Winner's Path outside & connected

This makes and connects Winner's Path Outside to Victory Road Gate. Also fixes bugs in Winner's Path that caused signs to crash the game.

Next, making the route that connects to Silent Hills, and reintegrating Mt. Silver!
This commit is contained in:
Llinos Evans 2024-07-18 16:15:40 +01:00
parent 85ed8efe18
commit 157bfdc15b
18 changed files with 253 additions and 63 deletions

View file

@ -1073,7 +1073,19 @@
const EVENT_BEAT_SAGE_GAKU
const EVENT_BEAT_SAGE_MASA
const EVENT_BEAT_SAGE_KOJI
; Unused: next 116 events
; New trainers
const EVENT_BEAT_CHANNELER_SHANNA ; unused
const EVENT_BEAT_CUE_BALL_KIRBY ; unused
const EVENT_BEAT_ENGINEER_DASHU
const EVENT_BEAT_ROCKER_BOWIE ; unused
const EVENT_BEAT_TAMER_MOE ; unused
const EVENT_BEAT_FIREFIGHTER_REMY ; unused
const EVENT_BEAT_TEACHERM_DORNYEI ; unused
const EVENT_BEAT_PAINTER_RACHEL ; unused
const EVENT_BEAT_PAINTER_DALI ; unused
const EVENT_BEAT_SOLDIER_PEPPINO ; unused
const EVENT_BEAT_SPORTSMAN_JACQUES ; unused
; Unused: next 106 events
const_next 1600
; Sprite visibility flags

View file

@ -617,6 +617,7 @@ ENDM
newgroup SILENT_HILLS ; 35
map_const WINNERS_PATH, 10, 26 ; 1
map_const WINNERS_PATH_OUTSIDE, 9, 30 ; 1
map_const SILENT_HILLS, 10, 10 ; 2
map_const DEBUG_ROOM, 20, 20 ; 3
map_const ROUTE_49, 15, 9 ; 4

View file

@ -245,8 +245,8 @@ DEF KRIS EQU __trainer_class__
trainerclass BEAUTY ; 1d
const VICTORIA
const SAMANTHA
const JULIE ; unused
const JACLYN ; unused
const JULIE
const JACLYN
const BRENDA ; unused
const CASSIE
const CAROLINE ; unused
@ -257,7 +257,7 @@ DEF KRIS EQU __trainer_class__
const KENDRA ; unused
const VERONICA ; unused
const JULIA
const THERESA ; unused
const THERESA
const VALERIE
const OLIVIA
@ -517,7 +517,7 @@ DEF KRIS EQU __trainer_class__
trainerclass FIREBREATHER ; 30
const OTIS
const DICK ; unused
const DICK
const NED ; unused
const BURT
const BILL
@ -713,34 +713,35 @@ DEF KRIS EQU __trainer_class__
const EUSINE
trainerclass CHANNELER ; 44
const SHANNA
const SHANNA ; unused
trainerclass CUE_BALL ; 45
const KIRBY ; That one Cleffa trainer.
const KIRBY ; unused, that one Cleffa trainer.
trainerclass ENGINEER ; 46
const DASHU ; From Mandarin 大叔, literally meaning "uncle". Affectionately refers to middle-aged men, and is the name for the class in Chinese.
const DASHU ; unused, From Mandarin 大叔, literally meaning "uncle". Affectionately refers to middle-aged men, and is the name for the class in Chinese.
trainerclass ROCKER ; 47
const BOWIE ; David Bowie!
const BOWIE ; unused
trainerclass TAMER ; 48
const MOE ; Ace Attorney reference
const MOE ; unused
trainerclass FIREFIGHTER ; 49
const REMY ; I am in France and larping at the time of doing this
const REMY ; unused
trainerclass TEACHERM ; 50
const DORNYEI ; Zoltan Dornyei, famous ELT teacher
const DORNYEI ; unused, Zoltan Dornyei, famous ELT teacher
trainerclass PAINTER ; 51
const RACHEL ; Could use Salvador Dali later, a surrealist painter.
const RACHEL ; Famous figure in the prototype Pokemon community and unused general girl name, unused
const DALI ; unused
trainerclass SOLDIER ; 52
const PEPPINO ; come on. COME ON.
const PEPPINO ; unused, may change
trainerclass SPORTSMAN ; 53
const JACQUES ; also an ace attorney reference.
const JACQUES ; unused
trainerclass AEROFOSSIL ; 54
const FOSSIL1

