summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-09-05 17:40:21 -0400
committeryenatch <yenatch@gmail.com>2013-09-05 17:40:21 -0400
commita4707eccaf7cc575bef6aada51ddf034abd917a8 (patch)
treeeaafe971a1d2e27eeb16d382d77dfee835711fed
parent2aff956ba4af940085929d1bc3af461dae16a167 (diff)
couple more specials in bank 3
-rw-r--r--main.asm19
1 files changed, 17 insertions, 2 deletions
diff --git a/main.asm b/main.asm
index ebacb376d..579786206 100644
--- a/main.asm
+++ b/main.asm
@@ -16536,7 +16536,11 @@ Functionc3ef: ; c3ef
ret
; c3fc
-INCBIN "baserom.gbc", $c3fc, $c403 - $c3fc
+Functionc3fc: ; c3fc
+ ld a, [ScriptVar]
+ ld [$dfce], a
+ ret
+; c403
Functionc403: ; c403
@@ -16564,7 +16568,18 @@ SpecialCheckPokerus: ; c419
jp ScriptReturnCarry
; c422
-INCBIN "baserom.gbc", $c422, $c43d - $c422
+Functionc422: ; c422
+ callba Function1152b
+ ld hl, $dc9d
+ res 0, [hl]
+ callba Function5d33
+ ret
+; c434
+
+Functionc434: ; c434
+ callba Function11542
+ jp ScriptReturnCarry
+; c43d
SpecialSnorlaxAwake: ; 0xc43d
; Check if the Poké Flute channel is playing, and if the player is standing