diff options
| author | vulcandth <vulcandth@gmail.com> | 2023-07-13 20:27:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 21:27:56 -0400 |
| commit | d001ced41b53271373753de835a9c3b3413dc318 (patch) | |
| tree | ff2db7f403bddfcdeb12e50def8411cafedcdd5e /gfx | |
| parent | Make wCurrentBoxNum a byte instead of word (#414) (diff) | |
| download | pokeyellow-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 'gfx')
| -rw-r--r-- | gfx/sprites.asm | 4 | ||||
| -rw-r--r-- | gfx/sprites/silph_worker_f.png (renamed from gfx/sprites/erika.png) | bin | 257 -> 257 bytes | |||
| -rw-r--r-- | gfx/sprites/silph_worker_m.png (renamed from gfx/sprites/silph_worker.png) | bin | 210 -> 210 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/gfx/sprites.asm b/gfx/sprites.asm index 4bcf678c..d4ad14cf 100644 --- a/gfx/sprites.asm +++ b/gfx/sprites.asm @@ -12,7 +12,7 @@ GrannySprite:: INCBIN "gfx/sprites/granny.2bpp" NurseSprite:: INCBIN "gfx/sprites/nurse.2bpp" LinkReceptionistSprite:: INCBIN "gfx/sprites/link_receptionist.2bpp" SilphPresidentSprite:: INCBIN "gfx/sprites/silph_president.2bpp" -SilphWorkerSprite:: INCBIN "gfx/sprites/silph_worker.2bpp" +SilphWorkerMSprite:: INCBIN "gfx/sprites/silph_worker_m.2bpp" WardenSprite:: INCBIN "gfx/sprites/warden.2bpp" CaptainSprite:: INCBIN "gfx/sprites/captain.2bpp" FisherSprite:: INCBIN "gfx/sprites/fisher.2bpp" @@ -58,7 +58,7 @@ GiovanniSprite:: INCBIN "gfx/sprites/giovanni.2bpp" RocketSprite:: INCBIN "gfx/sprites/rocket.2bpp" ChannelerSprite:: INCBIN "gfx/sprites/channeler.2bpp" WaiterSprite:: INCBIN "gfx/sprites/waiter.2bpp" -ErikaSprite:: INCBIN "gfx/sprites/erika.2bpp" +SilphWorkerFSprite:: INCBIN "gfx/sprites/silph_worker_f.2bpp" MiddleAgedWomanSprite:: INCBIN "gfx/sprites/middle_aged_woman.2bpp" BrunetteGirlSprite:: INCBIN "gfx/sprites/brunette_girl.2bpp" LanceSprite:: INCBIN "gfx/sprites/lance.2bpp" diff --git a/gfx/sprites/erika.png b/gfx/sprites/silph_worker_f.png Binary files differindex 37f2e5da..37f2e5da 100644 --- a/gfx/sprites/erika.png +++ b/gfx/sprites/silph_worker_f.png diff --git a/gfx/sprites/silph_worker.png b/gfx/sprites/silph_worker_m.png Binary files differindex 00f369fd..00f369fd 100644 --- a/gfx/sprites/silph_worker.png +++ b/gfx/sprites/silph_worker_m.png |
