aboutsummaryrefslogtreecommitdiffstats
path: root/engine/battle/moveEffects
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2015-07-06 13:35:48 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2015-07-06 13:35:48 -0400
commit9c9fb882c70650b82f4e684d12a5f5cf03d18ae6 (patch)
tree38e83aa984862e0e6010e490f2092b9eaf5d5807 /engine/battle/moveEffects
parentMore bank3d documentation. (diff)
downloadpokeyellow-9c9fb882c70650b82f4e684d12a5f5cf03d18ae6.tar.gz
pokeyellow-9c9fb882c70650b82f4e684d12a5f5cf03d18ae6.tar.xz
pokeyellow-9c9fb882c70650b82f4e684d12a5f5cf03d18ae6.zip
Complete documentation of bank3d
todo: label functions past engine/items/tm_prices.asm check if hlCoords are correct.
Diffstat (limited to 'engine/battle/moveEffects')
-rw-r--r--engine/battle/moveEffects/focus_energy_effect.asm4
-rw-r--r--engine/battle/moveEffects/heal_effect.asm14
-rw-r--r--engine/battle/moveEffects/mist_effect.asm4
-rw-r--r--engine/battle/moveEffects/one_hit_ko_effect.asm2
-rw-r--r--engine/battle/moveEffects/paralyze_effect.asm2
-rw-r--r--engine/battle/moveEffects/pay_day_effect.asm4
-rw-r--r--engine/battle/moveEffects/reflect_light_screen_effect.asm12
-rw-r--r--engine/battle/moveEffects/transform_effect.asm6
8 files changed, 24 insertions, 24 deletions
diff --git a/engine/battle/moveEffects/focus_energy_effect.asm b/engine/battle/moveEffects/focus_energy_effect.asm
index f01e61cc..0089c8b1 100644
--- a/engine/battle/moveEffects/focus_energy_effect.asm
+++ b/engine/battle/moveEffects/focus_energy_effect.asm
@@ -1,4 +1,4 @@
-FocusEnergyEffect_: ; 27f86 (9:7f86)
+FocusEnergyEffect_: ; f628b (3d:628b)
ld hl, W_PLAYERBATTSTATUS2
ld a, [H_WHOSETURN]
and a
@@ -18,7 +18,7 @@ FocusEnergyEffect_: ; 27f86 (9:7f86)
ld b, BANK(PrintButItFailedText_)
jp Bankswitch
-GettingPumpedText: ; 27fb3 (9:7fb3)
+GettingPumpedText: ; f62b5 (3d:62b5)
db $0a
TX_FAR _GettingPumpedText
db "@"
diff --git a/engine/battle/moveEffects/heal_effect.asm b/engine/battle/moveEffects/heal_effect.asm
index 862917f7..d6d4e183 100644
--- a/engine/battle/moveEffects/heal_effect.asm
+++ b/engine/battle/moveEffects/heal_effect.asm
@@ -1,4 +1,4 @@
-HealEffect_: ; 3b9ec (e:79ec)
+HealEffect_: ; f62ba (3d:62ba)
ld a, [H_WHOSETURN]
and a
ld de, wBattleMonHP
@@ -86,7 +86,7 @@ HealEffect_: ; 3b9ec (e:79ec)
ld [wHPBarNewHP], a
.playAnim
ld hl, PlayCurrentMoveAnimation
- call BankswitchEtoF
+ call Bankswitch3DtoF
ld a, [H_WHOSETURN]
and a
hlCoord 10, 9
@@ -98,23 +98,23 @@ HealEffect_: ; 3b9ec (e:79ec)
ld [wHPBarType], a
predef UpdateHPBar2
ld hl, DrawHUDsAndHPBars
- call BankswitchEtoF
+ call Bankswitch3DtoF
ld hl, RegainedHealthText
jp PrintText
.failed
ld c, 50
call DelayFrames
ld hl, PrintButItFailedText_
- jp BankswitchEtoF
+ jp Bankswitch3DtoF
-StartedSleepingEffect: ; 3baa2 (e:7aa2)
+StartedSleepingEffect: ; f6370 (3d:6370)
TX_FAR _StartedSleepingEffect
db "@"
-FellAsleepBecameHealthyText: ; 3baa7 (e:7aa7)
+FellAsleepBecameHealthyText: ; f6375 (3d:6375)
TX_FAR _FellAsleepBecameHealthyText
db "@"
-RegainedHealthText: ; 3baac (e:7aac)
+RegainedHealthText: ; f637a (3d:637a)
TX_FAR _RegainedHealthText
db "@"
diff --git a/engine/battle/moveEffects/mist_effect.asm b/engine/battle/moveEffects/mist_effect.asm
index 8394eec1..ed06d16c 100644
--- a/engine/battle/moveEffects/mist_effect.asm
+++ b/engine/battle/moveEffects/mist_effect.asm
@@ -1,4 +1,4 @@
-MistEffect_: ; 33f2b (c:7f2b)
+MistEffect_: ; f64ac (3d:64ac)
ld hl, W_PLAYERBATTSTATUS2
ld a, [H_WHOSETURN]
and a
@@ -16,6 +16,6 @@ MistEffect_: ; 33f2b (c:7f2b)
ld b, BANK(PrintButItFailedText_)
jp Bankswitch
-ShroudedInMistText: ; 33f52 (c:7f52)
+ShroudedInMistText: ; f64d3 (3d:64d3)
TX_FAR _ShroudedInMistText
db "@"
diff --git a/engine/battle/moveEffects/one_hit_ko_effect.asm b/engine/battle/moveEffects/one_hit_ko_effect.asm
index cc0eca7b..f859f9c4 100644
--- a/engine/battle/moveEffects/one_hit_ko_effect.asm
+++ b/engine/battle/moveEffects/one_hit_ko_effect.asm
@@ -1,4 +1,4 @@
-OneHitKOEffect_: ; 33f57 (c:7f57)
+OneHitKOEffect_: ; f64db (3d:64db)
ld hl, W_DAMAGE
xor a
ld [hli], a
diff --git a/engine/battle/moveEffects/paralyze_effect.asm b/engine/battle/moveEffects/paralyze_effect.asm
index 69acbb01..74a7319d 100644
--- a/engine/battle/moveEffects/paralyze_effect.asm
+++ b/engine/battle/moveEffects/paralyze_effect.asm
@@ -1,4 +1,4 @@
-ParalyzeEffect_: ; 52601 (14:6601)
+ParalyzeEffect_: ; f6562 (3d:6562)
ld hl, wEnemyMonStatus
ld de, W_PLAYERMOVETYPE
ld a, [H_WHOSETURN]
diff --git a/engine/battle/moveEffects/pay_day_effect.asm b/engine/battle/moveEffects/pay_day_effect.asm
index fc937d1b..1fab9771 100644
--- a/engine/battle/moveEffects/pay_day_effect.asm
+++ b/engine/battle/moveEffects/pay_day_effect.asm
@@ -1,4 +1,4 @@
-PayDayEffect_ ; 2feb8 (b:7eb8)
+PayDayEffect_ ; f6511 (3d:6511)
xor a
ld hl, wcd6d
ld [hli], a
@@ -40,6 +40,6 @@ PayDayEffect_ ; 2feb8 (b:7eb8)
ld hl, CoinsScatteredText
jp PrintText
-CoinsScatteredText: ; 2ff04 (b:7f04)
+CoinsScatteredText: ; f655d (3d:655d)
TX_FAR _CoinsScatteredText
db "@"
diff --git a/engine/battle/moveEffects/reflect_light_screen_effect.asm b/engine/battle/moveEffects/reflect_light_screen_effect.asm
index 7da98699..c12c6018 100644
--- a/engine/battle/moveEffects/reflect_light_screen_effect.asm
+++ b/engine/battle/moveEffects/reflect_light_screen_effect.asm
@@ -1,4 +1,4 @@
-ReflectLightScreenEffect_: ; 3bb97 (e:7b97)
+ReflectLightScreenEffect_: ; f645d (3d:645d)
ld hl, W_PLAYERBATTSTATUS3
ld de, W_PLAYERMOVEEFFECT
ld a, [H_WHOSETURN]
@@ -23,23 +23,23 @@ ReflectLightScreenEffect_: ; 3bb97 (e:7b97)
.playAnim
push hl
ld hl, PlayCurrentMoveAnimation
- call BankswitchEtoF
+ call Bankswitch3DtoF
pop hl
jp PrintText
.moveFailed
ld c, $32
call DelayFrames
ld hl, PrintButItFailedText_
- jp BankswitchEtoF
+ jp Bankswitch3DtoF
-LightScreenProtectedText: ; 3bbd7 (e:7bd7)
+LightScreenProtectedText: ; f649d (3d:649d)
TX_FAR _LightScreenProtectedText
db "@"
-ReflectGainedArmorText: ; 3bbdc (e:7bdc)
+ReflectGainedArmorText: ; f64a2 (3d:64a2)
TX_FAR _ReflectGainedArmorText
db "@"
-BankswitchEtoF: ; 3bbe1 (e:7be1)
+Bankswitch3DtoF: ; f64a7 (3d:64a7)
ld b, BANK(BattleCore)
jp Bankswitch
diff --git a/engine/battle/moveEffects/transform_effect.asm b/engine/battle/moveEffects/transform_effect.asm
index 6504bf03..5e0e6b07 100644
--- a/engine/battle/moveEffects/transform_effect.asm
+++ b/engine/battle/moveEffects/transform_effect.asm
@@ -1,4 +1,4 @@
-TransformEffect_: ; 3bab1 (e:7ab1)
+TransformEffect_: ; f637f (3d:637f)
ld hl, wBattleMonSpecies
ld de, wEnemyMonSpecies
ld bc, W_ENEMYBATTSTATUS3
@@ -141,8 +141,8 @@ TransformEffect_: ; 3bab1 (e:7ab1)
.failed
ld hl, PrintButItFailedText_
- jp BankswitchEtoF
+ jp Bankswitch3DtoF
-TransformedText: ; 3bb92 (e:7b92)
+TransformedText: ; f6458 (3d:6458)
TX_FAR _TransformedText
db "@"