thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 23:55: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