From e5038016b0325c961e64d5d615bb92aa391bac7f Mon Sep 17 00:00:00 2001 From: MementoMartha Date: Sat, 17 Sep 2022 23:42:19 +0100 Subject: [PATCH] Mostly map edits and a few other tweaks 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 --- constants/map_constants.asm | 12 ++++++------ data/maps/objects/CinnabarIsland.asm | 24 +++++++++++------------ data/maps/objects/DiglettsCave.asm | 3 ++- data/maps/objects/Route10.asm | 28 +++++++++++++-------------- data/maps/objects/Route20.asm | 28 +++++++++++++-------------- data/maps/objects/Route25.asm | 6 +++--- data/maps/objects/Route9.asm | 22 ++++++++++----------- data/maps/special_warps.asm | 2 +- engine/gfx/palettes.asm | 16 +++++++++++++-- gfx/pokemon/back/articunob.png | Bin 203 -> 1546 bytes maps/CinnabarIsland.blk | 2 +- maps/DiglettsCave.blk | 2 +- maps/Route10.blk | 2 +- maps/Route19.blk | 2 +- maps/Route20.blk | 2 +- maps/Route21.blk | 2 +- maps/Route25.blk | 22 ++++++++------------- maps/Route9.blk | 2 +- maps/UnderwaterTunnel.blk | 1 + scripts/DiglettsCave.asm | 5 +++++ scripts/GameCorner.asm | 15 +++++++------- text/DiglettsCave.asm | 10 ++++++++++ text/GameCorner.asm | 8 ++++---- 23 files changed, 120 insertions(+), 96 deletions(-) create mode 100644 maps/UnderwaterTunnel.blk diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 48b25461..1c967d8b 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -24,7 +24,7 @@ ENDM mapconst VERMILION_CITY, 18, 20 ; $05 mapconst CELADON_CITY, 18, 25 ; $06 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 SAFFRON_CITY, 18, 20 ; $0A 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_7, 9, 10 ; $12 mapconst ROUTE_8, 9, 30 ; $13 - mapconst ROUTE_9, 9, 30 ; $14 - mapconst ROUTE_10, 36, 10 ; $15 + mapconst ROUTE_9, 13, 30 ; $14 + mapconst ROUTE_10, 40, 10 ; $15 mapconst ROUTE_11, 9, 30 ; $16 mapconst ROUTE_12, 54, 10 ; $17 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_17, 72, 10 ; $1C mapconst ROUTE_18, 9, 25 ; $1D - mapconst ROUTE_19, 27, 10 ; $1E - mapconst ROUTE_20, 9, 50 ; $1F + mapconst ROUTE_19, 33, 10 ; $1E + mapconst ROUTE_20, 15, 50 ; $1F mapconst ROUTE_21, 45, 10 ; $20 mapconst ROUTE_22, 9, 20 ; $21 mapconst ROUTE_23, 72, 10 ; $22 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 mapconst REDS_HOUSE_1F, 4, 4 ; $25 mapconst REDS_HOUSE_2F, 4, 4 ; $26 diff --git a/data/maps/objects/CinnabarIsland.asm b/data/maps/objects/CinnabarIsland.asm index f3ca64fb..bbb598b4 100644 --- a/data/maps/objects/CinnabarIsland.asm +++ b/data/maps/objects/CinnabarIsland.asm @@ -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 diff --git a/data/maps/objects/DiglettsCave.asm b/data/maps/objects/DiglettsCave.asm index a05df414..3e599928 100644 --- a/data/maps/objects/DiglettsCave.asm +++ b/data/maps/objects/DiglettsCave.asm @@ -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 diff --git a/data/maps/objects/Route10.asm b/data/maps/objects/Route10.asm index 01eae9cf..26f8a7c7 100644 --- a/data/maps/objects/Route10.asm +++ b/data/maps/objects/Route10.asm @@ -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 diff --git a/data/maps/objects/Route20.asm b/data/maps/objects/Route20.asm index bd9697c2..39fe6545 100644 --- a/data/maps/objects/Route20.asm +++ b/data/maps/objects/Route20.asm @@ -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 diff --git a/data/maps/objects/Route25.asm b/data/maps/objects/Route25.asm index f0814b23..7ebf7313 100644 --- a/data/maps/objects/Route25.asm +++ b/data/maps/objects/Route25.asm @@ -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 diff --git a/data/maps/objects/Route9.asm b/data/maps/objects/Route9.asm index a9be69be..7658d3fe 100644 --- a/data/maps/objects/Route9.asm +++ b/data/maps/objects/Route9.asm @@ -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 diff --git a/data/maps/special_warps.asm b/data/maps/special_warps.asm index cad320ed..f978e9b5 100644 --- a/data/maps/special_warps.asm +++ b/data/maps/special_warps.asm @@ -84,7 +84,7 @@ FlyWarpDataPtr: .VermilionCity: fly_warp VERMILION_CITY, 11, 4 .CeladonCity: fly_warp CELADON_CITY, 41, 10 .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 .SaffronCity: fly_warp SAFFRON_CITY, 9, 30 .Route4: fly_warp ROUTE_4, 11, 6 diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm index d97fbc55..31af685d 100644 --- a/engine/gfx/palettes.asm +++ b/engine/gfx/palettes.asm @@ -149,8 +149,6 @@ SetPal_Overworld: jr c, .townOrRoute cp CERULEAN_CAVE_2F jr c, .normalDungeonOrBuilding - cp CERULEAN_CAVE_1F + 1 - jr c, .caveOrBruno cp LORELEIS_ROOM jr z, .Lorelei cp BRUNOS_ROOM @@ -173,11 +171,25 @@ SetPal_Overworld: ld a, PAL_GREYMON - 1 jr .town .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 jr .town .Lorelei + jr c, .gbcLorelei + jr .seafoam +.gbcLorelei xor a jr .town +.seafoam + ld a, PAL_0F - 1 + jr .town ; used when a Pokemon is the only thing on the screen ; such as evolution, trading and the Hall of Fame diff --git a/gfx/pokemon/back/articunob.png b/gfx/pokemon/back/articunob.png index b452945376e7ff66141b0fa353604c676ffbf5bc..b13e6827d74762b1a969454de56a2b7b2db2d5bd 100644 GIT binary patch literal 1546 zcmbVMU5MO79M6fi*N;L+hK03SvRwUJh(UsShGf_9I-ST5Mo4U%&bP z{@-s@rVo#8-?Lp1gt2nTnBg;s$0+{^&+i(a;M2CCbR-gl9rwp$M0o#$hXmoCF{fH% zHS-x{Q7?sUS|_QF7sRiG0|z?+wiXBjb<%YFg80j)7ewIL1#vE8LNh3mmQz{^$?Vc} z)mmDxbXz?5BskDPT!2Ry1|84!Bh)E~J-LXl<6~I_JqTMUh?6lPsF@W|q#*&BR93Q- zvASM{Zj(afwHK7ICbSV1pKAG-}a*5uIG$M8I8ZnhD1(b@9A} zB4Sg=xfuh8+!7sCy8)4BNJJMyi%cEoYVM1z2~aU4n9;CGsXGi*WvDVJ7Qw`v49rMDR3Y~?OiQX(g%D-(NXhXng0K%YsqHkno1s}r$yIrHRSl)}o1i>lY|QX& z!M24OH1sex*YR+Z$bsJ!LE=PIq%I9PG1pGnd|oaVD_-gy7AYGAk$WZOI5yJi*w%Gimo%t0BrTnW64toIbuF7wEh|s*dCt)b6*8!`7{`A2 z-u|EOpA8*ed)U2WIdMhCNrOsG#KYMg)XXe7Hdwh1=;aB*R-FF@(TW34Y;kbx+_4Ax zV%sgkh5koM^kETgur?0KWRrXAHVG$l)#bQO`&P*RG_ZHKsiuc;-YDW_(xLb!>2bv8 zjVq_wep_x@=5V^OwI^nY{N^xbyDymA`&o4qpjQmbOiuKlft2yOo^Z^6Ry0 zj|&~)Gjiy`75AO*KHu2&{Yd&)=1ccfdG&_})}C9-J@t|pjBlxwcfWc0+zz;(M)}c~ zzoGhXkDPsbNg(g8+1I;Yt$y;;!=sscZL9wE>e1yt<|jTn^@LE``1srRHjW;dyZGUa y*Vo^=^5~@(W-r`zI`ez`YE6?)-1p~=AD2h2@1>3T^%HyJZe5<5HqJaffAVkHWAXz4 delta 187 zcmV;s07UW6i@&6O}p^Wo~!HkdpKMO+4`Tv6l!pQ&C zXAibr`V|+1acsp02;<{Qh=KqAr20b`2Yxy5gBdpe`WJ(>e>DDQzXHVgy!gj|FymAI p=U-sPss7KaR>1uAhk%!%005lm-^6}Z|L6b!002ovPDHLkV1jCxUJn2O diff --git a/maps/CinnabarIsland.blk b/maps/CinnabarIsland.blk index 1a7922c9..09001b68 100644 --- a/maps/CinnabarIsland.blk +++ b/maps/CinnabarIsland.blk @@ -1 +1 @@ -d !{{ d7:~{yd{{y{{{{{d !{{{{{d7:~ ! !{d{{y|r|s{-{{{{{{{C-kkkkkkkkk \ No newline at end of file +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 \ No newline at end of file diff --git a/maps/DiglettsCave.blk b/maps/DiglettsCave.blk index b40a279e..23df97a0 100644 --- a/maps/DiglettsCave.blk +++ b/maps/DiglettsCave.blk @@ -1 +1 @@ -,++,8+>,+vvvvv+nnL8+)ztrs*TUUUUU2ss8+~[kkk[o>~[[[[o \ No newline at end of file +,++,8+>,+vvvvvvv+vvnnv)vL8+ztrs*TUUUUU2ss8+~[kkk[o>~[[[[o \ No newline at end of file diff --git a/maps/Route10.blk b/maps/Route10.blk index aed525c5..e8c20fe7 100644 --- a/maps/Route10.blk +++ b/maps/Route10.blk @@ -1,4 +1,4 @@ -WWWWWWWWW*CCCCCCCCC(aaaaaaae( +,,,,,,,,,,,+W*,,,,,,)(,,,,,,)(,,,,,W%CC$WWWW*CCCCCCCCC(aaaaaaae( Me( Me(;/Oe() diff --git a/maps/Route19.blk b/maps/Route19.blk index 0bd469e7..981b46ef 100644 --- a/maps/Route19.blk +++ b/maps/Route19.blk @@ -1 +1 @@ -(,)(,)(,)$W%$W%CCC11111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk \ No newline at end of file +(,)(,)(,)$W%$W%CCC11111CCk1111kkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkk \ No newline at end of file diff --git a/maps/Route20.blk b/maps/Route20.blk index aae6a458..230daaf5 100644 --- a/maps/Route20.blk +++ b/maps/Route20.blk @@ -1 +1 @@ -kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkeCCCCCCCCCCCCCCCCCCCCd>?;zzzzzeCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCCCCCCd$%zzzzzeCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCCCCCCdzTzz>?;eCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCTTCCCdzTzzz$%eCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCxxCCC-CjTzCCCCCCCCCCCCCCCCCCeCCCCCCCCCCCCCCCCCCCCkkkkkCCCCCCCCCCCCCCCCCCC.CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk \ No newline at end of file +CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkCCCCCCCCCCCCCCCCCCCCCd>?;zzzzzeCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCd$%zzzzzeCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCdzTzz>?;eCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCTTCCCdzTzzz$%eCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCxxCCC-CjTzCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkzTzCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk \ No newline at end of file diff --git a/maps/Route21.blk b/maps/Route21.blk index fa1f5b79..f4ae264e 100644 --- a/maps/Route21.blk +++ b/maps/Route21.blk @@ -7,4 +7,4 @@ tMed N tMed N -tMe-gROeCCCCCCg.CCCCkkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCTTCCCCCCxxCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCTTCCCCCCxxCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkCCCCCCCCCCCCTCCC \ No newline at end of file +tMe-gROeCCCCCCg.CCCCkkCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCTTCCCCCCxxCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCTTCCCCCCxxCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCkCCCCCCCCCCCCCCCC \ No newline at end of file diff --git a/maps/Route25.blk b/maps/Route25.blk index a928a9f8..baa5f565 100644 --- a/maps/Route25.blk +++ b/maps/Route25.blk @@ -1,29 +1,23 @@ -,,,,+WWWWWWWWWWWWWWWWWW%QQ$WW%WWWW%n +,,,,+WWWWWWWWWWWWWWWWWW%QQ$WWWWWWWW%WWWW%n n n `ttt -l6CCCd eCC +6CCCCd eCd11eCCCC LLL nlnttnt - -nCCCduveCCLlL +nCCCCduveC-.CCCCLlL mln ttottt - -6CCdhieCC11111ml +TTCCdhieCCCCCCCCC11111ml mL ttmtt - - - -l6-hi.CCQQQQQQQQQQQQQQQQQ -oooL -l|~eC??????????????????;m - +nxTCC-hi.CCCCCCCCCQQQQQQQQQQQQQQQQQ +nCTTd +|~eCCd1eCCC??????????????????;CxTT tt -eC,,,,,,,,,,,,,,,,,,)C-.C,,,,,,,,,,,,,,,,,,)kkkkkkkkkk \ No newline at end of file +eCC-.CCC,,,,,,,,,,,,,,,,,,)CCxx.CCCCCCCC,,,,,,,,,,,,,,,,,,,?????????????????? \ No newline at end of file diff --git a/maps/Route9.blk b/maps/Route9.blk index e1ebe7cb..f9d44ded 100644 --- a/maps/Route9.blk +++ b/maps/Route9.blk @@ -1,4 +1,4 @@ -$WWWWWWWWWWWWWWWW*+WWWWWWW*,,+ttM +(,,,,,,,,,,,,,,,,,,,,,,,,,,,,,(,,,,,,,,,,,,,,,,,,,,,,,,,,,,,(,,,,,,,,,,,,,,,,,,,,,,,,,,,,,(,,,,,,,,,,,,,,,,,,,,,,,,,,,,,$WWWWWWWWWWWWWWWW*+WWWWWWW*,,+ttM diff --git a/maps/UnderwaterTunnel.blk b/maps/UnderwaterTunnel.blk new file mode 100644 index 00000000..03d5dc7e --- /dev/null +++ b/maps/UnderwaterTunnel.blk @@ -0,0 +1 @@ +,+'vvvvvvvv( !!!!!" \ No newline at end of file diff --git a/scripts/DiglettsCave.asm b/scripts/DiglettsCave.asm index 045eb1d1..73e9a150 100644 --- a/scripts/DiglettsCave.asm +++ b/scripts/DiglettsCave.asm @@ -14,6 +14,7 @@ DiglettsCave_ScriptPointers: DiglettsCave_TextPointers: dw CrockyText + dw DiglettsCaveText1 DiglettsCaveTrainerHeaders: def_trainers @@ -34,3 +35,7 @@ CrockyBattleText: call PlayCry call WaitForSoundToFinish jp TextScriptEnd + +DiglettsCaveText1: + text_far _DiglettsCaveText1 + text_end diff --git a/scripts/GameCorner.asm b/scripts/GameCorner.asm index 47de3d9c..339b1ad9 100644 --- a/scripts/GameCorner.asm +++ b/scripts/GameCorner.asm @@ -152,7 +152,7 @@ CeladonGameCornerText2: xor a ldh [hMoney], a ldh [hMoney + 2], a - ld a, $10 + ld a, $80 ldh [hMoney + 1], a call HasEnoughMoney jr nc, .asm_48cdb @@ -162,7 +162,7 @@ CeladonGameCornerText2: xor a ldh [hMoney], a ldh [hMoney + 2], a - ld a, $10 + ld a, $80 ldh [hMoney + 1], a ld hl, hMoney + 2 ld de, wPlayerMoney + 2 @@ -170,12 +170,13 @@ CeladonGameCornerText2: predef SubBCDPredef xor a ldh [hUnusedCoinsByte], a - ldh [hCoins], a - ld a, $50 ldh [hCoins + 1], a - ld de, wPlayerCoins + 1 - ld hl, hCoins + 1 - ld c, $2 + ldh [hCoins + 2], a + ld a, $05 + ldh [hCoins], a + ld de, wPlayerCoins + 2 + ld hl, hCoins + 2 + ld c, $3 predef AddBCDPredef call CeladonGameCornerScript_48f1e ld hl, CeladonGameCornerText_48d27 diff --git a/text/DiglettsCave.asm b/text/DiglettsCave.asm index eabebd68..783f0442 100644 --- a/text/DiglettsCave.asm +++ b/text/DiglettsCave.asm @@ -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:: text "Graogh!@" text_end diff --git a/text/GameCorner.asm b/text/GameCorner.asm index 1868daf8..e6aacf79 100644 --- a/text/GameCorner.asm +++ b/text/GameCorner.asm @@ -14,14 +14,14 @@ _CeladonGameCornerText_48d22:: para "Do you need some" line "game coins?" - para "It's ¥1000 for 50" - line "coins. Would you" - cont "like some?" + para "It's ¥8000 for" + line "500 coins. Would" + cont "you like some?" done _CeladonGameCornerText_48d27:: text "Thanks! Here are" - line "your 50 coins!" + line "your 500 coins!" done _CeladonGameCornerText_48d2c::