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

Expanding on Pokemon icon usage

Browse source 
This adds Pikachu, Cat, and "Small Bird" menu icons. The cat has a custom animation done by myself.

The Jigglypuff in the Pokemon Centre now uses the new sprite, nice 'n' pretty. Officer Jenny is also in Cerulean. The Pokemon from Melanie's house in Yellow have been put in Mr. Fuji's House, given the purpose of the house in RB is different. I think it ends up fitting very nicely.

Chansey has been given its proper sprite in Fuschia. Yellow didn't actually do this, as Chansey doesn't have a walk cycle, causing the stuff that exists to go unused. I wanted it, though, so I had Chansey just not walk and turn around. Oh, and it's in all the Pokemon Centres now. Yeah, that's a...lot of changed files.
This commit is contained in:
Llinos Evans 2023-04-23 21:25:45 +01:00
parent 09ad875023
commit 9b387cab7e
49 changed files with 231 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

10
data/icon_pointers.asm
View file

@ -20,7 +20,11 @@ MonPartySpritePointers:
mon_icon_header SnakeIconFrame1, 1, 1, ICON_SNAKE << 2 + 2
mon_icon_header QuadrupedIconFrame1, 0, 1, ICON_QUADRUPED << 2
mon_icon_header QuadrupedIconFrame1, 1, 1, ICON_QUADRUPED << 2 + 2
mon_icon_header PikachuSprite, 0, 4, ICON_PIKACHU << 2
mon_icon_header TradeBubbleIconGFX, 0, 4, ICON_TRADEBUBBLE << 2
mon_icon_header SmallBirdSprite, 0, 4, ICON_SMALL_BIRD << 2
mon_icon_header CatIconFrame1, 0, 1, ICON_CAT << 2
mon_icon_header CatIconFrame1, 1, 1, ICON_CAT << 2 + 2
mon_icon_header MonsterSprite, 0, 4, ICONOFFSET + ICON_MON << 2
mon_icon_header PokeBallSprite, 0, 8, ICONOFFSET + ICON_BALL << 2
mon_icon_header FairySprite, 0, 4, ICONOFFSET + ICON_FAIRY << 2
@ -34,4 +38,8 @@ MonPartySpritePointers:
mon_icon_header SnakeIconFrame2, 1, 1, ICONOFFSET + ICON_SNAKE << 2 + 2
mon_icon_header QuadrupedIconFrame2, 0, 1, ICONOFFSET + ICON_QUADRUPED << 2
mon_icon_header QuadrupedIconFrame2, 1, 1, ICONOFFSET + ICON_QUADRUPED << 2 + 2
mon_icon_header TradeBubbleIconGFX, 4, 4, ICONOFFSET + ICON_TRADEBUBBLE << 2
mon_icon_header PikachuSprite, 12, 4, ICONOFFSET + ICON_PIKACHU << 2
mon_icon_header TradeBubbleIconGFX, 4, 4, ICONOFFSET + ICON_TRADEBUBBLE << 2
mon_icon_header SmallBirdSprite, 12, 4, ICONOFFSET + ICON_SMALL_BIRD << 2
mon_icon_header CatIconFrame2, 0, 1, ICONOFFSET + ICON_CAT << 2
mon_icon_header CatIconFrame2, 1, 1, ICONOFFSET + ICON_CAT << 2 + 2

1
data/maps/objects/CeladonPokecenter.asm
View file

@ -13,5 +13,6 @@ CeladonPokecenter_Object:
object_event 10, 5, SPRITE_BEAUTY, WALK, ANY_DIR, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 8, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Sandslash Trader
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to CELADON_POKECENTER

3
data/maps/objects/CeladonUniversityPokecenter.asm
View file

@ -12,6 +12,7 @@ CeladonUniversityPokecenter_Object:
object_event 8, 3, SPRITE_SCIENTIST, STAY, LEFT_RIGHT, 2 ; person
object_event 10, 5, SPRITE_MIDDLE_AGED_MAN, WALK, ANY_DIR, 3 ; spamton
object_event 3, 5, SPRITE_SUPER_NERD, STAY, DOWN, 4 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 5 ; person
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to CELADON_UNIVERSITY_POKECENTER

4
data/maps/objects/CeruleanCity.asm
View file

