summaryrefslogtreecommitdiff
path: root/engine/overworld.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/overworld.asm')
-rwxr-xr-xengine/overworld.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/overworld.asm b/engine/overworld.asm
index 67c2f25c6..4c379711d 100755
--- a/engine/overworld.asm
+++ b/engine/overworld.asm
@@ -77,7 +77,7 @@ GetPlayerSprite: ; 14183
cp c
jr z, .good
inc hl
- cp $ff
+ cp -1
jr nz, .loop
; Any player state not in the array defaults to Chris's sprite.
@@ -100,14 +100,14 @@ GetPlayerSprite: ; 14183
db PLAYER_BIKE, SPRITE_CHRIS_BIKE
db PLAYER_SURF, SPRITE_SURF
db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU
- db $ff
+ db -1 ; end
.Kris:
db PLAYER_NORMAL, SPRITE_KRIS
db PLAYER_BIKE, SPRITE_KRIS_BIKE
db PLAYER_SURF, SPRITE_SURF
db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU
- db $ff
+ db -1 ; end
; 141c9
@@ -719,10 +719,10 @@ LoadEmote:: ; 1442f
; 1444d
-INCLUDE "data/emotes.asm"
+INCLUDE "data/sprites/emotes.asm"
-INCLUDE "data/sprite_mons.asm"
+INCLUDE "data/sprites/sprite_mons.asm"
INCLUDE "data/maps/outdoor_sprites.asm"
-INCLUDE "data/sprites.asm"
+INCLUDE "data/sprites/sprites.asm"