diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-11 17:49:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-11 17:49:03 -0700 |
| commit | db0ac16b6b4f257de338d1aaac561e681ca8723a (patch) | |
| tree | d6888723f443557ce45c9a00d873caa5e7a8930e /scripts/oakslab.asm | |
| parent | More syncing with pokered (diff) | |
| parent | Merge branch 'master' of github.com:pret/pokeyellow (diff) | |
| download | pokeyellow-db0ac16b6b4f257de338d1aaac561e681ca8723a.tar.gz pokeyellow-db0ac16b6b4f257de338d1aaac561e681ca8723a.tar.xz pokeyellow-db0ac16b6b4f257de338d1aaac561e681ca8723a.zip | |
Merge pull request #14 from PikalaxALT/master
Yellow documentation
Diffstat (limited to 'scripts/oakslab.asm')
| -rwxr-xr-x | scripts/oakslab.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/oakslab.asm b/scripts/oakslab.asm index 5a6b9456..55b58b39 100755 --- a/scripts/oakslab.asm +++ b/scripts/oakslab.asm @@ -473,8 +473,8 @@ OaksLabScript17: ld [wPlayerFacingDirection], a ld a, $2 ld [wPikachuSpawnState], a - callba Func_fc4fa - call Func_1525 + callba SchedulePikachuSpawnForAfterText + call EnablePikachuOverworldSpriteDrawing ld a, $1a ld [hSpriteIndexOrTextID], a call DisplayTextID @@ -1044,7 +1044,7 @@ OaksLabText18: call AddPartyMon ld a, 163 ld [wPartyMon1CatchRate], a - call Func_152d + call DisablePikachuOverworldSpriteDrawing SetEvent EVENT_GOT_STARTER ld hl, wd72e set 3, [hl] |