diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 13:27:38 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-06-08 13:27:38 -0400 |
| commit | 399fefb8cfcc3e06f89e9f81f25250c7bab60526 (patch) | |
| tree | 79adbe2f70c1327a84b7caeb428dabbef1ae795e /home/overworld.asm | |
| parent | Fix WRAM address comments beyond the former site of wGBC (diff) | |
| download | pokeyellow-399fefb8cfcc3e06f89e9f81f25250c7bab60526.tar.gz pokeyellow-399fefb8cfcc3e06f89e9f81f25250c7bab60526.tar.xz pokeyellow-399fefb8cfcc3e06f89e9f81f25250c7bab60526.zip | |
Pikapic animation function labels
Diffstat (limited to 'home/overworld.asm')
| -rw-r--r-- | home/overworld.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index f29cfd51..03058505 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1945,9 +1945,9 @@ asm_0dbd predef LoadTilesetHeader ld a, [wd72e] bit 5, a ; did a battle happen immediately before this? - jr nz, .asm_0e73 - callab Func_fc4fa ; 3f:44fa -.asm_0e73 + jr nz, .skip_pika_spawn + callab SchedulePikachuSpawnForAfterText ; 3f:44fa +.skip_pika_spawn callab LoadWildData ; 3:4b62 pop hl ; restore hl from before going to the warp/sign/sprite data (this value was saved for seemingly no purpose) ld a, [wCurMapHeight] ; map height in 4x4 tile blocks @@ -2150,7 +2150,7 @@ IgnoreInputForHalfSecond: ; 0fc3 (0:0fc3) ld [wIgnoreInputCounter], a ld hl, wd730 ld a, [hl] - or $26 + or %00100110 ; $26 ld [hl], a ; set ignore input bit ret |