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

Mostly map edits and a few other tweaks

Browse source 
Underwater Tunnel is a new area that links Route 25 to Route 10, basically just being a straight tunnel needing Surf to traverse.

Also given Seafoam Islands and Lorelei's room an unused palette that gives it a more icy feel
This commit is contained in:
MementoMartha 2022-09-17 23:42:19 +01:00
parent aba9da027c
commit e5038016b0
23 changed files with 120 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

24
data/maps/objects/CinnabarIsland.asm
View file

@ -2,21 +2,21 @@ CinnabarIsland_Object:
db $43 ; border block
def_warp_events
warp_event 6, 3, POKEMON_MANSION_1F, 2
warp_event 18, 3, CINNABAR_GYM, 1
warp_event 6, 9, CINNABAR_LAB, 1
warp_event 11, 11, CINNABAR_POKECENTER, 1
warp_event 15, 11, CINNABAR_MART, 1
warp_event 6, 15, POKEMON_MANSION_1F, 2
warp_event 20, 9, CINNABAR_GYM, 1
warp_event 6, 21, CINNABAR_LAB, 1
warp_event 15, 17, CINNABAR_POKECENTER, 1
warp_event 21, 19, CINNABAR_MART, 1
def_bg_events
bg_event 9, 5, 3 ; CinnabarIslandText3
bg_event 16, 11, 4 ; MartSignText
bg_event 12, 11, 5 ; PokeCenterSignText
bg_event 9, 11, 6 ; CinnabarIslandText6
bg_event 13, 3, 7 ; CinnabarIslandText7
bg_event 11, 15, 3 ; CinnabarIslandText3
bg_event 22, 19, 4 ; MartSignText
bg_event 16, 17, 5 ; PokeCenterSignText
bg_event 9, 23, 6 ; CinnabarIslandText6
bg_event 9, 9, 7 ; CinnabarIslandText7
def_object_events
object_event 12, 5, SPRITE_GIRL, WALK, LEFT_RIGHT, 1 ; person
object_event 14, 6, SPRITE_GAMBLER, STAY, NONE, 2 ; person
object_event 11, 18, SPRITE_GIRL, WALK, LEFT_RIGHT, 1 ; person
object_event 17, 20, SPRITE_GAMBLER, STAY, NONE, 2 ; person
def_warps_to CINNABAR_ISLAND

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

@ -6,8 +6,9 @@ DiglettsCave_Object:
warp_event 37, 31, DIGLETTS_CAVE_ROUTE_11, 3
def_bg_events
bg_event 13, 25, 2 ; DiglettsCaveText1
def_object_events
object_event 29, 13, SPRITE_MONSTER, STAY, DOWN, 1, CROCKY, 28 | OW_POKEMON
object_event 29, 12, SPRITE_MONSTER, STAY, DOWN, 1, CROCKY, 28 | OW_POKEMON
def_warps_to DIGLETTS_CAVE

28
data/maps/objects/Route10.asm
View file