View file

@ -807,6 +807,7 @@ ENDM
; Nihon
map_attributes WinnersPath, WINNERS_PATH, $00, 0
map_attributes WinnersPathOutside, WINNERS_PATH_OUTSIDE, $05, 0
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
map_attributes QuietCave, QUIET_CAVE, $76, 0
map_attributes SilentHillsPokecenter1F, SILENT_HILLS_POKECENTER_1F, $00, 0

View file

@ -1201,3 +1201,6 @@ SinjohRuinsInterior_Blocks:
WinnersPath_Blocks:
INCBIN "maps/WinnersPath.ablk"
WinnersPathOutside_Blocks:
INCBIN "maps/WinnersPathOutside.ablk"

View file

@ -674,18 +674,19 @@ MapGroup_SevenIsland: ; 34
MapGroup_SilentHills:
table_width MAP_LENGTH, MapGroup_SilentHills
map WinnersPath, TILESET_CAVE, CAVE, LANDMARK_WINNERS_PATH, MUSIC_VICTORY_ROAD, FALSE, PALETTE_NITE, FISHGROUP_DRATINI ; Sounds like a funny fishgroup
map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
map WinnersPathOutside, TILESET_NIHON_01, ROUTE, LANDMARK_WINNERS_PATH, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_NONE
map SilentHills, TILESET_NIHON_01, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, TRUE, PALETTE_AUTO, FISHGROUP_NONE
map DebugRoom, TILESET_NIHON_01, TOWN, LANDMARK_DEBUG_ROOM, MUSIC_SINJOH_RUINS, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
map Route49, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
map QuietCave, TILESET_NIHON_01, ROUTE, LANDMARK_QUIET_CAVE, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
map Route49_2, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND
map SilentHillsPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map SilversHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map CalsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map CalsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map SinjohRuinsExterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map SinjohRuinsInterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_SHORE
map Route49OldCityGate, TILESET_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map SilentHillsPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map SilversHouse, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE
map CalsHouse1F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE
map CalsHouse2F, TILESET_PLAYERS_HOUSE, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_NIHON_TOWN_01, FALSE, PALETTE_DAY, FISHGROUP_NONE
map SinjohRuinsExterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_NONE
map SinjohRuinsInterior, TILESET_CAVE, CAVE, LANDMARK_SILENT_HILLS, MUSIC_SINJOH_RUINS, TRUE, PALETTE_DAY, FISHGROUP_NONE
map Route49OldCityGate, TILESET_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_NONE
assert_table_length NUM_SILENT_HILLS_MAPS
MapGroup_BlueForest:

View file

@ -704,7 +704,7 @@ SilentHillsGroupSprites:
db SPRITE_BIG_LAPRAS
db SPRITE_BIG_ONIX
db SPRITE_SUDOWOODO
db SPRITE_BIG_SNORLAX
db SPRITE_POKEFAN_M
db SPRITE_RIVAL
db SPRITE_TEACHER
db SPRITE_FISHER

View file

@ -593,3 +593,4 @@ INCLUDE "maps/SinjohRuinsInterior.asm"
SECTION "Map Scripts 29", ROMX
INCLUDE "maps/Route49OldCityGate.asm"
INCLUDE "maps/WinnersPath.asm"
INCLUDE "maps/WinnersPathOutside.asm"

Binary file not shown.

View file

