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/overworld | |
| 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/overworld')
| -rw-r--r-- | engine/overworld/elevator.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/player_animations.asm | 1 | ||||
| -rw-r--r-- | engine/overworld/player_state.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/push_boulder.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/tilesets.asm | 4 |
5 files changed, 5 insertions, 8 deletions
diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm index b873ffad..3c425caa 100644 --- a/engine/overworld/elevator.asm +++ b/engine/overworld/elevator.asm @@ -31,7 +31,7 @@ ShakeElevator:: ld a, SFX_SAFARI_ZONE_PA call PlayMusic .musicLoop - ld a, [wChannelSoundIDs + Ch5] + ld a, [wChannelSoundIDs + CHAN5] cp SFX_SAFARI_ZONE_PA jr z, .musicLoop call UpdateSprites diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index 008d5057..6f8a5c18 100644 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -14,7 +14,6 @@ EnterMapAnim:: ld hl, wd732 bit 4, [hl] ; used dungeon warp? pop hl - ;res 4, [hl] jr nz, .dungeonWarpAnimation call PlayerSpinWhileMovingDown ld a, SFX_TELEPORT_ENTER_2 diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm index 4e37523b..4998360d 100644 --- a/engine/overworld/player_state.asm +++ b/engine/overworld/player_state.asm @@ -240,11 +240,11 @@ PrintSafariZoneSteps:: call PlaceString ld a, [wNumSafariBalls] cp 10 - jr nc, .numSafariBallsTwoDigits + jr nc, .tenOrMore hlcoord 5, 3 ld a, " " ld [hl], a -.numSafariBallsTwoDigits +.tenOrMore hlcoord 6, 3 ld de, wNumSafariBalls lb bc, 1, 2 diff --git a/engine/overworld/push_boulder.asm b/engine/overworld/push_boulder.asm index 09911ca3..a8e532d3 100644 --- a/engine/overworld/push_boulder.asm +++ b/engine/overworld/push_boulder.asm @@ -2,8 +2,6 @@ TryPushingBoulder:: ld a, [wd728] bit 0, a ; using Strength? ret z -Func_f0a7: -; where LoadMissableObjects predef points to now ld a, [wFlags_0xcd60] bit 1, a ; has boulder dust animation from previous push played yet? ret nz diff --git a/engine/overworld/tilesets.asm b/engine/overworld/tilesets.asm index 21101e7b..11c2bef6 100644 --- a/engine/overworld/tilesets.asm +++ b/engine/overworld/tilesets.asm @@ -26,13 +26,13 @@ LoadTilesetHeader: call IsInArray pop de pop hl - jr c, .notDungeonTileset + jr c, .dungeon ld a, [wCurMapTileset] ld b, a ldh a, [hPreviousTileset] cp b jr z, .done -.notDungeonTileset +.dungeon ld a, [wDestinationWarpID] cp $ff jr z, .done |