@ -2,23 +2,23 @@ Route10_Object:
db $2c ; border block
def_warp_events
warp_event 11, 19, ROCK_TUNNEL_POKECENTER, 1
warp_event 8, 17, ROCK_TUNNEL_1F, 1
warp_event 8, 53, ROCK_TUNNEL_1F, 3
warp_event 6, 39, POWER_PLANT, 1
warp_event 11, 27, ROCK_TUNNEL_POKECENTER, 1
warp_event 8, 25, ROCK_TUNNEL_1F, 1
warp_event 8, 61, ROCK_TUNNEL_1F, 3
warp_event 6, 47, POWER_PLANT, 1
def_bg_events
bg_event 7, 19, 7 ; Route10Text7
bg_event 12, 19, 8 ; PokeCenterSignText
bg_event 9, 55, 9 ; Route10Text9
bg_event 5, 41, 10 ; Route10Text10
bg_event 7, 27, 7 ; Route10Text7
bg_event 12, 27, 8 ; PokeCenterSignText
bg_event 9, 63, 9 ; Route10Text9
bg_event 5, 49, 10 ; Route10Text10
def_object_events
object_event 10, 44, SPRITE_SUPER_NERD, STAY, LEFT, 1, OPP_POKEMANIAC, 1
object_event 3, 57, SPRITE_HIKER, STAY, UP, 2, OPP_HIKER, 7
object_event 14, 64, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_POKEMANIAC, 2
object_event 7, 25, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7
object_event 3, 61, SPRITE_HIKER, STAY, DOWN, 5, OPP_HIKER, 8
object_event 7, 54, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8
object_event 10, 52, SPRITE_SUPER_NERD, STAY, LEFT, 1, OPP_POKEMANIAC, 1
object_event 3, 65, SPRITE_HIKER, STAY, UP, 2, OPP_HIKER, 7
object_event 14, 72, SPRITE_SUPER_NERD, STAY, LEFT, 3, OPP_POKEMANIAC, 2
object_event 7, 33, SPRITE_COOLTRAINER_F, STAY, LEFT, 4, OPP_JR_TRAINER_F, 7
object_event 3, 69, SPRITE_HIKER, STAY, DOWN, 5, OPP_HIKER, 8
object_event 7, 62, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_JR_TRAINER_F, 8
def_warps_to ROUTE_10

28
data/maps/objects/Route20.asm
View file

@ -2,23 +2,23 @@ Route20_Object:
db $43 ; border block
def_warp_events
warp_event 48, 5, SEAFOAM_ISLANDS_1F, 1
warp_event 58, 9, SEAFOAM_ISLANDS_1F, 3
warp_event 48, 17, SEAFOAM_ISLANDS_1F, 1
warp_event 58, 21, SEAFOAM_ISLANDS_1F, 3
def_bg_events
bg_event 51, 7, 11 ; Route20Text11
bg_event 57, 11, 12 ; Route20Text12
bg_event 51, 19, 11 ; Route20Text11
bg_event 57, 23, 12 ; Route20Text12
def_object_events
object_event 87, 8, SPRITE_SWIMMER, STAY, UP, 1, OPP_SWIMMER, 9
object_event 68, 11, SPRITE_SWIMMER, STAY, UP, 2, OPP_BEAUTY, 15
object_event 45, 10, SPRITE_SWIMMER, STAY, DOWN, 3, OPP_BEAUTY, 6
object_event 55, 14, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24
object_event 38, 13, SPRITE_SWIMMER, STAY, DOWN, 5, OPP_SWIMMER, 10
object_event 87, 13, SPRITE_SWIMMER, STAY, UP, 6, OPP_SWIMMER, 11
object_event 34, 9, SPRITE_COOLTRAINER_M, STAY, UP, 7, OPP_BIRD_KEEPER, 11
object_event 25, 7, SPRITE_SWIMMER, STAY, UP, 8, OPP_BEAUTY, 7
object_event 24, 12, SPRITE_SWIMMER, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16
object_event 15, 8, SPRITE_SWIMMER, STAY, UP, 10, OPP_BEAUTY, 8
object_event 87, 20, SPRITE_SWIMMER, STAY, UP, 1, OPP_SWIMMER, 9
object_event 68, 23, SPRITE_SWIMMER, STAY, UP, 2, OPP_BEAUTY, 15
object_event 45, 22, SPRITE_SWIMMER, STAY, DOWN, 3, OPP_BEAUTY, 6
object_event 55, 26, SPRITE_SWIMMER, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 24
object_event 38, 25, SPRITE_SWIMMER, STAY, DOWN, 5, OPP_SWIMMER, 10
object_event 87, 25, SPRITE_SWIMMER, STAY, UP, 6, OPP_SWIMMER, 11
object_event 34, 21, SPRITE_COOLTRAINER_M, STAY, UP, 7, OPP_BIRD_KEEPER, 11
object_event 25, 19, SPRITE_SWIMMER, STAY, UP, 8, OPP_BEAUTY, 7
object_event 24, 24, SPRITE_SWIMMER, STAY, DOWN, 9, OPP_JR_TRAINER_F, 16
object_event 15, 20, SPRITE_SWIMMER, STAY, UP, 10, OPP_BEAUTY, 8
def_warps_to ROUTE_20

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

