summaryrefslogtreecommitdiff
path: root/battle
diff options
context:
space:
mode:
Diffstat (limited to 'battle')
-rw-r--r--battle/anim_objects.asm2
-rw-r--r--battle/bg_effects.asm434
-rw-r--r--battle/core.asm57
-rw-r--r--battle/effect_commands.asm63
-rwxr-xr-xbattle/objects/data.asm4
-rwxr-xr-xbattle/objects/functions.asm235
-rwxr-xr-xbattle/objects/helpers.asm (renamed from battle/objects/library.asm)0
-rwxr-xr-xbattle/sliding_intro.asm4
8 files changed, 335 insertions, 464 deletions
diff --git a/battle/anim_objects.asm b/battle/anim_objects.asm
index bdb5c222c..786a035bf 100644
--- a/battle/anim_objects.asm
+++ b/battle/anim_objects.asm
@@ -3,7 +3,7 @@
INCLUDE "battle/objects/engine.asm"
INCLUDE "battle/objects/data.asm"
INCLUDE "battle/objects/functions.asm"
-INCLUDE "battle/objects/library.asm"
+INCLUDE "battle/objects/helpers.asm"
INCLUDE "battle/objects/framesets.asm"
INCLUDE "battle/objects/oam.asm"
INCLUDE "battle/objects/gfx_headers.asm"
diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm
index b84c26ab1..188a3e43d 100644
--- a/battle/bg_effects.asm
+++ b/battle/bg_effects.asm
@@ -70,9 +70,8 @@ DoBattleBGEffectFunction: ; c804a (32:404a)
ld e, [hl]
ld d, 0
ld hl, BattleBGEffects
-rept 2
add hl, de
-endr
+ add hl, de
ld a, [hli]
ld h, [hl]
ld l, a
@@ -227,55 +226,63 @@ BattleBGEffect_FlashContinue: ; c80fb (32:40fb)
ret
BattleBGEffect_WhiteHues: ; c812d (32:412d)
- ld de, Unknown_c813d
- call Functionc8d57
- jr c, .asm_c8139
+ ld de, .Pals
+ call BattleBGEffect_GetNthDMGPal
+ jr c, .quit
ld [wBGP], a
ret
-.asm_c8139
+.quit
call EndBattleBGEffect
ret
-; c813d (32:413d)
-
-Unknown_c813d:
- db $e4, $e0, $d0, $ff
+.Pals
+ db %11100100
+ db %11100000
+ db %11010000
+ db -1
; c8141
BattleBGEffect_BlackHues: ; c8141 (32:4141)
- ld de, Unknown_c8151
- call Functionc8d57
- jr c, .asm_c814d
+ ld de, .Pals
+ call BattleBGEffect_GetNthDMGPal
+ jr c, .quit
ld [wBGP], a
ret
-.asm_c814d
+.quit
call EndBattleBGEffect
ret
-; c8151 (32:4151)
-
-Unknown_c8151:
- db $e4, $f4, $f8, $ff
+.Pals
+ db %11100100
+ db %11110100
+ db %11111000
+ db -1
; c8155
BattleBGEffect_AlternateHues: ; c8155 (32:4155)
- ld de, Unknown_c8168
- call Functionc8d57
- jr c, .asm_c8164
+ ld de, .Pals
+ call BattleBGEffect_GetNthDMGPal
+ jr c, .quit
ld [wBGP], a
ld [wOBP1], a
ret
-.asm_c8164
+.quit
call EndBattleBGEffect
ret
-; c8168 (32:4168)
-
-Unknown_c8168:
- db $e4, $f8, $fc, $f8, $e4, $90, $40, $90, $fe
+.Pals
+ db %11100100
+ db %11111000
+ db %11111100
+ db %11111000
+ db %11100100
+ db %10010000
+ db %01000000
+ db %10010000
+ db -2
; c8171
BattleBGEffect_06: ; c8171 (32:4171)
@@ -287,14 +294,19 @@ BattleBGEffect_06: ; c8171 (32:4171)
.sgb
ld de, .PalsSGB
.okay
- call Functionc8d57
+ call BattleBGEffect_GetNthDMGPal
ld [wOBP0], a
ret
.PalsCGB
- db $e4, $90, $fe
+ db %11100100
+ db %10010000
+ db -2
+
.PalsSGB
- db $f0, $c0, $fe
+ db %11110000
+ db %11000000
+ db -2
; c818b
BattleBGEffect_07: ; c818b (32:418b)
@@ -306,29 +318,37 @@ BattleBGEffect_07: ; c818b (32:418b)
.sgb
ld de, .PalsSGB
.okay
- call Functionc8d57
+ call BattleBGEffect_GetNthDMGPal
ld [wOBP0], a
ret
.PalsCGB
- db $e4, $d8, $fe
+ db %11100100
+ db %11011000
+ db -2
+
.PalsSGB
- db $f0, $cc, $fe
+ db %11110000
+ db %11001100
+ db -2
; c81a5
BattleBGEffect_08: ; c81a5 (32:41a5)
ld de, .Pals
- call Functionc8d57
+ call BattleBGEffect_GetNthDMGPal
ld [wBGP], a
ret
.Pals
- db $1b, $63, $87, $fe
+ db %00011011
+ db %01100011
+ db %10000111
+ db -2
; c81b3
BattleBGEffect_HideMon: ; c81b3 (32:41b3)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw BattleBGEffects_IncrementJumptable
dw BattleBGEffects_IncrementJumptable
@@ -395,7 +415,7 @@ BattleBGEffect_ShowMon: ; c81ea (32:41ea)
BattleBGEffect_FeetFollow: ; c8214 (32:4214)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw BattleBGEffects_IncrementJumptable
@@ -417,13 +437,13 @@ BattleBGEffect_FeetFollow: ; c8214 (32:4214)
push bc
call BGEffect_CheckBattleTurn
jr nz, .player_turn
- ld a, ANIM_OBJ_B8
+ ld a, ANIM_OBJ_PLAYERFEETFOLLOW
ld [wBattleAnimTemp0], a
ld a, 16 * 8 + 4
jr .okay
.player_turn
- ld a, ANIM_OBJ_B9
+ ld a, ANIM_OBJ_ENEMYFEETFOLLOW
ld [wBattleAnimTemp0], a
ld a, 6 * 8
.okay
@@ -463,7 +483,7 @@ BattleBGEffect_FeetFollow: ; c8214 (32:4214)
BattleBGEffect_HeadFollow: ; c8281 (32:4281)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw BattleBGEffects_IncrementJumptable
@@ -535,7 +555,7 @@ _QueueBattleAnimation: ; c82ee (32:42ee)
BattleBGEffect_27: ; c82f5 (32:42f5)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw BattleBGEffects_IncrementJumptable
@@ -700,7 +720,7 @@ BattleBGEffect_ReturnMon: ; c83a8 (32:43a8)
BattleBGEffect_RunPicResizeScript: ; c83ed (32:43ed)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw BattleBGEffects_IncrementJumptable
dw BattleBGEffects_IncrementJumptable
@@ -769,9 +789,8 @@ endr
ld e, [hl]
ld d, 0
ld hl, .Coords
-rept 2
add hl, de
-endr
+ add hl, de
ld a, [hli]
ld h, [hl]
ld l, a
@@ -811,9 +830,8 @@ endr
ld e, [hl]
ld d, 0
ld hl, .Coords
-rept 2
add hl, de
-endr
+ add hl, de
ld a, [hli]
ld h, [hl]
ld l, a
@@ -903,7 +921,7 @@ endm
BattleBGEffect_Surf: ; c8545 (32:4545)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -915,7 +933,7 @@ BattleBGEffect_Surf: ; c8545 (32:4545)
call InitSurfWaves
.one
- ld a, [hLCDStatCustom]
+ ld a, [hFFC6]
and a
ret z
push bc
@@ -945,7 +963,7 @@ BattleBGEffect_Surf: ; c8545 (32:4545)
ld hl, wSurfWaveBGEffect
ld bc, $0
.loop2
- ld a, [hLCDStatCustom + 1]
+ ld a, [hFFC7]
cp e
jr nc, .load_zero
push hl
@@ -970,7 +988,7 @@ BattleBGEffect_Surf: ; c8545 (32:4545)
BattleBGEffect_Whirlpool: ; c8599 (32:4599)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -980,11 +998,11 @@ BattleBGEffect_Whirlpool: ; c8599 (32:4599)
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, $42
- ld [hLCDStatCustom], a
+ ld [hFFC6], a
xor a
- ld [hLCDStatCustom + 1], a
+ ld [hFFC7], a
ld a, $5e
- ld [hLCDStatCustom + 2], a
+ ld [hFFC8], a
lb de, 2, 2
call Functionc8f2e
ret
@@ -1000,7 +1018,7 @@ BattleBGEffect_Whirlpool: ; c8599 (32:4599)
BattleBGEffect_30: ; c85c2 (32:45c2)
call BattleBGEffects_ClearLYOverrides
ld a, $42
- call Functionc8ede
+ call BattleBGEffect_SetLCDStatCustoms1
call EndBattleBGEffect
ret
@@ -1028,9 +1046,8 @@ BattleBGEffect_31: ; c85ce (32:45ce)
ld a, [hl]
cp $20
jr nc, .done
-rept 2
inc [hl]
-endr
+ inc [hl]
call Functionc8f9a
ret
@@ -1045,7 +1062,7 @@ BattleBGEffect_32: ; c8603 (32:4603)
BattleBGEffect_Psychic: ; c8607 (32:4607)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -1055,11 +1072,11 @@ BattleBGEffect_Psychic: ; c8607 (32:4607)
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, $43
- ld [hLCDStatCustom], a
+ ld [hFFC6], a
xor a
- ld [hLCDStatCustom + 1], a
+ ld [hFFC7], a
ld a, $5f
- ld [hLCDStatCustom + 2], a
+ ld [hFFC8], a
lb de, 6, 5
call Functionc8f2e
ld hl, BG_EFFECT_STRUCT_03
@@ -1083,7 +1100,7 @@ BattleBGEffect_Psychic: ; c8607 (32:4607)
BattleBGEffect_Teleport: ; c863f (32:463f)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -1093,7 +1110,7 @@ BattleBGEffect_Teleport: ; c863f (32:463f)
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, $43
- call Functionc8ede
+ call BattleBGEffect_SetLCDStatCustoms1
lb de, 6, 5
call Functionc8f2e
ret
@@ -1108,7 +1125,7 @@ BattleBGEffect_Teleport: ; c863f (32:463f)
BattleBGEffect_NightShade: ; c8662 (32:4662)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -1118,7 +1135,7 @@ BattleBGEffect_NightShade: ; c8662 (32:4662)
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, $42
- call Functionc8ede
+ call BattleBGEffect_SetLCDStatCustoms1
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld e, [hl]
@@ -1136,7 +1153,7 @@ BattleBGEffect_NightShade: ; c8662 (32:4662)
BattleBGEffect_DoubleTeam: ; c8689 (32:4689)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -1149,10 +1166,10 @@ BattleBGEffect_DoubleTeam: ; c8689 (32:4689)
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, $43
- call Functionc8ede
- ld a, [hLCDStatCustom + 2]
+ call BattleBGEffect_SetLCDStatCustoms1
+ ld a, [hFFC8]
inc a
- ld [hLCDStatCustom + 2], a
+ ld [hFFC8], a
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld [hl], $0
@@ -1207,9 +1224,9 @@ BattleBGEffect_DoubleTeam: ; c8689 (32:4689)
inc a
ld d, a
ld h, LYOverridesBackup / $100
- ld a, [hLCDStatCustom + 1]
+ ld a, [hFFC7]
ld l, a
- ld a, [hLCDStatCustom + 2]
+ ld a, [hFFC8]
sub l
srl a
push af
@@ -1231,7 +1248,7 @@ BattleBGEffect_DoubleTeam: ; c8689 (32:4689)
BattleBGEffect_AcidArmor: ; c8709 (32:4709)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -1241,14 +1258,14 @@ BattleBGEffect_AcidArmor: ; c8709 (32:4709)
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, $42
- call Functionc8ede
+ call BattleBGEffect_SetLCDStatCustoms1
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld e, [hl]
ld d, 2
call Functionc8f2e
ld h, $d2
- ld a, [hLCDStatCustom + 2]
+ ld a, [hFFC8]
ld l, a
ld [hl], $0
dec l
@@ -1256,7 +1273,7 @@ BattleBGEffect_AcidArmor: ; c8709 (32:4709)
ret
.one
- ld a, [hLCDStatCustom + 2]
+ ld a, [hFFC8]
ld l, a
ld h, $d2
ld e, l
@@ -1266,11 +1283,11 @@ BattleBGEffect_AcidArmor: ; c8709 (32:4709)
ld a, [de]
dec de
ld [hld], a
- ld a, [hLCDStatCustom + 1]
+ ld a, [hFFC7]
cp l
jr nz, .loop
ld [hl], $90
- ld a, [hLCDStatCustom + 2]
+ ld a, [hFFC8]
ld l, a
ld a, [hl]
cp $1
@@ -1294,7 +1311,7 @@ BattleBGEffect_AcidArmor: ; c8709 (32:4709)
BattleBGEffect_21: ; c8761 (32:4761)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -1304,10 +1321,10 @@ BattleBGEffect_21: ; c8761 (32:4761)
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, $42
- call Functionc8ede
- ld a, [hLCDStatCustom + 2]
+ call BattleBGEffect_SetLCDStatCustoms1
+ ld a, [hFFC8]
inc a
- ld [hLCDStatCustom + 2], a
+ ld [hFFC8], a
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld [hl], $1
@@ -1343,7 +1360,7 @@ BattleBGEffect_21: ; c8761 (32:4761)
BattleBGEffect_Dig: ; c87a7 (32:47a7)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -1354,10 +1371,10 @@ BattleBGEffect_Dig: ; c87a7 (32:47a7)
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, $42
- call Functionc8ede
- ld a, [hLCDStatCustom + 2]
+ call BattleBGEffect_SetLCDStatCustoms1
+ ld a, [hFFC8]
inc a
- ld [hLCDStatCustom + 2], a
+ ld [hFFC8], a
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld [hl], $2
@@ -1379,9 +1396,9 @@ BattleBGEffect_Dig: ; c87a7 (32:47a7)
ld [hl], $10
call BattleBGEffects_IncrementJumptable
.two
- ld a, [hLCDStatCustom + 1]
+ ld a, [hFFC7]
ld l, a
- ld a, [hLCDStatCustom + 2]
+ ld a, [hFFC8]
sub l
dec a
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
@@ -1400,9 +1417,8 @@ BattleBGEffect_Dig: ; c87a7 (32:47a7)
call Functionc901b
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
-rept 2
inc [hl]
-endr
+ inc [hl]
ret
.three
@@ -1411,7 +1427,7 @@ endr
BattleBGEffect_Tackle: ; c8805 (32:4805)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw Tackle_BGEffect25_2d_one
dw Tackle_BGEffect25_2d_two
@@ -1422,10 +1438,10 @@ BattleBGEffect_Tackle: ; c8805 (32:4805)
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, $43
- call Functionc8ede
- ld a, [hLCDStatCustom + 2]
+ call BattleBGEffect_SetLCDStatCustoms1
+ ld a, [hFFC8]
inc a
- ld [hLCDStatCustom + 2], a
+ ld [hFFC8], a
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld [hl], $0
@@ -1446,7 +1462,7 @@ BattleBGEffect_Tackle: ; c8805 (32:4805)
BattleBGEffect_25: ; c8837 (32:4837)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw Tackle_BGEffect25_2d_one
dw Tackle_BGEffect25_2d_two
@@ -1457,10 +1473,10 @@ BattleBGEffect_25: ; c8837 (32:4837)
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, $43
- call Functionc8ef4
- ld a, [hLCDStatCustom + 2]
+ call BattleBGEffect_SetLCDStatCustoms2
+ ld a, [hFFC8]
inc a
- ld [hLCDStatCustom + 2], a
+ ld [hFFC8], a
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld [hl], $0
@@ -1533,16 +1549,16 @@ Functionc88a5: ; c88a5 (32:48a5)
jp Functionc900b
.rollout
- ld a, [hLCDStatCustom + 1]
+ ld a, [hFFC7]
ld d, a
- ld a, [hLCDStatCustom + 2]
+ ld a, [hFFC8]
sub d
ld d, a
ld h, LYOverridesBackup / $100
ld a, [hSCY]
or a
jr nz, .skip1
- ld a, [hLCDStatCustom + 1]
+ ld a, [hFFC7]
or a
jr z, .skip2
dec a
@@ -1551,14 +1567,14 @@ Functionc88a5: ; c88a5 (32:48a5)
jr .skip2
.skip1
- ld a, [hLCDStatCustom + 2]
+ ld a, [hFFC8]
dec a
ld l, a
ld [hl], $0
.skip2
ld a, [hSCY]
ld l, a
- ld a, [hLCDStatCustom + 1]
+ ld a, [hFFC7]
sub l
jr nc, .skip3
xor a
@@ -1574,7 +1590,7 @@ Functionc88a5: ; c88a5 (32:48a5)
BattleBGEffect_2d: ; c88e7 (32:48e7)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw BGEffect2d_2f_zero
dw Tackle_BGEffect25_2d_one
dw Tackle_BGEffect25_2d_two
@@ -1589,10 +1605,10 @@ BGEffect2d_2f_zero:
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, $43
- call Functionc8ede
- ld a, [hLCDStatCustom + 2]
+ call BattleBGEffect_SetLCDStatCustoms1
+ ld a, [hFFC8]
inc a
- ld [hLCDStatCustom + 2], a
+ ld [hFFC8], a
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld [hl], $0
@@ -1609,7 +1625,7 @@ BGEffect2d_2f_zero:
BattleBGEffect_2f: ; c8919 (32:4919)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw BGEffect2d_2f_zero
dw Tackle_BGEffect25_2d_one
dw .two
@@ -1623,7 +1639,7 @@ BattleBGEffect_2f: ; c8919 (32:4919)
BattleBGEffect_26: ; c892a (32:492a)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -1633,10 +1649,10 @@ BattleBGEffect_26: ; c892a (32:492a)
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, $43
- call Functionc8ede
- ld a, [hLCDStatCustom + 2]
+ call BattleBGEffect_SetLCDStatCustoms1
+ ld a, [hFFC8]
inc a
- ld [hLCDStatCustom + 2], a
+ ld [hFFC8], a
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld [hl], $0
@@ -1662,7 +1678,7 @@ BattleBGEffect_26: ; c892a (32:492a)
BattleBGEffect_2c: ; c8964 (32:4964)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -1672,10 +1688,10 @@ BattleBGEffect_2c: ; c8964 (32:4964)
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, $43
- call Functionc8ede
- ld a, [hLCDStatCustom + 2]
+ call BattleBGEffect_SetLCDStatCustoms1
+ ld a, [hFFC8]
inc a
- ld [hLCDStatCustom + 2], a
+ ld [hFFC8], a
xor a
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
@@ -1717,7 +1733,7 @@ BattleBGEffect_2c: ; c8964 (32:4964)
BattleBGEffect_28: ; c89b5 (32:49b5)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -1727,7 +1743,7 @@ BattleBGEffect_28: ; c89b5 (32:49b5)
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, $43
- call Functionc8ede
+ call BattleBGEffect_SetLCDStatCustoms1
ret
.one
@@ -1760,7 +1776,7 @@ BattleBGEffect_28: ; c89b5 (32:49b5)
BattleBGEffect_BounceDown: ; c89ee (32:49ee)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -1770,10 +1786,10 @@ BattleBGEffect_BounceDown: ; c89ee (32:49ee)
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, $42
- call Functionc8ef4
- ld a, [hLCDStatCustom + 2]
+ call BattleBGEffect_SetLCDStatCustoms2
+ ld a, [hFFC8]
inc a
- ld [hLCDStatCustom + 2], a
+ ld [hFFC8], a
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld [hl], $1
@@ -1801,9 +1817,8 @@ BattleBGEffect_BounceDown: ; c89ee (32:49ee)
call Functionc901b
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
-rept 2
inc [hl]
-endr
+ inc [hl]
ret
.two
@@ -1812,7 +1827,7 @@ endr
BattleBGEffect_2a: ; c8a3a (32:4a3a)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -1825,15 +1840,15 @@ BattleBGEffect_2a: ; c8a3a (32:4a3a)
ld a, $e4
call BattleBGEffects_SetLYOverrides
ld a, $47
- call Functionc8ede
- ld a, [hLCDStatCustom + 2]
+ call BattleBGEffect_SetLCDStatCustoms1
+ ld a, [hFFC8]
inc a
- ld [hLCDStatCustom + 2], a
- ld a, [hLCDStatCustom + 1]
+ ld [hFFC8], a
+ ld a, [hFFC7]
ld l, a
ld h, $d2
.loop
- ld a, [hLCDStatCustom + 2]
+ ld a, [hFFC8]
cp l
jr z, .done
xor a
@@ -1858,9 +1873,9 @@ BattleBGEffect_2a: ; c8a3a (32:4a3a)
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld [hl], $0
- ld a, [hLCDStatCustom + 1]
+ ld a, [hFFC7]
inc a
- ld [hLCDStatCustom + 1], a
+ ld [hFFC7], a
call BattleBGEffects_IncrementJumptable
ret
@@ -1868,7 +1883,7 @@ BattleBGEffect_2a: ; c8a3a (32:4a3a)
call .GetLYOverride
jr nc, .finish
call .SetLYOverridesBackup
- ld a, [hLCDStatCustom + 2]
+ ld a, [hFFC8]
dec a
ld l, a
ld [hl], e
@@ -1880,23 +1895,22 @@ BattleBGEffect_2a: ; c8a3a (32:4a3a)
.SetLYOverridesBackup
ld e, a
- ld a, [hLCDStatCustom + 1]
+ ld a, [hFFC7]
ld l, a
- ld a, [hLCDStatCustom + 2]
+ ld a, [hFFC8]
sub l
srl a
ld h, LYOverridesBackup / $100
.loop2
ld [hl], e
-rept 2
inc hl
-endr
+ inc hl
dec a
jr nz, .loop2
ret
.five
- call Functionc8f19
+ call BattleBGEffects_ResetVideoHRAM
ret
.GetLYOverride
@@ -1922,7 +1936,7 @@ endr
BattleBGEffect_2b: ; c8acc (32:4acc)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
@@ -1931,7 +1945,7 @@ BattleBGEffect_2b: ; c8acc (32:4acc)
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, $43
- call Functionc8ede
+ call BattleBGEffect_SetLCDStatCustoms1
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld [hl], $40
@@ -1942,7 +1956,7 @@ BattleBGEffect_2b: ; c8acc (32:4acc)
add hl, bc
ld a, [hl]
and a
- jr z, .asm_c8afc
+ jr z, .done
dec [hl]
srl a
srl a
@@ -1953,7 +1967,7 @@ BattleBGEffect_2b: ; c8acc (32:4acc)
call Functionc8f2e
ret
-.asm_c8afc
+.done
call BattleAnim_ResetLCDStatCustom
ret
@@ -1962,7 +1976,7 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
and a
jr nz, .cgb
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -1973,11 +1987,11 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
ld a, $e4
call BattleBGEffects_SetLYOverrides
ld a, $47
- ld [hLCDStatCustom], a
+ ld [hFFC6], a
xor a
- ld [hLCDStatCustom + 1], a
+ ld [hFFC7], a
ld a, $60
- ld [hLCDStatCustom + 2], a
+ ld [hFFC8], a
ret
.one
@@ -2022,7 +2036,7 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
ret
.two
- call Functionc8f19
+ call BattleBGEffects_ResetVideoHRAM
ld a, $e4
ld [wBGP], a
ld [wOBP1], a
@@ -2199,7 +2213,7 @@ BattleBGEffect_1e: ; c8c55 (32:4c55)
BattleBGEffect_VibrateMon: ; c8c61 (32:4c61)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
@@ -2208,10 +2222,10 @@ BattleBGEffect_VibrateMon: ; c8c61 (32:4c61)
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, $43
- call Functionc8ede
- ld a, [hLCDStatCustom + 2]
+ call BattleBGEffect_SetLCDStatCustoms1
+ ld a, [hFFC8]
inc a
- ld [hLCDStatCustom + 2], a
+ ld [hFFC8], a
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc
ld [hl], $1
@@ -2244,7 +2258,7 @@ BattleBGEffect_VibrateMon: ; c8c61 (32:4c61)
BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2)
call BattleBGEffects_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -2254,11 +2268,11 @@ BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2)
call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides
ld a, $43
- ld [hLCDStatCustom], a
+ ld [hFFC6], a
xor a
- ld [hLCDStatCustom + 1], a
+ ld [hFFC7], a
ld a, $37
- ld [hLCDStatCustom + 2], a
+ ld [hFFC8], a
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld [hl], $0
@@ -2376,18 +2390,17 @@ BattleBGEffect_35: ; c8d3a (32:4d3a)
ld [hSCX], a
ret
-Functionc8d57: ; c8d57 (32:4d57)
+BattleBGEffect_GetNthDMGPal: ; c8d57 (32:4d57)
ld hl, BG_EFFECT_STRUCT_JT_INDEX
add hl, bc
ld a, [hl]
and a
jr z, .zero
-
dec [hl]
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld a, [hl]
- call Functionc8eb2
+ call BattleBGEffect_GetNextDMGPal
ret
.zero
@@ -2397,7 +2410,7 @@ Functionc8d57: ; c8d57 (32:4d57)
ld hl, BG_EFFECT_STRUCT_JT_INDEX
add hl, bc
ld [hl], a
- call Functionc8eac
+ call BattleBGEffect_GetFirstDMGPal
ret
BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
@@ -2421,10 +2434,10 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
ld a, $e4
call BattleBGEffects_SetLYOverrides
ld a, $47
- call Functionc8ede
- ld a, [hLCDStatCustom + 2]
+ call BattleBGEffect_SetLCDStatCustoms1
+ ld a, [hFFC8]
inc a
- ld [hLCDStatCustom + 2], a
+ ld [hFFC8], a
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld a, [hl]
@@ -2448,7 +2461,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
swap a
or [hl]
ld [hl], a
- call Functionc8eac
+ call BattleBGEffect_GetFirstDMGPal
jr c, .okay_2_dmg
call Functionc900b
ret
@@ -2460,8 +2473,8 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
ret
.two_dmg: ; c8dc9 (32:4dc9)
- call Functionc8f19
- ld a, $e4
+ call BattleBGEffects_ResetVideoHRAM
+ ld a, %11100100
ld [rBGP], a
call EndBattleBGEffect
ret
@@ -2511,7 +2524,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
swap a
or [hl]
ld [hl], a
- call Functionc8eac
+ call BattleBGEffect_GetFirstDMGPal
jr c, .okay_2_cgb
call BGEffects_LoadBGPal0_OBPal1
ret
@@ -2542,7 +2555,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
swap a
or [hl]
ld [hl], a
- call Functionc8eac
+ call BattleBGEffect_GetFirstDMGPal
jr c, .okay_4_cgb
call BGEffects_LoadBGPal1_OBPal0
ret
@@ -2613,30 +2626,29 @@ BGEffects_LoadBGPal1_OBPal0: ; c8e7f (32:4e7f)
ld [hCGBPalUpdate], a
ret
-Functionc8eac: ; c8eac (32:4eac)
+BattleBGEffect_GetFirstDMGPal: ; c8eac (32:4eac)
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld a, [hl]
inc [hl]
-
-Functionc8eb2: ; c8eb2 (32:4eb2)
+BattleBGEffect_GetNextDMGPal: ; c8eb2 (32:4eb2)
ld l, a
ld h, $0
add hl, de
ld a, [hl]
- cp $ff
- jr z, .asm_c8ec8
- cp $fe
- jr nz, .asm_c8ec6
+ cp -1
+ jr z, .quit
+ cp -2
+ jr nz, .repeat
ld a, [de]
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld [hl], $0
-.asm_c8ec6
+.repeat
and a
ret
-.asm_c8ec8
+.quit
scf
ret
@@ -2657,57 +2669,57 @@ BattleBGEffects_SetLYOverrides: ; c8ecb (32:4ecb)
jr nz, .loop2
ret
-Functionc8ede: ; c8ede (32:4ede)
- ld [hLCDStatCustom], a
+BattleBGEffect_SetLCDStatCustoms1: ; c8ede (32:4ede)
+ ld [hFFC6], a
call BGEffect_CheckBattleTurn
- jr nz, .asm_c8eea
- ld de, $36
+ jr nz, .player_turn
+ lb de, $00, $36
jr .okay
-.asm_c8eea
- ld de, $2f5e
+.player_turn
+ lb de, $2f, $5e
.okay
ld a, d
- ld [hLCDStatCustom + 1], a
+ ld [hFFC7], a
ld a, e
- ld [hLCDStatCustom + 2], a
+ ld [hFFC8], a
ret
-Functionc8ef4: ; c8ef4 (32:4ef4)
- ld [hLCDStatCustom], a
+BattleBGEffect_SetLCDStatCustoms2: ; c8ef4 (32:4ef4)
+ ld [hFFC6], a
call BGEffect_CheckBattleTurn
- jr nz, .asm_c8f00
- ld de, $36
- jr .asm_c8f03
+ jr nz, .player_turn
+ lb de, $00, $36
+ jr .okay
-.asm_c8f00
- ld de, $2d5e
-.asm_c8f03
+.player_turn
+ lb de, $2d, $5e
+.okay
ld a, d
- ld [hLCDStatCustom + 1], a
+ ld [hFFC7], a
ld a, e
- ld [hLCDStatCustom + 2], a
+ ld [hFFC8], a
ret
BattleAnim_ResetLCDStatCustom: ; c8f0a (32:4f0a)
xor a
- ld [hLCDStatCustom + 1], a
- ld [hLCDStatCustom + 2], a
+ ld [hFFC7], a
+ ld [hFFC8], a
call BattleBGEffects_ClearLYOverrides
xor a
- ld [hLCDStatCustom], a
+ ld [hFFC6], a
call EndBattleBGEffect
ret
-Functionc8f19: ; c8f19 (32:4f19)
+BattleBGEffects_ResetVideoHRAM: ; c8f19 (32:4f19)
xor a
- ld [hLCDStatCustom], a
- ld a, $e4
+ ld [hFFC6], a
+ ld a, %11100100
ld [rBGP], a
ld [wBGP], a
ld [wOBP1], a
- ld [hLCDStatCustom + 1], a
- ld [hLCDStatCustom + 2], a
+ ld [hFFC7], a
+ ld [hFFC8], a
call BattleBGEffects_ClearLYOverrides
ret
@@ -2723,10 +2735,10 @@ Functionc8f2e: ; c8f2e (32:4f2e)
ld [wBattleAnimTemp3], a
ld bc, LYOverridesBackup
.loop
- ld a, [hLCDStatCustom + 1]
+ ld a, [hFFC7]
cp c
jr nc, .next
- ld a, [hLCDStatCustom + 2]
+ ld a, [hFFC8]
cp c
jr c, .next
ld a, [wBattleAnimTemp2]
@@ -2800,14 +2812,14 @@ Functionc8f9a: ; c8f9a (32:4f9a)
call BattleBGEffects_Sine
ld e, a
pop hl
- ld a, [hLCDStatCustom + 2]
+ ld a, [hFFC8]
cp c
jr c, .skip1
ld a, e
ld [bc], a
inc bc
.skip1
- ld a, [hLCDStatCustom + 1]
+ ld a, [hFFC7]
cp l
jr nc, .skip2
ld [hl], e
@@ -2825,7 +2837,7 @@ Functionc8f9a: ; c8f9a (32:4f9a)
ret
.GetLYOverrideBackupAddrOffset
- ld a, [hLCDStatCustom + 1]
+ ld a, [hFFC7]
ld e, a
ld a, [wBattleAnimTemp0]
add e
@@ -2835,13 +2847,13 @@ Functionc8f9a: ; c8f9a (32:4f9a)
BattleBGEffect_WavyScreenFX: ; c8fef (32:4fef)
push bc
- ld a, [hLCDStatCustom + 1]
+ ld a, [hFFC7]
ld l, a
inc a
ld e, a
ld h, $d2
ld d, h
- ld a, [hLCDStatCustom + 2]
+ ld a, [hFFC8]
sub l
and a
jr z, .done
@@ -2863,9 +2875,9 @@ BattleBGEffect_WavyScreenFX: ; c8fef (32:4fef)
Functionc900b: ; c900b (32:500b)
push af
ld h, $d2
- ld a, [hLCDStatCustom + 1]
+ ld a, [hFFC7]
ld l, a
- ld a, [hLCDStatCustom + 2]
+ ld a, [hFFC8]
sub l
ld d, a
pop af
@@ -2878,14 +2890,14 @@ Functionc900b: ; c900b (32:500b)
Functionc901b: ; c901b (32:501b)
push af
ld e, a
- ld a, [hLCDStatCustom + 1]
+ ld a, [hFFC7]
ld l, a
- ld a, [hLCDStatCustom + 2]
+ ld a, [hFFC8]
sub l
sub e
ld d, a
ld h, $d2
- ld a, [hLCDStatCustom + 1]
+ ld a, [hFFC7]
ld l, a
ld a, $90
.asm_c902c
diff --git a/battle/core.asm b/battle/core.asm
index 7bc7d54f1..3abf99872 100644
--- a/battle/core.asm
+++ b/battle/core.asm
@@ -1849,9 +1849,8 @@ HandleWeather: ; 3cb9e
dec a
ld c, a
ld b, 0
-rept 2
add hl, bc
-endr
+ add hl, bc
ld a, [hli]
ld h, [hl]
ld l, a
@@ -2575,9 +2574,8 @@ Function3d02b: ; 3d02b
dec a
ld c, a
ld b, 0
-rept 2
add hl, bc
-endr
+ add hl, bc
ld a, [hli]
ld h, [hl]
ld l, a
@@ -2615,9 +2613,8 @@ endr
rl [hl]
ret nc
ld a, $ff
-rept 2
ld [hli], a
-endr
+ ld [hli], a
ld [hl], a
ret
; 3d0ab
@@ -4747,18 +4744,16 @@ HandleStatBoostingHeldItems: ; 3de97
ld a, [hli]
cp $ff
jr z, .finish
-rept 2
inc hl
-endr
+ inc hl
cp b
jr nz, .loop
pop bc
ld a, [bc]
ld [wd265], a
push bc
-rept 2
dec hl
-endr
+ dec hl
ld a, [hli]
ld h, [hl]
ld l, a
@@ -5822,9 +5817,8 @@ MoveSelectionScreen: ; 3e4bc
ld a, [wMenuCursorY]
ld b, a
ld a, [wNumMoves]
-rept 2
inc a
-endr
+ inc a
cp b
jp nz, .menu_loop
ld a, $1
@@ -6008,9 +6002,8 @@ MoveInfoBox: ; 3e6c8
lb bc, 1, 2
call PrintNum
pop hl
-rept 2
inc hl
-endr
+ inc hl
ld [hl], "/"
inc hl
ld de, wNamedObjectIndexBuffer
@@ -6818,9 +6811,8 @@ CheckUnownLetter: ; 3eb75
.next
; Make sure we haven't gone past the end of the table
-rept 2
inc e
-endr
+ inc e
ld a, e
cp a, .Set1 - .LetterSets
jr c, .loop
@@ -7176,9 +7168,8 @@ BadgeStatBoosts: ; 3ed45
; Swap badges 3 (PlainBadge) and 5 (MineralBadge).
ld d, a
and (1 << PLAINBADGE)
-rept 2
add a
-endr
+ add a
ld b, a
ld a, d
and (1 << MINERALBADGE)
@@ -7197,9 +7188,8 @@ endr
ld a, b
srl b
call c, BoostStat
-rept 2
inc hl
-endr
+ inc hl
; Check every other badge.
srl b
dec c
@@ -7328,9 +7318,8 @@ _BattleRandom:: ; 3edd8
; a * 5 + 1
ld c, a
-rept 2
add a
-endr
+ add a
add c
inc a
@@ -7467,9 +7456,8 @@ GiveExperiencePoints: ; 3ee3b
ld [de], a
.skip
-rept 2
inc de
-endr
+ inc de
dec c
jr nz, .loop1
xor a
@@ -7544,9 +7532,8 @@ endr
inc [hl]
jr nz, .skip2
ld a, $ff
-rept 2
ld [hli], a
-endr
+ ld [hli], a
ld [hl], a
.skip2
@@ -7881,9 +7868,8 @@ Function3f136: ; 3f136
inc [hl]
jr nz, .asm_3f186
ld a, $ff
-rept 2
ld [hli], a
-endr
+ ld [hli], a
ld [hl], a
.asm_3f186
@@ -8800,9 +8786,8 @@ CheckPayDay: ; 3f71d
rl [hl]
jr nc, .okay
ld a, $ff
-rept 2
ld [hli], a
-endr
+ ld [hli], a
ld [hl], a
.okay
@@ -9202,13 +9187,11 @@ Function3fa42: ; 3fa42
ld d, 5
.loop
push hl
-rept 2
inc hl
-endr
+ inc hl
ld a, [hl]
-rept 2
dec hl
-endr
+ dec hl
and a
jr z, .copy
push de
@@ -9308,18 +9291,16 @@ Function3fac8: ; 3fac8
ld c, $1
.loop2
ld a, b
-rept 2
add b
-endr
+ add b
ld e, a
ld d, $0
ld hl, wd002
add hl, de
push hl
ld a, c
-rept 2
add c
-endr
+ add c
ld e, a
ld d, $0
ld hl, wd002
diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm
index 2a482a8ce..ad89448da 100644
--- a/battle/effect_commands.asm
+++ b/battle/effect_commands.asm
@@ -51,9 +51,8 @@ DoMove: ; 3402c
ld c, a
ld b, 0
ld hl, MoveEffectsPointers
-rept 2
add hl, bc
-endr
+ add hl, bc
ld a, BANK(MoveEffectsPointers)
call GetFarHalfword
@@ -102,9 +101,8 @@ endr
ld c, a
ld b, 0
ld hl, BattleCommandPointers
-rept 2
add hl, bc
-endr
+ add hl, bc
pop bc
ld a, BANK(BattleCommandPointers)
@@ -1076,9 +1074,8 @@ BattleCommand_DoTurn: ; 34555
jp nz, EndMoveEffect
; SubStatus5
-rept 2
inc de
-endr
+ inc de
ld a, [de]
bit SUBSTATUS_TRANSFORMED, a
@@ -1276,9 +1273,8 @@ BattleCommand_Critical: ; 34631
jr nc, .ScopeLens
; +2 critical level
-rept 2
inc c
-endr
+ inc c
.ScopeLens
push bc
@@ -1522,9 +1518,8 @@ BattleCommand_Stab: ; 346d2
pop hl
.SkipType
-rept 2
inc hl
-endr
+ inc hl
jr .TypesLoop
.end
@@ -2741,9 +2736,8 @@ EndMoveEffect: ; 352a3
ld a, [BattleScriptBufferLoc + 1]
ld h, a
ld a, $ff
-rept 2
ld [hli], a
-endr
+ ld [hli], a
ld [hl], a
ret
@@ -3457,9 +3451,8 @@ BattleCommand_DamageCalc: ; 35612
xor a
ld hl, hDividend
-rept 2
ld [hli], a
-endr
+ ld [hli], a
ld [hl], a
; Level * 2
@@ -3480,9 +3473,8 @@ endr
pop bc
; + 2
-rept 2
inc [hl]
-endr
+ inc [hl]
; * bp
inc hl
@@ -4075,9 +4067,8 @@ BattleCommand_PainSplit: ; 35926
ld [Buffer3], a
ld a, [hl]
ld [Buffer4], a
-rept 2
dec de
-endr
+ dec de
ld a, [de]
dec de
add b
@@ -4587,9 +4578,8 @@ BattleCommand_Spite: ; 35c0f
call GetMoveName
call BattleRandom
and 3
-rept 2
inc a
-endr
+ inc a
ld b, a
ld a, [hl]
and $3f
@@ -6380,9 +6370,8 @@ CalcStats: ; 3661d
dec c
ld b, 0
ld hl, StatLevelMultipliers
-rept 2
add hl, bc
-endr
+ add hl, bc
xor a
ld [hMultiplicand + 0], a
@@ -6538,9 +6527,8 @@ BattleCommand_UnleashEnergy: ; 366e5
ld [wEnemyMoveStruct + MOVE_EFFECT], a
call BattleRandom
and 1
-rept 2
inc a
-endr
+ inc a
ld [bc], a
ld a, 1
ld [wKickCounter], a
@@ -6579,9 +6567,8 @@ BattleCommand_CheckRampage: ; 3671a
set SUBSTATUS_CONFUSED, [hl]
call BattleRandom
and %00000001
-rept 2
inc a
-endr
+ inc a
inc de ; ConfuseCount
ld [de], a
.continue_rampage
@@ -7464,9 +7451,8 @@ endr
ld a, [hli]
cp b
jr z, .found_trap_text
-rept 2
inc hl
-endr
+ inc hl
jr .find_trap_text
.found_trap_text
@@ -7552,9 +7538,8 @@ BattleCommand_Recoil: ; 36cb2
ld [Buffer2], a
ld a, [hl]
ld [Buffer1], a
-rept 2
dec hl
-endr
+ dec hl
ld a, [hl]
ld [Buffer3], a
sub c
@@ -7651,9 +7636,8 @@ BattleCommand_FinishConfusingTarget: ; 36d70
set SUBSTATUS_CONFUSED, [hl]
call BattleRandom
and 3
-rept 2
inc a
-endr
+ inc a
ld [bc], a
ld a, BATTLE_VARS_MOVE_EFFECT
@@ -7844,9 +7828,8 @@ BattleCommand_Substitute: ; 36e7c
rr b
srl a
rr b
-rept 2
dec hl
-endr
+ dec hl
ld a, b
ld [de], a
ld a, [hld]
@@ -8457,9 +8440,8 @@ BattleCommand_Transform: ; 371cd
ld a, [hli]
ld [de], a
inc hl
-rept 2
inc de
-endr
+ inc de
ld bc, NUM_MOVES
call CopyBytes
ld a, [hBattleTurn]
@@ -9125,9 +9107,8 @@ BattleCommand_GetMagnitude: ; 37991
ld a, [hli]
cp b
jr nc, .ok
-rept 2
inc hl
-endr
+ inc hl
jr .loop
.ok
@@ -9528,16 +9509,14 @@ BattleCommand_TimeBasedHealContinue: ; 37b7e
inc c
cp WEATHER_SUN
jr z, .Heal
-rept 2
dec c
-endr
+ dec c
.Heal
ld b, 0
ld hl, .Multipliers
-rept 2
add hl, bc
-endr
+ add hl, bc
ld a, [hli]
ld h, [hl]
diff --git a/battle/objects/data.asm b/battle/objects/data.asm
index cd4a6fb60..7ae0dc371 100755
--- a/battle/objects/data.asm
+++ b/battle/objects/data.asm
@@ -558,10 +558,10 @@ endm
; ANIM_OBJ_COTTON
battleanimobj $01, $ff, BATTLEANIMFRAMESET_89, BATTLEANIMFUNC_4F, $04, $1f
-; ANIM_OBJ_B8
+; ANIM_OBJ_PLAYERFEETFOLLOW
battleanimobj $00, $00, BATTLEANIMFRAMESET_B5, BATTLEANIMFUNC_00, $00, $28
-; ANIM_OBJ_B9
+; ANIM_OBJ_ENEMYFEETFOLLOW
battleanimobj $00, $00, BATTLEANIMFRAMESET_B6, BATTLEANIMFUNC_00, $01, $29
; ANIM_OBJ_BA
diff --git a/battle/objects/functions.asm b/battle/objects/functions.asm
index 13e78b0b3..7c1aa3764 100755
--- a/battle/objects/functions.asm
+++ b/battle/objects/functions.asm
@@ -96,13 +96,11 @@ DoBattleAnimFrame: ; ccfbe
BattleAnimFunction_00: ; cd06e (33:506e)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
-
.one
call DeinitBattleAnimation
-
.zero
ret
@@ -179,10 +177,9 @@ endr
BattleAnimFunction_03: ; cd0e3 (33:50e3)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
-
.zero
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
@@ -200,7 +197,6 @@ BattleAnimFunction_03: ; cd0e3 (33:50e3)
ld a, [hl]
and $7f
ld [hl], a
-
.one
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -227,10 +223,9 @@ BattleAnimFunction_03: ; cd0e3 (33:50e3)
BattleAnimFunction_01: ; cd12a (33:512a)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
-
.one
call DeinitBattleAnimation
ret
@@ -265,7 +260,7 @@ BattleAnimFunction_02: ; cd146 (33:5146)
BattleAnimFunction_12: ; cd15c (33:515c)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -278,7 +273,6 @@ BattleAnimFunction_12: ; cd15c (33:515c)
dw .nine
dw .ten
dw .eleven
-
.zero
call GetBallAnimFunction
call BattleAnim_IncAnonJumptableIndex
@@ -308,7 +302,6 @@ BattleAnimFunction_12: ; cd15c (33:515c)
ld [hl], $0
inc hl
ld [hl], $10
-
.four
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -384,11 +377,10 @@ BattleAnimFunction_12: ; cd15c (33:515c)
BattleAnimFunction_13: ; cd212 (33:5212)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
-
.zero
call GetBallAnimFunction
call BattleAnim_IncAnonJumptableIndex
@@ -448,8 +440,8 @@ GetBallAnimFunction: ; cd249 (33:5249)
add hl, bc
ld [hl], a
ret
-; cd26c (33:526c)
+; cd26c (33:526c)
.balls
db MASTER_BALL, 5
db ULTRA_BALL, 3
@@ -464,16 +456,14 @@ GetBallAnimFunction: ; cd249 (33:5249)
db LOVE_BALL, 4
db -1, 2
; cd284
-
BattleAnimFunction_10: ; cd284 (33:5284)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
dw .three
dw .four
-
.zero
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -510,10 +500,9 @@ BattleAnimFunction_10: ; cd284 (33:5284)
BattleAnimFunction_07: ; cd2be (33:52be)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
-
.zero
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
@@ -558,12 +547,11 @@ BattleAnimFunction_07: ; cd2be (33:52be)
BattleAnimFunction_08: ; cd306 (33:5306)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
dw .three
-
.zero
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
@@ -633,7 +621,6 @@ BattleAnimFunction_08: ; cd306 (33:5306)
.finish
call BattleAnim_IncAnonJumptableIndex
-
.three
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
@@ -672,11 +659,10 @@ BattleAnimFunction_08: ; cd306 (33:5306)
BattleAnimFunction_09: ; cd3ae (33:53ae)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
-
.zero
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
@@ -689,7 +675,6 @@ BattleAnimFunction_09: ; cd3ae (33:53ae)
ld hl, BATTLEANIMSTRUCT_XOFFSET
add hl, bc
ld [hl], a
-
.one
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -722,7 +707,7 @@ BattleAnimFunction_09: ; cd3ae (33:53ae)
BattleAnimFunction_0A: ; cd3f2 (33:53f2)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -733,7 +718,6 @@ BattleAnimFunction_0A: ; cd3f2 (33:53f2)
dw .seven
dw .eight
dw .nine
-
.zero
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -800,7 +784,6 @@ BattleAnimFunction_0A: ; cd3f2 (33:53f2)
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
inc [hl]
-
.two
ld hl, BATTLEANIMSTRUCT_XOFFSET
add hl, bc
@@ -811,18 +794,16 @@ BattleAnimFunction_0A: ; cd3f2 (33:53f2)
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
inc [hl]
-
.three
ld hl, BATTLEANIMSTRUCT_XOFFSET
add hl, bc
inc [hl]
-
.six
ret
BattleAnimFunction_0B: ; cd478 (33:5478)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
@@ -832,13 +813,11 @@ BattleAnimFunction_0B: ; cd478 (33:5478)
dw .six
dw .seven
dw .eight
-
.zero
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $40
-
.one
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -952,7 +931,6 @@ BattleAnimFunction_0B: ; cd478 (33:5478)
ld hl, BATTLEANIMSTRUCT_01
add hl, bc
res 5, [hl]
-
.four
.five
.six
@@ -1010,10 +988,9 @@ Functioncd557: ; cd557 (33:5557)
BattleAnimFunction_4E: ; cd58a (33:558a)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
-
.zero
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -1073,11 +1050,10 @@ BattleAnimFunction_4E: ; cd58a (33:558a)
BattleAnimFunction_0C: ; cd5e9 (33:55e9)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
-
.zero
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
@@ -1103,7 +1079,6 @@ BattleAnimFunction_0C: ; cd5e9 (33:55e9)
ld [hl], $0
ld a, $22
call ReinitBattleAnimFrameset
-
.two
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
@@ -1159,21 +1134,20 @@ BattleAnimFunction_0C: ; cd5e9 (33:55e9)
BattleAnimFunction_0D: ; cd66a (33:566a)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw .zero
dw .one
dw .two
dw .three
dw .four
-
.zero
call BattleAnim_IncAnonJumptableIndex
ld a, $42
- ld [hLCDStatCustom], a
+ ld [hFFC6], a
ld a, $58
- ld [hLCDStatCustom + 1], a
+ ld [hFFC7], a
ld a, $5e
- ld [hLCDStatCustom + 2], a
+ ld [hFFC8], a
ret
.one
@@ -1187,7 +1161,7 @@ BattleAnimFunction_0D: ; cd66a (33:566a)
jr nc, .asm_cd69b
call BattleAnim_IncAnonJumptableIndex
xor a
- ld [hLCDStatCustom + 1], a
+ ld [hFFC7], a
ret
.asm_cd69b
@@ -1206,7 +1180,7 @@ BattleAnimFunction_0D: ; cd66a (33:566a)
add [hl]
sub $10
ret c
- ld [hLCDStatCustom + 1], a
+ ld [hFFC7], a
ld hl, BATTLEANIMSTRUCT_XOFFSET
add hl, bc
ld a, [hl]
@@ -1227,10 +1201,9 @@ BattleAnimFunction_0D: ; cd66a (33:566a)
cp $70
jr c, asm_cd6da
xor a
- ld [hLCDStatCustom], a
- ld [hLCDStatCustom + 1], a
- ld [hLCDStatCustom + 2], a
-
+ ld [hFFC6], a
+ ld [hFFC7], a
+ ld [hFFC8], a
.four
call DeinitBattleAnimation
ret
@@ -1241,15 +1214,14 @@ asm_cd6da: ; cd6da (33:56da)
ld [hl], a
sub $10
ret c
- ld [hLCDStatCustom + 1], a
+ ld [hFFC7], a
ret
BattleAnimFunction_0E: ; cd6e3 (33:56e3)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncd6ea
dw Functioncd6f7
-
Functioncd6ea: ; cd6ea (33:56ea)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
@@ -1257,7 +1229,6 @@ Functioncd6ea: ; cd6ea (33:56ea)
ld a, $24
add [hl]
call ReinitBattleAnimFrameset
-
Functioncd6f7: ; cd6f7 (33:56f7)
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
@@ -1283,15 +1254,13 @@ Functioncd6f7: ; cd6f7 (33:56f7)
BattleAnimFunction_0F: ; cd71a (33:571a)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncd725
dw Functioncd728
dw Functioncd763
dw Functioncd776
-
Functioncd725: ; cd725 (33:5725)
call BattleAnim_IncAnonJumptableIndex
-
Functioncd728: ; cd728 (33:5728)
ld hl, BATTLEANIMSTRUCT_YCOORD
add hl, bc
@@ -1326,7 +1295,6 @@ Functioncd728: ; cd728 (33:5728)
ld a, [hl]
and $1
ld [hl], a
-
Functioncd763: ; cd763 (33:5763)
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
@@ -1340,7 +1308,6 @@ Functioncd763: ; cd763 (33:5763)
call BattleAnim_IncAnonJumptableIndex
ld a, $29
call ReinitBattleAnimFrameset
-
Functioncd776: ; cd776 (33:5776)
ret
@@ -1378,10 +1345,9 @@ BattleAnimFunction_11: ; cd777 (33:5777)
BattleAnimFunction_14: ; cd7a4 (33:57a4)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncd7ab
dw Functioncd7d2
-
Functioncd7ab: ; cd7ab (33:57ab)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
@@ -1404,7 +1370,6 @@ Functioncd7ab: ; cd7ab (33:57ab)
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld [hl], $1
-
Functioncd7d2: ; cd7d2 (33:57d2)
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
@@ -1447,17 +1412,15 @@ Functioncd7d2: ; cd7d2 (33:57d2)
BattleAnimFunction_15: ; cd80c (33:580c)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncd81f
dw Functioncd817
dw Functioncd81f
dw Functioncd820
-
Functioncd817: ; cd817 (33:5817)
call BattleAnim_IncAnonJumptableIndex
ld a, $35
call ReinitBattleAnimFrameset
-
Functioncd81f: ; cd81f (33:581f)
ret
@@ -1467,7 +1430,7 @@ Functioncd820: ; cd820 (33:5820)
BattleAnimFunction_16: ; cd824 (33:5824)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncd835
dw Functioncd860
dw Functioncd88f
@@ -1475,7 +1438,6 @@ BattleAnimFunction_16: ; cd824 (33:5824)
dw Functioncd88f
dw Functioncd88f
dw Functioncd893
-
Functioncd835: ; cd835 (33:5835)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
@@ -1503,7 +1465,6 @@ Functioncd835: ; cd835 (33:5835)
ld a, [hl]
and $7f
ld [hl], a
-
Functioncd860: ; cd860 (33:5860)
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -1535,7 +1496,6 @@ Functioncd860: ; cd860 (33:5860)
ld a, [hl]
and $1f
ret nz
-
Functioncd88f: ; cd88f (33:588f)
call BattleAnim_IncAnonJumptableIndex
ret
@@ -1548,7 +1508,7 @@ Functioncd893: ; cd893 (33:5893)
BattleAnimFunction_17: ; cd89a (33:589a)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncd8ab
dw Functioncd8cc
dw Functioncd8f5
@@ -1556,7 +1516,6 @@ BattleAnimFunction_17: ; cd89a (33:589a)
dw Functioncd8f5
dw Functioncd8f5
dw Functioncd8f9
-
Functioncd8ab: ; cd8ab (33:58ab)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
@@ -1578,7 +1537,6 @@ Functioncd8ab: ; cd8ab (33:58ab)
ld a, [hl]
and $7f
ld [hl], a
-
Functioncd8cc: ; cd8cc (33:58cc)
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -1606,7 +1564,6 @@ Functioncd8cc: ; cd8cc (33:58cc)
ld a, [hl]
and $1f
ret nz
-
Functioncd8f5: ; cd8f5 (33:58f5)
call BattleAnim_IncAnonJumptableIndex
ret
@@ -1619,10 +1576,9 @@ Functioncd8f9: ; cd8f9 (33:58f9)
BattleAnimFunction_18: ; cd900 (33:5900)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncd907
dw Functioncd913
-
Functioncd907: ; cd907 (33:5907)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
@@ -1630,7 +1586,6 @@ Functioncd907: ; cd907 (33:5907)
ld [hl], $28
inc hl
ld [hl], $0
-
Functioncd913: ; cd913 (33:5913)
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -1677,19 +1632,17 @@ Functioncd913: ; cd913 (33:5913)
BattleAnimFunction_19: ; cd954 (33:5954)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncd961
dw Functioncd96a
dw Functioncd96e
dw Functioncd96a
dw Functioncd97b
-
Functioncd961: ; cd961 (33:5961)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld [hl], $0
-
Functioncd96a: ; cd96a (33:596a)
call Functioncd99a
ret
@@ -1794,12 +1747,11 @@ Functioncd9f4: ; cd9f4 (33:59f4)
add hl, de
ld d, [hl]
ret
-; cda01 (33:5a01)
+; cda01 (33:5a01)
Unknown_cda01: ; cda01
db 8, 6, 5, 4, 5, 6, 8, 12, 16
; cda0a
-
BattleAnimFunction_1C: ; cda0a (33:5a0a)
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
@@ -1831,11 +1783,10 @@ BattleAnimFunction_1C: ; cda0a (33:5a0a)
BattleAnimFunction_1F: ; cda31 (33:5a31)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncda4c
dw Functioncda3a
dw Functioncda4c
-
Functioncda3a: ; cda3a (33:5a3a)
ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
add hl, bc
@@ -1846,18 +1797,16 @@ Functioncda3a: ; cda3a (33:5a3a)
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $8
-
Functioncda4c: ; cda4c (33:5a4c)
ret
BattleAnimFunction_20: ; cda4d (33:5a4d)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncda58
dw Functioncda62
dw Functioncda7a
dw Functioncda8c
-
Functioncda58: ; cda58 (33:5a58)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_10
@@ -1894,7 +1843,6 @@ Functioncda7a: ; cda7a (33:5a7a)
call BattleAnim_IncAnonJumptableIndex
ld a, $58
call ReinitBattleAnimFrameset
-
Functioncda8c: ; cda8c (33:5a8c)
ret
@@ -1948,11 +1896,10 @@ Functioncda8d: ; cda8d (33:5a8d)
BattleAnimFunction_3F: ; cdad6 (33:5ad6)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncdadf
dw Functioncdae9
dw Functioncdaf9
-
Functioncdadf: ; cdadf (33:5adf)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_10
@@ -1971,7 +1918,6 @@ Functioncdae9: ; cdae9 (33:5ae9)
.asm_cdaf6
call BattleAnim_IncAnonJumptableIndex
-
Functioncdaf9: ; cdaf9 (33:5af9)
ret
@@ -1986,13 +1932,12 @@ BattleAnimFunction_1A: ; cdafa (33:5afa)
BattleAnimFunction_1B: ; cdb06 (33:5b06)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncdb13
dw Functioncdb14
dw Functioncdb28
dw Functioncdb50
dw Functioncdb65
-
Functioncdb13: ; cdb13 (33:5b13)
ret
@@ -2048,7 +1993,6 @@ Functioncdb50: ; cdb50 (33:5b50)
ld hl, BATTLEANIMSTRUCT_DURATION
add hl, bc
ld [hl], $80
-
Functioncdb65: ; cdb65 (33:5b65)
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
@@ -2070,7 +2014,7 @@ Functioncdb65: ; cdb65 (33:5b65)
BattleAnimFunction_1D: ; cdb80 (33:5b80)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncdb9f
dw Functioncdbb3
dw Functioncdbcf
@@ -2085,7 +2029,6 @@ BattleAnimFunction_1D: ; cdb80 (33:5b80)
dw Functioncdc48
dw Functioncdc57
dw Functioncdc74
-
Functioncdb9f: ; cdb9f (33:5b9f)
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -2236,7 +2179,6 @@ Functioncdc57: ; cdc57 (33:5c57)
.asm_cdc71
call BattleAnim_IncAnonJumptableIndex
-
Functioncdc74: ; cdc74 (33:5c74)
ret
@@ -2296,10 +2238,9 @@ BattleAnimFunction_1E: ; cdca6 (33:5ca6)
BattleAnimFunction_21: ; cdcc3 (33:5cc3)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncdcca
dw Functioncdced
-
Functioncdcca: ; cdcca (33:5cca)
ld a, [hBattleTurn]
and a
@@ -2371,10 +2312,9 @@ Functioncdcfe: ; cdcfe (33:5cfe)
BattleAnimFunction_22: ; cdd2a (33:5d2a)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncdd31
dw Functioncdd4f
-
Functioncdd31: ; cdd31 (33:5d31)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
@@ -2439,10 +2379,9 @@ Functioncdd4f: ; cdd4f (33:5d4f)
BattleAnimFunction_23: ; cdd90 (33:5d90)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncdd97
dw Functioncddbc
-
Functioncdd97: ; cdd97 (33:5d97)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_FRAMESET_ID
@@ -2465,7 +2404,6 @@ Functioncdd97: ; cdd97 (33:5d97)
ld a, [hl]
and $7f
ld [hl], a
-
Functioncddbc: ; cddbc (33:5dbc)
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -2509,11 +2447,10 @@ Functioncddbc: ; cddbc (33:5dbc)
BattleAnimFunction_24: ; cddf9 (33:5df9)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncde02
dw Functioncde20
dw Functioncde21
-
Functioncde02: ; cde02 (33:5e02)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
@@ -2531,19 +2468,17 @@ Functioncde02: ; cde02 (33:5e02)
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], a
-
Functioncde20: ; cde20 (33:5e20)
ret
Functioncde21: ; cde21 (33:5e21)
call DeinitBattleAnimation
ret
-; cde25 (33:5e25)
+; cde25 (33:5e25)
Unknown_cde25: ; cde25
db $ec, $f8, $00
; cde28
-
BattleAnimFunction_25: ; cde28 (33:5e28)
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -2591,10 +2526,9 @@ BattleAnimFunction_26: ; cde54 (33:5e54)
BattleAnimFunction_27: ; cde6b (33:5e6b)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncde72
dw Functioncde88
-
Functioncde72: ; cde72 (33:5e72)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
@@ -2608,16 +2542,14 @@ Functioncde72: ; cde72 (33:5e72)
.asm_cde83
add $6a
call ReinitBattleAnimFrameset
-
Functioncde88: ; cde88 (33:5e88)
ret
BattleAnimFunction_28: ; cde89 (33:5e89)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncde90
dw Functioncdebf
-
Functioncde90: ; cde90 (33:5e90)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
@@ -2758,10 +2690,9 @@ BattleAnimFunction_2D: ; cdf1b (33:5f1b)
BattleAnimFunction_2A: ; cdf59 (33:5f59)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functioncdf60
dw BattleAnimFunction_29
-
Functioncdf60: ; cdf60 (33:5f60)
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
@@ -2879,11 +2810,10 @@ BattleAnimFunction_3C: ; cdfcb (33:5fcb)
BattleAnimFunction_35: ; ce00b (33:600b)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functionce014
dw Functionce023
dw Functionce05f
-
Functionce014: ; ce014 (33:6014)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
@@ -2892,7 +2822,6 @@ Functionce014: ; ce014 (33:6014)
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld [hl], $10
-
Functionce023: ; ce023 (33:6023)
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
@@ -2938,12 +2867,11 @@ Functionce05f: ; ce05f (33:605f)
BattleAnimFunction_2B: ; ce063 (33:6063)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functionce06e
dw Functionce083
dw Functionce091
dw Functionce09e
-
Functionce06e: ; ce06e (33:606e)
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -3005,11 +2933,10 @@ Functionce09e: ; ce09e (33:609e)
BattleAnimFunction_2C: ; ce0c5 (33:60c5)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functionce0ce
dw Functionce0f8
dw Functionce0dd
-
Functionce0ce: ; ce0ce (33:60ce)
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -3038,7 +2965,6 @@ Functionce0dd: ; ce0dd (33:60dd)
ld a, [hl]
sub $4
ld [hl], a
-
Functionce0f8: ; ce0f8 (33:60f8)
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
@@ -3057,10 +2983,9 @@ Functionce0f8: ; ce0f8 (33:60f8)
BattleAnimFunction_2E: ; ce10e (33:610e)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functionce115
dw Functionce12a
-
Functionce115: ; ce115 (33:6115)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
@@ -3073,7 +2998,6 @@ Functionce115: ; ce115 (33:6115)
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld [hl], a
-
Functionce12a: ; ce12a (33:612a)
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -3207,10 +3131,9 @@ BattleAnimFunction_42: ; ce1b0 (33:61b0)
BattleAnimFunction_30: ; ce1e7 (33:61e7)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functionce1ee
dw Functionce1fb
-
Functionce1ee: ; ce1ee (33:61ee)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_YCOORD
@@ -3219,7 +3142,6 @@ Functionce1ee: ; ce1ee (33:61ee)
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld [hl], a
-
Functionce1fb: ; ce1fb (33:61fb)
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -3248,10 +3170,9 @@ Functionce1fb: ; ce1fb (33:61fb)
BattleAnimFunction_31: ; ce226 (33:6226)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functionce22d
dw Functionce254
-
Functionce22d: ; ce22d (33:622d)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
@@ -3273,18 +3194,16 @@ Functionce22d: ; ce22d (33:622d)
ld hl, BATTLEANIMSTRUCT_10
add hl, bc
ld [hl], $f
-
Functionce254: ; ce254 (33:6254)
ret
BattleAnimFunction_32: ; ce255 (33:6255)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functionce260
dw Functionce274
dw Functionce278
dw Functionce289
-
Functionce260: ; ce260 (33:6260)
call BattleAnim_IncAnonJumptableIndex
ld a, [hBattleTurn]
@@ -3356,14 +3275,13 @@ Functionce29f: ; ce29f (33:629f)
and [hl]
ld [wOBP0], a
ret
-; ce2c4 (33:62c4)
+; ce2c4 (33:62c4)
Unknown_ce2c4: ; ce2c4
db $ff, $aa, $55, $aa
Unknown_ce2c8: ; ce2c8
db $ff, $ff, $00, $00
; ce2cc
-
BattleAnimFunction_33: ; ce2cc (33:62cc)
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -3396,11 +3314,10 @@ BattleAnimFunction_33: ; ce2cc (33:62cc)
BattleAnimFunction_36: ; ce2fd (33:62fd)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functionce306
dw Functionce330
dw Functionce34c
-
Functionce306: ; ce306 (33:6306)
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
@@ -3469,10 +3386,9 @@ Functionce34c: ; ce34c (33:634c)
BattleAnimFunction_37: ; ce35f (33:635f)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functionce366
dw Functionce375
-
Functionce366: ; ce366 (33:6366)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
@@ -3481,7 +3397,6 @@ Functionce366: ; ce366 (33:6366)
and $7f
add $81
call ReinitBattleAnimFrameset
-
Functionce375: ; ce375 (33:6375)
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -3500,11 +3415,10 @@ Functionce375: ; ce375 (33:6375)
BattleAnimFunction_38: ; ce389 (33:6389)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functionce392
dw Functionce39c
dw Functionce3ae
-
Functionce392: ; ce392 (33:6392)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
@@ -3525,7 +3439,6 @@ Functionce39c: ; ce39c (33:639c)
call BattleAnim_IncAnonJumptableIndex
ld a, $20
call ReinitBattleAnimFrameset
-
Functionce3ae: ; ce3ae (33:63ae)
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
@@ -3584,10 +3497,9 @@ BattleAnimFunction_3A: ; ce3d2 (33:63d2)
BattleAnimFunction_3B: ; ce3ff (33:63ff)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functionce406
dw Functionce412
-
Functionce406: ; ce406 (33:6406)
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -3628,11 +3540,10 @@ BattleAnimFunction_3D: ; ce416 (33:6416)
BattleAnimFunction_3E: ; ce43a (33:643a)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functionce443
dw Functionce465
dw Functionce490
-
Functionce443: ; ce443 (33:6443)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0F
@@ -3652,7 +3563,6 @@ Functionce443: ; ce443 (33:6443)
and $f0
or $8
ld [hl], a
-
Functionce465: ; ce465 (33:6465)
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -3682,7 +3592,6 @@ Functionce465: ; ce465 (33:6465)
.asm_ce48b
ld [hl], $10
call BattleAnim_IncAnonJumptableIndex
-
Functionce490: ; ce490 (33:6490)
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -3695,10 +3604,9 @@ Functionce490: ; ce490 (33:6490)
BattleAnimFunction_40: ; ce49c (33:649c)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functionce4a3
dw Functionce4b0
-
Functionce4a3: ; ce4a3 (33:64a3)
call BattleAnim_IncAnonJumptableIndex
ld hl, BATTLEANIMSTRUCT_0B
@@ -3706,7 +3614,6 @@ Functionce4a3: ; ce4a3 (33:64a3)
ld a, $24
add [hl]
call ReinitBattleAnimFrameset
-
Functionce4b0: ; ce4b0 (33:64b0)
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
@@ -3828,11 +3735,10 @@ BattleAnimFunction_44: ; ce532 (33:6532)
BattleAnimFunction_45: ; ce55b (33:655b)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functionce564
dw Functionce56e
dw Functionce577
-
Functionce564: ; ce564 (33:6564)
ld d, $18
ld hl, BATTLEANIMSTRUCT_0B
@@ -3846,7 +3752,6 @@ Functionce56e: ; ce56e (33:656e)
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
ld [hl], $18
-
Functionce577: ; ce577 (33:6577)
ld hl, BATTLEANIMSTRUCT_0F
add hl, bc
@@ -3871,10 +3776,9 @@ asm_ce58f: ; ce58f (33:658f)
BattleAnimFunction_46: ; ce593 (33:6593)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functionce5b3
dw Functionce59a
-
Functionce59a: ; ce59a (33:659a)
ld hl, BATTLEANIMSTRUCT_XCOORD
add hl, bc
@@ -3893,7 +3797,6 @@ Functionce59a: ; ce59a (33:659a)
.asm_ce5b0
call DeinitBattleAnimation
-
Functionce5b3: ; ce5b3 (33:65b3)
ret
@@ -3941,12 +3844,11 @@ endr
BattleAnimFunction_49: ; ce5ee (33:65ee)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functionce5f9
dw Functionce60a
dw Functionce622
dw Functionce618
-
Functionce5f9: ; ce5f9 (33:65f9)
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -3957,7 +3859,6 @@ Functionce5f9: ; ce5f9 (33:65f9)
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
ld [hl], $ec
-
Functionce60a: ; ce60a (33:660a)
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
@@ -3976,7 +3877,6 @@ Functionce618: ; ce618 (33:6618)
asm_ce61c: ; ce61c (33:661c)
call BattleAnim_IncAnonJumptableIndex
call BattleAnim_IncAnonJumptableIndex
-
Functionce622: ; ce622 (33:6622)
ld hl, BATTLEANIMSTRUCT_YOFFSET
add hl, bc
@@ -3990,12 +3890,11 @@ endr
BattleAnimFunction_4A: ; ce62f (33:662f)
call BattleAnim_AnonJumptable
-.anon_jumptable
+.anon_dw
dw Functionce63a
dw Functionce648
dw Functionce65c
dw Functionce672
-
Functionce63a: ; ce63a (33:663a)
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
@@ -4234,24 +4133,24 @@ BattleAnim_Cosine_e: ; ce76b (33:676b)
call BattleAnim_Cosine
ld e, a
ret
-; ce771 (33:6771)
+; ce771 (33:6771)
BattleAnim_AbsSinePrecise: ; ce771
ld a, e
call BattleAnim_Sine
ld e, l
ld d, h
ret
-; ce778
+; ce778
BattleAnim_AbsCosinePrecise: ; ce778
ld a, e
call BattleAnim_Cosine
ld e, l
ld d, h
ret
-; ce77f
+; ce77f
BattleAnimSineWave: ; ce77f
sine_wave $100
; ce7bf
diff --git a/battle/objects/library.asm b/battle/objects/helpers.asm
index a692211d3..a692211d3 100755
--- a/battle/objects/library.asm
+++ b/battle/objects/helpers.asm
diff --git a/battle/sliding_intro.asm b/battle/sliding_intro.asm
index 0611c91d9..6361f7fa7 100755
--- a/battle/sliding_intro.asm
+++ b/battle/sliding_intro.asm
@@ -5,10 +5,10 @@ BattleIntroSlidingPics: ; 4e980
ld [rSVBK], a
call .subfunction1
ld a, rSCX - $ff00
- ld [hLCDStatCustom], a
+ ld [hFFC6], a
call .subfunction2
xor a
- ld [hLCDStatCustom], a
+ ld [hFFC6], a
pop af
ld [rSVBK], a
ret
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-20 05:55:58 +0000