@ -127,4 +127,8 @@
tilecoll WALL, DOOR, FLOOR, FLOOR ; 7e
tilecoll WALL, WALL, FLOOR, FLOOR ; 7f
tilecoll FLOOR, WALL, FLOOR, WALL ; 80
tilecoll WALL, WALL, WALL, WALL ; 81
tilecoll WALL, WALL, DOOR, WALL ; 81
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 82
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 83
tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 84
tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 85

Binary file not shown.

View file

@ -1796,8 +1796,12 @@ BeautyGroup:
next_list_item ; BEAUTY (4)
db "JACLYN@", TRAINERTYPE_NORMAL
db 15
dw SENTRET
db 53
dw FURRET
db 53
dw MEGANIUM
db 55
dw EUCALA
db -1 ; end
next_list_item ; BEAUTY (5)
@ -5495,8 +5499,10 @@ CueBallGroup:
EngineerGroup:
next_list_item ; ENGINEER (1)
db "DASHU@", TRAINERTYPE_NORMAL
db 23
dw MAGNEMITE
db 52
dw MAGNEZONE
db 54
dw ELECTIVIRE
db -1 ; end
end_list_items
@ -5538,6 +5544,13 @@ PainterGroup:
db 23
dw SMEARGLE
db -1 ; end
next_list_item ; PAINTER (1)
db "DALI@", TRAINERTYPE_NORMAL
db 23
dw SMEARGLE
db -1 ; end
end_list_items
SoldierGroup:

View file

@ -1,4 +1,6 @@
NihonGrassWildMons:
; Winner's Path is themed around Pokemon found in the PokeWalker map.
; Additionally, it features Pokemon known to be successful in Nintendo Cup 2000.
def_grass_wildmons WINNERS_PATH
db 2 percent, 2 percent, 4 percent ; encounter rates: morn/day/nite
; morn
@ -6,7 +8,7 @@ NihonGrassWildMons:
dbw 51, SKARMORY
dbw 50, CHANSEY
dbw 51, MUNCHLAX
dbw 52, TAUROS
dbw 52, RHYDON
dbw 52, FORRETRESS
dbw 55, STEELIX
; day
@ -14,19 +16,47 @@ NihonGrassWildMons:
dbw 51, SKARMORY
dbw 50, CHANSEY
dbw 51, MUNCHLAX
dbw 52, TAUROS
dbw 52, RHYDON
dbw 52, FORRETRESS
dbw 55, STEELIX
; nite
dbw 50, MUNCHLAX
dbw 50, MAROWAK
dbw 51, SKARMORY
dbw 50, KITSEN
dbw 51, MUNCHLAX
dbw 51, MAROWAK
dbw 52, HAUNTER
dbw 52, MISDREAVUS
dbw 55, STEELIX
end_grass_wildmons
def_grass_wildmons WINNERS_PATH_OUTSIDE
db 2 percent, 2 percent, 4 percent ; encounter rates: morn/day/nite
; morn
dbw 50, MUNCHLAX
dbw 51, SKARMORY
dbw 50, MILTANK
dbw 51, MUNCHLAX
dbw 52, TAUROS
dbw 52, QUAGSIRE
dbw 55, AMPHAROS
; day
dbw 50, MUNCHLAX
dbw 51, SKARMORY
dbw 50, MILTANK
dbw 51, MUNCHLAX
dbw 52, TAUROS
dbw 52, QUAGSIRE
dbw 55, AMPHAROS
; nite
dbw 50, KADABRA
dbw 51, SKARMORY
dbw 50, KITSEN
dbw 51, KADABRA
dbw 52, HAUNTER
dbw 52, MISDREAVUS
dbw 55, AMPHAROS
end_grass_wildmons
def_grass_wildmons QUIET_CAVE
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn

View file

