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

A few fixes + added Blahaj cameo

Browse source 
Copycat now has a Jagg plushie in her house, referencing the amazing IKEA shark.

(note that KEP is not sponsored by IKEA)
This commit is contained in:
MementoMartha 2022-11-04 11:12:44 +00:00
parent 6213d683ce
commit 2b3da5e254
25 changed files with 73 additions and 242 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -10,9 +10,9 @@ CopycatsHouse2F_Object:
def_object_events
object_event 4, 3, SPRITE_BRUNETTE_GIRL, WALK, ANY_DIR, 1 ; person
object_event 4, 6, SPRITE_BIRD, WALK, LEFT_RIGHT, 2 ; person
object_event 0, 6, SPRITE_SEEL, STAY, RIGHT, 2 ; person
object_event 5, 1, SPRITE_MONSTER, STAY, DOWN, 3 ; person
object_event 2, 0, SPRITE_BIRD, STAY, DOWN, 4 ; person
object_event 1, 6, SPRITE_FAIRY, STAY, RIGHT, 5 ; person
object_event 4, 6, SPRITE_FAIRY, STAY, LEFT, 5 ; person
def_warps_to COPYCATS_HOUSE_2F

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

@ -2,8 +2,8 @@ FarawayIslandOutside_Object:
db $2d ; border block
def_warp_events
warp_event 2, 35, VERMILION_CITY, 11
warp_event 3, 35, VERMILION_CITY, 10
warp_event 2, 35, VERMILION_CITY, 10
warp_event 3, 35, VERMILION_CITY, 9
warp_event 14, 12, FARAWAY_ISLAND_INSIDE, 1
warp_event 15, 12, FARAWAY_ISLAND_INSIDE, 2

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

@ -9,7 +9,7 @@ PewterCity_Object:
warp_event 23, 17, PEWTER_MART, 1
warp_event 7, 29, PEWTER_SPEECH_HOUSE, 1
warp_event 13, 25, PEWTER_POKECENTER, 1
warp_event 27, 21, ROUTE_12_SUPER_ROD_HOUSE, 1
warp_event 7, 11, ROUTE_12_SUPER_ROD_HOUSE, 1
def_bg_events
bg_event 19, 29, 6 ; PewterCityText6

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

@ -5,8 +5,10 @@ Route6_Object:
warp_event 9, 1, ROUTE_6_GATE, 3
warp_event 10, 1, ROUTE_6_GATE, 3
warp_event 10, 7, ROUTE_6_GATE, 1
warp_event 17, 13, UNDERGROUND_PATH_ROUTE_6, 1
def_bg_events
bg_event 19, 15, 7 ; Route6Text7
def_object_events
object_event 10, 21, SPRITE_COOLTRAINER_M, STAY, RIGHT, 1, OPP_JR_TRAINER_M, 4

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

@ -6,8 +6,10 @@ Route8_Object:
warp_event 1, 10, ROUTE_8_GATE, 2
warp_event 8, 9, ROUTE_8_GATE, 3
warp_event 8, 10, ROUTE_8_GATE, 4
warp_event 13, 3, UNDERGROUND_PATH_ROUTE_8, 1
def_bg_events
bg_event 17, 3, 10 ; Route8Text10
def_object_events
object_event 8, 5, SPRITE_SUPER_NERD, STAY, RIGHT, 1, OPP_SUPER_NERD, 3

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

@ -4,7 +4,7 @@ UndergroundPathNorthSouth_Object:
def_warp_events
warp_event 5, 4, UNDERGROUND_PATH_ROUTE_5, 3
warp_event 2, 41, UNDERGROUND_PATH_ROUTE_6, 3
warp_event 2, 25, UNDERGROUND_PATH_ROUTE_7, 2
warp_event 2, 25, UNDERGROUND_PATH_ROUTE_7, 3
def_bg_events

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

@ -4,12 +4,11 @@ UndergroundPathRoute7_Object:
def_warp_events
warp_event 3, 7, LAST_MAP, 5
warp_event 4, 7, LAST_MAP, 5
warp_event 6, 2, UNDERGROUND_PATH_WEST_EAST, 1
warp_event 1, 3, UNDERGROUND_PATH_NORTH_SOUTH, 2
warp_event 4, 4, UNDERGROUND_PATH_WEST_EAST, 1
def_bg_events
def_object_events
object_event 3, 3, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 1 ; person
object_event 2, 4, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 1 ; person
def_warps_to UNDERGROUND_PATH_ROUTE_7

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

