More battle anims and bg effects

battle/anim_objects.asm

@@ -106,7 +106,7 @@ BattleAnimOAMUpdate: ; cca09
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	ld a, [w5_d418]
+	ld a, [wBattleAnimOAMPointerLo]
 	ld e, a
 	ld d, Sprites / $100
 .loop
@@ -173,7 +173,7 @@ BattleAnimOAMUpdate: ; cca09
 	inc hl
 	inc de
 	ld a, e
-	ld [w5_d418], a
+	ld [wBattleAnimOAMPointerLo], a
 	cp $a0
 	jr nc, .exit_set_carry
 	dec c
@@ -620,7 +620,7 @@ GetBattleAnimOAMPointer: ; ce83c
 
 ; ce846
 
-Functionce846: ; ce846 (33:6846)
+LoadBattleAnimObj: ; ce846 (33:6846)
 	push hl
 	ld l, a
 	ld h, 0

battle/core.asm

@@ -3762,7 +3762,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
 
 	xor a
 	ld [wNumHits], a
-	ld [wKickCounter], a
+	ld [wBattleAnimParam], a
 	call SetEnemyTurn
 	ld de, ANIM_SEND_OUT_MON
 	call Call_PlayBattleAnim
@@ -3770,7 +3770,7 @@ Function_SetEnemyPkmnAndSendOutAnimation: ; 3d7c7
 	call BattleCheckEnemyShininess
 	jr nc, .not_shiny
 	ld a, 1 ; shiny anim
-	ld [wKickCounter], a
+	ld [wBattleAnimParam], a
 	ld de, ANIM_SEND_OUT_MON
 	call Call_PlayBattleAnim
 .not_shiny
@@ -4268,13 +4268,13 @@ SendOutPlayerMon: ; 3db5f
 	call SetPlayerTurn
 	xor a
 	ld [wNumHits], a
-	ld [wKickCounter], a
+	ld [wBattleAnimParam], a
 	ld de, ANIM_SEND_OUT_MON
 	call Call_PlayBattleAnim
 	call BattleCheckPlayerShininess
 	jr nc, .not_shiny
-	ld a, $1
+	ld a, 1
-	ld [wKickCounter], a
+	ld [wBattleAnimParam], a
 	ld de, ANIM_SEND_OUT_MON
 	call Call_PlayBattleAnim
 
@@ -8398,7 +8398,7 @@ GetMonBackpic: ; 3f43d
 	ld hl, BattleAnimCmd_RaiseSub
 	jr nz, GetBackpic_DoAnim ; substitute
 
-Function3f447: ; 3f447
+DropPlayerSub: ; 3f447
 	ld a, [wPlayerMinimized]
 	and a
 	ld hl, BattleAnimCmd_MinimizeOpp
@@ -8434,7 +8434,7 @@ GetMonFrontpic: ; 3f47c
 	ld hl, BattleAnimCmd_RaiseSub
 	jr nz, GetFrontpic_DoAnim
 
-Function3f486: ; 3f486
+DropEnemySub: ; 3f486
 	ld a, [wEnemyMinimized]
 	and a
 	ld hl, BattleAnimCmd_MinimizeOpp
@@ -9595,7 +9595,7 @@ BattleStartMessage: ; 3fc8b
 	ld a, 1
 	ld [hBattleTurn], a
 	ld a, 1
-	ld [wKickCounter], a
+	ld [wBattleAnimParam], a
 	ld de, ANIM_SEND_OUT_MON
 	call Call_PlayBattleAnim
 

battle/effect_commands.asm

@@ -5584,12 +5584,12 @@ CheckIfStatCanBeRaised: ; 361ef
 
 StatUpAnimation: ; 36281
 	ld bc, wPlayerMinimized
-	ld hl, Function3f447
+	ld hl, DropPlayerSub
 	ld a, [hBattleTurn]
 	and a
 	jr z, .do_player ; 0x3628a $6
 	ld bc, wEnemyMinimized
-	ld hl, Function3f486
+	ld hl, DropEnemySub
 .do_player
 	ld a, BATTLE_VARS_MOVE_ANIM
 	call GetBattleVar
