aboutsummaryrefslogtreecommitdiffstats
path: root/data/sprites
diff options
context:
space:
mode:
authorvulcandth <vulcandth@gmail.com>2023-07-13 20:27:56 -0500
committerGitHub <noreply@github.com>2023-07-13 21:27:56 -0400
commitd001ced41b53271373753de835a9c3b3413dc318 (patch)
treeff2db7f403bddfcdeb12e50def8411cafedcdd5e /data/sprites
parentMake wCurrentBoxNum a byte instead of word (#414) (diff)
downloadpokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.gz
pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.xz
pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.zip
Add macros, constants, and labels for map scripts and text (#367)
This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
Diffstat (limited to 'data/sprites')
-rw-r--r--data/sprites/sprites.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/sprites/sprites.asm b/data/sprites/sprites.asm
index 72715087..612ce10c 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