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 /gfx | |
| 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 'gfx')
| -rw-r--r-- | gfx/font.asm | 4 | ||||
| -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 |
4 files changed, 4 insertions, 4 deletions
diff --git a/gfx/font.asm b/gfx/font.asm index 06b02fdf..45f5230c 100644 --- a/gfx/font.asm +++ b/gfx/font.asm @@ -15,8 +15,8 @@ BattleHudTiles3End: NintendoCopyrightLogoGraphics: INCBIN "gfx/splash/copyright.2bpp" -GamefreakLogoGraphics: INCBIN "gfx/title/gamefreak_inc.2bpp" -GamefreakLogoGraphicsEnd: +GameFreakLogoGraphics: INCBIN "gfx/title/gamefreak_inc.2bpp" +GameFreakLogoGraphicsEnd: NineTile: INCBIN "gfx/title/nine.2bpp" diff --git a/gfx/sprites.asm b/gfx/sprites.asm index c54aef3d..4fb5c974 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" @@ -59,7 +59,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 |
