Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove all address comments

Browse Source
This commit is contained in:
mid-kid
2018-06-24 16:09:41 +02:00
parent 131875d3e3
commit 1d9a68dbdd
616 changed files with 12133 additions and 20380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

174
engine/battle_anims/anim_commands.asm
View File

@@ -1,6 +1,6 @@
; Battle animation command interpreter.
PlayBattleAnim: ; cc0d6
PlayBattleAnim:
ld a, [rSVBK]
push af
@@ -13,9 +13,8 @@ PlayBattleAnim: ; cc0d6
pop af
ld [rSVBK], a
ret
; cc0e4
_PlayBattleAnim: ; cc0e4
_PlayBattleAnim:
ld c, 6
.wait
@@ -52,9 +51,8 @@ _PlayBattleAnim: ; cc0e4
call BattleAnimDelayFrame
call WaitSFX
ret
; cc11c
BattleAnimRunScript: ; cc11c
BattleAnimRunScript:
ld a, [wFXAnimID + 1]
and a
@@ -97,9 +95,8 @@ BattleAnimRunScript: ; cc11c
.done
call BattleAnim_RevertPals
ret
; cc163
RunBattleAnimScript: ; cc163
RunBattleAnimScript:
call ClearBattleAnims
@@ -140,9 +137,8 @@ RunBattleAnimScript: ; cc163
call BattleAnim_ClearCGB_OAMFlags
ret
; cc1a1
BattleAnimClearHud: ; cc1a1
BattleAnimClearHud:
call BattleAnimDelayFrame
call WaitTop
@@ -154,9 +150,8 @@ BattleAnimClearHud: ; cc1a1
call BattleAnimDelayFrame
call WaitTop
ret
; cc1bb
BattleAnimRestoreHuds: ; cc1bb
BattleAnimRestoreHuds:
call BattleAnimDelayFrame
call WaitTop
@@ -180,9 +175,8 @@ BattleAnimRestoreHuds: ; cc1bb
call BattleAnimDelayFrame
call WaitTop
ret
; cc1e2
BattleAnimRequestPals: ; cc1e2
BattleAnimRequestPals:
ld a, [hCGB]
and a
@@ -200,9 +194,8 @@ BattleAnimRequestPals: ; cc1e2
cp b
call nz, BattleAnim_SetOBPals
ret
; cc1fb
BattleAnimDelayFrame: ; cc1fb
BattleAnimDelayFrame:
; Like DelayFrame but wastes battery life.
ld a, 1
@@ -212,9 +205,8 @@ BattleAnimDelayFrame: ; cc1fb
and a
jr nz, .wait
ret
; cc207
ClearActorHud: ; cc207
ClearActorHud:
ld a, [hBattleTurn]
and a
@@ -230,9 +222,8 @@ ClearActorHud: ; cc207
lb bc, 5, 11
call ClearBox
ret
; cc220
Unreferenced_Functioncc220: ; cc220
Unreferenced_Functioncc220:
xor a
ld [hBGMapMode], a
ld a, LOW(vBGMap0 tile $28)
@@ -248,10 +239,9 @@ Unreferenced_Functioncc220: ; cc220
ld [hBGMapAddress + 1], a
call BattleAnimDelayFrame
ret
; cc23d
BattleAnim_ClearCGB_OAMFlags: ; cc23d
BattleAnim_ClearCGB_OAMFlags:
ld a, [wBattleAnimFlags]
bit 3, a
@@ -279,16 +269,14 @@ endr
dec c
jr nz, .loop2
ret
; cc25f
RunBattleAnimCommand: ; cc25f
RunBattleAnimCommand:
call .CheckTimer
ret nc
call .RunScript
ret
; cc267
.CheckTimer: ; cc267
.CheckTimer:
ld a, [wBattleAnimDuration]
and a
jr z, .done
@@ -301,9 +289,8 @@ RunBattleAnimCommand: ; cc25f
.done
scf
ret
; cc275
.RunScript: ; cc275
.RunScript:
.loop
call GetBattleAnimByte
@@ -329,9 +316,8 @@ RunBattleAnimCommand: ; cc25f
call .DoCommand
jr .loop
; cc293
.DoCommand: ; cc293
.DoCommand:
; Execute battle animation command in [wBattleAnimByte].
ld a, [wBattleAnimByte]
sub $d0
@@ -346,10 +332,9 @@ RunBattleAnimCommand: ; cc25f
ld h, [hl]
ld l, a
jp hl
; cc2a4
BattleAnimCommands:: ; cc2a4 (33:42a4)
BattleAnimCommands::
; entries correspond to macros/scripts/battle_anims.asm enumeration
dw BattleAnimCmd_Obj
dw BattleAnimCmd_1GFX
@@ -404,10 +389,10 @@ BattleAnimCommands:: ; cc2a4 (33:42a4)
BattleAnimCmd_EA:
BattleAnimCmd_EB:
BattleAnimCmd_EC:
BattleAnimCmd_ED: ; cc304 (33:4304)
BattleAnimCmd_ED:
ret
BattleAnimCmd_Ret: ; cc305 (33:4305)
BattleAnimCmd_Ret:
ld hl, wBattleAnimFlags
res 1, [hl]
ld hl, wBattleAnimParent
@@ -420,7 +405,7 @@ BattleAnimCmd_Ret: ; cc305 (33:4305)
ld [hl], d
ret
BattleAnimCmd_Call: ; cc317 (33:4317)
BattleAnimCmd_Call:
call GetBattleAnimByte
ld e, a
call GetBattleAnimByte
@@ -443,7 +428,7 @@ BattleAnimCmd_Call: ; cc317 (33:4317)
set 1, [hl]
ret
BattleAnimCmd_Jump: ; cc339 (33:4339)
BattleAnimCmd_Jump:
call GetBattleAnimByte
ld e, a
call GetBattleAnimByte
@@ -454,7 +439,7 @@ BattleAnimCmd_Jump: ; cc339 (33:4339)
ld [hl], d
ret
BattleAnimCmd_Loop: ; cc348 (33:4348)
BattleAnimCmd_Loop:
call GetBattleAnimByte
ld hl, wBattleAnimFlags
bit 2, [hl]
@@ -495,7 +480,7 @@ BattleAnimCmd_Loop: ; cc348 (33:4348)
ld [hl], e
ret
BattleAnimCmd_JumpUntil: ; cc383 (33:4383)
BattleAnimCmd_JumpUntil:
ld hl, wBattleAnimParam
ld a, [hl]
and a
@@ -524,17 +509,17 @@ BattleAnimCmd_JumpUntil: ; cc383 (33:4383)
ld [hl], e
ret
BattleAnimCmd_SetVar: ; cc3a6 (33:43a6)
BattleAnimCmd_SetVar:
call GetBattleAnimByte
ld [wBattleAnimVar], a
ret
BattleAnimCmd_IncVar: ; cc3ad (33:43ad)
BattleAnimCmd_IncVar:
ld hl, wBattleAnimVar
inc [hl]
ret
BattleAnimCmd_IfVarEqual: ; cc3b2 (33:43b2)
BattleAnimCmd_IfVarEqual:
call GetBattleAnimByte
ld hl, wBattleAnimVar
cp [hl]
@@ -562,7 +547,7 @@ BattleAnimCmd_IfVarEqual: ; cc3b2 (33:43b2)
ld [hl], d
ret
BattleAnimCmd_IfParamEqual: ; cc3d6 (33:43d6)
BattleAnimCmd_IfParamEqual:
call GetBattleAnimByte
ld hl, wBattleAnimParam
cp [hl]
@@ -590,7 +575,7 @@ BattleAnimCmd_IfParamEqual: ; cc3d6 (33:43d6)
ld [hl], d
ret
BattleAnimCmd_IfParamAnd: ; cc3fa (33:43fa)
BattleAnimCmd_IfParamAnd:
call GetBattleAnimByte
ld e, a
ld a, [wBattleAnimParam]
@@ -619,7 +604,7 @@ BattleAnimCmd_IfParamAnd: ; cc3fa (33:43fa)
ld [hl], d
ret
BattleAnimCmd_Obj: ; cc41f (33:441f)
BattleAnimCmd_Obj:
; index, x, y, param
call GetBattleAnimByte
ld [wBattleAnimTemp0], a
@@ -632,7 +617,7 @@ BattleAnimCmd_Obj: ; cc41f (33:441f)
call QueueBattleAnimation
ret
BattleAnimCmd_BGEffect: ; cc43b (33:443b)
BattleAnimCmd_BGEffect:
call GetBattleAnimByte
ld [wBattleAnimTemp0], a
call GetBattleAnimByte
@@ -644,22 +629,22 @@ BattleAnimCmd_BGEffect: ; cc43b (33:443b)
call _QueueBGEffect
ret
BattleAnimCmd_BGP: ; cc457 (33:4457)
BattleAnimCmd_BGP:
call GetBattleAnimByte
ld [wBGP], a
ret
BattleAnimCmd_OBP0: ; cc45e (33:445e)
BattleAnimCmd_OBP0:
call GetBattleAnimByte
ld [wOBP0], a
ret
BattleAnimCmd_OBP1: ; cc465 (33:4465)
BattleAnimCmd_OBP1:
call GetBattleAnimByte
ld [wOBP1], a
ret
BattleAnimCmd_ResetObp0: ; cc46c (33:446c)
BattleAnimCmd_ResetObp0:
ld a, [hSGB]
and a
ld a, $e0
@@ -669,7 +654,7 @@ BattleAnimCmd_ResetObp0: ; cc46c (33:446c)
ld [wOBP0], a
ret
BattleAnimCmd_ClearObjs: ; cc479 (33:4479)
BattleAnimCmd_ClearObjs:
ld hl, wActiveAnimObjects
ld a, $a0
.loop
@@ -683,7 +668,7 @@ BattleAnimCmd_1GFX:
BattleAnimCmd_2GFX:
BattleAnimCmd_3GFX:
BattleAnimCmd_4GFX:
BattleAnimCmd_5GFX: ; cc485 (33:4485)
BattleAnimCmd_5GFX:
ld a, [wBattleAnimByte]
and $f
ld c, a
@@ -718,7 +703,7 @@ endr
jr nz, .loop
ret
BattleAnimCmd_IncObj: ; cc4c0 (33:44c0)
BattleAnimCmd_IncObj:
call GetBattleAnimByte
ld e, 10
ld bc, wActiveAnimObjects
@@ -743,7 +728,7 @@ BattleAnimCmd_IncObj: ; cc4c0 (33:44c0)
inc [hl]
ret
BattleAnimCmd_IncBGEffect: ; cc4e3 (33:44e3)
BattleAnimCmd_IncBGEffect:
call GetBattleAnimByte
ld e, 5
ld bc, wActiveBGEffects
@@ -768,7 +753,7 @@ BattleAnimCmd_IncBGEffect: ; cc4e3 (33:44e3)
inc [hl]
ret
BattleAnimCmd_SetObj: ; cc506 (33:4506)
BattleAnimCmd_SetObj:
call GetBattleAnimByte
ld e, 10
ld bc, wActiveAnimObjects
@@ -794,7 +779,7 @@ BattleAnimCmd_SetObj: ; cc506 (33:4506)
ld [hl], a
ret
BattleAnimCmd_EnemyFeetObj: ; cc52c (33:452c)
BattleAnimCmd_EnemyFeetObj:
ld hl, wBattleAnimTileDict
.loop
@@ -828,7 +813,7 @@ BattleAnimCmd_EnemyFeetObj: ; cc52c (33:452c)
call .LoadFootprint
ret
.LoadFootprint: ; cc561 (33:4561)
.LoadFootprint:
push af
push hl
push de
@@ -849,7 +834,7 @@ BattleAnimCmd_EnemyFeetObj: ; cc52c (33:452c)
jr nz, .LoadFootprint
ret
BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e)
BattleAnimCmd_PlayerHeadObj:
ld hl, wBattleAnimTileDict
.loop
@@ -883,7 +868,7 @@ BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e)
call .LoadHead
ret
.LoadHead: ; cc5b3 (33:45b3)
.LoadHead:
push af
push hl
push de
@@ -904,16 +889,16 @@ BattleAnimCmd_PlayerHeadObj: ; cc57e (33:457e)
jr nz, .LoadHead
ret
BattleAnimCmd_CheckPokeball: ; cc5d0 (33:45d0)
BattleAnimCmd_CheckPokeball:
callfar GetPokeBallWobble
ld a, c
ld [wBattleAnimVar], a
ret
BattleAnimCmd_E7: ; cc5db (33:45db)
BattleAnimCmd_E7:
ret
BattleAnimCmd_Transform: ; cc5dc (33:45dc)
BattleAnimCmd_Transform:
ld a, [rSVBK]
push af
ld a, BANK(wCurPartySpecies)
@@ -948,7 +933,7 @@ BattleAnimCmd_Transform: ; cc5dc (33:45dc)
ld [rSVBK], a
ret
BattleAnimCmd_UpdateActorPic: ; cc622 (33:4622)
BattleAnimCmd_UpdateActorPic:
ld de, vTiles0 tile $00
ld a, [hBattleTurn]
@@ -968,7 +953,7 @@ BattleAnimCmd_UpdateActorPic: ; cc622 (33:4622)
call Request2bpp
ret
BattleAnimCmd_RaiseSub: ; cc640 (33:4640)
BattleAnimCmd_RaiseSub:
ld a, [rSVBK]
push af
@@ -1037,13 +1022,13 @@ GetSubstitutePic: ; used only for BANK(GetSubstitutePic)
ld [rSVBK], a
ret
.CopyTile: ; cc6c6 (33:46c6)
.CopyTile:
ld bc, 1 tiles
ld a, BANK(MonsterSpriteGFX)
call FarCopyBytes
ret
BattleAnimCmd_MinimizeOpp: ; cc6cf (33:46cf)
BattleAnimCmd_MinimizeOpp:
ld a, [rSVBK]
push af
ld a, 1 ; unnecessary bankswitch?
@@ -1057,7 +1042,7 @@ BattleAnimCmd_MinimizeOpp: ; cc6cf (33:46cf)
ld [rSVBK], a
ret
GetMinimizePic: ; cc6e7 (33:46e7)
GetMinimizePic:
ld hl, sScratch
ld bc, $31 tiles
.loop
@@ -1087,19 +1072,17 @@ GetMinimizePic: ; cc6e7 (33:46e7)
lb bc, BANK(GetMinimizePic), 6 * 6
ret
CopyMinimizePic: ; cc719 (33:4719)
CopyMinimizePic:
ld hl, MinimizePic
ld bc, $10
ld a, BANK(MinimizePic)
call FarCopyBytes
ret
; cc725 (33:4725)
MinimizePic: ; cc725
MinimizePic:
INCBIN "gfx/battle/minimize.2bpp"
; cc735
BattleAnimCmd_Minimize: ; cc735 (33:4735)
BattleAnimCmd_Minimize:
ld a, [rSVBK]
push af
ld a, 1 ; unnecessary bankswitch?
@@ -1114,7 +1097,7 @@ BattleAnimCmd_Minimize: ; cc735 (33:4735)
ld [rSVBK], a
ret
BattleAnimCmd_DropSub: ; cc750 (33:4750)
BattleAnimCmd_DropSub:
ld a, [rSVBK]
push af
ld a, BANK(wCurPartySpecies)
@@ -1139,7 +1122,7 @@ BattleAnimCmd_DropSub: ; cc750 (33:4750)
ld [rSVBK], a
ret
BattleAnimCmd_BeatUp: ; cc776 (33:4776)
BattleAnimCmd_BeatUp:
ld a, [rSVBK]
push af
ld a, BANK(wCurPartySpecies)
@@ -1175,31 +1158,31 @@ BattleAnimCmd_BeatUp: ; cc776 (33:4776)
ld [rSVBK], a
ret
BattleAnimCmd_OAMOn: ; cc7bb (33:47bb)
BattleAnimCmd_OAMOn:
xor a
ld [hOAMUpdate], a
ret
BattleAnimCmd_OAMOff: ; cc7bf (33:47bf)
BattleAnimCmd_OAMOff:
ld a, $1
ld [hOAMUpdate], a
ret
BattleAnimCmd_ClearSprites: ; cc7c4 (33:47c4)
BattleAnimCmd_ClearSprites:
ld hl, wBattleAnimFlags
set 3, [hl]
ret
BattleAnimCmd_F5: ; cc7ca (33:47ca)
BattleAnimCmd_F5:
ret
BattleAnimCmd_F6: ; cc7cb (33:47cb)
BattleAnimCmd_F6:
ret
BattleAnimCmd_F7: ; cc7cc (33:47cc)
BattleAnimCmd_F7:
ret
BattleAnimCmd_Sound: ; cc7cd (33:47cd)
BattleAnimCmd_Sound:
call GetBattleAnimByte
ld e, a
srl a
@@ -1222,13 +1205,11 @@ BattleAnimCmd_Sound: ; cc7cd (33:47cd)
callfar PlayStereoSFX
ret
; cc7f8 (33:47f8)
.GetPanning: ; cc7f8
.GetPanning:
db $f0, $0f, $f0, $0f
; cc7fc
.GetCryTrack: ; cc7fc (33:47fc)
.GetCryTrack:
ld a, [hBattleTurn]
and a
jr nz, .enemy
@@ -1241,7 +1222,7 @@ BattleAnimCmd_Sound: ; cc7cd (33:47cd)
xor 1
ret
BattleAnimCmd_Cry: ; cc807 (33:4807)
BattleAnimCmd_Cry:
call GetBattleAnimByte
maskbits NUM_NOISE_CHANS
ld e, a
@@ -1315,18 +1296,16 @@ endr
pop af
ld [rSVBK], a
ret
; cc871 (33:4871)
.CryData: ; cc871
.CryData:
; +pitch, +length
dw $0000, $00c0
dw $0000, $0040
dw $0000, $0000
dw $0000, $0000
; cc881
PlayHitSound: ; cc881
PlayHitSound:
ld a, [wNumHits]
cp $1
jr z, .okay
@@ -1350,9 +1329,8 @@ PlayHitSound: ; cc881
.play
call PlaySFX
ret
; cc8a4
BattleAnimAssignPals: ; cc8a4
BattleAnimAssignPals:
ld a, [hCGB]
and a
jr nz, .cgb
@@ -1378,9 +1356,8 @@ BattleAnimAssignPals: ; cc8a4
lb de, %11100100, %11100100
call DmgToCgbObjPals
ret
; cc8d3
ClearBattleAnims: ; cc8d3
ClearBattleAnims:
; Clear animation block
ld hl, wLYOverrides
ld bc, wBattleAnimEnd - wLYOverrides
@@ -1403,9 +1380,8 @@ ClearBattleAnims: ; cc8d3
call BattleAnimAssignPals
call BattleAnimDelayFrame
ret
; cc8f6
BattleAnim_RevertPals: ; cc8f6
BattleAnim_RevertPals:
call WaitTop
ld a, %11100100
ld [wBGP], a
@@ -1421,9 +1397,8 @@ BattleAnim_RevertPals: ; cc8f6
ld a, $1
ld [hBGMapMode], a
ret
; cc91a
BattleAnim_SetBGPals: ; cc91a
BattleAnim_SetBGPals:
ld [rBGP], a
ld a, [hCGB]
and a
@@ -1449,9 +1424,8 @@ BattleAnim_SetBGPals: ; cc91a
ld a, $1
ld [hCGBPalUpdate], a
ret
; cc94b
BattleAnim_SetOBPals: ; cc94b
BattleAnim_SetOBPals:
ld [rOBP0], a
ld a, [hCGB]
and a
@@ -1471,9 +1445,8 @@ BattleAnim_SetOBPals: ; cc94b
ld a, $1
ld [hCGBPalUpdate], a
ret
; cc96e
BattleAnim_UpdateOAM_All: ; cc96e
BattleAnim_UpdateOAM_All:
ld a, $0
ld [wBattleAnimOAMPointerLo], a
ld hl, wActiveAnimObjects
@@ -1510,4 +1483,3 @@ BattleAnim_UpdateOAM_All: ; cc96e
.done
ret
; cc9a1