@@ -6174,11 +6174,11 @@ BattleCommand_RaiseSubNoAnim: ; 365af
 
 
 BattleCommand_LowerSubNoAnim: ; 365c3
-	ld hl, Function3f447
+	ld hl, DropPlayerSub
 	ld a, [hBattleTurn]
 	and a
 	jr z, .PlayerTurn ; 365c9 $3
-	ld hl, Function3f486
+	ld hl, DropEnemySub
 .PlayerTurn
 	xor a
 	ld [hBGMapMode], a
@@ -9239,13 +9239,13 @@ BattleCommand_ClearHazards: ; 37b39
 BattleCommand_HealMorn: ; 37b74
 ; healmorn
 	ld b, MORN
-	jr BattleCommand_HealMorn6c
+	jr BattleCommand_TimeBasedHealContinue
 ; 37b78
 
 BattleCommand_HealDay: ; 37b78
 ; healday
 	ld b, DAY
-	jr BattleCommand_HealMorn6c
+	jr BattleCommand_TimeBasedHealContinue
 ; 37b7c
 
 BattleCommand_HealNite: ; 37b7c
@@ -9254,7 +9254,7 @@ BattleCommand_HealNite: ; 37b7c
 	; fallthrough
 ; 37b7e
 
-BattleCommand_HealMorn6c: ; 37b7e
+BattleCommand_TimeBasedHealContinue: ; 37b7e
 ; Time- and weather-sensitive heal.
 
 	ld hl, BattleMonMaxHP
@@ -9284,7 +9284,7 @@ BattleCommand_HealMorn6c: ; 37b7e
 	ld a, [TimeOfDay]
 	cp b
 	jr z, .Weather
-	dec c
+	dec c ; double
 
 .Weather
 	ld a, [Weather]

battle/objects/gfx_headers.asm

@@ -3,51 +3,50 @@ AnimObjGFX: ; cfcf6
 
 object_gfx: MACRO
 ; label, # tiles
-	db \2
+	db  \1
-	db BANK(\1)
+	dba \2
-	dw \1
 ENDM
 
-	object_gfx AnimObj00GFX, 0
+	object_gfx  0, AnimObj00GFX
-	object_gfx AnimObj01GFX, 21
+	object_gfx 21, AnimObj01GFX
-	object_gfx AnimObj02GFX, 6
+	object_gfx  6, AnimObj02GFX
-	object_gfx AnimObj03GFX, 6
+	object_gfx  6, AnimObj03GFX
-	object_gfx AnimObj04GFX, 20
+	object_gfx 20, AnimObj04GFX
-	object_gfx AnimObj05GFX, 26
+	object_gfx 26, AnimObj05GFX
-	object_gfx AnimObj06GFX, 18
+	object_gfx 18, AnimObj06GFX
-	object_gfx AnimObj07GFX, 12
+	object_gfx 12, AnimObj07GFX
-	object_gfx AnimObj08GFX, 9
+	object_gfx  9, AnimObj08GFX
-	object_gfx AnimObj09GFX, 17
+	object_gfx 17, AnimObj09GFX
-	object_gfx AnimObj10GFX, 6
+	object_gfx  6, AnimObj10GFX
-	object_gfx AnimObj11GFX, 10
+	object_gfx 10, AnimObj11GFX
-	object_gfx AnimObj12GFX, 9
+	object_gfx  9, AnimObj12GFX
-	object_gfx AnimObj13GFX, 13
+	object_gfx 13, AnimObj13GFX
-	object_gfx AnimObj14GFX, 16
+	object_gfx 16, AnimObj14GFX
-	object_gfx AnimObj15GFX, 2
+	object_gfx  2, AnimObj15GFX
-	object_gfx AnimObj16GFX, 11
+	object_gfx 11, AnimObj16GFX
-	object_gfx AnimObj17GFX, 9
+	object_gfx  9, AnimObj17GFX
-	object_gfx AnimObj18GFX, 9
+	object_gfx  9, AnimObj18GFX
-	object_gfx AnimObj19GFX, 19
+	object_gfx 19, AnimObj19GFX
-	object_gfx AnimObj20GFX, 10
+	object_gfx 10, AnimObj20GFX
-	object_gfx AnimObj21GFX, 12
+	object_gfx 12, AnimObj21GFX
-	object_gfx AnimObj22GFX, 18
+	object_gfx 18, AnimObj22GFX
-	object_gfx AnimObj23GFX, 13
+	object_gfx 13, AnimObj23GFX
-	object_gfx AnimObj24GFX, 10
+	object_gfx 10, AnimObj24GFX
-	object_gfx AnimObj25GFX, 27
+	object_gfx 27, AnimObj25GFX
-	object_gfx AnimObj26GFX, 12
+	object_gfx 12, AnimObj26GFX
-	object_gfx AnimObj27GFX, 14
+	object_gfx 14, AnimObj27GFX
-	object_gfx AnimObj28GFX, 16
+	object_gfx 16, AnimObj28GFX
-	object_gfx AnimObj29GFX, 7
+	object_gfx  7, AnimObj29GFX
-	object_gfx AnimObj30GFX, 8
+	object_gfx  8, AnimObj30GFX
-	object_gfx AnimObj31GFX, 40
+	object_gfx 40, AnimObj31GFX
-	object_gfx AnimObj32GFX, 36
+	object_gfx 36, AnimObj32GFX
-	object_gfx AnimObj33GFX, 16
+	object_gfx 16, AnimObj33GFX
-	object_gfx AnimObj34GFX, 48
+	object_gfx 48, AnimObj34GFX
-	object_gfx AnimObj35GFX, 18
+	object_gfx 18, AnimObj35GFX
-	object_gfx AnimObj36GFX, 38
+	object_gfx 38, AnimObj36GFX
-	object_gfx AnimObj37GFX, 35
+	object_gfx 35, AnimObj37GFX
-	object_gfx AnimObj38GFX, 18
+	object_gfx 18, AnimObj38GFX
-	object_gfx AnimObj39GFX, 24
+	object_gfx 24, AnimObj39GFX
-	object_gfx NULL, 1
+	object_gfx  1, NULL
-	object_gfx NULL, 1
+	object_gfx  1, NULL
 ; cfd9e

