thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-12-05 19:10:12 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Unnumbered Route? Not anymore!

Browse source 
Route 66 is what we've assigned it.
This commit is contained in:
Martha Schilling 2024-07-21 22:57:44 +01:00
parent 608863c365
commit 29c3858f45
11 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/landmark_constants.asm
View file

@ -127,7 +127,7 @@ DEF KANTO_LANDMARK EQU const_value
const LANDMARK_SEVEN_ISLAND const LANDMARK_SEVEN_ISLAND
DEF NIHON_LANDMARK EQU const_value DEF NIHON_LANDMARK EQU const_value
const LANDMARK_WINNERS_PATH const LANDMARK_WINNERS_PATH
const LANDMARK_UNNUMBERED_ROUTE const LANDMARK_ROUTE_66
const LANDMARK_SILENT_HILLS const LANDMARK_SILENT_HILLS
const LANDMARK_DEBUG_ROOM const LANDMARK_DEBUG_ROOM
const LANDMARK_ROUTE_49 const LANDMARK_ROUTE_49

2
constants/map_constants.asm
View file

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

4
data/maps/attributes.asm
View file

@ -809,9 +809,9 @@ ENDM
; Nihon ; Nihon
map_attributes WinnersPath, WINNERS_PATH, $00, 0 map_attributes WinnersPath, WINNERS_PATH, $00, 0
map_attributes WinnersPathOutside, WINNERS_PATH_OUTSIDE, $05, NORTH map_attributes WinnersPathOutside, WINNERS_PATH_OUTSIDE, $05, NORTH
connection north, UnnumberedRoute, UNNUMBERED_ROUTE, 0 connection north, Route66, ROUTE_66, 0
map_attributes UnnumberedRoute, UNNUMBERED_ROUTE, $05, WEST | SOUTH map_attributes Route66, ROUTE_66, $05, WEST | SOUTH
connection south, WinnersPathOutside, WINNERS_PATH_OUTSIDE, 0 connection south, WinnersPathOutside, WINNERS_PATH_OUTSIDE, 0
connection west, SilentHills, SILENT_HILLS, 0 connection west, SilentHills, SILENT_HILLS, 0

4
data/maps/blocks.asm
View file

@ -1205,8 +1205,8 @@ WinnersPath_Blocks:
WinnersPathOutside_Blocks: WinnersPathOutside_Blocks:
INCBIN "maps/WinnersPathOutside.ablk" INCBIN "maps/WinnersPathOutside.ablk"
UnnumberedRoute_Blocks: Route66_Blocks:
INCBIN "maps/UnnumberedRoute.ablk" INCBIN "maps/Route66.ablk"
BlueLab_Blocks: BlueLab_Blocks:
INCBIN "maps/BlueLab.ablk" INCBIN "maps/BlueLab.ablk"

3
data/maps/landmarks.asm
View file

@ -131,7 +131,7 @@ Landmarks:
landmark 0, 0, UnknownName ; Seven Island landmark 0, 0, UnknownName ; Seven Island
assert_table_length NIHON_LANDMARK assert_table_length NIHON_LANDMARK
landmark 108, 116, WinnersPathName landmark 108, 116, WinnersPathName
landmark 108, 108, UnknownName ; Unnumbered post-Winner's Path Route landmark 108, 108, Route66Name
landmark 92, 108, SilentHillsName landmark 92, 108, SilentHillsName
landmark 20, 28, UnknownName ; Debug Room landmark 20, 28, UnknownName ; Debug Room
landmark 84, 108, Route49Name landmark 84, 108, Route49Name
@ -245,6 +245,7 @@ SpecialMapName: db "SPECIAL@"
WinnersPathName: db "WINNER'S¯PATH@" WinnersPathName: db "WINNER'S¯PATH@"
SilentHillsName: db "SILENT¯HILLS@" SilentHillsName: db "SILENT¯HILLS@"
UnknownName: db "?????@" UnknownName: db "?????@"
Route66Name: db "ROUTE 66@"
Route49Name: db "ROUTE 49@" Route49Name: db "ROUTE 49@"
QuietCaveName: db "QUIET¯CAVE@" QuietCaveName: db "QUIET¯CAVE@"
BlueForestName: db "BLUE¯FOREST@" BlueForestName: db "BLUE¯FOREST@"

2
data/maps/maps.asm
View file

@ -675,7 +675,7 @@ MapGroup_SilentHills:
table_width MAP_LENGTH, 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 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 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 Route66, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_66, 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 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 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 Route49, TILESET_NIHON_01, ROUTE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, TRUE, PALETTE_AUTO, FISHGROUP_POND

2
data/maps/scripts.asm
View file

@ -576,7 +576,7 @@ INCLUDE "maps/Route49OldCityGate1F.asm"
INCLUDE "maps/Route49OldCityGate2F.asm" INCLUDE "maps/Route49OldCityGate2F.asm"
INCLUDE "maps/WinnersPath.asm" INCLUDE "maps/WinnersPath.asm"
INCLUDE "maps/WinnersPathOutside.asm" INCLUDE "maps/WinnersPathOutside.asm"
INCLUDE "maps/UnnumberedRoute.asm" INCLUDE "maps/Route66.asm"
INCLUDE "maps/BlueLab.asm" INCLUDE "maps/BlueLab.asm"
SECTION "Map Scripts 30", ROMX SECTION "Map Scripts 30", ROMX

2
data/wild/nihon_grass.asm
View file

@ -60,7 +60,7 @@ NihonGrassWildMons:
; Route east of Silent Hills ; Route east of Silent Hills
; Encounter data based on what is in the SW97 demo. ; Encounter data based on what is in the SW97 demo.
; https://tcrf.net/Proto:Pok%C3%A9mon_Gold_and_Silver/Spaceworld_1997_Demo/Maps ; https://tcrf.net/Proto:Pok%C3%A9mon_Gold_and_Silver/Spaceworld_1997_Demo/Maps
def_grass_wildmons UNNUMBERED_ROUTE def_grass_wildmons ROUTE_66
db 2 percent, 2 percent, 4 percent ; encounter rates: morn/day/nite db 2 percent, 2 percent, 4 percent ; encounter rates: morn/day/nite
; morn ; morn
dbw 29, PICHU dbw 29, PICHU

2
data/wild/nihon_water.asm
View file

@ -6,7 +6,7 @@ NihonWaterWildMons:
dbw 40, GRANBO ; SHARPOON dbw 40, GRANBO ; SHARPOON
end_water_wildmons end_water_wildmons
def_water_wildmons UNNUMBERED_ROUTE def_water_wildmons ROUTE_66
db 4 percent ; encounter rates: morn/day/nite db 4 percent ; encounter rates: morn/day/nite
dbw 30, MAGIKARP dbw 30, MAGIKARP
dbw 31, ANGORE dbw 31, ANGORE

0
maps/UnnumberedRoute.ablk → maps/Route66.ablk
View file

0
maps/UnnumberedRoute.asm → maps/Route66.asm
View file