232
engine/battle_anims/bg_effects.asm
View File

@@ -8,7 +8,7 @@
; BG effects for use in battle animations.
ExecuteBGEffects: ; c8000 (32:4000)
ExecuteBGEffects:
ld hl, wActiveBGEffects
ld e, 5
.loop
@@ -29,7 +29,7 @@ ExecuteBGEffects: ; c8000 (32:4000)
jr nz, .loop
ret
QueueBGEffect: ; c801a (32:401a)
QueueBGEffect:
ld hl, wActiveBGEffects
ld e, 5
.loop
@@ -58,13 +58,13 @@ QueueBGEffect: ; c801a (32:401a)
ld [hl], a
ret
EndBattleBGEffect: ; c8043 (32:4043)
EndBattleBGEffect:
ld hl, BG_EFFECT_STRUCT_FUNCTION
add hl, bc
ld [hl], 0
ret
DoBattleBGEffectFunction: ; c804a (32:404a)
DoBattleBGEffectFunction:
ld hl, BG_EFFECT_STRUCT_FUNCTION
add hl, bc
ld e, [hl]
@@ -77,7 +77,7 @@ DoBattleBGEffectFunction: ; c804a (32:404a)
ld l, a
jp hl
BattleBGEffects: ; c805a (32:405a)
BattleBGEffects:
; entries correspond to ANIM_BG_* constants
dw BattleBGEffect_End
dw BattleBGEffect_FlashInverted
@@ -135,11 +135,11 @@ BattleBGEffects: ; c805a (32:405a)
dw BattleBGEffect_35
BattleBGEffect_End: ; c80c6 (32:40c6)
BattleBGEffect_End:
call EndBattleBGEffect
ret
BatttleBGEffects_GetNamedJumptablePointer: ; c80ca (32:40ca)
BatttleBGEffects_GetNamedJumptablePointer:
ld hl, BG_EFFECT_STRUCT_JT_INDEX
add hl, bc
ld l, [hl]
@@ -151,7 +151,7 @@ BatttleBGEffects_GetNamedJumptablePointer: ; c80ca (32:40ca)
ld l, a
ret
BattleBGEffects_AnonJumptable: ; c80d7 (32:40d7)
BattleBGEffects_AnonJumptable:
pop de
ld hl, BG_EFFECT_STRUCT_JT_INDEX
add hl, bc
@@ -164,31 +164,29 @@ BattleBGEffects_AnonJumptable: ; c80d7 (32:40d7)
ld l, a
jp hl
BattleBGEffects_IncrementJumptable: ; c80e5 (32:40e5)
BattleBGEffects_IncrementJumptable:
ld hl, BG_EFFECT_STRUCT_JT_INDEX
add hl, bc
inc [hl]
ret
BattleBGEffect_FlashInverted: ; c80eb (32:40eb)
BattleBGEffect_FlashInverted:
ld de, .inverted
jp BattleBGEffect_FlashContinue
.inverted
db %11100100 ; 3210
db %00011011 ; 0123
; c80f3
BattleBGEffect_FlashWhite: ; c80f3 (32:40f3)
BattleBGEffect_FlashWhite:
ld de, .white
jp BattleBGEffect_FlashContinue
.white
db %11100100 ; 3210
db %00000000 ; 0000
; c80fb
BattleBGEffect_FlashContinue: ; c80fb (32:40fb)
BattleBGEffect_FlashContinue:
; current timer, flash duration, number of flashes
ld a, $1
ld [wBattleAnimTemp0], a
@@ -226,7 +224,7 @@ BattleBGEffect_FlashContinue: ; c80fb (32:40fb)
ld [wBGP], a
ret
BattleBGEffect_WhiteHues: ; c812d (32:412d)
BattleBGEffect_WhiteHues:
ld de, .Pals
call BattleBGEffect_GetNthDMGPal
jr c, .quit
@@ -242,9 +240,8 @@ BattleBGEffect_WhiteHues: ; c812d (32:412d)
db %11100000
db %11010000
db -1
; c8141
BattleBGEffect_BlackHues: ; c8141 (32:4141)
BattleBGEffect_BlackHues:
ld de, .Pals
call BattleBGEffect_GetNthDMGPal
jr c, .quit
@@ -260,9 +257,8 @@ BattleBGEffect_BlackHues: ; c8141 (32:4141)
db %11110100
db %11111000
db -1
; c8155
BattleBGEffect_AlternateHues: ; c8155 (32:4155)
BattleBGEffect_AlternateHues:
ld de, .Pals
call BattleBGEffect_GetNthDMGPal
jr c, .quit
@@ -284,9 +280,8 @@ BattleBGEffect_AlternateHues: ; c8155 (32:4155)
db %01000000
db %10010000
db -2
; c8171
BattleBGEffect_06: ; c8171 (32:4171)
BattleBGEffect_06:
call BattleBGEffects_CheckSGB
jr nz, .sgb
ld de, .PalsCGB
@@ -308,9 +303,8 @@ BattleBGEffect_06: ; c8171 (32:4171)
db %11110000
db %11000000
db -2
; c818b
BattleBGEffect_07: ; c818b (32:418b)
BattleBGEffect_07:
call BattleBGEffects_CheckSGB
jr nz, .sgb
ld de, .PalsCGB
@@ -332,9 +326,8 @@ BattleBGEffect_07: ; c818b (32:418b)
db %11110000
db %11001100
db -2
; c81a5
BattleBGEffect_08: ; c81a5 (32:41a5)
BattleBGEffect_08:
ld de, .Pals
call BattleBGEffect_GetNthDMGPal
ld [wBGP], a
@@ -345,9 +338,8 @@ BattleBGEffect_08: ; c81a5 (32:41a5)
db %01100011
db %10000111
db -2
; c81b3
BattleBGEffect_HideMon: ; c81b3 (32:41b3)
BattleBGEffect_HideMon:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -384,7 +376,7 @@ BattleBGEffect_HideMon: ; c81b3 (32:41b3)
call EndBattleBGEffect
ret
BattleBGEffect_ShowMon: ; c81ea (32:41ea)
BattleBGEffect_ShowMon:
call BGEffect_CheckFlyDigStatus
jr z, .not_flying
call EndBattleBGEffect
@@ -412,9 +404,8 @@ BattleBGEffect_ShowMon: ; c81ea (32:41ea)
.EnemyData:
db 3, $00, 3
db -1
; c8214
BattleBGEffect_FeetFollow: ; c8214 (32:4214)
BattleBGEffect_FeetFollow:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -482,7 +473,7 @@ BattleBGEffect_FeetFollow: ; c8214 (32:4214)
call EndBattleBGEffect
ret
BattleBGEffect_HeadFollow: ; c8281 (32:4281)
BattleBGEffect_HeadFollow:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -550,11 +541,11 @@ BattleBGEffect_HeadFollow: ; c8281 (32:4281)
call EndBattleBGEffect
ret
_QueueBattleAnimation: ; c82ee (32:42ee)
_QueueBattleAnimation:
callfar QueueBattleAnimation
ret
BattleBGEffect_27: ; c82f5 (32:42f5)
BattleBGEffect_27:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -655,7 +646,7 @@ BattleBGEffect_27: ; c82f5 (32:42f5)
call EndBattleBGEffect
ret
BattleBGEffect_EnterMon: ; c837b (32:437b)
BattleBGEffect_EnterMon:
call BGEffect_CheckBattleTurn
jr nz, .player_turn
ld de, .EnemyData
@@ -681,9 +672,8 @@ BattleBGEffect_EnterMon: ; c837b (32:437b)
db 4, $00, 4
db 3, $00, 3
db -1
; c83a8
BattleBGEffect_ReturnMon: ; c83a8 (32:43a8)
BattleBGEffect_ReturnMon:
call BGEffect_CheckBattleTurn
jr nz, .player_turn
ld de, .EnemyData
@@ -717,9 +707,8 @@ BattleBGEffect_ReturnMon: ; c83a8 (32:43a8)
db -2, $33, 5
db -3, $00, 0
db -1
; c83ed
BattleBGEffect_RunPicResizeScript: ; c83ed (32:43ed)
BattleBGEffect_RunPicResizeScript:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -918,9 +907,8 @@ ENDM
db $00, $15, $2a
db $03, $18, $2d
db $06, $1b, $30
; c8545
BattleBGEffect_Surf: ; c8545 (32:4545)
BattleBGEffect_Surf:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -987,7 +975,7 @@ BattleBGEffect_Surf: ; c8545 (32:4545)
jr c, .loop2
ret
BattleBGEffect_Whirlpool: ; c8599 (32:4599)
BattleBGEffect_Whirlpool:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -1016,14 +1004,14 @@ BattleBGEffect_Whirlpool: ; c8599 (32:4599)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_30: ; c85c2 (32:45c2)
BattleBGEffect_30:
call BattleBGEffects_ClearLYOverrides
ld a, rSCY - $ff00
call BattleBGEffect_SetLCDStatCustoms1
call EndBattleBGEffect
ret
BattleBGEffect_31: ; c85ce (32:45ce)
BattleBGEffect_31:
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld a, [hl]
@@ -1057,11 +1045,11 @@ BattleBGEffect_31: ; c85ce (32:45ce)
call EndBattleBGEffect
ret
BattleBGEffect_32: ; c8603 (32:4603)
BattleBGEffect_32:
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_Psychic: ; c8607 (32:4607)
BattleBGEffect_Psychic:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -1099,7 +1087,7 @@ BattleBGEffect_Psychic: ; c8607 (32:4607)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_Teleport: ; c863f (32:463f)
BattleBGEffect_Teleport:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -1124,7 +1112,7 @@ BattleBGEffect_Teleport: ; c863f (32:463f)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_NightShade: ; c8662 (32:4662)
BattleBGEffect_NightShade:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -1152,7 +1140,7 @@ BattleBGEffect_NightShade: ; c8662 (32:4662)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_DoubleTeam: ; c8689 (32:4689)
BattleBGEffect_DoubleTeam:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -1247,7 +1235,7 @@ BattleBGEffect_DoubleTeam: ; c8689 (32:4689)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_AcidArmor: ; c8709 (32:4709)
BattleBGEffect_AcidArmor:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -1310,7 +1298,7 @@ BattleBGEffect_AcidArmor: ; c8709 (32:4709)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_Withdraw: ; c8761 (32:4761)
BattleBGEffect_Withdraw:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -1359,7 +1347,7 @@ BattleBGEffect_Withdraw: ; c8761 (32:4761)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_Dig: ; c87a7 (32:47a7)
BattleBGEffect_Dig:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -1426,7 +1414,7 @@ BattleBGEffect_Dig: ; c87a7 (32:47a7)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_Tackle: ; c8805 (32:4805)
BattleBGEffect_Tackle:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -1461,7 +1449,7 @@ BattleBGEffect_Tackle: ; c8805 (32:4805)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_25: ; c8837 (32:4837)
BattleBGEffect_25:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -1537,7 +1525,7 @@ Tackle_BGEffect25_2d_two:
ld [hl], a
ret
Functionc88a5: ; c88a5 (32:48a5)
Functionc88a5:
push af
ld a, [wFXAnimID + 1] ; FXAnimID + 1
or a
@@ -1589,7 +1577,7 @@ Functionc88a5: ; c88a5 (32:48a5)
jr nz, .loop
ret
BattleBGEffect_2d: ; c88e7 (32:48e7)
BattleBGEffect_2d:
call BattleBGEffects_AnonJumptable
.anon_dw
dw BGEffect2d_2f_zero
@@ -1624,7 +1612,7 @@ BGEffect2d_2f_zero:
ld [hl], a
ret
BattleBGEffect_2f: ; c8919 (32:4919)
BattleBGEffect_2f:
call BattleBGEffects_AnonJumptable
.anon_dw
dw BGEffect2d_2f_zero
@@ -1638,7 +1626,7 @@ BattleBGEffect_2f: ; c8919 (32:4919)
.two
ret
BattleBGEffect_26: ; c892a (32:492a)
BattleBGEffect_26:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -1677,7 +1665,7 @@ BattleBGEffect_26: ; c892a (32:492a)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_2c: ; c8964 (32:4964)
BattleBGEffect_2c:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -1732,7 +1720,7 @@ BattleBGEffect_2c: ; c8964 (32:4964)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_28: ; c89b5 (32:49b5)
BattleBGEffect_28:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -1775,7 +1763,7 @@ BattleBGEffect_28: ; c89b5 (32:49b5)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_BounceDown: ; c89ee (32:49ee)
BattleBGEffect_BounceDown:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -1826,7 +1814,7 @@ BattleBGEffect_BounceDown: ; c89ee (32:49ee)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_2a: ; c8a3a (32:4a3a)
BattleBGEffect_2a:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -1933,9 +1921,8 @@ BattleBGEffect_2a: ; c8a3a (32:4a3a)
.data
db $00, $40, $90, $e4
db -1
; c8acc
BattleBGEffect_2b: ; c8acc (32:4acc)
BattleBGEffect_2b:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -1972,7 +1959,7 @@ BattleBGEffect_2b: ; c8acc (32:4acc)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_1c: ; c8b00 (32:4b00)
BattleBGEffect_1c:
ld a, [hCGB]
and a
jr nz, .cgb
@@ -2130,97 +2117,87 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
db $90, $f8
db $40, $fc
db $90, $f8
; c8be8
BattleBGEffect_RapidFlash: ; c8be8 (32:4be8)
BattleBGEffect_RapidFlash:
ld de, .FlashPals
call BGEffect_RapidCyclePals
ret
.FlashPals:
db $e4, $6c, $fe
; c8bf2
BattleBGEffect_16: ; c8bf2 (32:4bf2)
BattleBGEffect_16:
ld de, .Pals
call BGEffect_RapidCyclePals
ret
.Pals:
db $e4, $90, $40, $ff
; c8bfd
BattleBGEffect_17: ; c8bfd (32:4bfd)
BattleBGEffect_17:
ld de, .Pals
call BGEffect_RapidCyclePals
ret
.Pals:
db $e4, $f8, $fc, $ff
; c8c08
BattleBGEffect_18: ; c8c08 (32:4c08)
BattleBGEffect_18:
ld de, .Pals
call BGEffect_RapidCyclePals
ret
.Pals:
db $e4, $90, $40, $90, $fe
; c8c14
BattleBGEffect_19: ; c8c14 (32:4c14)
BattleBGEffect_19:
ld de, .Pals
call BGEffect_RapidCyclePals
ret
.Pals:
db $e4, $f8, $fc, $f8, $fe
; c8c20
BattleBGEffect_1a: ; c8c20 (32:4c20)
BattleBGEffect_1a:
ld de, .Pals
call BGEffect_RapidCyclePals
ret
.Pals:
db $e4, $f8, $fc, $f8, $e4, $90, $40, $90, $fe
; c8c30
BattleBGEffect_1b: ; c8c30 (32:4c30)
BattleBGEffect_1b:
ld de, .Pals
call BGEffect_RapidCyclePals
ret
.Pals:
db $e4, $fc, $e4, $00, $fe
; c8c3c
BattleBGEffect_1d: ; c8c3c (32:4c3c)
BattleBGEffect_1d:
ld de, .Pals
call BGEffect_RapidCyclePals
ret
.Pals:
db $e4, $90, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $90, $e4, $ff
; c8c55
BattleBGEffect_1e: ; c8c55 (32:4c55)
BattleBGEffect_1e:
ld de, .Pals
call BGEffect_RapidCyclePals
ret
.Pals:
db $00, $40, $90, $e4, $ff
; c8c61
BattleBGEffect_VibrateMon: ; c8c61 (32:4c61)
BattleBGEffect_VibrateMon:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
dw .one
.zero ; c8c68 (32:4c68)
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, rSCX - $ff00
@@ -2236,7 +2213,7 @@ BattleBGEffect_VibrateMon: ; c8c61 (32:4c61)
ld [hl], $20
ret
.one ; c8c85 (32:4c85)
.one
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld a, [hl]
@@ -2258,7 +2235,7 @@ BattleBGEffect_VibrateMon: ; c8c61 (32:4c61)
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2)
BattleBGEffect_WobbleMon:
call BattleBGEffects_AnonJumptable
.anon_dw
dw .zero
@@ -2266,7 +2243,7 @@ BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2)
dw .two
.zero ; c8cab (32:4cab)
.zero
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, rSCX - $ff00
@@ -2280,7 +2257,7 @@ BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2)
ld [hl], $0
ret
.one ; c8cc3 (32:4cc3)
.one
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld a, [hl]
@@ -2296,11 +2273,11 @@ BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2)
ld [hl], a
ret
.two ; c8cdd (32:4cdd)
.two
call BattleAnim_ResetLCDStatCustom
ret
BattleBGEffect_2e: ; c8ce1 (32:4ce1)
BattleBGEffect_2e:
call Functionc8d0b
jr c, .xor_a
bit 7, a
@@ -2317,7 +2294,7 @@ BattleBGEffect_2e: ; c8ce1 (32:4ce1)
ld [wAnimObject01YOffset], a
ret
BattleBGEffect_1f: ; c8cf9 (32:4cf9)
BattleBGEffect_1f:
call Functionc8d0b
jr nc, .skip
xor a
@@ -2325,7 +2302,7 @@ BattleBGEffect_1f: ; c8cf9 (32:4cf9)
ld [hSCX], a
ret
BattleBGEffect_20: ; c8d02 (32:4d02)
BattleBGEffect_20:
call Functionc8d0b
jr nc, .skip
xor a
@@ -2333,7 +2310,7 @@ BattleBGEffect_20: ; c8d02 (32:4d02)
ld [hSCY], a
ret
Functionc8d0b: ; c8d0b (32:4d0b)
Functionc8d0b:
ld hl, BG_EFFECT_STRUCT_JT_INDEX
add hl, bc
ld a, [hl]
@@ -2371,7 +2348,7 @@ Functionc8d0b: ; c8d0b (32:4d0b)
and a
ret
BattleBGEffect_35: ; c8d3a (32:4d3a)
BattleBGEffect_35:
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld a, [hl]
@@ -2392,7 +2369,7 @@ BattleBGEffect_35: ; c8d3a (32:4d3a)
ld [hSCX], a
ret
BattleBGEffect_GetNthDMGPal: ; c8d57 (32:4d57)
BattleBGEffect_GetNthDMGPal:
ld hl, BG_EFFECT_STRUCT_JT_INDEX
add hl, bc
ld a, [hl]
@@ -2415,7 +2392,7 @@ BattleBGEffect_GetNthDMGPal: ; c8d57 (32:4d57)
call BattleBGEffect_GetFirstDMGPal
ret
BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
BGEffect_RapidCyclePals:
ld a, [hCGB]
and a
jr nz, .cgb
@@ -2431,7 +2408,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
dw .two_dmg
.zero_dmg ; c8d8b (32:4d8b)
.zero_dmg
call BattleBGEffects_IncrementJumptable
ld a, $e4
call BattleBGEffects_SetLYOverrides
@@ -2449,7 +2426,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
ld [hl], a
ret
.one_dmg ; c8daa (32:4daa)
.one_dmg
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld a, [hl]
@@ -2474,7 +2451,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
dec [hl]
ret
.two_dmg ; c8dc9 (32:4dc9)
.two_dmg
call BattleBGEffects_ResetVideoHRAM
ld a, %11100100
ld [rBGP], a
@@ -2488,7 +2465,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
pop de
jp hl
.Jumptable_CGB: ; c8ddd (32:4ddd)
.Jumptable_CGB:
dw .zero_cgb
dw .one_cgb
dw .two_cgb
@@ -2496,7 +2473,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
dw .four_cgb
.zero_cgb ; c8de7 (32:4de7)
.zero_cgb
call BGEffect_CheckBattleTurn
jr nz, .player_turn_cgb
call BattleBGEffects_IncrementJumptable
@@ -2512,7 +2489,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
ld [hl], a
ret
.one_cgb ; c8e02 (32:4e02)
.one_cgb
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld a, [hl]
@@ -2537,13 +2514,13 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
dec [hl]
ret
.two_cgb ; c8e21 (32:4e21)
.two_cgb
ld a, $e4
call BGEffects_LoadBGPal0_OBPal1
call EndBattleBGEffect
ret
.three_cgb ; c8e2a (32:4e2a)
.three_cgb
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld a, [hl]
@@ -2568,13 +2545,13 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
dec [hl]
ret
.four_cgb ; c8e49 (32:4e49)
.four_cgb
ld a, $e4
call BGEffects_LoadBGPal1_OBPal0
call EndBattleBGEffect
ret
BGEffects_LoadBGPal0_OBPal1: ; c8e52 (32:4e52)
BGEffects_LoadBGPal0_OBPal1:
ld h, a
ld a, [rSVBK]
push af
@@ -2601,7 +2578,7 @@ BGEffects_LoadBGPal0_OBPal1: ; c8e52 (32:4e52)
ld [hCGBPalUpdate], a
ret
BGEffects_LoadBGPal1_OBPal0: ; c8e7f (32:4e7f)
BGEffects_LoadBGPal1_OBPal0:
ld h, a
ld a, [rSVBK]
push af
@@ -2628,12 +2605,12 @@ BGEffects_LoadBGPal1_OBPal0: ; c8e7f (32:4e7f)
ld [hCGBPalUpdate], a
ret
BattleBGEffect_GetFirstDMGPal: ; c8eac (32:4eac)
BattleBGEffect_GetFirstDMGPal:
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld a, [hl]
inc [hl]
BattleBGEffect_GetNextDMGPal: ; c8eb2 (32:4eb2)
BattleBGEffect_GetNextDMGPal:
ld l, a
ld h, $0
add hl, de
@@ -2654,9 +2631,9 @@ BattleBGEffect_GetNextDMGPal: ; c8eb2 (32:4eb2)
scf
ret
BattleBGEffects_ClearLYOverrides: ; c8eca (32:4eca)
BattleBGEffects_ClearLYOverrides:
xor a
BattleBGEffects_SetLYOverrides: ; c8ecb (32:4ecb)
BattleBGEffects_SetLYOverrides:
ld hl, wLYOverrides ; wListPointer
ld e, $99
.loop1
@@ -2671,7 +2648,7 @@ BattleBGEffects_SetLYOverrides: ; c8ecb (32:4ecb)
jr nz, .loop2
ret
BattleBGEffect_SetLCDStatCustoms1: ; c8ede (32:4ede)
BattleBGEffect_SetLCDStatCustoms1:
ld [hLCDCPointer], a
call BGEffect_CheckBattleTurn
jr nz, .player_turn
@@ -2687,7 +2664,7 @@ BattleBGEffect_SetLCDStatCustoms1: ; c8ede (32:4ede)
ld [hLYOverrideEnd], a
ret
BattleBGEffect_SetLCDStatCustoms2: ; c8ef4 (32:4ef4)
BattleBGEffect_SetLCDStatCustoms2:
ld [hLCDCPointer], a
call BGEffect_CheckBattleTurn
jr nz, .player_turn
@@ -2703,7 +2680,7 @@ BattleBGEffect_SetLCDStatCustoms2: ; c8ef4 (32:4ef4)
ld [hLYOverrideEnd], a
ret
BattleAnim_ResetLCDStatCustom: ; c8f0a (32:4f0a)
BattleAnim_ResetLCDStatCustom:
xor a
ld [hLYOverrideStart], a
ld [hLYOverrideEnd], a
@@ -2713,7 +2690,7 @@ BattleAnim_ResetLCDStatCustom: ; c8f0a (32:4f0a)
call EndBattleBGEffect
ret
BattleBGEffects_ResetVideoHRAM: ; c8f19 (32:4f19)
BattleBGEffects_ResetVideoHRAM:
xor a
ld [hLCDCPointer], a
ld a, %11100100
@@ -2725,7 +2702,7 @@ BattleBGEffects_ResetVideoHRAM: ; c8f19 (32:4f19)
call BattleBGEffects_ClearLYOverrides
ret
Functionc8f2e: ; c8f2e (32:4f2e)
Functionc8f2e:
push bc
xor a
ld [wBattleAnimTemp0], a
@@ -2760,7 +2737,7 @@ Functionc8f2e: ; c8f2e (32:4f2e)
pop bc
ret
InitSurfWaves: ; c8f69 (32:4f69)
InitSurfWaves:
push bc
xor a
ld [wBattleAnimTemp0], a
@@ -2788,7 +2765,7 @@ InitSurfWaves: ; c8f69 (32:4f69)
pop bc
ret
Functionc8f9a: ; c8f9a (32:4f9a)
Functionc8f9a:
push bc
ld [wBattleAnimTemp3], a
ld a, e
@@ -2847,7 +2824,7 @@ Functionc8f9a: ; c8f9a (32:4f9a)
ld d, $0
ret
BattleBGEffect_WavyScreenFX: ; c8fef (32:4fef)
BattleBGEffect_WavyScreenFX:
push bc
ld a, [hLYOverrideStart]
ld l, a
@@ -2874,7 +2851,7 @@ BattleBGEffect_WavyScreenFX: ; c8fef (32:4fef)
pop bc
ret
BGEffect_FillLYOverridesBackup: ; c900b (32:500b)
BGEffect_FillLYOverridesBackup:
push af
ld h, HIGH(wLYOverridesBackup)
ld a, [hLYOverrideStart]
@@ -2889,7 +2866,7 @@ BGEffect_FillLYOverridesBackup: ; c900b (32:500b)
jr nz, .loop
ret
BGEffect_DisplaceLYOverridesBackup: ; c901b (32:501b)
BGEffect_DisplaceLYOverridesBackup:
; e = a; d = [hLYOverrideEnd] - [hLYOverrideStart] - a
push af
ld e, a
@@ -2915,7 +2892,7 @@ BGEffect_DisplaceLYOverridesBackup: ; c901b (32:501b)
jr nz, .loop2
ret
BGEffect_CheckBattleTurn: ; c9038 (32:5038)
BGEffect_CheckBattleTurn:
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld a, [hBattleTurn]
@@ -2923,7 +2900,7 @@ BGEffect_CheckBattleTurn: ; c9038 (32:5038)
xor [hl]
ret
BGEffect_CheckFlyDigStatus: ; c9042 (32:5042)
BGEffect_CheckFlyDigStatus:
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld a, [hBattleTurn]
@@ -2939,21 +2916,20 @@ BGEffect_CheckFlyDigStatus: ; c9042 (32:5042)
and 1 << SUBSTATUS_FLYING | 1 << SUBSTATUS_UNDERGROUND
ret
BattleBGEffects_CheckSGB: ; c9059 (32:5059)
BattleBGEffects_CheckSGB:
ld a, [hSGB]
and a
ret
BattleBGEffects_Sine: ; c905d (32:505d)
BattleBGEffects_Sine:
ld e, a
callfar BattleAnim_Sine_e
ld a, e
ret
BattleBGEffects_Cosine: ; c9066 (32:5066)
BattleBGEffects_Cosine:
ld e, a
callfar BattleAnim_Cosine_e
ld a, e
ret
; c906f (32:506f)

