diff options
| author | yenatch <yenatch@gmail.com> | 2014-06-06 16:03:47 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-06-06 16:03:47 -0700 |
| commit | 35493bef27ba0425860a0f419c64371b824b6981 (patch) | |
| tree | b57de4968c66fc768f404e3dd03849b1fd64eace /scripts/route16.asm | |
| parent | Explicit sections for pics, sprites and misc graphics. (diff) | |
| parent | Relabel a few missed map scripts and TheEndTextString (diff) | |
| download | pokeyellow-35493bef27ba0425860a0f419c64371b824b6981.tar.gz pokeyellow-35493bef27ba0425860a0f419c64371b824b6981.tar.xz pokeyellow-35493bef27ba0425860a0f419c64371b824b6981.zip | |
Merge remote-tracking branch 'danny/master'
Diffstat (limited to 'scripts/route16.asm')
| -rwxr-xr-x | scripts/route16.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/route16.asm b/scripts/route16.asm index 68474c3f..39c3f477 100755 --- a/scripts/route16.asm +++ b/scripts/route16.asm @@ -7,7 +7,7 @@ Route16Script: ; 59933 (16:5933) ld [W_ROUTE16CURSCRIPT], a ret -Func_59946: ; 59946 (16:5946) +Route16Script_59946: ; 59946 (16:5946) xor a ld [wJoyIgnore], a ld [W_ROUTE16CURSCRIPT], a @@ -47,7 +47,7 @@ Route16Script0: ; 59959 (16:5959) Route16Script3: ; 5998f (16:598f) ld a, [W_ISINBATTLE] ; W_ISINBATTLE cp $ff - jp z, Func_59946 + jp z, Route16Script_59946 call UpdateSprites ld a, [wcf0b] cp $2 |