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

9529 lines
130 KiB
NASM
Raw Normal View History

rename CallBankF -> CallBattleCore
2013-12-31 00:25:38 -08:00
BattleCore:
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Core components of the battle engine.
Function3c000: ; 3c000
xor a
ld [$c664], a
ld [$c6fc], a
ld [$d0ec], a
ld [BattleEnded], a
inc a
ld [$d264], a
Partymon structs for opponent and player parties.
2014-02-22 21:37:09 -08:00
ld hl, OTPartyMon1HP
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld bc, OTPartyMon2 - (OTPartyMon1 + 1)
ld d, NUM_MOVES - 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3c019
inc d
ld a, [hli]
or [hl]
jr nz, .asm_3c021
add hl, bc
jr .asm_3c019
.asm_3c021
ld a, d
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld [wBattleAction], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [InLinkBattle]
and a
jr z, .asm_3c031
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$ffcb]
cp $2
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jr z, .asm_3c04c
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3c031
ld a, [IsInBattle]
dec a
jr z, .asm_3c047
xor a
ld [$c718], a
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewEnemyMonStatus
call ResetEnemyStatLevels
call BreakAttraction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d4e1
.asm_3c047
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
ld c, 40
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
.asm_3c04c
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function309d
call Function3d873
ld a, d
and a
jp z, LostBattle
call Function30b4
ld a, [BattleType]
cp $2
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp z, .asm_3c0e2
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_TUTORIAL
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp z, .asm_3c0e2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [CurPartyMon], a
.asm_3c06b
call Function3d887
jr nz, .asm_3c076
ld hl, CurPartyMon
inc [hl]
jr .asm_3c06b
.asm_3c076
ld a, [CurBattleMon]
ld [$c71a], a
ld a, [CurPartyMon]
ld [CurBattleMon], a
inc a
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
ld hl, PartySpecies - 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
ld [CurPartySpecies], a
ld [TempBattleMonSpecies], a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 5
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $9
call Function3d490
call Function309d
call Function3d57a
call Function3da0d
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call ResetPlayerStatLevels
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3f26d
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewBattleMonStatus
call BreakAttraction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3db5f
call EmptyBattleTextBox
call Function309d
call SetPlayerTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [InLinkBattle]
and a
jr z, .asm_3c0df
ld a, [$ffcb]
cp $2
jr nz, .asm_3c0df
xor a
ld [$c718], a
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewEnemyMonStatus
call ResetEnemyStatLevels
call BreakAttraction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d4e1
call SetEnemyTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3c0df
jp Function3c12f
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.asm_3c0e2
jp BattleMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3c0e5
Function3c0e5: ; 3c0e5
call Function30b4
ld a, [$d0ee]
and $c0
add $2
ld [$d0ee], a
ld a, [InLinkBattle]
and a
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, BattleText_0x807bd
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3c115
ld a, [$d0ee]
and $c0
ld [$d0ee], a
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, BattleText_0x807cf
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d2e0
jr nc, .asm_3c115
ld hl, $cd2a
bit 4, [hl]
jr nz, .asm_3c118
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, BattleText_0x81863
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3c115
call StdBattleTextBox
.asm_3c118
call Function3ceec
call Function3d2e0
jr c, .asm_3c126
ld de, SFX_RUN
call PlaySFX
.asm_3c126
call SetPlayerTurn
ld a, 1
ld [BattleEnded], a
ret
; 3c12f
Function3c12f: ; 3c12f
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3c1bf
call Function3c3f5
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp c, .quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [wPlayerIsSwitching], a
ld [wEnemyIsSwitching], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [$d264], a
ld [$c73f], a
ld [$c740], a
ld [CurDamage], a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld [CurDamage + 1], a
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3c27c
call UpdateBattleMonInParty
callba AIChooseMove
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
call IsMobileBattle
jr nz, .not_disconnected
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
callba Function100da5
callba Function100641
callba Function100dd8
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp c, .quit
.not_disconnected
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3c410
jr c, .asm_3c18a
.asm_3c179
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
call BattleMenu
jr c, .quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [BattleEnded]
and a
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr nz, .quit
ld a, [$d232] ; roared/whirlwinded/teleported
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr nz, .quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3c18a
call Function3c434
jr nz, .asm_3c179
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3c300
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr c, .quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3c314
jr c, .asm_3c19e
call Function3c5fe
jr .asm_3c1a1
.asm_3c19e
call Function3c664
.asm_3c1a1
call Function3d2e0
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr c, .quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$d232]
and a
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr nz, .quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [BattleEnded]
and a
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr nz, .quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3c1d6
ld a, [BattleEnded]
and a
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr nz, .quit
jp .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3c1bf
Function3c1bf: ; 3c1bf
ret
; 3c1c0
Function3c1c0: ; 3c1c0
ld a, $5
call GetSRAMBank
ld hl, $a89b
inc [hl]
jr nz, .asm_3c1d2
dec hl
inc [hl]
jr nz, .asm_3c1d2
dec [hl]
inc hl
dec [hl]
.asm_3c1d2
call CloseSRAM
ret
; 3c1d6
Function3c1d6: ; 3c1d6
ld a, [$ffcb]
cp $1
jr z, .asm_3c1fe
call Function3c23c
ret c
call Function3ca26
call Function3c23c
ret c
call HandleWeather
call Function3c23c
ret c
call Function3c874
call Function3c23c
ret c
call Function3c801
call Function3c23c
ret c
jr .asm_3c21e
.asm_3c1fe
call Function3c25c
ret c
call Function3ca26
call Function3c25c
ret c
call HandleWeather
call Function3c25c
ret c
call Function3c874
call Function3c25c
ret c
call Function3c801
call Function3c25c
ret c
.asm_3c21e
call Function3c8eb
call Function3c93c
call Function3ca8f
call Function3cafb
call Function3cb36
call Function3de97
call Function3dcf9
call UpdateBattleMonInParty
call Function309d
jp Function3c4df
; 3c23c
Function3c23c: ; 3c23c
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasPlayerFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3c24a
call Function3d14e
ld a, [BattleEnded]
and a
jr nz, .asm_3c25a
.asm_3c24a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasEnemyFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3c258
call Function3cd55
ld a, [BattleEnded]
and a
jr nz, .asm_3c25a
.asm_3c258
and a
ret
.asm_3c25a
scf
ret
; 3c25c
Function3c25c: ; 3c25c
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasEnemyFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3c26a
call Function3cd55
ld a, [BattleEnded]
and a
jr nz, .asm_3c27a
.asm_3c26a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasPlayerFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3c278
call Function3d14e
ld a, [BattleEnded]
and a
jr nz, .asm_3c27a
.asm_3c278
and a
ret
.asm_3c27a
scf
ret
; 3c27c
Function3c27c: ; 3c27c
ld a, [$ffcb]
cp $1
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
jr z, .reverse
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
call .player
jr .enemy
.reverse
call .enemy
; jr .player
.player
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
ld de, PartyMon1Item
ld a, [CurBattleMon]
ld b, a
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
jr .go
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
.enemy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
ld de, OTPartyMon1Item
ld a, [CurOTMon]
ld b, a
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
; jr .go
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
.go
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push de
push bc
callab GetUserItem
ld a, [hl]
ld [$d265], a
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
sub BERSERK_GENE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
pop de
ret nz
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld h, d
ld l, e
ld a, b
call GetPartyLocation
xor a
ld [hl], a
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
ld a, BATTLE_VARS_SUBSTATUS3
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
set SUBSTATUS_CONFUSED, [hl]
ld a, BATTLE_VARS_MOVE_ANIM
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
push af
xor a
ld [hl], a
ld [AttackMissed], a
ld [EffectFailed], a
callba BattleCommand77
pop af
pop hl
ld [hl], a
call GetItemName
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, BattleText_0x80bde
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
callab BattleCommand8c
pop af
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
bit SUBSTATUS_CONFUSED, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
xor a
ld [$cfca], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_CONFUSED
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ee0f
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, BecameConfusedText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp StdBattleTextBox
; 3c300
Function3c300: ; 3c300
ld a, [InLinkBattle]
and a
jr z, .asm_3c30d
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [wBattleAction]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $f
jr z, .asm_3c30f
.asm_3c30d
and a
ret
.asm_3c30f
call Function3c0e5
scf
ret
; 3c314
Function3c314: ; 3c314
ld a, [InLinkBattle]
and a
jr z, .asm_3c35b
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [wBattleAction]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $e
jr z, .asm_3c35b
cp $d
jr z, .asm_3c35b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
sub NUM_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr c, .asm_3c35b
ld a, [$d0ec]
cp $2
jr nz, .asm_3c34c
ld a, [$ffcb]
cp $2
jr z, .asm_3c341
call BattleRandom
cp $80
jp c, .asm_3c3f1
jp Function3c3f3
.asm_3c341
call BattleRandom
cp $80
jp c, Function3c3f3
jp .asm_3c3f1
.asm_3c34c
callab Function3846c
call SetEnemyTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp Function3c3f3
.asm_3c35b
ld a, [$d0ec]
and a
jp nz, .asm_3c3f1
comment move priority functions
2013-12-30 20:32:37 -08:00
call CompareMovePriority
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3c36d
jp c, .asm_3c3f1
jp Function3c3f3
.asm_3c36d
call SetPlayerTurn
callab GetUserItem
push bc
callab GetOpponentItem
pop de
ld a, d
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp HELD_QUICK_CLAW
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3c391
ld a, b
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp HELD_QUICK_CLAW
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3c39f
call BattleRandom
cp e
jr nc, .asm_3c3c5
jp .asm_3c3f1
.asm_3c391
ld a, b
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp HELD_QUICK_CLAW
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3c3c5
call BattleRandom
cp c
jr nc, .asm_3c3c5
jp Function3c3f3
.asm_3c39f
ld a, [$ffcb]
cp $2
jr z, .asm_3c3b5
call BattleRandom
cp c
jp c, Function3c3f3
call BattleRandom
cp e
jp c, .asm_3c3f1
jr .asm_3c3c5
.asm_3c3b5
call BattleRandom
cp e
jp c, .asm_3c3f1
call BattleRandom
cp c
jp c, Function3c3f3
jr .asm_3c3c5
.asm_3c3c5
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld de, BattleMonSpeed
ld hl, EnemyMonSpeed
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, $2
call StringCmp
jr z, .asm_3c3d8
jp nc, .asm_3c3f1
jp Function3c3f3
.asm_3c3d8
ld a, [$ffcb]
cp $2
jr z, .asm_3c3e9
call BattleRandom
cp $80
jp c, .asm_3c3f1
jp Function3c3f3
.asm_3c3e9
call BattleRandom
cp $80
jp c, Function3c3f3
.asm_3c3f1
scf
ret
; 3c3f3
Function3c3f3: ; 3c3f3
and a
ret
; 3c3f5
Function3c3f5: ; 3c3f5
ld a, [BattleType]
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
cp BATTLETYPE_CONTEST
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3c40e
ld a, [$dc79]
and a
jr nz, .asm_3c40e
ld a, [$d0ee]
and $c0
add $2
ld [$d0ee], a
scf
ret
.asm_3c40e
and a
ret
; 3c410
Function3c410: ; 3c410
ld a, [PlayerSubStatus4]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
and 1 << SUBSTATUS_RECHARGE
jp nz, .quit
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, EnemySubStatus3
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_FLINCHED, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, PlayerSubStatus3
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_FLINCHED, [hl]
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
and 1 << SUBSTATUS_CHARGED | 1 << SUBSTATUS_RAMPAGE
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jp nz, .quit
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, PlayerSubStatus1
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_ROLLOUT, [hl]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jp nz, .quit
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.quit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
; 3c434
Function3c434: ; 3c434
call Function3c410
jp c, .asm_3c4ba
ld hl, PlayerSubStatus5
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_ENCORED, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3c449
ld a, [LastPlayerMove]
ld [CurPlayerMove], a
jr .asm_3c47c
.asm_3c449
ld a, [$d0ec]
cp $2
jr z, .asm_3c4ce
and a
jr nz, .asm_3c4b5
ld a, [PlayerSubStatus3]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
and 1 << SUBSTATUS_BIDE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3c4ba
xor a
ld [$d235], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
inc a ; POUND
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [FXAnimIDLo], a
call Function3e4bc
push af
call Function30b4
call UpdateBattleHuds
ld a, [CurPlayerMove]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp STRUGGLE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3c476
call PlayClickSFX
.asm_3c476
ld a, $1
ld [hBGMapMode], a
pop af
ret nz
.asm_3c47c
call SetPlayerTurn
callab UpdateMoveData
xor a
ld [$c732], a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wPlayerMoveStruct + MOVE_EFFECT]
cp EFFECT_FURY_CUTTER
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3c494
xor a
ld [PlayerFuryCutterCount], a
.asm_3c494
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wPlayerMoveStruct + MOVE_EFFECT]
cp EFFECT_RAGE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3c4a4
ld hl, PlayerSubStatus4
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
res SUBSTATUS_RAGE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [$c72b], a
.asm_3c4a4
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wPlayerMoveStruct + MOVE_EFFECT]
cp EFFECT_PROTECT
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3c4c9
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
cp EFFECT_ENDURE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3c4c9
xor a
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
ld [PlayerProtectCount], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr .asm_3c4c9
.asm_3c4b5
ld hl, PlayerSubStatus3
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_BIDE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3c4ba
xor a
ld [PlayerFuryCutterCount], a
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
ld [PlayerProtectCount], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [$c72b], a
ld hl, PlayerSubStatus4
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_RAGE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3c4c9
call Function3e7c1
xor a
ret
.asm_3c4ce
xor a
ld [PlayerFuryCutterCount], a
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
ld [PlayerProtectCount], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [$c72b], a
ld hl, PlayerSubStatus4
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_RAGE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ret
; 3c4df
Function3c4df: ; 3c4df
ld a, [$ffcb]
cp $1
jr z, .asm_3c4ea
call .asm_3c4ed
jr .asm_3c518
.asm_3c4ea
call .asm_3c518
.asm_3c4ed
ld hl, PlayerSubStatus5
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_ENCORED, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
ld a, [PlayerEncoreCount]
dec a
ld [PlayerEncoreCount], a
jr z, .asm_3c50a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, BattleMonPP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurMoveNum]
ld c, a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
and $3f
ret nz
.asm_3c50a
ld hl, PlayerSubStatus5
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
res SUBSTATUS_ENCORED, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, BattleText_0x80c8a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp StdBattleTextBox
.asm_3c518
ld hl, EnemySubStatus5
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_ENCORED, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
ld a, [EnemyEncoreCount]
dec a
ld [EnemyEncoreCount], a
jr z, .asm_3c535
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, EnemyMonPP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurEnemyMoveNum]
ld c, a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
and $3f
ret nz
.asm_3c535
ld hl, EnemySubStatus5
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
res SUBSTATUS_ENCORED, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, BattleText_0x80c8a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp StdBattleTextBox
; 3c543
Function3c543: ; 3c543
ld a, [IsInBattle]
dec a
jr nz, .Stay
ld a, [PlayerSubStatus5]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_CANT_RUN, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .Stay
ld a, [$c731]
and a
jr nz, .Stay
ld a, [EnemyMonStatus]
and 1 << FRZ | SLP
jr nz, .Stay
ld a, [TempEnemyMonSpecies]
ld de, 1
fleemons are global
2013-12-24 14:19:39 -08:00
ld hl, AlwaysFleeMons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call IsInArray
jr c, .Flee
call BattleRandom
ld b, a
cp $80
jr nc, .Stay
push bc
ld a, [TempEnemyMonSpecies]
ld de, 1
fleemons are global
2013-12-24 14:19:39 -08:00
ld hl, OftenFleeMons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call IsInArray
pop bc
jr c, .Flee
ld a, b
cp $1a
jr nc, .Stay
ld a, [TempEnemyMonSpecies]
ld de, 1
fleemons are global
2013-12-24 14:19:39 -08:00
ld hl, SometimesFleeMons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call IsInArray
jr c, .Flee
.Stay
and a
ret
.Flee
scf
ret
; 3c59a
fleemons are global
2013-12-24 14:19:39 -08:00
FleeMons:
SometimesFleeMons: ; 3c59a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db MAGNEMITE
db GRIMER
db TANGELA
db MR__MIME
db EEVEE
db PORYGON
db DRATINI
db DRAGONAIR
db TOGETIC
db UMBREON
db UNOWN
db SNUBBULL
db HERACROSS
fleemons are global
2013-12-24 14:19:39 -08:00
db -1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
fleemons are global
2013-12-24 14:19:39 -08:00
OftenFleeMons: ; 3c5a8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db CUBONE
db ARTICUNO
db ZAPDOS
db MOLTRES
db QUAGSIRE
db DELIBIRD
db PHANPY
db TEDDIURSA
fleemons are global
2013-12-24 14:19:39 -08:00
db -1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
fleemons are global
2013-12-24 14:19:39 -08:00
AlwaysFleeMons: ; 3c5b1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db RAIKOU
db ENTEI
; db SUICUNE
fleemons are global
2013-12-24 14:19:39 -08:00
db -1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3c5b4
comment move priority functions
2013-12-30 20:32:37 -08:00
CompareMovePriority: ; 3c5b4
; Compare the priority of the player and enemy's moves.
; Return carry if the player goes first, or z if they match.
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurPlayerMove]
call GetMovePriority
ld b, a
push bc
ld a, [CurEnemyMove]
call GetMovePriority
pop bc
cp b
ret
; 3c5c5
GetMovePriority: ; 3c5c5
comment move priority functions
2013-12-30 20:32:37 -08:00
; Return the priority (0-3) of move a.
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
comment move priority functions
2013-12-30 20:32:37 -08:00
; Vital throw goes last.
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp VITAL_THROW
ld a, 0
ret z
comment move priority functions
2013-12-30 20:32:37 -08:00
call GetMoveEffect
ld hl, MoveEffectPriorities
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.loop
ld a, [hli]
cp b
comment move priority functions
2013-12-30 20:32:37 -08:00
jr z, .done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
comment move priority functions
2013-12-30 20:32:37 -08:00
cp -1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .loop
comment move priority functions
2013-12-30 20:32:37 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, 1
ret
comment move priority functions
2013-12-30 20:32:37 -08:00
.done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
ret
; 3c5df
comment move priority functions
2013-12-30 20:32:37 -08:00
MoveEffectPriorities: ; 3c5df
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db EFFECT_PROTECT, 3
db EFFECT_ENDURE, 3
db EFFECT_PRIORITY_HIT, 2
db EFFECT_WHIRLWIND, 0
db EFFECT_COUNTER, 0
db EFFECT_MIRROR_COAT, 0
comment move priority functions
2013-12-30 20:32:37 -08:00
db -1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3c5ec
comment move priority functions
2013-12-30 20:32:37 -08:00
GetMoveEffect: ; 3c5ec
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
dec a
label more pointers to Moves
2013-12-30 20:22:27 -08:00
ld hl, Moves + MOVE_EFFECT
Use constants for move struct positioning. This eliminates the need for arbitrary move labels like Move2 and Move1 that don't have anything to do with their respective moves.
2014-06-10 23:23:55 -07:00
ld bc, MOVE_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call AddNTimes
label more pointers to Moves
2013-12-30 20:22:27 -08:00
ld a, BANK(Moves)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetFarByte
ld b, a
ret
; 3c5fe
comment move priority functions
2013-12-30 20:32:37 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Function3c5fe: ; 3c5fe
call Function309d
call Function3c543
jp c, Function3c0e5
call SetEnemyTurn
ld a, $1
ld [$c70f], a
callab Function38000
jr c, .asm_3c62f
call Function3c6de
call Function3d2e0
ret c
ld a, [$d232]
and a
ret nz
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasPlayerFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, Function3d14e
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasEnemyFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, Function3cd55
.asm_3c62f
call SetEnemyTurn
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call ResidualDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, Function3cd55
call RefreshBattleHuds
call Function3c6cf
call Function3d2e0
ret c
ld a, [$d232]
and a
ret nz
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasEnemyFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, Function3cd55
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasPlayerFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, Function3d14e
call SetPlayerTurn
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call ResidualDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, Function3d14e
call RefreshBattleHuds
xor a
ld [$d0ec], a
ret
; 3c664
Function3c664: ; 3c664
xor a
ld [$c70f], a
call SetEnemyTurn
callab Function38000
push af
call Function3c6cf
pop bc
ld a, [$d232]
and a
ret nz
call Function3d2e0
ret c
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasEnemyFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, Function3cd55
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasPlayerFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, Function3d14e
push bc
call SetPlayerTurn
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call ResidualDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
jp z, Function3d14e
push bc
call RefreshBattleHuds
pop af
jr c, .asm_3c6be
call Function309d
call Function3c543
jp c, Function3c0e5
call Function3c6de
call Function3d2e0
ret c
ld a, [$d232]
and a
ret nz
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasPlayerFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, Function3d14e
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasEnemyFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, Function3cd55
.asm_3c6be
call SetEnemyTurn
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call ResidualDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, Function3cd55
call RefreshBattleHuds
xor a
ld [$d0ec], a
ret
; 3c6cf
Function3c6cf: ; 3c6cf
call SetPlayerTurn
call Function3c6fe
callab DoPlayerTurn
jp Function3c6ed
; 3c6de
Function3c6de: ; 3c6de
call SetEnemyTurn
call Function3c6fe
callab DoEnemyTurn
jp Function3c6ed
; 3c6ed
Function3c6ed: ; 3c6ed
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS1_OPP
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_PROTECT, [hl]
res SUBSTATUS_ENDURE, [hl]
ld a, BATTLE_VARS_SUBSTATUS5_OPP
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_DESTINY_BOND, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3c6fe
Function3c6fe: ; 3c6fe
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS5
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_DESTINY_BOND, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3c706
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
HasUserFainted: ; 3c706
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hBattleTurn]
and a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr z, HasPlayerFainted
HasEnemyFainted: ; 3c70b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonHP
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
jr Function3c713
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
HasPlayerFainted: ; 3c710
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, BattleMonHP
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
Function3c713: ; 3c713
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
ret
; 3c716
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ResidualDamage: ; 3c716
; Return z if the user fainted before
; or as a result of residual damage.
; For Sandstorm damage, see HandleWeather.
call HasUserFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_STATUS
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBattleVar
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
and 1 << PSN | 1 << BRN
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr z, .did_psn_brn
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld hl, HurtByPoisonText
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_PSN
and 1 << BRN
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr z, .got_anim
ld hl, HurtByBurnText
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_BRN
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
.got_anim
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push de
call StdBattleTextBox
pop de
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [$cfca], a
call Function3ee0f
call GetEighthMaxHP
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
ld de, PlayerToxicCount
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hBattleTurn]
and a
jr z, .asm_3c74d
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
ld de, EnemyToxicCount
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3c74d
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS5
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBattleVar
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_TOXIC, a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr z, .did_toxic
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call GetSixteenthMaxHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
inc a
ld [de], a
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
ld hl, 0
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
.add
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
dec a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr nz, .add
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, h
ld c, l
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
.did_toxic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3cc3f
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
.did_psn_brn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasUserFainted
jp z, .fainted
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS4
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_LEECH_SEED, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3c7a1
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [$cfca], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_SAP
ld a, BATTLE_VARS_SUBSTATUS3_OPP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBattleVar
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call z, Function3ee0f
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetEighthMaxHP
call Function3cc3f
ld a, $1
ld [hBGMapMode], a
call Function3ccef
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld hl, LeechSeedSapsText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
.asm_3c7a1
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasUserFainted
jr z, .fainted
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS1
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_NIGHTMARE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3c7c5
xor a
ld [$cfca], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_IN_NIGHTMARE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ee0f
call GetQuarterMaxHP
call Function3cc3f
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld hl, HasANightmareText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
.asm_3c7c5
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasUserFainted
jr z, .fainted
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS1
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_CURSE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3c7e9
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [$cfca], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_IN_NIGHTMARE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ee0f
call GetQuarterMaxHP
call Function3cc3f
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld hl, HurtByCurseText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
.asm_3c7e9
ld hl, BattleMonHP
ld a, [hBattleTurn]
and a
jr z, .asm_3c7f4
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3c7f4
ld a, [hli]
or [hl]
ret nz
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
.fainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call RefreshBattleHuds
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld c, 20
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
xor a
ret
; 3c801
Function3c801: ; 3c801
ld a, [$ffcb]
cp $1
jr z, .asm_3c813
call SetPlayerTurn
call .asm_3c81c
call SetEnemyTurn
jp .asm_3c81c
.asm_3c813
call SetEnemyTurn
call .asm_3c81c
call SetPlayerTurn
.asm_3c81c
ld hl, PlayerPerishCount
ld a, [hBattleTurn]
and a
jr z, .asm_3c827
ld hl, EnemyPerishCount
.asm_3c827
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBattleVar
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_PERISH, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
dec [hl]
ld a, [hl]
ld [$d265], a
push af
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld hl, PerishCountText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
pop af
ret nz
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS1
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_PERISH, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hBattleTurn]
and a
jr nz, .asm_3c85c
ld hl, BattleMonHP
xor a
ld [hli], a
ld [hl], a
Partymon structs for opponent and player parties.
2014-02-22 21:37:09 -08:00
ld hl, PartyMon1HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurBattleMon]
call GetPartyLocation
xor a
ld [hli], a
ld [hl], a
ret
.asm_3c85c
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [hli], a
ld [hl], a
ld a, [IsInBattle]
dec a
ret z
Partymon structs for opponent and player parties.
2014-02-22 21:37:09 -08:00
ld hl, OTPartyMon1HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurOTMon]
call GetPartyLocation
xor a
ld [hli], a
ld [hl], a
ret
; 3c874
Function3c874: ; 3c874
ld a, [$ffcb]
cp $1
jr z, .asm_3c886
call SetPlayerTurn
call .asm_3c88f
call SetEnemyTurn
jp .asm_3c88f
.asm_3c886
call SetEnemyTurn
call .asm_3c88f
call SetPlayerTurn
.asm_3c88f
ld hl, $c730
ld de, $c72e
ld a, [hBattleTurn]
and a
jr z, .asm_3c8a0
ld hl, $c731
ld de, $c72f
.asm_3c8a0
ld a, [hl]
and a
ret z
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBattleVar
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_SUBSTITUTE, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
ld a, [de]
ld [$d265], a
ld [FXAnimIDLo], a
call GetMoveName
dec [hl]
jr z, .asm_3c8de
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS3
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBattleVar
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3c8d3
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [$cfca], a
ld [FXAnimIDHi], a
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef PlayBattleAnim
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3c8d3
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call GetSixteenthMaxHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3cc3f
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, BattleText_0x80de2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr .asm_3c8e1
.asm_3c8de
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, BattleText_0x80df5
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3c8e1
jp StdBattleTextBox
; 3c8e4
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
SwitchTurnCore: ; 3c8e4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hBattleTurn]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
xor 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hBattleTurn], a
ret
; 3c8eb
Function3c8eb: ; 3c8eb
ld a, [$ffcb]
cp $1
jr z, .asm_3c8fd
call SetPlayerTurn
call .asm_3c906
call SetEnemyTurn
jp .asm_3c906
.asm_3c8fd
call SetEnemyTurn
call .asm_3c906
call SetPlayerTurn
.asm_3c906
callab GetUserItem
ld a, [hl]
ld [$d265], a
call GetItemName
ld a, b
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
cp HELD_LEFTOVERS
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
ld hl, BattleMonHP
ld a, [hBattleTurn]
and a
jr z, .asm_3c922
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3c922
ld a, [hli]
ld b, a
ld a, [hli]
ld c, a
ld a, [hli]
cp b
jr nz, .asm_3c92d
ld a, [hl]
cp c
ret z
.asm_3c92d
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call GetSixteenthMaxHP
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ccef
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, BattleText_0x80880
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp StdBattleTextBox
; 3c93c
Function3c93c: ; 3c93c
ld a, [$ffcb]
cp $1
jr z, .asm_3c94e
call SetPlayerTurn
call .asm_3c957
call SetEnemyTurn
jp .asm_3c957
.asm_3c94e
call SetEnemyTurn
call .asm_3c957
call SetPlayerTurn
.asm_3c957
callab GetUserItem
ld a, b
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp HELD_RESTORE_PP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3c9ae
ld hl, PartyMon1PP
ld a, [CurBattleMon]
call GetPartyLocation
ld d, h
ld e, l
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, PartyMon1Moves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurBattleMon]
call GetPartyLocation
ld a, [hBattleTurn]
and a
jr z, .asm_3c99b
ld de, $c739
ld hl, $c735
ld a, [IsInBattle]
dec a
jr z, .asm_3c99b
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, OTPartyMon1PP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurOTMon]
call GetPartyLocation
ld d, h
ld e, l
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, OTPartyMon1Moves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurOTMon]
call GetPartyLocation
.asm_3c99b
ld c, $0
.asm_3c99d
ld a, [hl]
and a
jr z, .asm_3c9ae
ld a, [de]
and $3f
jr z, .asm_3c9af
inc hl
inc de
inc c
ld a, c
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp NUM_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3c99d
.asm_3c9ae
ret
.asm_3c9af
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
; lousy hack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp SKETCH
ld b, 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3c9b8
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, 5
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3c9b8
ld a, [de]
add b
ld [de], a
push bc
push bc
ld a, [hl]
ld [$d265], a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld de, BattleMonMoves - 1
ld hl, BattleMonPP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hBattleTurn]
and a
jr z, .asm_3c9d2
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld de, EnemyMonMoves - 1
ld hl, EnemyMonPP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3c9d2
inc de
pop bc
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
push hl
ld h, d
ld l, e
add hl, bc
pop de
pop bc
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$d265]
cp [hl]
jr nz, .asm_3c9f5
ld a, [hBattleTurn]
and a
ld a, [PlayerSubStatus5]
jr z, .asm_3c9ee
ld a, [EnemySubStatus5]
.asm_3c9ee
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_TRANSFORMED, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3c9f5
ld a, [de]
add b
ld [de], a
.asm_3c9f5
callab GetUserItem
ld a, [hl]
ld [$d265], a
xor a
ld [hl], a
call Function3df12
ld a, [hBattleTurn]
and a
jr z, .asm_3ca12
ld a, [IsInBattle]
dec a
jr z, .asm_3ca14
call Function3df1f
.asm_3ca12
xor a
ld [hl], a
.asm_3ca14
call GetItemName
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ddc8
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, BattleText_0x80899
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp StdBattleTextBox
; 3ca26
Function3ca26: ; 3ca26
ld a, [$ffcb]
cp $1
jr z, .asm_3ca38
call SetPlayerTurn
call .asm_3ca41
call SetEnemyTurn
jp .asm_3ca41
.asm_3ca38
call SetEnemyTurn
call .asm_3ca41
call SetPlayerTurn
.asm_3ca41
ld hl, $c71d
ld a, [hBattleTurn]
and a
jr z, .asm_3ca4c
ld hl, $c71e
.asm_3ca4c
ld a, [hl]
and a
ret z
dec a
ld [hl], a
cp $1
ret nz
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, BattleText_0x808b6
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld a, BATTLE_VARS_MOVE
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld a, FUTURE_SIGHT
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
callab UpdateMoveData
xor a
ld [AttackMissed], a
ld [AlreadyDisobeyed], a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld a, 10
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [TypeModifier], a
callab DoMove
xor a
ld [CurDamage], a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld [CurDamage + 1], a
ld a, BATTLE_VARS_MOVE
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
ld [hl], a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call UpdateBattleMonInParty
jp UpdateEnemyMonInParty
; 3ca8f
Function3ca8f: ; 3ca8f
ld a, [$ffcb]
cp $1
jr z, .asm_3ca9a
call .asm_3ca9d
jr .asm_3cac9
.asm_3ca9a
call .asm_3cac9
.asm_3ca9d
ld a, [BattleMonStatus]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit FRZ, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
ld a, [$c73f]
and a
ret nz
call BattleRandom
cp $19
ret nc
xor a
ld [BattleMonStatus], a
ld a, [CurBattleMon]
ld hl, PartyMon1Status
call GetPartyLocation
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
ld [hl], 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call UpdateBattleHuds
call SetEnemyTurn
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, DefrostedOpponentText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp StdBattleTextBox
.asm_3cac9
ld a, [EnemyMonStatus]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit FRZ, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
ld a, [$c740]
and a
ret nz
call BattleRandom
cp $19
ret nc
xor a
ld [EnemyMonStatus], a
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [IsInBattle]
dec a
jr z, .asm_3caef
ld a, [CurOTMon]
ld hl, OTPartyMon1Status
call GetPartyLocation
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
ld [hl], 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3caef
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call UpdateBattleHuds
call SetPlayerTurn
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, DefrostedOpponentText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp StdBattleTextBox
; 3cafb
Function3cafb: ; 3cafb
ld a, [$ffcb]
cp $1
jr z, .asm_3cb06
call .asm_3cb09
jr .asm_3cb1c
.asm_3cb06
call .asm_3cb1c
.asm_3cb09
ld a, [PlayerScreens]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
bit SCREENS_SAFEGUARD, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
ld hl, $c701
dec [hl]
ret nz
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
res SCREENS_SAFEGUARD, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [PlayerScreens], a
xor a
jr .asm_3cb2e
.asm_3cb1c
ld a, [EnemyScreens]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
bit SCREENS_SAFEGUARD, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
ld hl, $c705
dec [hl]
ret nz
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
res SCREENS_SAFEGUARD, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [EnemyScreens], a
ld a, $1
.asm_3cb2e
ld [hBattleTurn], a
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, BattleText_0x808d2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp StdBattleTextBox
; 3cb36
Function3cb36: ; 3cb36
ld a, [$ffcb]
cp 1
jr z, .Both
call .CheckPlayer
jr .CheckEnemy
.Both
call .CheckEnemy
.CheckPlayer
call SetPlayerTurn
ld de, .Your
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
call .Copy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, PlayerScreens
ld de, PlayerLightScreenCount
jr .FadeScreens
.CheckEnemy
call SetEnemyTurn
ld de, .Enemy
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
call .Copy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, EnemyScreens
ld de, EnemyLightScreenCount
.FadeScreens
bit SCREENS_LIGHT_SCREEN, [hl]
call nz, FadeLightScreen
bit SCREENS_REFLECT, [hl]
call nz, FadeReflect
ret
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
.Copy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, StringBuffer1
jp CopyName2
; 3cb75
.Your
db "Your@"
.Enemy
db "Enemy@"
; 3cb80
FadeLightScreen: ; 3cb80
ld a, [de]
dec a
ld [de], a
ret nz
res SCREENS_LIGHT_SCREEN, [hl]
push hl
push de
ld hl, BattleText_0x808e7
call StdBattleTextBox
pop de
pop hl
ret
; 3cb91
FadeReflect: ; 3cb91
inc de
ld a, [de]
dec a
ld [de], a
ret nz
res SCREENS_REFLECT, [hl]
ld hl, BattleText_0x80905
jp StdBattleTextBox
; 3cb9e
HandleWeather: ; 3cb9e
ld a, [Weather]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp WEATHER_NONE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
ld hl, WeatherCount
dec [hl]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .ended
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, .WeatherMessages
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call .PrintWeatherMessage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [Weather]
cp WEATHER_SANDSTORM
ret nz
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$ffcb]
cp 1
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.player_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call .SandstormDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr .SandstormDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call .SandstormDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.SandstormDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVar
bit SUBSTATUS_UNDERGROUND, a
ret nz
ld hl, BattleMonType1
ld a, [hBattleTurn]
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, EnemyMonType1
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
cp ROCK
ret z
cp GROUND
ret z
cp STEEL
ret z
ld a, [hl]
cp ROCK
ret z
cp GROUND
ret z
cp STEEL
ret z
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [$cfca], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_IN_SANDSTORM
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ee17
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetEighthMaxHP
call Function3cc3f
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld hl, SandstormHitsText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp 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-13 21:18:14 -07:00
.ended
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, .WeatherEndedMessages
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call .PrintWeatherMessage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [Weather], a
ret
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.PrintWeatherMessage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [Weather]
dec a
ld c, a
ld b, 0
add hl, bc
add hl, bc
ld a, [hli]
ld h, [hl]
ld l, a
jp StdBattleTextBox
; 3cc2d
.WeatherMessages
dw BattleText_0x8091f
dw BattleText_0x80938
dw BattleText_0x80951
.WeatherEndedMessages
dw BattleText_0x80967
dw BattleText_0x8097a
dw BattleText_0x8098f
; 3cc39
Function3cc39: ; 3cc39
call Function3cc45
jp Function3cd3c
; 3cc3f
Function3cc3f: ; 3cc3f
call Function3cc45
jp Function3cd36
; 3cc45
Function3cc45: ; 3cc45
ld hl, BattleMonHP
ld a, [hBattleTurn]
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .ok
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, EnemyMonHP
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
ld a, [hl]
ld [$d1ec], a
sub c
ld [hld], a
ld [$d1ee], a
ld a, [hl]
ld [$d1ed], a
sbc b
ld [hl], a
ld [$d1ef], a
ret nc
ld a, [$d1ec]
ld c, a
ld a, [$d1ed]
ld b, a
xor a
ld [hli], a
ld [hl], a
ld [$d1ee], a
ld [$d1ef], a
ret
; 3cc76
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
GetSixteenthMaxHP: ; 3cc76
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetQuarterMaxHP
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
; quarter result
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
srl c
srl c
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
; round up
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, c
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr nz, .ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc c
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3cc83
GetEighthMaxHP: ; 3cc83
; output: bc
call GetQuarterMaxHP
; assumes nothing can have 1024 or more hp
; halve result
srl c
; round up
ld a, c
and a
jr nz, .end
inc c
.end
ret
; 3cc8e
GetQuarterMaxHP: ; 3cc8e
; output: bc
call GetMaxHP
; quarter result
srl b
rr c
srl b
rr c
; assumes nothing can have 1024 or more hp
; round up
ld a, c
and a
jr nz, .end
inc c
.end
ret
; 3cc9f
GetHalfMaxHP: ; 3cc9f
; output: bc
call GetMaxHP
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
; halve result
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
srl b
rr c
; floor = 1
ld a, c
or b
jr nz, .end
inc c
.end
ret
; 3ccac
GetMaxHP: ; 3ccac
; output: bc, Buffer1-2
ld hl, BattleMonMaxHP
ld a, [hBattleTurn]
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, EnemyMonMaxHP
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld [Buffer2], a
ld b, a
ld a, [hl]
ld [Buffer1], a
ld c, a
ret
; 3ccc2
Function3ccc2: ; 3ccc2
ld hl, BattleMonHP
ld a, [hBattleTurn]
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, EnemyMonHP
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld b, a
ld a, [hli]
ld c, a
srl b
rr c
ld a, [hli]
ld [Buffer2], a
ld a, [hl]
ld [Buffer1], a
ret
; 3ccde
Function3ccde: ; 3ccde
ld hl, BattleMonHP + 1
ld a, [hBattleTurn]
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, EnemyMonHP + 1
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, c
sub [hl]
dec hl
ld a, b
sbc [hl]
ret
; 3ccef
Function3ccef: ; 3ccef
ld hl, EnemyMonMaxHP
ld a, [hBattleTurn]
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, BattleMonMaxHP
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld [Buffer1 + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld [Buffer1 + 0], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec hl
ld a, [hl]
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld [Buffer1 + 2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add c
ld [hld], a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld [Buffer1 + 4], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld [Buffer1 + 3], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
adc b
ld [hli], a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld [Buffer1 + 5], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [Buffer1]
ld c, a
ld a, [hld]
sub c
ld a, [Buffer2]
ld b, a
ld a, [hl]
sbc b
jr c, .asm_3cd2d
ld a, b
ld [hli], a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld [Buffer1 + 5], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, c
ld [hl], a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld [Buffer1 + 4], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3cd2d
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3cd36
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jp SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3cd36
Function3cd36: ; 3cd36
call Function3cd3c
jp UpdateBattleHuds
; 3cd3c
Function3cd3c: ; 3cd3c
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 10, 9
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hBattleTurn]
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, 1
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr z, .ok
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 2, 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
ld [$d10a], a
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef Functionc6e0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
ret
; 3cd55
Function3cd55: ; 3cd55
call Function3cf14
ld hl, BattleMonHP
ld a, [hli]
or [hl]
call z, Function3cef1
xor a
ld [$c6f7], a
call Function3ce01
call Function3d873
ld a, d
and a
jp z, LostBattle
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, BattleMonHP
ld a, [hli]
or [hl]
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
call nz, UpdatePlayerHUD
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
ld [hBGMapMode], a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld c, 60
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [IsInBattle]
dec a
jr nz, .asm_3cd8c
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [BattleEnded], a
ret
.asm_3cd8c
call Function3cf35
jp z, Function3cfa4
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, BattleMonHP
ld a, [hli]
or [hl]
jr nz, .asm_3cdba
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d1f8
jr nc, .asm_3cda4
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [BattleEnded], a
ret
.asm_3cda4
call Function3d227
call Function3d2e0
jp c, Function3c0e5
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
ld [$d0ec], a
call Function3cf4a
jp z, Function3c0e5
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
jr Function3cdca
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3cdba
ld a, $1
ld [$d0ec], a
call Function3cf4a
jp z, Function3c0e5
xor a
ld [$d0ec], a
ret
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
; 3cdca
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
Function3cdca: ; 3cdca
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$ffcb]
cp $1
jr z, .asm_3cde6
call ClearSprites
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 0
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
lb bc, 4, 10
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
call Function3d2b3
ld a, $1
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call EnemyPartyMonEntrance
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr .asm_3cdfc
.asm_3cde6
ld a, [CurPartyMon]
push af
ld a, $1
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call EnemyPartyMonEntrance
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearSprites
call Function309d
pop af
ld [CurPartyMon], a
call Function3d2b3
.asm_3cdfc
xor a
ld [$d0ec], a
ret
; 3ce01
Function3ce01: ; 3ce01
call UpdateBattleMonInParty
ld a, [IsInBattle]
dec a
jr z, .asm_3ce16
ld a, [CurOTMon]
Partymon structs for opponent and player parties.
2014-02-22 21:37:09 -08:00
ld hl, OTPartyMon1HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
xor a
ld [hli], a
ld [hl], a
.asm_3ce16
ld hl, PlayerSubStatus3
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
res SUBSTATUS_IN_LOOP, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld hl, EnemyDamageTaken
ld [hli], a
ld [hl], a
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewEnemyMonStatus
call BreakAttraction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [IsInBattle]
dec a
jr z, .asm_3ce2f
jr .asm_3ce37
.asm_3ce2f
call Function3ceec
ld a, $1
ld [$c6fd], a
.asm_3ce37
ld hl, BattleMonHP
ld a, [hli]
or [hl]
jr nz, .asm_3ce47
ld a, [$c6f7]
and a
jr nz, .asm_3ce47
call Function3d1aa
.asm_3ce47
call Function3d873
ld a, d
and a
ret z
ld a, [IsInBattle]
dec a
call z, Function3d0ea
call EmptyBattleTextBox
call Function309d
ld a, [$d0ee]
and $c0
ld [$d0ee], a
call Function3ceaa
jr z, .asm_3ce72
ld hl, EnemyMonBaseStats
ld b, $7
.asm_3ce6c
srl [hl]
inc hl
dec b
jr nz, .asm_3ce6c
.asm_3ce72
ld hl, EnemyMonBaseStats
ld de, $c720
ld bc, $0007
call CopyBytes
xor a
ld [$c71f], a
call Function3ee3b
call Function3ceaa
ret z
ld a, [$c664]
push af
ld a, d
ld [$c664], a
ld hl, $c720
ld de, EnemyMonBaseStats
ld bc, $0007
call CopyBytes
ld a, $1
ld [$c71f], a
call Function3ee3b
pop af
ld [$c664], a
ret
; 3ceaa
Function3ceaa: ; 3ceaa
ld a, [PartyCount]
ld b, a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, PartyMon1
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
ld c, 1
ld d, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3ceb5
push hl
push bc
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld bc, PartyMon1HP - PartyMon1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hli]
or [hl]
pop bc
pop hl
jr z, .asm_3ced1
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
push bc
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld bc, PartyMon1Item - PartyMon1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
pop bc
ld a, [hl]
pop hl
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp EXP_SHARE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3ced1
ld a, d
or c
ld d, a
.asm_3ced1
sla c
push de
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld de, PartyMon2 - PartyMon1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, de
pop de
dec b
jr nz, .asm_3ceb5
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, d
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
ld e, 0
ld b, PARTY_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3cee1
srl a
jr nc, .asm_3cee6
inc e
.asm_3cee6
dec b
jr nz, .asm_3cee1
ld a, e
and a
ret
; 3ceec
Function3ceec: ; 3ceec
xor a
ld [Danger], a
ret
; 3cef1
Function3cef1: ; 3cef1
call Function3ceec
call WaitSFX
ld a, $f0
ld [CryTracks], a
ld a, [BattleMonSpecies]
Name cry functions in home.asm.
2014-07-18 10:25:03 -07:00
call PlayStereoCry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d43b
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 9, 7
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
lb bc, 5, 11
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
ld hl, BattleText_0x80a75
jp StdBattleTextBox
; 3cf14
Function3cf14: ; 3cf14
call WaitSFX
ld de, SFX_KINESIS
call PlaySFX
call Function3d432
ld de, SFX_UNKNOWN_2A
call PlaySFX
hlcoord 1, 0
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
lb bc, 4, 10
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
ld hl, BattleText_0x809a8
jp StdBattleTextBox
; 3cf35
Function3cf35: ; 3cf35
ld a, [OTPartyCount]
ld b, a
xor a
Partymon structs for opponent and player parties.
2014-02-22 21:37:09 -08:00
ld hl, OTPartyMon1HP
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld de, PartyMon2 - PartyMon1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3cf40
or [hl]
inc hl
or [hl]
dec hl
add hl, de
dec b
jr nz, .asm_3cf40
and a
ret
; 3cf4a
Function3cf4a: ; 3cf4a
ld hl, EnemyHPPal
More PartyMon labels for relative addressing.
2014-06-23 12:45:30 -07:00
ld e, HP_BAR_LENGTH_PX
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3e12e
call WaitBGMap
callba Function2c012
ld a, [InLinkBattle]
and a
jr z, .asm_3cf6d
call Function3e8e4
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [wBattleAction]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $f
ret z
call Function30b4
.asm_3cf6d
ld hl, BattleMonHP
ld a, [hli]
or [hl]
ld a, $0
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jr nz, EnemyPartyMonEntrance
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
ret
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
; 3cf78
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
EnemyPartyMonEntrance: ; 3cf78
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
xor a
ld [$c718], a
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewEnemyMonStatus
call ResetEnemyStatLevels
call BreakAttraction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
and a
jr nz, .asm_3cf8f
call Function3d4e1
jr .asm_3cf92
.asm_3cf8f
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
call Function3d517
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3cf92
call Function3d57a
call SetEnemyTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [wEnemyMoveStruct + MOVE_ANIM], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [$d0ec], a
inc a
ret
; 3cfa4
Function3cfa4: ; 3cfa4
call Function3ceec
ld a, $1
ld [$c6fd], a
ld [BattleEnded], a
ld a, [InLinkBattle]
and a
ld a, b
call z, Function3d0ea
callab Function39939
ld hl, BattleText_0x809da
call StdBattleTextBox
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
call IsMobileBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3cff5
ld a, [InLinkBattle]
and a
ret nz
ld a, [$cfc0]
bit 0, a
jr nz, .asm_3d006
call Function3ebd8
ld c, $28
call DelayFrames
ld a, [BattleType]
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_CANLOSE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3cfe8
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef Functionc658
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3cfe8
ld a, [$c2cc]
bit 0, a
jr nz, .asm_3cff2
call Function3718
.asm_3cff2
jp Function3d02b
.asm_3cff5
call Function3ebd8
ld c, $28
call DelayFrames
ld c, $4
callba Function4ea0a
ret
.asm_3d006
call Function3ebd8
ld c, $28
call DelayFrames
call EmptyBattleTextBox
ld c, $3
callba Function11c000
call Functiona80
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld hl, wPayDayMoney
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
inc hl
or [hl]
ret nz
call ClearTileMap
call WhiteBGMap
ret
; 3d02b
Function3d02b: ; 3d02b
ld a, [$c73d]
and a
call nz, Function3d099
call Function3d0b1
push af
ld a, $0
jr nc, .asm_3d044
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld a, [wMomSavingMoney]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and $7
cp $3
jr nz, .asm_3d044
inc a
.asm_3d044
ld b, a
ld c, $4
.asm_3d047
ld a, b
and a
jr z, .asm_3d052
call Function3d081
dec c
dec b
jr .asm_3d047
.asm_3d052
ld a, c
and a
jr z, .asm_3d05c
call Function3d08d
dec c
jr .asm_3d052
.asm_3d05c
call Function3d099
call Function3d099
pop af
jr nc, .asm_3d07b
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld a, [wMomSavingMoney]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and $7
jr z, .asm_3d07b
ld hl, SentToMomTexts
dec a
ld c, a
ld b, 0
add hl, bc
add hl, bc
ld a, [hli]
ld h, [hl]
ld l, a
jp StdBattleTextBox
.asm_3d07b
ld hl, BattleText_0x809be
jp StdBattleTextBox
; 3d081
Function3d081: ; 3d081
push bc
ld hl, $c688
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld de, wMomsMoney + 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d0be
pop bc
ret
; 3d08d
Function3d08d: ; 3d08d
push bc
ld hl, $c688
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld de, Money + 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d0be
pop bc
ret
; 3d099
Function3d099: ; 3d099
ld hl, $c688
sla [hl]
dec hl
rl [hl]
dec hl
rl [hl]
ret nc
ld a, $ff
ld [hli], a
ld [hli], a
ld [hl], a
ret
; 3d0ab
SentToMomTexts: ; 3d0ab
dw BattleText_0x809fc
dw BattleText_0x80a2a
dw BattleText_0x80a3d
; 3d0b1
Function3d0b1: ; 3d0b1
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, wMomsMoney + 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp 999999 % $100
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
sbc 999999 / $100 % $100
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
sbc 999999 / $10000 % $100
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3d0be
Function3d0be: ; 3d0be
ld c, $3
and a
push de
push hl
push bc
ld b, h
ld c, l
callba Function106008
pop bc
pop hl
.asm_3d0ce
ld a, [de]
adc [hl]
ld [de], a
dec de
dec hl
dec c
jr nz, .asm_3d0ce
pop hl
ld a, [hld]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp 999999 % $100
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
sbc 999999 / $100 % $100
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
sbc 999999 / $10000 % $100
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld [hl], 999999 / $10000 % $100
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld [hl], 999999 / $100 % $100
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld [hl], 999999 % $100
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3d0ea
Function3d0ea: ; 3d0ea
push de
ld de, MUSIC_NONE
call PlayMusic
call DelayFrame
ld de, MUSIC_WILD_VICTORY
ld a, [IsInBattle]
dec a
jr nz, .asm_3d113
push de
call Function3ceaa
pop de
jr nz, .asm_3d11e
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld hl, wPayDayMoney
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
jr nz, .asm_3d11e
ld a, [$c664]
and a
jr z, .asm_3d121
jr .asm_3d11e
.asm_3d113
ld de, MUSIC_GYM_VICTORY
call IsJohtoGymLeader
jr c, .asm_3d11e
ld de, MUSIC_TRAINER_VICTORY
.asm_3d11e
call PlayMusic
.asm_3d121
pop de
ret
; 3d123
; These functions check if the current opponent is a gym leader or one of a
; few other special trainers.
; Note: KantoGymLeaders is a subset of JohtoGymLeaders. If you wish to
; differentiate between the two, call IsKantoGymLeader first.
; The Lance and Red entries are unused for music checks; those trainers are
; accounted for elsewhere.
IsKantoGymLeader: ; 0x3d123
ld hl, KantoGymLeaders
jr IsGymLeaderCommon
IsJohtoGymLeader: ; 0x3d128
ld hl, JohtoGymLeaders
IsGymLeaderCommon:
push de
ld a, [OtherTrainerClass]
ld de, $0001
call IsInArray
pop de
ret
; 0x3d137
JohtoGymLeaders:
db FALKNER
db WHITNEY
db BUGSY
db MORTY
db PRYCE
db JASMINE
db CHUCK
db CLAIR
db WILL
db BRUNO
db KAREN
db KOGA
; fallthrough
; these two entries are unused
db CHAMPION
db RED
; fallthrough
KantoGymLeaders:
db BROCK
db MISTY
db LT_SURGE
db ERIKA
db JANINE
db SABRINA
db BLAINE
db BLUE
db $ff
Function3d14e: ; 3d14e
call Function3cef1
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
call z, Function3cf14
ld a, $1
ld [$c6f7], a
call Function3d1aa
call Function3d873
ld a, d
and a
jp z, LostBattle
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
jr nz, .asm_3d185
call Function3ce01
ld a, [IsInBattle]
dec a
jr nz, .asm_3d17f
ld a, $1
ld [BattleEnded], a
ret
.asm_3d17f
call Function3cf35
jp z, Function3cfa4
.asm_3d185
call Function3d1f8
jr nc, .asm_3d190
ld a, $1
ld [BattleEnded], a
ret
.asm_3d190
call Function3d227
call Function3d2e0
jp c, Function3c0e5
ld a, c
and a
ret nz
ld a, $1
ld [$d0ec], a
call Function3cf4a
jp z, Function3c0e5
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
jp Function3cdca
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3d1aa
Function3d1aa: ; 3d1aa
ld a, [CurBattleMon]
ld c, a
ld hl, $c664
ld b, $0
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef FlagPredef
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, EnemySubStatus3
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
res SUBSTATUS_IN_LOOP, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [Danger], a
ld hl, PlayerDamageTaken
ld [hli], a
ld [hl], a
ld [BattleMonStatus], a
call UpdateBattleMonInParty
ld c, $6
ld a, [BattleMonLevel]
add $1e
ld b, a
ld a, [EnemyMonLevel]
cp b
jr c, .asm_3d1dc
ld c, $8
.asm_3d1dc
ld a, [CurBattleMon]
ld [CurPartyMon], a
callab ChangeHappiness
ld a, [$d0ee]
and $c0
add $1
ld [$d0ee], a
ld a, [$c6f7]
and a
ret z
ret
; 3d1f8
Function3d1f8: ; 3d1f8
call EmptyBattleTextBox
call Function309d
ld a, [IsInBattle]
and a
dec a
ret nz
ld hl, BattleText_0x80a83
call StdBattleTextBox
.asm_3d20a
lb bc, 1, 7
call PlaceYesNoBox
ld a, [$cfa9]
jr c, .asm_3d217
and a
ret
.asm_3d217
ld a, [$cfa9]
cp $1
jr z, .asm_3d20a
Partymon structs for opponent and player parties.
2014-02-22 21:37:09 -08:00
ld hl, PartyMon1Speed
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld de, EnemyMonSpeed
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp Function3d8b3
; 3d227
Function3d227: ; 3d227
call EmptyBattleTextBox
call Function1d6e
call Function3d2f7
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call ForcePickPartyMonInBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [InLinkBattle]
and a
jr z, .asm_3d241
ld a, $1
ld [$d0ec], a
call Function3e8e4
.asm_3d241
xor a
ld [$d0ec], a
call Function3d2e0
jr c, .asm_3d251
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
jr nz, .asm_3d26c
.asm_3d251
call ClearSprites
call WhiteBGMap
call Function3eda6
call Function1c07
call Function309d
call WaitBGMap
call ClearSGB
call Function32f9
xor a
ld c, a
ret
.asm_3d26c
call ClearSprites
ld a, [CurBattleMon]
ld [$c71a], a
ld a, [CurPartyMon]
ld [CurBattleMon], a
call Function3d581
call Function3da0d
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call ResetPlayerStatLevels
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearPalettes
call DelayFrame
call Function3eda6
call Function1c17
call ClearSGB
call Function32f9
call Function3f26d
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewBattleMonStatus
call BreakAttraction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3db5f
call EmptyBattleTextBox
call Function309d
call SetPlayerTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
and a
ld c, a
ret
; 3d2b3
Function3d2b3: ; 3d2b3
ld a, [CurBattleMon]
ld [$c71a], a
ld a, [CurPartyMon]
ld [CurBattleMon], a
call Function3d581
call Function3da0d
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call ResetPlayerStatLevels
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3f26d
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewBattleMonStatus
call BreakAttraction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3db5f
call EmptyBattleTextBox
call Function309d
call SetPlayerTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jp SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3d2e0
Function3d2e0: ; 3d2e0
ld a, [InLinkBattle]
cp $4
jr nz, .asm_3d2ef
ld a, [$cd2b]
and a
jr z, .asm_3d2ef
scf
ret
.asm_3d2ef
xor a
ret
; 3d2f1
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
IsMobileBattle: ; 3d2f1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [InLinkBattle]
cp $4
ret
; 3d2f7
Function3d2f7: ; 3d2f7
call WhiteBGMap
Function3d2fa: ; 3d2fa
callba Function5004f
callba Function50405
callba Function8e85
callba Function503e0
ret
; 3d313
Function3d313: ; 3d313
callba WritePartyMenuTilemap
callba PrintPartyMenuText
call WaitBGMap
call Function32f9
call DelayFrame
ret
; 3d329
Function3d329: ; 3d329
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
call IsMobileBattle
jr z, .mobile
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
callba PartyMenuSelect
ret
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.mobile
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
callba Function100cb5
ret
; 3d33c
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
PickPartyMonInBattle: ; 3d33c
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.loop
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
ld a, $2 ; Which PKMN?
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [PartyMenuActionText], a
call Function3d313
call Function3d329
ret c
call Function3d887
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr z, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ret
; 3d34f
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
SwitchMonAlreadyOut: ; 3d34f
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, CurBattleMon
ld a, [CurPartyMon]
cp [hl]
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jr nz, .notout
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, BattleText_0x80c0d
call StdBattleTextBox
scf
ret
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
.notout
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ret
; 3d362
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
ForcePickPartyMonInBattle: ; 3d362
; Can't back out.
.pick
call PickPartyMonInBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nc
call Function3d2e0
ret c
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, SFX_WRONG
call PlaySFX
call WaitSFX
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jr .pick
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3d375
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
PickSwitchMonInBattle: ; 3d375
.pick
call PickPartyMonInBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SwitchMonAlreadyOut
jr c, .pick
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ret
; 3d380
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
ForcePickSwitchMonInBattle: ; 3d380
; Can't back out.
.pick
call ForcePickPartyMonInBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d2e0
ret c
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SwitchMonAlreadyOut
jr c, .pick
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ret
; 3d38e
LostBattle: ; 3d38e
ld a, 1
ld [BattleEnded], a
ld a, [$cfc0]
bit 0, a
jr nz, .asm_3d3bd
ld a, [BattleType]
cp BATTLETYPE_CANLOSE
jr nz, .asm_3d3e3
; Remove the enemy from the screen.
hlcoord 0, 0
ld bc, $0815
call ClearBox
call Function3ebd8
ld c, 40
call DelayFrames
ld a, [$c2cc]
bit 0, a
jr nz, .asm_3d3bc
call Function3718
.asm_3d3bc
ret
.asm_3d3bd
; Remove the enemy from the screen.
hlcoord 0, 0
ld bc, $0815
call ClearBox
call Function3ebd8
ld c, 40
call DelayFrames
call EmptyBattleTextBox
ld c, 2
callba Function11c000
call Functiona80
call ClearTileMap
call WhiteBGMap
ret
.asm_3d3e3
ld a, [InLinkBattle]
and a
jr nz, .LostLinkBattle
; Greyscale
ld b, 0
call GetSGBLayout
call Function32f9
jr .end
.LostLinkBattle
call UpdateEnemyMonInParty
call Function3cf35
jr nz, .asm_3d40a
ld hl, TiedAgainstText
ld a, [$d0ee]
and $c0
add 2
ld [$d0ee], a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr .text
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3d40a
ld hl, LostAgainstText
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
call IsMobileBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3d417
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
.text
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
.end
scf
ret
.asm_3d417
; Remove the enemy from the screen.
hlcoord 0, 0
ld bc, $0815
call ClearBox
call Function3ebd8
ld c, 40
call DelayFrames
ld c, $3
callba Function4ea0a
scf
ret
; 3d432
Function3d432: ; 3d432
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 12, 5
decoord 12, 6
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp Function3d444
; 3d43b
Function3d43b: ; 3d43b
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 10
decoord 1, 11
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp Function3d444
; 3d444
Function3d444: ; 3d444
ld a, [$cfbe]
push af
set 6, a
ld [$cfbe], a
ld b, $7
.asm_3d44f
push bc
push de
push hl
ld b, $6
.asm_3d454
push bc
push hl
push de
ld bc, $0007
call CopyBytes
pop de
pop hl
ld bc, -20
add hl, bc
push hl
ld h, d
ld l, e
add hl, bc
ld d, h
ld e, l
pop hl
pop bc
dec b
jr nz, .asm_3d454
ld bc, 20
add hl, bc
ld de, .Spaces
call PlaceString
ld c, 2
call DelayFrames
pop hl
pop de
pop bc
dec b
jr nz, .asm_3d44f
pop af
ld [$cfbe], a
ret
; 3d488
.Spaces
db " @"
; 3d490
Function3d490: ; 3d490
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld [$ffaf], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
.asm_3d493
push bc
push hl
ld b, $7
.asm_3d497
push hl
call Function3d4ae
pop hl
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, SCREEN_WIDTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, de
dec b
jr nz, .asm_3d497
ld c, 2
call DelayFrames
pop hl
pop bc
dec c
jr nz, .asm_3d493
ret
; 3d4ae
Function3d4ae: ; 3d4ae
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [$ffaf]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
cp $8
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr nz, .back
.forward
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld [hld], a
dec hl
dec c
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr nz, .forward
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.back
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
ld [hli], a
inc hl
dec c
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr nz, .back
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3d4c3
Function3d4c3: ; 3d4c3
call Function3d557
ld a, [$c718]
dec a
ld b, a
call Function3d6ca
call Function3d7a0
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewEnemyMonStatus
call ResetEnemyStatLevels
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d7c7
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call BreakAttraction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d57a
ret
; 3d4e1
Function3d4e1: ; 3d4e1
call Function3d714
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
jr nc, Function3d517
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d557
call Function3d533
jr c, .asm_3d4f1
call Function3d599
.asm_3d4f1
call Function3d6ca
call Function3d74b
push af
call Function3d7a0
call Function3d7b8
call Function3d7c7
pop af
ret c
xor a
ld [$c664], a
ld [$c6fc], a
ld [$d0ec], a
inc a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [wEnemyIsSwitching], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function309d
jp Function3e3ad
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
; 3d517
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
Function3d517: ; 3d517
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d557
call Function3d533
jr c, .asm_3d522
call Function3d599
.asm_3d522
call Function3d6ca
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, 1
ld [wEnemyIsSwitching], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d7a0
call Function3d7b8
jp Function3d7c7
; 3d533
Function3d533: ; 3d533
ld a, [InLinkBattle]
and a
jr z, .asm_3d541
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [wBattleAction]
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
sub NUM_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
jr .asm_3d555
.asm_3d541
ld a, [$c718]
and a
jr z, .asm_3d54b
dec a
ld b, a
jr .asm_3d555
.asm_3d54b
ld a, [$d264]
and a
ld b, $0
jr nz, .asm_3d555
and a
ret
.asm_3d555
scf
ret
; 3d557
Function3d557: ; 3d557
xor a
ld [LastEnemyCounterMove], a
ld [LastPlayerCounterMove], a
ld [LastEnemyMove], a
ld [CurEnemyMove], a
dec a
ld [$c6e6], a
xor a
ld [$c730], a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 18, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $8
call Function3d490
call EmptyBattleTextBox
jp Function1d6e
; 3d57a
Function3d57a: ; 3d57a
xor a
ld [$c664], a
ld [$c6fc], a
Function3d581: ; 3d581
ld a, [CurBattleMon]
ld c, a
ld hl, $c664
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld b, SET_FLAG
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef FlagPredef
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
ld hl, $c6fc
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef_jump FlagPredef
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3d599
Function3d599: ; 3d599
ld b, $ff
ld a, $1
ld [Buffer1], a
ld [Buffer2], a
.asm_3d5a3
ld hl, Buffer1
sla [hl]
inc hl
sla [hl]
inc b
ld a, [OTPartyCount]
cp b
jp z, Function3d672
ld a, [CurOTMon]
cp b
jr z, .asm_3d5d0
Partymon structs for opponent and player parties.
2014-02-22 21:37:09 -08:00
ld hl, OTPartyMon1HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
ld a, b
call GetPartyLocation
ld a, [hli]
ld c, a
ld a, [hl]
or c
pop bc
jr z, .asm_3d5d0
call Function3d5d7
call Function3d618
jr .asm_3d5a3
.asm_3d5d0
ld hl, Buffer2
set 0, [hl]
jr .asm_3d5a3
; 3d5d7
Function3d5d7: ; 3d5d7
push bc
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, OTPartyMon1Moves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
call GetPartyLocation
pop bc
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld e, NUM_MOVES + 1
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec e
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr z, .done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
and a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr z, .done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
push de
push bc
dec a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, Moves
Use constants for move struct positioning. This eliminates the need for arbitrary move labels like Move2 and Move1 that don't have anything to do with their respective moves.
2014-06-10 23:23:55 -07:00
ld bc, MOVE_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call AddNTimes
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld de, wEnemyMoveStruct
label more pointers to Moves
2013-12-30 20:22:27 -08:00
ld a, BANK(Moves)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call FarCopyBytes
call SetEnemyTurn
rename Function0x{} labels to Function{} for consistency
2013-12-31 01:10:49 -08:00
callab Function347c8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
pop de
pop hl
ld a, [$d265]
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
cp 10 + 1 ; 1.0 + 0.1
jr c, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, Buffer1
set 0, [hl]
ret
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
.done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3d618
Function3d618: ; 3d618
push bc
ld hl, OTPartyCount
ld a, b
inc a
ld c, a
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
dec a
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, BaseData + 7 ; type
ld bc, $20
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call AddNTimes
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
ld de, EnemyMonType
even more battle labels
2014-01-05 04:28:55 -08:00
ld bc, 2
ld a, BANK(BaseData)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call FarCopyBytes
ld a, [BattleMonType1]
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [wPlayerMoveStruct + MOVE_TYPE], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
rename Function0x{} labels to Function{} for consistency
2013-12-31 01:10:49 -08:00
callab Function347c8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$d265]
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
cp 10 + 1 ; 1.0 + 0.1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nc, .asm_3d663
ld a, [BattleMonType2]
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [wPlayerMoveStruct + MOVE_TYPE], a
rename Function0x{} labels to Function{} for consistency
2013-12-31 01:10:49 -08:00
callab Function347c8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$d265]
More comments and constants in move effect command code. Also add SUBSTATUS_IN_LOOP for multi-hit moves.
2014-06-23 12:47:07 -07:00
cp 10 + 1 ; 1.0 + 0.1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nc, .asm_3d663
pop bc
ret
.asm_3d663
pop bc
ld hl, Buffer1
bit 0, [hl]
jr nz, .asm_3d66f
inc hl
set 0, [hl]
ret
.asm_3d66f
res 0, [hl]
ret
; 3d672
Function3d672: ; 3d672
.asm_3d672
ld hl, Buffer1
sla [hl]
inc hl
sla [hl]
jr nc, .asm_3d672
ld a, [OTPartyCount]
ld b, a
ld c, [hl]
.asm_3d681
sla c
jr nc, .asm_3d68a
dec b
jr z, .asm_3d6a7
jr .asm_3d681
.asm_3d68a
ld a, [Buffer1]
and a
jr z, .asm_3d69a
ld b, $ff
ld c, a
.asm_3d693
inc b
sla c
jr nc, .asm_3d693
jr .asm_3d6c9
.asm_3d69a
ld b, $ff
ld a, [Buffer2]
ld c, a
.asm_3d6a0
inc b
sla c
jr c, .asm_3d6a0
jr .asm_3d6c9
.asm_3d6a7
ld a, [OTPartyCount]
ld b, a
call BattleRandom
and $7
cp b
jr nc, .asm_3d6a7
ld b, a
ld a, [CurOTMon]
cp b
jr z, .asm_3d6a7
Partymon structs for opponent and player parties.
2014-02-22 21:37:09 -08:00
ld hl, OTPartyMon1HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
ld a, b
call GetPartyLocation
pop bc
ld a, [hli]
ld c, a
ld a, [hl]
or c
jr z, .asm_3d6a7
.asm_3d6c9
ret
; 3d6ca
Function3d6ca: ; 3d6ca
ld a, b
ld [CurPartyMon], a
ld hl, OTPartyMon1Level
call GetPartyLocation
ld a, [hl]
ld [CurPartyLevel], a
ld a, [CurPartyMon]
inc a
ld hl, OTPartyCount
ld c, a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
ld [TempEnemyMonSpecies], a
ld [CurPartySpecies], a
call LoadEnemyMon
ld a, [CurPartySpecies]
Growth rate data.
2014-03-05 02:42:09 -08:00
cp UNOWN
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3d708
ld a, [$def4]
and a
jr nz, .asm_3d708
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonDVs
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef GetUnownLetter
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [UnownLetter]
ld [$def4], a
.asm_3d708
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld [$c6ea], a
ld a, [hl]
ld [$c6eb], a
ret
; 3d714
Function3d714: ; 3d714
ld a, [$d264]
dec a
jp z, .asm_3d749
ld a, [PartyCount]
dec a
jp z, .asm_3d749
ld a, [InLinkBattle]
and a
jp nz, .asm_3d749
ld a, [Options]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit BATTLE_SHIFT, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3d749
ld a, [CurPartyMon]
push af
ld a, [CurBattleMon]
ld [CurPartyMon], a
callba Functione538
pop bc
ld a, b
ld [CurPartyMon], a
jr c, .asm_3d749
scf
ret
.asm_3d749
and a
ret
; 3d74b
Function3d74b: ; 3d74b
ld a, [CurPartyMon]
push af
callab Function39939
ld hl, BattleText_0x80aca
call StdBattleTextBox
lb bc, 1, 7
call PlaceYesNoBox
ld a, [$cfa9]
dec a
jr nz, .asm_3d79a
call Function3d2f7
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call PickSwitchMonInBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr c, .asm_3d791
ld a, [CurBattleMon]
ld [$c71a], a
ld a, [CurPartyMon]
ld [CurBattleMon], a
call ClearPalettes
call DelayFrame
call Function3eda6
pop af
ld [CurPartyMon], a
xor a
ld [CurEnemyMove], a
ld [CurPlayerMove], a
and a
ret
.asm_3d791
call ClearPalettes
call DelayFrame
call Function3eda6
.asm_3d79a
pop af
ld [CurPartyMon], a
scf
ret
; 3d7a0
Function3d7a0: ; 3d7a0
xor a
ld [hBGMapMode], a
call Function1c07
call ClearSprites
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 0
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
lb bc, 4, 10
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
call WaitBGMap
jp Function3ee27
; 3d7b8
Function3d7b8: ; 3d7b8
callab Function39939
ld hl, BattleText_0x80af8
call StdBattleTextBox
jp WaitBGMap
; 3d7c7
Function3d7c7: ; 3d7c7
ld a, [TempEnemyMonSpecies]
ld [CurPartySpecies], a
ld [CurSpecies], a
call GetBaseData
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld a, OTPARTYMON
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [MonType], a
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef Function5084a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3f47c
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [$cfca], a
ld [$c689], a
call SetEnemyTurn
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
ld de, ANIM_SEND_OUT_MON
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ee17
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3da79
jr nc, .asm_3d800
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld a, 1 ; shiny anim
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [$c689], a
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
ld de, ANIM_SEND_OUT_MON
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ee17
.asm_3d800
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld bc, TempMonSpecies
callba Function4e53f
jr c, .asm_3d82c
callba CheckBattleScene
jr c, .asm_3d821
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 12, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld d, $0
ld e, $0
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef Functiond008e
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr .asm_3d82c
.asm_3d821
ld a, $f
ld [CryTracks], a
ld a, [TempEnemyMonSpecies]
Name cry functions in home.asm.
2014-07-18 10:25:03 -07:00
call PlayStereoCry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3d82c
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
call UpdateEnemyHUD
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
ld [hBGMapMode], a
ret
; 3d834
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
NewEnemyMonStatus: ; 3d834
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [LastEnemyCounterMove], a
ld [LastPlayerCounterMove], a
ld [LastEnemyMove], a
ld hl, EnemySubStatus1
ld [hli], a
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
ld [EnemyDisableCount], a
ld [EnemyFuryCutterCount], a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [EnemyProtectCount], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [$c72c], a
ld [EnemyDisabledMove], a
ld [$c6fa], a
ld [$c730], a
ld [$c731], a
ld [EnemyTurnsTaken], a
ld hl, PlayerSubStatus5
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
res SUBSTATUS_CANT_RUN, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3d867
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
ResetEnemyStatLevels: ; 3d867
ld a, 7
ld b, 8
ld hl, EnemyStatLevels
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
dec b
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3d873
Function3d873: ; 3d873
ld a, [PartyCount]
ld e, a
xor a
Partymon structs for opponent and player parties.
2014-02-22 21:37:09 -08:00
ld hl, PartyMon1HP
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
ld bc, PartyMon2 - (PartyMon1 + 1)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3d87e
or [hl]
inc hl
or [hl]
add hl, bc
dec e
jr nz, .asm_3d87e
ld d, a
ret
; 3d887
Function3d887: ; 3d887
ld a, [CurPartyMon]
Partymon structs for opponent and player parties.
2014-02-22 21:37:09 -08:00
ld hl, PartyMon1HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyLocation
ld a, [hli]
or [hl]
ret nz
ld a, [$d264]
and a
jr nz, .asm_3d8b1
ld hl, PartySpecies
ld a, [CurPartyMon]
ld c, a
ld b, 0
add hl, bc
ld a, [hl]
cp EGG
ld hl, BattleText_0x80b26
jr z, .asm_3d8ae
ld hl, BattleText_0x80b0b
.asm_3d8ae
call StdBattleTextBox
.asm_3d8b1
xor a
ret
; 3d8b3
Function3d8b3: ; 3d8b3
ld a, [BattleType]
cp $2
jp z, .asm_3d9a2
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
cp BATTLETYPE_CONTEST
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, .asm_3d9a2
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_TRAP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, .asm_3d98d
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_CELEBI
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, .asm_3d98d
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_SHINY
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, .asm_3d98d
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_SUICUNE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, .asm_3d98d
ld a, [InLinkBattle]
and a
jp nz, .asm_3d9a2
ld a, [IsInBattle]
dec a
jp nz, .asm_3d992
ld a, [EnemySubStatus5]
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
bit SUBSTATUS_CANT_RUN, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp nz, .asm_3d98d
ld a, [$c730]
and a
jp nz, .asm_3d98d
push hl
push de
ld a, [BattleMonItem]
ld [$d265], a
ld b, a
callab GetItem
ld a, b
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp HELD_ESCAPE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop de
pop hl
jr nz, .asm_3d916
call SetPlayerTurn
call GetItemName
ld hl, BattleText_0x80b89
call StdBattleTextBox
jp .asm_3d9a2
.asm_3d916
ld a, [$d267]
inc a
ld [$d267], a
ld a, [hli]
ld [$ffb5], a
ld a, [hl]
ld [$ffb6], a
ld a, [de]
inc de
ld [$ffb1], a
ld a, [de]
ld [$ffb2], a
call Function30b4
ld de, $ffb5
ld hl, $ffb1
ld c, $2
call StringCmp
jr nc, .asm_3d9a2
xor a
ld [hMultiplicand], a
ld a, $20
ld [hMultiplier], a
call Multiply
ld a, [$ffb5]
ld [hProduct], a
ld a, [$ffb6]
ld [hMultiplicand], a
ld a, [$ffb1]
ld b, a
ld a, [$ffb2]
srl b
rr a
srl b
rr a
and a
jr z, .asm_3d9a2
ld [hMultiplier], a
ld b, $2
call Divide
ld a, [$ffb5]
and a
jr nz, .asm_3d9a2
ld a, [$d267]
ld c, a
.asm_3d96c
dec c
jr z, .asm_3d97a
ld b, $1e
ld a, [$ffb6]
add b
ld [$ffb6], a
jr c, .asm_3d9a2
jr .asm_3d96c
.asm_3d97a
call BattleRandom
ld b, a
ld a, [$ffb6]
cp b
jr nc, .asm_3d9a2
ld a, $1
ld [$d0ec], a
ld hl, BattleText_0x80b3b
jr .asm_3d995
.asm_3d98d
ld hl, BattleText_0x80ba0
jr .asm_3d995
.asm_3d992
ld hl, BattleText_0x80b49
.asm_3d995
call StdBattleTextBox
ld a, $1
ld [$d266], a
call Function309d
and a
ret
.asm_3d9a2
ld a, [InLinkBattle]
and a
ld a, $2
jr z, .asm_3d9cf
call Function309d
xor a
ld [$d0ec], a
ld a, $f
ld [CurMoveNum], a
xor a
ld [CurPlayerMove], a
call Function3e8e4
call Function30b4
call Function3d2e0
jr c, .asm_3d9f5
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
; Got away safely
ld a, [wBattleAction]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $f
ld a, $2
jr z, .asm_3d9cf
dec a
.asm_3d9cf
ld b, a
ld a, [$d0ee]
and $c0
add b
ld [$d0ee], a
call Function3ceec
push de
ld de, SFX_RUN
call WaitPlaySFX
pop de
call WaitSFX
ld hl, BattleText_0x80b77
call StdBattleTextBox
call WaitSFX
call Function309d
scf
ret
.asm_3d9f5
call Function3ceec
ld hl, $cd2a
bit 4, [hl]
jr nz, .asm_3da05
ld hl, BattleText_0x81863
call StdBattleTextBox
.asm_3da05
call WaitSFX
call Function309d
scf
ret
; 3da0d
Function3da0d: ; 3da0d
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, PartyMon1Species - PartyMon1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
ld de, BattleMonSpecies
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld bc, 1 + 1 + NUM_MOVES ; species, item, moves ; BattleMonDVs - BattleMonSpecies
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld bc, PartyMon1DVs - (PartyMon1Species + 1 + 1 + NUM_MOVES)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld de, BattleMonDVs
ld bc, 2 + NUM_MOVES + 1 ; DVs, PP, happiness ; BattleMonLevel - BattleMonDVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
inc hl
inc hl
inc hl
ld de, BattleMonLevel
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld bc, 1 + 1 + 1 + 2 + 2 * 6 ; level, status, unused, stats
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
ld a, [BattleMonSpecies]
ld [TempBattleMonSpecies], a
ld [CurPartySpecies], a
ld [CurSpecies], a
call GetBaseData
ld a, [BaseType1]
ld [BattleMonType1], a
ld a, [BaseType2]
ld [BattleMonType2], a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, PartyMonNicknames
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurBattleMon]
call SkipNames
ld de, BattleMonNick
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld bc, PKMN_NAME_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, BattleMonAttack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, PlayerStats
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld bc, 2 * 5
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
call Function3ec2c
call BadgeStatBoosts
ret
; 3da74
Function3da74: ; 3da74
call Function3da85
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
jr Function3da7c
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Function3da79: ; 3da79
call Function3da97
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
Function3da7c: ; 3da7c
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, h
ld c, l
callab CheckShininess
ret
; 3da85
Function3da85: ; 3da85
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, BattleMonDVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [PlayerSubStatus5]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_TRANSFORMED, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
ld hl, PartyMon1DVs
ld a, [CurBattleMon]
jp GetPartyLocation
; 3da97
Function3da97: ; 3da97
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonDVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [EnemySubStatus5]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_TRANSFORMED, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
ld hl, $c6f2
ld a, [IsInBattle]
dec a
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, OTPartyMon1DVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurOTMon]
jp GetPartyLocation
; 3dab1
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
ResetPlayerStatLevels: ; 3dab1
ld a, 7
ld b, 8
ld hl, PlayerStatLevels
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
dec b
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3dabd
Function3dabd: ; 3dabd
ld a, [CurPartyMon]
ld hl, OTPartyMon1Species
call GetPartyLocation
ld de, EnemyMonSpecies
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld bc, 1 + 1 + NUM_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld bc, OTPartyMon1DVs - (OTPartyMon1Species + 1 + 1 + NUM_MOVES)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld de, EnemyMonDVs
ld bc, 2 + NUM_MOVES + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
inc hl
inc hl
inc hl
ld de, EnemyMonLevel
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld bc, 1 + 1 + 1 + 2 + 2 * 6
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
ld a, [EnemyMonSpecies]
ld [CurSpecies], a
call GetBaseData
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, OTPartyMonNicknames
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurPartyMon]
call SkipNames
ld de, EnemyMonNick
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld bc, PKMN_NAME_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonAttack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, EnemyStats
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld bc, 2 * 5
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
call Function3ec30
ld hl, BaseType1
ld de, EnemyMonType1
ld a, [hli]
ld [de], a
inc de
ld a, [hl]
ld [de], a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, BaseStats
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, EnemyMonBaseStats
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld b, 5
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3db25
ld a, [hli]
ld [de], a
inc de
dec b
jr nz, .asm_3db25
ld a, [CurPartyMon]
ld [CurOTMon], a
ret
; 3db32
Function3db32: ; 3db32
call ClearSprites
ld a, [CurBattleMon]
ld [$c71a], a
ld a, [CurPartyMon]
ld [CurBattleMon], a
call Function3d581
call Function3da0d
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call ResetPlayerStatLevels
call NewBattleMonStatus
call BreakAttraction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3db5f
call EmptyBattleTextBox
call Function309d
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
ret
; 3db5f
Function3db5f: ; 3db5f
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, BattleMonDVs
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef GetUnownLetter
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 5
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld b, 7
ld c, 8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
call WaitBGMap
xor a
ld [hBGMapMode], a
call Function3f43d
xor a
ld [$ffad], a
ld [$d0d2], a
ld [CurMoveNum], a
ld [TypeModifier], a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [wPlayerMoveStruct + MOVE_ANIM], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [LastEnemyCounterMove], a
ld [LastPlayerCounterMove], a
ld [LastPlayerMove], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call CheckAmuletCoin
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ee27
xor a
ld [$c731], a
call SetPlayerTurn
xor a
ld [$cfca], a
ld [$c689], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_SEND_OUT_MON
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ee17
call Function3da74
jr nc, .asm_3dbbc
ld a, $1
ld [$c689], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_SEND_OUT_MON
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ee17
.asm_3dbbc
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, PartyMon1Species - PartyMon1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
ld b, h
ld c, l
callba Function4e53f
jr c, .asm_3dbd6
ld a, $f0
ld [CryTracks], a
ld a, [CurPartySpecies]
Name cry functions in home.asm.
2014-07-18 10:25:03 -07:00
call PlayStereoCry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3dbd6
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
call UpdatePlayerHUD
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
ld [hBGMapMode], a
ret
; 3dbde
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
NewBattleMonStatus: ; 3dbde
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [LastEnemyCounterMove], a
ld [LastPlayerCounterMove], a
ld [LastPlayerMove], a
ld hl, PlayerSubStatus1
ld [hli], a
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
ld hl, PlayerUsedMoves
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
ld [PlayerDisableCount], a
ld [PlayerFuryCutterCount], a
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
ld [PlayerProtectCount], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [$c72b], a
ld [DisabledMove], a
ld [$c6fe], a
ld [$c731], a
ld [$c730], a
ld [PlayerTurnsTaken], a
ld hl, EnemySubStatus5
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
res SUBSTATUS_CANT_RUN, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3dc18
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
BreakAttraction: ; 3dc18
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, PlayerSubStatus1
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
res SUBSTATUS_IN_LOVE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, EnemySubStatus1
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
res SUBSTATUS_IN_LOVE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3dc23
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
SpikesDamage: ; 3dc23
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, PlayerScreens
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld de, BattleMonType
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
ld bc, UpdatePlayerHUD
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hBattleTurn]
and a
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jr z, .ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, EnemyScreens
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld de, EnemyMonType
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
ld bc, UpdateEnemyHUD
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
bit SCREENS_SPIKES, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
; Flying-types aren't affected by Spikes.
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
cp FLYING
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
inc de
ld a, [de]
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
cp FLYING
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
ld hl, BattleText_0x80bae ; "hurt by SPIKES!"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetEighthMaxHP
call Function3cc39
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call .hl
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp WaitBGMap
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
.hl
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp [hl]
; 3dc5b
Function3dc5b: ; 3dc5b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, BATTLE_VARS_MOVE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBattleVar
ld b, a
comment move priority functions
2013-12-30 20:32:37 -08:00
call GetMoveEffect
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
cp EFFECT_PURSUIT
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3dce4
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurBattleMon]
push af
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, DoPlayerTurn
ld a, [hBattleTurn]
and a
jr z, .asm_3dc7e
ld hl, DoEnemyTurn
ld a, [$c71a]
ld [CurBattleMon], a
.asm_3dc7e
ld a, BANK(DoPlayerTurn)
rst FarCall
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, BATTLE_VARS_MOVE
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $ff
ld [hl], a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
ld [CurBattleMon], a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hBattleTurn]
and a
jr z, .asm_3dcc0
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$c71a]
call Function399f
ld hl, BattleMonHP
ld a, [hli]
or [hl]
jr nz, .asm_3dce4
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $f0
ld [CryTracks], a
ld a, [BattleMonSpecies]
Name cry functions in home.asm.
2014-07-18 10:25:03 -07:00
call PlayStereoCry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$c71a]
ld c, a
ld hl, $c664
ld b, $0
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef FlagPredef
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d43b
ld hl, BattleText_0x80a75
jr .asm_3dcdf
.asm_3dcc0
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
jr nz, .asm_3dce4
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, SFX_KINESIS
call PlaySFX
call WaitSFX
ld de, SFX_UNKNOWN_2A
call PlaySFX
call WaitSFX
call Function3d432
ld hl, BattleText_0x809a8
.asm_3dcdf
call StdBattleTextBox
scf
ret
.asm_3dce4
and a
ret
; 3dce6
Function3dce6: ; 3dce6
ld a, [hBattleTurn]
push af
xor a
ld [hBattleTurn], a
ld [$cfca], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_RETURN_MON
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ee17
pop af
ld [hBattleTurn], a
ret
; 3dcf9
Function3dcf9: ; 3dcf9
ld a, [$ffcb]
cp $1
jr z, .asm_3dd17
call SetPlayerTurn
call Function3dd2f
call Function3dde9
call Function3de51
call SetEnemyTurn
call Function3dd2f
call Function3dde9
jp Function3de51
.asm_3dd17
call SetEnemyTurn
call Function3dd2f
call Function3dde9
call Function3de51
call SetPlayerTurn
call Function3dd2f
call Function3dde9
jp Function3de51
; 3dd2f
Function3dd2f: ; 3dd2f
callab GetOpponentItem
ld a, b
cp $1
ret nz
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld de, EnemyMonHP + 1
ld hl, EnemyMonMaxHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hBattleTurn]
and a
jr z, .asm_3dd4a
ld de, $c63d
ld hl, BattleMonMaxHP
.asm_3dd4a
push bc
ld a, [de]
ld [$d1ec], a
add a
ld c, a
dec de
ld a, [de]
inc de
ld [$d1ed], a
adc a
ld b, a
ld a, b
cp [hl]
ld a, c
pop bc
jr z, .asm_3dd62
jr c, .asm_3dd66
ret
.asm_3dd62
inc hl
cp [hl]
dec hl
ret nc
.asm_3dd66
call Function3ddc8
ld a, [hli]
ld [Buffer2], a
ld a, [hl]
ld [Buffer1], a
ld a, [de]
add c
ld [$d1ee], a
ld c, a
dec de
ld a, [de]
adc $0
ld [$d1ef], a
ld b, a
ld a, [hld]
cp c
ld a, [hl]
sbc b
jr nc, .asm_3dd8d
ld a, [hli]
ld [$d1ef], a
ld a, [hl]
ld [$d1ee], a
.asm_3dd8d
ld a, [$d1ef]
ld [de], a
inc de
ld a, [$d1ee]
ld [de], a
ld a, [hBattleTurn]
ld [$d10a], a
and a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 2, 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3dda4
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 10, 9
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3dda4
ld [$d10a], a
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef Functionc6e0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Function3ddac:
call RefreshBattleHuds
callab GetOpponentItem
ld a, [hl]
ld [$d265], a
call GetItemName
callab Function27192
ld hl, RecoveredUsingText
jp StdBattleTextBox
; 3ddc8
Function3ddc8: ; 3ddc8
push hl
push de
push bc
call EmptyBattleTextBox
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, RECOVER
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [FXAnimIDLo], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [$cfca], a
ld [FXAnimIDHi], a
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef PlayBattleAnim
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
pop de
pop hl
ret
; 3dde9
Function3dde9: ; 3dde9
callab GetOpponentItem
ld hl, .Statuses
.asm_3ddf2
ld a, [hli]
cp $ff
ret z
inc hl
cp b
jr nz, .asm_3ddf2
dec hl
ld b, [hl]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_STATUS_OPP
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and b
ret z
xor a
ld [hl], a
push bc
call UpdateOpponentInParty
pop bc
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS5_OPP
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and [hl]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_TOXIC, [hl]
ld a, BATTLE_VARS_SUBSTATUS1_OPP
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and [hl]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_NIGHTMARE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
cp $7f
jr nz, .asm_3de26
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS3_OPP
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_CONFUSED, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3de26
rename Function0x{} labels to Function{} for consistency
2013-12-31 01:10:49 -08:00
ld hl, Function365fd
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hBattleTurn]
and a
jr z, .asm_3de31
rename Function0x{} labels to Function{} for consistency
2013-12-31 01:10:49 -08:00
ld hl, Function365d7
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3de31
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
rename Function0x{} labels to Function{} for consistency
2013-12-31 01:10:49 -08:00
ld a, BANK(Function365fd)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
rst FarCall
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ddc8
call Function3ddac
ld a, $1
and a
ret
; 3de44
.Statuses ; 3de44
db HELD_HEAL_POISON, 1 << PSN
db HELD_HEAL_FREEZE, 1 << FRZ
db HELD_HEAL_BURN, 1 << BRN
db HELD_HEAL_SLEEP, SLP
db HELD_HEAL_PARALYZE, 1 << PAR
db HELD_HEAL_STATUS, 1 << PSN | 1 << FRZ | 1 << BRN | SLP | 1 << PAR
db $ff
; 3de51
Function3de51: ; 3de51
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS3_OPP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetBattleVar
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_CONFUSED, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
callab GetOpponentItem
ld a, b
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp HELD_HEAL_CONFUSION
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3de67
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp HELD_HEAL_STATUS
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
.asm_3de67
ld a, [hl]
ld [$d265], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS3_OPP
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
res SUBSTATUS_CONFUSED, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetItemName
call Function3ddc8
ld hl, BattleText_0x80dab
call StdBattleTextBox
ld a, [hBattleTurn]
and a
jr nz, .asm_3de90
call Function3df1f
xor a
ld [bc], a
ld a, [IsInBattle]
dec a
ret z
ld [hl], $0
ret
.asm_3de90
call Function3df12
xor a
ld [bc], a
ld [hl], a
ret
; 3de97
Function3de97: ; 3de97
ld a, [$ffcb]
cp $1
jr z, .asm_3dea3
call Function3dea9
jp Function3deb1
.asm_3dea3
call Function3deb1
jp Function3dea9
; 3dea9
Function3dea9: ; 3dea9
call Function3df12
ld a, $0
jp Function3deb6
; 3deb1
Function3deb1: ; 3deb1
call Function3df1f
ld a, $1
Function3deb6: ; 3deb6
ld [hBattleTurn], a
ld d, h
ld e, l
push de
push bc
ld a, [bc]
ld b, a
callab GetItem
ld hl, .data_3defc
.asm_3dec7
ld a, [hli]
cp $ff
jr z, .asm_3def9
inc hl
inc hl
cp b
jr nz, .asm_3dec7
pop bc
ld a, [bc]
ld [$d265], a
push bc
dec hl
dec hl
ld a, [hli]
ld h, [hl]
ld l, a
ld a, BANK(BattleCommand70)
rst FarCall
pop bc
pop de
ld a, [FailedMessage]
and a
ret nz
xor a
ld [bc], a
ld [de], a
call GetItemName
ld hl, BattleText_0x80bde
call StdBattleTextBox
callab BattleCommand8c
ret
.asm_3def9
pop bc
pop de
ret
; 3defc
.data_3defc
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
dbw HELD_ATTACK_UP, BattleCommand70
dbw HELD_DEFENSE_UP, BattleCommand71
dbw HELD_SPEED_UP, BattleCommand72
dbw HELD_SP_ATTACK_UP, BattleCommand73
dbw HELD_SP_DEFENSE_UP, BattleCommand74
dbw HELD_ACCURACY_UP, BattleCommand75
dbw HELD_EVASION_UP, BattleCommand76
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db $ff
; 3df12
Function3df12: ; 3df12
ld hl, PartyMon1Item
ld a, [CurBattleMon]
call GetPartyLocation
ld bc, BattleMonItem
ret
; 3df1f
Function3df1f: ; 3df1f
ld hl, OTPartyMon1Item
ld a, [CurOTMon]
call GetPartyLocation
ld bc, EnemyMonItem
ret
; 3df2c
Function3df2c: ; 3df2c
push hl
push de
push bc
call DrawPlayerHUD
ld hl, PlayerHPPal
call SetHPPal
call CheckDanger
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
call DrawEnemyHUD
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, EnemyHPPal
call SetHPPal
pop bc
pop de
pop hl
ret
; 3df48
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
UpdatePlayerHUD:: ; 3df48
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
push de
push bc
call DrawPlayerHUD
call UpdatePlayerHPPal
call CheckDanger
pop bc
pop de
pop hl
ret
; 3df58
DrawPlayerHUD: ; 3df58
xor a
ld [hBGMapMode], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
; Clear the area
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
hlcoord 9, 7
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
lb bc, 5, 11
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
callba DrawPlayerExpBar
hlcoord 18, 9
ld [hl], $73 ; vertical bar
call PrintPlayerHUD
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
; HP bar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
hlcoord 10, 9
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
ld b, 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [MonType], a
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef DrawPlayerHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
; Exp bar
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push de
ld a, [CurBattleMon]
ld hl, PartyMon1Exp + 2
call GetPartyLocation
ld d, h
ld e, l
hlcoord 10, 11
ld a, [TempMonLevel]
ld b, a
call FillInExpBar
pop de
ret
; 3df98
UpdatePlayerHPPal: ; 3df98
ld hl, PlayerHPPal
jp Function3e12e
; 3df9e
CheckDanger: ; 3df9e
ld hl, BattleMonHP
ld a, [hli]
or [hl]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .no_danger
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$c6fd]
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr nz, .done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [PlayerHPPal]
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
cp HP_RED
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr z, .danger
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.no_danger
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, Danger
res 7, [hl]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr .done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.danger
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, Danger
set 7, [hl]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
.done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3dfbf
PrintPlayerHUD: ; 3dfbf
ld de, BattleMonNick
hlcoord 10, 7
call Function3e138
call PlaceString
push bc
ld a, [CurBattleMon]
ld hl, PartyMon1DVs
call GetPartyLocation
ld de, TempMonDVs
ld a, [hli]
ld [de], a
inc de
ld a, [hl]
ld [de], a
ld hl, BattleMonLevel
ld de, TempMonLevel
ld bc, $0011
call CopyBytes
ld a, [CurBattleMon]
ld hl, PartyMon1Species
call GetPartyLocation
ld a, [hl]
ld [CurPartySpecies], a
ld [CurSpecies], a
call GetBaseData
pop hl
dec hl
ld a, $3
ld [MonType], a
callab GetGender
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, " "
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr c, .asm_3e013
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, "♂"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3e013
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, "♀"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3e013
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 17, 8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 14, 8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
push hl
ld de, BattleMonStatus
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef Function50d2e
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
pop bc
ret nz
ld a, b
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
cp " "
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3e02d
dec hl
.asm_3e02d
ld a, [BattleMonLevel]
ld [TempMonLevel], a
jp PrintLevel
; 3e036
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
UpdateEnemyHUD:: ; 3e036
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
push de
push bc
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
call DrawEnemyHUD
call UpdateEnemyHPPal
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
pop de
pop hl
ret
; 3e043
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
DrawEnemyHUD: ; 3e043
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [hBGMapMode], a
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 0
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
lb bc, 4, 11
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
callba Function2c0c5
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [TempEnemyMonSpecies]
ld [CurSpecies], a
ld [CurPartySpecies], a
call GetBaseData
ld de, EnemyMonNick
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3e138
call PlaceString
ld h, b
ld l, c
dec hl
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonDVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, TempMonDVs
ld a, [EnemySubStatus5]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_TRANSFORMED, a
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
jr z, .ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, $c6f2
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld [de], a
inc de
ld a, [hl]
ld [de], a
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $3
ld [MonType], a
callab GetGender
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, " "
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr c, .asm_3e09a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, "♂"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3e09a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, "♀"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3e09a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 9, 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 6, 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
push hl
ld de, EnemyMonStatus
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef Function50d2e
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
pop bc
jr nz, .asm_3e0be
ld a, b
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
cp " "
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3e0b5
dec hl
.asm_3e0b5
ld a, [EnemyMonLevel]
ld [TempMonLevel], a
call PrintLevel
.asm_3e0be
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld [$ffb5], a
ld a, [hld]
ld [$ffb6], a
or [hl]
jr nz, .asm_3e0d1
ld c, a
ld e, a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld d, HP_BAR_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp .asm_3e11a
.asm_3e0d1
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [hMultiplicand], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, HP_BAR_LENGTH_PX
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hMultiplier], a
call Multiply
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonMaxHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld b, a
ld a, [hl]
ld [hMultiplier], a
ld a, b
and a
jr z, .asm_3e105
ld a, [hMultiplier]
srl b
rr a
srl b
rr a
ld [hMultiplier], a
ld a, [$ffb5]
ld b, a
srl b
ld a, [$ffb6]
rr a
srl b
rr a
ld [$ffb6], a
ld a, b
ld [$ffb5], a
.asm_3e105
ld a, [$ffb5]
ld [hProduct], a
ld a, [$ffb6]
ld [hMultiplicand], a
ld a, $2
ld b, a
call Divide
ld a, [$ffb6]
ld e, a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, HP_BAR_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld d, a
ld c, a
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3e11a
xor a
ld [$d10a], a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 2, 2
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DrawHPBar
ret
; 3e127
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
UpdateEnemyHPPal: ; 3e127
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, EnemyHPPal
call Function3e12e
ret
; 3e12e
Function3e12e: ; 3e12e
ld b, [hl]
call SetHPPal
ld a, [hl]
cp b
ret z
jp Function3ee27
; 3e138
Function3e138: ; 3e138
ret
; 3e139
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
BattleMenu: ; 3e139
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [hBGMapMode], a
call Function30bf
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [BattleType]
cp $2
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr z, .ok
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_TUTORIAL
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr z, .ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call EmptyBattleTextBox
call UpdateBattleHuds
call EmptyBattleTextBox
call Function309d
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.ok
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [BattleType]
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
cp BATTLETYPE_CONTEST
jr nz, .not_contest
callba ContestBattleMenu
jr .next
.not_contest
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
; Auto input: choose "ITEM"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [InputType]
or a
jr z, .asm_3e171
callba Function1de294
.asm_3e171
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
call LoadBattleMenu2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.next
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
ld [hBGMapMode], a
ld a, [$d0d2]
cp $1
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp z, BattleMenu_Fight
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $3
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp z, BattleMenu_Pack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $2
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp z, BattleMenu_PKMN
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $4
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp z, BattleMenu_Run
jr .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3e192
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
BattleMenu_Fight: ; 3e192
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [$d267], a
call Function30b4
and a
ret
; 3e19b
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
LoadBattleMenu2: ; 3e19b
call IsMobileBattle
jr z, .mobile
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
callba LoadBattleMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.mobile
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
callba Function100b12
ld a, [$cd2b]
and a
ret z
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, $cd2a
bit 4, [hl]
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr nz, .error
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, BattleText_0x81863
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
ld c, 60
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.error
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
; 3e1c7
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
BattleMenu_Pack: ; 3e1c7
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [InLinkBattle]
and a
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp nz, ItemsCantBeUsed
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$cfc0]
and a
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp nz, ItemsCantBeUsed
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function1d6e
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [BattleType]
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_TUTORIAL
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr z, .tutorial
cp BATTLETYPE_CONTEST
jr z, .contest
callba BattlePack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$d0ec]
and a
jr z, .asm_3e20d
jr .asm_3e209
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.tutorial
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
callba Function107bb
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, POKE_BALL
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [CurItem], a
call DoItemEffect
jr .asm_3e209
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.contest
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, PARK_BALL
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [CurItem], a
call DoItemEffect
.asm_3e209
call Function3e234
ret
.asm_3e20d
call ClearPalettes
call DelayFrame
call Function3ed9f
call Function3f43d
call Function3f47c
call Function1c07
call WaitBGMap
call Function3ee27
call Function309d
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp BattleMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3e22b
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
ItemsCantBeUsed: ; 3e22b
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, BattleText_0x80bf3
call StdBattleTextBox
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp BattleMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3e234
Function3e234: ; 3e234
ld a, [$c64e]
and a
jr nz, .asm_3e279
callab CheckItemPocket
ld a, [$d142]
cp $3
jr z, .asm_3e24a
call WhiteBGMap
.asm_3e24a
xor a
ld [hBGMapMode], a
call Function3ed9f
call ClearSprites
ld a, [BattleType]
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_TUTORIAL
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3e25d
call Function3f43d
.asm_3e25d
call Function3f47c
ld a, $1
ld [$cfa9], a
call Function1c07
call Function3df2c
call WaitBGMap
call Function309d
call Function1fbf
call Function3ee27
and a
ret
.asm_3e279
xor a
ld [$c64e], a
ld a, [$d0ee]
and $c0
ld [$d0ee], a
call Function1fbf
call Function32f9
scf
ret
; 3e28d
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
BattleMenu_PKMN: ; 3e28d
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function1d6e
Function3e290:
call Function1c07
call Function1d6e
call WhiteBGMap
Function3e299:
call Function3d2fa
xor a
ld [PartyMenuActionText], a
call Function3d313
call Function3d329
jr c, .asm_3e2da
.asm_3e2a8
callba Function8ea4a
call Function3e2f5
jr c, .asm_3e2c8
call Function1bee
ld a, [$cfa9]
cp $1
jp z, Function3e358
cp $2
jr z, .asm_3e2cf
cp $3
jr z, .asm_3e2da
jr .asm_3e2a8
.asm_3e2c8
call Function3d2e0
jr c, .asm_3e2da
jr Function3e299
.asm_3e2cf
call Function3e308
call Function3d2e0
jr c, .asm_3e2da
jp Function3e290
.asm_3e2da
call ClearSprites
call ClearPalettes
call DelayFrame
call Function3eda6
call Function1c17
call Function309d
call ClearSGB
call Function32f9
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp BattleMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3e2f5
Function3e2f5: ; 3e2f5
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
call IsMobileBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3e301
callba Function24e99
ret
.asm_3e301
callba Function100d22
ret
; 3e308
Function3e308: ; 3e308
call DisableLCD
ld hl, $9310
ld de, VTiles0
ld bc, $0110
call CopyBytes
ld hl, VTiles2
ld de, $8110
ld bc, $0310
call CopyBytes
call EnableLCD
call ClearSprites
call LowVolume
xor a
ld [MonType], a
callba Function4dc7b
call MaxVolume
call DisableLCD
ld hl, VTiles0
ld de, $9310
ld bc, $0110
call CopyBytes
ld hl, $8110
ld de, VTiles2
ld bc, $0310
call CopyBytes
call EnableLCD
ret
; 3e358
Function3e358: ; 3e358
ld a, [CurBattleMon]
ld d, a
ld a, [CurPartyMon]
cp d
jr nz, .asm_3e36b
ld hl, BattleText_0x80c0d
call StdBattleTextBox
jp Function3e299
.asm_3e36b
ld a, [$c730]
and a
jr nz, .asm_3e378
ld a, [EnemySubStatus5]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_CANT_RUN, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3e381
.asm_3e378
ld hl, BattleText_0x80c22
call StdBattleTextBox
jp Function3e299
.asm_3e381
call Function3d887
jp z, Function3e299
ld a, [CurBattleMon]
ld [$c71a], a
ld a, $2
ld [$d0ec], a
call ClearPalettes
call DelayFrame
call ClearSprites
call Function3eda6
call Function1c17
call ClearSGB
call Function32f9
ld a, [CurPartyMon]
ld [CurBattleMon], a
; fallthrough
; 3e3ad
Function3e3ad: ; 3e3ad
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, 1
ld [wPlayerIsSwitching], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [InLinkBattle]
and a
jr z, .asm_3e3c1
call Function1d6e
call Function3e8e4
call Function1c17
.asm_3e3c1
call Function3e7c1
ld a, [InLinkBattle]
and a
jr nz, .asm_3e3cf
.asm_3e3ca
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call BattleMonEntrance
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
.asm_3e3cf
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [wBattleAction]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $e
jp z, .asm_3e3ca
cp $d
jp z, .asm_3e3ca
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
cp NUM_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp c, .asm_3e3ca
cp $f
jr nz, .asm_3e3e9
call Function3c0e5
ret
.asm_3e3e9
ld a, [$ffcb]
cp $1
jr z, .asm_3e3f7
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call BattleMonEntrance
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3e3ff
and a
ret
.asm_3e3f7
call Function3e3ff
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call BattleMonEntrance
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
; 3e3ff
Function3e3ff: ; 3e3ff
callab Function3846c
call SetEnemyTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jp SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3e40b
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
BattleMonEntrance: ; 3e40b
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3f2f4
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
ld c, 50
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, PlayerSubStatus4
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
res SUBSTATUS_RAGE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
call Function3dc5b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
jr c, .ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3dce6
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
.ok
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
hlcoord 9, 7
lb bc, 5, 11
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurBattleMon]
ld [CurPartyMon], a
call Function3d581
call Function3da0d
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call ResetPlayerStatLevels
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3f26d
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewBattleMonStatus
call BreakAttraction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3db5f
call EmptyBattleTextBox
call Function309d
call SetPlayerTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $2
ld [$cfa9], a
ret
; 3e459
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
PassedBattleMonEntrance: ; 3e459
ld c, 50
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
hlcoord 9, 7
lb bc, 5, 11
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurPartyMon]
ld [CurBattleMon], a
call Function3d581
call Function3da0d
xor a
ld [$d265], a
call Function3ecab
call Function3db5f
call EmptyBattleTextBox
call Function309d
call SetPlayerTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jp SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3e489
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
BattleMenu_Run: ; 3e489
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function30b4
ld a, $3
ld [$cfa9], a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, BattleMonSpeed
ld de, EnemyMonSpeed
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d8b3
ld a, $0
ld [$d266], a
ret c
ld a, [$d0ec]
and a
ret nz
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp BattleMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3e4a8
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
CheckAmuletCoin: ; 3e4a8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [BattleMonItem]
ld b, a
callab GetItem
ld a, b
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp HELD_AMULET_COIN
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [$c73d], a
ret
; 3e4bc
Function3e4bc: ; 3e4bc
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
call IsMobileBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3e4c8
callba Function100b9f
ret
.asm_3e4c8
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, EnemyMonMoves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$d235]
dec a
jr z, .asm_3e4e2
dec a
jr z, .asm_3e4dd
call Function3e786
ret z
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, BattleMonMoves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr .asm_3e4e2
.asm_3e4dd
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld a, PartyMon1Moves - PartyMon1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
.asm_3e4e2
ld de, $d25e
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld bc, NUM_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
xor a
ld [hBGMapMode], a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
hlcoord 4, 17 - NUM_MOVES - 1
ld b, 4
ld c, 14
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$d235]
cp $2
jr nz, .asm_3e503
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
hlcoord 4, 17 - NUM_MOVES - 1 - 4
ld b, 4
ld c, 14
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3e503
call TextBox
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
hlcoord 6, 17 - NUM_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$d235]
cp $2
jr nz, .asm_3e513
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
hlcoord 6, 17 - NUM_MOVES - 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3e513
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld a, SCREEN_WIDTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [Buffer1], a
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef ListMoves
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, 5
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$d235]
cp $2
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld a, 17 - NUM_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3e52c
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, 5
ld a, 17 - NUM_MOVES - 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3e52c
ld [$cfa1], a
ld a, b
ld [$cfa2], a
ld a, [$d235]
cp $1
jr z, .asm_3e53e
ld a, [CurMoveNum]
inc a
.asm_3e53e
ld [$cfa9], a
ld a, $1
ld [$cfaa], a
ld a, [$d0eb]
inc a
ld [$cfa3], a
ld a, $1
ld [$cfa4], a
ld c, $2c
ld a, [$d235]
dec a
ld b, $c1
jr z, .asm_3e569
dec a
ld b, $c3
jr z, .asm_3e569
ld a, [InLinkBattle]
and a
jr nz, .asm_3e569
ld b, $c7
.asm_3e569
ld a, b
ld [$cfa8], a
ld a, c
ld [$cfa5], a
xor a
ld [$cfa6], a
ld a, $10
ld [$cfa7], a
.asm_3e57a
ld a, [$d235]
and a
jr z, .asm_3e58e
dec a
jr nz, .asm_3e5a3
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 11, 14
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, .string_3e61c
call PlaceString
jr .asm_3e5a3
.asm_3e58e
call MoveInfoBox
ld a, [$d0e3]
and a
jr z, .asm_3e5a3
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 5, 13
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld bc, SCREEN_WIDTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
call AddNTimes
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld [hl], "â–·"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3e5a3
ld a, $1
ld [hBGMapMode], a
call Function1bd3
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit 6, a ; D_UP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp nz, .asm_3e61d
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit 7, a ; D_DOWN
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp nz, .asm_3e62e
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit 2, a ; B_BUTTON
jp nz, .asm_3e643
bit 1, a ; A_BUTTON
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [$d0e3], a
ld a, [$cfa9]
dec a
ld [$cfa9], a
ld b, a
ld a, [$d235]
dec a
jr nz, .asm_3e5d0
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
ret
.asm_3e5d0
dec a
ld a, b
ld [CurMoveNum], a
jr nz, .asm_3e5d9
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
ret
.asm_3e5d9
pop af
ret nz
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, BattleMonPP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$cfa9]
ld c, a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
and $3f
jr z, .asm_3e610
ld a, [PlayerDisableCount]
swap a
and $f
dec a
cp c
jr z, .asm_3e60b
ld a, [$c6e1]
and a
jr nz, .asm_3e606
ld a, [$cfa9]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, BattleMonMoves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
.asm_3e606
ld [CurPlayerMove], a
xor a
ret
.asm_3e60b
ld hl, BattleText_0x80c5b
jr .asm_3e613
.asm_3e610
ld hl, Function3cc39
.asm_3e613
call StdBattleTextBox
call Function30b4
jp Function3e4bc
; 3e61c
.string_3e61c ; 3e61c
db "@"
; 3e61d
.asm_3e61d
ld a, [$cfa9]
and a
jp nz, .asm_3e57a
ld a, [$d0eb]
inc a
ld [$cfa9], a
jp .asm_3e57a
; 3e62e
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
.asm_3e62e ; 3e62e
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$cfa9]
ld b, a
ld a, [$d0eb]
inc a
inc a
cp b
jp nz, .asm_3e57a
ld a, $1
ld [$cfa9], a
jp .asm_3e57a
; 3e643
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
.asm_3e643 ; 3e643
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$d0e3]
and a
jr z, .asm_3e6bf
ld hl, BattleMonMoves
call .asm_3e6a5
ld hl, BattleMonPP
call .asm_3e6a5
ld hl, PlayerDisableCount
ld a, [hl]
swap a
and $f
ld b, a
ld a, [$cfa9]
cp b
jr nz, .asm_3e671
ld a, [hl]
and $f
ld b, a
ld a, [$d0e3]
swap a
add b
ld [hl], a
jr .asm_3e682
.asm_3e671
ld a, [$d0e3]
cp b
jr nz, .asm_3e682
ld a, [hl]
and $f
ld b, a
ld a, [$cfa9]
swap a
add b
ld [hl], a
.asm_3e682
ld a, [PlayerSubStatus5]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_TRANSFORMED, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3e69e
ld hl, PartyMon1Moves
ld a, [CurBattleMon]
call GetPartyLocation
push hl
call .asm_3e6a5
pop hl
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld bc, PartyMon1PP - PartyMon1Moves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
call .asm_3e6a5
.asm_3e69e
xor a
ld [$d0e3], a
jp Function3e4bc
.asm_3e6a5
push hl
ld a, [$d0e3]
dec a
ld c, a
ld b, 0
add hl, bc
ld d, h
ld e, l
pop hl
ld a, [$cfa9]
dec a
ld c, a
ld b, 0
add hl, bc
ld a, [de]
ld b, [hl]
ld [hl], a
ld a, b
ld [de], a
ret
.asm_3e6bf
ld a, [$cfa9]
ld [$d0e3], a
jp Function3e4bc
; 3e6c8
MoveInfoBox: ; 3e6c8
xor a
ld [hBGMapMode], a
hlcoord 0, 8
ld b, 3
ld c, 9
call TextBox
call MobileTextBorder
ld a, [PlayerDisableCount]
and a
jr z, .asm_3e6f4
swap a
and $f
ld b, a
ld a, [$cfa9]
cp b
jr nz, .asm_3e6f4
hlcoord 1, 10
ld de, .Disabled
call PlaceString
jr .done
.asm_3e6f4
ld hl, $cfa9
dec [hl]
call SetPlayerTurn
ld hl, BattleMonMoves
ld a, [$cfa9]
ld c, a
ld b, 0
add hl, bc
ld a, [hl]
ld [CurPlayerMove], a
ld a, [CurBattleMon]
ld [CurPartyMon], a
ld a, WILDMON
ld [MonType], a
callab Functionf8ec
ld hl, $cfa9
ld c, [hl]
inc [hl]
ld b, 0
ld hl, BattleMonPP
add hl, bc
ld a, [hl]
and $3f
ld [StringBuffer1], a
call Function3e75f
hlcoord 1, 9
ld de, .Type
call PlaceString
hlcoord 7, 11
ld [hl], "/"
callab UpdateMoveData
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wPlayerMoveStruct + MOVE_ANIM]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
hlcoord 2, 10
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef PrintMoveType
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.done
ret
; 3e74f
.Disabled
db "Disabled!@"
.Type
db "TYPE/@"
; 3e75f
Function3e75f: ; 3e75f
hlcoord 5, 11
ld a, [InLinkBattle]
cp $4
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
jr c, .ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
hlcoord 5, 11
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
ld de, StringBuffer1
ld bc, $0102
call PrintNum
pop hl
inc hl
inc hl
ld [hl], "/"
inc hl
ld de, $d265
ld bc, $0102
call PrintNum
ret
; 3e786
Function3e786: ; 3e786
ld a, STRUGGLE
ld [CurPlayerMove], a
ld a, [PlayerDisableCount]
and a
ld hl, BattleMonPP
jr nz, .asm_3e79f
ld a, [hli]
or [hl]
inc hl
or [hl]
inc hl
or [hl]
and $3f
ret nz
jr .asm_3e7b4
.asm_3e79f
swap a
and $f
ld b, a
ld d, $5
xor a
.asm_3e7a7
dec d
jr z, .asm_3e7b2
ld c, [hl]
inc hl
dec b
jr z, .asm_3e7a7
or c
jr .asm_3e7a7
.asm_3e7b2
and a
ret nz
.asm_3e7b4
ld hl, BattleText_0x80c72
call StdBattleTextBox
ld c, 60
call DelayFrames
xor a
ret
; 3e7c1
Function3e7c1: ; 3e7c1
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wEnemyIsSwitching]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
ld a, [InLinkBattle]
and a
jr z, .asm_3e817
call EmptyBattleTextBox
call Function309d
ld a, [$d0ec]
and a
call z, Function3e8e4
call Function30b4
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [wBattleAction]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $e
jp z, .asm_3e8bd
cp $d
jp z, .asm_3e82c
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
cp NUM_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp nc, Function3e8c1
ld [CurEnemyMoveNum], a
ld c, a
ld a, [EnemySubStatus1]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_ROLLOUT, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp nz, .asm_3e882
ld a, [EnemySubStatus3]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
and 1 << SUBSTATUS_CHARGED | 1 << SUBSTATUS_RAMPAGE | 1 << SUBSTATUS_BIDE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp nz, .asm_3e882
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, EnemySubStatus5
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_ENCORED, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [LastEnemyMove]
jp nz, .asm_3e87f
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, EnemyMonMoves
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
jp .asm_3e87f
.asm_3e817
ld hl, EnemySubStatus5
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_ENCORED, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3e824
ld a, [LastEnemyMove]
jp .asm_3e87f
.asm_3e824
call Function3e8d1
jp nz, Function3e8c1
jr .asm_3e830
.asm_3e82c
ld a, $ff
jr .asm_3e87f
.asm_3e830
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, EnemyMonMoves
ld de, EnemyMonPP
ld b, NUM_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3e838
ld a, [hl]
and a
jp z, .asm_3e8bd
ld a, [EnemyDisabledMove]
cp [hl]
jr z, .asm_3e848
ld a, [de]
and $3f
jr nz, .asm_3e84f
.asm_3e848
inc hl
inc de
dec b
jr nz, .asm_3e838
jr .asm_3e8bd
.asm_3e84f
ld a, [IsInBattle]
dec a
jr nz, .asm_3e882
.asm_3e855
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, EnemyMonMoves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
and 3 ; TODO factor in NUM_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [EnemyDisableCount]
swap a
and $f
dec a
cp c
jr z, .asm_3e855
ld a, [hl]
and a
jr z, .asm_3e855
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, EnemyMonPP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld b, a
ld a, [hl]
and $3f
jr z, .asm_3e855
ld a, c
ld [CurEnemyMoveNum], a
ld a, b
.asm_3e87f
ld [CurEnemyMove], a
.asm_3e882
call SetEnemyTurn
callab UpdateMoveData
call Function3e8d1
jr nz, .asm_3e894
xor a
ld [$c733], a
.asm_3e894
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wEnemyMoveStruct + MOVE_EFFECT]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp EFFECT_FURY_CUTTER
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3e89f
xor a
ld [EnemyFuryCutterCount], a
.asm_3e89f
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wEnemyMoveStruct + MOVE_EFFECT]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp EFFECT_RAGE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3e8af
ld hl, EnemySubStatus4
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
res SUBSTATUS_RAGE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [$c72c], a
.asm_3e8af
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wEnemyMoveStruct + MOVE_EFFECT]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp EFFECT_PROTECT
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp EFFECT_ENDURE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
xor a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [EnemyProtectCount], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
.asm_3e8bd
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
ld a, STRUGGLE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr .asm_3e87f
; 3e8c1
Function3e8c1: ; 3e8c1
xor a
ld [EnemyFuryCutterCount], a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [EnemyProtectCount], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [$c72c], a
ld hl, EnemySubStatus4
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
res SUBSTATUS_RAGE, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3e8d1
Function3e8d1: ; 3e8d1
ld a, [EnemySubStatus4]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
and 1 << SUBSTATUS_RECHARGE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
ld hl, EnemySubStatus3
ld a, [hl]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
and 1 << SUBSTATUS_CHARGED | 1 << SUBSTATUS_RAMPAGE | 1 << SUBSTATUS_BIDE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
ld hl, EnemySubStatus1
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_ROLLOUT, [hl]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3e8e4
Function3e8e4: ; 3e8e4
callba Function100a09
ret
; 3e8eb
LoadEnemyMon: ; 3e8eb
; Initialize enemy monster parameters
; To do this we pull the species from TempEnemyMonSpecies
; Notes:
; BattleRandom is used to ensure sync between Game Boys
; Clear the whole EnemyMon struct
xor a
ld hl, EnemyMonSpecies
ld bc, EnemyMonEnd - EnemyMon
call ByteFill
; We don't need to be here if we're in a link battle
ld a, [InLinkBattle]
and a
jp nz, Function3dabd
ld a, [$cfc0] ; ????
bit 0, a
jp nz, Function3dabd
; Make sure everything knows what species we're working with
ld a, [TempEnemyMonSpecies]
ld [EnemyMonSpecies], a
ld [CurSpecies], a
ld [CurPartySpecies], a
; Grab the BaseData for this species
call GetBaseData
; Let's get the item:
; Is the item predetermined?
ld a, [IsInBattle]
dec a
jr z, .WildItem
; If we're in a trainer battle, the item is in the party struct
ld a, [CurPartyMon]
ld hl, OTPartyMon1Item
call GetPartyLocation ; bc = PartyMon[CurPartyMon] - PartyMons
ld a, [hl]
jr .UpdateItem
.WildItem
; In a wild battle, we pull from the item slots in BaseData
; Force Item1
; Used for Ho-Oh, Lugia and Snorlax encounters
ld a, [BattleType]
cp BATTLETYPE_FORCEITEM
ld a, [BaseItems]
jr z, .UpdateItem
; Failing that, it's all up to chance
; Effective chances:
; 75% None
; 23% Item1
; 2% Item2
; 25% chance of getting an item
call BattleRandom
cp a, $c0
ld a, NO_ITEM
jr c, .UpdateItem
; From there, an 8% chance for Item2
call BattleRandom
cp a, $14 ; 8% of 25% = 2% Item2
ld a, [BaseItems]
jr nc, .UpdateItem
ld a, [BaseItems+1]
.UpdateItem
ld [EnemyMonItem], a
; Initialize DVs
; If we're in a trainer battle, DVs are predetermined
ld a, [IsInBattle]
and a
jr z, .InitDVs
ld a, [EnemySubStatus5]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_TRANSFORMED, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .InitDVs
; Unknown
ld hl, $c6f2
ld de, EnemyMonDVs
ld a, [hli]
ld [de], a
inc de
ld a, [hl]
ld [de], a
jp .Happiness
.InitDVs
; Trainer DVs
; All trainers have preset DVs, determined by class
; See GetTrainerDVs for more on that
callba GetTrainerDVs
; These are the DVs we'll use if we're actually in a trainer battle
ld a, [IsInBattle]
dec a
jr nz, .UpdateDVs
; Wild DVs
; Here's where the fun starts
; Roaming monsters (Entei, Raikou) work differently
; They have their own structs, which are shorter than normal
ld a, [BattleType]
cp a, BATTLETYPE_ROAMING
jr nz, .NotRoaming
; Grab HP
call GetRoamMonHP
ld a, [hl]
; Check if the HP has been initialized
and a
; We'll do something with the result in a minute
push af
; Grab DVs
call GetRoamMonDVs
inc hl
ld a, [hld]
ld c, a
ld b, [hl]
; Get back the result of our check
pop af
; If the RoamMon struct has already been initialized, we're done
jr nz, .UpdateDVs
; If it hasn't, we need to initialize the DVs
; (HP is initialized at the end of the battle)
call GetRoamMonDVs
inc hl
call BattleRandom
ld [hld], a
ld c, a
call BattleRandom
ld [hl], a
ld b, a
; We're done with DVs
jr .UpdateDVs
.NotRoaming
; Register a contains BattleType
; Forced shiny battle type
; Used by Red Gyarados at Lake of Rage
cp a, BATTLETYPE_SHINY
jr nz, .GenerateDVs
ld b, ATKDEFDV_SHINY ; $ea
ld c, SPDSPCDV_SHINY ; $aa
jr .UpdateDVs
.GenerateDVs
; Generate new random DVs
call BattleRandom
ld b, a
call BattleRandom
ld c, a
.UpdateDVs
; Input DVs in register bc
ld hl, EnemyMonDVs
ld a, b
ld [hli], a
ld [hl], c
; We've still got more to do if we're dealing with a wild monster
ld a, [IsInBattle]
dec a
jr nz, .Happiness
; Species-specfic:
; Unown
ld a, [TempEnemyMonSpecies]
cp a, UNOWN
jr nz, .Magikarp
; Get letter based on DVs
ld hl, EnemyMonDVs
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef GetUnownLetter
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Can't use any letters that haven't been unlocked
; If combined with forced shiny battletype, causes an infinite loop
call CheckUnownLetter
jr c, .GenerateDVs ; try again
.Magikarp
; Skimming this part recommended
ld a, [TempEnemyMonSpecies]
cp a, MAGIKARP
jr nz, .Happiness
; Get Magikarp's length
ld de, EnemyMonDVs
ld bc, PlayerID
callab CalcMagikarpLength
; We're clear if the length is < 1536
ld a, [MagikarpLength]
cp a, $06 ; $600 = 1536
jr nz, .CheckMagikarpArea
; 5% chance of skipping size checks
call Random
cp a, $0c ; / $100
jr c, .CheckMagikarpArea
; Try again if > 1614
ld a, [MagikarpLength + 1]
cp a, $50
jr nc, .GenerateDVs
; 20% chance of skipping this check
call Random
cp a, $32 ; / $100
jr c, .CheckMagikarpArea
; Try again if > 1598
ld a, [MagikarpLength + 1]
cp a, $40
jr nc, .GenerateDVs
.CheckMagikarpArea
; The z checks are supposed to be nz
; Instead, all maps in GROUP_LAKE_OF_RAGE (mahogany area)
; and routes 20 and 44 are treated as Lake of Rage
; This also means Lake of Rage Magikarp can be smaller than ones
; caught elsewhere rather than the other way around
; Intended behavior enforces a minimum size at Lake of Rage
; The real behavior prevents size flooring in the Lake of Rage area
ld a, [MapGroup]
cp a, GROUP_LAKE_OF_RAGE
jr z, .Happiness
ld a, [MapNumber]
cp a, MAP_LAKE_OF_RAGE
jr z, .Happiness
; 40% chance of not flooring
call Random
cp a, $64 ; / $100
jr c, .Happiness
; Floor at length 1024
ld a, [MagikarpLength]
cp a, 1024 >> 8
jr c, .GenerateDVs ; try again
; Finally done with DVs
.Happiness
; Set happiness
ld a, BASE_HAPPINESS
ld [EnemyMonHappiness], a
; Set level
ld a, [CurPartyLevel]
ld [EnemyMonLevel], a
; Fill stats
ld de, EnemyMonMaxHP
ld b, $00
ld hl, $d201 ; ?
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef Functione167
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; If we're in a trainer battle,
; get the rest of the parameters from the party struct
ld a, [IsInBattle]
cp a, TRAINER_BATTLE
jr z, .OpponentParty
; If we're in a wild battle, check wild-specific stuff
and a
jr z, .TreeMon
ld a, [EnemySubStatus5]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_TRANSFORMED, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp nz, .Moves
.TreeMon
; If we're headbutting trees, some monsters enter battle asleep
call CheckSleepingTreeMon
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, SLP ; Asleep for 7 turns
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr c, .UpdateStatus
; Otherwise, no status
xor a
.UpdateStatus
ld hl, EnemyMonStatus
ld [hli], a
; Unused byte
xor a
ld [hli], a
; Full HP...
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [EnemyMonMaxHP]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [EnemyMonMaxHP + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
; ...unless it's a RoamMon
ld a, [BattleType]
cp a, BATTLETYPE_ROAMING
jr nz, .Moves
; Grab HP
call GetRoamMonHP
ld a, [hl]
; Check if it's been initialized again
and a
jr z, .InitRoamHP
; Update from the struct if it has
ld a, [hl]
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [EnemyMonHP + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr .Moves
.InitRoamHP
; HP only uses the lo byte in the RoamMon struct since
; Raikou/Entei/Suicune will have < 256 hp at level 40
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [EnemyMonHP + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
jr .Moves
.OpponentParty
; Get HP from the party struct
OTPartyMon1HP instead of PartyMon1HP - PartyMon1 + OtPartyMon1
2014-02-22 22:10:58 -08:00
ld hl, (OTPartyMon1HP + 1)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurPartyMon]
call GetPartyLocation
ld a, [hld]
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [EnemyMonHP + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [EnemyMonHP], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Make sure everything knows which monster the opponent is using
ld a, [CurPartyMon]
ld [CurOTMon], a
; Get status from the party struct
dec hl
ld a, [hl] ; OTPartyMonStatus
ld [EnemyMonStatus], a
.Moves
ld hl, BaseType1
ld de, EnemyMonType1
ld a, [hli]
ld [de], a
inc de
ld a, [hl]
ld [de], a
; Get moves
ld de, EnemyMonMoves
; Are we in a trainer battle?
ld a, [IsInBattle]
cp a, TRAINER_BATTLE
jr nz, .WildMoves
; Then copy moves from the party struct
ld hl, OTPartyMon1Moves
ld a, [CurPartyMon]
call GetPartyLocation
ld bc, NUM_MOVES
call CopyBytes
jr .PP
.WildMoves
; Clear EnemyMonMoves
xor a
ld h, d
ld l, e
ld [hli], a
ld [hli], a
ld [hli], a
ld [hl], a
; Make sure the predef knows this isn't a partymon
ld [MagikarpLength], a
; Fill moves based on level
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef FillMoves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.PP
; Trainer battle?
ld a, [IsInBattle]
cp a, TRAINER_BATTLE
jr z, .TrainerPP
; Fill wild PP
ld hl, EnemyMonMoves
ld de, EnemyMonPP
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef FillPP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr .Finish
.TrainerPP
; Copy PP from the party struct
ld hl, OTPartyMon1PP
ld a, [CurPartyMon]
call GetPartyLocation
ld de, EnemyMonPP
ld bc, NUM_MOVES
call CopyBytes
.Finish
; Only the first five base stats are copied...
ld hl, BaseStats
ld de, EnemyMonBaseStats
ld b, BaseSpecialDefense - BaseStats
.loop
ld a, [hli]
ld [de], a
inc de
dec b
jr nz, .loop
ld a, [BaseCatchRate]
ld [de], a
inc de
ld a, [BaseExp]
ld [de], a
ld a, [TempEnemyMonSpecies]
ld [$d265], a
call GetPokemonName
; Did we catch it?
ld a, [IsInBattle]
and a
ret z
; Update enemy nick
ld hl, StringBuffer1
ld de, EnemyMonNick
ld bc, PKMN_NAME_LENGTH
call CopyBytes
; Caught this mon
ld a, [TempEnemyMonSpecies]
dec a
ld c, a
ld b, 1 ; set
ld hl, PokedexSeen
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef FlagPredef
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, EnemyMonStats
ld de, EnemyStats
ld bc, EnemyMonStatsEnd - EnemyMonStats
call CopyBytes
ret
; 3eb38
CheckSleepingTreeMon: ; 3eb38
; Return carry if species is in the list
; for the current time of day
; Don't do anything if this isn't a tree encounter
ld a, [BattleType]
cp a, BATTLETYPE_TREE
jr nz, .NotSleeping
; Get list for the time of day
ld hl, .Morn
ld a, [TimeOfDay]
cp a, DAY
jr c, .Check
ld hl, .Day
jr z, .Check
ld hl, .Nite
.Check
ld a, [TempEnemyMonSpecies]
ld de, 1 ; length of species id
call IsInArray
; If it's a match, the opponent is asleep
ret c
.NotSleeping
and a
ret
.Nite
db CATERPIE
db METAPOD
db BUTTERFREE
db WEEDLE
db KAKUNA
db BEEDRILL
db SPEAROW
db EKANS
db EXEGGCUTE
db LEDYBA
db AIPOM
db $ff ; end
.Day
db VENONAT
db HOOTHOOT
db NOCTOWL
db SPINARAK
db HERACROSS
db $ff ; end
.Morn
db VENONAT
db HOOTHOOT
db NOCTOWL
db SPINARAK
db HERACROSS
db $ff ; end
; 3eb75
CheckUnownLetter: ; 3eb75
; Return carry if the Unown letter hasn't been unlocked yet
ld a, [UnlockedUnowns]
ld c, a
ld de, 0
.loop
; Don't check this set unless it's been unlocked
srl c
jr nc, .next
; Is our letter in the set?
ld hl, .LetterSets
add hl, de
ld a, [hli]
ld h, [hl]
ld l, a
push de
ld a, [UnownLetter]
ld de, 1
push bc
call IsInArray
pop bc
pop de
jr c, .match
.next
; Make sure we haven't gone past the end of the table
inc e
inc e
ld a, e
cp a, .Set1 - .LetterSets
jr c, .loop
; Hasn't been unlocked, or the letter is invalid
scf
ret
.match
; Valid letter
and a
ret
.LetterSets
dw .Set1
dw .Set2
dw .Set3
dw .Set4
.Set1
; A B C D E F G H I J K
db 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, $ff
.Set2
; L M N O P Q R
db 12, 13, 14, 15, 16, 17, 18, $ff
.Set3
; S T U V W
db 19, 20, 21, 22, 23, $ff
.Set4
; X Y Z
db 24, 25, 26, $ff
; 3ebc7
Function3ebc7: ; 3ebc7
push bc
ld a, [BattleMonLevel]
ld b, a
ld a, [EnemyMonLevel]
ld [BattleMonLevel], a
ld a, b
ld [EnemyMonLevel], a
pop bc
ret
; 3ebd8
Function3ebd8: ; 3ebd8
xor a
ld [TempEnemyMonSpecies], a
call Function3ee27
ld a, [OtherTrainerClass]
ld [TrainerClass], a
ld de, VTiles2
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
callab GetTrainerPic
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 19, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, $0
.asm_3ebf3
inc c
ld a, c
cp $7
ret z
xor a
ld [hBGMapMode], a
ld [hBGMapThird], a
ld d, $0
push bc
push hl
.asm_3ec01
call Function3ec1a
inc hl
ld a, $7
add d
ld d, a
dec c
jr nz, .asm_3ec01
ld a, $1
ld [hBGMapMode], a
ld c, $4
call DelayFrames
pop hl
pop bc
dec hl
jr .asm_3ebf3
; 3ec1a
Function3ec1a: ; 3ec1a
push hl
push de
push bc
ld e, $7
.asm_3ec1f
ld [hl], d
ld bc, $0014
add hl, bc
inc d
dec e
jr nz, .asm_3ec1f
pop bc
pop de
pop hl
ret
; 3ec2c
Function3ec2c: ; 3ec2c
ld a, 1
jr Function3ec31
; 3ec30
Function3ec30: ; 3ec30
xor a
; 3ec31
Function3ec31: ; 3ec31
ld [hBattleTurn], a
call Function3ec39
jp Function3ec76
; 3ec39
Function3ec39: ; 3ec39
ld a, [hBattleTurn]
and a
jr z, .asm_3ec5a
ld a, [BattleMonStatus]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
and 1 << PAR
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
ld hl, $c645
ld a, [hld]
ld b, a
ld a, [hl]
srl a
rr b
srl a
rr b
ld [hli], a
or b
jr nz, .asm_3ec58
ld b, $1
.asm_3ec58
ld [hl], b
ret
.asm_3ec5a
ld a, [EnemyMonStatus]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
and 1 << PAR
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
ld hl, $d21f
ld a, [hld]
ld b, a
ld a, [hl]
srl a
rr b
srl a
rr b
ld [hli], a
or b
jr nz, .asm_3ec74
ld b, $1
.asm_3ec74
ld [hl], b
ret
; 3ec76
Function3ec76: ; 3ec76
ld a, [hBattleTurn]
and a
jr z, .asm_3ec93
ld a, [BattleMonStatus]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
and 1 << BRN
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
ld hl, $c641
ld a, [hld]
ld b, a
ld a, [hl]
srl a
rr b
ld [hli], a
or b
jr nz, .asm_3ec91
ld b, $1
.asm_3ec91
ld [hl], b
ret
.asm_3ec93
ld a, [EnemyMonStatus]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
and 1 << BRN
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
ld hl, $d21b
ld a, [hld]
ld b, a
ld a, [hl]
srl a
rr b
ld [hli], a
or b
jr nz, .asm_3eca9
ld b, $1
.asm_3eca9
ld [hl], b
ret
; 3ecab
Function3ecab: ; 3ecab
ld c, 0
.asm_3ecad
call Function3ecb7
inc c
ld a, c
cp 5
jr nz, .asm_3ecad
ret
; 3ecb7
Function3ecb7: ; 3ecb7
push bc
push bc
ld a, [$d265]
and a
ld a, 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-12 18:32:42 -07:00
ld hl, BattleMonAttack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, PlayerStats
ld bc, PlayerAtkLevel
jr z, .asm_3ecd2
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonAttack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, EnemyStats
ld bc, EnemyAtkLevel
.asm_3ecd2
add c
ld c, a
jr nc, .asm_3ecd7
inc b
.asm_3ecd7
ld a, [bc]
pop bc
ld b, a
push bc
sla c
ld b, 0
add hl, bc
ld a, c
add e
ld e, a
jr nc, .asm_3ece6
inc d
.asm_3ece6
pop bc
push hl
ld hl, .StatLevelMultipliers
dec b
sla b
ld c, b
ld b, 0
add hl, bc
xor a
ld [hMultiplicand], a
ld a, [de]
ld [$ffb5], a
inc de
ld a, [de]
ld [$ffb6], a
ld a, [hli]
ld [hMultiplier], a
call Multiply
ld a, [hl]
ld [hMultiplier], a
ld b, $4
call Divide
pop hl
; Cap at 999.
ld a, [$ffb6]
sub 999 % $100
ld a, [$ffb5]
sbc 999 / $100
jp c, .asm_3ed1e
ld a, 999 / $100
ld [$ffb5], a
ld a, 999 % $100
ld [$ffb6], a
.asm_3ed1e
ld a, [$ffb5]
ld [hli], a
ld b, a
ld a, [$ffb6]
ld [hl], a
or b
jr nz, .asm_3ed29
inc [hl]
.asm_3ed29
pop bc
ret
; 3ed2b
.StatLevelMultipliers
; /
db 25, 100 ; 25%
db 28, 100 ; 28%
db 33, 100 ; 33%
db 40, 100 ; 40%
db 50, 100 ; 50%
db 66, 100 ; 66%
db 1, 1 ; 100%
db 15, 10 ; 150%
db 2, 1 ; 200%
db 25, 10 ; 250%
db 3, 1 ; 300%
db 35, 10 ; 350%
db 4, 1 ; 400%
; 3ed45
BadgeStatBoosts: ; 3ed45
; Raise BattleMon stats depending on which badges have been obtained.
; Every other badge boosts a stat, starting from the first.
; ZephyrBadge: Attack
; PlainBadge: Speed
; MineralBadge: Defense
; GlacierBadge: Special Attack
; RisingBadge: Special Defense
; The boosted stats are in order, except PlainBadge and MineralBadge's boosts are swapped.
ld a, [InLinkBattle]
and a
ret nz
ld a, [$cfc0]
and a
ret nz
ld a, [JohtoBadges]
; Swap badges 3 (PlainBadge) and 5 (MineralBadge).
ld d, a
and %00000100
add a
add a
ld b, a
ld a, d
and %00010000
rrca
rrca
ld c, a
ld a, d
and %11101011
or b
or c
ld b, a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, BattleMonAttack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, 4
.CheckBadge
ld a, b
srl b
call c, BoostStat
inc hl
inc hl
; Check every other badge.
srl b
dec c
jr nz, .CheckBadge
; And the last one (RisingBadge) too.
srl a
call c, BoostStat
ret
; 3ed7c
BoostStat: ; 3ed7c
; Raise stat at hl by 1/8.
ld a, [hli]
ld d, a
ld e, [hl]
srl d
rr e
srl d
rr e
srl d
rr e
ld a, [hl]
add e
ld [hld], a
ld a, [hl]
adc d
ld [hli], a
; Cap at 999.
ld a, [hld]
sub 999 % $100
ld a, [hl]
sbc 999 / $100
ret c
ld a, 999 / $100
ld [hli], a
ld a, 999 % $100
ld [hld], a
ret
; 3ed9f
Function3ed9f: ; 3ed9f
callab Functionfb4f2
ret
; 3eda6
Function3eda6: ; 3eda6
callab Functionfb50d
ret
; 3edad
Function3edad: ; 3edad
Label more graphics in bank 3e.
2014-03-04 23:43:08 -08:00
ld de, GFX_f8ac0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, $96c0
Label more graphics in bank 3e.
2014-03-04 23:43:08 -08:00
lb bc, BANK(GFX_f8ac0), 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Get1bpp
Label more graphics in bank 3e.
2014-03-04 23:43:08 -08:00
ld de, GFX_f8ae0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, $9730
Label more graphics in bank 3e.
2014-03-04 23:43:08 -08:00
lb bc, BANK(GFX_f8ae0), 6
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Get1bpp
Label more graphics in bank 3e.
2014-03-04 23:43:08 -08:00
ld de, GFX_f8b10
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, $9550
Label more graphics in bank 3e.
2014-03-04 23:43:08 -08:00
lb bc, BANK(GFX_f8b10), 8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp Get2bpp
; 3edd1
EmptyBattleTextBox: ; 3edd1
ld hl, .empty
jp BattleTextBox
.empty
db "@"
; 3edd8
Use :: to export labels between objects. This fixes the build.
2014-02-01 17:26:39 -08:00
_BattleRandom:: ; 3edd8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; If the normal RNG is used in a link battle it'll desync.
; To circumvent this a shared PRNG is used instead.
; But if we're in a non-link battle we're safe to use it
ld a, [InLinkBattle]
and a
jp z, Random
; The PRNG operates in streams of 10 values.
; Which value are we trying to pull?
push hl
push bc
ld a, [LinkBattleRNCount]
ld c, a
ld b, 0
ld hl, LinkBattleRNs
add hl, bc
inc a
ld [LinkBattleRNCount], a
; If we haven't hit the end yet, we're good
cp 10 - 1 ; Exclude last value. See the closing comment
ld a, [hl]
pop bc
pop hl
ret c
; If we have, we have to generate new pseudorandom data
; Instead of having multiple PRNGs, ten seeds are used
push hl
push bc
push af
; Reset count to 0
xor a
ld [LinkBattleRNCount], a
ld hl, LinkBattleRNs
ld b, 10 ; number of seeds
; Generate next number in the sequence for each seed
; The algorithm takes the form *5 + 1 % 256
.loop
; get last #
ld a, [hl]
; a * 5 + 1
ld c, a
add a
add a
add c
inc a
; update #
ld [hli], a
dec b
jr nz, .loop
; This has the side effect of pulling the last value first,
; then wrapping around. As a result, when we check to see if
; we've reached the end, we check the one before it.
pop af
pop bc
pop hl
ret
; 3ee0f
Function3ee0f: ; 3ee0f
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVar
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
ret nz
; 3ee17
Function3ee17: ; 3ee17
ld a, e
ld [FXAnimIDLo], a
ld a, d
ld [FXAnimIDHi], a
call WaitBGMap
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef_jump PlayBattleAnim
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3ee27
Function3ee27: ; 3ee27
push af
push bc
push de
push hl
ld b, $1
call GetSGBLayout
call Function32f9
call DelayFrame
pop hl
pop de
pop bc
pop af
ret
; 3ee3b
Function3ee3b: ; 3ee3b
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
; Give experience.
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [InLinkBattle]
and a
ret nz
ld a, [$cfc0]
bit 0, a
ret nz
call Function3f0d4
xor a
ld [CurPartyMon], a
ld bc, PartyMon1Species
.asm_3ee50
ld hl, $0022
add hl, bc
ld a, [hli]
or [hl]
jp z, .asm_3f0b9
push bc
ld hl, $c664
ld a, [CurPartyMon]
ld c, a
ld b, $2
ld d, $0
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef FlagPredef
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, c
and a
pop bc
jp z, .asm_3f0b9
ld hl, $000c
add hl, bc
ld d, h
ld e, l
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
ld hl, EnemyMonBaseStats - 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
ld c, $5
.asm_3ee7c
inc hl
ld a, [de]
add [hl]
ld [de], a
jr nc, .asm_3ee89
dec de
ld a, [de]
inc a
jr z, .asm_3eea4
ld [de], a
inc de
.asm_3ee89
push hl
push bc
ld a, $1c
call GetPartyParamLocation
ld a, [hl]
and a
pop bc
pop hl
jr z, .asm_3eea9
ld a, [de]
add [hl]
ld [de], a
jr nc, .asm_3eea9
dec de
ld a, [de]
inc a
jr z, .asm_3eea4
ld [de], a
inc de
jr .asm_3eea9
.asm_3eea4
ld a, $ff
ld [de], a
inc de
ld [de], a
.asm_3eea9
inc de
inc de
dec c
jr nz, .asm_3ee7c
xor a
ld [hMultiplicand], a
ld [$ffb5], a
ld a, [EnemyMonBaseExp]
ld [$ffb6], a
ld a, [EnemyMonLevel]
ld [hMultiplier], a
call Multiply
ld a, $7
ld [hMultiplier], a
ld b, $4
call Divide
pop bc
ld hl, $0006
add hl, bc
ld a, [PlayerID]
cp [hl]
jr nz, .asm_3eedd
inc hl
ld a, [$d47c]
cp [hl]
ld a, $0
jr z, .asm_3eee2
.asm_3eedd
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
call DoubleExp
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
.asm_3eee2
ld [$d088], a
ld a, [IsInBattle]
dec a
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
call nz, DoubleExp
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
ld a, PartyMon1Item - PartyMon1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
ld a, [hl]
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
cp LUCKY_EGG
call z, DoubleExp
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$ffb6]
ld [$d087], a
ld a, [$ffb5]
ld [StringBuffer2], a
ld a, [CurPartyMon]
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, PartyMonNicknames
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetNick
ld hl, UnknownText_0x3f11b
call BattleTextBox
ld a, [$d087]
ld [$ffb6], a
ld a, [StringBuffer2]
ld [$ffb5], a
pop bc
call Function3f136
push bc
call Function309d
pop bc
ld hl, $000a
add hl, bc
ld d, [hl]
ld a, [$ffb6]
add d
ld [hld], a
ld d, [hl]
ld a, [$ffb5]
adc d
ld [hl], a
jr nc, .asm_3ef3d
dec hl
inc [hl]
jr nz, .asm_3ef3d
ld a, $ff
ld [hli], a
ld [hli], a
ld [hl], a
.asm_3ef3d
ld a, [CurPartyMon]
ld e, a
ld d, $0
ld hl, PartySpecies
add hl, de
ld a, [hl]
ld [CurSpecies], a
call GetBaseData
push bc
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
ld d, MAX_LEVEL
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
callab Function50e47
pop bc
ld hl, $000a
add hl, bc
push bc
ld a, [hMultiplicand]
ld b, a
ld a, [$ffb5]
ld c, a
ld a, [$ffb6]
ld d, a
ld a, [hld]
sub d
ld a, [hld]
sbc c
ld a, [hl]
sbc b
jr c, .asm_3ef74
ld a, b
ld [hli], a
ld a, c
ld [hli], a
ld a, d
ld [hld], a
.asm_3ef74
xor a
ld [MonType], a
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef Function5084a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
callab Function50e1b
pop bc
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
ld hl, PartyMon1Level - PartyMon1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
cp MAX_LEVEL
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp nc, .asm_3f0b9
cp d
jp z, .asm_3f0b9
ld [$c719], a
ld a, [CurPartyLevel]
push af
ld a, d
ld [CurPartyLevel], a
ld [hl], a
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
ld hl, PartyMon1Species - PartyMon1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
ld [CurSpecies], a
ld [$d265], a
call GetBaseData
ld hl, $0025
add hl, bc
ld a, [hld]
ld e, a
ld d, [hl]
push de
ld hl, $0024
add hl, bc
ld d, h
ld e, l
ld hl, $000a
add hl, bc
push bc
ld b, $1
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef Functione167
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
pop de
ld hl, $0025
add hl, bc
ld a, [hld]
sub e
ld e, a
ld a, [hl]
sbc d
ld d, a
dec hl
ld a, [hl]
add e
ld [hld], a
ld a, [hl]
adc d
ld [hl], a
ld a, [CurBattleMon]
ld d, a
ld a, [CurPartyMon]
cp d
jr nz, .asm_3f035
ld de, BattleMonHP
ld a, [hli]
ld [de], a
inc de
ld a, [hli]
ld [de], a
ld de, BattleMonMaxHP
push bc
ld bc, $000c
call CopyBytes
pop bc
ld hl, $001f
add hl, bc
ld a, [hl]
ld [BattleMonLevel], a
ld a, [PlayerSubStatus5]
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_TRANSFORMED, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3f012
ld hl, $0026
add hl, bc
ld de, PlayerStats
ld bc, $000a
call CopyBytes
.asm_3f012
xor a
ld [$d265], a
call Function3ecab
callab Function3ec2c
callab BadgeStatBoosts
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
callab UpdatePlayerHUD
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call EmptyBattleTextBox
call Function309d
ld a, $1
ld [hBGMapMode], a
.asm_3f035
callba Function2709e
ld a, [CurBattleMon]
ld b, a
ld a, [CurPartyMon]
cp b
jr z, .asm_3f057
ld de, SFX_HIT_END_OF_EXP_BAR
call PlaySFX
call WaitSFX
ld hl, BattleText_0x80c9c
call StdBattleTextBox
call Function309d
.asm_3f057
xor a
ld [MonType], a
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef Function5084a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 9, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, $a
ld c, $9
call TextBox
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 11, 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld bc, $0004
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef Function50b7b
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, $1e
call DelayFrames
call Functiona80
call Function30b4
xor a
ld [MonType], a
ld a, [CurSpecies]
ld [$d265], a
ld a, [CurPartyLevel]
push af
ld c, a
ld a, [$c719]
ld b, a
.asm_3f093
inc b
ld a, b
ld [CurPartyLevel], a
push bc
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef LearnLevelMoves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
ld a, b
cp c
jr nz, .asm_3f093
pop af
ld [CurPartyLevel], a
ld hl, EvolvableFlags
ld a, [CurPartyMon]
ld c, a
ld b, $1
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef FlagPredef
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
ld [CurPartyLevel], a
.asm_3f0b9
ld a, [PartyCount]
ld b, a
ld a, [CurPartyMon]
inc a
cp b
jr z, .asm_3f0d1
ld [CurPartyMon], a
ld a, $0
call GetPartyParamLocation
ld b, h
ld c, l
jp .asm_3ee50
.asm_3f0d1
jp Function3d57a
; 3f0d4
Function3f0d4: ; 3f0d4
ld a, [$c664]
ld b, a
ld c, $6
ld d, $0
.asm_3f0dc
xor a
srl b
adc d
ld d, a
dec c
jr nz, .asm_3f0dc
cp $2
ret c
ld [$d265], a
ld hl, EnemyMonBaseStats
ld c, $7
.asm_3f0ef
xor a
ld [hProduct], a
ld a, [hl]
ld [hMultiplicand], a
ld a, [$d265]
ld [hMultiplier], a
ld b, $2
call Divide
ld a, [$ffb6]
ld [hli], a
dec c
jr nz, .asm_3f0ef
ret
; 3f106
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
DoubleExp: ; 3f106
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
ld a, [$ffb5]
ld b, a
ld a, [$ffb6]
ld c, a
srl b
rr c
add c
ld [$ffb6], a
ld a, [$ffb5]
adc b
ld [$ffb5], a
pop bc
ret
; 3f11b
UnknownText_0x3f11b: ; 3f11b
text_jump UnknownText_0x1c029c
start_asm
ld hl, UnknownText_0x3f131
ld a, [$d088] ; IsTradedMon
and a
ret z
ld hl, UnknownText_0x3f12c
ret
; 3f12c
UnknownText_0x3f12c: ; 3f12c
text_jump UnknownText_0x1c02a9
db "@"
; 3f131
UnknownText_0x3f131: ; 3f131
text_jump UnknownText_0x1c02c9
db "@"
; 3f136
Function3f136: ; 3f136
push bc
ld hl, CurPartyMon
ld a, [CurBattleMon]
cp [hl]
jp nz, .asm_3f219
ld a, [BattleMonLevel]
cp MAX_LEVEL
jp nc, .asm_3f219
ld a, [$ffb6]
ld [$d004], a
push af
ld a, [$ffb5]
ld [$d003], a
push af
xor a
ld [DefaultFlypoint], a
xor a
ld [MonType], a
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef Function5084a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [TempMonLevel]
ld b, a
ld e, a
push de
ld de, $d118
call Function3f39c
push bc
ld hl, $d118
ld a, [$d004]
add [hl]
ld [hld], a
ld a, [$d003]
adc [hl]
ld [hld], a
jr nc, .asm_3f186
inc [hl]
jr nz, .asm_3f186
ld a, $ff
ld [hli], a
ld [hli], a
ld [hl], a
.asm_3f186
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
ld d, MAX_LEVEL
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
callab Function50e47
ld a, [hMultiplicand]
ld b, a
ld a, [$ffb5]
ld c, a
ld a, [$ffb6]
ld d, a
ld hl, $d118
ld a, [hld]
sub d
ld a, [hld]
sbc c
ld a, [hl]
sbc b
jr c, .asm_3f1a8
ld a, b
ld [hli], a
ld a, c
ld [hli], a
ld a, d
ld [hld], a
.asm_3f1a8
callab Function50e1b
ld a, d
pop bc
pop de
ld d, a
cp e
jr nc, .asm_3f1b7
ld a, e
ld d, a
.asm_3f1b7
ld a, e
Growth rate data.
2014-03-05 02:42:09 -08:00
cp MAX_LEVEL
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nc, .asm_3f1ff
cp d
jr z, .asm_3f1ff
inc a
ld [TempMonLevel], a
ld [CurPartyLevel], a
ld [BattleMonLevel], a
push de
call Function3f21b
ld c, $40
call Function3f22c
call PrintPlayerHUD
ld hl, BattleMonNick
ld de, StringBuffer1
ld bc, $000b
call CopyBytes
call Function3dfe
ld de, SFX_HIT_END_OF_EXP_BAR
call PlaySFX
callba Function8e79d
call WaitSFX
ld hl, BattleText_0x80c9c
call StdBattleTextBox
pop de
inc e
ld b, $0
jr .asm_3f1b7
.asm_3f1ff
push bc
ld b, d
ld de, $d118
call Function3f39c
ld a, b
pop bc
ld c, a
call Function3f21b
call Function3f22c
call Function3dfe
pop af
ld [$ffb5], a
pop af
ld [$ffb6], a
.asm_3f219
pop bc
ret
; 3f21b
Function3f21b: ; 3f21b
push bc
call WaitSFX
ld de, SFX_EXP_BAR
call PlaySFX
ld c, 10
call DelayFrames
pop bc
ret
; 3f22c
Function3f22c: ; 3f22c
ld d, $3
dec b
.asm_3f22f
inc b
push bc
push de
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 17, 11
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3f41c
pop de
ld a, $1
ld [hBGMapMode], a
ld c, d
call DelayFrames
xor a
ld [hBGMapMode], a
pop bc
ld a, c
cp b
jr z, .asm_3f268
inc b
push bc
push de
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 17, 11
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3f41c
pop de
ld a, $1
ld [hBGMapMode], a
ld c, d
call DelayFrames
xor a
ld [hBGMapMode], a
dec d
jr nz, .asm_3f263
ld d, $1
.asm_3f263
pop bc
ld a, c
cp b
jr nz, .asm_3f22f
.asm_3f268
ld a, $1
ld [hBGMapMode], a
ret
; 3f26d
Function3f26d: ; 3f26d
; SendOutMonText?
ld a, [InLinkBattle]
and a
jr z, .asm_3f27c
ld hl, UnknownText_0x3f2d1
ld a, [$d264]
and a
jr nz, .asm_3f2ce
.asm_3f27c
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
ld hl, UnknownText_0x3f2d1
jr z, .asm_3f2ce
xor a
ld [hMultiplicand], a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld [$c6ea], a
ld [$ffb5], a
ld a, [hl]
ld [$c6eb], a
ld [$ffb6], a
ld a, $19
ld [hMultiplier], a
call Multiply
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonMaxHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld b, [hl]
srl a
rr b
srl a
rr b
ld a, b
ld b, $4
ld [hMultiplier], a
call Divide
ld a, [$ffb6]
ld hl, UnknownText_0x3f2d1
cp $46
jr nc, .asm_3f2ce
ld hl, UnknownText_0x3f2d8
cp $28
jr nc, .asm_3f2ce
ld hl, UnknownText_0x3f2df
cp $a
jr nc, .asm_3f2ce
ld hl, UnknownText_0x3f2e6
.asm_3f2ce
jp BattleTextBox
; 3f2d1
UnknownText_0x3f2d1: ; 3f2d1
text_jump UnknownText_0x1c02df
start_asm
jr Function3f2eb
; 3f2d6
UnknownText_0x3f2d8: ; 3f2d8
text_jump UnknownText_0x1c02e6
start_asm
jr Function3f2eb
; 3f2dd
UnknownText_0x3f2df: ; 3f2df
text_jump UnknownText_0x1c02f0
start_asm
jr Function3f2eb
; 3f2e4
UnknownText_0x3f2e6: ; 3f2e6
text_jump UnknownText_0x1c02fe
start_asm
; 3f2eb
Function3f2eb: ; 3f2eb
ld hl, UnknownText_0x3f2ef
ret
; 3f2ef
UnknownText_0x3f2ef: ; 3f2ef
text_jump UnknownText_0x1c0317
db "@"
; 3f2f4
Function3f2f4: ; 3f2f4
ld hl, UnknownText_0x3f2fa
jp BattleTextBox
; 3f2fa
UnknownText_0x3f2fa: ; 3f2fa
text_jump UnknownText_0x1c031d
start_asm
; 3f2ff
Function3f2ff: ; 3f2ff
push de
push bc
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonHP + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, $c6eb
ld b, [hl]
dec hl
ld a, [de]
sub b
ld [$ffb6], a
dec de
ld b, [hl]
ld a, [de]
sbc b
ld [$ffb5], a
ld a, $19
ld [hMultiplier], a
call Multiply
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonMaxHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld b, [hl]
srl a
rr b
srl a
rr b
ld a, b
ld b, $4
ld [hMultiplier], a
call Divide
pop bc
pop de
ld a, [$ffb6]
ld hl, UnknownText_0x3f348
and a
ret z
ld hl, UnknownText_0x3f35b
cp $1e
ret c
ld hl, UnknownText_0x3f34d
cp $46
ret c
ld hl, UnknownText_0x3f352
ret
; 3f348
UnknownText_0x3f348: ; 3f348
text_jump UnknownText_0x1c0324
db "@"
; 3f34d
UnknownText_0x3f34d: ; 3f34d
text_jump UnknownText_0x1c0340
db "@"
; 3f352
UnknownText_0x3f352: ; 3f352
text_jump UnknownText_0x1c0352
db "@"
; 3f357
Function3f357: ; 3f357
ld hl, UnknownText_0x3f35b
ret
; 3f35b
UnknownText_0x3f35b: ; 3f35b
text_jump UnknownText_0x1c0366
db "@"
; 3f360
Function3f360: ; 3f360
ld hl, $c6f0
ld a, [hl]
and a
jr z, .asm_3f36d
dec [hl]
ld hl, BattleText_0x80cba
jr .asm_3f388
.asm_3f36d
dec hl
ld a, [hl]
and a
ret z
dec [hl]
ld hl, BattleText_0x80cd1
jr nz, .asm_3f388
push hl
ld a, [EnemyMonSpecies]
ld [CurSpecies], a
call GetBaseData
ld a, [BaseCatchRate]
ld [EnemyMonCatchRate], a
pop hl
.asm_3f388
push hl
call Function30b4
pop hl
jp StdBattleTextBox
; 3f390
FillInExpBar: ; 3f390
push hl
call Function3f39c
pop hl
ld de, $0007
add hl, de
jp Function3f41c
; 3f39c
Function3f39c: ; 3f39c
push de
ld d, b
push de
callab Function50e47
pop de
ld hl, hMultiplicand
ld a, [hli]
push af
ld a, [hli]
push af
ld a, [hl]
push af
inc d
callab Function50e47
ld hl, $ffb6
ld a, [hl]
ld [$ffba], a
pop bc
sub b
ld [hld], a
ld a, [hl]
ld [$ffb9], a
pop bc
sbc b
ld [hld], a
ld a, [hl]
ld [hMathBuffer], a
pop bc
sbc b
ld [hl], a
pop de
ld hl, $ffb5
ld a, [hli]
push af
ld a, [hl]
push af
ld a, [de]
dec de
ld c, a
ld a, [$ffba]
sub c
ld [hld], a
ld a, [de]
dec de
ld b, a
ld a, [$ffb9]
sbc b
ld [hld], a
ld a, [de]
ld c, a
ld a, [hMathBuffer]
sbc c
ld [hld], a
xor a
ld [hl], a
ld a, $40
ld [hMultiplier], a
call Multiply
pop af
ld c, a
pop af
ld b, a
.asm_3f3f4
ld a, b
and a
jr z, .asm_3f40c
srl b
rr c
ld hl, hProduct
srl [hl]
inc hl
rr [hl]
inc hl
rr [hl]
inc hl
rr [hl]
jr .asm_3f3f4
.asm_3f40c
ld a, c
ld [hMultiplier], a
ld b, $4
call Divide
ld a, [$ffb6]
ld b, a
ld a, $40
sub b
ld b, a
ret
; 3f41c
Function3f41c: ; 3f41c
ld c, $8
.asm_3f41e
ld a, b
sub $8
jr c, .asm_3f42c
ld b, a
ld a, $6a
ld [hld], a
dec c
jr z, .asm_3f43c
jr .asm_3f41e
.asm_3f42c
add $8
jr z, .asm_3f434
add $54
jr .asm_3f436
.asm_3f434
ld a, $62
.asm_3f436
ld [hld], a
ld a, $62
dec c
jr nz, .asm_3f434
.asm_3f43c
ret
; 3f43d
Function3f43d: ; 3f43d
ld a, [PlayerSubStatus4]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_SUBSTITUTE, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, BattleAnimCmd_DD
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
jr nz, Function3f46f
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Function3f447: ; 3f447
ld a, [$c6fe]
and a
ld hl, BattleAnimCmd_E2
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
jr nz, Function3f46f
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurPartySpecies]
push af
ld a, [BattleMonSpecies]
ld [CurPartySpecies], a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, BattleMonDVs
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef GetUnownLetter
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, $9310
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
predef GetBackpic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
ld [CurPartySpecies], a
ret
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
; 3f46f
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
Function3f46f: ; 3f46f
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hBattleTurn]
push af
xor a
ld [hBattleTurn], a
ld a, BANK(BattleAnimCommands)
rst FarCall
pop af
ld [hBattleTurn], a
ret
; 3f47c
Function3f47c: ; 3f47c
ld a, [EnemySubStatus4]
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
bit SUBSTATUS_SUBSTITUTE, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, BattleAnimCmd_DD
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
jr nz, Function3f4b4
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Function3f486: ; 3f486
ld a, [$c6fa]
and a
ld hl, BattleAnimCmd_E2
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
jr nz, Function3f4b4
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurPartySpecies]
push af
ld a, [EnemyMonSpecies]
ld [CurSpecies], a
ld [CurPartySpecies], a
call GetBaseData
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonDVs
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef GetUnownLetter
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, VTiles2
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef Function5108b
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
ld [CurPartySpecies], a
ret
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
; 3f4b4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
clean up some labels in battle asm
2013-12-31 01:09:00 -08:00
Function3f4b4: ; 3f4b4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hBattleTurn]
push af
call SetEnemyTurn
ld a, BANK(BattleAnimCommands)
rst FarCall
pop af
ld [hBattleTurn], a
ret
; 3f4c1
StartBattle: ; 3f4c1
ld a, [PartyCount]
and a
ret z
ld a, [TimeOfDayPal]
push af
call Function3f4dd
call Function3c000
call Function3f69e
pop af
ld [TimeOfDayPal], a
scf
ret
; 3f4d9
Function3f4d9: ; 3f4d9
call Function3c000
ret
; 3f4dd
Function3f4dd: ; 3f4dd
callba Function106050
call Function3f54e
xor a
ld [TempBattleMonSpecies], a
ld [$d0d2], a
xor a
ld [$ffde], a
callba PlayBattleMusic
callba Function2ee18
callba Function2ee2f
call Function2ed3
callba ClearBattleRAM
call Function3f55e
call Function3f568
ld b, $0
call GetSGBLayout
ld hl, rLCDC
res 6, [hl]
call Function3fb6c
call BattleStartMessage
ld hl, rLCDC
set 6, [hl]
xor a
ld [hBGMapMode], a
call EmptyBattleTextBox
hlcoord 9, 7
ld bc, 5 << 8 + 11
call ClearBox
hlcoord 1, 0
ld bc, 4 << 8 + 10
call ClearBox
call ClearSprites
ld a, [IsInBattle]
cp $1
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
call z, UpdateEnemyHUD
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
ld [hBGMapMode], a
ret
; 3f54e
Function3f54e: ; 3f54e
ld a, [OtherTrainerClass]
and a
jr nz, .asm_3f55a
ld a, [$d22e]
ld [CurPartySpecies], a
.asm_3f55a
ld [TempEnemyMonSpecies], a
ret
; 3f55e
Function3f55e: ; 3f55e
ld a, [OtherTrainerClass]
and a
jp nz, Function3f594
jp Function3f607
; 3f568
Function3f568: ; 3f568
ld a, [rSVBK]
push af
ld a, $6
ld [rSVBK], a
ld hl, $d000
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld bc, $400
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $2
call ByteFill
ld a, [rVBK]
push af
ld a, $1
ld [rVBK], a
ld de, $d000
ld hl, VBGMap0
ld bc, $0f40
call Request2bpp
pop af
ld [rVBK], a
pop af
ld [rSVBK], a
ret
; 3f594
Function3f594: ; 3f594
ld [TrainerClass], a
callba Function10606a
xor a
ld [TempEnemyMonSpecies], a
callab Function3957b
Name and comment the trainer party reader. Reads the contents of trainers/trainers.asm.
2014-06-14 22:33:23 -07:00
callab ReadTrainerParty
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [TrainerClass]
Name and comment the trainer party reader. Reads the contents of trainers/trainers.asm.
2014-06-14 22:33:23 -07:00
cp RIVAL1
jr nz, .ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [OTPartyMon1Item], a
Name and comment the trainer party reader. Reads the contents of trainers/trainers.asm.
2014-06-14 22:33:23 -07:00
.ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, VTiles2
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
callab GetTrainerPic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [$ffad], a
dec a
ld [$c6e6], a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 12, 0
Name and comment the trainer party reader. Reads the contents of trainers/trainers.asm.
2014-06-14 22:33:23 -07:00
lb bc, 7, 7
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef FillBox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $ff
ld [CurOTMon], a
Name and comment the trainer party reader. Reads the contents of trainers/trainers.asm.
2014-06-14 22:33:23 -07:00
ld a, TRAINER_BATTLE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [IsInBattle], a
Name and comment the trainer party reader. Reads the contents of trainers/trainers.asm.
2014-06-14 22:33:23 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call IsJohtoGymLeader
jr nc, .asm_3f606
xor a
ld [CurPartyMon], a
ld a, [PartyCount]
ld b, a
.asm_3f5ea
push bc
Name and comment the trainer party reader. Reads the contents of trainers/trainers.asm.
2014-06-14 22:33:23 -07:00
ld a, PartyMon1HP - PartyMon1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
ld a, [hli]
or [hl]
jr z, .asm_3f5fc
ld c, $4
callab ChangeHappiness
.asm_3f5fc
pop bc
dec b
jr z, .asm_3f606
ld hl, CurPartyMon
inc [hl]
jr .asm_3f5ea
.asm_3f606
ret
; 3f607
Function3f607: ; 3f607
ld a, $1
ld [IsInBattle], a
callba Function10605d
call LoadEnemyMon
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, EnemyMonMoves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, $c735
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld bc, NUM_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, EnemyMonPP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, $c739
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld bc, NUM_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, EnemyMonDVs
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef GetUnownLetter
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurPartySpecies]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp UNOWN
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nz, .asm_3f648
ld a, [$def4]
and a
jr nz, .asm_3f648
ld a, [UnownLetter]
ld [$def4], a
.asm_3f648
ld de, VTiles2
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef Function5108b
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [TrainerClass], a
ld [$ffad], a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 12, 0
Name and comment the trainer party reader. Reads the contents of trainers/trainers.asm.
2014-06-14 22:33:23 -07:00
lb bc, 7, 7
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef FillBox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3f662
Function3f662: ; 3f662
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld hl, EnemyMonMoves
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, $d25e
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, NUM_MOVES
even more battle labels
2014-01-05 04:28:55 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
inc de
ld [hli], a
and a
even more battle labels
2014-01-05 04:28:55 -08:00
jr z, .clearpp
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
push hl
even more battle labels
2014-01-05 04:28:55 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
dec a
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, Moves + MOVE_PP
Use constants for move struct positioning. This eliminates the need for arbitrary move labels like Move2 and Move1 that don't have anything to do with their respective moves.
2014-06-10 23:23:55 -07:00
ld bc, MOVE_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call AddNTimes
even more battle labels
2014-01-05 04:28:55 -08:00
ld a, BANK(Moves)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetFarByte
pop hl
even more battle labels
2014-01-05 04:28:55 -08:00
ld bc, EnemyMonPP - (EnemyMonMoves + 1)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld [hl], a
even more battle labels
2014-01-05 04:28:55 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
pop bc
even more battle labels
2014-01-05 04:28:55 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec b
even more battle labels
2014-01-05 04:28:55 -08:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
even more battle labels
2014-01-05 04:28:55 -08:00
.clear
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [hli], a
even more battle labels
2014-01-05 04:28:55 -08:00
.clearpp
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
push hl
even more battle labels
2014-01-05 04:28:55 -08:00
ld bc, EnemyMonPP - (EnemyMonMoves + 1)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
xor a
ld [hl], a
pop hl
pop bc
dec b
even more battle labels
2014-01-05 04:28:55 -08:00
jr nz, .clear
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3f69e
Function3f69e: ; 3f69e
call Function3f6a5
call Function3f6d0
ret
; 3f6a5
Function3f6a5: ; 3f6a5
ld a, [InLinkBattle]
and a
jr z, .asm_3f6b7
call Function3f759
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld c, 150
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
call Function3f77c
ret
.asm_3f6b7
ld a, [$d0ee]
and $f
ret nz
call Function3f71d
xor a
ld [$d1e9], a
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef Function421e6
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
callba Function2ed44
ret
; 3f6d0
Function3f6d0: ; 3f6d0
call Function3f998
xor a
ld [Danger], a
ld [IsInBattle], a
ld [BattleType], a
ld [AttackMissed], a
ld [$d22e], a
ld [OtherTrainerClass], a
ld [$d266], a
ld [$d267], a
ld [$d232], a
ld [$d0d8], a
ld [$d0da], a
ld [$d0d9], a
ld [$d0d2], a
ld [CurMoveNum], a
ld [$d0db], a
ld [$d0d6], a
ld [$d0e4], a
ld [$d0e0], a
ld [$d0df], a
ld [$d0e1], a
ld hl, PlayerSubStatus1
ld b, $18
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
dec b
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call WaitSFX
ret
; 3f71d
Function3f71d: ; 3f71d
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld hl, wPayDayMoney
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
or [hl]
inc hl
or [hl]
ret z
ld a, [$c73d]
and a
jr z, .asm_3f73d
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld hl, wPayDayMoney + 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
sla [hl]
dec hl
rl [hl]
dec hl
rl [hl]
jr nc, .asm_3f73d
ld a, $ff
ld [hli], a
ld [hli], a
ld [hl], a
.asm_3f73d
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld hl, wPayDayMoney + 2
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld de, Money + 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d0be
ld hl, BattleText_0x80730
call StdBattleTextBox
ld a, [$cfc0]
bit 0, a
ret z
call ClearTileMap
call WhiteBGMap
ret
; 3f759
Function3f759: ; 3f759
callba Function1060df
callba Function106187
ld a, [CurOTMon]
ld hl, OTPartyMon1Status
call GetPartyLocation
ld a, [EnemyMonStatus]
ld [hl], a
call ClearTileMap
callba Function2c1b2
ret
; 3f77c
Function3f77c: ; 3f77c
callba Function3d2e0
jp c, Function3f80f
call Function3f830
jr nz, .asm_3f797
ld hl, $cd2a
bit 4, [hl]
jr z, .asm_3f797
callba Function2b930
.asm_3f797
ld a, [$d0ee]
and $f
cp $1
jr c, .asm_3f7ad
jr z, .asm_3f7b8
callba Function106107
ld de, .Draw
jr .asm_3f7c3
.asm_3f7ad
callba Function1060fb
ld de, .Win
jr .asm_3f7c3
.asm_3f7b8
callba Function106101
ld de, .Lose
jr .asm_3f7c3
.asm_3f7c3
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 6, 8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PlaceString
callba Function106187
ld c, $c8
call DelayFrames
ld a, $1
call GetSRAMBank
call Function3fa42
call Function3f85f
call CloseSRAM
call Function3f830
jr z, .asm_3f7ee
call Functiona80
call ClearTileMap
ret
.asm_3f7ee
ld c, $c8
call DelayFrames
call ClearTileMap
ret
; 3f7f7
.Win
db "YOU WIN@"
.Lose
db "YOU LOSE@"
.Draw
db " DRAW@"
; 3f80f
Function3f80f: ; 3f80f
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 6, 8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, .Invalid
call PlaceString
ld c, $c8
call DelayFrames
call ClearTileMap
ret
; 3f821
.Invalid
db "INVALID BATTLE@"
; 3f830
Function3f830: ; 3f830
ld a, [InLinkBattle]
cp $4
ret
; 3f836
Function3f836: ; 3f836
ld a, $1
call GetSRAMBank
call Function3f85f
call CloseSRAM
ld hl, AttrMap
xor a
ld bc, $0168
call ByteFill
call Function3200
ld b, $8
call GetSGBLayout
call Function32f9
ld c, $8
call DelayFrames
call Functiona80
ret
; 3f85f
Function3f85f: ; 3f85f
call ClearTileMap
call ClearSprites
call .asm_3f8e0
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 0, 8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, $5
ld de, $b268
.asm_3f870
push bc
push hl
push de
ld a, [de]
and a
jr z, .asm_3f8c9
ld a, [$d4b4]
and a
jr z, .asm_3f8c9
push hl
push hl
ld h, d
ld l, e
ld de, DefaultFlypoint
ld bc, $000a
call CopyBytes
ld a, $50
ld [de], a
inc de
ld bc, $0006
call CopyBytes
ld de, DefaultFlypoint
pop hl
call PlaceString
pop hl
ld de, $001a
add hl, de
push hl
ld de, $d00d
ld bc, $0204
call PrintNum
pop hl
ld de, $0005
add hl, de
push hl
ld de, $d00f
ld bc, $0204
call PrintNum
pop hl
ld de, $0005
add hl, de
ld de, $d011
ld bc, $0204
call PrintNum
jr .asm_3f8cf
.asm_3f8c9
ld de, .Format
call PlaceString
.asm_3f8cf
pop hl
ld bc, $0012
add hl, bc
ld d, h
ld e, l
pop hl
ld bc, $0028
add hl, bc
pop bc
dec b
jr nz, .asm_3f870
ret
.asm_3f8e0
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, .Record
call PlaceString
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 0, 6
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, .Result
call PlaceString
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 0, 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, .Total
call PlaceString
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 6, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, $b260
call .asm_3f92b
jr c, .asm_3f92a
ld bc, $0204
call PrintNum
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 11, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, $b262
call .asm_3f92b
ld bc, $0204
call PrintNum
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 16, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, $b264
call .asm_3f92b
ld bc, $0204
call PrintNum
.asm_3f92a
ret
.asm_3f92b
ld a, [$d4b4]
and a
ret nz
ld de, .Scores
call PlaceString
scf
ret
; 3f938
.Scores
db " 0 0 0@"
; 3f947
.Format ; 3f947
db " --- ", $22, " - - -@"
.Record ; 3f964
db $52, "'s RECORD@"
.Result ; 3f96e
db "RESULT WIN LOSE DRAW@"
.Total ; 3f983
db "TOTAL WIN LOSE DRAW@"
; 3f998
Function3f998: ; 3f998
ld a, [BattleType]
cp BATTLETYPE_ROAMING
jr nz, .asm_3f9c4
ld a, [$d0ee]
and $f
jr z, .asm_3f9af
call GetRoamMonHP
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [EnemyMonHP + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
jr .asm_3f9ca
.asm_3f9af
call GetRoamMonHP
ld [hl], $0
call GetRoamMonMapGroup
ld [hl], $ff
call GetRoamMonMapNumber
ld [hl], $ff
call GetRoamMonSpecies
ld [hl], $0
ret
.asm_3f9c4
call BattleRandom
and $f
ret nz
.asm_3f9ca
callab Function2a30d
ret
; 3f9d1
GetRoamMonMapGroup: ; 3f9d1
ld a, [TempEnemyMonSpecies]
ld b, a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wRoamMon1Species]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon1MapGroup
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wRoamMon2Species]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon2MapGroup
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon3MapGroup
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3f9e9
GetRoamMonMapNumber: ; 3f9e9
ld a, [TempEnemyMonSpecies]
ld b, a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wRoamMon1Species]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon1MapNumber
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wRoamMon2Species]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon2MapNumber
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon3MapNumber
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3fa01
GetRoamMonHP: ; 3fa01
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
; output: hl = wRoamMonHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [TempEnemyMonSpecies]
ld b, a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wRoamMon1Species]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon1HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wRoamMon2Species]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon2HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon3HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3fa19
GetRoamMonDVs: ; 3fa19
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
; output: hl = wRoamMonDVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [TempEnemyMonSpecies]
ld b, a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wRoamMon1Species]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon1DVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wRoamMon2Species]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon2DVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon3DVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3fa31
GetRoamMonSpecies: ; 3fa31
ld a, [TempEnemyMonSpecies]
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon1Species
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp [hl]
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon2Species
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp [hl]
ret z
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld hl, wRoamMon3Species
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3fa42
Function3fa42: ; 3fa42
ld hl, $d276
ld de, StringBuffer1
ld bc, $0002
call CopyBytes
ld hl, $d26b
ld bc, $000a
call CopyBytes
ld hl, $b254
call Function3faa0
ld hl, $b266
ld d, $5
.asm_3fa62
push hl
inc hl
inc hl
ld a, [hl]
dec hl
dec hl
and a
jr z, .asm_3fa85
push de
ld bc, $000c
ld de, StringBuffer1
call CompareLong
pop de
pop hl
jr c, .asm_3fa99
ld bc, $0012
add hl, bc
dec d
jr nz, .asm_3fa62
ld bc, $ffee
add hl, bc
push hl
.asm_3fa85
ld d, h
ld e, l
ld hl, StringBuffer1
ld bc, $000c
call CopyBytes
ld b, $6
xor a
.asm_3fa93
ld [de], a
inc de
dec b
jr nz, .asm_3fa93
pop hl
.asm_3fa99
call Function3faa0
call Function3fac8
ret
; 3faa0
Function3faa0: ; 3faa0
ld a, [$d0ee]
and $f
cp $1
ld bc, $000d
jr c, .asm_3fab4
ld bc, $000f
jr z, .asm_3fab4
ld bc, $0011
.asm_3fab4
add hl, bc
call Function3fabe
ret nc
inc [hl]
ret nz
dec hl
inc [hl]
ret
; 3fabe
Function3fabe: ; 3fabe
dec hl
ld a, [hl]
inc hl
cp $27
ret c
ld a, [hl]
cp $f
ret
; 3fac8
Function3fac8: ; 3fac8
ld b, $5
ld hl, $b277
ld de, DefaultFlypoint
.asm_3fad0
push bc
push de
push hl
call Function3fb54
pop hl
ld a, e
pop de
ld [de], a
inc de
ld a, b
ld [de], a
inc de
ld a, c
ld [de], a
inc de
ld bc, $0012
add hl, bc
pop bc
dec b
jr nz, .asm_3fad0
ld b, $0
ld c, $1
.asm_3faed
ld a, b
add b
add b
ld e, a
ld d, $0
ld hl, DefaultFlypoint
add hl, de
push hl
ld a, c
add c
add c
ld e, a
ld d, $0
ld hl, DefaultFlypoint
add hl, de
ld d, h
ld e, l
pop hl
push bc
ld c, $3
call StringCmp
pop bc
jr z, .asm_3fb10
jr nc, .asm_3fb1f
.asm_3fb10
inc c
ld a, c
cp $5
jr nz, .asm_3faed
inc b
ld c, b
inc c
ld a, b
cp $4
jr nz, .asm_3faed
ret
.asm_3fb1f
push bc
ld a, b
ld bc, $0012
ld hl, $b266
call AddNTimes
push hl
ld de, DefaultFlypoint
ld bc, $0012
call CopyBytes
pop hl
pop bc
push hl
ld a, c
ld bc, $0012
ld hl, $b266
call AddNTimes
pop de
push hl
ld bc, $0012
call CopyBytes
ld hl, DefaultFlypoint
ld bc, $0012
pop de
call CopyBytes
ret
; 3fb54
Function3fb54: ; 3fb54
ld e, $0
ld a, [hld]
ld c, a
ld a, [hld]
ld b, a
ld a, [hld]
add c
ld c, a
ld a, [hld]
adc b
ld b, a
jr nc, .asm_3fb63
inc e
.asm_3fb63
ld a, [hld]
add c
ld c, a
ld a, [hl]
adc b
ld b, a
ret nc
inc e
ret
; 3fb6c
Function3fb6c: ; 3fb6c
call Function3fbf8
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 0, 12
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, $4
ld c, $12
call TextBox
callba MobileTextBorder
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 5
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld bc, $0307
call ClearBox
call Functione51
call Function3ed9f
call Function3fbd6
xor a
ld [$ffde], a
ld [hSCY], a
ld a, $90
ld [hWY], a
ld [rWY], a
call WaitBGMap
xor a
ld [hBGMapMode], a
callba Function4e980
ld a, $1
ld [hBGMapMode], a
ld a, $31
ld [$ffad], a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 2, 6
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld bc, $0606
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef FillBox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [hWY], a
ld [rWY], a
call WaitBGMap
call HideSprites
ld b, $1
call GetSGBLayout
call Function32f9
ld a, $90
ld [hWY], a
xor a
ld [hSCX], a
ret
; 3fbd6
Function3fbd6: ; 3fbd6
ld a, [rSVBK]
push af
ld a, $6
ld [rSVBK], a
ld hl, $d000
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld bc, $400
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $7f
call ByteFill
ld de, $d000
ld hl, VBGMap0
ld bc, $0f40
call Request2bpp
pop af
ld [rSVBK], a
ret
; 3fbf8
Function3fbf8: ; 3fbf8
call GetBattleBackpic
call Function3fc30
ret
; 3fbff
GetBattleBackpic: ; 3fbff
; Load the player character's backpic (6x6) into VRAM starting from $9310.
; Special exception for Dude.
ld b, BANK(DudeBackpic)
ld hl, DudeBackpic
ld a, [BattleType]
cp BATTLETYPE_TUTORIAL
jr z, .Decompress
; What gender are we?
ld a, [$d45b]
bit 2, a
jr nz, .Chris
ld a, [PlayerGender]
bit 0, a
jr z, .Chris
; It's a girl.
callba GetKrisBackpic
ret
.Chris
; It's a boy.
ld b, BANK(ChrisBackpic)
ld hl, ChrisBackpic
.Decompress
ld de, $9310
ld c, $31
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef DecompressPredef
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3fc30
Function3fc30: ; 3fc30
ld a, [rSVBK]
push af
ld a, $6
ld [rSVBK], a
ld hl, VTiles0
ld de, $9310
ld a, [hROMBank]
ld b, a
ld c, $31
call Get2bpp
pop af
ld [rSVBK], a
call Function3fc5b
ld a, $31
ld [$ffad], a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 2, 6
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld bc, $0606
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef FillBox
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3fc5b
Function3fc5b: ; 3fc5b
ld hl, Sprites
xor a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld [$ffaf], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, $6
ld e, $a8
.asm_3fc65
ld c, $3
ld d, $40
.asm_3fc69
ld [hl], d
inc hl
ld [hl], e
inc hl
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [$ffaf]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
inc a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld [$ffaf], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
ld [hli], a
ld a, d
add $8
ld d, a
dec c
jr nz, .asm_3fc69
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [$ffaf]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add $3
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld [$ffaf], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, e
add $8
ld e, a
dec b
jr nz, .asm_3fc65
ret
; 3fc8b
BattleStartMessage: ; 3fc8b
ld a, [IsInBattle]
dec a
jr z, .asm_3fcaa
ld de, SFX_SHINE
call PlaySFX
call WaitSFX
ld c, 20
call DelayFrames
callba Function39939
ld hl, WantsToBattleText
jr .asm_3fd0e
.asm_3fcaa
call Function3da79
jr nc, .asm_3fcc2
xor a
ld [$cfca], a
ld a, 1
ld [hBattleTurn], a
ld a, 1
ld [$c689], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_SEND_OUT_MON
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ee17
.asm_3fcc2
callba CheckSleepingTreeMon
jr c, .asm_3fceb
callba CheckBattleScene
jr c, .asm_3fce0
hlcoord 12, 0
ld d, $0
ld e, $1
Use a predef macro that takes labels instead of juggling constants. Besides making predefs convenient, naming a predef no longer requires adding or renaming a predef constant. This also lets predefs be rearranged at will.
2014-06-16 11:20:01 -07:00
predef Functiond008e
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr .asm_3fceb
.asm_3fce0
ld a, $0f
ld [CryTracks], a
ld a, [TempEnemyMonSpecies]
Name cry functions in home.asm.
2014-07-18 10:25:03 -07:00
call PlayStereoCry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3fceb
ld a, [BattleType]
cp BATTLETYPE_FISH
jr nz, .asm_3fcfd
callba Function106086
ld hl, HookedPokemonAttackedText
jr .asm_3fd0e
.asm_3fcfd
ld hl, PokemonFellFromTreeText
cp BATTLETYPE_TREE
jr z, .asm_3fd0e
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
ld hl, WildCelebiAppearedText
cp BATTLETYPE_CELEBI
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3fd0e
ld hl, WildPokemonAppearedText
.asm_3fd0e
push hl
callba Function2c000
pop hl
call StdBattleTextBox
call Function3f830
ret nz
ld c, $2
callba Function4ea0a
ret
; 3fd26
Reference in New Issue Copy Permalink