diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /data/sprites | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'data/sprites')
| -rw-r--r-- | data/sprites/sprites.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm index f033230b..cf9e3994 100644 --- a/data/sprites/sprites.asm +++ b/data/sprites/sprites.asm @@ -33,7 +33,7 @@ SpriteSheetPointerTable: overworld_sprite RocketSprite, 12 ; SPRITE_ROCKET overworld_sprite ChannelerSprite, 12 ; SPRITE_CHANNELER overworld_sprite WaiterSprite, 12 ; SPRITE_WAITER - overworld_sprite ErikaSprite, 12 ; SPRITE_ERIKA + overworld_sprite SilphWorkerFSprite, 12 ; SPRITE_SILPH_WORKER_F overworld_sprite MiddleAgedWomanSprite, 12 ; SPRITE_MIDDLE_AGED_WOMAN overworld_sprite BrunetteGirlSprite, 12 ; SPRITE_BRUNETTE_GIRL overworld_sprite LanceSprite, 12 ; SPRITE_LANCE @@ -50,7 +50,7 @@ SpriteSheetPointerTable: overworld_sprite NurseSprite, 12 ; SPRITE_NURSE overworld_sprite LinkReceptionistSprite, 12 ; SPRITE_LINK_RECEPTIONIST overworld_sprite SilphPresidentSprite, 12 ; SPRITE_SILPH_PRESIDENT - overworld_sprite SilphWorkerSprite, 12 ; SPRITE_SILPH_WORKER + overworld_sprite SilphWorkerMSprite, 12 ; SPRITE_SILPH_WORKER_M overworld_sprite WardenSprite, 12 ; SPRITE_WARDEN overworld_sprite CaptainSprite, 12 ; SPRITE_CAPTAIN overworld_sprite FisherSprite, 12 ; SPRITE_FISHER |