aboutsummaryrefslogtreecommitdiffstats
path: root/wram.asm
diff options
context:
space:
mode:
authorluckytyphlosion <alan.rj.huang@gmail.com>2016-05-23 15:52:20 -0400
committerluckytyphlosion <alan.rj.huang@gmail.com>2016-05-23 15:52:20 -0400
commit5b53dbe15d0f24c0ebcb537d7e11c106abd99867 (patch)
treea5323e702ca9e0e3a2a97d49bdf57b561f9fe0e3 /wram.asm
parentMerge pull request #8 from PikalaxALT/master (diff)
downloadpokeyellow-5b53dbe15d0f24c0ebcb537d7e11c106abd99867.tar.gz
pokeyellow-5b53dbe15d0f24c0ebcb537d7e11c106abd99867.tar.xz
pokeyellow-5b53dbe15d0f24c0ebcb537d7e11c106abd99867.zip
Bank7 misc functions
Also delete gfx/intro_nido pngs (aren't used in the build)
Diffstat (limited to 'wram.asm')
-rwxr-xr-xwram.asm8
1 files changed, 6 insertions, 2 deletions
diff --git a/wram.asm b/wram.asm
index 77c489f8..b8b0aa28 100755
--- a/wram.asm
+++ b/wram.asm
@@ -2530,7 +2530,11 @@ wPikachuMood:: ds 1 ; d470
wd472:: ds 1
wd473:: ds 1
- ds 6
+ ds 1
+
+wd475:: ds 1
+
+ ds 4
wd47a:: ds 1
@@ -2752,7 +2756,7 @@ W_ROUTE19CURSCRIPT:: ; d61d
ds 1
W_ROUTE21CURSCRIPT:: ; d61e
ds 1
-W_SAFARIZONEENTRANCECURSCRIPT:: ; d61f
+wSafariZoneEntranceCurScript:: ; d61f
ds 1
W_ROCKTUNNEL2CURSCRIPT:: ; d620
ds 1