From 6dc1f939e1e97563928c22950d8fa618d892c32d Mon Sep 17 00:00:00 2001
From: luckytyphlosion <alan.rj.huang@gmail.com>
Date: Sun, 29 Nov 2015 15:09:32 -0500
Subject: bankB misc functions

ScaleSpriteByTwo, DisplayEffectiveness and CheckIfMoveIsKnown
---
 yellow/main.asm | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'yellow')

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]
 
-- 
cgit v1.3.1-sl0p