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

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

12
constants/map_constants.asm
View file

@ -24,7 +24,7 @@ ENDM
mapconst VERMILION_CITY, 18, 20 ; $05 mapconst VERMILION_CITY, 18, 20 ; $05
mapconst CELADON_CITY, 18, 25 ; $06 mapconst CELADON_CITY, 18, 25 ; $06
mapconst FUCHSIA_CITY, 18, 20 ; $07 mapconst FUCHSIA_CITY, 18, 20 ; $07
mapconst CINNABAR_ISLAND, 9, 10 ; $08 mapconst CINNABAR_ISLAND, 15, 14 ; $08
mapconst INDIGO_PLATEAU, 9, 10 ; $09 mapconst INDIGO_PLATEAU, 9, 10 ; $09
mapconst SAFFRON_CITY, 18, 20 ; $0A mapconst SAFFRON_CITY, 18, 20 ; $0A
DEF NUM_CITY_MAPS EQU const_value DEF NUM_CITY_MAPS EQU const_value
@ -38,8 +38,8 @@ DEF FIRST_ROUTE_MAP EQU const_value
mapconst ROUTE_6, 18, 10 ; $11 mapconst ROUTE_6, 18, 10 ; $11
mapconst ROUTE_7, 9, 10 ; $12 mapconst ROUTE_7, 9, 10 ; $12
mapconst ROUTE_8, 9, 30 ; $13 mapconst ROUTE_8, 9, 30 ; $13
mapconst ROUTE_9, 9, 30 ; $14 mapconst ROUTE_9, 13, 30 ; $14
mapconst ROUTE_10, 36, 10 ; $15 mapconst ROUTE_10, 40, 10 ; $15
mapconst ROUTE_11, 9, 30 ; $16 mapconst ROUTE_11, 9, 30 ; $16
mapconst ROUTE_12, 54, 10 ; $17 mapconst ROUTE_12, 54, 10 ; $17
mapconst ROUTE_13, 9, 30 ; $18 mapconst ROUTE_13, 9, 30 ; $18
@ -48,13 +48,13 @@ DEF FIRST_ROUTE_MAP EQU const_value
mapconst ROUTE_16, 9, 20 ; $1B mapconst ROUTE_16, 9, 20 ; $1B
mapconst ROUTE_17, 72, 10 ; $1C mapconst ROUTE_17, 72, 10 ; $1C
mapconst ROUTE_18, 9, 25 ; $1D mapconst ROUTE_18, 9, 25 ; $1D
mapconst ROUTE_19, 27, 10 ; $1E mapconst ROUTE_19, 33, 10 ; $1E
mapconst ROUTE_20, 9, 50 ; $1F mapconst ROUTE_20, 15, 50 ; $1F
mapconst ROUTE_21, 45, 10 ; $20 mapconst ROUTE_21, 45, 10 ; $20
mapconst ROUTE_22, 9, 20 ; $21 mapconst ROUTE_22, 9, 20 ; $21
mapconst ROUTE_23, 72, 10 ; $22 mapconst ROUTE_23, 72, 10 ; $22
mapconst ROUTE_24, 18, 10 ; $23 mapconst ROUTE_24, 18, 10 ; $23
mapconst ROUTE_25, 9, 30 ; $24 mapconst ROUTE_25, 9, 37 ; $24
DEF FIRST_INDOOR_MAP EQU const_value DEF FIRST_INDOOR_MAP EQU const_value
mapconst REDS_HOUSE_1F, 4, 4 ; $25 mapconst REDS_HOUSE_1F, 4, 4 ; $25
mapconst REDS_HOUSE_2F, 4, 4 ; $26 mapconst REDS_HOUSE_2F, 4, 4 ; $26

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

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

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

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

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

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

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

