diff options
| author | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
|---|---|---|
| committer | luckytyphlosion <alan.rj.huang@gmail.com> | 2015-10-29 14:23:30 -0400 |
| commit | cb414f1480e9117e5d6ee0ab5cb81903e83cde9a (patch) | |
| tree | e44bd6299c61335a9a0476db57b565aadcd0b4d7 /scripts/mtmoon3.asm | |
| parent | 2ea331ebb341505df1cd8429b140c52e345a5af4 (diff) | |
overworld item & movement code, cable club code, remove more instances of W_, add PIKAHAPPY_TRADE
Also make replace.sh take args
Diffstat (limited to 'scripts/mtmoon3.asm')
| -rwxr-xr-x | scripts/mtmoon3.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mtmoon3.asm b/scripts/mtmoon3.asm index 84c00981..b3a994e2 100755 --- a/scripts/mtmoon3.asm +++ b/scripts/mtmoon3.asm @@ -55,10 +55,10 @@ MtMoon3ScriptPointers: ; 49d63 (12:5d63) MtMoon3Script0: ; 49d6f (12:5d6f) CheckEvent EVENT_BEAT_MT_MOON_EXIT_SUPER_NERD jp nz, MtMoon3Script_49d91 - ld a, [W_YCOORD] + ld a, [wYCoord] cp $8 jp nz, MtMoon3Script_49d91 - ld a, [W_XCOORD] + ld a, [wXCoord] cp $d jp nz, MtMoon3Script_49d91 xor a @@ -73,7 +73,7 @@ MtMoon3Script_49d91: ; 49d91 (12:5d91) ret MtMoon3Script3: ; 49d9a (12:5d9a) - ld a, [W_ISINBATTLE] + ld a, [wIsInBattle] cp $ff jp z, MtMoon3Script_49d58 call UpdateSprites |