Define layout constants

2019-01-29 16:55:25 -06:00
parent 14641e916e
commit 5c1667b41a
1091 changed files with 3257 additions and 2806 deletions
@@ -1,8 +1,8 @@
-Route108_MapConnectionsList: @ 8486904
+Route108_MapConnectionsList:
 	connection left, 0, MAP_ROUTE107
 	connection right, -40, MAP_ROUTE109

-Route108_MapConnections: @ 848691C
-	.4byte 0x2
+Route108_MapConnections:
+	.4byte 2
 	.4byte Route108_MapConnectionsList

@@ -1,4 +1,4 @@
-Route108_EventObjects: @ 8528964
+Route108_EventObjects:
 	object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 3, Route108_EventScript_1EE68A, 0
 	object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 12, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 1, 1, 1, 3, Route108_EventScript_1EE6B8, 0
 	object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 13, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0
@@ -7,12 +7,12 @@ Route108_EventObjects: @ 8528964
 	object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 43, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 1, Route108_EventScript_1EE6FD, 0
 	object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route108_EventScript_290D4D, FLAG_ITEM_ROUTE_108_STAR_PIECE

-Route108_MapWarps: @ 8528A0C
+Route108_MapWarps:
 	warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK

-Route108_MapBGEvents: @ 8528A14
+Route108_MapBGEvents:
 	bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_108_RARE_CANDY

-Route108_MapEvents:: @ 8528A20
+Route108_MapEvents::
 	map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents

@@ -1,10 +1,10 @@
-Route108: @ 848273C
+Route108:
 	.4byte Route108_Layout
 	.4byte Route108_MapEvents
 	.4byte Route108_MapScripts
 	.4byte Route108_MapConnections
 	.2byte MUS_NEXTROAD
-	.2byte 24
+	.2byte LAYOUT_ROUTE108
 	.byte MAPSEC_ROUTE_108
 	.byte 0
 	.byte WEATHER_SUNNY