diff options
1091 files changed, 3257 insertions, 2806 deletions
diff --git a/data/maps.s b/data/maps.s index 56d957139..6e6545fbc 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,3 +1,4 @@ +#include "constants/layouts.h" #include "constants/map_types.h" #include "constants/maps.h" #include "constants/weather.h" diff --git a/data/maps/AbandonedShip_CaptainsOffice/events.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc index b59eb456a..aff922c97 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/events.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/events.inc @@ -1,11 +1,11 @@ -AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C +AbandonedShip_CaptainsOffice_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_STORAGE_KEY -AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C +AbandonedShip_CaptainsOffice_MapWarps: warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK -AbandonedShip_CaptainsOffice_MapEvents:: @ 8536A9C +AbandonedShip_CaptainsOffice_MapEvents:: map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 3102e0614..a3fbacdc7 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_CaptainsOffice: @ 84845A4 +AbandonedShip_CaptainsOffice: .4byte AbandonedShip_CaptainsOffice_Layout .4byte AbandonedShip_CaptainsOffice_MapEvents .4byte AbandonedShip_CaptainsOffice_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 195 + .2byte LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Corridors_1F/events.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc index 665350915..e9efcc82a 100644 --- a/data/maps/AbandonedShip_Corridors_1F/events.inc +++ b/data/maps/AbandonedShip_Corridors_1F/events.inc @@ -1,8 +1,8 @@ -AbandonedShip_Corridors_1F_EventObjects: @ 85366C0 +AbandonedShip_Corridors_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0 object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0 -AbandonedShip_Corridors_1F_MapWarps: @ 85366F0 +AbandonedShip_Corridors_1F_MapWarps: warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK warp_def 8, 11, 3, 2, MAP_ABANDONED_SHIP_DECK warp_def 0, 11, 3, 3, MAP_ABANDONED_SHIP_DECK @@ -16,6 +16,6 @@ AbandonedShip_Corridors_1F_MapWarps: @ 85366F0 warp_def 5, 2, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 3, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_1F -AbandonedShip_Corridors_1F_MapEvents:: @ 8536750 +AbandonedShip_Corridors_1F_MapEvents:: map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index b9f5e809c..fc296e762 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Corridors_1F: @ 84844C4 +AbandonedShip_Corridors_1F: .4byte AbandonedShip_Corridors_1F_Layout .4byte AbandonedShip_Corridors_1F_MapEvents .4byte AbandonedShip_Corridors_1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 187 + .2byte LAYOUT_ABANDONED_SHIP_CORRIDORS_1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc index 34bc41cf0..bbe3153e0 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/events.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc @@ -1,8 +1,8 @@ -AbandonedShip_Corridors_B1F_EventObjects: @ 8536808 +AbandonedShip_Corridors_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0 -AbandonedShip_Corridors_B1F_MapWarps: @ 8536838 +AbandonedShip_Corridors_B1F_MapWarps: warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F warp_def 3, 4, 3, 0, MAP_ABANDONED_SHIP_ROOMS2_B1F warp_def 5, 7, 3, 0, MAP_ABANDONED_SHIP_ROOMS_B1F @@ -12,9 +12,9 @@ AbandonedShip_Corridors_B1F_MapWarps: @ 8536838 warp_def 0, 2, 3, 10, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F -AbandonedShip_Corridors_B1F_MapBGEvents: @ 8536878 +AbandonedShip_Corridors_B1F_MapBGEvents: bg_event 11, 4, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_Corridors_B1F_EventScript_237DC8 -AbandonedShip_Corridors_B1F_MapEvents:: @ 8536884 +AbandonedShip_Corridors_B1F_MapEvents:: map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index 98f23c223..7b03645fd 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Corridors_B1F: @ 84844FC +AbandonedShip_Corridors_B1F: .4byte AbandonedShip_Corridors_B1F_Layout .4byte AbandonedShip_Corridors_B1F_MapEvents .4byte AbandonedShip_Corridors_B1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 189 + .2byte LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Deck/events.inc b/data/maps/AbandonedShip_Deck/events.inc index 289f917af..70fa72c4f 100644 --- a/data/maps/AbandonedShip_Deck/events.inc +++ b/data/maps/AbandonedShip_Deck/events.inc @@ -1,10 +1,10 @@ -AbandonedShip_Deck_MapWarps: @ 8536684 +AbandonedShip_Deck_MapWarps: warp_def 13, 15, 3, 0, MAP_ROUTE108 warp_def 14, 15, 3, 0, MAP_ROUTE108 warp_def 13, 9, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 8, 9, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 12, 5, 3, 0, MAP_ABANDONED_SHIP_CAPTAINS_OFFICE -AbandonedShip_Deck_MapEvents:: @ 85366AC +AbandonedShip_Deck_MapEvents:: map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index 394c93ec9..395f4404d 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Deck: @ 84844A8 +AbandonedShip_Deck: .4byte AbandonedShip_Deck_Layout .4byte AbandonedShip_Deck_MapEvents .4byte AbandonedShip_Deck_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 186 + .2byte LAYOUT_ABANDONED_SHIP_DECK .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc index 54453b729..5b0130c3e 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc @@ -1,4 +1,4 @@ -AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC +AbandonedShip_HiddenFloorCorridors_MapWarps: warp_def 3, 8, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS warp_def 6, 8, 3, 2, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS warp_def 9, 8, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS @@ -6,12 +6,12 @@ AbandonedShip_HiddenFloorCorridors_MapWarps: @ 8536ACC warp_def 6, 3, 3, 7, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS -AbandonedShip_HiddenFloorCorridors_MapBGEvents: @ 8536AFC +AbandonedShip_HiddenFloorCorridors_MapBGEvents: bg_event 3, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A19 bg_event 6, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A50 bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238A87 bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_238ABE -AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 8536B2C +AbandonedShip_HiddenFloorCorridors_MapEvents:: map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index dcf42db40..cc268ca6e 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_HiddenFloorCorridors: @ 84845DC +AbandonedShip_HiddenFloorCorridors: .4byte AbandonedShip_HiddenFloorCorridors_Layout .4byte AbandonedShip_HiddenFloorCorridors_MapEvents .4byte AbandonedShip_HiddenFloorCorridors_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 289 + .2byte LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc index b2cf9b11b..380e7f958 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc @@ -1,10 +1,10 @@ -AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40 +AbandonedShip_HiddenFloorRooms_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_6_LUXURY_BALL object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_4_SCANNER object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_1_TM_18 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOM_3_WATER_STONE -AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 +AbandonedShip_HiddenFloorRooms_MapWarps: warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS warp_def 7, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS warp_def 21, 14, 3, 1, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS @@ -15,7 +15,7 @@ AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 warp_def 21, 1, 3, 4, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS warp_def 36, 1, 3, 5, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS -AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8 +AbandonedShip_HiddenFloorRooms_MapBGEvents: bg_hidden_item_event 42, 10, 3, ITEM_ROOM_1_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_2_KEY bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_4_KEY @@ -27,6 +27,6 @@ AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8 bg_event 25, 2, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 bg_event 24, 6, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 -AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60 +AbandonedShip_HiddenFloorRooms_MapEvents:: map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index f279a52ab..24889acd1 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_HiddenFloorRooms: @ 84845F8 +AbandonedShip_HiddenFloorRooms: .4byte AbandonedShip_HiddenFloorRooms_Layout .4byte AbandonedShip_HiddenFloorRooms_MapEvents .4byte AbandonedShip_HiddenFloorRooms_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 310 + .2byte LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Room_B1F/events.inc b/data/maps/AbandonedShip_Room_B1F/events.inc index bd882d6d8..d0cddd45b 100644 --- a/data/maps/AbandonedShip_Room_B1F/events.inc +++ b/data/maps/AbandonedShip_Room_B1F/events.inc @@ -1,10 +1,10 @@ -AbandonedShip_Room_B1F_EventObjects: @ 853697C +AbandonedShip_Room_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_TM_13 -AbandonedShip_Room_B1F_MapWarps: @ 8536994 +AbandonedShip_Room_B1F_MapWarps: warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 5, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F -AbandonedShip_Room_B1F_MapEvents:: @ 85369A4 +AbandonedShip_Room_B1F_MapEvents:: map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index 3ac0c5f38..c6dd8ee37 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Room_B1F: @ 848456C +AbandonedShip_Room_B1F: .4byte AbandonedShip_Room_B1F_Layout .4byte AbandonedShip_Room_B1F_MapEvents .4byte AbandonedShip_Room_B1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 193 + .2byte LAYOUT_ABANDONED_SHIP_ROOM_B1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Rooms2_1F/events.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc index 6e4b9b280..71b0416e3 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/events.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc @@ -1,15 +1,15 @@ -AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8 +AbandonedShip_Rooms2_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_REVIVE object_event 4, EVENT_OBJ_GFX_HIKER, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0 object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0 -AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30 +AbandonedShip_Rooms2_1F_MapWarps: warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 5, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 4, 1, 3, 11, MAP_ABANDONED_SHIP_CORRIDORS_1F -AbandonedShip_Rooms2_1F_MapEvents:: @ 8536A48 +AbandonedShip_Rooms2_1F_MapEvents:: map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index 71f856bc0..e9a55f93e 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Rooms2_1F: @ 8484588 +AbandonedShip_Rooms2_1F: .4byte AbandonedShip_Rooms2_1F_Layout .4byte AbandonedShip_Rooms2_1F_MapEvents .4byte AbandonedShip_Rooms2_1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 194 + .2byte LAYOUT_ABANDONED_SHIP_ROOMS2_1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Rooms2_B1F/events.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc index 3bb29619a..3c47ae3bb 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/events.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/events.inc @@ -1,13 +1,13 @@ -AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4 +AbandonedShip_Rooms2_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_DIVE_BALL -AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924 +AbandonedShip_Rooms2_B1F_MapWarps: warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 5, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 13, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 14, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F -AbandonedShip_Rooms2_B1F_MapEvents:: @ 8536944 +AbandonedShip_Rooms2_B1F_MapEvents:: map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 943e57b77..4afe51937 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Rooms2_B1F: @ 8484534 +AbandonedShip_Rooms2_B1F: .4byte AbandonedShip_Rooms2_B1F_Layout .4byte AbandonedShip_Rooms2_B1F_MapEvents .4byte AbandonedShip_Rooms2_B1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 191 + .2byte LAYOUT_ABANDONED_SHIP_ROOMS2_B1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Rooms_1F/events.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc index f0322558b..b63f2bd72 100644 --- a/data/maps/AbandonedShip_Rooms_1F/events.inc +++ b/data/maps/AbandonedShip_Rooms_1F/events.inc @@ -1,10 +1,10 @@ -AbandonedShip_Rooms_1F_EventObjects: @ 8536764 +AbandonedShip_Rooms_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_HARBOR_MAIL object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0 object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0 -AbandonedShip_Rooms_1F_MapWarps: @ 85367C4 +AbandonedShip_Rooms_1F_MapWarps: warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 5, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 4, 1, 3, 6, MAP_ABANDONED_SHIP_CORRIDORS_1F @@ -12,6 +12,6 @@ AbandonedShip_Rooms_1F_MapWarps: @ 85367C4 warp_def 13, 1, 3, 7, MAP_ABANDONED_SHIP_CORRIDORS_1F warp_def 14, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F -AbandonedShip_Rooms_1F_MapEvents:: @ 85367F4 +AbandonedShip_Rooms_1F_MapEvents:: map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index b37456c28..60607565c 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Rooms_1F: @ 84844E0 +AbandonedShip_Rooms_1F: .4byte AbandonedShip_Rooms_1F_Layout .4byte AbandonedShip_Rooms_1F_MapEvents .4byte AbandonedShip_Rooms_1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 188 + .2byte LAYOUT_ABANDONED_SHIP_ROOMS_1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Rooms_B1F/events.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc index 4af246e5c..eda95460b 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/events.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/events.inc @@ -1,12 +1,12 @@ -AbandonedShip_Rooms_B1F_EventObjects: @ 8536898 +AbandonedShip_Rooms_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_ESCAPE_ROPE -AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8 +AbandonedShip_Rooms_B1F_MapWarps: warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 13, 1, 3, 3, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 22, 1, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_B1F -AbandonedShip_Rooms_B1F_MapEvents:: @ 85368E0 +AbandonedShip_Rooms_B1F_MapEvents:: map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index f5ec64f2b..582123b34 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Rooms_B1F: @ 8484518 +AbandonedShip_Rooms_B1F: .4byte AbandonedShip_Rooms_B1F_Layout .4byte AbandonedShip_Rooms_B1F_MapEvents .4byte AbandonedShip_Rooms_B1F_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 190 + .2byte LAYOUT_ABANDONED_SHIP_ROOMS_B1F .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/AbandonedShip_Underwater1/events.inc b/data/maps/AbandonedShip_Underwater1/events.inc index 5c9af3c10..c6c4e226f 100644 --- a/data/maps/AbandonedShip_Underwater1/events.inc +++ b/data/maps/AbandonedShip_Underwater1/events.inc @@ -1,7 +1,7 @@ -AbandonedShip_Underwater1_MapWarps: @ 8536958 +AbandonedShip_Underwater1_MapWarps: warp_def 3, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 warp_def 4, 7, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER2 -AbandonedShip_Underwater1_MapEvents:: @ 8536968 +AbandonedShip_Underwater1_MapEvents:: map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index e5119887a..d77b43cac 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Underwater1: @ 8484550 +AbandonedShip_Underwater1: .4byte AbandonedShip_Underwater1_Layout .4byte AbandonedShip_Underwater1_MapEvents .4byte AbandonedShip_Underwater1_MapScripts .4byte 0x0 .2byte MUS_DEEPDEEP - .2byte 192 + .2byte LAYOUT_ABANDONED_SHIP_UNDERWATER1 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/AbandonedShip_Underwater2/events.inc b/data/maps/AbandonedShip_Underwater2/events.inc index f06c21b2a..f4fadb1ba 100644 --- a/data/maps/AbandonedShip_Underwater2/events.inc +++ b/data/maps/AbandonedShip_Underwater2/events.inc @@ -1,6 +1,6 @@ -AbandonedShip_Underwater2_MapWarps: @ 8536AB0 +AbandonedShip_Underwater2_MapWarps: warp_def 3, 1, 3, 0, MAP_ABANDONED_SHIP_UNDERWATER1 -AbandonedShip_Underwater2_MapEvents:: @ 8536AB8 +AbandonedShip_Underwater2_MapEvents:: map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0 diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index de7e871d0..eb08a5f70 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -1,10 +1,10 @@ -AbandonedShip_Underwater2: @ 84845C0 +AbandonedShip_Underwater2: .4byte AbandonedShip_Underwater2_Layout .4byte AbandonedShip_Underwater2_MapEvents .4byte AbandonedShip_Underwater2_MapScripts .4byte 0x0 .2byte MUS_DEEPDEEP - .2byte 196 + .2byte LAYOUT_ABANDONED_SHIP_UNDERWATER2 .byte MAPSEC_ABANDONED_SHIP .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/AlteringCave/events.inc b/data/maps/AlteringCave/events.inc index 898038715..0963e3801 100644 --- a/data/maps/AlteringCave/events.inc +++ b/data/maps/AlteringCave/events.inc @@ -1,6 +1,6 @@ -AlteringCave_MapWarps: @ 8537894 +AlteringCave_MapWarps: warp_def 18, 22, 0, 0, MAP_ROUTE103 -AlteringCave_MapEvents:: @ 853789C +AlteringCave_MapEvents:: map_events 0x0, AlteringCave_MapWarps, 0x0, 0x0 diff --git a/data/maps/AlteringCave/header.inc b/data/maps/AlteringCave/header.inc index fe88dbca0..551d70424 100644 --- a/data/maps/AlteringCave/header.inc +++ b/data/maps/AlteringCave/header.inc @@ -1,10 +1,10 @@ -AlteringCave: @ 8484A58 +AlteringCave: .4byte AlteringCave_Layout .4byte AlteringCave_MapEvents .4byte AlteringCave_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 420 + .2byte LAYOUT_ALTERING_CAVE .byte MAPSEC_ALTERING_CAVE_2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc index 3e784dea2..06dedb33e 100644 --- a/data/maps/AncientTomb/events.inc +++ b/data/maps/AncientTomb/events.inc @@ -1,16 +1,16 @@ -AncientTomb_EventObjects: @ 8536CDC +AncientTomb_EventObjects: object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_23905A, FLAG_HIDE_REGISTEEL -AncientTomb_MapWarps: @ 8536CF4 +AncientTomb_MapWarps: warp_def 8, 29, 3, 0, MAP_ROUTE120 warp_def 8, 20, 0, 2, MAP_ANCIENT_TOMB warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB -AncientTomb_MapBGEvents: @ 8536D0C +AncientTomb_MapBGEvents: bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239033 bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050 bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_239050 -AncientTomb_MapEvents:: @ 8536D30 +AncientTomb_MapEvents:: map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index 5bfe54614..f1c3b4111 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -1,10 +1,10 @@ -AncientTomb: @ 8484630 +AncientTomb: .4byte AncientTomb_Layout .4byte AncientTomb_MapEvents .4byte AncientTomb_MapScripts .4byte 0x0 .2byte MUS_MABOROSI - .2byte 281 + .2byte LAYOUT_ANCIENT_TOMB .byte MAPSEC_ANCIENT_TOMB .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AquaHideout_1F/events.inc b/data/maps/AquaHideout_1F/events.inc index 6a4f0972f..663ae0ada 100644 --- a/data/maps/AquaHideout_1F/events.inc +++ b/data/maps/AquaHideout_1F/events.inc @@ -1,13 +1,13 @@ -AquaHideout_1F_EventObjects: @ 8535304 +AquaHideout_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_2334F8, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS -AquaHideout_1F_MapWarps: @ 853534C +AquaHideout_1F_MapWarps: warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY warp_def 14, 27, 1, 6, MAP_LILYCOVE_CITY warp_def 22, 1, 3, 0, MAP_AQUA_HIDEOUT_B1F -AquaHideout_1F_MapEvents:: @ 8535364 +AquaHideout_1F_MapEvents:: map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index dd4e12043..30e045f79 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -1,10 +1,10 @@ -AquaHideout_1F: @ 8484144 +AquaHideout_1F: .4byte AquaHideout_1F_Layout .4byte AquaHideout_1F_MapEvents .4byte AquaHideout_1F_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 143 + .2byte LAYOUT_AQUA_HIDEOUT_1F .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AquaHideout_B1F/events.inc b/data/maps/AquaHideout_B1F/events.inc index 6dd83aebf..edc3df4c6 100644 --- a/data/maps/AquaHideout_B1F/events.inc +++ b/data/maps/AquaHideout_B1F/events.inc @@ -1,4 +1,4 @@ -AquaHideout_B1F_EventObjects: @ 8535378 +AquaHideout_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, FLAG_ITEM_AQUA_HIDEOUT_B1F_MAX_ELIXIR @@ -9,7 +9,7 @@ AquaHideout_B1F_EventObjects: @ 8535378 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_233A38, FLAG_HIDE_AQUA_HIDEOUT_B1F_ELECTRODE_2 object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 28, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B1F_EventScript_233AEC, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS -AquaHideout_B1F_MapWarps: @ 8535450 +AquaHideout_B1F_MapWarps: warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F warp_def 18, 1, 3, 0, MAP_AQUA_HIDEOUT_B2F warp_def 12, 1, 3, 1, MAP_AQUA_HIDEOUT_B2F @@ -36,6 +36,6 @@ AquaHideout_B1F_MapWarps: @ 8535450 warp_def 45, 17, 3, 17, MAP_AQUA_HIDEOUT_B1F warp_def 48, 17, 3, 19, MAP_AQUA_HIDEOUT_B1F -AquaHideout_B1F_MapEvents:: @ 8535518 +AquaHideout_B1F_MapEvents:: map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index bc65150d6..dfe453ddd 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -1,10 +1,10 @@ -AquaHideout_B1F: @ 8484160 +AquaHideout_B1F: .4byte AquaHideout_B1F_Layout .4byte AquaHideout_B1F_MapEvents .4byte AquaHideout_B1F_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 144 + .2byte LAYOUT_AQUA_HIDEOUT_B1F .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc index 552a95ad4..f24115c32 100644 --- a/data/maps/AquaHideout_B2F/events.inc +++ b/data/maps/AquaHideout_B2F/events.inc @@ -1,4 +1,4 @@ -AquaHideout_B2F_EventObjects: @ 853552C +AquaHideout_B2F_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_233E8A, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, FLAG_ITEM_AQUA_HIDEOUT_B2F_NEST_BALL @@ -6,7 +6,7 @@ AquaHideout_B2F_EventObjects: @ 853552C object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EAF, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, AquaHideout_B2F_EventScript_233EC6, FLAG_HIDE_AQUA_HIDEOUT_GRUNTS -AquaHideout_B2F_MapWarps: @ 85355BC +AquaHideout_B2F_MapWarps: warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F warp_def 12, 1, 3, 2, MAP_AQUA_HIDEOUT_B1F warp_def 3, 3, 3, 3, MAP_AQUA_HIDEOUT_B1F @@ -18,10 +18,10 @@ AquaHideout_B2F_MapWarps: @ 85355BC warp_def 31, 17, 3, 4, MAP_AQUA_HIDEOUT_B2F warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F -AquaHideout_B2F_MapCoordEvents: @ 853560C +AquaHideout_B2F_MapCoordEvents: coord_event 28, 17, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5 coord_event 28, 16, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_233DE5 -AquaHideout_B2F_MapEvents:: @ 853562C +AquaHideout_B2F_MapEvents:: map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index d4bf34328..3d87c7ad3 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -1,10 +1,10 @@ -AquaHideout_B2F: @ 848417C +AquaHideout_B2F: .4byte AquaHideout_B2F_Layout .4byte AquaHideout_B2F_MapEvents .4byte AquaHideout_B2F_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 145 + .2byte LAYOUT_AQUA_HIDEOUT_B2F .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AquaHideout_UnusedRubyMap1/events.inc b/data/maps/AquaHideout_UnusedRubyMap1/events.inc index 45663b68f..f8107f479 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/events.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/events.inc @@ -1,3 +1,3 @@ -AquaHideout_UnusedRubyMap1_MapEvents:: @ 8536FBC +AquaHideout_UnusedRubyMap1_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/AquaHideout_UnusedRubyMap1/header.inc b/data/maps/AquaHideout_UnusedRubyMap1/header.inc index 90e59a51e..30946c6f8 100644 --- a/data/maps/AquaHideout_UnusedRubyMap1/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap1/header.inc @@ -1,10 +1,10 @@ -AquaHideout_UnusedRubyMap1: @ 84846D8 +AquaHideout_UnusedRubyMap1: .4byte AquaHideout_UnusedRubyMap1_Layout .4byte AquaHideout_UnusedRubyMap1_MapEvents .4byte AquaHideout_UnusedRubyMap1_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 316 + .2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AquaHideout_UnusedRubyMap2/events.inc b/data/maps/AquaHideout_UnusedRubyMap2/events.inc index 6f53de284..569e13cb0 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/events.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/events.inc @@ -1,3 +1,3 @@ -AquaHideout_UnusedRubyMap2_MapEvents:: @ 8536FD0 +AquaHideout_UnusedRubyMap2_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/AquaHideout_UnusedRubyMap2/header.inc b/data/maps/AquaHideout_UnusedRubyMap2/header.inc index 776465f16..cd08fcc5e 100644 --- a/data/maps/AquaHideout_UnusedRubyMap2/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap2/header.inc @@ -1,10 +1,10 @@ -AquaHideout_UnusedRubyMap2: @ 84846F4 +AquaHideout_UnusedRubyMap2: .4byte AquaHideout_UnusedRubyMap2_Layout .4byte AquaHideout_UnusedRubyMap2_MapEvents .4byte AquaHideout_UnusedRubyMap2_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 317 + .2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/AquaHideout_UnusedRubyMap3/events.inc b/data/maps/AquaHideout_UnusedRubyMap3/events.inc index 8a23a3786..7618c0d58 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/events.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/events.inc @@ -1,3 +1,3 @@ -AquaHideout_UnusedRubyMap3_MapEvents:: @ 8536FE4 +AquaHideout_UnusedRubyMap3_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/AquaHideout_UnusedRubyMap3/header.inc b/data/maps/AquaHideout_UnusedRubyMap3/header.inc index ab97ae84d..993f10aff 100644 --- a/data/maps/AquaHideout_UnusedRubyMap3/header.inc +++ b/data/maps/AquaHideout_UnusedRubyMap3/header.inc @@ -1,10 +1,10 @@ -AquaHideout_UnusedRubyMap3: @ 8484710 +AquaHideout_UnusedRubyMap3: .4byte AquaHideout_UnusedRubyMap3_Layout .4byte AquaHideout_UnusedRubyMap3_MapEvents .4byte AquaHideout_UnusedRubyMap3_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 318 + .2byte LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 .byte MAPSEC_AQUA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ArtisanCave_1F/events.inc b/data/maps/ArtisanCave_1F/events.inc index 30f920220..f53e074b9 100644 --- a/data/maps/ArtisanCave_1F/events.inc +++ b/data/maps/ArtisanCave_1F/events.inc @@ -1,10 +1,10 @@ -ArtisanCave_1F_EventObjects: @ 8537774 +ArtisanCave_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_1F_EventScript_2914D1, FLAG_ITEM_ARTISAN_CAVE_1F_CARBOS -ArtisanCave_1F_MapWarps: @ 853778C +ArtisanCave_1F_MapWarps: warp_def 10, 17, 0, 13, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 6, 5, 0, 1, MAP_ARTISAN_CAVE_B1F -ArtisanCave_1F_MapEvents:: @ 853779C +ArtisanCave_1F_MapEvents:: map_events ArtisanCave_1F_EventObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/ArtisanCave_1F/header.inc b/data/maps/ArtisanCave_1F/header.inc index c53a2851b..670aa6845 100644 --- a/data/maps/ArtisanCave_1F/header.inc +++ b/data/maps/ArtisanCave_1F/header.inc @@ -1,10 +1,10 @@ -ArtisanCave_1F: @ 84849B0 +ArtisanCave_1F: .4byte ArtisanCave_1F_Layout .4byte ArtisanCave_1F_MapEvents .4byte ArtisanCave_1F_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 401 + .2byte LAYOUT_ARTISAN_CAVE_1F .byte MAPSEC_ARTISAN_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ArtisanCave_B1F/events.inc b/data/maps/ArtisanCave_B1F/events.inc index 9df844aa3..7572aaa2a 100644 --- a/data/maps/ArtisanCave_B1F/events.inc +++ b/data/maps/ArtisanCave_B1F/events.inc @@ -1,16 +1,16 @@ -ArtisanCave_B1F_EventObjects: @ 8537708 +ArtisanCave_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ArtisanCave_B1F_EventScript_2914C4, FLAG_ITEM_ARTISAN_CAVE_B1F_HP_UP -ArtisanCave_B1F_MapWarps: @ 8537720 +ArtisanCave_B1F_MapWarps: warp_def 8, 48, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 38, 5, 0, 1, MAP_ARTISAN_CAVE_1F -ArtisanCave_B1F_MapBGEvents: @ 8537730 +ArtisanCave_B1F_MapBGEvents: bg_hidden_item_event 32, 29, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_ZINC bg_hidden_item_event 27, 8, 0, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_CALCIUM bg_hidden_item_event 7, 5, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_PROTEIN bg_hidden_item_event 19, 43, 0, ITEM_IRON, FLAG_HIDDEN_ITEM_ARTISAN_CAVE_B1F_IRON -ArtisanCave_B1F_MapEvents:: @ 8537760 +ArtisanCave_B1F_MapEvents:: map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents diff --git a/data/maps/ArtisanCave_B1F/header.inc b/data/maps/ArtisanCave_B1F/header.inc index f76fe6938..fd1adb32f 100644 --- a/data/maps/ArtisanCave_B1F/header.inc +++ b/data/maps/ArtisanCave_B1F/header.inc @@ -1,10 +1,10 @@ -ArtisanCave_B1F: @ 8484994 +ArtisanCave_B1F: .4byte ArtisanCave_B1F_Layout .4byte ArtisanCave_B1F_MapEvents .4byte ArtisanCave_B1F_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 400 + .2byte LAYOUT_ARTISAN_CAVE_B1F .byte MAPSEC_ARTISAN_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc index 4731db975..4d8b6ea2f 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC +BattleFrontier_BattleArenaBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 @@ -9,6 +9,6 @@ BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4 +BattleFrontier_BattleArenaBattleRoom_MapEvents:: map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc index 12962e7de..1c4cf3eb0 100644 --- a/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleArenaBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleArenaBattleRoom: @ 8485484 +BattleFrontier_BattleArenaBattleRoom: .4byte BattleFrontier_BattleArenaBattleRoom_Layout .4byte BattleFrontier_BattleArenaBattleRoom_MapEvents .4byte BattleFrontier_BattleArenaBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_ARENA - .2byte 356 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc index bfe28c339..5be3b04e6 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/events.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0 +BattleFrontier_BattleArenaCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 9, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleArenaCorridor_MapEvents:: @ 853C8D8 +BattleFrontier_BattleArenaCorridor_MapEvents:: map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc index d4935ea9e..17341a3e8 100644 --- a/data/maps/BattleFrontier_BattleArenaCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleArenaCorridor/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleArenaCorridor: @ 8485468 +BattleFrontier_BattleArenaCorridor: .4byte BattleFrontier_BattleArenaCorridor_Layout .4byte BattleFrontier_BattleArenaCorridor_MapEvents .4byte BattleFrontier_BattleArenaCorridor_MapScripts .4byte 0x0 .2byte MUS_B_ARENA - .2byte 355 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleArenaLobby/events.inc b/data/maps/BattleFrontier_BattleArenaLobby/events.inc index e20bec9c3..a63202848 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/events.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/events.inc @@ -1,17 +1,17 @@ -BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814 +BattleFrontier_BattleArenaLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0 object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0 object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 14, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0 object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0 -BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C +BattleFrontier_BattleArenaLobby_MapWarps: warp_def 7, 12, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894 +BattleFrontier_BattleArenaLobby_MapBGEvents: bg_event 5, 9, 3, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleArenaLobby_EventScript_256092 bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleArenaLobby_EventScript_2560CA -BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC +BattleFrontier_BattleArenaLobby_MapEvents:: map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleArenaLobby/header.inc b/data/maps/BattleFrontier_BattleArenaLobby/header.inc index 3523eaf63..db8f456ff 100644 --- a/data/maps/BattleFrontier_BattleArenaLobby/header.inc +++ b/data/maps/BattleFrontier_BattleArenaLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleArenaLobby: @ 848544C +BattleFrontier_BattleArenaLobby: .4byte BattleFrontier_BattleArenaLobby_Layout .4byte BattleFrontier_BattleArenaLobby_MapEvents .4byte BattleFrontier_BattleArenaLobby_MapScripts .4byte 0x0 .2byte MUS_B_ARENA - .2byte 354 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc index 910160645..ce8f66f6b 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4 +BattleFrontier_BattleDomeBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_TWIN, 0, 7, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 @@ -15,6 +15,6 @@ BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4 object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 14, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 15, EVENT_OBJ_GFX_VAR_0, 0, 11, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C +BattleFrontier_BattleDomeBattleRoom_MapEvents:: map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc index 7d2119ebe..593adeb6f 100644 --- a/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomeBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomeBattleRoom: @ 8485388 +BattleFrontier_BattleDomeBattleRoom: .4byte BattleFrontier_BattleDomeBattleRoom_Layout .4byte BattleFrontier_BattleDomeBattleRoom_MapEvents .4byte BattleFrontier_BattleDomeBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_DOME - .2byte 335 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc index 6bce917a0..3d3f5be4b 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/events.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/events.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C +BattleFrontier_BattleDomeCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 23, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164 +BattleFrontier_BattleDomeCorridor_MapWarps: warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_BattleDomeCorridor_MapEvents:: @ 853C174 +BattleFrontier_BattleDomeCorridor_MapEvents:: map_events BattleFrontier_BattleDomeCorridor_EventObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc index 25883e9ed..3ce5b2b5e 100644 --- a/data/maps/BattleFrontier_BattleDomeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleDomeCorridor/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomeCorridor: @ 8485350 +BattleFrontier_BattleDomeCorridor: .4byte BattleFrontier_BattleDomeCorridor_Layout .4byte BattleFrontier_BattleDomeCorridor_MapEvents .4byte BattleFrontier_BattleDomeCorridor_MapScripts .4byte 0x0 .2byte MUS_B_DOME1 - .2byte 333 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleDomeLobby/events.inc b/data/maps/BattleFrontier_BattleDomeLobby/events.inc index cce01feda..abf867132 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/events.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068 +BattleFrontier_BattleDomeLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 1, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0 object_event 3, EVENT_OBJ_GFX_LASS, 0, 14, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0 @@ -6,16 +6,16 @@ BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068 object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 8, 14, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0 object_event 6, EVENT_OBJ_GFX_TEALA, 0, 17, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0 -BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8 +BattleFrontier_BattleDomeLobby_MapWarps: warp_def 11, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 12, 16, 0, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108 +BattleFrontier_BattleDomeLobby_MapBGEvents: bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D52 bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D84 bg_event 18, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249D6B bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleDomeLobby_EventScript_249E34 -BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138 +BattleFrontier_BattleDomeLobby_MapEvents:: map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleDomeLobby/header.inc b/data/maps/BattleFrontier_BattleDomeLobby/header.inc index 451192a45..cf0c57619 100644 --- a/data/maps/BattleFrontier_BattleDomeLobby/header.inc +++ b/data/maps/BattleFrontier_BattleDomeLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomeLobby: @ 8485334 +BattleFrontier_BattleDomeLobby: .4byte BattleFrontier_BattleDomeLobby_Layout .4byte BattleFrontier_BattleDomeLobby_MapEvents .4byte BattleFrontier_BattleDomeLobby_MapScripts .4byte 0x0 .2byte MUS_B_DOME1 - .2byte 332 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc index 559199b29..0714b7b68 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/events.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188 +BattleFrontier_BattleDomePreBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0 +BattleFrontier_BattleDomePreBattleRoom_MapWarps: warp_def 6, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 7, 8, 3, 1, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_BattleDomePreBattleRoom_MapEvents:: @ 853C1B0 +BattleFrontier_BattleDomePreBattleRoom_MapEvents:: map_events BattleFrontier_BattleDomePreBattleRoom_EventObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc index 59b5b15e4..84637906d 100644 --- a/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleDomePreBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomePreBattleRoom: @ 848536C +BattleFrontier_BattleDomePreBattleRoom: .4byte BattleFrontier_BattleDomePreBattleRoom_Layout .4byte BattleFrontier_BattleDomePreBattleRoom_MapEvents .4byte BattleFrontier_BattleDomePreBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_DOME - .2byte 334 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc index bdaf4c51b..5f3a6a218 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC +BattleFrontier_BattleFactoryBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 @@ -8,6 +8,6 @@ BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 12, 8, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 8, EVENT_OBJ_GFX_VAR_F, 0, 5, 11, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C +BattleFrontier_BattleFactoryBattleRoom_MapEvents:: map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc index 960fef2eb..cb20b3f1e 100644 --- a/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleFactoryBattleRoom: @ 84854D8 +BattleFrontier_BattleFactoryBattleRoom: .4byte BattleFrontier_BattleFactoryBattleRoom_Layout .4byte BattleFrontier_BattleFactoryBattleRoom_MapEvents .4byte BattleFrontier_BattleFactoryBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_FACTORY - .2byte 348 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc index 063f49813..7cfccd0ff 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/events.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8 +BattleFrontier_BattleFactoryLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 11, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 14, 11, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0 @@ -6,15 +6,15 @@ BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8 object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 6, 10, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0 object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0 -BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68 +BattleFrontier_BattleFactoryLobby_MapWarps: warp_def 9, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 10, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78 +BattleFrontier_BattleFactoryLobby_MapBGEvents: bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587E1 bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleFactoryLobby_EventScript_2587FA bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleFactoryLobby_EventScript_258839 -BattleFrontier_BattleFactoryLobby_MapEvents:: @ 853CA9C +BattleFrontier_BattleFactoryLobby_MapEvents:: map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc index 92329c6ef..30bd38b68 100644 --- a/data/maps/BattleFrontier_BattleFactoryLobby/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleFactoryLobby: @ 84854A0 +BattleFrontier_BattleFactoryLobby: .4byte BattleFrontier_BattleFactoryLobby_Layout .4byte BattleFrontier_BattleFactoryLobby_MapEvents .4byte BattleFrontier_BattleFactoryLobby_MapScripts .4byte 0x0 .2byte MUS_B_FACTORY - .2byte 346 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc index d341250de..944ff8142 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0 +BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 12, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8 +BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc index 4cae9ed0c..ecbfc37a9 100644 --- a/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleFactoryPreBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleFactoryPreBattleRoom: @ 84854BC +BattleFrontier_BattleFactoryPreBattleRoom: .4byte BattleFrontier_BattleFactoryPreBattleRoom_Layout .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapEvents .4byte BattleFrontier_BattleFactoryPreBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_FACTORY - .2byte 347 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc index 8363f2bb5..95aacea95 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/events.inc @@ -1,14 +1,14 @@ -BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC +BattleFrontier_BattlePalaceBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 13, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574 +BattleFrontier_BattlePalaceBattleRoom_MapWarps: warp_def 0, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR warp_def 1, 9, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR -BattleFrontier_BattlePalaceBattleRoom_MapEvents:: @ 853C584 +BattleFrontier_BattlePalaceBattleRoom_MapEvents:: map_events BattleFrontier_BattlePalaceBattleRoom_EventObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc index 2715ade5c..035cd8758 100644 --- a/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePalaceBattleRoom: @ 84853DC +BattleFrontier_BattlePalaceBattleRoom: .4byte BattleFrontier_BattlePalaceBattleRoom_Layout .4byte BattleFrontier_BattlePalaceBattleRoom_MapEvents .4byte BattleFrontier_BattlePalaceBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_PALACE - .2byte 344 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc index 66e844665..578c2cc43 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420 +BattleFrontier_BattlePalaceCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 3, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 0, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 12, 6, 0, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 2, 0, 0, 0x0, 0 @@ -7,12 +7,12 @@ BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420 object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 13, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, 0x0, 0 object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 3, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, 0x0, 0 -BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8 +BattleFrontier_BattlePalaceCorridor_MapWarps: warp_def 8, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY warp_def 9, 13, 3, 2, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY warp_def 6, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM warp_def 10, 3, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM -BattleFrontier_BattlePalaceCorridor_MapEvents:: @ 853C4E8 +BattleFrontier_BattlePalaceCorridor_MapEvents:: map_events BattleFrontier_BattlePalaceCorridor_EventObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc index f2866b9b0..6d2f8ffb0 100644 --- a/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceCorridor/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePalaceCorridor: @ 84853C0 +BattleFrontier_BattlePalaceCorridor: .4byte BattleFrontier_BattlePalaceCorridor_Layout .4byte BattleFrontier_BattlePalaceCorridor_MapEvents .4byte BattleFrontier_BattlePalaceCorridor_MapScripts .4byte 0x0 .2byte MUS_B_PALACE - .2byte 343 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc index 632bfdf10..4c2d924b2 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340 +BattleFrontier_BattlePalaceLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 8, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0 object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 24, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0 @@ -6,16 +6,16 @@ BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340 object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 2, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0 object_event 6, EVENT_OBJ_GFX_EXPERT_M, 0, 19, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0 -BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0 +BattleFrontier_BattlePalaceLobby_MapWarps: warp_def 12, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 13, 11, 0, 2, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 5, 4, 3, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR -BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8 +BattleFrontier_BattlePalaceLobby_MapBGEvents: bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC50 bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePalaceLobby_EventScript_24DC69 bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6 -BattleFrontier_BattlePalaceLobby_MapEvents:: @ 853C40C +BattleFrontier_BattlePalaceLobby_MapEvents:: map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc index 19d06e0be..8846982cf 100644 --- a/data/maps/BattleFrontier_BattlePalaceLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePalaceLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePalaceLobby: @ 84853A4 +BattleFrontier_BattlePalaceLobby: .4byte BattleFrontier_BattlePalaceLobby_Layout .4byte BattleFrontier_BattlePalaceLobby_MapEvents .4byte BattleFrontier_BattlePalaceLobby_MapScripts .4byte 0x0 .2byte MUS_B_PALACE - .2byte 342 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc index b34916f49..ace2657bb 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/events.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54 +BattleFrontier_BattlePikeCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C +BattleFrontier_BattlePikeCorridor_MapEvents:: map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc index 07d730579..cecd6fba1 100644 --- a/data/maps/BattleFrontier_BattlePikeCorridor/header.inc +++ b/data/maps/BattleFrontier_BattlePikeCorridor/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeCorridor: @ 8485510 +BattleFrontier_BattlePikeCorridor: .4byte BattleFrontier_BattlePikeCorridor_Layout .4byte BattleFrontier_BattlePikeCorridor_MapEvents .4byte BattleFrontier_BattlePikeCorridor_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 350 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePikeLobby/events.inc b/data/maps/BattleFrontier_BattlePikeLobby/events.inc index 495d52257..b28d48d6a 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/events.inc @@ -1,18 +1,18 @@ -BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0 +BattleFrontier_BattlePikeLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0 object_event 2, EVENT_OBJ_GFX_HIKER, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0 object_event 3, EVENT_OBJ_GFX_TWIN, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0 object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 8, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0 -BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10 +BattleFrontier_BattlePikeLobby_MapWarps: warp_def 5, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 4, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 6, 12, 0, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28 +BattleFrontier_BattlePikeLobby_MapBGEvents: bg_event 8, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BA80 bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePikeLobby_EventScript_25BAC6 -BattleFrontier_BattlePikeLobby_MapEvents:: @ 853CC40 +BattleFrontier_BattlePikeLobby_MapEvents:: map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattlePikeLobby/header.inc b/data/maps/BattleFrontier_BattlePikeLobby/header.inc index e591be668..a3746c114 100644 --- a/data/maps/BattleFrontier_BattlePikeLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePikeLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeLobby: @ 84854F4 +BattleFrontier_BattlePikeLobby: .4byte BattleFrontier_BattlePikeLobby_Layout .4byte BattleFrontier_BattlePikeLobby_MapEvents .4byte BattleFrontier_BattlePikeLobby_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 349 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc index 81dee29d1..34f802c91 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/events.inc @@ -1,8 +1,8 @@ -BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54 +BattleFrontier_BattlePikeRandomRoom1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0 object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0 -BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84 +BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 coord_event 3, 6, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C4082 coord_event 3, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D @@ -11,6 +11,6 @@ BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84 coord_event 4, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D coord_event 5, 7, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D -BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4 +BattleFrontier_BattlePikeRandomRoom1_MapEvents:: map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc index d49bb07d5..ff61d1238 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom1/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeRandomRoom1: @ 8485548 +BattleFrontier_BattlePikeRandomRoom1: .4byte BattleFrontier_BattlePikeRandomRoom1_Layout .4byte BattleFrontier_BattlePikeRandomRoom1_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom1_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 352 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc index 41a58ad3b..0d929a2ae 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08 +BattleFrontier_BattlePikeRandomRoom2_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20 +BattleFrontier_BattlePikeRandomRoom2_MapEvents:: map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc index 506a31496..6ab11ae02 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom2/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeRandomRoom2: @ 8485564 +BattleFrontier_BattlePikeRandomRoom2: .4byte BattleFrontier_BattlePikeRandomRoom2_Layout .4byte BattleFrontier_BattlePikeRandomRoom2_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom2_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 353 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc index 61cb8ede4..9b3a6234e 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34 +BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: coord_event 4, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4174 coord_event 3, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 coord_event 4, 18, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C4202 @@ -7,6 +7,6 @@ BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents: @ 853CE34 coord_event 4, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D coord_event 5, 19, 3, VAR_TEMP_3, 1, BattleFrontier_BattlePikeRandomRoom3_EventScript_2C420D -BattleFrontier_BattlePikeRandomRoom3_MapEvents:: @ 853CEA4 +BattleFrontier_BattlePikeRandomRoom3_MapEvents:: map_events 0x0, 0x0, BattleFrontier_BattlePikeRandomRoom3_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc index 3f5607922..fabb3a8ef 100644 --- a/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc +++ b/data/maps/BattleFrontier_BattlePikeRandomRoom3/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeRandomRoom3: @ 8485580 +BattleFrontier_BattlePikeRandomRoom3: .4byte BattleFrontier_BattlePikeRandomRoom3_Layout .4byte BattleFrontier_BattlePikeRandomRoom3_MapEvents .4byte BattleFrontier_BattlePikeRandomRoom3_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 358 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc index 2fc9e9d6c..59abdb970 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/events.inc @@ -1,8 +1,8 @@ -BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80 +BattleFrontier_BattlePikeThreePathRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 4, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0 object_event 2, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0 -BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 +BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: coord_event 2, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E coord_event 6, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F59 coord_event 10, 3, 3, VAR_TEMP_1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F64 @@ -13,6 +13,6 @@ BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 coord_event 7, 9, 3, VAR_TEMP_2, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4062 coord_event 7, 10, 0, VAR_TEMP_3, 1, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D -BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40 +BattleFrontier_BattlePikeThreePathRoom_MapEvents:: map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc index 9743a7c36..718d5d3e6 100644 --- a/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc +++ b/data/maps/BattleFrontier_BattlePikeThreePathRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePikeThreePathRoom: @ 848552C +BattleFrontier_BattlePikeThreePathRoom: .4byte BattleFrontier_BattlePikeThreePathRoom_Layout .4byte BattleFrontier_BattlePikeThreePathRoom_MapEvents .4byte BattleFrontier_BattlePikeThreePathRoom_MapScripts .4byte 0x0 .2byte MUS_B_TUBE - .2byte 351 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc index 225961050..3c8e0fda8 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018 +BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0 object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0 @@ -9,11 +9,11 @@ BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018 object_event 8, EVENT_OBJ_GFX_TEALA, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0 object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 12, 10, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0 -BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0 +BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: warp_def 7, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 6, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 8, 10, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: @ 853D108 +BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: map_events BattleFrontier_BattlePointExchangeServiceCorner_EventObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc index 831a39d2a..c60cf97f2 100644 --- a/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc +++ b/data/maps/BattleFrontier_BattlePointExchangeServiceCorner/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePointExchangeServiceCorner: @ 84855D4 +BattleFrontier_BattlePointExchangeServiceCorner: .4byte BattleFrontier_BattlePointExchangeServiceCorner_Layout .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapEvents .4byte BattleFrontier_BattlePointExchangeServiceCorner_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 398 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc index f9604d8d1..793434de3 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C +BattleFrontier_BattlePyramidEmptySquare_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 0, 0, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 1, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 0, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 @@ -16,6 +16,6 @@ BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 2, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC +BattleFrontier_BattlePyramidEmptySquare_MapEvents:: map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc index ef5c8409f..46b22aa7a 100644 --- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePyramidEmptySquare: @ 8485414 +BattleFrontier_BattlePyramidEmptySquare: .4byte BattleFrontier_BattlePyramidEmptySquare_Layout .4byte BattleFrontier_BattlePyramidEmptySquare_MapEvents .4byte BattleFrontier_BattlePyramidEmptySquare_MapScripts .4byte 0x0 .2byte 65535 - .2byte 361 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc index b70958fec..81a4203b5 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/events.inc @@ -1,16 +1,16 @@ -BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598 +BattleFrontier_BattlePyramidLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_HIKER, 0, 7, 12, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0 object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 14, 13, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 2, 15, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0 object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 16, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0 -BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8 +BattleFrontier_BattlePyramidLobby_MapWarps: warp_def 7, 17, 4, 3, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600 +BattleFrontier_BattlePyramidLobby_MapBGEvents: bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattlePyramidLobby_EventScript_250D42 bg_event 1, 12, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattlePyramidLobby_EventScript_250E95 -BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618 +BattleFrontier_BattlePyramidLobby_MapEvents:: map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc index 91d454fbe..f8e7408a0 100644 --- a/data/maps/BattleFrontier_BattlePyramidLobby/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePyramidLobby: @ 84853F8 +BattleFrontier_BattlePyramidLobby: .4byte BattleFrontier_BattlePyramidLobby_Layout .4byte BattleFrontier_BattlePyramidLobby_MapEvents .4byte BattleFrontier_BattlePyramidLobby_MapScripts .4byte 0x0 .2byte MUS_PYRAMID - .2byte 360 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattlePyramidTop/events.inc b/data/maps/BattleFrontier_BattlePyramidTop/events.inc index fbf4941ca..9e1cd9f4f 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/events.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/events.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0 +BattleFrontier_BattlePyramidTop_EventObjects: object_event 1, EVENT_OBJ_GFX_HIKER, 0, 17, 11, 6, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0 object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 17, 7, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0 +BattleFrontier_BattlePyramidTop_MapCoordEvents: coord_event 17, 9, 4, VAR_TEMP_2, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 -BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800 +BattleFrontier_BattlePyramidTop_MapEvents:: map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0 diff --git a/data/maps/BattleFrontier_BattlePyramidTop/header.inc b/data/maps/BattleFrontier_BattlePyramidTop/header.inc index d58e1fe81..e2e8ec59a 100644 --- a/data/maps/BattleFrontier_BattlePyramidTop/header.inc +++ b/data/maps/BattleFrontier_BattlePyramidTop/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePyramidTop: @ 8485430 +BattleFrontier_BattlePyramidTop: .4byte BattleFrontier_BattlePyramidTop_Layout .4byte BattleFrontier_BattlePyramidTop_MapEvents .4byte BattleFrontier_BattlePyramidTop_MapScripts .4byte 0x0 .2byte 65535 - .2byte 378 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc index 148e590af..4de7382b2 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/events.inc @@ -1,12 +1,12 @@ -BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0 +BattleFrontier_BattleTowerBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 -BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818 +BattleFrontier_BattleTowerBattleRoom_MapWarps: warp_def 5, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY warp_def 6, 8, 0, 2, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY -BattleFrontier_BattleTowerBattleRoom_MapEvents:: @ 853B828 +BattleFrontier_BattleTowerBattleRoom_MapEvents:: map_events BattleFrontier_BattleTowerBattleRoom_EventObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc index 5aa95a63e..5f8b03ace 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerBattleRoom: @ 848521C +BattleFrontier_BattleTowerBattleRoom: .4byte BattleFrontier_BattleTowerBattleRoom_Layout .4byte BattleFrontier_BattleTowerBattleRoom_MapEvents .4byte BattleFrontier_BattleTowerBattleRoom_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 268 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc index f83bee69d..97dc0c857 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4 +BattleFrontier_BattleTowerBattleRoom2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 @@ -6,6 +6,6 @@ BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4 object_event 5, EVENT_OBJ_GFX_VAR_F, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 object_event 6, EVENT_OBJ_GFX_VAR_E, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 -BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054 +BattleFrontier_BattleTowerBattleRoom2_MapEvents:: map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc index 34a8fae84..464ed8566 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom2/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerBattleRoom2: @ 8485318 +BattleFrontier_BattleTowerBattleRoom2: .4byte BattleFrontier_BattleTowerBattleRoom_Layout .4byte BattleFrontier_BattleTowerBattleRoom2_MapEvents .4byte BattleFrontier_BattleTowerBattleRoom2_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 268 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc index ae3ca2575..80b239fbc 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/events.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4 +BattleFrontier_BattleTowerCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 -BattleFrontier_BattleTowerCorridor_MapEvents:: @ 853B7BC +BattleFrontier_BattleTowerCorridor_MapEvents:: map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc index 8d920a8c8..7774e0f3b 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerCorridor: @ 8485200 +BattleFrontier_BattleTowerCorridor: .4byte BattleFrontier_BattleTowerCorridor_Layout .4byte BattleFrontier_BattleTowerCorridor_MapEvents .4byte BattleFrontier_BattleTowerCorridor_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 267 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc index f96f14916..726c4b58a 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/events.inc @@ -1,9 +1,9 @@ -BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50 +BattleFrontier_BattleTowerCorridor2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 14, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 object_event 4, EVENT_OBJ_GFX_VAR_E, 0, 14, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0 +BattleFrontier_BattleTowerCorridor2_MapEvents:: map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc index 66255315f..9a8676f93 100644 --- a/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc +++ b/data/maps/BattleFrontier_BattleTowerCorridor2/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerCorridor2: @ 84852FC +BattleFrontier_BattleTowerCorridor2: .4byte BattleFrontier_BattleTowerCorridor2_Layout .4byte BattleFrontier_BattleTowerCorridor2_MapEvents .4byte BattleFrontier_BattleTowerCorridor2_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 391 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerElevator/events.inc b/data/maps/BattleFrontier_BattleTowerElevator/events.inc index 671d6d434..a33f30c9e 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/events.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/events.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleTowerElevator_EventObjects: @ 853B778 +BattleFrontier_BattleTowerElevator_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 -BattleFrontier_BattleTowerElevator_MapEvents:: @ 853B790 +BattleFrontier_BattleTowerElevator_MapEvents:: map_events BattleFrontier_BattleTowerElevator_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerElevator/header.inc b/data/maps/BattleFrontier_BattleTowerElevator/header.inc index f8d9ff853..3267daa20 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/header.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerElevator: @ 84851E4 +BattleFrontier_BattleTowerElevator: .4byte BattleElevator_Layout .4byte BattleFrontier_BattleTowerElevator_MapEvents .4byte BattleFrontier_BattleTowerElevator_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 266 + .2byte LAYOUT_BATTLE_ELEVATOR .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerLobby/events.inc b/data/maps/BattleFrontier_BattleTowerLobby/events.inc index 6a78eaee6..ddf573eb2 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/events.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638 +BattleFrontier_BattleTowerLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 17, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0 @@ -9,18 +9,18 @@ BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638 object_event 8, EVENT_OBJ_GFX_TEALA, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0 object_event 9, EVENT_OBJ_GFX_TEALA, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0 -BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710 +BattleFrontier_BattleTowerLobby_MapWarps: warp_def 12, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 13, 9, 3, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 6, 1, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM -BattleFrontier_BattleTowerLobby_MapBGEvents: @ 853B728 +BattleFrontier_BattleTowerLobby_MapBGEvents: bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFC7 bg_event 8, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFE0 bg_event 12, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23EFF9 bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_BattleTowerLobby_EventScript_23F012 bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_BattleTowerLobby_EventScript_23F4BE -BattleFrontier_BattleTowerLobby_MapEvents:: @ 853B764 +BattleFrontier_BattleTowerLobby_MapEvents:: map_events BattleFrontier_BattleTowerLobby_EventObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents diff --git a/data/maps/BattleFrontier_BattleTowerLobby/header.inc b/data/maps/BattleFrontier_BattleTowerLobby/header.inc index 989bffe9b..b1ca3914a 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/header.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerLobby: @ 84851C8 +BattleFrontier_BattleTowerLobby: .4byte BattleFrontier_BattleTowerLobby_Layout .4byte BattleFrontier_BattleTowerLobby_MapEvents .4byte BattleFrontier_BattleTowerLobby_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 264 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc index 9f3977075..d7dfcd3ad 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64 +BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2 @@ -9,6 +9,6 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64 object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 15, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_1 object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_ALT_2 -BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C +BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc index 23a792934..d8fc1abb6 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleTowerMultiBattleRoom: @ 84852E0 +BattleFrontier_BattleTowerMultiBattleRoom: .4byte BattleFrontier_BattleTowerMultiBattleRoom_Layout .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapEvents .4byte BattleFrontier_BattleTowerMultiBattleRoom_MapScripts .4byte 0x0 .2byte MUS_SATTOWER - .2byte 390 + .2byte LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge1/events.inc b/data/maps/BattleFrontier_Lounge1/events.inc index 78ef44109..7fb5e6256 100644 --- a/data/maps/BattleFrontier_Lounge1/events.inc +++ b/data/maps/BattleFrontier_Lounge1/events.inc @@ -1,11 +1,11 @@ -BattleFrontier_Lounge1_EventObjects: @ 853CFB4 +BattleFrontier_Lounge1_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 0, 6, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0 object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 7, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0 object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0 -BattleFrontier_Lounge1_MapWarps: @ 853CFFC +BattleFrontier_Lounge1_MapWarps: warp_def 4, 9, 0, 5, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_Lounge1_MapEvents:: @ 853D004 +BattleFrontier_Lounge1_MapEvents:: map_events BattleFrontier_Lounge1_EventObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge1/header.inc b/data/maps/BattleFrontier_Lounge1/header.inc index 58caac903..69119443d 100644 --- a/data/maps/BattleFrontier_Lounge1/header.inc +++ b/data/maps/BattleFrontier_Lounge1/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge1: @ 84855B8 +BattleFrontier_Lounge1: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge1_MapEvents .4byte BattleFrontier_Lounge1_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge2/events.inc b/data/maps/BattleFrontier_Lounge2/events.inc index cc32ddf42..faa0a5608 100644 --- a/data/maps/BattleFrontier_Lounge2/events.inc +++ b/data/maps/BattleFrontier_Lounge2/events.inc @@ -1,14 +1,14 @@ -BattleFrontier_Lounge2_EventObjects: @ 853D11C +BattleFrontier_Lounge2_EventObjects: object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0 object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 10, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0 object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 10, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0 object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 4, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0 object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 10, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0 -BattleFrontier_Lounge2_MapWarps: @ 853D194 +BattleFrontier_Lounge2_MapWarps: warp_def 1, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 2, 7, 0, 3, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_Lounge2_MapEvents:: @ 853D1A4 +BattleFrontier_Lounge2_MapEvents:: map_events BattleFrontier_Lounge2_EventObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge2/header.inc b/data/maps/BattleFrontier_Lounge2/header.inc index effcc53bd..a74f85ca4 100644 --- a/data/maps/BattleFrontier_Lounge2/header.inc +++ b/data/maps/BattleFrontier_Lounge2/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge2: @ 84855F0 +BattleFrontier_Lounge2: .4byte BattleFrontier_Lounge1_Layout .4byte BattleFrontier_Lounge2_MapEvents .4byte BattleFrontier_Lounge2_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 397 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE1 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge3/events.inc b/data/maps/BattleFrontier_Lounge3/events.inc index bce1dfa35..f8a26e4dd 100644 --- a/data/maps/BattleFrontier_Lounge3/events.inc +++ b/data/maps/BattleFrontier_Lounge3/events.inc @@ -1,13 +1,13 @@ -BattleFrontier_Lounge3_EventObjects: @ 853D1B8 +BattleFrontier_Lounge3_EventObjects: object_event 1, EVENT_OBJ_GFX_HIKER, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0 object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 5, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0 object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 0, 3, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0 -BattleFrontier_Lounge3_MapWarps: @ 853D230 +BattleFrontier_Lounge3_MapWarps: warp_def 4, 9, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_Lounge3_MapEvents:: @ 853D238 +BattleFrontier_Lounge3_MapEvents:: map_events BattleFrontier_Lounge3_EventObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge3/header.inc b/data/maps/BattleFrontier_Lounge3/header.inc index d6867551e..fb27b1580 100644 --- a/data/maps/BattleFrontier_Lounge3/header.inc +++ b/data/maps/BattleFrontier_Lounge3/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge3: @ 848560C +BattleFrontier_Lounge3: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge3_MapEvents .4byte BattleFrontier_Lounge3_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge4/events.inc b/data/maps/BattleFrontier_Lounge4/events.inc index 8b86bebc7..c2e2f44a2 100644 --- a/data/maps/BattleFrontier_Lounge4/events.inc +++ b/data/maps/BattleFrontier_Lounge4/events.inc @@ -1,11 +1,11 @@ -BattleFrontier_Lounge4_EventObjects: @ 853D24C +BattleFrontier_Lounge4_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0 object_event 2, EVENT_OBJ_GFX_COOK, 0, 6, 6, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 2, 1, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0 -BattleFrontier_Lounge4_MapWarps: @ 853D294 +BattleFrontier_Lounge4_MapWarps: warp_def 4, 9, 0, 6, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_Lounge4_MapEvents:: @ 853D29C +BattleFrontier_Lounge4_MapEvents:: map_events BattleFrontier_Lounge4_EventObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge4/header.inc b/data/maps/BattleFrontier_Lounge4/header.inc index 912cc41ff..edb6171e7 100644 --- a/data/maps/BattleFrontier_Lounge4/header.inc +++ b/data/maps/BattleFrontier_Lounge4/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge4: @ 8485628 +BattleFrontier_Lounge4: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge4_MapEvents .4byte BattleFrontier_Lounge4_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge5/events.inc b/data/maps/BattleFrontier_Lounge5/events.inc index 216a72473..e0a2ea344 100644 --- a/data/maps/BattleFrontier_Lounge5/events.inc +++ b/data/maps/BattleFrontier_Lounge5/events.inc @@ -1,13 +1,13 @@ -BattleFrontier_Lounge5_EventObjects: @ 853D2EC +BattleFrontier_Lounge5_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 12, 4, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0 object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0 object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 11, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0 -BattleFrontier_Lounge5_MapWarps: @ 853D34C +BattleFrontier_Lounge5_MapWarps: warp_def 1, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 2, 7, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_Lounge5_MapEvents:: @ 853D35C +BattleFrontier_Lounge5_MapEvents:: map_events BattleFrontier_Lounge5_EventObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge5/header.inc b/data/maps/BattleFrontier_Lounge5/header.inc index a6febc0c8..9c9de0e3b 100644 --- a/data/maps/BattleFrontier_Lounge5/header.inc +++ b/data/maps/BattleFrontier_Lounge5/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge5: @ 8485660 +BattleFrontier_Lounge5: .4byte BattleFrontier_Lounge1_Layout .4byte BattleFrontier_Lounge5_MapEvents .4byte BattleFrontier_Lounge5_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 397 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE1 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge6/events.inc b/data/maps/BattleFrontier_Lounge6/events.inc index 24d7958ec..8c3950d61 100644 --- a/data/maps/BattleFrontier_Lounge6/events.inc +++ b/data/maps/BattleFrontier_Lounge6/events.inc @@ -1,9 +1,9 @@ -BattleFrontier_Lounge6_EventObjects: @ 853D370 +BattleFrontier_Lounge6_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0 -BattleFrontier_Lounge6_MapWarps: @ 853D388 +BattleFrontier_Lounge6_MapWarps: warp_def 4, 9, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_Lounge6_MapEvents:: @ 853D390 +BattleFrontier_Lounge6_MapEvents:: map_events BattleFrontier_Lounge6_EventObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge6/header.inc b/data/maps/BattleFrontier_Lounge6/header.inc index 151890a14..2b5f8474f 100644 --- a/data/maps/BattleFrontier_Lounge6/header.inc +++ b/data/maps/BattleFrontier_Lounge6/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge6: @ 848567C +BattleFrontier_Lounge6: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge6_MapEvents .4byte BattleFrontier_Lounge6_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge7/events.inc b/data/maps/BattleFrontier_Lounge7/events.inc index de4aef12a..bc7f289ad 100644 --- a/data/maps/BattleFrontier_Lounge7/events.inc +++ b/data/maps/BattleFrontier_Lounge7/events.inc @@ -1,12 +1,12 @@ -BattleFrontier_Lounge7_EventObjects: @ 853D3A4 +BattleFrontier_Lounge7_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_F, 0, 2, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0 object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 8, 3, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0 -BattleFrontier_Lounge7_MapWarps: @ 853D404 +BattleFrontier_Lounge7_MapWarps: warp_def 4, 9, 0, 7, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_Lounge7_MapEvents:: @ 853D40C +BattleFrontier_Lounge7_MapEvents:: map_events BattleFrontier_Lounge7_EventObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge7/header.inc b/data/maps/BattleFrontier_Lounge7/header.inc index 061d2102c..58b9dc3e5 100644 --- a/data/maps/BattleFrontier_Lounge7/header.inc +++ b/data/maps/BattleFrontier_Lounge7/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge7: @ 8485698 +BattleFrontier_Lounge7: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge7_MapEvents .4byte BattleFrontier_Lounge7_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge8/events.inc b/data/maps/BattleFrontier_Lounge8/events.inc index c8edc68aa..47e8e51f1 100644 --- a/data/maps/BattleFrontier_Lounge8/events.inc +++ b/data/maps/BattleFrontier_Lounge8/events.inc @@ -1,11 +1,11 @@ -BattleFrontier_Lounge8_EventObjects: @ 853D4BC +BattleFrontier_Lounge8_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 4, 5, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 8, 7, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0 -BattleFrontier_Lounge8_MapWarps: @ 853D504 +BattleFrontier_Lounge8_MapWarps: warp_def 4, 9, 0, 10, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_Lounge8_MapEvents:: @ 853D50C +BattleFrontier_Lounge8_MapEvents:: map_events BattleFrontier_Lounge8_EventObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge8/header.inc b/data/maps/BattleFrontier_Lounge8/header.inc index e1b319e1d..578219cc4 100644 --- a/data/maps/BattleFrontier_Lounge8/header.inc +++ b/data/maps/BattleFrontier_Lounge8/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge8: @ 84856D0 +BattleFrontier_Lounge8: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge8_MapEvents .4byte BattleFrontier_Lounge8_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Lounge9/events.inc b/data/maps/BattleFrontier_Lounge9/events.inc index 6598e0229..ce86367cf 100644 --- a/data/maps/BattleFrontier_Lounge9/events.inc +++ b/data/maps/BattleFrontier_Lounge9/events.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge9_EventObjects: @ 853D520 +BattleFrontier_Lounge9_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 6, 3, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 -BattleFrontier_Lounge9_MapWarps: @ 853D538 +BattleFrontier_Lounge9_MapWarps: warp_def 1, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 2, 9, 0, 11, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_Lounge9_MapEvents:: @ 853D548 +BattleFrontier_Lounge9_MapEvents:: map_events BattleFrontier_Lounge9_EventObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Lounge9/header.inc b/data/maps/BattleFrontier_Lounge9/header.inc index 916feb569..32b1512ef 100644 --- a/data/maps/BattleFrontier_Lounge9/header.inc +++ b/data/maps/BattleFrontier_Lounge9/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge9: @ 84856EC +BattleFrontier_Lounge9: .4byte BattleFrontier_Lounge2_Layout .4byte BattleFrontier_Lounge9_MapEvents .4byte BattleFrontier_Lounge9_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 429 + .2byte LAYOUT_BATTLE_FRONTIER_LOUNGE2 .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_Mart/events.inc b/data/maps/BattleFrontier_Mart/events.inc index 9e57319f0..e637b489b 100644 --- a/data/maps/BattleFrontier_Mart/events.inc +++ b/data/maps/BattleFrontier_Mart/events.inc @@ -1,13 +1,13 @@ -BattleFrontier_Mart_EventObjects: @ 853D68C +BattleFrontier_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0 object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0 object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0 object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0 -BattleFrontier_Mart_MapWarps: @ 853D6EC +BattleFrontier_Mart_MapWarps: warp_def 3, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 4, 7, 0, 4, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_Mart_MapEvents:: @ 853D6FC +BattleFrontier_Mart_MapEvents:: map_events BattleFrontier_Mart_EventObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_Mart/header.inc b/data/maps/BattleFrontier_Mart/header.inc index 7dcfb9d33..97251160f 100644 --- a/data/maps/BattleFrontier_Mart/header.inc +++ b/data/maps/BattleFrontier_Mart/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_Mart: @ 8485740 +BattleFrontier_Mart: .4byte Mart_Layout .4byte BattleFrontier_Mart_MapEvents .4byte BattleFrontier_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_OutsideEast/connections.inc b/data/maps/BattleFrontier_OutsideEast/connections.inc index 5a2d13f7f..e042da23e 100644 --- a/data/maps/BattleFrontier_OutsideEast/connections.inc +++ b/data/maps/BattleFrontier_OutsideEast/connections.inc @@ -1,7 +1,7 @@ -BattleFrontier_OutsideEast_MapConnectionsList: @ 8486EE4 +BattleFrontier_OutsideEast_MapConnectionsList: connection left, 0, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_OutsideEast_MapConnections: @ 8486EF0 - .4byte 0x1 +BattleFrontier_OutsideEast_MapConnections: + .4byte 1 .4byte BattleFrontier_OutsideEast_MapConnectionsList diff --git a/data/maps/BattleFrontier_OutsideEast/events.inc b/data/maps/BattleFrontier_OutsideEast/events.inc index a16bca779..b5ee58e49 100644 --- a/data/maps/BattleFrontier_OutsideEast/events.inc +++ b/data/maps/BattleFrontier_OutsideEast/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_OutsideEast_EventObjects: @ 853BB10 +BattleFrontier_OutsideEast_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 20, 17, 0, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 42, 15, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0 object_event 3, EVENT_OBJ_GFX_HIKER, 0, 53, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0 @@ -26,7 +26,7 @@ BattleFrontier_OutsideEast_EventObjects: @ 853BB10 object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 48, 41, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0 object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 29, 14, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0 -BattleFrontier_OutsideEast_MapWarps: @ 853BD80 +BattleFrontier_OutsideEast_MapWarps: warp_def 16, 14, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY warp_def 39, 29, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY warp_def 45, 56, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY @@ -42,7 +42,7 @@ BattleFrontier_OutsideEast_MapWarps: @ 853BD80 warp_def 3, 51, 0, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F warp_def 28, 7, 0, 0, MAP_ARTISAN_CAVE_1F -BattleFrontier_OutsideEast_MapBGEvents: @ 853BDF0 +BattleFrontier_OutsideEast_MapBGEvents: bg_event 13, 17, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C43 bg_event 43, 56, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C4C bg_event 36, 34, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_242C55 @@ -52,6 +52,6 @@ BattleFrontier_OutsideEast_MapBGEvents: @ 853BDF0 bg_event 4, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_271E73 bg_event 5, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideEast_EventScript_271E73 -BattleFrontier_OutsideEast_MapEvents:: @ 853BE50 +BattleFrontier_OutsideEast_MapEvents:: map_events BattleFrontier_OutsideEast_EventObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents diff --git a/data/maps/BattleFrontier_OutsideEast/header.inc b/data/maps/BattleFrontier_OutsideEast/header.inc index b67df4029..72e10d0dd 100644 --- a/data/maps/BattleFrontier_OutsideEast/header.inc +++ b/data/maps/BattleFrontier_OutsideEast/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_OutsideEast: @ 84852C4 +BattleFrontier_OutsideEast: .4byte BattleFrontier_OutsideEast_Layout .4byte BattleFrontier_OutsideEast_MapEvents .4byte BattleFrontier_OutsideEast_MapScripts .4byte BattleFrontier_OutsideEast_MapConnections .2byte MUS_B_FRONTIER - .2byte 345 + .2byte LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_OutsideWest/connections.inc b/data/maps/BattleFrontier_OutsideWest/connections.inc index 1d20172f2..0755b3c44 100644 --- a/data/maps/BattleFrontier_OutsideWest/connections.inc +++ b/data/maps/BattleFrontier_OutsideWest/connections.inc @@ -1,7 +1,7 @@ -BattleFrontier_OutsideWest_MapConnectionsList: @ 8486ED0 +BattleFrontier_OutsideWest_MapConnectionsList: connection right, 0, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_OutsideWest_MapConnections: @ 8486EDC - .4byte 0x1 +BattleFrontier_OutsideWest_MapConnections: + .4byte 1 .4byte BattleFrontier_OutsideWest_MapConnectionsList diff --git a/data/maps/BattleFrontier_OutsideWest/events.inc b/data/maps/BattleFrontier_OutsideWest/events.inc index de372832f..87c0db7aa 100644 --- a/data/maps/BattleFrontier_OutsideWest/events.inc +++ b/data/maps/BattleFrontier_OutsideWest/events.inc @@ -1,4 +1,4 @@ -BattleFrontier_OutsideWest_EventObjects: @ 853B350 +BattleFrontier_OutsideWest_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 26, 38, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 20, 70, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 19, 68, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0 @@ -24,7 +24,7 @@ BattleFrontier_OutsideWest_EventObjects: @ 853B350 object_event 23, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0 object_event 24, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 26, 0, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0 -BattleFrontier_OutsideWest_MapWarps: @ 853B590 +BattleFrontier_OutsideWest_MapWarps: warp_def 42, 27, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY warp_def 19, 17, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_DOME_LOBBY warp_def 11, 38, 0, 0, MAP_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY @@ -37,13 +37,13 @@ BattleFrontier_OutsideWest_MapWarps: @ 853B590 warp_def 26, 61, 0, 1, MAP_BATTLE_FRONTIER_RECEPTION_GATE warp_def 39, 55, 0, 0, MAP_ARTISAN_CAVE_B1F -BattleFrontier_OutsideWest_MapBGEvents: @ 853B5E8 +BattleFrontier_OutsideWest_MapBGEvents: bg_event 15, 18, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4E2 bg_event 45, 30, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4F4 bg_event 16, 43, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_23D4EB bg_event 52, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A bg_event 53, 51, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_OutsideWest_EventScript_271E6A -BattleFrontier_OutsideWest_MapEvents:: @ 853B624 +BattleFrontier_OutsideWest_MapEvents:: map_events BattleFrontier_OutsideWest_EventObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents diff --git a/data/maps/BattleFrontier_OutsideWest/header.inc b/data/maps/BattleFrontier_OutsideWest/header.inc index 312c1961a..40f26c151 100644 --- a/data/maps/BattleFrontier_OutsideWest/header.inc +++ b/data/maps/BattleFrontier_OutsideWest/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_OutsideWest: @ 84851AC +BattleFrontier_OutsideWest: .4byte BattleFrontier_OutsideWest_Layout .4byte BattleFrontier_OutsideWest_MapEvents .4byte BattleFrontier_OutsideWest_MapScripts .4byte BattleFrontier_OutsideWest_MapConnections .2byte MUS_B_FRONTIER - .2byte 265 + .2byte LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc index 5f2782f0f..20bad9c6d 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/events.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/events.inc @@ -1,15 +1,15 @@ -BattleFrontier_PokemonCenter_1F_EventObjects: @ 853D55C +BattleFrontier_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0 object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0 object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0 -BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4 +BattleFrontier_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 6, 8, 3, 12, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 1, 6, 4, 0, MAP_BATTLE_FRONTIER_POKEMON_CENTER_2F -BattleFrontier_PokemonCenter_1F_MapEvents:: @ 853D5EC +BattleFrontier_PokemonCenter_1F_MapEvents:: map_events BattleFrontier_PokemonCenter_1F_EventObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc index dcf26742c..65445c2a1 100644 --- a/data/maps/BattleFrontier_PokemonCenter_1F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_PokemonCenter_1F: @ 8485708 +BattleFrontier_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte BattleFrontier_PokemonCenter_1F_MapEvents .4byte BattleFrontier_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc index 75bd2ebbb..d2f3730e8 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/events.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600 +BattleFrontier_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660 +BattleFrontier_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_BATTLE_FRONTIER_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -BattleFrontier_PokemonCenter_2F_MapEvents:: @ 853D678 +BattleFrontier_PokemonCenter_2F_MapEvents:: map_events BattleFrontier_PokemonCenter_2F_EventObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc index 6bcff1234..fbd39cde9 100644 --- a/data/maps/BattleFrontier_PokemonCenter_2F/header.inc +++ b/data/maps/BattleFrontier_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_PokemonCenter_2F: @ 8485724 +BattleFrontier_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte BattleFrontier_PokemonCenter_2F_MapEvents .4byte BattleFrontier_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_RankingHall/events.inc b/data/maps/BattleFrontier_RankingHall/events.inc index abec40c17..30a0e5ebb 100644 --- a/data/maps/BattleFrontier_RankingHall/events.inc +++ b/data/maps/BattleFrontier_RankingHall/events.inc @@ -1,13 +1,13 @@ -BattleFrontier_RankingHall_EventObjects: @ 853CEB8 +BattleFrontier_RankingHall_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0 object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 4, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0 object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 44, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0 -BattleFrontier_RankingHall_MapWarps: @ 853CF00 +BattleFrontier_RankingHall_MapWarps: warp_def 26, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST warp_def 27, 14, 3, 4, MAP_BATTLE_FRONTIER_OUTSIDE_EAST -BattleFrontier_RankingHall_MapBGEvents: @ 853CF10 +BattleFrontier_RankingHall_MapBGEvents: bg_event 26, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4AA bg_event 23, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4B6 bg_event 26, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, BattleFrontier_RankingHall_EventScript_25E4C2 @@ -21,6 +21,6 @@ BattleFrontier_RankingHall_MapBGEvents: @ 853CF10 bg_event 16, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E538 bg_event 36, 8, 0, BG_EVENT_PLAYER_FACING_ANY, BattleFrontier_RankingHall_EventScript_25E541 -BattleFrontier_RankingHall_MapEvents:: @ 853CFA0 +BattleFrontier_RankingHall_MapEvents:: map_events BattleFrontier_RankingHall_EventObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents diff --git a/data/maps/BattleFrontier_RankingHall/header.inc b/data/maps/BattleFrontier_RankingHall/header.inc index 03d9e3622..0f001d563 100644 --- a/data/maps/BattleFrontier_RankingHall/header.inc +++ b/data/maps/BattleFrontier_RankingHall/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_RankingHall: @ 848559C +BattleFrontier_RankingHall: .4byte BattleFrontier_RankingHall_Layout .4byte BattleFrontier_RankingHall_MapEvents .4byte BattleFrontier_RankingHall_MapScripts .4byte 0x0 .2byte MUS_BIJYUTU - .2byte 396 + .2byte LAYOUT_BATTLE_FRONTIER_RANKING_HALL .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_ReceptionGate/events.inc b/data/maps/BattleFrontier_ReceptionGate/events.inc index 551cb802f..c1e55ad87 100644 --- a/data/maps/BattleFrontier_ReceptionGate/events.inc +++ b/data/maps/BattleFrontier_ReceptionGate/events.inc @@ -1,14 +1,14 @@ -BattleFrontier_ReceptionGate_EventObjects: @ 853D420 +BattleFrontier_ReceptionGate_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 8, 11, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0 object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0 object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_BATTLE_FRONTIER_RECEPTION_GATE_SCOTT object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0 -BattleFrontier_ReceptionGate_MapWarps: @ 853D498 +BattleFrontier_ReceptionGate_MapWarps: warp_def 4, 13, 0, 8, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 4, 1, 0, 9, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_ReceptionGate_MapEvents:: @ 853D4A8 +BattleFrontier_ReceptionGate_MapEvents:: map_events BattleFrontier_ReceptionGate_EventObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_ReceptionGate/header.inc b/data/maps/BattleFrontier_ReceptionGate/header.inc index 099ab38e1..46a55a6b1 100644 --- a/data/maps/BattleFrontier_ReceptionGate/header.inc +++ b/data/maps/BattleFrontier_ReceptionGate/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_ReceptionGate: @ 84856B4 +BattleFrontier_ReceptionGate: .4byte BattleFrontier_ReceptionGate_Layout .4byte BattleFrontier_ReceptionGate_MapEvents .4byte BattleFrontier_ReceptionGate_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 399 + .2byte LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattleFrontier_ScottsHouse/events.inc b/data/maps/BattleFrontier_ScottsHouse/events.inc index 3f4dcff86..acb02c4d8 100644 --- a/data/maps/BattleFrontier_ScottsHouse/events.inc +++ b/data/maps/BattleFrontier_ScottsHouse/events.inc @@ -1,10 +1,10 @@ -BattleFrontier_ScottsHouse_EventObjects: @ 853D2B0 +BattleFrontier_ScottsHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0 -BattleFrontier_ScottsHouse_MapWarps: @ 853D2C8 +BattleFrontier_ScottsHouse_MapWarps: warp_def 2, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST warp_def 3, 7, 3, 5, MAP_BATTLE_FRONTIER_OUTSIDE_WEST -BattleFrontier_ScottsHouse_MapEvents:: @ 853D2D8 +BattleFrontier_ScottsHouse_MapEvents:: map_events BattleFrontier_ScottsHouse_EventObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/BattleFrontier_ScottsHouse/header.inc b/data/maps/BattleFrontier_ScottsHouse/header.inc index fe55f8272..ff41a82e3 100644 --- a/data/maps/BattleFrontier_ScottsHouse/header.inc +++ b/data/maps/BattleFrontier_ScottsHouse/header.inc @@ -1,10 +1,10 @@ -BattleFrontier_ScottsHouse: @ 8485644 +BattleFrontier_ScottsHouse: .4byte BattleFrontier_ScottsHouse_Layout .4byte BattleFrontier_ScottsHouse_MapEvents .4byte BattleFrontier_ScottsHouse_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 430 + .2byte LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE .byte MAPSEC_BATTLE_FRONTIER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare01/events.inc b/data/maps/BattlePyramidSquare01/events.inc index cf5cfc1af..bcc81b36c 100644 --- a/data/maps/BattlePyramidSquare01/events.inc +++ b/data/maps/BattlePyramidSquare01/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare01_EventObjects: @ 853A460 +BattlePyramidSquare01_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 5, 3, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare01_EventObjects: @ 853A460 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare01_MapEvents:: @ 853A508 +BattlePyramidSquare01_MapEvents:: map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare01/header.inc b/data/maps/BattlePyramidSquare01/header.inc index d9105ed4a..e63919e43 100644 --- a/data/maps/BattlePyramidSquare01/header.inc +++ b/data/maps/BattlePyramidSquare01/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare01: @ 8484F60 +BattlePyramidSquare01: .4byte BattlePyramidSquare01_Layout .4byte BattlePyramidSquare01_MapEvents .4byte BattlePyramidSquare01_MapScripts .4byte 0x0 .2byte 65535 - .2byte 362 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE01 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare02/events.inc b/data/maps/BattlePyramidSquare02/events.inc index ad621d684..978c55982 100644 --- a/data/maps/BattlePyramidSquare02/events.inc +++ b/data/maps/BattlePyramidSquare02/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare02_EventObjects: @ 853A51C +BattlePyramidSquare02_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare02_EventObjects: @ 853A51C object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare02_MapEvents:: @ 853A5C4 +BattlePyramidSquare02_MapEvents:: map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare02/header.inc b/data/maps/BattlePyramidSquare02/header.inc index cebb14906..61a1272cf 100644 --- a/data/maps/BattlePyramidSquare02/header.inc +++ b/data/maps/BattlePyramidSquare02/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare02: @ 8484F7C +BattlePyramidSquare02: .4byte BattlePyramidSquare02_Layout .4byte BattlePyramidSquare02_MapEvents .4byte BattlePyramidSquare02_MapScripts .4byte 0x0 .2byte 65535 - .2byte 363 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE02 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare03/events.inc b/data/maps/BattlePyramidSquare03/events.inc index 8eb81b96a..339010e8a 100644 --- a/data/maps/BattlePyramidSquare03/events.inc +++ b/data/maps/BattlePyramidSquare03/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare03_EventObjects: @ 853A5D8 +BattlePyramidSquare03_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 6, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare03_EventObjects: @ 853A5D8 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare03_MapEvents:: @ 853A680 +BattlePyramidSquare03_MapEvents:: map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare03/header.inc b/data/maps/BattlePyramidSquare03/header.inc index 389cd6538..ef7663ed0 100644 --- a/data/maps/BattlePyramidSquare03/header.inc +++ b/data/maps/BattlePyramidSquare03/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare03: @ 8484F98 +BattlePyramidSquare03: .4byte BattlePyramidSquare03_Layout .4byte BattlePyramidSquare03_MapEvents .4byte BattlePyramidSquare03_MapScripts .4byte 0x0 .2byte 65535 - .2byte 364 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE03 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare04/events.inc b/data/maps/BattlePyramidSquare04/events.inc index 79caf09ff..4c4cf7df1 100644 --- a/data/maps/BattlePyramidSquare04/events.inc +++ b/data/maps/BattlePyramidSquare04/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare04_EventObjects: @ 853A694 +BattlePyramidSquare04_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 7, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 1, 4, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare04_EventObjects: @ 853A694 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare04_MapEvents:: @ 853A73C +BattlePyramidSquare04_MapEvents:: map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare04/header.inc b/data/maps/BattlePyramidSquare04/header.inc index 3b09fce2e..7525f2b04 100644 --- a/data/maps/BattlePyramidSquare04/header.inc +++ b/data/maps/BattlePyramidSquare04/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare04: @ 8484FB4 +BattlePyramidSquare04: .4byte BattlePyramidSquare04_Layout .4byte BattlePyramidSquare04_MapEvents .4byte BattlePyramidSquare04_MapScripts .4byte 0x0 .2byte 65535 - .2byte 365 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE04 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare05/events.inc b/data/maps/BattlePyramidSquare05/events.inc index 472178c56..fe794509b 100644 --- a/data/maps/BattlePyramidSquare05/events.inc +++ b/data/maps/BattlePyramidSquare05/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare05_EventObjects: @ 853A750 +BattlePyramidSquare05_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 3, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 3, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare05_EventObjects: @ 853A750 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare05_MapEvents:: @ 853A7F8 +BattlePyramidSquare05_MapEvents:: map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare05/header.inc b/data/maps/BattlePyramidSquare05/header.inc index ec6eff68c..673d29e25 100644 --- a/data/maps/BattlePyramidSquare05/header.inc +++ b/data/maps/BattlePyramidSquare05/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare05: @ 8484FD0 +BattlePyramidSquare05: .4byte BattlePyramidSquare05_Layout .4byte BattlePyramidSquare05_MapEvents .4byte BattlePyramidSquare05_MapScripts .4byte 0x0 .2byte 65535 - .2byte 366 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE05 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare06/events.inc b/data/maps/BattlePyramidSquare06/events.inc index 3363f6d43..a7a1776e7 100644 --- a/data/maps/BattlePyramidSquare06/events.inc +++ b/data/maps/BattlePyramidSquare06/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare06_EventObjects: @ 853A80C +BattlePyramidSquare06_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 5, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 5, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare06_EventObjects: @ 853A80C object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare06_MapEvents:: @ 853A8B4 +BattlePyramidSquare06_MapEvents:: map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare06/header.inc b/data/maps/BattlePyramidSquare06/header.inc index 7890c3088..2487c4a94 100644 --- a/data/maps/BattlePyramidSquare06/header.inc +++ b/data/maps/BattlePyramidSquare06/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare06: @ 8484FEC +BattlePyramidSquare06: .4byte BattlePyramidSquare06_Layout .4byte BattlePyramidSquare06_MapEvents .4byte BattlePyramidSquare06_MapScripts .4byte 0x0 .2byte 65535 - .2byte 367 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE06 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare07/events.inc b/data/maps/BattlePyramidSquare07/events.inc index 8d63fc4e1..85e987626 100644 --- a/data/maps/BattlePyramidSquare07/events.inc +++ b/data/maps/BattlePyramidSquare07/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare07_EventObjects: @ 853A8C8 +BattlePyramidSquare07_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_BOY, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 4, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare07_EventObjects: @ 853A8C8 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare07_MapEvents:: @ 853A970 +BattlePyramidSquare07_MapEvents:: map_events BattlePyramidSquare07_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare07/header.inc b/data/maps/BattlePyramidSquare07/header.inc index 7f1bb51f1..aa31ddcb0 100644 --- a/data/maps/BattlePyramidSquare07/header.inc +++ b/data/maps/BattlePyramidSquare07/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare07: @ 8485008 +BattlePyramidSquare07: .4byte BattlePyramidSquare07_Layout .4byte BattlePyramidSquare07_MapEvents .4byte BattlePyramidSquare07_MapScripts .4byte 0x0 .2byte 65535 - .2byte 368 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE07 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare08/events.inc b/data/maps/BattlePyramidSquare08/events.inc index 77ed5da6b..dac62da21 100644 --- a/data/maps/BattlePyramidSquare08/events.inc +++ b/data/maps/BattlePyramidSquare08/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare08_EventObjects: @ 853A984 +BattlePyramidSquare08_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 2, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare08_EventObjects: @ 853A984 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare08_MapEvents:: @ 853AA2C +BattlePyramidSquare08_MapEvents:: map_events BattlePyramidSquare08_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare08/header.inc b/data/maps/BattlePyramidSquare08/header.inc index a5d641519..f579f958b 100644 --- a/data/maps/BattlePyramidSquare08/header.inc +++ b/data/maps/BattlePyramidSquare08/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare08: @ 8485024 +BattlePyramidSquare08: .4byte BattlePyramidSquare08_Layout .4byte BattlePyramidSquare08_MapEvents .4byte BattlePyramidSquare08_MapScripts .4byte 0x0 .2byte 65535 - .2byte 369 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE08 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare09/events.inc b/data/maps/BattlePyramidSquare09/events.inc index 0fd84a8c5..17a4a1e38 100644 --- a/data/maps/BattlePyramidSquare09/events.inc +++ b/data/maps/BattlePyramidSquare09/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare09_EventObjects: @ 853AA40 +BattlePyramidSquare09_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 6, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare09_EventObjects: @ 853AA40 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 6, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare09_MapEvents:: @ 853AAE8 +BattlePyramidSquare09_MapEvents:: map_events BattlePyramidSquare09_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare09/header.inc b/data/maps/BattlePyramidSquare09/header.inc index d396c65a6..6dac1b9fe 100644 --- a/data/maps/BattlePyramidSquare09/header.inc +++ b/data/maps/BattlePyramidSquare09/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare09: @ 8485040 +BattlePyramidSquare09: .4byte BattlePyramidSquare09_Layout .4byte BattlePyramidSquare09_MapEvents .4byte BattlePyramidSquare09_MapScripts .4byte 0x0 .2byte 65535 - .2byte 370 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE09 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare10/events.inc b/data/maps/BattlePyramidSquare10/events.inc index b697a7d02..f172155f9 100644 --- a/data/maps/BattlePyramidSquare10/events.inc +++ b/data/maps/BattlePyramidSquare10/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare10_EventObjects: @ 853AAFC +BattlePyramidSquare10_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare10_EventObjects: @ 853AAFC object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 1, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare10_MapEvents:: @ 853ABA4 +BattlePyramidSquare10_MapEvents:: map_events BattlePyramidSquare10_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare10/header.inc b/data/maps/BattlePyramidSquare10/header.inc index 254c24708..ac899c718 100644 --- a/data/maps/BattlePyramidSquare10/header.inc +++ b/data/maps/BattlePyramidSquare10/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare10: @ 848505C +BattlePyramidSquare10: .4byte BattlePyramidSquare10_Layout .4byte BattlePyramidSquare10_MapEvents .4byte BattlePyramidSquare10_MapScripts .4byte 0x0 .2byte 65535 - .2byte 371 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE10 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare11/events.inc b/data/maps/BattlePyramidSquare11/events.inc index e90e691e5..60c5e0e2d 100644 --- a/data/maps/BattlePyramidSquare11/events.inc +++ b/data/maps/BattlePyramidSquare11/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare11_EventObjects: @ 853ABB8 +BattlePyramidSquare11_EventObjects: object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 2, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 6, 4, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare11_EventObjects: @ 853ABB8 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare11_MapEvents:: @ 853AC60 +BattlePyramidSquare11_MapEvents:: map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare11/header.inc b/data/maps/BattlePyramidSquare11/header.inc index 765b74a0a..ca560a4a7 100644 --- a/data/maps/BattlePyramidSquare11/header.inc +++ b/data/maps/BattlePyramidSquare11/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare11: @ 8485078 +BattlePyramidSquare11: .4byte BattlePyramidSquare11_Layout .4byte BattlePyramidSquare11_MapEvents .4byte BattlePyramidSquare11_MapScripts .4byte 0x0 .2byte 65535 - .2byte 372 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE11 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare12/events.inc b/data/maps/BattlePyramidSquare12/events.inc index cad871e8d..7c650b972 100644 --- a/data/maps/BattlePyramidSquare12/events.inc +++ b/data/maps/BattlePyramidSquare12/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare12_EventObjects: @ 853AC74 +BattlePyramidSquare12_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 7, 5, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 5, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 3, 0, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare12_EventObjects: @ 853AC74 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare12_MapEvents:: @ 853AD1C +BattlePyramidSquare12_MapEvents:: map_events BattlePyramidSquare12_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare12/header.inc b/data/maps/BattlePyramidSquare12/header.inc index e81801a35..59793abe7 100644 --- a/data/maps/BattlePyramidSquare12/header.inc +++ b/data/maps/BattlePyramidSquare12/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare12: @ 8485094 +BattlePyramidSquare12: .4byte BattlePyramidSquare12_Layout .4byte BattlePyramidSquare12_MapEvents .4byte BattlePyramidSquare12_MapScripts .4byte 0x0 .2byte 65535 - .2byte 373 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE12 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare13/events.inc b/data/maps/BattlePyramidSquare13/events.inc index af56598c3..90d427f2d 100644 --- a/data/maps/BattlePyramidSquare13/events.inc +++ b/data/maps/BattlePyramidSquare13/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare13_EventObjects: @ 853AD30 +BattlePyramidSquare13_EventObjects: object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 6, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare13_EventObjects: @ 853AD30 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare13_MapEvents:: @ 853ADD8 +BattlePyramidSquare13_MapEvents:: map_events BattlePyramidSquare13_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare13/header.inc b/data/maps/BattlePyramidSquare13/header.inc index 356063c35..d0012926c 100644 --- a/data/maps/BattlePyramidSquare13/header.inc +++ b/data/maps/BattlePyramidSquare13/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare13: @ 84850B0 +BattlePyramidSquare13: .4byte BattlePyramidSquare13_Layout .4byte BattlePyramidSquare13_MapEvents .4byte BattlePyramidSquare13_MapScripts .4byte 0x0 .2byte 65535 - .2byte 374 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE13 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare14/events.inc b/data/maps/BattlePyramidSquare14/events.inc index f2d28d456..80f28a83a 100644 --- a/data/maps/BattlePyramidSquare14/events.inc +++ b/data/maps/BattlePyramidSquare14/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare14_EventObjects: @ 853ADEC +BattlePyramidSquare14_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare14_EventObjects: @ 853ADEC object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare14_MapEvents:: @ 853AE94 +BattlePyramidSquare14_MapEvents:: map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare14/header.inc b/data/maps/BattlePyramidSquare14/header.inc index 76ae3925c..049d9ec94 100644 --- a/data/maps/BattlePyramidSquare14/header.inc +++ b/data/maps/BattlePyramidSquare14/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare14: @ 84850CC +BattlePyramidSquare14: .4byte BattlePyramidSquare14_Layout .4byte BattlePyramidSquare14_MapEvents .4byte BattlePyramidSquare14_MapScripts .4byte 0x0 .2byte 65535 - .2byte 375 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE14 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare15/events.inc b/data/maps/BattlePyramidSquare15/events.inc index 2556030e3..3781ec3db 100644 --- a/data/maps/BattlePyramidSquare15/events.inc +++ b/data/maps/BattlePyramidSquare15/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare15_EventObjects: @ 853AEA8 +BattlePyramidSquare15_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 5, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 1, 4, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 4, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare15_EventObjects: @ 853AEA8 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 1, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare15_MapEvents:: @ 853AF50 +BattlePyramidSquare15_MapEvents:: map_events BattlePyramidSquare15_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare15/header.inc b/data/maps/BattlePyramidSquare15/header.inc index 57e45e1b2..980402c21 100644 --- a/data/maps/BattlePyramidSquare15/header.inc +++ b/data/maps/BattlePyramidSquare15/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare15: @ 84850E8 +BattlePyramidSquare15: .4byte BattlePyramidSquare15_Layout .4byte BattlePyramidSquare15_MapEvents .4byte BattlePyramidSquare15_MapScripts .4byte 0x0 .2byte 65535 - .2byte 376 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE15 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BattlePyramidSquare16/events.inc b/data/maps/BattlePyramidSquare16/events.inc index e08cb110e..973d7c0ef 100644 --- a/data/maps/BattlePyramidSquare16/events.inc +++ b/data/maps/BattlePyramidSquare16/events.inc @@ -1,4 +1,4 @@ -BattlePyramidSquare16_EventObjects: @ 853AF64 +BattlePyramidSquare16_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 6, 4, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 0, 0, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 7, 4, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0 @@ -7,6 +7,6 @@ BattlePyramidSquare16_EventObjects: @ 853AF64 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 7, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 2, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0 -BattlePyramidSquare16_MapEvents:: @ 853B00C +BattlePyramidSquare16_MapEvents:: map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattlePyramidSquare16/header.inc b/data/maps/BattlePyramidSquare16/header.inc index 24aa3edcc..b51e9692c 100644 --- a/data/maps/BattlePyramidSquare16/header.inc +++ b/data/maps/BattlePyramidSquare16/header.inc @@ -1,10 +1,10 @@ -BattlePyramidSquare16: @ 8485104 +BattlePyramidSquare16: .4byte BattlePyramidSquare16_Layout .4byte BattlePyramidSquare16_MapEvents .4byte BattlePyramidSquare16_MapScripts .4byte 0x0 .2byte 65535 - .2byte 377 + .2byte LAYOUT_BATTLE_PYRAMID_SQUARE16 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BirthIsland_Exterior/events.inc b/data/maps/BirthIsland_Exterior/events.inc index c5a485f9a..daf780f73 100644 --- a/data/maps/BirthIsland_Exterior/events.inc +++ b/data/maps/BirthIsland_Exterior/events.inc @@ -1,10 +1,10 @@ -BirthIsland_Exterior_EventObjects: @ 853D7DC +BirthIsland_Exterior_EventObjects: object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 15, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, BirthIsland_Exterior_EventScript_267F83, FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 15, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_DEOXYS -BirthIsland_Exterior_MapWarps: @ 853D80C +BirthIsland_Exterior_MapWarps: warp_def 15, 24, 0, 0, MAP_BIRTH_ISLAND_HARBOR -BirthIsland_Exterior_MapEvents:: @ 853D814 +BirthIsland_Exterior_MapEvents:: map_events BirthIsland_Exterior_EventObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/BirthIsland_Exterior/header.inc b/data/maps/BirthIsland_Exterior/header.inc index c6b02f600..71af6d880 100644 --- a/data/maps/BirthIsland_Exterior/header.inc +++ b/data/maps/BirthIsland_Exterior/header.inc @@ -1,10 +1,10 @@ -BirthIsland_Exterior: @ 8485794 +BirthIsland_Exterior: .4byte BirthIsland_Exterior_Layout .4byte BirthIsland_Exterior_MapEvents .4byte BirthIsland_Exterior_MapScripts .4byte 0x0 .2byte 65535 - .2byte 404 + .2byte LAYOUT_BIRTH_ISLAND_EXTERIOR .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/BirthIsland_Harbor/events.inc b/data/maps/BirthIsland_Harbor/events.inc index 8b8fe4660..1cbef2874 100644 --- a/data/maps/BirthIsland_Harbor/events.inc +++ b/data/maps/BirthIsland_Harbor/events.inc @@ -1,10 +1,10 @@ -BirthIsland_Harbor_EventObjects: @ 853D828 +BirthIsland_Harbor_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 -BirthIsland_Harbor_MapWarps: @ 853D858 +BirthIsland_Harbor_MapWarps: warp_def 8, 2, 0, 0, MAP_BIRTH_ISLAND_EXTERIOR -BirthIsland_Harbor_MapEvents:: @ 853D860 +BirthIsland_Harbor_MapEvents:: map_events BirthIsland_Harbor_EventObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/BirthIsland_Harbor/header.inc b/data/maps/BirthIsland_Harbor/header.inc index 82b752f90..e3b3d53b2 100644 --- a/data/maps/BirthIsland_Harbor/header.inc +++ b/data/maps/BirthIsland_Harbor/header.inc @@ -1,10 +1,10 @@ -BirthIsland_Harbor: @ 84857B0 +BirthIsland_Harbor: .4byte IslandHarbor_Layout .4byte BirthIsland_Harbor_MapEvents .4byte BirthIsland_Harbor_MapScripts .4byte 0x0 .2byte 65535 - .2byte 405 + .2byte LAYOUT_ISLAND_HARBOR .byte MAPSEC_BIRTH_ISLAND_2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/CaveOfOrigin_1F/events.inc b/data/maps/CaveOfOrigin_1F/events.inc index bdc629846..098938279 100644 --- a/data/maps/CaveOfOrigin_1F/events.inc +++ b/data/maps/CaveOfOrigin_1F/events.inc @@ -1,7 +1,7 @@ -CaveOfOrigin_1F_MapWarps: @ 8535D40 +CaveOfOrigin_1F_MapWarps: warp_def 11, 17, 3, 1, MAP_CAVE_OF_ORIGIN_ENTRANCE warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F -CaveOfOrigin_1F_MapEvents:: @ 8535D50 +CaveOfOrigin_1F_MapEvents:: map_events 0x0, CaveOfOrigin_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index f051c230c..df0e323d0 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_1F: @ 84842E8 +CaveOfOrigin_1F: .4byte CaveOfOrigin_1F_Layout .4byte CaveOfOrigin_1F_MapEvents .4byte CaveOfOrigin_1F_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 158 + .2byte LAYOUT_CAVE_OF_ORIGIN_1F .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/CaveOfOrigin_B1F/events.inc b/data/maps/CaveOfOrigin_B1F/events.inc index 94f30d262..0028301c9 100644 --- a/data/maps/CaveOfOrigin_B1F/events.inc +++ b/data/maps/CaveOfOrigin_B1F/events.inc @@ -1,9 +1,9 @@ -CaveOfOrigin_B1F_EventObjects: @ 8535DD0 +CaveOfOrigin_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 9, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, FLAG_HIDE_CAVE_OF_ORIGIN_B1F_WALLACE -CaveOfOrigin_B1F_MapWarps: @ 8535DE8 +CaveOfOrigin_B1F_MapWarps: warp_def 9, 3, 3, 1, MAP_CAVE_OF_ORIGIN_1F -CaveOfOrigin_B1F_MapEvents:: @ 8535DF0 +CaveOfOrigin_B1F_MapEvents:: map_events CaveOfOrigin_B1F_EventObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index 7b70ba43f..200c90bfd 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_B1F: @ 8484358 +CaveOfOrigin_B1F: .4byte CaveOfOrigin_B1F_Layout .4byte CaveOfOrigin_B1F_MapEvents .4byte CaveOfOrigin_B1F_MapScripts .4byte 0x0 .2byte 65535 - .2byte 162 + .2byte LAYOUT_CAVE_OF_ORIGIN_B1F .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/CaveOfOrigin_Entrance/events.inc b/data/maps/CaveOfOrigin_Entrance/events.inc index 5a5ad59f7..235e4afa0 100644 --- a/data/maps/CaveOfOrigin_Entrance/events.inc +++ b/data/maps/CaveOfOrigin_Entrance/events.inc @@ -1,7 +1,7 @@ -CaveOfOrigin_Entrance_MapWarps: @ 8535D1C +CaveOfOrigin_Entrance_MapWarps: warp_def 9, 20, 3, 3, MAP_SOOTOPOLIS_CITY warp_def 9, 5, 3, 0, MAP_CAVE_OF_ORIGIN_1F -CaveOfOrigin_Entrance_MapEvents:: @ 8535D2C +CaveOfOrigin_Entrance_MapEvents:: map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index af622019a..afbbd0312 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_Entrance: @ 84842CC +CaveOfOrigin_Entrance: .4byte CaveOfOrigin_Entrance_Layout .4byte CaveOfOrigin_Entrance_MapEvents .4byte CaveOfOrigin_Entrance_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 157 + .2byte LAYOUT_CAVE_OF_ORIGIN_ENTRANCE .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc index 049c263da..eeb07e63a 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/events.inc @@ -1,7 +1,7 @@ -CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: @ 8535D64 +CaveOfOrigin_UnusedRubySapphireMap1_MapWarps: warp_def 13, 5, 3, 1, MAP_CAVE_OF_ORIGIN_1F warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 -CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: @ 8535D74 +CaveOfOrigin_UnusedRubySapphireMap1_MapEvents:: map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap1_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc index 6b928bb3c..e0fea7bd5 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_UnusedRubySapphireMap1: @ 8484304 +CaveOfOrigin_UnusedRubySapphireMap1: .4byte CaveOfOrigin_UnusedRubySapphireMap1_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap1_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 159 + .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_NONE diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc index 5af05a471..1a8e841b7 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/events.inc @@ -1,7 +1,7 @@ -CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: @ 8535D88 +CaveOfOrigin_UnusedRubySapphireMap2_MapWarps: warp_def 5, 10, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 -CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: @ 8535D98 +CaveOfOrigin_UnusedRubySapphireMap2_MapEvents:: map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap2_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc index 0088131dc..e8e7c0c79 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_UnusedRubySapphireMap2: @ 8484320 +CaveOfOrigin_UnusedRubySapphireMap2: .4byte CaveOfOrigin_UnusedRubySapphireMap2_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap2_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 160 + .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_FOG_1 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc index a17416bd3..e1cacec43 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/events.inc @@ -1,7 +1,7 @@ -CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: @ 8535DAC +CaveOfOrigin_UnusedRubySapphireMap3_MapWarps: warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B1F -CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: @ 8535DBC +CaveOfOrigin_UnusedRubySapphireMap3_MapEvents:: map_events 0x0, CaveOfOrigin_UnusedRubySapphireMap3_MapWarps, 0x0, 0x0 diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc index 75bd4189e..ec55cb0ff 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/header.inc @@ -1,10 +1,10 @@ -CaveOfOrigin_UnusedRubySapphireMap3: @ 848433C +CaveOfOrigin_UnusedRubySapphireMap3: .4byte CaveOfOrigin_UnusedRubySapphireMap3_Layout .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapEvents .4byte CaveOfOrigin_UnusedRubySapphireMap3_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 161 + .2byte LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 .byte WEATHER_FOG_1 diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc index e7a815ce0..88dad2c28 100644 --- a/data/maps/DesertRuins/events.inc +++ b/data/maps/DesertRuins/events.inc @@ -1,16 +1,16 @@ -DesertRuins_EventObjects: @ 8534354 +DesertRuins_EventObjects: object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, FLAG_HIDE_REGIROCK -DesertRuins_MapWarps: @ 853436C +DesertRuins_MapWarps: warp_def 8, 29, 3, 1, MAP_ROUTE111 warp_def 8, 20, 0, 2, MAP_DESERT_RUINS warp_def 8, 11, 3, 1, MAP_DESERT_RUINS -DesertRuins_MapBGEvents: @ 8534384 +DesertRuins_MapBGEvents: bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9DB bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9F8 bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_22D9F8 -DesertRuins_MapEvents:: @ 85343A8 +DesertRuins_MapEvents:: map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index c717661f4..f0af5f2e0 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -1,10 +1,10 @@ -DesertRuins: @ 8483F68 +DesertRuins: .4byte DesertRuins_Layout .4byte DesertRuins_MapEvents .4byte DesertRuins_MapScripts .4byte 0x0 .2byte MUS_MABOROSI - .2byte 131 + .2byte LAYOUT_DESERT_RUINS .byte MAPSEC_DESERT_RUINS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DesertUnderpass/events.inc b/data/maps/DesertUnderpass/events.inc index aec461c34..25497be27 100644 --- a/data/maps/DesertUnderpass/events.inc +++ b/data/maps/DesertUnderpass/events.inc @@ -1,9 +1,9 @@ -DesertUnderpass_EventObjects: @ 85376D4 +DesertUnderpass_EventObjects: object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 132, 10, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DesertUnderpass_EventScript_23AF41, FLAG_HIDE_DESERT_UNDERPASS_FOSSIL -DesertUnderpass_MapWarps: @ 85376EC +DesertUnderpass_MapWarps: warp_def 10, 12, 0, 2, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL -DesertUnderpass_MapEvents:: @ 85376F4 +DesertUnderpass_MapEvents:: map_events DesertUnderpass_EventObjects, DesertUnderpass_MapWarps, 0x0, 0x0 diff --git a/data/maps/DesertUnderpass/header.inc b/data/maps/DesertUnderpass/header.inc index 757d81e73..ca7ab5254 100644 --- a/data/maps/DesertUnderpass/header.inc +++ b/data/maps/DesertUnderpass/header.inc @@ -1,10 +1,10 @@ -DesertUnderpass: @ 8484978 +DesertUnderpass: .4byte DesertUnderpass_Layout .4byte DesertUnderpass_MapEvents .4byte DesertUnderpass_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 389 + .2byte LAYOUT_DESERT_UNDERPASS .byte MAPSEC_DESERT_UNDERPASS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DewfordTown/connections.inc b/data/maps/DewfordTown/connections.inc index d03004922..294bf9956 100644 --- a/data/maps/DewfordTown/connections.inc +++ b/data/maps/DewfordTown/connections.inc @@ -1,8 +1,8 @@ -DewfordTown_MapConnectionsList: @ 8486640 +DewfordTown_MapConnectionsList: connection up, -60, MAP_ROUTE106 connection right, 0, MAP_ROUTE107 -DewfordTown_MapConnections: @ 8486658 - .4byte 0x2 +DewfordTown_MapConnections: + .4byte 2 .4byte DewfordTown_MapConnectionsList diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc index 3d2d0af4a..0b9036029 100644 --- a/data/maps/DewfordTown/events.inc +++ b/data/maps/DewfordTown/events.inc @@ -1,24 +1,24 @@ -DewfordTown_EventObjects: @ 8527964 +DewfordTown_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_1E9511, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0 object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0 -DewfordTown_MapWarps: @ 85279DC +DewfordTown_MapWarps: warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL warp_def 2, 10, 0, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F warp_def 8, 17, 0, 0, MAP_DEWFORD_TOWN_GYM warp_def 17, 14, 0, 0, MAP_DEWFORD_TOWN_HOUSE1 warp_def 8, 8, 0, 0, MAP_DEWFORD_TOWN_HOUSE2 -DewfordTown_MapBGEvents: @ 8527A04 +DewfordTown_MapBGEvents: bg_event 10, 10, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95BA bg_event 11, 16, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95C3 bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_271E73 bg_event 3, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_271E73 bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_1E95CC -DewfordTown_MapEvents:: @ 8527A40 +DewfordTown_MapEvents:: map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index 9314f753f..03c5b689b 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -1,10 +1,10 @@ -DewfordTown: @ 84825EC +DewfordTown: .4byte DewfordTown_Layout .4byte DewfordTown_MapEvents .4byte DewfordTown_MapScripts .4byte DewfordTown_MapConnections .2byte MUS_HIGHTOWN - .2byte 12 + .2byte LAYOUT_DEWFORD_TOWN .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc index a4c45c2cb..c3b718f19 100644 --- a/data/maps/DewfordTown_Gym/events.inc +++ b/data/maps/DewfordTown_Gym/events.inc @@ -1,4 +1,4 @@ -DewfordTown_Gym_EventObjects: @ 852DB34 +DewfordTown_Gym_EventObjects: object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 4, 3, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 18, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0 @@ -8,16 +8,16 @@ DewfordTown_Gym_EventObjects: @ 852DB34 object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 16, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0 object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 14, 12, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0 -DewfordTown_Gym_MapWarps: @ 852DBF4 +DewfordTown_Gym_MapWarps: warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN -DewfordTown_Gym_MapBGEvents: @ 852DC04 +DewfordTown_Gym_MapBGEvents: bg_event 4, 23, 3, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9A2 bg_event 7, 23, 3, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9B2 bg_event 4, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9A2 bg_event 7, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_1FC9B2 -DewfordTown_Gym_MapEvents:: @ 852DC34 +DewfordTown_Gym_MapEvents:: map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index 783a7eacc..72b93573b 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -1,10 +1,10 @@ -DewfordTown_Gym: @ 8482C60 +DewfordTown_Gym: .4byte DewfordTown_Gym_Layout .4byte DewfordTown_Gym_MapEvents .4byte DewfordTown_Gym_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 65 + .2byte LAYOUT_DEWFORD_TOWN_GYM .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc index 4f1881f92..7fc332f90 100644 --- a/data/maps/DewfordTown_Hall/events.inc +++ b/data/maps/DewfordTown_Hall/events.inc @@ -1,4 +1,4 @@ -DewfordTown_Hall_EventObjects: @ 852DC48 +DewfordTown_Hall_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0 object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0 @@ -9,14 +9,14 @@ DewfordTown_Hall_EventObjects: @ 852DC48 object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0 object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, FLAG_HIDE_DEWFORD_HALL_SLUDGE_BOMB_MAN -DewfordTown_Hall_MapWarps: @ 852DD20 +DewfordTown_Hall_MapWarps: warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN -DewfordTown_Hall_MapBGEvents: @ 852DD30 +DewfordTown_Hall_MapBGEvents: bg_event 0, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_1FD590 bg_event 7, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_1FD5A0 -DewfordTown_Hall_MapEvents:: @ 852DD48 +DewfordTown_Hall_MapEvents:: map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 600b02763..4fc39cf21 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -1,10 +1,10 @@ -DewfordTown_Hall: @ 8482C7C +DewfordTown_Hall: .4byte DewfordTown_Hall_Layout .4byte DewfordTown_Hall_MapEvents .4byte DewfordTown_Hall_MapScripts .4byte 0x0 .2byte MUS_HIGHTOWN - .2byte 66 + .2byte LAYOUT_DEWFORD_TOWN_HALL .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DewfordTown_House1/events.inc b/data/maps/DewfordTown_House1/events.inc index 53d72959c..a9c8b0ae5 100644 --- a/data/maps/DewfordTown_House1/events.inc +++ b/data/maps/DewfordTown_House1/events.inc @@ -1,12 +1,12 @@ -DewfordTown_House1_EventObjects: @ 852D9C8 +DewfordTown_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0 object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 1, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0 -DewfordTown_House1_MapWarps: @ 852DA10 +DewfordTown_House1_MapWarps: warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN -DewfordTown_House1_MapEvents:: @ 852DA20 +DewfordTown_House1_MapEvents:: map_events DewfordTown_House1_EventObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index cfaaaa698..9f4eec032 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -1,10 +1,10 @@ -DewfordTown_House1: @ 8482C0C +DewfordTown_House1: .4byte House3_Layout .4byte DewfordTown_House1_MapEvents .4byte DewfordTown_House1_MapScripts .4byte 0x0 .2byte MUS_HIGHTOWN - .2byte 64 + .2byte LAYOUT_HOUSE3 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DewfordTown_House2/events.inc b/data/maps/DewfordTown_House2/events.inc index 039ebac7c..9f3801afa 100644 --- a/data/maps/DewfordTown_House2/events.inc +++ b/data/maps/DewfordTown_House2/events.inc @@ -1,11 +1,11 @@ -DewfordTown_House2_EventObjects: @ 852DD5C +DewfordTown_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0 object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0 -DewfordTown_House2_MapWarps: @ 852DD8C +DewfordTown_House2_MapWarps: warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN -DewfordTown_House2_MapEvents:: @ 852DD9C +DewfordTown_House2_MapEvents:: map_events DewfordTown_House2_EventObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 2f9a36cf8..ec8359b68 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -1,10 +1,10 @@ -DewfordTown_House2: @ 8482C98 +DewfordTown_House2: .4byte House4_Layout .4byte DewfordTown_House2_MapEvents .4byte DewfordTown_House2_MapScripts .4byte 0x0 .2byte MUS_HIGHTOWN - .2byte 67 + .2byte LAYOUT_HOUSE4 .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DewfordTown_PokemonCenter_1F/events.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc index 830b6fd9b..86c42ffab 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/events.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/events.inc @@ -1,13 +1,13 @@ -DewfordTown_PokemonCenter_1F_EventObjects: @ 852DA34 +DewfordTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0 -DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C +DewfordTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN warp_def 6, 8, 3, 1, MAP_DEWFORD_TOWN warp_def 1, 6, 4, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_2F -DewfordTown_PokemonCenter_1F_MapEvents:: @ 852DA94 +DewfordTown_PokemonCenter_1F_MapEvents:: map_events DewfordTown_PokemonCenter_1F_EventObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index ae98bd680..b6aa6f791 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -DewfordTown_PokemonCenter_1F: @ 8482C28 +DewfordTown_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte DewfordTown_PokemonCenter_1F_MapEvents .4byte DewfordTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DewfordTown_PokemonCenter_2F/events.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc index 4f37111a5..eccedade4 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/events.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -DewfordTown_PokemonCenter_2F_EventObjects: @ 852DAA8 +DewfordTown_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08 +DewfordTown_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -DewfordTown_PokemonCenter_2F_MapEvents:: @ 852DB20 +DewfordTown_PokemonCenter_2F_MapEvents:: map_events DewfordTown_PokemonCenter_2F_EventObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index bb46a43d0..8bb0d81d7 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -DewfordTown_PokemonCenter_2F: @ 8482C44 +DewfordTown_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte DewfordTown_PokemonCenter_2F_MapEvents .4byte DewfordTown_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_DEWFORD_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/DoubleBattleColosseum/events.inc b/data/maps/DoubleBattleColosseum/events.inc index ffea67228..4ea0b7f61 100644 --- a/data/maps/DoubleBattleColosseum/events.inc +++ b/data/maps/DoubleBattleColosseum/events.inc @@ -1,15 +1,15 @@ -DoubleBattleColosseum_MapWarps: @ 8539E88 +DoubleBattleColosseum_MapWarps: warp_def 5, 8, 3, 127, MAP_NONE warp_def 6, 8, 3, 127, MAP_NONE warp_def 7, 8, 3, 127, MAP_NONE warp_def 8, 8, 3, 127, MAP_NONE -DoubleBattleColosseum_MapCoordEvents: @ 8539EA8 +DoubleBattleColosseum_MapCoordEvents: coord_event 3, 4, 3, VAR_TEMP_0, 0, gUnknown_08277388 coord_event 3, 6, 3, VAR_TEMP_0, 0, gUnknown_082773BE coord_event 10, 4, 3, VAR_TEMP_0, 0, gUnknown_082773A3 coord_event 10, 6, 3, VAR_TEMP_0, 0, gUnknown_082773D9 -DoubleBattleColosseum_MapEvents:: @ 8539EE8 +DoubleBattleColosseum_MapEvents:: map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index 032ef58ab..df679a918 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -1,10 +1,10 @@ -DoubleBattleColosseum: @ 8484D84 +DoubleBattleColosseum: .4byte DoubleBattleColosseum_Layout .4byte DoubleBattleColosseum_MapEvents .4byte DoubleBattleColosseum_MapScripts .4byte 0x0 .2byte MUS_RAINBOW - .2byte 224 + .2byte LAYOUT_DOUBLE_BATTLE_COLOSSEUM .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity/connections.inc b/data/maps/EverGrandeCity/connections.inc index 830240b07..78c3ba8d1 100644 --- a/data/maps/EverGrandeCity/connections.inc +++ b/data/maps/EverGrandeCity/connections.inc @@ -1,7 +1,7 @@ -EverGrandeCity_MapConnectionsList: @ 84867F8 +EverGrandeCity_MapConnectionsList: connection left, 40, MAP_ROUTE128 -EverGrandeCity_MapConnections: @ 8486804 - .4byte 0x1 +EverGrandeCity_MapConnections: + .4byte 1 .4byte EverGrandeCity_MapConnectionsList diff --git a/data/maps/EverGrandeCity/events.inc b/data/maps/EverGrandeCity/events.inc index e6bc7a10a..9c0cd79ef 100644 --- a/data/maps/EverGrandeCity/events.inc +++ b/data/maps/EverGrandeCity/events.inc @@ -1,10 +1,10 @@ -EverGrandeCity_MapWarps: @ 8527588 +EverGrandeCity_MapWarps: warp_def 18, 5, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F warp_def 27, 48, 0, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F warp_def 18, 41, 0, 0, MAP_VICTORY_ROAD_1F warp_def 18, 27, 0, 1, MAP_VICTORY_ROAD_1F -EverGrandeCity_MapCoordEvents: @ 85275A8 +EverGrandeCity_MapCoordEvents: coord_event 17, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 coord_event 16, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 coord_event 18, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 @@ -17,13 +17,13 @@ EverGrandeCity_MapCoordEvents: @ 85275A8 coord_event 25, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 coord_event 26, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_1E7D46 -EverGrandeCity_MapBGEvents: @ 8527658 +EverGrandeCity_MapBGEvents: bg_event 19, 43, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D2B bg_event 29, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_271E73 bg_event 18, 52, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D34 bg_event 23, 15, 0, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_1E7D3D bg_event 28, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_271E73 -EverGrandeCity_MapEvents:: @ 8527694 +EverGrandeCity_MapEvents:: map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index b1ee8e3a4..735094578 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity: @ 8482598 +EverGrandeCity: .4byte EverGrandeCity_Layout .4byte EverGrandeCity_MapEvents .4byte EverGrandeCity_MapScripts .4byte EverGrandeCity_MapConnections .2byte MUS_RAINBOW - .2byte 9 + .2byte LAYOUT_EVER_GRANDE_CITY .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc index 9ce5831ba..846e7f60e 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/events.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc @@ -1,12 +1,12 @@ -EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700 +EverGrandeCity_ChampionsRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_RIVAL object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_CHAMPIONS_ROOM_BIRCH -EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748 +EverGrandeCity_ChampionsRoom_MapWarps: warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_HALL4 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME -EverGrandeCity_ChampionsRoom_MapEvents:: @ 8533758 +EverGrandeCity_ChampionsRoom_MapEvents:: map_events EverGrandeCity_ChampionsRoom_EventObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index bd2ab305f..0b7334685 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_ChampionsRoom: @ 8483C3C +EverGrandeCity_ChampionsRoom: .4byte EverGrandeCity_ChampionsRoom_Layout .4byte EverGrandeCity_ChampionsRoom_MapEvents .4byte EverGrandeCity_ChampionsRoom_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 115 + .2byte LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_DrakesRoom/events.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc index 4f61f50ea..997df5045 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/events.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/events.inc @@ -1,10 +1,10 @@ -EverGrandeCity_DrakesRoom_EventObjects: @ 85336C4 +EverGrandeCity_DrakesRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0 -EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC +EverGrandeCity_DrakesRoom_MapWarps: warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL3 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL4 -EverGrandeCity_DrakesRoom_MapEvents:: @ 85336EC +EverGrandeCity_DrakesRoom_MapEvents:: map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index da5c8fa47..3c5b52b21 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_DrakesRoom: @ 8483C20 +EverGrandeCity_DrakesRoom: .4byte EverGrandeCity_DrakesRoom_Layout .4byte EverGrandeCity_DrakesRoom_MapEvents .4byte EverGrandeCity_DrakesRoom_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 114 + .2byte LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_GlaciasRoom/events.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc index 63dfbc0df..abe7b8564 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/events.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/events.inc @@ -1,10 +1,10 @@ -EverGrandeCity_GlaciasRoom_EventObjects: @ 8533688 +EverGrandeCity_GlaciasRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0 -EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0 +EverGrandeCity_GlaciasRoom_MapWarps: warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL2 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL3 -EverGrandeCity_GlaciasRoom_MapEvents:: @ 85336B0 +EverGrandeCity_GlaciasRoom_MapEvents:: map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index 0773a613e..f330a321f 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_GlaciasRoom: @ 8483C04 +EverGrandeCity_GlaciasRoom: .4byte EverGrandeCity_GlaciasRoom_Layout .4byte EverGrandeCity_GlaciasRoom_MapEvents .4byte EverGrandeCity_GlaciasRoom_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 113 + .2byte LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_Hall1/events.inc b/data/maps/EverGrandeCity_Hall1/events.inc index 3351b42e0..fd3a5584d 100644 --- a/data/maps/EverGrandeCity_Hall1/events.inc +++ b/data/maps/EverGrandeCity_Hall1/events.inc @@ -1,9 +1,9 @@ -EverGrandeCity_Hall1_MapWarps: @ 853376C +EverGrandeCity_Hall1_MapWarps: warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM -EverGrandeCity_Hall1_MapEvents:: @ 853378C +EverGrandeCity_Hall1_MapEvents:: map_events 0x0, EverGrandeCity_Hall1_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Hall1/header.inc b/data/maps/EverGrandeCity_Hall1/header.inc index d554ff768..1e2f0f8eb 100644 --- a/data/maps/EverGrandeCity_Hall1/header.inc +++ b/data/maps/EverGrandeCity_Hall1/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_Hall1: @ 8483C58 +EverGrandeCity_Hall1: .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall1_MapEvents .4byte EverGrandeCity_Hall1_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 116 + .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_Hall2/events.inc b/data/maps/EverGrandeCity_Hall2/events.inc index e3eacab10..e9b8ab056 100644 --- a/data/maps/EverGrandeCity_Hall2/events.inc +++ b/data/maps/EverGrandeCity_Hall2/events.inc @@ -1,9 +1,9 @@ -EverGrandeCity_Hall2_MapWarps: @ 85337A0 +EverGrandeCity_Hall2_MapWarps: warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_PHOEBES_ROOM -EverGrandeCity_Hall2_MapEvents:: @ 85337C0 +EverGrandeCity_Hall2_MapEvents:: map_events 0x0, EverGrandeCity_Hall2_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Hall2/header.inc b/data/maps/EverGrandeCity_Hall2/header.inc index 646478a25..242291542 100644 --- a/data/maps/EverGrandeCity_Hall2/header.inc +++ b/data/maps/EverGrandeCity_Hall2/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_Hall2: @ 8483C74 +EverGrandeCity_Hall2: .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall2_MapEvents .4byte EverGrandeCity_Hall2_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 116 + .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_Hall3/events.inc b/data/maps/EverGrandeCity_Hall3/events.inc index e44182b4f..3e792fd1b 100644 --- a/data/maps/EverGrandeCity_Hall3/events.inc +++ b/data/maps/EverGrandeCity_Hall3/events.inc @@ -1,9 +1,9 @@ -EverGrandeCity_Hall3_MapWarps: @ 85337D4 +EverGrandeCity_Hall3_MapWarps: warp_def 5, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_DRAKES_ROOM warp_def 4, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_GLACIAS_ROOM -EverGrandeCity_Hall3_MapEvents:: @ 85337F4 +EverGrandeCity_Hall3_MapEvents:: map_events 0x0, EverGrandeCity_Hall3_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Hall3/header.inc b/data/maps/EverGrandeCity_Hall3/header.inc index d7beaf36e..fd0643345 100644 --- a/data/maps/EverGrandeCity_Hall3/header.inc +++ b/data/maps/EverGrandeCity_Hall3/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_Hall3: @ 8483C90 +EverGrandeCity_Hall3: .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall3_MapEvents .4byte EverGrandeCity_Hall3_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 116 + .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_Hall4/events.inc b/data/maps/EverGrandeCity_Hall4/events.inc index b2d011234..3f4069896 100644 --- a/data/maps/EverGrandeCity_Hall4/events.inc +++ b/data/maps/EverGrandeCity_Hall4/events.inc @@ -1,7 +1,7 @@ -EverGrandeCity_Hall4_MapWarps: @ 8533808 +EverGrandeCity_Hall4_MapWarps: warp_def 5, 33, 3, 1, MAP_EVER_GRANDE_CITY_DRAKES_ROOM warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM -EverGrandeCity_Hall4_MapEvents:: @ 8533818 +EverGrandeCity_Hall4_MapEvents:: map_events 0x0, EverGrandeCity_Hall4_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Hall4/header.inc b/data/maps/EverGrandeCity_Hall4/header.inc index 8cf1eea6e..b2a199823 100644 --- a/data/maps/EverGrandeCity_Hall4/header.inc +++ b/data/maps/EverGrandeCity_Hall4/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_Hall4: @ 8483CAC +EverGrandeCity_Hall4: .4byte EverGrandeCity_Hall4_Layout .4byte EverGrandeCity_Hall4_MapEvents .4byte EverGrandeCity_Hall4_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 315 + .2byte LAYOUT_EVER_GRANDE_CITY_HALL4 .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_Hall5/events.inc b/data/maps/EverGrandeCity_Hall5/events.inc index 687920b71..655f4645e 100644 --- a/data/maps/EverGrandeCity_Hall5/events.inc +++ b/data/maps/EverGrandeCity_Hall5/events.inc @@ -1,9 +1,9 @@ -EverGrandeCity_Hall5_MapWarps: @ 853382C +EverGrandeCity_Hall5_MapWarps: warp_def 5, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F warp_def 5, 2, 0, 0, MAP_EVER_GRANDE_CITY_SIDNEYS_ROOM warp_def 4, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F warp_def 6, 12, 3, 2, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F -EverGrandeCity_Hall5_MapEvents:: @ 853384C +EverGrandeCity_Hall5_MapEvents:: map_events 0x0, EverGrandeCity_Hall5_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_Hall5/header.inc b/data/maps/EverGrandeCity_Hall5/header.inc index 38279720e..f15639e5b 100644 --- a/data/maps/EverGrandeCity_Hall5/header.inc +++ b/data/maps/EverGrandeCity_Hall5/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_Hall5: @ 8483CC8 +EverGrandeCity_Hall5: .4byte EverGrandeCity_ShortHall_Layout .4byte EverGrandeCity_Hall5_MapEvents .4byte EverGrandeCity_Hall5_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 116 + .2byte LAYOUT_EVER_GRANDE_CITY_SHORT_HALL .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_HallOfFame/events.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc index ad5f088c5..7d9198437 100644 --- a/data/maps/EverGrandeCity_HallOfFame/events.inc +++ b/data/maps/EverGrandeCity_HallOfFame/events.inc @@ -1,9 +1,9 @@ -EverGrandeCity_HallOfFame_EventObjects: @ 85338FC +EverGrandeCity_HallOfFame_EventObjects: object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 -EverGrandeCity_HallOfFame_MapWarps: @ 8533914 +EverGrandeCity_HallOfFame_MapWarps: warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM -EverGrandeCity_HallOfFame_MapEvents:: @ 853391C +EverGrandeCity_HallOfFame_MapEvents:: map_events EverGrandeCity_HallOfFame_EventObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index 865f90b91..7879c19bf 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_HallOfFame: @ 8483D00 +EverGrandeCity_HallOfFame: .4byte EverGrandeCity_HallOfFame_Layout .4byte EverGrandeCity_HallOfFame_MapEvents .4byte EverGrandeCity_HallOfFame_MapScripts .4byte 0x0 .2byte MUS_EIKOU_R - .2byte 298 + .2byte LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_PhoebesRoom/events.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc index abaa81622..d6ad89bea 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/events.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/events.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PhoebesRoom_EventObjects: @ 853364C +EverGrandeCity_PhoebesRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0 -EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664 +EverGrandeCity_PhoebesRoom_MapWarps: warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL1 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL2 -EverGrandeCity_PhoebesRoom_MapEvents:: @ 8533674 +EverGrandeCity_PhoebesRoom_MapEvents:: map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index eb0d77d7b..7869d6007 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PhoebesRoom: @ 8483BE8 +EverGrandeCity_PhoebesRoom: .4byte EverGrandeCity_PhoebesRoom_Layout .4byte EverGrandeCity_PhoebesRoom_MapEvents .4byte EverGrandeCity_PhoebesRoom_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 112 + .2byte LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc index 23e555622..a879c3bf6 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930 +EverGrandeCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0 object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT -EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990 +EverGrandeCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY warp_def 6, 8, 3, 1, MAP_EVER_GRANDE_CITY warp_def 1, 6, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F -EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 85339A8 +EverGrandeCity_PokemonCenter_1F_MapEvents:: map_events EverGrandeCity_PokemonCenter_1F_EventObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 292356472..060c11d0b 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PokemonCenter_1F: @ 8483D1C +EverGrandeCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte EverGrandeCity_PokemonCenter_1F_MapEvents .4byte EverGrandeCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc index 855336146..550765922 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -EverGrandeCity_PokemonCenter_2F_EventObjects: @ 85339BC +EverGrandeCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C +EverGrandeCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 8533A34 +EverGrandeCity_PokemonCenter_2F_MapEvents:: map_events EverGrandeCity_PokemonCenter_2F_EventObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index ec9f3e542..ae70ad359 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PokemonCenter_2F: @ 8483D38 +EverGrandeCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte EverGrandeCity_PokemonCenter_2F_MapEvents .4byte EverGrandeCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc index dcda8722c..524540d9d 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/events.inc @@ -1,16 +1,16 @@ -EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860 +EverGrandeCity_PokemonLeague_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0 object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0 -EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0 +EverGrandeCity_PokemonLeague_1F_MapWarps: warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY warp_def 10, 11, 3, 0, MAP_EVER_GRANDE_CITY warp_def 9, 1, 3, 0, MAP_EVER_GRANDE_CITY_HALL5 warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_HALL5 warp_def 1, 7, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_2F -EverGrandeCity_PokemonLeague_1F_MapEvents:: @ 85338E8 +EverGrandeCity_PokemonLeague_1F_MapEvents:: map_events EverGrandeCity_PokemonLeague_1F_EventObjects, EverGrandeCity_PokemonLeague_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc index 90a42edea..497d81582 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PokemonLeague_1F: @ 8483CE4 +EverGrandeCity_PokemonLeague_1F: .4byte EverGrandeCity_PokemonLeague_1F_Layout .4byte EverGrandeCity_PokemonLeague_1F_MapEvents .4byte EverGrandeCity_PokemonLeague_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 270 + .2byte LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc index b6497d824..2f26346c8 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/events.inc @@ -1,14 +1,14 @@ -EverGrandeCity_PokemonLeague_2F_EventObjects: @ 8533A48 +EverGrandeCity_PokemonLeague_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8 +EverGrandeCity_PokemonLeague_2F_MapWarps: warp_def 1, 6, 4, 4, MAP_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -EverGrandeCity_PokemonLeague_2F_MapEvents:: @ 8533AC0 +EverGrandeCity_PokemonLeague_2F_MapEvents:: map_events EverGrandeCity_PokemonLeague_2F_EventObjects, EverGrandeCity_PokemonLeague_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc index 4d9ee7f46..c03c85120 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_2F/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PokemonLeague_2F: @ 8483D54 +EverGrandeCity_PokemonLeague_2F: .4byte PokemonCenter_2F_Layout .4byte EverGrandeCity_PokemonLeague_2F_MapEvents .4byte EverGrandeCity_PokemonLeague_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/EverGrandeCity_SidneysRoom/events.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc index a1446aef8..ca7f7278d 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/events.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/events.inc @@ -1,10 +1,10 @@ -EverGrandeCity_SidneysRoom_EventObjects: @ 8533610 +EverGrandeCity_SidneysRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0 -EverGrandeCity_SidneysRoom_MapWarps: @ 8533628 +EverGrandeCity_SidneysRoom_MapWarps: warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_HALL5 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL1 -EverGrandeCity_SidneysRoom_MapEvents:: @ 8533638 +EverGrandeCity_SidneysRoom_MapEvents:: map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index b19db5fbb..e7d7f0812 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -1,10 +1,10 @@ -EverGrandeCity_SidneysRoom: @ 8483BCC +EverGrandeCity_SidneysRoom: .4byte EverGrandeCity_SidneysRoom_Layout .4byte EverGrandeCity_SidneysRoom_MapEvents .4byte EverGrandeCity_SidneysRoom_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 111 + .2byte LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM .byte MAPSEC_EVER_GRANDE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown/connections.inc b/data/maps/FallarborTown/connections.inc index 3808099d8..d5955c9e6 100644 --- a/data/maps/FallarborTown/connections.inc +++ b/data/maps/FallarborTown/connections.inc @@ -1,8 +1,8 @@ -FallarborTown_MapConnectionsList: @ 8486674 +FallarborTown_MapConnectionsList: connection left, 0, MAP_ROUTE114 connection right, 0, MAP_ROUTE113 -FallarborTown_MapConnections: @ 848668C - .4byte 0x2 +FallarborTown_MapConnections: + .4byte 2 .4byte FallarborTown_MapConnectionsList diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc index 9b2f0a2de..b3c451595 100644 --- a/data/maps/FallarborTown/events.inc +++ b/data/maps/FallarborTown/events.inc @@ -1,17 +1,17 @@ -FallarborTown_EventObjects: @ 8527BE0 +FallarborTown_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_1EB22B, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0 object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_1EB234, 0 object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, FLAG_HIDE_FALLARBOR_AZURILL -FallarborTown_MapWarps: @ 8527C40 +FallarborTown_MapWarps: warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART warp_def 8, 7, 0, 0, MAP_FALLARBOR_TOWN_BATTLE_TENT_LOBBY warp_def 14, 7, 0, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F warp_def 6, 17, 0, 0, MAP_FALLARBOR_TOWN_HOUSE1 warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2 -FallarborTown_MapBGEvents: @ 8527C68 +FallarborTown_MapBGEvents: bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E6A bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_271E73 bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB250 @@ -21,6 +21,6 @@ FallarborTown_MapBGEvents: @ 8527C68 bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_1EB262 bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET -FallarborTown_MapEvents:: @ 8527CC8 +FallarborTown_MapEvents:: map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index f32f0c30b..2e74cee38 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -1,10 +1,10 @@ -FallarborTown: @ 8482624 +FallarborTown: .4byte FallarborTown_Layout .4byte FallarborTown_MapEvents .4byte FallarborTown_MapScripts .4byte FallarborTown_MapConnections .2byte MUS_TONEKUSA - .2byte 14 + .2byte LAYOUT_FALLARBOR_TOWN .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc index 681f5b028..d452752d7 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/events.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/events.inc @@ -1,8 +1,8 @@ -FallarborTown_BattleTentBattleRoom_EventObjects: @ 852E444 +FallarborTown_BattleTentBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 -FallarborTown_BattleTentBattleRoom_MapEvents:: @ 852E48C +FallarborTown_BattleTentBattleRoom_MapEvents:: map_events FallarborTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc index 3435512f2..615c0ed26 100644 --- a/data/maps/FallarborTown_BattleTentBattleRoom/header.inc +++ b/data/maps/FallarborTown_BattleTentBattleRoom/header.inc @@ -1,10 +1,10 @@ -FallarborTown_BattleTentBattleRoom: @ 8482DCC +FallarborTown_BattleTentBattleRoom: .4byte BattleTentBattleRoom_Layout .4byte FallarborTown_BattleTentBattleRoom_MapEvents .4byte FallarborTown_BattleTentBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 386 + .2byte LAYOUT_BATTLE_TENT_BATTLE_ROOM .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_BattleTentCorridor/events.inc b/data/maps/FallarborTown_BattleTentCorridor/events.inc index 4af82f353..18c0dfb39 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/events.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/events.inc @@ -1,6 +1,6 @@ -FallarborTown_BattleTentCorridor_EventObjects: @ 852E418 +FallarborTown_BattleTentCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -FallarborTown_BattleTentCorridor_MapEvents:: @ 852E430 +FallarborTown_BattleTentCorridor_MapEvents:: map_events FallarborTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/FallarborTown_BattleTentCorridor/header.inc b/data/maps/FallarborTown_BattleTentCorridor/header.inc index 4b45ea55d..fd64a3266 100644 --- a/data/maps/FallarborTown_BattleTentCorridor/header.inc +++ b/data/maps/FallarborTown_BattleTentCorridor/header.inc @@ -1,10 +1,10 @@ -FallarborTown_BattleTentCorridor: @ 8482DB0 +FallarborTown_BattleTentCorridor: .4byte BattleTentCorridor_Layout .4byte FallarborTown_BattleTentCorridor_MapEvents .4byte FallarborTown_BattleTentCorridor_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 385 + .2byte LAYOUT_BATTLE_TENT_CORRIDOR .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_BattleTentLobby/events.inc b/data/maps/FallarborTown_BattleTentLobby/events.inc index 6a9741c50..2a9b758ca 100644 --- a/data/maps/FallarborTown_BattleTentLobby/events.inc +++ b/data/maps/FallarborTown_BattleTentLobby/events.inc @@ -1,17 +1,17 @@ -FallarborTown_BattleTentLobby_EventObjects: @ 852E370 +FallarborTown_BattleTentLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0 object_event 2, EVENT_OBJ_GFX_HIKER, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_BOY, 0, 12, 6, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0 object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0 object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT -FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8 +FallarborTown_BattleTentLobby_MapWarps: warp_def 6, 9, 0, 1, MAP_FALLARBOR_TOWN warp_def 7, 9, 0, 1, MAP_FALLARBOR_TOWN -FallarborTown_BattleTentLobby_MapBGEvents: @ 852E3F8 +FallarborTown_BattleTentLobby_MapBGEvents: bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_BattleTentLobby_EventScript_20024F -FallarborTown_BattleTentLobby_MapEvents:: @ 852E404 +FallarborTown_BattleTentLobby_MapEvents:: map_events FallarborTown_BattleTentLobby_EventObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents diff --git a/data/maps/FallarborTown_BattleTentLobby/header.inc b/data/maps/FallarborTown_BattleTentLobby/header.inc index 2465f36c8..4bdba3d51 100644 --- a/data/maps/FallarborTown_BattleTentLobby/header.inc +++ b/data/maps/FallarborTown_BattleTentLobby/header.inc @@ -1,10 +1,10 @@ -FallarborTown_BattleTentLobby: @ 8482D94 +FallarborTown_BattleTentLobby: .4byte BattleTentLobby_Layout .4byte FallarborTown_BattleTentLobby_MapEvents .4byte FallarborTown_BattleTentLobby_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 384 + .2byte LAYOUT_BATTLE_TENT_LOBBY .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc index da261afb4..9db77af03 100644 --- a/data/maps/FallarborTown_House1/events.inc +++ b/data/maps/FallarborTown_House1/events.inc @@ -1,11 +1,11 @@ -FallarborTown_House1_EventObjects: @ 852E5B8 +FallarborTown_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_200F13, FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0 -FallarborTown_House1_MapWarps: @ 852E5E8 +FallarborTown_House1_MapWarps: warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN -FallarborTown_House1_MapEvents:: @ 852E5F8 +FallarborTown_House1_MapEvents:: map_events FallarborTown_House1_EventObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index d5362b8c5..a17a5e0ab 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -1,10 +1,10 @@ -FallarborTown_House1: @ 8482E20 +FallarborTown_House1: .4byte House1_Layout .4byte FallarborTown_House1_MapEvents .4byte FallarborTown_House1_MapScripts .4byte 0x0 .2byte MUS_TONEKUSA - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_House2/events.inc b/data/maps/FallarborTown_House2/events.inc index 1b4e1c96e..117322b02 100644 --- a/data/maps/FallarborTown_House2/events.inc +++ b/data/maps/FallarborTown_House2/events.inc @@ -1,10 +1,10 @@ -FallarborTown_House2_EventObjects: @ 852E60C +FallarborTown_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0 -FallarborTown_House2_MapWarps: @ 852E624 +FallarborTown_House2_MapWarps: warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN -FallarborTown_House2_MapEvents:: @ 852E634 +FallarborTown_House2_MapEvents:: map_events FallarborTown_House2_EventObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index 7cb16bbf3..bdbf10fed 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -1,10 +1,10 @@ -FallarborTown_House2: @ 8482E3C +FallarborTown_House2: .4byte House2_Layout .4byte FallarborTown_House2_MapEvents .4byte FallarborTown_House2_MapScripts .4byte 0x0 .2byte MUS_TONEKUSA - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_Mart/events.inc b/data/maps/FallarborTown_Mart/events.inc index 41bc31894..b4870cf57 100644 --- a/data/maps/FallarborTown_Mart/events.inc +++ b/data/maps/FallarborTown_Mart/events.inc @@ -1,14 +1,14 @@ -FallarborTown_Mart_EventObjects: @ 852E2D4 +FallarborTown_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0 object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0 object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0 -FallarborTown_Mart_MapWarps: @ 852E34C +FallarborTown_Mart_MapWarps: warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN -FallarborTown_Mart_MapEvents:: @ 852E35C +FallarborTown_Mart_MapEvents:: map_events FallarborTown_Mart_EventObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index 65c5caaa6..be4e4ae9e 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -1,10 +1,10 @@ -FallarborTown_Mart: @ 8482D78 +FallarborTown_Mart: .4byte Mart_Layout .4byte FallarborTown_Mart_MapEvents .4byte FallarborTown_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc index cb6243c6f..f091ffce1 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/events.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0 +FallarborTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, FLAG_HIDE_FALLORBOR_POKEMON_CENTER_LANETTE -FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500 +FallarborTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN warp_def 6, 8, 3, 2, MAP_FALLARBOR_TOWN warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F -FallarborTown_PokemonCenter_1F_MapEvents:: @ 852E518 +FallarborTown_PokemonCenter_1F_MapEvents:: map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index b30b4874f..a03b385b5 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -FallarborTown_PokemonCenter_1F: @ 8482DE8 +FallarborTown_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte FallarborTown_PokemonCenter_1F_MapEvents .4byte FallarborTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc index 233eab8d9..bc3c01dd8 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/events.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -FallarborTown_PokemonCenter_2F_EventObjects: @ 852E52C +FallarborTown_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C +FallarborTown_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -FallarborTown_PokemonCenter_2F_MapEvents:: @ 852E5A4 +FallarborTown_PokemonCenter_2F_MapEvents:: map_events FallarborTown_PokemonCenter_2F_EventObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index b818368bf..f3a761312 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -FallarborTown_PokemonCenter_2F: @ 8482E04 +FallarborTown_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte FallarborTown_PokemonCenter_2F_MapEvents .4byte FallarborTown_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_FALLARBOR_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FarawayIsland_Entrance/events.inc b/data/maps/FarawayIsland_Entrance/events.inc index 6c2a8ebe3..0ae752f93 100644 --- a/data/maps/FarawayIsland_Entrance/events.inc +++ b/data/maps/FarawayIsland_Entrance/events.inc @@ -1,19 +1,19 @@ -FarawayIsland_Entrance_EventObjects: @ 853D710 +FarawayIsland_Entrance_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 39, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 41, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 -FarawayIsland_Entrance_MapWarps: @ 853D740 +FarawayIsland_Entrance_MapWarps: warp_def 22, 7, 3, 0, MAP_FARAWAY_ISLAND_INTERIOR warp_def 23, 7, 3, 1, MAP_FARAWAY_ISLAND_INTERIOR -FarawayIsland_Entrance_MapCoordEvents: @ 853D750 +FarawayIsland_Entrance_MapCoordEvents: coord_event 9, 18, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C98 coord_event 10, 20, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C9D coord_event 22, 9, 3, 0, 0, FarawayIsland_Entrance_EventScript_267C98 -FarawayIsland_Entrance_MapBGEvents: @ 853D780 +FarawayIsland_Entrance_MapBGEvents: bg_event 3, 32, 0, BG_EVENT_PLAYER_FACING_NORTH, FarawayIsland_Entrance_EventScript_267CF1 -FarawayIsland_Entrance_MapEvents:: @ 853D78C +FarawayIsland_Entrance_MapEvents:: map_events FarawayIsland_Entrance_EventObjects, FarawayIsland_Entrance_MapWarps, FarawayIsland_Entrance_MapCoordEvents, FarawayIsland_Entrance_MapBGEvents diff --git a/data/maps/FarawayIsland_Entrance/header.inc b/data/maps/FarawayIsland_Entrance/header.inc index af762d832..b76f97aef 100644 --- a/data/maps/FarawayIsland_Entrance/header.inc +++ b/data/maps/FarawayIsland_Entrance/header.inc @@ -1,10 +1,10 @@ -FarawayIsland_Entrance: @ 848575C +FarawayIsland_Entrance: .4byte FarawayIsland_Entrance_Layout .4byte FarawayIsland_Entrance_MapEvents .4byte FarawayIsland_Entrance_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 402 + .2byte LAYOUT_FARAWAY_ISLAND_ENTRANCE .byte MAPSEC_FARAWAY_ISLAND .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FarawayIsland_Interior/events.inc b/data/maps/FarawayIsland_Interior/events.inc index fc8d99166..a8611c038 100644 --- a/data/maps/FarawayIsland_Interior/events.inc +++ b/data/maps/FarawayIsland_Interior/events.inc @@ -1,10 +1,10 @@ -FarawayIsland_Interior_EventObjects: @ 853D7A0 +FarawayIsland_Interior_EventObjects: object_event 1, EVENT_OBJ_GFX_MEW, 0, 13, 17, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 15, 15, 0, 1, FarawayIsland_Interior_EventScript_267DF2, FLAG_HIDE_MEW -FarawayIsland_Interior_MapWarps: @ 853D7B8 +FarawayIsland_Interior_MapWarps: warp_def 12, 19, 0, 0, MAP_FARAWAY_ISLAND_ENTRANCE warp_def 13, 19, 0, 1, MAP_FARAWAY_ISLAND_ENTRANCE -FarawayIsland_Interior_MapEvents:: @ 853D7C8 +FarawayIsland_Interior_MapEvents:: map_events FarawayIsland_Interior_EventObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0 diff --git a/data/maps/FarawayIsland_Interior/header.inc b/data/maps/FarawayIsland_Interior/header.inc index c37bacece..828202471 100644 --- a/data/maps/FarawayIsland_Interior/header.inc +++ b/data/maps/FarawayIsland_Interior/header.inc @@ -1,10 +1,10 @@ -FarawayIsland_Interior: @ 8485778 +FarawayIsland_Interior: .4byte FarawayIsland_Interior_Layout .4byte FarawayIsland_Interior_MapEvents .4byte FarawayIsland_Interior_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 403 + .2byte LAYOUT_FARAWAY_ISLAND_INTERIOR .byte MAPSEC_FARAWAY_ISLAND .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc index 0ea132989..7fd7e44ad 100644 --- a/data/maps/FieryPath/events.inc +++ b/data/maps/FieryPath/events.inc @@ -1,4 +1,4 @@ -FieryPath_EventObjects: @ 8534C80 +FieryPath_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_29119E, FLAG_ITEM_FIERY_PATH_TM06 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_11 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_12 @@ -8,10 +8,10 @@ FieryPath_EventObjects: @ 8534C80 object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FieryPath_EventScript_2908BA, FLAG_TEMP_16 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_291191, FLAG_ITEM_FIERY_PATH_FIRE_STONE -FieryPath_MapWarps: @ 8534D40 +FieryPath_MapWarps: warp_def 26, 36, 3, 4, MAP_ROUTE112 warp_def 26, 4, 3, 5, MAP_ROUTE112 -FieryPath_MapEvents:: @ 8534D50 +FieryPath_MapEvents:: map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index 20278028f..83e339adb 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -1,10 +1,10 @@ -FieryPath: @ 8484048 +FieryPath: .4byte FieryPath_Layout .4byte FieryPath_MapEvents .4byte FieryPath_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 293 + .2byte LAYOUT_FIERY_PATH .byte MAPSEC_FIERY_PATH .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity/connections.inc b/data/maps/FortreeCity/connections.inc index 83b48c0ad..5e48951c2 100644 --- a/data/maps/FortreeCity/connections.inc +++ b/data/maps/FortreeCity/connections.inc @@ -1,8 +1,8 @@ -FortreeCity_MapConnectionsList: @ 8486784 +FortreeCity_MapConnectionsList: connection left, 0, MAP_ROUTE119 connection right, 0, MAP_ROUTE120 -FortreeCity_MapConnections: @ 848679C - .4byte 0x2 +FortreeCity_MapConnections: + .4byte 2 .4byte FortreeCity_MapConnectionsList diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc index 4dc9f3e83..865393404 100644 --- a/data/maps/FortreeCity/events.inc +++ b/data/maps/FortreeCity/events.inc @@ -1,4 +1,4 @@ -FortreeCity_EventObjects: @ 8526B9C +FortreeCity_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0 object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_EventScript_1E25DE, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 32, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, FortreeCity_EventScript_1E25BF, 0 @@ -7,7 +7,7 @@ FortreeCity_EventObjects: @ 8526B9C object_event 6, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0 object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, FortreeCity_EventScript_1E2614, FLAG_HIDE_FORTREE_CITY_KECLEON -FortreeCity_MapWarps: @ 8526C44 +FortreeCity_MapWarps: warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F warp_def 10, 3, 0, 0, MAP_FORTREE_CITY_HOUSE1 warp_def 22, 11, 0, 0, MAP_FORTREE_CITY_GYM @@ -18,7 +18,7 @@ FortreeCity_MapWarps: @ 8526C44 warp_def 12, 13, 0, 0, MAP_FORTREE_CITY_HOUSE5 warp_def 37, 13, 0, 0, MAP_FORTREE_CITY_DECORATION_SHOP -FortreeCity_MapBGEvents: @ 8526C8C +FortreeCity_MapBGEvents: bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_1E2602 bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E73 bg_event 5, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E6A @@ -26,6 +26,6 @@ FortreeCity_MapBGEvents: @ 8526C8C bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E73 bg_event 6, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_271E6A -FortreeCity_MapEvents:: @ 8526CD4 +FortreeCity_MapEvents:: map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index 0bfccda3c..9d7cd5aae 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -1,10 +1,10 @@ -FortreeCity: @ 8482528 +FortreeCity: .4byte FortreeCity_Layout .4byte FortreeCity_MapEvents .4byte FortreeCity_MapScripts .4byte FortreeCity_MapConnections .2byte MUS_MACHI_S3 - .2byte 5 + .2byte LAYOUT_FORTREE_CITY .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/FortreeCity_DecorationShop/events.inc b/data/maps/FortreeCity_DecorationShop/events.inc index 2c5a0d21e..604e3fda1 100644 --- a/data/maps/FortreeCity_DecorationShop/events.inc +++ b/data/maps/FortreeCity_DecorationShop/events.inc @@ -1,13 +1,13 @@ -FortreeCity_DecorationShop_EventObjects: @ 85310B0 +FortreeCity_DecorationShop_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0 object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0 object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0 -FortreeCity_DecorationShop_MapWarps: @ 8531110 +FortreeCity_DecorationShop_MapWarps: warp_def 3, 5, 0, 8, MAP_FORTREE_CITY warp_def 4, 5, 0, 8, MAP_FORTREE_CITY -FortreeCity_DecorationShop_MapEvents:: @ 8531120 +FortreeCity_DecorationShop_MapEvents:: map_events FortreeCity_DecorationShop_EventObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index 4a640a8ad..b4e0c9205 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -1,10 +1,10 @@ -FortreeCity_DecorationShop: @ 848361C +FortreeCity_DecorationShop: .4byte FortreeCity_DecorationShop_Layout .4byte FortreeCity_DecorationShop_MapEvents .4byte FortreeCity_DecorationShop_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 255 + .2byte LAYOUT_FORTREE_CITY_DECORATION_SHOP .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc index 307d35cc7..e71b6ea4e 100644 --- a/data/maps/FortreeCity_Gym/events.inc +++ b/data/maps/FortreeCity_Gym/events.inc @@ -1,4 +1,4 @@ -FortreeCity_Gym_EventObjects: @ 8530C98 +FortreeCity_Gym_EventObjects: object_event 1, EVENT_OBJ_GFX_WINONA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0 object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0 @@ -8,14 +8,14 @@ FortreeCity_Gym_EventObjects: @ 8530C98 object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, FortreeCity_Gym_EventScript_216704, 0 object_event 8, EVENT_OBJ_GFX_MAN_5, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, FortreeCity_Gym_EventScript_21671B, 0 -FortreeCity_Gym_MapWarps: @ 8530D58 +FortreeCity_Gym_MapWarps: warp_def 15, 24, 0, 2, MAP_FORTREE_CITY warp_def 16, 24, 0, 2, MAP_FORTREE_CITY -FortreeCity_Gym_MapBGEvents: @ 8530D68 +FortreeCity_Gym_MapBGEvents: bg_event 14, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_216751 bg_event 17, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_216761 -FortreeCity_Gym_MapEvents:: @ 8530D80 +FortreeCity_Gym_MapEvents:: map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 68f02747f..2bde54ddd 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -1,10 +1,10 @@ -FortreeCity_Gym: @ 848353C +FortreeCity_Gym: .4byte FortreeCity_Gym_Layout .4byte FortreeCity_Gym_MapEvents .4byte FortreeCity_Gym_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 100 + .2byte LAYOUT_FORTREE_CITY_GYM .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_House1/events.inc b/data/maps/FortreeCity_House1/events.inc index 45b2a902a..5cf082d41 100644 --- a/data/maps/FortreeCity_House1/events.inc +++ b/data/maps/FortreeCity_House1/events.inc @@ -1,12 +1,12 @@ -FortreeCity_House1_EventObjects: @ 8530C2C +FortreeCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0 object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_House1_EventScript_21635F, 0 -FortreeCity_House1_MapWarps: @ 8530C74 +FortreeCity_House1_MapWarps: warp_def 3, 5, 0, 1, MAP_FORTREE_CITY warp_def 4, 5, 0, 1, MAP_FORTREE_CITY -FortreeCity_House1_MapEvents:: @ 8530C84 +FortreeCity_House1_MapEvents:: map_events FortreeCity_House1_EventObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 1b52dd725..636a147f4 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -1,10 +1,10 @@ -FortreeCity_House1: @ 8483520 +FortreeCity_House1: .4byte FortreeCity_House1_Layout .4byte FortreeCity_House1_MapEvents .4byte FortreeCity_House1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 99 + .2byte LAYOUT_FORTREE_CITY_HOUSE1 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_House2/events.inc b/data/maps/FortreeCity_House2/events.inc index f9a5c11ab..ca183c005 100644 --- a/data/maps/FortreeCity_House2/events.inc +++ b/data/maps/FortreeCity_House2/events.inc @@ -1,11 +1,11 @@ -FortreeCity_House2_EventObjects: @ 8530F30 +FortreeCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0 -FortreeCity_House2_MapWarps: @ 8530F60 +FortreeCity_House2_MapWarps: warp_def 3, 5, 0, 4, MAP_FORTREE_CITY warp_def 4, 5, 0, 4, MAP_FORTREE_CITY -FortreeCity_House2_MapEvents:: @ 8530F70 +FortreeCity_House2_MapEvents:: map_events FortreeCity_House2_EventObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index 02b76c394..e61c000f6 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -1,10 +1,10 @@ -FortreeCity_House2: @ 84835AC +FortreeCity_House2: .4byte FortreeCity_House2_Layout .4byte FortreeCity_House2_MapEvents .4byte FortreeCity_House2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 101 + .2byte LAYOUT_FORTREE_CITY_HOUSE2 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_House3/events.inc b/data/maps/FortreeCity_House3/events.inc index 23ae10688..8a158f8ff 100644 --- a/data/maps/FortreeCity_House3/events.inc +++ b/data/maps/FortreeCity_House3/events.inc @@ -1,11 +1,11 @@ -FortreeCity_House3_EventObjects: @ 8530F84 +FortreeCity_House3_EventObjects: object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House3_EventScript_217AF1, 0 -FortreeCity_House3_MapWarps: @ 8530FB4 +FortreeCity_House3_MapWarps: warp_def 3, 5, 0, 5, MAP_FORTREE_CITY warp_def 4, 5, 0, 5, MAP_FORTREE_CITY -FortreeCity_House3_MapEvents:: @ 8530FC4 +FortreeCity_House3_MapEvents:: map_events FortreeCity_House3_EventObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index 1b039c24e..db66e65d8 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -1,10 +1,10 @@ -FortreeCity_House3: @ 84835C8 +FortreeCity_House3: .4byte FortreeCity_House1_Layout .4byte FortreeCity_House3_MapEvents .4byte FortreeCity_House3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 99 + .2byte LAYOUT_FORTREE_CITY_HOUSE1 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_House4/events.inc b/data/maps/FortreeCity_House4/events.inc index 8c7e03f76..bc6a4a39c 100644 --- a/data/maps/FortreeCity_House4/events.inc +++ b/data/maps/FortreeCity_House4/events.inc @@ -1,12 +1,12 @@ -FortreeCity_House4_EventObjects: @ 8530FD8 +FortreeCity_House4_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House4_EventScript_217C81, 0 object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0 object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL -FortreeCity_House4_MapWarps: @ 8531020 +FortreeCity_House4_MapWarps: warp_def 3, 5, 0, 6, MAP_FORTREE_CITY warp_def 4, 5, 0, 6, MAP_FORTREE_CITY -FortreeCity_House4_MapEvents:: @ 8531030 +FortreeCity_House4_MapEvents:: map_events FortreeCity_House4_EventObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index e675e063b..cd340c294 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -1,10 +1,10 @@ -FortreeCity_House4: @ 84835E4 +FortreeCity_House4: .4byte FortreeCity_House2_Layout .4byte FortreeCity_House4_MapEvents .4byte FortreeCity_House4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 101 + .2byte LAYOUT_FORTREE_CITY_HOUSE2 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_House5/events.inc b/data/maps/FortreeCity_House5/events.inc index 8db01a8d0..bc090cb80 100644 --- a/data/maps/FortreeCity_House5/events.inc +++ b/data/maps/FortreeCity_House5/events.inc @@ -1,12 +1,12 @@ -FortreeCity_House5_EventObjects: @ 8531044 +FortreeCity_House5_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0 object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0 object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0 -FortreeCity_House5_MapWarps: @ 853108C +FortreeCity_House5_MapWarps: warp_def 3, 5, 0, 7, MAP_FORTREE_CITY warp_def 4, 5, 0, 7, MAP_FORTREE_CITY -FortreeCity_House5_MapEvents:: @ 853109C +FortreeCity_House5_MapEvents:: map_events FortreeCity_House5_EventObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index bac2fff5b..a04e91eb3 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -1,10 +1,10 @@ -FortreeCity_House5: @ 8483600 +FortreeCity_House5: .4byte FortreeCity_House1_Layout .4byte FortreeCity_House5_MapEvents .4byte FortreeCity_House5_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 99 + .2byte LAYOUT_FORTREE_CITY_HOUSE1 .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_Mart/events.inc b/data/maps/FortreeCity_Mart/events.inc index e41280e89..ceb68f7ea 100644 --- a/data/maps/FortreeCity_Mart/events.inc +++ b/data/maps/FortreeCity_Mart/events.inc @@ -1,13 +1,13 @@ -FortreeCity_Mart_EventObjects: @ 8530EAC +FortreeCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0 object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0 -FortreeCity_Mart_MapWarps: @ 8530F0C +FortreeCity_Mart_MapWarps: warp_def 3, 7, 0, 3, MAP_FORTREE_CITY warp_def 4, 7, 0, 3, MAP_FORTREE_CITY -FortreeCity_Mart_MapEvents:: @ 8530F1C +FortreeCity_Mart_MapEvents:: map_events FortreeCity_Mart_EventObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index 37af953ab..f4aaf9ce1 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -1,10 +1,10 @@ -FortreeCity_Mart: @ 8483590 +FortreeCity_Mart: .4byte Mart_Layout .4byte FortreeCity_Mart_MapEvents .4byte FortreeCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_PokemonCenter_1F/events.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc index f43cb4063..af7b5f72e 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/events.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -FortreeCity_PokemonCenter_1F_EventObjects: @ 8530D94 +FortreeCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 8, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0 object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0 -FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4 +FortreeCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 0, MAP_FORTREE_CITY warp_def 6, 8, 3, 0, MAP_FORTREE_CITY warp_def 1, 6, 4, 0, MAP_FORTREE_CITY_POKEMON_CENTER_2F -FortreeCity_PokemonCenter_1F_MapEvents:: @ 8530E0C +FortreeCity_PokemonCenter_1F_MapEvents:: map_events FortreeCity_PokemonCenter_1F_EventObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index f2fdf3769..543e672a2 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -FortreeCity_PokemonCenter_1F: @ 8483558 +FortreeCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte FortreeCity_PokemonCenter_1F_MapEvents .4byte FortreeCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/FortreeCity_PokemonCenter_2F/events.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc index 028b5cada..7cdbc4a82 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/events.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -FortreeCity_PokemonCenter_2F_EventObjects: @ 8530E20 +FortreeCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80 +FortreeCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -FortreeCity_PokemonCenter_2F_MapEvents:: @ 8530E98 +FortreeCity_PokemonCenter_2F_MapEvents:: map_events FortreeCity_PokemonCenter_2F_EventObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index 1ad4484d9..8dbfeed07 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -FortreeCity_PokemonCenter_2F: @ 8483574 +FortreeCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte FortreeCity_PokemonCenter_2F_MapEvents .4byte FortreeCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_FORTREE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/GraniteCave_1F/events.inc b/data/maps/GraniteCave_1F/events.inc index 8228e1678..1885f3cf5 100644 --- a/data/maps/GraniteCave_1F/events.inc +++ b/data/maps/GraniteCave_1F/events.inc @@ -1,13 +1,13 @@ -GraniteCave_1F_EventObjects: @ 85343BC +GraniteCave_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, FLAG_ITEM_GRANITE_CAVE_1F_ESCAPE_ROPE -GraniteCave_1F_MapWarps: @ 85343EC +GraniteCave_1F_MapWarps: warp_def 37, 12, 3, 0, MAP_ROUTE106 warp_def 35, 3, 3, 0, MAP_GRANITE_CAVE_B1F warp_def 17, 11, 3, 1, MAP_GRANITE_CAVE_B1F warp_def 5, 10, 3, 0, MAP_GRANITE_CAVE_STEVENS_ROOM -GraniteCave_1F_MapEvents:: @ 853440C +GraniteCave_1F_MapEvents:: map_events GraniteCave_1F_EventObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index 7578523b2..2f834c7eb 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -1,10 +1,10 @@ -GraniteCave_1F: @ 8483F84 +GraniteCave_1F: .4byte GraniteCave_1F_Layout .4byte GraniteCave_1F_MapEvents .4byte GraniteCave_1F_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 132 + .2byte LAYOUT_GRANITE_CAVE_1F .byte MAPSEC_GRANITE_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/GraniteCave_B1F/events.inc b/data/maps/GraniteCave_B1F/events.inc index b27a68f17..f3dcbcbaf 100644 --- a/data/maps/GraniteCave_B1F/events.inc +++ b/data/maps/GraniteCave_B1F/events.inc @@ -1,7 +1,7 @@ -GraniteCave_B1F_EventObjects: @ 8534420 +GraniteCave_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, FLAG_ITEM_GRANITE_CAVE_B1F_POKE_BALL -GraniteCave_B1F_MapWarps: @ 8534438 +GraniteCave_B1F_MapWarps: warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F warp_def 4, 21, 3, 2, MAP_GRANITE_CAVE_1F warp_def 29, 13, 3, 0, MAP_GRANITE_CAVE_B2F @@ -10,6 +10,6 @@ GraniteCave_B1F_MapWarps: @ 8534438 warp_def 12, 3, 3, 3, MAP_GRANITE_CAVE_B2F warp_def 29, 2, 3, 4, MAP_GRANITE_CAVE_B2F -GraniteCave_B1F_MapEvents:: @ 8534470 +GraniteCave_B1F_MapEvents:: map_events GraniteCave_B1F_EventObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 64187397c..546c24658 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -1,10 +1,10 @@ -GraniteCave_B1F: @ 8483FA0 +GraniteCave_B1F: .4byte GraniteCave_B1F_Layout .4byte GraniteCave_B1F_MapEvents .4byte GraniteCave_B1F_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 133 + .2byte LAYOUT_GRANITE_CAVE_B1F .byte MAPSEC_GRANITE_CAVE .byte 1 .byte WEATHER_NONE diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc index 08ac73a5a..fc321dfb0 100644 --- a/data/maps/GraniteCave_B2F/events.inc +++ b/data/maps/GraniteCave_B2F/events.inc @@ -1,4 +1,4 @@ -GraniteCave_B2F_EventObjects: @ 8534484 +GraniteCave_B2F_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, FLAG_ITEM_GRANITE_CAVE_B2F_REPEL object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, FLAG_ITEM_GRANITE_CAVE_B2F_RARE_CANDY object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_11 @@ -9,17 +9,17 @@ GraniteCave_B2F_EventObjects: @ 8534484 object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_16 object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, GraniteCave_B2F_EventScript_2907A6, FLAG_TEMP_17 -GraniteCave_B2F_MapWarps: @ 853455C +GraniteCave_B2F_MapWarps: warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F warp_def 28, 21, 3, 3, MAP_GRANITE_CAVE_B1F warp_def 8, 5, 3, 4, MAP_GRANITE_CAVE_B1F warp_def 12, 3, 3, 5, MAP_GRANITE_CAVE_B1F warp_def 29, 2, 3, 6, MAP_GRANITE_CAVE_B1F -GraniteCave_B2F_MapBGEvents: @ 8534584 +GraniteCave_B2F_MapBGEvents: bg_hidden_item_event 28, 6, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_1 bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_GRANITE_CAVE_B2F_EVERSTONE_2 -GraniteCave_B2F_MapEvents:: @ 853459C +GraniteCave_B2F_MapEvents:: map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 4fd519156..ce63017be 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -1,10 +1,10 @@ -GraniteCave_B2F: @ 8483FBC +GraniteCave_B2F: .4byte GraniteCave_B2F_Layout .4byte GraniteCave_B2F_MapEvents .4byte GraniteCave_B2F_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 134 + .2byte LAYOUT_GRANITE_CAVE_B2F .byte MAPSEC_GRANITE_CAVE .byte 1 .byte WEATHER_NONE diff --git a/data/maps/GraniteCave_StevensRoom/events.inc b/data/maps/GraniteCave_StevensRoom/events.inc index 387770626..747fe2cc3 100644 --- a/data/maps/GraniteCave_StevensRoom/events.inc +++ b/data/maps/GraniteCave_StevensRoom/events.inc @@ -1,9 +1,9 @@ -GraniteCave_StevensRoom_EventObjects: @ 85345B0 +GraniteCave_StevensRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, FLAG_HIDE_GRANITE_CAVE_STEVEN -GraniteCave_StevensRoom_MapWarps: @ 85345C8 +GraniteCave_StevensRoom_MapWarps: warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F -GraniteCave_StevensRoom_MapEvents:: @ 85345D0 +GraniteCave_StevensRoom_MapEvents:: map_events GraniteCave_StevensRoom_EventObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index 0bd8e41b2..6d90fc6c8 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -1,10 +1,10 @@ -GraniteCave_StevensRoom: @ 8483FD8 +GraniteCave_StevensRoom: .4byte GraniteCave_StevensRoom_Layout .4byte GraniteCave_StevensRoom_MapEvents .4byte GraniteCave_StevensRoom_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 288 + .2byte LAYOUT_GRANITE_CAVE_STEVENS_ROOM .byte MAPSEC_GRANITE_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc index f8dbe9ad7..c7888165f 100644 --- a/data/maps/InsideOfTruck/events.inc +++ b/data/maps/InsideOfTruck/events.inc @@ -1,25 +1,25 @@ -InsideOfTruck_EventObjects: @ 853A078 +InsideOfTruck_EventObjects: object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0 -InsideOfTruck_MapWarps: @ 853A0C0 +InsideOfTruck_MapWarps: warp_def 4, 1, 0, 127, MAP_NONE warp_def 4, 2, 0, 127, MAP_NONE warp_def 4, 3, 0, 127, MAP_NONE -InsideOfTruck_MapCoordEvents: @ 853A0D8 +InsideOfTruck_MapCoordEvents: coord_event 3, 1, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 coord_event 3, 2, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 coord_event 3, 3, 3, VAR_0x4092, 0, InsideOfTruck_EventScript_23BF04 -InsideOfTruck_MapBGEvents: @ 853A108 +InsideOfTruck_MapBGEvents: bg_event 1, 0, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_23BF6C -InsideOfTruck_MapEvents:: @ 853A144 +InsideOfTruck_MapEvents:: map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index 52ea777a9..7b1889e25 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -1,10 +1,10 @@ -InsideOfTruck: @ 8484EF0 +InsideOfTruck: .4byte InsideOfTruck_Layout .4byte InsideOfTruck_MapEvents .4byte InsideOfTruck_MapScripts .4byte 0x0 .2byte 65535 - .2byte 237 + .2byte LAYOUT_INSIDE_OF_TRUCK .byte MAPSEC_INSIDE_OF_TRUCK .byte 0 .byte WEATHER_NONE diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc index f6abd57a7..fa9c3deba 100644 --- a/data/maps/IslandCave/events.inc +++ b/data/maps/IslandCave/events.inc @@ -1,16 +1,16 @@ -IslandCave_EventObjects: @ 8536C74 +IslandCave_EventObjects: object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, IslandCave_EventScript_238F58, FLAG_HIDE_REGICE -IslandCave_MapWarps: @ 8536C8C +IslandCave_MapWarps: warp_def 8, 29, 3, 0, MAP_ROUTE105 warp_def 8, 20, 0, 2, MAP_ISLAND_CAVE warp_def 8, 11, 3, 1, MAP_ISLAND_CAVE -IslandCave_MapBGEvents: @ 8536CA4 +IslandCave_MapBGEvents: bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238EEF bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238F1D bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_238F1D -IslandCave_MapEvents:: @ 8536CC8 +IslandCave_MapEvents:: map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index 767df72f0..15eb2b360 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -1,10 +1,10 @@ -IslandCave: @ 8484614 +IslandCave: .4byte IslandCave_Layout .4byte IslandCave_MapEvents .4byte IslandCave_MapScripts .4byte 0x0 .2byte MUS_MABOROSI - .2byte 280 + .2byte LAYOUT_ISLAND_CAVE .byte MAPSEC_ISLAND_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc index f9a82c89b..5d33af93e 100644 --- a/data/maps/JaggedPass/events.inc +++ b/data/maps/JaggedPass/events.inc @@ -1,4 +1,4 @@ -JaggedPass_EventObjects: @ 8534AE4 +JaggedPass_EventObjects: object_event 1, EVENT_OBJ_GFX_HIKER, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0 object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_291184, FLAG_ITEM_JAGGED_PASS_BURN_HEAL @@ -7,14 +7,14 @@ JaggedPass_EventObjects: @ 8534AE4 object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, JaggedPass_EventScript_230871, 0 object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 18, 25, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, JaggedPass_EventScript_23085A, 0 -JaggedPass_MapWarps: @ 8534B8C +JaggedPass_MapWarps: warp_def 14, 40, 3, 2, MAP_ROUTE112 warp_def 15, 40, 3, 3, MAP_ROUTE112 warp_def 13, 5, 3, 2, MAP_MT_CHIMNEY warp_def 14, 5, 3, 3, MAP_MT_CHIMNEY warp_def 16, 18, 0, 0, MAP_MAGMA_HIDEOUT_1F -JaggedPass_MapCoordEvents: @ 8534BB4 +JaggedPass_MapCoordEvents: coord_weather_event 13, 15, 3, COORD_EVENT_WEATHER_SUNNY coord_weather_event 21, 12, 3, COORD_EVENT_WEATHER_ASH coord_weather_event 14, 15, 3, COORD_EVENT_WEATHER_SUNNY @@ -26,10 +26,10 @@ JaggedPass_MapCoordEvents: @ 8534BB4 coord_event 14, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB coord_event 13, 15, 3, VAR_0x40C8, 1, JaggedPass_EventScript_2306BB -JaggedPass_MapBGEvents: @ 8534C54 +JaggedPass_MapBGEvents: bg_hidden_item_event 8, 10, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_JAGGED_PASS_FULL_HEAL bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_JAGGED_PASS_GREAT_BALL -JaggedPass_MapEvents:: @ 8534C6C +JaggedPass_MapEvents:: map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index f53bfbe65..870b817ec 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -1,10 +1,10 @@ -JaggedPass: @ 848402C +JaggedPass: .4byte JaggedPass_Layout .4byte JaggedPass_MapEvents .4byte JaggedPass_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 292 + .2byte LAYOUT_JAGGED_PASS .byte MAPSEC_JAGGED_PASS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LavaridgeTown/connections.inc b/data/maps/LavaridgeTown/connections.inc index 0b8181615..e3d4e1fb1 100644 --- a/data/maps/LavaridgeTown/connections.inc +++ b/data/maps/LavaridgeTown/connections.inc @@ -1,7 +1,7 @@ -LavaridgeTown_MapConnectionsList: @ 8486660 +LavaridgeTown_MapConnectionsList: connection right, -40, MAP_ROUTE112 -LavaridgeTown_MapConnections: @ 848666C - .4byte 0x1 +LavaridgeTown_MapConnections: + .4byte 1 .4byte LavaridgeTown_MapConnectionsList diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc index 6d34ee5c8..aeb55249e 100644 --- a/data/maps/LavaridgeTown/events.inc +++ b/data/maps/LavaridgeTown/events.inc @@ -1,4 +1,4 @@ -LavaridgeTown_EventObjects: @ 8527A54 +LavaridgeTown_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0 object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0 @@ -9,7 +9,7 @@ LavaridgeTown_EventObjects: @ 8527A54 object_event 8, EVENT_OBJ_GFX_VAR_0, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 object_event 9, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_EventScript_1EA744, 0 -LavaridgeTown_MapWarps: @ 8527B2C +LavaridgeTown_MapWarps: warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP warp_def 5, 15, 0, 0, MAP_LAVARIDGE_TOWN_GYM_1F warp_def 15, 5, 0, 0, MAP_LAVARIDGE_TOWN_MART @@ -17,10 +17,10 @@ LavaridgeTown_MapWarps: @ 8527B2C warp_def 16, 15, 0, 0, MAP_LAVARIDGE_TOWN_HOUSE warp_def 9, 2, 3, 3, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F -LavaridgeTown_MapCoordEvents: @ 8527B5C +LavaridgeTown_MapCoordEvents: coord_event 6, 3, 3, 0, 0, LavaridgeTown_EventScript_1EA6FA -LavaridgeTown_MapBGEvents: @ 8527B6C +LavaridgeTown_MapBGEvents: bg_event 14, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7B7 bg_event 7, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_1EA7AE bg_event 17, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E6A @@ -30,6 +30,6 @@ LavaridgeTown_MapBGEvents: @ 8527B6C bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_271E73 bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL -LavaridgeTown_MapEvents:: @ 8527BCC +LavaridgeTown_MapEvents:: map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index 6ea1e048c..5365e1a00 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown: @ 8482608 +LavaridgeTown: .4byte LavaridgeTown_Layout .4byte LavaridgeTown_MapEvents .4byte LavaridgeTown_MapScripts .4byte LavaridgeTown_MapConnections .2byte MUS_MACHI_S4 - .2byte 13 + .2byte LAYOUT_LAVARIDGE_TOWN .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc index ee1cf057f..08d22737c 100644 --- a/data/maps/LavaridgeTown_Gym_1F/events.inc +++ b/data/maps/LavaridgeTown_Gym_1F/events.inc @@ -1,4 +1,4 @@ -LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C +LavaridgeTown_Gym_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 13, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0 object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 3, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0 @@ -6,7 +6,7 @@ LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0 object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0 -LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC +LavaridgeTown_Gym_1F_MapWarps: warp_def 13, 18, 3, 1, MAP_LAVARIDGE_TOWN warp_def 14, 18, 3, 1, MAP_LAVARIDGE_TOWN warp_def 10, 18, 3, 0, MAP_LAVARIDGE_TOWN_GYM_B1F @@ -34,10 +34,10 @@ LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC warp_def 13, 17, 3, 22, MAP_LAVARIDGE_TOWN_GYM_B1F warp_def 12, 12, 3, 23, MAP_LAVARIDGE_TOWN_GYM_B1F -LavaridgeTown_Gym_1F_MapBGEvents: @ 852DF7C +LavaridgeTown_Gym_1F_MapBGEvents: bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_1FE98B bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_1FE99B -LavaridgeTown_Gym_1F_MapEvents:: @ 852DF94 +LavaridgeTown_Gym_1F_MapEvents:: map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index 86882ed34..f71786ce0 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_Gym_1F: @ 8482CD0 +LavaridgeTown_Gym_1F: .4byte LavaridgeTown_Gym_1F_Layout .4byte LavaridgeTown_Gym_1F_MapEvents .4byte LavaridgeTown_Gym_1F_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 69 + .2byte LAYOUT_LAVARIDGE_TOWN_GYM_1F .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/LavaridgeTown_Gym_B1F/events.inc b/data/maps/LavaridgeTown_Gym_B1F/events.inc index 337bfd761..64512a994 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/events.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/events.inc @@ -1,10 +1,10 @@ -LavaridgeTown_Gym_B1F_EventObjects: @ 852DFA8 +LavaridgeTown_Gym_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 4, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0 object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 3, 6, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0 object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0 object_event 4, EVENT_OBJ_GFX_HIKER, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0 -LavaridgeTown_Gym_B1F_MapWarps: @ 852E008 +LavaridgeTown_Gym_B1F_MapWarps: warp_def 10, 18, 3, 2, MAP_LAVARIDGE_TOWN_GYM_1F warp_def 0, 17, 3, 6, MAP_LAVARIDGE_TOWN_GYM_1F warp_def 8, 9, 3, 3, MAP_LAVARIDGE_TOWN_GYM_1F @@ -30,6 +30,6 @@ LavaridgeTown_Gym_B1F_MapWarps: @ 852E008 warp_def 13, 17, 3, 24, MAP_LAVARIDGE_TOWN_GYM_1F warp_def 12, 12, 3, 25, MAP_LAVARIDGE_TOWN_GYM_1F -LavaridgeTown_Gym_B1F_MapEvents:: @ 852E0C8 +LavaridgeTown_Gym_B1F_MapEvents:: map_events LavaridgeTown_Gym_B1F_EventObjects, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index b393e3693..fc1d6308a 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_Gym_B1F: @ 8482CEC +LavaridgeTown_Gym_B1F: .4byte LavaridgeTown_Gym_B1F_Layout .4byte LavaridgeTown_Gym_B1F_MapEvents .4byte LavaridgeTown_Gym_B1F_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 70 + .2byte LAYOUT_LAVARIDGE_TOWN_GYM_B1F .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/LavaridgeTown_HerbShop/events.inc b/data/maps/LavaridgeTown_HerbShop/events.inc index f8602d872..3cce9612f 100644 --- a/data/maps/LavaridgeTown_HerbShop/events.inc +++ b/data/maps/LavaridgeTown_HerbShop/events.inc @@ -1,12 +1,12 @@ -LavaridgeTown_HerbShop_EventObjects: @ 852DDB0 +LavaridgeTown_HerbShop_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0 object_event 2, EVENT_OBJ_GFX_OLD_MAN, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0 -LavaridgeTown_HerbShop_MapWarps: @ 852DDF8 +LavaridgeTown_HerbShop_MapWarps: warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN -LavaridgeTown_HerbShop_MapEvents:: @ 852DE08 +LavaridgeTown_HerbShop_MapEvents:: map_events LavaridgeTown_HerbShop_EventObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index 596d13482..68fe70df7 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_HerbShop: @ 8482CB4 +LavaridgeTown_HerbShop: .4byte LavaridgeTown_HerbShop_Layout .4byte LavaridgeTown_HerbShop_MapEvents .4byte LavaridgeTown_HerbShop_MapScripts .4byte 0x0 .2byte MUS_MACHI_S4 - .2byte 68 + .2byte LAYOUT_LAVARIDGE_TOWN_HERB_SHOP .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LavaridgeTown_House/events.inc b/data/maps/LavaridgeTown_House/events.inc index 0a44e6e8d..77af1e746 100644 --- a/data/maps/LavaridgeTown_House/events.inc +++ b/data/maps/LavaridgeTown_House/events.inc @@ -1,12 +1,12 @@ -LavaridgeTown_House_EventObjects: @ 852E0DC +LavaridgeTown_House_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0 object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0 object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0 -LavaridgeTown_House_MapWarps: @ 852E124 +LavaridgeTown_House_MapWarps: warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN -LavaridgeTown_House_MapEvents:: @ 852E134 +LavaridgeTown_House_MapEvents:: map_events LavaridgeTown_House_EventObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index 11bb01e13..0815c6fb4 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_House: @ 8482D08 +LavaridgeTown_House: .4byte House3_Layout .4byte LavaridgeTown_House_MapEvents .4byte LavaridgeTown_House_MapScripts .4byte 0x0 .2byte MUS_MACHI_S4 - .2byte 64 + .2byte LAYOUT_HOUSE3 .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LavaridgeTown_Mart/events.inc b/data/maps/LavaridgeTown_Mart/events.inc index 8534faa7b..24923dc51 100644 --- a/data/maps/LavaridgeTown_Mart/events.inc +++ b/data/maps/LavaridgeTown_Mart/events.inc @@ -1,12 +1,12 @@ -LavaridgeTown_Mart_EventObjects: @ 852E148 +LavaridgeTown_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0 object_event 3, EVENT_OBJ_GFX_OLD_WOMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0 -LavaridgeTown_Mart_MapWarps: @ 852E190 +LavaridgeTown_Mart_MapWarps: warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN -LavaridgeTown_Mart_MapEvents:: @ 852E1A0 +LavaridgeTown_Mart_MapEvents:: map_events LavaridgeTown_Mart_EventObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index 1c3ce0caf..9c96370f9 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_Mart: @ 8482D24 +LavaridgeTown_Mart: .4byte Mart_Layout .4byte LavaridgeTown_Mart_MapEvents .4byte LavaridgeTown_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc index bf7246caa..01974866c 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc @@ -1,15 +1,15 @@ -LavaridgeTown_PokemonCenter_1F_EventObjects: @ 852E1B4 +LavaridgeTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0 object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0 object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0 -LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214 +LavaridgeTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN warp_def 6, 8, 3, 3, MAP_LAVARIDGE_TOWN warp_def 1, 6, 4, 0, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_2F warp_def 2, 1, 0, 5, MAP_LAVARIDGE_TOWN -LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 852E234 +LavaridgeTown_PokemonCenter_1F_MapEvents:: map_events LavaridgeTown_PokemonCenter_1F_EventObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index 0f18f64e9..4e17b5fd0 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_PokemonCenter_1F: @ 8482D40 +LavaridgeTown_PokemonCenter_1F: .4byte LavaridgeTown_PokemonCenter_1F_Layout .4byte LavaridgeTown_PokemonCenter_1F_MapEvents .4byte LavaridgeTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 71 + .2byte LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc index 6e1011dd8..4da5d3b1f 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -LavaridgeTown_PokemonCenter_2F_EventObjects: @ 852E248 +LavaridgeTown_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8 +LavaridgeTown_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 852E2C0 +LavaridgeTown_PokemonCenter_2F_MapEvents:: map_events LavaridgeTown_PokemonCenter_2F_EventObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index d66d90b73..4a7226e29 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -LavaridgeTown_PokemonCenter_2F: @ 8482D5C +LavaridgeTown_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte LavaridgeTown_PokemonCenter_2F_MapEvents .4byte LavaridgeTown_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_LAVARIDGE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity/connections.inc b/data/maps/LilycoveCity/connections.inc index d5469e561..6e0cdff93 100644 --- a/data/maps/LilycoveCity/connections.inc +++ b/data/maps/LilycoveCity/connections.inc @@ -1,8 +1,8 @@ -LilycoveCity_MapConnectionsList: @ 84867A4 +LilycoveCity_MapConnectionsList: connection left, 10, MAP_ROUTE121 connection right, -10, MAP_ROUTE124 -LilycoveCity_MapConnections: @ 84867BC - .4byte 0x2 +LilycoveCity_MapConnections: + .4byte 2 .4byte LilycoveCity_MapConnectionsList diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc index 68a782212..71022af32 100644 --- a/data/maps/LilycoveCity/events.inc +++ b/data/maps/LilycoveCity/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_EventObjects: @ 8526CE8 +LilycoveCity_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_EventScript_1E2C53, 0 object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_1E2C2B, 0 object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0 @@ -22,7 +22,7 @@ LilycoveCity_EventObjects: @ 8526CE8 object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 16, 34, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CCB, 0 object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 16, 35, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_EventScript_1E2CD4, 0 -LilycoveCity_MapWarps: @ 8526EF8 +LilycoveCity_MapWarps: warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F warp_def 37, 24, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F warp_def 24, 14, 0, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F @@ -38,7 +38,7 @@ LilycoveCity_MapWarps: @ 8526EF8 warp_def 12, 32, 0, 0, MAP_LILYCOVE_CITY_HARBOR warp_def 12, 5, 0, 1, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F -LilycoveCity_MapBGEvents: @ 8526F68 +LilycoveCity_MapBGEvents: bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D1A bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_271E73 bg_event 29, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_1E2D6B @@ -53,6 +53,6 @@ LilycoveCity_MapBGEvents: @ 8526F68 bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_PP_UP bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_LILYCOVE_CITY_POKE_BALL -LilycoveCity_MapEvents:: @ 8527004 +LilycoveCity_MapEvents:: map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index cf3ebf2f5..93120b896 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -1,10 +1,10 @@ -LilycoveCity: @ 8482544 +LilycoveCity: .4byte LilycoveCity_Layout .4byte LilycoveCity_MapEvents .4byte LilycoveCity_MapScripts .4byte LilycoveCity_MapConnections .2byte MUS_MINAMO - .2byte 6 + .2byte LAYOUT_LILYCOVE_CITY .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc index 61d1cd63a..838aec23b 100644 --- a/data/maps/LilycoveCity_ContestHall/events.inc +++ b/data/maps/LilycoveCity_ContestHall/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_ContestHall_EventObjects: @ 8531850 +LilycoveCity_ContestHall_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0 object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0 @@ -32,13 +32,13 @@ LilycoveCity_ContestHall_EventObjects: @ 8531850 object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 42, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0 object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0 -LilycoveCity_ContestHall_MapWarps: @ 8531B50 +LilycoveCity_ContestHall_MapWarps: warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY warp_def 30, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY warp_def 20, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY warp_def 31, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY -LilycoveCity_ContestHall_MapBGEvents: @ 8531B70 +LilycoveCity_ContestHall_MapBGEvents: bg_event 27, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B733 bg_event 39, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B73C bg_event 11, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B745 @@ -46,6 +46,6 @@ LilycoveCity_ContestHall_MapBGEvents: @ 8531B70 bg_event 23, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B733 bg_event 35, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_21B73C -LilycoveCity_ContestHall_MapEvents:: @ 8531BB8 +LilycoveCity_ContestHall_MapEvents:: map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index eb07c7d59..d450c564e 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_ContestHall: @ 84836C4 +LilycoveCity_ContestHall: .4byte LilycoveCity_ContestHall_Layout .4byte LilycoveCity_ContestHall_MapEvents .4byte LilycoveCity_ContestHall_MapScripts .4byte 0x0 .2byte MUS_CONLOBBY - .2byte 106 + .2byte LAYOUT_LILYCOVE_CITY_CONTEST_HALL .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc index fa04b72e7..68c682a25 100644 --- a/data/maps/LilycoveCity_ContestLobby/events.inc +++ b/data/maps/LilycoveCity_ContestLobby/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_ContestLobby_EventObjects: @ 8531534 +LilycoveCity_ContestLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 15, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 26, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0 @@ -25,13 +25,13 @@ LilycoveCity_ContestLobby_EventObjects: @ 8531534 object_event 24, EVENT_OBJ_GFX_OLD_MAN, 0, 26, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, FLAG_HIDE_LILYCOVE_CONTEST_HALL_BLEND_MASTER_ONLOOKERS object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0 -LilycoveCity_ContestLobby_MapWarps: @ 853178C +LilycoveCity_ContestLobby_MapWarps: warp_def 14, 11, 0, 4, MAP_LILYCOVE_CITY warp_def 15, 11, 0, 4, MAP_LILYCOVE_CITY warp_def 9, 1, 0, 0, MAP_LILYCOVE_CITY_CONTEST_HALL warp_def 21, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL -LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC +LilycoveCity_ContestLobby_MapBGEvents: bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PblockLink bg_event 23, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293E1E bg_event 23, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A753 @@ -45,6 +45,6 @@ LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC bg_event 27, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_293D4D bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_21A784 -LilycoveCity_ContestLobby_MapEvents:: @ 853183C +LilycoveCity_ContestLobby_MapEvents:: map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index 605d594d3..d00e7190d 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_ContestLobby: @ 84836A8 +LilycoveCity_ContestLobby: .4byte LilycoveCity_ContestLobby_Layout .4byte LilycoveCity_ContestLobby_MapEvents .4byte LilycoveCity_ContestLobby_MapScripts .4byte 0x0 .2byte MUS_CONLOBBY - .2byte 105 + .2byte LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc index 66fd112c4..e769c3c9f 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc @@ -1,14 +1,14 @@ -LilycoveCity_CoveLilyMotel_1F_EventObjects: @ 8531134 +LilycoveCity_CoveLilyMotel_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0 -LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C +LilycoveCity_CoveLilyMotel_1F_MapWarps: warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY warp_def 6, 8, 0, 1, MAP_LILYCOVE_CITY warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F -LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: @ 8531164 +LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: coord_event 10, 2, 3, VAR_TEMP_1, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211 -LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 8531174 +LilycoveCity_CoveLilyMotel_1F_MapEvents:: map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 0322b01e1..ab7811a46 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_CoveLilyMotel_1F: @ 8483638 +LilycoveCity_CoveLilyMotel_1F: .4byte LilycoveCity_CoveLilyMotel_1F_Layout .4byte LilycoveCity_CoveLilyMotel_1F_MapEvents .4byte LilycoveCity_CoveLilyMotel_1F_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 299 + .2byte LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc index d7e508ec6..b7f973a84 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188 +LilycoveCity_CoveLilyMotel_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS @@ -7,9 +7,9 @@ LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188 object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, FLAG_HIDE_LILCOVE_MOTEL_GAME_DESIGNERS object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, FLAG_HIDE_LILCOVE_MOTEL_SCOTT -LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230 +LilycoveCity_CoveLilyMotel_2F_MapWarps: warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F -LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8531238 +LilycoveCity_CoveLilyMotel_2F_MapEvents:: map_events LilycoveCity_CoveLilyMotel_2F_EventObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index 92ccdc1b3..769cd8b0d 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_CoveLilyMotel_2F: @ 8483654 +LilycoveCity_CoveLilyMotel_2F: .4byte LilycoveCity_CoveLilyMotel_2F_Layout .4byte LilycoveCity_CoveLilyMotel_2F_MapEvents .4byte LilycoveCity_CoveLilyMotel_2F_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 300 + .2byte LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc index adafc5b61..307cb2d58 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStoreElevator_EventObjects: @ 85324B0 +LilycoveCity_DepartmentStoreElevator_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0 -LilycoveCity_DepartmentStoreElevator_MapWarps: @ 85324C8 +LilycoveCity_DepartmentStoreElevator_MapWarps: warp_def 1, 5, 3, 127, MAP_NONE warp_def 2, 5, 3, 127, MAP_NONE -LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 85324D8 +LilycoveCity_DepartmentStoreElevator_MapEvents:: map_events LilycoveCity_DepartmentStoreElevator_EventObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index eb728241b..8576dcbf2 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStoreElevator: @ 84838A0 +LilycoveCity_DepartmentStoreElevator: .4byte LilycoveCity_DepartmentStoreElevator_Layout .4byte LilycoveCity_DepartmentStoreElevator_MapEvents .4byte LilycoveCity_DepartmentStoreElevator_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 273 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc index 594a439ce..c44562b06 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc @@ -1,16 +1,16 @@ -LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C +LilycoveCity_DepartmentStoreRooftop_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0 object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, FLAG_HIDE_LILYCOVE_DEPARTMENT_STORE_ROOFTOP_SALE_WOMAN object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0 -LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C +LilycoveCity_DepartmentStoreRooftop_MapWarps: warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F -LilycoveCity_DepartmentStoreRooftop_MapBGEvents: @ 8532484 +LilycoveCity_DepartmentStoreRooftop_MapBGEvents: bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 -LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 853249C +LilycoveCity_DepartmentStoreRooftop_MapEvents:: map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 73ba491c3..775260145 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStoreRooftop: @ 8483884 +LilycoveCity_DepartmentStoreRooftop: .4byte LilycoveCity_DepartmentStoreRooftop_Layout .4byte LilycoveCity_DepartmentStoreRooftop_MapEvents .4byte LilycoveCity_DepartmentStoreRooftop_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 262 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc index dfd7cc46d..12d4726fb 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C +LilycoveCity_DepartmentStore_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0 object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0 @@ -6,15 +6,15 @@ LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C object_event 5, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0 object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0 -LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C +LilycoveCity_DepartmentStore_1F_MapWarps: warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY warp_def 9, 7, 0, 0, MAP_LILYCOVE_CITY warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR -LilycoveCity_DepartmentStore_1F_MapBGEvents: @ 853213C +LilycoveCity_DepartmentStore_1F_MapBGEvents: bg_event 0, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_DepartmentStore_1F_EventScript_21F85D -LilycoveCity_DepartmentStore_1F_MapEvents:: @ 8532148 +LilycoveCity_DepartmentStore_1F_MapEvents:: map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index 949b23403..27ae23d5f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStore_1F: @ 84837F8 +LilycoveCity_DepartmentStore_1F: .4byte LilycoveCity_DepartmentStore_1F_Layout .4byte LilycoveCity_DepartmentStore_1F_MapEvents .4byte LilycoveCity_DepartmentStore_1F_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 257 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc index 9e7d5514e..4854c51e9 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc @@ -1,15 +1,15 @@ -LilycoveCity_DepartmentStore_2F_EventObjects: @ 853215C +LilycoveCity_DepartmentStore_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0 object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0 -LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4 +LilycoveCity_DepartmentStore_2F_MapWarps: warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR -LilycoveCity_DepartmentStore_2F_MapEvents:: @ 85321EC +LilycoveCity_DepartmentStore_2F_MapEvents:: map_events LilycoveCity_DepartmentStore_2F_EventObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index 01f94ac14..62f5dcab3 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStore_2F: @ 8483814 +LilycoveCity_DepartmentStore_2F: .4byte LilycoveCity_DepartmentStore_2F_Layout .4byte LilycoveCity_DepartmentStore_2F_MapEvents .4byte LilycoveCity_DepartmentStore_2F_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 258 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc index 84796fad4..2eed8c39f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc @@ -1,15 +1,15 @@ -LilycoveCity_DepartmentStore_3F_EventObjects: @ 8532200 +LilycoveCity_DepartmentStore_3F_EventObjects: object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0 -LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278 +LilycoveCity_DepartmentStore_3F_MapWarps: warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR -LilycoveCity_DepartmentStore_3F_MapEvents:: @ 8532290 +LilycoveCity_DepartmentStore_3F_MapEvents:: map_events LilycoveCity_DepartmentStore_3F_EventObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index bc62df7d6..624671aea 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStore_3F: @ 8483830 +LilycoveCity_DepartmentStore_3F: .4byte LilycoveCity_DepartmentStore_3F_Layout .4byte LilycoveCity_DepartmentStore_3F_MapEvents .4byte LilycoveCity_DepartmentStore_3F_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 259 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc index 7b39c9194..77df01a38 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc @@ -1,15 +1,15 @@ -LilycoveCity_DepartmentStore_4F_EventObjects: @ 85322A4 +LilycoveCity_DepartmentStore_4F_EventObjects: object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0 object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0 -LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C +LilycoveCity_DepartmentStore_4F_MapWarps: warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F warp_def 13, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR -LilycoveCity_DepartmentStore_4F_MapEvents:: @ 8532334 +LilycoveCity_DepartmentStore_4F_MapEvents:: map_events LilycoveCity_DepartmentStore_4F_EventObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index 94a8d29c6..df74e3c2f 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStore_4F: @ 848384C +LilycoveCity_DepartmentStore_4F: .4byte LilycoveCity_DepartmentStore_4F_Layout .4byte LilycoveCity_DepartmentStore_4F_MapEvents .4byte LilycoveCity_DepartmentStore_4F_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 260 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc index 2118c33e8..d4492d7e9 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348 +LilycoveCity_DepartmentStore_5F_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0 @@ -7,11 +7,11 @@ LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348 object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 17, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0 object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0 -LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0 +LilycoveCity_DepartmentStore_5F_MapWarps: warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP -LilycoveCity_DepartmentStore_5F_MapEvents:: @ 8532408 +LilycoveCity_DepartmentStore_5F_MapEvents:: map_events LilycoveCity_DepartmentStore_5F_EventObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index 6c8070d80..938cfc7b8 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStore_5F: @ 8483868 +LilycoveCity_DepartmentStore_5F: .4byte LilycoveCity_DepartmentStore_5F_Layout .4byte LilycoveCity_DepartmentStore_5F_MapEvents .4byte LilycoveCity_DepartmentStore_5F_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 261 + .2byte LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_Harbor/events.inc b/data/maps/LilycoveCity_Harbor/events.inc index 4f69e4fc6..ad43f2bf1 100644 --- a/data/maps/LilycoveCity_Harbor/events.inc +++ b/data/maps/LilycoveCity_Harbor/events.inc @@ -1,14 +1,14 @@ -LilycoveCity_Harbor_EventObjects: @ 8531E1C +LilycoveCity_Harbor_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, FLAG_HIDE_LILYCOVE_HARBOR_FERRY_ATTENDANT object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_SSTIDAL object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0 object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_FERRY_SAILOR object_event 5, EVENT_OBJ_GFX_EXPERT_M, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER -LilycoveCity_Harbor_MapWarps: @ 8531E94 +LilycoveCity_Harbor_MapWarps: warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY warp_def 12, 14, 0, 12, MAP_LILYCOVE_CITY -LilycoveCity_Harbor_MapEvents:: @ 8531EA4 +LilycoveCity_Harbor_MapEvents:: map_events LilycoveCity_Harbor_EventObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index e818c894f..b332f5df7 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_Harbor: @ 8483750 +LilycoveCity_Harbor: .4byte Harbor_Layout .4byte LilycoveCity_Harbor_MapEvents .4byte LilycoveCity_Harbor_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 88 + .2byte LAYOUT_HARBOR .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_House1/events.inc b/data/maps/LilycoveCity_House1/events.inc index 392336e02..31515dae9 100644 --- a/data/maps/LilycoveCity_House1/events.inc +++ b/data/maps/LilycoveCity_House1/events.inc @@ -1,11 +1,11 @@ -LilycoveCity_House1_EventObjects: @ 8531EF4 +LilycoveCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0 object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0 -LilycoveCity_House1_MapWarps: @ 8531F24 +LilycoveCity_House1_MapWarps: warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY -LilycoveCity_House1_MapEvents:: @ 8531F34 +LilycoveCity_House1_MapEvents:: map_events LilycoveCity_House1_EventObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index ecae30372..68da92f8a 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_House1: @ 8483788 +LilycoveCity_House1: .4byte House1_Layout .4byte LilycoveCity_House1_MapEvents .4byte LilycoveCity_House1_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_House2/events.inc b/data/maps/LilycoveCity_House2/events.inc index e4839eb5c..e7c1b3cd7 100644 --- a/data/maps/LilycoveCity_House2/events.inc +++ b/data/maps/LilycoveCity_House2/events.inc @@ -1,10 +1,10 @@ -LilycoveCity_House2_EventObjects: @ 8531F48 +LilycoveCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0 -LilycoveCity_House2_MapWarps: @ 8531F60 +LilycoveCity_House2_MapWarps: warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY -LilycoveCity_House2_MapEvents:: @ 8531F70 +LilycoveCity_House2_MapEvents:: map_events LilycoveCity_House2_EventObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index f3b009880..93ff11013 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_House2: @ 84837A4 +LilycoveCity_House2: .4byte LilycoveCity_House2_Layout .4byte LilycoveCity_House2_MapEvents .4byte LilycoveCity_House2_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 74 + .2byte LAYOUT_LILYCOVE_CITY_HOUSE2 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_House3/events.inc b/data/maps/LilycoveCity_House3/events.inc index 363e62132..4e577400b 100644 --- a/data/maps/LilycoveCity_House3/events.inc +++ b/data/maps/LilycoveCity_House3/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_House3_EventObjects: @ 8531F84 +LilycoveCity_House3_EventObjects: object_event 1, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0 object_event 3, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0 @@ -6,10 +6,10 @@ LilycoveCity_House3_EventObjects: @ 8531F84 object_event 5, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0 object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0 -LilycoveCity_House3_MapWarps: @ 8532014 +LilycoveCity_House3_MapWarps: warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY -LilycoveCity_House3_MapEvents:: @ 8532024 +LilycoveCity_House3_MapEvents:: map_events LilycoveCity_House3_EventObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index 9126bb8fc..3788a2ee9 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_House3: @ 84837C0 +LilycoveCity_House3: .4byte House2_Layout .4byte LilycoveCity_House3_MapEvents .4byte LilycoveCity_House3_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_House4/events.inc b/data/maps/LilycoveCity_House4/events.inc index d14a5c82b..aa586c64f 100644 --- a/data/maps/LilycoveCity_House4/events.inc +++ b/data/maps/LilycoveCity_House4/events.inc @@ -1,11 +1,11 @@ -LilycoveCity_House4_EventObjects: @ 8532038 +LilycoveCity_House4_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0 -LilycoveCity_House4_MapWarps: @ 8532068 +LilycoveCity_House4_MapWarps: warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY -LilycoveCity_House4_MapEvents:: @ 8532078 +LilycoveCity_House4_MapEvents:: map_events LilycoveCity_House4_EventObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index 6ddb9a5f7..b0ee0ed36 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_House4: @ 84837DC +LilycoveCity_House4: .4byte House1_Layout .4byte LilycoveCity_House4_MapEvents .4byte LilycoveCity_House4_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc index 52f7a2f9e..a41748c69 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C +LilycoveCity_LilycoveMuseum_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0 @@ -10,12 +10,12 @@ LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_3 -LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C +LilycoveCity_LilycoveMuseum_1F_MapWarps: warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY warp_def 10, 13, 0, 13, MAP_LILYCOVE_CITY warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F -LilycoveCity_LilycoveMuseum_1F_MapBGEvents: @ 8531354 +LilycoveCity_LilycoveMuseum_1F_MapBGEvents: bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DAD bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DD1 @@ -33,6 +33,6 @@ LilycoveCity_LilycoveMuseum_1F_MapBGEvents: @ 8531354 bg_event 18, 11, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DE3 bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC -LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 8531414 +LilycoveCity_LilycoveMuseum_1F_MapEvents:: map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index b0aef9efa..7a50114fa 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_LilycoveMuseum_1F: @ 8483670 +LilycoveCity_LilycoveMuseum_1F: .4byte LilycoveCity_LilycoveMuseum_1F_Layout .4byte LilycoveCity_LilycoveMuseum_1F_MapEvents .4byte LilycoveCity_LilycoveMuseum_1F_MapScripts .4byte 0x0 .2byte MUS_BIJYUTU - .2byte 103 + .2byte LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc index ecae340c0..f6969462c 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc @@ -1,13 +1,13 @@ -LilycoveCity_LilycoveMuseum_2F_EventObjects: @ 8531428 +LilycoveCity_LilycoveMuseum_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0 object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, FLAG_HIDE_LILYCOVE_MUSEUM_PATRON_2 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS object_event 4, EVENT_OBJ_GFX_RICH_BOY, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, FLAG_HIDE_LILYCOVE_MUSEUM_TOURISTS -LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488 +LilycoveCity_LilycoveMuseum_2F_MapWarps: warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F -LilycoveCity_LilycoveMuseum_2F_MapBGEvents: @ 8531490 +LilycoveCity_LilycoveMuseum_2F_MapBGEvents: bg_event 14, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21992B bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_21993E @@ -21,6 +21,6 @@ LilycoveCity_LilycoveMuseum_2F_MapBGEvents: @ 8531490 bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA bg_event 15, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA -LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8531520 +LilycoveCity_LilycoveMuseum_2F_MapEvents:: map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index c58b69225..f1ba72c03 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_LilycoveMuseum_2F: @ 848368C +LilycoveCity_LilycoveMuseum_2F: .4byte LilycoveCity_LilycoveMuseum_2F_Layout .4byte LilycoveCity_LilycoveMuseum_2F_MapEvents .4byte LilycoveCity_LilycoveMuseum_2F_MapScripts .4byte 0x0 .2byte MUS_BIJYUTU - .2byte 104 + .2byte LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc index 100ee364c..8a606ce7e 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc @@ -1,10 +1,10 @@ -LilycoveCity_MoveDeletersHouse_EventObjects: @ 8531EB8 +LilycoveCity_MoveDeletersHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0 -LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0 +LilycoveCity_MoveDeletersHouse_MapWarps: warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY -LilycoveCity_MoveDeletersHouse_MapEvents:: @ 8531EE0 +LilycoveCity_MoveDeletersHouse_MapEvents:: map_events LilycoveCity_MoveDeletersHouse_EventObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index cdd8668ad..46a0f964e 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_MoveDeletersHouse: @ 848376C +LilycoveCity_MoveDeletersHouse: .4byte House2_Layout .4byte LilycoveCity_MoveDeletersHouse_MapEvents .4byte LilycoveCity_MoveDeletersHouse_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc index 26b6955c0..5a46fe756 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc @@ -1,15 +1,15 @@ -LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC +LilycoveCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0 object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0 object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0 object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0 object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, FLAG_HIDE_LILYCOVE_POKEMON_CENTER_LADY -LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44 +LilycoveCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY warp_def 6, 8, 3, 2, MAP_LILYCOVE_CITY warp_def 1, 6, 4, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_2F -LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8531C5C +LilycoveCity_PokemonCenter_1F_MapEvents:: map_events LilycoveCity_PokemonCenter_1F_EventObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index bcca0354d..e264b0955 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_PokemonCenter_1F: @ 84836E0 +LilycoveCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte LilycoveCity_PokemonCenter_1F_MapEvents .4byte LilycoveCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc index 1a7e9a6a2..accbba24d 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -LilycoveCity_PokemonCenter_2F_EventObjects: @ 8531C70 +LilycoveCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0 +LilycoveCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8531CE8 +LilycoveCity_PokemonCenter_2F_MapEvents:: map_events LilycoveCity_PokemonCenter_2F_EventObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 26c0789d6..bd96ad98b 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_PokemonCenter_2F: @ 84836FC +LilycoveCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte LilycoveCity_PokemonCenter_2F_MapEvents .4byte LilycoveCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc index 3d08ce647..f5755f50f 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc @@ -1,4 +1,4 @@ -LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20 +LilycoveCity_PokemonTrainerFanClub_EventObjects: object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0 @@ -9,10 +9,10 @@ LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20 object_event 8, EVENT_OBJ_GFX_EXPERT_F, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, FLAG_HIDE_FANCLUB_OLD_LADY object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER -LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8 +LilycoveCity_PokemonTrainerFanClub_MapWarps: warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY -LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8531E08 +LilycoveCity_PokemonTrainerFanClub_MapEvents:: map_events LilycoveCity_PokemonTrainerFanClub_EventObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index aba9dcb3c..61f306b69 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_PokemonTrainerFanClub: @ 8483734 +LilycoveCity_PokemonTrainerFanClub: .4byte LilycoveCity_PokemonTrainerFanClub_Layout .4byte LilycoveCity_PokemonTrainerFanClub_MapEvents .4byte LilycoveCity_PokemonTrainerFanClub_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 107 + .2byte LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LilycoveCity_UnusedMart/events.inc b/data/maps/LilycoveCity_UnusedMart/events.inc index 0481a1c0b..5a4eeaac9 100644 --- a/data/maps/LilycoveCity_UnusedMart/events.inc +++ b/data/maps/LilycoveCity_UnusedMart/events.inc @@ -1,7 +1,7 @@ -LilycoveCity_UnusedMart_MapWarps: @ 8531CFC +LilycoveCity_UnusedMart_MapWarps: warp_def 3, 7, 0, 0, MAP_LILYCOVE_CITY warp_def 4, 7, 0, 0, MAP_LILYCOVE_CITY -LilycoveCity_UnusedMart_MapEvents:: @ 8531D0C +LilycoveCity_UnusedMart_MapEvents:: map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0 diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index f1cbaf550..188530531 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -1,10 +1,10 @@ -LilycoveCity_UnusedMart: @ 8483718 +LilycoveCity_UnusedMart: .4byte Mart_Layout .4byte LilycoveCity_UnusedMart_MapEvents .4byte LilycoveCity_UnusedMart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_LILYCOVE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc index 7b6b875c2..d8a0e93d3 100644 --- a/data/maps/LinkContestRoom1/events.inc +++ b/data/maps/LinkContestRoom1/events.inc @@ -1,4 +1,4 @@ -LinkContestRoom1_EventObjects: @ 8539EFC +LinkContestRoom1_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 @@ -15,5 +15,6 @@ LinkContestRoom1_EventObjects: @ 8539EFC object_event 14, EVENT_OBJ_GFX_VAR_3, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 -LinkContestRoom1_MapEvents:: @ 853A064 +LinkContestRoom1_MapEvents:: map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index 2465a8680..24a33fdfc 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -1,10 +1,10 @@ -LinkContestRoom1: @ 8484DA0 +LinkContestRoom1: .4byte LinkContestRoom1_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 - .2byte 225 + .2byte LAYOUT_LINK_CONTEST_ROOM1 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index e37d65f86..50d0a7425 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -1,10 +1,10 @@ -LinkContestRoom2: @ 8484E64 +LinkContestRoom2: .4byte LinkContestRoom2_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 - .2byte 232 + .2byte LAYOUT_LINK_CONTEST_ROOM2 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 90333ebd9..06f9ffd19 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -1,10 +1,10 @@ -LinkContestRoom3: @ 8484E80 +LinkContestRoom3: .4byte LinkContestRoom3_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 - .2byte 233 + .2byte LAYOUT_LINK_CONTEST_ROOM3 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 781ebed0f..eba4cb0bd 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -1,10 +1,10 @@ -LinkContestRoom4: @ 8484E9C +LinkContestRoom4: .4byte LinkContestRoom4_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 - .2byte 234 + .2byte LAYOUT_LINK_CONTEST_ROOM4 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index 87253d0d6..12ec2d40d 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -1,10 +1,10 @@ -LinkContestRoom5: @ 8484EB8 +LinkContestRoom5: .4byte LinkContestRoom5_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 - .2byte 235 + .2byte LAYOUT_LINK_CONTEST_ROOM5 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index ade67e7e7..77f1c14c7 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -1,10 +1,10 @@ -LinkContestRoom6: @ 8484ED4 +LinkContestRoom6: .4byte LinkContestRoom6_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_CONTEST0 - .2byte 236 + .2byte LAYOUT_LINK_CONTEST_ROOM6 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LittlerootTown/connections.inc b/data/maps/LittlerootTown/connections.inc index 0fed8d8e1..bfd3b0ab7 100644 --- a/data/maps/LittlerootTown/connections.inc +++ b/data/maps/LittlerootTown/connections.inc @@ -1,7 +1,7 @@ -LittlerootTown_MapConnectionsList: @ 8486600 +LittlerootTown_MapConnectionsList: connection up, 0, MAP_ROUTE101 -LittlerootTown_MapConnections: @ 848660C - .4byte 0x1 +LittlerootTown_MapConnections: + .4byte 1 .4byte LittlerootTown_MapConnectionsList diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc index fc151a220..3d81193b0 100644 --- a/data/maps/LittlerootTown/events.inc +++ b/data/maps/LittlerootTown/events.inc @@ -1,4 +1,4 @@ -LittlerootTown_EventObjects: @ 85276A8 +LittlerootTown_EventObjects: object_event 1, EVENT_OBJ_GFX_TWIN, 0, 16, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, LittlerootTown_EventScript_1E8034, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E8022, FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_1E802B, 0 @@ -8,12 +8,12 @@ LittlerootTown_EventObjects: @ 85276A8 object_event 7, EVENT_OBJ_GFX_VAR_0, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_RIVAL object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BIRCH -LittlerootTown_MapWarps: @ 8527768 +LittlerootTown_MapWarps: warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F warp_def 5, 8, 0, 1, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB -LittlerootTown_MapCoordEvents: @ 8527780 +LittlerootTown_MapCoordEvents: coord_event 10, 1, 3, VAR_0x4050, 0, LittlerootTown_EventScript_1E8091 coord_event 11, 1, 3, VAR_0x4050, 0, LittlerootTown_EventScript_1E80EF coord_event 11, 1, 3, VAR_0x4050, 1, LittlerootTown_EventScript_1E811F @@ -24,12 +24,12 @@ LittlerootTown_MapCoordEvents: @ 8527780 coord_event 10, 2, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81BB coord_event 11, 2, 3, VAR_0x4050, 3, LittlerootTown_EventScript_1E81CE -LittlerootTown_MapBGEvents: @ 8527810 +LittlerootTown_MapBGEvents: bg_event 15, 13, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E8151 bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E815A bg_event 7, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E8163 bg_event 12, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_1E818F -LittlerootTown_MapEvents:: @ 8527840 +LittlerootTown_MapEvents:: map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index a94244f95..c1565535c 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -1,10 +1,10 @@ -LittlerootTown: @ 84825B4 +LittlerootTown: .4byte LittlerootTown_Layout .4byte LittlerootTown_MapEvents .4byte LittlerootTown_MapScripts .4byte LittlerootTown_MapConnections .2byte MUS_MISHIRO - .2byte 10 + .2byte LAYOUT_LITTLEROOT_TOWN .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc index 6f327d330..ad4d1a4a6 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc @@ -1,4 +1,4 @@ -LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C +LittlerootTown_BrendansHouse_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM object_event 2, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 1, 3, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 object_event 3, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 4, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 @@ -7,17 +7,17 @@ LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN -LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134 +LittlerootTown_BrendansHouse_1F_MapWarps: warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN warp_def 8, 8, 0, 1, MAP_LITTLEROOT_TOWN warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F -LittlerootTown_BrendansHouse_1F_MapCoordEvents: @ 852D14C +LittlerootTown_BrendansHouse_1F_MapCoordEvents: coord_event 8, 8, 0, VAR_0x4092, 4, LittlerootTown_BrendansHouse_1F_EventScript_1F78A3 coord_event 7, 3, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78BE coord_event 8, 4, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78CA coord_event 9, 3, 0, VAR_0x408D, 2, LittlerootTown_BrendansHouse_1F_EventScript_1F78D6 -LittlerootTown_BrendansHouse_1F_MapEvents:: @ 852D18C +LittlerootTown_BrendansHouse_1F_MapEvents:: map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index edae81a87..44b861056 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -1,10 +1,10 @@ -LittlerootTown_BrendansHouse_1F: @ 8482AF4 +LittlerootTown_BrendansHouse_1F: .4byte LittlerootTown_BrendansHouse_1F_Layout .4byte LittlerootTown_BrendansHouse_1F_MapEvents .4byte LittlerootTown_BrendansHouse_1F_MapScripts .4byte 0x0 .2byte MUS_MISHIRO - .2byte 54 + .2byte LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc index 46a4fcfc2..29dddeb6a 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc @@ -1,4 +1,4 @@ -LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0 +LittlerootTown_BrendansHouse_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -16,15 +16,15 @@ LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0 object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_SWABLU_DOLL -LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320 +LittlerootTown_BrendansHouse_2F_MapWarps: warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F -LittlerootTown_BrendansHouse_2F_MapBGEvents: @ 852D328 +LittlerootTown_BrendansHouse_2F_MapBGEvents: bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, EventScript_PlayerPCMale bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F8656 bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_292781 bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1F865F -LittlerootTown_BrendansHouse_2F_MapEvents:: @ 852D358 +LittlerootTown_BrendansHouse_2F_MapEvents:: map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 4c9e566d0..5bf1113dd 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -1,10 +1,10 @@ -LittlerootTown_BrendansHouse_2F: @ 8482B10 +LittlerootTown_BrendansHouse_2F: .4byte LittlerootTown_BrendansHouse_2F_Layout .4byte LittlerootTown_BrendansHouse_2F_MapEvents .4byte LittlerootTown_BrendansHouse_2F_MapScripts .4byte 0x0 .2byte MUS_MISHIRO - .2byte 55 + .2byte LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc index 3075945f1..890a6a624 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc @@ -1,4 +1,4 @@ -LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C +LittlerootTown_MaysHouse_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM object_event 2, EVENT_OBJ_GFX_VIGOROTH_FACING_AWAY, 0, 6, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 object_event 3, EVENT_OBJ_GFX_VIGOROTH_CARRYING_BOX, 0, 9, 3, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 @@ -7,17 +7,17 @@ LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C object_event 6, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN -LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414 +LittlerootTown_MaysHouse_1F_MapWarps: warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN warp_def 2, 8, 0, 0, MAP_LITTLEROOT_TOWN warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F -LittlerootTown_MaysHouse_1F_MapCoordEvents: @ 852D42C +LittlerootTown_MaysHouse_1F_MapCoordEvents: coord_event 2, 8, 0, VAR_0x4092, 4, LittlerootTown_MaysHouse_1F_EventScript_1F8A4C coord_event 1, 3, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A67 coord_event 2, 4, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A73 coord_event 3, 3, 0, VAR_0x408D, 2, LittlerootTown_MaysHouse_1F_EventScript_1F8A7F -LittlerootTown_MaysHouse_1F_MapEvents:: @ 852D46C +LittlerootTown_MaysHouse_1F_MapEvents:: map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 768c7d1b4..9ab1d2f8b 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -1,10 +1,10 @@ -LittlerootTown_MaysHouse_1F: @ 8482B2C +LittlerootTown_MaysHouse_1F: .4byte LittlerootTown_MaysHouse_1F_Layout .4byte LittlerootTown_MaysHouse_1F_MapEvents .4byte LittlerootTown_MaysHouse_1F_MapScripts .4byte 0x0 .2byte MUS_MISHIRO - .2byte 56 + .2byte LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc index 8f4c74737..b845971ec 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc @@ -1,4 +1,4 @@ -LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480 +LittlerootTown_MaysHouse_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 1, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -16,15 +16,15 @@ LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480 object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_PICHU_DOLL object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL -LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600 +LittlerootTown_MaysHouse_2F_MapWarps: warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F -LittlerootTown_MaysHouse_2F_MapBGEvents: @ 852D608 +LittlerootTown_MaysHouse_2F_MapBGEvents: bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F865F bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1F8656 bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_29278D bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, EventScript_PlayerPCFemale -LittlerootTown_MaysHouse_2F_MapEvents:: @ 852D638 +LittlerootTown_MaysHouse_2F_MapEvents:: map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index 8729bedeb..d68d04d0d 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -1,10 +1,10 @@ -LittlerootTown_MaysHouse_2F: @ 8482B48 +LittlerootTown_MaysHouse_2F: .4byte LittlerootTown_MaysHouse_2F_Layout .4byte LittlerootTown_MaysHouse_2F_MapEvents .4byte LittlerootTown_MaysHouse_2F_MapScripts .4byte 0x0 .2byte MUS_MISHIRO - .2byte 57 + .2byte LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc index 7ab449ecd..94baaed20 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc @@ -1,4 +1,4 @@ -LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C +LittlerootTown_ProfessorBirchsLab_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0 object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL @@ -6,11 +6,11 @@ LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA -LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC +LittlerootTown_ProfessorBirchsLab_MapWarps: warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN -LittlerootTown_ProfessorBirchsLab_MapBGEvents: @ 852D6EC +LittlerootTown_ProfessorBirchsLab_MapBGEvents: bg_event 10, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3 bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD @@ -27,6 +27,6 @@ LittlerootTown_ProfessorBirchsLab_MapBGEvents: @ 852D6EC bg_event 11, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB -LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 852D7A0 +LittlerootTown_ProfessorBirchsLab_MapEvents:: map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 49ab94727..3cbfbdca7 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -1,10 +1,10 @@ -LittlerootTown_ProfessorBirchsLab: @ 8482B64 +LittlerootTown_ProfessorBirchsLab: .4byte LittlerootTown_ProfessorBirchsLab_Layout .4byte LittlerootTown_ProfessorBirchsLab_MapEvents .4byte LittlerootTown_ProfessorBirchsLab_MapScripts .4byte 0x0 .2byte MUS_ODAMAKI - .2byte 58 + .2byte LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB .byte MAPSEC_LITTLEROOT_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc index fd82f78e0..4ee4905b6 100644 --- a/data/maps/MagmaHideout_1F/events.inc +++ b/data/maps/MagmaHideout_1F/events.inc @@ -1,4 +1,4 @@ -MagmaHideout_1F_EventObjects: @ 85371CC +MagmaHideout_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 4, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_1F_EventScript_23988C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 20, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_1F_EventScript_2914DE, FLAG_ITEM_MAGMA_HIDEOUT_1F_RARE_CANDY object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_1F_EventScript_2398A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS @@ -6,12 +6,12 @@ MagmaHideout_1F_EventObjects: @ 85371CC object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_12 object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, FLAG_TEMP_13 -MagmaHideout_1F_MapWarps: @ 853725C +MagmaHideout_1F_MapWarps: warp_def 10, 34, 3, 4, MAP_JAGGED_PASS warp_def 25, 34, 3, 1, MAP_MAGMA_HIDEOUT_2F_1R warp_def 31, 3, 0, 1, MAP_MAGMA_HIDEOUT_2F_2R warp_def 20, 22, 0, 0, MAP_MAGMA_HIDEOUT_2F_3R -MagmaHideout_1F_MapEvents:: @ 853727C +MagmaHideout_1F_MapEvents:: map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index 897f4f4fd..2f509f088 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_1F: @ 8484828 +MagmaHideout_1F: .4byte MagmaHideout_1F_Layout .4byte MagmaHideout_1F_MapEvents .4byte MagmaHideout_1F_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 336 + .2byte LAYOUT_MAGMA_HIDEOUT_1F .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_2F_1R/events.inc b/data/maps/MagmaHideout_2F_1R/events.inc index d80849231..e88bde884 100644 --- a/data/maps/MagmaHideout_2F_1R/events.inc +++ b/data/maps/MagmaHideout_2F_1R/events.inc @@ -1,14 +1,14 @@ -MagmaHideout_2F_1R_EventObjects: @ 8537290 +MagmaHideout_2F_1R_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 18, 19, 3, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 5, 4, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 14, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 7, 6, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS -MagmaHideout_2F_1R_MapWarps: @ 85372F0 +MagmaHideout_2F_1R_MapWarps: warp_def 11, 23, 0, 0, MAP_MAGMA_HIDEOUT_2F_2R warp_def 8, 2, 0, 1, MAP_MAGMA_HIDEOUT_1F warp_def 17, 33, 3, 2, MAP_MAGMA_HIDEOUT_3F_1R -MagmaHideout_2F_1R_MapEvents:: @ 8537308 +MagmaHideout_2F_1R_MapEvents:: map_events MagmaHideout_2F_1R_EventObjects, MagmaHideout_2F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_2F_1R/header.inc b/data/maps/MagmaHideout_2F_1R/header.inc index cafe144d8..29de6cac7 100644 --- a/data/maps/MagmaHideout_2F_1R/header.inc +++ b/data/maps/MagmaHideout_2F_1R/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_2F_1R: @ 8484844 +MagmaHideout_2F_1R: .4byte MagmaHideout_2F_1R_Layout .4byte MagmaHideout_2F_1R_MapEvents .4byte MagmaHideout_2F_1R_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 337 + .2byte LAYOUT_MAGMA_HIDEOUT_2F_1R .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_2F_2R/events.inc b/data/maps/MagmaHideout_2F_2R/events.inc index 8bc61def7..70b234139 100644 --- a/data/maps/MagmaHideout_2F_2R/events.inc +++ b/data/maps/MagmaHideout_2F_2R/events.inc @@ -1,4 +1,4 @@ -MagmaHideout_2F_2R_EventObjects: @ 853731C +MagmaHideout_2F_2R_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 21, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_MAX_ELIXIR @@ -6,10 +6,10 @@ MagmaHideout_2F_2R_EventObjects: @ 853731C object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, FLAG_ITEM_MAGMA_HIDEOUT_2F_2R_FULL_RESTORE -MagmaHideout_2F_2R_MapWarps: @ 85373AC +MagmaHideout_2F_2R_MapWarps: warp_def 10, 22, 3, 0, MAP_MAGMA_HIDEOUT_2F_1R warp_def 36, 4, 0, 2, MAP_MAGMA_HIDEOUT_1F -MagmaHideout_2F_2R_MapEvents:: @ 85373BC +MagmaHideout_2F_2R_MapEvents:: map_events MagmaHideout_2F_2R_EventObjects, MagmaHideout_2F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_2F_2R/header.inc b/data/maps/MagmaHideout_2F_2R/header.inc index 1493ae076..4606ef07b 100644 --- a/data/maps/MagmaHideout_2F_2R/header.inc +++ b/data/maps/MagmaHideout_2F_2R/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_2F_2R: @ 8484860 +MagmaHideout_2F_2R: .4byte MagmaHideout_2F_2R_Layout .4byte MagmaHideout_2F_2R_MapEvents .4byte MagmaHideout_2F_2R_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 338 + .2byte LAYOUT_MAGMA_HIDEOUT_2F_2R .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_2F_3R/events.inc b/data/maps/MagmaHideout_2F_3R/events.inc index ca379a0c7..5b12929d8 100644 --- a/data/maps/MagmaHideout_2F_3R/events.inc +++ b/data/maps/MagmaHideout_2F_3R/events.inc @@ -1,7 +1,7 @@ -MagmaHideout_2F_3R_MapWarps: @ 85375B0 +MagmaHideout_2F_3R_MapWarps: warp_def 16, 1, 0, 3, MAP_MAGMA_HIDEOUT_1F warp_def 16, 13, 0, 0, MAP_MAGMA_HIDEOUT_3F_3R -MagmaHideout_2F_3R_MapEvents:: @ 85375C0 +MagmaHideout_2F_3R_MapEvents:: map_events 0x0, MagmaHideout_2F_3R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_2F_3R/header.inc b/data/maps/MagmaHideout_2F_3R/header.inc index 5e1ccdcda..dd1d0d9e7 100644 --- a/data/maps/MagmaHideout_2F_3R/header.inc +++ b/data/maps/MagmaHideout_2F_3R/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_2F_3R: @ 84848EC +MagmaHideout_2F_3R: .4byte MagmaHideout_2F_3R_Layout .4byte MagmaHideout_2F_3R_MapEvents .4byte MagmaHideout_2F_3R_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 380 + .2byte LAYOUT_MAGMA_HIDEOUT_2F_3R .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_3F_1R/events.inc b/data/maps/MagmaHideout_3F_1R/events.inc index 1fbad5042..166e88b27 100644 --- a/data/maps/MagmaHideout_3F_1R/events.inc +++ b/data/maps/MagmaHideout_3F_1R/events.inc @@ -1,13 +1,13 @@ -MagmaHideout_3F_1R_EventObjects: @ 85373D0 +MagmaHideout_3F_1R_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 2, 7, 4, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 21, 21, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 16, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_1R_EventScript_291505, FLAG_ITEM_MAGMA_HIDEOUT_3F_1R_NUGGET -MagmaHideout_3F_1R_MapWarps: @ 8537418 +MagmaHideout_3F_1R_MapWarps: warp_def 7, 21, 0, 0, MAP_MAGMA_HIDEOUT_4F warp_def 21, 9, 0, 0, MAP_MAGMA_HIDEOUT_3F_2R warp_def 23, 3, 0, 2, MAP_MAGMA_HIDEOUT_2F_1R -MagmaHideout_3F_1R_MapEvents:: @ 8537430 +MagmaHideout_3F_1R_MapEvents:: map_events MagmaHideout_3F_1R_EventObjects, MagmaHideout_3F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_3F_1R/header.inc b/data/maps/MagmaHideout_3F_1R/header.inc index 492fb8a7e..ac8d5d9b4 100644 --- a/data/maps/MagmaHideout_3F_1R/header.inc +++ b/data/maps/MagmaHideout_3F_1R/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_1R: @ 848487C +MagmaHideout_3F_1R: .4byte MagmaHideout_3F_1R_Layout .4byte MagmaHideout_3F_1R_MapEvents .4byte MagmaHideout_3F_1R_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 339 + .2byte LAYOUT_MAGMA_HIDEOUT_3F_1R .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_3F_2R/events.inc b/data/maps/MagmaHideout_3F_2R/events.inc index d00cbf423..825e8985e 100644 --- a/data/maps/MagmaHideout_3F_2R/events.inc +++ b/data/maps/MagmaHideout_3F_2R/events.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_2R_EventObjects: @ 8537444 +MagmaHideout_3F_2R_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 16, 3, 0, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 9, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_2R_EventScript_291512, FLAG_ITEM_MAGMA_HIDEOUT_3F_2R_PP_MAX -MagmaHideout_3F_2R_MapWarps: @ 8537474 +MagmaHideout_3F_2R_MapWarps: warp_def 12, 15, 0, 1, MAP_MAGMA_HIDEOUT_3F_1R -MagmaHideout_3F_2R_MapEvents:: @ 853747C +MagmaHideout_3F_2R_MapEvents:: map_events MagmaHideout_3F_2R_EventObjects, MagmaHideout_3F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_3F_2R/header.inc b/data/maps/MagmaHideout_3F_2R/header.inc index e1cd32f9c..8fbb30b18 100644 --- a/data/maps/MagmaHideout_3F_2R/header.inc +++ b/data/maps/MagmaHideout_3F_2R/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_2R: @ 8484898 +MagmaHideout_3F_2R: .4byte MagmaHideout_3F_2R_Layout .4byte MagmaHideout_3F_2R_MapEvents .4byte MagmaHideout_3F_2R_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 340 + .2byte LAYOUT_MAGMA_HIDEOUT_3F_2R .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_3F_3R/events.inc b/data/maps/MagmaHideout_3F_3R/events.inc index 26ffa3dff..d4346a139 100644 --- a/data/maps/MagmaHideout_3F_3R/events.inc +++ b/data/maps/MagmaHideout_3F_3R/events.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_3R_EventObjects: @ 8537574 +MagmaHideout_3F_3R_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 19, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, FLAG_ITEM_MAGMA_HIDEOUT_3F_3R_ECAPE_ROPE -MagmaHideout_3F_3R_MapWarps: @ 853758C +MagmaHideout_3F_3R_MapWarps: warp_def 16, 1, 0, 1, MAP_MAGMA_HIDEOUT_2F_3R warp_def 16, 21, 0, 1, MAP_MAGMA_HIDEOUT_4F -MagmaHideout_3F_3R_MapEvents:: @ 853759C +MagmaHideout_3F_3R_MapEvents:: map_events MagmaHideout_3F_3R_EventObjects, MagmaHideout_3F_3R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_3F_3R/header.inc b/data/maps/MagmaHideout_3F_3R/header.inc index b21df5e70..c676fac3d 100644 --- a/data/maps/MagmaHideout_3F_3R/header.inc +++ b/data/maps/MagmaHideout_3F_3R/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_3R: @ 84848D0 +MagmaHideout_3F_3R: .4byte MagmaHideout_3F_3R_Layout .4byte MagmaHideout_3F_3R_MapEvents .4byte MagmaHideout_3F_3R_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 379 + .2byte LAYOUT_MAGMA_HIDEOUT_3F_3R .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MagmaHideout_4F/events.inc b/data/maps/MagmaHideout_4F/events.inc index 09e054109..2fd71b3db 100644 --- a/data/maps/MagmaHideout_4F/events.inc +++ b/data/maps/MagmaHideout_4F/events.inc @@ -1,4 +1,4 @@ -MagmaHideout_4F_EventObjects: @ 8537490 +MagmaHideout_4F_EventObjects: object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 16, 17, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_1 object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 31, 22, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A68C, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 30, 13, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MagmaHideout_4F_EventScript_23A6A3, FLAG_HIDE_MAGMA_HIDEOUT_GRUNTS @@ -8,10 +8,10 @@ MagmaHideout_4F_EventObjects: @ 8537490 object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 16, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAGMA_HIDEOUT_4F_GROUDON_2 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_4F_EventScript_29151F, FLAG_ITEM_MAGMA_HIDEOUT_4F_MAX_REVIVE -MagmaHideout_4F_MapWarps: @ 8537550 +MagmaHideout_4F_MapWarps: warp_def 46, 7, 0, 0, MAP_MAGMA_HIDEOUT_3F_1R warp_def 20, 21, 0, 1, MAP_MAGMA_HIDEOUT_3F_3R -MagmaHideout_4F_MapEvents:: @ 8537560 +MagmaHideout_4F_MapEvents:: map_events MagmaHideout_4F_EventObjects, MagmaHideout_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MagmaHideout_4F/header.inc b/data/maps/MagmaHideout_4F/header.inc index e10a780f7..82a3e66bb 100644 --- a/data/maps/MagmaHideout_4F/header.inc +++ b/data/maps/MagmaHideout_4F/header.inc @@ -1,10 +1,10 @@ -MagmaHideout_4F: @ 84848B4 +MagmaHideout_4F: .4byte MagmaHideout_4F_Layout .4byte MagmaHideout_4F_MapEvents .4byte MagmaHideout_4F_MapScripts .4byte 0x0 .2byte MUS_AJITO - .2byte 341 + .2byte LAYOUT_MAGMA_HIDEOUT_4F .byte MAPSEC_MAGMA_HIDEOUT .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MarineCave_End/events.inc b/data/maps/MarineCave_End/events.inc index 62d1cd37e..4a97b9f15 100644 --- a/data/maps/MarineCave_End/events.inc +++ b/data/maps/MarineCave_End/events.inc @@ -1,12 +1,12 @@ -MarineCave_End_EventObjects: @ 85377E8 +MarineCave_End_EventObjects: object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 9, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MARINE_CAVE_KYOGRE -MarineCave_End_MapWarps: @ 8537800 +MarineCave_End_MapWarps: warp_def 20, 4, 0, 0, MAP_MARINE_CAVE_ENTRANCE -MarineCave_End_MapCoordEvents: @ 8537808 +MarineCave_End_MapCoordEvents: coord_event 9, 26, 3, VAR_TEMP_1, 1, MarineCave_End_EventScript_23B01B -MarineCave_End_MapEvents:: @ 8537818 +MarineCave_End_MapEvents:: map_events MarineCave_End_EventObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0 diff --git a/data/maps/MarineCave_End/header.inc b/data/maps/MarineCave_End/header.inc index 5a3c1106b..e2377aa4b 100644 --- a/data/maps/MarineCave_End/header.inc +++ b/data/maps/MarineCave_End/header.inc @@ -1,10 +1,10 @@ -MarineCave_End: @ 8484A04 +MarineCave_End: .4byte MarineCave_End_Layout .4byte MarineCave_End_MapEvents .4byte MarineCave_End_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 413 + .2byte LAYOUT_MARINE_CAVE_END .byte MAPSEC_MARINE_CAVE .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/MarineCave_Entrance/events.inc b/data/maps/MarineCave_Entrance/events.inc index 4db3e1ddc..9e96bf225 100644 --- a/data/maps/MarineCave_Entrance/events.inc +++ b/data/maps/MarineCave_Entrance/events.inc @@ -1,6 +1,6 @@ -MarineCave_Entrance_MapWarps: @ 85377CC +MarineCave_Entrance_MapWarps: warp_def 14, 1, 3, 0, MAP_MARINE_CAVE_END -MarineCave_Entrance_MapEvents:: @ 85377D4 +MarineCave_Entrance_MapEvents:: map_events 0x0, MarineCave_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/MarineCave_Entrance/header.inc b/data/maps/MarineCave_Entrance/header.inc index 338da988a..a1ce8ac61 100644 --- a/data/maps/MarineCave_Entrance/header.inc +++ b/data/maps/MarineCave_Entrance/header.inc @@ -1,10 +1,10 @@ -MarineCave_Entrance: @ 84849E8 +MarineCave_Entrance: .4byte MarineCave_Entrance_Layout .4byte MarineCave_Entrance_MapEvents .4byte MarineCave_Entrance_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 407 + .2byte LAYOUT_MARINE_CAVE_ENTRANCE .byte MAPSEC_MARINE_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity/connections.inc b/data/maps/MauvilleCity/connections.inc index ee1f4e72a..97f97982c 100644 --- a/data/maps/MauvilleCity/connections.inc +++ b/data/maps/MauvilleCity/connections.inc @@ -1,10 +1,10 @@ -MauvilleCity_MapConnectionsList: @ 8486720 +MauvilleCity_MapConnectionsList: connection up, 0, MAP_ROUTE111 connection down, 0, MAP_ROUTE110 connection left, 0, MAP_ROUTE117 connection right, 0, MAP_ROUTE118 -MauvilleCity_MapConnections: @ 8486750 - .4byte 0x4 +MauvilleCity_MapConnections: + .4byte 4 .4byte MauvilleCity_MapConnectionsList diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc index ebdc866f5..961eb4005 100644 --- a/data/maps/MauvilleCity/events.inc +++ b/data/maps/MauvilleCity/events.inc @@ -1,4 +1,4 @@ -MauvilleCity_EventObjects: @ 852662C +MauvilleCity_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MauvilleCity_EventScript_1DF3B3, 0 object_event 2, EVENT_OBJ_GFX_RICH_BOY, 0, 24, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0 object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0 @@ -11,7 +11,7 @@ MauvilleCity_EventObjects: @ 852662C object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0 object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 12, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAUVILLE_CITY_SCOTT -MauvilleCity_MapWarps: @ 8526734 +MauvilleCity_MapWarps: warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM warp_def 22, 5, 0, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F warp_def 35, 5, 0, 0, MAP_MAUVILLE_CITY_BIKE_SHOP @@ -20,7 +20,7 @@ MauvilleCity_MapWarps: @ 8526734 warp_def 8, 13, 0, 0, MAP_MAUVILLE_CITY_GAME_CORNER warp_def 19, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE2 -MauvilleCity_MapBGEvents: @ 852676C +MauvilleCity_MapBGEvents: bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E73 bg_event 11, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3E0 bg_event 24, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_271E6A @@ -30,6 +30,6 @@ MauvilleCity_MapBGEvents: @ 852676C bg_event 33, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3E9 bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_1DF3F2 -MauvilleCity_MapEvents:: @ 85267CC +MauvilleCity_MapEvents:: map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index aa107e460..566eb49e7 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -1,10 +1,10 @@ -MauvilleCity: @ 84824F0 +MauvilleCity: .4byte MauvilleCity_Layout .4byte MauvilleCity_MapEvents .4byte MauvilleCity_MapScripts .4byte MauvilleCity_MapConnections .2byte MUS_GOTOWN - .2byte 3 + .2byte LAYOUT_MAUVILLE_CITY .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc index bae187003..ac9abae2a 100644 --- a/data/maps/MauvilleCity_BikeShop/events.inc +++ b/data/maps/MauvilleCity_BikeShop/events.inc @@ -1,15 +1,15 @@ -MauvilleCity_BikeShop_EventObjects: @ 852FE80 +MauvilleCity_BikeShop_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0 object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0 -MauvilleCity_BikeShop_MapWarps: @ 852FEB0 +MauvilleCity_BikeShop_MapWarps: warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY -MauvilleCity_BikeShop_MapBGEvents: @ 852FEC0 +MauvilleCity_BikeShop_MapBGEvents: bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_20ED3A bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_20EDAE -MauvilleCity_BikeShop_MapEvents:: @ 852FED8 +MauvilleCity_BikeShop_MapEvents:: map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index d4434e8ba..244439fed 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_BikeShop: @ 8483280 +MauvilleCity_BikeShop: .4byte MauvilleCity_BikeShop_Layout .4byte MauvilleCity_BikeShop_MapEvents .4byte MauvilleCity_BikeShop_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 90 + .2byte LAYOUT_MAUVILLE_CITY_BIKE_SHOP .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc index 0fac26b5d..c5ef3b7f6 100644 --- a/data/maps/MauvilleCity_GameCorner/events.inc +++ b/data/maps/MauvilleCity_GameCorner/events.inc @@ -1,4 +1,4 @@ -MauvilleCity_GameCorner_EventObjects: @ 852FF28 +MauvilleCity_GameCorner_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0 object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0 @@ -12,11 +12,11 @@ MauvilleCity_GameCorner_EventObjects: @ 852FF28 object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0 object_event 12, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0 -MauvilleCity_GameCorner_MapWarps: @ 8530048 +MauvilleCity_GameCorner_MapWarps: warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY -MauvilleCity_GameCorner_MapBGEvents: @ 8530058 +MauvilleCity_GameCorner_MapBGEvents: bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2102D6 bg_event 2, 8, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_2102F6 bg_event 2, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_210316 @@ -42,6 +42,6 @@ MauvilleCity_GameCorner_MapBGEvents: @ 8530058 bg_event 18, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF bg_event 19, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_2A5ADF -MauvilleCity_GameCorner_MapEvents:: @ 8530178 +MauvilleCity_GameCorner_MapEvents:: map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index 5c7399ae6..f13c98c77 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_GameCorner: @ 84832B8 +MauvilleCity_GameCorner: .4byte MauvilleCity_GameCorner_Layout .4byte MauvilleCity_GameCorner_MapEvents .4byte MauvilleCity_GameCorner_MapScripts .4byte 0x0 .2byte MUS_CASINO - .2byte 91 + .2byte LAYOUT_MAUVILLE_CITY_GAME_CORNER .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc index 4a05acafb..10c3c039d 100644 --- a/data/maps/MauvilleCity_Gym/events.inc +++ b/data/maps/MauvilleCity_Gym/events.inc @@ -1,4 +1,4 @@ -MauvilleCity_Gym_EventObjects: @ 852FD5C +MauvilleCity_Gym_EventObjects: object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 5, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, FLAG_HIDE_MAUVILLE_GYM_WATTSON object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 7, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 16, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0 @@ -7,20 +7,20 @@ MauvilleCity_Gym_EventObjects: @ 852FD5C object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0 object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0 -MauvilleCity_Gym_MapWarps: @ 852FE04 +MauvilleCity_Gym_MapWarps: warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY -MauvilleCity_Gym_MapCoordEvents: @ 852FE14 +MauvilleCity_Gym_MapCoordEvents: coord_event 4, 12, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E01E coord_event 3, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E043 coord_event 0, 15, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20DFF9 coord_event 8, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_20E068 -MauvilleCity_Gym_MapBGEvents: @ 852FE54 +MauvilleCity_Gym_MapBGEvents: bg_event 3, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_20E14B bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_20E15B -MauvilleCity_Gym_MapEvents:: @ 852FE6C +MauvilleCity_Gym_MapEvents:: map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index cd38ec176..5f9666eeb 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_Gym: @ 8483264 +MauvilleCity_Gym: .4byte MauvilleCity_Gym_Layout .4byte MauvilleCity_Gym_MapEvents .4byte MauvilleCity_Gym_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 89 + .2byte LAYOUT_MAUVILLE_CITY_GYM .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_House1/events.inc b/data/maps/MauvilleCity_House1/events.inc index 1d759b438..19b88a97e 100644 --- a/data/maps/MauvilleCity_House1/events.inc +++ b/data/maps/MauvilleCity_House1/events.inc @@ -1,10 +1,10 @@ -MauvilleCity_House1_EventObjects: @ 852FEEC +MauvilleCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0 -MauvilleCity_House1_MapWarps: @ 852FF04 +MauvilleCity_House1_MapWarps: warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY -MauvilleCity_House1_MapEvents:: @ 852FF14 +MauvilleCity_House1_MapEvents:: map_events MauvilleCity_House1_EventObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index 261e0e45b..c36670be5 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_House1: @ 848329C +MauvilleCity_House1: .4byte House2_Layout .4byte MauvilleCity_House1_MapEvents .4byte MauvilleCity_House1_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_House2/events.inc b/data/maps/MauvilleCity_House2/events.inc index fae511bb3..a27fec042 100644 --- a/data/maps/MauvilleCity_House2/events.inc +++ b/data/maps/MauvilleCity_House2/events.inc @@ -1,10 +1,10 @@ -MauvilleCity_House2_EventObjects: @ 853018C +MauvilleCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0 -MauvilleCity_House2_MapWarps: @ 85301A4 +MauvilleCity_House2_MapWarps: warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY -MauvilleCity_House2_MapEvents:: @ 85301B4 +MauvilleCity_House2_MapEvents:: map_events MauvilleCity_House2_EventObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 3a584fe41..60fc3ae22 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_House2: @ 84832D4 +MauvilleCity_House2: .4byte House1_Layout .4byte MauvilleCity_House2_MapEvents .4byte MauvilleCity_House2_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_Mart/events.inc b/data/maps/MauvilleCity_Mart/events.inc index 0d32a0e2c..1a5f9a3b7 100644 --- a/data/maps/MauvilleCity_Mart/events.inc +++ b/data/maps/MauvilleCity_Mart/events.inc @@ -1,12 +1,12 @@ -MauvilleCity_Mart_EventObjects: @ 8530310 +MauvilleCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0 -MauvilleCity_Mart_MapWarps: @ 8530358 +MauvilleCity_Mart_MapWarps: warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY -MauvilleCity_Mart_MapEvents:: @ 8530368 +MauvilleCity_Mart_MapEvents:: map_events MauvilleCity_Mart_EventObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index b3d85a0c6..b986d7e3b 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_Mart: @ 8483328 +MauvilleCity_Mart: .4byte Mart_Layout .4byte MauvilleCity_Mart_MapEvents .4byte MauvilleCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc index daf747e0d..f97d61136 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc @@ -1,15 +1,15 @@ -MauvilleCity_PokemonCenter_1F_EventObjects: @ 85301C8 +MauvilleCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0 object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0 -MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240 +MauvilleCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY warp_def 6, 8, 3, 1, MAP_MAUVILLE_CITY warp_def 1, 6, 4, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_2F -MauvilleCity_PokemonCenter_1F_MapEvents:: @ 8530258 +MauvilleCity_PokemonCenter_1F_MapEvents:: map_events MauvilleCity_PokemonCenter_1F_EventObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index 207dfb526..623cd61e6 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_PokemonCenter_1F: @ 84832F0 +MauvilleCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte MauvilleCity_PokemonCenter_1F_MapEvents .4byte MauvilleCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc index 031dac213..b4b2d15ba 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc @@ -1,15 +1,15 @@ -MauvilleCity_PokemonCenter_2F_EventObjects: @ 853026C +MauvilleCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 8, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0 -MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4 +MauvilleCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -MauvilleCity_PokemonCenter_2F_MapEvents:: @ 85302FC +MauvilleCity_PokemonCenter_2F_MapEvents:: map_events MauvilleCity_PokemonCenter_2F_EventObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index 00bf23b83..bde4b4376 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -MauvilleCity_PokemonCenter_2F: @ 848330C +MauvilleCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte MauvilleCity_PokemonCenter_2F_MapEvents .4byte MauvilleCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_MAUVILLE_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc index 8f84327d2..63c17fc0d 100644 --- a/data/maps/MeteorFalls_1F_1R/events.inc +++ b/data/maps/MeteorFalls_1F_1R/events.inc @@ -1,4 +1,4 @@ -MeteorFalls_1F_1R_EventObjects: @ 8533F74 +MeteorFalls_1F_1R_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, FLAG_ITEM_METEOR_FALLS_1F_1R_TM_23 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, FLAG_ITEM_METEOR_FALLS_1F_1R_MOON_STONE object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, FLAG_ITEM_METEOR_FALLS_1F_1R_FULL_HEAL @@ -10,7 +10,7 @@ MeteorFalls_1F_1R_EventObjects: @ 8533F74 object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_METEOR_FALLS_TEAM_AQUA object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO -MeteorFalls_1F_1R_MapWarps: @ 8534064 +MeteorFalls_1F_1R_MapWarps: warp_def 27, 18, 4, 0, MAP_ROUTE114 warp_def 6, 39, 3, 0, MAP_ROUTE115 warp_def 10, 3, 3, 0, MAP_METEOR_FALLS_1F_2R @@ -18,12 +18,12 @@ MeteorFalls_1F_1R_MapWarps: @ 8534064 warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R warp_def 4, 2, 0, 0, MAP_METEOR_FALLS_STEVENS_CAVE -MeteorFalls_1F_1R_MapCoordEvents: @ 8534094 +MeteorFalls_1F_1R_MapCoordEvents: coord_event 14, 18, 4, VAR_0x40BF, 0, MeteorFalls_1F_1R_EventScript_22BD5F -MeteorFalls_1F_1R_MapBGEvents: @ 85340A4 +MeteorFalls_1F_1R_MapBGEvents: bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 -MeteorFalls_1F_1R_MapEvents:: @ 85340B0 +MeteorFalls_1F_1R_MapEvents:: map_events MeteorFalls_1F_1R_EventObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index 85ba8dd6b..5bffcd6ba 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -1,10 +1,10 @@ -MeteorFalls_1F_1R: @ 8483EC0 +MeteorFalls_1F_1R: .4byte MeteorFalls_1F_1R_Layout .4byte MeteorFalls_1F_1R_MapEvents .4byte MeteorFalls_1F_1R_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 125 + .2byte LAYOUT_METEOR_FALLS_1F_1R .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc index d9a15cbcb..fe845ae67 100644 --- a/data/maps/MeteorFalls_1F_2R/events.inc +++ b/data/maps/MeteorFalls_1F_2R/events.inc @@ -1,17 +1,17 @@ -MeteorFalls_1F_2R_EventObjects: @ 85340C4 +MeteorFalls_1F_2R_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0 -MeteorFalls_1F_2R_MapWarps: @ 853410C +MeteorFalls_1F_2R_MapWarps: warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R warp_def 4, 14, 3, 0, MAP_METEOR_FALLS_B1F_1R warp_def 7, 20, 3, 1, MAP_METEOR_FALLS_B1F_1R warp_def 21, 23, 3, 2, MAP_METEOR_FALLS_B1F_1R -MeteorFalls_1F_2R_MapBGEvents: @ 853412C +MeteorFalls_1F_2R_MapBGEvents: bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 -MeteorFalls_1F_2R_MapEvents:: @ 8534138 +MeteorFalls_1F_2R_MapEvents:: map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index 79b56a254..4ee1d78c9 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -1,10 +1,10 @@ -MeteorFalls_1F_2R: @ 8483EDC +MeteorFalls_1F_2R: .4byte MeteorFalls_1F_2R_Layout .4byte MeteorFalls_1F_2R_MapEvents .4byte MeteorFalls_1F_2R_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 126 + .2byte LAYOUT_METEOR_FALLS_1F_2R .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MeteorFalls_B1F_1R/events.inc b/data/maps/MeteorFalls_B1F_1R/events.inc index 039f316d9..1407f4e99 100644 --- a/data/maps/MeteorFalls_B1F_1R/events.inc +++ b/data/maps/MeteorFalls_B1F_1R/events.inc @@ -1,4 +1,4 @@ -MeteorFalls_B1F_1R_MapWarps: @ 853414C +MeteorFalls_B1F_1R_MapWarps: warp_def 5, 6, 4, 1, MAP_METEOR_FALLS_1F_2R warp_def 7, 11, 5, 2, MAP_METEOR_FALLS_1F_2R warp_def 18, 15, 4, 3, MAP_METEOR_FALLS_1F_2R @@ -6,6 +6,6 @@ MeteorFalls_B1F_1R_MapWarps: @ 853414C warp_def 3, 23, 5, 3, MAP_METEOR_FALLS_1F_1R warp_def 20, 36, 3, 4, MAP_METEOR_FALLS_1F_1R -MeteorFalls_B1F_1R_MapEvents:: @ 853417C +MeteorFalls_B1F_1R_MapEvents:: map_events 0x0, MeteorFalls_B1F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index 0d1edf89e..9ae4d6e68 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -1,10 +1,10 @@ -MeteorFalls_B1F_1R: @ 8483EF8 +MeteorFalls_B1F_1R: .4byte MeteorFalls_B1F_1R_Layout .4byte MeteorFalls_B1F_1R_MapEvents .4byte MeteorFalls_B1F_1R_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 127 + .2byte LAYOUT_METEOR_FALLS_B1F_1R .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MeteorFalls_B1F_2R/events.inc b/data/maps/MeteorFalls_B1F_2R/events.inc index 44b283d1e..fb1826f6e 100644 --- a/data/maps/MeteorFalls_B1F_2R/events.inc +++ b/data/maps/MeteorFalls_B1F_2R/events.inc @@ -1,9 +1,9 @@ -MeteorFalls_B1F_2R_EventObjects: @ 8534190 +MeteorFalls_B1F_2R_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, FLAG_ITEM_METEOR_FALLS_B1F_2R_TM_02 -MeteorFalls_B1F_2R_MapWarps: @ 85341A8 +MeteorFalls_B1F_2R_MapWarps: warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R -MeteorFalls_B1F_2R_MapEvents:: @ 85341B0 +MeteorFalls_B1F_2R_MapEvents:: map_events MeteorFalls_B1F_2R_EventObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index ed9fe8beb..d48c61b6d 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -1,10 +1,10 @@ -MeteorFalls_B1F_2R: @ 8483F14 +MeteorFalls_B1F_2R: .4byte MeteorFalls_B1F_2R_Layout .4byte MeteorFalls_B1F_2R_MapEvents .4byte MeteorFalls_B1F_2R_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 128 + .2byte LAYOUT_METEOR_FALLS_B1F_2R .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MeteorFalls_StevensCave/events.inc b/data/maps/MeteorFalls_StevensCave/events.inc index 09225365d..c9fcf8bd3 100644 --- a/data/maps/MeteorFalls_StevensCave/events.inc +++ b/data/maps/MeteorFalls_StevensCave/events.inc @@ -1,9 +1,9 @@ -MeteorFalls_StevensCave_EventObjects: @ 85378B0 +MeteorFalls_StevensCave_EventObjects: object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0 -MeteorFalls_StevensCave_MapWarps: @ 85378C8 +MeteorFalls_StevensCave_MapWarps: warp_def 10, 29, 3, 5, MAP_METEOR_FALLS_1F_1R -MeteorFalls_StevensCave_MapEvents:: @ 85378D0 +MeteorFalls_StevensCave_MapEvents:: map_events MeteorFalls_StevensCave_EventObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0 diff --git a/data/maps/MeteorFalls_StevensCave/header.inc b/data/maps/MeteorFalls_StevensCave/header.inc index 28b265d44..c615b53de 100644 --- a/data/maps/MeteorFalls_StevensCave/header.inc +++ b/data/maps/MeteorFalls_StevensCave/header.inc @@ -1,10 +1,10 @@ -MeteorFalls_StevensCave: @ 8484A74 +MeteorFalls_StevensCave: .4byte MeteorFalls_StevensCave_Layout .4byte MeteorFalls_StevensCave_MapEvents .4byte MeteorFalls_StevensCave_MapScripts .4byte 0x0 .2byte MUS_DAN03 - .2byte 431 + .2byte LAYOUT_METEOR_FALLS_STEVENS_CAVE .byte MAPSEC_METEOR_FALLS .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MirageTower_1F/events.inc b/data/maps/MirageTower_1F/events.inc index f35ce6d2a..f797b84c8 100644 --- a/data/maps/MirageTower_1F/events.inc +++ b/data/maps/MirageTower_1F/events.inc @@ -1,7 +1,7 @@ -MirageTower_1F_MapWarps: @ 85375D4 +MirageTower_1F_MapWarps: warp_def 10, 14, 3, 3, MAP_ROUTE111 warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_2F -MirageTower_1F_MapEvents:: @ 85375E4 +MirageTower_1F_MapEvents:: map_events 0x0, MirageTower_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MirageTower_1F/header.inc b/data/maps/MirageTower_1F/header.inc index 59ce7edbf..67035316e 100644 --- a/data/maps/MirageTower_1F/header.inc +++ b/data/maps/MirageTower_1F/header.inc @@ -1,10 +1,10 @@ -MirageTower_1F: @ 8484908 +MirageTower_1F: .4byte MirageTower_1F_Layout .4byte MirageTower_1F_MapEvents .4byte MirageTower_1F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 381 + .2byte LAYOUT_MIRAGE_TOWER_1F .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MirageTower_2F/events.inc b/data/maps/MirageTower_2F/events.inc index fdbafbe06..6cbb1fb37 100644 --- a/data/maps/MirageTower_2F/events.inc +++ b/data/maps/MirageTower_2F/events.inc @@ -1,7 +1,7 @@ -MirageTower_2F_MapWarps: @ 85375F8 +MirageTower_2F_MapWarps: warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_3F warp_def 15, 2, 3, 1, MAP_MIRAGE_TOWER_1F -MirageTower_2F_MapEvents:: @ 8537608 +MirageTower_2F_MapEvents:: map_events 0x0, MirageTower_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MirageTower_2F/header.inc b/data/maps/MirageTower_2F/header.inc index efb970538..65a5c4665 100644 --- a/data/maps/MirageTower_2F/header.inc +++ b/data/maps/MirageTower_2F/header.inc @@ -1,10 +1,10 @@ -MirageTower_2F: @ 8484924 +MirageTower_2F: .4byte MirageTower_2F_Layout .4byte MirageTower_2F_MapEvents .4byte MirageTower_2F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 382 + .2byte LAYOUT_MIRAGE_TOWER_2F .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MirageTower_3F/events.inc b/data/maps/MirageTower_3F/events.inc index 4f55d7485..9fbc189dd 100644 --- a/data/maps/MirageTower_3F/events.inc +++ b/data/maps/MirageTower_3F/events.inc @@ -1,11 +1,11 @@ -MirageTower_3F_EventObjects: @ 853761C +MirageTower_3F_EventObjects: object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_3F_EventScript_2907A6, FLAG_TEMP_12 -MirageTower_3F_MapWarps: @ 853764C +MirageTower_3F_MapWarps: warp_def 18, 12, 3, 0, MAP_MIRAGE_TOWER_2F warp_def 2, 4, 0, 0, MAP_MIRAGE_TOWER_4F -MirageTower_3F_MapEvents:: @ 853765C +MirageTower_3F_MapEvents:: map_events MirageTower_3F_EventObjects, MirageTower_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MirageTower_3F/header.inc b/data/maps/MirageTower_3F/header.inc index 7362c553e..565ff1f6d 100644 --- a/data/maps/MirageTower_3F/header.inc +++ b/data/maps/MirageTower_3F/header.inc @@ -1,10 +1,10 @@ -MirageTower_3F: @ 8484940 +MirageTower_3F: .4byte MirageTower_3F_Layout .4byte MirageTower_3F_MapEvents .4byte MirageTower_3F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 383 + .2byte LAYOUT_MIRAGE_TOWER_3F .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MirageTower_4F/events.inc b/data/maps/MirageTower_4F/events.inc index 61c536c61..a2b22cad1 100644 --- a/data/maps/MirageTower_4F/events.inc +++ b/data/maps/MirageTower_4F/events.inc @@ -1,11 +1,11 @@ -MirageTower_4F_EventObjects: @ 8537670 +MirageTower_4F_EventObjects: object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 5, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD48, FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MirageTower_4F_EventScript_23AD89, FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MirageTower_4F_EventScript_2907A6, FLAG_TEMP_11 -MirageTower_4F_MapWarps: @ 85376B8 +MirageTower_4F_MapWarps: warp_def 1, 4, 3, 1, MAP_MIRAGE_TOWER_3F -MirageTower_4F_MapEvents:: @ 85376C0 +MirageTower_4F_MapEvents:: map_events MirageTower_4F_EventObjects, MirageTower_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MirageTower_4F/header.inc b/data/maps/MirageTower_4F/header.inc index 842b12bb6..b3bc8341a 100644 --- a/data/maps/MirageTower_4F/header.inc +++ b/data/maps/MirageTower_4F/header.inc @@ -1,10 +1,10 @@ -MirageTower_4F: @ 848495C +MirageTower_4F: .4byte MirageTower_4F_Layout .4byte MirageTower_4F_MapEvents .4byte MirageTower_4F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 388 + .2byte LAYOUT_MIRAGE_TOWER_4F .byte MAPSEC_MIRAGE_TOWER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity/connections.inc b/data/maps/MossdeepCity/connections.inc index a1845c04c..c22091fe7 100644 --- a/data/maps/MossdeepCity/connections.inc +++ b/data/maps/MossdeepCity/connections.inc @@ -1,8 +1,9 @@ -MossdeepCity_MapConnectionsList: @ 84867C4 +MossdeepCity_MapConnectionsList: connection up, 0, MAP_ROUTE125 connection down, 0, MAP_ROUTE127 connection left, -40, MAP_ROUTE124 -MossdeepCity_MapConnections: @ 84867E8 - .4byte 0x3 +MossdeepCity_MapConnections: + .4byte 3 .4byte MossdeepCity_MapConnectionsList + diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc index 5a653bc22..a8284ae5d 100644 --- a/data/maps/MossdeepCity/events.inc +++ b/data/maps/MossdeepCity/events.inc @@ -1,4 +1,4 @@ -MossdeepCity_EventObjects: @ 8527018 +MossdeepCity_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 38, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AD1, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 50, 34, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 32, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_1E4AB2, 0 @@ -17,7 +17,7 @@ MossdeepCity_EventObjects: @ 8527018 object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 61, 29, 5, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, FLAG_HIDE_MOSSDEEP_CITY_SCOTT object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 31, 29, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 3, 3, 0, 0, MossdeepCity_EventScript_1E4C7C, 0 -MossdeepCity_MapWarps: @ 85271B0 +MossdeepCity_MapWarps: warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1 warp_def 38, 9, 0, 0, MAP_MOSSDEEP_CITY_GYM warp_def 28, 16, 0, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F @@ -29,7 +29,7 @@ MossdeepCity_MapWarps: @ 85271B0 warp_def 64, 15, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F -MossdeepCity_MapCoordEvents: @ 8527200 +MossdeepCity_MapCoordEvents: coord_event 25, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 coord_event 26, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 coord_event 32, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_1E4B38 @@ -41,7 +41,7 @@ MossdeepCity_MapCoordEvents: @ 8527200 coord_event 40, 25, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 coord_event 40, 26, 5, VAR_0x405D, 1, MossdeepCity_EventScript_1E4B41 -MossdeepCity_MapBGEvents: @ 85272A0 +MossdeepCity_MapBGEvents: bg_event 25, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B26 bg_event 34, 9, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B1D bg_event 29, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E73 @@ -51,6 +51,6 @@ MossdeepCity_MapBGEvents: @ 85272A0 bg_event 39, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_271E6A bg_event 57, 21, 7, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_1E4B14 -MossdeepCity_MapEvents:: @ 8527300 +MossdeepCity_MapEvents:: map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index 641faf0f7..5ac6ceeaa 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -1,10 +1,10 @@ -MossdeepCity: @ 8482560 +MossdeepCity: .4byte MossdeepCity_Layout .4byte MossdeepCity_MapEvents .4byte MossdeepCity_MapScripts .4byte MossdeepCity_MapConnections .2byte MUS_GOTOWN - .2byte 7 + .2byte LAYOUT_MOSSDEEP_CITY .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc index 2f96c458f..e9b491f4d 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/events.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc @@ -1,17 +1,17 @@ -MossdeepCity_GameCorner_1F_EventObjects: @ 8532F40 +MossdeepCity_GameCorner_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0 -MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70 +MossdeepCity_GameCorner_1F_MapWarps: warp_def 5, 9, 0, 9, MAP_MOSSDEEP_CITY warp_def 6, 9, 0, 9, MAP_MOSSDEEP_CITY warp_def 2, 0, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F -MossdeepCity_GameCorner_1F_MapBGEvents: @ 8532F88 +MossdeepCity_GameCorner_1F_MapBGEvents: bg_event 3, 0, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_224B5D bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_277E9D bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_277E96 -MossdeepCity_GameCorner_1F_MapEvents:: @ 8532FAC +MossdeepCity_GameCorner_1F_MapEvents:: map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index d32f3a306..572a5fbe9 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_GameCorner_1F: @ 84839F0 +MossdeepCity_GameCorner_1F: .4byte MossdeepCity_GameCorner_1F_Layout .4byte MossdeepCity_GameCorner_1F_MapEvents .4byte MossdeepCity_GameCorner_1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 305 + .2byte LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_GameCorner_B1F/events.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc index 0737cd7e0..d86974ae9 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/events.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/events.inc @@ -1,9 +1,9 @@ -MossdeepCity_GameCorner_B1F_EventObjects: @ 8532FC0 +MossdeepCity_GameCorner_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 -MossdeepCity_GameCorner_B1F_MapWarps: @ 8532FD8 +MossdeepCity_GameCorner_B1F_MapWarps: warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F -MossdeepCity_GameCorner_B1F_MapEvents:: @ 8532FE0 +MossdeepCity_GameCorner_B1F_MapEvents:: map_events MossdeepCity_GameCorner_B1F_EventObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index 856f76166..ee2f55731 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_GameCorner_B1F: @ 8483A0C +MossdeepCity_GameCorner_B1F: .4byte MossdeepCity_GameCorner_B1F_Layout .4byte MossdeepCity_GameCorner_B1F_MapEvents .4byte MossdeepCity_GameCorner_B1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 306 + .2byte LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc index a6511d2c1..bc18f4eb7 100644 --- a/data/maps/MossdeepCity_Gym/events.inc +++ b/data/maps/MossdeepCity_Gym/events.inc @@ -1,4 +1,4 @@ -MossdeepCity_Gym_EventObjects: @ 85324EC +MossdeepCity_Gym_EventObjects: object_event 1, EVENT_OBJ_GFX_TATE, 0, 23, 7, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0 object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 30, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0 object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 20, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0 @@ -36,7 +36,7 @@ MossdeepCity_Gym_EventObjects: @ 85324EC object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 23, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 -MossdeepCity_Gym_MapWarps: @ 853284C +MossdeepCity_Gym_MapWarps: warp_def 6, 35, 3, 1, MAP_MOSSDEEP_CITY warp_def 7, 35, 3, 1, MAP_MOSSDEEP_CITY warp_def 3, 28, 0, 3, MAP_MOSSDEEP_CITY_GYM @@ -52,7 +52,7 @@ MossdeepCity_Gym_MapWarps: @ 853284C warp_def 13, 32, 0, 13, MAP_MOSSDEEP_CITY_GYM warp_def 21, 10, 0, 12, MAP_MOSSDEEP_CITY_GYM -MossdeepCity_Gym_MapCoordEvents: @ 85328BC +MossdeepCity_Gym_MapCoordEvents: coord_event 2, 21, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C67 coord_event 8, 10, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C7D coord_event 6, 7, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C7D @@ -63,10 +63,10 @@ MossdeepCity_Gym_MapCoordEvents: @ 85328BC coord_event 21, 6, 0, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220AF1 coord_event 3, 30, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_220C67 -MossdeepCity_Gym_MapBGEvents: @ 853294C +MossdeepCity_Gym_MapBGEvents: bg_event 4, 34, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_220C33 bg_event 8, 34, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_220C43 -MossdeepCity_Gym_MapEvents:: @ 8532964 +MossdeepCity_Gym_MapEvents:: map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index 12421b787..e596d834b 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_Gym: @ 84838BC +MossdeepCity_Gym: .4byte MossdeepCity_Gym_Layout .4byte MossdeepCity_Gym_MapEvents .4byte MossdeepCity_Gym_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 108 + .2byte LAYOUT_MOSSDEEP_CITY_GYM .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_House1/events.inc b/data/maps/MossdeepCity_House1/events.inc index 4ccf90558..c16a852df 100644 --- a/data/maps/MossdeepCity_House1/events.inc +++ b/data/maps/MossdeepCity_House1/events.inc @@ -1,11 +1,11 @@ -MossdeepCity_House1_EventObjects: @ 8532978 +MossdeepCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0 -MossdeepCity_House1_MapWarps: @ 85329A8 +MossdeepCity_House1_MapWarps: warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY -MossdeepCity_House1_MapEvents:: @ 85329B8 +MossdeepCity_House1_MapEvents:: map_events MossdeepCity_House1_EventObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index 365120f52..c0a3de2c9 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_House1: @ 84838D8 +MossdeepCity_House1: .4byte House2_Layout .4byte MossdeepCity_House1_MapEvents .4byte MossdeepCity_House1_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_House2/events.inc b/data/maps/MossdeepCity_House2/events.inc index 8e169c3b0..57d398ce9 100644 --- a/data/maps/MossdeepCity_House2/events.inc +++ b/data/maps/MossdeepCity_House2/events.inc @@ -1,12 +1,12 @@ -MossdeepCity_House2_EventObjects: @ 85329CC +MossdeepCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0 object_event 2, EVENT_OBJ_GFX_TWIN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0 object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL -MossdeepCity_House2_MapWarps: @ 8532A14 +MossdeepCity_House2_MapWarps: warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY -MossdeepCity_House2_MapEvents:: @ 8532A24 +MossdeepCity_House2_MapEvents:: map_events MossdeepCity_House2_EventObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index 76673969a..ffa15e327 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_House2: @ 84838F4 +MossdeepCity_House2: .4byte House1_Layout .4byte MossdeepCity_House2_MapEvents .4byte MossdeepCity_House2_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_House3/events.inc b/data/maps/MossdeepCity_House3/events.inc index 374808598..7eb2c3416 100644 --- a/data/maps/MossdeepCity_House3/events.inc +++ b/data/maps/MossdeepCity_House3/events.inc @@ -1,10 +1,10 @@ -MossdeepCity_House3_EventObjects: @ 8532BD4 +MossdeepCity_House3_EventObjects: object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0 -MossdeepCity_House3_MapWarps: @ 8532BEC +MossdeepCity_House3_MapWarps: warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY -MossdeepCity_House3_MapEvents:: @ 8532BFC +MossdeepCity_House3_MapEvents:: map_events MossdeepCity_House3_EventObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index 0d5be2fed..b8caf392d 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_House3: @ 8483964 +MossdeepCity_House3: .4byte House2_Layout .4byte MossdeepCity_House3_MapEvents .4byte MossdeepCity_House3_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_House4/events.inc b/data/maps/MossdeepCity_House4/events.inc index 5e33f871f..71dd54a5e 100644 --- a/data/maps/MossdeepCity_House4/events.inc +++ b/data/maps/MossdeepCity_House4/events.inc @@ -1,12 +1,12 @@ -MossdeepCity_House4_EventObjects: @ 8532CAC +MossdeepCity_House4_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0 object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0 object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0 -MossdeepCity_House4_MapWarps: @ 8532CF4 +MossdeepCity_House4_MapWarps: warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY -MossdeepCity_House4_MapEvents:: @ 8532D04 +MossdeepCity_House4_MapEvents:: map_events MossdeepCity_House4_EventObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index ba9059757..1e748b7b4 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_House4: @ 848399C +MossdeepCity_House4: .4byte HouseWithBed_Layout .4byte MossdeepCity_House4_MapEvents .4byte MossdeepCity_House4_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 80 + .2byte LAYOUT_HOUSE_WITH_BED .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_Mart/events.inc b/data/maps/MossdeepCity_Mart/events.inc index d452187d1..770cb7ee5 100644 --- a/data/maps/MossdeepCity_Mart/events.inc +++ b/data/maps/MossdeepCity_Mart/events.inc @@ -1,13 +1,13 @@ -MossdeepCity_Mart_EventObjects: @ 8532B50 +MossdeepCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0 object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0 object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_222408, 0 -MossdeepCity_Mart_MapWarps: @ 8532BB0 +MossdeepCity_Mart_MapWarps: warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY -MossdeepCity_Mart_MapEvents:: @ 8532BC0 +MossdeepCity_Mart_MapEvents:: map_events MossdeepCity_Mart_EventObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index 7de6cb5de..75ea708d1 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_Mart: @ 8483948 +MossdeepCity_Mart: .4byte Mart_Layout .4byte MossdeepCity_Mart_MapEvents .4byte MossdeepCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc index 5e48096c9..53aa69470 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc @@ -1,13 +1,13 @@ -MossdeepCity_PokemonCenter_1F_EventObjects: @ 8532A38 +MossdeepCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0 object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0 -MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80 +MossdeepCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY warp_def 6, 8, 3, 2, MAP_MOSSDEEP_CITY warp_def 1, 6, 4, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F -MossdeepCity_PokemonCenter_1F_MapEvents:: @ 8532A98 +MossdeepCity_PokemonCenter_1F_MapEvents:: map_events MossdeepCity_PokemonCenter_1F_EventObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index b97b7108d..719394a94 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_PokemonCenter_1F: @ 8483910 +MossdeepCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte MossdeepCity_PokemonCenter_1F_MapEvents .4byte MossdeepCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc index c2158f4f4..ce27a0804 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc @@ -1,15 +1,15 @@ -MossdeepCity_PokemonCenter_2F_EventObjects: @ 8532AAC +MossdeepCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0 -MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24 +MossdeepCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -MossdeepCity_PokemonCenter_2F_MapEvents:: @ 8532B3C +MossdeepCity_PokemonCenter_2F_MapEvents:: map_events MossdeepCity_PokemonCenter_2F_EventObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index 263511ce9..7bb1d541c 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_PokemonCenter_2F: @ 848392C +MossdeepCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte MossdeepCity_PokemonCenter_2F_MapEvents .4byte MossdeepCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc index dbb5a47eb..84466046f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc @@ -1,4 +1,4 @@ -MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18 +MossdeepCity_SpaceCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0 object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0 object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0 @@ -11,11 +11,11 @@ MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18 object_event 10, EVENT_OBJ_GFX_NINJA_BOY, 0, 2, 5, 0, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_1F_STEVEN -MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20 +MossdeepCity_SpaceCenter_1F_MapWarps: warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY warp_def 8, 9, 0, 8, MAP_MOSSDEEP_CITY warp_def 13, 1, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_2F -MossdeepCity_SpaceCenter_1F_MapEvents:: @ 8532E38 +MossdeepCity_SpaceCenter_1F_MapEvents:: map_events MossdeepCity_SpaceCenter_1F_EventObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index 5e99c584a..5bce64c21 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_SpaceCenter_1F: @ 84839B8 +MossdeepCity_SpaceCenter_1F: .4byte MossdeepCity_SpaceCenter_1F_Layout .4byte MossdeepCity_SpaceCenter_1F_MapEvents .4byte MossdeepCity_SpaceCenter_1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 275 + .2byte LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc index 6c271b5de..624185dfc 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc @@ -1,4 +1,4 @@ -MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C +MossdeepCity_SpaceCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0 @@ -9,9 +9,9 @@ MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_2F_TEAM_MAGMA -MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24 +MossdeepCity_SpaceCenter_2F_MapWarps: warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F -MossdeepCity_SpaceCenter_2F_MapEvents:: @ 8532F2C +MossdeepCity_SpaceCenter_2F_MapEvents:: map_events MossdeepCity_SpaceCenter_2F_EventObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index 3f4eab34e..1d6b5834f 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_SpaceCenter_2F: @ 84839D4 +MossdeepCity_SpaceCenter_2F: .4byte MossdeepCity_SpaceCenter_2F_Layout .4byte MossdeepCity_SpaceCenter_2F_MapEvents .4byte MossdeepCity_SpaceCenter_2F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 276 + .2byte LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc index dd8b3d1b4..c9fa20d62 100644 --- a/data/maps/MossdeepCity_StevensHouse/events.inc +++ b/data/maps/MossdeepCity_StevensHouse/events.inc @@ -1,18 +1,18 @@ -MossdeepCity_StevensHouse_EventObjects: @ 8532C10 +MossdeepCity_StevensHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY -MossdeepCity_StevensHouse_MapWarps: @ 8532C58 +MossdeepCity_StevensHouse_MapWarps: warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY -MossdeepCity_StevensHouse_MapBGEvents: @ 8532C68 +MossdeepCity_StevensHouse_MapBGEvents: bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 bg_event 10, 4, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 bg_event 10, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_222909 -MossdeepCity_StevensHouse_MapEvents:: @ 8532C98 +MossdeepCity_StevensHouse_MapEvents:: map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index 693801b86..a6e197f20 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -1,10 +1,10 @@ -MossdeepCity_StevensHouse: @ 8483980 +MossdeepCity_StevensHouse: .4byte MossdeepCity_StevensHouse_Layout .4byte MossdeepCity_StevensHouse_MapEvents .4byte MossdeepCity_StevensHouse_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 327 + .2byte LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE .byte MAPSEC_MOSSDEEP_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc index d11ba584e..e341872a7 100644 --- a/data/maps/MtChimney/events.inc +++ b/data/maps/MtChimney/events.inc @@ -1,4 +1,4 @@ -MtChimney_EventObjects: @ 85347C8 +MtChimney_EventObjects: object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 24, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 12, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MtChimney_EventScript_22F06E, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA @@ -30,16 +30,16 @@ MtChimney_EventObjects: @ 85347C8 object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 13, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtChimney_EventScript_22F1F1, FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA object_event 30, EVENT_OBJ_GFX_HIKER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 6, MtChimney_EventScript_22F208, FLAG_HIDE_MT_CHIMNEY_TRAINERS -MtChimney_MapWarps: @ 8534A98 +MtChimney_MapWarps: warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION warp_def 18, 36, 0, 1, MAP_MT_CHIMNEY_CABLE_CAR_STATION warp_def 20, 41, 3, 2, MAP_JAGGED_PASS warp_def 21, 41, 3, 3, MAP_JAGGED_PASS -MtChimney_MapBGEvents: @ 8534AB8 +MtChimney_MapBGEvents: bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_22F0E4 bg_event 24, 37, 3, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_22F141 -MtChimney_MapEvents:: @ 8534AD0 +MtChimney_MapEvents:: map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index 9cd065903..a7f03617e 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -1,10 +1,10 @@ -MtChimney: @ 8484010 +MtChimney: .4byte MtChimney_Layout .4byte MtChimney_MapEvents .4byte MtChimney_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 136 + .2byte LAYOUT_MT_CHIMNEY .byte MAPSEC_MT_CHIMNEY .byte 0 .byte WEATHER_ASH diff --git a/data/maps/MtChimney_CableCarStation/events.inc b/data/maps/MtChimney_CableCarStation/events.inc index 491ca7997..24f64fbbb 100644 --- a/data/maps/MtChimney_CableCarStation/events.inc +++ b/data/maps/MtChimney_CableCarStation/events.inc @@ -1,11 +1,11 @@ -MtChimney_CableCarStation_EventObjects: @ 8533CA8 +MtChimney_CableCarStation_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0 object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 -MtChimney_CableCarStation_MapWarps: @ 8533CD8 +MtChimney_CableCarStation_MapWarps: warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY -MtChimney_CableCarStation_MapEvents:: @ 8533CE8 +MtChimney_CableCarStation_MapEvents:: map_events MtChimney_CableCarStation_EventObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index 0f858f9c1..7b3d628cc 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -1,10 +1,10 @@ -MtChimney_CableCarStation: @ 8483DFC +MtChimney_CableCarStation: .4byte CableCarStation_Layout .4byte MtChimney_CableCarStation_MapEvents .4byte MtChimney_CableCarStation_MapScripts .4byte 0x0 .2byte MUS_DOORO_X1 - .2byte 118 + .2byte LAYOUT_CABLE_CAR_STATION .byte MAPSEC_MT_CHIMNEY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc index 5fd821541..7b1d79e16 100644 --- a/data/maps/MtPyre_1F/events.inc +++ b/data/maps/MtPyre_1F/events.inc @@ -1,9 +1,9 @@ -MtPyre_1F_EventObjects: @ 8534D64 +MtPyre_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_WOMAN, 0, 21, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_1F_EventScript_230F3F, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 17, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MtPyre_1F_EventScript_230F78, 0 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MtPyre_1F_EventScript_230F81, 0 -MtPyre_1F_MapWarps: @ 8534DAC +MtPyre_1F_MapWarps: warp_def 17, 18, 3, 0, MAP_ROUTE122 warp_def 3, 6, 3, 0, MAP_MT_PYRE_EXTERIOR warp_def 18, 18, 3, 0, MAP_ROUTE122 @@ -11,6 +11,6 @@ MtPyre_1F_MapWarps: @ 8534DAC warp_def 11, 1, 3, 0, MAP_MT_PYRE_2F warp_def 20, 9, 3, 4, MAP_MT_PYRE_2F -MtPyre_1F_MapEvents:: @ 8534DDC +MtPyre_1F_MapEvents:: map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index f60532fa2..b4d6603df 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -1,10 +1,10 @@ -MtPyre_1F: @ 8484064 +MtPyre_1F: .4byte MtPyre_1F_Layout .4byte MtPyre_1F_MapEvents .4byte MtPyre_1F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 137 + .2byte LAYOUT_MT_PYRE_1F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc index f9fad9f46..f0ec0d0a3 100644 --- a/data/maps/MtPyre_2F/events.inc +++ b/data/maps/MtPyre_2F/events.inc @@ -1,4 +1,4 @@ -MtPyre_2F_EventObjects: @ 8534DF0 +MtPyre_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, MtPyre_2F_EventScript_231128, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_2912FD, FLAG_ITEM_MT_PYRE_2F_ULTRA_BALL object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MtPyre_2F_EventScript_231116, 0 @@ -8,13 +8,13 @@ MtPyre_2F_EventObjects: @ 8534DF0 object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 6, 9, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, MtPyre_2F_EventScript_23118C, 0 object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_2F_EventScript_231175, 0 -MtPyre_2F_MapWarps: @ 8534EB0 +MtPyre_2F_MapWarps: warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F warp_def 10, 1, 3, 0, MAP_MT_PYRE_3F warp_def 10, 12, 3, 4, MAP_MT_PYRE_3F warp_def 6, 12, 3, 5, MAP_MT_PYRE_3F warp_def 11, 9, 3, 5, MAP_MT_PYRE_1F -MtPyre_2F_MapEvents:: @ 8534ED8 +MtPyre_2F_MapEvents:: map_events MtPyre_2F_EventObjects, MtPyre_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index 1abca7143..b1906b82e 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -1,10 +1,10 @@ -MtPyre_2F: @ 8484080 +MtPyre_2F: .4byte MtPyre_2F_Layout .4byte MtPyre_2F_MapEvents .4byte MtPyre_2F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 138 + .2byte LAYOUT_MT_PYRE_2F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc index f78373aca..4d6f3c9ea 100644 --- a/data/maps/MtPyre_3F/events.inc +++ b/data/maps/MtPyre_3F/events.inc @@ -1,10 +1,10 @@ -MtPyre_3F_EventObjects: @ 8534EEC +MtPyre_3F_EventObjects: object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231753, 0 object_event 2, EVENT_OBJ_GFX_LASS, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 4, MtPyre_3F_EventScript_23176A, 0 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_29130A, FLAG_ITEM_MT_PYRE_3F_SUPER_REPEL object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 1, 1, 1, 4, MtPyre_3F_EventScript_231781, 0 -MtPyre_3F_MapWarps: @ 8534F4C +MtPyre_3F_MapWarps: warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F warp_def 2, 1, 3, 1, MAP_MT_PYRE_4F warp_def 9, 10, 3, 4, MAP_MT_PYRE_4F @@ -12,6 +12,6 @@ MtPyre_3F_MapWarps: @ 8534F4C warp_def 10, 12, 3, 2, MAP_MT_PYRE_2F warp_def 6, 12, 3, 3, MAP_MT_PYRE_2F -MtPyre_3F_MapEvents:: @ 8534F7C +MtPyre_3F_MapEvents:: map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 3f54a3670..96026c7d9 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -1,10 +1,10 @@ -MtPyre_3F: @ 848409C +MtPyre_3F: .4byte MtPyre_3F_Layout .4byte MtPyre_3F_MapEvents .4byte MtPyre_3F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 139 + .2byte LAYOUT_MT_PYRE_3F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc index ffe568880..030039d18 100644 --- a/data/maps/MtPyre_4F/events.inc +++ b/data/maps/MtPyre_4F/events.inc @@ -1,8 +1,8 @@ -MtPyre_4F_EventObjects: @ 8534F90 +MtPyre_4F_EventObjects: object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 7, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, MtPyre_4F_EventScript_231C6E, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_4F_EventScript_291317, FLAG_ITEM_MT_PYRE_4F_SEA_INCENSE -MtPyre_4F_MapWarps: @ 8534FC0 +MtPyre_4F_MapWarps: warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F warp_def 2, 5, 3, 1, MAP_MT_PYRE_3F warp_def 12, 10, 3, 3, MAP_MT_PYRE_5F @@ -10,6 +10,6 @@ MtPyre_4F_MapWarps: @ 8534FC0 warp_def 9, 10, 3, 2, MAP_MT_PYRE_3F warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F -MtPyre_4F_MapEvents:: @ 8534FF0 +MtPyre_4F_MapEvents:: map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 1c41c3a6d..86edc3843 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -1,10 +1,10 @@ -MtPyre_4F: @ 84840B8 +MtPyre_4F: .4byte MtPyre_4F_Layout .4byte MtPyre_4F_MapEvents .4byte MtPyre_4F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 140 + .2byte LAYOUT_MT_PYRE_4F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc index afd3801e3..fd6261356 100644 --- a/data/maps/MtPyre_5F/events.inc +++ b/data/maps/MtPyre_5F/events.inc @@ -1,14 +1,14 @@ -MtPyre_5F_EventObjects: @ 8535004 +MtPyre_5F_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_5F_EventScript_231BC9, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_5F_EventScript_291324, FLAG_ITEM_MT_PYRE_5F_LAX_INCENSE -MtPyre_5F_MapWarps: @ 8535034 +MtPyre_5F_MapWarps: warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F warp_def 10, 5, 3, 0, MAP_MT_PYRE_4F warp_def 1, 10, 3, 1, MAP_MT_PYRE_6F warp_def 12, 10, 3, 2, MAP_MT_PYRE_4F warp_def 12, 12, 3, 3, MAP_MT_PYRE_4F -MtPyre_5F_MapEvents:: @ 853505C +MtPyre_5F_MapEvents:: map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index 17c8eddcd..8296f03dc 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -1,10 +1,10 @@ -MtPyre_5F: @ 84840D4 +MtPyre_5F: .4byte MtPyre_5F_Layout .4byte MtPyre_5F_MapEvents .4byte MtPyre_5F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 141 + .2byte LAYOUT_MT_PYRE_5F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc index 3ab5dcf70..df862d84e 100644 --- a/data/maps/MtPyre_6F/events.inc +++ b/data/maps/MtPyre_6F/events.inc @@ -1,12 +1,12 @@ -MtPyre_6F_EventObjects: @ 8535070 +MtPyre_6F_EventObjects: object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D3B, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_6F_EventScript_291331, FLAG_ITEM_MT_PYRE_6F_TM_30 object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 10, 3, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, MtPyre_6F_EventScript_231D9D, 0 -MtPyre_6F_MapWarps: @ 85350B8 +MtPyre_6F_MapWarps: warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F -MtPyre_6F_MapEvents:: @ 85350C8 +MtPyre_6F_MapEvents:: map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0 diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index 4e8082820..ca0e545aa 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -1,10 +1,10 @@ -MtPyre_6F: @ 84840F0 +MtPyre_6F: .4byte MtPyre_6F_Layout .4byte MtPyre_6F_MapEvents .4byte MtPyre_6F_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 142 + .2byte LAYOUT_MT_PYRE_6F .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc index 75c9489e4..1b8248e02 100644 --- a/data/maps/MtPyre_Exterior/events.inc +++ b/data/maps/MtPyre_Exterior/events.inc @@ -1,23 +1,23 @@ -MtPyre_Exterior_EventObjects: @ 85350DC +MtPyre_Exterior_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, FLAG_ITEM_MT_PYRE_EXTERIOR_MAX_POTION object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, FLAG_ITEM_MT_PYRE_EXTERIOR_TM_48 -MtPyre_Exterior_MapWarps: @ 853510C +MtPyre_Exterior_MapWarps: warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F warp_def 19, 10, 3, 1, MAP_MT_PYRE_SUMMIT warp_def 20, 10, 3, 1, MAP_MT_PYRE_SUMMIT -MtPyre_Exterior_MapCoordEvents: @ 8535124 +MtPyre_Exterior_MapCoordEvents: coord_event 24, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED coord_event 25, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED coord_event 22, 27, 3, 0, 0, MtPyre_Exterior_EventScript_231FF2 coord_event 23, 28, 3, 0, 0, MtPyre_Exterior_EventScript_231FF2 coord_event 26, 21, 3, 0, 0, MtPyre_Exterior_EventScript_231FED -MtPyre_Exterior_MapBGEvents: @ 8535174 +MtPyre_Exterior_MapBGEvents: bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_ULTRA_BALL bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_MT_PYRE_EXTERIOR_MAX_ETHER -MtPyre_Exterior_MapEvents:: @ 853518C +MtPyre_Exterior_MapEvents:: map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index 3b703a41e..9b9dfe1fa 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -1,10 +1,10 @@ -MtPyre_Exterior: @ 848410C +MtPyre_Exterior: .4byte MtPyre_Exterior_Layout .4byte MtPyre_Exterior_MapEvents .4byte MtPyre_Exterior_MapScripts .4byte 0x0 .2byte MUS_MACHUPI - .2byte 302 + .2byte LAYOUT_MT_PYRE_EXTERIOR .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc index b112fbcfe..abe957f28 100644 --- a/data/maps/MtPyre_Summit/events.inc +++ b/data/maps/MtPyre_Summit/events.inc @@ -1,4 +1,4 @@ -MtPyre_Summit_EventObjects: @ 85351A0 +MtPyre_Summit_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0 object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0 @@ -8,12 +8,12 @@ MtPyre_Summit_EventObjects: @ 85351A0 object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 25, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, MtPyre_Summit_EventScript_232442, FLAG_HIDE_MT_PYRE_SUMMIT_TEAM_AQUA object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE -MtPyre_Summit_MapWarps: @ 8535260 +MtPyre_Summit_MapWarps: warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR warp_def 23, 31, 3, 1, MAP_MT_PYRE_EXTERIOR warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR -MtPyre_Summit_MapCoordEvents: @ 8535278 +MtPyre_Summit_MapCoordEvents: coord_event 22, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232018 coord_event 23, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232024 coord_event 24, 7, 3, VAR_0x40B9, 0, MtPyre_Summit_EventScript_232030 @@ -21,10 +21,10 @@ MtPyre_Summit_MapCoordEvents: @ 8535278 coord_event 23, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_2321F8 coord_event 24, 9, 3, VAR_0x40B9, 2, MtPyre_Summit_EventScript_232204 -MtPyre_Summit_MapBGEvents: @ 85352D8 +MtPyre_Summit_MapBGEvents: bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_ZINC bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_MT_PYRE_SUMMIT_RARE_CANDY -MtPyre_Summit_MapEvents:: @ 85352F0 +MtPyre_Summit_MapEvents:: map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index 29a28e99b..483afb989 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -1,10 +1,10 @@ -MtPyre_Summit: @ 8484128 +MtPyre_Summit: .4byte MtPyre_Summit_Layout .4byte MtPyre_Summit_MapEvents .4byte MtPyre_Summit_MapScripts .4byte 0x0 .2byte MUS_MACHUPI - .2byte 303 + .2byte LAYOUT_MT_PYRE_SUMMIT .byte MAPSEC_MT_PYRE .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/NavelRock_B1F/events.inc b/data/maps/NavelRock_B1F/events.inc index e83d221dd..5142b09a2 100644 --- a/data/maps/NavelRock_B1F/events.inc +++ b/data/maps/NavelRock_B1F/events.inc @@ -1,7 +1,7 @@ -NavelRock_B1F_MapWarps: @ 853DA94 +NavelRock_B1F_MapWarps: warp_def 4, 3, 3, 0, MAP_NAVEL_ROCK_ENTRANCE warp_def 18, 9, 3, 1, MAP_NAVEL_ROCK_FORK -NavelRock_B1F_MapEvents:: @ 853DAA4 +NavelRock_B1F_MapEvents:: map_events 0x0, NavelRock_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_B1F/header.inc b/data/maps/NavelRock_B1F/header.inc index cf56d8fb4..08842ade1 100644 --- a/data/maps/NavelRock_B1F/header.inc +++ b/data/maps/NavelRock_B1F/header.inc @@ -1,10 +1,10 @@ -NavelRock_B1F: @ 84858C8 +NavelRock_B1F: .4byte NavelRock_B1F_Layout .4byte NavelRock_B1F_MapEvents .4byte NavelRock_B1F_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 427 + .2byte LAYOUT_NAVEL_ROCK_B1F .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Bottom/events.inc b/data/maps/NavelRock_Bottom/events.inc index d18565161..16fa053ce 100644 --- a/data/maps/NavelRock_Bottom/events.inc +++ b/data/maps/NavelRock_Bottom/events.inc @@ -1,9 +1,9 @@ -NavelRock_Bottom_EventObjects: @ 853DD50 +NavelRock_Bottom_EventObjects: object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 11, 13, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, NavelRock_Bottom_EventScript_2692A2, FLAG_HIDE_LUGIA -NavelRock_Bottom_MapWarps: @ 853DD68 +NavelRock_Bottom_MapWarps: warp_def 14, 19, 0, 0, MAP_NAVEL_ROCK_DOWN11 -NavelRock_Bottom_MapEvents:: @ 853DD70 +NavelRock_Bottom_MapEvents:: map_events NavelRock_Bottom_EventObjects, NavelRock_Bottom_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Bottom/header.inc b/data/maps/NavelRock_Bottom/header.inc index d6f9b9d5a..b768e916a 100644 --- a/data/maps/NavelRock_Bottom/header.inc +++ b/data/maps/NavelRock_Bottom/header.inc @@ -1,10 +1,10 @@ -NavelRock_Bottom: @ 8485AC0 +NavelRock_Bottom: .4byte NavelRock_Bottom_Layout .4byte NavelRock_Bottom_MapEvents .4byte NavelRock_Bottom_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 424 + .2byte LAYOUT_NAVEL_ROCK_BOTTOM .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down01/events.inc b/data/maps/NavelRock_Down01/events.inc index 3a6045215..9874119a9 100644 --- a/data/maps/NavelRock_Down01/events.inc +++ b/data/maps/NavelRock_Down01/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down01_MapWarps: @ 853DBC4 +NavelRock_Down01_MapWarps: warp_def 3, 3, 3, 2, MAP_NAVEL_ROCK_FORK warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN02 -NavelRock_Down01_MapEvents:: @ 853DBD4 +NavelRock_Down01_MapEvents:: map_events 0x0, NavelRock_Down01_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down01/header.inc b/data/maps/NavelRock_Down01/header.inc index 2dc18c232..7cddeeae7 100644 --- a/data/maps/NavelRock_Down01/header.inc +++ b/data/maps/NavelRock_Down01/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down01: @ 848598C +NavelRock_Down01: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down01_MapEvents .4byte NavelRock_Down01_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down02/events.inc b/data/maps/NavelRock_Down02/events.inc index 7441539c9..449085ea5 100644 --- a/data/maps/NavelRock_Down02/events.inc +++ b/data/maps/NavelRock_Down02/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down02_MapWarps: @ 853DBE8 +NavelRock_Down02_MapWarps: warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN01 warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN03 -NavelRock_Down02_MapEvents:: @ 853DBF8 +NavelRock_Down02_MapEvents:: map_events 0x0, NavelRock_Down02_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down02/header.inc b/data/maps/NavelRock_Down02/header.inc index 731e4e2fb..03d45822b 100644 --- a/data/maps/NavelRock_Down02/header.inc +++ b/data/maps/NavelRock_Down02/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down02: @ 84859A8 +NavelRock_Down02: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down02_MapEvents .4byte NavelRock_Down02_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down03/events.inc b/data/maps/NavelRock_Down03/events.inc index 20dabdfaf..7b74ad412 100644 --- a/data/maps/NavelRock_Down03/events.inc +++ b/data/maps/NavelRock_Down03/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down03_MapWarps: @ 853DC0C +NavelRock_Down03_MapWarps: warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN02 warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN04 -NavelRock_Down03_MapEvents:: @ 853DC1C +NavelRock_Down03_MapEvents:: map_events 0x0, NavelRock_Down03_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down03/header.inc b/data/maps/NavelRock_Down03/header.inc index fdf22dbc3..694f840e4 100644 --- a/data/maps/NavelRock_Down03/header.inc +++ b/data/maps/NavelRock_Down03/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down03: @ 84859C4 +NavelRock_Down03: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down03_MapEvents .4byte NavelRock_Down03_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down04/events.inc b/data/maps/NavelRock_Down04/events.inc index e50f6fe23..5459b1d50 100644 --- a/data/maps/NavelRock_Down04/events.inc +++ b/data/maps/NavelRock_Down04/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down04_MapWarps: @ 853DC30 +NavelRock_Down04_MapWarps: warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN03 warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN05 -NavelRock_Down04_MapEvents:: @ 853DC40 +NavelRock_Down04_MapEvents:: map_events 0x0, NavelRock_Down04_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down04/header.inc b/data/maps/NavelRock_Down04/header.inc index 7f93253b1..0275b6422 100644 --- a/data/maps/NavelRock_Down04/header.inc +++ b/data/maps/NavelRock_Down04/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down04: @ 84859E0 +NavelRock_Down04: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down04_MapEvents .4byte NavelRock_Down04_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down05/events.inc b/data/maps/NavelRock_Down05/events.inc index 500d38e9b..de52fa07f 100644 --- a/data/maps/NavelRock_Down05/events.inc +++ b/data/maps/NavelRock_Down05/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down05_MapWarps: @ 853DC54 +NavelRock_Down05_MapWarps: warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN04 warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN06 -NavelRock_Down05_MapEvents:: @ 853DC64 +NavelRock_Down05_MapEvents:: map_events 0x0, NavelRock_Down05_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down05/header.inc b/data/maps/NavelRock_Down05/header.inc index 602f440e0..50e298b6e 100644 --- a/data/maps/NavelRock_Down05/header.inc +++ b/data/maps/NavelRock_Down05/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down05: @ 84859FC +NavelRock_Down05: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down05_MapEvents .4byte NavelRock_Down05_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down06/events.inc b/data/maps/NavelRock_Down06/events.inc index 077367747..54e5f229e 100644 --- a/data/maps/NavelRock_Down06/events.inc +++ b/data/maps/NavelRock_Down06/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down06_MapWarps: @ 853DC78 +NavelRock_Down06_MapWarps: warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN05 warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN07 -NavelRock_Down06_MapEvents:: @ 853DC88 +NavelRock_Down06_MapEvents:: map_events 0x0, NavelRock_Down06_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down06/header.inc b/data/maps/NavelRock_Down06/header.inc index c3ec1fe55..8e18db5b9 100644 --- a/data/maps/NavelRock_Down06/header.inc +++ b/data/maps/NavelRock_Down06/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down06: @ 8485A18 +NavelRock_Down06: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down06_MapEvents .4byte NavelRock_Down06_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down07/events.inc b/data/maps/NavelRock_Down07/events.inc index 83f7ce9a6..55b4dd10c 100644 --- a/data/maps/NavelRock_Down07/events.inc +++ b/data/maps/NavelRock_Down07/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down07_MapWarps: @ 853DC9C +NavelRock_Down07_MapWarps: warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN06 warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN08 -NavelRock_Down07_MapEvents:: @ 853DCAC +NavelRock_Down07_MapEvents:: map_events 0x0, NavelRock_Down07_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down07/header.inc b/data/maps/NavelRock_Down07/header.inc index f3a5ab3f3..75c41046e 100644 --- a/data/maps/NavelRock_Down07/header.inc +++ b/data/maps/NavelRock_Down07/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down07: @ 8485A34 +NavelRock_Down07: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down07_MapEvents .4byte NavelRock_Down07_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down08/events.inc b/data/maps/NavelRock_Down08/events.inc index 38bef10e8..b1180ed83 100644 --- a/data/maps/NavelRock_Down08/events.inc +++ b/data/maps/NavelRock_Down08/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down08_MapWarps: @ 853DCC0 +NavelRock_Down08_MapWarps: warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN07 warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_DOWN09 -NavelRock_Down08_MapEvents:: @ 853DCD0 +NavelRock_Down08_MapEvents:: map_events 0x0, NavelRock_Down08_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down08/header.inc b/data/maps/NavelRock_Down08/header.inc index 3a6f28081..bcb69b412 100644 --- a/data/maps/NavelRock_Down08/header.inc +++ b/data/maps/NavelRock_Down08/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down08: @ 8485A50 +NavelRock_Down08: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down08_MapEvents .4byte NavelRock_Down08_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down09/events.inc b/data/maps/NavelRock_Down09/events.inc index e3843e759..e7279c4d0 100644 --- a/data/maps/NavelRock_Down09/events.inc +++ b/data/maps/NavelRock_Down09/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down09_MapWarps: @ 853DCE4 +NavelRock_Down09_MapWarps: warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN08 warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_DOWN10 -NavelRock_Down09_MapEvents:: @ 853DCF4 +NavelRock_Down09_MapEvents:: map_events 0x0, NavelRock_Down09_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down09/header.inc b/data/maps/NavelRock_Down09/header.inc index f132b9f66..cb80dd7fa 100644 --- a/data/maps/NavelRock_Down09/header.inc +++ b/data/maps/NavelRock_Down09/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down09: @ 8485A6C +NavelRock_Down09: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down09_MapEvents .4byte NavelRock_Down09_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down10/events.inc b/data/maps/NavelRock_Down10/events.inc index 805e399b4..b9eadabf1 100644 --- a/data/maps/NavelRock_Down10/events.inc +++ b/data/maps/NavelRock_Down10/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down10_MapWarps: @ 853DD08 +NavelRock_Down10_MapWarps: warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_DOWN09 warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN11 -NavelRock_Down10_MapEvents:: @ 853DD18 +NavelRock_Down10_MapEvents:: map_events 0x0, NavelRock_Down10_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down10/header.inc b/data/maps/NavelRock_Down10/header.inc index 3ee4d62ce..308a89e05 100644 --- a/data/maps/NavelRock_Down10/header.inc +++ b/data/maps/NavelRock_Down10/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down10: @ 8485A88 +NavelRock_Down10: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Down10_MapEvents .4byte NavelRock_Down10_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Down11/events.inc b/data/maps/NavelRock_Down11/events.inc index 505a6ed6d..9822ee8ff 100644 --- a/data/maps/NavelRock_Down11/events.inc +++ b/data/maps/NavelRock_Down11/events.inc @@ -1,7 +1,7 @@ -NavelRock_Down11_MapWarps: @ 853DD2C +NavelRock_Down11_MapWarps: warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_BOTTOM warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_DOWN10 -NavelRock_Down11_MapEvents:: @ 853DD3C +NavelRock_Down11_MapEvents:: map_events 0x0, NavelRock_Down11_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Down11/header.inc b/data/maps/NavelRock_Down11/header.inc index ef2ad00b7..2c5a0862b 100644 --- a/data/maps/NavelRock_Down11/header.inc +++ b/data/maps/NavelRock_Down11/header.inc @@ -1,10 +1,10 @@ -NavelRock_Down11: @ 8485AA4 +NavelRock_Down11: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Down11_MapEvents .4byte NavelRock_Down11_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Entrance/events.inc b/data/maps/NavelRock_Entrance/events.inc index ee45485a7..b063f08d8 100644 --- a/data/maps/NavelRock_Entrance/events.inc +++ b/data/maps/NavelRock_Entrance/events.inc @@ -1,7 +1,7 @@ -NavelRock_Entrance_MapWarps: @ 853DA70 +NavelRock_Entrance_MapWarps: warp_def 10, 5, 3, 0, MAP_NAVEL_ROCK_B1F warp_def 10, 26, 3, 1, MAP_NAVEL_ROCK_EXTERIOR -NavelRock_Entrance_MapEvents:: @ 853DA80 +NavelRock_Entrance_MapEvents:: map_events 0x0, NavelRock_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Entrance/header.inc b/data/maps/NavelRock_Entrance/header.inc index dbc28a781..793ab85cd 100644 --- a/data/maps/NavelRock_Entrance/header.inc +++ b/data/maps/NavelRock_Entrance/header.inc @@ -1,10 +1,10 @@ -NavelRock_Entrance: @ 84858AC +NavelRock_Entrance: .4byte NavelRock_Entrance_Layout .4byte NavelRock_Entrance_MapEvents .4byte NavelRock_Entrance_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 422 + .2byte LAYOUT_NAVEL_ROCK_ENTRANCE .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Exterior/events.inc b/data/maps/NavelRock_Exterior/events.inc index 66bbf376f..1ec151c8c 100644 --- a/data/maps/NavelRock_Exterior/events.inc +++ b/data/maps/NavelRock_Exterior/events.inc @@ -1,7 +1,7 @@ -NavelRock_Exterior_MapWarps: @ 853DA00 +NavelRock_Exterior_MapWarps: warp_def 10, 18, 0, 0, MAP_NAVEL_ROCK_HARBOR warp_def 10, 10, 0, 1, MAP_NAVEL_ROCK_ENTRANCE -NavelRock_Exterior_MapEvents:: @ 853DA10 +NavelRock_Exterior_MapEvents:: map_events 0x0, NavelRock_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Exterior/header.inc b/data/maps/NavelRock_Exterior/header.inc index e13422c26..f355dbf55 100644 --- a/data/maps/NavelRock_Exterior/header.inc +++ b/data/maps/NavelRock_Exterior/header.inc @@ -1,10 +1,10 @@ -NavelRock_Exterior: @ 8485874 +NavelRock_Exterior: .4byte NavelRock_Exterior_Layout .4byte NavelRock_Exterior_MapEvents .4byte NavelRock_Exterior_MapScripts .4byte 0x0 .2byte MUS_RG_NANASHIMA - .2byte 421 + .2byte LAYOUT_NAVEL_ROCK_EXTERIOR .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Fork/events.inc b/data/maps/NavelRock_Fork/events.inc index 869dc0f08..fde5e5930 100644 --- a/data/maps/NavelRock_Fork/events.inc +++ b/data/maps/NavelRock_Fork/events.inc @@ -1,8 +1,8 @@ -NavelRock_Fork_MapWarps: @ 853DAB8 +NavelRock_Fork_MapWarps: warp_def 4, 6, 3, 0, MAP_NAVEL_ROCK_UP1 warp_def 11, 79, 3, 1, MAP_NAVEL_ROCK_B1F warp_def 22, 6, 3, 0, MAP_NAVEL_ROCK_DOWN01 -NavelRock_Fork_MapEvents:: @ 853DAD0 +NavelRock_Fork_MapEvents:: map_events 0x0, NavelRock_Fork_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Fork/header.inc b/data/maps/NavelRock_Fork/header.inc index 49087db7e..01e4f7bcc 100644 --- a/data/maps/NavelRock_Fork/header.inc +++ b/data/maps/NavelRock_Fork/header.inc @@ -1,10 +1,10 @@ -NavelRock_Fork: @ 84858E4 +NavelRock_Fork: .4byte NavelRock_Fork_Layout .4byte NavelRock_Fork_MapEvents .4byte NavelRock_Fork_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 428 + .2byte LAYOUT_NAVEL_ROCK_FORK .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Harbor/events.inc b/data/maps/NavelRock_Harbor/events.inc index b5a299572..0c687f1fc 100644 --- a/data/maps/NavelRock_Harbor/events.inc +++ b/data/maps/NavelRock_Harbor/events.inc @@ -1,10 +1,10 @@ -NavelRock_Harbor_EventObjects: @ 853DA24 +NavelRock_Harbor_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 8, 5, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 7, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 -NavelRock_Harbor_MapWarps: @ 853DA54 +NavelRock_Harbor_MapWarps: warp_def 8, 2, 0, 0, MAP_NAVEL_ROCK_EXTERIOR -NavelRock_Harbor_MapEvents:: @ 853DA5C +NavelRock_Harbor_MapEvents:: map_events NavelRock_Harbor_EventObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Harbor/header.inc b/data/maps/NavelRock_Harbor/header.inc index 1df05a2bc..2af7e6e35 100644 --- a/data/maps/NavelRock_Harbor/header.inc +++ b/data/maps/NavelRock_Harbor/header.inc @@ -1,10 +1,10 @@ -NavelRock_Harbor: @ 8485890 +NavelRock_Harbor: .4byte IslandHarbor_Layout .4byte NavelRock_Harbor_MapEvents .4byte NavelRock_Harbor_MapScripts .4byte 0x0 .2byte MUS_RG_NANASHIMA - .2byte 405 + .2byte LAYOUT_ISLAND_HARBOR .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Top/events.inc b/data/maps/NavelRock_Top/events.inc index 0952b0f67..7ba534d02 100644 --- a/data/maps/NavelRock_Top/events.inc +++ b/data/maps/NavelRock_Top/events.inc @@ -1,15 +1,15 @@ -NavelRock_Top_EventObjects: @ 853DB74 +NavelRock_Top_EventObjects: object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_HO_OH -NavelRock_Top_MapWarps: @ 853DB8C +NavelRock_Top_MapWarps: warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4 -NavelRock_Top_MapCoordEvents: @ 853DB94 +NavelRock_Top_MapCoordEvents: coord_event 12, 10, 3, VAR_TEMP_1, 0, NavelRock_Top_EventScript_26916F -NavelRock_Top_MapBGEvents: @ 853DBA4 +NavelRock_Top_MapBGEvents: bg_hidden_item_event 12, 9, 3, ITEM_SACRED_ASH, FLAG_HIDDEN_ITEM_NAVEL_ROCK_TOP_SACRED_ASH -NavelRock_Top_MapEvents:: @ 853DBB0 +NavelRock_Top_MapEvents:: map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents diff --git a/data/maps/NavelRock_Top/header.inc b/data/maps/NavelRock_Top/header.inc index e99a64054..6e8acfce8 100644 --- a/data/maps/NavelRock_Top/header.inc +++ b/data/maps/NavelRock_Top/header.inc @@ -1,10 +1,10 @@ -NavelRock_Top: @ 8485970 +NavelRock_Top: .4byte NavelRock_Top_Layout .4byte NavelRock_Top_MapEvents .4byte NavelRock_Top_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 423 + .2byte LAYOUT_NAVEL_ROCK_TOP .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/NavelRock_Up1/events.inc b/data/maps/NavelRock_Up1/events.inc index fd0741a6a..c0dba5dd3 100644 --- a/data/maps/NavelRock_Up1/events.inc +++ b/data/maps/NavelRock_Up1/events.inc @@ -1,7 +1,7 @@ -NavelRock_Up1_MapWarps: @ 853DAE4 +NavelRock_Up1_MapWarps: warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_FORK warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP2 -NavelRock_Up1_MapEvents:: @ 853DAF4 +NavelRock_Up1_MapEvents:: map_events 0x0, NavelRock_Up1_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Up1/header.inc b/data/maps/NavelRock_Up1/header.inc index 33266d8f0..2ddaf1dcc 100644 --- a/data/maps/NavelRock_Up1/header.inc +++ b/data/maps/NavelRock_Up1/header.inc @@ -1,10 +1,10 @@ -NavelRock_Up1: @ 8485900 +NavelRock_Up1: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Up1_MapEvents .4byte NavelRock_Up1_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Up2/events.inc b/data/maps/NavelRock_Up2/events.inc index bd142b997..8d6f64dbc 100644 --- a/data/maps/NavelRock_Up2/events.inc +++ b/data/maps/NavelRock_Up2/events.inc @@ -1,7 +1,7 @@ -NavelRock_Up2_MapWarps: @ 853DB08 +NavelRock_Up2_MapWarps: warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP1 warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_UP3 -NavelRock_Up2_MapEvents:: @ 853DB18 +NavelRock_Up2_MapEvents:: map_events 0x0, NavelRock_Up2_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Up2/header.inc b/data/maps/NavelRock_Up2/header.inc index f93dc31ed..68fe366f2 100644 --- a/data/maps/NavelRock_Up2/header.inc +++ b/data/maps/NavelRock_Up2/header.inc @@ -1,10 +1,10 @@ -NavelRock_Up2: @ 848591C +NavelRock_Up2: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Up2_MapEvents .4byte NavelRock_Up2_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Up3/events.inc b/data/maps/NavelRock_Up3/events.inc index 9491e5dac..3853f75c7 100644 --- a/data/maps/NavelRock_Up3/events.inc +++ b/data/maps/NavelRock_Up3/events.inc @@ -1,7 +1,7 @@ -NavelRock_Up3_MapWarps: @ 853DB2C +NavelRock_Up3_MapWarps: warp_def 5, 5, 3, 1, MAP_NAVEL_ROCK_UP2 warp_def 3, 3, 3, 0, MAP_NAVEL_ROCK_UP4 -NavelRock_Up3_MapEvents:: @ 853DB3C +NavelRock_Up3_MapEvents:: map_events 0x0, NavelRock_Up3_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Up3/header.inc b/data/maps/NavelRock_Up3/header.inc index d816e58f1..b357349b7 100644 --- a/data/maps/NavelRock_Up3/header.inc +++ b/data/maps/NavelRock_Up3/header.inc @@ -1,10 +1,10 @@ -NavelRock_Up3: @ 8485938 +NavelRock_Up3: .4byte NavelRock_LadderRoom1_Layout .4byte NavelRock_Up3_MapEvents .4byte NavelRock_Up3_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 425 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM1 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NavelRock_Up4/events.inc b/data/maps/NavelRock_Up4/events.inc index 3d81f1523..449e1f29d 100644 --- a/data/maps/NavelRock_Up4/events.inc +++ b/data/maps/NavelRock_Up4/events.inc @@ -1,7 +1,7 @@ -NavelRock_Up4_MapWarps: @ 853DB50 +NavelRock_Up4_MapWarps: warp_def 3, 3, 3, 1, MAP_NAVEL_ROCK_UP3 warp_def 5, 5, 3, 0, MAP_NAVEL_ROCK_TOP -NavelRock_Up4_MapEvents:: @ 853DB60 +NavelRock_Up4_MapEvents:: map_events 0x0, NavelRock_Up4_MapWarps, 0x0, 0x0 diff --git a/data/maps/NavelRock_Up4/header.inc b/data/maps/NavelRock_Up4/header.inc index 583c672b4..4c44746f0 100644 --- a/data/maps/NavelRock_Up4/header.inc +++ b/data/maps/NavelRock_Up4/header.inc @@ -1,10 +1,10 @@ -NavelRock_Up4: @ 8485954 +NavelRock_Up4: .4byte NavelRock_LadderRoom2_Layout .4byte NavelRock_Up4_MapEvents .4byte NavelRock_Up4_MapScripts .4byte 0x0 .2byte MUS_RG_NANADUNGEON - .2byte 426 + .2byte LAYOUT_NAVEL_ROCK_LADDER_ROOM2 .byte MAPSEC_NAVEL_ROCK2 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NewMauville_Entrance/events.inc b/data/maps/NewMauville_Entrance/events.inc index 4c333f6b3..d230fc4e9 100644 --- a/data/maps/NewMauville_Entrance/events.inc +++ b/data/maps/NewMauville_Entrance/events.inc @@ -1,10 +1,10 @@ -NewMauville_Entrance_MapWarps: @ 8536474 +NewMauville_Entrance_MapWarps: warp_def 4, 6, 3, 0, MAP_ROUTE110 warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE -NewMauville_Entrance_MapCoordEvents: @ 8536484 +NewMauville_Entrance_MapCoordEvents: coord_event 4, 2, 3, VAR_0x40BA, 0, NewMauville_Entrance_EventScript_2372FF -NewMauville_Entrance_MapEvents:: @ 8536494 +NewMauville_Entrance_MapEvents:: map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index a8a1df296..c0b8938ca 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -1,10 +1,10 @@ -NewMauville_Entrance: @ 8484470 +NewMauville_Entrance: .4byte NewMauville_Entrance_Layout .4byte NewMauville_Entrance_MapEvents .4byte NewMauville_Entrance_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 184 + .2byte LAYOUT_NEW_MAUVILLE_ENTRANCE .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc index 568f4b22e..c366496f4 100644 --- a/data/maps/NewMauville_Inside/events.inc +++ b/data/maps/NewMauville_Inside/events.inc @@ -1,4 +1,4 @@ -NewMauville_Inside_EventObjects: @ 85364A8 +NewMauville_Inside_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, FLAG_ITEM_NEW_MAUVILLE_ESCAPE_ROPE object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_291206, FLAG_ITEM_NEW_MAUVILLE_THUNDER_STONE @@ -8,10 +8,10 @@ NewMauville_Inside_EventObjects: @ 85364A8 object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_2377FC, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_2 object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_237849, FLAG_HIDE_NEW_MAUVILLE_VOLTORB_3 -NewMauville_Inside_MapWarps: @ 8536568 +NewMauville_Inside_MapWarps: warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE -NewMauville_Inside_MapCoordEvents: @ 8536570 +NewMauville_Inside_MapCoordEvents: coord_event 30, 38, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 coord_event 18, 36, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 coord_event 4, 26, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_237459 @@ -23,7 +23,7 @@ NewMauville_Inside_MapCoordEvents: @ 8536570 coord_event 17, 10, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_237471 coord_event 33, 6, 3, VAR_0x40BA, 1, NewMauville_Inside_EventScript_237725 -NewMauville_Inside_MapBGEvents: @ 8536610 +NewMauville_Inside_MapBGEvents: bg_event 32, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F bg_event 32, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F bg_event 32, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F @@ -33,6 +33,6 @@ NewMauville_Inside_MapBGEvents: @ 8536610 bg_event 35, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F bg_event 35, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_23778F -NewMauville_Inside_MapEvents:: @ 8536670 +NewMauville_Inside_MapEvents:: map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 57966d38f..c4e736885 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -1,10 +1,10 @@ -NewMauville_Inside: @ 848448C +NewMauville_Inside: .4byte NewMauville_Inside_Layout .4byte NewMauville_Inside_MapEvents .4byte NewMauville_Inside_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 185 + .2byte LAYOUT_NEW_MAUVILLE_INSIDE .byte MAPSEC_NEW_MAUVILLE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/OldaleTown/connections.inc b/data/maps/OldaleTown/connections.inc index db0232f83..a82523c9c 100644 --- a/data/maps/OldaleTown/connections.inc +++ b/data/maps/OldaleTown/connections.inc @@ -1,9 +1,9 @@ -OldaleTown_MapConnectionsList: @ 8486614 +OldaleTown_MapConnectionsList: connection up, 0, MAP_ROUTE103 connection down, 0, MAP_ROUTE101 connection left, 0, MAP_ROUTE102 -OldaleTown_MapConnections: @ 8486638 - .4byte 0x3 +OldaleTown_MapConnections: + .4byte 3 .4byte OldaleTown_MapConnectionsList diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc index a3bc51483..aa56e67f6 100644 --- a/data/maps/OldaleTown/events.inc +++ b/data/maps/OldaleTown/events.inc @@ -1,28 +1,28 @@ -OldaleTown_EventObjects: @ 8527854 +OldaleTown_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0 object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0 object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0 object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, OldaleTown_EventScript_1E9070, FLAG_HIDE_OLDALE_TOWN_RIVAL -OldaleTown_MapWarps: @ 85278B4 +OldaleTown_MapWarps: warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 warp_def 15, 16, 0, 0, MAP_OLDALE_TOWN_HOUSE2 warp_def 6, 16, 0, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_1F warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART -OldaleTown_MapCoordEvents: @ 85278D4 +OldaleTown_MapCoordEvents: coord_event 0, 10, 3, VAR_0x4051, 0, OldaleTown_EventScript_1E903F coord_event 8, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E9086 coord_event 9, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E90A6 coord_event 10, 19, 3, VAR_0x40C7, 1, OldaleTown_EventScript_1E90C6 -OldaleTown_MapBGEvents: @ 8527914 +OldaleTown_MapBGEvents: bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, OldaleTown_EventScript_1E8EEA bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E73 bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E6A bg_event 8, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E73 bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_271E6A -OldaleTown_MapEvents:: @ 8527950 +OldaleTown_MapEvents:: map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 83f3624dc..30025e1f1 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -1,10 +1,10 @@ -OldaleTown: @ 84825D0 +OldaleTown: .4byte OldaleTown_Layout .4byte OldaleTown_MapEvents .4byte OldaleTown_MapScripts .4byte OldaleTown_MapConnections .2byte MUS_MACHI_S4 - .2byte 11 + .2byte LAYOUT_OLDALE_TOWN .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/OldaleTown_House1/events.inc b/data/maps/OldaleTown_House1/events.inc index 7183f9293..8fc37079c 100644 --- a/data/maps/OldaleTown_House1/events.inc +++ b/data/maps/OldaleTown_House1/events.inc @@ -1,10 +1,10 @@ -OldaleTown_House1_EventObjects: @ 852D7B4 +OldaleTown_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0 -OldaleTown_House1_MapWarps: @ 852D7CC +OldaleTown_House1_MapWarps: warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN -OldaleTown_House1_MapEvents:: @ 852D7DC +OldaleTown_House1_MapEvents:: map_events OldaleTown_House1_EventObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index 6444d83c4..7dc2d6b70 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -1,10 +1,10 @@ -OldaleTown_House1: @ 8482B80 +OldaleTown_House1: .4byte House1_Layout .4byte OldaleTown_House1_MapEvents .4byte OldaleTown_House1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S4 - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/OldaleTown_House2/events.inc b/data/maps/OldaleTown_House2/events.inc index 7e94a2356..45678ebb8 100644 --- a/data/maps/OldaleTown_House2/events.inc +++ b/data/maps/OldaleTown_House2/events.inc @@ -1,11 +1,11 @@ -OldaleTown_House2_EventObjects: @ 852D7F0 +OldaleTown_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0 -OldaleTown_House2_MapWarps: @ 852D820 +OldaleTown_House2_MapWarps: warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN -OldaleTown_House2_MapEvents:: @ 852D830 +OldaleTown_House2_MapEvents:: map_events OldaleTown_House2_EventObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 0df8e3c0e..4ae5e078c 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -1,10 +1,10 @@ -OldaleTown_House2: @ 8482B9C +OldaleTown_House2: .4byte House2_Layout .4byte OldaleTown_House2_MapEvents .4byte OldaleTown_House2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S4 - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/OldaleTown_Mart/events.inc b/data/maps/OldaleTown_Mart/events.inc index 22b308364..2d29aedba 100644 --- a/data/maps/OldaleTown_Mart/events.inc +++ b/data/maps/OldaleTown_Mart/events.inc @@ -1,12 +1,12 @@ -OldaleTown_Mart_EventObjects: @ 852D95C +OldaleTown_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0 -OldaleTown_Mart_MapWarps: @ 852D9A4 +OldaleTown_Mart_MapWarps: warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN -OldaleTown_Mart_MapEvents:: @ 852D9B4 +OldaleTown_Mart_MapEvents:: map_events OldaleTown_Mart_EventObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index df506157b..a371273bd 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -1,10 +1,10 @@ -OldaleTown_Mart: @ 8482BF0 +OldaleTown_Mart: .4byte Mart_Layout .4byte OldaleTown_Mart_MapEvents .4byte OldaleTown_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/OldaleTown_PokemonCenter_1F/events.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc index ba50faea9..f05c854b4 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/events.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -OldaleTown_PokemonCenter_1F_EventObjects: @ 852D844 +OldaleTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0 object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0 -OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4 +OldaleTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN warp_def 6, 8, 3, 2, MAP_OLDALE_TOWN warp_def 1, 6, 4, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_2F -OldaleTown_PokemonCenter_1F_MapEvents:: @ 852D8BC +OldaleTown_PokemonCenter_1F_MapEvents:: map_events OldaleTown_PokemonCenter_1F_EventObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index 250f5d164..394ca4969 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -OldaleTown_PokemonCenter_1F: @ 8482BB8 +OldaleTown_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte OldaleTown_PokemonCenter_1F_MapEvents .4byte OldaleTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/OldaleTown_PokemonCenter_2F/events.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc index 34f343eb4..2f155ed57 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/events.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -OldaleTown_PokemonCenter_2F_EventObjects: @ 852D8D0 +OldaleTown_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930 +OldaleTown_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -OldaleTown_PokemonCenter_2F_MapEvents:: @ 852D948 +OldaleTown_PokemonCenter_2F_MapEvents:: map_events OldaleTown_PokemonCenter_2F_EventObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 1562c900f..33437b863 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -OldaleTown_PokemonCenter_2F: @ 8482BD4 +OldaleTown_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte OldaleTown_PokemonCenter_2F_MapEvents .4byte OldaleTown_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_OLDALE_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown/connections.inc b/data/maps/PacifidlogTown/connections.inc index 5c84301bf..bea3619dd 100644 --- a/data/maps/PacifidlogTown/connections.inc +++ b/data/maps/PacifidlogTown/connections.inc @@ -1,8 +1,8 @@ -PacifidlogTown_MapConnectionsList: @ 84866B4 +PacifidlogTown_MapConnectionsList: connection left, 0, MAP_ROUTE132 connection right, 0, MAP_ROUTE131 -PacifidlogTown_MapConnections: @ 84866CC - .4byte 0x2 +PacifidlogTown_MapConnections: + .4byte 2 .4byte PacifidlogTown_MapConnectionsList diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc index f73c1d14a..2754afc4d 100644 --- a/data/maps/PacifidlogTown/events.inc +++ b/data/maps/PacifidlogTown/events.inc @@ -1,9 +1,9 @@ -PacifidlogTown_EventObjects: @ 8527DE8 +PacifidlogTown_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0 object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0 object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0 -PacifidlogTown_MapWarps: @ 8527E30 +PacifidlogTown_MapWarps: warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F warp_def 16, 13, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE1 warp_def 3, 22, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE2 @@ -11,11 +11,11 @@ PacifidlogTown_MapWarps: @ 8527E30 warp_def 2, 12, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE4 warp_def 17, 21, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE5 -PacifidlogTown_MapBGEvents: @ 8527E60 +PacifidlogTown_MapBGEvents: bg_event 9, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_271E73 bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PacifidlogTown_EventScript_1EBADE bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_271E73 -PacifidlogTown_MapEvents:: @ 8527E84 +PacifidlogTown_MapEvents:: map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index 786fa9d71..0232c0613 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown: @ 848265C +PacifidlogTown: .4byte PacifidlogTown_Layout .4byte PacifidlogTown_MapEvents .4byte PacifidlogTown_MapScripts .4byte PacifidlogTown_MapConnections .2byte MUS_MINAMO - .2byte 16 + .2byte LAYOUT_PACIFIDLOG_TOWN .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/PacifidlogTown_House1/events.inc b/data/maps/PacifidlogTown_House1/events.inc index ac082b74a..3b5b06af7 100644 --- a/data/maps/PacifidlogTown_House1/events.inc +++ b/data/maps/PacifidlogTown_House1/events.inc @@ -1,11 +1,11 @@ -PacifidlogTown_House1_EventObjects: @ 852EBA0 +PacifidlogTown_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0 -PacifidlogTown_House1_MapWarps: @ 852EBD0 +PacifidlogTown_House1_MapWarps: warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN -PacifidlogTown_House1_MapEvents:: @ 852EBE0 +PacifidlogTown_House1_MapEvents:: map_events PacifidlogTown_House1_EventObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index a4f350e06..53a3499ce 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_House1: @ 8482F8C +PacifidlogTown_House1: .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House1_MapEvents .4byte PacifidlogTown_House1_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 77 + .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE1 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown_House2/events.inc b/data/maps/PacifidlogTown_House2/events.inc index fae916c73..5a521ab4b 100644 --- a/data/maps/PacifidlogTown_House2/events.inc +++ b/data/maps/PacifidlogTown_House2/events.inc @@ -1,12 +1,12 @@ -PacifidlogTown_House2_EventObjects: @ 852EBF4 +PacifidlogTown_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203792, 0 object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_203891, 0 object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0 -PacifidlogTown_House2_MapWarps: @ 852EC3C +PacifidlogTown_House2_MapWarps: warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN -PacifidlogTown_House2_MapEvents:: @ 852EC4C +PacifidlogTown_House2_MapEvents:: map_events PacifidlogTown_House2_EventObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index 8a3e0ada4..f41349ba5 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_House2: @ 8482FA8 +PacifidlogTown_House2: .4byte PacifidlogTown_House2_Layout .4byte PacifidlogTown_House2_MapEvents .4byte PacifidlogTown_House2_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 78 + .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE2 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown_House3/events.inc b/data/maps/PacifidlogTown_House3/events.inc index 30460329a..7f18a831e 100644 --- a/data/maps/PacifidlogTown_House3/events.inc +++ b/data/maps/PacifidlogTown_House3/events.inc @@ -1,11 +1,11 @@ -PacifidlogTown_House3_EventObjects: @ 852EC60 +PacifidlogTown_House3_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0 -PacifidlogTown_House3_MapWarps: @ 852EC90 +PacifidlogTown_House3_MapWarps: warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN -PacifidlogTown_House3_MapEvents:: @ 852ECA0 +PacifidlogTown_House3_MapEvents:: map_events PacifidlogTown_House3_EventObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index ed538fa8b..9f6286b13 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_House3: @ 8482FC4 +PacifidlogTown_House3: .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House3_MapEvents .4byte PacifidlogTown_House3_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 77 + .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE1 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown_House4/events.inc b/data/maps/PacifidlogTown_House4/events.inc index 740cc4ba3..ed736434f 100644 --- a/data/maps/PacifidlogTown_House4/events.inc +++ b/data/maps/PacifidlogTown_House4/events.inc @@ -1,12 +1,12 @@ -PacifidlogTown_House4_EventObjects: @ 852ECB4 +PacifidlogTown_House4_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0 -PacifidlogTown_House4_MapWarps: @ 852ECFC +PacifidlogTown_House4_MapWarps: warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN -PacifidlogTown_House4_MapEvents:: @ 852ED0C +PacifidlogTown_House4_MapEvents:: map_events PacifidlogTown_House4_EventObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index 7108a0104..ff9240d0d 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_House4: @ 8482FE0 +PacifidlogTown_House4: .4byte PacifidlogTown_House2_Layout .4byte PacifidlogTown_House4_MapEvents .4byte PacifidlogTown_House4_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 78 + .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE2 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown_House5/events.inc b/data/maps/PacifidlogTown_House5/events.inc index 8d7f0b0c0..d3e00938a 100644 --- a/data/maps/PacifidlogTown_House5/events.inc +++ b/data/maps/PacifidlogTown_House5/events.inc @@ -1,11 +1,11 @@ -PacifidlogTown_House5_EventObjects: @ 852ED20 +PacifidlogTown_House5_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0 -PacifidlogTown_House5_MapWarps: @ 852ED50 +PacifidlogTown_House5_MapWarps: warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN -PacifidlogTown_House5_MapEvents:: @ 852ED60 +PacifidlogTown_House5_MapEvents:: map_events PacifidlogTown_House5_EventObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index 07da6a24d..a70ac3992 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_House5: @ 8482FFC +PacifidlogTown_House5: .4byte PacifidlogTown_House1_Layout .4byte PacifidlogTown_House5_MapEvents .4byte PacifidlogTown_House5_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 77 + .2byte LAYOUT_PACIFIDLOG_TOWN_HOUSE1 .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc index 80c8a8c71..edc6e916f 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc @@ -1,15 +1,15 @@ -PacifidlogTown_PokemonCenter_1F_EventObjects: @ 852EA70 +PacifidlogTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0 object_event 2, EVENT_OBJ_GFX_OLD_MAN, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0 object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0 object_event 5, EVENT_OBJ_GFX_MAN_5, 0, 12, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0 -PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8 +PacifidlogTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN warp_def 6, 8, 3, 0, MAP_PACIFIDLOG_TOWN warp_def 1, 6, 4, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F -PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 852EB00 +PacifidlogTown_PokemonCenter_1F_MapEvents:: map_events PacifidlogTown_PokemonCenter_1F_EventObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index 9db47a72b..39135ef6a 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_PokemonCenter_1F: @ 8482F54 +PacifidlogTown_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte PacifidlogTown_PokemonCenter_1F_MapEvents .4byte PacifidlogTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc index d41f1fa71..1d0e1a449 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -PacifidlogTown_PokemonCenter_2F_EventObjects: @ 852EB14 +PacifidlogTown_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74 +PacifidlogTown_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 852EB8C +PacifidlogTown_PokemonCenter_2F_MapEvents:: map_events PacifidlogTown_PokemonCenter_2F_EventObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index e16d7b5e5..a6c1609d3 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -PacifidlogTown_PokemonCenter_2F: @ 8482F70 +PacifidlogTown_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte PacifidlogTown_PokemonCenter_2F_MapEvents .4byte PacifidlogTown_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity/connections.inc b/data/maps/PetalburgCity/connections.inc index 96bd6cbce..0c576c79f 100644 --- a/data/maps/PetalburgCity/connections.inc +++ b/data/maps/PetalburgCity/connections.inc @@ -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 diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc index 10d85c939..83b3d227e 100644 --- a/data/maps/PetalburgCity/events.inc +++ b/data/maps/PetalburgCity/events.inc @@ -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 diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index 5cf3cc6e1..4aafc87a6 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -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 diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc index 4c75dc7f6..81b244f2e 100644 --- a/data/maps/PetalburgCity_Gym/events.inc +++ b/data/maps/PetalburgCity_Gym/events.inc @@ -1,4 +1,4 @@ -PetalburgCity_Gym_EventObjects: @ 852EDC8 +PetalburgCity_Gym_EventObjects: object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, FLAG_HIDE_PETALYBURG_GYM_NORMAN object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 94, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 4, 81, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0 @@ -11,7 +11,7 @@ PetalburgCity_Gym_EventObjects: @ 852EDC8 object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_GYM_WALLY object_event 11, EVENT_OBJ_GFX_POKEFAN_M, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE -PetalburgCity_Gym_MapWarps: @ 852EED0 +PetalburgCity_Gym_MapWarps: warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY warp_def 5, 111, 3, 2, MAP_PETALBURG_CITY warp_def 1, 105, 3, 3, MAP_PETALBURG_CITY_GYM @@ -51,7 +51,7 @@ PetalburgCity_Gym_MapWarps: @ 852EED0 warp_def 7, 7, 3, 33, MAP_PETALBURG_CITY_GYM warp_def 6, 7, 3, 33, MAP_PETALBURG_CITY_GYM -PetalburgCity_Gym_MapBGEvents: @ 852F000 +PetalburgCity_Gym_MapBGEvents: bg_event 1, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205137 bg_event 7, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_205187 bg_event 1, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_2051BC @@ -67,6 +67,6 @@ PetalburgCity_Gym_MapBGEvents: @ 852F000 bg_event 1, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_20576E bg_event 7, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_20577E -PetalburgCity_Gym_MapEvents:: @ 852F0A8 +PetalburgCity_Gym_MapEvents:: map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 626f37c3d..d58d30b90 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_Gym: @ 8483034 +PetalburgCity_Gym: .4byte PetalburgCity_Gym_Layout .4byte PetalburgCity_Gym_MapEvents .4byte PetalburgCity_Gym_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 79 + .2byte LAYOUT_PETALBURG_CITY_GYM .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity_House1/events.inc b/data/maps/PetalburgCity_House1/events.inc index bcb91e637..9a22e581d 100644 --- a/data/maps/PetalburgCity_House1/events.inc +++ b/data/maps/PetalburgCity_House1/events.inc @@ -1,11 +1,11 @@ -PetalburgCity_House1_EventObjects: @ 852F0BC +PetalburgCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0 -PetalburgCity_House1_MapWarps: @ 852F0EC +PetalburgCity_House1_MapWarps: warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY -PetalburgCity_House1_MapEvents:: @ 852F0FC +PetalburgCity_House1_MapEvents:: map_events PetalburgCity_House1_EventObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 058d2ae6b..7582e6336 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_House1: @ 8483050 +PetalburgCity_House1: .4byte House1_Layout .4byte PetalburgCity_House1_MapEvents .4byte PetalburgCity_House1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S2 - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity_House2/events.inc b/data/maps/PetalburgCity_House2/events.inc index 660f1efe3..cc964b56c 100644 --- a/data/maps/PetalburgCity_House2/events.inc +++ b/data/maps/PetalburgCity_House2/events.inc @@ -1,11 +1,11 @@ -PetalburgCity_House2_EventObjects: @ 852F110 +PetalburgCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0 -PetalburgCity_House2_MapWarps: @ 852F140 +PetalburgCity_House2_MapWarps: warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY -PetalburgCity_House2_MapEvents:: @ 852F150 +PetalburgCity_House2_MapEvents:: map_events PetalburgCity_House2_EventObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index d8ceeafbe..36eb663c0 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_House2: @ 848306C +PetalburgCity_House2: .4byte HouseWithBed_Layout .4byte PetalburgCity_House2_MapEvents .4byte PetalburgCity_House2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S2 - .2byte 80 + .2byte LAYOUT_HOUSE_WITH_BED .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity_Mart/events.inc b/data/maps/PetalburgCity_Mart/events.inc index b79aa5cb0..9cb05df7d 100644 --- a/data/maps/PetalburgCity_Mart/events.inc +++ b/data/maps/PetalburgCity_Mart/events.inc @@ -1,13 +1,13 @@ -PetalburgCity_Mart_EventObjects: @ 852F294 +PetalburgCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0 -PetalburgCity_Mart_MapWarps: @ 852F2F4 +PetalburgCity_Mart_MapWarps: warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY -PetalburgCity_Mart_MapEvents:: @ 852F304 +PetalburgCity_Mart_MapEvents:: map_events PetalburgCity_Mart_EventObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index 757430cab..e95fb3553 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_Mart: @ 84830C0 +PetalburgCity_Mart: .4byte Mart_Layout .4byte PetalburgCity_Mart_MapEvents .4byte PetalburgCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc index 8a1de856d..de02c8a8e 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc @@ -1,15 +1,15 @@ -PetalburgCity_PokemonCenter_1F_EventObjects: @ 852F164 +PetalburgCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0 object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0 object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0 -PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC +PetalburgCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY warp_def 6, 8, 3, 3, MAP_PETALBURG_CITY warp_def 1, 6, 4, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_2F -PetalburgCity_PokemonCenter_1F_MapEvents:: @ 852F1F4 +PetalburgCity_PokemonCenter_1F_MapEvents:: map_events PetalburgCity_PokemonCenter_1F_EventObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 61b328753..08ec4783f 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_PokemonCenter_1F: @ 8483088 +PetalburgCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte PetalburgCity_PokemonCenter_1F_MapEvents .4byte PetalburgCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc index 08bd8f524..49514363b 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -PetalburgCity_PokemonCenter_2F_EventObjects: @ 852F208 +PetalburgCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268 +PetalburgCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -PetalburgCity_PokemonCenter_2F_MapEvents:: @ 852F280 +PetalburgCity_PokemonCenter_2F_MapEvents:: map_events PetalburgCity_PokemonCenter_2F_EventObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index c6cacfc3a..779a106b9 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_PokemonCenter_2F: @ 84830A4 +PetalburgCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte PetalburgCity_PokemonCenter_2F_MapEvents .4byte PetalburgCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgCity_WallysHouse/events.inc b/data/maps/PetalburgCity_WallysHouse/events.inc index e30f3a487..98487bd2c 100644 --- a/data/maps/PetalburgCity_WallysHouse/events.inc +++ b/data/maps/PetalburgCity_WallysHouse/events.inc @@ -1,11 +1,11 @@ -PetalburgCity_WallysHouse_EventObjects: @ 852ED74 +PetalburgCity_WallysHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0 -PetalburgCity_WallysHouse_MapWarps: @ 852EDA4 +PetalburgCity_WallysHouse_MapWarps: warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY -PetalburgCity_WallysHouse_MapEvents:: @ 852EDB4 +PetalburgCity_WallysHouse_MapEvents:: map_events PetalburgCity_WallysHouse_EventObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 04b723666..2c49b77f6 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -1,10 +1,10 @@ -PetalburgCity_WallysHouse: @ 8483018 +PetalburgCity_WallysHouse: .4byte House2_Layout .4byte PetalburgCity_WallysHouse_MapEvents .4byte PetalburgCity_WallysHouse_MapScripts .4byte 0x0 .2byte MUS_MACHI_S2 - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_PETALBURG_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc index b64e38885..95326cedf 100644 --- a/data/maps/PetalburgWoods/events.inc +++ b/data/maps/PetalburgWoods/events.inc @@ -1,4 +1,4 @@ -PetalburgWoods_EventObjects: @ 85345E4 +PetalburgWoods_EventObjects: object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, FLAG_TEMP_12 object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 26, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_PETALBURG_WOODS_AQUA_GRUNT @@ -13,7 +13,7 @@ PetalburgWoods_EventObjects: @ 85345E4 object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_291129, FLAG_ITEM_PETALBURD_WOODS_PARALYZE_HEAL object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_22E222, 0 -PetalburgWoods_MapWarps: @ 853471C +PetalburgWoods_MapWarps: warp_def 14, 5, 0, 2, MAP_ROUTE104 warp_def 15, 5, 0, 3, MAP_ROUTE104 warp_def 16, 38, 0, 4, MAP_ROUTE104 @@ -21,11 +21,11 @@ PetalburgWoods_MapWarps: @ 853471C warp_def 36, 38, 0, 6, MAP_ROUTE104 warp_def 37, 38, 0, 7, MAP_ROUTE104 -PetalburgWoods_MapCoordEvents: @ 853474C +PetalburgWoods_MapCoordEvents: coord_event 26, 23, 3, VAR_0x4098, 0, PetalburgWoods_EventScript_22DFD7 coord_event 27, 23, 3, VAR_0x4098, 0, PetalburgWoods_EventScript_22E079 -PetalburgWoods_MapBGEvents: @ 853476C +PetalburgWoods_MapBGEvents: bg_event 14, 32, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E25B bg_hidden_item_event 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POTION bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_TINY_MUSHROOM_1 @@ -33,6 +33,6 @@ PetalburgWoods_MapBGEvents: @ 853476C bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_PETALBURG_WOODS_POKE_BALL bg_event 11, 8, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_22E264 -PetalburgWoods_MapEvents:: @ 85347B4 +PetalburgWoods_MapEvents:: map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index e25f6f750..530c2f2aa 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -1,10 +1,10 @@ -PetalburgWoods: @ 8483FF4 +PetalburgWoods: .4byte PetalburgWoods_Layout .4byte PetalburgWoods_MapEvents .4byte PetalburgWoods_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 135 + .2byte LAYOUT_PETALBURG_WOODS .byte MAPSEC_PETALBURG_WOODS .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc index 06c6588a9..44829f60d 100644 --- a/data/maps/RecordCorner/events.inc +++ b/data/maps/RecordCorner/events.inc @@ -1,18 +1,18 @@ -RecordCorner_EventObjects: @ 8539DFC +RecordCorner_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0 -RecordCorner_MapWarps: @ 8539E14 +RecordCorner_MapWarps: warp_def 8, 9, 3, 127, MAP_NONE warp_def 9, 9, 3, 127, MAP_NONE warp_def 11, 9, 3, 127, MAP_NONE warp_def 10, 9, 3, 127, MAP_NONE -RecordCorner_MapCoordEvents: @ 8539E34 +RecordCorner_MapCoordEvents: coord_event 6, 4, 3, VAR_TEMP_0, 0, gUnknown_0827741D coord_event 6, 6, 3, VAR_TEMP_0, 0, gUnknown_08277447 coord_event 13, 4, 3, VAR_TEMP_0, 0, gUnknown_08277432 coord_event 13, 6, 3, VAR_TEMP_0, 0, gUnknown_0827745C -RecordCorner_MapEvents:: @ 8539E74 +RecordCorner_MapEvents:: map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index c0864092b..0a3254abd 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -1,10 +1,10 @@ -RecordCorner: @ 8484D68 +RecordCorner: .4byte RecordCorner_Layout .4byte RecordCorner_MapEvents .4byte RecordCorner_MapScripts .4byte 0x0 .2byte MUS_RAINBOW - .2byte 223 + .2byte LAYOUT_RECORD_CORNER .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route101/connections.inc b/data/maps/Route101/connections.inc index f5f35e974..32ee511a8 100644 --- a/data/maps/Route101/connections.inc +++ b/data/maps/Route101/connections.inc @@ -1,8 +1,8 @@ -Route101_MapConnectionsList: @ 848680C +Route101_MapConnectionsList: connection up, 0, MAP_OLDALE_TOWN connection down, 0, MAP_LITTLEROOT_TOWN -Route101_MapConnections: @ 8486824 - .4byte 0x2 +Route101_MapConnections: + .4byte 2 .4byte Route101_MapConnectionsList diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc index 77ee2848f..b14649cc0 100644 --- a/data/maps/Route101/events.inc +++ b/data/maps/Route101/events.inc @@ -1,4 +1,4 @@ -Route101_EventObjects: @ 8527E98 +Route101_EventObjects: object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0 object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_101_BIRCH_ZIGZAGOON_BATTLE object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1EBE16, FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG @@ -6,7 +6,7 @@ Route101_EventObjects: @ 8527E98 object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_272141, FLAG_HIDE_ROUTE_101_BIRCH object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_1EBE04, FLAG_HIDE_ROUTE_101_BOY -Route101_MapCoordEvents: @ 8527F28 +Route101_MapCoordEvents: coord_event 10, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE coord_event 11, 19, 3, VAR_0x4060, 1, Route101_EventScript_1EBCDE coord_event 10, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD4E @@ -17,9 +17,9 @@ Route101_MapCoordEvents: @ 8527F28 coord_event 6, 18, 3, VAR_0x4060, 2, Route101_EventScript_1EBD64 coord_event 7, 13, 3, VAR_0x4060, 2, Route101_EventScript_1EBD7A -Route101_MapBGEvents: @ 8527FB8 +Route101_MapBGEvents: bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route101_EventScript_1EBE0D -Route101_MapEvents:: @ 8527FC4 +Route101_MapEvents:: map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index 5a98f7e22..b40de8df9 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -1,10 +1,10 @@ -Route101: @ 8482678 +Route101: .4byte Route101_Layout .4byte Route101_MapEvents .4byte Route101_MapScripts .4byte Route101_MapConnections .2byte MUS_DOORO1 - .2byte 17 + .2byte LAYOUT_ROUTE101 .byte MAPSEC_ROUTE_101 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route102/connections.inc b/data/maps/Route102/connections.inc index 419cfeec9..1b76d47f5 100644 --- a/data/maps/Route102/connections.inc +++ b/data/maps/Route102/connections.inc @@ -1,8 +1,8 @@ -Route102_MapConnectionsList: @ 848682C +Route102_MapConnectionsList: connection left, -10, MAP_PETALBURG_CITY connection right, 0, MAP_OLDALE_TOWN -Route102_MapConnections: @ 8486844 - .4byte 0x2 +Route102_MapConnections: + .4byte 2 .4byte Route102_MapConnectionsList diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc index b2299feea..65acbee41 100644 --- a/data/maps/Route102/events.inc +++ b/data/maps/Route102/events.inc @@ -1,4 +1,4 @@ -Route102_EventObjects: @ 8527FD8 +Route102_EventObjects: object_event 1, EVENT_OBJ_GFX_LITTLE_BOY, 0, 18, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0 object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route102_EventScript_1EC105, 0 object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0 @@ -9,10 +9,10 @@ Route102_EventObjects: @ 8527FD8 object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 1, BerryTreeScript, 0 object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_1EC1E1, 0 -Route102_MapBGEvents: @ 85280B0 +Route102_MapBGEvents: bg_event 17, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0F3 bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_1EC0EA -Route102_MapEvents:: @ 85280C8 +Route102_MapEvents:: map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index 7a0fcacda..6b5c24b0c 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -1,10 +1,10 @@ -Route102: @ 8482694 +Route102: .4byte Route102_Layout .4byte Route102_MapEvents .4byte Route102_MapScripts .4byte Route102_MapConnections .2byte MUS_DOORO1 - .2byte 18 + .2byte LAYOUT_ROUTE102 .byte MAPSEC_ROUTE_102 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route103/connections.inc b/data/maps/Route103/connections.inc index 0759d872f..cff488cf2 100644 --- a/data/maps/Route103/connections.inc +++ b/data/maps/Route103/connections.inc @@ -1,8 +1,8 @@ -Route103_MapConnectionsList: @ 848684C +Route103_MapConnectionsList: connection down, 0, MAP_OLDALE_TOWN connection right, -60, MAP_ROUTE110 -Route103_MapConnections: @ 8486864 - .4byte 0x2 +Route103_MapConnections: + .4byte 2 .4byte Route103_MapConnectionsList diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc index 5a6cc8866..879412157 100644 --- a/data/maps/Route103/events.inc +++ b/data/maps/Route103/events.inc @@ -1,4 +1,4 @@ -Route103_EventObjects: @ 85280DC +Route103_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route103_EventScript_1EC3C1, FLAG_HIDE_ROUTE_103_RIVAL object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 71, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0 @@ -20,12 +20,12 @@ Route103_EventObjects: @ 85280DC object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 13, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route103_EventScript_1EC778, 0 object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 7, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_290CF2, FLAG_ITEM_ROUTE_103_PP_UP -Route103_MapWarps: @ 85282BC +Route103_MapWarps: warp_def 45, 6, 0, 0, MAP_ALTERING_CAVE -Route103_MapBGEvents: @ 85282C4 +Route103_MapBGEvents: bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route103_EventScript_1EC5EB -Route103_MapEvents:: @ 85282D0 +Route103_MapEvents:: map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index b614f32eb..942ec632c 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -1,10 +1,10 @@ -Route103: @ 84826B0 +Route103: .4byte Route103_Layout .4byte Route103_MapEvents .4byte Route103_MapScripts .4byte Route103_MapConnections .2byte MUS_DOORO1 - .2byte 19 + .2byte LAYOUT_ROUTE103 .byte MAPSEC_ROUTE_103 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route104/connections.inc b/data/maps/Route104/connections.inc index ce605c828..193f89833 100644 --- a/data/maps/Route104/connections.inc +++ b/data/maps/Route104/connections.inc @@ -1,9 +1,9 @@ -Route104_MapConnectionsList: @ 848686C +Route104_MapConnectionsList: connection up, 0, MAP_RUSTBORO_CITY connection down, 0, MAP_ROUTE105 connection right, 50, MAP_PETALBURG_CITY -Route104_MapConnections: @ 8486890 - .4byte 0x3 +Route104_MapConnections: + .4byte 3 .4byte Route104_MapConnectionsList diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc index 53e868559..8b67a0854 100644 --- a/data/maps/Route104/events.inc +++ b/data/maps/Route104/events.inc @@ -1,4 +1,4 @@ -Route104_EventObjects: @ 85282E4 +Route104_EventObjects: object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0 object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_1ED006, 0 object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0 @@ -34,7 +34,7 @@ Route104_EventObjects: @ 85282E4 object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 59, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0 object_event 34, EVENT_OBJ_GFX_VAR_0, 0, 17, 50, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1ECC9E, FLAG_HIDE_ROUTE_104_RIVAL -Route104_MapWarps: @ 8528614 +Route104_MapWarps: warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE warp_def 5, 18, 0, 0, MAP_ROUTE104_PRETTY_PETAL_FLOWER_SHOP warp_def 10, 30, 3, 0, MAP_PETALBURG_WOODS @@ -44,10 +44,10 @@ Route104_MapWarps: @ 8528614 warp_def 32, 42, 3, 4, MAP_PETALBURG_WOODS warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS -Route104_MapCoordEvents: @ 8528654 +Route104_MapCoordEvents: coord_event 17, 51, 3, VAR_0x4063, 1, Route104_EventScript_1ECCB3 -Route104_MapBGEvents: @ 8528664 +Route104_MapBGEvents: bg_event 20, 50, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED018 bg_event 27, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED021 bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_1ED02A @@ -59,6 +59,6 @@ Route104_MapBGEvents: @ 8528664 bg_hidden_item_event 16, 72, 3, ITEM_ANTIDOTE, FLAG_HIDDEN_ITEM_ROUTE_104_ANTIDOTE bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_104_HEART_SCALE -Route104_MapEvents:: @ 85286DC +Route104_MapEvents:: map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index 101e690d5..6f8e0776b 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -1,10 +1,10 @@ -Route104: @ 84826CC +Route104: .4byte Route104_Layout .4byte Route104_MapEvents .4byte Route104_MapScripts .4byte Route104_MapConnections .2byte MUS_NEXTROAD - .2byte 20 + .2byte LAYOUT_ROUTE104 .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route104_MrBrineysHouse/events.inc b/data/maps/Route104_MrBrineysHouse/events.inc index daee7759a..d1924756c 100644 --- a/data/maps/Route104_MrBrineysHouse/events.inc +++ b/data/maps/Route104_MrBrineysHouse/events.inc @@ -1,11 +1,11 @@ -Route104_MrBrineysHouse_EventObjects: @ 8533AD4 +Route104_MrBrineysHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, FLAG_HIDE_BRINEYS_HOUSE_PEEKO -Route104_MrBrineysHouse_MapWarps: @ 8533B04 +Route104_MrBrineysHouse_MapWarps: warp_def 5, 8, 0, 0, MAP_ROUTE104 warp_def 6, 8, 0, 0, MAP_ROUTE104 -Route104_MrBrineysHouse_MapEvents:: @ 8533B14 +Route104_MrBrineysHouse_MapEvents:: map_events Route104_MrBrineysHouse_EventObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index c52a076de..784db2d2d 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -1,10 +1,10 @@ -Route104_MrBrineysHouse: @ 8483D70 +Route104_MrBrineysHouse: .4byte Route104_MrBrineysHouse_Layout .4byte Route104_MrBrineysHouse_MapEvents .4byte Route104_MrBrineysHouse_MapScripts .4byte 0x0 .2byte MUS_MACHI_S2 - .2byte 102 + .2byte LAYOUT_ROUTE104_MR_BRINEYS_HOUSE .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route104_PrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc index 52e57efc7..c33268ff6 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/events.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/events.inc @@ -1,12 +1,12 @@ -Route104_PrettyPetalFlowerShop_EventObjects: @ 8533B28 +Route104_PrettyPetalFlowerShop_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0 object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0 -Route104_PrettyPetalFlowerShop_MapWarps: @ 8533B70 +Route104_PrettyPetalFlowerShop_MapWarps: warp_def 2, 8, 0, 1, MAP_ROUTE104 warp_def 3, 8, 0, 1, MAP_ROUTE104 -Route104_PrettyPetalFlowerShop_MapEvents:: @ 8533B80 +Route104_PrettyPetalFlowerShop_MapEvents:: map_events Route104_PrettyPetalFlowerShop_EventObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index eaf073550..b201d0a3e 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -1,10 +1,10 @@ -Route104_PrettyPetalFlowerShop: @ 8483D8C +Route104_PrettyPetalFlowerShop: .4byte Route104_PrettyPetalFlowerShop_Layout .4byte Route104_PrettyPetalFlowerShop_MapEvents .4byte Route104_PrettyPetalFlowerShop_MapScripts .4byte 0x0 .2byte MUS_MACHI_S2 - .2byte 117 + .2byte LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc index 08976e5a8..4f1dfef12 100644 --- a/data/maps/Route104_Prototype/events.inc +++ b/data/maps/Route104_Prototype/events.inc @@ -1,3 +1,3 @@ -Route104_Prototype_MapEvents:: @ 853DDC0 +Route104_Prototype_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 0de3a4b47..7bc8d0a87 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -1,10 +1,10 @@ -Route104_Prototype: @ 8485AF8 +Route104_Prototype: .4byte Route104_Prototype_Layout .4byte Route104_Prototype_MapEvents .4byte Route104_Prototype_MapScripts .4byte 0x0 .2byte MUS_NEXTROAD - .2byte 287 + .2byte LAYOUT_ROUTE104_PROTOTYPE .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc index e66b3c841..76dd77e02 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc @@ -1,3 +1,3 @@ -Route104_PrototypePrettyPetalFlowerShop_MapEvents:: @ 853DDD4 +Route104_PrototypePrettyPetalFlowerShop_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index e72f9a606..53b543e4e 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -1,10 +1,10 @@ -Route104_PrototypePrettyPetalFlowerShop: @ 8485B14 +Route104_PrototypePrettyPetalFlowerShop: .4byte Route104_PrettyPetalFlowerShop_Layout .4byte Route104_PrototypePrettyPetalFlowerShop_MapEvents .4byte Route104_PrototypePrettyPetalFlowerShop_MapScripts .4byte 0x0 .2byte MUS_NEXTROAD - .2byte 117 + .2byte LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP .byte MAPSEC_ROUTE_104 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route105/connections.inc b/data/maps/Route105/connections.inc index ac03944b7..89c412cc6 100644 --- a/data/maps/Route105/connections.inc +++ b/data/maps/Route105/connections.inc @@ -1,9 +1,9 @@ -Route105_MapConnectionsList: @ 8486898 +Route105_MapConnectionsList: connection up, 0, MAP_ROUTE104 connection down, 0, MAP_ROUTE106 connection dive, 0, MAP_UNDERWATER6 -Route105_MapConnections: @ 84868BC - .4byte 0x3 +Route105_MapConnections: + .4byte 3 .4byte Route105_MapConnectionsList diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc index e22aa668c..851a26fdc 100644 --- a/data/maps/Route105/events.inc +++ b/data/maps/Route105/events.inc @@ -1,4 +1,4 @@ -Route105_EventObjects: @ 85286F0 +Route105_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 19, 60, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route105_EventScript_1EE261, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 36, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 7, 0, 1, 3, Route105_EventScript_1EE278, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 45, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 7, 1, 3, Route105_EventScript_1EE28F, 0 @@ -8,13 +8,13 @@ Route105_EventObjects: @ 85286F0 object_event 7, EVENT_OBJ_GFX_MAN_5, 0, 4, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 2, 1, 2, Route105_EventScript_1EE2BD, 0 object_event 8, EVENT_OBJ_GFX_HIKER, 0, 4, 58, 3, MOVEMENT_TYPE_FACE_UP, 0, 2, 1, 4, Route105_EventScript_1EE2D4, 0 -Route105_MapWarps: @ 85287B0 +Route105_MapWarps: warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE -Route105_MapBGEvents: @ 85287B8 +Route105_MapBGEvents: bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_105_HEART_SCALE bg_hidden_item_event 5, 56, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_ROUTE_105_BIG_PEARL -Route105_MapEvents:: @ 85287D0 +Route105_MapEvents:: map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 5c6b2fc15..ac3e766dd 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -1,10 +1,10 @@ -Route105: @ 84826E8 +Route105: .4byte Route105_Layout .4byte Route105_MapEvents .4byte Route105_MapScripts .4byte Route105_MapConnections .2byte MUS_NEXTROAD - .2byte 21 + .2byte LAYOUT_ROUTE105 .byte MAPSEC_ROUTE_105 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route106/connections.inc b/data/maps/Route106/connections.inc index 18f181d2b..f48a08bd8 100644 --- a/data/maps/Route106/connections.inc +++ b/data/maps/Route106/connections.inc @@ -1,8 +1,8 @@ -Route106_MapConnectionsList: @ 84868C4 +Route106_MapConnectionsList: connection up, 0, MAP_ROUTE105 connection down, 60, MAP_DEWFORD_TOWN -Route106_MapConnections: @ 84868DC - .4byte 0x2 +Route106_MapConnections: + .4byte 2 .4byte Route106_MapConnectionsList diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc index 9ff0f41dd..6454fc188 100644 --- a/data/maps/Route106/events.inc +++ b/data/maps/Route106/events.inc @@ -1,19 +1,19 @@ -Route106_EventObjects: @ 85287E4 +Route106_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 5, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 4, 0, 1, 3, Route106_EventScript_1EE493, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 29, 10, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0 object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0 object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_1EE523, 0 object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route106_EventScript_290D40, FLAG_ITEM_ROUTE_106_PROTEIN -Route106_MapWarps: @ 852885C +Route106_MapWarps: warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F -Route106_MapBGEvents: @ 8528864 +Route106_MapBGEvents: bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_ROUTE_106_POKE_BALL bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_ROUTE_106_STARDUST bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_106_HEART_SCALE bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, Route106_EventScript_1EE48A -Route106_MapEvents:: @ 8528894 +Route106_MapEvents:: map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index f0f032b8b..01c7b9ae6 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -1,10 +1,10 @@ -Route106: @ 8482704 +Route106: .4byte Route106_Layout .4byte Route106_MapEvents .4byte Route106_MapScripts .4byte Route106_MapConnections .2byte MUS_NEXTROAD - .2byte 22 + .2byte LAYOUT_ROUTE106 .byte MAPSEC_ROUTE_106 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route107/connections.inc b/data/maps/Route107/connections.inc index 04ad13b07..d1bb18b87 100644 --- a/data/maps/Route107/connections.inc +++ b/data/maps/Route107/connections.inc @@ -1,8 +1,8 @@ -Route107_MapConnectionsList: @ 84868E4 +Route107_MapConnectionsList: connection left, 0, MAP_DEWFORD_TOWN connection right, 0, MAP_ROUTE108 -Route107_MapConnections: @ 84868FC - .4byte 0x2 +Route107_MapConnections: + .4byte 2 .4byte Route107_MapConnectionsList diff --git a/data/maps/Route107/events.inc b/data/maps/Route107/events.inc index b67e98384..461d8cd86 100644 --- a/data/maps/Route107/events.inc +++ b/data/maps/Route107/events.inc @@ -1,4 +1,4 @@ -Route107_EventObjects: @ 85288A8 +Route107_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 10, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, Route107_EventScript_1EE595, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 23, 11, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 6, 2, 1, 2, Route107_EventScript_1EE5AC, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 7, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0 @@ -7,6 +7,6 @@ Route107_EventObjects: @ 85288A8 object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 1, Route107_EventScript_1EE657, 0 object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route107_EventScript_1EE672, 0 -Route107_MapEvents:: @ 8528950 +Route107_MapEvents:: map_events Route107_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index a4ec264ea..db53b811d 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -1,10 +1,10 @@ -Route107: @ 8482720 +Route107: .4byte Route107_Layout .4byte Route107_MapEvents .4byte Route107_MapScripts .4byte Route107_MapConnections .2byte MUS_NEXTROAD - .2byte 23 + .2byte LAYOUT_ROUTE107 .byte MAPSEC_ROUTE_107 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route108/connections.inc b/data/maps/Route108/connections.inc index f80d0ade2..9b2d0f1f9 100644 --- a/data/maps/Route108/connections.inc +++ b/data/maps/Route108/connections.inc @@ -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 diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc index 094eb0bc7..9e1a088c0 100644 --- a/data/maps/Route108/events.inc +++ b/data/maps/Route108/events.inc @@ -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 diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index 106fe3135..97d4a879d 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -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 diff --git a/data/maps/Route109/connections.inc b/data/maps/Route109/connections.inc index 25a7a0e91..d74fc08dd 100644 --- a/data/maps/Route109/connections.inc +++ b/data/maps/Route109/connections.inc @@ -1,8 +1,8 @@ -Route109_MapConnectionsList: @ 8486924 +Route109_MapConnectionsList: connection up, 0, MAP_SLATEPORT_CITY connection left, 40, MAP_ROUTE108 -Route109_MapConnections: @ 848693C - .4byte 0x2 +Route109_MapConnections: + .4byte 2 .4byte Route109_MapConnectionsList diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc index 89ee11bb3..efd0e896f 100644 --- a/data/maps/Route109/events.inc +++ b/data/maps/Route109/events.inc @@ -1,4 +1,4 @@ -Route109_EventObjects: @ 8528A34 +Route109_EventObjects: object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_1EE910, FLAG_HIDE_ROUTE_108_MR_BRINEY object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0 @@ -24,10 +24,10 @@ Route109_EventObjects: @ 8528A34 object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, FLAG_ITEM_ROUTE_109_POTION object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 17, 56, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0 -Route109_MapWarps: @ 8528C74 +Route109_MapWarps: warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE -Route109_MapBGEvents: @ 8528C7C +Route109_MapBGEvents: bg_event 15, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA2B bg_event 29, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_1EEA34 bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_109_REVIVE @@ -37,5 +37,6 @@ Route109_MapBGEvents: @ 8528C7C bg_hidden_item_event 13, 16, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_2 bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_109_HEART_SCALE_3 -Route109_MapEvents:: @ 8528CDC +Route109_MapEvents:: map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents + diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index 045f42256..9de12f3e6 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -1,10 +1,10 @@ -Route109: @ 8482758 +Route109: .4byte Route109_Layout .4byte Route109_MapEvents .4byte Route109_MapScripts .4byte Route109_MapConnections .2byte MUS_NEXTROAD - .2byte 25 + .2byte LAYOUT_ROUTE109 .byte MAPSEC_ROUTE_109 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route109_SeashoreHouse/events.inc b/data/maps/Route109_SeashoreHouse/events.inc index 0632596a9..7ef23ad7f 100644 --- a/data/maps/Route109_SeashoreHouse/events.inc +++ b/data/maps/Route109_SeashoreHouse/events.inc @@ -1,13 +1,13 @@ -Route109_SeashoreHouse_EventObjects: @ 853DDE8 +Route109_SeashoreHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0 object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0 object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0 -Route109_SeashoreHouse_MapWarps: @ 853DE48 +Route109_SeashoreHouse_MapWarps: warp_def 6, 9, 0, 0, MAP_ROUTE109 warp_def 7, 9, 0, 0, MAP_ROUTE109 -Route109_SeashoreHouse_MapEvents:: @ 853DE58 +Route109_SeashoreHouse_MapEvents:: map_events Route109_SeashoreHouse_EventObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index 68dc54b77..d8109deac 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -1,10 +1,10 @@ -Route109_SeashoreHouse: @ 8485B30 +Route109_SeashoreHouse: .4byte Route109_SeashoreHouse_Layout .4byte Route109_SeashoreHouse_MapEvents .4byte Route109_SeashoreHouse_MapScripts .4byte 0x0 .2byte MUS_HIGHTOWN - .2byte 243 + .2byte LAYOUT_ROUTE109_SEASHORE_HOUSE .byte MAPSEC_ROUTE_109 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110/connections.inc b/data/maps/Route110/connections.inc index 22000354f..d0334b8c5 100644 --- a/data/maps/Route110/connections.inc +++ b/data/maps/Route110/connections.inc @@ -1,9 +1,9 @@ -Route110_MapConnectionsList: @ 8486944 +Route110_MapConnectionsList: connection up, 0, MAP_MAUVILLE_CITY connection down, 0, MAP_SLATEPORT_CITY connection left, 60, MAP_ROUTE103 -Route110_MapConnections: @ 8486968 - .4byte 0x3 +Route110_MapConnections: + .4byte 3 .4byte Route110_MapConnectionsList diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc index b50e5eec6..349670c13 100644 --- a/data/maps/Route110/events.inc +++ b/data/maps/Route110/events.inc @@ -1,4 +1,4 @@ -Route110_EventObjects: @ 8528CF0 +Route110_EventObjects: object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF338, 0 object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 14, 69, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route110_EventScript_1EF326, 0 @@ -36,7 +36,7 @@ Route110_EventObjects: @ 8528CF0 object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_EventScript_290D8E, FLAG_ITEM_ROUTE_110_ELIXIR object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 79, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_110_BIRCH -Route110_MapWarps: @ 8529050 +Route110_MapWarps: warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE warp_def 11, 66, 0, 0, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 15, 16, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE @@ -44,7 +44,7 @@ Route110_MapWarps: @ 8529050 warp_def 16, 88, 0, 0, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_NORTH_ENTRANCE -Route110_MapCoordEvents: @ 8529080 +Route110_MapCoordEvents: coord_event 28, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661 coord_event 29, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_1EF661 coord_event 33, 56, 3, VAR_0x4069, 0, Route110_EventScript_1EF74D @@ -55,7 +55,7 @@ Route110_MapCoordEvents: @ 8529080 coord_event 9, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9E1 coord_event 10, 85, 3, VAR_0x40DA, 1, Route110_EventScript_1EF9EC -Route110_MapBGEvents: @ 8529110 +Route110_MapBGEvents: bg_event 15, 25, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF353 bg_event 9, 51, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF365 bg_event 14, 88, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A @@ -74,6 +74,6 @@ Route110_MapBGEvents: @ 8529110 bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_110_FULL_HEAL bg_event 13, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_1EF34A -Route110_MapEvents:: @ 85291DC +Route110_MapEvents:: map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index 14194cd37..5edb81ec4 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -1,10 +1,10 @@ -Route110: @ 8482774 +Route110: .4byte Route110_Layout .4byte Route110_MapEvents .4byte Route110_MapScripts .4byte Route110_MapConnections .2byte MUS_DOORO_X1 - .2byte 26 + .2byte LAYOUT_ROUTE110 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc index ee7f5ef17..f9050259c 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc @@ -1,16 +1,16 @@ -Route110_SeasideCyclingRoadNorthEntrance_EventObjects: @ 853E9A0 +Route110_SeasideCyclingRoadNorthEntrance_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA78, 0 -Route110_SeasideCyclingRoadNorthEntrance_MapWarps: @ 853E9B8 +Route110_SeasideCyclingRoadNorthEntrance_MapWarps: warp_def 1, 5, 0, 4, MAP_ROUTE110 warp_def 2, 5, 0, 4, MAP_ROUTE110 warp_def 12, 5, 0, 5, MAP_ROUTE110 warp_def 13, 5, 0, 5, MAP_ROUTE110 -Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents: @ 853E9D8 +Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents: coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EA84 coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_26EAB6 -Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 853E9F8 +Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: map_events Route110_SeasideCyclingRoadNorthEntrance_EventObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index 50f4b763f..008df77af 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -1,10 +1,10 @@ -Route110_SeasideCyclingRoadNorthEntrance: @ 8485C80 +Route110_SeasideCyclingRoadNorthEntrance: .4byte Route110_SeasideCyclingRoadEntrance_Layout .4byte Route110_SeasideCyclingRoadNorthEntrance_MapEvents .4byte Route110_SeasideCyclingRoadNorthEntrance_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 256 + .2byte LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc index 8d10ce499..f64836526 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc @@ -1,16 +1,16 @@ -Route110_SeasideCyclingRoadSouthEntrance_EventObjects: @ 853EA0C +Route110_SeasideCyclingRoadSouthEntrance_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBC4, 0 -Route110_SeasideCyclingRoadSouthEntrance_MapWarps: @ 853EA24 +Route110_SeasideCyclingRoadSouthEntrance_MapWarps: warp_def 1, 5, 0, 2, MAP_ROUTE110 warp_def 2, 5, 0, 2, MAP_ROUTE110 warp_def 12, 5, 0, 3, MAP_ROUTE110 warp_def 13, 5, 0, 3, MAP_ROUTE110 -Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents: @ 853EA44 +Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents: coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EBD0 coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_26EC13 -Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 853EA64 +Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: map_events Route110_SeasideCyclingRoadSouthEntrance_EventObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index 4e09eeef3..be2646ee2 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -1,10 +1,10 @@ -Route110_SeasideCyclingRoadSouthEntrance: @ 8485C9C +Route110_SeasideCyclingRoadSouthEntrance: .4byte Route110_SeasideCyclingRoadEntrance_Layout .4byte Route110_SeasideCyclingRoadSouthEntrance_MapEvents .4byte Route110_SeasideCyclingRoadSouthEntrance_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 256 + .2byte LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHouseCorridor/events.inc b/data/maps/Route110_TrickHouseCorridor/events.inc index e9d84d56b..814e46cbe 100644 --- a/data/maps/Route110_TrickHouseCorridor/events.inc +++ b/data/maps/Route110_TrickHouseCorridor/events.inc @@ -1,9 +1,9 @@ -Route110_TrickHouseCorridor_MapWarps: @ 853DF54 +Route110_TrickHouseCorridor_MapWarps: warp_def 13, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END warp_def 14, 3, 3, 1, MAP_ROUTE110_TRICK_HOUSE_END warp_def 4, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 5, 23, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE -Route110_TrickHouseCorridor_MapEvents:: @ 853DF74 +Route110_TrickHouseCorridor_MapEvents:: map_events 0x0, Route110_TrickHouseCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index 6657162b7..2a60d20d8 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHouseCorridor: @ 8485B84 +Route110_TrickHouseCorridor: .4byte Route110_TrickHouseCorridor_Layout .4byte Route110_TrickHouseCorridor_MapEvents .4byte Route110_TrickHouseCorridor_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 246 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc index 1e371bbbe..82088646e 100644 --- a/data/maps/Route110_TrickHouseEnd/events.inc +++ b/data/maps/Route110_TrickHouseEnd/events.inc @@ -1,16 +1,16 @@ -Route110_TrickHouseEnd_EventObjects: @ 853DEFC +Route110_TrickHouseEnd_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, FLAG_HIDE_TRICK_HOUSE_END_MAN -Route110_TrickHouseEnd_MapWarps: @ 853DF14 +Route110_TrickHouseEnd_MapWarps: warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR -Route110_TrickHouseEnd_MapCoordEvents: @ 853DF24 +Route110_TrickHouseEnd_MapCoordEvents: coord_event 2, 2, 3, VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26B041 -Route110_TrickHouseEnd_MapBGEvents: @ 853DF34 +Route110_TrickHouseEnd_MapBGEvents: bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET -Route110_TrickHouseEnd_MapEvents:: @ 853DF40 +Route110_TrickHouseEnd_MapEvents:: map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index 52a39914f..0c2dfac3a 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHouseEnd: @ 8485B68 +Route110_TrickHouseEnd: .4byte Route110_TrickHouseEnd_Layout .4byte Route110_TrickHouseEnd_MapEvents .4byte Route110_TrickHouseEnd_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 245 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_END .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc index ff83f0bdb..791ecbbc5 100644 --- a/data/maps/Route110_TrickHouseEntrance/events.inc +++ b/data/maps/Route110_TrickHouseEntrance/events.inc @@ -1,20 +1,20 @@ -Route110_TrickHouseEntrance_EventObjects: @ 853DE6C +Route110_TrickHouseEntrance_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN -Route110_TrickHouseEntrance_MapWarps: @ 853DE84 +Route110_TrickHouseEntrance_MapWarps: warp_def 5, 7, 3, 1, MAP_ROUTE110 warp_def 6, 7, 3, 1, MAP_ROUTE110 warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 -Route110_TrickHouseEntrance_MapCoordEvents: @ 853DE9C +Route110_TrickHouseEntrance_MapCoordEvents: coord_event 4, 7, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 coord_event 5, 6, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 coord_event 6, 6, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 coord_event 7, 7, 3, VAR_0x40A5, 0, Route110_TrickHouseEntrance_EventScript_26A3F8 -Route110_TrickHouseEntrance_MapBGEvents: @ 853DEDC +Route110_TrickHouseEntrance_MapBGEvents: bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, Route110_TrickHouseEntrance_EventScript_26A0D3 -Route110_TrickHouseEntrance_MapEvents:: @ 853DEE8 +Route110_TrickHouseEntrance_MapEvents:: map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 4e651e5f9..0f5f0aad5 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHouseEntrance: @ 8485B4C +Route110_TrickHouseEntrance: .4byte Route110_TrickHouseEntrance_Layout .4byte Route110_TrickHouseEntrance_MapEvents .4byte Route110_TrickHouseEntrance_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 244 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc index 02dfa58bc..3a2bb131c 100644 --- a/data/maps/Route110_TrickHousePuzzle1/events.inc +++ b/data/maps/Route110_TrickHousePuzzle1/events.inc @@ -1,4 +1,4 @@ -Route110_TrickHousePuzzle1_EventObjects: @ 853DF88 +Route110_TrickHousePuzzle1_EventObjects: object_event 1, EVENT_OBJ_GFX_LASS, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0 object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0 object_event 3, EVENT_OBJ_GFX_LASS, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0 @@ -15,14 +15,14 @@ Route110_TrickHousePuzzle1_EventObjects: @ 853DF88 object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1C object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, FLAG_TEMP_1E -Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0 +Route110_TrickHousePuzzle1_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle1_MapBGEvents: @ 853E108 +Route110_TrickHousePuzzle1_MapBGEvents: bg_event 3, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle1_EventScript_26B92B -Route110_TrickHousePuzzle1_MapEvents:: @ 853E114 +Route110_TrickHousePuzzle1_MapEvents:: map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index de4ff3ed2..5835faa5f 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle1: @ 8485BA0 +Route110_TrickHousePuzzle1: .4byte Route110_TrickHousePuzzle1_Layout .4byte Route110_TrickHousePuzzle1_MapEvents .4byte Route110_TrickHousePuzzle1_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 247 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc index e49d391e6..c56d53dea 100644 --- a/data/maps/Route110_TrickHousePuzzle2/events.inc +++ b/data/maps/Route110_TrickHousePuzzle2/events.inc @@ -1,24 +1,24 @@ -Route110_TrickHousePuzzle2_EventObjects: @ 853E128 +Route110_TrickHousePuzzle2_EventObjects: object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0 object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 10, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0 object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_WAVE_MAIL object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_HARBOR_MAIL -Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0 +Route110_TrickHousePuzzle2_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle2_MapCoordEvents: @ 853E1B8 +Route110_TrickHousePuzzle2_MapCoordEvents: coord_event 11, 12, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle2_EventScript_26BBDD coord_event 0, 4, 0, VAR_TEMP_2, 0, Route110_TrickHousePuzzle2_EventScript_26BBF0 coord_event 14, 5, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle2_EventScript_26BC03 coord_event 7, 11, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle2_EventScript_26BC16 -Route110_TrickHousePuzzle2_MapBGEvents: @ 853E1F8 +Route110_TrickHousePuzzle2_MapBGEvents: bg_event 14, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle2_EventScript_26BBC0 -Route110_TrickHousePuzzle2_MapEvents:: @ 853E204 +Route110_TrickHousePuzzle2_MapEvents:: map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index 8a2b708ea..b957dac78 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle2: @ 8485BBC +Route110_TrickHousePuzzle2: .4byte Route110_TrickHousePuzzle2_Layout .4byte Route110_TrickHousePuzzle2_MapEvents .4byte Route110_TrickHousePuzzle2_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 248 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc index 118667076..6e3406753 100644 --- a/data/maps/Route110_TrickHousePuzzle3/events.inc +++ b/data/maps/Route110_TrickHousePuzzle3/events.inc @@ -1,4 +1,4 @@ -Route110_TrickHousePuzzle3_EventObjects: @ 853E218 +Route110_TrickHousePuzzle3_EventObjects: object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 7, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0 object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0 object_event 3, EVENT_OBJ_GFX_HIKER, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0 @@ -7,20 +7,20 @@ Route110_TrickHousePuzzle3_EventObjects: @ 853E218 object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, FLAG_TEMP_15 object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, FLAG_TEMP_16 -Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0 +Route110_TrickHousePuzzle3_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle3_MapCoordEvents: @ 853E2D8 +Route110_TrickHousePuzzle3_MapCoordEvents: coord_event 4, 14, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle3_EventScript_26C4CD coord_event 3, 11, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle3_EventScript_26C4D9 coord_event 12, 5, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle3_EventScript_26C4E5 coord_event 8, 2, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle3_EventScript_26C4F1 -Route110_TrickHousePuzzle3_MapBGEvents: @ 853E318 +Route110_TrickHousePuzzle3_MapBGEvents: bg_event 0, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle3_EventScript_26C5A7 -Route110_TrickHousePuzzle3_MapEvents:: @ 853E324 +Route110_TrickHousePuzzle3_MapEvents:: map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index 37a517f72..b367f850e 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle3: @ 8485BD8 +Route110_TrickHousePuzzle3: .4byte Route110_TrickHousePuzzle3_Layout .4byte Route110_TrickHousePuzzle3_MapEvents .4byte Route110_TrickHousePuzzle3_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 249 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc index 4bad58814..c2de17b66 100644 --- a/data/maps/Route110_TrickHousePuzzle4/events.inc +++ b/data/maps/Route110_TrickHousePuzzle4/events.inc @@ -1,4 +1,4 @@ -Route110_TrickHousePuzzle4_EventObjects: @ 853E338 +Route110_TrickHousePuzzle4_EventObjects: object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0 object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0 @@ -14,14 +14,14 @@ Route110_TrickHousePuzzle4_EventObjects: @ 853E338 object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_19 object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, FLAG_TEMP_1A -Route110_TrickHousePuzzle4_MapWarps: @ 853E488 +Route110_TrickHousePuzzle4_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle4_MapBGEvents: @ 853E4A0 +Route110_TrickHousePuzzle4_MapBGEvents: bg_event 14, 13, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle4_EventScript_26C861 -Route110_TrickHousePuzzle4_MapEvents:: @ 853E4AC +Route110_TrickHousePuzzle4_MapEvents:: map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index 993f002d7..9f3f637b9 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle4: @ 8485BF4 +Route110_TrickHousePuzzle4: .4byte Route110_TrickHousePuzzle4_Layout .4byte Route110_TrickHousePuzzle4_MapEvents .4byte Route110_TrickHousePuzzle4_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 250 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc index f91d26f4d..88eebe092 100644 --- a/data/maps/Route110_TrickHousePuzzle5/events.inc +++ b/data/maps/Route110_TrickHousePuzzle5/events.inc @@ -1,16 +1,16 @@ -Route110_TrickHousePuzzle5_EventObjects: @ 853E4C0 +Route110_TrickHousePuzzle5_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0 object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 14, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0 object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 14, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0 object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 10, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0 -Route110_TrickHousePuzzle5_MapWarps: @ 853E538 +Route110_TrickHousePuzzle5_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle5_MapCoordEvents: @ 853E550 +Route110_TrickHousePuzzle5_MapCoordEvents: coord_event 5, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBD7 coord_event 4, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBE3 coord_event 3, 17, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_26CBEF @@ -34,9 +34,9 @@ Route110_TrickHousePuzzle5_MapCoordEvents: @ 853E550 coord_event 10, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCBB coord_event 9, 19, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_26CCC7 -Route110_TrickHousePuzzle5_MapBGEvents: @ 853E6B0 +Route110_TrickHousePuzzle5_MapBGEvents: bg_event 11, 21, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle5_EventScript_26CB15 -Route110_TrickHousePuzzle5_MapEvents:: @ 853E6BC +Route110_TrickHousePuzzle5_MapEvents:: map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index b22b21bce..e179a016a 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle5: @ 8485C10 +Route110_TrickHousePuzzle5: .4byte Route110_TrickHousePuzzle5_Layout .4byte Route110_TrickHousePuzzle5_MapEvents .4byte Route110_TrickHousePuzzle5_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 251 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc index f172622ea..512164dba 100644 --- a/data/maps/Route110_TrickHousePuzzle6/events.inc +++ b/data/maps/Route110_TrickHousePuzzle6/events.inc @@ -1,17 +1,17 @@ -Route110_TrickHousePuzzle6_EventObjects: @ 853E6D0 +Route110_TrickHousePuzzle6_EventObjects: object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 7, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0 object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_GLITTER_MAIL -Route110_TrickHousePuzzle6_MapWarps: @ 853E730 +Route110_TrickHousePuzzle6_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle6_MapBGEvents: @ 853E748 +Route110_TrickHousePuzzle6_MapBGEvents: bg_event 0, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle6_EventScript_26DDC4 -Route110_TrickHousePuzzle6_MapEvents:: @ 853E754 +Route110_TrickHousePuzzle6_MapEvents:: map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index e10fd78b2..ec7a42d20 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle6: @ 8485C2C +Route110_TrickHousePuzzle6: .4byte Route110_TrickHousePuzzle6_Layout .4byte Route110_TrickHousePuzzle6_MapEvents .4byte Route110_TrickHousePuzzle6_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 252 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc index d29c76263..4dff66e1c 100644 --- a/data/maps/Route110_TrickHousePuzzle7/events.inc +++ b/data/maps/Route110_TrickHousePuzzle7/events.inc @@ -1,4 +1,4 @@ -Route110_TrickHousePuzzle7_EventObjects: @ 853E768 +Route110_TrickHousePuzzle7_EventObjects: object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 9, 20, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0 object_event 2, EVENT_OBJ_GFX_LASS, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0 object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 8, 17, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0 @@ -9,7 +9,7 @@ Route110_TrickHousePuzzle7_EventObjects: @ 853E768 object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 17, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 4, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 -Route110_TrickHousePuzzle7_MapWarps: @ 853E840 +Route110_TrickHousePuzzle7_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END @@ -24,15 +24,15 @@ Route110_TrickHousePuzzle7_MapWarps: @ 853E840 warp_def 1, 3, 0, 12, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 warp_def 8, 12, 0, 11, MAP_ROUTE110_TRICK_HOUSE_PUZZLE7 -Route110_TrickHousePuzzle7_MapCoordEvents: @ 853E8A8 +Route110_TrickHousePuzzle7_MapCoordEvents: coord_event 8, 19, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E31B coord_event 0, 14, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E331 coord_event 6, 6, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E347 coord_event 9, 7, 0, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_26E35D -Route110_TrickHousePuzzle7_MapBGEvents: @ 853E8E8 +Route110_TrickHousePuzzle7_MapBGEvents: bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_26E1D0 -Route110_TrickHousePuzzle7_MapEvents:: @ 853E8F4 +Route110_TrickHousePuzzle7_MapEvents:: map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index 40f43f9d8..ca21629e3 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle7: @ 8485C48 +Route110_TrickHousePuzzle7: .4byte Route110_TrickHousePuzzle7_Layout .4byte Route110_TrickHousePuzzle7_MapEvents .4byte Route110_TrickHousePuzzle7_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 253 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc index 909c8cbfd..2ccba5add 100644 --- a/data/maps/Route110_TrickHousePuzzle8/events.inc +++ b/data/maps/Route110_TrickHousePuzzle8/events.inc @@ -1,17 +1,17 @@ -Route110_TrickHousePuzzle8_EventObjects: @ 853E908 +Route110_TrickHousePuzzle8_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_BEAD_MAIL -Route110_TrickHousePuzzle8_MapWarps: @ 853E968 +Route110_TrickHousePuzzle8_MapWarps: warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 1, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE warp_def 13, 1, 0, 0, MAP_ROUTE110_TRICK_HOUSE_END -Route110_TrickHousePuzzle8_MapBGEvents: @ 853E980 +Route110_TrickHousePuzzle8_MapBGEvents: bg_event 3, 21, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle8_EventScript_26E802 -Route110_TrickHousePuzzle8_MapEvents:: @ 853E98C +Route110_TrickHousePuzzle8_MapEvents:: map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index 175515292..1bf3fbb1c 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -1,10 +1,10 @@ -Route110_TrickHousePuzzle8: @ 8485C64 +Route110_TrickHousePuzzle8: .4byte Route110_TrickHousePuzzle8_Layout .4byte Route110_TrickHousePuzzle8_MapEvents .4byte Route110_TrickHousePuzzle8_MapScripts .4byte 0x0 .2byte MUS_KARAKURI - .2byte 254 + .2byte LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8 .byte MAPSEC_ROUTE_110 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route111/connections.inc b/data/maps/Route111/connections.inc index 6a57d275e..25e409976 100644 --- a/data/maps/Route111/connections.inc +++ b/data/maps/Route111/connections.inc @@ -1,9 +1,9 @@ -Route111_MapConnectionsList: @ 8486970 +Route111_MapConnectionsList: connection down, 0, MAP_MAUVILLE_CITY connection left, 0, MAP_ROUTE113 connection left, 20, MAP_ROUTE112 -Route111_MapConnections: @ 8486994 - .4byte 0x3 +Route111_MapConnections: + .4byte 3 .4byte Route111_MapConnectionsList diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc index 975141b73..703c9a662 100644 --- a/data/maps/Route111/events.inc +++ b/data/maps/Route111/events.inc @@ -1,4 +1,4 @@ -Route111_EventObjects: @ 85291F0 +Route111_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1F0FC5, FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE @@ -46,14 +46,14 @@ Route111_EventObjects: @ 85291F0 object_event 45, EVENT_OBJ_GFX_VAR_0, 0, 19, 53, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_ROUTE_111_PLAYER_DESCENT object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 101, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_1F11E4, FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY -Route111_MapWarps: @ 8529640 +Route111_MapWarps: warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE warp_def 29, 87, 0, 0, MAP_DESERT_RUINS warp_def 26, 18, 0, 0, MAP_ROUTE111_OLD_LADYS_REST_STOP warp_def 19, 58, 0, 0, MAP_MIRAGE_TOWER_1F warp_def 31, 113, 0, 0, MAP_TRAINER_HILL_ENTRANCE -Route111_MapCoordEvents: @ 8529668 +Route111_MapCoordEvents: coord_event 12, 62, 3, 0, 0, Route111_EventScript_1F0FBD coord_event 11, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A coord_event 12, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_1F0F0A @@ -89,7 +89,7 @@ Route111_MapCoordEvents: @ 8529668 coord_event 12, 43, 3, 0, 0, Route111_EventScript_1F0FBD coord_event 11, 44, 3, 0, 0, Route111_EventScript_1F0FBD -Route111_MapBGEvents: @ 8529888 +Route111_MapBGEvents: bg_event 16, 114, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F115C bg_event 24, 126, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1153 bg_event 7, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F1165 @@ -109,6 +109,6 @@ Route111_MapBGEvents: @ 8529888 bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_111_RARE_CANDY bg_event 24, 116, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_1F146C -Route111_MapEvents:: @ 8529960 +Route111_MapEvents:: map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index cb975e74a..2ec5fc6ed 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -1,10 +1,10 @@ -Route111: @ 8482790 +Route111: .4byte Route111_Layout .4byte Route111_MapEvents .4byte Route111_MapScripts .4byte Route111_MapConnections .2byte MUS_DOORO_X1 - .2byte 27 + .2byte LAYOUT_ROUTE111 .byte MAPSEC_ROUTE_111 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route111_OldLadysRestStop/events.inc b/data/maps/Route111_OldLadysRestStop/events.inc index 973837871..fbdd2e5dd 100644 --- a/data/maps/Route111_OldLadysRestStop/events.inc +++ b/data/maps/Route111_OldLadysRestStop/events.inc @@ -1,10 +1,10 @@ -Route111_OldLadysRestStop_EventObjects: @ 8533C18 +Route111_OldLadysRestStop_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0 -Route111_OldLadysRestStop_MapWarps: @ 8533C30 +Route111_OldLadysRestStop_MapWarps: warp_def 3, 7, 0, 2, MAP_ROUTE111 warp_def 4, 7, 0, 2, MAP_ROUTE111 -Route111_OldLadysRestStop_MapEvents:: @ 8533C40 +Route111_OldLadysRestStop_MapEvents:: map_events Route111_OldLadysRestStop_EventObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index a3c2a0161..9b2633050 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -1,10 +1,10 @@ -Route111_OldLadysRestStop: @ 8483DC4 +Route111_OldLadysRestStop: .4byte House3_Layout .4byte Route111_OldLadysRestStop_MapEvents .4byte Route111_OldLadysRestStop_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 64 + .2byte LAYOUT_HOUSE3 .byte MAPSEC_ROUTE_111 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route111_WinstrateFamilysHouse/events.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc index edaf85eb4..b433e1198 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/events.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/events.inc @@ -1,13 +1,13 @@ -Route111_WinstrateFamilysHouse_EventObjects: @ 8533B94 +Route111_WinstrateFamilysHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0 object_event 4, EVENT_OBJ_GFX_EXPERT_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0 -Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4 +Route111_WinstrateFamilysHouse_MapWarps: warp_def 3, 7, 0, 0, MAP_ROUTE111 warp_def 4, 7, 0, 0, MAP_ROUTE111 -Route111_WinstrateFamilysHouse_MapEvents:: @ 8533C04 +Route111_WinstrateFamilysHouse_MapEvents:: map_events Route111_WinstrateFamilysHouse_EventObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 12e408089..d37a62e00 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -1,10 +1,10 @@ -Route111_WinstrateFamilysHouse: @ 8483DA8 +Route111_WinstrateFamilysHouse: .4byte House2_Layout .4byte Route111_WinstrateFamilysHouse_MapEvents .4byte Route111_WinstrateFamilysHouse_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_ROUTE_111 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route112/connections.inc b/data/maps/Route112/connections.inc index 132c4ff76..0fc8da215 100644 --- a/data/maps/Route112/connections.inc +++ b/data/maps/Route112/connections.inc @@ -1,9 +1,9 @@ -Route112_MapConnectionsList: @ 848699C +Route112_MapConnectionsList: connection up, -60, MAP_ROUTE113 connection left, 40, MAP_LAVARIDGE_TOWN connection right, -20, MAP_ROUTE111 -Route112_MapConnections: @ 84869C0 - .4byte 0x3 +Route112_MapConnections: + .4byte 3 .4byte Route112_MapConnectionsList diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc index cfa145e97..4d1b338c3 100644 --- a/data/maps/Route112/events.inc +++ b/data/maps/Route112/events.inc @@ -1,4 +1,4 @@ -Route112_EventObjects: @ 8529974 +Route112_EventObjects: object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route112_EventScript_1F1DB7, FLAG_HIDE_ROUTE_112_TEAM_MAGMA object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0 @@ -14,7 +14,7 @@ Route112_EventObjects: @ 8529974 object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, Route112_EventScript_1F1F11, 0 object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 31, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route112_EventScript_1F1F28, 0 -Route112_MapWarps: @ 8529AC4 +Route112_MapWarps: warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION warp_def 29, 27, 0, 1, MAP_ROUTE112_CABLE_CAR_STATION warp_def 6, 46, 3, 0, MAP_JAGGED_PASS @@ -22,11 +22,11 @@ Route112_MapWarps: @ 8529AC4 warp_def 11, 36, 0, 0, MAP_FIERY_PATH warp_def 22, 10, 0, 1, MAP_FIERY_PATH -Route112_MapBGEvents: @ 8529AF4 +Route112_MapBGEvents: bg_event 19, 44, 3, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E4F bg_event 22, 37, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E46 bg_event 4, 49, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_1F1E58 -Route112_MapEvents:: @ 8529B18 +Route112_MapEvents:: map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index 70e0f2d65..1cc8583a5 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -1,10 +1,10 @@ -Route112: @ 84827AC +Route112: .4byte Route112_Layout .4byte Route112_MapEvents .4byte Route112_MapScripts .4byte Route112_MapConnections .2byte MUS_DOORO_X1 - .2byte 28 + .2byte LAYOUT_ROUTE112 .byte MAPSEC_ROUTE_112 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route112_CableCarStation/events.inc b/data/maps/Route112_CableCarStation/events.inc index 2fe084697..4b51decda 100644 --- a/data/maps/Route112_CableCarStation/events.inc +++ b/data/maps/Route112_CableCarStation/events.inc @@ -1,11 +1,11 @@ -Route112_CableCarStation_EventObjects: @ 8533C54 +Route112_CableCarStation_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0 object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 -Route112_CableCarStation_MapWarps: @ 8533C84 +Route112_CableCarStation_MapWarps: warp_def 6, 11, 0, 0, MAP_ROUTE112 warp_def 7, 11, 0, 1, MAP_ROUTE112 -Route112_CableCarStation_MapEvents:: @ 8533C94 +Route112_CableCarStation_MapEvents:: map_events Route112_CableCarStation_EventObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index fd9038c12..f1a00b968 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -1,10 +1,10 @@ -Route112_CableCarStation: @ 8483DE0 +Route112_CableCarStation: .4byte CableCarStation_Layout .4byte Route112_CableCarStation_MapEvents .4byte Route112_CableCarStation_MapScripts .4byte 0x0 .2byte MUS_DOORO_X1 - .2byte 118 + .2byte LAYOUT_CABLE_CAR_STATION .byte MAPSEC_ROUTE_112 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route113/connections.inc b/data/maps/Route113/connections.inc index 3067ee23b..a4d583ce8 100644 --- a/data/maps/Route113/connections.inc +++ b/data/maps/Route113/connections.inc @@ -1,9 +1,9 @@ -Route113_MapConnectionsList: @ 84869C8 +Route113_MapConnectionsList: connection down, 60, MAP_ROUTE112 connection left, 0, MAP_FALLARBOR_TOWN connection right, 0, MAP_ROUTE111 -Route113_MapConnections: @ 84869EC - .4byte 0x3 +Route113_MapConnections: + .4byte 3 .4byte Route113_MapConnectionsList diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc index b2481d6ed..bcf377e74 100644 --- a/data/maps/Route113/events.inc +++ b/data/maps/Route113/events.inc @@ -1,4 +1,4 @@ -Route113_EventObjects: @ 8529B2C +Route113_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 66, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route113_EventScript_1F2193, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route113_EventScript_1F218A, 0 object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0 @@ -16,12 +16,12 @@ Route113_EventObjects: @ 8529B2C object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 7, 6, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 6, Route113_EventScript_1F22FF, 0 object_event 16, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 6, Route113_EventScript_1F2316, 0 -Route113_MapWarps: @ 8529CAC +Route113_MapWarps: warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP warp_def 41, 12, 0, 0, MAP_TERRA_CAVE_ENTRANCE warp_def 88, 5, 0, 0, MAP_TERRA_CAVE_ENTRANCE -Route113_MapCoordEvents: @ 8529CC4 +Route113_MapCoordEvents: coord_weather_event 19, 11, 3, COORD_EVENT_WEATHER_ASH coord_weather_event 19, 10, 3, COORD_EVENT_WEATHER_ASH coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ASH @@ -42,7 +42,7 @@ Route113_MapCoordEvents: @ 8529CC4 coord_weather_event 87, 6, 3, COORD_EVENT_WEATHER_ASH coord_weather_event 87, 7, 3, COORD_EVENT_WEATHER_ASH -Route113_MapBGEvents: @ 8529DF4 +Route113_MapBGEvents: bg_event 85, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F219C bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21A5 bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_1F21B7 @@ -52,6 +52,6 @@ Route113_MapBGEvents: @ 8529DF4 bg_hidden_item_event 22, 5, 3, ITEM_TM32, FLAG_HIDDEN_ITEM_ROUTE_113_TM_32 bg_hidden_item_event 73, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_ROUTE_113_NUGGET -Route113_MapEvents:: @ 8529E54 +Route113_MapEvents:: map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index deaacca36..aae60a100 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -1,10 +1,10 @@ -Route113: @ 84827C8 +Route113: .4byte Route113_Layout .4byte Route113_MapEvents .4byte Route113_MapScripts .4byte Route113_MapConnections .2byte MUS_KAZANBAI - .2byte 29 + .2byte LAYOUT_ROUTE113 .byte MAPSEC_ROUTE_113 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route113_GlassWorkshop/events.inc b/data/maps/Route113_GlassWorkshop/events.inc index d6f9c0d4b..7c8fbe717 100644 --- a/data/maps/Route113_GlassWorkshop/events.inc +++ b/data/maps/Route113_GlassWorkshop/events.inc @@ -1,11 +1,11 @@ -Route113_GlassWorkshop_EventObjects: @ 853EA78 +Route113_GlassWorkshop_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0 object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0 -Route113_GlassWorkshop_MapWarps: @ 853EAA8 +Route113_GlassWorkshop_MapWarps: warp_def 3, 8, 0, 0, MAP_ROUTE113 warp_def 4, 8, 0, 0, MAP_ROUTE113 -Route113_GlassWorkshop_MapEvents:: @ 853EAB8 +Route113_GlassWorkshop_MapEvents:: map_events Route113_GlassWorkshop_EventObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index 44a87e5ef..e77f3acc8 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -1,10 +1,10 @@ -Route113_GlassWorkshop: @ 8485CB8 +Route113_GlassWorkshop: .4byte House4_Layout .4byte Route113_GlassWorkshop_MapEvents .4byte Route113_GlassWorkshop_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 67 + .2byte LAYOUT_HOUSE4 .byte MAPSEC_ROUTE_113 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route114/connections.inc b/data/maps/Route114/connections.inc index 760c2ddc0..5c7671c7c 100644 --- a/data/maps/Route114/connections.inc +++ b/data/maps/Route114/connections.inc @@ -1,8 +1,8 @@ -Route114_MapConnectionsList: @ 84869F4 +Route114_MapConnectionsList: connection left, 40, MAP_ROUTE115 connection right, 0, MAP_FALLARBOR_TOWN -Route114_MapConnections: @ 8486A0C - .4byte 0x2 +Route114_MapConnections: + .4byte 2 .4byte Route114_MapConnectionsList diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc index 55ea12195..9f17b54c0 100644 --- a/data/maps/Route114/events.inc +++ b/data/maps/Route114/events.inc @@ -1,4 +1,4 @@ -Route114_EventObjects: @ 8529E68 +Route114_EventObjects: object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 77, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 78, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route114_EventScript_1F2640, 0 @@ -27,14 +27,14 @@ Route114_EventObjects: @ 8529E68 object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route114_EventScript_290E1D, FLAG_ITEM_ROUTE_114_ENERGY_POWDER object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, Route114_EventScript_1F27F2, 0 -Route114_MapWarps: @ 852A0F0 +Route114_MapWarps: warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R warp_def 29, 5, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE warp_def 27, 36, 0, 0, MAP_ROUTE114_LANETTES_HOUSE warp_def 6, 46, 0, 0, MAP_TERRA_CAVE_ENTRANCE warp_def 7, 4, 0, 0, MAP_TERRA_CAVE_ENTRANCE -Route114_MapBGEvents: @ 852A118 +Route114_MapBGEvents: bg_event 7, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F2625 bg_event 31, 7, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1F262E bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1_1 @@ -48,6 +48,6 @@ Route114_MapBGEvents: @ 852A118 bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3 bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_113_REVIVE -Route114_MapEvents:: @ 852A1A8 +Route114_MapEvents:: map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index 318efdbaf..7177662e6 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -1,10 +1,10 @@ -Route114: @ 84827E4 +Route114: .4byte Route114_Layout .4byte Route114_MapEvents .4byte Route114_MapScripts .4byte Route114_MapConnections .2byte MUS_DOORO_X1 - .2byte 30 + .2byte LAYOUT_ROUTE114 .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc index 9c4579c1d..dd3be1a66 100644 --- a/data/maps/Route114_FossilManiacsHouse/events.inc +++ b/data/maps/Route114_FossilManiacsHouse/events.inc @@ -1,17 +1,17 @@ -Route114_FossilManiacsHouse_EventObjects: @ 8533CFC +Route114_FossilManiacsHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_NINJA_BOY, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0 -Route114_FossilManiacsHouse_MapWarps: @ 8533D14 +Route114_FossilManiacsHouse_MapWarps: warp_def 4, 7, 0, 1, MAP_ROUTE114 warp_def 5, 7, 0, 1, MAP_ROUTE114 warp_def 4, 1, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL -Route114_FossilManiacsHouse_MapBGEvents: @ 8533D2C +Route114_FossilManiacsHouse_MapBGEvents: bg_event 5, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD73 bg_event 6, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD73 bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD7C bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_22AD7C -Route114_FossilManiacsHouse_MapEvents:: @ 8533D5C +Route114_FossilManiacsHouse_MapEvents:: map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index ca042d6b4..648359c8f 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -1,10 +1,10 @@ -Route114_FossilManiacsHouse: @ 8483E18 +Route114_FossilManiacsHouse: .4byte Route114_FossilManiacsHouse_Layout .4byte Route114_FossilManiacsHouse_MapEvents .4byte Route114_FossilManiacsHouse_MapScripts .4byte 0x0 .2byte MUS_TONEKUSA - .2byte 119 + .2byte LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route114_FossilManiacsTunnel/events.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc index ba3798f7b..ec9551959 100644 --- a/data/maps/Route114_FossilManiacsTunnel/events.inc +++ b/data/maps/Route114_FossilManiacsTunnel/events.inc @@ -1,15 +1,15 @@ -Route114_FossilManiacsTunnel_EventObjects: @ 8533D70 +Route114_FossilManiacsTunnel_EventObjects: object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0 -Route114_FossilManiacsTunnel_MapWarps: @ 8533D88 +Route114_FossilManiacsTunnel_MapWarps: warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE warp_def 6, 2, 0, 0, MAP_DESERT_UNDERPASS -Route114_FossilManiacsTunnel_MapCoordEvents: @ 8533DA0 +Route114_FossilManiacsTunnel_MapCoordEvents: coord_event 5, 4, 3, VAR_0x40CC, 1, Route114_FossilManiacsTunnel_EventScript_22AF66 coord_event 6, 4, 3, VAR_0x40CC, 1, Route114_FossilManiacsTunnel_EventScript_22AF66 -Route114_FossilManiacsTunnel_MapEvents:: @ 8533DC0 +Route114_FossilManiacsTunnel_MapEvents:: map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, Route114_FossilManiacsTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index be53b84ce..9012e1d40 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -1,10 +1,10 @@ -Route114_FossilManiacsTunnel: @ 8483E34 +Route114_FossilManiacsTunnel: .4byte Route114_FossilManiacsTunnel_Layout .4byte Route114_FossilManiacsTunnel_MapEvents .4byte Route114_FossilManiacsTunnel_MapScripts .4byte 0x0 .2byte MUS_TONEKUSA - .2byte 120 + .2byte LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc index 17030ddc1..ccd082851 100644 --- a/data/maps/Route114_LanettesHouse/events.inc +++ b/data/maps/Route114_LanettesHouse/events.inc @@ -1,15 +1,15 @@ -Route114_LanettesHouse_EventObjects: @ 8533DD4 +Route114_LanettesHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, FLAG_HIDE_LANETTES_HOUSE_LANETTE -Route114_LanettesHouse_MapWarps: @ 8533DEC +Route114_LanettesHouse_MapWarps: warp_def 5, 7, 0, 2, MAP_ROUTE114 warp_def 6, 7, 0, 2, MAP_ROUTE114 -Route114_LanettesHouse_MapBGEvents: @ 8533DFC +Route114_LanettesHouse_MapBGEvents: bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B309 bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B345 bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_22B345 -Route114_LanettesHouse_MapEvents:: @ 8533E20 +Route114_LanettesHouse_MapEvents:: map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index 51023a800..7b5b94963 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -1,10 +1,10 @@ -Route114_LanettesHouse: @ 8483E50 +Route114_LanettesHouse: .4byte Route114_LanettesHouse_Layout .4byte Route114_LanettesHouse_MapEvents .4byte Route114_LanettesHouse_MapScripts .4byte 0x0 .2byte MUS_TONEKUSA - .2byte 121 + .2byte LAYOUT_ROUTE114_LANETTES_HOUSE .byte MAPSEC_ROUTE_114 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route115/connections.inc b/data/maps/Route115/connections.inc index 4518e31fa..a569fd0b5 100644 --- a/data/maps/Route115/connections.inc +++ b/data/maps/Route115/connections.inc @@ -1,8 +1,8 @@ -Route115_MapConnectionsList: @ 8486A14 +Route115_MapConnectionsList: connection down, 0, MAP_RUSTBORO_CITY connection right, -40, MAP_ROUTE114 -Route115_MapConnections: @ 8486A2C - .4byte 0x2 +Route115_MapConnections: + .4byte 2 .4byte Route115_MapConnectionsList diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc index 18179deb1..517711bd5 100644 --- a/data/maps/Route115/events.inc +++ b/data/maps/Route115/events.inc @@ -1,4 +1,4 @@ -Route115_EventObjects: @ 852A1BC +Route115_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 18, 68, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route115_EventScript_1F2973, 0 object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 5, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route115_EventScript_1F298E, 0 object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, Route115_EventScript_1F2A07, 0 @@ -23,12 +23,12 @@ Route115_EventObjects: @ 852A1BC object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 67, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E6B, FLAG_ITEM_ROUTE_115_PP_UP object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_290E5E, FLAG_ITEM_ROUTE_115_HEAL_POWDER -Route115_MapWarps: @ 852A3E4 +Route115_MapWarps: warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R warp_def 21, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE warp_def 36, 10, 0, 0, MAP_TERRA_CAVE_ENTRANCE -Route115_MapBGEvents: @ 852A3FC +Route115_MapBGEvents: bg_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4_2 bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3_2 bg_event 16, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_1F297C @@ -44,6 +44,6 @@ Route115_MapBGEvents: @ 852A3FC bg_secret_base_event 20, 53, 0, SECRET_BASE_RED_CAVE3_1 bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_115_HEART_SCALE -Route115_MapEvents:: @ 852A4A4 +Route115_MapEvents:: map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index 70e831aee..fd3f9b2fc 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -1,10 +1,10 @@ -Route115: @ 8482800 +Route115: .4byte Route115_Layout .4byte Route115_MapEvents .4byte Route115_MapScripts .4byte Route115_MapConnections .2byte MUS_NEXTROAD - .2byte 31 + .2byte LAYOUT_ROUTE115 .byte MAPSEC_ROUTE_115 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route116/connections.inc b/data/maps/Route116/connections.inc index fef193c0f..bbf03097c 100644 --- a/data/maps/Route116/connections.inc +++ b/data/maps/Route116/connections.inc @@ -1,8 +1,8 @@ -Route116_MapConnectionsList: @ 8486A34 +Route116_MapConnectionsList: connection down, 80, MAP_VERDANTURF_TOWN connection left, 0, MAP_RUSTBORO_CITY -Route116_MapConnections: @ 8486A4C - .4byte 0x2 +Route116_MapConnections: + .4byte 2 .4byte Route116_MapConnectionsList diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc index 37c54eb7e..29566f515 100644 --- a/data/maps/Route116/events.inc +++ b/data/maps/Route116/events.inc @@ -1,4 +1,4 @@ -Route116_EventObjects: @ 852A4B8 +Route116_EventObjects: object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 25, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 26, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0 @@ -28,17 +28,17 @@ Route116_EventObjects: @ 852A4B8 object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 36, 13, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 5, Route116_EventScript_1F3086, 0 object_event 28, EVENT_OBJ_GFX_HIKER, 0, 42, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, Route116_EventScript_1F306F, 0 -Route116_MapWarps: @ 852A758 +Route116_MapWarps: warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL warp_def 38, 8, 0, 0, MAP_ROUTE116_TUNNELERS_REST_HOUSE warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL warp_def 59, 13, 0, 0, MAP_TERRA_CAVE_ENTRANCE warp_def 79, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE -Route116_MapCoordEvents: @ 852A780 +Route116_MapCoordEvents: coord_event 47, 9, 3, VAR_0x406F, 1, Route116_EventScript_1F2D95 -Route116_MapBGEvents: @ 852A790 +Route116_MapBGEvents: bg_event 5, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D57 bg_event 48, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D60 bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_1F2D69 @@ -51,6 +51,6 @@ Route116_MapBGEvents: @ 852A790 bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_ROUTE_116_SUPER_POTION bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_ROUTE_116_BLACK_GLASSES -Route116_MapEvents:: @ 852A814 +Route116_MapEvents:: map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index e97885bc7..d4688d63a 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -1,10 +1,10 @@ -Route116: @ 848281C +Route116: .4byte Route116_Layout .4byte Route116_MapEvents .4byte Route116_MapScripts .4byte Route116_MapConnections .2byte MUS_NEXTROAD - .2byte 32 + .2byte LAYOUT_ROUTE116 .byte MAPSEC_ROUTE_116 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route116_TunnelersRestHouse/events.inc b/data/maps/Route116_TunnelersRestHouse/events.inc index 32a4dc0ea..5ecd36317 100644 --- a/data/maps/Route116_TunnelersRestHouse/events.inc +++ b/data/maps/Route116_TunnelersRestHouse/events.inc @@ -1,12 +1,12 @@ -Route116_TunnelersRestHouse_EventObjects: @ 8533E34 +Route116_TunnelersRestHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_M, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0 -Route116_TunnelersRestHouse_MapWarps: @ 8533E7C +Route116_TunnelersRestHouse_MapWarps: warp_def 4, 8, 0, 1, MAP_ROUTE116 warp_def 5, 8, 0, 1, MAP_ROUTE116 -Route116_TunnelersRestHouse_MapEvents:: @ 8533E8C +Route116_TunnelersRestHouse_MapEvents:: map_events Route116_TunnelersRestHouse_EventObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index 1c3abde78..f50a13c93 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -1,10 +1,10 @@ -Route116_TunnelersRestHouse: @ 8483E6C +Route116_TunnelersRestHouse: .4byte Route116_TunnelersRestHouse_Layout .4byte Route116_TunnelersRestHouse_MapEvents .4byte Route116_TunnelersRestHouse_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 122 + .2byte LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE .byte MAPSEC_ROUTE_116 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route117/connections.inc b/data/maps/Route117/connections.inc index 2780eac5a..101690881 100644 --- a/data/maps/Route117/connections.inc +++ b/data/maps/Route117/connections.inc @@ -1,8 +1,8 @@ -Route117_MapConnectionsList: @ 8486A54 +Route117_MapConnectionsList: connection left, 0, MAP_VERDANTURF_TOWN connection right, 0, MAP_MAUVILLE_CITY -Route117_MapConnections: @ 8486A6C - .4byte 0x2 +Route117_MapConnections: + .4byte 2 .4byte Route117_MapConnectionsList diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc index 4cede4040..217068cd3 100644 --- a/data/maps/Route117/events.inc +++ b/data/maps/Route117/events.inc @@ -1,4 +1,4 @@ -Route117_EventObjects: @ 852A828 +Route117_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_1F399A, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_BOY, 0, 25, 5, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP, 2, 2, 0, 0, Route117_EventScript_1F39A3, 0 object_event 3, EVENT_OBJ_GFX_OLD_MAN, 0, 47, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_291C18, 0 @@ -24,15 +24,15 @@ Route117_EventObjects: @ 852A828 object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 21, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route117_EventScript_1F3C65, 0 object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 16, 4, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 4, 1, 1, 4, Route117_EventScript_1F3C37, 0 -Route117_MapWarps: @ 852AA68 +Route117_MapWarps: warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE -Route117_MapBGEvents: @ 852AA70 +Route117_MapBGEvents: bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39B5 bg_event 49, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39BE bg_event 49, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_1F39C7 bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_ROUTE_117_REPEL -Route117_MapEvents:: @ 852AAA0 +Route117_MapEvents:: map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 1d5eda074..4ae1b92e5 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -1,10 +1,10 @@ -Route117: @ 8482838 +Route117: .4byte Route117_Layout .4byte Route117_MapEvents .4byte Route117_MapScripts .4byte Route117_MapConnections .2byte MUS_DOORO_X1 - .2byte 33 + .2byte LAYOUT_ROUTE117 .byte MAPSEC_ROUTE_117 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route117_PokemonDayCare/events.inc b/data/maps/Route117_PokemonDayCare/events.inc index 37a9db0f2..6b5d2cc7a 100644 --- a/data/maps/Route117_PokemonDayCare/events.inc +++ b/data/maps/Route117_PokemonDayCare/events.inc @@ -1,10 +1,10 @@ -Route117_PokemonDayCare_EventObjects: @ 8533EA0 +Route117_PokemonDayCare_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_WOMAN, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0 -Route117_PokemonDayCare_MapWarps: @ 8533EB8 +Route117_PokemonDayCare_MapWarps: warp_def 2, 8, 0, 0, MAP_ROUTE117 warp_def 3, 8, 0, 0, MAP_ROUTE117 -Route117_PokemonDayCare_MapEvents:: @ 8533EC8 +Route117_PokemonDayCare_MapEvents:: map_events Route117_PokemonDayCare_EventObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index ba48de228..827464a75 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -1,10 +1,10 @@ -Route117_PokemonDayCare: @ 8483E88 +Route117_PokemonDayCare: .4byte Route117_PokemonDayCare_Layout .4byte Route117_PokemonDayCare_MapEvents .4byte Route117_PokemonDayCare_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 123 + .2byte LAYOUT_ROUTE117_POKEMON_DAY_CARE .byte MAPSEC_ROUTE_117 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route118/connections.inc b/data/maps/Route118/connections.inc index 8069f036e..54ecf1577 100644 --- a/data/maps/Route118/connections.inc +++ b/data/maps/Route118/connections.inc @@ -1,9 +1,9 @@ -Route118_MapConnectionsList: @ 8486A74 +Route118_MapConnectionsList: connection up, 40, MAP_ROUTE119 connection left, 0, MAP_MAUVILLE_CITY connection right, 0, MAP_ROUTE123 -Route118_MapConnections: @ 8486A98 - .4byte 0x3 +Route118_MapConnections: + .4byte 3 .4byte Route118_MapConnectionsList diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index fe131549f..3dea1c6f6 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -1,4 +1,4 @@ -Route118_EventObjects: @ 852AAB4 +Route118_EventObjects: object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 31, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 32, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 33, BerryTreeScript, 0 @@ -21,16 +21,16 @@ Route118_EventObjects: @ 852AAB4 object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_290ED3, FLAG_ITEM_ROUTE_118_HYPER_POTION object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, Route118_EventScript_1F40A7, 0 -Route118_MapWarps: @ 852ACAC +Route118_MapWarps: warp_def 42, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE warp_def 9, 6, 0, 0, MAP_TERRA_CAVE_ENTRANCE -Route118_MapCoordEvents: @ 852ACBC +Route118_MapCoordEvents: coord_event 43, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3E8E coord_event 44, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EAE coord_event 45, 11, 3, VAR_0x4071, 0, Route118_EventScript_1F3EC4 -Route118_MapBGEvents: @ 852ACEC +Route118_MapBGEvents: bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1 bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E7C bg_event 56, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_1F3E85 @@ -41,6 +41,6 @@ Route118_MapBGEvents: @ 852ACEC bg_hidden_item_event 31, 13, 3, ITEM_IRON, FLAG_HIDDEN_ITEM_ROUTE_118_IRON bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_118_HEART_SCALE -Route118_MapEvents:: @ 852AD58 +Route118_MapEvents:: map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index e0b541643..d38319d96 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -1,10 +1,10 @@ -Route118: @ 8482854 +Route118: .4byte Route118_Layout .4byte Route118_MapEvents .4byte Route118_MapScripts .4byte Route118_MapConnections .2byte MUS_ROUTE_118 - .2byte 34 + .2byte LAYOUT_ROUTE118 .byte MAPSEC_ROUTE_118 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route119/connections.inc b/data/maps/Route119/connections.inc index 4987e049e..067db34f1 100644 --- a/data/maps/Route119/connections.inc +++ b/data/maps/Route119/connections.inc @@ -1,8 +1,8 @@ -Route119_MapConnectionsList: @ 8486AA0 +Route119_MapConnectionsList: connection down, -40, MAP_ROUTE118 connection right, 0, MAP_FORTREE_CITY -Route119_MapConnections: @ 8486AB8 - .4byte 0x2 +Route119_MapConnections: + .4byte 2 .4byte Route119_MapConnectionsList diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc index 86ec2d2be..9942a4c4f 100644 --- a/data/maps/Route119/events.inc +++ b/data/maps/Route119/events.inc @@ -1,4 +1,4 @@ -Route119_EventObjects: @ 852AD6C +Route119_EventObjects: object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 34, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 35, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 36, BerryTreeScript, 0 @@ -43,11 +43,11 @@ Route119_EventObjects: @ 852AD6C object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 42, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_290F3B, FLAG_ITEM_ROUTE_119_ELIXIR_2 object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 28, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_119_SCOTT -Route119_MapWarps: @ 852B174 +Route119_MapWarps: warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE -Route119_MapCoordEvents: @ 852B184 +Route119_MapCoordEvents: coord_event 25, 31, 0, VAR_0x4072, 0, Route119_EventScript_1F4472 coord_event 26, 31, 0, VAR_0x4072, 0, Route119_EventScript_1F447D coord_weather_event 29, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE @@ -72,7 +72,7 @@ Route119_MapCoordEvents: @ 852B184 coord_weather_event 20, 137, 3, COORD_EVENT_WEATHER_SUNNY coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE -Route119_MapBGEvents: @ 852B2F4 +Route119_MapBGEvents: bg_event 9, 33, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F477D bg_event 27, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F4774 bg_secret_base_event 5, 2, 0, SECRET_BASE_SHRUB1_1 @@ -94,6 +94,6 @@ Route119_MapBGEvents: @ 852B2F4 bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_ROUTE_119_MAX_ETHER bg_event 28, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_1F49E3 -Route119_MapEvents:: @ 852B3E4 +Route119_MapEvents:: map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index 7181f6b0d..0e3685b37 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -1,10 +1,10 @@ -Route119: @ 8482870 +Route119: .4byte Route119_Layout .4byte Route119_MapEvents .4byte Route119_MapScripts .4byte Route119_MapConnections .2byte MUS_GRANROAD - .2byte 35 + .2byte LAYOUT_ROUTE119 .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route119_House/events.inc b/data/maps/Route119_House/events.inc index aff8116a7..152deabee 100644 --- a/data/maps/Route119_House/events.inc +++ b/data/maps/Route119_House/events.inc @@ -1,4 +1,4 @@ -Route119_House_EventObjects: @ 853ECD0 +Route119_House_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_House_EventScript_270966, 0 object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 1, 0, 0, Route119_House_EventScript_27096F, 0 @@ -7,10 +7,10 @@ Route119_House_EventObjects: @ 853ECD0 object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_27096F, 0 object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route119_House_EventScript_27096F, 0 -Route119_House_MapWarps: @ 853ED78 +Route119_House_MapWarps: warp_def 3, 8, 0, 1, MAP_ROUTE119 warp_def 4, 8, 0, 1, MAP_ROUTE119 -Route119_House_MapEvents:: @ 853ED88 +Route119_House_MapEvents:: map_events Route119_House_EventObjects, Route119_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index 334b858ec..d7bbbd5ff 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -1,10 +1,10 @@ -Route119_House: @ 8485D28 +Route119_House: .4byte House1_Layout .4byte Route119_House_MapEvents .4byte Route119_House_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc index 6d72fea9c..e8f3b93f8 100644 --- a/data/maps/Route119_WeatherInstitute_1F/events.inc +++ b/data/maps/Route119_WeatherInstitute_1F/events.inc @@ -1,21 +1,21 @@ -Route119_WeatherInstitute_1F_EventObjects: @ 853EB20 +Route119_WeatherInstitute_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, FLAG_HIDE_ROUTE_119_TEAM_AQUA object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, FLAG_HIDE_ROUTE_119_TEAM_AQUA object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS object_event 5, EVENT_OBJ_GFX_NINJA_BOY, 0, 14, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0 -Route119_WeatherInstitute_1F_MapWarps: @ 853EB98 +Route119_WeatherInstitute_1F_MapWarps: warp_def 9, 12, 0, 0, MAP_ROUTE119 warp_def 10, 12, 0, 0, MAP_ROUTE119 warp_def 17, 1, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_2F -Route119_WeatherInstitute_1F_MapBGEvents: @ 853EBB0 +Route119_WeatherInstitute_1F_MapBGEvents: bg_event 1, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 bg_event 0, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_26FB18 -Route119_WeatherInstitute_1F_MapEvents:: @ 853EBE0 +Route119_WeatherInstitute_1F_MapEvents:: map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index e5e7abbc9..be2fe1617 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -1,10 +1,10 @@ -Route119_WeatherInstitute_1F: @ 8485CF0 +Route119_WeatherInstitute_1F: .4byte Route119_WeatherInstitute_1F_Layout .4byte Route119_WeatherInstitute_1F_MapEvents .4byte Route119_WeatherInstitute_1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 271 + .2byte LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc index d2cc64d40..746384820 100644 --- a/data/maps/Route119_WeatherInstitute_2F/events.inc +++ b/data/maps/Route119_WeatherInstitute_2F/events.inc @@ -1,4 +1,4 @@ -Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4 +Route119_WeatherInstitute_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, FLAG_HIDE_ROUTE_119_TEAM_AQUA object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, FLAG_HIDE_ROUTE_119_TEAM_AQUA object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, FLAG_HIDE_ROUTE_119_TEAM_AQUA @@ -8,9 +8,9 @@ Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4 object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 16, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_2F_AQUA_GRUNT_M object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 19, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, FLAG_HIDE_ROUTE_119_TEAM_AQUA -Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4 +Route119_WeatherInstitute_2F_MapWarps: warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F -Route119_WeatherInstitute_2F_MapEvents:: @ 853ECBC +Route119_WeatherInstitute_2F_MapEvents:: map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index c81f9731c..8543b0ed8 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -1,10 +1,10 @@ -Route119_WeatherInstitute_2F: @ 8485D0C +Route119_WeatherInstitute_2F: .4byte Route119_WeatherInstitute_2F_Layout .4byte Route119_WeatherInstitute_2F_MapEvents .4byte Route119_WeatherInstitute_2F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 272 + .2byte LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F .byte MAPSEC_ROUTE_119 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route120/connections.inc b/data/maps/Route120/connections.inc index c599e6a2c..9dda2ecad 100644 --- a/data/maps/Route120/connections.inc +++ b/data/maps/Route120/connections.inc @@ -1,8 +1,8 @@ -Route120_MapConnectionsList: @ 8486AC0 +Route120_MapConnectionsList: connection left, 0, MAP_FORTREE_CITY connection right, 80, MAP_ROUTE121 -Route120_MapConnections: @ 8486AD8 - .4byte 0x2 +Route120_MapConnections: + .4byte 2 .4byte Route120_MapConnectionsList diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc index 24b289060..d198dff3c 100644 --- a/data/maps/Route120/events.inc +++ b/data/maps/Route120/events.inc @@ -1,4 +1,4 @@ -Route120_EventObjects: @ 852B3F8 +Route120_EventObjects: object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 46, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 45, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 44, BerryTreeScript, 0 @@ -44,11 +44,11 @@ Route120_EventObjects: @ 852B3F8 object_event 43, EVENT_OBJ_GFX_MAN_3, 0, 14, 34, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route120_EventScript_1F596A, 0 object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 24, 33, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F7C, FLAG_ITEM_ROUTE_120_REVIVE -Route120_MapWarps: @ 852B818 +Route120_MapWarps: warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB -Route120_MapCoordEvents: @ 852B828 +Route120_MapCoordEvents: coord_weather_event 7, 15, 0, COORD_EVENT_WEATHER_RAIN_LIGHT coord_weather_event 7, 16, 0, COORD_EVENT_WEATHER_RAIN_LIGHT coord_weather_event 22, 61, 3, COORD_EVENT_WEATHER_RAIN_LIGHT @@ -69,7 +69,7 @@ Route120_MapCoordEvents: @ 852B828 coord_weather_event 12, 75, 3, COORD_EVENT_WEATHER_CLOUDS coord_weather_event 13, 75, 3, COORD_EVENT_WEATHER_CLOUDS -Route120_MapBGEvents: @ 852B958 +Route120_MapBGEvents: bg_event 27, 3, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57C5 bg_event 38, 88, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1F57CE bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3_1 @@ -85,6 +85,6 @@ Route120_MapBGEvents: @ 852B958 bg_hidden_item_event 24, 42, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_ROUTE_120_ZINC bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4 -Route120_MapEvents:: @ 852BA00 +Route120_MapEvents:: map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 626b57a94..4d48d8b33 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -1,10 +1,10 @@ -Route120: @ 848288C +Route120: .4byte Route120_Layout .4byte Route120_MapEvents .4byte Route120_MapScripts .4byte Route120_MapConnections .2byte MUS_DOORO_X3 - .2byte 36 + .2byte LAYOUT_ROUTE120 .byte MAPSEC_ROUTE_120 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route121/connections.inc b/data/maps/Route121/connections.inc index 94116a03e..6d9bd9ae4 100644 --- a/data/maps/Route121/connections.inc +++ b/data/maps/Route121/connections.inc @@ -1,9 +1,9 @@ -Route121_MapConnectionsList: @ 8486AE0 +Route121_MapConnectionsList: connection down, 20, MAP_ROUTE122 connection left, -80, MAP_ROUTE120 connection right, -10, MAP_LILYCOVE_CITY -Route121_MapConnections: @ 8486B04 - .4byte 0x3 +Route121_MapConnections: + .4byte 3 .4byte Route121_MapConnectionsList diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index 432071ed1..5e637bb7e 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -1,4 +1,4 @@ -Route121_EventObjects: @ 852BA14 +Route121_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 29, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route121_EventScript_1F5DFD, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 47, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 48, BerryTreeScript, 0 @@ -29,16 +29,16 @@ Route121_EventObjects: @ 852BA14 object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 60, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290F96, FLAG_ITEM_ROUTE_121_REVIVE object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 38, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_290FA3, FLAG_ITEM_ROUTE_121_ZINC -Route121_MapWarps: @ 852BCCC +Route121_MapWarps: warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE -Route121_MapCoordEvents: @ 852BCD4 +Route121_MapCoordEvents: coord_event 25, 5, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 coord_event 25, 6, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 coord_event 25, 7, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 coord_event 25, 8, 3, VAR_0x4074, 0, Route121_EventScript_1F5E18 -Route121_MapBGEvents: @ 852BD14 +Route121_MapBGEvents: bg_event 32, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_1F5E06 bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2_2 bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3_2 @@ -50,6 +50,6 @@ Route121_MapBGEvents: @ 852BD14 bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_ROUTE_121_FULL_HEAL bg_hidden_item_event 68, 8, 3, ITEM_MAX_REVIVE, FLAG_HIDDEN_ITEM_ROUTE_121_MAX_REVIVE -Route121_MapEvents:: @ 852BD8C +Route121_MapEvents:: map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 3f070c2ec..04cee6942 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -1,10 +1,10 @@ -Route121: @ 84828A8 +Route121: .4byte Route121_Layout .4byte Route121_MapEvents .4byte Route121_MapScripts .4byte Route121_MapConnections .2byte MUS_DOORO_X3 - .2byte 37 + .2byte LAYOUT_ROUTE121 .byte MAPSEC_ROUTE_121 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc index 658be476f..73c836cff 100644 --- a/data/maps/Route121_SafariZoneEntrance/events.inc +++ b/data/maps/Route121_SafariZoneEntrance/events.inc @@ -1,20 +1,20 @@ -Route121_SafariZoneEntrance_EventObjects: @ 8533EDC +Route121_SafariZoneEntrance_EventObjects: object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0 object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0 object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 -Route121_SafariZoneEntrance_MapWarps: @ 8533F24 +Route121_SafariZoneEntrance_MapWarps: warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH warp_def 3, 5, 0, 0, MAP_SAFARI_ZONE_SOUTH warp_def 14, 13, 0, 0, MAP_ROUTE121 warp_def 15, 13, 0, 0, MAP_ROUTE121 -Route121_SafariZoneEntrance_MapCoordEvents: @ 8533F44 +Route121_SafariZoneEntrance_MapCoordEvents: coord_event 8, 4, 3, VAR_TEMP_1, 0, Route121_SafariZoneEntrance_EventScript_22BC18 -Route121_SafariZoneEntrance_MapBGEvents: @ 8533F54 +Route121_SafariZoneEntrance_MapBGEvents: bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_SafariZoneEntrance_EventScript_22BD21 -Route121_SafariZoneEntrance_MapEvents:: @ 8533F60 +Route121_SafariZoneEntrance_MapEvents:: map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index fa645a693..b23cdeccc 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -1,10 +1,10 @@ -Route121_SafariZoneEntrance: @ 8483EA4 +Route121_SafariZoneEntrance: .4byte Route121_SafariZoneEntrance_Layout .4byte Route121_SafariZoneEntrance_MapEvents .4byte Route121_SafariZoneEntrance_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 124 + .2byte LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE .byte MAPSEC_ROUTE_121 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route122/connections.inc b/data/maps/Route122/connections.inc index 2a0442a05..a5a9f4fd6 100644 --- a/data/maps/Route122/connections.inc +++ b/data/maps/Route122/connections.inc @@ -1,8 +1,8 @@ -Route122_MapConnectionsList: @ 8486B0C +Route122_MapConnectionsList: connection up, -20, MAP_ROUTE121 connection down, -100, MAP_ROUTE123 -Route122_MapConnections: @ 8486B24 - .4byte 0x2 +Route122_MapConnections: + .4byte 2 .4byte Route122_MapConnectionsList diff --git a/data/maps/Route122/events.inc b/data/maps/Route122/events.inc index 4c5b9b464..8eb4dbb2c 100644 --- a/data/maps/Route122/events.inc +++ b/data/maps/Route122/events.inc @@ -1,6 +1,6 @@ -Route122_MapWarps: @ 852BDA0 +Route122_MapWarps: warp_def 22, 29, 0, 0, MAP_MT_PYRE_1F -Route122_MapEvents:: @ 852BDA8 +Route122_MapEvents:: map_events 0x0, Route122_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index eddd1a234..941fff7a3 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -1,10 +1,10 @@ -Route122: @ 84828C4 +Route122: .4byte Route122_Layout .4byte Route122_MapEvents .4byte Route122_MapScripts .4byte Route122_MapConnections .2byte MUS_DOORO_X4 - .2byte 38 + .2byte LAYOUT_ROUTE122 .byte MAPSEC_ROUTE_122 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route123/connections.inc b/data/maps/Route123/connections.inc index 616c365ef..e2125c911 100644 --- a/data/maps/Route123/connections.inc +++ b/data/maps/Route123/connections.inc @@ -1,8 +1,8 @@ -Route123_MapConnectionsList: @ 8486B2C +Route123_MapConnectionsList: connection up, 100, MAP_ROUTE122 connection left, 0, MAP_ROUTE118 -Route123_MapConnections: @ 8486B44 - .4byte 0x2 +Route123_MapConnections: + .4byte 2 .4byte Route123_MapConnectionsList diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc index d45ac0222..2584ebbd3 100644 --- a/data/maps/Route123/events.inc +++ b/data/maps/Route123/events.inc @@ -1,4 +1,4 @@ -Route123_EventObjects: @ 852BDBC +Route123_EventObjects: object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 58, BerryTreeScript, 0 object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 59, BerryTreeScript, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 60, BerryTreeScript, 0 @@ -43,10 +43,10 @@ Route123_EventObjects: @ 852BDBC object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 14, 12, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 3, Route123_EventScript_1F63A5, 0 object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 57, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_290FE4, FLAG_ITEM_ROUTE_123_REVIVAL_HERB -Route123_MapWarps: @ 852C1C4 +Route123_MapWarps: warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE -Route123_MapCoordEvents: @ 852C1CC +Route123_MapCoordEvents: coord_weather_event 90, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE coord_weather_event 92, 9, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE coord_weather_event 93, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE @@ -70,7 +70,7 @@ Route123_MapCoordEvents: @ 852C1CC coord_weather_event 9, 16, 3, COORD_EVENT_WEATHER_SUNNY coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE -Route123_MapBGEvents: @ 852C32C +Route123_MapBGEvents: bg_event 117, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_1F61B3 bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2 bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2 @@ -83,6 +83,6 @@ Route123_MapBGEvents: @ 852C32C bg_hidden_item_event 139, 15, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_ROUTE_123_PP_UP bg_hidden_item_event 138, 18, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_ROUTE_123_RARE_CANDY -Route123_MapEvents:: @ 852C3B0 +Route123_MapEvents:: map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index a215c3592..2a0120cfd 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -1,10 +1,10 @@ -Route123: @ 84828E0 +Route123: .4byte Route123_Layout .4byte Route123_MapEvents .4byte Route123_MapScripts .4byte Route123_MapConnections .2byte MUS_DOORO_X4 - .2byte 39 + .2byte LAYOUT_ROUTE123 .byte MAPSEC_ROUTE_123 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route123_BerryMastersHouse/events.inc b/data/maps/Route123_BerryMastersHouse/events.inc index 3462054cb..4ad6c2b63 100644 --- a/data/maps/Route123_BerryMastersHouse/events.inc +++ b/data/maps/Route123_BerryMastersHouse/events.inc @@ -1,11 +1,11 @@ -Route123_BerryMastersHouse_EventObjects: @ 853EACC +Route123_BerryMastersHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0 object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0 -Route123_BerryMastersHouse_MapWarps: @ 853EAFC +Route123_BerryMastersHouse_MapWarps: warp_def 3, 7, 0, 0, MAP_ROUTE123 warp_def 4, 7, 0, 0, MAP_ROUTE123 -Route123_BerryMastersHouse_MapEvents:: @ 853EB0C +Route123_BerryMastersHouse_MapEvents:: map_events Route123_BerryMastersHouse_EventObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 163625aae..158471eaa 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -1,10 +1,10 @@ -Route123_BerryMastersHouse: @ 8485CD4 +Route123_BerryMastersHouse: .4byte House2_Layout .4byte Route123_BerryMastersHouse_MapEvents .4byte Route123_BerryMastersHouse_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_ROUTE_123 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route124/connections.inc b/data/maps/Route124/connections.inc index ed10daab9..959719385 100644 --- a/data/maps/Route124/connections.inc +++ b/data/maps/Route124/connections.inc @@ -1,11 +1,11 @@ -Route124_MapConnectionsList: @ 8486B4C +Route124_MapConnectionsList: connection down, 0, MAP_ROUTE126 connection left, 10, MAP_LILYCOVE_CITY connection right, 0, MAP_ROUTE125 connection right, 40, MAP_MOSSDEEP_CITY connection dive, 0, MAP_UNDERWATER1 -Route124_MapConnections: @ 8486B88 - .4byte 0x5 +Route124_MapConnections: + .4byte 5 .4byte Route124_MapConnectionsList diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc index 4b52615fc..4096396e8 100644 --- a/data/maps/Route124/events.inc +++ b/data/maps/Route124/events.inc @@ -1,4 +1,4 @@ -Route124_EventObjects: @ 852C3C4 +Route124_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 34, 25, 1, MOVEMENT_TYPE_LOOK_AROUND, 5, 0, 1, 3, Route124_EventScript_1F6585, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 61, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 5, 3, 1, 7, Route124_EventScript_1F659C, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0 @@ -12,12 +12,12 @@ Route124_EventObjects: @ 852C3C4 object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 29, 1, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 5, Route124_EventScript_1F670B, 0 object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 74, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route124_EventScript_1F6722, 0 -Route124_MapWarps: @ 852C4E4 +Route124_MapWarps: warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE -Route124_MapBGEvents: @ 852C4EC +Route124_MapBGEvents: bg_event 73, 48, 3, BG_EVENT_PLAYER_FACING_ANY, Route124_EventScript_1F657C -Route124_MapEvents:: @ 852C4F8 +Route124_MapEvents:: map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index c9ae442b7..189d0dc51 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -1,10 +1,10 @@ -Route124: @ 84828FC +Route124: .4byte Route124_Layout .4byte Route124_MapEvents .4byte Route124_MapScripts .4byte Route124_MapConnections .2byte MUS_DOORO_X3 - .2byte 40 + .2byte LAYOUT_ROUTE124 .byte MAPSEC_ROUTE_124 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc index 30dffed32..4cff6a1f3 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc @@ -1,12 +1,13 @@ -Route124_DivingTreasureHuntersHouse_EventObjects: @ 853ED9C +Route124_DivingTreasureHuntersHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0 -Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4 +Route124_DivingTreasureHuntersHouse_MapWarps: warp_def 3, 8, 0, 0, MAP_ROUTE124 warp_def 4, 8, 0, 0, MAP_ROUTE124 -Route124_DivingTreasureHuntersHouse_MapBGEvents: @ 853EDC4 +Route124_DivingTreasureHuntersHouse_MapBGEvents: bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route124_DivingTreasureHuntersHouse_EventScript_270F63 -Route124_DivingTreasureHuntersHouse_MapEvents:: @ 853EDD0 +Route124_DivingTreasureHuntersHouse_MapEvents:: map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents + diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index db9097ce5..46358f337 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -1,10 +1,10 @@ -Route124_DivingTreasureHuntersHouse: @ 8485D44 +Route124_DivingTreasureHuntersHouse: .4byte Route124_DivingTreasureHuntersHouse_Layout .4byte Route124_DivingTreasureHuntersHouse_MapEvents .4byte Route124_DivingTreasureHuntersHouse_MapScripts .4byte 0x0 .2byte MUS_MINAMO - .2byte 301 + .2byte LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE .byte MAPSEC_ROUTE_124 .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Route125/connections.inc b/data/maps/Route125/connections.inc index 2b5f944c9..61ea9f029 100644 --- a/data/maps/Route125/connections.inc +++ b/data/maps/Route125/connections.inc @@ -1,9 +1,9 @@ -Route125_MapConnectionsList: @ 8486B90 +Route125_MapConnectionsList: connection down, 0, MAP_MOSSDEEP_CITY connection left, 0, MAP_ROUTE124 connection dive, 0, MAP_UNDERWATER7 -Route125_MapConnections: @ 8486BB4 - .4byte 0x3 +Route125_MapConnections: + .4byte 3 .4byte Route125_MapConnectionsList diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc index 256802406..e278d6e24 100644 --- a/data/maps/Route125/events.inc +++ b/data/maps/Route125/events.inc @@ -1,4 +1,4 @@ -Route125_EventObjects: @ 852C50C +Route125_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 31, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 2, 5, 1, 2, Route125_EventScript_1F67BB, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 38, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0 @@ -10,15 +10,15 @@ Route125_EventObjects: @ 852C50C object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 48, 19, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 2, 1, 1, 3, Route125_EventScript_1F68AF, 0 object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 46, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route125_EventScript_291018, FLAG_ITEM_ROUTE_125_BIG_PEARL -Route125_MapWarps: @ 852C5FC +Route125_MapWarps: warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM -Route125_MapBGEvents: @ 852C604 +Route125_MapBGEvents: bg_secret_base_event 53, 10, 0, SECRET_BASE_RED_CAVE1_2 bg_secret_base_event 55, 11, 0, SECRET_BASE_RED_CAVE4_2 bg_secret_base_event 7, 25, 0, SECRET_BASE_YELLOW_CAVE2_2 bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4_2 -Route125_MapEvents:: @ 852C634 +Route125_MapEvents:: map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index 12ea80531..b3a7308f3 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -1,10 +1,10 @@ -Route125: @ 8482918 +Route125: .4byte Route125_Layout .4byte Route125_MapEvents .4byte Route125_MapScripts .4byte Route125_MapConnections .2byte MUS_DOORO_X3 - .2byte 41 + .2byte LAYOUT_ROUTE125 .byte MAPSEC_ROUTE_125 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route126/connections.inc b/data/maps/Route126/connections.inc index b1f0f6d81..5784faa25 100644 --- a/data/maps/Route126/connections.inc +++ b/data/maps/Route126/connections.inc @@ -1,9 +1,9 @@ -Route126_MapConnectionsList: @ 8486BBC +Route126_MapConnectionsList: connection up, 0, MAP_ROUTE124 connection right, 0, MAP_ROUTE127 connection dive, 0, MAP_UNDERWATER2 -Route126_MapConnections: @ 8486BE0 - .4byte 0x3 +Route126_MapConnections: + .4byte 3 .4byte Route126_MapConnectionsList diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc index 8754a0006..04355d668 100644 --- a/data/maps/Route126/events.inc +++ b/data/maps/Route126/events.inc @@ -1,4 +1,4 @@ -Route126_EventObjects: @ 852C648 +Route126_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 51, 65, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 3, 1, 3, Route126_EventScript_1F68D6, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 22, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 63, 43, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route126_EventScript_1F6904, 0 @@ -9,6 +9,6 @@ Route126_EventObjects: @ 852C648 object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 1, 1, 1, 7, Route126_EventScript_1F6949, 0 object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 56, 5, 1, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 1, 1, 1, 7, Route126_EventScript_1F6932, 0 -Route126_MapEvents:: @ 852C720 +Route126_MapEvents:: map_events Route126_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index 86225727f..f0eabeeba 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -1,10 +1,10 @@ -Route126: @ 8482934 +Route126: .4byte Route126_Layout .4byte Route126_MapEvents .4byte Route126_MapScripts .4byte Route126_MapConnections .2byte MUS_DOORO_X3 - .2byte 42 + .2byte LAYOUT_ROUTE126 .byte MAPSEC_ROUTE_126 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route127/connections.inc b/data/maps/Route127/connections.inc index 3ad7057a3..8dcdf7978 100644 --- a/data/maps/Route127/connections.inc +++ b/data/maps/Route127/connections.inc @@ -1,10 +1,10 @@ -Route127_MapConnectionsList: @ 8486BE8 +Route127_MapConnectionsList: connection up, 0, MAP_MOSSDEEP_CITY connection down, 0, MAP_ROUTE128 connection left, 0, MAP_ROUTE126 connection dive, 0, MAP_UNDERWATER3 -Route127_MapConnections: @ 8486C18 - .4byte 0x4 +Route127_MapConnections: + .4byte 4 .4byte Route127_MapConnectionsList diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc index 78dc26899..7b9e040d3 100644 --- a/data/maps/Route127/events.inc +++ b/data/maps/Route127/events.inc @@ -1,4 +1,4 @@ -Route127_EventObjects: @ 852C734 +Route127_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 45, 42, 1, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 68, 1, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_291032, FLAG_ITEM_ROUTE_127_ZINC @@ -11,13 +11,13 @@ Route127_EventObjects: @ 852C734 object_event 10, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, Route127_EventScript_1F6ABF, 0 object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_29104C, FLAG_ITEM_ROUTE_127_RARE_CANDY -Route127_MapBGEvents: @ 852C83C +Route127_MapBGEvents: bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1 bg_secret_base_event 59, 72, 0, SECRET_BASE_YELLOW_CAVE3_2 bg_secret_base_event 67, 63, 0, SECRET_BASE_YELLOW_CAVE4_1 bg_secret_base_event 61, 21, 0, SECRET_BASE_YELLOW_CAVE3_3 bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1_3 -Route127_MapEvents:: @ 852C878 +Route127_MapEvents:: map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index b237a42ab..0a7055f1c 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -1,10 +1,10 @@ -Route127: @ 8482950 +Route127: .4byte Route127_Layout .4byte Route127_MapEvents .4byte Route127_MapScripts .4byte Route127_MapConnections .2byte MUS_DOORO_X3 - .2byte 43 + .2byte LAYOUT_ROUTE127 .byte MAPSEC_ROUTE_127 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route128/connections.inc b/data/maps/Route128/connections.inc index 5b2f0665d..b958dbd3b 100644 --- a/data/maps/Route128/connections.inc +++ b/data/maps/Route128/connections.inc @@ -1,10 +1,10 @@ -Route128_MapConnectionsList: @ 8486C20 +Route128_MapConnectionsList: connection up, 0, MAP_ROUTE127 connection down, 0, MAP_ROUTE129 connection right, -40, MAP_EVER_GRANDE_CITY connection dive, 0, MAP_UNDERWATER4 -Route128_MapConnections: @ 8486C50 - .4byte 0x4 +Route128_MapConnections: + .4byte 4 .4byte Route128_MapConnectionsList diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc index 792ff5ca3..6a449b761 100644 --- a/data/maps/Route128/events.inc +++ b/data/maps/Route128/events.inc @@ -1,4 +1,4 @@ -Route128_EventObjects: @ 852C88C +Route128_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 33, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, 5, 5, 1, 3, Route128_EventScript_1F6CBE, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 78, 24, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0 object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_128_STEVEN @@ -10,11 +10,11 @@ Route128_EventObjects: @ 852C88C object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 101, 29, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 4, Route128_EventScript_1F6DDE, 0 object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 101, 22, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 4, Route128_EventScript_1F6DC7, 0 -Route128_MapBGEvents: @ 852C97C +Route128_MapBGEvents: bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_1 bg_hidden_item_event 57, 21, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_2 bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_ROUTE_128_HEART_SCALE_3 -Route128_MapEvents:: @ 852C9A0 +Route128_MapEvents:: map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index 2875033e9..33894ba7c 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -1,10 +1,10 @@ -Route128: @ 848296C +Route128: .4byte Route128_Layout .4byte Route128_MapEvents .4byte Route128_MapScripts .4byte Route128_MapConnections .2byte MUS_DOORO_X3 - .2byte 44 + .2byte LAYOUT_ROUTE128 .byte MAPSEC_ROUTE_128 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route129/connections.inc b/data/maps/Route129/connections.inc index 1293e8235..c486c13cb 100644 --- a/data/maps/Route129/connections.inc +++ b/data/maps/Route129/connections.inc @@ -1,9 +1,9 @@ -Route129_MapConnectionsList: @ 8486C58 +Route129_MapConnectionsList: connection up, 0, MAP_ROUTE128 connection left, 0, MAP_ROUTE130 connection dive, 0, MAP_UNDERWATER5 -Route129_MapConnections: @ 8486C7C - .4byte 0x3 +Route129_MapConnections: + .4byte 3 .4byte Route129_MapConnectionsList diff --git a/data/maps/Route129/events.inc b/data/maps/Route129/events.inc index c127ec5e3..3919274cd 100644 --- a/data/maps/Route129/events.inc +++ b/data/maps/Route129/events.inc @@ -1,10 +1,10 @@ -Route129_EventObjects: @ 852C9B4 +Route129_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 4, 1, 3, Route129_EventScript_1F72EC, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 14, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 5, 2, 1, 2, Route129_EventScript_1F7303, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 22, 1, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 1, 1, 1, 5, Route129_EventScript_1F7331, 0 object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 35, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, Route129_EventScript_1F731A, 0 object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 13, 27, 1, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 1, 1, 1, 5, Route129_EventScript_1F7348, 0 -Route129_MapEvents:: @ 852CA2C +Route129_MapEvents:: map_events Route129_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index 645cc7d92..fd3cae801 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -1,10 +1,10 @@ -Route129: @ 8482988 +Route129: .4byte Route129_Layout .4byte Route129_MapEvents .4byte Route129_MapScripts .4byte Route129_MapConnections .2byte MUS_GRANROAD - .2byte 45 + .2byte LAYOUT_ROUTE129 .byte MAPSEC_ROUTE_129 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route130/connections.inc b/data/maps/Route130/connections.inc index b977d43bc..4300eaae4 100644 --- a/data/maps/Route130/connections.inc +++ b/data/maps/Route130/connections.inc @@ -1,8 +1,8 @@ -Route130_MapConnectionsList: @ 8486C84 +Route130_MapConnectionsList: connection left, 0, MAP_ROUTE131 connection right, 0, MAP_ROUTE129 -Route130_MapConnections: @ 8486C9C - .4byte 0x2 +Route130_MapConnections: + .4byte 2 .4byte Route130_MapConnectionsList diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc index 97532e576..b07cc1001 100644 --- a/data/maps/Route130/events.inc +++ b/data/maps/Route130/events.inc @@ -1,9 +1,9 @@ -Route130_EventObjects: @ 852CA40 +Route130_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 70, 21, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 3, 6, 1, 3, Route130_EventScript_1F73BF, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 7, 21, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 5, Route130_EventScript_1F73D6, 0 object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, BerryTreeScript, FLAG_TEMP_11 object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 30, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 4, 1, 5, Route130_EventScript_1F73ED, 0 -Route130_MapEvents:: @ 852CAA0 +Route130_MapEvents:: map_events Route130_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index 4c03656ac..5afd25eda 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -1,10 +1,10 @@ -Route130: @ 84829A4 +Route130: .4byte Route130_Layout .4byte Route130_MapEvents .4byte Route130_MapScripts .4byte Route130_MapConnections .2byte MUS_GRANROAD - .2byte 263 + .2byte LAYOUT_ROUTE130 .byte MAPSEC_ROUTE_130 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route131/connections.inc b/data/maps/Route131/connections.inc index 150ea7023..9697ba1e0 100644 --- a/data/maps/Route131/connections.inc +++ b/data/maps/Route131/connections.inc @@ -1,8 +1,8 @@ -Route131_MapConnectionsList: @ 8486CA4 +Route131_MapConnectionsList: connection left, 0, MAP_PACIFIDLOG_TOWN connection right, 0, MAP_ROUTE130 -Route131_MapConnections: @ 8486CBC - .4byte 0x2 +Route131_MapConnections: + .4byte 2 .4byte Route131_MapConnectionsList diff --git a/data/maps/Route131/events.inc b/data/maps/Route131/events.inc index 1c321a6cb..4f57f7b1c 100644 --- a/data/maps/Route131/events.inc +++ b/data/maps/Route131/events.inc @@ -1,4 +1,4 @@ -Route131_EventObjects: @ 852CAB4 +Route131_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 41, 32, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, 5, 7, 1, 3, Route131_EventScript_1F7429, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 19, 1, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 7, 1, 4, Route131_EventScript_1F7440, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 22, 1, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 6, 0, 1, 4, Route131_EventScript_1F7457, 0 @@ -8,9 +8,9 @@ Route131_EventObjects: @ 852CAB4 object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 20, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 3, 1, 5, Route131_EventScript_1F74D2, 0 object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 52, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 1, 3, 1, 5, Route131_EventScript_1F74BB, 0 -Route131_MapWarps: @ 852CB74 +Route131_MapWarps: warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE -Route131_MapEvents:: @ 852CB7C +Route131_MapEvents:: map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0 diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index e84799fd4..177dba5ab 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -1,10 +1,10 @@ -Route131: @ 84829C0 +Route131: .4byte Route131_Layout .4byte Route131_MapEvents .4byte Route131_MapScripts .4byte Route131_MapConnections .2byte MUS_GRANROAD - .2byte 47 + .2byte LAYOUT_ROUTE131 .byte MAPSEC_ROUTE_131 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route132/connections.inc b/data/maps/Route132/connections.inc index 5a70e3471..48999eb5c 100644 --- a/data/maps/Route132/connections.inc +++ b/data/maps/Route132/connections.inc @@ -1,8 +1,8 @@ -Route132_MapConnectionsList: @ 8486CC4 +Route132_MapConnectionsList: connection left, 0, MAP_ROUTE133 connection right, 0, MAP_PACIFIDLOG_TOWN -Route132_MapConnections: @ 8486CDC - .4byte 0x2 +Route132_MapConnections: + .4byte 2 .4byte Route132_MapConnectionsList diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc index da648b925..8ced11205 100644 --- a/data/maps/Route132/events.inc +++ b/data/maps/Route132/events.inc @@ -1,4 +1,4 @@ -Route132_EventObjects: @ 852CB90 +Route132_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 40, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route132_EventScript_1F74EA, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 10, 6, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 2, Route132_EventScript_1F7501, 0 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_291059, FLAG_ITEM_ROUTE_132_RARE_CANDY @@ -10,6 +10,6 @@ Route132_EventObjects: @ 852CB90 object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 21, 25, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 1, 4, 1, 4, Route132_EventScript_1F7574, 0 object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route132_EventScript_291066, FLAG_ITEM_ROUTE_132_PROTEIN -Route132_MapEvents:: @ 852CC80 +Route132_MapEvents:: map_events Route132_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index 50630af03..06e0ac05d 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -1,10 +1,10 @@ -Route132: @ 84829DC +Route132: .4byte Route132_Layout .4byte Route132_MapEvents .4byte Route132_MapScripts .4byte Route132_MapConnections .2byte MUS_GRANROAD - .2byte 48 + .2byte LAYOUT_ROUTE132 .byte MAPSEC_ROUTE_132 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route133/connections.inc b/data/maps/Route133/connections.inc index 1f22ea960..6a7777c4b 100644 --- a/data/maps/Route133/connections.inc +++ b/data/maps/Route133/connections.inc @@ -1,8 +1,8 @@ -Route133_MapConnectionsList: @ 8486CE4 +Route133_MapConnectionsList: connection left, 0, MAP_ROUTE134 connection right, 0, MAP_ROUTE132 -Route133_MapConnections: @ 8486CFC - .4byte 0x2 +Route133_MapConnections: + .4byte 2 .4byte Route133_MapConnectionsList diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc index 36f8b747d..641489016 100644 --- a/data/maps/Route133/events.inc +++ b/data/maps/Route133/events.inc @@ -1,4 +1,4 @@ -Route133_EventObjects: @ 852CC94 +Route133_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 68, 27, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 2, 1, 3, Route133_EventScript_1F75A3, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 13, 3, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0 object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 28, 1, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 2, 1, 3, Route133_EventScript_1F75BA, 0 @@ -10,6 +10,6 @@ Route133_EventObjects: @ 852CC94 object_event 9, EVENT_OBJ_GFX_EXPERT_M, 0, 56, 15, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, Route133_EventScript_1F762D, 0 object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 48, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route133_EventScript_29108D, FLAG_ITEM_ROUTE_133_MAX_REVIVE -Route133_MapEvents:: @ 852CD84 +Route133_MapEvents:: map_events Route133_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index ed6b7d2ce..2d4cc8a66 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -1,10 +1,10 @@ -Route133: @ 84829F8 +Route133: .4byte Route133_Layout .4byte Route133_MapEvents .4byte Route133_MapScripts .4byte Route133_MapConnections .2byte MUS_GRANROAD - .2byte 49 + .2byte LAYOUT_ROUTE133 .byte MAPSEC_ROUTE_133 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/Route134/connections.inc b/data/maps/Route134/connections.inc index 861c82b4d..30989b374 100644 --- a/data/maps/Route134/connections.inc +++ b/data/maps/Route134/connections.inc @@ -1,8 +1,8 @@ -Route134_MapConnectionsList: @ 8486D04 +Route134_MapConnectionsList: connection left, 0, MAP_SLATEPORT_CITY connection right, 0, MAP_ROUTE133 -Route134_MapConnections: @ 8486D1C - .4byte 0x2 +Route134_MapConnections: + .4byte 2 .4byte Route134_MapConnectionsList diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc index 8caf4da1e..83e693c26 100644 --- a/data/maps/Route134/events.inc +++ b/data/maps/Route134/events.inc @@ -1,4 +1,4 @@ -Route134_EventObjects: @ 852CD98 +Route134_EventObjects: object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 49, 9, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 3, 5, 1, 2, Route134_EventScript_1F7653, 0 object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 58, 7, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route134_EventScript_1F766A, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 41, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route134_EventScript_1F7698, 0 @@ -11,6 +11,6 @@ Route134_EventObjects: @ 852CD98 object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 50, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_29109A, FLAG_ITEM_ROUTE_134_CARBOS object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 27, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route134_EventScript_2910A7, FLAG_ITEM_ROUTE_134_STAR_PIECE -Route134_MapEvents:: @ 852CEA0 +Route134_MapEvents:: map_events Route134_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 8204e2815..87bddf5c7 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -1,10 +1,10 @@ -Route134: @ 8482A14 +Route134: .4byte Route134_Layout .4byte Route134_MapEvents .4byte Route134_MapScripts .4byte Route134_MapConnections .2byte MUS_GRANROAD - .2byte 50 + .2byte LAYOUT_ROUTE134 .byte MAPSEC_ROUTE_134 .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/RustboroCity/connections.inc b/data/maps/RustboroCity/connections.inc index dbca1662d..c2921111f 100644 --- a/data/maps/RustboroCity/connections.inc +++ b/data/maps/RustboroCity/connections.inc @@ -1,9 +1,9 @@ -RustboroCity_MapConnectionsList: @ 8486758 +RustboroCity_MapConnectionsList: connection up, 0, MAP_ROUTE115 connection down, 0, MAP_ROUTE104 connection right, 0, MAP_ROUTE116 -RustboroCity_MapConnections: @ 848677C - .4byte 0x3 +RustboroCity_MapConnections: + .4byte 3 .4byte RustboroCity_MapConnectionsList diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc index b2bcfa7ca..ecf816f7d 100644 --- a/data/maps/RustboroCity/events.inc +++ b/data/maps/RustboroCity/events.inc @@ -1,4 +1,4 @@ -RustboroCity_EventObjects: @ 85267E0 +RustboroCity_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_1E088A, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_1E085F, 0 object_event 3, EVENT_OBJ_GFX_NINJA_BOY, 0, 25, 37, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0 @@ -16,7 +16,7 @@ RustboroCity_EventObjects: @ 85267E0 object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 11, 15, 0, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, FLAG_HIDE_RUSTBORO_CITY_SCIENTIST object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 31, 36, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 1, 0, 0, RustboroCity_EventScript_1E1236, 0 -RustboroCity_MapWarps: @ 8526960 +RustboroCity_MapWarps: warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM warp_def 13, 30, 0, 0, MAP_RUSTBORO_CITY_FLAT1_1F warp_def 16, 45, 0, 0, MAP_RUSTBORO_CITY_MART @@ -30,7 +30,7 @@ RustboroCity_MapWarps: @ 8526960 warp_def 5, 51, 0, 0, MAP_RUSTBORO_CITY_FLAT2_1F warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3 -RustboroCity_MapCoordEvents: @ 85269C0 +RustboroCity_MapCoordEvents: coord_event 23, 20, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E095A coord_event 23, 21, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0971 coord_event 23, 22, 3, VAR_0x405A, 1, RustboroCity_EventScript_1E0988 @@ -53,7 +53,7 @@ RustboroCity_MapCoordEvents: @ 85269C0 coord_event 18, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0F73 coord_event 19, 53, 3, VAR_0x405A, 7, RustboroCity_EventScript_1E0FB3 -RustboroCity_MapBGEvents: @ 8526B10 +RustboroCity_MapBGEvents: bg_event 23, 19, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08F5 bg_event 25, 35, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0910 bg_event 17, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_271E6A @@ -65,6 +65,6 @@ RustboroCity_MapBGEvents: @ 8526B10 bg_event 30, 8, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E08E3 bg_event 12, 38, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_1E0919 -RustboroCity_MapEvents:: @ 8526B88 +RustboroCity_MapEvents:: map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index 0cbd55b24..f1f4a3d8c 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -1,10 +1,10 @@ -RustboroCity: @ 848250C +RustboroCity: .4byte RustboroCity_Layout .4byte RustboroCity_MapEvents .4byte RustboroCity_MapScripts .4byte RustboroCity_MapConnections .2byte MUS_GOTOWN - .2byte 4 + .2byte LAYOUT_RUSTBORO_CITY .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/RustboroCity_CuttersHouse/events.inc b/data/maps/RustboroCity_CuttersHouse/events.inc index 71e57a143..4980d5b95 100644 --- a/data/maps/RustboroCity_CuttersHouse/events.inc +++ b/data/maps/RustboroCity_CuttersHouse/events.inc @@ -1,11 +1,11 @@ -RustboroCity_CuttersHouse_EventObjects: @ 8530A1C +RustboroCity_CuttersHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0 object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0 -RustboroCity_CuttersHouse_MapWarps: @ 8530A4C +RustboroCity_CuttersHouse_MapWarps: warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY -RustboroCity_CuttersHouse_MapEvents:: @ 8530A5C +RustboroCity_CuttersHouse_MapEvents:: map_events RustboroCity_CuttersHouse_EventObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index 8ffdf2c7b..434b27c3e 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -1,10 +1,10 @@ -RustboroCity_CuttersHouse: @ 8483478 +RustboroCity_CuttersHouse: .4byte RustboroCity_CuttersHouse_Layout .4byte RustboroCity_CuttersHouse_MapEvents .4byte RustboroCity_CuttersHouse_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 98 + .2byte LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_DevonCorp_1F/events.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc index f0d54df77..a3ed4affb 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/events.inc @@ -1,17 +1,17 @@ -RustboroCity_DevonCorp_1F_EventObjects: @ 853037C +RustboroCity_DevonCorp_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 2, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0 object_event 2, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 15, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0 -RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4 +RustboroCity_DevonCorp_1F_MapWarps: warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY warp_def 6, 8, 0, 6, MAP_RUSTBORO_CITY warp_def 14, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_2F -RustboroCity_DevonCorp_1F_MapBGEvents: @ 85303DC +RustboroCity_DevonCorp_1F_MapBGEvents: bg_event 3, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_1F_EventScript_211312 bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_1F_EventScript_211309 -RustboroCity_DevonCorp_1F_MapEvents:: @ 85303F4 +RustboroCity_DevonCorp_1F_MapEvents:: map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, RustboroCity_DevonCorp_1F_MapBGEvents diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index a6f55163b..3515eacb5 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_DevonCorp_1F: @ 8483344 +RustboroCity_DevonCorp_1F: .4byte RustboroCity_DevonCorp_1F_Layout .4byte RustboroCity_DevonCorp_1F_MapEvents .4byte RustboroCity_DevonCorp_1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 92 + .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_DevonCorp_2F/events.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc index f10c94780..fdf2e319e 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/events.inc @@ -1,4 +1,4 @@ -RustboroCity_DevonCorp_2F_EventObjects: @ 8530408 +RustboroCity_DevonCorp_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0 object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0 @@ -6,10 +6,10 @@ RustboroCity_DevonCorp_2F_EventObjects: @ 8530408 object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0 object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0 -RustboroCity_DevonCorp_2F_MapWarps: @ 8530498 +RustboroCity_DevonCorp_2F_MapWarps: warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_3F -RustboroCity_DevonCorp_2F_MapEvents:: @ 85304A8 +RustboroCity_DevonCorp_2F_MapEvents:: map_events RustboroCity_DevonCorp_2F_EventObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index bb548c44e..dea4bb1b4 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_DevonCorp_2F: @ 8483360 +RustboroCity_DevonCorp_2F: .4byte RustboroCity_DevonCorp_2F_Layout .4byte RustboroCity_DevonCorp_2F_MapEvents .4byte RustboroCity_DevonCorp_2F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 93 + .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc index df8ba0293..e9bae9746 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc @@ -1,15 +1,15 @@ -RustboroCity_DevonCorp_3F_EventObjects: @ 85304BC +RustboroCity_DevonCorp_3F_EventObjects: object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0 -RustboroCity_DevonCorp_3F_MapWarps: @ 8530504 +RustboroCity_DevonCorp_3F_MapWarps: warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F -RustboroCity_DevonCorp_3F_MapBGEvents: @ 853050C +RustboroCity_DevonCorp_3F_MapBGEvents: bg_event 1, 5, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_212600 bg_event 1, 7, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_212600 -RustboroCity_DevonCorp_3F_MapEvents:: @ 8530524 +RustboroCity_DevonCorp_3F_MapEvents:: map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index d37f055a5..f64fe6253 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_DevonCorp_3F: @ 848337C +RustboroCity_DevonCorp_3F: .4byte RustboroCity_DevonCorp_3F_Layout .4byte RustboroCity_DevonCorp_3F_MapEvents .4byte RustboroCity_DevonCorp_3F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 269 + .2byte LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Flat1_1F/events.inc b/data/maps/RustboroCity_Flat1_1F/events.inc index b606a30db..7f745cbfd 100644 --- a/data/maps/RustboroCity_Flat1_1F/events.inc +++ b/data/maps/RustboroCity_Flat1_1F/events.inc @@ -1,12 +1,12 @@ -RustboroCity_Flat1_1F_EventObjects: @ 8530890 +RustboroCity_Flat1_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 12, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0 -RustboroCity_Flat1_1F_MapWarps: @ 85308C0 +RustboroCity_Flat1_1F_MapWarps: warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY warp_def 7, 7, 0, 1, MAP_RUSTBORO_CITY warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT1_2F -RustboroCity_Flat1_1F_MapEvents:: @ 85308D8 +RustboroCity_Flat1_1F_MapEvents:: map_events RustboroCity_Flat1_1F_EventObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index 9d3a63c8c..ea268aed4 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat1_1F: @ 8483424 +RustboroCity_Flat1_1F: .4byte RustboroCity_Flat1_1F_Layout .4byte RustboroCity_Flat1_1F_MapEvents .4byte RustboroCity_Flat1_1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 313 + .2byte LAYOUT_RUSTBORO_CITY_FLAT1_1F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Flat1_2F/events.inc b/data/maps/RustboroCity_Flat1_2F/events.inc index 9d3aace61..02c650f87 100644 --- a/data/maps/RustboroCity_Flat1_2F/events.inc +++ b/data/maps/RustboroCity_Flat1_2F/events.inc @@ -1,4 +1,4 @@ -RustboroCity_Flat1_2F_EventObjects: @ 85308EC +RustboroCity_Flat1_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0 object_event 2, EVENT_OBJ_GFX_TWIN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 9, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 @@ -8,9 +8,9 @@ RustboroCity_Flat1_2F_EventObjects: @ 85308EC object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0 -RustboroCity_Flat1_2F_MapWarps: @ 85309AC +RustboroCity_Flat1_2F_MapWarps: warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F -RustboroCity_Flat1_2F_MapEvents:: @ 85309B4 +RustboroCity_Flat1_2F_MapEvents:: map_events RustboroCity_Flat1_2F_EventObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index ce47b6cb4..9f6d03649 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat1_2F: @ 8483440 +RustboroCity_Flat1_2F: .4byte RustboroCity_Flat1_2F_Layout .4byte RustboroCity_Flat1_2F_MapEvents .4byte RustboroCity_Flat1_2F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 314 + .2byte LAYOUT_RUSTBORO_CITY_FLAT1_2F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Flat2_1F/events.inc b/data/maps/RustboroCity_Flat2_1F/events.inc index c35574261..82105a66a 100644 --- a/data/maps/RustboroCity_Flat2_1F/events.inc +++ b/data/maps/RustboroCity_Flat2_1F/events.inc @@ -1,12 +1,12 @@ -RustboroCity_Flat2_1F_EventObjects: @ 8530AC4 +RustboroCity_Flat2_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0 object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0 -RustboroCity_Flat2_1F_MapWarps: @ 8530AF4 +RustboroCity_Flat2_1F_MapWarps: warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY warp_def 3, 8, 0, 10, MAP_RUSTBORO_CITY warp_def 3, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_2F -RustboroCity_Flat2_1F_MapEvents:: @ 8530B0C +RustboroCity_Flat2_1F_MapEvents:: map_events RustboroCity_Flat2_1F_EventObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index dc2a68edf..73ae19885 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat2_1F: @ 84834B0 +RustboroCity_Flat2_1F: .4byte RustboroCity_Flat2_1F_Layout .4byte RustboroCity_Flat2_1F_MapEvents .4byte RustboroCity_Flat2_1F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 294 + .2byte LAYOUT_RUSTBORO_CITY_FLAT2_1F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Flat2_2F/events.inc b/data/maps/RustboroCity_Flat2_2F/events.inc index 60423b5d6..fd8fad1a4 100644 --- a/data/maps/RustboroCity_Flat2_2F/events.inc +++ b/data/maps/RustboroCity_Flat2_2F/events.inc @@ -1,11 +1,11 @@ -RustboroCity_Flat2_2F_EventObjects: @ 8530B20 +RustboroCity_Flat2_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0 object_event 2, EVENT_OBJ_GFX_NINJA_BOY, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0 -RustboroCity_Flat2_2F_MapWarps: @ 8530B50 +RustboroCity_Flat2_2F_MapWarps: warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F warp_def 1, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_3F -RustboroCity_Flat2_2F_MapEvents:: @ 8530B60 +RustboroCity_Flat2_2F_MapEvents:: map_events RustboroCity_Flat2_2F_EventObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index 1d117d316..d002b54ae 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat2_2F: @ 84834CC +RustboroCity_Flat2_2F: .4byte RustboroCity_Flat2_2F_Layout .4byte RustboroCity_Flat2_2F_MapEvents .4byte RustboroCity_Flat2_2F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 295 + .2byte LAYOUT_RUSTBORO_CITY_FLAT2_2F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Flat2_3F/events.inc b/data/maps/RustboroCity_Flat2_3F/events.inc index 9ab4727f3..a33992eb2 100644 --- a/data/maps/RustboroCity_Flat2_3F/events.inc +++ b/data/maps/RustboroCity_Flat2_3F/events.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat2_3F_EventObjects: @ 8530B74 +RustboroCity_Flat2_3F_EventObjects: object_event 1, EVENT_OBJ_GFX_DEVON_EMPLOYEE, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0 -RustboroCity_Flat2_3F_MapWarps: @ 8530BA4 +RustboroCity_Flat2_3F_MapWarps: warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F -RustboroCity_Flat2_3F_MapEvents:: @ 8530BAC +RustboroCity_Flat2_3F_MapEvents:: map_events RustboroCity_Flat2_3F_EventObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index 037ca6821..1b7f52fca 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat2_3F: @ 84834E8 +RustboroCity_Flat2_3F: .4byte RustboroCity_Flat2_3F_Layout .4byte RustboroCity_Flat2_3F_MapEvents .4byte RustboroCity_Flat2_3F_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 296 + .2byte LAYOUT_RUSTBORO_CITY_FLAT2_3F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc index 0d1f57cdd..3fb151799 100644 --- a/data/maps/RustboroCity_Gym/events.inc +++ b/data/maps/RustboroCity_Gym/events.inc @@ -1,18 +1,18 @@ -RustboroCity_Gym_EventObjects: @ 8530538 +RustboroCity_Gym_EventObjects: object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0 object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0 object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0 object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0 object_event 5, EVENT_OBJ_GFX_HIKER, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, RustboroCity_Gym_EventScript_213011, 0 -RustboroCity_Gym_MapWarps: @ 85305B0 +RustboroCity_Gym_MapWarps: warp_def 5, 19, 0, 0, MAP_RUSTBORO_CITY warp_def 6, 19, 0, 0, MAP_RUSTBORO_CITY -RustboroCity_Gym_MapBGEvents: @ 85305C0 +RustboroCity_Gym_MapBGEvents: bg_event 2, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213047 bg_event 8, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_213057 -RustboroCity_Gym_MapEvents:: @ 85305D8 +RustboroCity_Gym_MapEvents:: map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index 72dc7ee47..4f043ed98 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Gym: @ 8483398 +RustboroCity_Gym: .4byte RustboroCity_Gym_Layout .4byte RustboroCity_Gym_MapEvents .4byte RustboroCity_Gym_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 94 + .2byte LAYOUT_RUSTBORO_CITY_GYM .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_House1/events.inc b/data/maps/RustboroCity_House1/events.inc index 2fc0284a9..4278568e6 100644 --- a/data/maps/RustboroCity_House1/events.inc +++ b/data/maps/RustboroCity_House1/events.inc @@ -1,11 +1,11 @@ -RustboroCity_House1_EventObjects: @ 85309C8 +RustboroCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0 object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0 -RustboroCity_House1_MapWarps: @ 85309F8 +RustboroCity_House1_MapWarps: warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY -RustboroCity_House1_MapEvents:: @ 8530A08 +RustboroCity_House1_MapEvents:: map_events RustboroCity_House1_EventObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index cff9064e9..22c08344a 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -1,10 +1,10 @@ -RustboroCity_House1: @ 848345C +RustboroCity_House1: .4byte RustboroCity_House1_Layout .4byte RustboroCity_House1_MapEvents .4byte RustboroCity_House1_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 97 + .2byte LAYOUT_RUSTBORO_CITY_HOUSE1 .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_House2/events.inc b/data/maps/RustboroCity_House2/events.inc index 2f8d4b2bf..87f324126 100644 --- a/data/maps/RustboroCity_House2/events.inc +++ b/data/maps/RustboroCity_House2/events.inc @@ -1,11 +1,11 @@ -RustboroCity_House2_EventObjects: @ 8530A70 +RustboroCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_F, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0 object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0 -RustboroCity_House2_MapWarps: @ 8530AA0 +RustboroCity_House2_MapWarps: warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY -RustboroCity_House2_MapEvents:: @ 8530AB0 +RustboroCity_House2_MapEvents:: map_events RustboroCity_House2_EventObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index d842f2e79..564b2aecc 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -1,10 +1,10 @@ -RustboroCity_House2: @ 8483494 +RustboroCity_House2: .4byte RustboroCity_House_Layout .4byte RustboroCity_House2_MapEvents .4byte RustboroCity_House2_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 96 + .2byte LAYOUT_RUSTBORO_CITY_HOUSE .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_House3/events.inc b/data/maps/RustboroCity_House3/events.inc index 95198b27c..3d32a9c73 100644 --- a/data/maps/RustboroCity_House3/events.inc +++ b/data/maps/RustboroCity_House3/events.inc @@ -1,12 +1,12 @@ -RustboroCity_House3_EventObjects: @ 8530BC0 +RustboroCity_House3_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0 object_event 2, EVENT_OBJ_GFX_OLD_WOMAN, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0 object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0 -RustboroCity_House3_MapWarps: @ 8530C08 +RustboroCity_House3_MapWarps: warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY -RustboroCity_House3_MapEvents:: @ 8530C18 +RustboroCity_House3_MapEvents:: map_events RustboroCity_House3_EventObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index 7f057cf15..eea35721c 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -1,10 +1,10 @@ -RustboroCity_House3: @ 8483504 +RustboroCity_House3: .4byte RustboroCity_House_Layout .4byte RustboroCity_House3_MapEvents .4byte RustboroCity_House3_MapScripts .4byte 0x0 .2byte MUS_GOTOWN - .2byte 96 + .2byte LAYOUT_RUSTBORO_CITY_HOUSE .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_Mart/events.inc b/data/maps/RustboroCity_Mart/events.inc index 8d65c367d..131ffe24b 100644 --- a/data/maps/RustboroCity_Mart/events.inc +++ b/data/maps/RustboroCity_Mart/events.inc @@ -1,13 +1,13 @@ -RustboroCity_Mart_EventObjects: @ 853080C +RustboroCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0 object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0 object_event 3, EVENT_OBJ_GFX_POKEFAN_F, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_Mart_EventScript_214F74, 0 object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_Mart_EventScript_214F86, 0 -RustboroCity_Mart_MapWarps: @ 853086C +RustboroCity_Mart_MapWarps: warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY -RustboroCity_Mart_MapEvents:: @ 853087C +RustboroCity_Mart_MapEvents:: map_events RustboroCity_Mart_EventObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index bb41aab1d..f6dbd60a5 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -1,10 +1,10 @@ -RustboroCity_Mart: @ 8483408 +RustboroCity_Mart: .4byte Mart_Layout .4byte RustboroCity_Mart_MapEvents .4byte RustboroCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_PokemonCenter_1F/events.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc index 597eace15..50b18e882 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/events.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -RustboroCity_PokemonCenter_1F_EventObjects: @ 85306F4 +RustboroCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0 object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0 -RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754 +RustboroCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY warp_def 6, 8, 3, 3, MAP_RUSTBORO_CITY warp_def 1, 6, 4, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_2F -RustboroCity_PokemonCenter_1F_MapEvents:: @ 853076C +RustboroCity_PokemonCenter_1F_MapEvents:: map_events RustboroCity_PokemonCenter_1F_EventObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index 4c5c50074..71f0d8b25 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_PokemonCenter_1F: @ 84833D0 +RustboroCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte RustboroCity_PokemonCenter_1F_MapEvents .4byte RustboroCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc index 346a4de16..a565f259b 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/events.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780 +RustboroCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0 +RustboroCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -RustboroCity_PokemonCenter_2F_MapEvents:: @ 85307F8 +RustboroCity_PokemonCenter_2F_MapEvents:: map_events RustboroCity_PokemonCenter_2F_EventObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index 8e70f4c80..2ee6bdfd1 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -RustboroCity_PokemonCenter_2F: @ 84833EC +RustboroCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte RustboroCity_PokemonCenter_2F_MapEvents .4byte RustboroCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc index 0c6ca19dc..0d230b178 100644 --- a/data/maps/RustboroCity_PokemonSchool/events.inc +++ b/data/maps/RustboroCity_PokemonSchool/events.inc @@ -1,4 +1,4 @@ -RustboroCity_PokemonSchool_EventObjects: @ 85305EC +RustboroCity_PokemonSchool_EventObjects: object_event 1, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0 object_event 2, EVENT_OBJ_GFX_GAMEBOY_KID, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0 object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0 @@ -7,17 +7,17 @@ RustboroCity_PokemonSchool_EventObjects: @ 85305EC object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0 object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 0, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT -RustboroCity_PokemonSchool_MapWarps: @ 8530694 +RustboroCity_PokemonSchool_MapWarps: warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY -RustboroCity_PokemonSchool_MapBGEvents: @ 85306A4 +RustboroCity_PokemonSchool_MapBGEvents: bg_event 5, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 bg_event 4, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 bg_event 6, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213EA9 bg_event 3, 5, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_213F8C -RustboroCity_PokemonSchool_MapEvents:: @ 85306E0 +RustboroCity_PokemonSchool_MapEvents:: map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 9b1467042..e02d9c711 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -1,10 +1,10 @@ -RustboroCity_PokemonSchool: @ 84833B4 +RustboroCity_PokemonSchool: .4byte RustboroCity_PokemonSchool_Layout .4byte RustboroCity_PokemonSchool_MapEvents .4byte RustboroCity_PokemonSchool_MapScripts .4byte 0x0 .2byte MUS_P_SCHOOL - .2byte 95 + .2byte LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL .byte MAPSEC_RUSTBORO_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc index 292bda57d..ea48a4828 100644 --- a/data/maps/RusturfTunnel/events.inc +++ b/data/maps/RusturfTunnel/events.inc @@ -1,4 +1,4 @@ -RusturfTunnel_EventObjects: @ 85341C4 +RusturfTunnel_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_MAN object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, FLAG_ITEM_RUSTURF_TUNNEL_POKE_BALL @@ -10,18 +10,18 @@ RusturfTunnel_EventObjects: @ 85341C4 object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, RusturfTunnel_EventScript_22D1B1, 0 object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_22CE5F, FLAG_HIDE_RUSTURF_TUNNEL_LOVER_WOMAN -RusturfTunnel_MapWarps: @ 85342B4 +RusturfTunnel_MapWarps: warp_def 4, 10, 3, 0, MAP_ROUTE116 warp_def 29, 16, 3, 4, MAP_VERDANTURF_TOWN warp_def 18, 20, 3, 2, MAP_ROUTE116 -RusturfTunnel_MapCoordEvents: @ 85342CC +RusturfTunnel_MapCoordEvents: coord_event 23, 4, 3, 0, 0, RusturfTunnel_EventScript_22D071 coord_event 9, 4, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083 coord_event 9, 5, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_22D083 coord_event 25, 4, 3, 0, 0, RusturfTunnel_EventScript_22D077 coord_event 25, 5, 3, 0, 0, RusturfTunnel_EventScript_22D07D -RusturfTunnel_MapEvents:: @ 853431C +RusturfTunnel_MapEvents:: map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index 70a477681..8bb9fa94f 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -1,10 +1,10 @@ -RusturfTunnel: @ 8483F30 +RusturfTunnel: .4byte RusturfTunnel_Layout .4byte RusturfTunnel_MapEvents .4byte RusturfTunnel_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 129 + .2byte LAYOUT_RUSTURF_TUNNEL .byte MAPSEC_RUSTURF_TUNNEL .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc index c36e38fda..56a07b43e 100644 --- a/data/maps/SSTidalCorridor/events.inc +++ b/data/maps/SSTidalCorridor/events.inc @@ -1,11 +1,11 @@ -SSTidalCorridor_EventObjects: @ 853A158 +SSTidalCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0D9, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_23C0E2, FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_CORRIDOR_SCOTT -SSTidalCorridor_MapWarps: @ 853A1D0 +SSTidalCorridor_MapWarps: warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS warp_def 7, 9, 3, 2, MAP_SS_TIDAL_ROOMS warp_def 10, 9, 3, 4, MAP_SS_TIDAL_ROOMS @@ -16,7 +16,7 @@ SSTidalCorridor_MapWarps: @ 853A1D0 warp_def 13, 3, 3, 11, MAP_SS_TIDAL_ROOMS warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK -SSTidalCorridor_MapBGEvents: @ 853A218 +SSTidalCorridor_MapBGEvents: bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_23C17D @@ -30,6 +30,6 @@ SSTidalCorridor_MapBGEvents: @ 853A218 bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C107 bg_event 14, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_23C110 -SSTidalCorridor_MapEvents:: @ 853A2A8 +SSTidalCorridor_MapEvents:: map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 37128821c..972fae215 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -1,10 +1,10 @@ -SSTidalCorridor: @ 8484F0C +SSTidalCorridor: .4byte SSTidalCorridor_Layout .4byte SSTidalCorridor_MapEvents .4byte SSTidalCorridor_MapScripts .4byte 0x0 .2byte MUS_M_BOAT - .2byte 277 + .2byte LAYOUT_SS_TIDAL_CORRIDOR .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc index 65ced7c13..73385dfc3 100644 --- a/data/maps/SSTidalLowerDeck/events.inc +++ b/data/maps/SSTidalLowerDeck/events.inc @@ -1,13 +1,13 @@ -SSTidalLowerDeck_EventObjects: @ 853A2BC +SSTidalLowerDeck_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0 -SSTidalLowerDeck_MapWarps: @ 853A2EC +SSTidalLowerDeck_MapWarps: warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR -SSTidalLowerDeck_MapBGEvents: @ 853A2F4 +SSTidalLowerDeck_MapBGEvents: bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_SS_TIDAL_LOWER_DECK_LEFTOVERS -SSTidalLowerDeck_MapEvents:: @ 853A300 +SSTidalLowerDeck_MapEvents:: map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index f86d3ac06..c14cf5513 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -1,10 +1,10 @@ -SSTidalLowerDeck: @ 8484F28 +SSTidalLowerDeck: .4byte SSTidalLowerDeck_Layout .4byte SSTidalLowerDeck_MapEvents .4byte SSTidalLowerDeck_MapScripts .4byte 0x0 .2byte MUS_M_BOAT - .2byte 278 + .2byte LAYOUT_SS_TIDAL_LOWER_DECK .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc index 99937ef75..dc8a57164 100644 --- a/data/maps/SSTidalRooms/events.inc +++ b/data/maps/SSTidalRooms/events.inc @@ -1,4 +1,4 @@ -SSTidalRooms_EventObjects: @ 853A314 +SSTidalRooms_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0 object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0 @@ -8,7 +8,7 @@ SSTidalRooms_EventObjects: @ 853A314 object_event 7, EVENT_OBJ_GFX_WOMAN_2, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0 object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SSTidalRooms_EventScript_23C9F2, FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER -SSTidalRooms_MapWarps: @ 853A3D4 +SSTidalRooms_MapWarps: warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR warp_def 5, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR warp_def 13, 16, 0, 1, MAP_SS_TIDAL_CORRIDOR @@ -22,10 +22,10 @@ SSTidalRooms_MapWarps: @ 853A3D4 warp_def 22, 1, 0, 6, MAP_SS_TIDAL_CORRIDOR warp_def 31, 1, 0, 7, MAP_SS_TIDAL_CORRIDOR -SSTidalRooms_MapBGEvents: @ 853A434 +SSTidalRooms_MapBGEvents: bg_event 15, 11, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_23CA33 bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_23CA33 -SSTidalRooms_MapEvents:: @ 853A44C +SSTidalRooms_MapEvents:: map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index 0d1f4db63..951cd6ce1 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -1,10 +1,10 @@ -SSTidalRooms: @ 8484F44 +SSTidalRooms: .4byte SSTidalRooms_Layout .4byte SSTidalRooms_MapEvents .4byte SSTidalRooms_MapScripts .4byte 0x0 .2byte MUS_M_BOAT - .2byte 279 + .2byte LAYOUT_SS_TIDAL_ROOMS .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_North/connections.inc b/data/maps/SafariZone_North/connections.inc index d99826f0d..131338df9 100644 --- a/data/maps/SafariZone_North/connections.inc +++ b/data/maps/SafariZone_North/connections.inc @@ -1,9 +1,9 @@ -SafariZone_North_MapConnectionsList: @ 8486E18 +SafariZone_North_MapConnectionsList: connection left, 0, MAP_SAFARI_ZONE_NORTHWEST connection down, 0, MAP_SAFARI_ZONE_SOUTH connection right, 0, MAP_SAFARI_ZONE_NORTHEAST -SafariZone_North_MapConnections: @ 8486E3C - .4byte 0x3 +SafariZone_North_MapConnections: + .4byte 3 .4byte SafariZone_North_MapConnectionsList diff --git a/data/maps/SafariZone_North/events.inc b/data/maps/SafariZone_North/events.inc index 152fa54c5..1131cd714 100644 --- a/data/maps/SafariZone_North/events.inc +++ b/data/maps/SafariZone_North/events.inc @@ -1,4 +1,4 @@ -SafariZone_North_EventObjects: @ 853B160 +SafariZone_North_EventObjects: object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D254, 0 object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 6, 29, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_23D25D, 0 object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_11 @@ -9,6 +9,6 @@ SafariZone_North_EventObjects: @ 853B160 object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2907A6, FLAG_TEMP_16 object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_North_EventScript_2912C9, FLAG_ITEM_SAFARI_ZONE_NORTH_CALCIUM -SafariZone_North_MapEvents:: @ 853B238 +SafariZone_North_MapEvents:: map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SafariZone_North/header.inc b/data/maps/SafariZone_North/header.inc index ebcb62f9a..935a2c5a6 100644 --- a/data/maps/SafariZone_North/header.inc +++ b/data/maps/SafariZone_North/header.inc @@ -1,10 +1,10 @@ -SafariZone_North: @ 8485158 +SafariZone_North: .4byte SafariZone_North_Layout .4byte SafariZone_North_MapEvents .4byte SafariZone_North_MapScripts .4byte SafariZone_North_MapConnections .2byte MUS_SAFARI - .2byte 239 + .2byte LAYOUT_SAFARI_ZONE_NORTH .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_Northeast/connections.inc b/data/maps/SafariZone_Northeast/connections.inc index c762c485a..20595bd7a 100644 --- a/data/maps/SafariZone_Northeast/connections.inc +++ b/data/maps/SafariZone_Northeast/connections.inc @@ -1,8 +1,8 @@ -SafariZone_Northeast_MapConnectionsList: @ 8486E90 +SafariZone_Northeast_MapConnectionsList: connection left, 0, MAP_SAFARI_ZONE_NORTH connection down, 0, MAP_SAFARI_ZONE_SOUTHEAST -SafariZone_Northeast_MapConnections: @ 8486EA8 - .4byte 0x2 +SafariZone_Northeast_MapConnections: + .4byte 2 .4byte SafariZone_Northeast_MapConnectionsList diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc index dc0393b4d..02bb2fc19 100644 --- a/data/maps/SafariZone_Northeast/events.inc +++ b/data/maps/SafariZone_Northeast/events.inc @@ -1,4 +1,4 @@ -SafariZone_Northeast_EventObjects: @ 853B968 +SafariZone_Northeast_EventObjects: object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 8, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 30, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0 object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_15 @@ -9,10 +9,10 @@ SafariZone_Northeast_EventObjects: @ 853B968 object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2907A6, FLAG_TEMP_12 object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_2912E3, FLAG_ITEM_SAFARI_ZONE_NORTH_EAST_NUGGET -SafariZone_Northeast_MapBGEvents: @ 853BA40 +SafariZone_Northeast_MapBGEvents: bg_hidden_item_event 31, 35, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_RARE_CANDY bg_hidden_item_event 21, 5, 3, ITEM_ZINC, FLAG_HIDDEN_ITEM_SAFARI_ZONE_NORTH_EAST_ZINC -SafariZone_Northeast_MapEvents:: @ 853BA58 +SafariZone_Northeast_MapEvents:: map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index 9db5fd596..8c68cd8c2 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -1,10 +1,10 @@ -SafariZone_Northeast: @ 848528C +SafariZone_Northeast: .4byte SafariZone_Northeast_Layout .4byte SafariZone_Northeast_MapEvents .4byte SafariZone_Northeast_MapScripts .4byte SafariZone_Northeast_MapConnections .2byte MUS_SAFARI - .2byte 394 + .2byte LAYOUT_SAFARI_ZONE_NORTHEAST .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_Northwest/connections.inc b/data/maps/SafariZone_Northwest/connections.inc index 010a13cc2..24ac78021 100644 --- a/data/maps/SafariZone_Northwest/connections.inc +++ b/data/maps/SafariZone_Northwest/connections.inc @@ -1,8 +1,8 @@ -SafariZone_Northwest_MapConnectionsList: @ 8486DF8 +SafariZone_Northwest_MapConnectionsList: connection right, 0, MAP_SAFARI_ZONE_NORTH connection down, 0, MAP_SAFARI_ZONE_SOUTHWEST -SafariZone_Northwest_MapConnections: @ 8486E10 - .4byte 0x2 +SafariZone_Northwest_MapConnections: + .4byte 2 .4byte SafariZone_Northwest_MapConnectionsList diff --git a/data/maps/SafariZone_Northwest/events.inc b/data/maps/SafariZone_Northwest/events.inc index 95b6623ac..729e51734 100644 --- a/data/maps/SafariZone_Northwest/events.inc +++ b/data/maps/SafariZone_Northwest/events.inc @@ -1,7 +1,7 @@ -SafariZone_Northwest_EventObjects: @ 853B11C +SafariZone_Northwest_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northwest_EventScript_2912BC, FLAG_ITEM_SAFARI_ZONE_NORTH_WEST_TM_22 -SafariZone_Northwest_MapEvents:: @ 853B14C +SafariZone_Northwest_MapEvents:: map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index ca59f45e7..1218a6513 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -1,10 +1,10 @@ -SafariZone_Northwest: @ 848513C +SafariZone_Northwest: .4byte SafariZone_Northwest_Layout .4byte SafariZone_Northwest_MapEvents .4byte SafariZone_Northwest_MapScripts .4byte SafariZone_Northwest_MapConnections .2byte MUS_SAFARI - .2byte 238 + .2byte LAYOUT_SAFARI_ZONE_NORTHWEST .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_RestHouse/events.inc b/data/maps/SafariZone_RestHouse/events.inc index 5a54de961..2d601b883 100644 --- a/data/maps/SafariZone_RestHouse/events.inc +++ b/data/maps/SafariZone_RestHouse/events.inc @@ -1,12 +1,12 @@ -SafariZone_RestHouse_EventObjects: @ 853B8FC +SafariZone_RestHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0 object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0 object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0 -SafariZone_RestHouse_MapWarps: @ 853B944 +SafariZone_RestHouse_MapWarps: warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST -SafariZone_RestHouse_MapEvents:: @ 853B954 +SafariZone_RestHouse_MapEvents:: map_events SafariZone_RestHouse_EventObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index fbb6f4d05..79d807c7f 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -1,10 +1,10 @@ -SafariZone_RestHouse: @ 8485270 +SafariZone_RestHouse: .4byte SafariZone_RestHouse_Layout .4byte SafariZone_RestHouse_MapEvents .4byte SafariZone_RestHouse_MapScripts .4byte 0x0 .2byte MUS_SAFARI - .2byte 329 + .2byte LAYOUT_SAFARI_ZONE_REST_HOUSE .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_South/connections.inc b/data/maps/SafariZone_South/connections.inc index 856bb30ab..4c2e912ca 100644 --- a/data/maps/SafariZone_South/connections.inc +++ b/data/maps/SafariZone_South/connections.inc @@ -1,9 +1,9 @@ -SafariZone_South_MapConnectionsList: @ 8486E64 +SafariZone_South_MapConnectionsList: connection up, 0, MAP_SAFARI_ZONE_NORTH connection left, 0, MAP_SAFARI_ZONE_SOUTHWEST connection right, 0, MAP_SAFARI_ZONE_SOUTHEAST -SafariZone_South_MapConnections: @ 8486E88 - .4byte 0x3 +SafariZone_South_MapConnections: + .4byte 3 .4byte SafariZone_South_MapConnectionsList diff --git a/data/maps/SafariZone_South/events.inc b/data/maps/SafariZone_South/events.inc index 6d8d84877..8bc56885f 100644 --- a/data/maps/SafariZone_South/events.inc +++ b/data/maps/SafariZone_South/events.inc @@ -1,4 +1,4 @@ -SafariZone_South_EventObjects: @ 853B2A4 +SafariZone_South_EventObjects: object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0 object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_South_EventScript_23D2CA, 0 object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 16, 6, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0 @@ -6,9 +6,9 @@ SafariZone_South_EventObjects: @ 853B2A4 object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 36, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D390, FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 36, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_South_EventScript_23D3A2, FLAG_HIDE_SAFARI_ZONE_SOUTH_CONSTRUCTION_WORKERS -SafariZone_South_MapWarps: @ 853B334 +SafariZone_South_MapWarps: warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE -SafariZone_South_MapEvents:: @ 853B33C +SafariZone_South_MapEvents:: map_events SafariZone_South_EventObjects, SafariZone_South_MapWarps, 0x0, 0x0 diff --git a/data/maps/SafariZone_South/header.inc b/data/maps/SafariZone_South/header.inc index 1567935d2..01fcac57f 100644 --- a/data/maps/SafariZone_South/header.inc +++ b/data/maps/SafariZone_South/header.inc @@ -1,10 +1,10 @@ -SafariZone_South: @ 8485190 +SafariZone_South: .4byte SafariZone_South_Layout .4byte SafariZone_South_MapEvents .4byte SafariZone_South_MapScripts .4byte SafariZone_South_MapConnections .2byte MUS_SAFARI - .2byte 241 + .2byte LAYOUT_SAFARI_ZONE_SOUTH .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_Southeast/connections.inc b/data/maps/SafariZone_Southeast/connections.inc index 16b39e87b..5a7b4140a 100644 --- a/data/maps/SafariZone_Southeast/connections.inc +++ b/data/maps/SafariZone_Southeast/connections.inc @@ -1,8 +1,8 @@ -SafariZone_Southeast_MapConnectionsList: @ 8486EB0 +SafariZone_Southeast_MapConnectionsList: connection left, 0, MAP_SAFARI_ZONE_SOUTH connection up, 0, MAP_SAFARI_ZONE_NORTHEAST -SafariZone_Southeast_MapConnections: @ 8486EC8 - .4byte 0x2 +SafariZone_Southeast_MapConnections: + .4byte 2 .4byte SafariZone_Southeast_MapConnectionsList diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc index badaaefd4..a35a8564d 100644 --- a/data/maps/SafariZone_Southeast/events.inc +++ b/data/maps/SafariZone_Southeast/events.inc @@ -1,14 +1,14 @@ -SafariZone_Southeast_EventObjects: @ 853BA6C +SafariZone_Southeast_EventObjects: object_event 1, EVENT_OBJ_GFX_RICH_BOY, 0, 7, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 20, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0 object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL, 0, 8, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0 object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_2912F0, FLAG_ITEM_SAFARI_ZONE_SOUTH_EAST_BIG_PEARL object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_Southeast_EventScript_23D399, FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION -SafariZone_Southeast_MapBGEvents: @ 853BAE4 +SafariZone_Southeast_MapBGEvents: bg_hidden_item_event 19, 36, 3, ITEM_PP_UP, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_PP_UP bg_hidden_item_event 32, 33, 0, ITEM_FULL_RESTORE, FLAG_HIDDEN_ITEM_SAFARI_ZONE_SOUTH_EAST_FULL_RESTORE -SafariZone_Southeast_MapEvents:: @ 853BAFC +SafariZone_Southeast_MapEvents:: map_events SafariZone_Southeast_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index 55ff68232..b07747fd5 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -1,10 +1,10 @@ -SafariZone_Southeast: @ 84852A8 +SafariZone_Southeast: .4byte SafariZone_Southeast_Layout .4byte SafariZone_Southeast_MapEvents .4byte SafariZone_Southeast_MapScripts .4byte SafariZone_Southeast_MapConnections .2byte MUS_SAFARI - .2byte 395 + .2byte LAYOUT_SAFARI_ZONE_SOUTHEAST .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SafariZone_Southwest/connections.inc b/data/maps/SafariZone_Southwest/connections.inc index 83398e3a3..34702a3c2 100644 --- a/data/maps/SafariZone_Southwest/connections.inc +++ b/data/maps/SafariZone_Southwest/connections.inc @@ -1,8 +1,8 @@ -SafariZone_Southwest_MapConnectionsList: @ 8486E44 +SafariZone_Southwest_MapConnectionsList: connection up, 0, MAP_SAFARI_ZONE_NORTHWEST connection right, 0, MAP_SAFARI_ZONE_SOUTH -SafariZone_Southwest_MapConnections: @ 8486E5C - .4byte 0x2 +SafariZone_Southwest_MapConnections: + .4byte 2 .4byte SafariZone_Southwest_MapConnectionsList diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc index 930d3c8ed..6a6a48887 100644 --- a/data/maps/SafariZone_Southwest/events.inc +++ b/data/maps/SafariZone_Southwest/events.inc @@ -1,13 +1,13 @@ -SafariZone_Southwest_EventObjects: @ 853B24C +SafariZone_Southwest_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southwest_EventScript_2912D6, FLAG_ITEM_SAFARI_ZONE_SOUTH_WEST_MAX_REVIVE -SafariZone_Southwest_MapWarps: @ 853B27C +SafariZone_Southwest_MapWarps: warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE -SafariZone_Southwest_MapBGEvents: @ 853B284 +SafariZone_Southwest_MapBGEvents: bg_event 32, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SafariZone_Southwest_EventScript_23D270 -SafariZone_Southwest_MapEvents:: @ 853B290 +SafariZone_Southwest_MapEvents:: map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 189fa09b8..f3cafdebb 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -1,10 +1,10 @@ -SafariZone_Southwest: @ 8485174 +SafariZone_Southwest: .4byte SafariZone_Southwest_Layout .4byte SafariZone_Southwest_MapEvents .4byte SafariZone_Southwest_MapScripts .4byte SafariZone_Southwest_MapConnections .2byte MUS_SAFARI - .2byte 240 + .2byte LAYOUT_SAFARI_ZONE_SOUTHWEST .byte MAPSEC_SAFARI_ZONE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc index 20a5fc145..f43240a78 100644 --- a/data/maps/ScorchedSlab/events.inc +++ b/data/maps/ScorchedSlab/events.inc @@ -1,9 +1,9 @@ -ScorchedSlab_EventObjects: @ 8536F88 +ScorchedSlab_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, FLAG_ITEM_SCORCHED_SLAB_TM_11 -ScorchedSlab_MapWarps: @ 8536FA0 +ScorchedSlab_MapWarps: warp_def 7, 16, 1, 1, MAP_ROUTE120 -ScorchedSlab_MapEvents:: @ 8536FA8 +ScorchedSlab_MapEvents:: map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0 diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 84c09df3f..ec09efb0f 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -1,10 +1,10 @@ -ScorchedSlab: @ 84846BC +ScorchedSlab: .4byte ScorchedSlab_Layout .4byte ScorchedSlab_MapEvents .4byte ScorchedSlab_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 311 + .2byte LAYOUT_SCORCHED_SLAB .byte MAPSEC_SCORCHED_SLAB .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Entrance/events.inc b/data/maps/SeafloorCavern_Entrance/events.inc index b0574d14e..ea2057417 100644 --- a/data/maps/SeafloorCavern_Entrance/events.inc +++ b/data/maps/SeafloorCavern_Entrance/events.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Entrance_EventObjects: @ 85356BC +SeafloorCavern_Entrance_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SeafloorCavern_Entrance_EventScript_234485, FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT -SeafloorCavern_Entrance_MapWarps: @ 85356D4 +SeafloorCavern_Entrance_MapWarps: warp_def 10, 18, 3, 0, MAP_UNDERWATER4 warp_def 10, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM1 -SeafloorCavern_Entrance_MapEvents:: @ 85356E4 +SeafloorCavern_Entrance_MapEvents:: map_events SeafloorCavern_Entrance_EventObjects, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index 8e62470ac..b1b8ec30c 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Entrance: @ 84841B4 +SeafloorCavern_Entrance: .4byte SeafloorCavern_Entrance_Layout .4byte SeafloorCavern_Entrance_MapEvents .4byte SeafloorCavern_Entrance_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 147 + .2byte LAYOUT_SEAFLOOR_CAVERN_ENTRANCE .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room1/events.inc b/data/maps/SeafloorCavern_Room1/events.inc index 2c507151b..a5cb5ed3b 100644 --- a/data/maps/SeafloorCavern_Room1/events.inc +++ b/data/maps/SeafloorCavern_Room1/events.inc @@ -1,15 +1,15 @@ -SeafloorCavern_Room1_EventObjects: @ 85356F8 +SeafloorCavern_Room1_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, FLAG_TEMP_12 object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, FLAG_TEMP_13 object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_234803, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS -SeafloorCavern_Room1_MapWarps: @ 8535770 +SeafloorCavern_Room1_MapWarps: warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE warp_def 17, 13, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM5 warp_def 6, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM2 -SeafloorCavern_Room1_MapEvents:: @ 8535788 +SeafloorCavern_Room1_MapEvents:: map_events SeafloorCavern_Room1_EventObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index 9b84e5d96..14ab5fbde 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room1: @ 84841D0 +SeafloorCavern_Room1: .4byte SeafloorCavern_Room1_Layout .4byte SeafloorCavern_Room1_MapEvents .4byte SeafloorCavern_Room1_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 148 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM1 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room2/events.inc b/data/maps/SeafloorCavern_Room2/events.inc index 1cc30957a..5e1af8027 100644 --- a/data/maps/SeafloorCavern_Room2/events.inc +++ b/data/maps/SeafloorCavern_Room2/events.inc @@ -1,4 +1,4 @@ -SeafloorCavern_Room2_EventObjects: @ 853579C +SeafloorCavern_Room2_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_12 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_13 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_11 @@ -8,12 +8,12 @@ SeafloorCavern_Room2_EventObjects: @ 853579C object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 9, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, FLAG_TEMP_19 object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, FLAG_TEMP_17 -SeafloorCavern_Room2_MapWarps: @ 853585C +SeafloorCavern_Room2_MapWarps: warp_def 10, 7, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 warp_def 4, 10, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM4 warp_def 6, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM6 warp_def 11, 1, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7 -SeafloorCavern_Room2_MapEvents:: @ 853587C +SeafloorCavern_Room2_MapEvents:: map_events SeafloorCavern_Room2_EventObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index b7d4e47d7..822c7f2b1 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room2: @ 84841EC +SeafloorCavern_Room2: .4byte SeafloorCavern_Room2_Layout .4byte SeafloorCavern_Room2_MapEvents .4byte SeafloorCavern_Room2_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 149 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM2 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room3/events.inc b/data/maps/SeafloorCavern_Room3/events.inc index e48782693..168e9e96d 100644 --- a/data/maps/SeafloorCavern_Room3/events.inc +++ b/data/maps/SeafloorCavern_Room3/events.inc @@ -1,4 +1,4 @@ -SeafloorCavern_Room3_EventObjects: @ 8535890 +SeafloorCavern_Room3_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_12 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_14 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, FLAG_TEMP_15 @@ -9,11 +9,11 @@ SeafloorCavern_Room3_EventObjects: @ 8535890 object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 6, SeafloorCavern_Room3_EventScript_234938, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 4, SeafloorCavern_Room3_EventScript_23494F, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS -SeafloorCavern_Room3_MapWarps: @ 8535968 +SeafloorCavern_Room3_MapWarps: warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 warp_def 9, 13, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM7 warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6 -SeafloorCavern_Room3_MapEvents:: @ 8535980 +SeafloorCavern_Room3_MapEvents:: map_events SeafloorCavern_Room3_EventObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index b5a032b60..f1cfa2568 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room3: @ 8484208 +SeafloorCavern_Room3: .4byte SeafloorCavern_Room3_Layout .4byte SeafloorCavern_Room3_MapEvents .4byte SeafloorCavern_Room3_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 150 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM3 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room4/events.inc b/data/maps/SeafloorCavern_Room4/events.inc index c4e96aee0..37f0c7b04 100644 --- a/data/maps/SeafloorCavern_Room4/events.inc +++ b/data/maps/SeafloorCavern_Room4/events.inc @@ -1,13 +1,13 @@ -SeafloorCavern_Room4_EventObjects: @ 8535994 +SeafloorCavern_Room4_EventObjects: object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS -SeafloorCavern_Room4_MapWarps: @ 85359C4 +SeafloorCavern_Room4_MapWarps: warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM5 warp_def 9, 10, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM5 warp_def 10, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE -SeafloorCavern_Room4_MapEvents:: @ 85359E4 +SeafloorCavern_Room4_MapEvents:: map_events SeafloorCavern_Room4_EventObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index 75b51c343..22e6d27c7 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room4: @ 8484224 +SeafloorCavern_Room4: .4byte SeafloorCavern_Room4_Layout .4byte SeafloorCavern_Room4_MapEvents .4byte SeafloorCavern_Room4_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 151 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM4 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room5/events.inc b/data/maps/SeafloorCavern_Room5/events.inc index e4780db22..4f7573270 100644 --- a/data/maps/SeafloorCavern_Room5/events.inc +++ b/data/maps/SeafloorCavern_Room5/events.inc @@ -1,4 +1,4 @@ -SeafloorCavern_Room5_EventObjects: @ 85359F8 +SeafloorCavern_Room5_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_12 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_13 @@ -6,11 +6,11 @@ SeafloorCavern_Room5_EventObjects: @ 85359F8 object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, FLAG_TEMP_16 object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, FLAG_TEMP_14 -SeafloorCavern_Room5_MapWarps: @ 8535A88 +SeafloorCavern_Room5_MapWarps: warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 warp_def 15, 12, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM4 warp_def 7, 17, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM4 -SeafloorCavern_Room5_MapEvents:: @ 8535AA0 +SeafloorCavern_Room5_MapEvents:: map_events SeafloorCavern_Room5_EventObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 6b053fc71..42489c1de 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room5: @ 8484240 +SeafloorCavern_Room5: .4byte SeafloorCavern_Room5_Layout .4byte SeafloorCavern_Room5_MapEvents .4byte SeafloorCavern_Room5_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 152 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM5 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room6/events.inc b/data/maps/SeafloorCavern_Room6/events.inc index 99c10d87e..596daefe2 100644 --- a/data/maps/SeafloorCavern_Room6/events.inc +++ b/data/maps/SeafloorCavern_Room6/events.inc @@ -1,8 +1,8 @@ -SeafloorCavern_Room6_MapWarps: @ 8535AB4 +SeafloorCavern_Room6_MapWarps: warp_def 11, 21, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM2 warp_def 4, 1, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM3 warp_def 14, 8, 1, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE -SeafloorCavern_Room6_MapEvents:: @ 8535ACC +SeafloorCavern_Room6_MapEvents:: map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index d1346acd8..f70a2d07e 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room6: @ 848425C +SeafloorCavern_Room6: .4byte SeafloorCavern_Room6_Layout .4byte SeafloorCavern_Room6_MapEvents .4byte SeafloorCavern_Room6_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 153 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM6 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room7/events.inc b/data/maps/SeafloorCavern_Room7/events.inc index 2d8fca999..fb3fcc1b6 100644 --- a/data/maps/SeafloorCavern_Room7/events.inc +++ b/data/maps/SeafloorCavern_Room7/events.inc @@ -1,7 +1,7 @@ -SeafloorCavern_Room7_MapWarps: @ 8535AE0 +SeafloorCavern_Room7_MapWarps: warp_def 3, 23, 3, 3, MAP_SEAFLOOR_CAVERN_ROOM2 warp_def 5, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM3 -SeafloorCavern_Room7_MapEvents:: @ 8535AF0 +SeafloorCavern_Room7_MapEvents:: map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index b5b4aca03..28433a051 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room7: @ 8484278 +SeafloorCavern_Room7: .4byte SeafloorCavern_Room7_Layout .4byte SeafloorCavern_Room7_MapEvents .4byte SeafloorCavern_Room7_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 154 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM7 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room8/events.inc b/data/maps/SeafloorCavern_Room8/events.inc index c34ec76d3..673f303fe 100644 --- a/data/maps/SeafloorCavern_Room8/events.inc +++ b/data/maps/SeafloorCavern_Room8/events.inc @@ -1,4 +1,4 @@ -SeafloorCavern_Room8_EventObjects: @ 8535B04 +SeafloorCavern_Room8_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_12 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_13 @@ -12,10 +12,10 @@ SeafloorCavern_Room8_EventObjects: @ 8535B04 object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1B object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, FLAG_TEMP_1C -SeafloorCavern_Room8_MapWarps: @ 8535C24 +SeafloorCavern_Room8_MapWarps: warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3 -SeafloorCavern_Room8_MapEvents:: @ 8535C34 +SeafloorCavern_Room8_MapEvents:: map_events SeafloorCavern_Room8_EventObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index 0ada4ab71..bc6f7de4b 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room8: @ 8484294 +SeafloorCavern_Room8: .4byte SeafloorCavern_Room8_Layout .4byte SeafloorCavern_Room8_MapEvents .4byte SeafloorCavern_Room8_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 155 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM8 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc index 6ca415e12..771f58b15 100644 --- a/data/maps/SeafloorCavern_Room9/events.inc +++ b/data/maps/SeafloorCavern_Room9/events.inc @@ -1,4 +1,4 @@ -SeafloorCavern_Room9_EventObjects: @ 8535C48 +SeafloorCavern_Room9_EventObjects: object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1 object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_ARCHIE object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAXIE @@ -7,12 +7,12 @@ SeafloorCavern_Room9_EventObjects: @ 8535C48 object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_291401, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_TM_26 object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_2 -SeafloorCavern_Room9_MapWarps: @ 8535CF0 +SeafloorCavern_Room9_MapWarps: warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 -SeafloorCavern_Room9_MapCoordEvents: @ 8535CF8 +SeafloorCavern_Room9_MapCoordEvents: coord_event 17, 42, 3, VAR_0x40A2, 0, SeafloorCavern_Room9_EventScript_234DC9 -SeafloorCavern_Room9_MapEvents:: @ 8535D08 +SeafloorCavern_Room9_MapEvents:: map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index 4d2be9474..5748571be 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room9: @ 84842B0 +SeafloorCavern_Room9: .4byte SeafloorCavern_Room9_Layout .4byte SeafloorCavern_Room9_MapEvents .4byte SeafloorCavern_Room9_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 156 + .2byte LAYOUT_SEAFLOOR_CAVERN_ROOM9 .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/SealedChamber_InnerRoom/events.inc b/data/maps/SealedChamber_InnerRoom/events.inc index ddd6c15ec..96891324d 100644 --- a/data/maps/SealedChamber_InnerRoom/events.inc +++ b/data/maps/SealedChamber_InnerRoom/events.inc @@ -1,7 +1,7 @@ -SealedChamber_InnerRoom_MapWarps: @ 8536F00 +SealedChamber_InnerRoom_MapWarps: warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM -SealedChamber_InnerRoom_MapBGEvents: @ 8536F08 +SealedChamber_InnerRoom_MapBGEvents: bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_239255 bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_23925F @@ -12,6 +12,6 @@ SealedChamber_InnerRoom_MapBGEvents: @ 8536F08 bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 bg_event 11, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_2391F8 -SealedChamber_InnerRoom_MapEvents:: @ 8536F74 +SealedChamber_InnerRoom_MapEvents:: map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index 5fa5dccc9..6e2a2ff8b 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -1,10 +1,10 @@ -SealedChamber_InnerRoom: @ 84846A0 +SealedChamber_InnerRoom: .4byte SealedChamber_InnerRoom_Layout .4byte SealedChamber_InnerRoom_MapEvents .4byte SealedChamber_InnerRoom_MapScripts .4byte 0x0 .2byte MUS_MABOROSI - .2byte 304 + .2byte LAYOUT_SEALED_CHAMBER_INNER_ROOM .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SealedChamber_OuterRoom/events.inc b/data/maps/SealedChamber_OuterRoom/events.inc index 3cd1b9714..530ff738c 100644 --- a/data/maps/SealedChamber_OuterRoom/events.inc +++ b/data/maps/SealedChamber_OuterRoom/events.inc @@ -1,7 +1,7 @@ -SealedChamber_OuterRoom_MapWarps: @ 8536D88 +SealedChamber_OuterRoom_MapWarps: warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM -SealedChamber_OuterRoom_MapBGEvents: @ 8536D90 +SealedChamber_OuterRoom_MapBGEvents: bg_event 5, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_23916C bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239176 bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_239180 @@ -32,6 +32,6 @@ SealedChamber_OuterRoom_MapBGEvents: @ 8536D90 bg_event 9, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391ED bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_2391ED -SealedChamber_OuterRoom_MapEvents:: @ 8536EEC +SealedChamber_OuterRoom_MapEvents:: map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index 3930e818d..bdb40d153 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -1,10 +1,10 @@ -SealedChamber_OuterRoom: @ 8484684 +SealedChamber_OuterRoom: .4byte SealedChamber_OuterRoom_Layout .4byte SealedChamber_OuterRoom_MapEvents .4byte SealedChamber_OuterRoom_MapScripts .4byte 0x0 .2byte MUS_MABOROSI - .2byte 284 + .2byte LAYOUT_SEALED_CHAMBER_OUTER_ROOM .byte MAPSEC_SEALED_CHAMBER .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BlueCave1/events.inc b/data/maps/SecretBase_BlueCave1/events.inc index 95e52b889..f0cfb017f 100644 --- a/data/maps/SecretBase_BlueCave1/events.inc +++ b/data/maps/SecretBase_BlueCave1/events.inc @@ -1,4 +1,4 @@ -SecretBase_BlueCave1_EventObjects: @ 8537BEC +SecretBase_BlueCave1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BlueCave1_EventObjects: @ 8537BEC object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BlueCave1_MapWarps: @ 8537D54 +SecretBase_BlueCave1_MapWarps: warp_def 5, 7, 0, 126, MAP_NONE -SecretBase_BlueCave1_MapEvents:: @ 8537D5C +SecretBase_BlueCave1_MapEvents:: map_events SecretBase_BlueCave1_EventObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index 60eeeab32..5159eec53 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -1,10 +1,10 @@ -SecretBase_BlueCave1: @ 8484AC8 +SecretBase_BlueCave1: .4byte SecretBase_BlueCave1_Layout .4byte SecretBase_BlueCave1_MapEvents .4byte SecretBase_BlueCave1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 199 + .2byte LAYOUT_SECRET_BASE_BLUE_CAVE1 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BlueCave2/events.inc b/data/maps/SecretBase_BlueCave2/events.inc index 62c4b8dcd..9a2a82db6 100644 --- a/data/maps/SecretBase_BlueCave2/events.inc +++ b/data/maps/SecretBase_BlueCave2/events.inc @@ -1,4 +1,4 @@ -SecretBase_BlueCave2_EventObjects: @ 8538504 +SecretBase_BlueCave2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BlueCave2_EventObjects: @ 8538504 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BlueCave2_MapWarps: @ 853866C +SecretBase_BlueCave2_MapWarps: warp_def 7, 5, 0, 126, MAP_NONE -SecretBase_BlueCave2_MapEvents:: @ 8538674 +SecretBase_BlueCave2_MapEvents:: map_events SecretBase_BlueCave2_EventObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index 348a5cd02..4d893835b 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -1,10 +1,10 @@ -SecretBase_BlueCave2: @ 8484B70 +SecretBase_BlueCave2: .4byte SecretBase_BlueCave2_Layout .4byte SecretBase_BlueCave2_MapEvents .4byte SecretBase_BlueCave2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 205 + .2byte LAYOUT_SECRET_BASE_BLUE_CAVE2 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BlueCave3/events.inc b/data/maps/SecretBase_BlueCave3/events.inc index 14c7460ad..463c513e5 100644 --- a/data/maps/SecretBase_BlueCave3/events.inc +++ b/data/maps/SecretBase_BlueCave3/events.inc @@ -1,4 +1,4 @@ -SecretBase_BlueCave3_EventObjects: @ 8538E1C +SecretBase_BlueCave3_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BlueCave3_EventObjects: @ 8538E1C object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BlueCave3_MapWarps: @ 8538F84 +SecretBase_BlueCave3_MapWarps: warp_def 4, 15, 0, 126, MAP_NONE -SecretBase_BlueCave3_MapEvents:: @ 8538F8C +SecretBase_BlueCave3_MapEvents:: map_events SecretBase_BlueCave3_EventObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 26ab5ef93..1e730552e 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -1,10 +1,10 @@ -SecretBase_BlueCave3: @ 8484C18 +SecretBase_BlueCave3: .4byte SecretBase_BlueCave3_Layout .4byte SecretBase_BlueCave3_MapEvents .4byte SecretBase_BlueCave3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 211 + .2byte LAYOUT_SECRET_BASE_BLUE_CAVE3 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BlueCave4/events.inc b/data/maps/SecretBase_BlueCave4/events.inc index 1d047cd42..fd121b594 100644 --- a/data/maps/SecretBase_BlueCave4/events.inc +++ b/data/maps/SecretBase_BlueCave4/events.inc @@ -1,4 +1,4 @@ -SecretBase_BlueCave4_EventObjects: @ 8539734 +SecretBase_BlueCave4_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BlueCave4_EventObjects: @ 8539734 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BlueCave4_MapWarps: @ 853989C +SecretBase_BlueCave4_MapWarps: warp_def 4, 15, 0, 126, MAP_NONE -SecretBase_BlueCave4_MapEvents:: @ 85398A4 +SecretBase_BlueCave4_MapEvents:: map_events SecretBase_BlueCave4_EventObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 5e253d51e..ff6cb64dc 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -1,10 +1,10 @@ -SecretBase_BlueCave4: @ 8484CC0 +SecretBase_BlueCave4: .4byte SecretBase_BlueCave4_Layout .4byte SecretBase_BlueCave4_MapEvents .4byte SecretBase_BlueCave4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 217 + .2byte LAYOUT_SECRET_BASE_BLUE_CAVE4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BrownCave1/events.inc b/data/maps/SecretBase_BrownCave1/events.inc index 43d144535..82e523298 100644 --- a/data/maps/SecretBase_BrownCave1/events.inc +++ b/data/maps/SecretBase_BrownCave1/events.inc @@ -1,4 +1,4 @@ -SecretBase_BrownCave1_EventObjects: @ 8537A68 +SecretBase_BrownCave1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BrownCave1_EventObjects: @ 8537A68 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BrownCave1_MapWarps: @ 8537BD0 +SecretBase_BrownCave1_MapWarps: warp_def 5, 7, 0, 126, MAP_NONE -SecretBase_BrownCave1_MapEvents:: @ 8537BD8 +SecretBase_BrownCave1_MapEvents:: map_events SecretBase_BrownCave1_EventObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index ab531bf5c..e20bdbce1 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -1,10 +1,10 @@ -SecretBase_BrownCave1: @ 8484AAC +SecretBase_BrownCave1: .4byte SecretBase_BrownCave1_Layout .4byte SecretBase_BrownCave1_MapEvents .4byte SecretBase_BrownCave1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 198 + .2byte LAYOUT_SECRET_BASE_BROWN_CAVE1 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BrownCave2/events.inc b/data/maps/SecretBase_BrownCave2/events.inc index 09bb03327..86d18b5d9 100644 --- a/data/maps/SecretBase_BrownCave2/events.inc +++ b/data/maps/SecretBase_BrownCave2/events.inc @@ -1,4 +1,4 @@ -SecretBase_BrownCave2_EventObjects: @ 8538380 +SecretBase_BrownCave2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BrownCave2_EventObjects: @ 8538380 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BrownCave2_MapWarps: @ 85384E8 +SecretBase_BrownCave2_MapWarps: warp_def 1, 7, 0, 126, MAP_NONE -SecretBase_BrownCave2_MapEvents:: @ 85384F0 +SecretBase_BrownCave2_MapEvents:: map_events SecretBase_BrownCave2_EventObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index 464bcd059..93f2b5923 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -1,10 +1,10 @@ -SecretBase_BrownCave2: @ 8484B54 +SecretBase_BrownCave2: .4byte SecretBase_BrownCave2_Layout .4byte SecretBase_BrownCave2_MapEvents .4byte SecretBase_BrownCave2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 204 + .2byte LAYOUT_SECRET_BASE_BROWN_CAVE2 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BrownCave3/events.inc b/data/maps/SecretBase_BrownCave3/events.inc index 12ec86587..2ec6ed1b2 100644 --- a/data/maps/SecretBase_BrownCave3/events.inc +++ b/data/maps/SecretBase_BrownCave3/events.inc @@ -1,4 +1,4 @@ -SecretBase_BrownCave3_EventObjects: @ 8538C98 +SecretBase_BrownCave3_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BrownCave3_EventObjects: @ 8538C98 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BrownCave3_MapWarps: @ 8538E00 +SecretBase_BrownCave3_MapWarps: warp_def 11, 9, 0, 126, MAP_NONE -SecretBase_BrownCave3_MapEvents:: @ 8538E08 +SecretBase_BrownCave3_MapEvents:: map_events SecretBase_BrownCave3_EventObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 923b2c4be..5c4fac1c0 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -1,10 +1,10 @@ -SecretBase_BrownCave3: @ 8484BFC +SecretBase_BrownCave3: .4byte SecretBase_BrownCave3_Layout .4byte SecretBase_BrownCave3_MapEvents .4byte SecretBase_BrownCave3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 210 + .2byte LAYOUT_SECRET_BASE_BROWN_CAVE3 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_BrownCave4/events.inc b/data/maps/SecretBase_BrownCave4/events.inc index 15fab00be..58e71dc18 100644 --- a/data/maps/SecretBase_BrownCave4/events.inc +++ b/data/maps/SecretBase_BrownCave4/events.inc @@ -1,4 +1,4 @@ -SecretBase_BrownCave4_EventObjects: @ 85395B0 +SecretBase_BrownCave4_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_BrownCave4_EventObjects: @ 85395B0 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_BrownCave4_MapWarps: @ 8539718 +SecretBase_BrownCave4_MapWarps: warp_def 2, 8, 0, 126, MAP_NONE -SecretBase_BrownCave4_MapEvents:: @ 8539720 +SecretBase_BrownCave4_MapEvents:: map_events SecretBase_BrownCave4_EventObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index 6d61f06a7..b3123ee22 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -1,10 +1,10 @@ -SecretBase_BrownCave4: @ 8484CA4 +SecretBase_BrownCave4: .4byte SecretBase_BrownCave4_Layout .4byte SecretBase_BrownCave4_MapEvents .4byte SecretBase_BrownCave4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 216 + .2byte LAYOUT_SECRET_BASE_BROWN_CAVE4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_RedCave1/events.inc b/data/maps/SecretBase_RedCave1/events.inc index e0d718068..015e2bde5 100644 --- a/data/maps/SecretBase_RedCave1/events.inc +++ b/data/maps/SecretBase_RedCave1/events.inc @@ -1,4 +1,4 @@ -SecretBase_RedCave1_EventObjects: @ 85378E4 +SecretBase_RedCave1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_RedCave1_EventObjects: @ 85378E4 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_RedCave1_MapWarps: @ 8537A4C +SecretBase_RedCave1_MapWarps: warp_def 5, 7, 0, 126, MAP_NONE -SecretBase_RedCave1_MapEvents:: @ 8537A54 +SecretBase_RedCave1_MapEvents:: map_events SecretBase_RedCave1_EventObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 82fc8c4e3..4ac30b1cb 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -1,10 +1,10 @@ -SecretBase_RedCave1: @ 8484A90 +SecretBase_RedCave1: .4byte SecretBase_RedCave1_Layout .4byte SecretBase_RedCave1_MapEvents .4byte SecretBase_RedCave1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 197 + .2byte LAYOUT_SECRET_BASE_RED_CAVE1 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_RedCave2/events.inc b/data/maps/SecretBase_RedCave2/events.inc index 365e3f353..70997288d 100644 --- a/data/maps/SecretBase_RedCave2/events.inc +++ b/data/maps/SecretBase_RedCave2/events.inc @@ -1,4 +1,4 @@ -SecretBase_RedCave2_EventObjects: @ 85381FC +SecretBase_RedCave2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_RedCave2_EventObjects: @ 85381FC object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_RedCave2_MapWarps: @ 8538364 +SecretBase_RedCave2_MapWarps: warp_def 3, 14, 0, 126, MAP_NONE -SecretBase_RedCave2_MapEvents:: @ 853836C +SecretBase_RedCave2_MapEvents:: map_events SecretBase_RedCave2_EventObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index e4a2176d7..64ef71196 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -1,10 +1,10 @@ -SecretBase_RedCave2: @ 8484B38 +SecretBase_RedCave2: .4byte SecretBase_RedCave2_Layout .4byte SecretBase_RedCave2_MapEvents .4byte SecretBase_RedCave2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 203 + .2byte LAYOUT_SECRET_BASE_RED_CAVE2 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_RedCave3/events.inc b/data/maps/SecretBase_RedCave3/events.inc index 16e14d49f..191aed927 100644 --- a/data/maps/SecretBase_RedCave3/events.inc +++ b/data/maps/SecretBase_RedCave3/events.inc @@ -1,4 +1,4 @@ -SecretBase_RedCave3_EventObjects: @ 8538B14 +SecretBase_RedCave3_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 12, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_RedCave3_EventObjects: @ 8538B14 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_RedCave3_MapWarps: @ 8538C7C +SecretBase_RedCave3_MapWarps: warp_def 3, 6, 0, 126, MAP_NONE -SecretBase_RedCave3_MapEvents:: @ 8538C84 +SecretBase_RedCave3_MapEvents:: map_events SecretBase_RedCave3_EventObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index 9317921e2..880fa84e6 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -1,10 +1,10 @@ -SecretBase_RedCave3: @ 8484BE0 +SecretBase_RedCave3: .4byte SecretBase_RedCave3_Layout .4byte SecretBase_RedCave3_MapEvents .4byte SecretBase_RedCave3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 209 + .2byte LAYOUT_SECRET_BASE_RED_CAVE3 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_RedCave4/events.inc b/data/maps/SecretBase_RedCave4/events.inc index eaf227506..9e29c6bcc 100644 --- a/data/maps/SecretBase_RedCave4/events.inc +++ b/data/maps/SecretBase_RedCave4/events.inc @@ -1,4 +1,4 @@ -SecretBase_RedCave4_EventObjects: @ 853942C +SecretBase_RedCave4_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_RedCave4_EventObjects: @ 853942C object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_RedCave4_MapWarps: @ 8539594 +SecretBase_RedCave4_MapWarps: warp_def 2, 12, 0, 126, MAP_NONE -SecretBase_RedCave4_MapEvents:: @ 853959C +SecretBase_RedCave4_MapEvents:: map_events SecretBase_RedCave4_EventObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index 62fd094a4..7454f0251 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -1,10 +1,10 @@ -SecretBase_RedCave4: @ 8484C88 +SecretBase_RedCave4: .4byte SecretBase_RedCave4_Layout .4byte SecretBase_RedCave4_MapEvents .4byte SecretBase_RedCave4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 215 + .2byte LAYOUT_SECRET_BASE_RED_CAVE4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc index 07eb2e1bd..89c832969 100644 --- a/data/maps/SecretBase_Shrub1/events.inc +++ b/data/maps/SecretBase_Shrub1/events.inc @@ -1,4 +1,4 @@ -SecretBase_Shrub1_EventObjects: @ 8538078 +SecretBase_Shrub1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Shrub1_EventObjects: @ 8538078 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Shrub1_MapWarps: @ 85381E0 +SecretBase_Shrub1_MapWarps: warp_def 5, 7, 0, 126, MAP_NONE -SecretBase_Shrub1_MapEvents:: @ 85381E8 +SecretBase_Shrub1_MapEvents:: map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index 4807cc485..76bfd4506 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -1,10 +1,10 @@ -SecretBase_Shrub1: @ 8484B1C +SecretBase_Shrub1: .4byte SecretBase_Shrub1_Layout .4byte SecretBase_Shrub1_MapEvents .4byte SecretBase_Shrub1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 202 + .2byte LAYOUT_SECRET_BASE_SHRUB1 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Shrub2/events.inc b/data/maps/SecretBase_Shrub2/events.inc index 385500c5f..6e1f4ee8c 100644 --- a/data/maps/SecretBase_Shrub2/events.inc +++ b/data/maps/SecretBase_Shrub2/events.inc @@ -1,4 +1,4 @@ -SecretBase_Shrub2_EventObjects: @ 8538990 +SecretBase_Shrub2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Shrub2_EventObjects: @ 8538990 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Shrub2_MapWarps: @ 8538AF8 +SecretBase_Shrub2_MapWarps: warp_def 7, 5, 0, 126, MAP_NONE -SecretBase_Shrub2_MapEvents:: @ 8538B00 +SecretBase_Shrub2_MapEvents:: map_events SecretBase_Shrub2_EventObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 56df5fd2f..53faf2d72 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -1,10 +1,10 @@ -SecretBase_Shrub2: @ 8484BC4 +SecretBase_Shrub2: .4byte SecretBase_Shrub2_Layout .4byte SecretBase_Shrub2_MapEvents .4byte SecretBase_Shrub2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 208 + .2byte LAYOUT_SECRET_BASE_SHRUB2 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Shrub3/events.inc b/data/maps/SecretBase_Shrub3/events.inc index 8cc399fed..38408df63 100644 --- a/data/maps/SecretBase_Shrub3/events.inc +++ b/data/maps/SecretBase_Shrub3/events.inc @@ -1,4 +1,4 @@ -SecretBase_Shrub3_EventObjects: @ 85392A8 +SecretBase_Shrub3_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Shrub3_EventObjects: @ 85392A8 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Shrub3_MapWarps: @ 8539410 +SecretBase_Shrub3_MapWarps: warp_def 6, 9, 0, 126, MAP_NONE -SecretBase_Shrub3_MapEvents:: @ 8539418 +SecretBase_Shrub3_MapEvents:: map_events SecretBase_Shrub3_EventObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index 3b5ade8f3..4692a0060 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -1,10 +1,10 @@ -SecretBase_Shrub3: @ 8484C6C +SecretBase_Shrub3: .4byte SecretBase_Shrub3_Layout .4byte SecretBase_Shrub3_MapEvents .4byte SecretBase_Shrub3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 214 + .2byte LAYOUT_SECRET_BASE_SHRUB3 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc index 16dfd4ba1..1ebe8a0e8 100644 --- a/data/maps/SecretBase_Shrub4/events.inc +++ b/data/maps/SecretBase_Shrub4/events.inc @@ -1,4 +1,4 @@ -SecretBase_Shrub4_EventObjects: @ 8539BC0 +SecretBase_Shrub4_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Shrub4_EventObjects: @ 8539BC0 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Shrub4_MapWarps: @ 8539D28 +SecretBase_Shrub4_MapWarps: warp_def 11, 8, 0, 126, MAP_NONE -SecretBase_Shrub4_MapEvents:: @ 8539D30 +SecretBase_Shrub4_MapEvents:: map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 816b963cb..2b0186878 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -1,10 +1,10 @@ -SecretBase_Shrub4: @ 8484D14 +SecretBase_Shrub4: .4byte SecretBase_Shrub4_Layout .4byte SecretBase_Shrub4_MapEvents .4byte SecretBase_Shrub4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 220 + .2byte LAYOUT_SECRET_BASE_SHRUB4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Tree1/events.inc b/data/maps/SecretBase_Tree1/events.inc index 8c7c05e6e..6ed26cb27 100644 --- a/data/maps/SecretBase_Tree1/events.inc +++ b/data/maps/SecretBase_Tree1/events.inc @@ -1,4 +1,4 @@ -SecretBase_Tree1_EventObjects: @ 8537EF4 +SecretBase_Tree1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Tree1_EventObjects: @ 8537EF4 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Tree1_MapWarps: @ 853805C +SecretBase_Tree1_MapWarps: warp_def 5, 7, 0, 126, MAP_NONE -SecretBase_Tree1_MapEvents:: @ 8538064 +SecretBase_Tree1_MapEvents:: map_events SecretBase_Tree1_EventObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index f1ed545a5..8cace4cef 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -1,10 +1,10 @@ -SecretBase_Tree1: @ 8484B00 +SecretBase_Tree1: .4byte SecretBase_Tree1_Layout .4byte SecretBase_Tree1_MapEvents .4byte SecretBase_Tree1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 201 + .2byte LAYOUT_SECRET_BASE_TREE1 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc index e6b5c627b..46b268c37 100644 --- a/data/maps/SecretBase_Tree2/events.inc +++ b/data/maps/SecretBase_Tree2/events.inc @@ -1,4 +1,4 @@ -SecretBase_Tree2_EventObjects: @ 853880C +SecretBase_Tree2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Tree2_EventObjects: @ 853880C object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Tree2_MapWarps: @ 8538974 +SecretBase_Tree2_MapWarps: warp_def 3, 14, 0, 126, MAP_NONE -SecretBase_Tree2_MapEvents:: @ 853897C +SecretBase_Tree2_MapEvents:: map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index 2d8c2652c..7f286a94f 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -1,10 +1,10 @@ -SecretBase_Tree2: @ 8484BA8 +SecretBase_Tree2: .4byte SecretBase_Tree2_Layout .4byte SecretBase_Tree2_MapEvents .4byte SecretBase_Tree2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 207 + .2byte LAYOUT_SECRET_BASE_TREE2 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Tree3/events.inc b/data/maps/SecretBase_Tree3/events.inc index 921c4f102..8512b4e31 100644 --- a/data/maps/SecretBase_Tree3/events.inc +++ b/data/maps/SecretBase_Tree3/events.inc @@ -1,4 +1,4 @@ -SecretBase_Tree3_EventObjects: @ 8539124 +SecretBase_Tree3_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Tree3_EventObjects: @ 8539124 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Tree3_MapWarps: @ 853928C +SecretBase_Tree3_MapWarps: warp_def 8, 6, 0, 126, MAP_NONE -SecretBase_Tree3_MapEvents:: @ 8539294 +SecretBase_Tree3_MapEvents:: map_events SecretBase_Tree3_EventObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index e4f703d21..679490875 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -1,10 +1,10 @@ -SecretBase_Tree3: @ 8484C50 +SecretBase_Tree3: .4byte SecretBase_Tree3_Layout .4byte SecretBase_Tree3_MapEvents .4byte SecretBase_Tree3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 213 + .2byte LAYOUT_SECRET_BASE_TREE3 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_Tree4/events.inc b/data/maps/SecretBase_Tree4/events.inc index ee2495e79..ed0f8b236 100644 --- a/data/maps/SecretBase_Tree4/events.inc +++ b/data/maps/SecretBase_Tree4/events.inc @@ -1,4 +1,4 @@ -SecretBase_Tree4_EventObjects: @ 8539A3C +SecretBase_Tree4_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_Tree4_EventObjects: @ 8539A3C object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_Tree4_MapWarps: @ 8539BA4 +SecretBase_Tree4_MapWarps: warp_def 7, 12, 0, 126, MAP_NONE -SecretBase_Tree4_MapEvents:: @ 8539BAC +SecretBase_Tree4_MapEvents:: map_events SecretBase_Tree4_EventObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index 7cf8ef024..ff2605f40 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -1,10 +1,10 @@ -SecretBase_Tree4: @ 8484CF8 +SecretBase_Tree4: .4byte SecretBase_Tree4_Layout .4byte SecretBase_Tree4_MapEvents .4byte SecretBase_Tree4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 219 + .2byte LAYOUT_SECRET_BASE_TREE4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_YellowCave1/events.inc b/data/maps/SecretBase_YellowCave1/events.inc index 6beae3454..6464c4854 100644 --- a/data/maps/SecretBase_YellowCave1/events.inc +++ b/data/maps/SecretBase_YellowCave1/events.inc @@ -1,4 +1,4 @@ -SecretBase_YellowCave1_EventObjects: @ 8537D70 +SecretBase_YellowCave1_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_YellowCave1_EventObjects: @ 8537D70 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_YellowCave1_MapWarps: @ 8537ED8 +SecretBase_YellowCave1_MapWarps: warp_def 5, 7, 0, 126, MAP_NONE -SecretBase_YellowCave1_MapEvents:: @ 8537EE0 +SecretBase_YellowCave1_MapEvents:: map_events SecretBase_YellowCave1_EventObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index 9bc1b071e..642db55f5 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -1,10 +1,10 @@ -SecretBase_YellowCave1: @ 8484AE4 +SecretBase_YellowCave1: .4byte SecretBase_YellowCave1_Layout .4byte SecretBase_YellowCave1_MapEvents .4byte SecretBase_YellowCave1_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 200 + .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE1 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_YellowCave2/events.inc b/data/maps/SecretBase_YellowCave2/events.inc index 9378718c4..99bcee17d 100644 --- a/data/maps/SecretBase_YellowCave2/events.inc +++ b/data/maps/SecretBase_YellowCave2/events.inc @@ -1,4 +1,4 @@ -SecretBase_YellowCave2_EventObjects: @ 8538688 +SecretBase_YellowCave2_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_YellowCave2_EventObjects: @ 8538688 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_YellowCave2_MapWarps: @ 85387F0 +SecretBase_YellowCave2_MapWarps: warp_def 12, 7, 0, 126, MAP_NONE -SecretBase_YellowCave2_MapEvents:: @ 85387F8 +SecretBase_YellowCave2_MapEvents:: map_events SecretBase_YellowCave2_EventObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index 60c0f49f0..ae0cd73bc 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -1,10 +1,10 @@ -SecretBase_YellowCave2: @ 8484B8C +SecretBase_YellowCave2: .4byte SecretBase_YellowCave2_Layout .4byte SecretBase_YellowCave2_MapEvents .4byte SecretBase_YellowCave2_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 206 + .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE2 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_YellowCave3/events.inc b/data/maps/SecretBase_YellowCave3/events.inc index 3a60b042b..10bbfac8d 100644 --- a/data/maps/SecretBase_YellowCave3/events.inc +++ b/data/maps/SecretBase_YellowCave3/events.inc @@ -1,4 +1,4 @@ -SecretBase_YellowCave3_EventObjects: @ 8538FA0 +SecretBase_YellowCave3_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_YellowCave3_EventObjects: @ 8538FA0 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_YellowCave3_MapWarps: @ 8539108 +SecretBase_YellowCave3_MapWarps: warp_def 5, 9, 0, 126, MAP_NONE -SecretBase_YellowCave3_MapEvents:: @ 8539110 +SecretBase_YellowCave3_MapEvents:: map_events SecretBase_YellowCave3_EventObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index b82555cf4..39008b2b3 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -1,10 +1,10 @@ -SecretBase_YellowCave3: @ 8484C34 +SecretBase_YellowCave3: .4byte SecretBase_YellowCave3_Layout .4byte SecretBase_YellowCave3_MapEvents .4byte SecretBase_YellowCave3_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 212 + .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE3 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc index 13757dbef..9afc93297 100644 --- a/data/maps/SecretBase_YellowCave4/events.inc +++ b/data/maps/SecretBase_YellowCave4/events.inc @@ -1,4 +1,4 @@ -SecretBase_YellowCave4_EventObjects: @ 85398B8 +SecretBase_YellowCave4_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, FLAG_DECORATION_0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_1 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 @@ -15,9 +15,9 @@ SecretBase_YellowCave4_EventObjects: @ 85398B8 object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 -SecretBase_YellowCave4_MapWarps: @ 8539A20 +SecretBase_YellowCave4_MapWarps: warp_def 6, 12, 0, 126, MAP_NONE -SecretBase_YellowCave4_MapEvents:: @ 8539A28 +SecretBase_YellowCave4_MapEvents:: map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index d7056f380..24e10379b 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -1,10 +1,10 @@ -SecretBase_YellowCave4: @ 8484CDC +SecretBase_YellowCave4: .4byte SecretBase_YellowCave4_Layout .4byte SecretBase_YellowCave4_MapEvents .4byte SecretBase_YellowCave4_MapScripts .4byte 0x0 .2byte MUS_MACHI_S3 - .2byte 218 + .2byte LAYOUT_SECRET_BASE_YELLOW_CAVE4 .byte MAPSEC_SECRET_BASE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/events.inc b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc index e04abe693..8fa935974 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/events.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/events.inc @@ -1,3 +1,3 @@ -ShoalCave_HighTideEntranceRoom_MapEvents:: @ 853644C +ShoalCave_HighTideEntranceRoom_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index c4d7d39e9..12d853e7a 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_HighTideEntranceRoom: @ 8484438 +ShoalCave_HighTideEntranceRoom: .4byte ShoalCave_HighTideEntranceRoom_Layout .4byte ShoalCave_HighTideEntranceRoom_MapEvents .4byte ShoalCave_HighTideEntranceRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 168 + .2byte LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_HighTideInnerRoom/events.inc b/data/maps/ShoalCave_HighTideInnerRoom/events.inc index 20d59a56f..96d1e9d5e 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/events.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/events.inc @@ -1,3 +1,3 @@ -ShoalCave_HighTideInnerRoom_MapEvents:: @ 8536460 +ShoalCave_HighTideInnerRoom_MapEvents:: map_events 0x0, 0x0, 0x0, 0x0 diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index f9983a781..cdee5935a 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_HighTideInnerRoom: @ 8484454 +ShoalCave_HighTideInnerRoom: .4byte ShoalCave_HighTideInnerRoom_Layout .4byte ShoalCave_HighTideInnerRoom_MapEvents .4byte ShoalCave_HighTideInnerRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 169 + .2byte LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc index 899ad3eb8..39b462ba8 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc @@ -1,13 +1,13 @@ -ShoalCave_LowTideEntranceRoom_EventObjects: @ 853627C +ShoalCave_LowTideEntranceRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, FLAG_ITEM_SHOAL_CAVE_ENTRANCE_BIG_PEARL object_event 2, EVENT_OBJ_GFX_EXPERT_M, 0, 18, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0 -ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC +ShoalCave_LowTideEntranceRoom_MapWarps: warp_def 20, 30, 3, 0, MAP_ROUTE125 warp_def 19, 5, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 6, 2, 3, 6, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 27, 2, 3, 7, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM -ShoalCave_LowTideEntranceRoom_MapEvents:: @ 85362CC +ShoalCave_LowTideEntranceRoom_MapEvents:: map_events ShoalCave_LowTideEntranceRoom_EventObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index 656df8188..cf1600b53 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideEntranceRoom: @ 84843C8 +ShoalCave_LowTideEntranceRoom: .4byte ShoalCave_LowTideEntranceRoom_Layout .4byte ShoalCave_LowTideEntranceRoom_MapEvents .4byte ShoalCave_LowTideEntranceRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 164 + .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_LowTideIceRoom/events.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc index 99ab13475..57c4f580b 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/events.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/events.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideIceRoom_EventObjects: @ 8537100 +ShoalCave_LowTideIceRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_TM_07 object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, FLAG_ITEM_SHOAL_CAVE_ICE_ROOM_NEVER_MELT_ICE -ShoalCave_LowTideIceRoom_MapWarps: @ 8537130 +ShoalCave_LowTideIceRoom_MapWarps: warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM -ShoalCave_LowTideIceRoom_MapEvents:: @ 8537138 +ShoalCave_LowTideIceRoom_MapEvents:: map_events ShoalCave_LowTideIceRoom_EventObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index 58669c0c6..a05edf096 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideIceRoom: @ 84847D4 +ShoalCave_LowTideIceRoom: .4byte ShoalCave_LowTideIceRoom_Layout .4byte ShoalCave_LowTideIceRoom_MapEvents .4byte ShoalCave_LowTideIceRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 328 + .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc index 4f446148e..8a4d0b7a9 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc @@ -1,7 +1,7 @@ -ShoalCave_LowTideInnerRoom_EventObjects: @ 85362E0 +ShoalCave_LowTideInnerRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, FLAG_ITEM_SHOAL_CAVE_INNER_ROOM_RARE_CANDY -ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 +ShoalCave_LowTideInnerRoom_MapWarps: warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM warp_def 38, 15, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM warp_def 42, 4, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM @@ -11,7 +11,7 @@ ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 warp_def 14, 33, 5, 2, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM warp_def 40, 33, 5, 3, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM -ShoalCave_LowTideInnerRoom_MapBGEvents: @ 8536338 +ShoalCave_LowTideInnerRoom_MapBGEvents: bg_event 31, 8, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_23708C bg_event 14, 26, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_2370C8 bg_event 41, 20, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_236FBA @@ -19,6 +19,6 @@ ShoalCave_LowTideInnerRoom_MapBGEvents: @ 8536338 bg_event 6, 9, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_237028 bg_event 16, 13, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_23705A -ShoalCave_LowTideInnerRoom_MapEvents:: @ 8536380 +ShoalCave_LowTideInnerRoom_MapEvents:: map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index 7f21d0a22..431d59985 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideInnerRoom: @ 84843E4 +ShoalCave_LowTideInnerRoom: .4byte ShoalCave_LowTideInnerRoom_Layout .4byte ShoalCave_LowTideInnerRoom_MapEvents .4byte ShoalCave_LowTideInnerRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 165 + .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc index b487edcd7..226f351e4 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc @@ -1,16 +1,16 @@ -ShoalCave_LowTideLowerRoom_EventObjects: @ 85363DC +ShoalCave_LowTideLowerRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, FLAG_TEMP_11 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0 -ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C +ShoalCave_LowTideLowerRoom_MapWarps: warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 2, 6, 3, 4, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 19, 11, 3, 5, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 28, 11, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM -ShoalCave_LowTideLowerRoom_MapBGEvents: @ 853642C +ShoalCave_LowTideLowerRoom_MapBGEvents: bg_event 18, 2, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideLowerRoom_EventScript_237176 -ShoalCave_LowTideLowerRoom_MapEvents:: @ 8536438 +ShoalCave_LowTideLowerRoom_MapEvents:: map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 21ea185ea..490825d06 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideLowerRoom: @ 848441C +ShoalCave_LowTideLowerRoom: .4byte ShoalCave_LowTideLowerRoom_Layout .4byte ShoalCave_LowTideLowerRoom_MapEvents .4byte ShoalCave_LowTideLowerRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 167 + .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc index 6dbf50eb5..640d153f7 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/events.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc @@ -1,13 +1,13 @@ -ShoalCave_LowTideStairsRoom_EventObjects: @ 8536394 +ShoalCave_LowTideStairsRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, FLAG_ITEM_SHOAL_CAVE_STAIRS_ROOM_ICE_HEAL -ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC +ShoalCave_LowTideStairsRoom_MapWarps: warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 7, 4, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM -ShoalCave_LowTideStairsRoom_MapBGEvents: @ 85363BC +ShoalCave_LowTideStairsRoom_MapBGEvents: bg_event 11, 11, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideStairsRoom_EventScript_23711A -ShoalCave_LowTideStairsRoom_MapEvents:: @ 85363C8 +ShoalCave_LowTideStairsRoom_MapEvents:: map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index 7d7089f85..3454cf1f6 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideStairsRoom: @ 8484400 +ShoalCave_LowTideStairsRoom: .4byte ShoalCave_LowTideStairsRoom_Layout .4byte ShoalCave_LowTideStairsRoom_MapEvents .4byte ShoalCave_LowTideStairsRoom_MapScripts .4byte 0x0 .2byte MUS_M_DUNGON - .2byte 166 + .2byte LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM .byte MAPSEC_SHOAL_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc index b43b505bd..cc422090e 100644 --- a/data/maps/SingleBattleColosseum/events.inc +++ b/data/maps/SingleBattleColosseum/events.inc @@ -1,14 +1,14 @@ -SingleBattleColosseum_EventObjects: @ 8539D44 +SingleBattleColosseum_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0 -SingleBattleColosseum_MapWarps: @ 8539D5C +SingleBattleColosseum_MapWarps: warp_def 6, 8, 3, 127, MAP_NONE warp_def 7, 8, 3, 127, MAP_NONE -SingleBattleColosseum_MapCoordEvents: @ 8539D6C +SingleBattleColosseum_MapCoordEvents: coord_event 3, 5, 3, VAR_TEMP_0, 0, gUnknown_08277374 coord_event 10, 5, 3, VAR_TEMP_0, 0, gUnknown_0827737E -SingleBattleColosseum_MapEvents:: @ 8539D8C +SingleBattleColosseum_MapEvents:: map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index ac5f23b1e..9bf35edca 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -1,10 +1,10 @@ -SingleBattleColosseum: @ 8484D30 +SingleBattleColosseum: .4byte SingleBattleColosseum_Layout .4byte SingleBattleColosseum_MapEvents .4byte SingleBattleColosseum_MapScripts .4byte 0x0 .2byte MUS_RAINBOW - .2byte 221 + .2byte LAYOUT_SINGLE_BATTLE_COLOSSEUM .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_1F/events.inc b/data/maps/SkyPillar_1F/events.inc index 59ac1aac0..eb6f98b7d 100644 --- a/data/maps/SkyPillar_1F/events.inc +++ b/data/maps/SkyPillar_1F/events.inc @@ -1,8 +1,8 @@ -SkyPillar_1F_MapWarps: @ 8537058 +SkyPillar_1F_MapWarps: warp_def 6, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE warp_def 7, 13, 3, 1, MAP_SKY_PILLAR_OUTSIDE warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_2F -SkyPillar_1F_MapEvents:: @ 8537070 +SkyPillar_1F_MapEvents:: map_events 0x0, SkyPillar_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index 9f76317d8..83082ecc0 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -1,10 +1,10 @@ -SkyPillar_1F: @ 8484764 +SkyPillar_1F: .4byte SkyPillar_1F_Layout .4byte SkyPillar_1F_MapEvents .4byte SkyPillar_1F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 322 + .2byte LAYOUT_SKY_PILLAR_1F .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_2F/events.inc b/data/maps/SkyPillar_2F/events.inc index 780db9ccc..3b4b27915 100644 --- a/data/maps/SkyPillar_2F/events.inc +++ b/data/maps/SkyPillar_2F/events.inc @@ -1,7 +1,7 @@ -SkyPillar_2F_MapWarps: @ 8537084 +SkyPillar_2F_MapWarps: warp_def 10, 1, 3, 2, MAP_SKY_PILLAR_1F warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_3F -SkyPillar_2F_MapEvents:: @ 8537094 +SkyPillar_2F_MapEvents:: map_events 0x0, SkyPillar_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index 833510702..46141edca 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -1,10 +1,10 @@ -SkyPillar_2F: @ 8484780 +SkyPillar_2F: .4byte SkyPillar_2F_Layout .4byte SkyPillar_2F_MapEvents .4byte SkyPillar_2F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 323 + .2byte LAYOUT_SKY_PILLAR_2F .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_3F/events.inc b/data/maps/SkyPillar_3F/events.inc index 2e7697395..8e3f498dc 100644 --- a/data/maps/SkyPillar_3F/events.inc +++ b/data/maps/SkyPillar_3F/events.inc @@ -1,8 +1,8 @@ -SkyPillar_3F_MapWarps: @ 85370A8 +SkyPillar_3F_MapWarps: warp_def 3, 1, 3, 1, MAP_SKY_PILLAR_2F warp_def 11, 1, 3, 0, MAP_SKY_PILLAR_4F warp_def 7, 1, 3, 1, MAP_SKY_PILLAR_4F -SkyPillar_3F_MapEvents:: @ 85370C0 +SkyPillar_3F_MapEvents:: map_events 0x0, SkyPillar_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index 5381079f6..9b4ab53f0 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -1,10 +1,10 @@ -SkyPillar_3F: @ 848479C +SkyPillar_3F: .4byte SkyPillar_3F_Layout .4byte SkyPillar_3F_MapEvents .4byte SkyPillar_3F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 324 + .2byte LAYOUT_SKY_PILLAR_3F .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_4F/events.inc b/data/maps/SkyPillar_4F/events.inc index 248e36f95..ce0cdd2e3 100644 --- a/data/maps/SkyPillar_4F/events.inc +++ b/data/maps/SkyPillar_4F/events.inc @@ -1,8 +1,8 @@ -SkyPillar_4F_MapWarps: @ 85370D4 +SkyPillar_4F_MapWarps: warp_def 11, 1, 3, 1, MAP_SKY_PILLAR_3F warp_def 7, 1, 3, 2, MAP_SKY_PILLAR_3F warp_def 3, 1, 3, 0, MAP_SKY_PILLAR_5F -SkyPillar_4F_MapEvents:: @ 85370EC +SkyPillar_4F_MapEvents:: map_events 0x0, SkyPillar_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index ff91215e0..be6e9e66a 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -1,10 +1,10 @@ -SkyPillar_4F: @ 84847B8 +SkyPillar_4F: .4byte SkyPillar_4F_Layout .4byte SkyPillar_4F_MapEvents .4byte SkyPillar_4F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 325 + .2byte LAYOUT_SKY_PILLAR_4F .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_5F/events.inc b/data/maps/SkyPillar_5F/events.inc index c0acb14c0..b3ad7b0f7 100644 --- a/data/maps/SkyPillar_5F/events.inc +++ b/data/maps/SkyPillar_5F/events.inc @@ -1,7 +1,7 @@ -SkyPillar_5F_MapWarps: @ 853714C +SkyPillar_5F_MapWarps: warp_def 3, 1, 3, 2, MAP_SKY_PILLAR_4F warp_def 10, 1, 3, 0, MAP_SKY_PILLAR_TOP -SkyPillar_5F_MapEvents:: @ 853715C +SkyPillar_5F_MapEvents:: map_events 0x0, SkyPillar_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index 06618c766..8fa59173b 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -1,10 +1,10 @@ -SkyPillar_5F: @ 84847F0 +SkyPillar_5F: .4byte SkyPillar_5F_Layout .4byte SkyPillar_5F_MapEvents .4byte SkyPillar_5F_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 330 + .2byte LAYOUT_SKY_PILLAR_5F .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_Entrance/events.inc b/data/maps/SkyPillar_Entrance/events.inc index 92cf0da9b..ca0647e3f 100644 --- a/data/maps/SkyPillar_Entrance/events.inc +++ b/data/maps/SkyPillar_Entrance/events.inc @@ -1,7 +1,7 @@ -SkyPillar_Entrance_MapWarps: @ 8536FF8 +SkyPillar_Entrance_MapWarps: warp_def 6, 16, 3, 0, MAP_ROUTE131 warp_def 14, 4, 3, 0, MAP_SKY_PILLAR_OUTSIDE -SkyPillar_Entrance_MapEvents:: @ 8537008 +SkyPillar_Entrance_MapEvents:: map_events 0x0, SkyPillar_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 434b1f85a..5326495a6 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -1,10 +1,10 @@ -SkyPillar_Entrance: @ 848472C +SkyPillar_Entrance: .4byte SkyPillar_Entrance_Layout .4byte SkyPillar_Entrance_MapEvents .4byte SkyPillar_Entrance_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 320 + .2byte LAYOUT_SKY_PILLAR_ENTRANCE .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_Outside/events.inc b/data/maps/SkyPillar_Outside/events.inc index 9519d1248..90de89d64 100644 --- a/data/maps/SkyPillar_Outside/events.inc +++ b/data/maps/SkyPillar_Outside/events.inc @@ -1,10 +1,10 @@ -SkyPillar_Outside_EventObjects: @ 853701C +SkyPillar_Outside_EventObjects: object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Outside_EventScript_2393F8, FLAG_HIDE_SKY_PILLAR_WALLACE -SkyPillar_Outside_MapWarps: @ 8537034 +SkyPillar_Outside_MapWarps: warp_def 17, 13, 3, 1, MAP_SKY_PILLAR_ENTRANCE warp_def 14, 5, 0, 0, MAP_SKY_PILLAR_1F -SkyPillar_Outside_MapEvents:: @ 8537044 +SkyPillar_Outside_MapEvents:: map_events SkyPillar_Outside_EventObjects, SkyPillar_Outside_MapWarps, 0x0, 0x0 diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 3ca072c80..3b60eaef2 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -1,10 +1,10 @@ -SkyPillar_Outside: @ 8484748 +SkyPillar_Outside: .4byte SkyPillar_Outside_Layout .4byte SkyPillar_Outside_MapEvents .4byte SkyPillar_Outside_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 321 + .2byte LAYOUT_SKY_PILLAR_OUTSIDE .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc index a47e5e77f..23edf5bb2 100644 --- a/data/maps/SkyPillar_Top/events.inc +++ b/data/maps/SkyPillar_Top/events.inc @@ -1,13 +1,13 @@ -SkyPillar_Top_EventObjects: @ 8537170 +SkyPillar_Top_EventObjects: object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 14, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SKY_PILLAR_TOP_RAYQUAZA_2 object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 14, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Top_EventScript_239722, FLAG_RAYQUAZA_ON_SKY_TOWER_SUMMIT -SkyPillar_Top_MapWarps: @ 85371A0 +SkyPillar_Top_MapWarps: warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F -SkyPillar_Top_MapCoordEvents: @ 85371A8 +SkyPillar_Top_MapCoordEvents: coord_event 14, 9, 3, VAR_0x40D7, 0, SkyPillar_Top_EventScript_23979A -SkyPillar_Top_MapEvents:: @ 85371B8 +SkyPillar_Top_MapEvents:: map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0 diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index 07dbd38bb..a4ab735e0 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -1,10 +1,10 @@ -SkyPillar_Top: @ 848480C +SkyPillar_Top: .4byte SkyPillar_Top_Layout .4byte SkyPillar_Top_MapEvents .4byte SkyPillar_Top_MapScripts .4byte 0x0 .2byte MUS_TOZAN - .2byte 331 + .2byte LAYOUT_SKY_PILLAR_TOP .byte MAPSEC_SKY_PILLAR .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity/connections.inc b/data/maps/SlateportCity/connections.inc index 1485b313b..09e0b790a 100644 --- a/data/maps/SlateportCity/connections.inc +++ b/data/maps/SlateportCity/connections.inc @@ -1,9 +1,9 @@ -SlateportCity_MapConnectionsList: @ 84866F4 +SlateportCity_MapConnectionsList: connection up, 0, MAP_ROUTE110 connection down, 0, MAP_ROUTE109 connection right, 0, MAP_ROUTE134 -SlateportCity_MapConnections: @ 8486718 - .4byte 0x3 +SlateportCity_MapConnections: + .4byte 3 .4byte SlateportCity_MapConnectionsList diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc index 2987c2020..ce576927c 100644 --- a/data/maps/SlateportCity/events.inc +++ b/data/maps/SlateportCity/events.inc @@ -1,4 +1,4 @@ -SlateportCity_EventObjects: @ 85261CC +SlateportCity_EventObjects: object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_1DCED9, 0 object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 34, 29, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0 object_event 3, EVENT_OBJ_GFX_RICH_BOY, 0, 5, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_EventScript_1DCEB8, 0 @@ -35,7 +35,7 @@ SlateportCity_EventObjects: @ 85261CC object_event 34, EVENT_OBJ_GFX_POKEFAN_F, 0, 11, 37, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 2, 0, 0, SlateportCity_EventScript_1DD36E, 0 object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 10, 12, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 2, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_SCOTT -SlateportCity_MapWarps: @ 8526514 +SlateportCity_MapWarps: warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F warp_def 13, 26, 0, 0, MAP_SLATEPORT_CITY_MART warp_def 26, 38, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F @@ -48,10 +48,10 @@ SlateportCity_MapWarps: @ 8526514 warp_def 40, 7, 0, 2, MAP_SLATEPORT_CITY_HARBOR warp_def 21, 44, 0, 0, MAP_SLATEPORT_CITY_HOUSE2 -SlateportCity_MapCoordEvents: @ 852656C +SlateportCity_MapCoordEvents: coord_event 10, 13, 3, VAR_0x40D2, 2, SlateportCity_EventScript_1DD5DC -SlateportCity_MapBGEvents: @ 852657C +SlateportCity_MapBGEvents: bg_event 8, 19, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCFB2 bg_event 20, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E73 bg_event 21, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_271E73 @@ -66,6 +66,6 @@ SlateportCity_MapBGEvents: @ 852657C bg_event 23, 38, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_1DCF3F bg_event 10, 36, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1DD643 -SlateportCity_MapEvents:: @ 8526618 +SlateportCity_MapEvents:: map_events SlateportCity_EventObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index b8454f656..3a6e14534 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -1,10 +1,10 @@ -SlateportCity: @ 84824D4 +SlateportCity: .4byte SlateportCity_Layout .4byte SlateportCity_MapEvents .4byte SlateportCity_MapScripts .4byte SlateportCity_MapConnections .2byte MUS_FINECITY - .2byte 2 + .2byte LAYOUT_SLATEPORT_CITY .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc index 71e8d6d3a..2dae03138 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/events.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/events.inc @@ -1,8 +1,8 @@ -SlateportCity_BattleTentBattleRoom_EventObjects: @ 852F4DC +SlateportCity_BattleTentBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -SlateportCity_BattleTentBattleRoom_MapEvents:: @ 852F524 +SlateportCity_BattleTentBattleRoom_MapEvents:: map_events SlateportCity_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc index e9044f1e9..ff2970197 100644 --- a/data/maps/SlateportCity_BattleTentBattleRoom/header.inc +++ b/data/maps/SlateportCity_BattleTentBattleRoom/header.inc @@ -1,10 +1,10 @@ -SlateportCity_BattleTentBattleRoom: @ 848314C +SlateportCity_BattleTentBattleRoom: .4byte BattleTentBattleRoom_Layout .4byte SlateportCity_BattleTentBattleRoom_MapEvents .4byte SlateportCity_BattleTentBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 386 + .2byte LAYOUT_BATTLE_TENT_BATTLE_ROOM .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_BattleTentCorridor/events.inc b/data/maps/SlateportCity_BattleTentCorridor/events.inc index 4fe072b50..f165ab2fa 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/events.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/events.inc @@ -1,6 +1,6 @@ -SlateportCity_BattleTentCorridor_EventObjects: @ 852F4B0 +SlateportCity_BattleTentCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -SlateportCity_BattleTentCorridor_MapEvents:: @ 852F4C8 +SlateportCity_BattleTentCorridor_MapEvents:: map_events SlateportCity_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SlateportCity_BattleTentCorridor/header.inc b/data/maps/SlateportCity_BattleTentCorridor/header.inc index 0a273edef..d1e0a8911 100644 --- a/data/maps/SlateportCity_BattleTentCorridor/header.inc +++ b/data/maps/SlateportCity_BattleTentCorridor/header.inc @@ -1,10 +1,10 @@ -SlateportCity_BattleTentCorridor: @ 8483130 +SlateportCity_BattleTentCorridor: .4byte BattleTentCorridor_Layout .4byte SlateportCity_BattleTentCorridor_MapEvents .4byte SlateportCity_BattleTentCorridor_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 385 + .2byte LAYOUT_BATTLE_TENT_CORRIDOR .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_BattleTentLobby/events.inc b/data/maps/SlateportCity_BattleTentLobby/events.inc index 3eadecd27..81a3499ec 100644 --- a/data/maps/SlateportCity_BattleTentLobby/events.inc +++ b/data/maps/SlateportCity_BattleTentLobby/events.inc @@ -1,17 +1,17 @@ -SlateportCity_BattleTentLobby_EventObjects: @ 852F408 +SlateportCity_BattleTentLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 1, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0 object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 1, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0 -SlateportCity_BattleTentLobby_MapWarps: @ 852F480 +SlateportCity_BattleTentLobby_MapWarps: warp_def 6, 9, 0, 3, MAP_SLATEPORT_CITY warp_def 7, 9, 0, 3, MAP_SLATEPORT_CITY -SlateportCity_BattleTentLobby_MapBGEvents: @ 852F490 +SlateportCity_BattleTentLobby_MapBGEvents: bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_BattleTentLobby_EventScript_208A99 -SlateportCity_BattleTentLobby_MapEvents:: @ 852F49C +SlateportCity_BattleTentLobby_MapEvents:: map_events SlateportCity_BattleTentLobby_EventObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents diff --git a/data/maps/SlateportCity_BattleTentLobby/header.inc b/data/maps/SlateportCity_BattleTentLobby/header.inc index 6bbbbf45f..8b9df581e 100644 --- a/data/maps/SlateportCity_BattleTentLobby/header.inc +++ b/data/maps/SlateportCity_BattleTentLobby/header.inc @@ -1,10 +1,10 @@ -SlateportCity_BattleTentLobby: @ 8483114 +SlateportCity_BattleTentLobby: .4byte BattleTentLobby_Layout .4byte SlateportCity_BattleTentLobby_MapEvents .4byte SlateportCity_BattleTentLobby_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 384 + .2byte LAYOUT_BATTLE_TENT_LOBBY .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc index e0781c2cb..7984e2992 100644 --- a/data/maps/SlateportCity_Harbor/events.inc +++ b/data/maps/SlateportCity_Harbor/events.inc @@ -1,4 +1,4 @@ -SlateportCity_Harbor_EventObjects: @ 852FA68 +SlateportCity_Harbor_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS @@ -8,18 +8,18 @@ SlateportCity_Harbor_EventObjects: @ 852FA68 object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_ARCHIE object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_HARBOR_SUBMARINE_SHADOW -SlateportCity_Harbor_MapWarps: @ 852FB28 +SlateportCity_Harbor_MapWarps: warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY warp_def 12, 14, 0, 8, MAP_SLATEPORT_CITY warp_def 19, 15, 0, 9, MAP_SLATEPORT_CITY warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY -SlateportCity_Harbor_MapCoordEvents: @ 852FB48 +SlateportCity_Harbor_MapCoordEvents: coord_event 8, 11, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9BB coord_event 8, 12, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9C7 coord_event 8, 13, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9D3 coord_event 8, 14, 3, VAR_0x40A0, 1, SlateportCity_Harbor_EventScript_20C9DF -SlateportCity_Harbor_MapEvents:: @ 852FB88 +SlateportCity_Harbor_MapEvents:: map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 922f84f1a..24b39a88f 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -1,10 +1,10 @@ -SlateportCity_Harbor: @ 84831D8 +SlateportCity_Harbor: .4byte Harbor_Layout .4byte SlateportCity_Harbor_MapEvents .4byte SlateportCity_Harbor_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 88 + .2byte LAYOUT_HARBOR .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_House1/events.inc b/data/maps/SlateportCity_House1/events.inc index 9917c0a24..a5fcfba7e 100644 --- a/data/maps/SlateportCity_House1/events.inc +++ b/data/maps/SlateportCity_House1/events.inc @@ -1,10 +1,10 @@ -SlateportCity_House1_EventObjects: @ 852F538 +SlateportCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0 -SlateportCity_House1_MapWarps: @ 852F550 +SlateportCity_House1_MapWarps: warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY -SlateportCity_House1_MapEvents:: @ 852F560 +SlateportCity_House1_MapEvents:: map_events SlateportCity_House1_EventObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 1e48dfb54..2673a3716 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -1,10 +1,10 @@ -SlateportCity_House1: @ 8483168 +SlateportCity_House1: .4byte HouseWithBed_Layout .4byte SlateportCity_House1_MapEvents .4byte SlateportCity_House1_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 80 + .2byte LAYOUT_HOUSE_WITH_BED .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_House2/events.inc b/data/maps/SlateportCity_House2/events.inc index 2dfffdaec..eba48e548 100644 --- a/data/maps/SlateportCity_House2/events.inc +++ b/data/maps/SlateportCity_House2/events.inc @@ -1,11 +1,11 @@ -SlateportCity_House2_EventObjects: @ 852FB9C +SlateportCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_POKEFAN_M, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0 -SlateportCity_House2_MapWarps: @ 852FBCC +SlateportCity_House2_MapWarps: warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY -SlateportCity_House2_MapEvents:: @ 852FBDC +SlateportCity_House2_MapEvents:: map_events SlateportCity_House2_EventObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index 6028d12fb..0e756ee4a 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -1,10 +1,10 @@ -SlateportCity_House2: @ 84831F4 +SlateportCity_House2: .4byte House2_Layout .4byte SlateportCity_House2_MapEvents .4byte SlateportCity_House2_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_Mart/events.inc b/data/maps/SlateportCity_Mart/events.inc index 9cc5b9829..a6d872630 100644 --- a/data/maps/SlateportCity_Mart/events.inc +++ b/data/maps/SlateportCity_Mart/events.inc @@ -1,12 +1,12 @@ -SlateportCity_Mart_EventObjects: @ 852FCF0 +SlateportCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0 object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0 -SlateportCity_Mart_MapWarps: @ 852FD38 +SlateportCity_Mart_MapWarps: warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY -SlateportCity_Mart_MapEvents:: @ 852FD48 +SlateportCity_Mart_MapEvents:: map_events SlateportCity_Mart_EventObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index 2d53ac8c3..a98e7bb90 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -1,10 +1,10 @@ -SlateportCity_Mart: @ 8483248 +SlateportCity_Mart: .4byte Mart_Layout .4byte SlateportCity_Mart_MapEvents .4byte SlateportCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc index 8d727f483..254506300 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc @@ -1,4 +1,4 @@ -SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670 +SlateportCity_OceanicMuseum_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0 object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_AQUA_GRUNTS @@ -14,16 +14,16 @@ SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670 object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_FAMILIAR_AQUA_GRUNT object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION -SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0 +SlateportCity_OceanicMuseum_1F_MapWarps: warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY warp_def 10, 8, 0, 7, MAP_SLATEPORT_CITY warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F -SlateportCity_OceanicMuseum_1F_MapCoordEvents: @ 852F7D8 +SlateportCity_OceanicMuseum_1F_MapCoordEvents: coord_event 9, 7, 3, VAR_0x40AA, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD9F coord_event 10, 7, 3, VAR_0x40AA, 0, SlateportCity_OceanicMuseum_1F_EventScript_20ADB0 -SlateportCity_OceanicMuseum_1F_MapBGEvents: @ 852F7F8 +SlateportCity_OceanicMuseum_1F_MapBGEvents: bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE83 bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE8C bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AE95 @@ -38,6 +38,6 @@ SlateportCity_OceanicMuseum_1F_MapBGEvents: @ 852F7F8 bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AECB bg_event 17, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_20AECB -SlateportCity_OceanicMuseum_1F_MapEvents:: @ 852F894 +SlateportCity_OceanicMuseum_1F_MapEvents:: map_events SlateportCity_OceanicMuseum_1F_EventObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index b75a12f60..0bf69b52a 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -1,10 +1,10 @@ -SlateportCity_OceanicMuseum_1F: @ 84831A0 +SlateportCity_OceanicMuseum_1F: .4byte SlateportCity_OceanicMuseum_1F_Layout .4byte SlateportCity_OceanicMuseum_1F_MapEvents .4byte SlateportCity_OceanicMuseum_1F_MapScripts .4byte 0x0 .2byte MUS_FUNE_KAN - .2byte 86 + .2byte LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc index 14499f35b..b1cd4477a 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc @@ -1,4 +1,4 @@ -SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8 +SlateportCity_OceanicMuseum_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_CAPTAIN_STERN object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_ARCHIE object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLATEPORT_CITY_OCEANIC_MUSEUM_2F_AQUA_GRUNT_1 @@ -7,10 +7,10 @@ SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8 object_event 6, EVENT_OBJ_GFX_POKEFAN_F, 0, 9, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION object_event 7, EVENT_OBJ_GFX_NINJA_BOY, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION -SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950 +SlateportCity_OceanicMuseum_2F_MapWarps: warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F -SlateportCity_OceanicMuseum_2F_MapBGEvents: @ 852F958 +SlateportCity_OceanicMuseum_2F_MapBGEvents: bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD0A bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD13 bg_event 4, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD52 @@ -33,6 +33,6 @@ SlateportCity_OceanicMuseum_2F_MapBGEvents: @ 852F958 bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 bg_event 4, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 -SlateportCity_OceanicMuseum_2F_MapEvents:: @ 852FA54 +SlateportCity_OceanicMuseum_2F_MapEvents:: map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index a571c2372..8212c6be5 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -1,10 +1,10 @@ -SlateportCity_OceanicMuseum_2F: @ 84831BC +SlateportCity_OceanicMuseum_2F: .4byte SlateportCity_OceanicMuseum_2F_Layout .4byte SlateportCity_OceanicMuseum_2F_MapEvents .4byte SlateportCity_OceanicMuseum_2F_MapScripts .4byte 0x0 .2byte MUS_FUNE_KAN - .2byte 87 + .2byte LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_PokemonCenter_1F/events.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc index f5409bdf0..79442b1aa 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/events.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/events.inc @@ -1,13 +1,13 @@ -SlateportCity_PokemonCenter_1F_EventObjects: @ 852FBF0 +SlateportCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0 object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0 -SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38 +SlateportCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY warp_def 6, 8, 3, 0, MAP_SLATEPORT_CITY warp_def 1, 6, 4, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_2F -SlateportCity_PokemonCenter_1F_MapEvents:: @ 852FC50 +SlateportCity_PokemonCenter_1F_MapEvents:: map_events SlateportCity_PokemonCenter_1F_EventObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index 37f19272d..aee6e2e1c 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -SlateportCity_PokemonCenter_1F: @ 8483210 +SlateportCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte SlateportCity_PokemonCenter_1F_MapEvents .4byte SlateportCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_PokemonCenter_2F/events.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc index c28c3111a..34f7fe078 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/events.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -SlateportCity_PokemonCenter_2F_EventObjects: @ 852FC64 +SlateportCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4 +SlateportCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -SlateportCity_PokemonCenter_2F_MapEvents:: @ 852FCDC +SlateportCity_PokemonCenter_2F_MapEvents:: map_events SlateportCity_PokemonCenter_2F_EventObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 1cac2f35e..bc9640581 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -SlateportCity_PokemonCenter_2F: @ 848322C +SlateportCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte SlateportCity_PokemonCenter_2F_MapEvents .4byte SlateportCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_PokemonFanClub/events.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc index 74b2a6acf..861d9cb62 100644 --- a/data/maps/SlateportCity_PokemonFanClub/events.inc +++ b/data/maps/SlateportCity_PokemonFanClub/events.inc @@ -1,4 +1,4 @@ -SlateportCity_PokemonFanClub_EventObjects: @ 852F574 +SlateportCity_PokemonFanClub_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0 object_event 2, EVENT_OBJ_GFX_TWIN, 0, 1, 5, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0 object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0 @@ -9,10 +9,10 @@ SlateportCity_PokemonFanClub_EventObjects: @ 852F574 object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0 object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 11, 8, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0 -SlateportCity_PokemonFanClub_MapWarps: @ 852F64C +SlateportCity_PokemonFanClub_MapWarps: warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY -SlateportCity_PokemonFanClub_MapEvents:: @ 852F65C +SlateportCity_PokemonFanClub_MapEvents:: map_events SlateportCity_PokemonFanClub_EventObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index b3b0dc899..29e6816a3 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -1,10 +1,10 @@ -SlateportCity_PokemonFanClub: @ 8483184 +SlateportCity_PokemonFanClub: .4byte SlateportCity_PokemonFanClub_Layout .4byte SlateportCity_PokemonFanClub_MapEvents .4byte SlateportCity_PokemonFanClub_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 85 + .2byte LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_SternsShipyard_1F/events.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc index 5bad8c5e2..052ccd965 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/events.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/events.inc @@ -1,14 +1,14 @@ -SlateportCity_SternsShipyard_1F_EventObjects: @ 852F318 +SlateportCity_SternsShipyard_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0 object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0 object_event 4, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY -SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378 +SlateportCity_SternsShipyard_1F_MapWarps: warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY warp_def 3, 14, 0, 2, MAP_SLATEPORT_CITY warp_def 3, 1, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F -SlateportCity_SternsShipyard_1F_MapEvents:: @ 852F390 +SlateportCity_SternsShipyard_1F_MapEvents:: map_events SlateportCity_SternsShipyard_1F_EventObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index e702530ef..3731923e2 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -1,10 +1,10 @@ -SlateportCity_SternsShipyard_1F: @ 84830DC +SlateportCity_SternsShipyard_1F: .4byte SlateportCity_SternsShipyard_1F_Layout .4byte SlateportCity_SternsShipyard_1F_MapEvents .4byte SlateportCity_SternsShipyard_1F_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 81 + .2byte LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SlateportCity_SternsShipyard_2F/events.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc index f34a52726..2e48eb8b4 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/events.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/events.inc @@ -1,11 +1,11 @@ -SlateportCity_SternsShipyard_2F_EventObjects: @ 852F3A4 +SlateportCity_SternsShipyard_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0 object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0 -SlateportCity_SternsShipyard_2F_MapWarps: @ 852F3EC +SlateportCity_SternsShipyard_2F_MapWarps: warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F -SlateportCity_SternsShipyard_2F_MapEvents:: @ 852F3F4 +SlateportCity_SternsShipyard_2F_MapEvents:: map_events SlateportCity_SternsShipyard_2F_EventObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index 8139d7604..094f9fdec 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -1,10 +1,10 @@ -SlateportCity_SternsShipyard_2F: @ 84830F8 +SlateportCity_SternsShipyard_2F: .4byte SlateportCity_SternsShipyard_2F_Layout .4byte SlateportCity_SternsShipyard_2F_MapEvents .4byte SlateportCity_SternsShipyard_2F_MapScripts .4byte 0x0 .2byte MUS_FINECITY - .2byte 82 + .2byte LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F .byte MAPSEC_SLATEPORT_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc index 9ca0bb20d..6592c293d 100644 --- a/data/maps/SootopolisCity/events.inc +++ b/data/maps/SootopolisCity/events.inc @@ -1,4 +1,4 @@ -SootopolisCity_EventObjects: @ 8527314 +SootopolisCity_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 47, 33, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0 @@ -18,7 +18,7 @@ SootopolisCity_EventObjects: @ 8527314 object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 31, 33, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E651F, FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 31, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_1E6446, FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE -SootopolisCity_MapWarps: @ 85274C4 +SootopolisCity_MapWarps: warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F warp_def 17, 29, 0, 0, MAP_SOOTOPOLIS_CITY_MART warp_def 31, 32, 0, 0, MAP_SOOTOPOLIS_CITY_GYM_1F @@ -33,7 +33,7 @@ SootopolisCity_MapWarps: @ 85274C4 warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE warp_def 51, 36, 0, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F -SootopolisCity_MapBGEvents: @ 852752C +SootopolisCity_MapBGEvents: bg_event 33, 34, 3, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_1E614B bg_event 19, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E6A bg_event 44, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E73 @@ -41,6 +41,6 @@ SootopolisCity_MapBGEvents: @ 852752C bg_event 18, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_271E6A bg_event 41, 37, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_1E6154 -SootopolisCity_MapEvents:: @ 8527574 +SootopolisCity_MapEvents:: map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index 1b6832fbe..0d12af500 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -1,10 +1,10 @@ -SootopolisCity: @ 848257C +SootopolisCity: .4byte SootopolisCity_Layout .4byte SootopolisCity_MapEvents .4byte SootopolisCity_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 8 + .2byte LAYOUT_SOOTOPOLIS_CITY .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc index 36d8d7b27..288d78343 100644 --- a/data/maps/SootopolisCity_Gym_1F/events.inc +++ b/data/maps/SootopolisCity_Gym_1F/events.inc @@ -1,16 +1,16 @@ -SootopolisCity_Gym_1F_EventObjects: @ 8532FF4 +SootopolisCity_Gym_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_JUAN, 0, 8, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0 object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0 -SootopolisCity_Gym_1F_MapWarps: @ 8533024 +SootopolisCity_Gym_1F_MapWarps: warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY warp_def 9, 25, 0, 2, MAP_SOOTOPOLIS_CITY warp_def 11, 22, 3, 0, MAP_SOOTOPOLIS_CITY_GYM_B1F -SootopolisCity_Gym_1F_MapBGEvents: @ 853303C +SootopolisCity_Gym_1F_MapBGEvents: bg_event 6, 24, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_Gym_1F_EventScript_22505F bg_event 10, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_Gym_1F_EventScript_22506F -SootopolisCity_Gym_1F_MapEvents:: @ 8533054 +SootopolisCity_Gym_1F_MapEvents:: map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index 1d71e0923..72e6fd2c8 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_Gym_1F: @ 8483A28 +SootopolisCity_Gym_1F: .4byte SootopolisCity_Gym_1F_Layout .4byte SootopolisCity_Gym_1F_MapEvents .4byte SootopolisCity_Gym_1F_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 109 + .2byte LAYOUT_SOOTOPOLIS_CITY_GYM_1F .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_Gym_B1F/events.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc index 0ca0287ad..2ef2609e7 100644 --- a/data/maps/SootopolisCity_Gym_B1F/events.inc +++ b/data/maps/SootopolisCity_Gym_B1F/events.inc @@ -1,4 +1,4 @@ -SootopolisCity_Gym_B1F_EventObjects: @ 8533068 +SootopolisCity_Gym_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0 object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0 @@ -10,9 +10,9 @@ SootopolisCity_Gym_B1F_EventObjects: @ 8533068 object_event 9, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0 object_event 10, EVENT_OBJ_GFX_POKEFAN_F, 0, 10, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0 -SootopolisCity_Gym_B1F_MapWarps: @ 8533158 +SootopolisCity_Gym_B1F_MapWarps: warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F -SootopolisCity_Gym_B1F_MapEvents:: @ 8533160 +SootopolisCity_Gym_B1F_MapEvents:: map_events SootopolisCity_Gym_B1F_EventObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index c06afbc1b..afa12fa9f 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_Gym_B1F: @ 8483A44 +SootopolisCity_Gym_B1F: .4byte SootopolisCity_Gym_B1F_Layout .4byte SootopolisCity_Gym_B1F_MapEvents .4byte SootopolisCity_Gym_B1F_MapScripts .4byte 0x0 .2byte MUS_GIM - .2byte 110 + .2byte LAYOUT_SOOTOPOLIS_CITY_GYM_B1F .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House1/events.inc b/data/maps/SootopolisCity_House1/events.inc index 38885d648..64012784a 100644 --- a/data/maps/SootopolisCity_House1/events.inc +++ b/data/maps/SootopolisCity_House1/events.inc @@ -1,11 +1,11 @@ -SootopolisCity_House1_EventObjects: @ 85332F8 +SootopolisCity_House1_EventObjects: object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0 object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0 -SootopolisCity_House1_MapWarps: @ 8533328 +SootopolisCity_House1_MapWarps: warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY -SootopolisCity_House1_MapEvents:: @ 8533338 +SootopolisCity_House1_MapEvents:: map_events SootopolisCity_House1_EventObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index f7621f917..af4cf939c 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House1: @ 8483AB4 +SootopolisCity_House1: .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House1_MapEvents .4byte SootopolisCity_House1_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 307 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE1 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House2/events.inc b/data/maps/SootopolisCity_House2/events.inc index 509eeb46f..ea70cecb9 100644 --- a/data/maps/SootopolisCity_House2/events.inc +++ b/data/maps/SootopolisCity_House2/events.inc @@ -1,10 +1,10 @@ -SootopolisCity_House2_EventObjects: @ 853334C +SootopolisCity_House2_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_F, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0 -SootopolisCity_House2_MapWarps: @ 8533364 +SootopolisCity_House2_MapWarps: warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY -SootopolisCity_House2_MapEvents:: @ 8533374 +SootopolisCity_House2_MapEvents:: map_events SootopolisCity_House2_EventObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index c32962718..42b7e14aa 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House2: @ 8483AD0 +SootopolisCity_House2: .4byte SootopolisCity_House2_Layout .4byte SootopolisCity_House2_MapEvents .4byte SootopolisCity_House2_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 308 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE2 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House3/events.inc b/data/maps/SootopolisCity_House3/events.inc index 5a91765c5..d078de8ec 100644 --- a/data/maps/SootopolisCity_House3/events.inc +++ b/data/maps/SootopolisCity_House3/events.inc @@ -1,11 +1,11 @@ -SootopolisCity_House3_EventObjects: @ 8533388 +SootopolisCity_House3_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0 object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0 -SootopolisCity_House3_MapWarps: @ 85333B8 +SootopolisCity_House3_MapWarps: warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY -SootopolisCity_House3_MapEvents:: @ 85333C8 +SootopolisCity_House3_MapEvents:: map_events SootopolisCity_House3_EventObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index bd90fabc0..0913505e1 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House3: @ 8483AEC +SootopolisCity_House3: .4byte SootopolisCity_House3_Layout .4byte SootopolisCity_House3_MapEvents .4byte SootopolisCity_House3_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 309 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE3 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House4/events.inc b/data/maps/SootopolisCity_House4/events.inc index 3bd0aed0e..ce669cd75 100644 --- a/data/maps/SootopolisCity_House4/events.inc +++ b/data/maps/SootopolisCity_House4/events.inc @@ -1,12 +1,12 @@ -SootopolisCity_House4_EventObjects: @ 85333DC +SootopolisCity_House4_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 2, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0 object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SootopolisCity_House4_EventScript_226D28, 0 -SootopolisCity_House4_MapWarps: @ 8533424 +SootopolisCity_House4_MapWarps: warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY -SootopolisCity_House4_MapEvents:: @ 8533434 +SootopolisCity_House4_MapEvents:: map_events SootopolisCity_House4_EventObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index f71568287..1266c68fe 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House4: @ 8483B08 +SootopolisCity_House4: .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House4_MapEvents .4byte SootopolisCity_House4_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 307 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE1 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House5/events.inc b/data/maps/SootopolisCity_House5/events.inc index 321de8b64..fa6d0452d 100644 --- a/data/maps/SootopolisCity_House5/events.inc +++ b/data/maps/SootopolisCity_House5/events.inc @@ -1,11 +1,11 @@ -SootopolisCity_House5_EventObjects: @ 8533448 +SootopolisCity_House5_EventObjects: object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0 object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0 -SootopolisCity_House5_MapWarps: @ 8533478 +SootopolisCity_House5_MapWarps: warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY -SootopolisCity_House5_MapEvents:: @ 8533488 +SootopolisCity_House5_MapEvents:: map_events SootopolisCity_House5_EventObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index d3d90fb05..0b1b3664c 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House5: @ 8483B24 +SootopolisCity_House5: .4byte SootopolisCity_House2_Layout .4byte SootopolisCity_House5_MapEvents .4byte SootopolisCity_House5_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 308 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE2 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House6/events.inc b/data/maps/SootopolisCity_House6/events.inc index 40fd1d0a7..c89c13538 100644 --- a/data/maps/SootopolisCity_House6/events.inc +++ b/data/maps/SootopolisCity_House6/events.inc @@ -1,10 +1,10 @@ -SootopolisCity_House6_EventObjects: @ 853349C +SootopolisCity_House6_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0 -SootopolisCity_House6_MapWarps: @ 85334B4 +SootopolisCity_House6_MapWarps: warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY -SootopolisCity_House6_MapEvents:: @ 85334C4 +SootopolisCity_House6_MapEvents:: map_events SootopolisCity_House6_EventObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index e3daef4ed..3268fbf09 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House6: @ 8483B40 +SootopolisCity_House6: .4byte SootopolisCity_House3_Layout .4byte SootopolisCity_House6_MapEvents .4byte SootopolisCity_House6_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 309 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE3 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_House7/events.inc b/data/maps/SootopolisCity_House7/events.inc index d2f4e1ff2..e978cb8d4 100644 --- a/data/maps/SootopolisCity_House7/events.inc +++ b/data/maps/SootopolisCity_House7/events.inc @@ -1,11 +1,11 @@ -SootopolisCity_House7_EventObjects: @ 85334D8 +SootopolisCity_House7_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0 object_event 2, EVENT_OBJ_GFX_POKEFAN_F, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0 -SootopolisCity_House7_MapWarps: @ 8533508 +SootopolisCity_House7_MapWarps: warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY -SootopolisCity_House7_MapEvents:: @ 8533518 +SootopolisCity_House7_MapEvents:: map_events SootopolisCity_House7_EventObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index db988ed22..0398f1cf7 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_House7: @ 8483B5C +SootopolisCity_House7: .4byte SootopolisCity_House1_Layout .4byte SootopolisCity_House7_MapEvents .4byte SootopolisCity_House7_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 307 + .2byte LAYOUT_SOOTOPOLIS_CITY_HOUSE1 .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc index 07c18bae5..da5b123fe 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/events.inc @@ -1,15 +1,15 @@ -SootopolisCity_LotadAndSeedotHouse_EventObjects: @ 853352C +SootopolisCity_LotadAndSeedotHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0 object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0 -SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C +SootopolisCity_LotadAndSeedotHouse_MapWarps: warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY -SootopolisCity_LotadAndSeedotHouse_MapBGEvents: @ 853356C +SootopolisCity_LotadAndSeedotHouse_MapBGEvents: bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_LotadAndSeedotHouse_EventScript_22734D bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_LotadAndSeedotHouse_EventScript_22735B -SootopolisCity_LotadAndSeedotHouse_MapEvents:: @ 8533584 +SootopolisCity_LotadAndSeedotHouse_MapEvents:: map_events SootopolisCity_LotadAndSeedotHouse_EventObjects, SootopolisCity_LotadAndSeedotHouse_MapWarps, 0x0, SootopolisCity_LotadAndSeedotHouse_MapBGEvents diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc index 47f68b58f..35da7aa8b 100644 --- a/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc +++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_LotadAndSeedotHouse: @ 8483B78 +SootopolisCity_LotadAndSeedotHouse: .4byte SootopolisCity_LotadAndSeedotHouse_Layout .4byte SootopolisCity_LotadAndSeedotHouse_MapEvents .4byte SootopolisCity_LotadAndSeedotHouse_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 297 + .2byte LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_Mart/events.inc b/data/maps/SootopolisCity_Mart/events.inc index 32fc081d2..0fb940fd9 100644 --- a/data/maps/SootopolisCity_Mart/events.inc +++ b/data/maps/SootopolisCity_Mart/events.inc @@ -1,12 +1,12 @@ -SootopolisCity_Mart_EventObjects: @ 853328C +SootopolisCity_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0 object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0 object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0 -SootopolisCity_Mart_MapWarps: @ 85332D4 +SootopolisCity_Mart_MapWarps: warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY -SootopolisCity_Mart_MapEvents:: @ 85332E4 +SootopolisCity_Mart_MapEvents:: map_events SootopolisCity_Mart_EventObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index 131540c7a..5b5ad1a01 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_Mart: @ 8483A98 +SootopolisCity_Mart: .4byte Mart_Layout .4byte SootopolisCity_Mart_MapEvents .4byte SootopolisCity_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc index 65a265578..560e693cf 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/events.inc @@ -1,11 +1,11 @@ -SootopolisCity_MysteryEventsHouse_1F_EventObjects: @ 8533598 +SootopolisCity_MysteryEventsHouse_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_OLD_MAN, 0, 6, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0 -SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0 +SootopolisCity_MysteryEventsHouse_1F_MapWarps: warp_def 3, 7, 0, 12, MAP_SOOTOPOLIS_CITY warp_def 4, 7, 0, 12, MAP_SOOTOPOLIS_CITY warp_def 3, 1, 3, 0, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F -SootopolisCity_MysteryEventsHouse_1F_MapEvents:: @ 85335C8 +SootopolisCity_MysteryEventsHouse_1F_MapEvents:: map_events SootopolisCity_MysteryEventsHouse_1F_EventObjects, SootopolisCity_MysteryEventsHouse_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc index 153be53cb..bf7d81321 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_MysteryEventsHouse_1F: @ 8483B94 +SootopolisCity_MysteryEventsHouse_1F: .4byte SootopolisCity_MysteryEventsHouse_1F_Layout .4byte SootopolisCity_MysteryEventsHouse_1F_MapEvents .4byte SootopolisCity_MysteryEventsHouse_1F_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 439 + .2byte LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc index 5cdbf0559..816cbaecc 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/events.inc @@ -1,9 +1,9 @@ -SootopolisCity_MysteryEventsHouse_B1F_EventObjects: @ 85335DC +SootopolisCity_MysteryEventsHouse_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, 0 -SootopolisCity_MysteryEventsHouse_B1F_MapWarps: @ 85335F4 +SootopolisCity_MysteryEventsHouse_B1F_MapWarps: warp_def 3, 1, 0, 2, MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F -SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: @ 85335FC +SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: map_events SootopolisCity_MysteryEventsHouse_B1F_EventObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc index e0355b074..ee7def94c 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_MysteryEventsHouse_B1F: @ 8483BB0 +SootopolisCity_MysteryEventsHouse_B1F: .4byte SootopolisCity_MysteryEventsHouse_B1F_Layout .4byte SootopolisCity_MysteryEventsHouse_B1F_MapEvents .4byte SootopolisCity_MysteryEventsHouse_B1F_MapScripts .4byte 0x0 .2byte MUS_RUNECITY - .2byte 440 + .2byte LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc index b5a221dad..743ba0ccb 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -SootopolisCity_PokemonCenter_1F_EventObjects: @ 8533174 +SootopolisCity_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0 object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0 -SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4 +SootopolisCity_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY warp_def 6, 8, 3, 0, MAP_SOOTOPOLIS_CITY warp_def 1, 6, 4, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F -SootopolisCity_PokemonCenter_1F_MapEvents:: @ 85331EC +SootopolisCity_PokemonCenter_1F_MapEvents:: map_events SootopolisCity_PokemonCenter_1F_EventObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index 75da1fc47..972cf28e4 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_PokemonCenter_1F: @ 8483A60 +SootopolisCity_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte SootopolisCity_PokemonCenter_1F_MapEvents .4byte SootopolisCity_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc index 0062c87e1..e8fb6e09f 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -SootopolisCity_PokemonCenter_2F_EventObjects: @ 8533200 +SootopolisCity_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260 +SootopolisCity_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -SootopolisCity_PokemonCenter_2F_MapEvents:: @ 8533278 +SootopolisCity_PokemonCenter_2F_MapEvents:: map_events SootopolisCity_PokemonCenter_2F_EventObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index f9e1c5189..03ab97ea5 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -SootopolisCity_PokemonCenter_2F: @ 8483A7C +SootopolisCity_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte SootopolisCity_PokemonCenter_2F_MapEvents .4byte SootopolisCity_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc index 14dc7169b..eeb21d3af 100644 --- a/data/maps/SouthernIsland_Exterior/events.inc +++ b/data/maps/SouthernIsland_Exterior/events.inc @@ -1,14 +1,14 @@ -SouthernIsland_Exterior_EventObjects: @ 853B83C +SouthernIsland_Exterior_EventObjects: object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0 object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 -SouthernIsland_Exterior_MapWarps: @ 853B86C +SouthernIsland_Exterior_MapWarps: warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR -SouthernIsland_Exterior_MapBGEvents: @ 853B87C +SouthernIsland_Exterior_MapBGEvents: bg_event 16, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SouthernIsland_Exterior_EventScript_242A3C -SouthernIsland_Exterior_MapEvents:: @ 853B888 +SouthernIsland_Exterior_MapEvents:: map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index 4aa0eff1a..1288fbdf5 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -1,10 +1,10 @@ -SouthernIsland_Exterior: @ 8485238 +SouthernIsland_Exterior: .4byte SouthernIsland_Exterior_Layout .4byte SouthernIsland_Exterior_MapEvents .4byte SouthernIsland_Exterior_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 290 + .2byte LAYOUT_SOUTHERN_ISLAND_EXTERIOR .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte WEATHER_NONE diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc index 000386c33..190762f5b 100644 --- a/data/maps/SouthernIsland_Interior/events.inc +++ b/data/maps/SouthernIsland_Interior/events.inc @@ -1,14 +1,14 @@ -SouthernIsland_Interior_EventObjects: @ 853B89C +SouthernIsland_Interior_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 13, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON -SouthernIsland_Interior_MapWarps: @ 853B8CC +SouthernIsland_Interior_MapWarps: warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR -SouthernIsland_Interior_MapBGEvents: @ 853B8DC +SouthernIsland_Interior_MapBGEvents: bg_event 13, 11, 3, BG_EVENT_PLAYER_FACING_NORTH, SouthernIsland_Interior_EventScript_242AC4 -SouthernIsland_Interior_MapEvents:: @ 853B8E8 +SouthernIsland_Interior_MapEvents:: map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index b1238c4f7..95eb61d7c 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -1,10 +1,10 @@ -SouthernIsland_Interior: @ 8485254 +SouthernIsland_Interior: .4byte SouthernIsland_Interior_Layout .4byte SouthernIsland_Interior_MapEvents .4byte SouthernIsland_Interior_MapScripts .4byte 0x0 .2byte MUS_DAN02 - .2byte 291 + .2byte LAYOUT_SOUTHERN_ISLAND_INTERIOR .byte MAPSEC_SOUTHERN_ISLAND .byte 0 .byte WEATHER_SHADE diff --git a/data/maps/TerraCave_End/events.inc b/data/maps/TerraCave_End/events.inc index 553b4151a..f20abd8fd 100644 --- a/data/maps/TerraCave_End/events.inc +++ b/data/maps/TerraCave_End/events.inc @@ -1,12 +1,12 @@ -TerraCave_End_EventObjects: @ 8537850 +TerraCave_End_EventObjects: object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 17, 22, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_TERRA_CAVE_GROUDON -TerraCave_End_MapWarps: @ 8537868 +TerraCave_End_MapWarps: warp_def 5, 4, 3, 1, MAP_TERRA_CAVE_ENTRANCE -TerraCave_End_MapCoordEvents: @ 8537870 +TerraCave_End_MapCoordEvents: coord_event 17, 26, 3, VAR_TEMP_1, 1, TerraCave_End_EventScript_23B0EC -TerraCave_End_MapEvents:: @ 8537880 +TerraCave_End_MapEvents:: map_events TerraCave_End_EventObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0 diff --git a/data/maps/TerraCave_End/header.inc b/data/maps/TerraCave_End/header.inc index 8ba9f7d45..f95ac38b8 100644 --- a/data/maps/TerraCave_End/header.inc +++ b/data/maps/TerraCave_End/header.inc @@ -1,10 +1,10 @@ -TerraCave_End: @ 8484A3C +TerraCave_End: .4byte TerraCave_End_Layout .4byte TerraCave_End_MapEvents .4byte TerraCave_End_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 409 + .2byte LAYOUT_TERRA_CAVE_END .byte MAPSEC_TERRA_CAVE .byte 0 .byte WEATHER_FOG_1 diff --git a/data/maps/TerraCave_Entrance/events.inc b/data/maps/TerraCave_Entrance/events.inc index a176c548d..bfa4092fd 100644 --- a/data/maps/TerraCave_Entrance/events.inc +++ b/data/maps/TerraCave_Entrance/events.inc @@ -1,7 +1,7 @@ -TerraCave_Entrance_MapWarps: @ 853782C +TerraCave_Entrance_MapWarps: warp_def 8, 18, 0, 127, MAP_NONE warp_def 14, 1, 3, 0, MAP_TERRA_CAVE_END -TerraCave_Entrance_MapEvents:: @ 853783C +TerraCave_Entrance_MapEvents:: map_events 0x0, TerraCave_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/TerraCave_Entrance/header.inc b/data/maps/TerraCave_Entrance/header.inc index b75c86799..5ede2a448 100644 --- a/data/maps/TerraCave_Entrance/header.inc +++ b/data/maps/TerraCave_Entrance/header.inc @@ -1,10 +1,10 @@ -TerraCave_Entrance: @ 8484A20 +TerraCave_Entrance: .4byte TerraCave_Entrance_Layout .4byte TerraCave_Entrance_MapEvents .4byte TerraCave_Entrance_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 408 + .2byte LAYOUT_TERRA_CAVE_ENTRANCE .byte MAPSEC_TERRA_CAVE .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc index 8991b6aab..79faca7e6 100644 --- a/data/maps/TradeCenter/events.inc +++ b/data/maps/TradeCenter/events.inc @@ -1,14 +1,14 @@ -TradeCenter_EventObjects: @ 8539DA0 +TradeCenter_EventObjects: object_event 1, EVENT_OBJ_GFX_LINK_RECEPTIONIST, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0 -TradeCenter_MapWarps: @ 8539DB8 +TradeCenter_MapWarps: warp_def 5, 8, 3, 127, MAP_NONE warp_def 6, 8, 3, 127, MAP_NONE -TradeCenter_MapCoordEvents: @ 8539DC8 +TradeCenter_MapCoordEvents: coord_event 4, 5, 3, VAR_TEMP_0, 0, gUnknown_082773F5 coord_event 7, 5, 3, VAR_TEMP_0, 0, gUnknown_082773FF -TradeCenter_MapEvents:: @ 8539DE8 +TradeCenter_MapEvents:: map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index 9b621cb02..80a11cd52 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -1,10 +1,10 @@ -TradeCenter: @ 8484D4C +TradeCenter: .4byte TradeCenter_Layout .4byte TradeCenter_MapEvents .4byte TradeCenter_MapScripts .4byte 0x0 .2byte MUS_RAINBOW - .2byte 222 + .2byte LAYOUT_TRADE_CENTER .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_1F/events.inc b/data/maps/TrainerHill_1F/events.inc index 2a2428f57..21e62b951 100644 --- a/data/maps/TrainerHill_1F/events.inc +++ b/data/maps/TrainerHill_1F/events.inc @@ -1,7 +1,7 @@ -TrainerHill_1F_MapWarps: @ 853D934 +TrainerHill_1F_MapWarps: warp_def 2, 1, 3, 2, MAP_TRAINER_HILL_ENTRANCE warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_2F -TrainerHill_1F_MapEvents:: @ 853D944 +TrainerHill_1F_MapEvents:: map_events 0x0, TrainerHill_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/TrainerHill_1F/header.inc b/data/maps/TrainerHill_1F/header.inc index 3c6b58119..a3654edf2 100644 --- a/data/maps/TrainerHill_1F/header.inc +++ b/data/maps/TrainerHill_1F/header.inc @@ -1,10 +1,10 @@ -TrainerHill_1F: @ 84857E8 +TrainerHill_1F: .4byte TrainerHill_1F_Layout .4byte TrainerHill_1F_MapEvents .4byte TrainerHill_1F_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 415 + .2byte LAYOUT_TRAINER_HILL_1F .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_2F/events.inc b/data/maps/TrainerHill_2F/events.inc index ca50380d5..4752e33cd 100644 --- a/data/maps/TrainerHill_2F/events.inc +++ b/data/maps/TrainerHill_2F/events.inc @@ -1,7 +1,7 @@ -TrainerHill_2F_MapWarps: @ 853D958 +TrainerHill_2F_MapWarps: warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_1F warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_3F -TrainerHill_2F_MapEvents:: @ 853D968 +TrainerHill_2F_MapEvents:: map_events 0x0, TrainerHill_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/TrainerHill_2F/header.inc b/data/maps/TrainerHill_2F/header.inc index d8343060c..2f607baff 100644 --- a/data/maps/TrainerHill_2F/header.inc +++ b/data/maps/TrainerHill_2F/header.inc @@ -1,10 +1,10 @@ -TrainerHill_2F: @ 8485804 +TrainerHill_2F: .4byte TrainerHill_2F_Layout .4byte TrainerHill_2F_MapEvents .4byte TrainerHill_2F_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 416 + .2byte LAYOUT_TRAINER_HILL_2F .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_3F/events.inc b/data/maps/TrainerHill_3F/events.inc index e12394655..5de009a47 100644 --- a/data/maps/TrainerHill_3F/events.inc +++ b/data/maps/TrainerHill_3F/events.inc @@ -1,7 +1,7 @@ -TrainerHill_3F_MapWarps: @ 853D97C +TrainerHill_3F_MapWarps: warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_2F warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_4F -TrainerHill_3F_MapEvents:: @ 853D98C +TrainerHill_3F_MapEvents:: map_events 0x0, TrainerHill_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/TrainerHill_3F/header.inc b/data/maps/TrainerHill_3F/header.inc index db82eb277..4dd8e394f 100644 --- a/data/maps/TrainerHill_3F/header.inc +++ b/data/maps/TrainerHill_3F/header.inc @@ -1,10 +1,10 @@ -TrainerHill_3F: @ 8485820 +TrainerHill_3F: .4byte TrainerHill_3F_Layout .4byte TrainerHill_3F_MapEvents .4byte TrainerHill_3F_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 417 + .2byte LAYOUT_TRAINER_HILL_3F .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_4F/events.inc b/data/maps/TrainerHill_4F/events.inc index e9696de15..05f6e8917 100644 --- a/data/maps/TrainerHill_4F/events.inc +++ b/data/maps/TrainerHill_4F/events.inc @@ -1,7 +1,7 @@ -TrainerHill_4F_MapWarps: @ 853D9A0 +TrainerHill_4F_MapWarps: warp_def 2, 1, 3, 1, MAP_TRAINER_HILL_3F warp_def 12, 1, 3, 0, MAP_TRAINER_HILL_ROOF -TrainerHill_4F_MapEvents:: @ 853D9B0 +TrainerHill_4F_MapEvents:: map_events 0x0, TrainerHill_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/TrainerHill_4F/header.inc b/data/maps/TrainerHill_4F/header.inc index d699f53d5..4f370c5d9 100644 --- a/data/maps/TrainerHill_4F/header.inc +++ b/data/maps/TrainerHill_4F/header.inc @@ -1,10 +1,10 @@ -TrainerHill_4F: @ 848583C +TrainerHill_4F: .4byte TrainerHill_4F_Layout .4byte TrainerHill_4F_MapEvents .4byte TrainerHill_4F_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 418 + .2byte LAYOUT_TRAINER_HILL_4F .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_Elevator/events.inc b/data/maps/TrainerHill_Elevator/events.inc index 0125c9936..c0336a267 100644 --- a/data/maps/TrainerHill_Elevator/events.inc +++ b/data/maps/TrainerHill_Elevator/events.inc @@ -1,10 +1,10 @@ -TrainerHill_Elevator_EventObjects: @ 853DD84 +TrainerHill_Elevator_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0 -TrainerHill_Elevator_MapWarps: @ 853DD9C +TrainerHill_Elevator_MapWarps: warp_def 1, 6, 3, 1, MAP_TRAINER_HILL_ROOF warp_def 2, 6, 3, 1, MAP_TRAINER_HILL_ROOF -TrainerHill_Elevator_MapEvents:: @ 853DDAC +TrainerHill_Elevator_MapEvents:: map_events TrainerHill_Elevator_EventObjects, TrainerHill_Elevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/TrainerHill_Elevator/header.inc b/data/maps/TrainerHill_Elevator/header.inc index 936b7712d..5eeaa994b 100644 --- a/data/maps/TrainerHill_Elevator/header.inc +++ b/data/maps/TrainerHill_Elevator/header.inc @@ -1,10 +1,10 @@ -TrainerHill_Elevator: @ 8485ADC +TrainerHill_Elevator: .4byte BattleElevator_Layout .4byte TrainerHill_Elevator_MapEvents .4byte TrainerHill_Elevator_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 266 + .2byte LAYOUT_BATTLE_ELEVATOR .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_Entrance/events.inc b/data/maps/TrainerHill_Entrance/events.inc index 30817defc..ddc3f3f09 100644 --- a/data/maps/TrainerHill_Entrance/events.inc +++ b/data/maps/TrainerHill_Entrance/events.inc @@ -1,21 +1,21 @@ -TrainerHill_Entrance_EventObjects: @ 853D874 +TrainerHill_Entrance_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0 object_event 2, EVENT_OBJ_GFX_NURSE, 0, 4, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0 object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0 object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 5, 14, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0 object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 14, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, TrainerHill_Entrance_EventScript_268391, 0 -TrainerHill_Entrance_MapWarps: @ 853D8EC +TrainerHill_Entrance_MapWarps: warp_def 9, 16, 3, 4, MAP_ROUTE111 warp_def 10, 16, 3, 4, MAP_ROUTE111 warp_def 9, 1, 3, 0, MAP_TRAINER_HILL_1F -TrainerHill_Entrance_MapCoordEvents: @ 853D904 +TrainerHill_Entrance_MapCoordEvents: coord_event 9, 6, 3, VAR_0x40D6, 0, TrainerHill_Entrance_EventScript_268229 -TrainerHill_Entrance_MapBGEvents: @ 853D914 +TrainerHill_Entrance_MapBGEvents: bg_event 8, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, TrainerHill_Entrance_EventScript_268388 -TrainerHill_Entrance_MapEvents:: @ 853D920 +TrainerHill_Entrance_MapEvents:: map_events TrainerHill_Entrance_EventObjects, TrainerHill_Entrance_MapWarps, TrainerHill_Entrance_MapCoordEvents, TrainerHill_Entrance_MapBGEvents diff --git a/data/maps/TrainerHill_Entrance/header.inc b/data/maps/TrainerHill_Entrance/header.inc index 79d6c8b96..26e215a6e 100644 --- a/data/maps/TrainerHill_Entrance/header.inc +++ b/data/maps/TrainerHill_Entrance/header.inc @@ -1,10 +1,10 @@ -TrainerHill_Entrance: @ 84857CC +TrainerHill_Entrance: .4byte TrainerHill_Entrance_Layout .4byte TrainerHill_Entrance_MapEvents .4byte TrainerHill_Entrance_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 414 + .2byte LAYOUT_TRAINER_HILL_ENTRANCE .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/TrainerHill_Roof/events.inc b/data/maps/TrainerHill_Roof/events.inc index eeab57317..0a3b361c4 100644 --- a/data/maps/TrainerHill_Roof/events.inc +++ b/data/maps/TrainerHill_Roof/events.inc @@ -1,10 +1,10 @@ -TrainerHill_Roof_EventObjects: @ 853D9C4 +TrainerHill_Roof_EventObjects: object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0 -TrainerHill_Roof_MapWarps: @ 853D9DC +TrainerHill_Roof_MapWarps: warp_def 9, 5, 3, 1, MAP_TRAINER_HILL_4F warp_def 15, 5, 0, 1, MAP_TRAINER_HILL_ELEVATOR -TrainerHill_Roof_MapEvents:: @ 853D9EC +TrainerHill_Roof_MapEvents:: map_events TrainerHill_Roof_EventObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0 diff --git a/data/maps/TrainerHill_Roof/header.inc b/data/maps/TrainerHill_Roof/header.inc index 9f0b0dd3b..c27cb3b5a 100644 --- a/data/maps/TrainerHill_Roof/header.inc +++ b/data/maps/TrainerHill_Roof/header.inc @@ -1,10 +1,10 @@ -TrainerHill_Roof: @ 8485858 +TrainerHill_Roof: .4byte TrainerHill_Roof_Layout .4byte TrainerHill_Roof_MapEvents .4byte TrainerHill_Roof_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 419 + .2byte LAYOUT_TRAINER_HILL_ROOF .byte MAPSEC_TRAINER_HILL .byte 0 .byte WEATHER_NONE diff --git a/data/maps/Underwater1/connections.inc b/data/maps/Underwater1/connections.inc index b0b1aa108..01c45b11b 100644 --- a/data/maps/Underwater1/connections.inc +++ b/data/maps/Underwater1/connections.inc @@ -1,8 +1,8 @@ -Underwater1_MapConnectionsList: @ 8486D38 +Underwater1_MapConnectionsList: connection down, 0, MAP_UNDERWATER2 connection emerge, 0, MAP_ROUTE124 -Underwater1_MapConnections: @ 8486D50 - .4byte 0x2 +Underwater1_MapConnections: + .4byte 2 .4byte Underwater1_MapConnectionsList diff --git a/data/maps/Underwater1/events.inc b/data/maps/Underwater1/events.inc index 7d3866eb0..ef329306f 100644 --- a/data/maps/Underwater1/events.inc +++ b/data/maps/Underwater1/events.inc @@ -1,4 +1,4 @@ -Underwater1_MapBGEvents: @ 852CEB4 +Underwater1_MapBGEvents: bg_hidden_item_event 42, 51, 0, ITEM_CARBOS, FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS bg_hidden_item_event 14, 40, 0, ITEM_GREEN_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD bg_hidden_item_event 66, 34, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL @@ -7,6 +7,6 @@ Underwater1_MapBGEvents: @ 852CEB4 bg_hidden_item_event 42, 5, 3, ITEM_CALCIUM, FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM bg_hidden_item_event 45, 36, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2 -Underwater1_MapEvents:: @ 852CF08 +Underwater1_MapEvents:: map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index 7cf954299..06ab5f383 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -1,10 +1,10 @@ -Underwater1: @ 8482A30 +Underwater1: .4byte Underwater1_Layout .4byte Underwater1_MapEvents .4byte Underwater1_MapScripts .4byte Underwater1_MapConnections .2byte MUS_DEEPDEEP - .2byte 274 + .2byte LAYOUT_UNDERWATER1 .byte MAPSEC_UNDERWATER_124 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater2/connections.inc b/data/maps/Underwater2/connections.inc index 11df3eaec..74f11e5af 100644 --- a/data/maps/Underwater2/connections.inc +++ b/data/maps/Underwater2/connections.inc @@ -1,9 +1,9 @@ -Underwater2_MapConnectionsList: @ 8486D6C +Underwater2_MapConnectionsList: connection up, 0, MAP_UNDERWATER1 connection right, 0, MAP_UNDERWATER3 connection emerge, 0, MAP_ROUTE126 -Underwater2_MapConnections: @ 8486D90 - .4byte 0x3 +Underwater2_MapConnections: + .4byte 3 .4byte Underwater2_MapConnectionsList diff --git a/data/maps/Underwater2/events.inc b/data/maps/Underwater2/events.inc index dd2421506..b4127fc15 100644 --- a/data/maps/Underwater2/events.inc +++ b/data/maps/Underwater2/events.inc @@ -1,7 +1,7 @@ -Underwater2_MapWarps: @ 852CF1C +Underwater2_MapWarps: warp_def 45, 65, 0, 0, MAP_UNDERWATER_SOOTOPOLIS_CITY -Underwater2_MapBGEvents: @ 852CF24 +Underwater2_MapBGEvents: bg_hidden_item_event 30, 17, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE bg_hidden_item_event 41, 19, 3, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL bg_hidden_item_event 63, 19, 3, ITEM_STARDUST, FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST @@ -11,6 +11,6 @@ Underwater2_MapBGEvents: @ 852CF24 bg_hidden_item_event 65, 60, 3, ITEM_BIG_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL bg_hidden_item_event 9, 77, 3, ITEM_BLUE_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD -Underwater2_MapEvents:: @ 852CF84 +Underwater2_MapEvents:: map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index a4c14ab28..d1b11aa62 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -1,10 +1,10 @@ -Underwater2: @ 8482A4C +Underwater2: .4byte Underwater2_Layout .4byte Underwater2_MapEvents .4byte Underwater2_MapScripts .4byte Underwater2_MapConnections .2byte MUS_DEEPDEEP - .2byte 51 + .2byte LAYOUT_UNDERWATER2 .byte MAPSEC_UNDERWATER_125 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater3/connections.inc b/data/maps/Underwater3/connections.inc index db8b0947b..e0e6226de 100644 --- a/data/maps/Underwater3/connections.inc +++ b/data/maps/Underwater3/connections.inc @@ -1,9 +1,9 @@ -Underwater3_MapConnectionsList: @ 8486D98 +Underwater3_MapConnectionsList: connection emerge, 0, MAP_ROUTE127 connection left, 0, MAP_UNDERWATER2 connection down, 0, MAP_UNDERWATER4 -Underwater3_MapConnections: @ 8486DBC - .4byte 0x3 +Underwater3_MapConnections: + .4byte 3 .4byte Underwater3_MapConnectionsList diff --git a/data/maps/Underwater3/events.inc b/data/maps/Underwater3/events.inc index 02ac86aa1..92964db38 100644 --- a/data/maps/Underwater3/events.inc +++ b/data/maps/Underwater3/events.inc @@ -1,13 +1,13 @@ -Underwater3_MapWarps: @ 852CF98 +Underwater3_MapWarps: warp_def 57, 5, 0, 0, MAP_UNDERWATER_MARINE_CAVE warp_def 67, 38, 0, 0, MAP_UNDERWATER_MARINE_CAVE -Underwater3_MapBGEvents: @ 852CFA8 +Underwater3_MapBGEvents: bg_hidden_item_event 12, 42, 3, ITEM_STAR_PIECE, FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE bg_hidden_item_event 50, 36, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP bg_hidden_item_event 34, 72, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE bg_hidden_item_event 72, 20, 3, ITEM_RED_SHARD, FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD -Underwater3_MapEvents:: @ 852CFD8 +Underwater3_MapEvents:: map_events 0x0, Underwater3_MapWarps, 0x0, Underwater3_MapBGEvents diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 4e91eb687..1722cfdd8 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -1,10 +1,10 @@ -Underwater3: @ 8482A68 +Underwater3: .4byte Underwater3_Layout .4byte Underwater3_MapEvents .4byte Underwater3_MapScripts .4byte Underwater3_MapConnections .2byte MUS_DEEPDEEP - .2byte 52 + .2byte LAYOUT_UNDERWATER3 .byte MAPSEC_UNDERWATER_126 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater4/connections.inc b/data/maps/Underwater4/connections.inc index 8a63d54a4..c1701e1dd 100644 --- a/data/maps/Underwater4/connections.inc +++ b/data/maps/Underwater4/connections.inc @@ -1,8 +1,8 @@ -Underwater4_MapConnectionsList: @ 8486DC4 +Underwater4_MapConnectionsList: connection up, 0, MAP_UNDERWATER3 connection emerge, 0, MAP_ROUTE128 -Underwater4_MapConnections: @ 8486DDC - .4byte 0x2 +Underwater4_MapConnections: + .4byte 2 .4byte Underwater4_MapConnectionsList diff --git a/data/maps/Underwater4/events.inc b/data/maps/Underwater4/events.inc index 5a08e82f9..4bdc98caf 100644 --- a/data/maps/Underwater4/events.inc +++ b/data/maps/Underwater4/events.inc @@ -1,10 +1,10 @@ -Underwater4_MapWarps: @ 852CFEC +Underwater4_MapWarps: warp_def 38, 26, 3, 0, MAP_UNDERWATER_SEAFLOOR_CAVERN -Underwater4_MapBGEvents: @ 852CFF4 +Underwater4_MapBGEvents: bg_hidden_item_event 38, 19, 3, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN bg_hidden_item_event 69, 18, 3, ITEM_PEARL, FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL -Underwater4_MapEvents:: @ 852D00C +Underwater4_MapEvents:: map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index 804fb1d14..2b9975a90 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -1,10 +1,10 @@ -Underwater4: @ 8482A84 +Underwater4: .4byte Underwater4_Layout .4byte Underwater4_MapEvents .4byte Underwater4_MapScripts .4byte Underwater4_MapConnections .2byte MUS_DEEPDEEP - .2byte 53 + .2byte LAYOUT_UNDERWATER4 .byte MAPSEC_UNDERWATER_127 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater5/connections.inc b/data/maps/Underwater5/connections.inc index 15a3322ed..c082452d3 100644 --- a/data/maps/Underwater5/connections.inc +++ b/data/maps/Underwater5/connections.inc @@ -1,7 +1,7 @@ -Underwater5_MapConnectionsList: @ 8486DE4 +Underwater5_MapConnectionsList: connection emerge, 0, MAP_ROUTE129 -Underwater5_MapConnections: @ 8486DF0 - .4byte 0x1 +Underwater5_MapConnections: + .4byte 1 .4byte Underwater5_MapConnectionsList diff --git a/data/maps/Underwater5/events.inc b/data/maps/Underwater5/events.inc index 4b902cf96..5b5c58cf4 100644 --- a/data/maps/Underwater5/events.inc +++ b/data/maps/Underwater5/events.inc @@ -1,7 +1,7 @@ -Underwater5_MapWarps: @ 852D020 +Underwater5_MapWarps: warp_def 26, 3, 0, 0, MAP_UNDERWATER_MARINE_CAVE warp_def 32, 21, 0, 0, MAP_UNDERWATER_MARINE_CAVE -Underwater5_MapEvents:: @ 852D030 +Underwater5_MapEvents:: map_events 0x0, Underwater5_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater5/header.inc b/data/maps/Underwater5/header.inc index 8ad3b5ba2..3466acdf6 100644 --- a/data/maps/Underwater5/header.inc +++ b/data/maps/Underwater5/header.inc @@ -1,10 +1,10 @@ -Underwater5: @ 8482AA0 +Underwater5: .4byte Underwater5_Layout .4byte Underwater5_MapEvents .4byte Underwater5_MapScripts .4byte Underwater5_MapConnections .2byte MUS_DEEPDEEP - .2byte 412 + .2byte LAYOUT_UNDERWATER5 .byte MAPSEC_UNDERWATER_129 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater6/connections.inc b/data/maps/Underwater6/connections.inc index 432ab625f..8e051ea55 100644 --- a/data/maps/Underwater6/connections.inc +++ b/data/maps/Underwater6/connections.inc @@ -1,7 +1,7 @@ -Underwater6_MapConnectionsList: @ 8486D24 +Underwater6_MapConnectionsList: connection emerge, 0, MAP_ROUTE105 -Underwater6_MapConnections: @ 8486D30 - .4byte 0x1 +Underwater6_MapConnections: + .4byte 1 .4byte Underwater6_MapConnectionsList diff --git a/data/maps/Underwater6/events.inc b/data/maps/Underwater6/events.inc index a624efba3..067bc5561 100644 --- a/data/maps/Underwater6/events.inc +++ b/data/maps/Underwater6/events.inc @@ -1,7 +1,7 @@ -Underwater6_MapWarps: @ 852D044 +Underwater6_MapWarps: warp_def 13, 4, 0, 0, MAP_UNDERWATER_MARINE_CAVE warp_def 17, 66, 0, 0, MAP_UNDERWATER_MARINE_CAVE -Underwater6_MapEvents:: @ 852D054 +Underwater6_MapEvents:: map_events 0x0, Underwater6_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater6/header.inc b/data/maps/Underwater6/header.inc index 4e978a1e7..5683868e2 100644 --- a/data/maps/Underwater6/header.inc +++ b/data/maps/Underwater6/header.inc @@ -1,10 +1,10 @@ -Underwater6: @ 8482ABC +Underwater6: .4byte Underwater6_Layout .4byte Underwater6_MapEvents .4byte Underwater6_MapScripts .4byte Underwater6_MapConnections .2byte MUS_DEEPDEEP - .2byte 410 + .2byte LAYOUT_UNDERWATER6 .byte MAPSEC_UNDERWATER_TERRA_CAVE .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater7/connections.inc b/data/maps/Underwater7/connections.inc index 82803997c..7113f21e9 100644 --- a/data/maps/Underwater7/connections.inc +++ b/data/maps/Underwater7/connections.inc @@ -1,7 +1,7 @@ -Underwater7_MapConnectionsList: @ 8486D58 +Underwater7_MapConnectionsList: connection emerge, 0, MAP_ROUTE125 -Underwater7_MapConnections: @ 8486D64 - .4byte 0x1 +Underwater7_MapConnections: + .4byte 1 .4byte Underwater7_MapConnectionsList diff --git a/data/maps/Underwater7/events.inc b/data/maps/Underwater7/events.inc index fba9324f6..d4c2a882a 100644 --- a/data/maps/Underwater7/events.inc +++ b/data/maps/Underwater7/events.inc @@ -1,7 +1,7 @@ -Underwater7_MapWarps: @ 852D068 +Underwater7_MapWarps: warp_def 22, 10, 0, 0, MAP_UNDERWATER_MARINE_CAVE warp_def 45, 30, 0, 0, MAP_UNDERWATER_MARINE_CAVE -Underwater7_MapEvents:: @ 852D078 +Underwater7_MapEvents:: map_events 0x0, Underwater7_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater7/header.inc b/data/maps/Underwater7/header.inc index 132eb867e..a1fa2824c 100644 --- a/data/maps/Underwater7/header.inc +++ b/data/maps/Underwater7/header.inc @@ -1,10 +1,10 @@ -Underwater7: @ 8482AD8 +Underwater7: .4byte Underwater7_Layout .4byte Underwater7_MapEvents .4byte Underwater7_MapScripts .4byte Underwater7_MapConnections .2byte MUS_DEEPDEEP - .2byte 411 + .2byte LAYOUT_UNDERWATER7 .byte MAPSEC_UNDERWATER_UNK1 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater_MarineCave/events.inc b/data/maps/Underwater_MarineCave/events.inc index 685abaa16..b0da76440 100644 --- a/data/maps/Underwater_MarineCave/events.inc +++ b/data/maps/Underwater_MarineCave/events.inc @@ -1,6 +1,6 @@ -Underwater_MarineCave_MapWarps: @ 85377B0 +Underwater_MarineCave_MapWarps: warp_def 9, 8, 0, 127, MAP_NONE -Underwater_MarineCave_MapEvents:: @ 85377B8 +Underwater_MarineCave_MapEvents:: map_events 0x0, Underwater_MarineCave_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater_MarineCave/header.inc b/data/maps/Underwater_MarineCave/header.inc index 88fe213ab..1cc75bd54 100644 --- a/data/maps/Underwater_MarineCave/header.inc +++ b/data/maps/Underwater_MarineCave/header.inc @@ -1,10 +1,10 @@ -Underwater_MarineCave: @ 84849CC +Underwater_MarineCave: .4byte Underwater_MarineCave_Layout .4byte Underwater_MarineCave_MapEvents .4byte Underwater_MarineCave_MapScripts .4byte 0x0 .2byte MUS_DAN01 - .2byte 406 + .2byte LAYOUT_UNDERWATER_MARINE_CAVE .byte MAPSEC_UNDERWATER_MARINE_CAVE .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater_Route134/events.inc b/data/maps/Underwater_Route134/events.inc index 3a5219511..a514ccf72 100644 --- a/data/maps/Underwater_Route134/events.inc +++ b/data/maps/Underwater_Route134/events.inc @@ -1,6 +1,6 @@ -Underwater_Route134_MapWarps: @ 8536D44 +Underwater_Route134_MapWarps: warp_def 8, 8, 0, 0, MAP_UNDERWATER_SEALED_CHAMBER -Underwater_Route134_MapEvents:: @ 8536D4C +Underwater_Route134_MapEvents:: map_events 0x0, Underwater_Route134_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index 591dffa53..07d1bcd8e 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -1,10 +1,10 @@ -Underwater_Route134: @ 848464C +Underwater_Route134: .4byte Underwater_Route134_Layout .4byte Underwater_Route134_MapEvents .4byte Underwater_Route134_MapScripts .4byte 0x0 .2byte MUS_DEEPDEEP - .2byte 282 + .2byte LAYOUT_UNDERWATER_ROUTE134 .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater_SeafloorCavern/events.inc b/data/maps/Underwater_SeafloorCavern/events.inc index 468dedcd6..d4c212a19 100644 --- a/data/maps/Underwater_SeafloorCavern/events.inc +++ b/data/maps/Underwater_SeafloorCavern/events.inc @@ -1,12 +1,12 @@ -Underwater_SeafloorCavern_EventObjects: @ 8535640 +Underwater_SeafloorCavern_EventObjects: object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, FLAG_HIDE_UNDERWATER_SEA_FLOOR_CAVERN_STOLEN_SUBMARINE -Underwater_SeafloorCavern_MapWarps: @ 85356A0 +Underwater_SeafloorCavern_MapWarps: warp_def 6, 7, 0, 0, MAP_UNDERWATER4 -Underwater_SeafloorCavern_MapEvents:: @ 85356A8 +Underwater_SeafloorCavern_MapEvents:: map_events Underwater_SeafloorCavern_EventObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index 08eac747c..0df694b90 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -1,10 +1,10 @@ -Underwater_SeafloorCavern: @ 8484198 +Underwater_SeafloorCavern: .4byte Underwater_SeafloorCavern_Layout .4byte Underwater_SeafloorCavern_MapEvents .4byte Underwater_SeafloorCavern_MapScripts .4byte 0x0 .2byte MUS_DEEPDEEP - .2byte 146 + .2byte LAYOUT_UNDERWATER_SEAFLOOR_CAVERN .byte MAPSEC_UNDERWATER_128 .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater_SealedChamber/events.inc b/data/maps/Underwater_SealedChamber/events.inc index e0bb19642..e8b93885a 100644 --- a/data/maps/Underwater_SealedChamber/events.inc +++ b/data/maps/Underwater_SealedChamber/events.inc @@ -1,9 +1,9 @@ -Underwater_SealedChamber_MapWarps: @ 8536D60 +Underwater_SealedChamber_MapWarps: warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134 -Underwater_SealedChamber_MapBGEvents: @ 8536D68 +Underwater_SealedChamber_MapBGEvents: bg_event 12, 43, 0, BG_EVENT_PLAYER_FACING_ANY, Underwater_SealedChamber_EventScript_2390FC -Underwater_SealedChamber_MapEvents:: @ 8536D74 +Underwater_SealedChamber_MapEvents:: map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index 94fcc6ba7..f7117f905 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -1,10 +1,10 @@ -Underwater_SealedChamber: @ 8484668 +Underwater_SealedChamber: .4byte Underwater_SealedChamber_Layout .4byte Underwater_SealedChamber_MapEvents .4byte Underwater_SealedChamber_MapScripts .4byte 0x0 .2byte MUS_DEEPDEEP - .2byte 283 + .2byte LAYOUT_UNDERWATER_SEALED_CHAMBER .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/Underwater_SootopolisCity/events.inc b/data/maps/Underwater_SootopolisCity/events.inc index 78839e8a1..3829ecb10 100644 --- a/data/maps/Underwater_SootopolisCity/events.inc +++ b/data/maps/Underwater_SootopolisCity/events.inc @@ -1,7 +1,7 @@ -Underwater_SootopolisCity_MapWarps: @ 8534330 +Underwater_SootopolisCity_MapWarps: warp_def 9, 8, 0, 0, MAP_UNDERWATER2 warp_def 10, 8, 0, 0, MAP_UNDERWATER2 -Underwater_SootopolisCity_MapEvents:: @ 8534340 +Underwater_SootopolisCity_MapEvents:: map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0 diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index 1611026e0..31caf4011 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -1,10 +1,10 @@ -Underwater_SootopolisCity: @ 8483F4C +Underwater_SootopolisCity: .4byte Underwater_SootopolisCity_Layout .4byte Underwater_SootopolisCity_MapEvents .4byte Underwater_SootopolisCity_MapScripts .4byte 0x0 .2byte MUS_DEEPDEEP - .2byte 130 + .2byte LAYOUT_UNDERWATER_SOOTOPOLIS_CITY .byte MAPSEC_UNDERWATER_SOOTOPOLIS .byte 0 .byte WEATHER_BUBBLES diff --git a/data/maps/UnionRoom/events.inc b/data/maps/UnionRoom/events.inc index 3ab614468..c78b86eec 100644 --- a/data/maps/UnionRoom/events.inc +++ b/data/maps/UnionRoom/events.inc @@ -1,4 +1,4 @@ -UnionRoom_EventObjects: @ 853B020 +UnionRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0 object_event 2, EVENT_OBJ_GFX_VAR_3, 0, 1, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D204, FLAG_HIDE_UNION_ROOM_PLAYER_4 object_event 3, EVENT_OBJ_GFX_VAR_7, 0, 7, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D22C, FLAG_HIDE_UNION_ROOM_PLAYER_8 @@ -9,10 +9,10 @@ UnionRoom_EventObjects: @ 853B020 object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 13, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1F0, FLAG_HIDE_UNION_ROOM_PLAYER_2 object_event 9, EVENT_OBJ_GFX_VAR_0, 0, 4, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, UnionRoom_EventScript_23D1E6, FLAG_HIDE_UNION_ROOM_PLAYER_1 -UnionRoom_MapWarps: @ 853B0F8 +UnionRoom_MapWarps: warp_def 7, 11, 3, 127, MAP_NONE warp_def 8, 11, 3, 127, MAP_NONE -UnionRoom_MapEvents:: @ 853B108 +UnionRoom_MapEvents:: map_events UnionRoom_EventObjects, UnionRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/UnionRoom/header.inc b/data/maps/UnionRoom/header.inc index 29fd3cc3f..cc7e1c3d1 100644 --- a/data/maps/UnionRoom/header.inc +++ b/data/maps/UnionRoom/header.inc @@ -1,10 +1,10 @@ -UnionRoom: @ 8485120 +UnionRoom: .4byte UnionRoom_Layout .4byte UnionRoom_MapEvents .4byte UnionRoom_MapScripts .4byte 0x0 .2byte MUS_RAINBOW - .2byte 393 + .2byte LAYOUT_UNION_ROOM .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index aa4ffc0cd..0520cd58a 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -1,10 +1,10 @@ -UnknownMap_25_29: @ 8484DBC +UnknownMap_25_29: .4byte UnknownMap_25_29_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI - .2byte 226 + .2byte LAYOUT_UNKNOWN_MAP_25_29 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 86e2d4f70..ed085f46e 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -1,10 +1,10 @@ -UnknownMap_25_30: @ 8484DD8 +UnknownMap_25_30: .4byte UnknownMap_25_30_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI - .2byte 227 + .2byte LAYOUT_UNKNOWN_MAP_25_30 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 78ede2d65..fde407fb8 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -1,10 +1,10 @@ -UnknownMap_25_31: @ 8484DF4 +UnknownMap_25_31: .4byte UnknownMap_25_31_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI - .2byte 228 + .2byte LAYOUT_UNKNOWN_MAP_25_31 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index 826528119..1f0655d54 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -1,10 +1,10 @@ -UnknownMap_25_32: @ 8484E10 +UnknownMap_25_32: .4byte UnknownMap_25_32_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI - .2byte 229 + .2byte LAYOUT_UNKNOWN_MAP_25_32 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index 99502bb0f..71f5d3523 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -1,10 +1,10 @@ -UnknownMap_25_33: @ 8484E2C +UnknownMap_25_33: .4byte UnknownMap_25_33_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI - .2byte 230 + .2byte LAYOUT_UNKNOWN_MAP_25_33 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index 6e95a8222..8fc47f938 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -1,10 +1,10 @@ -UnknownMap_25_34: @ 8484E48 +UnknownMap_25_34: .4byte UnknownMap_25_34_Layout .4byte LinkContestRoom1_MapEvents .4byte LinkContestRoom1_MapScripts .4byte 0x0 .2byte MUS_NIBI - .2byte 231 + .2byte LAYOUT_UNKNOWN_MAP_25_34 .byte MAPSEC_DYNAMIC .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown/connections.inc b/data/maps/VerdanturfTown/connections.inc index de6fdface..805bab59e 100644 --- a/data/maps/VerdanturfTown/connections.inc +++ b/data/maps/VerdanturfTown/connections.inc @@ -1,8 +1,8 @@ -VerdanturfTown_MapConnectionsList: @ 8486694 +VerdanturfTown_MapConnectionsList: connection up, -80, MAP_ROUTE116 connection right, 0, MAP_ROUTE117 -VerdanturfTown_MapConnections: @ 84866AC - .4byte 0x2 +VerdanturfTown_MapConnections: + .4byte 2 .4byte VerdanturfTown_MapConnectionsList diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc index 971ad87c4..d5e99eece 100644 --- a/data/maps/VerdanturfTown/events.inc +++ b/data/maps/VerdanturfTown/events.inc @@ -1,10 +1,10 @@ -VerdanturfTown_EventObjects: @ 8527CDC +VerdanturfTown_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0 object_event 2, EVENT_OBJ_GFX_TWIN, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0 object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 11, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0 object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0 -VerdanturfTown_MapWarps: @ 8527D3C +VerdanturfTown_MapWarps: warp_def 3, 7, 0, 0, MAP_VERDANTURF_TOWN_BATTLE_TENT_LOBBY warp_def 12, 3, 0, 0, MAP_VERDANTURF_TOWN_MART warp_def 16, 3, 0, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F @@ -13,7 +13,7 @@ VerdanturfTown_MapWarps: @ 8527D3C warp_def 1, 14, 0, 0, MAP_VERDANTURF_TOWN_FRIENDSHIP_RATERS_HOUSE warp_def 17, 15, 0, 0, MAP_VERDANTURF_TOWN_HOUSE -VerdanturfTown_MapBGEvents: @ 8527D74 +VerdanturfTown_MapBGEvents: bg_event 14, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E6A bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5D9 bg_event 17, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_271E73 @@ -23,6 +23,6 @@ VerdanturfTown_MapBGEvents: @ 8527D74 bg_event 1, 8, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5EB bg_event 7, 3, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_1EB5F4 -VerdanturfTown_MapEvents:: @ 8527DD4 +VerdanturfTown_MapEvents:: map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index 053a58712..c2e0109f6 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown: @ 8482640 +VerdanturfTown: .4byte VerdanturfTown_Layout .4byte VerdanturfTown_MapEvents .4byte VerdanturfTown_MapScripts .4byte VerdanturfTown_MapConnections .2byte MUS_GOMACHI0 - .2byte 15 + .2byte LAYOUT_VERDANTURF_TOWN .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_SUNNY diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc index ee91fff2c..fb424a056 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/events.inc @@ -1,8 +1,8 @@ -VerdanturfTown_BattleTentBattleRoom_EventObjects: @ 852E734 +VerdanturfTown_BattleTentBattleRoom_EventObjects: object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 11, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 -VerdanturfTown_BattleTentBattleRoom_MapEvents:: @ 852E77C +VerdanturfTown_BattleTentBattleRoom_MapEvents:: map_events VerdanturfTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc index 8a95c60a3..af844405e 100644 --- a/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc +++ b/data/maps/VerdanturfTown_BattleTentBattleRoom/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_BattleTentBattleRoom: @ 8482E90 +VerdanturfTown_BattleTentBattleRoom: .4byte VerdanturfTown_BattleTentBattleRoom_Layout .4byte VerdanturfTown_BattleTentBattleRoom_MapEvents .4byte VerdanturfTown_BattleTentBattleRoom_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 387 + .2byte LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc index d0ca880ef..b5a8f71fb 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/events.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/events.inc @@ -1,6 +1,6 @@ -VerdanturfTown_BattleTentCorridor_EventObjects: @ 852E708 +VerdanturfTown_BattleTentCorridor_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, 0 -VerdanturfTown_BattleTentCorridor_MapEvents:: @ 852E720 +VerdanturfTown_BattleTentCorridor_MapEvents:: map_events VerdanturfTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc index 5aa6fcc46..49e27d7f5 100644 --- a/data/maps/VerdanturfTown_BattleTentCorridor/header.inc +++ b/data/maps/VerdanturfTown_BattleTentCorridor/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_BattleTentCorridor: @ 8482E74 +VerdanturfTown_BattleTentCorridor: .4byte BattleTentCorridor_Layout .4byte VerdanturfTown_BattleTentCorridor_MapEvents .4byte VerdanturfTown_BattleTentCorridor_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 385 + .2byte LAYOUT_BATTLE_TENT_CORRIDOR .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_BattleTentLobby/events.inc b/data/maps/VerdanturfTown_BattleTentLobby/events.inc index 1dfb49dd9..68ee1322f 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/events.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/events.inc @@ -1,4 +1,4 @@ -VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648 +VerdanturfTown_BattleTentLobby_EventObjects: object_event 1, EVENT_OBJ_GFX_EXPERT_M, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0 object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0 object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 9, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0 @@ -6,13 +6,13 @@ VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648 object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, FLAG_HIDE_VERDANTURF_TOWN_SCOTT object_event 6, EVENT_OBJ_GFX_LITTLE_BOY, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0 -VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8 +VerdanturfTown_BattleTentLobby_MapWarps: warp_def 6, 9, 0, 0, MAP_VERDANTURF_TOWN warp_def 7, 9, 0, 0, MAP_VERDANTURF_TOWN -VerdanturfTown_BattleTentLobby_MapBGEvents: @ 852E6E8 +VerdanturfTown_BattleTentLobby_MapBGEvents: bg_event 4, 5, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_BattleTentLobby_EventScript_201B02 -VerdanturfTown_BattleTentLobby_MapEvents:: @ 852E6F4 +VerdanturfTown_BattleTentLobby_MapEvents:: map_events VerdanturfTown_BattleTentLobby_EventObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents diff --git a/data/maps/VerdanturfTown_BattleTentLobby/header.inc b/data/maps/VerdanturfTown_BattleTentLobby/header.inc index 3f3eb1ae6..012f55ec9 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/header.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_BattleTentLobby: @ 8482E58 +VerdanturfTown_BattleTentLobby: .4byte BattleTentLobby_Layout .4byte VerdanturfTown_BattleTentLobby_MapEvents .4byte VerdanturfTown_BattleTentLobby_MapScripts .4byte 0x0 .2byte MUS_B_TOWER - .2byte 384 + .2byte LAYOUT_BATTLE_TENT_LOBBY .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc index 990bcd1f6..8d15647d6 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc @@ -1,11 +1,11 @@ -VerdanturfTown_FriendshipRatersHouse_EventObjects: @ 852E9C8 +VerdanturfTown_FriendshipRatersHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0 object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0 -VerdanturfTown_FriendshipRatersHouse_MapWarps: @ 852E9F8 +VerdanturfTown_FriendshipRatersHouse_MapWarps: warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN -VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 852EA08 +VerdanturfTown_FriendshipRatersHouse_MapEvents:: map_events VerdanturfTown_FriendshipRatersHouse_EventObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 43148f8ef..512004a3e 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_FriendshipRatersHouse: @ 8482F1C +VerdanturfTown_FriendshipRatersHouse: .4byte House2_Layout .4byte VerdanturfTown_FriendshipRatersHouse_MapEvents .4byte VerdanturfTown_FriendshipRatersHouse_MapScripts .4byte 0x0 .2byte MUS_GOMACHI0 - .2byte 60 + .2byte LAYOUT_HOUSE2 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_House/events.inc b/data/maps/VerdanturfTown_House/events.inc index d714aa8a0..a5f61b86f 100644 --- a/data/maps/VerdanturfTown_House/events.inc +++ b/data/maps/VerdanturfTown_House/events.inc @@ -1,11 +1,11 @@ -VerdanturfTown_House_EventObjects: @ 852EA1C +VerdanturfTown_House_EventObjects: object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0 -VerdanturfTown_House_MapWarps: @ 852EA4C +VerdanturfTown_House_MapWarps: warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN -VerdanturfTown_House_MapEvents:: @ 852EA5C +VerdanturfTown_House_MapEvents:: map_events VerdanturfTown_House_EventObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index 5c3e26d09..910126e29 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_House: @ 8482F38 +VerdanturfTown_House: .4byte House1_Layout .4byte VerdanturfTown_House_MapEvents .4byte VerdanturfTown_House_MapScripts .4byte 0x0 .2byte MUS_GOMACHI0 - .2byte 59 + .2byte LAYOUT_HOUSE1 .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_Mart/events.inc b/data/maps/VerdanturfTown_Mart/events.inc index 9ae237dc8..79e731fe4 100644 --- a/data/maps/VerdanturfTown_Mart/events.inc +++ b/data/maps/VerdanturfTown_Mart/events.inc @@ -1,13 +1,13 @@ -VerdanturfTown_Mart_EventObjects: @ 852E790 +VerdanturfTown_Mart_EventObjects: object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0 object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_F, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0 object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0 -VerdanturfTown_Mart_MapWarps: @ 852E7F0 +VerdanturfTown_Mart_MapWarps: warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN -VerdanturfTown_Mart_MapEvents:: @ 852E800 +VerdanturfTown_Mart_MapEvents:: map_events VerdanturfTown_Mart_EventObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index 0441f8147..e04be5fd6 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_Mart: @ 8482EAC +VerdanturfTown_Mart: .4byte Mart_Layout .4byte VerdanturfTown_Mart_MapEvents .4byte VerdanturfTown_Mart_MapScripts .4byte 0x0 .2byte MUS_FRIENDLY - .2byte 63 + .2byte LAYOUT_MART .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc index 246270361..47449cd1b 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc @@ -1,14 +1,14 @@ -VerdanturfTown_PokemonCenter_1F_EventObjects: @ 852E814 +VerdanturfTown_PokemonCenter_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0 object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0 object_event 3, EVENT_OBJ_GFX_EXPERT_M, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0 object_event 4, EVENT_OBJ_GFX_LITTLE_BOY, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0 -VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874 +VerdanturfTown_PokemonCenter_1F_MapWarps: warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN warp_def 6, 8, 3, 2, MAP_VERDANTURF_TOWN warp_def 1, 6, 4, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F -VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 852E88C +VerdanturfTown_PokemonCenter_1F_MapEvents:: map_events VerdanturfTown_PokemonCenter_1F_EventObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index e1d7d3fa8..e2adc24a4 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_PokemonCenter_1F: @ 8482EC8 +VerdanturfTown_PokemonCenter_1F: .4byte PokemonCenter_1F_Layout .4byte VerdanturfTown_PokemonCenter_1F_MapEvents .4byte VerdanturfTown_PokemonCenter_1F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 61 + .2byte LAYOUT_POKEMON_CENTER_1F .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc index e3e959838..a4e13db36 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc @@ -1,14 +1,14 @@ -VerdanturfTown_PokemonCenter_2F_EventObjects: @ 852E8A0 +VerdanturfTown_PokemonCenter_2F_EventObjects: object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0 object_event 2, EVENT_OBJ_GFX_TEALA, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0 object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0 object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 1, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, FLAG_HIDE_POKEMON_CENTER_2F_MYSTERY_GIFT_MAN -VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900 +VerdanturfTown_PokemonCenter_2F_MapWarps: warp_def 1, 6, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F warp_def 5, 1, 3, 0, MAP_UNION_ROOM warp_def 9, 1, 3, 0, MAP_TRADE_CENTER -VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 852E918 +VerdanturfTown_PokemonCenter_2F_MapEvents:: map_events VerdanturfTown_PokemonCenter_2F_EventObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index 933a3da18..d64084b53 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_PokemonCenter_2F: @ 8482EE4 +VerdanturfTown_PokemonCenter_2F: .4byte PokemonCenter_2F_Layout .4byte VerdanturfTown_PokemonCenter_2F_MapEvents .4byte VerdanturfTown_PokemonCenter_2F_MapScripts .4byte 0x0 .2byte MUS_POKECEN - .2byte 62 + .2byte LAYOUT_POKEMON_CENTER_2F .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VerdanturfTown_WandasHouse/events.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc index f8d6f4db5..940417c7a 100644 --- a/data/maps/VerdanturfTown_WandasHouse/events.inc +++ b/data/maps/VerdanturfTown_WandasHouse/events.inc @@ -1,14 +1,14 @@ -VerdanturfTown_WandasHouse_EventObjects: @ 852E92C +VerdanturfTown_WandasHouse_EventObjects: object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_MAN object_event 3, EVENT_OBJ_GFX_POKEFAN_M, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE object_event 4, EVENT_OBJ_GFX_POKEFAN_F, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0 object_event 5, EVENT_OBJ_GFX_WOMAN_2, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_LOVER_WOMAN -VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4 +VerdanturfTown_WandasHouse_MapWarps: warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN -VerdanturfTown_WandasHouse_MapEvents:: @ 852E9B4 +VerdanturfTown_WandasHouse_MapEvents:: map_events VerdanturfTown_WandasHouse_EventObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index 573fe6f76..bb285600f 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -1,10 +1,10 @@ -VerdanturfTown_WandasHouse: @ 8482F00 +VerdanturfTown_WandasHouse: .4byte VerdanturfTown_WandasHouse_Layout .4byte VerdanturfTown_WandasHouse_MapEvents .4byte VerdanturfTown_WandasHouse_MapScripts .4byte 0x0 .2byte MUS_GOMACHI0 - .2byte 76 + .2byte LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE .byte MAPSEC_VERDANTURF_TOWN .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc index 05cafcc48..1e34108ed 100644 --- a/data/maps/VictoryRoad_1F/events.inc +++ b/data/maps/VictoryRoad_1F/events.inc @@ -1,4 +1,4 @@ -VictoryRoad_1F_EventObjects: @ 8535E04 +VictoryRoad_1F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 33, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0 object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 15, 4, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0 object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 27, 34, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0 @@ -9,20 +9,20 @@ VictoryRoad_1F_EventObjects: @ 8535E04 object_event 8, EVENT_OBJ_GFX_WOMAN_5, 0, 29, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0 object_event 9, EVENT_OBJ_GFX_MAN_3, 0, 32, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0 -VictoryRoad_1F_MapWarps: @ 8535EDC +VictoryRoad_1F_MapWarps: warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY warp_def 39, 5, 3, 3, MAP_EVER_GRANDE_CITY warp_def 21, 32, 3, 5, MAP_VICTORY_ROAD_B1F warp_def 42, 38, 4, 2, MAP_VICTORY_ROAD_B1F warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F -VictoryRoad_1F_MapCoordEvents: @ 8535F04 +VictoryRoad_1F_MapCoordEvents: coord_event 2, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DAF coord_event 3, 23, 4, VAR_0x40C3, 0, VictoryRoad_1F_EventScript_235DC8 -VictoryRoad_1F_MapBGEvents: @ 8535F24 +VictoryRoad_1F_MapBGEvents: bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_1F_ULTRA_BALL -VictoryRoad_1F_MapEvents:: @ 8535F30 +VictoryRoad_1F_MapEvents:: map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 950f26aa5..eb1e53c9b 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -1,10 +1,10 @@ -VictoryRoad_1F: @ 8484374 +VictoryRoad_1F: .4byte VictoryRoad_1F_Layout .4byte VictoryRoad_1F_MapEvents .4byte VictoryRoad_1F_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 163 + .2byte LAYOUT_VICTORY_ROAD_1F .byte MAPSEC_VICTORY_ROAD .byte 0 .byte WEATHER_NONE diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc index 814d8a73d..35c4fe428 100644 --- a/data/maps/VictoryRoad_B1F/events.inc +++ b/data/maps/VictoryRoad_B1F/events.inc @@ -1,4 +1,4 @@ -VictoryRoad_B1F_EventObjects: @ 8535F44 +VictoryRoad_B1F_EventObjects: object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_13 object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_14 object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, FLAG_TEMP_11 @@ -21,7 +21,7 @@ VictoryRoad_B1F_EventObjects: @ 8535F44 object_event 20, EVENT_OBJ_GFX_MAN_3, 0, 14, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0 object_event 21, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 20, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, VictoryRoad_B1F_EventScript_236541, 0 -VictoryRoad_B1F_MapWarps: @ 853613C +VictoryRoad_B1F_MapWarps: warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F warp_def 17, 16, 3, 2, MAP_VICTORY_ROAD_B2F warp_def 42, 25, 3, 3, MAP_VICTORY_ROAD_1F @@ -30,6 +30,6 @@ VictoryRoad_B1F_MapWarps: @ 853613C warp_def 20, 21, 3, 2, MAP_VICTORY_ROAD_1F warp_def 5, 26, 3, 3, MAP_VICTORY_ROAD_B2F -VictoryRoad_B1F_MapEvents:: @ 8536174 +VictoryRoad_B1F_MapEvents:: map_events VictoryRoad_B1F_EventObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index d89408de9..cc0064fd6 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -1,10 +1,10 @@ -VictoryRoad_B1F: @ 8484390 +VictoryRoad_B1F: .4byte VictoryRoad_B1F_Layout .4byte VictoryRoad_B1F_MapEvents .4byte VictoryRoad_B1F_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 285 + .2byte LAYOUT_VICTORY_ROAD_B1F .byte MAPSEC_VICTORY_ROAD .byte 1 .byte WEATHER_NONE diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc index 1ad4f3e50..0bc77cade 100644 --- a/data/maps/VictoryRoad_B2F/events.inc +++ b/data/maps/VictoryRoad_B2F/events.inc @@ -1,4 +1,4 @@ -VictoryRoad_B2F_EventObjects: @ 8536188 +VictoryRoad_B2F_EventObjects: object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0 object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 43, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0 object_event 3, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236903, 0 @@ -7,16 +7,16 @@ VictoryRoad_B2F_EventObjects: @ 8536188 object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 25, 18, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236948, 0 object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 25, 21, 4, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_236931, 0 -VictoryRoad_B2F_MapWarps: @ 8536230 +VictoryRoad_B2F_MapWarps: warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F warp_def 43, 2, 3, 3, MAP_VICTORY_ROAD_B1F warp_def 19, 12, 3, 1, MAP_VICTORY_ROAD_B1F warp_def 5, 26, 3, 6, MAP_VICTORY_ROAD_B1F -VictoryRoad_B2F_MapBGEvents: @ 8536250 +VictoryRoad_B2F_MapBGEvents: bg_hidden_item_event 28, 5, 3, ITEM_ELIXIR, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_ELIXIR bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, FLAG_HIDDEN_ITEM_VICTORY_ROAD_B2F_MAX_REPEL -VictoryRoad_B2F_MapEvents:: @ 8536268 +VictoryRoad_B2F_MapEvents:: map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index 462898c2b..0af51f971 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -1,10 +1,10 @@ -VictoryRoad_B2F: @ 84843AC +VictoryRoad_B2F: .4byte VictoryRoad_B2F_Layout .4byte VictoryRoad_B2F_MapEvents .4byte VictoryRoad_B2F_MapScripts .4byte 0x0 .2byte MUS_C_ROAD - .2byte 286 + .2byte LAYOUT_VICTORY_ROAD_B2F .byte MAPSEC_VICTORY_ROAD .byte 1 .byte WEATHER_NONE diff --git a/include/constants/layouts.h b/include/constants/layouts.h new file mode 100755 index 000000000..d12db9b33 --- /dev/null +++ b/include/constants/layouts.h @@ -0,0 +1,446 @@ +#ifndef GUARD_CONSTANTS_LAYOUTS_H +#define GUARD_CONSTANTS_LAYOUTS_H + +#define LAYOUT_PETALBURG_CITY 1 +#define LAYOUT_SLATEPORT_CITY 2 +#define LAYOUT_MAUVILLE_CITY 3 +#define LAYOUT_RUSTBORO_CITY 4 +#define LAYOUT_FORTREE_CITY 5 +#define LAYOUT_LILYCOVE_CITY 6 +#define LAYOUT_MOSSDEEP_CITY 7 +#define LAYOUT_SOOTOPOLIS_CITY 8 +#define LAYOUT_EVER_GRANDE_CITY 9 +#define LAYOUT_LITTLEROOT_TOWN 10 +#define LAYOUT_OLDALE_TOWN 11 +#define LAYOUT_DEWFORD_TOWN 12 +#define LAYOUT_LAVARIDGE_TOWN 13 +#define LAYOUT_FALLARBOR_TOWN 14 +#define LAYOUT_VERDANTURF_TOWN 15 +#define LAYOUT_PACIFIDLOG_TOWN 16 +#define LAYOUT_ROUTE101 17 +#define LAYOUT_ROUTE102 18 +#define LAYOUT_ROUTE103 19 +#define LAYOUT_ROUTE104 20 +#define LAYOUT_ROUTE105 21 +#define LAYOUT_ROUTE106 22 +#define LAYOUT_ROUTE107 23 +#define LAYOUT_ROUTE108 24 +#define LAYOUT_ROUTE109 25 +#define LAYOUT_ROUTE110 26 +#define LAYOUT_ROUTE111 27 +#define LAYOUT_ROUTE112 28 +#define LAYOUT_ROUTE113 29 +#define LAYOUT_ROUTE114 30 +#define LAYOUT_ROUTE115 31 +#define LAYOUT_ROUTE116 32 +#define LAYOUT_ROUTE117 33 +#define LAYOUT_ROUTE118 34 +#define LAYOUT_ROUTE119 35 +#define LAYOUT_ROUTE120 36 +#define LAYOUT_ROUTE121 37 +#define LAYOUT_ROUTE122 38 +#define LAYOUT_ROUTE123 39 +#define LAYOUT_ROUTE124 40 +#define LAYOUT_ROUTE125 41 +#define LAYOUT_ROUTE126 42 +#define LAYOUT_ROUTE127 43 +#define LAYOUT_ROUTE128 44 +#define LAYOUT_ROUTE129 45 +#define LAYOUT_UNKNOWN_MAP_08417FC4 46 +#define LAYOUT_ROUTE131 47 +#define LAYOUT_ROUTE132 48 +#define LAYOUT_ROUTE133 49 +#define LAYOUT_ROUTE134 50 +#define LAYOUT_UNDERWATER2 51 +#define LAYOUT_UNDERWATER3 52 +#define LAYOUT_UNDERWATER4 53 +#define LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F 54 +#define LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F 55 +#define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F 56 +#define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_2F 57 +#define LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB 58 +#define LAYOUT_HOUSE1 59 +#define LAYOUT_HOUSE2 60 +#define LAYOUT_POKEMON_CENTER_1F 61 +#define LAYOUT_POKEMON_CENTER_2F 62 +#define LAYOUT_MART 63 +#define LAYOUT_HOUSE3 64 +#define LAYOUT_DEWFORD_TOWN_GYM 65 +#define LAYOUT_DEWFORD_TOWN_HALL 66 +#define LAYOUT_HOUSE4 67 +#define LAYOUT_LAVARIDGE_TOWN_HERB_SHOP 68 +#define LAYOUT_LAVARIDGE_TOWN_GYM_1F 69 +#define LAYOUT_LAVARIDGE_TOWN_GYM_B1F 70 +#define LAYOUT_LAVARIDGE_TOWN_POKEMON_CENTER_1F 71 +#define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_LOBBY 72 +#define LAYOUT_FALLARBOR_TOWN_LEFTOVER_RSCONTEST_HALL 73 +#define LAYOUT_LILYCOVE_CITY_HOUSE2 74 +#define LAYOUT_UNKNOWN_MAP_08428450 75 +#define LAYOUT_VERDANTURF_TOWN_WANDAS_HOUSE 76 +#define LAYOUT_PACIFIDLOG_TOWN_HOUSE1 77 +#define LAYOUT_PACIFIDLOG_TOWN_HOUSE2 78 +#define LAYOUT_PETALBURG_CITY_GYM 79 +#define LAYOUT_HOUSE_WITH_BED 80 +#define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_1F 81 +#define LAYOUT_SLATEPORT_CITY_STERNS_SHIPYARD_2F 82 +#define LAYOUT_UNKNOWN_MAP_084294C4 83 +#define LAYOUT_UNKNOWN_MAP_084294E8 84 +#define LAYOUT_SLATEPORT_CITY_POKEMON_FAN_CLUB 85 +#define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_1F 86 +#define LAYOUT_SLATEPORT_CITY_OCEANIC_MUSEUM_2F 87 +#define LAYOUT_HARBOR 88 +#define LAYOUT_MAUVILLE_CITY_GYM 89 +#define LAYOUT_MAUVILLE_CITY_BIKE_SHOP 90 +#define LAYOUT_MAUVILLE_CITY_GAME_CORNER 91 +#define LAYOUT_RUSTBORO_CITY_DEVON_CORP_1F 92 +#define LAYOUT_RUSTBORO_CITY_DEVON_CORP_2F 93 +#define LAYOUT_RUSTBORO_CITY_GYM 94 +#define LAYOUT_RUSTBORO_CITY_POKEMON_SCHOOL 95 +#define LAYOUT_RUSTBORO_CITY_HOUSE 96 +#define LAYOUT_RUSTBORO_CITY_HOUSE1 97 +#define LAYOUT_RUSTBORO_CITY_CUTTERS_HOUSE 98 +#define LAYOUT_FORTREE_CITY_HOUSE1 99 +#define LAYOUT_FORTREE_CITY_GYM 100 +#define LAYOUT_FORTREE_CITY_HOUSE2 101 +#define LAYOUT_ROUTE104_MR_BRINEYS_HOUSE 102 +#define LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F 103 +#define LAYOUT_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F 104 +#define LAYOUT_LILYCOVE_CITY_CONTEST_LOBBY 105 +#define LAYOUT_LILYCOVE_CITY_CONTEST_HALL 106 +#define LAYOUT_LILYCOVE_CITY_POKEMON_TRAINER_FAN_CLUB 107 +#define LAYOUT_MOSSDEEP_CITY_GYM 108 +#define LAYOUT_SOOTOPOLIS_CITY_GYM_1F 109 +#define LAYOUT_SOOTOPOLIS_CITY_GYM_B1F 110 +#define LAYOUT_EVER_GRANDE_CITY_SIDNEYS_ROOM 111 +#define LAYOUT_EVER_GRANDE_CITY_PHOEBES_ROOM 112 +#define LAYOUT_EVER_GRANDE_CITY_GLACIAS_ROOM 113 +#define LAYOUT_EVER_GRANDE_CITY_DRAKES_ROOM 114 +#define LAYOUT_EVER_GRANDE_CITY_CHAMPIONS_ROOM 115 +#define LAYOUT_EVER_GRANDE_CITY_SHORT_HALL 116 +#define LAYOUT_ROUTE104_PRETTY_PETAL_FLOWER_SHOP 117 +#define LAYOUT_CABLE_CAR_STATION 118 +#define LAYOUT_ROUTE114_FOSSIL_MANIACS_HOUSE 119 +#define LAYOUT_ROUTE114_FOSSIL_MANIACS_TUNNEL 120 +#define LAYOUT_ROUTE114_LANETTES_HOUSE 121 +#define LAYOUT_ROUTE116_TUNNELERS_REST_HOUSE 122 +#define LAYOUT_ROUTE117_POKEMON_DAY_CARE 123 +#define LAYOUT_ROUTE121_SAFARI_ZONE_ENTRANCE 124 +#define LAYOUT_METEOR_FALLS_1F_1R 125 +#define LAYOUT_METEOR_FALLS_1F_2R 126 +#define LAYOUT_METEOR_FALLS_B1F_1R 127 +#define LAYOUT_METEOR_FALLS_B1F_2R 128 +#define LAYOUT_RUSTURF_TUNNEL 129 +#define LAYOUT_UNDERWATER_SOOTOPOLIS_CITY 130 +#define LAYOUT_DESERT_RUINS 131 +#define LAYOUT_GRANITE_CAVE_1F 132 +#define LAYOUT_GRANITE_CAVE_B1F 133 +#define LAYOUT_GRANITE_CAVE_B2F 134 +#define LAYOUT_PETALBURG_WOODS 135 +#define LAYOUT_MT_CHIMNEY 136 +#define LAYOUT_MT_PYRE_1F 137 +#define LAYOUT_MT_PYRE_2F 138 +#define LAYOUT_MT_PYRE_3F 139 +#define LAYOUT_MT_PYRE_4F 140 +#define LAYOUT_MT_PYRE_5F 141 +#define LAYOUT_MT_PYRE_6F 142 +#define LAYOUT_AQUA_HIDEOUT_1F 143 +#define LAYOUT_AQUA_HIDEOUT_B1F 144 +#define LAYOUT_AQUA_HIDEOUT_B2F 145 +#define LAYOUT_UNDERWATER_SEAFLOOR_CAVERN 146 +#define LAYOUT_SEAFLOOR_CAVERN_ENTRANCE 147 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM1 148 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM2 149 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM3 150 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM4 151 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM5 152 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM6 153 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM7 154 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM8 155 +#define LAYOUT_SEAFLOOR_CAVERN_ROOM9 156 +#define LAYOUT_CAVE_OF_ORIGIN_ENTRANCE 157 +#define LAYOUT_CAVE_OF_ORIGIN_1F 158 +#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP1 159 +#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP2 160 +#define LAYOUT_CAVE_OF_ORIGIN_UNUSED_RUBY_SAPPHIRE_MAP3 161 +#define LAYOUT_CAVE_OF_ORIGIN_B1F 162 +#define LAYOUT_VICTORY_ROAD_1F 163 +#define LAYOUT_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM 164 +#define LAYOUT_SHOAL_CAVE_LOW_TIDE_INNER_ROOM 165 +#define LAYOUT_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM 166 +#define LAYOUT_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM 167 +#define LAYOUT_SHOAL_CAVE_HIGH_TIDE_ENTRANCE_ROOM 168 +#define LAYOUT_SHOAL_CAVE_HIGH_TIDE_INNER_ROOM 169 +#define LAYOUT_UNKNOWN_MAP_0843E6C0 170 +#define LAYOUT_UNKNOWN_MAP_0843E6E4 171 +#define LAYOUT_UNKNOWN_MAP_0843E708 172 +#define LAYOUT_UNKNOWN_MAP_0843E72C 173 +#define LAYOUT_UNKNOWN_MAP_0843E750 174 +#define LAYOUT_UNKNOWN_MAP_0843E774 175 +#define LAYOUT_UNKNOWN_MAP_0843E798 176 +#define LAYOUT_UNKNOWN_MAP_0843E7BC 177 +#define LAYOUT_UNKNOWN_MAP_0843E7E0 178 +#define LAYOUT_UNKNOWN_MAP_0843E804 179 +#define LAYOUT_UNKNOWN_MAP_0843E828 180 +#define LAYOUT_UNKNOWN_MAP_0843E84C 181 +#define LAYOUT_UNKNOWN_MAP_0843E870 182 +#define LAYOUT_UNKNOWN_MAP_0843E894 183 +#define LAYOUT_NEW_MAUVILLE_ENTRANCE 184 +#define LAYOUT_NEW_MAUVILLE_INSIDE 185 +#define LAYOUT_ABANDONED_SHIP_DECK 186 +#define LAYOUT_ABANDONED_SHIP_CORRIDORS_1F 187 +#define LAYOUT_ABANDONED_SHIP_ROOMS_1F 188 +#define LAYOUT_ABANDONED_SHIP_CORRIDORS_B1F 189 +#define LAYOUT_ABANDONED_SHIP_ROOMS_B1F 190 +#define LAYOUT_ABANDONED_SHIP_ROOMS2_B1F 191 +#define LAYOUT_ABANDONED_SHIP_UNDERWATER1 192 +#define LAYOUT_ABANDONED_SHIP_ROOM_B1F 193 +#define LAYOUT_ABANDONED_SHIP_ROOMS2_1F 194 +#define LAYOUT_ABANDONED_SHIP_CAPTAINS_OFFICE 195 +#define LAYOUT_ABANDONED_SHIP_UNDERWATER2 196 +#define LAYOUT_SECRET_BASE_RED_CAVE1 197 +#define LAYOUT_SECRET_BASE_BROWN_CAVE1 198 +#define LAYOUT_SECRET_BASE_BLUE_CAVE1 199 +#define LAYOUT_SECRET_BASE_YELLOW_CAVE1 200 +#define LAYOUT_SECRET_BASE_TREE1 201 +#define LAYOUT_SECRET_BASE_SHRUB1 202 +#define LAYOUT_SECRET_BASE_RED_CAVE2 203 +#define LAYOUT_SECRET_BASE_BROWN_CAVE2 204 +#define LAYOUT_SECRET_BASE_BLUE_CAVE2 205 +#define LAYOUT_SECRET_BASE_YELLOW_CAVE2 206 +#define LAYOUT_SECRET_BASE_TREE2 207 +#define LAYOUT_SECRET_BASE_SHRUB2 208 +#define LAYOUT_SECRET_BASE_RED_CAVE3 209 +#define LAYOUT_SECRET_BASE_BROWN_CAVE3 210 +#define LAYOUT_SECRET_BASE_BLUE_CAVE3 211 +#define LAYOUT_SECRET_BASE_YELLOW_CAVE3 212 +#define LAYOUT_SECRET_BASE_TREE3 213 +#define LAYOUT_SECRET_BASE_SHRUB3 214 +#define LAYOUT_SECRET_BASE_RED_CAVE4 215 +#define LAYOUT_SECRET_BASE_BROWN_CAVE4 216 +#define LAYOUT_SECRET_BASE_BLUE_CAVE4 217 +#define LAYOUT_SECRET_BASE_YELLOW_CAVE4 218 +#define LAYOUT_SECRET_BASE_TREE4 219 +#define LAYOUT_SECRET_BASE_SHRUB4 220 +#define LAYOUT_SINGLE_BATTLE_COLOSSEUM 221 +#define LAYOUT_TRADE_CENTER 222 +#define LAYOUT_RECORD_CORNER 223 +#define LAYOUT_DOUBLE_BATTLE_COLOSSEUM 224 +#define LAYOUT_LINK_CONTEST_ROOM1 225 +#define LAYOUT_UNKNOWN_MAP_25_29 226 +#define LAYOUT_UNKNOWN_MAP_25_30 227 +#define LAYOUT_UNKNOWN_MAP_25_31 228 +#define LAYOUT_UNKNOWN_MAP_25_32 229 +#define LAYOUT_UNKNOWN_MAP_25_33 230 +#define LAYOUT_UNKNOWN_MAP_25_34 231 +#define LAYOUT_LINK_CONTEST_ROOM2 232 +#define LAYOUT_LINK_CONTEST_ROOM3 233 +#define LAYOUT_LINK_CONTEST_ROOM4 234 +#define LAYOUT_LINK_CONTEST_ROOM5 235 +#define LAYOUT_LINK_CONTEST_ROOM6 236 +#define LAYOUT_INSIDE_OF_TRUCK 237 +#define LAYOUT_SAFARI_ZONE_NORTHWEST 238 +#define LAYOUT_SAFARI_ZONE_NORTH 239 +#define LAYOUT_SAFARI_ZONE_SOUTHWEST 240 +#define LAYOUT_SAFARI_ZONE_SOUTH 241 +#define LAYOUT_UNKNOWN_MAP_08447028 242 +#define LAYOUT_ROUTE109_SEASHORE_HOUSE 243 +#define LAYOUT_ROUTE110_TRICK_HOUSE_ENTRANCE 244 +#define LAYOUT_ROUTE110_TRICK_HOUSE_END 245 +#define LAYOUT_ROUTE110_TRICK_HOUSE_CORRIDOR 246 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE1 247 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE2 248 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE3 249 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE4 250 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE5 251 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE6 252 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE7 253 +#define LAYOUT_ROUTE110_TRICK_HOUSE_PUZZLE8 254 +#define LAYOUT_FORTREE_CITY_DECORATION_SHOP 255 +#define LAYOUT_ROUTE110_SEASIDE_CYCLING_ROAD_ENTRANCE 256 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_1F 257 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_2F 258 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_3F 259 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_4F 260 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_5F 261 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP 262 +#define LAYOUT_ROUTE130 263 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY 264 +#define LAYOUT_BATTLE_FRONTIER_OUTSIDE_WEST 265 +#define LAYOUT_BATTLE_ELEVATOR 266 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR 267 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_BATTLE_ROOM 268 +#define LAYOUT_RUSTBORO_CITY_DEVON_CORP_3F 269 +#define LAYOUT_EVER_GRANDE_CITY_POKEMON_LEAGUE_1F 270 +#define LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F 271 +#define LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F 272 +#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR 273 +#define LAYOUT_UNDERWATER1 274 +#define LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F 275 +#define LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F 276 +#define LAYOUT_SS_TIDAL_CORRIDOR 277 +#define LAYOUT_SS_TIDAL_LOWER_DECK 278 +#define LAYOUT_SS_TIDAL_ROOMS 279 +#define LAYOUT_ISLAND_CAVE 280 +#define LAYOUT_ANCIENT_TOMB 281 +#define LAYOUT_UNDERWATER_ROUTE134 282 +#define LAYOUT_UNDERWATER_SEALED_CHAMBER 283 +#define LAYOUT_SEALED_CHAMBER_OUTER_ROOM 284 +#define LAYOUT_VICTORY_ROAD_B1F 285 +#define LAYOUT_VICTORY_ROAD_B2F 286 +#define LAYOUT_ROUTE104_PROTOTYPE 287 +#define LAYOUT_GRANITE_CAVE_STEVENS_ROOM 288 +#define LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS 289 +#define LAYOUT_SOUTHERN_ISLAND_EXTERIOR 290 +#define LAYOUT_SOUTHERN_ISLAND_INTERIOR 291 +#define LAYOUT_JAGGED_PASS 292 +#define LAYOUT_FIERY_PATH 293 +#define LAYOUT_RUSTBORO_CITY_FLAT2_1F 294 +#define LAYOUT_RUSTBORO_CITY_FLAT2_2F 295 +#define LAYOUT_RUSTBORO_CITY_FLAT2_3F 296 +#define LAYOUT_SOOTOPOLIS_CITY_LOTAD_AND_SEEDOT_HOUSE 297 +#define LAYOUT_EVER_GRANDE_CITY_HALL_OF_FAME 298 +#define LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_1F 299 +#define LAYOUT_LILYCOVE_CITY_COVE_LILY_MOTEL_2F 300 +#define LAYOUT_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE 301 +#define LAYOUT_MT_PYRE_EXTERIOR 302 +#define LAYOUT_MT_PYRE_SUMMIT 303 +#define LAYOUT_SEALED_CHAMBER_INNER_ROOM 304 +#define LAYOUT_MOSSDEEP_CITY_GAME_CORNER_1F 305 +#define LAYOUT_MOSSDEEP_CITY_GAME_CORNER_B1F 306 +#define LAYOUT_SOOTOPOLIS_CITY_HOUSE1 307 +#define LAYOUT_SOOTOPOLIS_CITY_HOUSE2 308 +#define LAYOUT_SOOTOPOLIS_CITY_HOUSE3 309 +#define LAYOUT_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS 310 +#define LAYOUT_SCORCHED_SLAB 311 +#define LAYOUT_UNKNOWN_MAP_0845A394 312 +#define LAYOUT_RUSTBORO_CITY_FLAT1_1F 313 +#define LAYOUT_RUSTBORO_CITY_FLAT1_2F 314 +#define LAYOUT_EVER_GRANDE_CITY_HALL4 315 +#define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP1 316 +#define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP2 317 +#define LAYOUT_AQUA_HIDEOUT_UNUSED_RUBY_MAP3 318 +#define LAYOUT_UNKNOWN_MAP_0845D470 319 +#define LAYOUT_SKY_PILLAR_ENTRANCE 320 +#define LAYOUT_SKY_PILLAR_OUTSIDE 321 +#define LAYOUT_SKY_PILLAR_1F 322 +#define LAYOUT_SKY_PILLAR_2F 323 +#define LAYOUT_SKY_PILLAR_3F 324 +#define LAYOUT_SKY_PILLAR_4F 325 +#define LAYOUT_UNKNOWN_MAP_0845ECB4 326 +#define LAYOUT_MOSSDEEP_CITY_STEVENS_HOUSE 327 +#define LAYOUT_SHOAL_CAVE_LOW_TIDE_ICE_ROOM 328 +#define LAYOUT_SAFARI_ZONE_REST_HOUSE 329 +#define LAYOUT_SKY_PILLAR_5F 330 +#define LAYOUT_SKY_PILLAR_TOP 331 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_LOBBY 332 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_CORRIDOR 333 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_PRE_BATTLE_ROOM 334 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_DOME_BATTLE_ROOM 335 +#define LAYOUT_MAGMA_HIDEOUT_1F 336 +#define LAYOUT_MAGMA_HIDEOUT_2F_1R 337 +#define LAYOUT_MAGMA_HIDEOUT_2F_2R 338 +#define LAYOUT_MAGMA_HIDEOUT_3F_1R 339 +#define LAYOUT_MAGMA_HIDEOUT_3F_2R 340 +#define LAYOUT_MAGMA_HIDEOUT_4F 341 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_LOBBY 342 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR 343 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM 344 +#define LAYOUT_BATTLE_FRONTIER_OUTSIDE_EAST 345 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_LOBBY 346 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_PRE_BATTLE_ROOM 347 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_FACTORY_BATTLE_ROOM 348 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_LOBBY 349 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_CORRIDOR 350 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_THREE_PATH_ROOM 351 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM1 352 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM2 353 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_LOBBY 354 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR 355 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_ARENA_BATTLE_ROOM 356 +#define LAYOUT_UNKNOWN_MAP_08469200 357 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PIKE_RANDOM_ROOM3 358 +#define LAYOUT_UNKNOWN_MAP_084693AC 359 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY 360 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE 361 +#define LAYOUT_BATTLE_PYRAMID_SQUARE01 362 +#define LAYOUT_BATTLE_PYRAMID_SQUARE02 363 +#define LAYOUT_BATTLE_PYRAMID_SQUARE03 364 +#define LAYOUT_BATTLE_PYRAMID_SQUARE04 365 +#define LAYOUT_BATTLE_PYRAMID_SQUARE05 366 +#define LAYOUT_BATTLE_PYRAMID_SQUARE06 367 +#define LAYOUT_BATTLE_PYRAMID_SQUARE07 368 +#define LAYOUT_BATTLE_PYRAMID_SQUARE08 369 +#define LAYOUT_BATTLE_PYRAMID_SQUARE09 370 +#define LAYOUT_BATTLE_PYRAMID_SQUARE10 371 +#define LAYOUT_BATTLE_PYRAMID_SQUARE11 372 +#define LAYOUT_BATTLE_PYRAMID_SQUARE12 373 +#define LAYOUT_BATTLE_PYRAMID_SQUARE13 374 +#define LAYOUT_BATTLE_PYRAMID_SQUARE14 375 +#define LAYOUT_BATTLE_PYRAMID_SQUARE15 376 +#define LAYOUT_BATTLE_PYRAMID_SQUARE16 377 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP 378 +#define LAYOUT_MAGMA_HIDEOUT_3F_3R 379 +#define LAYOUT_MAGMA_HIDEOUT_2F_3R 380 +#define LAYOUT_MIRAGE_TOWER_1F 381 +#define LAYOUT_MIRAGE_TOWER_2F 382 +#define LAYOUT_MIRAGE_TOWER_3F 383 +#define LAYOUT_BATTLE_TENT_LOBBY 384 +#define LAYOUT_BATTLE_TENT_CORRIDOR 385 +#define LAYOUT_BATTLE_TENT_BATTLE_ROOM 386 +#define LAYOUT_VERDANTURF_TOWN_BATTLE_TENT_BATTLE_ROOM 387 +#define LAYOUT_MIRAGE_TOWER_4F 388 +#define LAYOUT_DESERT_UNDERPASS 389 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM 390 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2 391 +#define LAYOUT_ROUTE111_NO_MIRAGE_TOWER 392 +#define LAYOUT_UNION_ROOM 393 +#define LAYOUT_SAFARI_ZONE_NORTHEAST 394 +#define LAYOUT_SAFARI_ZONE_SOUTHEAST 395 +#define LAYOUT_BATTLE_FRONTIER_RANKING_HALL 396 +#define LAYOUT_BATTLE_FRONTIER_LOUNGE1 397 +#define LAYOUT_BATTLE_FRONTIER_BATTLE_POINT_EXCHANGE_SERVICE_CORNER 398 +#define LAYOUT_BATTLE_FRONTIER_RECEPTION_GATE 399 +#define LAYOUT_ARTISAN_CAVE_B1F 400 +#define LAYOUT_ARTISAN_CAVE_1F 401 +#define LAYOUT_FARAWAY_ISLAND_ENTRANCE 402 +#define LAYOUT_FARAWAY_ISLAND_INTERIOR 403 +#define LAYOUT_BIRTH_ISLAND_EXTERIOR 404 +#define LAYOUT_ISLAND_HARBOR 405 +#define LAYOUT_UNDERWATER_MARINE_CAVE 406 +#define LAYOUT_MARINE_CAVE_ENTRANCE 407 +#define LAYOUT_TERRA_CAVE_ENTRANCE 408 +#define LAYOUT_TERRA_CAVE_END 409 +#define LAYOUT_UNDERWATER6 410 +#define LAYOUT_UNDERWATER7 411 +#define LAYOUT_UNDERWATER5 412 +#define LAYOUT_MARINE_CAVE_END 413 +#define LAYOUT_TRAINER_HILL_ENTRANCE 414 +#define LAYOUT_TRAINER_HILL_1F 415 +#define LAYOUT_TRAINER_HILL_2F 416 +#define LAYOUT_TRAINER_HILL_3F 417 +#define LAYOUT_TRAINER_HILL_4F 418 +#define LAYOUT_TRAINER_HILL_ROOF 419 +#define LAYOUT_ALTERING_CAVE 420 +#define LAYOUT_NAVEL_ROCK_EXTERIOR 421 +#define LAYOUT_NAVEL_ROCK_ENTRANCE 422 +#define LAYOUT_NAVEL_ROCK_TOP 423 +#define LAYOUT_NAVEL_ROCK_BOTTOM 424 +#define LAYOUT_NAVEL_ROCK_LADDER_ROOM1 425 +#define LAYOUT_NAVEL_ROCK_LADDER_ROOM2 426 +#define LAYOUT_NAVEL_ROCK_B1F 427 +#define LAYOUT_NAVEL_ROCK_FORK 428 +#define LAYOUT_BATTLE_FRONTIER_LOUNGE2 429 +#define LAYOUT_BATTLE_FRONTIER_SCOTTS_HOUSE 430 +#define LAYOUT_METEOR_FALLS_STEVENS_CAVE 431 +#define LAYOUT_UNKNOWN_MAP_08480DAC 432 +#define LAYOUT_UNKNOWN_MAP_08480F54 433 +#define LAYOUT_UNKNOWN_MAP_084810FC 434 +#define LAYOUT_UNKNOWN_MAP_084812A4 435 +#define LAYOUT_UNKNOWN_MAP_0848144C 436 +#define LAYOUT_UNKNOWN_MAP_084815F4 437 +#define LAYOUT_UNKNOWN_MAP_08481B24 438 +#define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F 439 +#define LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F 440 +#define LAYOUT_UNKNOWN_MAP_08481DBC 441 + +#endif // GUARD_CONSTANTS_LAYOUTS_H |