@ -2,10 +2,10 @@ Route25_Object:
db $2c ; border block db $2c ; border block
def_warp_events def_warp_events
warp_event 45, 3, BILLS_HOUSE, 1 warp_event 49, 11, BILLS_HOUSE, 1
def_bg_events def_bg_events
bg_event 43, 3, 11 ; Route25Text11 bg_event 53, 11, 11 ; Route25Text11
def_object_events def_object_events
object_event 14, 2, SPRITE_YOUNGSTER, STAY, DOWN, 1, OPP_YOUNGSTER, 5 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 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 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 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 8, 4, SPRITE_HIKER, STAY, RIGHT, 7, OPP_HIKER, 2
object_event 23, 9, SPRITE_HIKER, STAY, UP, 8, OPP_HIKER, 3 object_event 23, 9, SPRITE_HIKER, STAY, UP, 8, OPP_HIKER, 3
object_event 13, 7, SPRITE_HIKER, STAY, RIGHT, 9, OPP_HIKER, 4 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_warp_events
def_bg_events def_bg_events
bg_event 25, 7, 11 ; Route9Text11 bg_event 25, 15, 11 ; Route9Text11
def_object_events def_object_events
object_event 13, 10, SPRITE_COOLTRAINER_F, STAY, LEFT, 1, OPP_JR_TRAINER_F, 5 object_event 13, 18, 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 24, 15, 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 31, 15, 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 48, 16, 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 16, 23, SPRITE_HIKER, STAY, LEFT, 5, OPP_HIKER, 11
object_event 43, 3, SPRITE_HIKER, STAY, LEFT, 6, OPP_HIKER, 6 object_event 43, 11, SPRITE_HIKER, STAY, LEFT, 6, OPP_HIKER, 6
object_event 22, 2, SPRITE_YOUNGSTER, STAY, DOWN, 7, OPP_BUG_CATCHER, 13 object_event 22, 10, SPRITE_YOUNGSTER, STAY, DOWN, 7, OPP_BUG_CATCHER, 13
object_event 45, 15, SPRITE_HIKER, STAY, RIGHT, 8, OPP_HIKER, 5 object_event 45, 23, SPRITE_HIKER, STAY, RIGHT, 8, OPP_HIKER, 5
object_event 40, 8, SPRITE_YOUNGSTER, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14 object_event 40, 16, SPRITE_YOUNGSTER, STAY, RIGHT, 9, OPP_BUG_CATCHER, 14
object_event 10, 15, SPRITE_POKE_BALL, STAY, NONE, 10, TM_TELEPORT object_event 10, 23, SPRITE_POKE_BALL, STAY, NONE, 10, TM_TELEPORT
def_warps_to ROUTE_9 def_warps_to ROUTE_9

2
data/maps/special_warps.asm
View file

@ -84,7 +84,7 @@ FlyWarpDataPtr:
.VermilionCity: fly_warp VERMILION_CITY, 11, 4 .VermilionCity: fly_warp VERMILION_CITY, 11, 4
.CeladonCity: fly_warp CELADON_CITY, 41, 10 .CeladonCity: fly_warp CELADON_CITY, 41, 10
.FuchsiaCity: fly_warp FUCHSIA_CITY, 19, 28 .FuchsiaCity: fly_warp FUCHSIA_CITY, 19, 28
.CinnabarIsland: fly_warp CINNABAR_ISLAND, 11, 12 .CinnabarIsland: fly_warp CINNABAR_ISLAND, 15, 18
.IndigoPlateau: fly_warp INDIGO_PLATEAU, 9, 6 .IndigoPlateau: fly_warp INDIGO_PLATEAU, 9, 6
.SaffronCity: fly_warp SAFFRON_CITY, 9, 30 .SaffronCity: fly_warp SAFFRON_CITY, 9, 30
.Route4: fly_warp ROUTE_4, 11, 6 .Route4: fly_warp ROUTE_4, 11, 6

16
engine/gfx/palettes.asm
View file

@ -149,8 +149,6 @@ SetPal_Overworld:
jr c, .townOrRoute jr c, .townOrRoute
cp CERULEAN_CAVE_2F cp CERULEAN_CAVE_2F
jr c, .normalDungeonOrBuilding jr c, .normalDungeonOrBuilding
cp CERULEAN_CAVE_1F + 1
jr c, .caveOrBruno
cp LORELEIS_ROOM cp LORELEIS_ROOM
jr z, .Lorelei jr z, .Lorelei
cp BRUNOS_ROOM cp BRUNOS_ROOM
@ -173,11 +171,25 @@ SetPal_Overworld:
ld a, PAL_GREYMON - 1 ld a, PAL_GREYMON - 1
jr .town jr .town
.caveOrBruno .caveOrBruno
ld a, [wCurMap]
cp SEAFOAM_ISLANDS_1F
jr z, .seafoam
cp SEAFOAM_ISLANDS_B1F
jr c, .caveDefault
cp SEAFOAM_ISLANDS_B4F + 1
jr c, .seafoam
.caveDefault
ld a, PAL_CAVE - 1 ld a, PAL_CAVE - 1
jr .town jr .town
.Lorelei .Lorelei
jr c, .gbcLorelei
jr .seafoam
.gbcLorelei
xor a xor a
jr .town jr .town
.seafoam
ld a, PAL_0F - 1
jr .town
; used when a Pokemon is the only thing on the screen ; used when a Pokemon is the only thing on the screen
; such as evolution, trading and the Hall of Fame ; such as evolution, trading and the Hall of Fame

