diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/init.asm | 4 | ||||
| -rw-r--r-- | home/overworld.asm | 8 | ||||
| -rwxr-xr-x | home/pikachu.asm | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/home/init.asm b/home/init.asm index 67d52dd2..ad602a99 100644 --- a/home/init.asm +++ b/home/init.asm @@ -3,8 +3,6 @@ SoftReset:: ; 1d08 (0:1d08) call GBPalWhiteOut ld c, 32 call DelayFrames - ; fallthrough - Init:: ; 1d10 (0:1d10) ; Program init. @@ -99,7 +97,7 @@ rLCDC_DEFAULT EQU %11100011 predef LoadSGB - ld a, $1f ; BANK(SFX_1f_67) + ld a, BANK(SFX_Shooting_Star) ld [wAudioROMBank], a ld [wAudioSavedROMBank], a ld a, $9c 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 diff --git a/home/pikachu.asm b/home/pikachu.asm index e79fdb1b..c2521208 100755 --- a/home/pikachu.asm +++ b/home/pikachu.asm @@ -14,14 +14,14 @@ Func_151d:: ; 151d (0:151d) pop hl ret -Func_1525:: ; 1525 (0:1525) +EnablePikachuOverworldSpriteDrawing:: ; 1525 (0:1525) push hl ld hl, wPikachuOverworldStateFlags res 3, [hl] pop hl ret -Func_152d:: ; 152d (0:152d) +DisablePikachuOverworldSpriteDrawing:: ; 152d (0:152d) push hl ld hl, wPikachuOverworldStateFlags set 3, [hl] |