@ -27,11 +27,11 @@ CeruleanCity_Object:
object_event 31, 20, SPRITE_COOLTRAINER_M, STAY, DOWN, 3 ; person
object_event 15, 18, SPRITE_SUPER_NERD, WALK, UP_DOWN, 4 ; person
object_event 9, 21, SPRITE_SUPER_NERD, WALK, LEFT_RIGHT, 5 ; person
object_event 28, 12, SPRITE_GUARD, STAY, DOWN, 6 ; person
object_event 28, 12, SPRITE_OFFICER_JENNY, STAY, DOWN, 6 ; person
object_event 29, 26, SPRITE_COOLTRAINER_F, STAY, LEFT, 7 ; person
object_event 28, 26, SPRITE_MONSTER, STAY, DOWN, 8 ; person
object_event 9, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 9 ; person
object_event 4, 12, SPRITE_SUPER_NERD, STAY, DOWN, 10 ; person
object_event 27, 12, SPRITE_GUARD, STAY, DOWN, 11 ; person
object_event 27, 12, SPRITE_OFFICER_JENNY, STAY, DOWN, 11 ; person
def_warps_to CERULEAN_CITY

1
data/maps/objects/CeruleanPokecenter.asm
View file

@ -13,5 +13,6 @@ CeruleanPokecenter_Object:
object_event 4, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 9, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Ninetales Trader
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to CERULEAN_POKECENTER

1
data/maps/objects/CinnabarPokecenter.asm
View file

@ -14,5 +14,6 @@ CinnabarPokecenter_Object:
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 9, 6, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 5 ; spamton
object_event 8, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 6 ; Muk Trader
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 7 ; Chansey
def_warps_to CINNABAR_POKECENTER

2
data/maps/objects/FuchsiaCity.asm
View file

@ -33,7 +33,7 @@ FuchsiaCity_Object:
object_event 28, 17, SPRITE_GAMBLER, WALK, LEFT_RIGHT, 2 ; person
object_event 30, 14, SPRITE_FISHER, STAY, DOWN, 3 ; person
object_event 24, 8, SPRITE_YOUNGSTER, STAY, UP, 4 ; person
object_event 31, 5, SPRITE_FAIRY, WALK, ANY_DIR, 5 ; person
object_event 31, 5, SPRITE_CHANSEY, STAY, ANY_DIR, 5 ; person
object_event 25, 6, SPRITE_POKE_BALL, STAY, NONE, 6 ; person
object_event 12, 6, SPRITE_MONSTER, WALK, LEFT_RIGHT, 7 ; person
object_event 30, 12, SPRITE_MONSTER, WALK, LEFT_RIGHT, 8 ; person

1
data/maps/objects/FuchsiaPokecenter.asm
View file

@ -13,5 +13,6 @@ FuchsiaPokecenter_Object:
object_event 6, 5, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Marowak Trader
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to FUCHSIA_POKECENTER

1
data/maps/objects/IndigoPlateauLobby.asm
View file

@ -15,5 +15,6 @@ IndigoPlateauLobby_Object:
object_event 0, 5, SPRITE_CLERK, STAY, RIGHT, 4 ; person
object_event 13, 6, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 5 ; person
object_event 10, 7, SPRITE_GAMEBOY_KID, STAY, DOWN, 6 ; Exeggutor Trader
object_event 8, 5, SPRITE_CHANSEY, STAY, DOWN, 7 ; Chansey
def_warps_to INDIGO_PLATEAU_LOBBY

1
data/maps/objects/LavenderPokecenter.asm
View file

@ -13,5 +13,6 @@ LavenderPokecenter_Object:
object_event 2, 6, SPRITE_LITTLE_GIRL, WALK, UP_DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 9, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Dugtrio Trader
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to LAVENDER_POKECENTER

5
data/maps/objects/MrFujisHouse.asm
View file

@ -10,9 +10,10 @@ MrFujisHouse_Object:
def_object_events
object_event 3, 5, SPRITE_SUPER_NERD, STAY, NONE, 1 ; person
object_event 6, 3, SPRITE_LITTLE_GIRL, STAY, DOWN, 2 ; person
object_event 6, 4, SPRITE_MONSTER, STAY, UP, 3 ; person
object_event 1, 3, SPRITE_MONSTER, STAY, NONE, 4 ; person
object_event 6, 4, SPRITE_SANDSHREW, STAY, UP, 3 ; person
object_event 1, 3, SPRITE_BULBASAUR, STAY, NONE, 4 ; person
object_event 3, 1, SPRITE_MR_FUJI, STAY, NONE, 5 ; person
object_event 3, 3, SPRITE_POKEDEX, STAY, NONE, 6 ; person
object_event 0, 4, SPRITE_ODDISH, STAY, NONE, 7 ; person
def_warps_to MR_FUJIS_HOUSE

