diff options
| author | mid-kid <esteve.varela@gmail.com> | 2019-08-21 14:43:21 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2019-10-21 00:31:50 +0200 |
| commit | 1f172badc42935bb510b03fa56e61707489e7c9b (patch) | |
| tree | 23ed7b464ca37b502d7ba0a87bcef6a0a2ce060e | |
| parent | 0d48d829d407524fa4edd45cc012f4e7d935e9b4 (diff) | |
Misc fixes
| -rw-r--r-- | constants/engine_flags.asm | 4 | ||||
| -rw-r--r-- | engine/events/shuckle.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/map_objects.asm | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/constants/engine_flags.asm b/constants/engine_flags.asm index d6ef40b55..c2cae8aed 100644 --- a/constants/engine_flags.asm +++ b/constants/engine_flags.asm @@ -1,4 +1,4 @@ -; EngineFlags indexes (see engine/engine_flags.asm) +; EngineFlags indexes (see data/engine_flags.asm) const_def ; wPokegearFlags const ENGINE_RADIO_CARD @@ -64,7 +64,7 @@ const ENGINE_UNLOCKED_UNOWNS_UNUSED_7 ; wVisitedSpawns const ENGINE_FLYPOINT_PLAYERS_HOUSE - const ENGINE_FLYPOINT_VIRIDIAN_POKECENTER + const ENGINE_FLYPOINT_DEBUG const ENGINE_FLYPOINT_PALLET const ENGINE_FLYPOINT_VIRIDIAN const ENGINE_FLYPOINT_PEWTER diff --git a/engine/events/shuckle.asm b/engine/events/shuckle.asm index ca8985591..85bcce629 100644 --- a/engine/events/shuckle.asm +++ b/engine/events/shuckle.asm @@ -2,7 +2,7 @@ MANIA_OT_ID EQU 00518 GiveShuckle: ; Adding to the party. - xor a + xor a ; PARTYMON ld [wMonType], a ; Level 15 Shuckle. diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index cf532fea6..6a1c1a22b 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -430,7 +430,7 @@ RestoreDefaultMovement: ret .ok - ld a, SPRITEMOVEFN_STANDING + ld a, SPRITEMOVEDATA_STANDING_DOWN ret ClearObjectMovementByteIndex: @@ -2466,7 +2466,7 @@ RefreshPlayerSprite: jr ContinueSpawnFacing SpawnInFacingDown: - ld a, 0 + ld a, DOWN ContinueSpawnFacing: ld bc, wPlayerStruct call SetSpriteDirection |