diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-23 15:57:48 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-23 15:57:48 -0400 |
| commit | 9da88a19beed6b713317bb446d21cbd493ab8009 (patch) | |
| tree | d8d6cc4df3c3dcb00541b5bda9cae842584a7009 /wram.asm | |
| parent | e63bfa7741d503fa2710792898ac4a2b5b859acf (diff) | |
| parent | 5b53dbe15d0f24c0ebcb537d7e11c106abd99867 (diff) | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'wram.asm')
| -rwxr-xr-x | wram.asm | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -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 |