thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-16 02:13:23 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

5
charmap.asm
View file

@ -50,7 +50,7 @@
charmap "”", $73 ; closing quote
charmap "·", $74 ; middle dot, unused
charmap "…", $75 ; ellipsis
charmap "ぁ", $76 ; hiragana small a, unused
;charmap "&", $76 ; and symbol, was unused hiragana small a
charmap "ぇ", $77 ; hiragana small e, unused
charmap "ぉ", $78 ; hiragana small o, unused
@ -71,6 +71,7 @@
charmap "<BOLD_P>", $72 ; was jp opening quote (“)
charmap "<ID>", $73
charmap "№", $74
charmap "&", $76 ; and symbol, was unused hiragana small a
; Actual characters (from other graphics files)
@ -166,7 +167,7 @@
charmap "!", $e7
charmap ".", $e8
charmap "ァ", $e9 ; katakana small a, unused
charmap "&", $e9 ; & was unused katakana small a
charmap "ゥ", $ea ; katakana small u, unused
charmap "ェ", $eb ; katakana small e, unused

44
constants/sprite_constants.asm
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

3
constants/sprite_set_constants.asm
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

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

2
engine/debug/debug_party.asm
View file

@ -24,7 +24,7 @@ IshiharaTeam:
db EXEGGUTOR_A, 90
db RHYDON, 90
db KANGASKHAN, 90
db KASANAGI, 50
db NIDORAN_M, 50
IF DEF(_DEBUG)
db KOKANA, 50
ENDC

BIN
gfx/font/font.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 625 B

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
gfx/font/font_extra.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 283 B

After

Width:  |  Height:  |  Size: 665 B

16
gfx/sprites.asm
View file

@ -1,3 +1,4 @@
; Ported from Yellow
SECTION "NPC Sprites 1", ROMX
ScientistSprite:: INCBIN "gfx/sprites/scientist.2bpp"
@ -27,6 +28,7 @@ ClipboardSprite:: INCBIN "gfx/sprites/clipboard.2bpp"
SnorlaxSprite:: INCBIN "gfx/sprites/snorlax.2bpp"
OldAmberSprite:: INCBIN "gfx/sprites/old_amber.2bpp"
GamblerAsleepSprite:: INCBIN "gfx/sprites/gambler_asleep.2bpp"
CatSprite:: INCBIN "gfx/sprites/cat.2bpp"
SECTION "NPC Sprites 2", ROMX
@ -72,7 +74,17 @@ BrunoSprite:: INCBIN "gfx/sprites/bruno.2bpp"
LoreleiSprite:: INCBIN "gfx/sprites/lorelei.2bpp"
SeelSprite:: INCBIN "gfx/sprites/seel.2bpp"
SECTION "NPC Sprites 3", ROMX
CatSprite:: INCBIN "gfx/sprites/cat.2bpp"
TreeSprite:: INCBIN "gfx/sprites/fake_tree.2bpp"
OfficerJennySprite:: INCBIN "gfx/sprites/officer_jenny.2bpp"
PikachuSprite:: INCBIN "gfx/sprites/pikachu.2bpp"
SandshrewSprite:: INCBIN "gfx/sprites/sandshrew.2bpp"
OddishSprite:: INCBIN "gfx/sprites/oddish.2bpp"
BulbasaurSprite:: INCBIN "gfx/sprites/bulbasaur.2bpp"
JigglypuffSprite:: INCBIN "gfx/sprites/jigglypuff.2bpp"
ClefairySprite:: INCBIN "gfx/sprites/clefairy.2bpp"
ChanseySprite:: INCBIN "gfx/sprites/chansey.2bpp"
SurfingPikachuSprite:: INCBIN "gfx/sprites/surfing_pikachu.2bpp"
JessieSprite:: INCBIN "gfx/sprites/jessie.2bpp"
JamesSprite:: INCBIN "gfx/sprites/james.2bpp"

BIN
gfx/sprites/bulbasaur.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 547 B

BIN
gfx/sprites/chansey.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 544 B

BIN
gfx/sprites/clefairy.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 554 B

BIN
gfx/sprites/daisy (1).png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 277 B

BIN
gfx/sprites/james.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 711 B

BIN
gfx/sprites/jessie.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 888 B

BIN
gfx/sprites/jigglypuff.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 467 B

BIN
gfx/sprites/nurse (1).png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 272 B

BIN
gfx/sprites/oddish.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 421 B

BIN
gfx/sprites/officer_jenny.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 859 B

BIN
gfx/sprites/pikachu.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 847 B

BIN
gfx/sprites/sandshrew.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 625 B

BIN
gfx/sprites/surfing_pikachu.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

6
scripts/CitrineRocketHouse.asm
View file

@ -67,8 +67,8 @@ JessieFight:
ld [wIsTrainerBattle], a
ld a, $5
ld [wCitrineRocketHouseCurScript], a
ld hl, JessieWinText
ld de, JessieLoseText
ld hl, JessieLoseText
ld de, JessieWinText
call SaveEndBattleTextPointers
jp TextScriptEnd
jr .done
@ -92,7 +92,7 @@ JessieWinText:
text_end
JessieLoseText:
text_far _JessieWinText
text_far _JessieLoseText
text_end
JessieText2:

9
text/CitrineRocketHouse.asm
View file

@ -28,7 +28,7 @@ _JamesText::
done
_MeowthText::
text "Nyarth!"
text "MEOWTH: Nyarth!"
done
_JessieText1::
@ -57,7 +57,8 @@ _JessieWinText::
_JessieLoseText::
text "Grr!"
line "JAMES, you lout!"
line "JAMES! You lout!"
prompt
_JessieText2::
text "That's it! I'm"
@ -66,10 +67,10 @@ _JessieText2::
_JessieAfterBattleText::
text "Too chicken to"
line "fight? Then go"
line "battle? Then go"
cont "away!"
done
; This mart text is unused because implementing custom mart text is hell.
_MartGuyPrompt1::
text "Alright, tell you"
line "what. I sell TMs,"