thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-09-17 02:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Integrate Route 53

Browse source 
For some reason the map was in the game with no data, so I added it into the region with some signs. No connection to the nonexistent Ochre Town.
This commit is contained in:
Llinos Evans 2025-01-01 19:39:59 +00:00
parent 8f3e178a35
commit 2fe0d906ea
11 changed files with 141 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/landmark_constants.asm
View file

@ -142,6 +142,7 @@ DEF NIHON_LANDMARK EQU const_value
const LANDMARK_ROUTE_51
const LANDMARK_ROUTE_52
const LANDMARK_RUDDY_TOWN
const LANDMARK_ROUTE_53
const LANDMARK_ROUTE_57
const LANDMARK_SUNGLOW_CITY
const LANDMARK_BLUE_FOREST

9
constants/map_constants.asm
View file

@ -693,10 +693,11 @@ ENDM
map_const RUDDY_TOWN_POKECENTER_1F, 10, 4 ; 2
map_const RUDDY_MART, 8, 4 ; 3
map_const RUDDY_TOWN_BIG_HOUSE_1, 5, 4 ; 4
map_const RUDDY_TOWN_BIG_HOUSE_2, 5, 4 ; 4
map_const ROUTE_52_RUDDY_TOWN_GATE, 5, 4 ; 4
map_const ROUTE_53_RUDDY_TOWN_GATE, 5, 4 ; 5
map_const ROUTE_54_RUDDY_TOWN_GATE, 5, 4 ; 6
map_const RUDDY_TOWN_BIG_HOUSE_2, 5, 4 ; 5
map_const ROUTE_52_RUDDY_TOWN_GATE, 5, 4 ; 6
map_const ROUTE_53_RUDDY_TOWN_GATE, 5, 4 ; 7
map_const ROUTE_54_RUDDY_TOWN_GATE, 5, 4 ; 8
map_const ROUTE_53, 35, 9 ; 9
endgroup
newgroup SUNGLOW_CITY ; 40

4
data/maps/attributes.asm
View file

@ -922,7 +922,9 @@ ENDM
map_attributes Route52RuddyTownGate, ROUTE_52_RUDDY_TOWN_GATE, $00, 0
map_attributes Route53RuddyTownGate, ROUTE_53_RUDDY_TOWN_GATE, $00, 0
map_attributes Route54RuddyTownGate, ROUTE_54_RUDDY_TOWN_GATE, $00, 0
map_attributes Route53, ROUTE_53, $00, 0
map_attributes Route57, ROUTE_57, $03, NORTH
connection north, SunglowCity, SUNGLOW_CITY, 0

3
data/maps/blocks.asm
View file

@ -1333,6 +1333,9 @@ Route51_Blocks:
Route52_Blocks:
INCBIN "maps/Route52.ablk"
Route53_Blocks:
INCBIN "maps/Route53.ablk"
RuddyTown_Blocks:
INCBIN "maps/RuddyTown.ablk"

2
data/maps/landmarks.asm
View file

@ -146,6 +146,7 @@ Landmarks:
landmark 24, 92, Route51Name
landmark 12, 84, Route52Name
landmark 12, 68, RuddyTownName
landmark 16, 68, Route53Name
landmark 60, 88, Route57Name
landmark 60, 76, SunglowCityName
landmark 140, 60, BlueForestName
@ -275,6 +276,7 @@ Route49Name: db "ROUTE 49@"
Route50Name: db "ROUTE 50@"
Route51Name: db "ROUTE 51@"
Route52Name: db "ROUTE 52@"
Route53Name: db "ROUTE 53@"
Route57Name: db "ROUTE 57@"
QuietCaveName: db "QUIET¯CAVE@"
OldCityName: db "SEPIA¯CITY@"

1
data/maps/maps.asm
View file

@ -765,6 +765,7 @@ MapGroup_RuddyTown:
map Route52RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_52, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE
map Route53RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE ; needs new landmark when route is made
map Route54RuddyTownGate, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_50, MUSIC_PEACEFULTHEME, FALSE, PALETTE_DAY, FISHGROUP_NONE ; see above
map Route53, TILESET_NIHON_FONT, ROUTE, LANDMARK_ROUTE_53, MUSIC_MOBILE_ADAPTER_MENU, FALSE, PALETTE_AUTO, FISHGROUP_OCEAN
assert_table_length NUM_RUDDY_TOWN_MAPS
MapGroup_SunglowCity:

1
data/maps/scripts.asm
View file

@ -659,3 +659,4 @@ INCLUDE "maps/CoralCityFishingGuruHouse.asm"
INCLUDE "maps/CoralCityBigHouse.asm"
INCLUDE "maps/RuddyTownBigHouse1.asm"
INCLUDE "maps/RuddyTownBigHouse2.asm"
INCLUDE "maps/Route53.asm"