@ -10,7 +10,6 @@ VermilionCity_Object:
warp_event 18, 31, VERMILION_DOCK, 1
warp_event 19, 31, VERMILION_DOCK, 1
warp_event 15, 13, VERMILION_TRADE_HOUSE, 1
warp_event 7, 3, VERMILION_OLD_ROD_HOUSE, 1
warp_event 10, 31, FARAWAY_ISLAND_OUTSIDE, 2
warp_event 11, 31, FARAWAY_ISLAND_OUTSIDE, 1

22
data/pokemon/base_stats/missingno.asm
View file

@ -1,6 +1,6 @@
db DEX_MISSINGNO ; pokedex id
db 211, 157, 53, 31, 47
db 211, 157, 53, 29, 73
; hp atk def spd spc
db BIRD, NORMAL ; type
@ -10,21 +10,17 @@
INCBIN "gfx/pokemon/front/missingno.pic", 0, 1 ; sprite dimensions
dw MissingNoPicFront, MissingNoPicBack
db WATER_GUN, WATER_GUN, SKY_ATTACK, NO_MOVE ; level 1 learnset
db WATER_GUN, WATER_GUN, SKY_ATTACK, PAY_DAY ; level 1 learnset
db GROWTH_SLOW ; growth rate
; tm/hm learnset
tmhm MEGA_PUNCH, RAZOR_WIND, SWORDS_DANCE, WHIRLWIND, MEGA_KICK, \
TOXIC, HORN_DRILL, BODY_SLAM, TAKE_DOWN, DOUBLE_EDGE, \
BUBBLEBEAM, WATER_GUN, ICE_BEAM, BLIZZARD, HYPER_BEAM, \
PAY_DAY, SUBMISSION, COUNTER, SEISMIC_TOSS, RAGE, \
MEGA_DRAIN, SOLARBEAM, DRAGON_RAGE, THUNDERBOLT, THUNDER, \
EARTHQUAKE, FISSURE, DIG, PSYCHIC_M, TELEPORT, \
MIMIC, DOUBLE_TEAM, REFLECT, BIDE, METRONOME, \
SELFDESTRUCT, EGG_BOMB, FIRE_BLAST, SWIFT, SKULL_BASH, \
SOFTBOILED, DREAM_EATER, SKY_ATTACK, REST, THUNDER_WAVE, \
PSYWAVE, EXPLOSION, ROCK_SLIDE, TRI_ATTACK, SUBSTITUTE, \
CUT, FLY, SURF, STRENGTH, FLASH
tmhm MEGA_PUNCH, RAZOR_WIND, SWORDS_DANCE, MEGA_KICK, TOXIC, \
TAKE_DOWN, DOUBLE_EDGE, BUBBLEBEAM, WATER_GUN, ICE_BEAM, \
BLIZZARD, HYPER_BEAM, PAY_DAY, SUBMISSION, SEISMIC_TOSS, \
RAGE, THUNDERBOLT, THUNDER, EARTHQUAKE, FISSURE, \
PSYCHIC_M, TELEPORT, MIMIC, DOUBLE_TEAM, REFLECT, \
BIDE, SWIFT, SKY_ATTACK, REST, THUNDER_WAVE, \
TRI_ATTACK, SUBSTITUTE, CUT, FLY, SURF
; end
db BANK(MissingNoPicFront)

3
data/pokemon/menu_icons.asm
View file

@ -1,6 +1,5 @@
MonPartyData:
nybble_array MonPartyData
nybble ICON_MON ; MissingNo.
nybble ICON_GRASS ; Bulbasaur
nybble ICON_GRASS ; Ivysaur
nybble ICON_GRASS ; Venusaur
@ -218,4 +217,4 @@ MonPartyData:
nybble ICON_SNAKE ; Dragonite
nybble ICON_MON ; Mewtwo
nybble ICON_MON ; Mew
end_nybble_array NUM_POKEMON
end_nybble_array NUM_POKEMON - 1