Define layout constants

This commit is contained in:
Marcus Huderle
2019-01-29 16:55:25 -06:00
parent 14641e916e
commit 5c1667b41a
1091 changed files with 3257 additions and 2806 deletions
+3 -3
View File
@@ -1,8 +1,8 @@
PetalburgCity_MapConnectionsList: @ 84866D4
PetalburgCity_MapConnectionsList:
connection left, -50, MAP_ROUTE104
connection right, 10, MAP_ROUTE102
PetalburgCity_MapConnections: @ 84866EC
.4byte 0x2
PetalburgCity_MapConnections:
.4byte 2
.4byte PetalburgCity_MapConnectionsList
+5 -5
View File
@@ -1,4 +1,4 @@
PetalburgCity_EventObjects: @ 8525FD0
PetalburgCity_EventObjects:
object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 16, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_EventScript_1DC3FD, FLAG_HIDE_PETALBURG_CITY_WALLYS_AUNT
object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_WALLY
object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0
@@ -9,7 +9,7 @@ PetalburgCity_EventObjects: @ 8525FD0
object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0
object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_PETALBURG_CITY_SCOTT
PetalburgCity_MapWarps: @ 85260A8
PetalburgCity_MapWarps:
warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1
warp_def 7, 5, 0, 0, MAP_PETALBURG_CITY_WALLYS_HOUSE
warp_def 15, 8, 0, 0, MAP_PETALBURG_CITY_GYM
@@ -17,7 +17,7 @@ PetalburgCity_MapWarps: @ 85260A8
warp_def 20, 24, 0, 0, MAP_PETALBURG_CITY_HOUSE2
warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART
PetalburgCity_MapCoordEvents: @ 85260D8
PetalburgCity_MapCoordEvents:
coord_event 8, 10, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC49A
coord_event 8, 11, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4A6
coord_event 8, 12, 3, VAR_0x4057, 0, PetalburgCity_EventScript_1DC4B2
@@ -27,7 +27,7 @@ PetalburgCity_MapCoordEvents: @ 85260D8
coord_event 4, 12, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6BD
coord_event 4, 13, 3, VAR_0x40C9, 0, PetalburgCity_EventScript_1DC6D3
PetalburgCity_MapBGEvents: @ 8526158
PetalburgCity_MapBGEvents:
bg_event 17, 10, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC476
bg_event 26, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E6A
bg_event 21, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_271E73
@@ -37,6 +37,6 @@ PetalburgCity_MapBGEvents: @ 8526158
bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_1DC491
bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_PETALBURG_CITY_RARE_CANDY
PetalburgCity_MapEvents:: @ 85261B8
PetalburgCity_MapEvents::
map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents
+2 -2
View File
@@ -1,10 +1,10 @@
PetalburgCity: @ 84824B8
PetalburgCity:
.4byte PetalburgCity_Layout
.4byte PetalburgCity_MapEvents
.4byte PetalburgCity_MapScripts
.4byte PetalburgCity_MapConnections
.2byte MUS_MACHI_S2
.2byte 1
.2byte LAYOUT_PETALBURG_CITY
.byte MAPSEC_PETALBURG_CITY
.byte 0
.byte WEATHER_SUNNY