diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-25 22:19:24 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-25 22:19:24 -0500 |
| commit | 6ebe45e41fa4d939f5a9f44e05eaf64512b59018 (patch) | |
| tree | eb77ceca4fe585001858cff5cb1157e205685e00 /engine/overworld.asm | |
| parent | 87514598bedf66be222d85ebbc7565c14d79e0f4 (diff) | |
Move event data to data/events/
Diffstat (limited to 'engine/overworld.asm')
| -rwxr-xr-x | engine/overworld.asm | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/engine/overworld.asm b/engine/overworld.asm index 32ef356e5..88356877c 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -60,14 +60,14 @@ RefreshSprites:: ; 14168 GetPlayerSprite: ; 14183 ; Get Chris or Kris's sprite. - ld hl, .Chris + ld hl, ChrisStateSprites ld a, [wPlayerSpriteSetupFlags] bit PLAYERSPRITESETUP_FEMALE_TO_MALE_F, a jr nz, .go ld a, [wPlayerGender] bit PLAYERGENDER_FEMALE_F, a jr z, .go - ld hl, .Kris + ld hl, KrisStateSprites .go ld a, [PlayerState] @@ -95,20 +95,7 @@ GetPlayerSprite: ; 14183 ld [PlayerObjectSprite], a ret -.Chris: - db PLAYER_NORMAL, SPRITE_CHRIS - db PLAYER_BIKE, SPRITE_CHRIS_BIKE - db PLAYER_SURF, SPRITE_SURF - db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU - 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 -1 ; end -; 141c9 +INCLUDE "data/sprites/player_sprites.asm" AddMapSprites: ; 141c9 |