constants/animation_constants.asm

@@ -299,34 +299,60 @@ BATTLEANIMSTRUCT_LENGTH EQU const_value
 
 
 
-ANIM_BG_FLASH_INVERTED EQU $01
+const_value SET 1
-ANIM_BG_FLASH_WHITE EQU $02
+	const ANIM_BG_FLASH_INVERTED
-ANIM_BG_WHITE_HUES EQU $03
+	const ANIM_BG_FLASH_WHITE
-ANIM_BG_BLACK_HUES EQU $04
+	const ANIM_BG_WHITE_HUES
-ANIM_BG_ALTERNATE_HUES EQU $05
+	const ANIM_BG_BLACK_HUES
-; ???? EQU $06
+	const ANIM_BG_ALTERNATE_HUES
-; ???? EQU $07
+	const ANIM_BG_06
-; ???? EQU $08
+	const ANIM_BG_07
-ANIM_BG_HIDE_MON EQU $09
+	const ANIM_BG_08
-ANIM_BG_SHOW_MON EQU $0a
+	const ANIM_BG_HIDE_MON
-ANIM_BG_ENTER_MON EQU $0b
+	const ANIM_BG_SHOW_MON
-ANIM_BG_RETURN_MON EQU $0c
+	const ANIM_BG_ENTER_MON
-ANIM_BG_SURF EQU $0d
+	const ANIM_BG_RETURN_MON
-ANIM_BG_WHIRLPOOL EQU $0e
+	const ANIM_BG_SURF
-ANIM_BG_TELEPORT EQU $0f
+	const ANIM_BG_WHIRLPOOL
-ANIM_BG_NIGHT_SHADE EQU $10
+	const ANIM_BG_TELEPORT
-ANIM_BG_FEET_FOLLOW EQU $11
+	const ANIM_BG_NIGHT_SHADE
-ANIM_BG_HEAD_FOLLOW EQU $12
+	const ANIM_BG_FEET_FOLLOW
-ANIM_BG_DOUBLE_TEAM EQU $13
+	const ANIM_BG_HEAD_FOLLOW
-ANIM_BG_ACID_ARMOR EQU $14
+	const ANIM_BG_DOUBLE_TEAM
-ANIM_BG_RAPID_FLASH EQU $15 ; unused
+	const ANIM_BG_ACID_ARMOR
-
+	const ANIM_BG_RAPID_FLASH
-ANIM_BG_TACKLE EQU $24
+	const ANIM_BG_16
-
+	const ANIM_BG_17
-ANIM_BG_PSYCHIC EQU $29
+	const ANIM_BG_18
-
+	const ANIM_BG_19
-ANIM_BG_VIBRATE_MON EQU $33
+	const ANIM_BG_1A
-ANIM_BG_WOBBLE_MON EQU $34
+	const ANIM_BG_1B
+	const ANIM_BG_1C
+	const ANIM_BG_1D
+	const ANIM_BG_1E
+	const ANIM_BG_1F
+	const ANIM_BG_20
+	const ANIM_BG_21
+	const ANIM_BG_22
+	const ANIM_BG_23
+	const ANIM_BG_TACKLE
+	const ANIM_BG_25
+	const ANIM_BG_26
+	const ANIM_BG_27
+	const ANIM_BG_28
+	const ANIM_BG_PSYCHIC
+	const ANIM_BG_2A
+	const ANIM_BG_2B
+	const ANIM_BG_2C
+	const ANIM_BG_2D
+	const ANIM_BG_2E
+	const ANIM_BG_2F
+	const ANIM_BG_30
+	const ANIM_BG_31
+	const ANIM_BG_32
+	const ANIM_BG_VIBRATE_MON
+	const ANIM_BG_WOBBLE_MON
+	const ANIM_BG_35
 
 	const_def
 	const ANIM_MON_SLOW    ; 0