21
engine/battle_anims/core.asm
View File

@@ -1,4 +1,4 @@
QueueBattleAnimation: ; cc9a1 (33:49a1)
QueueBattleAnimation:
ld hl, wActiveAnimObjects
ld e, 10
.loop
@@ -20,15 +20,14 @@ QueueBattleAnimation: ; cc9a1 (33:49a1)
call InitBattleAnimation
ret
DeinitBattleAnimation: ; cc9bd
DeinitBattleAnimation:
ld hl, BATTLEANIMSTRUCT_INDEX
add hl, bc
ld [hl], $0
ret
; cc9c4
InitBattleAnimation: ; cc9c4 (33:49c4)
InitBattleAnimation:
ld a, [wBattleAnimTemp0]
ld e, a
ld d, 0
@@ -79,7 +78,7 @@ endr
ld [hl], a ; 10
ret
BattleAnimOAMUpdate: ; cca09
BattleAnimOAMUpdate:
call InitBattleAnimBuffer
call GetBattleAnimFrame
cp -3
@@ -191,9 +190,8 @@ BattleAnimOAMUpdate: ; cca09
scf
ret
; ccaaa
InitBattleAnimBuffer: ; ccaaa
InitBattleAnimBuffer:
ld hl, BATTLEANIMSTRUCT_01
add hl, bc
ld a, [hl]
@@ -276,9 +274,8 @@ InitBattleAnimBuffer: ; ccaaa
ld [wBattleAnimTempXOffset], a
ret
; ccb31
GetBattleAnimTileOffset: ; ccb31 (33:4b31)
GetBattleAnimTileOffset:
push hl
push bc
ld hl, wBattleAnimTileDict
@@ -301,14 +298,12 @@ GetBattleAnimTileOffset: ; ccb31 (33:4b31)
pop hl
ret
_ExecuteBGEffects: ; ccb48
_ExecuteBGEffects:
callfar ExecuteBGEffects
ret
; ccb4f
_QueueBGEffect: ; ccb4f (33:4b4f)
_QueueBGEffect:
callfar QueueBGEffect
ret
; ccb56 (33:4b56)

