diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-15 15:47:00 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-15 15:47:00 -0500 |
| commit | db8741635917237d6bc96d5260034953b7344b8e (patch) | |
| tree | 9a97e03ca7d4596a383cb5f06fa3796d2978f369 | |
| parent | 52b2097f923b29baeef7dc5bcaa5cb7ea32d7070 (diff) | |
Bank 4 moveEffects
conversion, haze, recoil
| -rw-r--r-- | engine/battle/moveEffects/conversion_effect.asm | 8 | ||||
| -rw-r--r-- | engine/battle/moveEffects/haze_effect.asm | 10 | ||||
| -rw-r--r-- | engine/battle/moveEffects/recoil_effect.asm | 4 | ||||
| -rwxr-xr-x | yellow/main.asm | 5 |
4 files changed, 14 insertions, 13 deletions
diff --git a/engine/battle/moveEffects/conversion_effect.asm b/engine/battle/moveEffects/conversion_effect.asm index e4c5b4bd..968f27e9 100644 --- a/engine/battle/moveEffects/conversion_effect.asm +++ b/engine/battle/moveEffects/conversion_effect.asm @@ -1,4 +1,4 @@ -ConversionEffect_: ; 139a3 (4:79a3) +ConversionEffect_: ; 1396d (4:796d) ld hl, wEnemyMonType1 ld de, wBattleMonType1 ld a, [H_WHOSETURN] @@ -24,12 +24,12 @@ ConversionEffect_: ; 139a3 (4:79a3) ld hl, ConvertedTypeText jp PrintText -ConvertedTypeText: ; 139cd (4:79cd) +ConvertedTypeText: ; 13997 (4:7997) TX_FAR _ConvertedTypeText db "@" -PrintButItFailedText: ; 139d2 (4:79d2) +PrintButItFailedText: ; 1399c (4:799c) ld hl, PrintButItFailedText_ -CallBankF: ; 139d5 (4:79d5) +CallBankF: ; 1399f (4:799f) ld b, BANK(PrintButItFailedText_) jp Bankswitch diff --git a/engine/battle/moveEffects/haze_effect.asm b/engine/battle/moveEffects/haze_effect.asm index 5c5443c0..fcee5a2f 100644 --- a/engine/battle/moveEffects/haze_effect.asm +++ b/engine/battle/moveEffects/haze_effect.asm @@ -1,4 +1,4 @@ -HazeEffect_: ; 139da (4:79da) +HazeEffect_: ; 139a4 (4:79a4) ld a, $7 ; store 7 on every stat mod ld hl, wPlayerMonAttackMod @@ -45,7 +45,7 @@ HazeEffect_: ; 139da (4:79da) ld hl, StatusChangesEliminatedText jp PrintText -CureVolatileStatuses: ; 13a37 (4:7a37) +CureVolatileStatuses: ; 13a01 (4:7a01) ; only cures statuses of the Pokemon not using Haze res Confused, [hl] inc hl ; BATTSTATUS2 @@ -58,7 +58,7 @@ CureVolatileStatuses: ; 13a37 (4:7a37) ld [hl], a ret -ResetStatMods: ; 13a43 (4:7a43) +ResetStatMods: ; 13a0d (4:7a0d) ld b, $8 .loop ld [hli], a @@ -66,7 +66,7 @@ ResetStatMods: ; 13a43 (4:7a43) jr nz, .loop ret -ResetStats: ; 13a4a (4:7a4a) +ResetStats: ; 13a14 (4:7a14) ld b, $8 .loop ld a, [hli] @@ -76,6 +76,6 @@ ResetStats: ; 13a4a (4:7a4a) jr nz, .loop ret -StatusChangesEliminatedText: ; 13a53 (4:7a53) +StatusChangesEliminatedText: ; 13a1d (4:7a1d) TX_FAR _StatusChangesEliminatedText db "@" diff --git a/engine/battle/moveEffects/recoil_effect.asm b/engine/battle/moveEffects/recoil_effect.asm index 9b165932..76394ddf 100644 --- a/engine/battle/moveEffects/recoil_effect.asm +++ b/engine/battle/moveEffects/recoil_effect.asm @@ -1,4 +1,4 @@ -RecoilEffect_: ; 1392c (4:792c) +RecoilEffect_: ; 138f6 (4:78f6) ld a, [H_WHOSETURN] and a ld a, [W_PLAYERMOVENUM] @@ -65,6 +65,6 @@ RecoilEffect_: ; 1392c (4:792c) predef UpdateHPBar2 ld hl, HitWithRecoilText jp PrintText -HitWithRecoilText: ; 1399e (4:799e) +HitWithRecoilText: ; 13968 (4:7968) TX_FAR _HitWithRecoilText db "@" diff --git a/yellow/main.asm b/yellow/main.asm index 89d54608..b0e5ce7e 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -3569,8 +3569,9 @@ QuestionMarkSprite: INCBIN "gfx/sprites/question_mark.2bpp" INCLUDE "engine/battle/end_of_battle.asm" INCLUDE "engine/battle/wild_encounters.asm" - - dr $138f6,$14000 +INCLUDE "engine/battle/moveEffects/recoil_effect.asm" +INCLUDE "engine/battle/moveEffects/conversion_effect.asm" +INCLUDE "engine/battle/moveEffects/haze_effect.asm" SECTION "NPC Sprites 2", ROMX, BANK[NPC_SPRITES_2] |