diff options
author | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
---|---|---|
committer | dannye <corrnondacqb@yahoo.com> | 2016-06-11 16:16:56 -0500 |
commit | c979b3bb03b121dd03a800df74144cd69a74601a (patch) | |
tree | 0d6bb48125efe6f6215347967383ba4c3b7da391 /main.asm | |
parent | 269f2c3ba72776e975f5b00d9a1361cadbda42a7 (diff) | |
parent | 6e8c3883e430b567f7aa8f9230e366e03610bd5a (diff) |
Merge branch 'master' of https://github.com/pret/pokeyellow
Diffstat (limited to 'main.asm')
-rwxr-xr-x | main.asm | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -697,7 +697,7 @@ Func_2fd6a: ; 2fd6a (b:7d6a) callab IsThisPartymonStarterPikachu_Party ret nc ld a, $3 - ld [wd431], a + ld [wPikachuSpawnState], a ret INCLUDE "engine/battle/scale_sprites.asm" |