Viridian forest works! Kind of. It's still a little screwy but you can get to it now.

This commit is contained in:
Zeta_Null 2024-07-14 20:20:48 -04:00
parent 0adf7b3c87
commit 82f9dab3fa
6 changed files with 29 additions and 8 deletions

View file

@ -483,8 +483,8 @@ ENDM
map_const ROUTE_2_GATE, 5, 4 ; 12
map_const VICTORY_ROAD_GATE, 10, 9 ; 13
map_const VIRIDIAN_FOREST, 19, 26
map_const VIRIDIAN_FOREST_VIRIDIAN_GATE, 4, 5
map_const VIRIDIAN_FOREST_PEWTER_GATE, 4, 5
map_const VIRIDIAN_FOREST_VIRIDIAN_GATE, 5, 4
map_const VIRIDIAN_FOREST_PEWTER_GATE, 5, 4
endgroup
newgroup NEW_BARK ; 24

View file

@ -525,7 +525,7 @@ MapGroup_Viridian:
map Route2NuggetHouse, TILESET_HOUSE, INDOOR, LANDMARK_ROUTE_2, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map Route2Gate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map VictoryRoadGate, TILESET_GATE, GATE, LANDMARK_ROUTE_26, MUSIC_INDIGO_PLATEAU, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map ViridianForest, TILESET_FOREST_KANTO, CAVE, LANDMARK_VIRIDIAN_FOREST, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE ; MUSIC_ROUTE_2 is the viridian forest remix
map ViridianForest, TILESET_FOREST_KANTO, ROUTE, LANDMARK_VIRIDIAN_FOREST, MUSIC_ROUTE_2, FALSE, PALETTE_AUTO, FISHGROUP_SHORE ; MUSIC_ROUTE_2 is the viridian forest remix
map ViridianForestViridianGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map ViridianForestPewterGate, TILESET_GATE, GATE, LANDMARK_ROUTE_2, MUSIC_ROUTE_2, FALSE, PALETTE_DAY, FISHGROUP_SHORE
assert_table_length NUM_VIRIDIAN_MAPS

Binary file not shown.

View file

@ -1,3 +1,12 @@
object_const_def
const VIRIDIANFOREST_BUG_CATCHER1
const VIRIDIANFOREST_BUG_CATCHER2
const VIRIDIANFOREST_BUG_CATCHER3
const VIRIDIANFOREST_BUG_CATCHER4
const VIRIDIANFOREST_BUG_CATCHER5
const VIRIDIANFOREST_POKE_BALL1
const VIRIDIANFOREST_POKE_BALL2
ViridianForest_MapScripts:
def_scene_scripts
@ -213,6 +222,8 @@ ViridianForestSignText6:
done
ViridianForest_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 3, 5, VIRIDIAN_FOREST_PEWTER_GATE, 1
warp_event 18, 47, VIRIDIAN_FOREST_VIRIDIAN_GATE, 1
@ -221,7 +232,7 @@ ViridianForest_MapEvents:
def_coord_events
def_bg_events
bg_event 4, 7, BGEVENT_READ, ViridianForestSignText1
bg_event 4, 6, BGEVENT_READ, ViridianForestSignText1
bg_event 6, 26, BGEVENT_READ, ViridianForestSignText2
bg_event 28, 19, BGEVENT_READ, ViridianForestSignText3
bg_event 18, 34, BGEVENT_READ, ViridianForestSignText4

View file

@ -1,3 +1,6 @@
object_const_def
const VIRIDIANFORESTPEWTERGATEOFFICER
ViridianForestPewterGate_MapScripts:
def_scene_scripts
@ -15,11 +18,13 @@ ViridianForestPewterGateOfficerText:
done
ViridianForestPewterGate_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 4, 7, VIRIDIAN_FOREST, 1
warp_event 5, 7, VIRIDIAN_FOREST, 1
warp_event 4, 0, ROUTE_2, 5
warp_event 5, 0, ROUTE_2, 6
warp_event 4, 0, ROUTE_2, 7
warp_event 5, 0, ROUTE_2, 8
def_coord_events

View file

@ -1,3 +1,6 @@
object_const_def
const VIRIDIANFORESTVIRIDIANGATEOFFICER
ViridianForestViridianGate_MapScripts:
def_scene_scripts
@ -15,11 +18,13 @@ ViridianForestViridianGateOfficerText:
done
ViridianForestViridianGate_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 4, 0, VIRIDIAN_FOREST, 2
warp_event 5, 0, VIRIDIAN_FOREST, 3
warp_event 4, 7, ROUTE_2, 2
warp_event 5, 7, ROUTE_2, 2
warp_event 4, 7, ROUTE_2, 6
warp_event 5, 7, ROUTE_2, 6
def_coord_events