From 289b250e894ed6a5d9b7352e1ad336b1c681a70a Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Thu, 18 Jul 2024 17:51:01 +0100 Subject: [PATCH] Unnumbered Route This route is unnumbered for now, because it's technically the last Nihon Route (numbered 23 in-prototype) and I don't know how to number it yet. It's easily find/replaced once we're sure, anyway. Wild data uses the prototype's plus a couple edits, levels are kept low as you're actually entering here. It's official: Nihon is connected to Johto and Kanto now! --- Makefile | 1 - constants/event_flags.asm | 1 + constants/landmark_constants.asm | 1 + constants/map_constants.asm | 27 ++--- constants/trainer_constants.asm | 13 +-- data/maps/attributes.asm | 11 ++- data/maps/blocks.asm | 3 + data/maps/landmarks.asm | 11 ++- data/maps/maps.asm | 1 + data/maps/outdoor_sprites.asm | 2 +- data/maps/scripts.asm | 1 + data/tilesets/nihon01_attributes.bin | Bin 2144 -> 2288 bytes data/tilesets/nihon01_collision.asm | 9 ++ data/tilesets/nihon01_metatiles.bin | Bin 2144 -> 2288 bytes data/trainers/parties.asm | 135 ++++--------------------- data/trainers/parties_new_classes.asm | 108 ++++++++++++++++++++ data/wild/nihon_grass.asm | 31 ++++++ data/wild/nihon_water.asm | 7 ++ layout.link | 5 +- main.asm | 9 +- maps/SilentHills.ablk | 3 +- maps/UnnumberedRoute.ablk | 6 ++ maps/UnnumberedRoute.asm | 137 ++++++++++++++++++++++++++ maps/WinnersPathOutside.ablk | 2 +- 24 files changed, 368 insertions(+), 156 deletions(-) create mode 100644 data/trainers/parties_new_classes.asm create mode 100644 maps/UnnumberedRoute.ablk create mode 100644 maps/UnnumberedRoute.asm diff --git a/Makefile b/Makefile index 9c66400..c8582b0 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,6 @@ pokecrystal_vc_opt = -Cjv -t PM_CRYSTAL -i BYTE -n 0 -k 01 -l 0x33 -m 0x10 %.gbc: $$(%_obj) layout.link $(RGBLINK) -n $*.sym -m $*.map -l layout.link -o $@ $(filter %.o,$^) $(RGBFIX) $($*_opt) $@ - tools/stadium $@ ### LZ compression rules diff --git a/constants/event_flags.asm b/constants/event_flags.asm index 27bc41e..2a89ca6 100644 --- a/constants/event_flags.asm +++ b/constants/event_flags.asm @@ -672,6 +672,7 @@ const EVENT_BEAT_FISHER_WILTON2 const EVENT_BEAT_FISHER_SCOTT const EVENT_BEAT_FISHER_WILTON3 + const EVENT_BEAT_FISHER_BRAN ; Twins const EVENT_BEAT_TWINS_AMY_AND_MAY const EVENT_BEAT_TWINS_ANN_AND_ANNE diff --git a/constants/landmark_constants.asm b/constants/landmark_constants.asm index 2878238..a39c85b 100644 --- a/constants/landmark_constants.asm +++ b/constants/landmark_constants.asm @@ -127,6 +127,7 @@ DEF KANTO_LANDMARK EQU const_value const LANDMARK_SEVEN_ISLAND DEF NIHON_LANDMARK EQU const_value const LANDMARK_WINNERS_PATH + const LANDMARK_UNNUMBERED_ROUTE const LANDMARK_SILENT_HILLS const LANDMARK_DEBUG_ROOM const LANDMARK_ROUTE_49 diff --git a/constants/map_constants.asm b/constants/map_constants.asm index 92738d0..234ff96 100644 --- a/constants/map_constants.asm +++ b/constants/map_constants.asm @@ -617,19 +617,20 @@ 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 - map_const QUIET_CAVE, 27, 18 ; 5 - map_const ROUTE_49_2, 10, 19 ; 6 - map_const SILENT_HILLS_POKECENTER_1F, 10, 4 ; 7 - map_const SILVERS_HOUSE, 5, 5 ; 8 - map_const CALS_HOUSE_1F, 5, 4 ; 9 - map_const CALS_HOUSE_2F, 5, 4 ; 10 - map_const SINJOH_RUINS_EXTERIOR, 10, 10 ; 11 - map_const SINJOH_RUINS_INTERIOR, 10, 10 ; 12 - map_const ROUTE_49_OLD_CITY_GATE, 5, 4 ; 13 + map_const WINNERS_PATH_OUTSIDE, 9, 30 ; 2 + map_const UNNUMBERED_ROUTE, 31, 9 ; 3 + map_const SILENT_HILLS, 10, 10 ; 4 + map_const DEBUG_ROOM, 20, 20 ; 5 + map_const ROUTE_49, 15, 9 ; 6 + map_const QUIET_CAVE, 27, 18 ; 7 + map_const ROUTE_49_2, 10, 19 ; 8 + map_const SILENT_HILLS_POKECENTER_1F, 10, 4 ; 9 + map_const SILVERS_HOUSE, 5, 5 ; 10 + map_const CALS_HOUSE_1F, 5, 4 ; 11 + map_const CALS_HOUSE_2F, 5, 4 ; 12 + map_const SINJOH_RUINS_EXTERIOR, 10, 10 ; 13 + map_const SINJOH_RUINS_INTERIOR, 10, 10 ; 14 + map_const ROUTE_49_OLD_CITY_GATE, 5, 4 ; 15 endgroup newgroup BLUE_FOREST ; 36 diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm index fea2577..87902d3 100644 --- a/constants/trainer_constants.asm +++ b/constants/trainer_constants.asm @@ -210,12 +210,12 @@ DEF KRIS EQU __trainer_class__ const GAVEN3 const BLAKE const BRIAN - const ERICK ; unused - const ANDY ; unused + const ERICK + const ANDY const TYLER ; unused const SEAN const KEVIN - const STEVE ; unused + const STEVE const ALLEN const DARIN @@ -384,6 +384,7 @@ DEF KRIS EQU __trainer_class__ const RALPH4 const RALPH5 const TULLY4 + const BRAN trainerclass SWIMMERM ; 26 const HAROLD @@ -447,7 +448,7 @@ DEF KRIS EQU __trainer_class__ trainerclass SUPER_NERD ; 29 const STAN const ERIC - const GREGG ; unused + const GREGG const JAY ; unused const DAVE ; unused const SAM @@ -734,8 +735,8 @@ DEF KRIS EQU __trainer_class__ const DORNYEI ; unused, Zoltan Dornyei, famous ELT teacher trainerclass PAINTER ; 51 - const RACHEL ; Famous figure in the prototype Pokemon community and unused general girl name, unused - const DALI ; unused + const RACHEL ; Famous figure in the prototype Pokemon community and unused general girl name, unused, give kotora, smeargle... + const DALI trainerclass SOLDIER ; 52 const PEPPINO ; unused, may change diff --git a/data/maps/attributes.asm b/data/maps/attributes.asm index 25a2852..3365d3e 100644 --- a/data/maps/attributes.asm +++ b/data/maps/attributes.asm @@ -375,8 +375,9 @@ ENDM connection north, Route10North, ROUTE_10_NORTH, 0 connection south, LavenderTown, LAVENDER_TOWN, 0 - map_attributes SilentHills, SILENT_HILLS, $05, WEST ; Add Prince and east connections later + map_attributes SilentHills, SILENT_HILLS, $05, EAST | WEST ; Add Prince connections later connection west, Route49, ROUTE_49, 0 + connection east, UnnumberedRoute, UNNUMBERED_ROUTE, 0 map_attributes Route49, ROUTE_49, $05, EAST | WEST connection east, SilentHills, SILENT_HILLS, $05, 0 @@ -807,7 +808,13 @@ ENDM ; Nihon map_attributes WinnersPath, WINNERS_PATH, $00, 0 - map_attributes WinnersPathOutside, WINNERS_PATH_OUTSIDE, $05, 0 + map_attributes WinnersPathOutside, WINNERS_PATH_OUTSIDE, $05, NORTH + connection north, UnnumberedRoute, UNNUMBERED_ROUTE, 0 + + map_attributes UnnumberedRoute, UNNUMBERED_ROUTE, $05, WEST | SOUTH + connection south, WinnersPathOutside, WINNERS_PATH_OUTSIDE, 0 + connection west, SilentHills, SILENT_HILLS, 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 93fc205..686a0cf 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -1204,3 +1204,6 @@ WinnersPath_Blocks: WinnersPathOutside_Blocks: INCBIN "maps/WinnersPathOutside.ablk" + +UnnumberedRoute_Blocks: + INCBIN "maps/UnnumberedRoute.ablk" diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm index 3bd67c4..06fa794 100644 --- a/data/maps/landmarks.asm +++ b/data/maps/landmarks.asm @@ -130,11 +130,12 @@ Landmarks: landmark 0, 0, UnknownName ; Six Island landmark 0, 0, UnknownName ; Seven Island assert_table_length NIHON_LANDMARK - landmark 0, 0, WinnersPathName - landmark 92, 108, SilentHillsName + landmark 108, 116, WinnersPathName + landmark 108, 108, UnknownName ; Unnumbered post-Winner's Path Route + landmark 92, 108, SilentHillsName landmark 20, 28, UnknownName ; Debug Room - landmark 91, 108, Route49Name ; probably not correct - landmark 91, 108, QuietCaveName ; probably not correct + landmark 84, 108, Route49Name + landmark 76, 108, QuietCaveName landmark 140, 60, BlueForestName assert_table_length NUM_LANDMARKS @@ -164,7 +165,7 @@ WhirlIslandsName: db "WHIRL¯ISLANDS@" MtMortarName: db "MT.MORTAR@" DragonsDenName: db "DRAGON'S¯DEN@" IcePathName: db "ICE PATH@" -NotApplicableName: db "N/A@" ; unreferenced ; "オバケやしき" ("HAUNTED HOUSE") in Japanese +HauntedHouseName: db "HAUNTED¯HOUSE@" ; unreferenced ; "オバケやしき" ("HAUNTED HOUSE") in Japanese PalletTownName: db "PALLET TOWN@" ViridianCityName: db "VIRIDIAN¯CITY@" PewterCityName: db "PEWTER CITY@" diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 458960c..0409efd 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -675,6 +675,7 @@ 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 WinnersPathOutside, TILESET_NIHON_01, ROUTE, LANDMARK_WINNERS_PATH, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_AUTO, FISHGROUP_NONE + map UnnumberedRoute, TILESET_NIHON_01, ROUTE, LANDMARK_UNNUMBERED_ROUTE, MUSIC_ROUTE_30, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN 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 diff --git a/data/maps/outdoor_sprites.asm b/data/maps/outdoor_sprites.asm index 4086e26..c5e27e1 100644 --- a/data/maps/outdoor_sprites.asm +++ b/data/maps/outdoor_sprites.asm @@ -703,7 +703,7 @@ SilentHillsGroupSprites: db SPRITE_OLD_LINK_RECEPTIONIST db SPRITE_BIG_LAPRAS db SPRITE_BIG_ONIX - db SPRITE_SUDOWOODO + db SPRITE_SUPER_NERD db SPRITE_POKEFAN_M db SPRITE_RIVAL db SPRITE_TEACHER diff --git a/data/maps/scripts.asm b/data/maps/scripts.asm index d970be7..9edc155 100644 --- a/data/maps/scripts.asm +++ b/data/maps/scripts.asm @@ -594,3 +594,4 @@ SECTION "Map Scripts 29", ROMX INCLUDE "maps/Route49OldCityGate.asm" INCLUDE "maps/WinnersPath.asm" INCLUDE "maps/WinnersPathOutside.asm" +INCLUDE "maps/UnnumberedRoute.asm" diff --git a/data/tilesets/nihon01_attributes.bin b/data/tilesets/nihon01_attributes.bin index 9969f03c266bbafa0fd4d1e37e0a28c63679c53e..9b59fb17c590a61ac9e9b40b1894a49828314749 100644 GIT binary patch delta 79 ocmaDL@Ii1x0>?xHQ3w)bVr51JlNHz{G+3d42?`jXfCCKx0NV2hg8%>k delta 7 Ocmew$_&{Jo0tWyNbpr|j diff --git a/data/tilesets/nihon01_collision.asm b/data/tilesets/nihon01_collision.asm index 77609b0..a6046d3 100644 --- a/data/tilesets/nihon01_collision.asm +++ b/data/tilesets/nihon01_collision.asm @@ -132,3 +132,12 @@ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 83 tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 84 tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 85 + tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 86 + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 87 + tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 88 + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 89 + tilecoll WATER, WATER, WATER, WATER ; 8a + tilecoll WALL, WALL, WALL, DOOR ; 8b + tilecoll WALL, WALL, WALL, WALL ; 8c + tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 8d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 8e diff --git a/data/tilesets/nihon01_metatiles.bin b/data/tilesets/nihon01_metatiles.bin index 64b420bfcbe65588208b7aa8da18a131f5fe62a7..3d7354c4bae5407bd352e9850d51d585c543fd9d 100644 GIT binary patch delta 193 zcmaDL@Ig?40SjP*i?K0mRA^>rG@iVKeNR0r9N5^hvc|;1xG)}!hKaMXqKcS`paL## qZf+@UIe95(00A0fdgn|sBXaE41Y7#gA delta 47 ccmew$_&`8`0S&OBfsG2y?2O)%m$2^v0C