diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-29 15:09:32 -0500 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-11-29 15:09:32 -0500 |
| commit | 6dc1f939e1e97563928c22950d8fa618d892c32d (patch) | |
| tree | 9f9f19eac7a40d9d66fb259da8b1e377826360be /yellow/main.asm | |
| parent | 2e3b58e6207997315cd69bf50968494b3b2b982b (diff) | |
bankB misc functions
ScaleSpriteByTwo, DisplayEffectiveness and CheckIfMoveIsKnown
Diffstat (limited to 'yellow/main.asm')
| -rwxr-xr-x | yellow/main.asm | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/yellow/main.asm b/yellow/main.asm index b7a9cfba..24b6250f 100755 --- a/yellow/main.asm +++ b/yellow/main.asm @@ -1796,7 +1796,7 @@ ApplyOutOfBattlePoisonDamage: ; c3de (3:43de) and a ; are any party members poisoned? jr z, .skipPoisonEffectAndSound ld b, $2 - predef InvertBGPalColor0_4Frames ; change BG white to dark grey for 4 frames + predef InvertBGPal_4Frames ; change BG white to dark grey for 4 frames ld a, SFX_POISONED call PlaySound .skipPoisonEffectAndSound @@ -3866,12 +3866,17 @@ BeedrillPicBack: INCBIN "pic/monback/beedrillb.pic" FossilKabutopsPic: INCBIN "pic/ymon/fossilkabutops.pic" - dr $2fd25,$2fd42 -CheckIfMoveIsKnown: ; 2fd42 (b:7d42) - dr $2fd42,$2fd6a +INCLUDE "engine/battle/display_effectiveness.asm" +INCLUDE "engine/items/tmhm.asm" Func_2fd6a: ; 2fd6a (b:7d6a) - dr $2fd6a,$30000 - + callab IsThisPartymonOurPikachu + ret nc + ld a, $3 + ld [wd431], a + ret + +INCLUDE "engine/battle/scale_sprites.asm" +INCLUDE "engine/game_corner_slots2.asm" SECTION "Pics 4", ROMX, BANK[PICS_4] |