Charmander & Rod House move

This adds Damien, the Charmander trainer, with text changed to be more accurate to his character.

I've also moved the Pewter Rod House nearby, as it makes more sense for it to be in the Water-type area. However, it seems to load oddly.

I have also integrated the Pikachu/Eevee Mode more, with architecture that it can make it more easily modified. This'll come into play for the Squirtle event.

I have also erased further misinformation the game gives about burns, and changed the Viridian Pre-Gym accordingly, to talk about confusion, which lacks a Trainer Tips sign.
This commit is contained in:
Llinos Evans 2023-06-28 16:31:14 +01:00
parent c716be39da
commit a3c81c549c
18 changed files with 187 additions and 26 deletions

View file

@ -322,6 +322,7 @@ Route22HS:
Route24HS:
db ROUTE_24, $01, SHOW ; HS_NUGGET_BRIDGE_GUY
db ROUTE_24, $08, SHOW ; HS_ROUTE_24_ITEM
db ROUTE_24, $09, HIDE ; HS_DAMIEN
Route25HS:
db ROUTE_25, $0A, SHOW ; HS_ROUTE_25_ITEM
BrunswickTrailHS:
@ -349,8 +350,6 @@ CeruleanCaveHS:
db CERULEAN_CAVE_1F, $01, SHOW ; HS_CERULEAN_CAVE_1F_ITEM_1
db CERULEAN_CAVE_1F, $02, SHOW ; HS_CERULEAN_CAVE_1F_ITEM_2
db CERULEAN_CAVE_1F, $03, SHOW ; HS_CERULEAN_CAVE_1F_ITEM_3
DaycareHS:
db DAYCARE, $03, SHOW ; HS_DAYCARE_BULBASAUR
CelesteHillHS:
db CELESTE_HILL, $01, SHOW ; HS_MOLTRES_G
PokemonTower2FHS:
@ -609,4 +608,6 @@ RockTunnelB1FHS:
db ROCK_TUNNEL_B1F, $0D, SHOW ; HS_ROCK_TUNNEL_B1F_WING
MtMoonSquareHS:
db MT_MOON_SQUARE, $04, SHOW ; HS_MT_MOON_CRATER_GUARD
DaycareHS:
db DAYCARE, $03, SHOW ; HS_DAYCARE_BULBASAUR
assert_table_length NUM_HS_OBJECTS + 1

View file

@ -9,7 +9,6 @@ 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 7, 11, ROUTE_12_SUPER_ROD_HOUSE, 1
def_bg_events
bg_event 19, 29, 6 ; PewterCityText6

View file

@ -2,8 +2,8 @@ Route12SuperRodHouse_Object:
db $a ; border block
def_warp_events
warp_event 2, 7, LAST_MAP, 8
warp_event 3, 7, LAST_MAP, 8
warp_event 2, 7, LAST_MAP, 1
warp_event 3, 7, LAST_MAP, 1
def_bg_events

View file

@ -2,6 +2,7 @@ Route24_Object:
db $2c ; border block
def_warp_events
warp_event 5, 5, ROUTE_12_SUPER_ROD_HOUSE, 1
def_bg_events
@ -13,6 +14,7 @@ Route24_Object:
object_event 11, 25, SPRITE_YOUNGSTER, STAY, LEFT, 5, OPP_YOUNGSTER, 4
object_event 10, 28, SPRITE_COOLTRAINER_F, STAY, RIGHT, 6, OPP_LASS, 8
object_event 11, 31, SPRITE_YOUNGSTER, STAY, LEFT, 7, OPP_BUG_CATCHER, 9
object_event 10, 5, SPRITE_POKE_BALL, STAY, NONE, 8, TM_THUNDER_WAVE
object_event 18, 5, SPRITE_POKE_BALL, STAY, NONE, 8, TM_THUNDER_WAVE
object_event 9, 5, SPRITE_COOLTRAINER_M, STAY, DOWN, 9 ; Damien
def_warps_to ROUTE_24