@ -2,10 +2,10 @@ Route25_Object:
db $2c ; border block
def_warp_events
warp_event 45, 3, BILLS_HOUSE, 1
warp_event 49, 11, BILLS_HOUSE, 1
def_bg_events
bg_event 43, 3, 11 ; Route25Text11
bg_event 53, 11, 11 ; Route25Text11
def_object_events
object_event 14, 2, SPRITE_YOUNGSTER, STAY, DOWN, 1, OPP_YOUNGSTER, 5
@ -13,7 +13,7 @@ Route25_Object:
object_event 24, 4, SPRITE_COOLTRAINER_M, STAY, DOWN, 3, OPP_JR_TRAINER_M, 2
object_event 18, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_LASS, 9
object_event 32, 3, SPRITE_YOUNGSTER, STAY, LEFT, 5, OPP_YOUNGSTER, 7
object_event 37, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_LASS, 10
object_event 36, 4, SPRITE_COOLTRAINER_F, STAY, DOWN, 6, OPP_LASS, 10
object_event 8, 4, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 2
object_event 23, 9, SPRITE_HIKER, STAY, UP, 8, OPP_HIKER, 3
object_event 13, 7, SPRITE_HIKER, STAY, RIGHT, 9, OPP_HIKER, 4

22
data/maps/objects/Route9.asm
View file

@ -4,18 +4,18 @@ Route9_Object:
def_warp_events
def_bg_events
bg_event 25, 7, 11 ; Route9Text11
bg_event 25, 15, 11 ; Route9Text11
def_object_events
object_event 13, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5
object_event 24, 7, SPRITE_COOLTRAINER_M, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7
object_event 31, 7, SPRITE_COOLTRAINER_M, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8
object_event 48, 8, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6
object_event 16, 15, SPRITE_HIKER, STAY, LEFT, 5, OPP_HIKER, 11
object_event 43, 3, SPRITE_HIKER, STAY, LEFT, 6, OPP_HIKER, 6
object_event 22, 2, SPRITE_YOUNGSTER, STAY, DOWN, 7, OPP_BUG_CATCHER, 13
object_event 45, 15, SPRITE_HIKER, STAY, RIGHT, 8, OPP_HIKER, 5
object_event 40, 8, SPRITE_YOUNGSTER, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14
object_event 10, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_TELEPORT
object_event 13, 18, SPRITE_COOLTRAINER_F, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5
object_event 24, 15, SPRITE_COOLTRAINER_M, STAY, LEFT, 2, OPP_JR_TRAINER_M, 7
object_event 31, 15, SPRITE_COOLTRAINER_M, STAY, RIGHT, 3, OPP_JR_TRAINER_M, 8
object_event 48, 16, SPRITE_COOLTRAINER_F, STAY, RIGHT, 4, OPP_JR_TRAINER_F, 6
object_event 16, 23, SPRITE_HIKER, STAY, LEFT, 5, OPP_HIKER, 11
object_event 43, 11, SPRITE_HIKER, STAY, LEFT, 6, OPP_HIKER, 6
object_event 22, 10, SPRITE_YOUNGSTER, STAY, DOWN, 7, OPP_BUG_CATCHER, 13
object_event 45, 23, SPRITE_HIKER, STAY, RIGHT, 8, OPP_HIKER, 5
object_event 40, 16, SPRITE_YOUNGSTER, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14
object_event 10, 23, SPRITE_POKE_BALL, STAY, NONE, 10, TM_TELEPORT
def_warps_to ROUTE_9