1
data/maps/objects/MtMoonPokecenter.asm
View file

@ -14,5 +14,6 @@ MtMoonPokecenter_Object:
object_event 10, 6, SPRITE_MIDDLE_AGED_MAN, WALK, LEFT_RIGHT, 4 ; person
object_event 7, 2, SPRITE_CLIPBOARD, STAY, NONE, 5 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 6 ; person
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 7 ; Chansey
def_warps_to MT_MOON_POKECENTER

3
data/maps/objects/PewterPokecenter.asm
View file

@ -10,8 +10,9 @@ PewterPokecenter_Object:
def_object_events
object_event 3, 1, SPRITE_NURSE, STAY, DOWN, 1 ; person
object_event 11, 7, SPRITE_GENTLEMAN, STAY, LEFT, 2 ; person
object_event 1, 3, SPRITE_FAIRY, STAY, DOWN, 3 ; person
object_event 1, 3, SPRITE_JIGGLYPUFF, STAY, DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Golem Trader
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to PEWTER_POKECENTER

1
data/maps/objects/RockTunnelPokecenter.asm
View file

@ -13,5 +13,6 @@ RockTunnelPokecenter_Object:
object_event 2, 5, SPRITE_FISHER, STAY, NONE, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 9, 6, SPRITE_MIDDLE_AGED_MAN, STAY, DOWN, 5 ; spamton
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to ROCK_TUNNEL_POKECENTER

1
data/maps/objects/SaffronPokecenter.asm
View file

@ -13,5 +13,6 @@ SaffronPokecenter_Object:
object_event 8, 3, SPRITE_GENTLEMAN, STAY, DOWN, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Raichu Trader
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to SAFFRON_POKECENTER

1
data/maps/objects/VermilionPokecenter.asm
View file

@ -13,5 +13,6 @@ VermilionPokecenter_Object:
object_event 5, 4, SPRITE_SAILOR, STAY, NONE, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Persian Trader
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to VERMILION_POKECENTER

1
data/maps/objects/ViridianPokecenter.asm
View file

@ -13,5 +13,6 @@ ViridianPokecenter_Object:
object_event 4, 3, SPRITE_COOLTRAINER_M, STAY, NONE, 3 ; person
object_event 11, 2, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 4 ; person
object_event 7, 3, SPRITE_GAMEBOY_KID, STAY, DOWN, 5 ; Raticate Trader
object_event 4, 1, SPRITE_CHANSEY, STAY, DOWN, 6 ; Chansey
def_warps_to VIRIDIAN_POKECENTER

6
data/maps/sprite_sets.asm
View file

@ -66,6 +66,8 @@ SplitMapSpriteSets:
SpriteSets:
table_width SPRITE_SET_LENGTH, SpriteSets
; Useful note: The last entry in a spriteset doesn't move, presumably for the Old Man in Viridian.
; Unsure why Poke Balls don't use that space in other spritesets - consider experimenting.
; SPRITESET_PALLET_VIRIDIAN
db SPRITE_BLUE
db SPRITE_YOUNGSTER
@ -86,7 +88,7 @@ SpriteSets:
db SPRITE_HIKER
db SPRITE_MONSTER
db SPRITE_BLUE
db SPRITE_GUARD
db SPRITE_OFFICER_JENNY
db SPRITE_COOLTRAINER_F
db SPRITE_COOLTRAINER_M
db SPRITE_POKE_BALL
@ -186,7 +188,7 @@ SpriteSets:
; SPRITESET_FUCHSIA
db SPRITE_BIRD
db SPRITE_COOLTRAINER_M
db SPRITE_FAIRY
db SPRITE_CHANSEY
db SPRITE_FISHER
db SPRITE_GAMBLER
db SPRITE_MONSTER

34
data/pokemon/menu_icons.asm
View file

