From 157bfdc15b940b95149739703a9c0efdbf177c13 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Thu, 18 Jul 2024 16:15:40 +0100 Subject: [PATCH] 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! --- constants/event_flags.asm | 14 ++- constants/map_constants.asm | 1 + constants/trainer_constants.asm | 29 ++++--- data/maps/attributes.asm | 1 + data/maps/blocks.asm | 3 + data/maps/maps.asm | 17 ++-- data/maps/outdoor_sprites.asm | 2 +- data/maps/scripts.asm | 1 + data/tilesets/nihon01_attributes.bin | Bin 2080 -> 2144 bytes data/tilesets/nihon01_collision.asm | 6 +- data/tilesets/nihon01_metatiles.bin | Bin 2080 -> 2144 bytes data/trainers/parties.asm | 21 ++++- data/wild/nihon_grass.asm | 40 +++++++-- maps/DebugRoom.asm | 2 +- maps/VictoryRoadGate.asm | 8 +- maps/WinnersPath.asm | 48 +++++------ maps/WinnersPathOutside.ablk | 1 + maps/WinnersPathOutside.asm | 122 +++++++++++++++++++++++++++ 18 files changed, 253 insertions(+), 63 deletions(-) create mode 100644 maps/WinnersPathOutside.ablk create mode 100644 maps/WinnersPathOutside.asm diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 03dfa20..27bc41e 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -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 diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 27f19ca..92738d0 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -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 diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index d8caeef..fea2577 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -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 diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 0bcbaff..25a2852 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -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 diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index ddec052..93fc205 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1201,3 +1201,6 @@ SinjohRuinsInterior_Blocks: WinnersPath_Blocks: INCBIN "maps/WinnersPath.ablk" + +WinnersPathOutside_Blocks: + INCBIN "maps/WinnersPathOutside.ablk" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 98c3eac..458960c 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -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: diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm index d171cdc..4086e26 100644 --- a/data/maps/outdoor_sprites.asm +++ b/data/maps/outdoor_sprites.asm @@ -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 diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index e08f580..d970be7 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -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" diff --git a/data/tilesets/nihon01_attributes.bin b/data/tilesets/nihon01_attributes.bin index e956b3f759d41d655f7d07242a6c406f30c2a4c9..9969f03c266bbafa0fd4d1e37e0a28c63679c53e 100644 GIT binary patch delta 58 ycmZ1=@IYWg5DOm@69WSi9BfWt31DVn1A@t0*kdMMRN!Y~WCS4~05c{kDgpo;p9psV delta 53 icmaDLus~o#5DOmz3fP>$62Q#D3Ivn4u*V2+paB5fK?ZRE diff --git a/data/tilesets/nihon01_collision.asm b/data/tilesets/nihon01_collision.asm index 2820da3..77609b0 100644 --- a/data/tilesets/nihon01_collision.asm +++ b/data/tilesets/nihon01_collision.asm @@ -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 diff --git a/data/tilesets/nihon01_metatiles.bin b/data/tilesets/nihon01_metatiles.bin index dee8ef46ecdea4935c4f459d5ea4d70bda3c3010..64b420bfcbe65588208b7aa8da18a131f5fe62a7 100644 GIT binary patch delta 135 zcmZ1=@IYWg5DOnGtAise9BfWt31DJWnY@whzW_H7NJ9Y=5KKP69uS}c1zz4JCQ;EQ pCNRE=N&t|p8o