BIN
gfx/pokemon/back/articunob.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 203 B

After

Width:  |  Height:  |  Size: 1.5 KiB

2
maps/CinnabarIsland.blk
View file

@ -1 +1 @@
d !{{ d7:~{yd{{y{{{{{d !{{{{{d7:~ ! !{d{{y|r|s{-{{{{{{{C-kkkkkkkkk CCCCCC>???;CCCCTCC>$*,+%;CCCTC>+W$W%W*;d{{{$%+ *()d{{y$*)($%d{{{{$p/$*)d !{{{{{{{$%d7:~y{ !{{{{ed{{{{{|r{ !{ed !{{{{{|s{ed7:~{{{{{{{{ed{{y{0{0{{e-{{{{{{{{{{eC-.kkkkkkkkkkkkk

2
maps/DiglettsCave.blk
View file

@ -1 +1 @@
,++,8+>,+vvvvv+nnL8+)ztrs*TUUUUU2ss8+~[kkk[o>~[[[[o ,++,8+>,+vvvvvvv+vvnnv)vL8+ztrs*TUUUUU2ss8+~[kkk[o>~[[[[o

2
maps/Route10.blk
View file

@ -1,4 +1,4 @@
WWWWWWWWW*CCCCCCCCC(aaaaaaae( ,,,,,,,,,,,+W*,,,,,,)(,,,,,,)(,,,,,W%CC$WWWW*CCCCCCCCC(aaaaaaae(
Me( Me(
Me(;/Oe() Me(;/Oe()

2
maps/Route19.blk
View file

@ -1 +1 @@
(,)(,)(,)$W%$W%CCC11111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk (,)(,)(,)$W%$W%CCC11111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk

2
maps/Route20.blk
View file

@ -1 +1 @@
kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkeCCCCCCCCCCCCCCCCCCCCd>?;zzzzzeCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCCCCCCd$%zzzzzeCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCCCCCCdzTzz>?;eCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCTTCCCdzTzzz$%eCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCxxCCC-CjTzCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCCCCCCkkkkkCCCCCCCCCCCCCCCCCCC.CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkCCCCCCCCCCCCCCCCCCCCCd>?;zzzzzeCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCd$%zzzzzeCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCdzTzz>?;eCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCTTCCCdzTzzz$%eCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCxxCCC-CjTzCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkzTzCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk

2
maps/Route21.blk
View file

@ -7,4 +7,4 @@ tMed N
tMed N tMed N
tMe-gROeCCCCCCg.CCCCkkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCTTCCCCCCxxCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCTTCCCCCCxxCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkCCCCCCCCCCCCTCCC tMe-gROeCCCCCCg.CCCCkkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCTTCCCCCCxxCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCTTCCCCCCxxCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkCCCCCCCCCCCCCCCC

22
maps/Route25.blk
View file

@ -1,29 +1,23 @@
,,,,+WWWWWWWWWWWWWWWWWW%QQ$WW%WWWW%n ,,,,+WWWWWWWWWWWWWWWWWW%QQ$WWWWWWWW%WWWW%n
n n
n n
`ttt `ttt
l6CCCd eCC 6CCCCd eCd11eCCCC
LLL LLL
nlnttnt nlnttnt
nCCCCduveC-.CCCCLlL
nCCCduveCCLlL
mln mln
ttottt ttottt
TTCCdhieCCCCCCCCC11111ml
6CCdhieCC11111ml
mL mL
ttmtt ttmtt
nxTCC-hi.CCCCCCCCCQQQQQQQQQQQQQQQQQ
nCTTd
|~eCCd1eCCC??????????????????;CxTT
l6-hi.CCQQQQQQQQQQQQQQQQQ
oooL
l|~eC??????????????????;m
tt tt
eC,,,,,,,,,,,,,,,,,,)C-.C,,,,,,,,,,,,,,,,,,)kkkkkkkkkk eCC-.CCC,,,,,,,,,,,,,,,,,,)CCxx.CCCCCCCC,,,,,,,,,,,,,,,,,,,??????????????????

2
maps/Route9.blk
View file

@ -1,4 +1,4 @@
$WWWWWWWWWWWWWWWW*+WWWWWWW*,,+ttM (,,,,,,,,,,,,,,,,,,,,,,,,,,,,,(,,,,,,,,,,,,,,,,,,,,,,,,,,,,,(,,,,,,,,,,,,,,,,,,,,,,,,,,,,,(,,,,,,,,,,,,,,,,,,,,,,,,,,,,,$WWWWWWWWWWWWWWWW*+WWWWWWW*,,+ttM

1
maps/UnderwaterTunnel.blk Normal file
View file

@ -0,0 +1 @@
,+'vvvvvvvv( !!!!!"

5
scripts/DiglettsCave.asm
View file

@ -14,6 +14,7 @@ DiglettsCave_ScriptPointers:
DiglettsCave_TextPointers: DiglettsCave_TextPointers:
dw CrockyText dw CrockyText
dw DiglettsCaveText1
DiglettsCaveTrainerHeaders: DiglettsCaveTrainerHeaders:
def_trainers def_trainers
@ -34,3 +35,7 @@ CrockyBattleText:
call PlayCry call PlayCry
call WaitForSoundToFinish call WaitForSoundToFinish
jp TextScriptEnd jp TextScriptEnd
DiglettsCaveText1:
text_far _DiglettsCaveText1
text_end

15
scripts/GameCorner.asm
View file

@ -152,7 +152,7 @@ CeladonGameCornerText2:
xor a xor a
ldh [hMoney], a ldh [hMoney], a
ldh [hMoney + 2], a ldh [hMoney + 2], a
ld a, $10 ld a, $80
ldh [hMoney + 1], a ldh [hMoney + 1], a
call HasEnoughMoney call HasEnoughMoney
jr nc, .asm_48cdb jr nc, .asm_48cdb
@ -162,7 +162,7 @@ CeladonGameCornerText2:
xor a xor a
ldh [hMoney], a ldh [hMoney], a
ldh [hMoney + 2], a ldh [hMoney + 2], a
ld a, $10 ld a, $80
ldh [hMoney + 1], a ldh [hMoney + 1], a
ld hl, hMoney + 2 ld hl, hMoney + 2
ld de, wPlayerMoney + 2 ld de, wPlayerMoney + 2
@ -170,12 +170,13 @@ CeladonGameCornerText2:
predef SubBCDPredef predef SubBCDPredef
xor a xor a
ldh [hUnusedCoinsByte], a ldh [hUnusedCoinsByte], a
ldh [hCoins], a
ld a, $50
ldh [hCoins + 1], a ldh [hCoins + 1], a
ld de, wPlayerCoins + 1 ldh [hCoins + 2], a
ld hl, hCoins + 1 ld a, $05
ld c, $2 ldh [hCoins], a
ld de, wPlayerCoins + 2
ld hl, hCoins + 2
ld c, $3
predef AddBCDPredef predef AddBCDPredef
call CeladonGameCornerScript_48f1e call CeladonGameCornerScript_48f1e
ld hl, CeladonGameCornerText_48d27 ld hl, CeladonGameCornerText_48d27

10
text/DiglettsCave.asm
View file

@ -1,3 +1,13 @@
_DiglettsCaveText1::
text "DANGER!"
line "A hostile CROCKY"
cont "is nesting here!"
para "Looks like the"
line "sign has many"
cont "bite marks."
done
_CrockyBattleText:: _CrockyBattleText::
text "Graogh!@" text "Graogh!@"
text_end text_end

8
text/GameCorner.asm
View file

@ -14,14 +14,14 @@ _CeladonGameCornerText_48d22::
para "Do you need some" para "Do you need some"
line "game coins?" line "game coins?"
para "It's ¥1000 for 50" para "It's ¥8000 for"
line "coins. Would you" line "500 coins. Would"
cont "like some?" cont "you like some?"
done done
_CeladonGameCornerText_48d27:: _CeladonGameCornerText_48d27::
text "Thanks! Here are" text "Thanks! Here are"
line "your 50 coins!" line "your 500 coins!"
done done
_CeladonGameCornerText_48d2c:: _CeladonGameCornerText_48d2c::