@@ -338,3 +364,9 @@ ANIM_BG_WOBBLE_MON EQU $34
 	const ANIM_MON_UNUSED  ; 6
 	const ANIM_MON_EGG1    ; 7
 	const ANIM_MON_EGG2    ; 8
+
+	const_def
+	const BG_EFFECT_STRUCT_FUNCTION
+	const BG_EFFECT_STRUCT_JT_INDEX
+	const BG_EFFECT_STRUCT_02
+	const BG_EFFECT_STRUCT_03

wram.asm

@@ -755,6 +755,7 @@ EnemyDamageTaken:: ; c684
 	ds 2
 
 wBattleReward:: ds 3
+wBattleAnimParam::
 wKickCounter::
 wPresentPower:: ds 1
 wc68a::
@@ -3317,10 +3318,22 @@ AnimObject09:: battle_anim_struct AnimObject09
 AnimObject10:: battle_anim_struct AnimObject10
 ActiveAnimObjectsEnd:: ; d3aa
 
-ActiveBGEffects:: ; d3fa
+battle_bg_effect: MACRO
-	ds 4 * 5
+\1_Function:: ds 1
+\1_01:: ds 1
+\1_02:: ds 1
+\1_03:: ds 1
+endm
 
-wNumActiveBattleAnims:: ds 1
+ActiveBGEffects:: ; d3fa
+BGEffect1:: battle_bg_effect BGEffect1
+BGEffect2:: battle_bg_effect BGEffect2
+BGEffect3:: battle_bg_effect BGEffect3
+BGEffect4:: battle_bg_effect BGEffect4
+BGEffect5:: battle_bg_effect BGEffect5
+ActiveBGEffectsEnd::
+
+wNumActiveBattleAnims:: ds 1 ; d40e
 
 BattleAnimFlags:: ; d40f
 	ds 1
@@ -3336,14 +3349,12 @@ BattleAnimVar:: ; d416
 	ds 1
 BattleAnimByte:: ; d417
 	ds 1
-w5_d418:: ds 1
+wBattleAnimOAMPointerLo:: ds 1 ; d418
 BattleAnimTemps:: ; d419
 	ds 8
 	ds 1
 w5_d422:: ds $32
 wBattleAnimEnd::
-	ds $e
-; d462
 
 SECTION "WRAM 5 MOBILE", WRAMX [$d800], BANK [5]
 w5_d800:: ds $200