60
data/wild/nihon_grass.asm
View file

@ -203,7 +203,7 @@ NihonGrassWildMons:
def_grass_wildmons ROUTE_51
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
dbw 30, FEAROW
dbw 30, SPEAROW
dbw 31, RAPIDASH
dbw 30, FEAROW
dbw 31, COATL
@ -211,7 +211,7 @@ NihonGrassWildMons:
dbw 32, TAUROS
dbw 35, WARUCHU
; day
dbw 30, FEAROW
dbw 30, SPEAROW
dbw 31, RAPIDASH
dbw 30, FEAROW
dbw 31, COATL
@ -230,4 +230,60 @@ NihonGrassWildMons:
; Route 52 has no grass.
def_grass_wildmons ROUTE_53
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
dbw 30, SPEAROW
dbw 31, RAPIDASH
dbw 30, FEAROW
dbw 31, COATL
dbw 32, QATU
dbw 32, TAUROS
dbw 35, WARUCHU
; day
dbw 30, SPEAROW
dbw 31, RAPIDASH
dbw 30, FEAROW
dbw 31, COATL
dbw 32, QATU
dbw 32, TAUROS
dbw 35, WARUCHU
; nite
dbw 30, MURKROW
dbw 31, FOXFIRE
dbw 30, MURKROW
dbw 31, SNEASEL
dbw 32, ARBOK
dbw 32, NOCTOWL
dbw 35, WARUCHU
end_grass_wildmons
def_grass_wildmons ROUTE_57
db 10 percent, 10 percent, 10 percent ; encounter rates: morn/day/nite
; morn
dbw 30, SPEAROW
dbw 31, DODUO
dbw 30, FEAROW
dbw 31, DODRIO ; CACTORMUS
dbw 32, KIWOOKED
dbw 32, DITTO
dbw 35, CYCLORP
; day
dbw 30, SPEAROW
dbw 31, DODUO
dbw 30, FEAROW
dbw 31, DODRIO ; CACTORMUS
dbw 32, KIWOOKED
dbw 32, DITTO
dbw 35, CYCLORP
; nite
dbw 30, CUBONE
dbw 31, DROWZEE
dbw 30, MAROWAK
dbw 31, DODRIO ; CACTORMUS
dbw 32, ARBOK
dbw 32, DITTO
dbw 35, CYCLORP
end_grass_wildmons
db -1 ; end

9
data/wild/nihon_water.asm
View file

@ -30,4 +30,13 @@ NihonWaterWildMons:
dbw 30, ANGORE
end_water_wildmons
def_water_wildmons ROUTE_53
db 4 percent ; encounter rates: morn/day/nite
dbw 30, MOLAMBINO
dbw 31, MANTINE
dbw 30, ANGORE
end_water_wildmons
; Route 57 has no grass
db -1 ; end

50
maps/Route53.asm Normal file
View file

@ -0,0 +1,50 @@
object_const_def
Route53_MapScripts:
def_scene_scripts
def_callbacks
Route53SignScript1:
jumptext Route53SignText1
Route53SignText1:
text "ROUTE 53"
para "WEST: RUDDY TOWN"
line "EAST: OCHRE TOWN"
done
Route53SignScript2:
jumptext Route53SignText2
Route53SignText2:
text "RUDDY SAND"
line "BATHS"
para "Relax your"
line "mind and body!"
done
Route53SignScript3:
jumptext Route53SignText3
Route53SignText3:
text "Comment to be"
line "written."
done
Route53_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 6, 9, ROUTE_53_RUDDY_TOWN_GATE, 3
def_coord_events
def_bg_events
bg_event 8, 9, BGEVENT_READ, Route53SignScript1
bg_event 24, 9, BGEVENT_READ, Route53SignScript2
bg_event 16, 6, BGEVENT_READ, Route53SignScript3
def_object_events

12
maps/Route53RuddyTownGate.asm
View file

@ -11,8 +11,12 @@ Route53RuddyTownGateOfficerScript:
jumptextfaceplayer Route53RuddyTownGateOfficerText
Route53RuddyTownGateOfficerText:
text "Comment to be"
line "written."
text "The waters here"
line "are hotter than"
cont "usual."
para "Expect to see"
line "tropical fish!"
done
Route53RuddyTownGateGrampsScript:
@ -48,8 +52,8 @@ Route53RuddyTownGate_MapEvents:
def_warp_events
warp_event 0, 7, RUDDY_TOWN, 5
warp_event 1, 7, RUDDY_TOWN, 5
warp_event 8, 7, DEBUG_ROOM, 1 ; Route 53
warp_event 9, 7, DEBUG_ROOM, 1 ; Route 53
warp_event 8, 7, ROUTE_53, 1 ; Route 53
warp_event 9, 7, ROUTE_53, 1 ; Route 53
def_coord_events