@ -9,10 +9,10 @@ MonPartyData:
nybble ICON_WATER ; Squirtle
nybble ICON_WATER ; Wartortle
nybble ICON_WATER ; Totartle
nybble ICON_FAIRY ; Pikachu
nybble ICON_FAIRY ; Raichu
nybble ICON_FAIRY ; Raichu-A
nybble ICON_FAIRY ; Gorochu
nybble ICON_PIKACHU ; Pikachu
nybble ICON_PIKACHU ; Raichu
nybble ICON_PIKACHU ; Raichu-A
nybble ICON_PIKACHU ; Gorochu
nybble ICON_QUADRUPED ; Eevee
nybble ICON_QUADRUPED ; Vaporeon
nybble ICON_QUADRUPED ; Jolteon
@ -25,14 +25,14 @@ MonPartyData:
nybble ICON_QUADRUPED ; Rattata
nybble ICON_QUADRUPED ; Raticate
nybble ICON_QUADRUPED ; Raticate-A
nybble ICON_BIRD ; Pidgey
nybble ICON_BIRD ; Pidgeotto
nybble ICON_SMALL_BIRD ; Pidgey
nybble ICON_SMALL_BIRD ; Pidgeotto
nybble ICON_BIRD ; Pidgeot
nybble ICON_MON ; Konya
nybble ICON_MON ; Meowth
nybble ICON_MON ; Persian
nybble ICON_MON ; Persian-A
nybble ICON_MON ; Perrserker
nybble ICON_CAT ; Konya
nybble ICON_CAT ; Meowth
nybble ICON_CAT ; Persian
nybble ICON_CAT ; Persian-A
nybble ICON_CAT ; Perrserker
nybble ICON_BUG ; Caterpie
nybble ICON_BUG ; Metapod
nybble ICON_BUG ; Butterfree
@ -42,7 +42,7 @@ MonPartyData:
nybble ICON_BUG ; Kokana
nybble ICON_BUG ; Kasanagi
nybble ICON_BUG ; Carapthor
nybble ICON_BIRD ; Spearow
nybble ICON_SMALL_BIRD ; Spearow
nybble ICON_BIRD ; Fearow
nybble ICON_SNAKE ; Ekans
nybble ICON_SNAKE ; Arbok
@ -118,9 +118,9 @@ MonPartyData:
nybble ICON_WATER ; Wugtrio
nybble ICON_SNAKE ; Onix
nybble ICON_SNAKE ; Steelix
nybble ICON_QUADRUPED ; Kotora
nybble ICON_QUADRUPED ; Gaotora
nybble ICON_QUADRUPED ; Gorotora
nybble ICON_CAT ; Kotora
nybble ICON_CAT ; Gaotora
nybble ICON_CAT ; Gorotora - unsure about how fitting this is but they ARE tigers, so...
nybble ICON_BALL ; Voltorb
nybble ICON_BALL ; Electrode
nybble ICON_BALL ; Electrode-H
@ -163,10 +163,10 @@ MonPartyData:
nybble ICON_MON ; Marowak
nybble ICON_MON ; Marowak-A
nybble ICON_MON ; Guardia
nybble ICON_BIRD ; Farfetch'd
nybble ICON_SMALL_BIRD ; Farfetch'd
nybble ICON_BIRD ; Madaamu
nybble ICON_BIRD ; Sirfetch'd
nybble ICON_BIRD ; Doduo
nybble ICON_BIRD ; Doduo - it's flightless, so the current sprite fits better.
nybble ICON_BIRD ; Dodrio
nybble ICON_MON ; Grimer
nybble ICON_MON ; Muk

1
data/sprites/sprites.asm
View file

@ -79,6 +79,7 @@ SpriteSheetPointerTable:
overworld_sprite JessieSprite, 12 ; SPRITE_JESSIE
overworld_sprite JamesSprite, 12 ; SPRITE_JAMES
overworld_sprite CatSprite, 12 ; SPRITE_CAT
overworld_sprite SmallBirdSprite, 12 ; SPRITE_SMALL_BIRD
overworld_sprite PokeBallSprite, 4 ; SPRITE_POKE_BALL
overworld_sprite FossilSprite, 4 ; SPRITE_FOSSIL
overworld_sprite BoulderSprite, 4 ; SPRITE_BOULDER

5
data/text/text_1.asm
View file

@ -147,3 +147,8 @@ _OaksAideNoRoomText::
text_ram wOaksAideRewardItemName
text "."
done
_NurseChanseyText::
text "CHANSEY: Chaaan"
line "sey!"
done