@ -502,7 +502,7 @@ DebugRoom_MapEvents:
warp_event 19, 34, BLUE_FOREST, 1 ; southern warp
warp_event 33, 33, BLUE_FOREST, 1 ; southeast warp
warp_event 5, 3, AZALEA_TOWN, 1
warp_event 34, 11, WINNERS_PATH, 1
warp_event 34, 11, WINNERS_PATH_OUTSIDE, 1
def_coord_events

View file

@ -77,7 +77,9 @@ VictoryRoadGateEightBadgesText:
VictoryRoadGateLeftBlackBeltText:
text "This way leads to"
line "MT.SILVER."
line "WINNER'S PATH,"
cont "which leads to"
cont "NIHON."
para "You'll see scary-"
line "strong #MON out"
@ -105,8 +107,8 @@ VictoryRoadGate_MapEvents:
warp_event 10, 17, ROUTE_26, 1
warp_event 9, 0, VICTORY_ROAD, 1
warp_event 10, 0, VICTORY_ROAD, 1
warp_event 1, 7, ROUTE_28, 2
warp_event 2, 7, ROUTE_28, 2
warp_event 1, 7, WINNERS_PATH_OUTSIDE, 1
warp_event 2, 7, WINNERS_PATH_OUTSIDE, 2
def_coord_events
coord_event 10, 11, SCENE_VICTORYROADGATE_BADGE_CHECK, VictoryRoadGateBadgeCheckScript

View file

@ -86,59 +86,57 @@ CoolTrainerAndyAfterBattleText:
line "fault!"
done
TrainerCoolTrainerSteve:
trainer COOLTRAINERM, STEVE, EVENT_BEAT_COOLTRAINERM_STEVE, CoolTrainerSteveSeenText, CoolTrainerSteveBeatenText, 0, .AfterScript
TrainerBeautyJaclyn:
trainer BEAUTY, JACLYN, EVENT_BEAT_BEAUTY_JACLYN, BeautyJaclynSeenText, BeautyJaclynBeatenText, 0, .AfterScript
.AfterScript:
endifjustbattled
opentext
writetext CoolTrainerSteveAfterBattleText
writetext BeautyJaclynAfterBattleText
waitbutton
closetext
end
CoolTrainerSteveSeenText:
text "NIHON is a great"
line "place! But do"
cont "you have what it"
cont "takes to get"
cont "there?"
BeautyJaclynSeenText:
text "Oh, a cute"
line "TRAINER! Let's"
cont "see how you"
cont "got here!"
done
CoolTrainerSteveBeatenText:
text "Haha! Whoa!"
BeautyJaclynBeatenText:
text "Hey, take it"
line "easy! You won"
cont "already!"
prompt
CoolTrainerSteveAfterBattleText:
text "WINNER'S PATH is"
line "known for having"
cont "some of the stro-"
cont "-ngest #MON of"
cont "all!"
BeautyJaclynAfterBattleText:
text "I love meeting"
line "the strong"
cont "TRAINERs here."
para "Obvious when"
line "you think about"
cont "it, right?"
para "Many used to be"
line "CHAMPIONs! Eek!"
done
WinnersPath_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 3, 49, DEBUG_ROOM, 1 ; Will be...Indigo Plateau?
warp_event 3, 49, WINNERS_PATH_OUTSIDE, 3
warp_event 17, 39, WINNERS_PATH, 3
warp_event 17, 29, WINNERS_PATH, 2
warp_event 3, 21, WINNERS_PATH, 5
warp_event 3, 11, WINNERS_PATH, 4
warp_event 17, 5, DEBUG_ROOM, 3 ; Some Route...
warp_event 17, 5, WINNERS_PATH_OUTSIDE, 4 ; Some Route...
def_coord_events
def_bg_events
bg_event 2, 48, BGEVENT_READ, WinnersPathSign1Text
bg_event 16, 4, BGEVENT_READ, WinnersPathSign2Text
bg_event 2, 48, BGEVENT_READ, WinnersPathSign1Script
bg_event 16, 4, BGEVENT_READ, WinnersPathSign2Script
def_object_events
object_event 9, 43, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerCoolTrainerErick, -1
object_event 5, 22, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerCoolTrainerAndy, -1
object_event 7, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerCoolTrainerSteve, -1
object_event 7, 8, SPRITE_BEAUTY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerBeautyJaclyn, -1

