summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2016-05-30 19:55:13 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2016-05-30 19:55:13 -0400
commit5908de236f588d17231c6280b1d16240cd8c0a88 (patch)
tree9ba1850488dbe0d5dcfe3b128132f00c31a438f7
parent8ef80e7c36820ad8939363b116297ab3ec3bcfc8 (diff)
Forgot to add rest of the files
-rw-r--r--engine/bank3e.asm27
-rwxr-xr-xmain.asm27
2 files changed, 28 insertions, 26 deletions
diff --git a/engine/bank3e.asm b/engine/bank3e.asm
new file mode 100644
index 00000000..af7cc074
--- /dev/null
+++ b/engine/bank3e.asm
@@ -0,0 +1,27 @@
+Func_f8000: ; f8000 (3e:4000)
+ dr $f8000,$f8bcb
+
+Func_f8bcb: ; f8bcb (3e:4bcb)
+ push de
+ callab IsSurfingPikachuInThePlayersParty
+ pop de
+ ret nc
+ callab PlayPikachuSoundClip
+ ret
+
+Func_f8bdf: ; f8bdf (3e:4bdf)
+ dr $f8bdf,$f982d
+PlayIntroScene: ; f982d (3e:582d)
+ dr $f982d,$fa35a
+
+YellowIntroGraphics: INCBIN "gfx/yellow_intro.2bpp"
+
+Func_fbb5a: ; fbb5a (3e:7b5a)
+ ld hl, wTileMapBackup
+ ld bc, 10 * SCREEN_WIDTH
+ xor a
+ call FillMemory
+ ret
+
+Func_fbb65: ; fbb65 (3e:7b65)
+ dr $fbb65,$fbd76 \ No newline at end of file
diff --git a/main.asm b/main.asm
index 77143ea6..ad386b82 100755
--- a/main.asm
+++ b/main.asm
@@ -1569,33 +1569,8 @@ SECTION "bank3D",ROMX,BANK[$3D]
INCLUDE "engine/bank3d.asm"
SECTION "bank3E",ROMX,BANK[$3E]
-Func_f8000: ; f8000
- dr $f8000,$f8bcb
-Func_f8bcb: ; f8bcb
- push de
- callab IsSurfingPikachuInThePlayersParty
- pop de
- ret nc
- callab PlayPikachuSoundClip
- ret
-
-Func_f8bdf: ; f8bdf
- dr $f8bdf,$f982d
-PlayIntroScene: ; f982d (3e:582d)
- dr $f982d,$fa35a
-
-YellowIntroGraphics: INCBIN "gfx/yellow_intro.2bpp"
-
-Func_fbb5a:
- ld hl, wTileMapBackup
- ld bc, 10 * SCREEN_WIDTH
- xor a
- call FillMemory
- ret
-
-Func_fbb65:
- dr $fbb65,$fbd76
+INCLUDE "engine/bank3e.asm"
SECTION "bank3F",ROMX,BANK[$3F]