diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-13 13:45:38 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-13 13:45:38 -0500 |
| commit | ce0359cd02fb1ec42045b70ccef5e817e06058f0 (patch) | |
| tree | 69e0d66e0e339e42eae279c97d22347db01d5973 | |
| parent | 80bbf5ac91c3696c8a526a6c8a2b71da7cf88a9d (diff) | |
drain_hp_effect.asm
| -rw-r--r-- | engine/battle/moveEffects/drain_hp_effect.asm | 6 | ||||
| -rwxr-xr-x | yellow/main.asm | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/engine/battle/moveEffects/drain_hp_effect.asm b/engine/battle/moveEffects/drain_hp_effect.asm index e977af32..0dc02e46 100644 --- a/engine/battle/moveEffects/drain_hp_effect.asm +++ b/engine/battle/moveEffects/drain_hp_effect.asm @@ -1,4 +1,4 @@ -DrainHPEffect_: ; 783f (1:783f) +DrainHPEffect_: ; 76e7 (1:76e7) ld hl, wDamage ld a, [hl] srl a ; divide damage by 2 @@ -95,10 +95,10 @@ DrainHPEffect_: ; 783f (1:783f) .printText jp PrintText -SuckedHealthText: ; 78dc (1:78dc) +SuckedHealthText: ; 7784 (1:7784) TX_FAR _SuckedHealthText db "@" -DreamWasEatenText: ; 78e1 (1:78e1) +DreamWasEatenText: ; 7789 (1:7789) TX_FAR _DreamWasEatenText db "@" diff --git a/yellow/main.asm b/yellow/main.asm index 106d6501..0183a2b8 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -1090,7 +1090,8 @@ PrintStartMenuItem: ; 702b (1:702b) INCLUDE "engine/overworld/cable_club_npc.asm" INCLUDE "engine/text_boxes.asm" - dr $76e7,$778e +INCLUDE "engine/battle/moveEffects/drain_hp_effect.asm" + PlayerPC: ; 778e (1:778e) dr $778e,$7a0f _RemovePokemon: ; 7a0f (1:7a0f) @@ -3953,7 +3954,9 @@ SlidePlayerAndEnemySilhouettesOnScreen: ; 3c04c (f:404c) StartBattle: ; 3c127 (f:4127) dr $3c127,$3cae8 AnyPartyAlive: ; 3cae8 (f:4ae8) - dr $3cae8,$3ce1f + dr $3cae8,$3ce08 +ReadPlayerMonCurHPAndStatus: ; 3ce08 (f:4e08) + dr $3ce08,$3ce1f DrawHUDsAndHPBars: ; 3ce1f (f:4e1f) dr $3ce1f,$3ceb1 DrawEnemyHUDAndHPBar: ; 3ceb1 (f:4eb1) |