thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finish Rocket House, Yellow sprite backport

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

6
data/maps/objects/CitrineRocketHouse.asm
View file

@ -12,8 +12,8 @@ CitrineRocketHouse_Object:
object_event 5, 1, SPRITE_ROCKET, STAY, DOWN, 2 ; Mart Guy
object_event 1, 6, SPRITE_ROCKET, STAY, RIGHT, 3 ; person
object_event 9, 3, SPRITE_ROCKET, STAY, UP, 4 ; person
object_event 9, 8, SPRITE_ROCKET, STAY, UP, 5 ; Meowth ; SPRITE_CAT
object_event 9, 5, SPRITE_ROCKET, STAY, DOWN, 6 ; James ; SPRITE_JAMES
object_event 7, 6, SPRITE_ROCKET, STAY, RIGHT, 7 ; Jessie ; SPRITE_JESSIE
object_event 9, 8, SPRITE_CAT, STAY, UP, 5 ; Meowth
object_event 9, 5, SPRITE_JAMES, STAY, DOWN, 6 ; James
object_event 7, 6, SPRITE_JESSIE, STAY, RIGHT, 7 ; Jessie
def_warps_to CITRINE_ROCKET_HOUSE

10
data/maps/sprite_sets.asm
View file

@ -90,7 +90,7 @@ SpriteSets:
db SPRITE_COOLTRAINER_F
db SPRITE_COOLTRAINER_M
db SPRITE_POKE_BALL
db SPRITE_FAKE_TREE ; fake tree, used to be unused sleeping gambler
db SPRITE_CAT
; SPRITESET_LAVENDER
db SPRITE_LITTLE_GIRL
@ -103,7 +103,7 @@ SpriteSets:
db SPRITE_COOLTRAINER_M
db SPRITE_GUARD
db SPRITE_POKE_BALL
db SPRITE_FAKE_TREE ; fake tree, used to be unused sleeping gambler
db SPRITE_CAT
; SPRITESET_VERMILION
db SPRITE_BEAUTY
@ -116,7 +116,7 @@ SpriteSets:
db SPRITE_COOLTRAINER_F
db SPRITE_COOLTRAINER_M
db SPRITE_POKE_BALL
db SPRITE_FAKE_TREE ; fake tree, used to be unused sleeping gambler
db SPRITE_CAT
; SPRITESET_CELADON
db SPRITE_LITTLE_GIRL
@ -142,7 +142,7 @@ SpriteSets:
db SPRITE_GUARD
db SPRITE_GAMBLER
db SPRITE_POKE_BALL
db SPRITE_FAKE_TREE ; fake tree, used to be unused sleeping gambler
db SPRITE_CAT
; SPRITESET_SAFFRON
db SPRITE_ROCKET
@ -155,7 +155,7 @@ SpriteSets:
db SPRITE_COOLTRAINER_M
db SPRITE_MONSTER
db SPRITE_POKE_BALL
db SPRITE_FAKE_TREE ; fake tree, used to be unused sleeping gambler
db SPRITE_CAT
; SPRITESET_SILENCE_BRIDGE
db SPRITE_BIKER

20
data/sprites/sprites.asm
View file

@ -1,3 +1,4 @@
; Ported from Yellow
MACRO overworld_sprite
dw \1
db \2 tiles
@ -37,7 +38,7 @@ SpriteSheetPointerTable:
overworld_sprite MiddleAgedWomanSprite, 12 ; SPRITE_MIDDLE_AGED_WOMAN
overworld_sprite BrunetteGirlSprite, 12 ; SPRITE_BRUNETTE_GIRL
overworld_sprite LanceSprite, 12 ; SPRITE_LANCE
overworld_sprite ScientistSprite, 12 ; SPRITE_UNUSED_SCIENTIST
overworld_sprite RedSprite, 12 ; SPRITE_UNUSED_RED_1
overworld_sprite ScientistSprite, 12 ; SPRITE_SCIENTIST
overworld_sprite RockerSprite, 12 ; SPRITE_ROCKER
overworld_sprite SwimmerSprite, 12 ; SPRITE_SWIMMER
@ -56,17 +57,28 @@ SpriteSheetPointerTable:
overworld_sprite FisherSprite, 12 ; SPRITE_FISHER
overworld_sprite KogaSprite, 12 ; SPRITE_KOGA
overworld_sprite GuardSprite, 12 ; SPRITE_GUARD
overworld_sprite TreeSprite, 4 ; SPRITE_FAKE_TREE - used to be unused guard, now fake tree
overworld_sprite RedSprite, 12 ; SPRITE_UNUSED_RED_2
overworld_sprite MomSprite, 12 ; SPRITE_MOM
overworld_sprite BaldingGuySprite, 12 ; SPRITE_BALDING_GUY
overworld_sprite LittleBoySprite, 12 ; SPRITE_LITTLE_BOY
overworld_sprite GameboyKidSprite, 12 ; SPRITE_UNUSED_GAMEBOY_KID
overworld_sprite RedSprite, 12 ; SPRITE_UNUSED_RED_3
overworld_sprite GameboyKidSprite, 12 ; SPRITE_GAMEBOY_KID
overworld_sprite FairySprite, 12 ; SPRITE_FAIRY
overworld_sprite AgathaSprite, 12 ; SPRITE_AGATHA
overworld_sprite BrunoSprite, 12 ; SPRITE_BRUNO
overworld_sprite LoreleiSprite, 12 ; SPRITE_LORELEI
overworld_sprite SeelSprite, 12 ; SPRITE_SEEL
overworld_sprite PikachuSprite, 12 ; SPRITE_PIKACHU
overworld_sprite OfficerJennySprite, 12 ; SPRITE_OFFICER_JENNY
overworld_sprite SandshrewSprite, 12 ; SPRITE_SANDSHREW
overworld_sprite OddishSprite, 12 ; SPRITE_ODDISH
overworld_sprite BulbasaurSprite, 12 ; SPRITE_BULBASAUR
overworld_sprite JigglypuffSprite, 12 ; SPRITE_JIGGLYPUFF
overworld_sprite ClefairySprite, 12 ; SPRITE_CLEFAIRY
overworld_sprite ChanseySprite, 12 ; SPRITE_CHANSEY
overworld_sprite JessieSprite, 12 ; SPRITE_JESSIE
overworld_sprite JamesSprite, 12 ; SPRITE_JAMES
overworld_sprite CatSprite, 12 ; SPRITE_CAT
overworld_sprite PokeBallSprite, 4 ; SPRITE_POKE_BALL
overworld_sprite FossilSprite, 4 ; SPRITE_FOSSIL
overworld_sprite BoulderSprite, 4 ; SPRITE_BOULDER
@ -79,4 +91,4 @@ SpriteSheetPointerTable:
overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_UNUSED_GAMBLER_ASLEEP_1
overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_UNUSED_GAMBLER_ASLEEP_2
overworld_sprite GamblerAsleepSprite, 4 ; SPRITE_GAMBLER_ASLEEP
assert_table_length NUM_SPRITES
assert_table_length NUM_SPRITES