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 /yellow | |
| parent | EndOfBattle and TryDoWildEncounter (diff) | |
| download | pokeyellow-db8741635917237d6bc96d5260034953b7344b8e.tar.gz pokeyellow-db8741635917237d6bc96d5260034953b7344b8e.tar.xz pokeyellow-db8741635917237d6bc96d5260034953b7344b8e.zip | |
Bank 4 moveEffects
conversion, haze, recoil
Diffstat (limited to 'yellow')
| -rwxr-xr-x | yellow/main.asm | 5 |
1 files changed, 3 insertions, 2 deletions
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] |