View file

@ -0,0 +1 @@
<05>WWWWWW<02>WWWWWW<05>WWWWWW<01><02>WWWWWWEk))))("l**<>%"l**&l**&l**&l**&l***(l***&l***&l***&j<>''%EWWa<02>mC99„WWWpttt<02>rq{{E

122
maps/WinnersPathOutside.asm Normal file
View file

@ -0,0 +1,122 @@
object_const_def
WinnersPathOutside_MapScripts:
def_scene_scripts
def_callbacks
WinnersPathOutsideSign1Script:
jumptext WinnersPathOutsideSign1Text
WinnersPathOutsideSign2Script:
jumptext WinnersPathOutsideSign2Text
WinnersPathOutsideSign3Script:
jumptext WinnersPathOutsideSign3Text
WinnersPathOutsideSign1Text:
text "#MON LEAGUE"
line "RECEPTION"
done
WinnersPathOutsideSign2Text:
text "WINNER'S PATH"
line "Warning: Strong"
cont "#MON ahead!"
done
WinnersPathOutsideSign3Text:
text "WINNER'S PATH"
line "NORTH: NIHON"
cont "SOUTH: KANTO"
done
TrainerEngineerDashu:
trainer ENGINEER, DASHU, EVENT_BEAT_ENGINEER_DASHU, EngineerDashuSeenText, EngineerDashuBeatenText, 0, .AfterScript
.AfterScript:
endifjustbattled
opentext
writetext EngineerDashuAfterBattleText
waitbutton
closetext
end
EngineerDashuSeenText:
text "Whoa! We don't"
line "see many folks"
cont "from JOHTO in"
cont "these parts!"
done
EngineerDashuBeatenText:
text "Gahaha! And you're"
line "always strong!"
prompt
EngineerDashuAfterBattleText:
text "There's a huge"
line "POWER PLANT"
cont "near NEW TYPE." ; Change name when necessary.
para "Why aren't I"
line "there right"
cont "now? Aren't"
cont "you a nosy"
cont "one, eh?"
done
TrainerCoolTrainerSteve:
trainer COOLTRAINERM, STEVE, EVENT_BEAT_COOLTRAINERM_STEVE, CoolTrainerSteveSeenText, CoolTrainerSteveBeatenText, 0, .AfterScript
.AfterScript:
endifjustbattled
opentext
writetext CoolTrainerSteveAfterBattleText
waitbutton
closetext
end
CoolTrainerSteveSeenText:
text "NIHON is a great"
line "place! But do"
cont "you have what it"
cont "takes to get"
cont "there?"
done
CoolTrainerSteveBeatenText:
text "Haha! Whoa!"
prompt
CoolTrainerSteveAfterBattleText:
text "WINNER'S PATH is"
line "known for having"
cont "some of the stro-"
cont "-ngest #MON of"
cont "all!"
para "Obvious when"
line "you think about"
cont "it, right?"
done
WinnersPathOutside_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 12, 53, VICTORY_ROAD_GATE, 7
warp_event 13, 53, VICTORY_ROAD_GATE, 8
warp_event 4, 41, WINNERS_PATH, 1
warp_event 10, 23, WINNERS_PATH, 6
def_coord_events
def_bg_events
bg_event 14, 54, BGEVENT_READ, WinnersPathOutsideSign1Script
bg_event 6, 42, BGEVENT_READ, WinnersPathOutsideSign2Script
bg_event 6, 16, BGEVENT_READ, WinnersPathOutsideSign3Script
def_object_events
object_event 6, 48, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_SPINCLOCKWISE, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerCoolTrainerSteve, -1
object_event 10, 12, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 2, TrainerEngineerDashu, -1