Sevii Region groundwork

This adds the baseline infrastructure to account for the Sevii Islands, while also fixing a couple of bugs. Zeta, please read the commit carefully!

Only real issue I noticed was that scrolling on the town map is infinite in all three new regions, implying there's something in `pokegear.asm` I haven't accounted for.

I've also ret'd the ezchat order and gen1 orders out of existence to reduce the sheer amount of 8-bit warnings. This abolishes gen1 compatibility (though this was already a bit fucked) in exchange for actually being able to debug things in a reasonable timeframe.
This commit is contained in:
Llinos Evans 2024-08-06 15:30:37 +01:00
parent 08cea5888f
commit 4432dd4d2f
27 changed files with 425 additions and 538 deletions

View file

@ -398,7 +398,7 @@ DebugRoom_MapEvents:
warp_event 27, 5, PEWTER_CITY, 2
warp_event 15, 2, GOLDENROD_CITY, 1 ; city warp
warp_event 4, 9, SUMMER_BEACH_HOUSE, 1 ; left lab/league warp
warp_event 5, 9, PALLET_TOWN, 1 ; right lab/league warp
warp_event 5, 9, ONE_ISLAND, 1 ; right lab/league warp
warp_event 35, 17, OLD_CITY, 1 ; east warp
warp_event 5, 35, LAVENDER_TOWN, 1 ; southwest warp
warp_event 19, 34, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; southern warp

View file

@ -4,6 +4,11 @@ FiveIsland_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, FiveIslandFlypointCallback
FiveIslandFlypointCallback:
setflag ENGINE_FLYPOINT_FIVE_ISLAND
endcallback
FiveIsland_MapEvents:
db 0, 0 ; filler

View file

@ -4,6 +4,11 @@ FourIsland_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, FourIslandFlypointCallback
FourIslandFlypointCallback:
setflag ENGINE_FLYPOINT_FOUR_ISLAND
endcallback
FourIsland_MapEvents:
db 0, 0 ; filler

View file

@ -4,16 +4,54 @@ OneIsland_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, OneIslandFlypointCallback
OneIslandFlypointCallback:
setflag ENGINE_FLYPOINT_ONE_ISLAND
endcallback
OneIslandSign1:
jumptext OneIslandSign1Text
OneIslandSign1Text:
text "Comment to be"
line "written."
done
OneIslandSign2:
jumptext OneIslandSign2Text
OneIslandSign2Text:
text "Comment to be"
line "written."
done
OneIslandSailorScript:
jumptextfaceplayer OneIslandSailorText
OneIslandSailorText:
text "Shove off! I'm"
line "workin', 'ere!"
para "Bolt south to"
line "TREASURE BEACH"
cont "or somethin'!"
done
OneIsland_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 14, 19, DEBUG_ROOM, 1
warp_event 15, 19, DEBUG_ROOM, 1
warp_event 14, 19, DEBUG_ROOM, 1 ; port
warp_event 15, 19, DEBUG_ROOM, 1 ; port
warp_event 17, 6, DEBUG_ROOM, 1 ; pokecenter
warp_event 11, 13, DEBUG_ROOM, 1 ; left house
warp_event 21, 11, DEBUG_ROOM, 1 ; right house
def_coord_events
def_bg_events
def_object_events
def_object_events
object_event 19, 23, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OneIslandSailorScript, -1

View file

@ -4,6 +4,11 @@ SevenIsland_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, SevenIslandFlypointCallback
SevenIslandFlypointCallback:
setflag ENGINE_FLYPOINT_SEVEN_ISLAND
endcallback
SevenIsland_MapEvents:
db 0, 0 ; filler

View file

@ -4,6 +4,11 @@ SixIsland_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, SixIslandFlypointCallback
SixIslandFlypointCallback:
setflag ENGINE_FLYPOINT_SIX_ISLAND
endcallback
SixIsland_MapEvents:
db 0, 0 ; filler

View file

@ -4,6 +4,11 @@ ThreeIsland_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, ThreeIslandFlypointCallback
ThreeIslandFlypointCallback:
setflag ENGINE_FLYPOINT_THREE_ISLAND
endcallback
ThreeIsland_MapEvents:
db 0, 0 ; filler

View file

@ -4,6 +4,11 @@ TwoIsland_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, TwoIslandFlypointCallback
TwoIslandFlypointCallback:
setflag ENGINE_FLYPOINT_TWO_ISLAND
endcallback
TwoIsland_MapEvents:
db 0, 0 ; filler