456
engine/battle_anims/functions.asm
View File

File diff suppressed because it is too large Load Diff

14
engine/battle_anims/helpers.asm
View File

@@ -1,4 +1,4 @@
ReinitBattleAnimFrameset: ; ce7bf (33:67bf)
ReinitBattleAnimFrameset:
ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
add hl, bc
ld [hl], a
@@ -10,7 +10,7 @@ ReinitBattleAnimFrameset: ; ce7bf (33:67bf)
ld [hl], -1
ret
GetBattleAnimFrame: ; ce7d1
GetBattleAnimFrame:
.loop
ld hl, BATTLEANIMSTRUCT_DURATION
add hl, bc
@@ -72,9 +72,8 @@ GetBattleAnimFrame: ; ce7d1
ld [hl], a
jr .loop
; ce823
.GetPointer: ; ce823
.GetPointer:
ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
add hl, bc
ld e, [hl]
@@ -93,9 +92,8 @@ GetBattleAnimFrame: ; ce7d1
add hl, de
ret
; ce83c
GetBattleAnimOAMPointer: ; ce83c
GetBattleAnimOAMPointer:
ld l, a
ld h, 0
ld de, BattleAnimOAMData
@@ -104,9 +102,8 @@ GetBattleAnimOAMPointer: ; ce83c
add hl, de
ret
; ce846
LoadBattleAnimObj: ; ce846 (33:6846)
LoadBattleAnimObj:
push hl
ld l, a
ld h, 0
@@ -127,4 +124,3 @@ LoadBattleAnimObj: ; ce846 (33:6846)
pop bc
ret
; ce85e (33:685e)

2
engine/battle_anims/pokeball_wobble.asm
View File

@@ -1,4 +1,4 @@
GetPokeBallWobble: ; f971 (3:7971)
GetPokeBallWobble:
; Returns whether a Poke Ball will wobble in the catch animation.
; Whether a Pokemon is caught is determined beforehand.