Finish Rocket House, Yellow sprite backport

Some big dubs for KEP today. This commit backports the Yellow overworld spriteset, and also adds the cat sprite for Meowth. This allows Jessie and James to use their overworld sprites in the Rocket House and serves as groundwork for backporting their other events.

There are altered Daisy and Nurse Joy sprites that may or may not warrant usage. That can be discussed.

Naturally, this also means there's a ton of overworld sprites to use elsewhere. Revamps of the "Bulbasaur house" in Cerulean and the Surfing Pikachu sprite change come to mind.

An & symbol has been backported from GSC for Jessie and James's trainer class as well.
This commit is contained in:
Llinos Evans 2023-04-23 17:59:28 +01:00
parent eba8947133
commit 09ad875023
25 changed files with 80 additions and 41 deletions

View file

@ -1,3 +1,4 @@
; ported from Yellow
; overworld sprites
; SpriteSheetPointerTable indexes (see data/sprites/sprites.asm)
const_def
@ -32,7 +33,7 @@
const SPRITE_MIDDLE_AGED_WOMAN ; $1c
const SPRITE_BRUNETTE_GIRL ; $1d
const SPRITE_LANCE ; $1e
const SPRITE_UNUSED_SCIENTIST ; $1f
const SPRITE_UNUSED_RED_1 ; $1f
const SPRITE_SCIENTIST ; $20
const SPRITE_ROCKER ; $21
const SPRITE_SWIMMER ; $22
@ -51,28 +52,39 @@
const SPRITE_FISHER ; $2f
const SPRITE_KOGA ; $30
const SPRITE_GUARD ; $31
const SPRITE_FAKE_TREE ; $32 - fake tree, was guard
const SPRITE_UNUSED_RED_2 ; $32
const SPRITE_MOM ; $33
const SPRITE_BALDING_GUY ; $34
const SPRITE_LITTLE_BOY ; $35
const SPRITE_UNUSED_GAMEBOY_KID ; $36
const SPRITE_UNUSED_RED_3 ; $36
const SPRITE_GAMEBOY_KID ; $37
const SPRITE_FAIRY ; $38
const SPRITE_AGATHA ; $39
const SPRITE_BRUNO ; $3a
const SPRITE_LORELEI ; $3b
const SPRITE_SEEL ; $3c
const SPRITE_PIKACHU ; $3d
const SPRITE_OFFICER_JENNY ; $3e
const SPRITE_SANDSHREW ; $3f
const SPRITE_ODDISH ; $40
const SPRITE_BULBASAUR ; $41
const SPRITE_JIGGLYPUFF ; $42
const SPRITE_CLEFAIRY ; $43
const SPRITE_CHANSEY ; $44
const SPRITE_JESSIE ; $45
const SPRITE_JAMES ; $46
const SPRITE_CAT
DEF FIRST_STILL_SPRITE EQU const_value
const SPRITE_POKE_BALL ; $3d
const SPRITE_FOSSIL ; $3e
const SPRITE_BOULDER ; $3f
const SPRITE_PAPER ; $40
const SPRITE_POKEDEX ; $41
const SPRITE_CLIPBOARD ; $42
const SPRITE_SNORLAX ; $43
const SPRITE_UNUSED_OLD_AMBER ; $44
const SPRITE_OLD_AMBER ; $45
const SPRITE_UNUSED_GAMBLER_ASLEEP_1 ; $46
const SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; $47
const SPRITE_GAMBLER_ASLEEP ; $48
DEF NUM_SPRITES EQU const_value - 1
const SPRITE_POKE_BALL ; $47
const SPRITE_FOSSIL ; $48
const SPRITE_BOULDER ; $49
const SPRITE_PAPER ; $4a
const SPRITE_POKEDEX ; $4b
const SPRITE_CLIPBOARD ; $4c
const SPRITE_SNORLAX ; $4d
const SPRITE_UNUSED_OLD_AMBER ; $4e
const SPRITE_OLD_AMBER ; $4f
const SPRITE_UNUSED_GAMBLER_ASLEEP_1 ; $50
const SPRITE_UNUSED_GAMBLER_ASLEEP_2 ; $51
const SPRITE_GAMBLER_ASLEEP ; $52
DEF NUM_SPRITES EQU const_value - 1

View file

@ -1,3 +1,4 @@
; Ported from Yellow
; sprite set ids
; indexes for SpriteSets (see data/maps/sprite_sets.asm)
; values for MapSpriteSets and SplitMapSpriteSets (see data/maps/sprite_sets.asm)
@ -38,4 +39,4 @@ DEF EAST_WEST EQU 1
DEF NORTH_SOUTH EQU 2
; each sprite set has 9 walking sprites and 2 still sprites
DEF SPRITE_SET_LENGTH EQU 9 + 2
DEF SPRITE_SET_LENGTH EQU 9 + 2