pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-09-09 09:51:34 -07:00
Code Issues Packages Projects Releases Wiki Activity
d8aa438644
pokecrystal-board/battle/core.asm

9606 lines
137 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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc664], a
ld [wc6fc], a
ld [wd0ec], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [BattleEnded], a
inc a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd264], a
Partymon structs for opponent and player parties.
2014-02-22 21:37:09 -08:00
ld hl, OTPartyMon1HP
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld bc, PARTYMON_STRUCT_LENGTH - 1
ld d, BATTLEACTION_SWITCH1 - 1
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc d
ld a, [hli]
or [hl]
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nz, .alive
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.alive
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, d
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld [wBattleAction], a
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .not_linked
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $2
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .player_2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.not_linked
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .wild
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc718], 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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.wild
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
ld c, 40
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrames
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.player_2
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
call CheckPlayerPartyForFitPkmn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, d
and a
jp z, LostBattle
changed more labels
2015-09-09 16:27:07 -07:00
call Call_LoadTempTileMapToTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [BattleType]
changed more labels
2015-09-09 16:27:07 -07:00
cp BATTLETYPE_DEBUG
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp z, .tutorial_debug
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_TUTORIAL
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp z, .tutorial_debug
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [CurPartyMon], a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.loop2
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
call CheckIfPartyHasPkmnToBattleWith
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nz, .alive2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, CurPartyMon
inc [hl]
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr .loop2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.alive2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurBattleMon]
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [LastPlayerMon], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d57a
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call InitBattleMon
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call ResetPlayerStatLevels
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
call SendOutPkmnText
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
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SpikesDamage
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .not_linked_2
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $2
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nz, .not_linked_2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc718], 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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.not_linked_2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp Function3c12f
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.tutorial_debug
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp BattleMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3c0e5
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
WildFled_EnemyFled_LinkBattleCanceled: ; 3c0e5
changed more labels
2015-09-09 16:27:07 -07:00
call Call_LoadTempTileMapToTileMap
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and $c0
add $2
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld [wBattleResult], a
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
change more labelss
2015-08-24 16:56:30 -07:00
ld hl, BattleText_WildFled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3c115
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and $c0
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld [wBattleResult], a
change more labelss
2015-08-24 16:56:30 -07:00
ld hl, BattleText_EnemyFled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d2e0
jr nc, .asm_3c115
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wcd2a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
bit 4, [hl]
jr nz, .asm_3c118
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
change more labelss
2015-08-24 16:56:30 -07:00
ld hl, BattleText_LinkErrorBattleCanceled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3c115
call StdBattleTextBox
.asm_3c118
So very jumb
2015-10-19 13:49:29 -07:00
call StopDangerSound
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d2e0
jr c, .asm_3c126
ld de, SFX_RUN
call PlaySFX
.asm_3c126
call SetPlayerTurn
ld a, 1
ld [BattleEnded], a
ret
; 3c12f
change more labelss
2015-08-24 16:56:30 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd264], a
ld [wc73f], a
ld [wc740], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd232] ; 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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
call DetermineMoveOrder
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd232]
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
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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $1
So very jumb
2015-10-19 13:49:29 -07:00
jr z, .CheckEnemyFirst
call CheckFaint_PlayerThenEnemy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
call Function3ca26
So very jumb
2015-10-19 13:49:29 -07:00
call CheckFaint_PlayerThenEnemy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
call HandleWeather
So very jumb
2015-10-19 13:49:29 -07:00
call CheckFaint_PlayerThenEnemy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
call Function3c874
So very jumb
2015-10-19 13:49:29 -07:00
call CheckFaint_PlayerThenEnemy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
call Function3c801
So very jumb
2015-10-19 13:49:29 -07:00
call CheckFaint_PlayerThenEnemy
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
So very jumb
2015-10-19 13:49:29 -07:00
jr .NoMoreFaintingConditions
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
So very jumb
2015-10-19 13:49:29 -07:00
.CheckEnemyFirst
call CheckFaint_EnemyThenPlayer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
call Function3ca26
So very jumb
2015-10-19 13:49:29 -07:00
call CheckFaint_EnemyThenPlayer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
call HandleWeather
So very jumb
2015-10-19 13:49:29 -07:00
call CheckFaint_EnemyThenPlayer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
call Function3c874
So very jumb
2015-10-19 13:49:29 -07:00
call CheckFaint_EnemyThenPlayer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
call Function3c801
So very jumb
2015-10-19 13:49:29 -07:00
call CheckFaint_EnemyThenPlayer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
So very jumb
2015-10-19 13:49:29 -07:00
.NoMoreFaintingConditions
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3c8eb
call Function3c93c
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
call HanleDefrost
call HandleSafeguard
call HandleScreens
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3de97
call Function3dcf9
call UpdateBattleMonInParty
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp Function3c4df
; 3c23c
So very jumb
2015-10-19 13:49:29 -07:00
CheckFaint_PlayerThenEnemy: ; 3c23c
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasPlayerFainted
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .PlayerNotFainted
call HandlePlayerMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [BattleEnded]
and a
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .BattleIsOver
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
So very jumb
2015-10-19 13:49:29 -07:00
.PlayerNotFainted
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasEnemyFainted
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .BattleContinues
call HandleEnemyMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [BattleEnded]
and a
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .BattleIsOver
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
So very jumb
2015-10-19 13:49:29 -07:00
.BattleContinues
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
So very jumb
2015-10-19 13:49:29 -07:00
.BattleIsOver
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
; 3c25c
So very jumb
2015-10-19 13:49:29 -07:00
CheckFaint_EnemyThenPlayer: ; 3c25c
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasEnemyFainted
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .EnemyNotFainted
call HandleEnemyMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [BattleEnded]
and a
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .BattleIsOver
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
So very jumb
2015-10-19 13:49:29 -07:00
.EnemyNotFainted
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasPlayerFainted
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .BattleContinues
call HandlePlayerMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [BattleEnded]
and a
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .BattleIsOver
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
So very jumb
2015-10-19 13:49:29 -07:00
.BattleContinues
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
So very jumb
2015-10-19 13:49:29 -07:00
.BattleIsOver
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
; 3c27c
Function3c27c: ; 3c27c
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd265], 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
BattleCommand labels copied from macros
2015-11-06 11:45:10 -08:00
callba BattleCommand_AttackUp2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
pop hl
ld [hl], a
call GetItemName
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_UsersStringBuffer1Activated
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
More battle command labels
2015-11-06 17:55:16 -08:00
callab BattleCommand_StatUpMessage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
bit SUBSTATUS_CONFUSED, a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfca], 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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .not_linked
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [wBattleAction]
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
cp BATTLEACTION_FORFEIT
jr z, .forfeit
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.not_linked
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.forfeit
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
call WildFled_EnemyFled_LinkBattleCanceled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
; 3c314
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
DetermineMoveOrder: ; 3c314
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .use_move
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [wBattleAction]
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
cp BATTLEACTION_E
jr z, .use_move
cp BATTLEACTION_D
jr z, .use_move
sub BATTLEACTION_SWITCH1
jr c, .use_move
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd0ec]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $2
Some battle labels
2015-11-05 16:13:09 -08:00
jr nz, .switch
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $2
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .player_2
Some battle labels
2015-11-05 16:13:09 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
cp 1 + (50 percent)
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp c, .player_first
jp .enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.player_2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
cp 1 + (50 percent)
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp c, .enemy_first
jp .player_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Some battle labels
2015-11-05 16:13:09 -08:00
.switch
Better trainer AI comments and finish off trainer attributes.
2014-08-13 19:44:56 -07:00
callab AI_Switch
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SpikesDamage
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp .enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.use_move
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd0ec]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp nz, .player_first
comment move priority functions
2013-12-30 20:32:37 -08:00
call CompareMovePriority
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .equal_priority
jp c, .player_first ; player goes first
jp .enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.equal_priority
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nz, .player_no_quick_claw
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp HELD_QUICK_CLAW
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .both_have_quick_claw
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
cp e
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nc, .speed_check
jp .player_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.player_no_quick_claw
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
cp HELD_QUICK_CLAW
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nz, .speed_check
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
cp c
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nc, .speed_check
jp .enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.both_have_quick_claw
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $2
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .player_2b
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
cp c
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp c, .enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
cp e
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp c, .player_first
jr .speed_check
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.player_2b
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
cp e
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp c, .player_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
cp c
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp c, .enemy_first
jr .speed_check
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.speed_check
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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld c, 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StringCmp
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .speed_tie
jp nc, .player_first
jp .enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.speed_tie
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $2
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .player_2c
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
cp 1 + (50 percent)
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp c, .player_first
jp .enemy_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.player_2c
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
cp 1 + (50 percent)
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp c, .enemy_first
.player_first
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
; 3c3f3
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.enemy_first: ; 3c3f3
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wdc79]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jr nz, .asm_3c40e
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and $c0
add $2
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld [wBattleResult], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
.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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd0ec]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd235], 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
changed name of some labels
2015-10-10 04:45:39 -07:00
call MoveSelectionScreen
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
changed more labels
2015-09-09 16:27:07 -07:00
call Call_LoadTempTileMapToTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc732], 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
Some battle labels
2015-11-05 16:13:09 -08:00
ld [wPlayerRageCounter], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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
Some battle labels
2015-11-05 16:13:09 -08:00
ld [wPlayerRageCounter], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Some battle labels
2015-11-05 16:13:09 -08:00
ld [wPlayerRageCounter], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_TargetsEncoreEnded
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
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_TargetsEncoreEnded
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp StdBattleTextBox
; 3c543
Function3c543: ; 3c543
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
jr nz, .Stay
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc731]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
cp 1 + (50 percent)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
cp 1 + (10 percent)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3c543
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
jp c, WildFled_EnemyFled_LinkBattleCanceled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
ld a, $1
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc70f], a
change more labelss
2015-08-24 16:56:30 -07:00
callab AI_SwitchOrTryItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr c, .asm_3c62f
call Function3c6de
call Function3d2e0
ret c
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd232]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasPlayerFainted
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandlePlayerMonFaint
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasEnemyFainted
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandleEnemyMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3c62f
call SetEnemyTurn
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call ResidualDamage
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandleEnemyMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call RefreshBattleHuds
call Function3c6cf
call Function3d2e0
ret c
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd232]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasEnemyFainted
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandleEnemyMonFaint
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasPlayerFainted
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandlePlayerMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call ResidualDamage
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandlePlayerMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call RefreshBattleHuds
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0ec], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3c664
Function3c664: ; 3c664
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc70f], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
change more labelss
2015-08-24 16:56:30 -07:00
callab AI_SwitchOrTryItem
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
call Function3c6cf
pop bc
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd232]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandleEnemyMonFaint
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasPlayerFainted
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandlePlayerMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
call SetPlayerTurn
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call ResidualDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandlePlayerMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
call RefreshBattleHuds
pop af
jr c, .asm_3c6be
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3c543
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
jp c, WildFled_EnemyFled_LinkBattleCanceled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3c6de
call Function3d2e0
ret c
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd232]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasPlayerFainted
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandlePlayerMonFaint
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasEnemyFainted
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandleEnemyMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3c6be
call SetEnemyTurn
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call ResidualDamage
So very jumb
2015-10-19 13:49:29 -07:00
jp z, HandleEnemyMonFaint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call RefreshBattleHuds
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0ec], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
jr CheckIfHPIsZero
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
CheckIfHPIsZero: ; 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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfca], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
More battle command labels
2015-11-06 17:55:16 -08:00
call SubtractHPFromUser
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
.did_psn_brn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
call HasUserFainted
jp z, .fainted
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, BATTLE_VARS_SUBSTATUS4
Rename _GetBattleVar -> GetBattleVarAddr. Functions prefixed with _ imply they're private. The real purpose of this function is to use an address, rather than saving a few cycles on push/pop.
2014-06-14 00:34:57 -07:00
call GetBattleVarAddr
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
bit SUBSTATUS_LEECH_SEED, [hl]
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfca], 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
More battle command labels
2015-11-06 17:55:16 -08:00
call SubtractHPFromUser
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfca], 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
More battle command labels
2015-11-06 17:55:16 -08:00
call SubtractHPFromUser
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld hl, HasANightmareText
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfca], 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
More battle command labels
2015-11-06 17:55:16 -08:00
call SubtractHPFromUser
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld hl, HurtByCurseText
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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd265], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld hl, PerishCountText
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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ret z
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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wc730
ld de, wc72e
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_3c8a0
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wc731
ld de, wc72f
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd265], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfca], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
More battle command labels
2015-11-06 17:55:16 -08:00
call SubtractHPFromUser
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_UsersHurtByStringBuffer1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr .asm_3c8e1
.asm_3c8de
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_UserWasReleasedFromStringBuffer1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd265], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetItemName
ld a, b
use constants for berserk gene, kings rock, scope lens effects
2014-01-19 21:07:51 -08:00
cp HELD_LEFTOVERS
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nz
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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld de, wc739
ld hl, wc735
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
jr z, .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]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd265], 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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd265]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd265], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [hl], a
call Function3df12
ld a, [hBattleTurn]
and a
jr z, .asm_3ca12
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
jr z, .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
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_UserRecoveredPPUsing
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp StdBattleTextBox
; 3ca26
Function3ca26: ; 3ca26
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wc71d
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_3ca4c
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wc71e
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
HanleDefrost: ; 3ca8f
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc73f]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
call BattleRandom
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
cp 10 percent
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nc
xor a
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc740]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
call BattleRandom
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
cp 10 percent
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nc
xor a
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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
jr z, .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
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
HandleSafeguard: ; 3cafb
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, PlayerSafeguardCount
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec [hl]
ret nz
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
res SCREENS_SAFEGUARD, a
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, EnemySafeguardCount
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec [hl]
ret nz
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
res SCREENS_SAFEGUARD, a
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
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_SafeguardFaded
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp StdBattleTextBox
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
HandleScreens: ; 3cb36
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_PkmnnLightScreenFell
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfca], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_IN_SANDSTORM
changed more labels
2015-09-09 16:27:07 -07:00
call Call_PlayBattleAnim
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetEighthMaxHP
More battle command labels
2015-11-06 17:55:16 -08:00
call SubtractHPFromUser
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld hl, SandstormHitsText
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
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld h, [hl]
ld l, a
jp StdBattleTextBox
; 3cc2d
.WeatherMessages
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
dw BattleText_RainContinuesToFall
dw BattleText_TheSunlightIsStrong
dw BattleText_TheSandstormRages
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.WeatherEndedMessages
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
dw BattleText_TheRainStopped
dw BattleText_TheSunlightFaded
dw BattleText_TheSandstormSubsided
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3cc39
More battle command labels
2015-11-06 17:55:16 -08:00
SubtractHPFromTarget: ; 3cc39
call SubtractHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp Function3cd3c
; 3cc3f
More battle command labels
2015-11-06 17:55:16 -08:00
SubtractHPFromUser: ; 3cc3f
changed more labels
2015-09-09 16:27:07 -07:00
; Subtract HP from Pkmn
More battle command labels
2015-11-06 17:55:16 -08:00
call SubtractHP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp Function3cd36
; 3cc45
More battle command labels
2015-11-06 17:55:16 -08:00
SubtractHP: ; 3cc45
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd1ec], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
sub c
ld [hld], a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd1ee], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd1ed], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
sbc b
ld [hl], a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd1ef], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret nc
changed more labels
2015-09-09 16:27:07 -07:00
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd1ec]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd1ed]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
xor a
ld [hli], a
ld [hl], a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd1ee], a
ld [wd1ef], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd10a], 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
So very jumb
2015-10-19 13:49:29 -07:00
HandleEnemyMonFaint: ; 3cd55
call FaintEnemyPokemon
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]
So very jumb
2015-10-19 13:49:29 -07:00
call z, FaintYourPokemon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc6f7], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ce01
changed more labels
2015-09-09 16:27:07 -07:00
call CheckPlayerPartyForFitPkmn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, d
and a
jp z, LostBattle
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .trainer
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [BattleEnded], a
ret
So very jumb
2015-10-19 13:49:29 -07:00
.trainer
call CheckEnemyTrainerDefeated
jp z, WinTrainerBattle
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
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
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
jp c, WildFled_EnemyFled_LinkBattleCanceled
More battle code cleanup. - Use more substatus constants. - Reformat some code to be 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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0ec], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3cf4a
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
jp z, WildFled_EnemyFled_LinkBattleCanceled
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0ec], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3cf4a
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
jp z, WildFled_EnemyFled_LinkBattleCanceled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0ec], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
ld [CurPartyMon], a
call Function3d2b3
.asm_3cdfc
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0ec], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3ce01
Function3ce01: ; 3ce01
call UpdateBattleMonInParty
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
jr z, .asm_3ce2f
jr .asm_3ce37
.asm_3ce2f
So very jumb
2015-10-19 13:49:29 -07:00
call StopDangerSound
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc6fd], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3ce37
ld hl, BattleMonHP
ld a, [hli]
or [hl]
jr nz, .asm_3ce47
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc6f7]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jr nz, .asm_3ce47
call Function3d1aa
.asm_3ce47
changed more labels
2015-09-09 16:27:07 -07:00
call CheckPlayerPartyForFitPkmn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, d
and a
ret z
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
changed more labels
2015-09-09 16:27:07 -07:00
call z, PlayVictoryMusic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call EmptyBattleTextBox
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and $c0
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld [wBattleResult], a
changed more labels
2015-09-09 16:27:07 -07:00
call ShareExperiencePoints
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld de, wc720
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld bc, $0007
call CopyBytes
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc71f], a
changed more labels
2015-09-09 16:27:07 -07:00
call GiveExperiencePoints
call ShareExperiencePoints
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc664]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
ld a, d
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc664], a
ld hl, wc720
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, EnemyMonBaseStats
ld bc, $0007
call CopyBytes
ld a, $1
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc71f], a
changed more labels
2015-09-09 16:27:07 -07:00
call GiveExperiencePoints
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc664], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3ceaa
changed more labels
2015-09-09 16:27:07 -07:00
ShareExperiencePoints: ; 3ceaa
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld bc, MON_HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hli]
or [hl]
pop bc
pop hl
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
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld bc, MON_ITEM
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
pop bc
ld a, [hl]
pop hl
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp EXP_SHARE
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
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld de, PARTYMON_STRUCT_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, de
pop de
dec b
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
So very jumb
2015-10-19 13:49:29 -07:00
StopDangerSound: ; 3ceec
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [Danger], a
ret
; 3cef1
So very jumb
2015-10-19 13:49:29 -07:00
FaintYourPokemon: ; 3cef1
call StopDangerSound
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
So very jumb
2015-10-19 13:49:29 -07:00
call PlayerMonFaintedAnimation
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 9, 7
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
lb bc, 5, 11
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_PkmnFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp StdBattleTextBox
; 3cf14
So very jumb
2015-10-19 13:49:29 -07:00
FaintEnemyPokemon: ; 3cf14
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call WaitSFX
ld de, SFX_KINESIS
call PlaySFX
So very jumb
2015-10-19 13:49:29 -07:00
call EnemyMonFaintedAnimation
Macro update, roam mon annotations Updated map and mapgroup macros to get around an rgbds bug. Legendary beast locale handling annotated and relabeled. Added a new constant NUM_ENGINE_FLAGS for use in the EngineFlagAction function. This will make it easier for modders to add or remove engine flags.
2015-07-25 11:25:37 -07:00
ld de, SFX_FAINT
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PlaySFX
hlcoord 1, 0
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
lb bc, 4, 10
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_EnemyPkmnFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp StdBattleTextBox
; 3cf35
So very jumb
2015-10-19 13:49:29 -07:00
CheckEnemyTrainerDefeated: ; 3cf35
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld de, PARTYMON_STRUCT_LENGTH
So very jumb
2015-10-19 13:49:29 -07:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
or [hl]
inc hl
or [hl]
dec hl
add hl, de
dec b
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
; 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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .not_linked
changed more labels
2015-09-09 16:27:07 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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]
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
cp BATTLEACTION_FORFEIT
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret z
changed more labels
2015-09-09 16:27:07 -07:00
call Call_LoadTempTileMapToTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.not_linked
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc718], 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
changed more labels
2015-09-09 16:27:07 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0ec], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
ret
; 3cfa4
So very jumb
2015-10-19 13:49:29 -07:00
WinTrainerBattle: ; 3cfa4
changed more labels
2015-09-09 16:27:07 -07:00
; Player won the battle
So very jumb
2015-10-19 13:49:29 -07:00
call StopDangerSound
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc6fd], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [BattleEnded], a
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ld a, b
changed more labels
2015-09-09 16:27:07 -07:00
call z, PlayVictoryMusic
More enumeration of constants, more annotations of scripts.
2015-07-15 12:48:44 -07:00
callab Battle_GetTrainerName
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_EnemyWasDefeated
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
changed more labels
2015-09-09 16:27:07 -07:00
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
call IsMobileBattle
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
jr z, .mobile
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
changed more labels
2015-09-04 13:30:40 -07:00
ld a, [InBattleTowerBattle]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
bit 0, a
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
jr nz, .battle_tower
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
jr nz, .skip_heal
Labels for the heal machine; spriteface constants.
2015-06-26 23:24:55 -07:00
predef HealParty
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
.skip_heal
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc2cc]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
bit 0, a
Corrected some mislabeled 1bpps
2015-11-04 12:35:29 -08:00
jr nz, .skip_win_loss_text
call PrintWinLossText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Corrected some mislabeled 1bpps
2015-11-04 12:35:29 -08:00
.skip_win_loss_text
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp Function3d02b
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
.mobile
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ebd8
ld c, $28
call DelayFrames
ld c, $4
callba Function4ea0a
ret
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
.battle_tower
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ebd8
ld c, $28
call DelayFrames
call EmptyBattleTextBox
ld c, $3
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
callba BattleTowerText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc73d]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Labels for "sent some to mom" text.
2015-06-11 09:57:45 -07:00
jr nc, .KeepItAll
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
Labels for "sent some to mom" text.
2015-06-11 09:57:45 -07:00
jr z, .KeepItAll
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, SentToMomTexts
dec a
ld c, a
ld b, 0
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld h, [hl]
ld l, a
jp StdBattleTextBox
Labels for "sent some to mom" text.
2015-06-11 09:57:45 -07:00
.KeepItAll
ld hl, GotMoneyForWinningText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp StdBattleTextBox
; 3d081
Function3d081: ; 3d081
push bc
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wc688
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wc688
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wc688
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
sla [hl]
dec hl
rl [hl]
dec hl
rl [hl]
ret nc
ld a, $ff
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
ret
; 3d0ab
SentToMomTexts: ; 3d0ab
Labels for "sent some to mom" text.
2015-06-11 09:57:45 -07:00
dw SentSomeToMomText
dw SentHalfToMomText
dw SentAllToMomText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 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
About time I got to these functions
2015-10-24 07:34:19 -07:00
callba MobileFn_106008
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
PlayVictoryMusic: ; 3d0ea
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push de
ld de, MUSIC_NONE
call PlayMusic
call DelayFrame
ld de, MUSIC_WILD_VICTORY
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
jr nz, .asm_3d113
push de
changed more labels
2015-09-09 16:27:07 -07:00
call ShareExperiencePoints
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc664]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
db -1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
So very jumb
2015-10-19 13:49:29 -07:00
HandlePlayerMonFaint: ; 3d14e
call FaintYourPokemon
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]
So very jumb
2015-10-19 13:49:29 -07:00
call z, FaintEnemyPokemon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc6f7], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d1aa
changed more labels
2015-09-09 16:27:07 -07:00
call CheckPlayerPartyForFitPkmn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, d
and a
jp z, LostBattle
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]
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .notfainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ce01
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .trainer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
ld [BattleEnded], a
ret
So very jumb
2015-10-19 13:49:29 -07:00
.trainer
call CheckEnemyTrainerDefeated
jp z, WinTrainerBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
So very jumb
2015-10-19 13:49:29 -07:00
.notfainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d1f8
jr nc, .asm_3d190
ld a, $1
ld [BattleEnded], a
ret
.asm_3d190
call Function3d227
call Function3d2e0
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
jp c, WildFled_EnemyFled_LinkBattleCanceled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, c
and a
ret nz
ld a, $1
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0ec], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3cf4a
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
jp z, WildFled_EnemyFled_LinkBattleCanceled
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wc664
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
ld c, HAPPINESS_FAINTED
; If TheirLevel > (YourLevel + 30), use a different parameter
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [BattleMonLevel]
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
add 30
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
ld a, [EnemyMonLevel]
cp b
jr c, .asm_3d1dc
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
ld c, HAPPINESS_BEATENBYSTRONGFOE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3d1dc
ld a, [CurBattleMon]
ld [CurPartyMon], a
callab ChangeHappiness
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
and %11000000
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add $1
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld [wBattleResult], a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc6f7]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret z
ret
; 3d1f8
Function3d1f8: ; 3d1f8
call EmptyBattleTextBox
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
dec a
ret nz
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_UseNextMon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
.asm_3d20a
lb bc, 1, 7
call PlaceYesNoBox
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld a, [MenuSelection2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr c, .asm_3d217
and a
ret
.asm_3d217
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld a, [MenuSelection2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
jp TryToRunAwayFromBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3d227
Function3d227: ; 3d227
call EmptyBattleTextBox
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
call LoadMenuDataHeader_0x1d75
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d2f7
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call ForcePickPartyMonInBattle
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jr z, .asm_3d241
ld a, $1
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0ec], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3e8e4
.asm_3d241
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0ec], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
call ExitMenu
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call WaitBGMap
call ClearSGB
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld c, a
ret
.asm_3d26c
call ClearSprites
ld a, [CurBattleMon]
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [LastPlayerMon], a
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
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call InitBattleMon
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call ResetPlayerStatLevels
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearPalettes
call DelayFrame
call Function3eda6
More enumeration of constants, more annotations of scripts.
2015-07-15 12:48:44 -07:00
call WriteBackup
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearSGB
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
call SendOutPkmnText
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
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
and a
ld c, a
ret
; 3d2b3
Function3d2b3: ; 3d2b3
ld a, [CurBattleMon]
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [LastPlayerMon], a
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
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call InitBattleMon
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call ResetPlayerStatLevels
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
call SendOutPkmnText
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
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jp SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3d2e0
Function3d2e0: ; 3d2e0
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
cp LINK_MOBILE
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
jr nz, .asm_3d2ef ; It's not a mobile battle
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wcd2b]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jr z, .asm_3d2ef
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
; We have a mobile battle and something else happened
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
cp LINK_MOBILE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrame
ret
; 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
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
call CheckIfPartyHasPkmnToBattleWith
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
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_PkmnIsAlreadyOut
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-04 13:30:40 -07:00
ld a, [InBattleTowerBattle]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
bit 0, a
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
jr nz, .battle_tower
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [BattleType]
cp BATTLETYPE_CANLOSE
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
jr nz, .not_canlose
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Remove the enemy from the screen.
hlcoord 0, 0
So very jumb
2015-10-19 13:49:29 -07:00
lb bc, 8, 21
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
call Function3ebd8
ld c, 40
call DelayFrames
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc2cc]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
bit 0, a
Corrected some mislabeled 1bpps
2015-11-04 12:35:29 -08:00
jr nz, .skip_win_loss_text
call PrintWinLossText
.skip_win_loss_text
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
.battle_tower
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Remove the enemy from the screen.
hlcoord 0, 0
So very jumb
2015-10-19 13:49:29 -07:00
lb bc, 8, 21
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
call Function3ebd8
ld c, 40
call DelayFrames
call EmptyBattleTextBox
ld c, 2
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
callba BattleTowerText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Functiona80
call ClearTileMap
call WhiteBGMap
ret
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
.not_canlose
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jr nz, .LostLinkBattle
; Greyscale
ld b, 0
call GetSGBLayout
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr .end
.LostLinkBattle
call UpdateEnemyMonInParty
So very jumb
2015-10-19 13:49:29 -07:00
call CheckEnemyTrainerDefeated
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
jr nz, .not_tied
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, TiedAgainstText
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and $c0
add 2
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld [wBattleResult], a
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
jr .text
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
.not_tied
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, LostAgainstText
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
call IsMobileBattle
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
jr z, .mobile
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
.text
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
.end
scf
ret
Battle Tower trainer text
2015-11-03 19:35:36 -08:00
.mobile
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Remove the enemy from the screen.
hlcoord 0, 0
So very jumb
2015-10-19 13:49:29 -07:00
lb bc, 8, 21
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
call Function3ebd8
ld c, 40
call DelayFrames
ld c, $3
callba Function4ea0a
scf
ret
; 3d432
So very jumb
2015-10-19 13:49:29 -07:00
EnemyMonFaintedAnimation: ; 3d432
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 12, 5
decoord 12, 6
So very jumb
2015-10-19 13:49:29 -07:00
jp MonFaintedAnimation
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3d43b
So very jumb
2015-10-19 13:49:29 -07:00
PlayerMonFaintedAnimation: ; 3d43b
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 10
decoord 1, 11
So very jumb
2015-10-19 13:49:29 -07:00
jp MonFaintedAnimation
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3d444
So very jumb
2015-10-19 13:49:29 -07:00
MonFaintedAnimation: ; 3d444
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wcfbe]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
set 6, a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfbe], a
So very jumb
2015-10-19 13:49:29 -07:00
ld b, 7
.OuterLoop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
push de
push hl
So very jumb
2015-10-19 13:49:29 -07:00
ld b, 6
.InnerLoop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
push hl
push de
So very jumb
2015-10-19 13:49:29 -07:00
ld bc, 7
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
pop de
pop hl
So very jumb
2015-10-19 13:49:29 -07:00
ld bc, -SCREEN_WIDTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
push hl
ld h, d
ld l, e
add hl, bc
ld d, h
ld e, l
pop hl
pop bc
dec b
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .InnerLoop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld bc, 20
add hl, bc
ld de, .Spaces
call PlaceString
ld c, 2
call DelayFrames
pop hl
pop de
pop bc
dec b
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .OuterLoop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfbe], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3d488
.Spaces
db " @"
; 3d490
Function3d490: ; 3d490
object_struct
2015-11-02 08:15:32 -08:00
ld [hMapObjectIndexBuffer], 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
object_struct
2015-11-02 08:15:32 -08:00
ld a, [hMapObjectIndexBuffer]
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
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
call ResetEnemyBattleVars
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc718]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ld b, a
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
call LoadEnemyPkmnToSwitchTo
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d7a0
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call NewEnemyMonStatus
call ResetEnemyStatLevels
changed labels and added comments
2015-08-23 06:09:56 -07:00
call Function_SetEnemyPkmnAndSendOutAnimation
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
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
call ResetEnemyBattleVars
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d533
jr c, .asm_3d4f1
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
call FindPkmnInOTPartyToSwitchIntoBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3d4f1
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
call LoadEnemyPkmnToSwitchTo
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d74b
push af
call Function3d7a0
changed labels and added comments
2015-08-23 06:09:56 -07:00
call Function_BattleTextEnemySentOut
call Function_SetEnemyPkmnAndSendOutAnimation
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
ret c
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc664], a
ld [wc6fc], a
ld [wd0ec], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld [wEnemyIsSwitching], a
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
call ResetEnemyBattleVars
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3d533
jr c, .asm_3d522
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
call FindPkmnInOTPartyToSwitchIntoBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3d522
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
; 'b' contains the PartyNr of the Pkmn the AI will switch to
call LoadEnemyPkmnToSwitchTo
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
changed labels and added comments
2015-08-23 06:09:56 -07:00
call Function_BattleTextEnemySentOut
jp Function_SetEnemyPkmnAndSendOutAnimation
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3d533
Function3d533: ; 3d533
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
; returns carry if: ???
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .not_linked
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [wBattleAction]
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
sub BATTLEACTION_SWITCH1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr .return_carry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.not_linked
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc718]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .check_wd264
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ld b, a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr .return_carry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.check_wd264
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd264]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ld b, $0
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nz, .return_carry
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.return_carry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
; 3d557
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
ResetEnemyBattleVars: ; 3d557
; and draw empty TextBox
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 [CurEnemyMove], a
dec a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc6e6], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc730], 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
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
jp LoadMenuDataHeader_0x1d75
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3d57a
Function3d57a: ; 3d57a
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc664], a
ld [wc6fc], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Function3d581: ; 3d581
ld a, [CurBattleMon]
ld c, a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wc664
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wc6fc
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
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
FindPkmnInOTPartyToSwitchIntoBattle: ; 3d599
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
call LookUpTheEffectivenessOfEveryMove
call IsThePlayerPkmnTypesEffectiveAgainstOTPkmn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr .asm_3d5a3
.asm_3d5d0
ld hl, Buffer2
set 0, [hl]
jr .asm_3d5a3
; 3d5d7
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
LookUpTheEffectivenessOfEveryMove: ; 3d5d7
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
More battle command labels
2015-11-06 17:55:16 -08:00
callab BattleCheckTypeMatchup
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
pop de
pop hl
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
ld a, [wd265] ; Get The Effectiveness Modifier
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
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
IsThePlayerPkmnTypesEffectiveAgainstOTPkmn: ; 3d618
; Calculates the effectiveness of the types of the PlayerPkmn
; against the OTPkmn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
More battle command labels
2015-11-06 17:55:16 -08:00
callab BattleCheckTypeMatchup
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd265]
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
More battle command labels
2015-11-06 17:55:16 -08:00
callab BattleCheckTypeMatchup
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd265]
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
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
LoadEnemyPkmnToSwitchTo: ; 3d6ca
; 'b' contains the PartyNr of the Pkmn the AI will switch to
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
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
changed more labels
2015-09-09 16:27:07 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wdef4]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wdef4], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3d708
changed more labels
2015-09-09 16:27:07 -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]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc6ea], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc6eb], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3d714
Function3d714: ; 3d714
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd264]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
jp z, .asm_3d749
ld a, [PartyCount]
dec a
jp z, .asm_3d749
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jp 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
No more -bash000; engine/movement.asm, SPRITEMOVEFN
2015-10-29 20:32:11 -07:00
callba CheckCurPartyMonFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
More enumeration of constants, more annotations of scripts.
2015-07-15 12:48:44 -07:00
callab Battle_GetTrainerName
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_EnemyIsAboutToUseWillPlayerChangePkmn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
lb bc, 1, 7
call PlaceYesNoBox
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld a, [MenuSelection2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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]
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [LastPlayerMon], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
call ExitMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearSprites
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 0
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
lb bc, 4, 10
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
call WaitBGMap
jp Function3ee27
; 3d7b8
changed labels and added comments
2015-08-23 06:09:56 -07:00
Function_BattleTextEnemySentOut: ; 3d7b8
More enumeration of constants, more annotations of scripts.
2015-07-15 12:48:44 -07:00
callab Battle_GetTrainerName
changed labels and added comments
2015-08-23 06:09:56 -07:00
ld hl, BattleText_EnemySentOut
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
jp WaitBGMap
; 3d7c7
changed labels and added comments
2015-08-23 06:09:56 -07:00
Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
found CalcPkmnStats-function
2015-10-08 11:53:39 -07:00
predef CopyPkmnToTempMon
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call GetMonFrontpic
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfca], a
More battle command labels
2015-11-06 17:55:16 -08:00
ld [wKickCounter], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
ld de, ANIM_SEND_OUT_MON
changed more labels
2015-09-09 16:27:07 -07:00
call Call_PlayBattleAnim
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call BattleCheckEnemyShininess
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nc, .asm_3d800
Residual damage, battle text labels, pic predefs.
2014-06-18 00:55:44 -07:00
ld a, 1 ; shiny anim
More battle command labels
2015-11-06 17:55:16 -08:00
ld [wKickCounter], a
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
ld de, ANIM_SEND_OUT_MON
changed more labels
2015-09-09 16:27:07 -07:00
call Call_PlayBattleAnim
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
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
Some battle labels
2015-11-05 16:13:09 -08:00
ld [wEnemyRageCounter], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [EnemyDisabledMove], a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc6fa], a
ld [wc730], a
ld [wc731], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
More battle command labels
2015-11-06 17:55:16 -08:00
ld a, BASE_STAT_LEVEL
ld b, NUM_LEVEL_STATS
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
CheckPlayerPartyForFitPkmn: ; 3d873
; Has the player any Pkmn in his Party that can fight?
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
CheckIfPartyHasPkmnToBattleWith: ; 3d887
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd264]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_AnEGGCantBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3d8ae
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_TheresNoWillToBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3d8ae
call StdBattleTextBox
.asm_3d8b1
xor a
ret
; 3d8b3
changed more labels
2015-09-09 16:27:07 -07:00
TryToRunAwayFromBattle: ; 3d8b3
; Run away from battle, with or without item
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [BattleType]
changed more labels
2015-09-09 16:27:07 -07:00
cp BATTLETYPE_DEBUG
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp z, .can_escape
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
cp BATTLETYPE_CONTEST
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp z, .can_escape
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_TRAP
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp z, .cant_escape
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_CELEBI
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp z, .cant_escape
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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp z, .cant_escape
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_SUICUNE
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp z, .cant_escape
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp nz, .can_escape
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp nz, .cant_run_from_trainer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp nz, .cant_escape
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc730]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp nz, .cant_escape
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
push de
ld a, [BattleMonItem]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd265], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nz, .no_flee_item
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
call GetItemName
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_UserFledUsingAStringBuffer1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jp .can_escape
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.no_flee_item
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd267]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd267], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hStringCmpString2 + 0], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hStringCmpString2 + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
inc de
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hStringCmpString1 + 0], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hStringCmpString1 + 1], a
changed more labels
2015-09-09 16:27:07 -07:00
call Call_LoadTempTileMapToTileMap
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld de, hStringCmpString2
ld hl, hStringCmpString1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, $2
call StringCmp
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nc, .can_escape
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [hMultiplicand], a
ld a, $20
ld [hMultiplier], a
call Multiply
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld a, [hProduct + 2]
ld [hDividend + 0], a
ld a, [hProduct + 3]
ld [hDividend + 1], a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hStringCmpString1 + 0]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hStringCmpString1 + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
srl b
rr a
srl b
rr a
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .can_escape
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hDivisor], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, $2
call Divide
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld a, [hQuotient + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nz, .can_escape
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd267]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec c
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .cant_escape_2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, $1e
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld a, [hQuotient + 2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add b
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld [hQuotient + 2], a
jr c, .can_escape
jr .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.cant_escape_2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleRandom
ld b, a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hQuotient + 2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr nc, .can_escape
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0ec], a
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_CantEscape2
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr .print_inescapable_text
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.cant_escape
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_CantEscape
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr .print_inescapable_text
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.cant_run_from_trainer
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_TheresNoEscapeFromTrainerBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.print_inescapable_text
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
ld a, $1
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd266], a
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.can_escape
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, DRAW
jr z, .fled
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0ec], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $f
ld [CurMoveNum], a
xor a
ld [CurPlayerMove], a
call Function3e8e4
changed more labels
2015-09-09 16:27:07 -07:00
call Call_LoadTempTileMapToTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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]
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
cp BATTLEACTION_FORFEIT
ld a, DRAW
jr z, .fled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.fled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and $c0
add b
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld [wBattleResult], a
So very jumb
2015-10-19 13:49:29 -07:00
call StopDangerSound
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push de
ld de, SFX_RUN
call WaitPlaySFX
pop de
call WaitSFX
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_GotAwaySafely
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
call WaitSFX
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
.asm_3d9f5
So very jumb
2015-10-19 13:49:29 -07:00
call StopDangerSound
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wcd2a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
bit 4, [hl]
jr nz, .asm_3da05
change more labelss
2015-08-24 16:56:30 -07:00
ld hl, BattleText_LinkErrorBattleCanceled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
.asm_3da05
call WaitSFX
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
; 3da0d
Sprite movement function labels
2015-11-06 13:42:38 -08:00
InitBattleMon: ; 3da0d
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld a, MON_SPECIES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
ld de, BattleMonSpecies
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld bc, MON_ID
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld bc, (MON_DVS) - (MON_ID)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld bc, (MON_PKRUS) - (MON_DVS)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 3
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, BattleMonLevel
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld bc, (PARTYMON_STRUCT_LENGTH) - (MON_LEVEL)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
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
Sprite movement function labels
2015-11-06 13:42:38 -08:00
ld bc, (PARTYMON_STRUCT_LENGTH) - (MON_ATK)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
call Function3ec2c
call BadgeStatBoosts
ret
; 3da74
Sprite movement function labels
2015-11-06 13:42:38 -08:00
BattleCheckPlayerShininess: ; 3da74
call GetPartyMonDVs
jr BattleCheckShininess
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Sprite movement function labels
2015-11-06 13:42:38 -08:00
BattleCheckEnemyShininess: ; 3da79
call GetEnemyMonDVs
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Sprite movement function labels
2015-11-06 13:42:38 -08:00
BattleCheckShininess: ; 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
Sprite movement function labels
2015-11-06 13:42:38 -08:00
GetPartyMonDVs: ; 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
Sprite movement function labels
2015-11-06 13:42:38 -08:00
GetEnemyMonDVs: ; 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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wc6f2
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ret z
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
More battle command labels
2015-11-06 17:55:16 -08:00
ld a, BASE_STAT_LEVEL
ld b, NUM_LEVEL_STATS
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld bc, MON_ID
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld bc, (MON_DVS) - (MON_ID)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld bc, (MON_PKRUS) - (MON_DVS)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 3
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, EnemyMonLevel
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld bc, (PARTYMON_STRUCT_LENGTH) - (MON_LEVEL)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
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
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld bc, (PARTYMON_STRUCT_LENGTH) - (MON_ATK)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
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]
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [LastPlayerMon], a
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
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call InitBattleMon
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call ResetPlayerStatLevels
call NewBattleMonStatus
call BreakAttraction
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3db5f
call EmptyBattleTextBox
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
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
BattleCommand labels copied from macros
2015-11-06 11:45:10 -08:00
call GetMonBackpic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [$ffad], a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0d2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc731], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfca], a
More battle command labels
2015-11-06 17:55:16 -08:00
ld [wKickCounter], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_SEND_OUT_MON
changed more labels
2015-09-09 16:27:07 -07:00
call Call_PlayBattleAnim
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call BattleCheckPlayerShininess
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr nc, .asm_3dbbc
ld a, $1
More battle command labels
2015-11-06 17:55:16 -08:00
ld [wKickCounter], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_SEND_OUT_MON
changed more labels
2015-09-09 16:27:07 -07:00
call Call_PlayBattleAnim
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3dbbc
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld a, MON_SPECIES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
ld b, h
ld c, l
callba 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
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
ld hl, PlayerUsedMoves
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 3
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
ld [PlayerDisableCount], a
ld [PlayerFuryCutterCount], a
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
ld [PlayerProtectCount], a
Some battle labels
2015-11-05 16:13:09 -08:00
ld [wPlayerRageCounter], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [DisabledMove], a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc6fe], a
ld [wc731], a
ld [wc730], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_UserHurtBySpikes ; "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
More battle command labels
2015-11-06 17:55:16 -08:00
call SubtractHPFromTarget
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call .hl
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp WaitBGMap
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
.hl
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp [hl]
; 3dc5b
Some battle labels
2015-11-05 16:13:09 -08:00
PursuitSwitch: ; 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
Some battle labels
2015-11-05 16:13:09 -08:00
jr nz, .done
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld 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
Some battle labels
2015-11-05 16:13:09 -08:00
jr z, .do_turn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, DoEnemyTurn
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld a, [LastPlayerMon]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [CurBattleMon], a
Some battle labels
2015-11-05 16:13:09 -08:00
.do_turn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Some battle labels
2015-11-05 16:13:09 -08:00
jr z, .check_enemy_fainted
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld a, [LastPlayerMon]
Move radio code to its own file
2015-07-20 22:52:46 -07:00
call UpdateBattleMon
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]
Some battle labels
2015-11-05 16:13:09 -08:00
jr nz, .done
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $f0
ld [CryTracks], a
ld a, [BattleMonSpecies]
Name cry functions in home.asm.
2014-07-18 10:25:03 -07:00
call PlayStereoCry
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc71a]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wc664
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
So very jumb
2015-10-19 13:49:29 -07:00
call PlayerMonFaintedAnimation
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_PkmnFainted
Some battle labels
2015-11-05 16:13:09 -08:00
jr .done_fainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Some battle labels
2015-11-05 16:13:09 -08:00
.check_enemy_fainted
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]
Some battle labels
2015-11-05 16:13:09 -08:00
jr nz, .done
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, SFX_KINESIS
call PlaySFX
call WaitSFX
Macro update, roam mon annotations Updated map and mapgroup macros to get around an rgbds bug. Legendary beast locale handling annotated and relabeled. Added a new constant NUM_ENGINE_FLAGS for use in the EngineFlagAction function. This will make it easier for modders to add or remove engine flags.
2015-07-25 11:25:37 -07:00
ld de, SFX_FAINT
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PlaySFX
call WaitSFX
So very jumb
2015-10-19 13:49:29 -07:00
call EnemyMonFaintedAnimation
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, BattleText_EnemyPkmnFainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Some battle labels
2015-11-05 16:13:09 -08:00
.done_fainted
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
scf
ret
Some battle labels
2015-11-05 16:13:09 -08:00
.done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
; 3dce6
Function3dce6: ; 3dce6
ld a, [hBattleTurn]
push af
xor a
ld [hBattleTurn], a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfca], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_RETURN_MON
changed more labels
2015-09-09 16:27:07 -07:00
call Call_PlayBattleAnim
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop af
ld [hBattleTurn], a
ret
; 3dcf9
Function3dcf9: ; 3dcf9
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $1
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .player_1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
call Function3dd2f
call Function3dde9
call Function3de51
call SetEnemyTurn
call Function3dd2f
call Function3dde9
jp Function3de51
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.player_1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld de, BattleMonHP + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, BattleMonMaxHP
.asm_3dd4a
push bc
ld a, [de]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd1ec], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add a
ld c, a
dec de
ld a, [de]
inc de
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd1ed], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
adc a
ld b, a
ld a, b
cp [hl]
ld a, c
pop bc
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd1ee], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
dec de
ld a, [de]
adc $0
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd1ef], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
ld a, [hld]
cp c
ld a, [hl]
sbc b
jr nc, .asm_3dd8d
ld a, [hli]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd1ef], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd1ee], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3dd8d
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd1ef]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [de], a
inc de
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd1ee]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [de], a
ld a, [hBattleTurn]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd10a], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 2, 2
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd10a], 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]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd265], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfca], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
More battle command labels
2015-11-06 17:55:16 -08:00
ld hl, CalcEnemyStats
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
More battle command labels
2015-11-06 17:55:16 -08:00
ld hl, CalcPlayerStats
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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
More battle command labels
2015-11-06 17:55:16 -08:00
ld a, BANK(CalcEnemyStats)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
rst FarCall
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
call SwitchTurnCore
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]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd265], 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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ret z
ld [hl], $0
ret
.asm_3de90
call Function3df12
xor a
ld [bc], a
ld [hl], a
ret
; 3de97
Function3de97: ; 3de97
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $1
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .player_1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3dea9
jp Function3deb1
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.player_1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call 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
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
jr nz, .asm_3dec7
pop bc
ld a, [bc]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd265], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec hl
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld h, [hl]
ld l, a
BattleCommand labels copied from macros
2015-11-06 11:45:10 -08:00
ld a, BANK(BattleCommand_AttackUp)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
rst FarCall
pop bc
pop de
ld a, [FailedMessage]
and a
ret nz
xor a
ld [bc], a
ld [de], a
call GetItemName
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_UsersStringBuffer1Activated
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
More battle command labels
2015-11-06 17:55:16 -08:00
callab BattleCommand_StatUpMessage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
.asm_3def9
pop bc
pop de
ret
; 3defc
.data_3defc
BattleCommand labels copied from macros
2015-11-06 11:45:10 -08:00
dbw HELD_ATTACK_UP, BattleCommand_AttackUp
dbw HELD_DEFENSE_UP, BattleCommand_DefenseUp
dbw HELD_SPEED_UP, BattleCommand_SpeedUp
dbw HELD_SP_ATTACK_UP, BattleCommand_SpecialAttackUp
dbw HELD_SP_DEFENSE_UP, BattleCommand_SpecialDefenseUp
dbw HELD_ACCURACY_UP, BattleCommand_AccuracyUp
dbw HELD_EVASION_UP, BattleCommand_EvasionUp
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
Labeling of AI item and wild encounter functions
2015-10-07 18:27:32 -07:00
xor a ; PARTYMON
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 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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc6fd]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
jr nz, .done
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
Labeling of AI item and wild encounter functions
2015-10-07 18:27:32 -07:00
ld a, BREEDMON
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Status strings
2015-11-03 06:45:25 -08:00
predef PlaceNonFaintStatus
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
pop bc
ret nz
ld a, b
Fix some misnamed substatus constants. SUBSTATUS_ROLLOUT was actually SUBSTATUS_RAMPAGE. SUBSTATUS_ENCORED was actually SUBSTATUS_ROLLOUT. Substatus 5 bit 4 was actually SUBSTATUS_ENCORED. Also use some more (sub)status constants where needed.
2014-06-17 12:52:32 -07:00
cp " "
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wc6f2
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
Labeling of AI item and wild encounter functions
2015-10-07 18:27:32 -07:00
ld a, BREEDMON
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Status strings
2015-11-03 06:45:25 -08:00
predef PlaceNonFaintStatus
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop hl
pop bc
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]
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hMultiplicand + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hMultiplicand + 2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
or [hl]
jr nz, .asm_3e0d1
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
ld e, a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld d, HP_BAR_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp .asm_3e11a
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
.asm_3e0d1
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
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hDivisor], a
ld a, [hProduct + 2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
srl b
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld a, [hProduct + 3]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
rr a
srl b
rr a
ld [$ffb6], a
ld a, b
ld [$ffb5], a
.asm_3e105
ld a, [$ffb5]
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hDividend + 0], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$ffb6]
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hDividend + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $2
ld b, a
call Divide
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld a, [hQuotient + 2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld e, a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, HP_BAR_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld d, a
ld c, a
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3e11a
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd10a], 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
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTempTileMapToTileMap
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]
changed more labels
2015-09-09 16:27:07 -07:00
cp BATTLETYPE_DEBUG
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr z, .ok
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
cp BATTLETYPE_TUTORIAL
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr z, .ok
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call EmptyBattleTextBox
call UpdateBattleHuds
call EmptyBattleTextBox
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.ok
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
.loop
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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
callba _DudeAutoInput_DownA
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd0d2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $1
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp z, BattleMenu_Fight
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $3
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp z, BattleMenu_Pack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $2
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp z, BattleMenu_PKMN
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $4
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp z, BattleMenu_Run
jr .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd267], a
changed more labels
2015-09-09 16:27:07 -07:00
call Call_LoadTempTileMapToTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wcd2b]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret z
Name the UpdateEnemyHUD predef. Also start using hp palette constants.
2014-06-16 22:52:59 -07:00
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wcd2a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
bit 4, [hl]
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jr nz, .error
change more labelss
2015-08-24 16:56:30 -07:00
ld hl, BattleText_LinkErrorBattleCanceled
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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp nz, ItemsCantBeUsed
changed more labels
2015-09-04 13:30:40 -07:00
ld a, [InBattleTowerBattle]
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
jp nz, ItemsCantBeUsed
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
call LoadMenuDataHeader_0x1d75
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd0ec]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
BattleCommand labels copied from macros
2015-11-06 11:45:10 -08:00
call GetMonBackpic
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call GetMonFrontpic
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
call ExitMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call WaitBGMap
call Function3ee27
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp BattleMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3e22b
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
ItemsCantBeUsed: ; 3e22b
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_ItemsCantBeUsedHere
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp BattleMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3e234
Function3e234: ; 3e234
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc64e]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jr nz, .asm_3e279
callab CheckItemPocket
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wItemAttributeParamBuffer]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
BattleCommand labels copied from macros
2015-11-06 11:45:10 -08:00
call GetMonBackpic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3e25d
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call GetMonFrontpic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld [MenuSelection2], a
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
call ExitMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3df2c
call WaitBGMap
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
Add commented numbers to map/group constants
2015-10-17 17:49:34 -07:00
call ResetTextRelatedRAM
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ee27
and a
ret
.asm_3e279
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc64e], a
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and $c0
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld [wBattleResult], a
Add commented numbers to map/group constants
2015-10-17 17:49:34 -07:00
call ResetTextRelatedRAM
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
scf
ret
; 3e28d
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
BattleMenu_PKMN: ; 3e28d
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
call LoadMenuDataHeader_0x1d75
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Function3e290:
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
call ExitMenu
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
call LoadMenuDataHeader_0x1d75
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld a, [MenuSelection2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
More enumeration of constants, more annotations of scripts.
2015-07-15 12:48:44 -07:00
call WriteBackup
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearSGB
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
jp BattleMenu
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 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
Replaced "ldtile" and "dwtile" with the "tile" equs macro
2015-10-14 06:29:15 -07:00
ld hl, VTiles2 tile $31
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, VTiles0
ld bc, $0110
call CopyBytes
ld hl, VTiles2
Replaced "ldtile" and "dwtile" with the "tile" equs macro
2015-10-14 06:29:15 -07:00
ld de, VTiles0 tile $11
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld bc, $0310
call CopyBytes
call EnableLCD
call ClearSprites
call LowVolume
Labeling of AI item and wild encounter functions
2015-10-07 18:27:32 -07:00
xor a ; PARTYMON
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [MonType], a
callba Function4dc7b
call MaxVolume
call DisableLCD
ld hl, VTiles0
Replaced "ldtile" and "dwtile" with the "tile" equs macro
2015-10-14 06:29:15 -07:00
ld de, VTiles2 tile $31
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld bc, $0110
call CopyBytes
Replaced "ldtile" and "dwtile" with the "tile" equs macro
2015-10-14 06:29:15 -07:00
ld hl, VTiles0 tile $11
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_PkmnIsAlreadyOut
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
jp Function3e299
.asm_3e36b
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc730]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_PkmnCantBeRecalled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
jp Function3e299
.asm_3e381
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
call CheckIfPartyHasPkmnToBattleWith
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, Function3e299
ld a, [CurBattleMon]
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [LastPlayerMon], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $2
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0ec], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearPalettes
call DelayFrame
call ClearSprites
call Function3eda6
More enumeration of constants, more annotations of scripts.
2015-07-15 12:48:44 -07:00
call WriteBackup
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearSGB
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jr z, .asm_3e3c1
found functions that determine next OTPkmn
2015-09-11 19:21:00 -07:00
call LoadMenuDataHeader_0x1d75
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3e8e4
More enumeration of constants, more annotations of scripts.
2015-07-15 12:48:44 -07:00
call WriteBackup
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3e3c1
call Function3e7c1
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jr nz, .asm_3e3cf
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.switch
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call BattleMonEntrance
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
.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]
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
cp BATTLEACTION_E
jp z, .switch
cp BATTLEACTION_D
jp z, .switch
cp BATTLEACTION_SWITCH1
jp c, .switch
cp BATTLEACTION_FORFEIT
jr nz, .dont_run
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
call WildFled_EnemyFled_LinkBattleCanceled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.dont_run
ld a, [hLinkPlayerNumber]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $1
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
jr z, .player_1
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call BattleMonEntrance
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
call EnemyMonEntrance
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
.player_1
call EnemyMonEntrance
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call BattleMonEntrance
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret
; 3e3ff
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
EnemyMonEntrance: ; 3e3ff
Better trainer AI comments and finish off trainer attributes.
2014-08-13 19:44:56 -07:00
callab AI_Switch
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetEnemyTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jp SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3e40b
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
BattleMonEntrance: ; 3e40b
changed more labels
2015-09-09 16:27:07 -07:00
call BattleMonNickComma_TextBox
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
Some battle labels
2015-11-05 16:13:09 -08:00
call PursuitSwitch
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
jr c, .ok
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
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call InitBattleMon
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call ResetPlayerStatLevels
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
call SendOutPkmnText
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
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
call SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $2
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld [MenuSelection2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call InitBattleMon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd265], a
changed more labels
2015-09-09 16:27:07 -07:00
call ApplyStatLevelMultiplierOnAllStats
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3db5f
call EmptyBattleTextBox
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call SetPlayerTurn
comment and relabel more battle functions
2014-01-01 05:09:15 -08:00
jp SpikesDamage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3e489
Contest battle type and comment the battle menu.
2014-06-17 11:58:11 -07:00
BattleMenu_Run: ; 3e489
changed more labels
2015-09-09 16:27:07 -07:00
call Call_LoadTempTileMapToTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $3
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld [MenuSelection2], 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
changed more labels
2015-09-09 16:27:07 -07:00
call TryToRunAwayFromBattle
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $0
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd266], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret c
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd0ec]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc73d], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3e4bc
changed name of some labels
2015-10-10 04:45:39 -07:00
MoveSelectionScreen: ; 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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd235]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld a, MON_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
.asm_3e4e2
Battle intro animation function
2015-10-17 14:18:52 -07:00
ld de, wListMoves_MoveIndicesBuffer
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld bc, NUM_MOVES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call CopyBytes
xor a
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd235]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd235]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd235]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $2
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld a, 17 - NUM_MOVES
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfa1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, b
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfa2], a
ld a, [wd235]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $1
jr z, .asm_3e53e
ld a, [CurMoveNum]
inc a
.asm_3e53e
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld [MenuSelection2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfaa], a
ld a, [wd0eb]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfa3], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfa4], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, $2c
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd235]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ld b, $c1
jr z, .asm_3e569
dec a
ld b, $c3
jr z, .asm_3e569
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jr nz, .asm_3e569
ld b, $c7
.asm_3e569
ld a, b
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfa8], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, c
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfa5], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfa6], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $10
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfa7], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3e57a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd235]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd0e3]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0e3], a
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld a, [MenuSelection2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld [MenuSelection2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd235]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld a, [MenuSelection2]
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]
and $3f
jr z, .asm_3e610
ld a, [PlayerDisableCount]
swap a
and $f
dec a
cp c
jr z, .asm_3e60b
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc6e1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jr nz, .asm_3e606
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld a, [MenuSelection2]
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
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_TheMoveIsDisabled
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr .asm_3e613
.asm_3e610
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_TheresNoPPLeftForThisMove
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3e613
call StdBattleTextBox
changed more labels
2015-09-09 16:27:07 -07:00
call Call_LoadTempTileMapToTileMap
changed name of some labels
2015-10-10 04:45:39 -07:00
jp MoveSelectionScreen
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3e61c
.string_3e61c ; 3e61c
db "@"
; 3e61d
.asm_3e61d
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld a, [MenuSelection2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jp nz, .asm_3e57a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd0eb]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld [MenuSelection2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld a, [MenuSelection2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd0eb]
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc a
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
jp nz, .asm_3e57a
ld a, $1
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld [MenuSelection2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd0e3]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld a, [MenuSelection2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
jr nz, .asm_3e671
ld a, [hl]
and $f
ld b, a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd0e3]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
swap a
add b
ld [hl], a
jr .asm_3e682
.asm_3e671
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd0e3]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
jr nz, .asm_3e682
ld a, [hl]
and $f
ld b, a
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld a, [MenuSelection2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld bc, (MON_PP) - (MON_MOVES)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
call .asm_3e6a5
.asm_3e69e
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0e3], a
changed name of some labels
2015-10-10 04:45:39 -07:00
jp MoveSelectionScreen
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3e6a5
push hl
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd0e3]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ld c, a
ld b, 0
add hl, bc
ld d, h
ld e, l
pop hl
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld a, [MenuSelection2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
ld c, a
ld b, 0
add hl, bc
ld a, [de]
ld b, [hl]
ld [hl], a
ld a, b
ld [de], a
ret
.asm_3e6bf
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld a, [MenuSelection2]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0e3], a
changed name of some labels
2015-10-10 04:45:39 -07:00
jp MoveSelectionScreen
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 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
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld a, [MenuSelection2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp b
jr nz, .asm_3e6f4
hlcoord 1, 10
ld de, .Disabled
call PlaceString
jr .done
.asm_3e6f4
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld hl, MenuSelection2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec [hl]
call SetPlayerTurn
ld hl, BattleMonMoves
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld a, [MenuSelection2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, a
ld b, 0
add hl, bc
ld a, [hl]
ld [CurPlayerMove], a
ld a, [CurBattleMon]
ld [CurPartyMon], a
ld a, WILDMON
ld [MonType], a
callab Functionf8ec
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld hl, MenuSelection2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, [hl]
inc [hl]
ld b, 0
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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode] ; What's the point of this check?
cp LINK_MOBILE
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
Annotation of PrintNum arguments in bc, and radio functions
2015-10-10 14:03:04 -07:00
lb bc, 1, 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PrintNum
pop hl
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], "/"
inc hl
Annotation of PrintNum arguments in bc, and radio functions
2015-10-10 14:03:04 -07:00
ld de, wNamedObjectIndexBuffer
lb bc, 1, 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_PkmnHasNoMovesLeft
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jr z, .asm_3e817
call EmptyBattleTextBox
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd0ec]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
call z, Function3e8e4
changed more labels
2015-09-09 16:27:07 -07:00
call Call_LoadTempTileMapToTileMap
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld a, [wBattleAction]
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
cp BATTLEACTION_E
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, .asm_3e8bd
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
cp BATTLEACTION_D
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp z, .asm_3e82c
BATTLEACTION constants
2015-11-06 06:04:27 -08:00
cp BATTLEACTION_SWITCH1
changed more labels
2015-09-09 16:27:07 -07:00
jp nc, ResetVarsForSubstatusRage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
call CheckSubstatus_RechargeChargedRampageBideRollout
jp nz, ResetVarsForSubstatusRage
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
jr nz, .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
changed more labels
2015-09-09 16:27:07 -07:00
call CheckSubstatus_RechargeChargedRampageBideRollout
More battle command labels
2015-11-06 17:55:16 -08:00
jr nz, .raging
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc733], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
More battle command labels
2015-11-06 17:55:16 -08:00
.raging
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wEnemyMoveStruct + MOVE_EFFECT]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp EFFECT_FURY_CUTTER
More battle command labels
2015-11-06 17:55:16 -08:00
jr z, .fury_cutter
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [EnemyFuryCutterCount], a
More battle command labels
2015-11-06 17:55:16 -08:00
.fury_cutter
Consolidate monster structs in wram and sram. The PartyMon struct is really the box struct with volatile variables like status added. Some other labels have been reworked. Move structs no longer have explicit labels since their location is arbitrary and usually shared.
2014-06-12 18:32:42 -07:00
ld a, [wEnemyMoveStruct + MOVE_EFFECT]
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
cp EFFECT_RAGE
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
Some battle labels
2015-11-05 16:13:09 -08:00
ld [wEnemyRageCounter], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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
changed more labels
2015-09-09 16:27:07 -07:00
ResetVarsForSubstatusRage: ; 3e8c1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Some battle labels
2015-11-05 16:13:09 -08:00
ld [wEnemyRageCounter], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
CheckSubstatus_RechargeChargedRampageBideRollout: ; 3e8d1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; We don't need to be here if we're in a link battle
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jp nz, Function3dabd
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
changed more labels
2015-09-04 13:30:40 -07:00
; and also not in a BattleTower-Battle
ld a, [InBattleTowerBattle] ; ????
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
bit 0, a
jp nz, Function3dabd
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Make sure everything knows what species we're working with
ld a, [TempEnemyMonSpecies]
ld [EnemyMonSpecies], a
ld [CurSpecies], a
ld [CurPartySpecies], a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Grab the BaseData for this species
call GetBaseData
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Let's get the item:
; Is the item predetermined?
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
jr z, .WildItem
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; If we're in a trainer battle, the item is in the party struct
ld a, [CurPartyMon]
ld hl, OTPartyMon1Item
call GetPartyLocation ; bc = PartyMon[CurPartyMon] - PartyMons
ld a, [hl]
jr .UpdateItem
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Failing that, it's all up to chance
; Effective chances:
; 75% None
; 23% Item1
; 2% Item2
; 25% chance of getting an item
call BattleRandom
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
cp a, 1 + (75 percent)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, NO_ITEM
jr c, .UpdateItem
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; From there, an 8% chance for Item2
call BattleRandom
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
cp a, 8 percent ; 8% of 25% = 2% Item2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [BaseItems]
jr nc, .UpdateItem
ld a, [BaseItems+1]
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.UpdateItem
ld [EnemyMonItem], a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Initialize DVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; If we're in a trainer battle, DVs are predetermined
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jr z, .InitDVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
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
jr z, .InitDVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Unknown
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wc6f2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, EnemyMonDVs
ld a, [hli]
ld [de], a
inc de
ld a, [hl]
ld [de], a
jp .Happiness
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.InitDVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Trainer DVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; All trainers have preset DVs, determined by class
; See GetTrainerDVs for more on that
callba GetTrainerDVs
; These are the DVs we'll use if we're actually in a trainer battle
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
jr nz, .UpdateDVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Wild DVs
; Here's where the fun starts
; Roaming monsters (Entei, Raikou) work differently
; They have their own structs, which are shorter than normal
ld a, [BattleType]
cp a, BATTLETYPE_ROAMING
jr nz, .NotRoaming
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Grab HP
call GetRoamMonHP
ld a, [hl]
; Check if the HP has been initialized
and a
; We'll do something with the result in a minute
push af
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Grab DVs
call GetRoamMonDVs
inc hl
ld a, [hld]
ld c, a
ld b, [hl]
; Get back the result of our check
pop af
; If the RoamMon struct has already been initialized, we're done
jr nz, .UpdateDVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; If it hasn't, we need to initialize the DVs
; (HP is initialized at the end of the battle)
call GetRoamMonDVs
inc hl
call BattleRandom
ld [hld], a
ld c, a
call BattleRandom
ld [hl], a
ld b, a
; We're done with DVs
jr .UpdateDVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.GenerateDVs
; Generate new random DVs
call BattleRandom
ld b, a
call BattleRandom
ld c, a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.UpdateDVs
; Input DVs in register bc
ld hl, EnemyMonDVs
ld a, b
ld [hli], a
ld [hl], c
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; We've still got more to do if we're dealing with a wild monster
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
jr nz, .Happiness
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Species-specfic:
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Unown
ld a, [TempEnemyMonSpecies]
cp a, UNOWN
jr nz, .Magikarp
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Get letter based on DVs
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
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.Magikarp
; Skimming this part recommended
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [TempEnemyMonSpecies]
cp a, MAGIKARP
jr nz, .Happiness
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Get Magikarp's length
ld de, EnemyMonDVs
ld bc, PlayerID
callab CalcMagikarpLength
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; We're clear if the length is < 1536
ld a, [MagikarpLength]
cp a, $06 ; $600 = 1536
jr nz, .CheckMagikarpArea
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 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
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 20% chance of skipping this check
call Random
cp a, $32 ; / $100
jr c, .CheckMagikarpArea
; Try again if > 1598
ld a, [MagikarpLength + 1]
cp a, $40
jr nc, .GenerateDVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; This also means Lake of Rage Magikarp can be smaller than ones
; caught elsewhere rather than the other way around
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 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
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Finally done with DVs
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, LinkBattleRNs + 7 ; ?
found CalcPkmnStats-function
2015-10-08 11:53:39 -07:00
predef CalcPkmnStats
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; If we're in a trainer battle,
; get the rest of the parameters from the party struct
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp a, TRAINER_BATTLE
jr z, .OpponentParty
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; If we're in a wild battle, check wild-specific stuff
and a
jr z, .TreeMon
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
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
jp nz, .Moves
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.UpdateStatus
ld hl, EnemyMonStatus
ld [hli], a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Unused byte
xor a
ld [hli], a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 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
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; ...unless it's a RoamMon
ld a, [BattleType]
cp a, BATTLETYPE_ROAMING
jr nz, .Moves
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Grab HP
call GetRoamMonHP
ld a, [hl]
; Check if it's been initialized again
and a
jr z, .InitRoamHP
; Update from the struct if it has
ld a, [hl]
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
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Make sure everything knows which monster the opponent is using
ld a, [CurPartyMon]
ld [CurOTMon], a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Get status from the party struct
dec hl
ld a, [hl] ; OTPartyMonStatus
ld [EnemyMonStatus], a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.Moves
ld hl, BaseType1
ld de, EnemyMonType1
ld a, [hli]
ld [de], a
inc de
ld a, [hl]
ld [de], a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Get moves
ld de, EnemyMonMoves
; Are we in a trainer battle?
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.WildMoves
; Clear EnemyMonMoves
xor a
ld h, d
ld l, e
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 3
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
; 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
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.PP
; Trainer battle?
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp a, TRAINER_BATTLE
jr z, .TrainerPP
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Fill wild PP
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
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.TrainerPP
; Copy PP from the party struct
ld hl, OTPartyMon1PP
ld a, [CurPartyMon]
call GetPartyLocation
ld de, EnemyMonPP
ld bc, NUM_MOVES
call CopyBytes
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd265], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPokemonName
; Did we catch it?
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret z
; 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
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Get list for the time of day
ld hl, .Morn
ld a, [TimeOfDay]
cp a, DAY
jr c, .Check
ld hl, .Day
jr z, .Check
ld hl, .Nite
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.Check
ld a, [TempEnemyMonSpecies]
ld de, 1 ; length of species id
call IsInArray
; If it's a match, the opponent is asleep
ret c
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
db -1 ; end
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.Day
db VENONAT
db HOOTHOOT
db NOCTOWL
db SPINARAK
db HERACROSS
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
db -1 ; end
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.Morn
db VENONAT
db HOOTHOOT
db NOCTOWL
db SPINARAK
db HERACROSS
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
db -1 ; end
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3eb75
CheckUnownLetter: ; 3eb75
; Return carry if the Unown letter hasn't been unlocked yet
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [UnlockedUnowns]
ld c, a
ld de, 0
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.loop
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Don't check this set unless it's been unlocked
srl c
jr nc, .next
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Is our letter in the set?
ld hl, .LetterSets
add hl, de
ld a, [hli]
ld h, [hl]
ld l, a
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push de
ld a, [UnownLetter]
ld de, 1
push bc
call IsInArray
pop bc
pop de
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr c, .match
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.next
; Make sure we haven't gone past the end of the table
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc e
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, e
cp a, .Set1 - .LetterSets
jr c, .loop
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; Hasn't been unlocked, or the letter is invalid
scf
ret
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.match
; Valid letter
and a
ret
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.LetterSets
dw .Set1
dw .Set2
dw .Set3
dw .Set4
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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
Fix unnecessary white space and retire add_n_times
2015-07-20 08:28:05 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 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
So very jumb
2015-10-19 13:49:29 -07:00
.outer_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc c
ld a, c
cp $7
ret z
xor a
ld [hBGMapMode], a
ld [hBGMapThird], a
ld d, $0
push bc
push hl
So very jumb
2015-10-19 13:49:29 -07:00
.inner_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ec1a
inc hl
ld a, $7
add d
ld d, a
dec c
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .inner_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
ld [hBGMapMode], a
ld c, $4
call DelayFrames
pop hl
pop bc
dec hl
So very jumb
2015-10-19 13:49:29 -07:00
jr .outer_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3ec1a
Function3ec1a: ; 3ec1a
push hl
push de
push bc
ld e, $7
So very jumb
2015-10-19 13:49:29 -07:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], d
So very jumb
2015-10-19 13:49:29 -07:00
ld bc, SCREEN_WIDTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
inc d
dec e
So very jumb
2015-10-19 13:49:29 -07:00
jr nz, .loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
pop de
pop hl
ret
; 3ec2c
Function3ec2c: ; 3ec2c
ld a, 1
jr Function3ec31
; 3ec30
Function3ec30: ; 3ec30
xor a
; 3ec31
Function3ec31: ; 3ec31
ld [hBattleTurn], a
More battle command labels
2015-11-06 17:55:16 -08:00
call ApplyPrzEffectOnSpeed
jp ApplyBrnEffectOnAttack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3ec39
More battle command labels
2015-11-06 17:55:16 -08:00
ApplyPrzEffectOnSpeed: ; 3ec39
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_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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, BattleMonSpeed + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
ld b, a
ld a, [hl]
srl a
rr b
srl a
rr b
ld [hli], a
or b
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, EnemyMonSpeed + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
ld b, a
ld a, [hl]
srl a
rr b
srl a
rr b
ld [hli], a
or b
jr nz, .asm_3ec74
ld b, $1
.asm_3ec74
ld [hl], b
ret
; 3ec76
More battle command labels
2015-11-06 17:55:16 -08:00
ApplyBrnEffectOnAttack: ; 3ec76
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_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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, BattleMonAttack + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
ld b, a
ld a, [hl]
srl a
rr b
ld [hli], a
or b
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, EnemyMonAttack + 1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
ld b, a
ld a, [hl]
srl a
rr b
ld [hli], a
or b
jr nz, .asm_3eca9
ld b, $1
.asm_3eca9
ld [hl], b
ret
; 3ecab
changed more labels
2015-09-09 16:27:07 -07:00
ApplyStatLevelMultiplierOnAllStats: ; 3ecab
; Apply StatLevelMultipliers on all 5 Stats
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, 0
.asm_3ecad
changed more labels
2015-09-09 16:27:07 -07:00
call ApplyStatLevelMultiplier
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc c
ld a, c
cp 5
jr nz, .asm_3ecad
ret
; 3ecb7
changed more labels
2015-09-09 16:27:07 -07:00
ApplyStatLevelMultiplier: ; 3ecb7
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
push bc
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd265]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hMultiplicand + 0], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hMultiplicand + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc de
ld a, [de]
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hMultiplicand + 2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hli]
ld [hMultiplier], a
call Multiply
ld a, [hl]
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hDivisor], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, $4
call Divide
pop hl
; Cap at 999.
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld a, [hQuotient + 2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
sub 999 % $100
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld a, [hQuotient + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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.
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
changed more labels
2015-09-04 13:30:40 -07:00
ld a, [InBattleTowerBattle]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
ld a, [JohtoBadges]
; Swap badges 3 (PlainBadge) and 5 (MineralBadge).
ld d, a
and %00000100
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add a
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld 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
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 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
Corrected some mislabeled 1bpps
2015-11-04 12:35:29 -08:00
LoadHPExpBarGFX: ; unreferenced
ld de, EnemyHPBarBorderGFX
Replaced "ldtile" and "dwtile" with the "tile" equs macro
2015-10-14 06:29:15 -07:00
ld hl, VTiles2 tile $6c
Corrected some mislabeled 1bpps
2015-11-04 12:35:29 -08:00
lb bc, BANK(EnemyHPBarBorderGFX), 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Get1bpp
Corrected some mislabeled 1bpps
2015-11-04 12:35:29 -08:00
ld de, HPExpBarBorderGFX
Replaced "ldtile" and "dwtile" with the "tile" equs macro
2015-10-14 06:29:15 -07:00
ld hl, VTiles2 tile $73
Corrected some mislabeled 1bpps
2015-11-04 12:35:29 -08:00
lb bc, BANK(HPExpBarBorderGFX), 6
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Get1bpp
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
ld de, ExpBarGFX
Replaced "ldtile" and "dwtile" with the "tile" equs macro
2015-10-14 06:29:15 -07:00
ld hl, VTiles2 tile $55
Mon submenu, engine/menu.asm
2015-11-04 11:02:11 -08:00
lb bc, BANK(ExpBarGFX), 8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp Get2bpp
; 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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jp z, Random
; The PRNG operates in streams of 10 values.
; Which value are we trying to pull?
push hl
push bc
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
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add a
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
Call_PlayBattleAnim: ; 3ee17
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call DelayFrame
pop hl
pop de
pop bc
pop af
ret
; 3ee3b
changed more labels
2015-09-09 16:27:07 -07:00
GiveExperiencePoints: ; 3ee3b
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
; Give experience.
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
change more labelss
2015-08-24 16:56:30 -07:00
changed more labels
2015-09-04 13:30:40 -07:00
ld a, [InBattleTowerBattle]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
bit 0, a
ret nz
change more labelss
2015-08-24 16:56:30 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wc664
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld a, MON_PKRUS
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
ld a, [hl]
and a
pop bc
pop hl
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
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc de
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec c
jr nz, .asm_3ee7c
xor a
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hMultiplicand + 0], a
ld [hMultiplicand + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [EnemyMonBaseExp]
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hMultiplicand + 2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [EnemyMonLevel]
ld [hMultiplier], a
call Multiply
ld a, $7
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hDivisor], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, $4
call Divide
pop bc
ld hl, $0006
add hl, bc
ld a, [PlayerID]
cp [hl]
jr nz, .asm_3eedd
inc hl
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [PlayerID + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [StringBuffer2 + 2], a
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
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
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld a, MON_ITEM
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
ld a, [hl]
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
cp LUCKY_EGG
call z, DoubleExp
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [$ffb6]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [StringBuffer2 + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, Text_PkmnGainedExpPoint
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call BattleTextBox
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [StringBuffer2 + 1]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [$ffb6], a
ld a, [StringBuffer2]
ld [$ffb5], a
pop bc
call Function3f136
push bc
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
.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
Experience and level calculations
2015-11-03 09:36:33 -08:00
callab CalcExpAtLevel
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Labeling of AI item and wild encounter functions
2015-10-07 18:27:32 -07:00
xor a ; PARTYMON
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [MonType], a
found CalcPkmnStats-function
2015-10-08 11:53:39 -07:00
predef CopyPkmnToTempMon
Experience and level calculations
2015-11-03 09:36:33 -08:00
callab CalcLevel
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld hl, MON_LEVEL
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
cp MAX_LEVEL
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc719], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurPartyLevel]
push af
ld a, d
ld [CurPartyLevel], a
ld [hl], a
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld hl, MON_SPECIES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add hl, bc
ld a, [hl]
ld [CurSpecies], a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd265], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
found CalcPkmnStats-function
2015-10-08 11:53:39 -07:00
predef CalcPkmnStats
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd265], a
changed more labels
2015-09-09 16:27:07 -07:00
call ApplyStatLevelMultiplierOnAllStats
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
ld [hBGMapMode], a
.asm_3f035
Finished the decoration attributes table Interpretation of the Decoration Attributes table is complete. Other changes include some more event flag and function naming, as well as a minor tweak to the person_events of every map.
2015-07-19 01:58:31 -07:00
callba LevelUpHappinessMod
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_StringBuffer1GrewToLevel
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
changed more labels
2015-09-09 16:27:07 -07:00
call LoadTileMapToTempTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3f057
Labeling of AI item and wild encounter functions
2015-10-07 18:27:32 -07:00
xor a ; PARTYMON
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [MonType], a
found CalcPkmnStats-function
2015-10-08 11:53:39 -07:00
predef CopyPkmnToTempMon
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
Comment PrintTempMonStats.
2015-02-11 13:15:38 -08:00
predef PrintTempMonStats
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, $1e
call DelayFrames
call Functiona80
changed more labels
2015-09-09 16:27:07 -07:00
call Call_LoadTempTileMapToTileMap
Labeling of AI item and wild encounter functions
2015-10-07 18:27:32 -07:00
xor a ; PARTYMON
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [MonType], a
ld a, [CurSpecies]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd265], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurPartyLevel]
push af
ld c, a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc719]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld a, MON_SPECIES
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
ld b, h
ld c, l
jp .asm_3ee50
.asm_3f0d1
jp Function3d57a
; 3f0d4
Function3f0d4: ; 3f0d4
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc664]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd265], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, EnemyMonBaseStats
ld c, $7
.asm_3f0ef
xor a
changed more labels
2015-09-09 16:27:07 -07:00
ld [hDividend + 0], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
changed more labels
2015-09-09 16:27:07 -07:00
ld [hDividend + 1], a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd265]
changed more labels
2015-09-09 16:27:07 -07:00
ld [hDivisor], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, $2
call Divide
changed more labels
2015-09-09 16:27:07 -07:00
ld a, [hQuotient + 2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
Text_PkmnGainedExpPoint: ; 3f11b
text_jump Text_Gained
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
start_asm
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, TextJump_StringBuffer2ExpPoints
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [StringBuffer2 + 2] ; IsTradedMon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret z
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, TextJump_ABoostedStringBuffer2ExpPoints
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3f12c
changed more labels
2015-09-09 16:27:07 -07:00
TextJump_ABoostedStringBuffer2ExpPoints: ; 3f12c
text_jump Text_ABoostedStringBuffer2ExpPoints
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db "@"
; 3f131
changed more labels
2015-09-09 16:27:07 -07:00
TextJump_StringBuffer2ExpPoints: ; 3f131
text_jump Text_StringBuffer2ExpPoints
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd004], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
ld a, [$ffb5]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd003], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push af
xor a
ld [DefaultFlypoint], a
Labeling of AI item and wild encounter functions
2015-10-07 18:27:32 -07:00
xor a ; PARTYMON
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [MonType], a
found CalcPkmnStats-function
2015-10-08 11:53:39 -07:00
predef CopyPkmnToTempMon
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld de, TempMonExp + 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3f39c
push bc
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, TempMonExp + 2
ld a, [wd004]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add [hl]
ld [hld], a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wd003]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
adc [hl]
ld [hld], a
jr nc, .asm_3f186
inc [hl]
jr nz, .asm_3f186
ld a, $ff
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
.asm_3f186
More MAX_LEVEL use.
2014-06-03 14:07:10 -07:00
ld d, MAX_LEVEL
Experience and level calculations
2015-11-03 09:36:33 -08:00
callab CalcExpAtLevel
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hMultiplicand]
ld b, a
ld a, [$ffb5]
ld c, a
ld a, [$ffb6]
ld d, a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, TempMonExp + 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hld]
sub d
ld a, [hld]
sbc c
ld a, [hl]
sbc b
jr c, .asm_3f1a8
ld a, b
ld [hli], a
ld a, c
ld [hli], a
ld a, d
ld [hld], a
.asm_3f1a8
Experience and level calculations
2015-11-03 09:36:33 -08:00
callab CalcLevel
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, d
pop bc
pop de
ld d, a
cp e
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
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_StringBuffer1GrewToLevel
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
pop de
inc e
ld b, $0
jr .asm_3f1b7
.asm_3f1ff
push bc
ld b, d
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld de, TempMonExp + 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
SendOutPkmnText: ; 3f26d
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jr z, .asm_3f27c
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, JumpText_GoPkmn ; If we're in a LinkBattle print just "Go <PlayerMon>"
ld a, [wd264] ; besides this variable is set. which stands for ???
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jr nz, .asm_3f2ce
.asm_3f27c
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
; Depending on the HP of the enemy Pkmn, the game prints a different text
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]
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, JumpText_GoPkmn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr z, .asm_3f2ce
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hMultiplicand + 0], 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]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc6ea], a
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hMultiplicand + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc6eb], a
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hMultiplicand + 2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hDivisor], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Divide
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld a, [hQuotient + 2]
ld hl, JumpText_GoPkmn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $46
jr nc, .asm_3f2ce
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, JumpText_DoItPkmn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $28
jr nc, .asm_3f2ce
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, JumpText_GoForItPkmn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $a
jr nc, .asm_3f2ce
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld hl, JumpText_YourFoesWeakGetmPkmn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3f2ce
jp BattleTextBox
; 3f2d1
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
JumpText_GoPkmn: ; 3f2d1
text_jump Text_GoPkmn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
start_asm
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
jr Function_TextJump_BattleMonNick01
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3f2d6
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
JumpText_DoItPkmn: ; 3f2d8
text_jump Text_DoItPkmn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
start_asm
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
jr Function_TextJump_BattleMonNick01
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3f2dd
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
JumpText_GoForItPkmn: ; 3f2df
text_jump Text_GoForItPkmn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
start_asm
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
jr Function_TextJump_BattleMonNick01
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3f2e4
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
JumpText_YourFoesWeakGetmPkmn: ; 3f2e6
text_jump Text_YourFoesWeakGetmPkmn
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
start_asm
; 3f2eb
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
Function_TextJump_BattleMonNick01: ; 3f2eb
ld hl, TextJump_BattleMonNick01
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3f2ef
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
TextJump_BattleMonNick01: ; 3f2ef
text_jump Text_BattleMonNick01
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db "@"
; 3f2f4
changed more labels
2015-09-09 16:27:07 -07:00
BattleMonNickComma_TextBox: ; 3f2f4
ld hl, TextJump_BattleMonNickComma
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jp BattleTextBox
; 3f2fa
changed more labels
2015-09-09 16:27:07 -07:00
TextJump_BattleMonNickComma: ; 3f2fa
text_jump Text_BattleMonNickComma
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
start_asm
; 3f2ff
Function3f2ff: ; 3f2ff
changed more labels
2015-09-09 16:27:07 -07:00
; Print text to withdraw Pkmn
; depending on HP the message is different
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld de, wc6eb
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, [hl]
dec hl
ld a, [de]
sub b
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hMultiplicand + 2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec de
ld b, [hl]
ld a, [de]
sbc b
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hMultiplicand + 1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hDivisor], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Divide
pop bc
pop de
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld a, [hQuotient + 2]
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, TextJump_ThatsEnoughComeBack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret z
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, TextJump_ComeBack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $1e
ret c
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, TextJump_OKComeBack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
cp $46
ret c
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, TextJump_GoodComeBack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3f348
changed more labels
2015-09-09 16:27:07 -07:00
TextJump_ThatsEnoughComeBack: ; 3f348
text_jump Text_ThatsEnoughComeBack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db "@"
; 3f34d
changed more labels
2015-09-09 16:27:07 -07:00
TextJump_OKComeBack: ; 3f34d
text_jump Text_OKComeBack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db "@"
; 3f352
changed more labels
2015-09-09 16:27:07 -07:00
TextJump_GoodComeBack: ; 3f352
text_jump Text_GoodComeBack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db "@"
; 3f357
changed more labels
2015-09-09 16:27:07 -07:00
Function_TextJump_ComeBack: ; 3f357
; this function doesn't seem to be used
ld hl, TextJump_ComeBack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3f35b
changed more labels
2015-09-09 16:27:07 -07:00
TextJump_ComeBack: ; 3f35b
text_jump Text_ComeBack
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
db "@"
; 3f360
Function3f360: ; 3f360
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wc6f0
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
and a
jr z, .asm_3f36d
dec [hl]
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_WildPkmnIsEating
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
jr .asm_3f388
.asm_3f36d
dec hl
ld a, [hl]
and a
ret z
dec [hl]
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_WildPkmnIsAngry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed more labels
2015-09-09 16:27:07 -07:00
call Call_LoadTempTileMapToTileMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Experience and level calculations
2015-11-03 09:36:33 -08:00
callab CalcExpAtLevel
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop de
ld hl, hMultiplicand
ld a, [hli]
push af
ld a, [hli]
push af
ld a, [hl]
push af
inc d
Experience and level calculations
2015-11-03 09:36:33 -08:00
callab CalcExpAtLevel
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld [hDivisor], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, $4
call Divide
changed varlabels for multiply- and divide-func, renamed battletext-labels
2015-09-06 14:38:01 -07:00
ld a, [hQuotient + 2]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, a
ld a, $40
sub b
ld b, a
ret
; 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
BattleCommand labels copied from macros
2015-11-06 11:45:10 -08:00
GetMonBackpic: ; 3f43d
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc6fe]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Replaced "ldtile" and "dwtile" with the "tile" equs macro
2015-10-14 06:29:15 -07:00
ld de, VTiles2 tile $31
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
Sprite movement function labels
2015-11-06 13:42:38 -08:00
GetMonFrontpic: ; 3f47c
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc6fa]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
About time I got to these functions
2015-10-24 07:34:19 -07:00
; This check prevents you from entering a battle without any Pokemon.
; Those using walk-through-walls to bypass getting a Pokemon experience
; the effects of this check.
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [PartyCount]
and a
ret z
About time I got to these functions
2015-10-24 07:34:19 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
About time I got to these functions
2015-10-24 07:34:19 -07:00
callba MobileFn_106050 ; mobile
call LoadTrainerOrWildMonPic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [TempBattleMonSpecies], a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0d2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Various labels
2015-11-05 11:06:03 -08:00
ld [hMapAnims], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
callba PlayBattleMusic
About time I got to these functions
2015-10-24 07:34:19 -07:00
callba ShowLinkBattleParticipants
callba FindFirstAliveMon
call DisableSpriteUpdates
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
callba ClearBattleRAM
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call InitEnemy
call BackUpVBGMap2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Some battle labels
2015-11-05 16:13:09 -08:00
lb bc, 5, 11
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
hlcoord 1, 0
Some battle labels
2015-11-05 16:13:09 -08:00
lb bc, 4, 10
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
call ClearSprites
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
About time I got to these functions
2015-10-24 07:34:19 -07:00
LoadTrainerOrWildMonPic: ; 3f54e
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [OtherTrainerClass]
and a
About time I got to these functions
2015-10-24 07:34:19 -07:00
jr nz, .Trainer
Wild Pokemon functions and data Replaced encounter rates with percent values Added new constants denoting the number of wild Pokemon in the grass and water wild constructs Annotated and relabeled the encounter generating functions Renamed a WRAM address associaed with the temporary storage of the wild Pokemon's species Moved spawn constants to constants/map_constants.asm for use anywhere in the disassembly
2015-07-23 00:41:52 -07:00
ld a, [TempWildMonSpecies]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [CurPartySpecies], a
About time I got to these functions
2015-10-24 07:34:19 -07:00
.Trainer
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [TempEnemyMonSpecies], a
ret
; 3f55e
Sprite movement function labels
2015-11-06 13:42:38 -08:00
InitEnemy: ; 3f55e
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [OtherTrainerClass]
and a
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jp nz, InitEnemyTrainer ; trainer
jp InitEnemyWildmon ; wild
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 3f568
Sprite movement function labels
2015-11-06 13:42:38 -08:00
BackUpVBGMap2: ; 3f568
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [rSVBK]
push af
Sprite movement function labels
2015-11-06 13:42:38 -08:00
ld a, $6 ; BANK(w6_d000)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [rSVBK], a
Fix a bunch of palette copying errors and wram bank conflicts. There are probably a bunch more labels with wrong banks. This takes care of the most noticeable ones.
2015-02-10 18:21:38 -08:00
ld hl, w6_d000
Sprite movement function labels
2015-11-06 13:42:38 -08:00
ld bc, $40 tiles ; VBGMap3 - VBGMap2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $2
call ByteFill
ld a, [rVBK]
push af
ld a, $1
ld [rVBK], a
Fix a bunch of palette copying errors and wram bank conflicts. There are probably a bunch more labels with wrong banks. This takes care of the most noticeable ones.
2015-02-10 18:21:38 -08:00
ld de, w6_d000
Sprite movement function labels
2015-11-06 13:42:38 -08:00
ld hl, VBGMap0 ; VBGMap2
lb bc, BANK(BackUpVBGMap2), $40
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Request2bpp
pop af
ld [rVBK], a
pop af
ld [rSVBK], a
ret
; 3f594
Sprite movement function labels
2015-11-06 13:42:38 -08:00
InitEnemyTrainer: ; 3f594
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [TrainerClass], a
About time I got to these functions
2015-10-24 07:34:19 -07:00
callba MobileFn_10606a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wc6e6], 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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, -1
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld [wBattleMode], a
Name and comment the trainer party reader. Reads the contents of trainers/trainers.asm.
2014-06-14 22:33:23 -07:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call IsJohtoGymLeader
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
jr nc, .done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
ld [CurPartyMon], a
ld a, [PartyCount]
ld b, a
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
.partyloop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
Replace party struct relative values with EQUS constants
2015-11-04 08:19:58 -08:00
ld a, MON_HP
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetPartyParamLocation
ld a, [hli]
or [hl]
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
jr z, .skipfaintedmon
ld c, HAPPINESS_GYMBATTLE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
callab ChangeHappiness
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
.skipfaintedmon
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
pop bc
dec b
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
jr z, .done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, CurPartyMon
inc [hl]
Happiness and Mystery Gift constants
2015-10-12 09:33:24 -07:00
jr .partyloop
.done
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3f607
Sprite movement function labels
2015-11-06 13:42:38 -08:00
InitEnemyWildmon: ; 3f607
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $1
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld [wBattleMode], a
About time I got to these functions
2015-10-24 07:34:19 -07:00
callba MobileFn_10605d
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld de, wc735
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld de, wc739
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wdef4]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
jr nz, .asm_3f648
ld a, [UnownLetter]
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wdef4], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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
Battle intro animation function
2015-10-17 14:18:52 -07:00
ld de, wListMoves_MoveIndicesBuffer
Consolidate NUM_MOVES usage and monster struct labels. There turned out to be a lot of instances of NUM_MOVES.
2014-06-10 23:08:07 -07:00
ld b, NUM_MOVES
even more battle labels
2014-01-05 04:28:55 -08:00
.loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [de]
inc de
ld [hli], a
and a
even more battle labels
2014-01-05 04:28:55 -08:00
jr z, .clearpp
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push bc
push hl
even more battle labels
2014-01-05 04:28:55 -08:00
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
push hl
dec a
even more battle labels
2014-01-05 04:28:55 -08:00
ld hl, Moves + MOVE_PP
Use constants for move struct positioning. This eliminates the need for arbitrary move labels like Move2 and Move1 that don't have anything to do with their respective moves.
2014-06-10 23:23:55 -07:00
ld bc, MOVE_LENGTH
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call AddNTimes
even more battle labels
2014-01-05 04:28:55 -08:00
ld a, BANK(Moves)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetFarByte
pop hl
even more battle labels
2014-01-05 04:28:55 -08:00
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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
About time I got to these functions
2015-10-24 07:34:19 -07:00
jr z, .not_linked
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
About time I got to these functions
2015-10-24 07:34:19 -07:00
.not_linked
ld a, [wBattleResult]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and $f
ret nz
call Function3f71d
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd1e9], 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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld [wBattleMode], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [BattleType], a
ld [AttackMissed], a
Wild Pokemon functions and data Replaced encounter rates with percent values Added new constants denoting the number of wild Pokemon in the grass and water wild constructs Annotated and relabeled the encounter generating functions Renamed a WRAM address associaed with the temporary storage of the wild Pokemon's species Moved spawn constants to constants/map_constants.asm for use anywhere in the disassembly
2015-07-23 00:41:52 -07:00
ld [TempWildMonSpecies], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [OtherTrainerClass], a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd266], a
ld [wd267], a
ld [wd232], a
ld [wd0d8], a
Address comments on PR 322
2015-10-24 16:49:19 -07:00
ld [wKeyItemsPocketCursor], a
ld [wItemsPocketCursor], a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0d2], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [CurMoveNum], a
Address comments on PR 322
2015-10-24 16:49:19 -07:00
ld [wBallsPocketCursor], a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wd0d6], a
ld [wd0e4], a
ld [wd0e0], a
ld [wd0df], a
ld [wd0e1], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld a, [wc73d]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], a
.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
changed more labels
2015-09-09 16:27:07 -07:00
ld hl, BattleText_PlayerPickuedUpPayDayMoney
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call StdBattleTextBox
changed more labels
2015-09-04 13:30:40 -07:00
ld a, [InBattleTowerBattle]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
bit 0, a
ret z
call ClearTileMap
call WhiteBGMap
ret
; 3f759
Function3f759: ; 3f759
About time I got to these functions
2015-10-24 07:34:19 -07:00
callba MobileFn_1060df
Various labels
2015-11-05 11:06:03 -08:00
callba BackupMobileEventIndex
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [CurOTMon]
ld hl, OTPartyMon1Status
call GetPartyLocation
ld a, [EnemyMonStatus]
ld [hl], a
call ClearTileMap
About time I got to these functions
2015-10-24 07:34:19 -07:00
callba _ShowLinkBattleParticipants
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3f77c
Function3f77c: ; 3f77c
callba Function3d2e0
jp c, Function3f80f
call Function3f830
jr nz, .asm_3f797
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wcd2a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
bit 4, [hl]
jr z, .asm_3f797
callba Function2b930
.asm_3f797
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and $f
cp $1
jr c, .asm_3f7ad
jr z, .asm_3f7b8
About time I got to these functions
2015-10-24 07:34:19 -07:00
callba MobileFn_106107
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, .Draw
jr .asm_3f7c3
.asm_3f7ad
About time I got to these functions
2015-10-24 07:34:19 -07:00
callba MobileFn_1060fb
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, .Win
jr .asm_3f7c3
.asm_3f7b8
About time I got to these functions
2015-10-24 07:34:19 -07:00
callba MobileFn_106101
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Various labels
2015-11-05 11:06:03 -08:00
callba BackupMobileEventIndex
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, $c8
call DelayFrames
soft reset
2015-10-04 11:14:51 -07:00
ld a, BANK(sLinkBattleStats)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wLinkMode]
cp LINK_MOBILE
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3f836
Function3f836: ; 3f836
Add labels for link battle scores.
2015-08-19 21:21:38 -07:00
ld a, BANK(sLinkBattleStats)
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call GetSRAMBank
call Function3f85f
call CloseSRAM
Various annotations Annotated the SGB functions in predef/sgb.asm, and some of the map scripts. Renamed several functions in home. Renamed six WRAM addresses corresponding to party icon animations, and renamed several others relative to these.
2015-07-22 12:57:02 -07:00
hlcoord 0, 0, AttrMap
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Various annotations Annotated the SGB functions in predef/sgb.asm, and some of the map scripts. Renamed several functions in home. Renamed six WRAM addresses corresponding to party icon animations, and renamed several others relative to these.
2015-07-22 12:57:02 -07:00
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ByteFill
call Function3200
ld b, $8
call GetSGBLayout
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld 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
soft reset
2015-10-04 11:14:51 -07:00
ld de, sLinkBattleStats + $8
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.asm_3f870
push bc
push hl
push de
ld a, [de]
and a
jr z, .asm_3f8c9
Split up bank 2; other relabelings
2015-10-16 10:35:43 -07:00
ld a, [wSavedAtLeastOnce]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld de, wd00d
Annotation of PrintNum arguments in bc, and radio functions
2015-10-10 14:03:04 -07:00
lb bc, 2, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PrintNum
pop hl
ld de, $0005
add hl, de
push hl
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld de, wd00f
Annotation of PrintNum arguments in bc, and radio functions
2015-10-10 14:03:04 -07:00
lb bc, 2, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PrintNum
pop hl
ld de, $0005
add hl, de
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld de, wd011
Annotation of PrintNum arguments in bc, and radio functions
2015-10-10 14:03:04 -07:00
lb bc, 2, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PrintNum
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
Add labels for link battle scores.
2015-08-19 21:21:38 -07:00
ld de, sLinkBattleWins
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call .asm_3f92b
jr c, .asm_3f92a
Annotation of PrintNum arguments in bc, and radio functions
2015-10-10 14:03:04 -07:00
lb bc, 2, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PrintNum
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 11, 4
Add labels for link battle scores.
2015-08-19 21:21:38 -07:00
ld de, sLinkBattleLosses
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call .asm_3f92b
Annotation of PrintNum arguments in bc, and radio functions
2015-10-10 14:03:04 -07:00
lb bc, 2, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PrintNum
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 16, 4
Add labels for link battle scores.
2015-08-19 21:21:38 -07:00
ld de, sLinkBattleDraws
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call .asm_3f92b
Annotation of PrintNum arguments in bc, and radio functions
2015-10-10 14:03:04 -07:00
lb bc, 2, 4
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call PrintNum
.asm_3f92a
ret
.asm_3f92b
Split up bank 2; other relabelings
2015-10-16 10:35:43 -07:00
ld a, [wSavedAtLeastOnce]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and a
ret nz
ld de, .Scores
call PlaceString
scf
ret
; 3f938
.Scores
db " 0 0 0@"
; 3f947
.Format ; 3f947
Split up bank 2; other relabelings
2015-10-16 10:35:43 -07:00
db " --- <LNBRK> - - -@"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.Record ; 3f964
Split up bank 2; other relabelings
2015-10-16 10:35:43 -07:00
db "<PLAYER>'s RECORD@"
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
.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
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and $f
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
More label updates, moved predefs to new file Also named most of the engine and event flag constants.
2015-07-20 00:51:52 -07:00
callab UpdateRoamMons
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wd276
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, StringBuffer1
ld bc, $0002
call CopyBytes
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld hl, wd26b
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld bc, $000a
call CopyBytes
ld hl, $b254
call Function3faa0
ld hl, $b266
ld d, $5
.asm_3fa62
push hl
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
inc hl
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [hl]
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec hl
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wBattleResult]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
and $f
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
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add b
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld e, a
ld d, $0
ld hl, DefaultFlypoint
add hl, de
push hl
ld a, c
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
rept 2
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add c
Reverted ld_hl_pointer macro
2015-07-20 19:18:18 -07:00
endr
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld 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
Sprite movement function labels
2015-11-06 13:42:38 -08:00
ld b, 4
ld c, 18
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call TextBox
callba MobileTextBorder
Use {hl,de,bc}coord macros wherever possible.
2014-06-04 01:10:56 -07:00
hlcoord 1, 5
Sweepthrough of ClearBox arg conversion to lb
2015-11-01 06:38:48 -08:00
lb bc, 3, 7
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call ClearBox
home/copy.asm completely labeled
2015-11-04 13:14:27 -08:00
call LoadStandardFont
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Function3ed9f
call Function3fbd6
xor a
Various labels
2015-11-05 11:06:03 -08:00
ld [hMapAnims], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Sprite movement function labels
2015-11-06 13:42:38 -08:00
lb bc, 6, 6
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
changed more labels
2015-09-09 16:27:07 -07:00
call SetPalettes
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, $90
ld [hWY], a
xor a
ld [hSCX], a
ret
; 3fbd6
Function3fbd6: ; 3fbd6
ld a, [rSVBK]
push af
ld a, $6
ld [rSVBK], a
Fix a bunch of palette copying errors and wram bank conflicts. There are probably a bunch more labels with wrong banks. This takes care of the most noticeable ones.
2015-02-10 18:21:38 -08:00
ld hl, w6_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
Fix a bunch of palette copying errors and wram bank conflicts. There are probably a bunch more labels with wrong banks. This takes care of the most noticeable ones.
2015-02-10 18:21:38 -08:00
ld de, w6_d000
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, VBGMap0
Inconsequential bank ref in battle graphics code.
2015-02-02 16:39:42 -08:00
lb bc, BANK(Function3fbd6), $40
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
call Request2bpp
pop af
ld [rSVBK], a
ret
; 3fbf8
Function3fbf8: ; 3fbf8
Sprite movement function labels
2015-11-06 13:42:38 -08:00
call GetTrainerBackpic
call CopyBackpic
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3fbff
Sprite movement function labels
2015-11-06 13:42:38 -08:00
GetTrainerBackpic: ; 3fbff
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
; 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?
About time I got to these functions
2015-10-24 07:34:19 -07:00
ld a, [wPlayerSpriteSetupFlags]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Replaced "ldtile" and "dwtile" with the "tile" equs macro
2015-10-14 06:29:15 -07:00
ld de, VTiles2 tile $31
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Sprite movement function labels
2015-11-06 13:42:38 -08:00
CopyBackpic: ; 3fc30
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [rSVBK]
push af
ld a, $6
ld [rSVBK], a
ld hl, VTiles0
Replaced "ldtile" and "dwtile" with the "tile" equs macro
2015-10-14 06:29:15 -07:00
ld de, VTiles2 tile $31
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Sprite movement function labels
2015-11-06 13:42:38 -08:00
lb bc, 6, 6
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
object_struct
2015-11-02 08:15:32 -08:00
ld [hMapObjectIndexBuffer], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld b, $6
ld e, $a8
Sprite movement function labels
2015-11-06 13:42:38 -08:00
.outer_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld c, $3
ld d, $40
Sprite movement function labels
2015-11-06 13:42:38 -08:00
.inner_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hl], d
inc hl
ld [hl], e
inc hl
object_struct
2015-11-02 08:15:32 -08:00
ld a, [hMapObjectIndexBuffer]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld [hli], a
inc a
object_struct
2015-11-02 08:15:32 -08:00
ld [hMapObjectIndexBuffer], 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
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr nz, .inner_loop
object_struct
2015-11-02 08:15:32 -08:00
ld a, [hMapObjectIndexBuffer]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
add $3
object_struct
2015-11-02 08:15:32 -08:00
ld [hMapObjectIndexBuffer], 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
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr nz, .outer_loop
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ret
; 3fc8b
BattleStartMessage: ; 3fc8b
Move battle start animation functions to its own file
2015-10-19 07:23:58 -07:00
ld a, [wBattleMode]
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
dec a
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr z, .wild
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld de, SFX_SHINE
call PlaySFX
call WaitSFX
ld c, 20
call DelayFrames
More enumeration of constants, more annotations of scripts.
2015-07-15 12:48:44 -07:00
callba Battle_GetTrainerName
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, WantsToBattleText
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr .PlaceBattleStartText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Sprite movement function labels
2015-11-06 13:42:38 -08:00
.wild
call BattleCheckEnemyShininess
jr nc, .not_shiny
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
xor a
Blindly use wram labels for everything except mobile, part 1. Wram banks and mobile make this tough, since any address can secretly be a ghost. As usual, mobile completely disregards 99% of the codebase. It's been ignored in kind.
2015-02-08 00:03:32 -08:00
ld [wcfca], a
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, 1
ld [hBattleTurn], a
ld a, 1
More battle command labels
2015-11-06 17:55:16 -08:00
ld [wKickCounter], a
More battle code cleanup. - Use more substatus constants. - Reformat some code to be more atomic. - Add constants for unused status prevention held item effects. - Remove pointless or redundant comments.
2014-06-13 21:18:14 -07:00
ld de, ANIM_SEND_OUT_MON
changed more labels
2015-09-09 16:27:07 -07:00
call Call_PlayBattleAnim
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Sprite movement function labels
2015-11-06 13:42:38 -08:00
.not_shiny
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
callba CheckSleepingTreeMon
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr c, .skip_cry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
callba CheckBattleScene
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr c, .do_cry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr .skip_cry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Sprite movement function labels
2015-11-06 13:42:38 -08:00
.do_cry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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
Sprite movement function labels
2015-11-06 13:42:38 -08:00
.skip_cry
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld a, [BattleType]
cp BATTLETYPE_FISH
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr nz, .NotFishing
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
About time I got to these functions
2015-10-24 07:34:19 -07:00
callba MobileFn_106086
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, HookedPokemonAttackedText
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr .PlaceBattleStartText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
Sprite movement function labels
2015-11-06 13:42:38 -08:00
.NotFishing
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, PokemonFellFromTreeText
cp BATTLETYPE_TREE
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr z, .PlaceBattleStartText
Battle type constants in the wild. Also add constants for trap and Celebi event battles.
2014-06-13 22:53:20 -07:00
ld hl, WildCelebiAppearedText
cp BATTLETYPE_CELEBI
Sprite movement function labels
2015-11-06 13:42:38 -08:00
jr z, .PlaceBattleStartText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
ld hl, WildPokemonAppearedText
Sprite movement function labels
2015-11-06 13:42:38 -08:00
.PlaceBattleStartText
split out the battle engine into battle/core.asm
2013-12-17 22:11:06 -08:00
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