diff options
| author | dannye <33dannye@gmail.com> | 2022-09-11 23:34:59 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2022-09-12 00:53:37 -0500 |
| commit | ecab35295aefb44227ba38f257dc40c8c10474e3 (patch) | |
| tree | d04160bc19180ee50a941d121f90cc7071e7a672 /engine/events/hidden_objects | |
| parent | Replace Hard-Coded Number With Constant (diff) | |
| parent | Add `UNUSED_TYPE`/`UNUSED_TYPE_END` constants (diff) | |
| download | pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.tar.gz pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.tar.xz pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/events/hidden_objects')
| -rw-r--r-- | engine/events/hidden_objects/museum_fossils2.asm | 2 | ||||
| -rw-r--r-- | engine/events/hidden_objects/safari_game.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engine/events/hidden_objects/museum_fossils2.asm b/engine/events/hidden_objects/museum_fossils2.asm index fce0f03a..d8090e0a 100644 --- a/engine/events/hidden_objects/museum_fossils2.asm +++ b/engine/events/hidden_objects/museum_fossils2.asm @@ -14,7 +14,7 @@ DisplayMonFrontSpriteInBox: ld a, [wcf91] ld [wd0b5], a call GetMonHeader - ld de, vChars1 + $310 + ld de, vChars1 tile $31 call LoadMonFrontSprite ld a, $80 ldh [hStartTileID], a diff --git a/engine/events/hidden_objects/safari_game.asm b/engine/events/hidden_objects/safari_game.asm index 5a267346..2863a201 100644 --- a/engine/events/hidden_objects/safari_game.asm +++ b/engine/events/hidden_objects/safari_game.asm @@ -36,7 +36,7 @@ SafariZoneGameOver: ld a, SFX_SAFARI_ZONE_PA call PlayMusic .waitForMusicToPlay - ld a, [wChannelSoundIDs + Ch5] + ld a, [wChannelSoundIDs + CHAN5] cp SFX_SAFARI_ZONE_PA jr nz, .waitForMusicToPlay ld a, TEXT_SAFARI_GAME_OVER |