diff options
| author | yenatch <yenatch@gmail.com> | 2016-06-16 16:11:29 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2016-06-16 16:11:29 -0400 |
| commit | 8de49d722cbd21abff92ec384e5faaf1f0dde2d5 (patch) | |
| tree | f2a577679cdd5b20b58285afe3695587ceb84488 /data/maps/events | |
| parent | 9d8d999973a627b319413e33344103913b630499 (diff) | |
Dump the maps.
Diffstat (limited to 'data/maps/events')
393 files changed, 7160 insertions, 0 deletions
diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.s b/data/maps/events/AbandonedShip_CaptainsOffice.s new file mode 100644 index 000000000..ab3cdc682 --- /dev/null +++ b/data/maps/events/AbandonedShip_CaptainsOffice.s @@ -0,0 +1,11 @@ +AbandonedShip_CaptainsOffice_MapObjects:: @ 838E45C + object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 3, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_15EAF5, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, 1100, 0, 0 + +AbandonedShip_CaptainsOffice_MapWarps:: @ 838E48C + warp_def 7, 6, 3, 4, AbandonedShip_Deck + warp_def 8, 6, 3, 4, AbandonedShip_Deck + +AbandonedShip_CaptainsOffice_MapEvents:: @ 838E49C + map_events AbandonedShip_CaptainsOffice_MapObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/AbandonedShip_Corridors_1F.s b/data/maps/events/AbandonedShip_Corridors_1F.s new file mode 100644 index 000000000..35218874f --- /dev/null +++ b/data/maps/events/AbandonedShip_Corridors_1F.s @@ -0,0 +1,21 @@ +AbandonedShip_Corridors_1F_MapObjects:: @ 838E120 + object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 17, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Corridors_1F_EventScript_15E965, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_TUBER_M, 0, 5, 0, 10, 0, 3, 45, 116, 0, 1, 0, 3, 0, AbandonedShip_Corridors_1F_EventScript_15E96E, 0, 0, 0 + +AbandonedShip_Corridors_1F_MapWarps:: @ 838E150 + warp_def 9, 11, 3, 2, AbandonedShip_Deck + warp_def 8, 11, 3, 2, AbandonedShip_Deck + warp_def 0, 11, 3, 3, AbandonedShip_Deck + warp_def 1, 11, 3, 3, AbandonedShip_Deck + warp_def 11, 9, 3, 0, AbandonedShip_Rooms_1F + warp_def 14, 9, 3, 3, AbandonedShip_Rooms_1F + warp_def 11, 3, 3, 2, AbandonedShip_Rooms_1F + warp_def 14, 3, 3, 4, AbandonedShip_Rooms_1F + warp_def 3, 9, 3, 0, AbandonedShip_Rooms2_1F + warp_def 16, 2, 3, 7, AbandonedShip_Corridors_B1F + warp_def 5, 2, 3, 6, AbandonedShip_Corridors_B1F + warp_def 3, 3, 3, 2, AbandonedShip_Rooms2_1F + +AbandonedShip_Corridors_1F_MapEvents:: @ 838E1B0 + map_events AbandonedShip_Corridors_1F_MapObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.s b/data/maps/events/AbandonedShip_Corridors_B1F.s new file mode 100644 index 000000000..42766d63d --- /dev/null +++ b/data/maps/events/AbandonedShip_Corridors_B1F.s @@ -0,0 +1,20 @@ +AbandonedShip_Corridors_B1F_MapObjects:: @ 838E238 + object_event 1, MAP_OBJ_GFX_TUBER_M, 0, 2, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9CA, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SAILOR, 0, 9, 0, 6, 0, 3, 14, 0, 0, 1, 0, 4, 0, AbandonedShip_Corridors_B1F_EventScript_15EA1E, 0, 0, 0 + +AbandonedShip_Corridors_B1F_MapWarps:: @ 838E268 + warp_def 6, 4, 3, 2, AbandonedShip_Rooms2_B1F + warp_def 3, 4, 3, 0, AbandonedShip_Rooms2_B1F + warp_def 5, 7, 3, 0, AbandonedShip_Rooms_B1F + warp_def 8, 7, 3, 1, AbandonedShip_Rooms_B1F + warp_def 11, 7, 3, 2, AbandonedShip_Rooms_B1F + warp_def 11, 4, 3, 0, AbandonedShip_Room_B1F + warp_def 0, 2, 3, 10, AbandonedShip_Corridors_1F + warp_def 8, 2, 3, 9, AbandonedShip_Corridors_1F + +AbandonedShip_Corridors_B1F_MapBGEvents:: @ 838E2A8 + bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9D3 + +AbandonedShip_Corridors_B1F_MapEvents:: @ 838E2B4 + map_events AbandonedShip_Corridors_B1F_MapObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents + diff --git a/data/maps/events/AbandonedShip_Deck.s b/data/maps/events/AbandonedShip_Deck.s new file mode 100644 index 000000000..5246e92ae --- /dev/null +++ b/data/maps/events/AbandonedShip_Deck.s @@ -0,0 +1,10 @@ +AbandonedShip_Deck_MapWarps:: @ 838E0E4 + warp_def 13, 15, 3, 0, Route108 + warp_def 14, 15, 3, 0, Route108 + warp_def 13, 9, 3, 1, AbandonedShip_Corridors_1F + warp_def 8, 9, 3, 2, AbandonedShip_Corridors_1F + warp_def 12, 5, 3, 0, AbandonedShip_CaptainsOffice + +AbandonedShip_Deck_MapEvents:: @ 838E10C + map_events 0x0, AbandonedShip_Deck_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/AbandonedShip_HiddenFloorCorridors.s b/data/maps/events/AbandonedShip_HiddenFloorCorridors.s new file mode 100644 index 000000000..8f60ea32a --- /dev/null +++ b/data/maps/events/AbandonedShip_HiddenFloorCorridors.s @@ -0,0 +1,17 @@ +AbandonedShip_HiddenFloorCorridors_MapWarps:: @ 838E4CC + warp_def 3, 8, 3, 0, AbandonedShip_HiddenFloorRooms + warp_def 6, 8, 3, 2, AbandonedShip_HiddenFloorRooms + warp_def 9, 8, 3, 4, AbandonedShip_HiddenFloorRooms + warp_def 3, 3, 3, 6, AbandonedShip_HiddenFloorRooms + warp_def 6, 3, 3, 7, AbandonedShip_HiddenFloorRooms + warp_def 9, 3, 3, 8, AbandonedShip_HiddenFloorRooms + +AbandonedShip_HiddenFloorCorridors_MapBGEvents:: @ 838E4FC + bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3 + bg_event 6, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A + bg_event 3, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EC61 + bg_event 9, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EC98 + +AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 838E52C + map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents + diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.s b/data/maps/events/AbandonedShip_HiddenFloorRooms.s new file mode 100644 index 000000000..2a5bb2ecc --- /dev/null +++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.s @@ -0,0 +1,32 @@ +AbandonedShip_HiddenFloorRooms_MapObjects:: @ 838E540 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 41, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18CB, 1077, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18D8, 1078, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18F2, 1102, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, 1101, 0, 0 + +AbandonedShip_HiddenFloorRooms_MapWarps:: @ 838E5A0 + warp_def 6, 14, 3, 0, AbandonedShip_HiddenFloorCorridors + warp_def 7, 14, 3, 0, AbandonedShip_HiddenFloorCorridors + warp_def 21, 14, 3, 1, AbandonedShip_HiddenFloorCorridors + warp_def 22, 14, 3, 1, AbandonedShip_HiddenFloorCorridors + warp_def 36, 14, 3, 2, AbandonedShip_HiddenFloorCorridors + warp_def 37, 14, 3, 2, AbandonedShip_HiddenFloorCorridors + warp_def 6, 1, 3, 3, AbandonedShip_HiddenFloorCorridors + warp_def 21, 1, 3, 4, AbandonedShip_HiddenFloorCorridors + warp_def 36, 1, 3, 5, AbandonedShip_HiddenFloorCorridors + +AbandonedShip_HiddenFloorRooms_MapBGEvents:: @ 838E5E8 + bg_event 42, 10, 3, 7, 0, ITEM_ROOM_1_KEY, 31, 0 + bg_event 20, 5, 3, 7, 0, ITEM_ROOM_2_KEY, 32, 0 + bg_event 1, 12, 3, 7, 0, ITEM_ROOM_4_KEY, 33, 0 + bg_event 1, 2, 0, 7, 0, ITEM_ROOM_6_KEY, 34, 0 + bg_event 8, 5, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 11, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 10, 10, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 16, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 25, 2, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + +AbandonedShip_HiddenFloorRooms_MapEvents:: @ 838E660 + map_events AbandonedShip_HiddenFloorRooms_MapObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents + diff --git a/data/maps/events/AbandonedShip_Room_B1F.s b/data/maps/events/AbandonedShip_Room_B1F.s new file mode 100644 index 000000000..27b93348a --- /dev/null +++ b/data/maps/events/AbandonedShip_Room_B1F.s @@ -0,0 +1,10 @@ +AbandonedShip_Room_B1F_MapObjects:: @ 838E3AC + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, 1098, 0, 0 + +AbandonedShip_Room_B1F_MapWarps:: @ 838E3C4 + warp_def 4, 7, 3, 5, AbandonedShip_Corridors_B1F + warp_def 5, 7, 3, 5, AbandonedShip_Corridors_B1F + +AbandonedShip_Room_B1F_MapEvents:: @ 838E3D4 + map_events AbandonedShip_Room_B1F_MapObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.s b/data/maps/events/AbandonedShip_Rooms2_1F.s new file mode 100644 index 000000000..82f981e3c --- /dev/null +++ b/data/maps/events/AbandonedShip_Rooms2_1F.s @@ -0,0 +1,13 @@ +AbandonedShip_Rooms2_1F_MapObjects:: @ 838E3E8 + object_event 1, MAP_OBJ_GFX_MAN_5, 0, 7, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_15EA68, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_15EAAE, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, 1099, 0, 0 + +AbandonedShip_Rooms2_1F_MapWarps:: @ 838E430 + warp_def 4, 16, 3, 8, AbandonedShip_Corridors_1F + warp_def 5, 16, 3, 8, AbandonedShip_Corridors_1F + warp_def 4, 1, 3, 11, AbandonedShip_Corridors_1F + +AbandonedShip_Rooms2_1F_MapEvents:: @ 838E448 + map_events AbandonedShip_Rooms2_1F_MapObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.s b/data/maps/events/AbandonedShip_Rooms2_B1F.s new file mode 100644 index 000000000..23a7751aa --- /dev/null +++ b/data/maps/events/AbandonedShip_Rooms2_B1F.s @@ -0,0 +1,13 @@ +AbandonedShip_Rooms2_B1F_MapObjects:: @ 838E324 + object_event 1, MAP_OBJ_GFX_CAMPER, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_15EA4E, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, 1097, 0, 0 + +AbandonedShip_Rooms2_B1F_MapWarps:: @ 838E354 + warp_def 4, 7, 3, 1, AbandonedShip_Corridors_B1F + warp_def 5, 7, 3, 1, AbandonedShip_Corridors_B1F + warp_def 13, 7, 3, 0, AbandonedShip_Corridors_B1F + warp_def 14, 7, 3, 0, AbandonedShip_Corridors_B1F + +AbandonedShip_Rooms2_B1F_MapEvents:: @ 838E374 + map_events AbandonedShip_Rooms2_B1F_MapObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/AbandonedShip_Rooms_1F.s b/data/maps/events/AbandonedShip_Rooms_1F.s new file mode 100644 index 000000000..f1d37bafd --- /dev/null +++ b/data/maps/events/AbandonedShip_Rooms_1F.s @@ -0,0 +1,15 @@ +AbandonedShip_Rooms_1F_MapObjects:: @ 838E1C4 + object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 11, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_15E986, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, 1095, 0, 0 + +AbandonedShip_Rooms_1F_MapWarps:: @ 838E1F4 + warp_def 4, 16, 3, 4, AbandonedShip_Corridors_1F + warp_def 5, 16, 3, 4, AbandonedShip_Corridors_1F + warp_def 4, 1, 3, 6, AbandonedShip_Corridors_1F + warp_def 13, 16, 3, 5, AbandonedShip_Corridors_1F + warp_def 13, 1, 3, 7, AbandonedShip_Corridors_1F + warp_def 14, 16, 3, 5, AbandonedShip_Corridors_1F + +AbandonedShip_Rooms_1F_MapEvents:: @ 838E224 + map_events AbandonedShip_Rooms_1F_MapObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.s b/data/maps/events/AbandonedShip_Rooms_B1F.s new file mode 100644 index 000000000..8d7264820 --- /dev/null +++ b/data/maps/events/AbandonedShip_Rooms_B1F.s @@ -0,0 +1,12 @@ +AbandonedShip_Rooms_B1F_MapObjects:: @ 838E2C8 + object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 25, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_15EA44, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, 1096, 0, 0 + +AbandonedShip_Rooms_B1F_MapWarps:: @ 838E2F8 + warp_def 4, 1, 3, 2, AbandonedShip_Corridors_B1F + warp_def 13, 1, 3, 3, AbandonedShip_Corridors_B1F + warp_def 22, 1, 3, 4, AbandonedShip_Corridors_B1F + +AbandonedShip_Rooms_B1F_MapEvents:: @ 838E310 + map_events AbandonedShip_Rooms_B1F_MapObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/AbandonedShip_Underwater1.s b/data/maps/events/AbandonedShip_Underwater1.s new file mode 100644 index 000000000..c6e7adf24 --- /dev/null +++ b/data/maps/events/AbandonedShip_Underwater1.s @@ -0,0 +1,7 @@ +AbandonedShip_Underwater1_MapWarps:: @ 838E388 + warp_def 3, 7, 3, 0, AbandonedShip_Underwater2 + warp_def 4, 7, 3, 0, AbandonedShip_Underwater2 + +AbandonedShip_Underwater1_MapEvents:: @ 838E398 + map_events 0x0, AbandonedShip_Underwater1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/AbandonedShip_Underwater2.s b/data/maps/events/AbandonedShip_Underwater2.s new file mode 100644 index 000000000..d6bb65101 --- /dev/null +++ b/data/maps/events/AbandonedShip_Underwater2.s @@ -0,0 +1,6 @@ +AbandonedShip_Underwater2_MapWarps:: @ 838E4B0 + warp_def 3, 1, 3, 0, AbandonedShip_Underwater1 + +AbandonedShip_Underwater2_MapEvents:: @ 838E4B8 + map_events 0x0, AbandonedShip_Underwater2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/AncientTomb.s b/data/maps/events/AncientTomb.s new file mode 100644 index 000000000..d3a5b2051 --- /dev/null +++ b/data/maps/events/AncientTomb.s @@ -0,0 +1,16 @@ +AncientTomb_MapObjects:: @ 838E6DC + object_event 1, MAP_OBJ_GFX_REGISTEEL, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, AncientTomb_EventScript_15F050, 937, 0, 0 + +AncientTomb_MapWarps:: @ 838E6F4 + warp_def 8, 29, 3, 0, Route120 + warp_def 8, 20, 0, 2, AncientTomb + warp_def 8, 11, 3, 1, AncientTomb + +AncientTomb_MapBGEvents:: @ 838E70C + bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_15F021 + bg_event 7, 20, 0, 0, 0, AncientTomb_EventScript_15F042 + bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_15F042 + +AncientTomb_MapEvents:: @ 838E730 + map_events AncientTomb_MapObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents + diff --git a/data/maps/events/AquaHideout_1F.s b/data/maps/events/AquaHideout_1F.s new file mode 100644 index 000000000..c23236788 --- /dev/null +++ b/data/maps/events/AquaHideout_1F.s @@ -0,0 +1,13 @@ +AquaHideout_1F_MapObjects:: @ 838CD0C + object_event 1, 241, 0, 13, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, 821, 0, 0 + object_event 2, 241, 0, 14, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, 822, 0, 0 + object_event 3, 241, 0, 20, 0, 4, 0, 3, 50, 93, 0, 1, 0, 3, 0, AquaHideout_1F_EventScript_15D80C, 924, 0, 0 + +AquaHideout_1F_MapWarps:: @ 838CD54 + warp_def 13, 27, 1, 6, LilycoveCity + warp_def 14, 27, 1, 6, LilycoveCity + warp_def 22, 1, 3, 0, AquaHideout_B1F + +AquaHideout_1F_MapEvents:: @ 838CD6C + map_events AquaHideout_1F_MapObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/AquaHideout_B1F.s b/data/maps/events/AquaHideout_B1F.s new file mode 100644 index 000000000..7f1235a81 --- /dev/null +++ b/data/maps/events/AquaHideout_B1F.s @@ -0,0 +1,40 @@ +AquaHideout_B1F_MapObjects:: @ 838CD80 + object_event 1, 241, 0, 27, 0, 18, 0, 3, 24, 0, 0, 1, 0, 3, 0, AquaHideout_B1F_EventScript_15D850, 924, 0, 0 + object_event 2, 241, 0, 6, 0, 6, 0, 3, 9, 0, 0, 1, 0, 5, 0, AquaHideout_B1F_EventScript_15D875, 924, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, 1071, 0, 0 + object_event 4, 242, 0, 20, 0, 18, 0, 3, 27, 4, 0, 1, 0, 4, 0, AquaHideout_B1F_EventScript_15D89A, 924, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B198E, 1124, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A04FD, 977, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B199B, 1132, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A051B, 978, 0, 0 + +AquaHideout_B1F_MapWarps:: @ 838CE40 + warp_def 29, 1, 3, 2, AquaHideout_1F + warp_def 18, 1, 3, 0, AquaHideout_B2F + warp_def 12, 1, 3, 1, AquaHideout_B2F + warp_def 3, 3, 3, 2, AquaHideout_B2F + warp_def 31, 4, 3, 7, AquaHideout_B1F + warp_def 27, 4, 3, 8, AquaHideout_B1F + warp_def 20, 4, 3, 10, AquaHideout_B1F + warp_def 27, 12, 3, 4, AquaHideout_B1F + warp_def 3, 15, 3, 5, AquaHideout_B1F + warp_def 3, 20, 3, 12, AquaHideout_B1F + warp_def 32, 19, 3, 6, AquaHideout_B1F + warp_def 23, 10, 3, 22, AquaHideout_B1F + warp_def 45, 3, 3, 9, AquaHideout_B1F + warp_def 42, 5, 3, 18, AquaHideout_B1F + warp_def 45, 5, 3, 12, AquaHideout_B1F + warp_def 48, 5, 3, 16, AquaHideout_B1F + warp_def 42, 9, 3, 15, AquaHideout_B1F + warp_def 45, 9, 3, 20, AquaHideout_B1F + warp_def 48, 9, 3, 13, AquaHideout_B1F + warp_def 42, 13, 3, 24, AquaHideout_B1F + warp_def 45, 13, 3, 17, AquaHideout_B1F + warp_def 48, 13, 3, 12, AquaHideout_B1F + warp_def 42, 17, 3, 11, AquaHideout_B1F + warp_def 45, 17, 3, 17, AquaHideout_B1F + warp_def 48, 17, 3, 19, AquaHideout_B1F + +AquaHideout_B1F_MapEvents:: @ 838CF08 + map_events AquaHideout_B1F_MapObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/AquaHideout_B2F.s b/data/maps/events/AquaHideout_B2F.s new file mode 100644 index 000000000..112e431fe --- /dev/null +++ b/data/maps/events/AquaHideout_B2F.s @@ -0,0 +1,26 @@ +AquaHideout_B2F_MapObjects:: @ 838CF1C + object_event 1, 241, 0, 23, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, 924, 0, 0 + object_event 2, 241, 0, 23, 0, 10, 0, 3, 45, 52, 0, 1, 0, 3, 0, AquaHideout_B2F_EventScript_15D962, 924, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, 1072, 0, 0 + object_event 4, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 0, 20, 0, 1, 9, 0, 0, 0, 0, 0, 0, 0x0, 943, 0, 0 + object_event 5, 242, 0, 10, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, AquaHideout_B2F_EventScript_15D987, 924, 0, 0 + +AquaHideout_B2F_MapWarps:: @ 838CF94 + warp_def 18, 1, 3, 1, AquaHideout_B1F + warp_def 12, 1, 3, 2, AquaHideout_B1F + warp_def 3, 3, 3, 3, AquaHideout_B1F + warp_def 31, 8, 3, 5, AquaHideout_B2F + warp_def 8, 8, 3, 8, AquaHideout_B2F + warp_def 5, 8, 3, 3, AquaHideout_B2F + warp_def 18, 13, 3, 7, AquaHideout_B2F + warp_def 12, 13, 3, 6, AquaHideout_B2F + warp_def 31, 17, 3, 4, AquaHideout_B2F + warp_def 32, 20, 3, 4, AquaHideout_B1F + +AquaHideout_B2F_MapCoordEvents:: @ 838CFE4 + coord_event 28, 17, 3, 0, 0x4001, 0, 0, AquaHideout_B2F_EventScript_15D8BD + coord_event 28, 16, 3, 0, 0x4001, 0, 0, AquaHideout_B2F_EventScript_15D8BD + +AquaHideout_B2F_MapEvents:: @ 838D004 + map_events AquaHideout_B2F_MapObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 + diff --git a/data/maps/events/BattleTower_BattleRoom.s b/data/maps/events/BattleTower_BattleRoom.s new file mode 100644 index 000000000..161bf8a2f --- /dev/null +++ b/data/maps/events/BattleTower_BattleRoom.s @@ -0,0 +1,11 @@ +BattleTower_BattleRoom_MapObjects:: @ 8391DAC + object_event 1, 240, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 888, 0, 0 + object_event 2, MAP_OBJ_GFX_TEALA, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + +BattleTower_BattleRoom_MapWarps:: @ 8391DDC + warp_def 5, 8, 0, 2, BattleTower_Lobby + warp_def 6, 8, 0, 2, BattleTower_Lobby + +BattleTower_BattleRoom_MapEvents:: @ 8391DEC + map_events BattleTower_BattleRoom_MapObjects, BattleTower_BattleRoom_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/BattleTower_Corridor.s b/data/maps/events/BattleTower_Corridor.s new file mode 100644 index 000000000..07f7b23f5 --- /dev/null +++ b/data/maps/events/BattleTower_Corridor.s @@ -0,0 +1,6 @@ +BattleTower_Corridor_MapObjects:: @ 8391D80 + object_event 1, MAP_OBJ_GFX_TEALA, 0, 9, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + +BattleTower_Corridor_MapEvents:: @ 8391D98 + map_events BattleTower_Corridor_MapObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/events/BattleTower_Elevator.s b/data/maps/events/BattleTower_Elevator.s new file mode 100644 index 000000000..37e14df01 --- /dev/null +++ b/data/maps/events/BattleTower_Elevator.s @@ -0,0 +1,6 @@ +BattleTower_Elevator_MapObjects:: @ 8391D54 + object_event 1, MAP_OBJ_GFX_TEALA, 0, 1, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + +BattleTower_Elevator_MapEvents:: @ 8391D6C + map_events BattleTower_Elevator_MapObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/events/BattleTower_Lobby.s b/data/maps/events/BattleTower_Lobby.s new file mode 100644 index 000000000..a61e6eaa7 --- /dev/null +++ b/data/maps/events/BattleTower_Lobby.s @@ -0,0 +1,19 @@ +BattleTower_Lobby_MapObjects:: @ 8391C8C + object_event 1, MAP_OBJ_GFX_TEALA, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_16049E, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_5, 0, 12, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1606A5, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160715, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BOY_1, 0, 1, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_16071E, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1AE1FF, 918, 0, 0 + object_event 6, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, 941, 0, 0 + +BattleTower_Lobby_MapWarps:: @ 8391D1C + warp_def 6, 8, 0, 0, BattleTower_Outside + warp_def 7, 8, 0, 0, BattleTower_Outside + warp_def 6, 1, 0, 0, BattleTower_BattleRoom + +BattleTower_Lobby_MapBGEvents:: @ 8391D34 + bg_event 3, 5, 3, 1, 0, BattleTower_Lobby_EventScript_160727 + +BattleTower_Lobby_MapEvents:: @ 8391D40 + map_events BattleTower_Lobby_MapObjects, BattleTower_Lobby_MapWarps, 0x0, BattleTower_Lobby_MapBGEvents + diff --git a/data/maps/events/BattleTower_Outside.s b/data/maps/events/BattleTower_Outside.s new file mode 100644 index 000000000..5ffb86b0a --- /dev/null +++ b/data/maps/events/BattleTower_Outside.s @@ -0,0 +1,16 @@ +BattleTower_Outside_MapObjects:: @ 8391BEC + object_event 1, MAP_OBJ_GFX_BUG_CATCHER, 0, 18, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_160263, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 11, 0, 14, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_16026C, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BOY_2, 0, 10, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_160275, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_SS_TIDAL, 0, 19, 0, 26, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 19, 0, 24, 0, 3, 7, 17, 0, 0, 0, 0, 0, BattleTower_Outside_EventScript_160168, 0, 0, 0 + +BattleTower_Outside_MapWarps:: @ 8391C64 + warp_def 14, 8, 0, 0, BattleTower_Lobby + +BattleTower_Outside_MapBGEvents:: @ 8391C6C + bg_event 16, 13, 0, 0, 0, BattleTower_Outside_EventScript_16025A + +BattleTower_Outside_MapEvents:: @ 8391C78 + map_events BattleTower_Outside_MapObjects, BattleTower_Outside_MapWarps, 0x0, BattleTower_Outside_MapBGEvents + diff --git a/data/maps/events/CaveOfOrigin_1F.s b/data/maps/events/CaveOfOrigin_1F.s new file mode 100644 index 000000000..8e97e7761 --- /dev/null +++ b/data/maps/events/CaveOfOrigin_1F.s @@ -0,0 +1,12 @@ +CaveOfOrigin_1F_MapWarps:: @ 838D718 + warp_def 11, 17, 3, 1, CaveOfOrigin_Entrance + warp_def 14, 5, 3, 0, CaveOfOrigin_B1F + +CaveOfOrigin_1F_MapCoordEvents:: @ 838D728 + coord_event 7, 11, 3, 0, 0x4001, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF + coord_event 6, 11, 3, 0, 0x4001, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF + coord_event 5, 11, 3, 0, 0x4001, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF + +CaveOfOrigin_1F_MapEvents:: @ 838D758 + map_events 0x0, CaveOfOrigin_1F_MapWarps, CaveOfOrigin_1F_MapCoordEvents, 0x0 + diff --git a/data/maps/events/CaveOfOrigin_B1F.s b/data/maps/events/CaveOfOrigin_B1F.s new file mode 100644 index 000000000..733582664 --- /dev/null +++ b/data/maps/events/CaveOfOrigin_B1F.s @@ -0,0 +1,12 @@ +CaveOfOrigin_B1F_MapWarps:: @ 838D76C + warp_def 13, 5, 3, 1, CaveOfOrigin_1F + warp_def 5, 11, 3, 0, CaveOfOrigin_B2F + +CaveOfOrigin_B1F_MapCoordEvents:: @ 838D77C + coord_event 12, 15, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF + coord_event 12, 16, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF + coord_event 12, 17, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF + +CaveOfOrigin_B1F_MapEvents:: @ 838D7AC + map_events 0x0, CaveOfOrigin_B1F_MapWarps, CaveOfOrigin_B1F_MapCoordEvents, 0x0 + diff --git a/data/maps/events/CaveOfOrigin_B2F.s b/data/maps/events/CaveOfOrigin_B2F.s new file mode 100644 index 000000000..90f1d2681 --- /dev/null +++ b/data/maps/events/CaveOfOrigin_B2F.s @@ -0,0 +1,12 @@ +CaveOfOrigin_B2F_MapWarps:: @ 838D7C0 + warp_def 5, 10, 3, 1, CaveOfOrigin_B1F + warp_def 8, 14, 3, 0, CaveOfOrigin_B3F + +CaveOfOrigin_B2F_MapCoordEvents:: @ 838D7D0 + coord_event 10, 6, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF + coord_event 10, 5, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF + coord_event 14, 13, 3, 0, 0x4002, 0, 0, CaveOfOrigin_B2F_EventScript_1A04BB + +CaveOfOrigin_B2F_MapEvents:: @ 838D800 + map_events 0x0, CaveOfOrigin_B2F_MapWarps, CaveOfOrigin_B2F_MapCoordEvents, 0x0 + diff --git a/data/maps/events/CaveOfOrigin_B3F.s b/data/maps/events/CaveOfOrigin_B3F.s new file mode 100644 index 000000000..774164c52 --- /dev/null +++ b/data/maps/events/CaveOfOrigin_B3F.s @@ -0,0 +1,15 @@ +CaveOfOrigin_B3F_MapObjects:: @ 838D814 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, 1059, 0, 0 + +CaveOfOrigin_B3F_MapWarps:: @ 838D82C + warp_def 7, 14, 3, 1, CaveOfOrigin_B2F + warp_def 12, 6, 3, 0, CaveOfOrigin_B4F + +CaveOfOrigin_B3F_MapCoordEvents:: @ 838D83C + coord_event 5, 11, 3, 0, 0x4001, 0, 0, CaveOfOrigin_B3F_EventScript_1A04AF + coord_event 8, 6, 3, 0, 0x4002, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB + coord_event 8, 5, 3, 0, 0x4002, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB + +CaveOfOrigin_B3F_MapEvents:: @ 838D86C + map_events CaveOfOrigin_B3F_MapObjects, CaveOfOrigin_B3F_MapWarps, CaveOfOrigin_B3F_MapCoordEvents, 0x0 + diff --git a/data/maps/events/CaveOfOrigin_B4F.s b/data/maps/events/CaveOfOrigin_B4F.s new file mode 100644 index 000000000..353ef25b9 --- /dev/null +++ b/data/maps/events/CaveOfOrigin_B4F.s @@ -0,0 +1,14 @@ +CaveOfOrigin_B4F_MapObjects:: @ 838D880 + object_event 1, 248, 0, 9, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 825, 0, 0 + +CaveOfOrigin_B4F_MapWarps:: @ 838D898 + warp_def 12, 5, 3, 1, CaveOfOrigin_B3F + +CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0 + coord_event 9, 13, 3, 0, 0x409b, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7 + coord_event 13, 9, 3, 0, 0x4005, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 + coord_event 5, 9, 3, 0, 0x4005, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 + +CaveOfOrigin_B4F_MapEvents:: @ 838D8D0 + map_events CaveOfOrigin_B4F_MapObjects, CaveOfOrigin_B4F_MapWarps, CaveOfOrigin_B4F_MapCoordEvents, 0x0 + diff --git a/data/maps/events/CaveOfOrigin_Entrance.s b/data/maps/events/CaveOfOrigin_Entrance.s new file mode 100644 index 000000000..8adbba9d4 --- /dev/null +++ b/data/maps/events/CaveOfOrigin_Entrance.s @@ -0,0 +1,7 @@ +CaveOfOrigin_Entrance_MapWarps:: @ 838D6F4 + warp_def 9, 20, 3, 3, SootopolisCity + warp_def 9, 5, 3, 0, CaveOfOrigin_1F + +CaveOfOrigin_Entrance_MapEvents:: @ 838D704 + map_events 0x0, CaveOfOrigin_Entrance_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/DesertRuins.s b/data/maps/events/DesertRuins.s new file mode 100644 index 000000000..2e0508adb --- /dev/null +++ b/data/maps/events/DesertRuins.s @@ -0,0 +1,16 @@ +DesertRuins_MapObjects:: @ 838BEBC + object_event 1, MAP_OBJ_GFX_REGIROCK, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, 935, 0, 0 + +DesertRuins_MapWarps:: @ 838BED4 + warp_def 8, 29, 3, 1, Route111 + warp_def 8, 20, 0, 2, DesertRuins + warp_def 8, 11, 3, 1, DesertRuins + +DesertRuins_MapBGEvents:: @ 838BEEC + bg_event 8, 20, 0, 0, 0, DesertRuins_EventScript_15CB56 + bg_event 7, 20, 0, 0, 0, DesertRuins_EventScript_15CB77 + bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_15CB77 + +DesertRuins_MapEvents:: @ 838BF10 + map_events DesertRuins_MapObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents + diff --git a/data/maps/events/DewfordTown.s b/data/maps/events/DewfordTown.s new file mode 100644 index 000000000..77b2a72e9 --- /dev/null +++ b/data/maps/events/DewfordTown.s @@ -0,0 +1,24 @@ +DewfordTown_MapObjects:: @ 8380B88 + object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 12, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E0A2, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 9, 0, 3, 9, 16, 0, 0, 0, 3, 0, DewfordTown_EventScript_14E002, 740, 0, 0 + object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 12, 0, 14, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E0C6, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 8, 0, 1, 8, 0, 0, 0, 0, 0, 0, 0x0, 743, 0, 0 + object_event 5, MAP_OBJ_GFX_BOY_1, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, DewfordTown_EventScript_14E413, 0, 0, 0 + +DewfordTown_MapWarps:: @ 8380C00 + warp_def 3, 3, 0, 0, DewfordTown_Hall + warp_def 2, 10, 0, 0, DewfordTown_PokemonCenter_1F + warp_def 8, 17, 0, 0, DewfordTown_Gym + warp_def 17, 14, 0, 0, DewfordTown_House1 + warp_def 8, 8, 0, 0, DewfordTown_House2 + +DewfordTown_MapBGEvents:: @ 8380C28 + bg_event 10, 10, 0, 0, 0, DewfordTown_EventScript_14E0AB + bg_event 11, 16, 0, 0, 0, DewfordTown_EventScript_14E0B4 + bg_event 4, 10, 0, 1, 0, DewfordTown_EventScript_1A00EA + bg_event 3, 10, 0, 1, 0, DewfordTown_EventScript_1A00EA + bg_event 2, 4, 0, 0, 0, DewfordTown_EventScript_14E0BD + +DewfordTown_MapEvents:: @ 8380C64 + map_events DewfordTown_MapObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents + diff --git a/data/maps/events/DewfordTown_Gym.s b/data/maps/events/DewfordTown_Gym.s new file mode 100644 index 000000000..0eb8606bb --- /dev/null +++ b/data/maps/events/DewfordTown_Gym.s @@ -0,0 +1,20 @@ +DewfordTown_Gym_MapObjects:: @ 8385FBC + object_event 1, MAP_OBJ_GFX_BRAWLY, 0, 14, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_Gym_EventScript_153152, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 2, 0, 17, 0, 3, 7, 0, 0, 1, 0, 3, 0, DewfordTown_Gym_EventScript_1531D9, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 1, 0, 10, 0, 3, 7, 0, 0, 1, 0, 3, 0, DewfordTown_Gym_EventScript_1531FB, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 12, 0, 24, 0, 3, 7, 0, 0, 1, 0, 2, 0, DewfordTown_Gym_EventScript_15321D, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_MAN_2, 0, 5, 0, 24, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_Gym_EventScript_15323F, 0, 0, 0 + +DewfordTown_Gym_MapWarps:: @ 8386034 + warp_def 5, 27, 0, 2, DewfordTown + warp_def 6, 27, 0, 2, DewfordTown + +DewfordTown_Gym_MapBGEvents:: @ 8386044 + bg_event 7, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15325E + bg_event 10, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15326E + bg_event 4, 24, 0, 1, 0, DewfordTown_Gym_EventScript_15325E + bg_event 7, 24, 0, 1, 0, DewfordTown_Gym_EventScript_15326E + +DewfordTown_Gym_MapEvents:: @ 8386074 + map_events DewfordTown_Gym_MapObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents + diff --git a/data/maps/events/DewfordTown_Hall.s b/data/maps/events/DewfordTown_Hall.s new file mode 100644 index 000000000..1aa3b84fb --- /dev/null +++ b/data/maps/events/DewfordTown_Hall.s @@ -0,0 +1,22 @@ +DewfordTown_Hall_MapObjects:: @ 8386088 + object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 4, 0, 6, 0, 0, 7, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153293, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 1, 0, 5, 0, 0, 10, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532BC, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_1, 0, 5, 0, 4, 0, 0, 9, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532CD, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 3, 0, 0, 7, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15330A, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153326, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 14, 0, 7, 0, 0, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153342, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 12, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533F2, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_PSYCHIC_M, 0, 15, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533FE, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, 940, 0, 0 + +DewfordTown_Hall_MapWarps:: @ 8386160 + warp_def 5, 8, 0, 0, DewfordTown + warp_def 6, 8, 0, 0, DewfordTown + +DewfordTown_Hall_MapBGEvents:: @ 8386170 + bg_event 0, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153353 + bg_event 7, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153363 + +DewfordTown_Hall_MapEvents:: @ 8386188 + map_events DewfordTown_Hall_MapObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents + diff --git a/data/maps/events/DewfordTown_House1.s b/data/maps/events/DewfordTown_House1.s new file mode 100644 index 000000000..2faf40276 --- /dev/null +++ b/data/maps/events/DewfordTown_House1.s @@ -0,0 +1,12 @@ +DewfordTown_House1_MapObjects:: @ 8385E58 + object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 6, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FF8, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_1, 0, 3, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FEF, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_ZIGZAGOON, 0, 4, 0, 2, 0, 3, 8, 19, 0, 0, 0, 0, 0, DewfordTown_House1_EventScript_153001, 0, 0, 0 + +DewfordTown_House1_MapWarps:: @ 8385EA0 + warp_def 3, 7, 0, 3, DewfordTown + warp_def 4, 7, 0, 3, DewfordTown + +DewfordTown_House1_MapEvents:: @ 8385EB0 + map_events DewfordTown_House1_MapObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/DewfordTown_House2.s b/data/maps/events/DewfordTown_House2.s new file mode 100644 index 000000000..ab8d6eab9 --- /dev/null +++ b/data/maps/events/DewfordTown_House2.s @@ -0,0 +1,11 @@ +DewfordTown_House2_MapObjects:: @ 838619C + object_event 1, MAP_OBJ_GFX_MAN_4, 0, 6, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_House2_EventScript_1535DC, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, DewfordTown_House2_EventScript_15361F, 0, 0, 0 + +DewfordTown_House2_MapWarps:: @ 83861CC + warp_def 3, 8, 0, 4, DewfordTown + warp_def 4, 8, 0, 4, DewfordTown + +DewfordTown_House2_MapEvents:: @ 83861DC + map_events DewfordTown_House2_MapObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.s b/data/maps/events/DewfordTown_PokemonCenter_1F.s new file mode 100644 index 000000000..8ff89ab68 --- /dev/null +++ b/data/maps/events/DewfordTown_PokemonCenter_1F.s @@ -0,0 +1,13 @@ +DewfordTown_PokemonCenter_1F_MapObjects:: @ 8385EC4 + object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153023, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153031, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 0, 5, 18, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_15303A, 0, 0, 0 + +DewfordTown_PokemonCenter_1F_MapWarps:: @ 8385F0C + warp_def 7, 8, 3, 1, DewfordTown + warp_def 6, 8, 3, 1, DewfordTown + warp_def 1, 6, 4, 0, DewfordTown_PokemonCenter_2F + +DewfordTown_PokemonCenter_1F_MapEvents:: @ 8385F24 + map_events DewfordTown_PokemonCenter_1F_MapObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.s b/data/maps/events/DewfordTown_PokemonCenter_2F.s new file mode 100644 index 000000000..81dcd1573 --- /dev/null +++ b/data/maps/events/DewfordTown_PokemonCenter_2F.s @@ -0,0 +1,15 @@ +DewfordTown_PokemonCenter_2F_MapObjects:: @ 8385F38 + object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153053, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153059, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_15305F, 0, 0, 0 + +DewfordTown_PokemonCenter_2F_MapWarps:: @ 8385F80 + warp_def 1, 5, 4, 2, DewfordTown_PokemonCenter_1F + warp_def 5, 1, 0, 0, SingleBattleColosseum + warp_def 8, 1, 0, 0, TradeCenter + warp_def 11, 1, 0, 0, RecordCorner + warp_def 0, 0, 0, 0, DoubleBattleColosseum + +DewfordTown_PokemonCenter_2F_MapEvents:: @ 8385FA8 + map_events DewfordTown_PokemonCenter_2F_MapObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/DoubleBattleColosseum.s b/data/maps/events/DoubleBattleColosseum.s new file mode 100644 index 000000000..94e077e78 --- /dev/null +++ b/data/maps/events/DoubleBattleColosseum.s @@ -0,0 +1,15 @@ +DoubleBattleColosseum_MapWarps:: @ 8391428 + warp_def 5, 8, 3, 127, NONE + warp_def 6, 8, 3, 127, NONE + warp_def 7, 8, 3, 127, NONE + warp_def 8, 8, 3, 127, NONE + +DoubleBattleColosseum_MapCoordEvents:: @ 8391448 + coord_event 3, 4, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A4383 + coord_event 3, 6, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A43B9 + coord_event 10, 4, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A439E + coord_event 10, 6, 3, 0, 0x4000, 0, 0, DoubleBattleColosseum_EventScript_1A43D4 + +DoubleBattleColosseum_MapEvents:: @ 8391488 + map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 + diff --git a/data/maps/events/EverGrandeCity.s b/data/maps/events/EverGrandeCity.s new file mode 100644 index 000000000..fd9270eb6 --- /dev/null +++ b/data/maps/events/EverGrandeCity.s @@ -0,0 +1,29 @@ +EverGrandeCity_MapWarps:: @ 83807DC + warp_def 18, 5, 0, 0, EverGrandeCity_PokemonLeague + warp_def 27, 48, 0, 0, EverGrandeCity_PokemonCenter_1F + warp_def 18, 41, 0, 0, VictoryRoad_1F + warp_def 18, 27, 0, 1, VictoryRoad_1F + +EverGrandeCity_MapCoordEvents:: @ 83807FC + coord_event 17, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 16, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 18, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 19, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 20, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 21, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 22, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 23, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 24, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 25, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 26, 58, 1, 0, 0x4001, 0, 0, EverGrandeCity_EventScript_14D500 + +EverGrandeCity_MapBGEvents:: @ 83808AC + bg_event 19, 43, 5, 0, 0, EverGrandeCity_EventScript_14D4E5 + bg_event 29, 48, 0, 1, 0, EverGrandeCity_EventScript_1A00EA + bg_event 18, 52, 5, 0, 0, EverGrandeCity_EventScript_14D4EE + bg_event 23, 15, 0, 0, 0, EverGrandeCity_EventScript_14D4F7 + bg_event 28, 48, 0, 1, 0, EverGrandeCity_EventScript_1A00EA + +EverGrandeCity_MapEvents:: @ 83808E8 + map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents + diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.s b/data/maps/events/EverGrandeCity_ChampionsRoom.s new file mode 100644 index 000000000..4a1d90085 --- /dev/null +++ b/data/maps/events/EverGrandeCity_ChampionsRoom.s @@ -0,0 +1,12 @@ +EverGrandeCity_ChampionsRoom_MapObjects:: @ 838B334 + object_event 1, MAP_OBJ_GFX_STEVEN, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, 240, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 920, 0, 0 + object_event 3, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 921, 0, 0 + +EverGrandeCity_ChampionsRoom_MapWarps:: @ 838B37C + warp_def 6, 12, 3, 1, EverGrandeCity_Corridor4 + warp_def 6, 2, 0, 0, EverGrandeCity_HallOfFame + +EverGrandeCity_ChampionsRoom_MapEvents:: @ 838B38C + map_events EverGrandeCity_ChampionsRoom_MapObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/EverGrandeCity_Corridor1.s b/data/maps/events/EverGrandeCity_Corridor1.s new file mode 100644 index 000000000..d9b3964ca --- /dev/null +++ b/data/maps/events/EverGrandeCity_Corridor1.s @@ -0,0 +1,9 @@ +EverGrandeCity_Corridor1_MapWarps:: @ 838B3A0 + warp_def 5, 12, 3, 1, EverGrandeCity_SidneysRoom + warp_def 5, 2, 0, 0, EverGrandeCity_PhoebesRoom + warp_def 4, 12, 3, 1, EverGrandeCity_SidneysRoom + warp_def 6, 12, 3, 1, EverGrandeCity_SidneysRoom + +EverGrandeCity_Corridor1_MapEvents:: @ 838B3C0 + map_events 0x0, EverGrandeCity_Corridor1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/EverGrandeCity_Corridor2.s b/data/maps/events/EverGrandeCity_Corridor2.s new file mode 100644 index 000000000..acd3875e4 --- /dev/null +++ b/data/maps/events/EverGrandeCity_Corridor2.s @@ -0,0 +1,9 @@ +EverGrandeCity_Corridor2_MapWarps:: @ 838B3D4 + warp_def 5, 12, 3, 1, EverGrandeCity_PhoebesRoom + warp_def 5, 2, 0, 0, EverGrandeCity_GlaciasRoom + warp_def 4, 12, 3, 1, EverGrandeCity_PhoebesRoom + warp_def 6, 12, 3, 1, EverGrandeCity_PhoebesRoom + +EverGrandeCity_Corridor2_MapEvents:: @ 838B3F4 + map_events 0x0, EverGrandeCity_Corridor2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/EverGrandeCity_Corridor3.s b/data/maps/events/EverGrandeCity_Corridor3.s new file mode 100644 index 000000000..53b3357c8 --- /dev/null +++ b/data/maps/events/EverGrandeCity_Corridor3.s @@ -0,0 +1,9 @@ +EverGrandeCity_Corridor3_MapWarps:: @ 838B408 + warp_def 5, 12, 3, 1, EverGrandeCity_GlaciasRoom + warp_def 5, 2, 0, 0, EverGrandeCity_DrakesRoom + warp_def 4, 12, 3, 1, EverGrandeCity_GlaciasRoom + warp_def 6, 12, 3, 1, EverGrandeCity_GlaciasRoom + +EverGrandeCity_Corridor3_MapEvents:: @ 838B428 + map_events 0x0, EverGrandeCity_Corridor3_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/EverGrandeCity_Corridor4.s b/data/maps/events/EverGrandeCity_Corridor4.s new file mode 100644 index 000000000..d53d63404 --- /dev/null +++ b/data/maps/events/EverGrandeCity_Corridor4.s @@ -0,0 +1,7 @@ +EverGrandeCity_Corridor4_MapWarps:: @ 838B43C + warp_def 5, 33, 3, 1, EverGrandeCity_DrakesRoom + warp_def 5, 2, 0, 0, EverGrandeCity_ChampionsRoom + +EverGrandeCity_Corridor4_MapEvents:: @ 838B44C + map_events 0x0, EverGrandeCity_Corridor4_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/EverGrandeCity_Corridor5.s b/data/maps/events/EverGrandeCity_Corridor5.s new file mode 100644 index 000000000..e4fbbbd53 --- /dev/null +++ b/data/maps/events/EverGrandeCity_Corridor5.s @@ -0,0 +1,9 @@ +EverGrandeCity_Corridor5_MapWarps:: @ 838B460 + warp_def 5, 12, 3, 2, EverGrandeCity_PokemonLeague + warp_def 5, 2, 0, 0, EverGrandeCity_SidneysRoom + warp_def 4, 12, 3, 2, EverGrandeCity_PokemonLeague + warp_def 6, 12, 3, 2, EverGrandeCity_PokemonLeague + +EverGrandeCity_Corridor5_MapEvents:: @ 838B480 + map_events 0x0, EverGrandeCity_Corridor5_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.s b/data/maps/events/EverGrandeCity_DrakesRoom.s new file mode 100644 index 000000000..72b4c3170 --- /dev/null +++ b/data/maps/events/EverGrandeCity_DrakesRoom.s @@ -0,0 +1,10 @@ +EverGrandeCity_DrakesRoom_MapObjects:: @ 838B2F8 + object_event 1, MAP_OBJ_GFX_DRAKE, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_15B764, 0, 0, 0 + +EverGrandeCity_DrakesRoom_MapWarps:: @ 838B310 + warp_def 6, 13, 3, 1, EverGrandeCity_Corridor3 + warp_def 6, 2, 0, 0, EverGrandeCity_Corridor4 + +EverGrandeCity_DrakesRoom_MapEvents:: @ 838B320 + map_events EverGrandeCity_DrakesRoom_MapObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.s b/data/maps/events/EverGrandeCity_GlaciasRoom.s new file mode 100644 index 000000000..87ee60dee --- /dev/null +++ b/data/maps/events/EverGrandeCity_GlaciasRoom.s @@ -0,0 +1,10 @@ +EverGrandeCity_GlaciasRoom_MapObjects:: @ 838B2BC + object_event 1, MAP_OBJ_GFX_GLACIA, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_15B6CA, 0, 0, 0 + +EverGrandeCity_GlaciasRoom_MapWarps:: @ 838B2D4 + warp_def 6, 13, 3, 1, EverGrandeCity_Corridor2 + warp_def 6, 2, 0, 0, EverGrandeCity_Corridor3 + +EverGrandeCity_GlaciasRoom_MapEvents:: @ 838B2E4 + map_events EverGrandeCity_GlaciasRoom_MapObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/EverGrandeCity_HallOfFame.s b/data/maps/events/EverGrandeCity_HallOfFame.s new file mode 100644 index 000000000..e610ee5dc --- /dev/null +++ b/data/maps/events/EverGrandeCity_HallOfFame.s @@ -0,0 +1,9 @@ +EverGrandeCity_HallOfFame_MapObjects:: @ 838B528 + object_event 1, MAP_OBJ_GFX_STEVEN, 0, 6, 0, 16, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + +EverGrandeCity_HallOfFame_MapWarps:: @ 838B540 + warp_def 7, 11, 3, 1, EverGrandeCity_ChampionsRoom + +EverGrandeCity_HallOfFame_MapEvents:: @ 838B548 + map_events EverGrandeCity_HallOfFame_MapObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.s b/data/maps/events/EverGrandeCity_PhoebesRoom.s new file mode 100644 index 000000000..1401900f8 --- /dev/null +++ b/data/maps/events/EverGrandeCity_PhoebesRoom.s @@ -0,0 +1,10 @@ +EverGrandeCity_PhoebesRoom_MapObjects:: @ 838B280 + object_event 1, MAP_OBJ_GFX_PHOEBE, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_15B630, 0, 0, 0 + +EverGrandeCity_PhoebesRoom_MapWarps:: @ 838B298 + warp_def 6, 13, 3, 1, EverGrandeCity_Corridor1 + warp_def 6, 2, 0, 0, EverGrandeCity_Corridor2 + +EverGrandeCity_PhoebesRoom_MapEvents:: @ 838B2A8 + map_events EverGrandeCity_PhoebesRoom_MapObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.s b/data/maps/events/EverGrandeCity_PokemonCenter_1F.s new file mode 100644 index 000000000..27497731d --- /dev/null +++ b/data/maps/events/EverGrandeCity_PokemonCenter_1F.s @@ -0,0 +1,13 @@ +EverGrandeCity_PokemonCenter_1F_MapObjects:: @ 838B55C + object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC70, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC7E, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 10, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC87, 0, 0, 0 + +EverGrandeCity_PokemonCenter_1F_MapWarps:: @ 838B5A4 + warp_def 7, 8, 3, 1, EverGrandeCity + warp_def 6, 8, 3, 1, EverGrandeCity + warp_def 1, 6, 4, 0, EverGrandeCity_PokemonCenter_2F + +EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 838B5BC + map_events EverGrandeCity_PokemonCenter_1F_MapObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.s b/data/maps/events/EverGrandeCity_PokemonCenter_2F.s new file mode 100644 index 000000000..7bd153239 --- /dev/null +++ b/data/maps/events/EverGrandeCity_PokemonCenter_2F.s @@ -0,0 +1,15 @@ +EverGrandeCity_PokemonCenter_2F_MapObjects:: @ 838B5D0 + object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA0, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA6, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCAC, 0, 0, 0 + +EverGrandeCity_PokemonCenter_2F_MapWarps:: @ 838B618 + warp_def 1, 5, 4, 2, EverGrandeCity_PokemonCenter_1F + warp_def 5, 1, 0, 0, SingleBattleColosseum + warp_def 8, 1, 0, 0, TradeCenter + warp_def 11, 1, 0, 0, RecordCorner + warp_def 0, 0, 0, 0, DoubleBattleColosseum + +EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 838B640 + map_events EverGrandeCity_PokemonCenter_2F_MapObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/EverGrandeCity_PokemonLeague.s b/data/maps/events/EverGrandeCity_PokemonLeague.s new file mode 100644 index 000000000..3e759a22f --- /dev/null +++ b/data/maps/events/EverGrandeCity_PokemonLeague.s @@ -0,0 +1,15 @@ +EverGrandeCity_PokemonLeague_MapObjects:: @ 838B494 + object_event 1, MAP_OBJ_GFX_NURSE, 0, 3, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BA9A, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 16, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAA8, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_4, 0, 8, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_4, 0, 11, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0, 0, 0 + +EverGrandeCity_PokemonLeague_MapWarps:: @ 838B4F4 + warp_def 9, 11, 3, 0, EverGrandeCity + warp_def 10, 11, 3, 0, EverGrandeCity + warp_def 9, 1, 3, 0, EverGrandeCity_Corridor5 + warp_def 10, 1, 3, 0, EverGrandeCity_Corridor5 + +EverGrandeCity_PokemonLeague_MapEvents:: @ 838B514 + map_events EverGrandeCity_PokemonLeague_MapObjects, EverGrandeCity_PokemonLeague_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.s b/data/maps/events/EverGrandeCity_SidneysRoom.s new file mode 100644 index 000000000..4c73e643d --- /dev/null +++ b/data/maps/events/EverGrandeCity_SidneysRoom.s @@ -0,0 +1,10 @@ +EverGrandeCity_SidneysRoom_MapObjects:: @ 838B244 + object_event 1, MAP_OBJ_GFX_SIDNEY, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_15B596, 0, 0, 0 + +EverGrandeCity_SidneysRoom_MapWarps:: @ 838B25C + warp_def 6, 13, 3, 1, EverGrandeCity_Corridor5 + warp_def 6, 2, 0, 0, EverGrandeCity_Corridor1 + +EverGrandeCity_SidneysRoom_MapEvents:: @ 838B26C + map_events EverGrandeCity_SidneysRoom_MapObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/FallarborTown.s b/data/maps/events/FallarborTown.s new file mode 100644 index 000000000..e98657297 --- /dev/null +++ b/data/maps/events/FallarborTown.s @@ -0,0 +1,26 @@ +FallarborTown_MapObjects:: @ 8380E04 + object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 8, 0, 11, 0, 3, 8, 16, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E814, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 9, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E7F5, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 11, 0, 15, 0, 3, 3, 17, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E81D, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_AZURILL, 0, 8, 0, 12, 0, 3, 1, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E826, 907, 0, 0 + +FallarborTown_MapWarps:: @ 8380E64 + warp_def 15, 15, 0, 0, FallarborTown_Mart + warp_def 8, 7, 0, 0, FallarborTown_ContestLobby + warp_def 14, 7, 0, 0, FallarborTown_PokemonCenter_1F + warp_def 6, 17, 0, 0, FallarborTown_House1 + warp_def 1, 6, 0, 0, FallarborTown_House2 + +FallarborTown_MapBGEvents:: @ 8380E8C + bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1 + bg_event 15, 7, 0, 1, 0, FallarborTown_EventScript_1A00EA + bg_event 6, 8, 0, 0, 0, FallarborTown_EventScript_14E839 + bg_event 16, 7, 0, 1, 0, FallarborTown_EventScript_1A00EA + bg_event 10, 11, 0, 0, 0, FallarborTown_EventScript_14E842 + bg_event 17, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1 + bg_event 3, 7, 0, 0, 0, FallarborTown_EventScript_14E84B + bg_event 2, 15, 3, 7, 0, ITEM_NUGGET, 28, 0 + +FallarborTown_MapEvents:: @ 8380EEC + map_events FallarborTown_MapObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents + diff --git a/data/maps/events/FallarborTown_ContestHall.s b/data/maps/events/FallarborTown_ContestHall.s new file mode 100644 index 000000000..90fe5d71b --- /dev/null +++ b/data/maps/events/FallarborTown_ContestHall.s @@ -0,0 +1,16 @@ +FallarborTown_ContestHall_MapObjects:: @ 83867DC + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 19, 0, 8, 0, 0, 2, 34, 0, 0, 0, 0, 0, FallarborTown_ContestHall_EventScript_153ACF, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 7, 0, 0, 2, 50, 0, 0, 0, 0, 0, FallarborTown_ContestHall_EventScript_153AD8, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 0, 15, 0, 0, 2, 51, 0, 0, 0, 0, 0, FallarborTown_ContestHall_EventScript_153AE1, 0, 0, 0 + +FallarborTown_ContestHall_MapWarps:: @ 8386824 + warp_def 10, 17, 0, 2, FallarborTown_ContestLobby + warp_def 11, 17, 0, 2, FallarborTown_ContestLobby + +FallarborTown_ContestHall_MapBGEvents:: @ 8386834 + bg_event 12, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA + bg_event 8, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA + +FallarborTown_ContestHall_MapEvents:: @ 838684C + map_events FallarborTown_ContestHall_MapObjects, FallarborTown_ContestHall_MapWarps, 0x0, FallarborTown_ContestHall_MapBGEvents + diff --git a/data/maps/events/FallarborTown_ContestLobby.s b/data/maps/events/FallarborTown_ContestLobby.s new file mode 100644 index 000000000..7ae34cad6 --- /dev/null +++ b/data/maps/events/FallarborTown_ContestLobby.s @@ -0,0 +1,22 @@ +FallarborTown_ContestLobby_MapObjects:: @ 83866F0 + object_event 1, MAP_OBJ_GFX_TEALA, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1539CD, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 2, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A8E, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AB2, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B778A, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, 800, 0, 0 + object_event 6, MAP_OBJ_GFX_ARTIST, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A97, 0, 0, 0 + +FallarborTown_ContestLobby_MapWarps:: @ 8386780 + warp_def 5, 6, 0, 1, FallarborTown + warp_def 6, 6, 0, 1, FallarborTown + warp_def 1, 1, 0, 0, FallarborTown_ContestHall + +FallarborTown_ContestLobby_MapBGEvents:: @ 8386798 + bg_event 10, 3, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7823 + bg_event 12, 5, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7604 + bg_event 11, 1, 3, 0, 0, FallarborTown_ContestLobby_EventScript_153ABB + bg_event 13, 1, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AC2 + +FallarborTown_ContestLobby_MapEvents:: @ 83867C8 + map_events FallarborTown_ContestLobby_MapObjects, FallarborTown_ContestLobby_MapWarps, 0x0, FallarborTown_ContestLobby_MapBGEvents + diff --git a/data/maps/events/FallarborTown_House1.s b/data/maps/events/FallarborTown_House1.s new file mode 100644 index 000000000..5ed16a6ea --- /dev/null +++ b/data/maps/events/FallarborTown_House1.s @@ -0,0 +1,11 @@ +FallarborTown_House1_MapObjects:: @ 8386970 + object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153BB5, 928, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153C5E, 0, 0, 0 + +FallarborTown_House1_MapWarps:: @ 83869A0 + warp_def 3, 8, 0, 3, FallarborTown + warp_def 4, 8, 0, 3, FallarborTown + +FallarborTown_House1_MapEvents:: @ 83869B0 + map_events FallarborTown_House1_MapObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/FallarborTown_House2.s b/data/maps/events/FallarborTown_House2.s new file mode 100644 index 000000000..dd5061663 --- /dev/null +++ b/data/maps/events/FallarborTown_House2.s @@ -0,0 +1,10 @@ +FallarborTown_House2_MapObjects:: @ 83869C4 + object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_House2_EventScript_153C91, 0, 0, 0 + +FallarborTown_House2_MapWarps:: @ 83869DC + warp_def 3, 7, 0, 4, FallarborTown + warp_def 4, 7, 0, 4, FallarborTown + +FallarborTown_House2_MapEvents:: @ 83869EC + map_events FallarborTown_House2_MapObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/FallarborTown_Mart.s b/data/maps/events/FallarborTown_Mart.s new file mode 100644 index 000000000..5548e4d43 --- /dev/null +++ b/data/maps/events/FallarborTown_Mart.s @@ -0,0 +1,13 @@ +FallarborTown_Mart_MapObjects:: @ 838666C + object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_153967, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_15399C, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1539A5, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_SKITTY, 0, 2, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1539AE, 0, 0, 0 + +FallarborTown_Mart_MapWarps:: @ 83866CC + warp_def 3, 7, 0, 0, FallarborTown + warp_def 4, 7, 0, 0, FallarborTown + +FallarborTown_Mart_MapEvents:: @ 83866DC + map_events FallarborTown_Mart_MapObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.s b/data/maps/events/FallarborTown_PokemonCenter_1F.s new file mode 100644 index 000000000..2282928ba --- /dev/null +++ b/data/maps/events/FallarborTown_PokemonCenter_1F.s @@ -0,0 +1,14 @@ +FallarborTown_PokemonCenter_1F_MapObjects:: @ 8386860 + object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B02, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B10, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B19, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, 871, 0, 0 + +FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0 + warp_def 7, 8, 3, 2, FallarborTown + warp_def 6, 8, 3, 2, FallarborTown + warp_def 1, 6, 4, 0, FallarborTown_PokemonCenter_2F + +FallarborTown_PokemonCenter_1F_MapEvents:: @ 83868D8 + map_events FallarborTown_PokemonCenter_1F_MapObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.s b/data/maps/events/FallarborTown_PokemonCenter_2F.s new file mode 100644 index 000000000..61d042023 --- /dev/null +++ b/data/maps/events/FallarborTown_PokemonCenter_2F.s @@ -0,0 +1,15 @@ +FallarborTown_PokemonCenter_2F_MapObjects:: @ 83868EC + object_event 1, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA8, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153B9C, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA2, 0, 0, 0 + +FallarborTown_PokemonCenter_2F_MapWarps:: @ 8386934 + warp_def 1, 5, 4, 2, FallarborTown_PokemonCenter_1F + warp_def 5, 1, 3, 0, SingleBattleColosseum + warp_def 8, 1, 3, 0, TradeCenter + warp_def 11, 1, 3, 0, RecordCorner + warp_def 0, 0, 0, 0, DoubleBattleColosseum + +FallarborTown_PokemonCenter_2F_MapEvents:: @ 838695C + map_events FallarborTown_PokemonCenter_2F_MapObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/FieryPath.s b/data/maps/events/FieryPath.s new file mode 100644 index 000000000..c6fc85f61 --- /dev/null +++ b/data/maps/events/FieryPath.s @@ -0,0 +1,17 @@ +FieryPath_MapObjects:: @ 838C718 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17EE, 1091, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, FieryPath_EventScript_1B0FCB, 17, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, FieryPath_EventScript_1B0FCB, 18, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, FieryPath_EventScript_1B0FCB, 19, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, FieryPath_EventScript_1B0FCB, 20, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, FieryPath_EventScript_1B0FCB, 21, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, FieryPath_EventScript_1B0FCB, 22, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, 1111, 0, 0 + +FieryPath_MapWarps:: @ 838C7D8 + warp_def 26, 36, 3, 4, Route112 + warp_def 26, 4, 3, 5, Route112 + +FieryPath_MapEvents:: @ 838C7E8 + map_events FieryPath_MapObjects, FieryPath_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/FortreeCity.s b/data/maps/events/FortreeCity.s new file mode 100644 index 000000000..4e2d1e97b --- /dev/null +++ b/data/maps/events/FortreeCity.s @@ -0,0 +1,31 @@ +FortreeCity_MapObjects:: @ 8380020 + object_event 1, MAP_OBJ_GFX_MAN_2, 0, 31, 0, 3, 0, 4, 1, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C955, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 32, 0, 16, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C97D, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 32, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C95E, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BOY_1, 0, 11, 0, 14, 0, 4, 1, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C98F, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C986, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BOY_5, 0, 9, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C998, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_KECLEON_1, 0, 25, 0, 8, 0, 3, 76, 17, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C9B3, 969, 0, 0 + +FortreeCity_MapWarps:: @ 83800C8 + warp_def 5, 6, 0, 0, FortreeCity_PokemonCenter_1F + warp_def 10, 3, 0, 0, FortreeCity_House1 + warp_def 22, 11, 0, 0, FortreeCity_Gym + warp_def 4, 14, 0, 0, FortreeCity_Mart + warp_def 17, 3, 0, 0, FortreeCity_House2 + warp_def 25, 3, 0, 0, FortreeCity_House3 + warp_def 32, 2, 0, 0, FortreeCity_House4 + warp_def 12, 13, 0, 0, FortreeCity_House5 + warp_def 37, 13, 0, 0, FortreeCity_DecorationShop + +FortreeCity_MapBGEvents:: @ 8380110 + bg_event 6, 9, 0, 0, 0, FortreeCity_EventScript_14C9A1 + bg_event 7, 6, 0, 1, 0, FortreeCity_EventScript_1A00EA + bg_event 5, 14, 0, 1, 0, FortreeCity_EventScript_1A00E1 + bg_event 26, 10, 0, 0, 0, FortreeCity_EventScript_14C9AA + bg_event 6, 6, 0, 1, 0, FortreeCity_EventScript_1A00EA + bg_event 6, 14, 0, 1, 0, FortreeCity_EventScript_1A00E1 + +FortreeCity_MapEvents:: @ 8380158 + map_events FortreeCity_MapObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents + diff --git a/data/maps/events/FortreeCity_DecorationShop.s b/data/maps/events/FortreeCity_DecorationShop.s new file mode 100644 index 000000000..1283fe593 --- /dev/null +++ b/data/maps/events/FortreeCity_DecorationShop.s @@ -0,0 +1,13 @@ +FortreeCity_DecorationShop_MapObjects:: @ 83893E0 + object_event 1, MAP_OBJ_GFX_MAN_3, 0, 6, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158258, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158261, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_15826A, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158298, 0, 0, 0 + +FortreeCity_DecorationShop_MapWarps:: @ 8389440 + warp_def 3, 5, 0, 8, FortreeCity + warp_def 4, 5, 0, 8, FortreeCity + +FortreeCity_DecorationShop_MapEvents:: @ 8389450 + map_events FortreeCity_DecorationShop_MapObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/FortreeCity_Gym.s b/data/maps/events/FortreeCity_Gym.s new file mode 100644 index 000000000..7427a7ab1 --- /dev/null +++ b/data/maps/events/FortreeCity_Gym.s @@ -0,0 +1,19 @@ +FortreeCity_Gym_MapObjects:: @ 8389018 + object_event 1, MAP_OBJ_GFX_WINONA, 0, 4, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157EF0, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_6, 0, 12, 0, 22, 0, 3, 7, 0, 0, 1, 0, 3, 0, FortreeCity_Gym_EventScript_157F62, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_CAMPER, 0, 9, 0, 9, 0, 3, 8, 0, 0, 1, 0, 3, 0, FortreeCity_Gym_EventScript_157F90, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 18, 0, 19, 0, 3, 9, 0, 0, 1, 0, 4, 0, FortreeCity_Gym_EventScript_157FA7, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_MAN_6, 0, 18, 0, 1, 0, 3, 8, 0, 0, 1, 0, 1, 0, FortreeCity_Gym_EventScript_157F79, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_MAN_2, 0, 2, 0, 19, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157FBE, 0, 0, 0 + +FortreeCity_Gym_MapWarps:: @ 83890A8 + warp_def 2, 24, 0, 2, FortreeCity + warp_def 3, 24, 0, 2, FortreeCity + +FortreeCity_Gym_MapBGEvents:: @ 83890B8 + bg_event 1, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FDD + bg_event 4, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FED + +FortreeCity_Gym_MapEvents:: @ 83890D0 + map_events FortreeCity_Gym_MapObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents + diff --git a/data/maps/events/FortreeCity_House1.s b/data/maps/events/FortreeCity_House1.s new file mode 100644 index 000000000..f687cd86a --- /dev/null +++ b/data/maps/events/FortreeCity_House1.s @@ -0,0 +1,12 @@ +FortreeCity_House1_MapObjects:: @ 8388FAC + object_event 1, MAP_OBJ_GFX_WOMAN_1, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_House1_EventScript_157E13, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_ZIGZAGOON, 0, 2, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, FortreeCity_House1_EventScript_157EC0, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, FortreeCity_House1_EventScript_157EB7, 0, 0, 0 + +FortreeCity_House1_MapWarps:: @ 8388FF4 + warp_def 3, 5, 0, 1, FortreeCity + warp_def 4, 5, 0, 1, FortreeCity + +FortreeCity_House1_MapEvents:: @ 8389004 + map_events FortreeCity_House1_MapObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/FortreeCity_House2.s b/data/maps/events/FortreeCity_House2.s new file mode 100644 index 000000000..9e9fea410 --- /dev/null +++ b/data/maps/events/FortreeCity_House2.s @@ -0,0 +1,10 @@ +FortreeCity_House2_MapObjects:: @ 8389278 + object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 2, 0, 3, 0, 3, 5, 1, 0, 0, 0, 0, 0, FortreeCity_House2_EventScript_1580B4, 0, 0, 0 + +FortreeCity_House2_MapWarps:: @ 8389290 + warp_def 3, 5, 0, 4, FortreeCity + warp_def 4, 5, 0, 4, FortreeCity + +FortreeCity_House2_MapEvents:: @ 83892A0 + map_events FortreeCity_House2_MapObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/FortreeCity_House3.s b/data/maps/events/FortreeCity_House3.s new file mode 100644 index 000000000..c4970c754 --- /dev/null +++ b/data/maps/events/FortreeCity_House3.s @@ -0,0 +1,11 @@ +FortreeCity_House3_MapObjects:: @ 83892B4 + object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_House3_EventScript_15816C, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_House3_EventScript_158175, 0, 0, 0 + +FortreeCity_House3_MapWarps:: @ 83892E4 + warp_def 3, 5, 0, 5, FortreeCity + warp_def 4, 5, 0, 5, FortreeCity + +FortreeCity_House3_MapEvents:: @ 83892F4 + map_events FortreeCity_House3_MapObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/FortreeCity_House4.s b/data/maps/events/FortreeCity_House4.s new file mode 100644 index 000000000..c4ac000bd --- /dev/null +++ b/data/maps/events/FortreeCity_House4.s @@ -0,0 +1,12 @@ +FortreeCity_House4_MapObjects:: @ 8389308 + object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15817F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BOY_3, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_158188, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WINGULL, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, 933, 0, 0 + +FortreeCity_House4_MapWarps:: @ 8389350 + warp_def 3, 5, 0, 6, FortreeCity + warp_def 4, 5, 0, 6, FortreeCity + +FortreeCity_House4_MapEvents:: @ 8389360 + map_events FortreeCity_House4_MapObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/FortreeCity_House5.s b/data/maps/events/FortreeCity_House5.s new file mode 100644 index 000000000..eba77eada --- /dev/null +++ b/data/maps/events/FortreeCity_House5.s @@ -0,0 +1,12 @@ +FortreeCity_House5_MapObjects:: @ 8389374 + object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 6, 0, 4, 0, 3, 20, 0, 0, 0, 0, 0, 0, FortreeCity_House5_EventScript_158232, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_ZIGZAGOON, 0, 6, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House5_EventScript_158244, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_1, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_House5_EventScript_15823B, 0, 0, 0 + +FortreeCity_House5_MapWarps:: @ 83893BC + warp_def 3, 5, 0, 7, FortreeCity + warp_def 4, 5, 0, 7, FortreeCity + +FortreeCity_House5_MapEvents:: @ 83893CC + map_events FortreeCity_House5_MapObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/FortreeCity_Mart.s b/data/maps/events/FortreeCity_Mart.s new file mode 100644 index 000000000..0e88f0598 --- /dev/null +++ b/data/maps/events/FortreeCity_Mart.s @@ -0,0 +1,13 @@ +FortreeCity_Mart_MapObjects:: @ 83891F4 + object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158067, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 9, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158098, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 8, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_1580A1, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, FortreeCity_Mart_EventScript_1580AA, 0, 0, 0 + +FortreeCity_Mart_MapWarps:: @ 8389254 + warp_def 3, 7, 0, 3, FortreeCity + warp_def 4, 7, 0, 3, FortreeCity + +FortreeCity_Mart_MapEvents:: @ 8389264 + map_events FortreeCity_Mart_MapObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.s b/data/maps/events/FortreeCity_PokemonCenter_1F.s new file mode 100644 index 000000000..dd81d8351 --- /dev/null +++ b/data/maps/events/FortreeCity_PokemonCenter_1F.s @@ -0,0 +1,14 @@ +FortreeCity_PokemonCenter_1F_MapObjects:: @ 83890E4 + object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15801B, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158029, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_4, 0, 8, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158032, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BOY_3, 0, 2, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15803B, 0, 0, 0 + +FortreeCity_PokemonCenter_1F_MapWarps:: @ 8389144 + warp_def 7, 8, 3, 0, FortreeCity + warp_def 6, 8, 3, 0, FortreeCity + warp_def 1, 6, 4, 0, FortreeCity_PokemonCenter_2F + +FortreeCity_PokemonCenter_1F_MapEvents:: @ 838915C + map_events FortreeCity_PokemonCenter_1F_MapObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.s b/data/maps/events/FortreeCity_PokemonCenter_2F.s new file mode 100644 index 000000000..c23083513 --- /dev/null +++ b/data/maps/events/FortreeCity_PokemonCenter_2F.s @@ -0,0 +1,15 @@ +FortreeCity_PokemonCenter_2F_MapObjects:: @ 8389170 + object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158054, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_15805A, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158060, 0, 0, 0 + +FortreeCity_PokemonCenter_2F_MapWarps:: @ 83891B8 + warp_def 1, 5, 4, 2, FortreeCity_PokemonCenter_1F + warp_def 5, 1, 0, 0, SingleBattleColosseum + warp_def 8, 1, 0, 0, TradeCenter + warp_def 11, 1, 0, 0, RecordCorner + warp_def 0, 0, 0, 0, DoubleBattleColosseum + +FortreeCity_PokemonCenter_2F_MapEvents:: @ 83891E0 + map_events FortreeCity_PokemonCenter_2F_MapObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/GraniteCave_1F.s b/data/maps/events/GraniteCave_1F.s new file mode 100644 index 000000000..8ed16ccd8 --- /dev/null +++ b/data/maps/events/GraniteCave_1F.s @@ -0,0 +1,13 @@ +GraniteCave_1F_MapObjects:: @ 838BF24 + object_event 1, MAP_OBJ_GFX_HIKER, 0, 36, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_15CBA7, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, 1050, 0, 0 + +GraniteCave_1F_MapWarps:: @ 838BF54 + warp_def 37, 12, 3, 0, Route106 + warp_def 35, 3, 3, 0, GraniteCave_B1F + warp_def 17, 11, 3, 1, GraniteCave_B1F + warp_def 5, 10, 3, 0, GraniteCave_StevensRoom + +GraniteCave_1F_MapEvents:: @ 838BF74 + map_events GraniteCave_1F_MapObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/GraniteCave_B1F.s b/data/maps/events/GraniteCave_B1F.s new file mode 100644 index 000000000..2c2b4c2a2 --- /dev/null +++ b/data/maps/events/GraniteCave_B1F.s @@ -0,0 +1,15 @@ +GraniteCave_B1F_MapObjects:: @ 838BF88 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 15, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, 1051, 0, 0 + +GraniteCave_B1F_MapWarps:: @ 838BFA0 + warp_def 25, 13, 3, 1, GraniteCave_1F + warp_def 4, 21, 3, 2, GraniteCave_1F + warp_def 29, 13, 3, 0, GraniteCave_B2F + warp_def 28, 21, 3, 1, GraniteCave_B2F + warp_def 8, 5, 3, 2, GraniteCave_B2F + warp_def 12, 3, 3, 3, GraniteCave_B2F + warp_def 29, 2, 3, 4, GraniteCave_B2F + +GraniteCave_B1F_MapEvents:: @ 838BFD8 + map_events GraniteCave_B1F_MapObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/GraniteCave_B2F.s b/data/maps/events/GraniteCave_B2F.s new file mode 100644 index 000000000..9d781e583 --- /dev/null +++ b/data/maps/events/GraniteCave_B2F.s @@ -0,0 +1,25 @@ +GraniteCave_B2F_MapObjects:: @ 838BFEC + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, 1053, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, 1054, 0, 0 + object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B0EB7, 17, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B0EB7, 18, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B0EB7, 19, 0, 0 + object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B0EB7, 20, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B0EB7, 21, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B0EB7, 22, 0, 0 + object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B0EB7, 23, 0, 0 + +GraniteCave_B2F_MapWarps:: @ 838C0C4 + warp_def 29, 13, 3, 2, GraniteCave_B1F + warp_def 28, 21, 3, 3, GraniteCave_B1F + warp_def 8, 5, 3, 4, GraniteCave_B1F + warp_def 12, 3, 3, 5, GraniteCave_B1F + warp_def 29, 2, 3, 6, GraniteCave_B1F + +GraniteCave_B2F_MapBGEvents:: @ 838C0EC + bg_event 28, 6, 3, 7, 0, ITEM_EVERSTONE, 48, 0 + bg_event 15, 11, 3, 7, 0, ITEM_EVERSTONE, 49, 0 + +GraniteCave_B2F_MapEvents:: @ 838C104 + map_events GraniteCave_B2F_MapObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents + diff --git a/data/maps/events/GraniteCave_StevensRoom.s b/data/maps/events/GraniteCave_StevensRoom.s new file mode 100644 index 000000000..812b0fc27 --- /dev/null +++ b/data/maps/events/GraniteCave_StevensRoom.s @@ -0,0 +1,9 @@ +GraniteCave_StevensRoom_MapObjects:: @ 838C118 + object_event 1, MAP_OBJ_GFX_STEVEN, 0, 7, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, 833, 0, 0 + +GraniteCave_StevensRoom_MapWarps:: @ 838C130 + warp_def 7, 3, 3, 3, GraniteCave_1F + +GraniteCave_StevensRoom_MapEvents:: @ 838C138 + map_events GraniteCave_StevensRoom_MapObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/InsideOfTruck.s b/data/maps/events/InsideOfTruck.s new file mode 100644 index 000000000..f0531d1dc --- /dev/null +++ b/data/maps/events/InsideOfTruck.s @@ -0,0 +1,25 @@ +InsideOfTruck_MapObjects:: @ 8391618 + object_event 1, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 0, 3, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MOVING_BOX, 0, 2, 0, 3, 0, 8, 8, 0, 0, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0, 0, 0 + +InsideOfTruck_MapWarps:: @ 8391660 + warp_def 4, 1, 0, 127, NONE + warp_def 4, 2, 0, 127, NONE + warp_def 4, 3, 0, 127, NONE + +InsideOfTruck_MapCoordEvents:: @ 8391678 + coord_event 3, 1, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 2, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 3, 3, 0, 0x4092, 0, 0, InsideOfTruck_EventScript_15FC29 + +InsideOfTruck_MapBGEvents:: @ 83916A8 + bg_event 1, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B + bg_event 3, 4, 0, 0, 0, InsideOfTruck_EventScript_15FC8B + bg_event 2, 3, 0, 0, 0, InsideOfTruck_EventScript_15FC8B + bg_event 0, 1, 0, 0, 0, InsideOfTruck_EventScript_15FC8B + bg_event 0, 2, 0, 0, 0, InsideOfTruck_EventScript_15FC8B + +InsideOfTruck_MapEvents:: @ 83916E4 + map_events InsideOfTruck_MapObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents + diff --git a/data/maps/events/IslandCave.s b/data/maps/events/IslandCave.s new file mode 100644 index 000000000..72f7b9266 --- /dev/null +++ b/data/maps/events/IslandCave.s @@ -0,0 +1,16 @@ +IslandCave_MapObjects:: @ 838E674 + object_event 1, MAP_OBJ_GFX_REGICE, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, 936, 0, 0 + +IslandCave_MapWarps:: @ 838E68C + warp_def 8, 29, 3, 0, Route105 + warp_def 8, 20, 0, 2, IslandCave + warp_def 8, 11, 3, 1, IslandCave + +IslandCave_MapBGEvents:: @ 838E6A4 + bg_event 8, 20, 0, 0, 0, IslandCave_EventScript_15EF59 + bg_event 7, 20, 0, 0, 0, IslandCave_EventScript_15EF7C + bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_15EF7C + +IslandCave_MapEvents:: @ 838E6C8 + map_events IslandCave_MapObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents + diff --git a/data/maps/events/JaggedPass.s b/data/maps/events/JaggedPass.s new file mode 100644 index 000000000..8267f504d --- /dev/null +++ b/data/maps/events/JaggedPass.s @@ -0,0 +1,26 @@ +JaggedPass_MapObjects:: @ 838C61C + object_event 1, MAP_OBJ_GFX_HIKER, 0, 8, 0, 18, 0, 3, 8, 0, 0, 1, 0, 3, 0, JaggedPass_EventScript_15D285, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_CAMPER, 0, 16, 0, 22, 0, 3, 14, 0, 0, 1, 0, 2, 0, JaggedPass_EventScript_15D2DA, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, JaggedPass_EventScript_1B17D4, 1070, 0, 0 + object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 13, 0, 35, 0, 3, 15, 17, 0, 1, 0, 3, 0, JaggedPass_EventScript_15D29C, 0, 0, 0 + +JaggedPass_MapWarps:: @ 838C67C + warp_def 14, 40, 3, 2, Route112 + warp_def 15, 40, 3, 3, Route112 + warp_def 13, 5, 3, 2, MtChimney + warp_def 14, 5, 3, 3, MtChimney + +JaggedPass_MapCoordEvents:: @ 838C69C + coord_event 13, 15, 3, 0, 2, 0, 0, 0x0 + coord_event 21, 12, 3, 0, 8, 0, 0, 0x0 + coord_event 14, 15, 3, 0, 2, 0, 0, 0x0 + coord_event 18, 17, 3, 0, 2, 0, 0, 0x0 + coord_event 22, 19, 3, 0, 2, 0, 0, 0x0 + +JaggedPass_MapBGEvents:: @ 838C6EC + bg_event 8, 10, 3, 7, 0, ITEM_FULL_HEAL, 77, 0 + bg_event 7, 29, 3, 7, 0, ITEM_GREAT_BALL, 76, 0 + +JaggedPass_MapEvents:: @ 838C704 + map_events JaggedPass_MapObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents + diff --git a/data/maps/events/LavaridgeTown.s b/data/maps/events/LavaridgeTown.s new file mode 100644 index 000000000..dc9c8c05f --- /dev/null +++ b/data/maps/events/LavaridgeTown.s @@ -0,0 +1,35 @@ +LavaridgeTown_MapObjects:: @ 8380C78 + object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E751, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E724, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E72D, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 0, 13, 0, 3, 3, 32, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E736, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 0, 4, 0, 3, 18, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E73F, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 0, 4, 0, 3, 17, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E748, 0, 0, 0 + object_event 7, 243, 0, 6, 0, 16, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 930, 0, 0 + object_event 8, 240, 0, 12, 0, 15, 0, 0, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, 929, 0, 0 + object_event 9, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 4, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E75A, 0, 0, 0 + +LavaridgeTown_MapWarps:: @ 8380D50 + warp_def 12, 15, 0, 0, LavaridgeTown_HerbShop + warp_def 5, 15, 0, 0, LavaridgeTown_Gym_1F + warp_def 15, 5, 0, 0, LavaridgeTown_Mart + warp_def 9, 6, 0, 0, LavaridgeTown_PokemonCenter_1F + warp_def 16, 15, 0, 0, LavaridgeTown_House + warp_def 9, 2, 3, 3, LavaridgeTown_PokemonCenter_1F + +LavaridgeTown_MapCoordEvents:: @ 8380D80 + coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_14E710 + +LavaridgeTown_MapBGEvents:: @ 8380D90 + bg_event 14, 16, 0, 0, 0, LavaridgeTown_EventScript_14E7D7 + bg_event 7, 15, 0, 0, 0, LavaridgeTown_EventScript_14E7C5 + bg_event 17, 5, 0, 1, 0, LavaridgeTown_EventScript_1A00E1 + bg_event 13, 8, 0, 0, 0, LavaridgeTown_EventScript_14E7BC + bg_event 10, 6, 0, 1, 0, LavaridgeTown_EventScript_1A00EA + bg_event 16, 5, 0, 1, 0, LavaridgeTown_EventScript_1A00E1 + bg_event 11, 6, 0, 1, 0, LavaridgeTown_EventScript_1A00EA + bg_event 4, 5, 3, 7, 0, ITEM_ICE_HEAL, 0, 0 + +LavaridgeTown_MapEvents:: @ 8380DF0 + map_events LavaridgeTown_MapObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents + diff --git a/data/maps/events/LavaridgeTown_Gym_1F.s b/data/maps/events/LavaridgeTown_Gym_1F.s new file mode 100644 index 000000000..2c28aaf2b --- /dev/null +++ b/data/maps/events/LavaridgeTown_Gym_1F.s @@ -0,0 +1,40 @@ +LavaridgeTown_Gym_1F_MapObjects:: @ 838625C + object_event 1, MAP_OBJ_GFX_FLANNERY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153741, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_6, 0, 10, 0, 19, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1537CB, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 17, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_15383E, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_6, 0, 4, 0, 12, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1537ED, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 2, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153823, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_MAN_2, 0, 6, 0, 23, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153859, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_MAN_6, 0, 6, 0, 2, 0, 3, 8, 0, 0, 3, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153808, 0, 0, 0 + +LavaridgeTown_Gym_1F_MapWarps:: @ 8386304 + warp_def 8, 23, 3, 1, LavaridgeTown + warp_def 9, 23, 3, 1, LavaridgeTown + warp_def 3, 21, 3, 0, LavaridgeTown_Gym_B1F + warp_def 1, 14, 3, 2, LavaridgeTown_Gym_B1F + warp_def 6, 14, 3, 4, LavaridgeTown_Gym_B1F + warp_def 1, 6, 3, 3, LavaridgeTown_Gym_B1F + warp_def 9, 2, 3, 1, LavaridgeTown_Gym_B1F + warp_def 6, 20, 3, 5, LavaridgeTown_Gym_B1F + warp_def 0, 23, 3, 6, LavaridgeTown_Gym_B1F + warp_def 0, 17, 3, 7, LavaridgeTown_Gym_B1F + warp_def 4, 17, 3, 8, LavaridgeTown_Gym_B1F + warp_def 0, 11, 3, 9, LavaridgeTown_Gym_B1F + warp_def 4, 12, 3, 10, LavaridgeTown_Gym_B1F + warp_def 4, 9, 3, 11, LavaridgeTown_Gym_B1F + warp_def 0, 2, 3, 12, LavaridgeTown_Gym_B1F + warp_def 4, 6, 3, 13, LavaridgeTown_Gym_B1F + warp_def 4, 2, 3, 14, LavaridgeTown_Gym_B1F + warp_def 10, 19, 3, 15, LavaridgeTown_Gym_B1F + warp_def 10, 14, 3, 16, LavaridgeTown_Gym_B1F + warp_def 6, 6, 3, 17, LavaridgeTown_Gym_B1F + warp_def 6, 2, 3, 18, LavaridgeTown_Gym_B1F + warp_def 10, 6, 3, 19, LavaridgeTown_Gym_B1F + +LavaridgeTown_Gym_1F_MapBGEvents:: @ 83863B4 + bg_event 6, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153878 + bg_event 10, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153888 + +LavaridgeTown_Gym_1F_MapEvents:: @ 83863CC + map_events LavaridgeTown_Gym_1F_MapObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents + diff --git a/data/maps/events/LavaridgeTown_Gym_B1F.s b/data/maps/events/LavaridgeTown_Gym_B1F.s new file mode 100644 index 000000000..e3147dcb8 --- /dev/null +++ b/data/maps/events/LavaridgeTown_Gym_B1F.s @@ -0,0 +1,25 @@ +LavaridgeTown_Gym_B1F_MapWarps:: @ 83863E0 + warp_def 3, 21, 3, 2, LavaridgeTown_Gym_1F + warp_def 9, 2, 3, 6, LavaridgeTown_Gym_1F + warp_def 1, 14, 3, 3, LavaridgeTown_Gym_1F + warp_def 1, 6, 3, 5, LavaridgeTown_Gym_1F + warp_def 6, 14, 3, 4, LavaridgeTown_Gym_1F + warp_def 6, 20, 3, 7, LavaridgeTown_Gym_1F + warp_def 0, 23, 3, 8, LavaridgeTown_Gym_1F + warp_def 0, 17, 3, 9, LavaridgeTown_Gym_1F + warp_def 4, 17, 3, 10, LavaridgeTown_Gym_1F + warp_def 0, 11, 3, 11, LavaridgeTown_Gym_1F + warp_def 4, 12, 3, 12, LavaridgeTown_Gym_1F + warp_def 4, 9, 3, 13, LavaridgeTown_Gym_1F + warp_def 0, 2, 3, 14, LavaridgeTown_Gym_1F + warp_def 4, 6, 3, 15, LavaridgeTown_Gym_1F + warp_def 4, 2, 3, 16, LavaridgeTown_Gym_1F + warp_def 10, 18, 3, 17, LavaridgeTown_Gym_1F + warp_def 10, 14, 3, 18, LavaridgeTown_Gym_1F + warp_def 6, 6, 3, 19, LavaridgeTown_Gym_1F + warp_def 6, 2, 3, 20, LavaridgeTown_Gym_1F + warp_def 10, 6, 3, 21, LavaridgeTown_Gym_1F + +LavaridgeTown_Gym_B1F_MapEvents:: @ 8386480 + map_events 0x0, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LavaridgeTown_HerbShop.s b/data/maps/events/LavaridgeTown_HerbShop.s new file mode 100644 index 000000000..b78ff8835 --- /dev/null +++ b/data/maps/events/LavaridgeTown_HerbShop.s @@ -0,0 +1,12 @@ +LavaridgeTown_HerbShop_MapObjects:: @ 83861F0 + object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 3, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_153629, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_2, 0, 7, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_153655, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 3, 0, 3, 5, 17, 0, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_15364C, 0, 0, 0 + +LavaridgeTown_HerbShop_MapWarps:: @ 8386238 + warp_def 3, 7, 0, 0, LavaridgeTown + warp_def 4, 7, 0, 0, LavaridgeTown + +LavaridgeTown_HerbShop_MapEvents:: @ 8386248 + map_events LavaridgeTown_HerbShop_MapObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LavaridgeTown_House.s b/data/maps/events/LavaridgeTown_House.s new file mode 100644 index 000000000..ca600d8d7 --- /dev/null +++ b/data/maps/events/LavaridgeTown_House.s @@ -0,0 +1,11 @@ +LavaridgeTown_House_MapObjects:: @ 8386494 + object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 2, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavaridgeTown_House_EventScript_1538AE, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_ZIGZAGOON, 0, 6, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, LavaridgeTown_House_EventScript_1538B7, 0, 0, 0 + +LavaridgeTown_House_MapWarps:: @ 83864C4 + warp_def 3, 7, 0, 4, LavaridgeTown + warp_def 4, 7, 0, 4, LavaridgeTown + +LavaridgeTown_House_MapEvents:: @ 83864D4 + map_events LavaridgeTown_House_MapObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LavaridgeTown_Mart.s b/data/maps/events/LavaridgeTown_Mart.s new file mode 100644 index 000000000..cb5c05af5 --- /dev/null +++ b/data/maps/events/LavaridgeTown_Mart.s @@ -0,0 +1,12 @@ +LavaridgeTown_Mart_MapObjects:: @ 83864E8 + object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538CB, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538FA, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 9, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_153903, 0, 0, 0 + +LavaridgeTown_Mart_MapWarps:: @ 8386530 + warp_def 3, 7, 0, 2, LavaridgeTown + warp_def 4, 7, 0, 2, LavaridgeTown + +LavaridgeTown_Mart_MapEvents:: @ 8386540 + map_events LavaridgeTown_Mart_MapObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.s b/data/maps/events/LavaridgeTown_PokemonCenter_1F.s new file mode 100644 index 000000000..28cac417b --- /dev/null +++ b/data/maps/events/LavaridgeTown_PokemonCenter_1F.s @@ -0,0 +1,15 @@ +LavaridgeTown_PokemonCenter_1F_MapObjects:: @ 8386554 + object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15391B, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 11, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153929, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 10, 0, 6, 0, 0, 9, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153932, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15393B, 0, 0, 0 + +LavaridgeTown_PokemonCenter_1F_MapWarps:: @ 83865B4 + warp_def 7, 8, 3, 3, LavaridgeTown + warp_def 6, 8, 3, 3, LavaridgeTown + warp_def 1, 6, 4, 0, LavaridgeTown_PokemonCenter_2F + warp_def 2, 1, 0, 5, LavaridgeTown + +LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 83865D4 + map_events LavaridgeTown_PokemonCenter_1F_MapObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.s b/data/maps/events/LavaridgeTown_PokemonCenter_2F.s new file mode 100644 index 000000000..b657b8759 --- /dev/null +++ b/data/maps/events/LavaridgeTown_PokemonCenter_2F.s @@ -0,0 +1,15 @@ +LavaridgeTown_PokemonCenter_2F_MapObjects:: @ 83865E8 + object_event 1, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153960, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153954, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_15395A, 0, 0, 0 + +LavaridgeTown_PokemonCenter_2F_MapWarps:: @ 8386630 + warp_def 1, 5, 4, 2, LavaridgeTown_PokemonCenter_1F + warp_def 5, 1, 0, 0, SingleBattleColosseum + warp_def 8, 1, 0, 0, TradeCenter + warp_def 11, 1, 0, 0, RecordCorner + warp_def 0, 0, 0, 0, DoubleBattleColosseum + +LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 8386658 + map_events LavaridgeTown_PokemonCenter_2F_MapObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LilycoveCity.s b/data/maps/events/LilycoveCity.s new file mode 100644 index 000000000..2a1034f44 --- /dev/null +++ b/data/maps/events/LilycoveCity.s @@ -0,0 +1,54 @@ +LilycoveCity_MapObjects:: @ 838016C + object_event 1, MAP_OBJ_GFX_SAILOR, 0, 32, 0, 20, 0, 3, 3, 16, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CBEF, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 15, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CBC7, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_1, 0, 28, 0, 28, 0, 3, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CBBE, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BOY_4, 0, 21, 0, 15, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CBE6, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_MAN_2, 0, 16, 0, 9, 0, 5, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC2D, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 35, 0, 27, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC0E, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 35, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC36, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 34, 0, 37, 0, 5, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC3F, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 57, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CC48, 0, 0, 0 + object_event 10, 241, 0, 73, 0, 15, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, 852, 0, 0 + object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 61, 0, 36, 0, 5, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, 1042, 0, 0 + object_event 12, 241, 0, 43, 0, 18, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD3D, 852, 0, 0 + object_event 13, 241, 0, 46, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, 852, 0, 0 + object_event 14, 241, 0, 45, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, 852, 0, 0 + object_event 15, 241, 0, 38, 0, 9, 0, 5, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, 852, 0, 0 + object_event 16, MAP_OBJ_GFX_GENTLEMAN, 0, 50, 0, 7, 0, 5, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CB74, 0, 0, 0 + object_event 17, 240, 0, 27, 0, 7, 0, 5, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD46, 971, 0, 0 + +LilycoveCity_MapWarps:: @ 8380304 + warp_def 27, 6, 0, 0, LilycoveCity_DepartmentStore_1F + warp_def 37, 24, 0, 0, LilycoveCity_CoveLilyMotel_1F + warp_def 24, 14, 0, 0, LilycoveCity_PokemonCenter_1F + warp_def 11, 5, 0, 0, LilycoveCity_LilycoveMuseum_1F + warp_def 23, 24, 0, 0, LilycoveCity_ContestLobby + warp_def 39, 14, 0, 1, LilycoveCity_PokemonTrainerFanClub + warp_def 70, 5, 1, 0, AquaHideout_1F + warp_def 36, 6, 0, 0, LilycoveCity_MoveDeletersHouse + warp_def 42, 6, 0, 0, LilycoveCity_House1 + warp_def 55, 15, 0, 0, LilycoveCity_House2 + warp_def 11, 22, 0, 0, LilycoveCity_House3 + warp_def 12, 14, 0, 0, LilycoveCity_House4 + warp_def 12, 32, 0, 0, LilycoveCity_Harbor + warp_def 12, 5, 0, 1, LilycoveCity_LilycoveMuseum_1F + warp_def 71, 5, 1, 0, MagmaHideout_1F + +LilycoveCity_MapBGEvents:: @ 838037C + bg_event 19, 7, 0, 0, 0, LilycoveCity_EventScript_14CC82 + bg_event 25, 14, 0, 1, 0, LilycoveCity_EventScript_1A00EA + bg_event 29, 7, 0, 0, 0, LilycoveCity_EventScript_14CCD3 + bg_event 26, 14, 0, 1, 0, LilycoveCity_EventScript_1A00EA + bg_event 6, 15, 0, 0, 0, LilycoveCity_EventScript_14CC67 + bg_event 29, 24, 0, 0, 0, LilycoveCity_EventScript_14CC70 + bg_event 35, 24, 0, 0, 0, LilycoveCity_EventScript_14CC79 + bg_event 6, 30, 3, 0, 0, LilycoveCity_EventScript_14CCAC + bg_event 36, 14, 0, 0, 0, LilycoveCity_EventScript_14CCCA + bg_event 34, 6, 0, 0, 0, LilycoveCity_EventScript_14CCDC + bg_event 36, 31, 3, 7, 0, ITEM_HEART_SCALE, 27, 0 + bg_event 61, 7, 0, 7, 0, ITEM_PP_UP, 43, 0 + bg_event 64, 31, 0, 7, 0, ITEM_POKE_BALL, 75, 0 + +LilycoveCity_MapEvents:: @ 8380418 + map_events LilycoveCity_MapObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents + diff --git a/data/maps/events/LilycoveCity_ContestHall.s b/data/maps/events/LilycoveCity_ContestHall.s new file mode 100644 index 000000000..e99ba1f1a --- /dev/null +++ b/data/maps/events/LilycoveCity_ContestHall.s @@ -0,0 +1,51 @@ +LilycoveCity_ContestHall_MapObjects:: @ 8389A18 + object_event 1, MAP_OBJ_GFX_BOY_1, 0, 30, 0, 30, 0, 3, 2, 68, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15909B, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BOY_3, 0, 11, 0, 7, 0, 3, 2, 51, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590A4, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 40, 0, 8, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590AD, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 12, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590BF, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 15, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590D4, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 10, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590E9, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590FE, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_MANIAC, 0, 14, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159113, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_WOMAN_6, 0, 16, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159128, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 8, 0, 24, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15913D, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 18, 0, 24, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159170, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_BOY_1, 0, 8, 0, 22, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159146, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_WOMAN_4, 0, 24, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159185, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 27, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15919A, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_WOMAN_5, 0, 22, 0, 13, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591AF, 0, 0, 0 + object_event 16, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 0, 13, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591C4, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_PSYCHIC_M, 0, 26, 0, 13, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591D9, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_WOMAN_2, 0, 28, 0, 13, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591EE, 0, 0, 0 + object_event 19, MAP_OBJ_GFX_WOMAN_3, 0, 20, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159203, 0, 0, 0 + object_event 20, MAP_OBJ_GFX_WOMAN_1, 0, 30, 0, 11, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15922D, 0, 0, 0 + object_event 21, MAP_OBJ_GFX_MAN_1, 0, 26, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159218, 0, 0, 0 + object_event 22, MAP_OBJ_GFX_CAMPER, 0, 13, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15915B, 0, 0, 0 + object_event 23, MAP_OBJ_GFX_WOMAN_4, 0, 36, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159242, 0, 0, 0 + object_event 24, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 39, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159257, 0, 0, 0 + object_event 25, MAP_OBJ_GFX_BOY_2, 0, 34, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15926C, 0, 0, 0 + object_event 26, MAP_OBJ_GFX_GIRL_2, 0, 36, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159281, 0, 0, 0 + object_event 27, MAP_OBJ_GFX_BOY_3, 0, 38, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159296, 0, 0, 0 + object_event 28, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 40, 0, 25, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592AB, 0, 0, 0 + object_event 29, MAP_OBJ_GFX_WOMAN_3, 0, 32, 0, 23, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592C0, 0, 0, 0 + object_event 30, MAP_OBJ_GFX_MAN_1, 0, 37, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592F7, 0, 0, 0 + object_event 31, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 0, 24, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592E2, 0, 0, 0 + object_event 32, MAP_OBJ_GFX_SAILOR, 0, 23, 0, 26, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590B6, 0, 0, 0 + +LilycoveCity_ContestHall_MapWarps:: @ 8389D18 + warp_def 19, 32, 0, 2, LilycoveCity_ContestLobby + warp_def 30, 32, 0, 3, LilycoveCity_ContestLobby + warp_def 20, 32, 0, 2, LilycoveCity_ContestLobby + warp_def 31, 32, 0, 3, LilycoveCity_ContestLobby + +LilycoveCity_ContestHall_MapBGEvents:: @ 8389D38 + bg_event 27, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C + bg_event 39, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159315 + bg_event 11, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15931E + bg_event 15, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15931E + bg_event 23, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C + bg_event 35, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159315 + +LilycoveCity_ContestHall_MapEvents:: @ 8389D80 + map_events LilycoveCity_ContestHall_MapObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents + diff --git a/data/maps/events/LilycoveCity_ContestLobby.s b/data/maps/events/LilycoveCity_ContestLobby.s new file mode 100644 index 000000000..480cabfce --- /dev/null +++ b/data/maps/events/LilycoveCity_ContestLobby.s @@ -0,0 +1,33 @@ +LilycoveCity_ContestLobby_MapObjects:: @ 838984C + object_event 1, MAP_OBJ_GFX_TEALA, 0, 6, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_158EB0, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_158B85, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 17, 0, 9, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B77AB, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_ARTIST, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 774, 0, 0 + object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15901E, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 3, 0, 10, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159027, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_ARTIST, 0, 20, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159042, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_REPORTER_M, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, 802, 0, 0 + object_event 9, MAP_OBJ_GFX_BOY_1, 0, 18, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15907B, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_GIRL_1, 0, 19, 0, 9, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159084, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_ARTIST, 0, 13, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 895, 0, 0 + object_event 12, MAP_OBJ_GFX_FISHERMAN, 0, 13, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159054, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15904B, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 7, 0, 3, 3, 16, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15905D, 0, 0, 0 + +LilycoveCity_ContestLobby_MapWarps:: @ 838999C + warp_def 6, 11, 0, 4, LilycoveCity + warp_def 7, 11, 0, 4, LilycoveCity + warp_def 1, 1, 0, 0, LilycoveCity_ContestHall + warp_def 13, 1, 0, 1, LilycoveCity_ContestHall + +LilycoveCity_ContestLobby_MapBGEvents:: @ 83899BC + bg_event 18, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7835 + bg_event 18, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7659 + bg_event 15, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159066 + bg_event 17, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15906D + bg_event 19, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159074 + bg_event 22, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15908D + +LilycoveCity_ContestLobby_MapEvents:: @ 8389A04 + map_events LilycoveCity_ContestLobby_MapObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents + diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.s b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.s new file mode 100644 index 000000000..44c7d612a --- /dev/null +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.s @@ -0,0 +1,14 @@ +LilycoveCity_CoveLilyMotel_1F_MapObjects:: @ 8389464 + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 10, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5, 0, 0, 0 + +LilycoveCity_CoveLilyMotel_1F_MapWarps:: @ 838947C + warp_def 5, 8, 0, 1, LilycoveCity + warp_def 6, 8, 0, 1, LilycoveCity + warp_def 2, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F + +LilycoveCity_CoveLilyMotel_1F_MapCoordEvents:: @ 8389494 + coord_event 10, 2, 3, 0, 0x4001, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D + +LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 83894A4 + map_events LilycoveCity_CoveLilyMotel_1F_MapObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 + diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.s b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.s new file mode 100644 index 000000000..a8cb53f84 --- /dev/null +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.s @@ -0,0 +1,14 @@ +LilycoveCity_CoveLilyMotel_2F_MapObjects:: @ 83894B8 + object_event 1, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1, 925, 0, 0 + object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 1, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7, 925, 0, 0 + object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158400, 925, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_5, 0, 10, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE, 925, 0, 0 + object_event 5, MAP_OBJ_GFX_BOY_5, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158412, 925, 0, 0 + object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 4, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, 925, 0, 0 + +LilycoveCity_CoveLilyMotel_2F_MapWarps:: @ 8389548 + warp_def 2, 1, 0, 2, LilycoveCity_CoveLilyMotel_1F + +LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8389550 + map_events LilycoveCity_CoveLilyMotel_2F_MapObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.s b/data/maps/events/LilycoveCity_DepartmentStoreElevator.s new file mode 100644 index 000000000..117c0b76c --- /dev/null +++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.s @@ -0,0 +1,10 @@ +LilycoveCity_DepartmentStoreElevator_MapObjects:: @ 838A624 + object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A39C, 0, 0, 0 + +LilycoveCity_DepartmentStoreElevator_MapWarps:: @ 838A63C + warp_def 1, 5, 3, 127, NONE + warp_def 2, 5, 3, 127, NONE + +LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 838A64C + map_events LilycoveCity_DepartmentStoreElevator_MapObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.s b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.s new file mode 100644 index 000000000..849ac136e --- /dev/null +++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.s @@ -0,0 +1,15 @@ +LilycoveCity_DepartmentStoreRooftop_MapObjects:: @ 838A5A8 + object_event 1, MAP_OBJ_GFX_MAN_2, 0, 4, 0, 4, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_4, 0, 7, 0, 5, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 0, 1, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, 962, 0, 0 + +LilycoveCity_DepartmentStoreRooftop_MapWarps:: @ 838A5F0 + warp_def 13, 3, 0, 2, LilycoveCity_DepartmentStore_5F + +LilycoveCity_DepartmentStoreRooftop_MapBGEvents:: @ 838A5F8 + bg_event 9, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD + bg_event 10, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD + +LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 838A610 + map_events LilycoveCity_DepartmentStoreRooftop_MapObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents + diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.s b/data/maps/events/LilycoveCity_DepartmentStore_1F.s new file mode 100644 index 000000000..5143b5d9a --- /dev/null +++ b/data/maps/events/LilycoveCity_DepartmentStore_1F.s @@ -0,0 +1,20 @@ +LilycoveCity_DepartmentStore_1F_MapObjects:: @ 838A218 + object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D55, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D5E, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 14, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159ED7, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE0, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_MAN_3, 0, 3, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE9, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 2, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EF2, 0, 0, 0 + +LilycoveCity_DepartmentStore_1F_MapWarps:: @ 838A2A8 + warp_def 8, 7, 0, 0, LilycoveCity + warp_def 9, 7, 0, 0, LilycoveCity + warp_def 16, 1, 0, 0, LilycoveCity_DepartmentStore_2F + warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator + +LilycoveCity_DepartmentStore_1F_MapBGEvents:: @ 838A2C8 + bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_159F05 + +LilycoveCity_DepartmentStore_1F_MapEvents:: @ 838A2D4 + map_events LilycoveCity_DepartmentStore_1F_MapObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents + diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.s b/data/maps/events/LilycoveCity_DepartmentStore_2F.s new file mode 100644 index 000000000..ffda16328 --- /dev/null +++ b/data/maps/events/LilycoveCity_DepartmentStore_2F.s @@ -0,0 +1,15 @@ +LilycoveCity_DepartmentStore_2F_MapObjects:: @ 838A2E8 + object_event 1, MAP_OBJ_GFX_COOK, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F0F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F18, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_SAILOR, 0, 13, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F21, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 10, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F5E, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 7, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F2A, 0, 0, 0 + +LilycoveCity_DepartmentStore_2F_MapWarps:: @ 838A360 + warp_def 16, 1, 0, 2, LilycoveCity_DepartmentStore_1F + warp_def 13, 1, 0, 0, LilycoveCity_DepartmentStore_3F + warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator + +LilycoveCity_DepartmentStore_2F_MapEvents:: @ 838A378 + map_events LilycoveCity_DepartmentStore_2F_MapObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.s b/data/maps/events/LilycoveCity_DepartmentStore_3F.s new file mode 100644 index 000000000..d904058d2 --- /dev/null +++ b/data/maps/events/LilycoveCity_DepartmentStore_3F.s @@ -0,0 +1,15 @@ +LilycoveCity_DepartmentStore_3F_MapObjects:: @ 838A38C + object_event 1, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FE2, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FEB, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 13, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FF4, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159F91, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 10, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FB8, 0, 0, 0 + +LilycoveCity_DepartmentStore_3F_MapWarps:: @ 838A404 + warp_def 13, 1, 0, 1, LilycoveCity_DepartmentStore_2F + warp_def 16, 1, 0, 0, LilycoveCity_DepartmentStore_4F + warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator + +LilycoveCity_DepartmentStore_3F_MapEvents:: @ 838A41C + map_events LilycoveCity_DepartmentStore_3F_MapObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.s b/data/maps/events/LilycoveCity_DepartmentStore_4F.s new file mode 100644 index 000000000..8f5a468ef --- /dev/null +++ b/data/maps/events/LilycoveCity_DepartmentStore_4F.s @@ -0,0 +1,15 @@ +LilycoveCity_DepartmentStore_4F_MapObjects:: @ 838A430 + object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_159FFE, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A007, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 13, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A010, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 7, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A019, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 9, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A03C, 0, 0, 0 + +LilycoveCity_DepartmentStore_4F_MapWarps:: @ 838A4A8 + warp_def 16, 1, 0, 1, LilycoveCity_DepartmentStore_3F + warp_def 13, 1, 0, 0, LilycoveCity_DepartmentStore_5F + warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator + +LilycoveCity_DepartmentStore_4F_MapEvents:: @ 838A4C0 + map_events LilycoveCity_DepartmentStore_4F_MapObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.s b/data/maps/events/LilycoveCity_DepartmentStore_5F.s new file mode 100644 index 000000000..a24138ca2 --- /dev/null +++ b/data/maps/events/LilycoveCity_DepartmentStore_5F.s @@ -0,0 +1,17 @@ +LilycoveCity_DepartmentStore_5F_MapObjects:: @ 838A4D4 + object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A136, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 7, 0, 7, 0, 3, 17, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A124, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A061, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A094, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 15, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0C2, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_WOMAN_4, 0, 17, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0F2, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 9, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A12D, 0, 0, 0 + +LilycoveCity_DepartmentStore_5F_MapWarps:: @ 838A57C + warp_def 13, 1, 0, 1, LilycoveCity_DepartmentStore_4F + warp_def 2, 1, 0, 0, LilycoveCity_DepartmentStoreElevator + warp_def 16, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop + +LilycoveCity_DepartmentStore_5F_MapEvents:: @ 838A594 + map_events LilycoveCity_DepartmentStore_5F_MapObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LilycoveCity_EmptyMap.s b/data/maps/events/LilycoveCity_EmptyMap.s new file mode 100644 index 000000000..b3bbd3805 --- /dev/null +++ b/data/maps/events/LilycoveCity_EmptyMap.s @@ -0,0 +1,6 @@ +LilycoveCity_EmptyMap_MapWarps:: @ 838A028 + warp_def 7, 5, 0, 2, LilycoveCity_Harbor + +LilycoveCity_EmptyMap_MapEvents:: @ 838A030 + map_events 0x0, LilycoveCity_EmptyMap_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LilycoveCity_Harbor.s b/data/maps/events/LilycoveCity_Harbor.s new file mode 100644 index 000000000..01664e2d6 --- /dev/null +++ b/data/maps/events/LilycoveCity_Harbor.s @@ -0,0 +1,15 @@ +LilycoveCity_Harbor_MapObjects:: @ 8389F94 + object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, 908, 0, 0 + object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 861, 0, 0 + object_event 3, MAP_OBJ_GFX_SAILOR, 0, 3, 0, 13, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_159A8D, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_SAILOR, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 909, 0, 0 + +LilycoveCity_Harbor_MapWarps:: @ 8389FF4 + warp_def 11, 14, 0, 12, LilycoveCity + warp_def 12, 14, 0, 12, LilycoveCity + warp_def 20, 15, 0, 0, LilycoveCity_EmptyMap + warp_def 21, 15, 0, 0, LilycoveCity_EmptyMap + +LilycoveCity_Harbor_MapEvents:: @ 838A014 + map_events LilycoveCity_Harbor_MapObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LilycoveCity_House1.s b/data/maps/events/LilycoveCity_House1.s new file mode 100644 index 000000000..85c4081a5 --- /dev/null +++ b/data/maps/events/LilycoveCity_House1.s @@ -0,0 +1,11 @@ +LilycoveCity_House1_MapObjects:: @ 838A080 + object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_House1_EventScript_159B86, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_House1_EventScript_159B8F, 0, 0, 0 + +LilycoveCity_House1_MapWarps:: @ 838A0B0 + warp_def 3, 8, 0, 8, LilycoveCity + warp_def 4, 8, 0, 8, LilycoveCity + +LilycoveCity_House1_MapEvents:: @ 838A0C0 + map_events LilycoveCity_House1_MapObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LilycoveCity_House2.s b/data/maps/events/LilycoveCity_House2.s new file mode 100644 index 000000000..9589929c0 --- /dev/null +++ b/data/maps/events/LilycoveCity_House2.s @@ -0,0 +1,10 @@ +LilycoveCity_House2_MapObjects:: @ 838A0D4 + object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_House2_EventScript_159BA3, 0, 0, 0 + +LilycoveCity_House2_MapWarps:: @ 838A0EC + warp_def 2, 7, 0, 9, LilycoveCity + warp_def 3, 7, 0, 9, LilycoveCity + +LilycoveCity_House2_MapEvents:: @ 838A0FC + map_events LilycoveCity_House2_MapObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LilycoveCity_House3.s b/data/maps/events/LilycoveCity_House3.s new file mode 100644 index 000000000..48917beac --- /dev/null +++ b/data/maps/events/LilycoveCity_House3.s @@ -0,0 +1,15 @@ +LilycoveCity_House3_MapObjects:: @ 838A110 + object_event 1, MAP_OBJ_GFX_BOY_5, 0, 3, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159CE5, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159BF3, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BOY_5, 0, 1, 0, 4, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159C7D, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BOY_5, 0, 2, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159CB1, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BOY_5, 0, 2, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159C49, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_MAN_1, 0, 7, 0, 5, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159C32, 0, 0, 0 + +LilycoveCity_House3_MapWarps:: @ 838A1A0 + warp_def 3, 7, 0, 10, LilycoveCity + warp_def 4, 7, 0, 10, LilycoveCity + +LilycoveCity_House3_MapEvents:: @ 838A1B0 + map_events LilycoveCity_House3_MapObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LilycoveCity_House4.s b/data/maps/events/LilycoveCity_House4.s new file mode 100644 index 000000000..cf7498304 --- /dev/null +++ b/data/maps/events/LilycoveCity_House4.s @@ -0,0 +1,11 @@ +LilycoveCity_House4_MapObjects:: @ 838A1C4 + object_event 1, MAP_OBJ_GFX_MAN_5, 0, 1, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_House4_EventScript_159D42, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_1, 0, 7, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_House4_EventScript_159D4B, 0, 0, 0 + +LilycoveCity_House4_MapWarps:: @ 838A1F4 + warp_def 3, 8, 0, 11, LilycoveCity + warp_def 4, 8, 0, 11, LilycoveCity + +LilycoveCity_House4_MapEvents:: @ 838A204 + map_events LilycoveCity_House4_MapObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.s b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.s new file mode 100644 index 000000000..6b4c67874 --- /dev/null +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.s @@ -0,0 +1,38 @@ +LilycoveCity_LilycoveMuseum_1F_MapObjects:: @ 8389564 + object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 5, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15841C, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 16, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, 775, 0, 0 + object_event 3, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 13, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158558, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_ARTIST, 0, 13, 0, 10, 0, 3, 5, 2, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158561, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15856A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_WOMAN_5, 0, 3, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158573, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 11, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, 776, 0, 0 + object_event 8, MAP_OBJ_GFX_ARTIST, 0, 19, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, 779, 0, 0 + object_event 9, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 2, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, 780, 0, 0 + object_event 10, MAP_OBJ_GFX_PSYCHIC_M, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, 778, 0, 0 + +LilycoveCity_LilycoveMuseum_1F_MapWarps:: @ 8389654 + warp_def 9, 13, 0, 3, LilycoveCity + warp_def 10, 13, 0, 13, LilycoveCity + warp_def 16, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F + +LilycoveCity_LilycoveMuseum_1F_MapBGEvents:: @ 838966C + bg_event 1, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 + bg_event 2, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 + bg_event 5, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158534 + bg_event 6, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158534 + bg_event 9, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158507 + bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158519 + bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158519 + bg_event 15, 12, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15853D + bg_event 11, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158507 + bg_event 6, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15852B + bg_event 17, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F + bg_event 19, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158522 + bg_event 20, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158522 + bg_event 18, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F + bg_event 18, 11, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158546 + bg_event 16, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F + +LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 838972C + map_events LilycoveCity_LilycoveMuseum_1F_MapObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents + diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.s b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.s new file mode 100644 index 000000000..55774a8bf --- /dev/null +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.s @@ -0,0 +1,26 @@ +LilycoveCity_LilycoveMuseum_2F_MapObjects:: @ 8389740 + object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 10, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 19, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, 777, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, 780, 0, 0 + object_event 4, MAP_OBJ_GFX_BOY_4, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, 780, 0, 0 + +LilycoveCity_LilycoveMuseum_2F_MapWarps:: @ 83897A0 + warp_def 13, 1, 0, 2, LilycoveCity_LilycoveMuseum_1F + +LilycoveCity_LilycoveMuseum_2F_MapBGEvents:: @ 83897A8 + bg_event 14, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D + bg_event 15, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D + bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0 + bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0 + bg_event 10, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3 + bg_event 11, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3 + bg_event 19, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6 + bg_event 18, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6 + bg_event 6, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9 + bg_event 7, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9 + bg_event 11, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D + bg_event 15, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D + +LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8389838 + map_events LilycoveCity_LilycoveMuseum_2F_MapObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents + diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.s b/data/maps/events/LilycoveCity_MoveDeletersHouse.s new file mode 100644 index 000000000..6747891dd --- /dev/null +++ b/data/maps/events/LilycoveCity_MoveDeletersHouse.s @@ -0,0 +1,10 @@ +LilycoveCity_MoveDeletersHouse_MapObjects:: @ 838A044 + object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_159AAE, 0, 0, 0 + +LilycoveCity_MoveDeletersHouse_MapWarps:: @ 838A05C + warp_def 3, 7, 0, 7, LilycoveCity + warp_def 4, 7, 0, 7, LilycoveCity + +LilycoveCity_MoveDeletersHouse_MapEvents:: @ 838A06C + map_events LilycoveCity_MoveDeletersHouse_MapObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.s b/data/maps/events/LilycoveCity_PokemonCenter_1F.s new file mode 100644 index 000000000..8b45733ed --- /dev/null +++ b/data/maps/events/LilycoveCity_PokemonCenter_1F.s @@ -0,0 +1,13 @@ +LilycoveCity_PokemonCenter_1F_MapObjects:: @ 8389D94 + object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159331, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BOY_1, 0, 10, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_15933F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MANIAC, 0, 11, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159348, 0, 0, 0 + +LilycoveCity_PokemonCenter_1F_MapWarps:: @ 8389DDC + warp_def 7, 8, 3, 2, LilycoveCity + warp_def 6, 8, 3, 2, LilycoveCity + warp_def 1, 6, 4, 0, LilycoveCity_PokemonCenter_2F + +LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8389DF4 + map_events LilycoveCity_PokemonCenter_1F_MapObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.s b/data/maps/events/LilycoveCity_PokemonCenter_2F.s new file mode 100644 index 000000000..f50bdc536 --- /dev/null +++ b/data/maps/events/LilycoveCity_PokemonCenter_2F.s @@ -0,0 +1,15 @@ +LilycoveCity_PokemonCenter_2F_MapObjects:: @ 8389E08 + object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159377, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_15937D, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159383, 0, 0, 0 + +LilycoveCity_PokemonCenter_2F_MapWarps:: @ 8389E50 + warp_def 1, 5, 4, 2, LilycoveCity_PokemonCenter_1F + warp_def 5, 1, 0, 0, SingleBattleColosseum + warp_def 8, 1, 0, 0, TradeCenter + warp_def 11, 1, 0, 0, RecordCorner + warp_def 0, 0, 0, 0, DoubleBattleColosseum + +LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8389E78 + map_events LilycoveCity_PokemonCenter_2F_MapObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.s b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.s new file mode 100644 index 000000000..d5b5493a2 --- /dev/null +++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.s @@ -0,0 +1,17 @@ +LilycoveCity_PokemonTrainerFanClub_MapObjects:: @ 8389EB0 + object_event 1, MAP_OBJ_GFX_LASS, 0, 3, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_5, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15952F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_3, 0, 6, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15961D, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159694, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, 791, 0, 0 + object_event 6, MAP_OBJ_GFX_BOY_2, 0, 1, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, 790, 0, 0 + object_event 7, MAP_OBJ_GFX_WOMAN_4, 0, 3, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, 792, 0, 0 + object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 10, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, 789, 0, 0 + +LilycoveCity_PokemonTrainerFanClub_MapWarps:: @ 8389F70 + warp_def 6, 13, 0, 5, LilycoveCity + warp_def 5, 13, 0, 5, LilycoveCity + +LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8389F80 + map_events LilycoveCity_PokemonTrainerFanClub_MapObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LilycoveCity_UnusedMart.s b/data/maps/events/LilycoveCity_UnusedMart.s new file mode 100644 index 000000000..7fec14286 --- /dev/null +++ b/data/maps/events/LilycoveCity_UnusedMart.s @@ -0,0 +1,7 @@ +LilycoveCity_UnusedMart_MapWarps:: @ 8389E8C + warp_def 3, 7, 0, 0, LilycoveCity + warp_def 4, 7, 0, 0, LilycoveCity + +LilycoveCity_UnusedMart_MapEvents:: @ 8389E9C + map_events 0x0, LilycoveCity_UnusedMart_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/LinkContestRoom1.s b/data/maps/events/LinkContestRoom1.s new file mode 100644 index 000000000..6c1e09430 --- /dev/null +++ b/data/maps/events/LinkContestRoom1.s @@ -0,0 +1,18 @@ +LinkContestRoom1_MapObjects:: @ 839149C + object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, 240, 0, 4, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, 241, 0, 6, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, 242, 0, 8, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, 244, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 7, 246, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 8, 247, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 9, 248, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 10, 249, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 11, 250, 0, 12, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 12, 245, 0, 2, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 86, 0, 0 + object_event 14, 243, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_ARTIST, 0, 12, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + +LinkContestRoom1_MapEvents:: @ 8391604 diff --git a/data/maps/events/LinkContestRoom2.s b/data/maps/events/LinkContestRoom2.s new file mode 100644 index 000000000..562a96523 --- /dev/null +++ b/data/maps/events/LinkContestRoom2.s @@ -0,0 +1 @@ +LinkContestRoom2_MapEvents:: @ 8391604 diff --git a/data/maps/events/LinkContestRoom3.s b/data/maps/events/LinkContestRoom3.s new file mode 100644 index 000000000..8c93f28c9 --- /dev/null +++ b/data/maps/events/LinkContestRoom3.s @@ -0,0 +1 @@ +LinkContestRoom3_MapEvents:: @ 8391604 diff --git a/data/maps/events/LinkContestRoom4.s b/data/maps/events/LinkContestRoom4.s new file mode 100644 index 000000000..a5e455811 --- /dev/null +++ b/data/maps/events/LinkContestRoom4.s @@ -0,0 +1 @@ +LinkContestRoom4_MapEvents:: @ 8391604 diff --git a/data/maps/events/LinkContestRoom5.s b/data/maps/events/LinkContestRoom5.s new file mode 100644 index 000000000..f0f8fa508 --- /dev/null +++ b/data/maps/events/LinkContestRoom5.s @@ -0,0 +1 @@ +LinkContestRoom5_MapEvents:: @ 8391604 diff --git a/data/maps/events/LinkContestRoom6.s b/data/maps/events/LinkContestRoom6.s new file mode 100644 index 000000000..a8fd4962f --- /dev/null +++ b/data/maps/events/LinkContestRoom6.s @@ -0,0 +1 @@ +LinkContestRoom6_MapEvents:: @ 8391604 diff --git a/data/maps/events/LittlerootTown.s b/data/maps/events/LittlerootTown.s new file mode 100644 index 000000000..14ce5fcb1 --- /dev/null +++ b/data/maps/events/LittlerootTown.s @@ -0,0 +1,33 @@ +LittlerootTown_MapObjects:: @ 83808FC + object_event 1, MAP_OBJ_GFX_LITTLE_BOY_3, 0, 16, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6DF, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 12, 0, 13, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6CD, 868, 0, 0 + object_event 3, MAP_OBJ_GFX_BOY_2, 0, 14, 0, 17, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6D6, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_MOM, 0, 5, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, 752, 0, 0 + object_event 5, MAP_OBJ_GFX_TRUCK, 0, 2, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 761, 0, 0 + object_event 6, MAP_OBJ_GFX_TRUCK, 0, 11, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 762, 0, 0 + +LittlerootTown_MapWarps:: @ 838098C + warp_def 14, 8, 0, 1, LittlerootTown_MaysHouse_1F + warp_def 5, 8, 0, 1, LittlerootTown_BrendansHouse_1F + warp_def 7, 16, 0, 0, LittlerootTown_ProfessorBirchsLab + +LittlerootTown_MapCoordEvents:: @ 83809A4 + coord_event 10, 1, 3, 0, 0x4050, 0, 0, LittlerootTown_EventScript_14D739 + coord_event 11, 1, 3, 0, 0x4050, 0, 0, LittlerootTown_EventScript_14D797 + coord_event 11, 1, 3, 0, 0x4050, 1, 0, LittlerootTown_EventScript_14D7C7 + coord_event 8, 9, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D89E + coord_event 9, 9, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D8AA + coord_event 10, 9, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D886 + coord_event 11, 9, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D892 + coord_event 10, 2, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D860 + coord_event 11, 2, 3, 0, 0x4050, 3, 0, LittlerootTown_EventScript_14D873 + +LittlerootTown_MapBGEvents:: @ 8380A34 + bg_event 15, 13, 0, 0, 0, LittlerootTown_EventScript_14D7F6 + bg_event 6, 17, 0, 0, 0, LittlerootTown_EventScript_14D7FF + bg_event 7, 8, 3, 0, 0, LittlerootTown_EventScript_14D808 + bg_event 12, 8, 3, 0, 0, LittlerootTown_EventScript_14D834 + +LittlerootTown_MapEvents:: @ 8380A64 + map_events LittlerootTown_MapObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents + diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.s b/data/maps/events/LittlerootTown_BrendansHouse_1F.s new file mode 100644 index 000000000..624f712c5 --- /dev/null +++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.s @@ -0,0 +1,18 @@ +LittlerootTown_BrendansHouse_1F_MapObjects:: @ 8385674 + object_event 1, MAP_OBJ_GFX_MOM, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, 758, 0, 0 + object_event 2, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 0, 3, 0, 3, 28, 3, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, 755, 0, 0 + object_event 3, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, 754, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, 784, 0, 0 + object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 734, 0, 0 + +LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC + warp_def 9, 8, 0, 1, LittlerootTown + warp_def 8, 8, 0, 1, LittlerootTown + warp_def 8, 2, 0, 0, LittlerootTown_BrendansHouse_2F + +LittlerootTown_BrendansHouse_1F_MapCoordEvents:: @ 8385704 + coord_event 8, 8, 0, 0, 0x4092, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_152789 + +LittlerootTown_BrendansHouse_1F_MapEvents:: @ 8385714 + map_events LittlerootTown_BrendansHouse_1F_MapObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 + diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.s b/data/maps/events/LittlerootTown_BrendansHouse_2F.s new file mode 100644 index 000000000..53d62b978 --- /dev/null +++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.s @@ -0,0 +1,28 @@ +LittlerootTown_BrendansHouse_2F_MapObjects:: @ 8385728 + object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, 760, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 4, 1, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 5, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, MAP_OBJ_GFX_MOM, 0, 7, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, 757, 0, 0 + +LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878 + warp_def 7, 1, 0, 2, LittlerootTown_BrendansHouse_1F + +LittlerootTown_BrendansHouse_2F_MapBGEvents:: @ 8385880 + bg_event 0, 1, 0, 1, 0, LittlerootTown_BrendansHouse_2F_EventScript_15281E + bg_event 1, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152867 + bg_event 5, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1B69D3 + bg_event 3, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152870 + +LittlerootTown_BrendansHouse_2F_MapEvents:: @ 83858B0 + map_events LittlerootTown_BrendansHouse_2F_MapObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents + diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.s b/data/maps/events/LittlerootTown_MaysHouse_1F.s new file mode 100644 index 000000000..05dff7a9e --- /dev/null +++ b/data/maps/events/LittlerootTown_MaysHouse_1F.s @@ -0,0 +1,18 @@ +LittlerootTown_MaysHouse_1F_MapObjects:: @ 83858C4 + object_event 1, MAP_OBJ_GFX_MOM, 0, 8, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, 759, 0, 0 + object_event 2, MAP_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, 754, 0, 0 + object_event 3, MAP_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 0, 3, 0, 3, 27, 3, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, 755, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 8, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, 785, 0, 0 + object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, 734, 0, 0 + +LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C + warp_def 1, 8, 0, 0, LittlerootTown + warp_def 2, 8, 0, 0, LittlerootTown + warp_def 2, 2, 0, 0, LittlerootTown_MaysHouse_2F + +LittlerootTown_MaysHouse_1F_MapCoordEvents:: @ 8385954 + coord_event 2, 8, 0, 0, 0x4092, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_152A35 + +LittlerootTown_MaysHouse_1F_MapEvents:: @ 8385964 + map_events LittlerootTown_MaysHouse_1F_MapObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 + diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.s b/data/maps/events/LittlerootTown_MaysHouse_2F.s new file mode 100644 index 000000000..cbadc3bed --- /dev/null +++ b/data/maps/events/LittlerootTown_MaysHouse_2F.s @@ -0,0 +1,29 @@ +LittlerootTown_MaysHouse_2F_MapObjects:: @ 8385978 + object_event 1, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, 722, 0, 0 + object_event 2, 240, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 2, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 4, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 5, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 2, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 3, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, MAP_OBJ_GFX_MOM, 0, 1, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, 757, 0, 0 + object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 3, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, 0x0, 849, 0, 0 + +LittlerootTown_MaysHouse_2F_MapWarps:: @ 8385AE0 + warp_def 1, 1, 0, 2, LittlerootTown_MaysHouse_1F + +LittlerootTown_MaysHouse_2F_MapBGEvents:: @ 8385AE8 + bg_event 5, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152870 + bg_event 7, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152867 + bg_event 3, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1B69DF + bg_event 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152C39 + +LittlerootTown_MaysHouse_2F_MapEvents:: @ 8385B18 + map_events LittlerootTown_MaysHouse_2F_MapObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents + diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.s b/data/maps/events/LittlerootTown_ProfessorBirchsLab.s new file mode 100644 index 000000000..2e680faf8 --- /dev/null +++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.s @@ -0,0 +1,29 @@ +LittlerootTown_ProfessorBirchsLab_MapObjects:: @ 8385B2C + object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 9, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D63, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, 721, 0, 0 + object_event 3, 240, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, 889, 0, 0 + +LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74 + warp_def 6, 12, 0, 2, LittlerootTown + warp_def 7, 12, 0, 2, LittlerootTown + +LittlerootTown_ProfessorBirchsLab_MapBGEvents:: @ 8385B84 + bg_event 10, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A + bg_event 11, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A + bg_event 7, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2 + bg_event 8, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2 + bg_event 1, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 0, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 1, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 2, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 3, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 4, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 3, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 1, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 1, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 11, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 11, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + +LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 8385C38 + map_events LittlerootTown_ProfessorBirchsLab_MapObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents + diff --git a/data/maps/events/MagmaHideout_1F.s b/data/maps/events/MagmaHideout_1F.s new file mode 100644 index 000000000..f0339712c --- /dev/null +++ b/data/maps/events/MagmaHideout_1F.s @@ -0,0 +1,12 @@ +MagmaHideout_1F_MapObjects:: @ 838E9BC + object_event 1, 241, 0, 13, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7CE, 821, 0, 0 + object_event 2, 241, 0, 14, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7ED, 822, 0, 0 + object_event 3, 241, 0, 20, 0, 3, 0, 3, 50, 110, 0, 1, 0, 3, 0, MagmaHideout_1F_EventScript_15D80C, 0, 0, 0 + +MagmaHideout_1F_MapWarps:: @ 838EA04 + warp_def 13, 27, 1, 14, LilycoveCity + warp_def 13, 1, 3, 0, MagmaHideout_B1F + +MagmaHideout_1F_MapEvents:: @ 838EA14 + map_events MagmaHideout_1F_MapObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MagmaHideout_B1F.s b/data/maps/events/MagmaHideout_B1F.s new file mode 100644 index 000000000..5ec44bb7c --- /dev/null +++ b/data/maps/events/MagmaHideout_B1F.s @@ -0,0 +1,44 @@ +MagmaHideout_B1F_MapObjects:: @ 838EA28 + object_event 1, 241, 0, 33, 0, 3, 0, 3, 9, 17, 0, 1, 0, 5, 0, MagmaHideout_B1F_EventScript_15D850, 0, 0, 0 + object_event 2, 241, 0, 41, 0, 17, 0, 3, 23, 17, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D875, 0, 0, 0 + object_event 3, 242, 0, 33, 0, 19, 0, 3, 27, 20, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D89A, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, 1125, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, 1126, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, 977, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, 1134, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A051B, 978, 0, 0 + +MagmaHideout_B1F_MapWarps:: @ 838EAE8 + warp_def 3, 3, 3, 1, MagmaHideout_1F + warp_def 14, 3, 3, 0, MagmaHideout_B2F + warp_def 23, 1, 3, 1, MagmaHideout_B2F + warp_def 29, 1, 3, 2, MagmaHideout_B2F + warp_def 8, 5, 3, 6, MagmaHideout_B1F + warp_def 8, 7, 3, 9, MagmaHideout_B1F + warp_def 14, 8, 3, 4, MagmaHideout_B1F + warp_def 23, 5, 3, 10, MagmaHideout_B1F + warp_def 39, 5, 3, 13, MagmaHideout_B1F + warp_def 16, 16, 3, 5, MagmaHideout_B1F + warp_def 21, 14, 3, 7, MagmaHideout_B1F + warp_def 21, 20, 3, 12, MagmaHideout_B1F + warp_def 38, 11, 3, 11, MagmaHideout_B1F + warp_def 43, 19, 3, 8, MagmaHideout_B1F + warp_def 34, 11, 3, 28, MagmaHideout_B1F + warp_def 41, 11, 3, 16, MagmaHideout_B1F + warp_def 56, 3, 3, 15, MagmaHideout_B1F + warp_def 56, 5, 3, 16, MagmaHideout_B1F + warp_def 53, 5, 3, 22, MagmaHideout_B1F + warp_def 59, 5, 3, 20, MagmaHideout_B1F + warp_def 53, 9, 3, 19, MagmaHideout_B1F + warp_def 56, 9, 3, 24, MagmaHideout_B1F + warp_def 59, 9, 3, 18, MagmaHideout_B1F + warp_def 53, 13, 3, 17, MagmaHideout_B1F + warp_def 56, 13, 3, 21, MagmaHideout_B1F + warp_def 59, 13, 3, 26, MagmaHideout_B1F + warp_def 53, 17, 3, 25, MagmaHideout_B1F + warp_def 56, 17, 3, 21, MagmaHideout_B1F + warp_def 59, 17, 3, 14, MagmaHideout_B1F + +MagmaHideout_B1F_MapEvents:: @ 838EBD0 + map_events MagmaHideout_B1F_MapObjects, MagmaHideout_B1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MagmaHideout_B2F.s b/data/maps/events/MagmaHideout_B2F.s new file mode 100644 index 000000000..8453baf55 --- /dev/null +++ b/data/maps/events/MagmaHideout_B2F.s @@ -0,0 +1,26 @@ +MagmaHideout_B2F_MapObjects:: @ 838EBE4 + object_event 1, 241, 0, 8, 0, 19, 0, 3, 10, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, 924, 0, 0 + object_event 2, 241, 0, 31, 0, 11, 0, 3, 51, 71, 0, 1, 0, 3, 0, MagmaHideout_B2F_EventScript_15D962, 924, 0, 0 + object_event 3, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 0, 20, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, 943, 0, 0 + object_event 4, 242, 0, 13, 0, 3, 0, 3, 9, 17, 0, 1, 0, 4, 0, MagmaHideout_B2F_EventScript_15D987, 924, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, 1127, 0, 0 + +MagmaHideout_B2F_MapWarps:: @ 838EC5C + warp_def 3, 3, 3, 1, MagmaHideout_B1F + warp_def 12, 1, 3, 2, MagmaHideout_B1F + warp_def 18, 1, 3, 3, MagmaHideout_B1F + warp_def 2, 14, 3, 4, MagmaHideout_B1F + warp_def 12, 13, 3, 5, MagmaHideout_B2F + warp_def 17, 13, 3, 4, MagmaHideout_B2F + warp_def 31, 4, 3, 7, MagmaHideout_B2F + warp_def 31, 16, 3, 6, MagmaHideout_B2F + +MagmaHideout_B2F_MapCoordEvents:: @ 838EC9C + coord_event 7, 16, 3, 0, 0x4001, 0, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 6, 16, 3, 0, 0x4001, 0, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 5, 16, 3, 0, 0x4001, 0, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 4, 16, 3, 0, 0x4001, 0, 0, MagmaHideout_B2F_EventScript_15D8BD + +MagmaHideout_B2F_MapEvents:: @ 838ECDC + map_events MagmaHideout_B2F_MapObjects, MagmaHideout_B2F_MapWarps, MagmaHideout_B2F_MapCoordEvents, 0x0 + diff --git a/data/maps/events/MauvilleCity.s b/data/maps/events/MauvilleCity.s new file mode 100644 index 000000000..9249a7053 --- /dev/null +++ b/data/maps/events/MauvilleCity.s @@ -0,0 +1,33 @@ +MauvilleCity_MapObjects:: @ 837FB90 + object_event 1, MAP_OBJ_GFX_BOY_3, 0, 29, 0, 16, 0, 3, 5, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C05A, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BOY_4, 0, 24, 0, 10, 0, 3, 5, 1, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C075, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MANIAC, 0, 14, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C063, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 18, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C06C, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 17, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0A2, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_WALLY, 0, 8, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, 804, 0, 0 + object_event 7, MAP_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, 805, 0, 0 + object_event 8, MAP_OBJ_GFX_WATTSON, 0, 29, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, 912, 0, 0 + object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_1B171E, 1116, 0, 0 + +MauvilleCity_MapWarps:: @ 837FC68 + warp_def 8, 5, 0, 0, MauvilleCity_Gym + warp_def 22, 5, 0, 0, MauvilleCity_PokemonCenter_1F + warp_def 35, 5, 0, 0, MauvilleCity_BikeShop + warp_def 23, 14, 0, 0, MauvilleCity_Mart + warp_def 32, 14, 0, 0, MauvilleCity_House1 + warp_def 8, 13, 0, 0, MauvilleCity_GameCorner + warp_def 19, 14, 0, 0, MauvilleCity_House2 + +MauvilleCity_MapBGEvents:: @ 837FCA0 + bg_event 23, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA + bg_event 11, 6, 3, 0, 0, MauvilleCity_EventScript_14C087 + bg_event 24, 14, 0, 1, 0, MauvilleCity_EventScript_1A00E1 + bg_event 25, 14, 0, 1, 0, MauvilleCity_EventScript_1A00E1 + bg_event 24, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA + bg_event 19, 7, 0, 0, 0, MauvilleCity_EventScript_14C07E + bg_event 33, 6, 0, 0, 0, MauvilleCity_EventScript_14C090 + bg_event 11, 15, 0, 0, 0, MauvilleCity_EventScript_14C099 + +MauvilleCity_MapEvents:: @ 837FD00 + map_events MauvilleCity_MapObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents + diff --git a/data/maps/events/MauvilleCity_BikeShop.s b/data/maps/events/MauvilleCity_BikeShop.s new file mode 100644 index 000000000..165f23c3e --- /dev/null +++ b/data/maps/events/MauvilleCity_BikeShop.s @@ -0,0 +1,15 @@ +MauvilleCity_BikeShop_MapObjects:: @ 8388318 + object_event 1, MAP_OBJ_GFX_MAN_2, 0, 2, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156796, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_6, 0, 7, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_15690B, 0, 0, 0 + +MauvilleCity_BikeShop_MapWarps:: @ 8388348 + warp_def 3, 8, 0, 2, MauvilleCity + warp_def 4, 8, 0, 2, MauvilleCity + +MauvilleCity_BikeShop_MapBGEvents:: @ 8388358 + bg_event 8, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156914 + bg_event 11, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156988 + +MauvilleCity_BikeShop_MapEvents:: @ 8388370 + map_events MauvilleCity_BikeShop_MapObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents + diff --git a/data/maps/events/MauvilleCity_GameCorner.s b/data/maps/events/MauvilleCity_GameCorner.s new file mode 100644 index 000000000..4aa469f77 --- /dev/null +++ b/data/maps/events/MauvilleCity_GameCorner.s @@ -0,0 +1,47 @@ +MauvilleCity_GameCorner_MapObjects:: @ 83883C0 + object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 12, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F84, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 16, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F8D, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156A34, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156B6C, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_GIRL_2, 0, 7, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F96, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_MAN_3, 0, 19, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_15707C, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_OLD_MAN_2, 0, 20, 0, 8, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570D8, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_COOK, 0, 6, 0, 8, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570E8, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BEAUTY, 0, 13, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156D1A, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_MAN_4, 0, 1, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570F8, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_MANIAC, 0, 9, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_157115, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_157125, 0, 0, 0 + +MauvilleCity_GameCorner_MapWarps:: @ 83884E0 + warp_def 11, 10, 3, 5, MauvilleCity + warp_def 12, 10, 3, 5, MauvilleCity + +MauvilleCity_GameCorner_MapBGEvents:: @ 83884F0 + bg_event 2, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157135 + bg_event 2, 8, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157155 + bg_event 2, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157175 + bg_event 3, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157195 + bg_event 3, 8, 0, 4, 0, MauvilleCity_GameCorner_EventScript_1571B5 + bg_event 3, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_1571D5 + bg_event 7, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_1571F5 + bg_event 7, 7, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157215 + bg_event 7, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157235 + bg_event 8, 6, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157255 + bg_event 8, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157275 + bg_event 8, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157295 + bg_event 14, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 15, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 14, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 15, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 14, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 15, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 18, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 19, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 18, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 19, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 18, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 19, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC + +MauvilleCity_GameCorner_MapEvents:: @ 8388610 + map_events MauvilleCity_GameCorner_MapObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents + diff --git a/data/maps/events/MauvilleCity_Gym.s b/data/maps/events/MauvilleCity_Gym.s new file mode 100644 index 000000000..561cab1ff --- /dev/null +++ b/data/maps/events/MauvilleCity_Gym.s @@ -0,0 +1,24 @@ +MauvilleCity_Gym_MapObjects:: @ 838821C + object_event 1, MAP_OBJ_GFX_WATTSON, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_1565AB, 913, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_6, 0, 6, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, MauvilleCity_Gym_EventScript_1566FD, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 7, 0, 11, 0, 3, 8, 0, 0, 1, 0, 1, 0, MauvilleCity_Gym_EventScript_15672B, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, MauvilleCity_Gym_EventScript_156714, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_MAN_6, 0, 2, 0, 15, 0, 3, 8, 0, 0, 1, 0, 2, 0, MauvilleCity_Gym_EventScript_1566E6, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 20, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_156742, 0, 0, 0 + +MauvilleCity_Gym_MapWarps:: @ 83882AC + warp_def 4, 20, 0, 0, MauvilleCity + warp_def 5, 20, 0, 0, MauvilleCity + +MauvilleCity_Gym_MapCoordEvents:: @ 83882BC + coord_event 0, 9, 3, 0, 0x4000, 0, 0, MauvilleCity_Gym_EventScript_15664B + coord_event 8, 11, 3, 0, 0x4000, 0, 0, MauvilleCity_Gym_EventScript_156670 + coord_event 4, 15, 3, 0, 0x4000, 0, 0, MauvilleCity_Gym_EventScript_156695 + +MauvilleCity_Gym_MapBGEvents:: @ 83882EC + bg_event 3, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_156761 + bg_event 6, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_156771 + +MauvilleCity_Gym_MapEvents:: @ 8388304 + map_events MauvilleCity_Gym_MapObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents + diff --git a/data/maps/events/MauvilleCity_House1.s b/data/maps/events/MauvilleCity_House1.s new file mode 100644 index 000000000..02fd08bc9 --- /dev/null +++ b/data/maps/events/MauvilleCity_House1.s @@ -0,0 +1,10 @@ +MauvilleCity_House1_MapObjects:: @ 8388384 + object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_House1_EventScript_1569FD, 0, 0, 0 + +MauvilleCity_House1_MapWarps:: @ 838839C + warp_def 3, 7, 0, 4, MauvilleCity + warp_def 4, 7, 0, 4, MauvilleCity + +MauvilleCity_House1_MapEvents:: @ 83883AC + map_events MauvilleCity_House1_MapObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MauvilleCity_House2.s b/data/maps/events/MauvilleCity_House2.s new file mode 100644 index 000000000..5318ac92a --- /dev/null +++ b/data/maps/events/MauvilleCity_House2.s @@ -0,0 +1,10 @@ +MauvilleCity_House2_MapObjects:: @ 8388624 + object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 4, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_House2_EventScript_1572C0, 0, 0, 0 + +MauvilleCity_House2_MapWarps:: @ 838863C + warp_def 3, 8, 0, 6, MauvilleCity + warp_def 4, 8, 0, 6, MauvilleCity + +MauvilleCity_House2_MapEvents:: @ 838864C + map_events MauvilleCity_House2_MapObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MauvilleCity_Mart.s b/data/maps/events/MauvilleCity_Mart.s new file mode 100644 index 000000000..4b83cacff --- /dev/null +++ b/data/maps/events/MauvilleCity_Mart.s @@ -0,0 +1,12 @@ +MauvilleCity_Mart_MapObjects:: @ 83887A0 + object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573BE, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573F4, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573FD, 0, 0, 0 + +MauvilleCity_Mart_MapWarps:: @ 83887E8 + warp_def 3, 7, 0, 3, MauvilleCity + warp_def 4, 7, 0, 3, MauvilleCity + +MauvilleCity_Mart_MapEvents:: @ 83887F8 + map_events MauvilleCity_Mart_MapObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.s b/data/maps/events/MauvilleCity_PokemonCenter_1F.s new file mode 100644 index 000000000..2c6599053 --- /dev/null +++ b/data/maps/events/MauvilleCity_PokemonCenter_1F.s @@ -0,0 +1,15 @@ +MauvilleCity_PokemonCenter_1F_MapObjects:: @ 8388660 + object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157369, 0, 0, 0 + object_event 2, 240, 0, 2, 0, 3, 0, 3, 9, 1, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE744, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 8, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157377, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 11, 0, 4, 0, 3, 3, 16, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157380, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 2, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157389, 0, 0, 0 + +MauvilleCity_PokemonCenter_1F_MapWarps:: @ 83886D8 + warp_def 7, 8, 3, 1, MauvilleCity + warp_def 6, 8, 3, 1, MauvilleCity + warp_def 1, 6, 4, 0, MauvilleCity_PokemonCenter_2F + +MauvilleCity_PokemonCenter_1F_MapEvents:: @ 83886F0 + map_events MauvilleCity_PokemonCenter_1F_MapObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.s b/data/maps/events/MauvilleCity_PokemonCenter_2F.s new file mode 100644 index 000000000..0586e29f0 --- /dev/null +++ b/data/maps/events/MauvilleCity_PokemonCenter_2F.s @@ -0,0 +1,16 @@ +MauvilleCity_PokemonCenter_2F_MapObjects:: @ 8388704 + object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A2, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A8, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573AE, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 6, 0, 7, 0, 3, 5, 1, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573B4, 0, 0, 0 + +MauvilleCity_PokemonCenter_2F_MapWarps:: @ 8388764 + warp_def 1, 5, 4, 2, MauvilleCity_PokemonCenter_1F + warp_def 5, 1, 0, 0, SingleBattleColosseum + warp_def 8, 1, 0, 0, TradeCenter + warp_def 11, 1, 0, 0, RecordCorner + warp_def 0, 0, 0, 0, DoubleBattleColosseum + +MauvilleCity_PokemonCenter_2F_MapEvents:: @ 838878C + map_events MauvilleCity_PokemonCenter_2F_MapObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MeteorFalls_1F_1R.s b/data/maps/events/MeteorFalls_1F_1R.s new file mode 100644 index 000000000..7072ecbdc --- /dev/null +++ b/data/maps/events/MeteorFalls_1F_1R.s @@ -0,0 +1,29 @@ +MeteorFalls_1F_1R_MapObjects:: @ 838BACC + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B17FB, 1044, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, 1046, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, 1045, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, 1047, 0, 0 + object_event 5, 241, 0, 12, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 938, 0, 0 + object_event 6, 241, 0, 14, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 938, 0, 0 + object_event 7, 247, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 939, 0, 0 + object_event 8, 244, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 939, 0, 0 + object_event 9, 244, 0, 6, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 939, 0, 0 + object_event 10, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 23, 0, 3, 21, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, 942, 0, 0 + +MeteorFalls_1F_1R_MapWarps:: @ 838BBBC + warp_def 27, 18, 4, 0, Route114 + warp_def 6, 39, 3, 0, Route115 + warp_def 10, 3, 3, 0, MeteorFalls_1F_2R + warp_def 5, 4, 3, 4, MeteorFalls_B1F_1R + warp_def 26, 28, 3, 5, MeteorFalls_B1F_1R + +MeteorFalls_1F_1R_MapCoordEvents:: @ 838BBE4 + coord_event 14, 18, 4, 0, 0x40bf, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C + +MeteorFalls_1F_1R_MapBGEvents:: @ 838BBF4 + bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_1R_EventScript_14E842 + bg_event 9, 58, 0, 0, 0, 0x0 + +MeteorFalls_1F_1R_MapEvents:: @ 838BC0C + map_events MeteorFalls_1F_1R_MapObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents + diff --git a/data/maps/events/MeteorFalls_1F_2R.s b/data/maps/events/MeteorFalls_1F_2R.s new file mode 100644 index 000000000..db5d53ee6 --- /dev/null +++ b/data/maps/events/MeteorFalls_1F_2R.s @@ -0,0 +1,18 @@ +MeteorFalls_1F_2R_MapObjects:: @ 838BC20 + object_event 1, MAP_OBJ_GFX_MAN_4, 0, 13, 0, 2, 0, 3, 8, 0, 0, 1, 0, 1, 0, MeteorFalls_1F_2R_EventScript_15C679, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 6, 0, 12, 0, 3, 8, 17, 0, 1, 0, 0, 0, MeteorFalls_1F_2R_EventScript_15C6B7, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 7, 0, 12, 0, 3, 8, 17, 0, 1, 0, 0, 0, MeteorFalls_1F_2R_EventScript_15C6FD, 0, 0, 0 + +MeteorFalls_1F_2R_MapWarps:: @ 838BC68 + warp_def 10, 29, 3, 2, MeteorFalls_1F_1R + warp_def 4, 14, 3, 0, MeteorFalls_B1F_1R + warp_def 7, 20, 3, 1, MeteorFalls_B1F_1R + warp_def 21, 23, 3, 2, MeteorFalls_B1F_1R + +MeteorFalls_1F_2R_MapBGEvents:: @ 838BC88 + bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_2R_EventScript_14E842 + bg_event 9, 58, 0, 0, 0, 0x0 + +MeteorFalls_1F_2R_MapEvents:: @ 838BCA0 + map_events MeteorFalls_1F_2R_MapObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents + diff --git a/data/maps/events/MeteorFalls_B1F_1R.s b/data/maps/events/MeteorFalls_B1F_1R.s new file mode 100644 index 000000000..f5990a9a6 --- /dev/null +++ b/data/maps/events/MeteorFalls_B1F_1R.s @@ -0,0 +1,11 @@ +MeteorFalls_B1F_1R_MapWarps:: @ 838BCB4 + warp_def 5, 6, 4, 1, MeteorFalls_1F_2R + warp_def 7, 11, 5, 2, MeteorFalls_1F_2R + warp_def 18, 15, 4, 3, MeteorFalls_1F_2R + warp_def 17, 3, 3, 0, MeteorFalls_B1F_2R + warp_def 3, 23, 5, 3, MeteorFalls_1F_1R + warp_def 20, 36, 3, 4, MeteorFalls_1F_1R + +MeteorFalls_B1F_1R_MapEvents:: @ 838BCE4 + map_events 0x0, MeteorFalls_B1F_1R_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MeteorFalls_B1F_2R.s b/data/maps/events/MeteorFalls_B1F_2R.s new file mode 100644 index 000000000..2a48daee1 --- /dev/null +++ b/data/maps/events/MeteorFalls_B1F_2R.s @@ -0,0 +1,9 @@ +MeteorFalls_B1F_2R_MapObjects:: @ 838BCF8 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, 1080, 0, 0 + +MeteorFalls_B1F_2R_MapWarps:: @ 838BD10 + warp_def 5, 15, 3, 3, MeteorFalls_B1F_1R + +MeteorFalls_B1F_2R_MapEvents:: @ 838BD18 + map_events MeteorFalls_B1F_2R_MapObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MossdeepCity.s b/data/maps/events/MossdeepCity.s new file mode 100644 index 000000000..2b9a53f62 --- /dev/null +++ b/data/maps/events/MossdeepCity.s @@ -0,0 +1,42 @@ +MossdeepCity_MapObjects:: @ 838042C + object_event 1, MAP_OBJ_GFX_SAILOR, 0, 42, 0, 24, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFB7, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 50, 0, 34, 0, 5, 5, 1, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFC9, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 32, 0, 12, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFAE, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 26, 0, 21, 0, 5, 3, 16, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFC0, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_GIRL_1, 0, 45, 0, 18, 0, 7, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFD2, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 62, 0, 35, 0, 5, 1, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_1B1745, 1043, 0, 0 + object_event 7, MAP_OBJ_GFX_MAN_1, 0, 53, 0, 5, 0, 7, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14D011, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 56, 0, 21, 0, 7, 10, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14CFDB, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BOY_2, 0, 23, 0, 13, 0, 5, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_EventScript_14D027, 0, 0, 0 + +MossdeepCity_MapWarps:: @ 8380504 + warp_def 28, 9, 0, 0, MossdeepCity_House1 + warp_def 38, 9, 0, 0, MossdeepCity_Gym + warp_def 28, 16, 0, 0, MossdeepCity_PokemonCenter_1F + warp_def 67, 24, 0, 0, MossdeepCity_House2 + warp_def 37, 18, 0, 0, MossdeepCity_Mart + warp_def 49, 6, 0, 0, MossdeepCity_House3 + warp_def 19, 10, 0, 0, MossdeepCity_StevensHouse + warp_def 18, 16, 0, 1, MossdeepCity_House4 + warp_def 64, 13, 0, 0, MossdeepCity_SpaceCenter_1F + warp_def 36, 24, 0, 0, MossdeepCity_GameCorner_1F + +MossdeepCity_MapCoordEvents:: @ 8380554 + coord_event 25, 25, 0, 0, 0x4001, 0, 0, MossdeepCity_EventScript_14D008 + coord_event 26, 25, 0, 0, 0x4001, 0, 0, MossdeepCity_EventScript_14D008 + coord_event 32, 27, 0, 0, 0x4001, 0, 0, MossdeepCity_EventScript_14D008 + coord_event 33, 27, 0, 0, 0x4001, 0, 0, MossdeepCity_EventScript_14D008 + +MossdeepCity_MapBGEvents:: @ 8380594 + bg_event 25, 16, 0, 0, 0, MossdeepCity_EventScript_14CFF6 + bg_event 34, 9, 0, 0, 0, MossdeepCity_EventScript_14CFED + bg_event 29, 16, 0, 1, 0, MossdeepCity_EventScript_1A00EA + bg_event 38, 18, 0, 1, 0, MossdeepCity_EventScript_1A00E1 + bg_event 66, 14, 0, 0, 0, MossdeepCity_EventScript_14CFFF + bg_event 30, 16, 0, 1, 0, MossdeepCity_EventScript_1A00EA + bg_event 39, 18, 0, 1, 0, MossdeepCity_EventScript_1A00E1 + bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_14CFE4 + +MossdeepCity_MapEvents:: @ 83805F4 + map_events MossdeepCity_MapObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents + diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.s b/data/maps/events/MossdeepCity_GameCorner_1F.s new file mode 100644 index 000000000..5cad24dc1 --- /dev/null +++ b/data/maps/events/MossdeepCity_GameCorner_1F.s @@ -0,0 +1,14 @@ +MossdeepCity_GameCorner_1F_MapObjects:: @ 838AC6C + object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AD42, 0, 0, 0 + +MossdeepCity_GameCorner_1F_MapWarps:: @ 838AC84 + warp_def 3, 7, 0, 9, MossdeepCity + warp_def 4, 7, 0, 9, MossdeepCity + warp_def 3, 1, 0, 0, MossdeepCity_GameCorner_B1F + +MossdeepCity_GameCorner_1F_MapBGEvents:: @ 838AC9C + bg_event 3, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AE4C + +MossdeepCity_GameCorner_1F_MapEvents:: @ 838ACA8 + map_events MossdeepCity_GameCorner_1F_MapObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents + diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.s b/data/maps/events/MossdeepCity_GameCorner_B1F.s new file mode 100644 index 000000000..47a760807 --- /dev/null +++ b/data/maps/events/MossdeepCity_GameCorner_B1F.s @@ -0,0 +1,9 @@ +MossdeepCity_GameCorner_B1F_MapObjects:: @ 838ACBC + object_event 1, 240, 0, 6, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + +MossdeepCity_GameCorner_B1F_MapWarps:: @ 838ACD4 + warp_def 3, 1, 0, 2, MossdeepCity_GameCorner_1F + +MossdeepCity_GameCorner_B1F_MapEvents:: @ 838ACDC + map_events MossdeepCity_GameCorner_B1F_MapObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MossdeepCity_Gym.s b/data/maps/events/MossdeepCity_Gym.s new file mode 100644 index 000000000..cafe7a834 --- /dev/null +++ b/data/maps/events/MossdeepCity_Gym.s @@ -0,0 +1,29 @@ +MossdeepCity_Gym_MapObjects:: @ 838A660 + object_event 1, MAP_OBJ_GFX_TATE, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_PSYCHIC_M, 0, 2, 0, 24, 0, 3, 7, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A74E, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_PSYCHIC_M, 0, 17, 0, 18, 0, 3, 7, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A77C, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_LASS, 0, 9, 0, 17, 0, 3, 9, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A7C1, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_LASS, 0, 11, 0, 10, 0, 3, 8, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A7AA, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 0, 7, 0, 3, 10, 0, 0, 1, 0, 1, 0, MossdeepCity_Gym_EventScript_15A765, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_LASS, 0, 4, 0, 3, 0, 3, 8, 0, 0, 1, 0, 2, 0, MossdeepCity_Gym_EventScript_15A793, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_MAN_2, 0, 8, 0, 29, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A7D8, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_LIZA, 0, 9, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0, 0, 0 + +MossdeepCity_Gym_MapWarps:: @ 838A738 + warp_def 9, 29, 0, 1, MossdeepCity + warp_def 10, 29, 0, 1, MossdeepCity + +MossdeepCity_Gym_MapCoordEvents:: @ 838A748 + coord_event 12, 3, 3, 0, 0x4001, 0, 0, MossdeepCity_Gym_EventScript_15A742 + +MossdeepCity_Gym_MapBGEvents:: @ 838A758 + bg_event 2, 7, 0, 0, 0, MossdeepCity_Gym_EventScript_15A5EA + bg_event 8, 10, 0, 0, 0, MossdeepCity_Gym_EventScript_15A646 + bg_event 17, 15, 0, 0, 0, MossdeepCity_Gym_EventScript_15A69A + bg_event 5, 24, 0, 0, 0, MossdeepCity_Gym_EventScript_15A6EE + bg_event 7, 27, 0, 1, 0, MossdeepCity_Gym_EventScript_15A7FA + bg_event 11, 27, 0, 1, 0, MossdeepCity_Gym_EventScript_15A80A + +MossdeepCity_Gym_MapEvents:: @ 838A7A0 + map_events MossdeepCity_Gym_MapObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents + diff --git a/data/maps/events/MossdeepCity_House1.s b/data/maps/events/MossdeepCity_House1.s new file mode 100644 index 000000000..ab1ab92cc --- /dev/null +++ b/data/maps/events/MossdeepCity_House1.s @@ -0,0 +1,11 @@ +MossdeepCity_House1_MapObjects:: @ 838A7B4 + object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 3, 0, 3, 0, 3, 3, 17, 0, 0, 0, 0, 0, MossdeepCity_House1_EventScript_15A82F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_House1_EventScript_15A85F, 0, 0, 0 + +MossdeepCity_House1_MapWarps:: @ 838A7E4 + warp_def 3, 7, 0, 0, MossdeepCity + warp_def 4, 7, 0, 0, MossdeepCity + +MossdeepCity_House1_MapEvents:: @ 838A7F4 + map_events MossdeepCity_House1_MapObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MossdeepCity_House2.s b/data/maps/events/MossdeepCity_House2.s new file mode 100644 index 000000000..e55c0ff06 --- /dev/null +++ b/data/maps/events/MossdeepCity_House2.s @@ -0,0 +1,12 @@ +MossdeepCity_House2_MapObjects:: @ 838A808 + object_event 1, MAP_OBJ_GFX_MAN_5, 0, 6, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A869, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A872, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WINGULL, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, 934, 0, 0 + +MossdeepCity_House2_MapWarps:: @ 838A850 + warp_def 3, 8, 0, 3, MossdeepCity + warp_def 4, 8, 0, 3, MossdeepCity + +MossdeepCity_House2_MapEvents:: @ 838A860 + map_events MossdeepCity_House2_MapObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MossdeepCity_House3.s b/data/maps/events/MossdeepCity_House3.s new file mode 100644 index 000000000..b55646ca9 --- /dev/null +++ b/data/maps/events/MossdeepCity_House3.s @@ -0,0 +1,10 @@ +MossdeepCity_House3_MapObjects:: @ 838AA08 + object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_House3_EventScript_15A972, 0, 0, 0 + +MossdeepCity_House3_MapWarps:: @ 838AA20 + warp_def 3, 7, 0, 5, MossdeepCity + warp_def 4, 7, 0, 5, MossdeepCity + +MossdeepCity_House3_MapEvents:: @ 838AA30 + map_events MossdeepCity_House3_MapObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MossdeepCity_House4.s b/data/maps/events/MossdeepCity_House4.s new file mode 100644 index 000000000..7eefcf496 --- /dev/null +++ b/data/maps/events/MossdeepCity_House4.s @@ -0,0 +1,12 @@ +MossdeepCity_House4_MapObjects:: @ 838AAF8 + object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB31, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB50, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_SKITTY, 0, 2, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB77, 0, 0, 0 + +MossdeepCity_House4_MapWarps:: @ 838AB40 + warp_def 4, 7, 0, 7, MossdeepCity + warp_def 3, 7, 0, 7, MossdeepCity + +MossdeepCity_House4_MapEvents:: @ 838AB50 + map_events MossdeepCity_House4_MapObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MossdeepCity_Mart.s b/data/maps/events/MossdeepCity_Mart.s new file mode 100644 index 000000000..be10d2e50 --- /dev/null +++ b/data/maps/events/MossdeepCity_Mart.s @@ -0,0 +1,13 @@ +MossdeepCity_Mart_MapObjects:: @ 838A984 + object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A926, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 1, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A956, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BOY_2, 0, 8, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A95F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_SAILOR, 0, 5, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A968, 0, 0, 0 + +MossdeepCity_Mart_MapWarps:: @ 838A9E4 + warp_def 3, 7, 0, 4, MossdeepCity + warp_def 4, 7, 0, 4, MossdeepCity + +MossdeepCity_Mart_MapEvents:: @ 838A9F4 + map_events MossdeepCity_Mart_MapObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.s b/data/maps/events/MossdeepCity_PokemonCenter_1F.s new file mode 100644 index 000000000..ddd6f6d43 --- /dev/null +++ b/data/maps/events/MossdeepCity_PokemonCenter_1F.s @@ -0,0 +1,13 @@ +MossdeepCity_PokemonCenter_1F_MapObjects:: @ 838A874 + object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8DA, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 8, 0, 4, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8E8, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 3, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8F1, 0, 0, 0 + +MossdeepCity_PokemonCenter_1F_MapWarps:: @ 838A8BC + warp_def 7, 8, 3, 2, MossdeepCity + warp_def 6, 8, 3, 2, MossdeepCity + warp_def 1, 6, 4, 0, MossdeepCity_PokemonCenter_2F + +MossdeepCity_PokemonCenter_1F_MapEvents:: @ 838A8D4 + map_events MossdeepCity_PokemonCenter_1F_MapObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.s b/data/maps/events/MossdeepCity_PokemonCenter_2F.s new file mode 100644 index 000000000..abce6d90e --- /dev/null +++ b/data/maps/events/MossdeepCity_PokemonCenter_2F.s @@ -0,0 +1,16 @@ +MossdeepCity_PokemonCenter_2F_MapObjects:: @ 838A8E8 + object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A913, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A919, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A91F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 6, 0, 3, 5, 18, 0, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A90A, 0, 0, 0 + +MossdeepCity_PokemonCenter_2F_MapWarps:: @ 838A948 + warp_def 1, 5, 4, 2, MossdeepCity_PokemonCenter_1F + warp_def 5, 1, 0, 0, SingleBattleColosseum + warp_def 8, 1, 0, 0, TradeCenter + warp_def 11, 1, 0, 0, RecordCorner + warp_def 0, 0, 0, 0, DoubleBattleColosseum + +MossdeepCity_PokemonCenter_2F_MapEvents:: @ 838A970 + map_events MossdeepCity_PokemonCenter_2F_MapObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.s b/data/maps/events/MossdeepCity_SpaceCenter_1F.s new file mode 100644 index 000000000..febaceb4a --- /dev/null +++ b/data/maps/events/MossdeepCity_SpaceCenter_1F.s @@ -0,0 +1,15 @@ +MossdeepCity_SpaceCenter_1F_MapObjects:: @ 838AB64 + object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 7, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AB8B, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 2, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABCC, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_SAILOR, 0, 6, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABD5, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_OLD_MAN_2, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC1F, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 14, 0, 7, 0, 3, 3, 17, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC16, 0, 0, 0 + +MossdeepCity_SpaceCenter_1F_MapWarps:: @ 838ABDC + warp_def 7, 9, 0, 8, MossdeepCity + warp_def 8, 9, 0, 8, MossdeepCity + warp_def 13, 1, 0, 0, MossdeepCity_SpaceCenter_2F + +MossdeepCity_SpaceCenter_1F_MapEvents:: @ 838ABF4 + map_events MossdeepCity_SpaceCenter_1F_MapObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.s b/data/maps/events/MossdeepCity_SpaceCenter_2F.s new file mode 100644 index 000000000..ca4dd97b0 --- /dev/null +++ b/data/maps/events/MossdeepCity_SpaceCenter_2F.s @@ -0,0 +1,11 @@ +MossdeepCity_SpaceCenter_2F_MapObjects:: @ 838AC08 + object_event 1, MAP_OBJ_GFX_BOY_4, 0, 6, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC49, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 11, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC40, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 5, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC37, 0, 0, 0 + +MossdeepCity_SpaceCenter_2F_MapWarps:: @ 838AC50 + warp_def 13, 1, 0, 2, MossdeepCity_SpaceCenter_1F + +MossdeepCity_SpaceCenter_2F_MapEvents:: @ 838AC58 + map_events MossdeepCity_SpaceCenter_2F_MapObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MossdeepCity_StevensHouse.s b/data/maps/events/MossdeepCity_StevensHouse.s new file mode 100644 index 000000000..062fe3a4e --- /dev/null +++ b/data/maps/events/MossdeepCity_StevensHouse.s @@ -0,0 +1,19 @@ +MossdeepCity_StevensHouse_MapObjects:: @ 838AA44 + object_event 1, MAP_OBJ_GFX_STEVEN, 0, 9, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, 967, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, 968, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, 1133, 0, 0 + object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, 727, 0, 0 + +MossdeepCity_StevensHouse_MapWarps:: @ 838AAA4 + warp_def 3, 7, 0, 6, MossdeepCity + warp_def 4, 7, 0, 6, MossdeepCity + +MossdeepCity_StevensHouse_MapBGEvents:: @ 838AAB4 + bg_event 0, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 + bg_event 1, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 + bg_event 10, 4, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 + bg_event 10, 6, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 + +MossdeepCity_StevensHouse_MapEvents:: @ 838AAE4 + map_events MossdeepCity_StevensHouse_MapObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents + diff --git a/data/maps/events/MtChimney.s b/data/maps/events/MtChimney.s new file mode 100644 index 000000000..741c7bea9 --- /dev/null +++ b/data/maps/events/MtChimney.s @@ -0,0 +1,43 @@ +MtChimney_MapObjects:: @ 838C330 + object_event 1, 247, 0, 24, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, 927, 0, 0 + object_event 2, 246, 0, 13, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, 926, 0, 0 + object_event 3, 241, 0, 12, 0, 11, 0, 3, 9, 0, 0, 1, 0, 2, 0, MtChimney_EventScript_15D110, 926, 0, 0 + object_event 4, 241, 0, 32, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, 926, 0, 0 + object_event 5, 241, 0, 28, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D159, 926, 0, 0 + object_event 6, 244, 0, 19, 0, 39, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, 927, 0, 0 + object_event 7, 244, 0, 29, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, 927, 0, 0 + object_event 8, 244, 0, 31, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D107, 927, 0, 0 + object_event 9, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 16, 0, 37, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15CF95, 877, 0, 0 + object_event 10, 241, 0, 22, 0, 39, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, 926, 0, 0 + object_event 11, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 19, 0, 3, 74, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0 + object_event 12, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 18, 0, 3, 64, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 + object_event 13, 241, 0, 23, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, 926, 0, 0 + object_event 14, MAP_OBJ_GFX_POOCHYENA, 0, 23, 0, 20, 0, 3, 65, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 + object_event 15, MAP_OBJ_GFX_POOCHYENA, 0, 22, 0, 19, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 + object_event 16, 241, 0, 23, 0, 21, 0, 3, 7, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D150, 926, 0, 0 + object_event 17, 241, 0, 21, 0, 19, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, 926, 0, 0 + object_event 18, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 12, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0 + object_event 19, MAP_OBJ_GFX_POOCHYENA, 0, 29, 0, 12, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 + object_event 20, MAP_OBJ_GFX_POOCHYENA, 0, 30, 0, 5, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0 + object_event 21, MAP_OBJ_GFX_POOCHYENA, 0, 31, 0, 5, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 + object_event 22, 241, 0, 9, 0, 15, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D127, 926, 0, 0 + object_event 23, MAP_OBJ_GFX_POOCHYENA, 0, 20, 0, 39, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, 927, 0, 0 + object_event 24, MAP_OBJ_GFX_POOCHYENA, 0, 21, 0, 39, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, 926, 0, 0 + object_event 25, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 16, 0, 18, 0, 3, 13, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D1E3, 877, 0, 0 + object_event 26, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 7, 0, 3, 70, 0, 0, 1, 0, 4, 0, MtChimney_EventScript_15D221, 877, 0, 0 + object_event 27, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D238, 877, 0, 0 + object_event 28, MAP_OBJ_GFX_BEAUTY, 0, 27, 0, 17, 0, 3, 16, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D24F, 877, 0, 0 + +MtChimney_MapWarps:: @ 838C5D0 + warp_def 17, 36, 0, 0, MtChimney_CableCarStation + warp_def 18, 36, 0, 1, MtChimney_CableCarStation + warp_def 20, 41, 3, 2, JaggedPass + warp_def 21, 41, 3, 3, JaggedPass + +MtChimney_MapBGEvents:: @ 838C5F0 + bg_event 14, 6, 0, 0, 0, MtChimney_EventScript_15D17D + bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_15D1DA + +MtChimney_MapEvents:: @ 838C608 + map_events MtChimney_MapObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents + diff --git a/data/maps/events/MtChimney_CableCarStation.s b/data/maps/events/MtChimney_CableCarStation.s new file mode 100644 index 000000000..a151775e0 --- /dev/null +++ b/data/maps/events/MtChimney_CableCarStation.s @@ -0,0 +1,11 @@ +MtChimney_CableCarStation_MapObjects:: @ 838B828 + object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 6, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_15C14B, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 6, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + +MtChimney_CableCarStation_MapWarps:: @ 838B858 + warp_def 6, 11, 0, 0, MtChimney + warp_def 7, 11, 0, 1, MtChimney + +MtChimney_CableCarStation_MapEvents:: @ 838B868 + map_events MtChimney_CableCarStation_MapObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MtPyre_1F.s b/data/maps/events/MtPyre_1F.s new file mode 100644 index 000000000..bd68cb405 --- /dev/null +++ b/data/maps/events/MtPyre_1F.s @@ -0,0 +1,16 @@ +MtPyre_1F_MapObjects:: @ 838C7FC + object_event 1, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 21, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtPyre_1F_EventScript_15D323, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 17, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, MtPyre_1F_EventScript_15D35C, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_5, 0, 13, 0, 10, 0, 3, 9, 17, 0, 0, 0, 0, 0, MtPyre_1F_EventScript_15D365, 0, 0, 0 + +MtPyre_1F_MapWarps:: @ 838C844 + warp_def 17, 18, 3, 0, Route122 + warp_def 3, 6, 3, 0, MtPyre_Exterior + warp_def 18, 18, 3, 0, Route122 + warp_def 4, 6, 3, 0, MtPyre_Exterior + warp_def 11, 1, 3, 0, MtPyre_2F + warp_def 20, 9, 3, 4, MtPyre_2F + +MtPyre_1F_MapEvents:: @ 838C874 + map_events MtPyre_1F_MapObjects, MtPyre_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MtPyre_2F.s b/data/maps/events/MtPyre_2F.s new file mode 100644 index 000000000..80f64f367 --- /dev/null +++ b/data/maps/events/MtPyre_2F.s @@ -0,0 +1,18 @@ +MtPyre_2F_MapObjects:: @ 838C888 + object_event 1, MAP_OBJ_GFX_MANIAC, 0, 6, 0, 6, 0, 3, 17, 17, 0, 1, 0, 2, 0, MtPyre_2F_EventScript_15D39B, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_1B1933, 1129, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 5, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_15D389, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 11, 0, 3, 8, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_15D392, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 8, 0, 3, 8, 17, 0, 1, 0, 0, 0, MtPyre_2F_EventScript_15D3CD, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_MAN_5, 0, 3, 0, 8, 0, 3, 8, 17, 0, 1, 0, 0, 0, MtPyre_2F_EventScript_15D3B2, 0, 0, 0 + +MtPyre_2F_MapWarps:: @ 838C918 + warp_def 2, 1, 3, 4, MtPyre_1F + warp_def 10, 1, 3, 0, MtPyre_3F + warp_def 10, 12, 3, 4, MtPyre_3F + warp_def 6, 12, 3, 5, MtPyre_3F + warp_def 11, 9, 3, 5, MtPyre_1F + +MtPyre_2F_MapEvents:: @ 838C940 + map_events MtPyre_2F_MapObjects, MtPyre_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MtPyre_3F.s b/data/maps/events/MtPyre_3F.s new file mode 100644 index 000000000..609560c1b --- /dev/null +++ b/data/maps/events/MtPyre_3F.s @@ -0,0 +1,16 @@ +MtPyre_3F_MapObjects:: @ 838C954 + object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 1, 0, 4, 0, 3, 18, 17, 0, 1, 0, 3, 0, MtPyre_3F_EventScript_15D3E9, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LASS, 0, 12, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtPyre_3F_EventScript_15D400, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_3F_EventScript_1B1940, 1120, 0, 0 + +MtPyre_3F_MapWarps:: @ 838C99C + warp_def 10, 1, 3, 1, MtPyre_2F + warp_def 2, 1, 3, 1, MtPyre_4F + warp_def 9, 10, 3, 4, MtPyre_4F + warp_def 1, 12, 3, 5, MtPyre_4F + warp_def 10, 12, 3, 2, MtPyre_2F + warp_def 6, 12, 3, 3, MtPyre_2F + +MtPyre_3F_MapEvents:: @ 838C9CC + map_events MtPyre_3F_MapObjects, MtPyre_3F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MtPyre_4F.s b/data/maps/events/MtPyre_4F.s new file mode 100644 index 000000000..9d2650c9e --- /dev/null +++ b/data/maps/events/MtPyre_4F.s @@ -0,0 +1,15 @@ +MtPyre_4F_MapObjects:: @ 838C9E0 + object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 7, 0, 3, 24, 17, 0, 1, 0, 2, 0, MtPyre_4F_EventScript_15D418, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_4F_EventScript_1B194D, 1130, 0, 0 + +MtPyre_4F_MapWarps:: @ 838CA10 + warp_def 10, 1, 3, 1, MtPyre_5F + warp_def 2, 5, 3, 1, MtPyre_3F + warp_def 12, 10, 3, 3, MtPyre_5F + warp_def 12, 12, 3, 4, MtPyre_5F + warp_def 9, 10, 3, 2, MtPyre_3F + warp_def 2, 12, 3, 3, MtPyre_3F + +MtPyre_4F_MapEvents:: @ 838CA40 + map_events MtPyre_4F_MapObjects, MtPyre_4F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MtPyre_5F.s b/data/maps/events/MtPyre_5F.s new file mode 100644 index 000000000..edc844971 --- /dev/null +++ b/data/maps/events/MtPyre_5F.s @@ -0,0 +1,14 @@ +MtPyre_5F_MapObjects:: @ 838CA54 + object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 3, 0, 7, 0, 3, 17, 17, 0, 1, 0, 2, 0, MtPyre_5F_EventScript_15D430, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_5F_EventScript_1B195A, 1052, 0, 0 + +MtPyre_5F_MapWarps:: @ 838CA84 + warp_def 2, 1, 3, 0, MtPyre_6F + warp_def 10, 5, 3, 0, MtPyre_4F + warp_def 1, 10, 3, 1, MtPyre_6F + warp_def 12, 10, 3, 2, MtPyre_4F + warp_def 12, 12, 3, 3, MtPyre_4F + +MtPyre_5F_MapEvents:: @ 838CAAC + map_events MtPyre_5F_MapObjects, MtPyre_5F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MtPyre_6F.s b/data/maps/events/MtPyre_6F.s new file mode 100644 index 000000000..420ff3711 --- /dev/null +++ b/data/maps/events/MtPyre_6F.s @@ -0,0 +1,11 @@ +MtPyre_6F_MapObjects:: @ 838CAC0 + object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 6, 0, 3, 0, 3, 23, 17, 0, 1, 0, 2, 0, MtPyre_6F_EventScript_15D448, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_6F_EventScript_1B1967, 1089, 0, 0 + +MtPyre_6F_MapWarps:: @ 838CAF0 + warp_def 2, 1, 3, 0, MtPyre_5F + warp_def 1, 10, 3, 2, MtPyre_5F + +MtPyre_6F_MapEvents:: @ 838CB00 + map_events MtPyre_6F_MapObjects, MtPyre_6F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/MtPyre_Exterior.s b/data/maps/events/MtPyre_Exterior.s new file mode 100644 index 000000000..f01e9a6b9 --- /dev/null +++ b/data/maps/events/MtPyre_Exterior.s @@ -0,0 +1,23 @@ +MtPyre_Exterior_MapObjects:: @ 838CB14 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1974, 1073, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 40, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, 1074, 0, 0 + +MtPyre_Exterior_MapWarps:: @ 838CB44 + warp_def 10, 42, 3, 1, MtPyre_1F + warp_def 19, 10, 3, 1, MtPyre_Summit + warp_def 20, 10, 3, 1, MtPyre_Summit + +MtPyre_Exterior_MapCoordEvents:: @ 838CB5C + coord_event 24, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 + coord_event 25, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 + coord_event 22, 27, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4AC + coord_event 23, 28, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4AC + coord_event 26, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 + +MtPyre_Exterior_MapBGEvents:: @ 838CBAC + bg_event 9, 8, 0, 7, 0, ITEM_ULTRA_BALL, 29, 0 + bg_event 16, 22, 0, 7, 0, ITEM_MAX_ETHER, 78, 0 + +MtPyre_Exterior_MapEvents:: @ 838CBC4 + map_events MtPyre_Exterior_MapObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents + diff --git a/data/maps/events/MtPyre_Summit.s b/data/maps/events/MtPyre_Summit.s new file mode 100644 index 000000000..a424a62fe --- /dev/null +++ b/data/maps/events/MtPyre_Summit.s @@ -0,0 +1,28 @@ +MtPyre_Summit_MapObjects:: @ 838CBD8 + object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 22, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D5EF, 0, 0, 0 + object_event 2, 246, 0, 23, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 916, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 23, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D623, 0, 0, 0 + object_event 4, 241, 0, 21, 0, 18, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DA9, 917, 0, 0 + object_event 5, 241, 0, 25, 0, 15, 0, 3, 9, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DC0, 917, 0, 0 + object_event 6, 241, 0, 21, 0, 11, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DD7, 917, 0, 0 + +MtPyre_Summit_MapWarps:: @ 838CC68 + warp_def 22, 31, 3, 1, MtPyre_Exterior + warp_def 23, 31, 3, 1, MtPyre_Exterior + warp_def 24, 31, 3, 1, MtPyre_Exterior + +MtPyre_Summit_MapCoordEvents:: @ 838CC80 + coord_event 22, 7, 3, 0, 0x40b9, 0, 0, MtPyre_Summit_EventScript_15D4BD + coord_event 23, 7, 3, 0, 0x40b9, 0, 0, MtPyre_Summit_EventScript_15D4C9 + coord_event 24, 7, 3, 0, 0x40b9, 0, 0, MtPyre_Summit_EventScript_15D4D5 + coord_event 22, 7, 3, 0, 0x40b9, 2, 0, MtPyre_Summit_EventScript_15D6CE + coord_event 23, 7, 3, 0, 0x40b9, 2, 0, MtPyre_Summit_EventScript_15D6DA + coord_event 24, 7, 3, 0, 0x40b9, 2, 0, MtPyre_Summit_EventScript_15D6E6 + +MtPyre_Summit_MapBGEvents:: @ 838CCE0 + bg_event 9, 25, 0, 7, 0, ITEM_ZINC, 79, 0 + bg_event 37, 7, 3, 7, 0, ITEM_RARE_CANDY, 80, 0 + +MtPyre_Summit_MapEvents:: @ 838CCF8 + map_events MtPyre_Summit_MapObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents + diff --git a/data/maps/events/NewMauville_Entrance.s b/data/maps/events/NewMauville_Entrance.s new file mode 100644 index 000000000..e1b1e2e04 --- /dev/null +++ b/data/maps/events/NewMauville_Entrance.s @@ -0,0 +1,10 @@ +NewMauville_Entrance_MapWarps:: @ 838DED4 + warp_def 4, 6, 3, 0, Route110 + warp_def 4, 1, 3, 0, NewMauville_Inside + +NewMauville_Entrance_MapCoordEvents:: @ 838DEE4 + coord_event 4, 2, 3, 0, 0x40ba, 0, 0, NewMauville_Entrance_EventScript_15E4DC + +NewMauville_Entrance_MapEvents:: @ 838DEF4 + map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 + diff --git a/data/maps/events/NewMauville_Inside.s b/data/maps/events/NewMauville_Inside.s new file mode 100644 index 000000000..c0cd16a2f --- /dev/null +++ b/data/maps/events/NewMauville_Inside.s @@ -0,0 +1,38 @@ +NewMauville_Inside_MapObjects:: @ 838DF08 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B183C, 1075, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 22, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1849, 1076, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1856, 1110, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 17, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1863, 1122, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1870, 1123, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E900, 974, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E91E, 975, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E93C, 976, 0, 0 + +NewMauville_Inside_MapWarps:: @ 838DFC8 + warp_def 32, 33, 3, 1, NewMauville_Entrance + +NewMauville_Inside_MapCoordEvents:: @ 838DFD0 + coord_event 30, 38, 3, 0, 0x4001, 0, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 18, 36, 3, 0, 0x4002, 0, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 4, 26, 3, 0, 0x4001, 0, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 16, 22, 3, 0, 0x4001, 0, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 25, 18, 3, 0, 0x4002, 0, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 2, 11, 3, 0, 0x4002, 0, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 6, 11, 3, 0, 0x4001, 0, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 13, 10, 3, 0, 0x4001, 0, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 17, 10, 3, 0, 0x4002, 0, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 33, 6, 3, 0, 0x40ba, 1, 0, NewMauville_Inside_EventScript_15E876 + +NewMauville_Inside_MapBGEvents:: @ 838E070 + bg_event 32, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 + bg_event 32, 3, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 + bg_event 32, 2, 0, 0, 0, NewMauville_Inside_EventScript_15E8E0 + bg_event 33, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 + bg_event 34, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 + bg_event 35, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 + bg_event 35, 3, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 + bg_event 35, 2, 0, 0, 0, NewMauville_Inside_EventScript_15E8E0 + +NewMauville_Inside_MapEvents:: @ 838E0D0 + map_events NewMauville_Inside_MapObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents + diff --git a/data/maps/events/OldaleTown.s b/data/maps/events/OldaleTown.s new file mode 100644 index 000000000..5c4fb5f93 --- /dev/null +++ b/data/maps/events/OldaleTown.s @@ -0,0 +1,28 @@ +OldaleTown_MapObjects:: @ 8380A78 + object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 16, 0, 11, 0, 3, 9, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DDB3, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 13, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DDBC, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 9, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DEDF, 0, 0, 0 + object_event 4, 240, 0, 11, 0, 19, 0, 3, 7, 17, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DF30, 979, 0, 0 + +OldaleTown_MapWarps:: @ 8380AD8 + warp_def 5, 7, 0, 0, OldaleTown_House1 + warp_def 15, 16, 0, 0, OldaleTown_House2 + warp_def 6, 16, 0, 0, OldaleTown_PokemonCenter_1F + warp_def 14, 6, 0, 0, OldaleTown_Mart + +OldaleTown_MapCoordEvents:: @ 8380AF8 + coord_event 0, 10, 3, 0, 0x4051, 0, 0, OldaleTown_EventScript_14DEFF + coord_event 8, 19, 3, 0, 0x40c7, 1, 0, OldaleTown_EventScript_14DF41 + coord_event 9, 19, 3, 0, 0x40c7, 1, 0, OldaleTown_EventScript_14DF5C + coord_event 10, 19, 3, 0, 0x40c7, 1, 0, OldaleTown_EventScript_14DF77 + +OldaleTown_MapBGEvents:: @ 8380B38 + bg_event 11, 9, 0, 0, 0, OldaleTown_EventScript_14DDAA + bg_event 7, 16, 0, 1, 0, OldaleTown_EventScript_1A00EA + bg_event 15, 6, 0, 1, 0, OldaleTown_EventScript_1A00E1 + bg_event 8, 16, 0, 1, 0, OldaleTown_EventScript_1A00EA + bg_event 16, 6, 0, 1, 0, OldaleTown_EventScript_1A00E1 + +OldaleTown_MapEvents:: @ 8380B74 + map_events OldaleTown_MapObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents + diff --git a/data/maps/events/OldaleTown_House1.s b/data/maps/events/OldaleTown_House1.s new file mode 100644 index 000000000..9af90253e --- /dev/null +++ b/data/maps/events/OldaleTown_House1.s @@ -0,0 +1,10 @@ +OldaleTown_House1_MapObjects:: @ 8385C4C + object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, OldaleTown_House1_EventScript_152EEC, 0, 0, 0 + +OldaleTown_House1_MapWarps:: @ 8385C64 + warp_def 3, 8, 0, 0, OldaleTown + warp_def 4, 8, 0, 0, OldaleTown + +OldaleTown_House1_MapEvents:: @ 8385C74 + map_events OldaleTown_House1_MapObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/OldaleTown_House2.s b/data/maps/events/OldaleTown_House2.s new file mode 100644 index 000000000..b183496ca --- /dev/null +++ b/data/maps/events/OldaleTown_House2.s @@ -0,0 +1,11 @@ +OldaleTown_House2_MapObjects:: @ 8385C88 + object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EF6, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EFF, 0, 0, 0 + +OldaleTown_House2_MapWarps:: @ 8385CB8 + warp_def 3, 7, 0, 1, OldaleTown + warp_def 4, 7, 0, 1, OldaleTown + +OldaleTown_House2_MapEvents:: @ 8385CC8 + map_events OldaleTown_House2_MapObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/OldaleTown_Mart.s b/data/maps/events/OldaleTown_Mart.s new file mode 100644 index 000000000..1621d4a79 --- /dev/null +++ b/data/maps/events/OldaleTown_Mart.s @@ -0,0 +1,12 @@ +OldaleTown_Mart_MapObjects:: @ 8385DEC + object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152F79, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152FC6, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BOY_1, 0, 9, 0, 4, 0, 3, 3, 16, 0, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152FE5, 0, 0, 0 + +OldaleTown_Mart_MapWarps:: @ 8385E34 + warp_def 3, 7, 0, 3, OldaleTown + warp_def 4, 7, 0, 3, OldaleTown + +OldaleTown_Mart_MapEvents:: @ 8385E44 + map_events OldaleTown_Mart_MapObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.s b/data/maps/events/OldaleTown_PokemonCenter_1F.s new file mode 100644 index 000000000..54049c00e --- /dev/null +++ b/data/maps/events/OldaleTown_PokemonCenter_1F.s @@ -0,0 +1,14 @@ +OldaleTown_PokemonCenter_1F_MapObjects:: @ 8385CDC + object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F17, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F25, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BOY_1, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F2E, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 3, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F37, 0, 0, 0 + +OldaleTown_PokemonCenter_1F_MapWarps:: @ 8385D3C + warp_def 7, 8, 3, 2, OldaleTown + warp_def 6, 8, 3, 2, OldaleTown + warp_def 1, 6, 4, 0, OldaleTown_PokemonCenter_2F + +OldaleTown_PokemonCenter_1F_MapEvents:: @ 8385D54 + map_events OldaleTown_PokemonCenter_1F_MapObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.s b/data/maps/events/OldaleTown_PokemonCenter_2F.s new file mode 100644 index 000000000..79e7be760 --- /dev/null +++ b/data/maps/events/OldaleTown_PokemonCenter_2F.s @@ -0,0 +1,15 @@ +OldaleTown_PokemonCenter_2F_MapObjects:: @ 8385D68 + object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F66, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F6C, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F72, 0, 0, 0 + +OldaleTown_PokemonCenter_2F_MapWarps:: @ 8385DB0 + warp_def 1, 5, 4, 2, OldaleTown_PokemonCenter_1F + warp_def 5, 1, 0, 0, SingleBattleColosseum + warp_def 8, 1, 0, 0, TradeCenter + warp_def 11, 1, 0, 0, RecordCorner + warp_def 0, 0, 0, 0, DoubleBattleColosseum + +OldaleTown_PokemonCenter_2F_MapEvents:: @ 8385DD8 + map_events OldaleTown_PokemonCenter_2F_MapObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/PacifidlogTown.s b/data/maps/events/PacifidlogTown.s new file mode 100644 index 000000000..a608c7c12 --- /dev/null +++ b/data/maps/events/PacifidlogTown.s @@ -0,0 +1,21 @@ +PacifidlogTown_MapObjects:: @ 838100C + object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 10, 0, 23, 0, 3, 9, 0, 0, 0, 0, 0, 0, PacifidlogTown_EventScript_14E909, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_FISHERMAN, 0, 11, 0, 14, 0, 3, 10, 0, 0, 0, 0, 0, 0, PacifidlogTown_EventScript_14E912, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 9, 0, 16, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_EventScript_14E900, 0, 0, 0 + +PacifidlogTown_MapWarps:: @ 8381054 + warp_def 8, 15, 0, 0, PacifidlogTown_PokemonCenter_1F + warp_def 16, 13, 0, 0, PacifidlogTown_House1 + warp_def 3, 22, 0, 0, PacifidlogTown_House2 + warp_def 12, 24, 0, 0, PacifidlogTown_House3 + warp_def 2, 12, 0, 0, PacifidlogTown_House4 + warp_def 17, 21, 0, 0, PacifidlogTown_House5 + +PacifidlogTown_MapBGEvents:: @ 8381084 + bg_event 9, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA + bg_event 7, 16, 0, 0, 0, PacifidlogTown_EventScript_14E91B + bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA + +PacifidlogTown_MapEvents:: @ 83810A8 + map_events PacifidlogTown_MapObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents + diff --git a/data/maps/events/PacifidlogTown_House1.s b/data/maps/events/PacifidlogTown_House1.s new file mode 100644 index 000000000..917648e80 --- /dev/null +++ b/data/maps/events/PacifidlogTown_House1.s @@ -0,0 +1,11 @@ +PacifidlogTown_House1_MapObjects:: @ 8386F40 + object_event 1, MAP_OBJ_GFX_MAN_6, 0, 3, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_154155, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_15415E, 0, 0, 0 + +PacifidlogTown_House1_MapWarps:: @ 8386F70 + warp_def 4, 8, 0, 1, PacifidlogTown + warp_def 5, 8, 0, 1, PacifidlogTown + +PacifidlogTown_House1_MapEvents:: @ 8386F80 + map_events PacifidlogTown_House1_MapObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/PacifidlogTown_House2.s b/data/maps/events/PacifidlogTown_House2.s new file mode 100644 index 000000000..4765253b2 --- /dev/null +++ b/data/maps/events/PacifidlogTown_House2.s @@ -0,0 +1,12 @@ +PacifidlogTown_House2_MapObjects:: @ 8386F94 + object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 3, 0, 5, 0, 3, 8, 17, 0, 0, 0, 0, 0, PacifidlogTown_House2_EventScript_154168, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_AZURILL, 0, 8, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, PacifidlogTown_House2_EventScript_154267, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_AZURILL, 0, 1, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, PacifidlogTown_House2_EventScript_154282, 0, 0, 0 + +PacifidlogTown_House2_MapWarps:: @ 8386FDC + warp_def 4, 8, 0, 2, PacifidlogTown + warp_def 5, 8, 0, 2, PacifidlogTown + +PacifidlogTown_House2_MapEvents:: @ 8386FEC + map_events PacifidlogTown_House2_MapObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/PacifidlogTown_House3.s b/data/maps/events/PacifidlogTown_House3.s new file mode 100644 index 000000000..e2a6f747f --- /dev/null +++ b/data/maps/events/PacifidlogTown_House3.s @@ -0,0 +1,11 @@ +PacifidlogTown_House3_MapObjects:: @ 8387000 + object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 3, 0, 5, 0, 3, 18, 0, 0, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_154342, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 4, 0, 2, 0, 3, 10, 17, 0, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_15429E, 0, 0, 0 + +PacifidlogTown_House3_MapWarps:: @ 8387030 + warp_def 4, 8, 0, 3, PacifidlogTown + warp_def 5, 8, 0, 3, PacifidlogTown + +PacifidlogTown_House3_MapEvents:: @ 8387040 + map_events PacifidlogTown_House3_MapObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/PacifidlogTown_House4.s b/data/maps/events/PacifidlogTown_House4.s new file mode 100644 index 000000000..52666b2e3 --- /dev/null +++ b/data/maps/events/PacifidlogTown_House4.s @@ -0,0 +1,12 @@ +PacifidlogTown_House4_MapObjects:: @ 8387054 + object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 3, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_154355, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_15434C, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BOY_1, 0, 7, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_15435E, 0, 0, 0 + +PacifidlogTown_House4_MapWarps:: @ 838709C + warp_def 4, 8, 0, 4, PacifidlogTown + warp_def 5, 8, 0, 4, PacifidlogTown + +PacifidlogTown_House4_MapEvents:: @ 83870AC + map_events PacifidlogTown_House4_MapObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/PacifidlogTown_House5.s b/data/maps/events/PacifidlogTown_House5.s new file mode 100644 index 000000000..b2793c57a --- /dev/null +++ b/data/maps/events/PacifidlogTown_House5.s @@ -0,0 +1,11 @@ +PacifidlogTown_House5_MapObjects:: @ 83870C0 + object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_154394, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 3, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_1543BA, 0, 0, 0 + +PacifidlogTown_House5_MapWarps:: @ 83870F0 + warp_def 4, 8, 0, 5, PacifidlogTown + warp_def 5, 8, 0, 5, PacifidlogTown + +PacifidlogTown_House5_MapEvents:: @ 8387100 + map_events PacifidlogTown_House5_MapObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.s b/data/maps/events/PacifidlogTown_PokemonCenter_1F.s new file mode 100644 index 000000000..d66a2eafc --- /dev/null +++ b/data/maps/events/PacifidlogTown_PokemonCenter_1F.s @@ -0,0 +1,14 @@ +PacifidlogTown_PokemonCenter_1F_MapObjects:: @ 8386E30 + object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_153F18, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_2, 0, 10, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154129, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 2, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154117, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154120, 0, 0, 0 + +PacifidlogTown_PokemonCenter_1F_MapWarps:: @ 8386E90 + warp_def 7, 8, 3, 0, PacifidlogTown + warp_def 6, 8, 3, 0, PacifidlogTown + warp_def 1, 6, 4, 0, PacifidlogTown_PokemonCenter_2F + +PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 8386EA8 + map_events PacifidlogTown_PokemonCenter_1F_MapObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.s b/data/maps/events/PacifidlogTown_PokemonCenter_2F.s new file mode 100644 index 000000000..abe443e5e --- /dev/null +++ b/data/maps/events/PacifidlogTown_PokemonCenter_2F.s @@ -0,0 +1,15 @@ +PacifidlogTown_PokemonCenter_2F_MapObjects:: @ 8386EBC + object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F48, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F4E, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_15414E, 0, 0, 0 + +PacifidlogTown_PokemonCenter_2F_MapWarps:: @ 8386F04 + warp_def 1, 5, 4, 2, PacifidlogTown_PokemonCenter_1F + warp_def 5, 1, 0, 0, SingleBattleColosseum + warp_def 8, 1, 0, 0, TradeCenter + warp_def 11, 1, 0, 0, RecordCorner + warp_def 0, 1, 0, 0, DoubleBattleColosseum + +PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 8386F2C + map_events PacifidlogTown_PokemonCenter_2F_MapObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/PetalburgCity.s b/data/maps/events/PetalburgCity.s new file mode 100644 index 000000000..10525c300 --- /dev/null +++ b/data/maps/events/PetalburgCity.s @@ -0,0 +1,38 @@ +PetalburgCity_MapObjects:: @ 837F5F0 + object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 16, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7C3, 728, 0, 0 + object_event 2, MAP_OBJ_GFX_WALLY, 0, 15, 0, 10, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 726, 0, 0 + object_event 3, MAP_OBJ_GFX_BOY_1, 0, 8, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7AC, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 20, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B824, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_MAN_1, 0, 15, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 811, 0, 0 + object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 14, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 812, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, 1039, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 28, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, 1040, 0, 0 + object_event 9, MAP_OBJ_GFX_BOY_2, 0, 12, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14BA2D, 0, 0, 0 + +PetalburgCity_MapWarps:: @ 837F6C8 + warp_def 10, 19, 0, 0, PetalburgCity_House1 + warp_def 7, 5, 0, 0, PetalburgCity_WallysHouse + warp_def 15, 8, 0, 0, PetalburgCity_Gym + warp_def 20, 16, 0, 0, PetalburgCity_PokemonCenter_1F + warp_def 20, 24, 0, 0, PetalburgCity_House2 + warp_def 25, 12, 0, 0, PetalburgCity_Mart + +PetalburgCity_MapCoordEvents:: @ 837F6F8 + coord_event 8, 10, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B836 + coord_event 8, 11, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B842 + coord_event 8, 12, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B84E + coord_event 8, 13, 3, 0, 0x4057, 0, 0, PetalburgCity_EventScript_14B85A + +PetalburgCity_MapBGEvents:: @ 837F738 + bg_event 17, 10, 0, 0, 0, PetalburgCity_EventScript_14B812 + bg_event 26, 12, 0, 1, 0, PetalburgCity_EventScript_1A00E1 + bg_event 21, 16, 0, 1, 0, PetalburgCity_EventScript_1A00EA + bg_event 17, 16, 0, 0, 0, PetalburgCity_EventScript_14B81B + bg_event 22, 16, 0, 1, 0, PetalburgCity_EventScript_1A00EA + bg_event 27, 12, 0, 1, 0, PetalburgCity_EventScript_1A00E1 + bg_event 8, 9, 0, 0, 0, PetalburgCity_EventScript_14B82D + bg_event 11, 29, 3, 7, 0, ITEM_RARE_CANDY, 95, 0 + +PetalburgCity_MapEvents:: @ 837F798 + map_events PetalburgCity_MapObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents + diff --git a/data/maps/events/PetalburgCity_Gym.s b/data/maps/events/PetalburgCity_Gym.s new file mode 100644 index 000000000..178f2a684 --- /dev/null +++ b/data/maps/events/PetalburgCity_Gym.s @@ -0,0 +1,71 @@ +PetalburgCity_Gym_MapObjects:: @ 8387168 + object_event 1, MAP_OBJ_GFX_NORMAN, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, 772, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 94, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154EE6, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 81, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154DF6, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 42, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154E32, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 55, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154F22, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 68, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154E6E, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 16, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154F5E, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_MAN_4, 0, 4, 0, 29, 0, 3, 8, 0, 0, 1, 0, 0, 0, PetalburgCity_Gym_EventScript_154EAA, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 109, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, 781, 0, 0 + object_event 10, MAP_OBJ_GFX_WALLY, 0, 4, 0, 111, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 866, 0, 0 + +PetalburgCity_Gym_MapWarps:: @ 8387258 + warp_def 4, 111, 3, 2, PetalburgCity + warp_def 5, 111, 3, 2, PetalburgCity + warp_def 1, 105, 3, 3, PetalburgCity_Gym + warp_def 7, 85, 3, 2, PetalburgCity_Gym + warp_def 6, 85, 3, 2, PetalburgCity_Gym + warp_def 7, 105, 3, 6, PetalburgCity_Gym + warp_def 1, 98, 3, 5, PetalburgCity_Gym + warp_def 2, 98, 3, 5, PetalburgCity_Gym + warp_def 1, 79, 3, 10, PetalburgCity_Gym + warp_def 7, 79, 3, 12, PetalburgCity_Gym + warp_def 7, 46, 3, 8, PetalburgCity_Gym + warp_def 6, 46, 3, 8, PetalburgCity_Gym + warp_def 1, 59, 3, 9, PetalburgCity_Gym + warp_def 2, 59, 3, 9, PetalburgCity_Gym + warp_def 1, 92, 3, 16, PetalburgCity_Gym + warp_def 7, 92, 3, 18, PetalburgCity_Gym + warp_def 7, 59, 3, 14, PetalburgCity_Gym + warp_def 6, 59, 3, 14, PetalburgCity_Gym + warp_def 1, 72, 3, 15, PetalburgCity_Gym + warp_def 2, 72, 3, 15, PetalburgCity_Gym + warp_def 7, 40, 3, 24, PetalburgCity_Gym + warp_def 1, 53, 3, 26, PetalburgCity_Gym + warp_def 7, 53, 3, 28, PetalburgCity_Gym + warp_def 1, 66, 3, 30, PetalburgCity_Gym + warp_def 1, 20, 3, 20, PetalburgCity_Gym + warp_def 2, 20, 3, 20, PetalburgCity_Gym + warp_def 7, 20, 3, 21, PetalburgCity_Gym + warp_def 6, 20, 3, 21, PetalburgCity_Gym + warp_def 1, 33, 3, 22, PetalburgCity_Gym + warp_def 2, 33, 3, 22, PetalburgCity_Gym + warp_def 7, 33, 3, 23, PetalburgCity_Gym + warp_def 6, 33, 3, 23, PetalburgCity_Gym + warp_def 7, 14, 3, 34, PetalburgCity_Gym + warp_def 1, 27, 3, 36, PetalburgCity_Gym + warp_def 1, 7, 3, 32, PetalburgCity_Gym + warp_def 2, 7, 3, 32, PetalburgCity_Gym + warp_def 7, 7, 3, 33, PetalburgCity_Gym + warp_def 6, 7, 3, 33, PetalburgCity_Gym + +PetalburgCity_Gym_MapBGEvents:: @ 8387388 + bg_event 1, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154B73 + bg_event 7, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154BC3 + bg_event 1, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_154BF8 + bg_event 7, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_154C2B + bg_event 1, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_154C5E + bg_event 7, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_154C91 + bg_event 7, 40, 3, 0, 0, PetalburgCity_Gym_EventScript_154CC4 + bg_event 1, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_154CF7 + bg_event 7, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_154D2A + bg_event 1, 66, 3, 0, 0, PetalburgCity_Gym_EventScript_154D5D + bg_event 7, 14, 3, 0, 0, PetalburgCity_Gym_EventScript_154D90 + bg_event 1, 27, 3, 0, 0, PetalburgCity_Gym_EventScript_154DC3 + bg_event 1, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_1551AA + bg_event 7, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_1551BA + +PetalburgCity_Gym_MapEvents:: @ 8387430 + map_events PetalburgCity_Gym_MapObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents + diff --git a/data/maps/events/PetalburgCity_House1.s b/data/maps/events/PetalburgCity_House1.s new file mode 100644 index 000000000..48973ff27 --- /dev/null +++ b/data/maps/events/PetalburgCity_House1.s @@ -0,0 +1,11 @@ +PetalburgCity_House1_MapObjects:: @ 8387444 + object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 7, 0, 4, 0, 3, 2, 34, 0, 0, 0, 0, 0, PetalburgCity_House1_EventScript_1551E8, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_House1_EventScript_1551DF, 0, 0, 0 + +PetalburgCity_House1_MapWarps:: @ 8387474 + warp_def 3, 8, 0, 0, PetalburgCity + warp_def 4, 8, 0, 0, PetalburgCity + +PetalburgCity_House1_MapEvents:: @ 8387484 + map_events PetalburgCity_House1_MapObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/PetalburgCity_House2.s b/data/maps/events/PetalburgCity_House2.s new file mode 100644 index 000000000..11fab721b --- /dev/null +++ b/data/maps/events/PetalburgCity_House2.s @@ -0,0 +1,11 @@ +PetalburgCity_House2_MapObjects:: @ 8387498 + object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 2, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_House2_EventScript_1551F2, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_House2_EventScript_1551FB, 0, 0, 0 + +PetalburgCity_House2_MapWarps:: @ 83874C8 + warp_def 3, 7, 0, 4, PetalburgCity + warp_def 4, 7, 0, 4, PetalburgCity + +PetalburgCity_House2_MapEvents:: @ 83874D8 + map_events PetalburgCity_House2_MapObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/PetalburgCity_Mart.s b/data/maps/events/PetalburgCity_Mart.s new file mode 100644 index 000000000..68c9abbce --- /dev/null +++ b/data/maps/events/PetalburgCity_Mart.s @@ -0,0 +1,13 @@ +PetalburgCity_Mart_MapObjects:: @ 8387614 + object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_1552B0, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_1, 0, 9, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15532C, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BOY_1, 0, 6, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_155323, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15531A, 0, 0, 0 + +PetalburgCity_Mart_MapWarps:: @ 8387674 + warp_def 3, 7, 0, 5, PetalburgCity + warp_def 4, 7, 0, 5, PetalburgCity + +PetalburgCity_Mart_MapEvents:: @ 8387684 + map_events PetalburgCity_Mart_MapObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.s b/data/maps/events/PetalburgCity_PokemonCenter_1F.s new file mode 100644 index 000000000..77ff43bc1 --- /dev/null +++ b/data/maps/events/PetalburgCity_PokemonCenter_1F.s @@ -0,0 +1,15 @@ +PetalburgCity_PokemonCenter_1F_MapObjects:: @ 83874EC + object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155213, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_5, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1B14, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155221, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 9, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_15522A, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155233, 0, 0, 0 + +PetalburgCity_PokemonCenter_1F_MapWarps:: @ 8387564 + warp_def 7, 8, 3, 3, PetalburgCity + warp_def 6, 8, 3, 3, PetalburgCity + warp_def 1, 6, 4, 0, PetalburgCity_PokemonCenter_2F + +PetalburgCity_PokemonCenter_1F_MapEvents:: @ 838757C + map_events PetalburgCity_PokemonCenter_1F_MapObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.s b/data/maps/events/PetalburgCity_PokemonCenter_2F.s new file mode 100644 index 000000000..2adccdc91 --- /dev/null +++ b/data/maps/events/PetalburgCity_PokemonCenter_2F.s @@ -0,0 +1,15 @@ +PetalburgCity_PokemonCenter_2F_MapObjects:: @ 8387590 + object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_15529D, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A3, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A9, 0, 0, 0 + +PetalburgCity_PokemonCenter_2F_MapWarps:: @ 83875D8 + warp_def 1, 5, 4, 2, PetalburgCity_PokemonCenter_1F + warp_def 5, 1, 0, 0, SingleBattleColosseum + warp_def 8, 1, 0, 0, TradeCenter + warp_def 11, 1, 0, 0, RecordCorner + warp_def 0, 0, 0, 0, DoubleBattleColosseum + +PetalburgCity_PokemonCenter_2F_MapEvents:: @ 8387600 + map_events PetalburgCity_PokemonCenter_2F_MapObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/PetalburgCity_WallysHouse.s b/data/maps/events/PetalburgCity_WallysHouse.s new file mode 100644 index 000000000..777afdc10 --- /dev/null +++ b/data/maps/events/PetalburgCity_WallysHouse.s @@ -0,0 +1,11 @@ +PetalburgCity_WallysHouse_MapObjects:: @ 8387114 + object_event 1, MAP_OBJ_GFX_MAN_3, 0, 3, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_1543C4, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_154445, 0, 0, 0 + +PetalburgCity_WallysHouse_MapWarps:: @ 8387144 + warp_def 3, 7, 0, 1, PetalburgCity + warp_def 4, 7, 0, 1, PetalburgCity + +PetalburgCity_WallysHouse_MapEvents:: @ 8387154 + map_events PetalburgCity_WallysHouse_MapObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/PetalburgWoods.s b/data/maps/events/PetalburgWoods.s new file mode 100644 index 000000000..633a02de0 --- /dev/null +++ b/data/maps/events/PetalburgWoods.s @@ -0,0 +1,38 @@ +PetalburgWoods_MapObjects:: @ 838C14C + object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B0DCC, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B0DCC, 18, 0, 0 + object_event 3, 241, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 725, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 724, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, 1056, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 35, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, 1055, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, 1058, 0, 0 + object_event 8, MAP_OBJ_GFX_BOY_2, 0, 15, 0, 19, 0, 3, 3, 33, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CECA, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BUG_CATCHER, 0, 7, 0, 32, 0, 3, 22, 0, 0, 1, 0, 3, 0, PetalburgWoods_EventScript_15CF27, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 4, 0, 14, 0, 3, 20, 0, 0, 1, 0, 3, 0, PetalburgWoods_EventScript_15CF3E, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_BOY_3, 0, 30, 0, 34, 0, 3, 2, 18, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CED3, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1779, 1117, 0, 0 + object_event 13, MAP_OBJ_GFX_GIRL_2, 0, 33, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_15CEDC, 0, 0, 0 + +PetalburgWoods_MapWarps:: @ 838C284 + warp_def 14, 5, 0, 2, Route104 + warp_def 15, 5, 0, 3, Route104 + warp_def 16, 38, 0, 4, Route104 + warp_def 17, 38, 0, 5, Route104 + warp_def 36, 38, 0, 6, Route104 + warp_def 37, 38, 0, 7, Route104 + +PetalburgWoods_MapCoordEvents:: @ 838C2B4 + coord_event 26, 23, 3, 0, 0x4098, 0, 0, PetalburgWoods_EventScript_15CCA8 + coord_event 27, 23, 3, 0, 0x4098, 0, 0, PetalburgWoods_EventScript_15CD42 + +PetalburgWoods_MapBGEvents:: @ 838C2D4 + bg_event 14, 32, 3, 0, 0, PetalburgWoods_EventScript_15CF15 + bg_event 39, 35, 3, 7, 0, ITEM_POTION, 58, 0 + bg_event 26, 6, 3, 7, 0, ITEM_TINY_MUSHROOM, 59, 0 + bg_event 40, 29, 3, 7, 0, ITEM_TINY_MUSHROOM, 60, 0 + bg_event 4, 19, 3, 7, 0, ITEM_POKE_BALL, 61, 0 + bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_15CF1E + +PetalburgWoods_MapEvents:: @ 838C31C + map_events PetalburgWoods_MapObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents + diff --git a/data/maps/events/RecordCorner.s b/data/maps/events/RecordCorner.s new file mode 100644 index 000000000..83942871c --- /dev/null +++ b/data/maps/events/RecordCorner.s @@ -0,0 +1,18 @@ +RecordCorner_MapObjects:: @ 839139C + object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 10, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, RecordCorner_EventScript_1A44BC, 0, 0, 0 + +RecordCorner_MapWarps:: @ 83913B4 + warp_def 8, 9, 3, 127, NONE + warp_def 9, 9, 3, 127, NONE + warp_def 11, 9, 3, 127, NONE + warp_def 10, 9, 3, 127, NONE + +RecordCorner_MapCoordEvents:: @ 83913D4 + coord_event 6, 4, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A4418 + coord_event 6, 6, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A4442 + coord_event 13, 4, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A442D + coord_event 13, 6, 3, 0, 0x4000, 0, 0, RecordCorner_EventScript_1A4457 + +RecordCorner_MapEvents:: @ 8391414 + map_events RecordCorner_MapObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 + diff --git a/data/maps/events/Route101.s b/data/maps/events/Route101.s new file mode 100644 index 000000000..8ee7bf27b --- /dev/null +++ b/data/maps/events/Route101.s @@ -0,0 +1,25 @@ +Route101_MapObjects:: @ 83810BC + object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 16, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA64, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 9, 0, 13, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0x0, 720, 0, 0 + object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 7, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA7F, 700, 0, 0 + object_event 4, MAP_OBJ_GFX_POOCHYENA, 0, 10, 0, 13, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0x0, 750, 0, 0 + object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_1A037F, 897, 0, 0 + object_event 6, MAP_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, 991, 0, 0 + +Route101_MapCoordEvents:: @ 838114C + coord_event 10, 19, 3, 0, 0x4060, 1, 0, Route101_EventScript_14E948 + coord_event 11, 19, 3, 0, 0x4060, 1, 0, Route101_EventScript_14E948 + coord_event 10, 18, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9B8 + coord_event 11, 18, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9B8 + coord_event 6, 16, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9CE + coord_event 6, 15, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9CE + coord_event 6, 17, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9CE + coord_event 6, 18, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9CE + coord_event 7, 13, 3, 0, 0x4060, 2, 0, Route101_EventScript_14E9E4 + +Route101_MapBGEvents:: @ 83811DC + bg_event 5, 9, 0, 0, 0, Route101_EventScript_14EA76 + +Route101_MapEvents:: @ 83811E8 + map_events Route101_MapObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents + diff --git a/data/maps/events/Route102.s b/data/maps/events/Route102.s new file mode 100644 index 000000000..58be44d36 --- /dev/null +++ b/data/maps/events/Route102.s @@ -0,0 +1,18 @@ +Route102_MapObjects:: @ 83811FC + object_event 1, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 18, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route102_EventScript_14EADA, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 33, 0, 14, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route102_EventScript_14EAFE, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BUG_CATCHER, 0, 25, 0, 15, 0, 3, 7, 0, 0, 1, 0, 2, 0, Route102_EventScript_14EB3C, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_LASS, 0, 8, 0, 7, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route102_EventScript_14EB53, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BOY_1, 0, 37, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route102_EventScript_14EAF5, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route102_EventScript_1B1439, 1000, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, Route102_EventScript_1A14DD, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, Route102_EventScript_1A14DD, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_YOUNGSTER, 0, 19, 0, 4, 0, 3, 8, 17, 0, 1, 0, 3, 0, Route102_EventScript_14EB6A, 0, 0, 0 + +Route102_MapBGEvents:: @ 83812D4 + bg_event 17, 2, 0, 0, 0, Route102_EventScript_14EAEC + bg_event 40, 9, 0, 0, 0, Route102_EventScript_14EAE3 + +Route102_MapEvents:: @ 83812EC + map_events Route102_MapObjects, 0x0, 0x0, Route102_MapBGEvents + diff --git a/data/maps/events/Route103.s b/data/maps/events/Route103.s new file mode 100644 index 000000000..2b3f4ef6c --- /dev/null +++ b/data/maps/events/Route103.s @@ -0,0 +1,23 @@ +Route103_MapObjects:: @ 8381300 + object_event 1, MAP_OBJ_GFX_MAN_4, 0, 49, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route103_EventScript_14ED82, 0, 0, 0 + object_event 2, 240, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route103_EventScript_14EB92, 723, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 71, 0, 10, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route103_EventScript_14ED94, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDF1, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 0, 11, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route103_EventScript_14EDAB, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 50, 0, 8, 0, 3, 26, 16, 0, 1, 0, 3, 0, Route103_EventScript_14EE37, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 58, 0, 5, 0, 3, 12, 0, 0, 0, 0, 5, 0, Route103_EventScript_1A14DD, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, Route103_EventScript_1A14DD, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, Route103_EventScript_1A14DD, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BOY_1, 0, 20, 0, 10, 0, 3, 2, 33, 0, 0, 0, 0, 0, Route103_EventScript_14ED79, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, 898, 0, 0 + object_event 12, MAP_OBJ_GFX_MAN_3, 0, 56, 0, 12, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route103_EventScript_14EE4E, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 63, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B1446, 1114, 0, 0 + object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B0DCC, 18, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B0DCC, 19, 0, 0 + +Route103_MapBGEvents:: @ 8381468 + bg_event 11, 9, 0, 0, 0, Route103_EventScript_14ED8B + +Route103_MapEvents:: @ 8381474 + map_events Route103_MapObjects, 0x0, 0x0, Route103_MapBGEvents + diff --git a/data/maps/events/Route104.s b/data/maps/events/Route104.s new file mode 100644 index 000000000..8bb03579c --- /dev/null +++ b/data/maps/events/Route104.s @@ -0,0 +1,59 @@ +Route104_MapObjects:: @ 8381488 + object_event 1, MAP_OBJ_GFX_BUG_CATCHER, 0, 15, 0, 60, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route104_EventScript_14EF4B, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 25, 0, 49, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF42, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_LASS, 0, 31, 0, 24, 0, 3, 9, 0, 0, 1, 0, 7, 0, Route104_EventScript_14F1A0, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BOY_1, 0, 27, 0, 63, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route104_EventScript_14EF81, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 30, 0, 50, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF8A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_GIRL_3, 0, 28, 0, 74, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route104_EventScript_14EFCC, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 54, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, 742, 0, 0 + object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 51, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, 738, 0, 0 + object_event 9, MAP_OBJ_GFX_FISHERMAN, 0, 29, 0, 8, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F172, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 6, 0, 3, 12, 0, 0, 0, 0, 8, 0, Route104_EventScript_1A14DD, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, Route104_EventScript_1A14DD, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 6, 0, 3, 12, 0, 0, 0, 0, 10, 0, Route104_EventScript_1A14DD, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 41, 0, 3, 12, 0, 0, 0, 0, 11, 0, Route104_EventScript_1A14DD, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 41, 0, 3, 12, 0, 0, 0, 0, 12, 0, Route104_EventScript_1A14DD, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 41, 0, 3, 12, 0, 0, 0, 0, 13, 0, Route104_EventScript_1A14DD, 0, 0, 0 + object_event 16, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 37, 0, 8, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EEC8, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 22, 0, 3, 12, 0, 0, 0, 0, 3, 0, Route104_EventScript_1A14DD, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, Route104_EventScript_1A14DD, 0, 0, 0 + object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, Route104_EventScript_1A14DD, 0, 0, 0 + object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, Route104_EventScript_1A14DD, 0, 0, 0 + object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 39, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route104_EventScript_1B1453, 1002, 0, 0 + object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 8, 0, 19, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_EventScript_14EF09, 906, 0, 0 + object_event 23, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F25A, 0, 0, 0 + object_event 24, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_EventScript_14F279, 0, 0, 0 + object_event 25, MAP_OBJ_GFX_BOY_4, 0, 11, 0, 44, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route104_EventScript_14F1DE, 0, 0, 0 + object_event 26, MAP_OBJ_GFX_WOMAN_3, 0, 22, 0, 25, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route104_EventScript_14F21C, 0, 0, 0 + object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B1460, 1057, 0, 0 + object_event 28, MAP_OBJ_GFX_YOUNGSTER, 0, 18, 0, 67, 0, 3, 46, 101, 0, 1, 0, 2, 0, Route104_EventScript_14F189, 0, 0, 0 + object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B146D, 1115, 0, 0 + object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B0DCC, 17, 0, 0 + object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B147A, 1135, 0, 0 + object_event 32, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_14EF93, 0, 0, 0 + +Route104_MapWarps:: @ 8381788 + warp_def 17, 50, 0, 0, Route104_MrBrineysHouse + warp_def 5, 18, 0, 0, Route104_PrettyPetalFlowerShop + warp_def 10, 30, 3, 0, PetalburgWoods + warp_def 11, 30, 3, 1, PetalburgWoods + warp_def 10, 38, 3, 2, PetalburgWoods + warp_def 11, 38, 3, 3, PetalburgWoods + warp_def 32, 42, 3, 4, PetalburgWoods + warp_def 33, 42, 3, 5, PetalburgWoods + +Route104_MapBGEvents:: @ 83817C8 + bg_event 20, 50, 0, 0, 0, Route104_EventScript_14EF54 + bg_event 27, 66, 0, 0, 0, Route104_EventScript_14EF5D + bg_event 23, 5, 0, 0, 0, Route104_EventScript_14EF66 + bg_event 7, 20, 0, 0, 0, Route104_EventScript_14EF6F + bg_event 17, 23, 3, 0, 0, Route104_EventScript_14EF78 + bg_event 7, 6, 3, 7, 0, ITEM_SUPER_POTION, 44, 0 + bg_event 3, 9, 3, 7, 0, ITEM_POKE_BALL, 62, 0 + bg_event 14, 55, 3, 7, 0, ITEM_POTION, 37, 0 + bg_event 16, 72, 3, 7, 0, ITEM_ANTIDOTE, 85, 0 + bg_event 16, 64, 3, 7, 0, ITEM_HEART_SCALE, 88, 0 + +Route104_MapEvents:: @ 8381840 + map_events Route104_MapObjects, Route104_MapWarps, 0x0, Route104_MapBGEvents + diff --git a/data/maps/events/Route104_MrBrineysHouse.s b/data/maps/events/Route104_MrBrineysHouse.s new file mode 100644 index 000000000..64959eb74 --- /dev/null +++ b/data/maps/events/Route104_MrBrineysHouse.s @@ -0,0 +1,11 @@ +Route104_MrBrineysHouse_MapObjects:: @ 838B654 + object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 3, 0, 3, 50, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, 739, 0, 0 + object_event 2, MAP_OBJ_GFX_WINGULL, 0, 6, 0, 3, 0, 3, 8, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, 881, 0, 0 + +Route104_MrBrineysHouse_MapWarps:: @ 838B684 + warp_def 5, 8, 0, 0, Route104 + warp_def 6, 8, 0, 0, Route104 + +Route104_MrBrineysHouse_MapEvents:: @ 838B694 + map_events Route104_MrBrineysHouse_MapObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.s b/data/maps/events/Route104_PrettyPetalFlowerShop.s new file mode 100644 index 000000000..d2baf64fe --- /dev/null +++ b/data/maps/events/Route104_PrettyPetalFlowerShop.s @@ -0,0 +1,12 @@ +Route104_PrettyPetalFlowerShop_MapObjects:: @ 838B6A8 + object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BE0B, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 7, 0, 3, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEA4, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 11, 0, 6, 0, 4, 2, 34, 0, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEDA, 0, 0, 0 + +Route104_PrettyPetalFlowerShop_MapWarps:: @ 838B6F0 + warp_def 2, 8, 0, 1, Route104 + warp_def 3, 8, 0, 1, Route104 + +Route104_PrettyPetalFlowerShop_MapEvents:: @ 838B700 + map_events Route104_PrettyPetalFlowerShop_MapObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Route104_Prototype.s b/data/maps/events/Route104_Prototype.s new file mode 100644 index 000000000..4d073abb2 --- /dev/null +++ b/data/maps/events/Route104_Prototype.s @@ -0,0 +1,24 @@ +Route104_Prototype_MapObjects:: @ 8391F2C + object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 27, 0, 9, 0, 3, 23, 0, 0, 1, 0, 1, 0, Route104_Prototype_EventScript_160D2E, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 0, 9, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route104_Prototype_EventScript_160D60, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 0, 10, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route104_Prototype_EventScript_160D60, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_HIKER, 0, 25, 0, 21, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route104_Prototype_EventScript_160D7B, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 16, 0, 30, 0, 3, 24, 0, 0, 1, 0, 1, 0, Route104_Prototype_EventScript_160D92, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_HIKER, 0, 34, 0, 2, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route104_Prototype_EventScript_160DA9, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BOY_1, 0, 15, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160C4B, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 14, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160CA3, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 0, 29, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_Prototype_EventScript_160D45, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 26, 0, 29, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route104_Prototype_EventScript_160D45, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_BOY_1, 0, 17, 0, 37, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160D13, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_MAN_3, 0, 11, 0, 28, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route104_Prototype_EventScript_160D0A, 0, 0, 0 + +Route104_Prototype_MapWarps:: @ 839204C + warp_def 5, 24, 0, 0, Route104_PrototypePrettyPetalFlowerShop + +Route104_Prototype_MapBGEvents:: @ 8392054 + bg_event 7, 26, 0, 0, 0, Route104_Prototype_EventScript_160D1C + bg_event 18, 8, 0, 0, 0, Route104_Prototype_EventScript_160D25 + +Route104_Prototype_MapEvents:: @ 839206C + map_events Route104_Prototype_MapObjects, Route104_Prototype_MapWarps, 0x0, Route104_Prototype_MapBGEvents + diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.s b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.s new file mode 100644 index 000000000..21cb6be90 --- /dev/null +++ b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.s @@ -0,0 +1,10 @@ +Route104_PrototypePrettyPetalFlowerShop_MapObjects:: @ 8392080 + object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route104_PrototypePrettyPetalFlowerShop_EventScript_160DC1, 0, 0, 0 + +Route104_PrototypePrettyPetalFlowerShop_MapWarps:: @ 8392098 + warp_def 2, 8, 0, 0, Route104_Prototype + warp_def 3, 8, 0, 0, Route104_Prototype + +Route104_PrototypePrettyPetalFlowerShop_MapEvents:: @ 83920A8 + map_events Route104_PrototypePrettyPetalFlowerShop_MapObjects, Route104_PrototypePrettyPetalFlowerShop_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Route105.s b/data/maps/events/Route105.s new file mode 100644 index 000000000..9ac8d94f3 --- /dev/null +++ b/data/maps/events/Route105.s @@ -0,0 +1,17 @@ +Route105_MapObjects:: @ 8381854 + object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 18, 0, 60, 0, 1, 10, 0, 0, 1, 0, 6, 0, Route105_EventScript_14F2D2, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 10, 0, 44, 0, 1, 27, 7, 0, 1, 0, 3, 0, Route105_EventScript_14F2E9, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 26, 0, 36, 0, 1, 25, 112, 0, 1, 0, 3, 0, Route105_EventScript_14F300, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 19, 0, 9, 0, 1, 24, 80, 0, 1, 0, 3, 0, Route105_EventScript_14F317, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 73, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route105_EventScript_1B1487, 1003, 0, 0 + object_event 6, MAP_OBJ_GFX_HIKER, 0, 12, 0, 51, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route105_EventScript_14F2BB, 0, 0, 0 + +Route105_MapWarps:: @ 83818E4 + warp_def 9, 20, 0, 0, IslandCave + +Route105_MapBGEvents:: @ 83818EC + bg_event 15, 68, 3, 7, 0, ITEM_HEART_SCALE, 89, 0 + +Route105_MapEvents:: @ 83818F8 + map_events Route105_MapObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents + diff --git a/data/maps/events/Route106.s b/data/maps/events/Route106.s new file mode 100644 index 000000000..1119231b5 --- /dev/null +++ b/data/maps/events/Route106.s @@ -0,0 +1,19 @@ +Route106_MapObjects:: @ 838190C + object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 29, 0, 11, 0, 1, 27, 4, 0, 1, 0, 3, 0, Route106_EventScript_14F338, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 18, 0, 5, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route106_EventScript_14F34F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 51, 0, 14, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route106_EventScript_14F366, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_FISHERMAN, 0, 65, 0, 14, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route106_EventScript_14F3A4, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route106_EventScript_1B1494, 1004, 0, 0 + +Route106_MapWarps:: @ 8381984 + warp_def 48, 16, 0, 0, GraniteCave_1F + +Route106_MapBGEvents:: @ 838198C + bg_event 41, 11, 3, 7, 0, ITEM_POKE_BALL, 63, 0 + bg_event 53, 12, 0, 7, 0, ITEM_STARDUST, 46, 0 + bg_event 68, 15, 3, 7, 0, ITEM_HEART_SCALE, 47, 0 + bg_event 59, 13, 3, 0, 0, Route106_EventScript_14F32F + +Route106_MapEvents:: @ 83819BC + map_events Route106_MapObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents + diff --git a/data/maps/events/Route107.s b/data/maps/events/Route107.s new file mode 100644 index 000000000..576975eca --- /dev/null +++ b/data/maps/events/Route107.s @@ -0,0 +1,11 @@ +Route107_MapObjects:: @ 83819D0 + object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 27, 0, 10, 0, 1, 24, 17, 0, 1, 0, 3, 0, Route107_EventScript_14F3BC, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 38, 0, 11, 0, 1, 52, 38, 0, 1, 0, 2, 0, Route107_EventScript_14F3D3, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 50, 0, 6, 0, 1, 14, 0, 0, 1, 0, 3, 0, Route107_EventScript_14F411, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 16, 0, 11, 0, 1, 7, 0, 0, 1, 0, 4, 0, Route107_EventScript_14F428, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_SWIMMER_F, 0, 33, 0, 4, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route107_EventScript_14F43F, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 0, 4, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route107_EventScript_14F45A, 0, 0, 0 + +Route107_MapEvents:: @ 8381A60 + map_events Route107_MapObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/events/Route108.s b/data/maps/events/Route108.s new file mode 100644 index 000000000..363cb6bd1 --- /dev/null +++ b/data/maps/events/Route108.s @@ -0,0 +1,15 @@ +Route108_MapObjects:: @ 8381A74 + object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 17, 0, 13, 0, 1, 45, 51, 0, 1, 0, 3, 0, Route108_EventScript_14F476, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 8, 0, 6, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route108_EventScript_14F4A4, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 50, 0, 10, 0, 1, 24, 0, 0, 1, 0, 3, 0, Route108_EventScript_14F48D, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 36, 0, 12, 0, 1, 51, 54, 0, 1, 0, 3, 0, Route108_EventScript_14F4BB, 0, 0, 0 + +Route108_MapWarps:: @ 8381AD4 + warp_def 29, 6, 3, 0, AbandonedShip_Deck + +Route108_MapBGEvents:: @ 8381ADC + bg_event 38, 14, 3, 7, 0, ITEM_RARE_CANDY, 86, 0 + +Route108_MapEvents:: @ 8381AE8 + map_events Route108_MapObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents + diff --git a/data/maps/events/Route109.s b/data/maps/events/Route109.s new file mode 100644 index 000000000..e076fc164 --- /dev/null +++ b/data/maps/events/Route109.s @@ -0,0 +1,38 @@ +Route109_MapObjects:: @ 8381AFC + object_event 1, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 0, 26, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, 744, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 21, 0, 24, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F680, 741, 0, 0 + object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 12, 0, 36, 0, 3, 10, 0, 0, 1, 0, 5, 0, Route109_EventScript_14F7AD, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 25, 0, 42, 0, 3, 15, 0, 0, 1, 0, 5, 0, Route109_EventScript_14F7C4, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_SAILOR, 0, 19, 0, 19, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route109_EventScript_14F7DB, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_SAILOR, 0, 14, 0, 11, 0, 4, 8, 0, 0, 1, 0, 1, 0, Route109_EventScript_14F7F2, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_TUBER_M, 0, 21, 0, 11, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F809, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_TUBER_F, 0, 28, 0, 8, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route109_EventScript_14F847, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F705, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 48, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route109_EventScript_1B14A1, 1005, 0, 0 + object_event 11, MAP_OBJ_GFX_TUBER_F, 0, 29, 0, 32, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F89C, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_TUBER_F, 0, 28, 0, 31, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route109_EventScript_14F885, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 15, 0, 52, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route109_EventScript_14F8B3, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_TUBER_M, 0, 24, 0, 17, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F70E, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_TUBER_F, 0, 25, 0, 17, 0, 3, 9, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F725, 0, 0, 0 + object_event 16, MAP_OBJ_GFX_WOMAN_2, 0, 30, 0, 32, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F776, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_WOMAN_5, 0, 8, 0, 41, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route109_EventScript_14F8E5, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_MAN_5, 0, 9, 0, 41, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route109_EventScript_14F8CA, 0, 0, 0 + object_event 19, MAP_OBJ_GFX_OLD_MAN_2, 0, 33, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F77F, 0, 0, 0 + object_event 20, MAP_OBJ_GFX_ZIGZAGOON, 0, 32, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route109_EventScript_14F788, 0, 0, 0 + +Route109_MapWarps:: @ 8381CDC + warp_def 12, 5, 0, 0, Route109_SeashoreHouse + +Route109_MapBGEvents:: @ 8381CE4 + bg_event 15, 5, 0, 0, 0, Route109_EventScript_14F79B + bg_event 29, 10, 3, 0, 0, Route109_EventScript_14F7A4 + bg_event 16, 23, 3, 7, 0, ITEM_REVIVE, 50, 0 + bg_event 33, 5, 3, 7, 0, ITEM_HEART_SCALE, 52, 0 + bg_event 9, 10, 3, 7, 0, ITEM_GREAT_BALL, 51, 0 + bg_event 28, 20, 3, 7, 0, ITEM_ETHER, 64, 0 + bg_event 13, 16, 3, 7, 0, ITEM_HEART_SCALE, 90, 0 + bg_event 8, 42, 3, 7, 0, ITEM_HEART_SCALE, 91, 0 + +Route109_MapEvents:: @ 8381D44 + map_events Route109_MapObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents + diff --git a/data/maps/events/Route109_SeashoreHouse.s b/data/maps/events/Route109_SeashoreHouse.s new file mode 100644 index 000000000..47ea6ce96 --- /dev/null +++ b/data/maps/events/Route109_SeashoreHouse.s @@ -0,0 +1,13 @@ +Route109_SeashoreHouse_MapObjects:: @ 83920BC + object_event 1, MAP_OBJ_GFX_MAN_3, 0, 6, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_160DD4, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SAILOR, 0, 2, 0, 3, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route109_SeashoreHouse_EventScript_160EB8, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_TUBER_M, 0, 14, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route109_SeashoreHouse_EventScript_160EEE, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 10, 0, 5, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route109_SeashoreHouse_EventScript_160ED3, 0, 0, 0 + +Route109_SeashoreHouse_MapWarps:: @ 839211C + warp_def 6, 9, 0, 0, Route109 + warp_def 7, 9, 0, 0, Route109 + +Route109_SeashoreHouse_MapEvents:: @ 839212C + map_events Route109_SeashoreHouse_MapObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Route110.s b/data/maps/events/Route110.s new file mode 100644 index 000000000..105119052 --- /dev/null +++ b/data/maps/events/Route110.s @@ -0,0 +1,70 @@ +Route110_MapObjects:: @ 8381D58 + object_event 1, MAP_OBJ_GFX_CAMPER, 0, 17, 0, 90, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F9D4, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 0, 79, 0, 4, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F9CB, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 14, 0, 69, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route110_EventScript_14F9C2, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 0, 57, 0, 4, 2, 17, 0, 0, 0, 0, 0, Route110_EventScript_14F9B0, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 10, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route110_EventScript_14F9B9, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 0, 24, 0, 4, 2, 49, 0, 0, 0, 0, 0, Route110_EventScript_14F9A7, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BOY_3, 0, 15, 0, 7, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route110_EventScript_14F99E, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 0, 73, 0, 4, 49, 226, 0, 1, 0, 3, 0, Route110_EventScript_14FB7D, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 0, 31, 0, 4, 51, 26, 0, 1, 0, 3, 0, Route110_EventScript_14FB28, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 0, 31, 0, 4, 9, 17, 0, 1, 0, 4, 0, Route110_EventScript_14FB94, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 0, 55, 0, 4, 45, 68, 0, 1, 0, 3, 0, Route110_EventScript_14FB3F, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_PSYCHIC_M, 0, 5, 0, 39, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FA8E, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_LASS, 0, 33, 0, 15, 0, 3, 9, 0, 0, 1, 0, 1, 0, Route110_EventScript_14FAA5, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_MANIAC, 0, 23, 0, 40, 0, 3, 20, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FABC, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 10, 0, 19, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_EventScript_14FAFA, 0, 0, 0 + object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 11, 0, 3, 12, 0, 0, 0, 0, 16, 0, Route110_EventScript_1A14DD, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, Route110_EventScript_1A14DD, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, Route110_EventScript_1A14DD, 0, 0, 0 + object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 69, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14BB, 1007, 0, 0 + object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14AE, 1006, 0, 0 + object_event 21, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 0, 92, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_EventScript_14FA53, 0, 0, 0 + object_event 22, 241, 0, 7, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F946, 900, 0, 0 + object_event 23, 241, 0, 8, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F95C, 900, 0, 0 + object_event 24, 241, 0, 9, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F972, 900, 0, 0 + object_event 25, 241, 0, 10, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F988, 900, 0, 0 + object_event 26, 241, 0, 8, 0, 82, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 900, 0, 0 + object_event 27, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 0, 78, 0, 4, 51, 23, 0, 1, 0, 2, 0, Route110_EventScript_14FB11, 0, 0, 0 + object_event 28, 240, 0, 34, 0, 54, 0, 3, 14, 0, 0, 0, 0, 0, 0, 0x0, 919, 0, 0 + object_event 29, 243, 0, 34, 0, 54, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 922, 0, 0 + object_event 30, MAP_OBJ_GFX_YOUNGSTER, 0, 33, 0, 69, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route110_EventScript_14FC10, 0, 0, 0 + object_event 31, MAP_OBJ_GFX_WOMAN_2, 0, 11, 0, 73, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route110_EventScript_14FBD2, 0, 0, 0 + +Route110_MapWarps:: @ 8382040 + warp_def 35, 24, 3, 0, NewMauville_Entrance + warp_def 11, 66, 0, 0, Route110_TrickHouseEntrance + warp_def 15, 16, 0, 0, Route110_SeasideCyclingRoadNorthEntrance + warp_def 18, 16, 0, 2, Route110_SeasideCyclingRoadNorthEntrance + warp_def 16, 88, 0, 0, Route110_SeasideCyclingRoadSouthEntrance + warp_def 19, 88, 0, 2, Route110_SeasideCyclingRoadSouthEntrance + +Route110_MapCoordEvents:: @ 8382070 + coord_event 28, 92, 3, 0, 0x40a9, 2, 0, Route110_EventScript_14FC27 + coord_event 29, 92, 3, 0, 0x40a9, 2, 0, Route110_EventScript_14FC27 + coord_event 33, 56, 3, 0, 0x4069, 0, 0, Route110_EventScript_14FD13 + coord_event 34, 56, 3, 0, 0x4069, 0, 0, Route110_EventScript_14FD1E + coord_event 35, 56, 3, 0, 0x4069, 0, 0, Route110_EventScript_14FD29 + +Route110_MapBGEvents:: @ 83820C0 + bg_event 15, 25, 0, 0, 0, Route110_EventScript_14F9EF + bg_event 9, 51, 0, 0, 0, Route110_EventScript_14FA01 + bg_event 14, 88, 0, 0, 0, Route110_EventScript_14F9E6 + bg_event 20, 94, 0, 0, 0, Route110_EventScript_14F9DD + bg_event 7, 75, 0, 0, 0, Route110_EventScript_14F9F8 + bg_event 3, 17, 0, 0, 0, Route110_EventScript_14FA0A + bg_event 16, 25, 0, 8, 0, ITEM_MACHO_BRACE, 0, 0 + bg_event 17, 25, 0, 8, 0, ITEM_SOUL_DEW, 0, 0 + bg_event 35, 39, 3, 0, 0, Route110_EventScript_14FA13 + bg_event 37, 70, 3, 0, 0, Route110_EventScript_14FA1C + bg_event 8, 67, 0, 0, 0, Route110_EventScript_14FA25 + bg_event 32, 93, 0, 0, 0, Route110_EventScript_14FA2E + bg_event 26, 40, 3, 7, 0, ITEM_REVIVE, 54, 0 + bg_event 34, 42, 3, 7, 0, ITEM_GREAT_BALL, 53, 0 + bg_event 4, 35, 3, 7, 0, ITEM_POKE_BALL, 65, 0 + bg_event 37, 67, 3, 7, 0, ITEM_FULL_HEAL, 55, 0 + bg_event 13, 16, 0, 0, 0, Route110_EventScript_14F9E6 + +Route110_MapEvents:: @ 838218C + map_events Route110_MapObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents + diff --git a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.s b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.s new file mode 100644 index 000000000..dd1546439 --- /dev/null +++ b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.s @@ -0,0 +1,16 @@ +Route110_SeasideCyclingRoadNorthEntrance_MapObjects:: @ 8392CAC + object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB, 0, 0, 0 + +Route110_SeasideCyclingRoadNorthEntrance_MapWarps:: @ 8392CC4 + warp_def 1, 5, 0, 2, Route110 + warp_def 2, 5, 0, 2, Route110 + warp_def 12, 5, 0, 3, Route110 + warp_def 13, 5, 0, 3, Route110 + +Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents:: @ 8392CE4 + coord_event 7, 4, 3, 0, 0x4001, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7 + coord_event 5, 4, 3, 0, 0x4001, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A + +Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 8392D04 + map_events Route110_SeasideCyclingRoadNorthEntrance_MapObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 + diff --git a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.s b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.s new file mode 100644 index 000000000..6019467dc --- /dev/null +++ b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.s @@ -0,0 +1,16 @@ +Route110_SeasideCyclingRoadSouthEntrance_MapObjects:: @ 8392C40 + object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F, 0, 0, 0 + +Route110_SeasideCyclingRoadSouthEntrance_MapWarps:: @ 8392C58 + warp_def 1, 5, 0, 4, Route110 + warp_def 2, 5, 0, 4, Route110 + warp_def 12, 5, 0, 5, Route110 + warp_def 13, 5, 0, 5, Route110 + +Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents:: @ 8392C78 + coord_event 7, 4, 3, 0, 0x4001, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B + coord_event 5, 4, 3, 0, 0x4001, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD + +Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 8392C98 + map_events Route110_SeasideCyclingRoadSouthEntrance_MapObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 + diff --git a/data/maps/events/Route110_TrickHouseCorridor.s b/data/maps/events/Route110_TrickHouseCorridor.s new file mode 100644 index 000000000..5546edf44 --- /dev/null +++ b/data/maps/events/Route110_TrickHouseCorridor.s @@ -0,0 +1,9 @@ +Route110_TrickHouseCorridor_MapWarps:: @ 8392228 + warp_def 13, 3, 3, 1, Route110_TrickHouseEnd + warp_def 14, 3, 3, 1, Route110_TrickHouseEnd + warp_def 4, 23, 3, 2, Route110_TrickHouseEntrance + warp_def 5, 23, 3, 2, Route110_TrickHouseEntrance + +Route110_TrickHouseCorridor_MapEvents:: @ 8392248 + map_events 0x0, Route110_TrickHouseCorridor_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Route110_TrickHouseEnd.s b/data/maps/events/Route110_TrickHouseEnd.s new file mode 100644 index 000000000..7a789fc5a --- /dev/null +++ b/data/maps/events/Route110_TrickHouseEnd.s @@ -0,0 +1,16 @@ +Route110_TrickHouseEnd_MapObjects:: @ 83921D0 + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, 899, 0, 0 + +Route110_TrickHouseEnd_MapWarps:: @ 83921E8 + warp_def 10, 1, 3, 2, Route110_TrickHousePuzzle1 + warp_def 2, 1, 3, 0, Route110_TrickHouseCorridor + +Route110_TrickHouseEnd_MapCoordEvents:: @ 83921F8 + coord_event 2, 2, 3, 0, 0x4002, 0, 0, Route110_TrickHouseEnd_EventScript_161CA0 + +Route110_TrickHouseEnd_MapBGEvents:: @ 8392208 + bg_event 4, 5, 3, 7, 0, ITEM_NUGGET, 1, 0 + +Route110_TrickHouseEnd_MapEvents:: @ 8392214 + map_events Route110_TrickHouseEnd_MapObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents + diff --git a/data/maps/events/Route110_TrickHouseEntrance.s b/data/maps/events/Route110_TrickHouseEntrance.s new file mode 100644 index 000000000..dde80168a --- /dev/null +++ b/data/maps/events/Route110_TrickHouseEntrance.s @@ -0,0 +1,20 @@ +Route110_TrickHouseEntrance_MapObjects:: @ 8392140 + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 6, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, 872, 0, 0 + +Route110_TrickHouseEntrance_MapWarps:: @ 8392158 + warp_def 5, 7, 3, 1, Route110 + warp_def 6, 7, 3, 1, Route110 + warp_def 5, 2, 3, 0, Route110_TrickHousePuzzle1 + +Route110_TrickHouseEntrance_MapCoordEvents:: @ 8392170 + coord_event 4, 7, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 5, 6, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 6, 6, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 7, 7, 3, 0, 0x40a5, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + +Route110_TrickHouseEntrance_MapBGEvents:: @ 83921B0 + bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_16158A + +Route110_TrickHouseEntrance_MapEvents:: @ 83921BC + map_events Route110_TrickHouseEntrance_MapObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents + diff --git a/data/maps/events/Route110_TrickHousePuzzle1.s b/data/maps/events/Route110_TrickHousePuzzle1.s new file mode 100644 index 000000000..20d28aa1e --- /dev/null +++ b/data/maps/events/Route110_TrickHousePuzzle1.s @@ -0,0 +1,32 @@ +Route110_TrickHousePuzzle1_MapObjects:: @ 839225C + object_event 1, MAP_OBJ_GFX_LASS, 0, 13, 0, 21, 0, 3, 9, 0, 0, 1, 0, 5, 0, Route110_TrickHousePuzzle1_EventScript_161D31, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 13, 0, 7, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle1_EventScript_161D48, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_LASS, 0, 3, 0, 8, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle1_EventScript_161D5F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 19, 0, 0 + object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 17, 0, 0 + object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 18, 0, 0 + object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 20, 0, 0 + object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 23, 0, 0 + object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 22, 0, 0 + object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 21, 0, 0 + object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 25, 0, 0 + object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 24, 0, 0 + object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 26, 0, 0 + object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 28, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 27, 0, 0 + object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 29, 0, 0 + object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 30, 0, 0 + object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, 1060, 0, 0 + object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B0DCC, 31, 0, 0 + +Route110_TrickHousePuzzle1_MapWarps:: @ 8392424 + warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance + warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance + warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + +Route110_TrickHousePuzzle1_MapBGEvents:: @ 839243C + bg_event 14, 8, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_161D14 + +Route110_TrickHousePuzzle1_MapEvents:: @ 8392448 + map_events Route110_TrickHousePuzzle1_MapObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents + diff --git a/data/maps/events/Route110_TrickHousePuzzle2.s b/data/maps/events/Route110_TrickHousePuzzle2.s new file mode 100644 index 000000000..68cbbf898 --- /dev/null +++ b/data/maps/events/Route110_TrickHousePuzzle2.s @@ -0,0 +1,24 @@ +Route110_TrickHousePuzzle2_MapObjects:: @ 839245C + object_event 1, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 13, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle2_EventScript_161E78, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 0, 10, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle2_EventScript_161E8F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 9, 0, 7, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route110_TrickHousePuzzle2_EventScript_161EA6, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 5, 0, 19, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A6B, 1062, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, 1061, 0, 0 + +Route110_TrickHousePuzzle2_MapWarps:: @ 83924D4 + warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance + warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance + warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + +Route110_TrickHousePuzzle2_MapCoordEvents:: @ 83924EC + coord_event 14, 21, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DE0 + coord_event 8, 17, 3, 0, 0x4002, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DF3 + coord_event 4, 10, 3, 0, 0x4003, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E06 + coord_event 5, 2, 0, 0, 0x4004, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E19 + +Route110_TrickHousePuzzle2_MapBGEvents:: @ 839252C + bg_event 14, 5, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DC3 + +Route110_TrickHousePuzzle2_MapEvents:: @ 8392538 + map_events Route110_TrickHousePuzzle2_MapObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents + diff --git a/data/maps/events/Route110_TrickHousePuzzle3.s b/data/maps/events/Route110_TrickHousePuzzle3.s new file mode 100644 index 000000000..7f8b7e792 --- /dev/null +++ b/data/maps/events/Route110_TrickHousePuzzle3.s @@ -0,0 +1,33 @@ +Route110_TrickHousePuzzle3_MapObjects:: @ 839254C + object_event 1, MAP_OBJ_GFX_CAMPER, 0, 10, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162708, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_PICNICKER, 0, 1, 0, 13, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_16271F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_HIKER, 0, 11, 0, 4, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle3_EventScript_162736, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B0EB7, 17, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B0EB7, 18, 0, 0 + object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B0EB7, 19, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B0EB7, 20, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, 1064, 0, 0 + object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, 1063, 0, 0 + object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B0EB7, 21, 0, 0 + object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B0EB7, 22, 0, 0 + +Route110_TrickHousePuzzle3_MapWarps:: @ 8392654 + warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance + warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance + warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + +Route110_TrickHousePuzzle3_MapCoordEvents:: @ 839266C + coord_event 5, 20, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625AB + coord_event 4, 12, 3, 0, 0x4002, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625B7 + coord_event 11, 10, 3, 0, 0x4003, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625C3 + coord_event 3, 8, 3, 0, 0x4004, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625CF + coord_event 13, 7, 3, 0, 0x4005, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625DB + coord_event 1, 3, 3, 0, 0x4006, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625E7 + coord_event 10, 2, 3, 0, 0x4007, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625F3 + +Route110_TrickHousePuzzle3_MapBGEvents:: @ 83926DC + bg_event 0, 8, 3, 0, 0, Route110_TrickHousePuzzle3_EventScript_1626EB + +Route110_TrickHousePuzzle3_MapEvents:: @ 83926E8 + map_events Route110_TrickHousePuzzle3_MapObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents + diff --git a/data/maps/events/Route110_TrickHousePuzzle4.s b/data/maps/events/Route110_TrickHousePuzzle4.s new file mode 100644 index 000000000..aaa1bb895 --- /dev/null +++ b/data/maps/events/Route110_TrickHousePuzzle4.s @@ -0,0 +1,28 @@ +Route110_TrickHousePuzzle4_MapObjects:: @ 83926FC + object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 12, 0, 8, 0, 3, 9, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_16276B, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 4, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle4_EventScript_162799, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 7, 0, 4, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle4_EventScript_162782, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, 1065, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 17, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 18, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 19, 0, 0 + object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 20, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 21, 0, 0 + object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 22, 0, 0 + object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 23, 0, 0 + object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 24, 0, 0 + object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 25, 0, 0 + object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 26, 0, 0 + object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B0FCB, 27, 0, 0 + +Route110_TrickHousePuzzle4_MapWarps:: @ 8392864 + warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance + warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance + warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + +Route110_TrickHousePuzzle4_MapBGEvents:: @ 839287C + bg_event 0, 5, 3, 0, 0, Route110_TrickHousePuzzle4_EventScript_16274E + +Route110_TrickHousePuzzle4_MapEvents:: @ 8392888 + map_events Route110_TrickHousePuzzle4_MapObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents + diff --git a/data/maps/events/Route110_TrickHousePuzzle5.s b/data/maps/events/Route110_TrickHousePuzzle5.s new file mode 100644 index 000000000..487bb49f8 --- /dev/null +++ b/data/maps/events/Route110_TrickHousePuzzle5.s @@ -0,0 +1,34 @@ +Route110_TrickHousePuzzle5_MapObjects:: @ 839289C + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 9, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627F2, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_1, 0, 5, 0, 14, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162813, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_1, 0, 12, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162834, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_1, 0, 12, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162855, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_MAN_1, 0, 1, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162876, 0, 0, 0 + +Route110_TrickHousePuzzle5_MapWarps:: @ 8392914 + warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance + warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance + warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + +Route110_TrickHousePuzzle5_MapCoordEvents:: @ 839292C + coord_event 8, 19, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_162897 + coord_event 7, 19, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628A3 + coord_event 6, 19, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628AF + coord_event 5, 19, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628BB + coord_event 6, 14, 3, 0, 0x4002, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628C7 + coord_event 7, 14, 3, 0, 0x4002, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628D3 + coord_event 11, 10, 3, 0, 0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628DF + coord_event 10, 10, 3, 0, 0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628EB + coord_event 9, 10, 3, 0, 0x4003, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628F7 + coord_event 11, 5, 3, 0, 0x4004, 0, 0, Route110_TrickHousePuzzle5_EventScript_162903 + coord_event 10, 5, 3, 0, 0x4004, 0, 0, Route110_TrickHousePuzzle5_EventScript_16290F + coord_event 2, 6, 3, 0, 0x4005, 0, 0, Route110_TrickHousePuzzle5_EventScript_16291B + coord_event 3, 6, 3, 0, 0x4005, 0, 0, Route110_TrickHousePuzzle5_EventScript_162927 + coord_event 4, 6, 3, 0, 0x4005, 0, 0, Route110_TrickHousePuzzle5_EventScript_162933 + +Route110_TrickHousePuzzle5_MapBGEvents:: @ 8392A0C + bg_event 2, 9, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627D5 + +Route110_TrickHousePuzzle5_MapEvents:: @ 8392A18 + map_events Route110_TrickHousePuzzle5_MapObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents + diff --git a/data/maps/events/Route110_TrickHousePuzzle6.s b/data/maps/events/Route110_TrickHousePuzzle6.s new file mode 100644 index 000000000..9188da0d1 --- /dev/null +++ b/data/maps/events/Route110_TrickHousePuzzle6.s @@ -0,0 +1,17 @@ +Route110_TrickHousePuzzle6_MapObjects:: @ 8392A2C + object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 10, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle6_EventScript_163107, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_6, 0, 14, 0, 12, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle6_EventScript_16311E, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 0, 3, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route110_TrickHousePuzzle6_EventScript_163135, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, 1067, 0, 0 + +Route110_TrickHousePuzzle6_MapWarps:: @ 8392A8C + warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance + warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance + warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + +Route110_TrickHousePuzzle6_MapBGEvents:: @ 8392AA4 + bg_event 13, 9, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_1630EA + +Route110_TrickHousePuzzle6_MapEvents:: @ 8392AB0 + map_events Route110_TrickHousePuzzle6_MapObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents + diff --git a/data/maps/events/Route110_TrickHousePuzzle7.s b/data/maps/events/Route110_TrickHousePuzzle7.s new file mode 100644 index 000000000..9ab0a3754 --- /dev/null +++ b/data/maps/events/Route110_TrickHousePuzzle7.s @@ -0,0 +1,25 @@ +Route110_TrickHousePuzzle7_MapObjects:: @ 8392AC4 + object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 0, 3, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle7_EventScript_1633D6, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LASS, 0, 14, 0, 3, 0, 3, 7, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle7_EventScript_163404, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_HEX_MANIAC, 0, 9, 0, 10, 0, 3, 23, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle7_EventScript_1633ED, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, 1068, 0, 0 + +Route110_TrickHousePuzzle7_MapWarps:: @ 8392B24 + warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance + warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance + warp_def 13, 1, 3, 0, Route110_TrickHouseEnd + +Route110_TrickHousePuzzle7_MapCoordEvents:: @ 8392B3C + coord_event 9, 2, 3, 0, 0x4001, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632A8 + +Route110_TrickHousePuzzle7_MapBGEvents:: @ 8392B4C + bg_event 7, 2, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_16328B + bg_event 12, 16, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632B9 + bg_event 5, 10, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163317 + bg_event 12, 11, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632E8 + bg_event 4, 4, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163346 + bg_event 7, 5, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163375 + +Route110_TrickHousePuzzle7_MapEvents:: @ 8392B94 + map_events Route110_TrickHousePuzzle7_MapObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents + diff --git a/data/maps/events/Route110_TrickHousePuzzle8.s b/data/maps/events/Route110_TrickHousePuzzle8.s new file mode 100644 index 000000000..7fbdbed39 --- /dev/null +++ b/data/maps/events/Route110_TrickHousePuzzle8.s @@ -0,0 +1,17 @@ +Route110_TrickHousePuzzle8_MapObjects:: @ 8392BA8 + object_event 1, MAP_OBJ_GFX_MAN_4, 0, 12, 0, 21, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle8_EventScript_163439, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_4, 0, 12, 0, 11, 0, 3, 10, 0, 0, 1, 0, 2, 0, Route110_TrickHousePuzzle8_EventScript_163467, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 11, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route110_TrickHousePuzzle8_EventScript_163450, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, 1069, 0, 0 + +Route110_TrickHousePuzzle8_MapWarps:: @ 8392C08 + warp_def 0, 21, 3, 2, Route110_TrickHouseEntrance + warp_def 1, 21, 3, 2, Route110_TrickHouseEntrance + warp_def 13, 1, 0, 0, Route110_TrickHouseEnd + +Route110_TrickHousePuzzle8_MapBGEvents:: @ 8392C20 + bg_event 7, 11, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_16341C + +Route110_TrickHousePuzzle8_MapEvents:: @ 8392C2C + map_events Route110_TrickHousePuzzle8_MapObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents + diff --git a/data/maps/events/Route111.s b/data/maps/events/Route111.s new file mode 100644 index 000000000..500287f46 --- /dev/null +++ b/data/maps/events/Route111.s @@ -0,0 +1,101 @@ +Route111_MapObjects:: @ 83821A0 + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 13, 0, 114, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1501D1, 768, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 769, 0, 0 + object_event 3, MAP_OBJ_GFX_LASS, 0, 13, 0, 113, 0, 0, 8, 1, 0, 0, 0, 0, 0, 0x0, 770, 0, 0 + object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 771, 0, 0 + object_event 5, MAP_OBJ_GFX_PICNICKER, 0, 28, 0, 51, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503BE, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 5, 0, 3, 12, 0, 0, 0, 0, 19, 0, Route111_EventScript_1A14DD, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, Route111_EventScript_1A14DD, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_MAN_4, 0, 8, 0, 91, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route111_EventScript_150395, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_CAMPER, 0, 24, 0, 60, 0, 3, 21, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503A7, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_HIKER, 0, 27, 0, 69, 0, 3, 50, 34, 0, 1, 0, 2, 0, Route111_EventScript_150403, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_CAMPER, 0, 21, 0, 47, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route111_EventScript_1503D5, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_PICNICKER, 0, 32, 0, 72, 0, 3, 24, 0, 0, 1, 0, 3, 0, Route111_EventScript_1503EC, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE442, 796, 0, 0 + object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE422, 796, 0, 0 + object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B0EB7, 17, 0, 0 + object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B0EB7, 18, 0, 0 + object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 23, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route111_EventScript_1500C5, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 105, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14C8, 1008, 0, 0 + object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, Route111_EventScript_1A14DD, 0, 0, 0 + object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, Route111_EventScript_1A14DD, 0, 0, 0 + object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, 799, 0, 0 + object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE502, 799, 0, 0 + object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE562, 903, 0, 0 + object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, 903, 0, 0 + object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, 1009, 0, 0 + object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 114, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14E2, 1010, 0, 0 + object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B0DCC, 19, 0, 0 + object_event 28, MAP_OBJ_GFX_PICNICKER, 0, 10, 0, 82, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route111_EventScript_150458, 0, 0, 0 + object_event 29, MAP_OBJ_GFX_CAMPER, 0, 11, 0, 71, 0, 3, 22, 0, 0, 1, 0, 3, 0, Route111_EventScript_150441, 0, 0, 0 + object_event 30, MAP_OBJ_GFX_BLACK_BELT, 0, 32, 0, 29, 0, 3, 28, 1, 0, 1, 0, 2, 0, Route111_EventScript_15046F, 0, 0, 0 + object_event 31, MAP_OBJ_GFX_WOMAN_7, 0, 11, 0, 12, 0, 3, 7, 4, 0, 1, 0, 4, 0, Route111_EventScript_1504C4, 0, 0, 0 + object_event 32, MAP_OBJ_GFX_MAN_4, 0, 9, 0, 27, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route111_EventScript_150486, 0, 0, 0 + object_event 33, MAP_OBJ_GFX_BOY_1, 0, 13, 0, 20, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route111_EventScript_1A3858, 960, 0, 0 + object_event 34, MAP_OBJ_GFX_FOSSIL, 0, 32, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150023, 963, 0, 0 + object_event 35, MAP_OBJ_GFX_FOSSIL, 0, 33, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150069, 964, 0, 0 + object_event 36, MAP_OBJ_GFX_MAN_5, 0, 20, 0, 114, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route111_EventScript_15039E, 0, 0, 0 + +Route111_MapWarps:: @ 8382500 + warp_def 13, 113, 0, 0, Route111_WinstrateFamilysHouse + warp_def 29, 87, 0, 0, DesertRuins + warp_def 26, 18, 0, 0, Route111_OldLadysRestStop + +Route111_MapCoordEvents:: @ 8382518 + coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 11, 61, 3, 0, 0x4003, 0, 0, Route111_EventScript_150116 + coord_event 12, 61, 3, 0, 0x4003, 0, 0, Route111_EventScript_150116 + coord_event 13, 61, 3, 0, 0x4003, 0, 0, Route111_EventScript_150116 + coord_event 7, 63, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 12, 44, 3, 0, 0x4003, 0, 0, Route111_EventScript_150122 + coord_event 13, 43, 3, 0, 0x4003, 0, 0, Route111_EventScript_150122 + coord_event 14, 42, 3, 0, 0x4003, 0, 0, Route111_EventScript_150122 + coord_event 16, 40, 3, 0, 0x4003, 0, 0, Route111_EventScript_150122 + coord_event 14, 61, 3, 0, 0x4003, 0, 0, Route111_EventScript_150116 + coord_event 18, 32, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 17, 31, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 9, 37, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 10, 36, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 17, 39, 3, 0, 0x4003, 0, 0, Route111_EventScript_150122 + coord_event 18, 38, 3, 0, 0x4003, 0, 0, Route111_EventScript_150122 + coord_event 8, 64, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 9, 65, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 10, 65, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 11, 66, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 12, 67, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 13, 68, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 14, 69, 3, 0, 0, 0, 0, Route111_EventScript_1501BC + coord_event 10, 61, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 11, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 13, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 14, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 17, 38, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 16, 39, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 15, 40, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 14, 41, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 13, 42, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 12, 43, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 11, 44, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + +Route111_MapBGEvents:: @ 8382738 + bg_event 16, 114, 0, 0, 0, Route111_EventScript_150368 + bg_event 24, 126, 0, 0, 0, Route111_EventScript_15035F + bg_event 7, 66, 0, 0, 0, Route111_EventScript_150371 + bg_event 13, 6, 0, 0, 0, Route111_EventScript_15037A + bg_event 24, 36, 0, 8, 0, ITEM_FAB_MAIL, 0, 0 + bg_event 34, 50, 0, 8, 0, ITEM_LUM_BERRY, 0, 0 + bg_event 33, 34, 0, 8, 0, ITEM_ORANGE_MAIL, 0, 0 + bg_event 25, 19, 0, 0, 0, Route111_EventScript_150383 + bg_event 35, 1, 0, 8, 0, ITEM_POTION, 0, 0 + bg_event 35, 31, 0, 8, 0, ITEM_POMEG_BERRY, 0, 0 + bg_event 26, 70, 0, 7, 0, ITEM_STARDUST, 2, 0 + bg_event 27, 27, 3, 8, 0, ITEM_REVIVAL_HERB, 0, 0 + bg_event 7, 84, 3, 0, 0, Route111_EventScript_15038C + bg_event 14, 19, 0, 8, 0, ITEM_PAMTRE_BERRY, 0, 0 + bg_event 13, 19, 0, 8, 0, ITEM_RABUTA_BERRY, 0, 0 + bg_event 19, 55, 0, 7, 0, ITEM_PROTEIN, 56, 0 + bg_event 35, 66, 0, 7, 0, ITEM_RARE_CANDY, 57, 0 + +Route111_MapEvents:: @ 8382804 + map_events Route111_MapObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents + diff --git a/data/maps/events/Route111_OldLadysRestStop.s b/data/maps/events/Route111_OldLadysRestStop.s new file mode 100644 index 000000000..325edeee6 --- /dev/null +++ b/data/maps/events/Route111_OldLadysRestStop.s @@ -0,0 +1,10 @@ +Route111_OldLadysRestStop_MapObjects:: @ 838B798 + object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 6, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_15BFDB, 0, 0, 0 + +Route111_OldLadysRestStop_MapWarps:: @ 838B7B0 + warp_def 3, 7, 0, 2, Route111 + warp_def 4, 7, 0, 2, Route111 + +Route111_OldLadysRestStop_MapEvents:: @ 838B7C0 + map_events Route111_OldLadysRestStop_MapObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.s b/data/maps/events/Route111_WinstrateFamilysHouse.s new file mode 100644 index 000000000..7f7b3c8a7 --- /dev/null +++ b/data/maps/events/Route111_WinstrateFamilysHouse.s @@ -0,0 +1,13 @@ +Route111_WinstrateFamilysHouse_MapObjects:: @ 838B714 + object_event 1, MAP_OBJ_GFX_LASS, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF80, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF25, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 7, 0, 4, 0, 3, 9, 1, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF3A, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF95, 0, 0, 0 + +Route111_WinstrateFamilysHouse_MapWarps:: @ 838B774 + warp_def 3, 7, 0, 0, Route111 + warp_def 4, 7, 0, 0, Route111 + +Route111_WinstrateFamilysHouse_MapEvents:: @ 838B784 + map_events Route111_WinstrateFamilysHouse_MapObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Route112.s b/data/maps/events/Route112.s new file mode 100644 index 000000000..7344e0be2 --- /dev/null +++ b/data/maps/events/Route112.s @@ -0,0 +1,30 @@ +Route112_MapObjects:: @ 8382818 + object_event 1, 241, 0, 26, 0, 30, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route112_EventScript_150513, 819, 0, 0 + object_event 2, MAP_OBJ_GFX_HIKER, 0, 24, 0, 34, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route112_EventScript_150549, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_CAMPER, 0, 29, 0, 49, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route112_EventScript_15059E, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 22, 0, 46, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route112_EventScript_1505B5, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_HIKER, 0, 17, 0, 40, 0, 3, 16, 0, 0, 1, 0, 4, 0, Route112_EventScript_150560, 0, 0, 0 + object_event 6, 241, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, 819, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, Route112_EventScript_1A14DD, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, Route112_EventScript_1A14DD, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, Route112_EventScript_1A14DD, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, Route112_EventScript_1A14DD, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_HIKER, 0, 8, 0, 50, 0, 3, 26, 48, 0, 0, 0, 0, 0, Route112_EventScript_150540, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 43, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route112_EventScript_1B14EF, 1011, 0, 0 + +Route112_MapWarps:: @ 8382938 + warp_def 28, 27, 0, 0, Route112_CableCarStation + warp_def 29, 27, 0, 1, Route112_CableCarStation + warp_def 6, 46, 3, 0, JaggedPass + warp_def 7, 46, 3, 1, JaggedPass + warp_def 11, 36, 0, 0, FieryPath + warp_def 22, 10, 0, 1, FieryPath + +Route112_MapBGEvents:: @ 8382968 + bg_event 19, 44, 3, 0, 0, Route112_EventScript_15052E + bg_event 22, 37, 0, 0, 0, Route112_EventScript_150525 + bg_event 4, 49, 0, 0, 0, Route112_EventScript_150537 + +Route112_MapEvents:: @ 838298C + map_events Route112_MapObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents + diff --git a/data/maps/events/Route112_CableCarStation.s b/data/maps/events/Route112_CableCarStation.s new file mode 100644 index 000000000..3570762b3 --- /dev/null +++ b/data/maps/events/Route112_CableCarStation.s @@ -0,0 +1,11 @@ +Route112_CableCarStation_MapObjects:: @ 838B7D4 + object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 6, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_CableCarStation_EventScript_15C08C, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 6, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + +Route112_CableCarStation_MapWarps:: @ 838B804 + warp_def 6, 11, 0, 0, Route112 + warp_def 7, 11, 0, 1, Route112 + +Route112_CableCarStation_MapEvents:: @ 838B814 + map_events Route112_CableCarStation_MapObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Route113.s b/data/maps/events/Route113.s new file mode 100644 index 000000000..2cb0e6e41 --- /dev/null +++ b/data/maps/events/Route113.s @@ -0,0 +1,49 @@ +Route113_MapObjects:: @ 83829A0 + object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 66, 0, 12, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route113_EventScript_15060E, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 36, 0, 10, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route113_EventScript_150605, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 62, 0, 8, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route113_EventScript_15063B, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 21, 0, 11, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route113_EventScript_150652, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 51, 0, 11, 0, 3, 23, 0, 0, 1, 0, 2, 0, Route113_EventScript_150669, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 53, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B14FC, 1012, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 78, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B1509, 1013, 0, 0 + object_event 8, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 66, 0, 3, 0, 3, 63, 0, 0, 3, 0, 1, 0, Route113_EventScript_1506A7, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 29, 0, 6, 0, 3, 63, 0, 0, 3, 0, 1, 0, Route113_EventScript_1506E5, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 0, 6, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route113_EventScript_1506FC, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 0, 6, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route113_EventScript_150717, 0, 0, 0 + +Route113_MapWarps:: @ 8382AA8 + warp_def 33, 5, 0, 0, Route113_GlassWorkshop + +Route113_MapCoordEvents:: @ 8382AB0 + coord_event 19, 11, 3, 0, 8, 0, 0, 0x0 + coord_event 19, 10, 3, 0, 8, 0, 0, 0x0 + coord_event 19, 12, 3, 0, 8, 0, 0, 0x0 + coord_event 19, 13, 3, 0, 8, 0, 0, 0x0 + coord_event 87, 9, 3, 0, 8, 0, 0, 0x0 + coord_event 86, 10, 3, 0, 8, 0, 0, 0x0 + coord_event 86, 11, 3, 0, 8, 0, 0, 0x0 + coord_event 14, 10, 3, 0, 2, 0, 0, 0x0 + coord_event 14, 11, 3, 0, 2, 0, 0, 0x0 + coord_event 14, 12, 3, 0, 2, 0, 0, 0x0 + coord_event 14, 13, 3, 0, 2, 0, 0, 0x0 + coord_event 94, 8, 3, 0, 2, 0, 0, 0x0 + coord_event 94, 9, 3, 0, 2, 0, 0, 0x0 + coord_event 94, 10, 3, 0, 2, 0, 0, 0x0 + coord_event 94, 11, 0, 0, 2, 0, 0, 0x0 + coord_event 19, 14, 3, 0, 8, 0, 0, 0x0 + coord_event 88, 8, 3, 0, 8, 0, 0, 0x0 + coord_event 88, 6, 3, 0, 8, 0, 0, 0x0 + coord_event 88, 7, 3, 0, 8, 0, 0, 0x0 + +Route113_MapBGEvents:: @ 8382BE0 + bg_event 85, 6, 0, 0, 0, Route113_EventScript_150617 + bg_event 11, 9, 0, 0, 0, Route113_EventScript_150620 + bg_event 58, 4, 3, 0, 0, Route113_EventScript_150632 + bg_event 31, 5, 0, 0, 0, Route113_EventScript_150629 + bg_event 49, 8, 0, 8, 0, ITEM_GREAT_BALL, 0, 0 + bg_event 72, 4, 3, 7, 0, ITEM_ETHER, 3, 0 + bg_event 22, 5, 3, 7, 0, ITEM_TM32, 30, 0 + +Route113_MapEvents:: @ 8382C34 + map_events Route113_MapObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents + diff --git a/data/maps/events/Route113_GlassWorkshop.s b/data/maps/events/Route113_GlassWorkshop.s new file mode 100644 index 000000000..deee26c6e --- /dev/null +++ b/data/maps/events/Route113_GlassWorkshop.s @@ -0,0 +1,11 @@ +Route113_GlassWorkshop_MapObjects:: @ 8392D18 + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_163565, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 5, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_1639D6, 0, 0, 0 + +Route113_GlassWorkshop_MapWarps:: @ 8392D48 + warp_def 3, 8, 0, 0, Route113 + warp_def 4, 8, 0, 0, Route113 + +Route113_GlassWorkshop_MapEvents:: @ 8392D58 + map_events Route113_GlassWorkshop_MapObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Route114.s b/data/maps/events/Route114.s new file mode 100644 index 000000000..87e2da82c --- /dev/null +++ b/data/maps/events/Route114.s @@ -0,0 +1,47 @@ +Route114_MapObjects:: @ 8382C48 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 43, 0, 3, 12, 0, 0, 0, 0, 77, 0, Route114_EventScript_1A14DD, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 44, 0, 3, 12, 0, 0, 0, 0, 78, 0, Route114_EventScript_1A14DD, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_HIKER, 0, 15, 0, 65, 0, 7, 10, 0, 0, 1, 0, 6, 0, Route114_EventScript_1507F1, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_HIKER, 0, 30, 0, 72, 0, 5, 15, 0, 0, 1, 0, 4, 0, Route114_EventScript_150808, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_CAMPER, 0, 22, 0, 50, 0, 3, 10, 0, 0, 1, 0, 3, 0, Route114_EventScript_15081F, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 19, 0, 35, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route114_EventScript_150836, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_MANIAC, 0, 20, 0, 56, 0, 3, 7, 0, 0, 1, 0, 3, 0, Route114_EventScript_15084D, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, Route114_EventScript_1A14DD, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1516, 1014, 0, 0 + object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 11, 0, 37, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1523, 1015, 0, 0 + object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B0EB7, 17, 0, 0 + object_event 12, MAP_OBJ_GFX_GENTLEMAN, 0, 19, 0, 11, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_150782, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_POOCHYENA, 0, 19, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route114_EventScript_1507C3, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_MAN_5, 0, 27, 0, 42, 0, 3, 3, 16, 0, 0, 0, 0, 0, Route114_EventScript_150733, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 23, 0, 20, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508E0, 0, 0, 0 + object_event 16, MAP_OBJ_GFX_FISHERMAN, 0, 19, 0, 26, 0, 3, 9, 0, 0, 1, 0, 0, 0, Route114_EventScript_1508C9, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_MAN_6, 0, 30, 0, 58, 0, 5, 23, 0, 0, 1, 0, 3, 0, Route114_EventScript_15088B, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route114_EventScript_1B0EB7, 18, 0, 0 + object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route114_EventScript_1B0EB7, 19, 0, 0 + object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, Route114_EventScript_1B0EB7, 20, 0, 0 + object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route114_EventScript_1B0EB7, 21, 0, 0 + object_event 22, MAP_OBJ_GFX_LASS, 0, 24, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_150912, 0, 0, 0 + object_event 23, MAP_OBJ_GFX_LASS, 0, 23, 0, 44, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route114_EventScript_1508F7, 0, 0, 0 + +Route114_MapWarps:: @ 8382E70 + warp_def 8, 63, 0, 0, MeteorFalls_1F_1R + warp_def 29, 5, 0, 0, Route114_FossilManiacsHouse + warp_def 27, 36, 0, 0, Route114_LanettesHouse + +Route114_MapBGEvents:: @ 8382E88 + bg_event 7, 64, 0, 0, 0, Route114_EventScript_1507D6 + bg_event 31, 7, 0, 0, 0, Route114_EventScript_1507DF + bg_event 9, 47, 0, 8, 0, ITEM_RED_FLUTE, 0, 0 + bg_event 30, 51, 0, 8, 0, ITEM_GREEN_SHARD, 0, 0 + bg_event 11, 62, 0, 8, 0, 61, 0, 0 + bg_event 19, 70, 0, 8, 0, ITEM_PP_MAX, 0, 0 + bg_event 11, 27, 0, 8, 0, ITEM_EXP_SHARE, 0, 0 + bg_event 12, 27, 0, 8, 0, ITEM_DEEP_SEA_TOOTH, 0, 0 + bg_event 25, 38, 3, 0, 0, Route114_EventScript_1507E8 + bg_event 20, 57, 3, 7, 0, ITEM_CARBOS, 4, 0 + bg_event 32, 57, 0, 8, 0, ITEM_GUARD_SPEC, 0, 0 + bg_event 7, 30, 3, 7, 0, ITEM_REVIVE, 42, 0 + +Route114_MapEvents:: @ 8382F18 + map_events Route114_MapObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents + diff --git a/data/maps/events/Route114_FossilManiacsHouse.s b/data/maps/events/Route114_FossilManiacsHouse.s new file mode 100644 index 000000000..74ec29552 --- /dev/null +++ b/data/maps/events/Route114_FossilManiacsHouse.s @@ -0,0 +1,17 @@ +Route114_FossilManiacsHouse_MapObjects:: @ 838B87C + object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 3, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route114_FossilManiacsHouse_EventScript_15C1C3, 0, 0, 0 + +Route114_FossilManiacsHouse_MapWarps:: @ 838B894 + warp_def 4, 7, 0, 1, Route114 + warp_def 5, 7, 0, 1, Route114 + warp_def 4, 1, 0, 0, Route114_FossilManiacsTunnel + +Route114_FossilManiacsHouse_MapBGEvents:: @ 838B8AC + bg_event 5, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC + bg_event 6, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC + bg_event 7, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C205 + bg_event 8, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C205 + +Route114_FossilManiacsHouse_MapEvents:: @ 838B8DC + map_events Route114_FossilManiacsHouse_MapObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents + diff --git a/data/maps/events/Route114_FossilManiacsTunnel.s b/data/maps/events/Route114_FossilManiacsTunnel.s new file mode 100644 index 000000000..c30299643 --- /dev/null +++ b/data/maps/events/Route114_FossilManiacsTunnel.s @@ -0,0 +1,10 @@ +Route114_FossilManiacsTunnel_MapObjects:: @ 838B8F0 + object_event 1, MAP_OBJ_GFX_MANIAC, 0, 5, 0, 3, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route114_FossilManiacsTunnel_EventScript_15C20F, 0, 0, 0 + +Route114_FossilManiacsTunnel_MapWarps:: @ 838B908 + warp_def 6, 25, 3, 2, Route114_FossilManiacsHouse + warp_def 7, 25, 3, 2, Route114_FossilManiacsHouse + +Route114_FossilManiacsTunnel_MapEvents:: @ 838B918 + map_events Route114_FossilManiacsTunnel_MapObjects, Route114_FossilManiacsTunnel_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Route114_LanettesHouse.s b/data/maps/events/Route114_LanettesHouse.s new file mode 100644 index 000000000..5b011f2ca --- /dev/null +++ b/data/maps/events/Route114_LanettesHouse.s @@ -0,0 +1,15 @@ +Route114_LanettesHouse_MapObjects:: @ 838B92C + object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, 870, 0, 0 + +Route114_LanettesHouse_MapWarps:: @ 838B944 + warp_def 5, 7, 0, 2, Route114 + warp_def 6, 7, 0, 2, Route114 + +Route114_LanettesHouse_MapBGEvents:: @ 838B954 + bg_event 5, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C299 + bg_event 8, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C2D5 + bg_event 7, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C2D5 + +Route114_LanettesHouse_MapEvents:: @ 838B978 + map_events Route114_LanettesHouse_MapObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents + diff --git a/data/maps/events/Route115.s b/data/maps/events/Route115.s new file mode 100644 index 000000000..0b028b1e2 --- /dev/null +++ b/data/maps/events/Route115.s @@ -0,0 +1,40 @@ +Route115_MapObjects:: @ 8382F2C + object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 18, 0, 68, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route115_EventScript_15092E, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 15, 0, 3, 10, 0, 0, 1, 0, 6, 0, Route115_EventScript_150949, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 27, 0, 53, 0, 3, 15, 17, 0, 1, 0, 4, 0, Route115_EventScript_15099E, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 69, 0, Route115_EventScript_1A14DD, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 70, 0, Route115_EventScript_1A14DD, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 13, 0, 5, 0, 3, 12, 0, 0, 0, 0, 71, 0, Route115_EventScript_1A14DD, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 15, 0, 50, 0, 3, 64, 0, 0, 1, 0, 3, 0, Route115_EventScript_1509DC, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BLACK_BELT, 0, 17, 0, 17, 0, 3, 50, 51, 0, 1, 0, 2, 0, Route115_EventScript_150987, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_MANIAC, 0, 25, 0, 61, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route115_EventScript_150A1A, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 60, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B1530, 1016, 0, 0 + object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B153D, 1017, 0, 0 + object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B154A, 1018, 0, 0 + object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, Route115_EventScript_1A14DD, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, Route115_EventScript_1A14DD, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B0EB7, 17, 0, 0 + object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, 1118, 0, 0 + +Route115_MapWarps:: @ 83830AC + warp_def 27, 37, 0, 1, MeteorFalls_1F_1R + +Route115_MapBGEvents:: @ 83830B4 + bg_event 32, 6, 0, 8, 0, 72, 0, 0 + bg_event 21, 18, 0, 8, 0, 62, 0, 0 + bg_event 16, 64, 0, 0, 0, Route115_EventScript_150937 + bg_event 25, 38, 3, 0, 0, Route115_EventScript_150940 + bg_event 8, 30, 0, 8, 0, ITEM_CHERI_BERRY, 0, 0 + bg_event 32, 39, 0, 8, 0, ITEM_BLACK_FLUTE, 0, 0 + bg_event 26, 15, 0, 8, 0, 52, 0, 0 + bg_event 23, 8, 0, 8, 0, ITEM_WHITE_FLUTE, 0, 0 + bg_event 32, 46, 0, 8, 0, 53, 0, 0 + bg_event 7, 20, 0, 8, 0, ITEM_STARF_BERRY, 0, 0 + bg_event 8, 20, 0, 8, 0, ITEM_QUICK_CLAW, 0, 0 + bg_event 25, 24, 0, 8, 0, ITEM_HP_UP, 0, 0 + bg_event 20, 53, 0, 8, 0, ITEM_HYPER_POTION, 0, 0 + bg_event 15, 49, 3, 7, 0, ITEM_HEART_SCALE, 97, 0 + +Route115_MapEvents:: @ 838315C + map_events Route115_MapObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents + diff --git a/data/maps/events/Route116.s b/data/maps/events/Route116.s new file mode 100644 index 000000000..4fcbd0eb0 --- /dev/null +++ b/data/maps/events/Route116.s @@ -0,0 +1,48 @@ +Route116_MapObjects:: @ 8383170 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, Route116_EventScript_1A14DD, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, Route116_EventScript_1A14DD, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 12, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route116_EventScript_150C62, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B0DCC, 17, 0, 0 + object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B0DCC, 18, 0, 0 + object_event 6, MAP_OBJ_GFX_BUG_CATCHER, 0, 13, 0, 17, 0, 3, 24, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C79, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 19, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B1571, 1019, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B157E, 1020, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, Route116_EventScript_1A14DD, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, Route116_EventScript_1A14DD, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, 891, 0, 0 + object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B0DCC, 19, 0, 0 + object_event 13, MAP_OBJ_GFX_HIKER, 0, 36, 0, 15, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CCE, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B0DCC, 20, 0, 0 + object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 80, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B158B, 1021, 0, 0 + object_event 16, MAP_OBJ_GFX_LASS, 0, 22, 0, 16, 0, 3, 13, 0, 0, 1, 0, 3, 0, Route116_EventScript_150CE5, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_GIRL_3, 0, 25, 0, 4, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route116_EventScript_150CFC, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 31, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route116_EventScript_150C90, 0, 0, 0 + object_event 19, MAP_OBJ_GFX_MAN_2, 0, 46, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A7B, 947, 0, 0 + object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 56, 0, 12, 0, 4, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_1B1564, 1001, 0, 0 + object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 38, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A49, 894, 0, 0 + object_event 22, MAP_OBJ_GFX_MANIAC, 0, 74, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150B8F, 813, 0, 0 + +Route116_MapWarps:: @ 8383380 + warp_def 47, 8, 0, 0, RusturfTunnel + warp_def 38, 8, 0, 0, Route116_TunnelersRestHouse + warp_def 65, 10, 0, 2, RusturfTunnel + +Route116_MapCoordEvents:: @ 8383398 + coord_event 47, 9, 3, 0, 0x406f, 1, 0, Route116_EventScript_150B6E + +Route116_MapBGEvents:: @ 83833A8 + bg_event 5, 10, 0, 0, 0, Route116_EventScript_150B30 + bg_event 48, 9, 0, 0, 0, Route116_EventScript_150B39 + bg_event 40, 9, 0, 0, 0, Route116_EventScript_150B42 + bg_event 71, 4, 0, 8, 0, ITEM_FLUFFY_TAIL, 0, 0 + bg_event 79, 11, 0, 8, 0, 91, 0, 0 + bg_event 16, 12, 0, 0, 0, Route116_EventScript_150B4B + bg_event 29, 10, 0, 0, 0, Route116_EventScript_150B54 + bg_event 56, 6, 0, 8, 0, 102, 0, 0 + bg_event 55, 15, 0, 8, 0, 112, 0, 0 + bg_event 22, 9, 3, 7, 0, ITEM_SUPER_POTION, 45, 0 + bg_event 70, 13, 3, 7, 0, ITEM_BLACK_GLASSES, 96, 0 + +Route116_MapEvents:: @ 838342C + map_events Route116_MapObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents + diff --git a/data/maps/events/Route116_TunnelersRestHouse.s b/data/maps/events/Route116_TunnelersRestHouse.s new file mode 100644 index 000000000..d8f3f2e01 --- /dev/null +++ b/data/maps/events/Route116_TunnelersRestHouse.s @@ -0,0 +1,12 @@ +Route116_TunnelersRestHouse_MapObjects:: @ 838B98C + object_event 1, MAP_OBJ_GFX_MAN_3, 0, 6, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2E8, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_3, 0, 3, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2FA, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2F1, 0, 0, 0 + +Route116_TunnelersRestHouse_MapWarps:: @ 838B9D4 + warp_def 4, 8, 0, 1, Route116 + warp_def 5, 8, 0, 1, Route116 + +Route116_TunnelersRestHouse_MapEvents:: @ 838B9E4 + map_events Route116_TunnelersRestHouse_MapObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Route117.s b/data/maps/events/Route117.s new file mode 100644 index 000000000..f3eda5d9e --- /dev/null +++ b/data/maps/events/Route117.s @@ -0,0 +1,35 @@ +Route117_MapObjects:: @ 8383440 + object_event 1, MAP_OBJ_GFX_WOMAN_1, 0, 13, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route117_EventScript_150D57, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 26, 0, 13, 0, 3, 33, 34, 0, 0, 0, 0, 0, Route117_EventScript_150D60, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 47, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B222D, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_ZIGZAGOON, 0, 33, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_KECLEON_1, 0, 39, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 42, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_PIKACHU, 0, 49, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 35, 0, 7, 0, 3, 28, 7, 0, 1, 0, 4, 0, Route117_EventScript_150E09, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_WOMAN_3, 0, 31, 0, 11, 0, 3, 23, 0, 0, 1, 0, 3, 0, Route117_EventScript_150DCB, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_MAN_5, 0, 10, 0, 9, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route117_EventScript_150D8D, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 41, 0, 13, 0, 3, 12, 0, 0, 0, 0, 29, 0, Route117_EventScript_1A14DD, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, Route117_EventScript_1A14DD, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, Route117_EventScript_1A14DD, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 16, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B1598, 1022, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B0DCC, 17, 0, 0 + object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 9, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B15A5, 1023, 0, 0 + object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 0, 1, 0, 3, 40, 68, 0, 1, 0, 3, 0, Route117_EventScript_150E47, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_MANIAC, 0, 17, 0, 12, 0, 3, 7, 17, 0, 1, 0, 4, 0, Route117_EventScript_150E85, 0, 0, 0 + object_event 19, MAP_OBJ_GFX_LASS, 0, 46, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route117_EventScript_150EE2, 0, 0, 0 + object_event 20, MAP_OBJ_GFX_LASS, 0, 45, 0, 15, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route117_EventScript_150E9C, 0, 0, 0 + object_event 21, MAP_OBJ_GFX_GIRL_2, 0, 48, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route117_EventScript_150D69, 0, 0, 0 + +Route117_MapWarps:: @ 8383638 + warp_def 51, 5, 0, 0, Route117_PokemonDayCare + +Route117_MapBGEvents:: @ 8383640 + bg_event 16, 6, 0, 0, 0, Route117_EventScript_150D72 + bg_event 49, 12, 0, 0, 0, Route117_EventScript_150D7B + bg_event 49, 5, 0, 0, 0, Route117_EventScript_150D84 + bg_event 3, 18, 3, 7, 0, ITEM_REPEL, 72, 0 + +Route117_MapEvents:: @ 8383670 + map_events Route117_MapObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents + diff --git a/data/maps/events/Route117_PokemonDayCare.s b/data/maps/events/Route117_PokemonDayCare.s new file mode 100644 index 000000000..db5e64384 --- /dev/null +++ b/data/maps/events/Route117_PokemonDayCare.s @@ -0,0 +1,10 @@ +Route117_PokemonDayCare_MapObjects:: @ 838B9F8 + object_event 1, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 2, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_1B2327, 0, 0, 0 + +Route117_PokemonDayCare_MapWarps:: @ 838BA10 + warp_def 2, 8, 0, 0, Route117 + warp_def 3, 8, 0, 0, Route117 + +Route117_PokemonDayCare_MapEvents:: @ 838BA20 + map_events Route117_PokemonDayCare_MapObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Route118.s b/data/maps/events/Route118.s new file mode 100644 index 000000000..eaa71212e --- /dev/null +++ b/data/maps/events/Route118.s @@ -0,0 +1,41 @@ +Route118_MapObjects:: @ 8383684 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 5, 0, 3, 12, 0, 0, 0, 0, 31, 0, Route118_EventScript_1A14DD, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, Route118_EventScript_1A14DD, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, Route118_EventScript_1A14DD, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_6, 0, 64, 0, 10, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route118_EventScript_151139, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE462, 797, 0, 0 + object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE482, 797, 0, 0 + object_event 7, MAP_OBJ_GFX_GIRL_2, 0, 12, 0, 8, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route118_EventScript_150F93, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE522, 901, 0, 0 + object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, 901, 0, 0 + object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE562, 904, 0, 0 + object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE582, 904, 0, 0 + object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route118_EventScript_1B0DCC, 17, 0, 0 + object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 28, 0, 8, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route118_EventScript_150F34, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 7, 0, 10, 0, 3, 24, 0, 0, 1, 0, 4, 0, Route118_EventScript_15108F, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 14, 0, 14, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route118_EventScript_1510E4, 0, 0, 0 + object_event 16, MAP_OBJ_GFX_MAN_6, 0, 56, 0, 7, 0, 3, 16, 0, 0, 1, 0, 3, 0, Route118_EventScript_151150, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_FISHERMAN, 0, 39, 0, 15, 0, 3, 1, 0, 0, 1, 0, 2, 0, Route118_EventScript_1510CD, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_MAN_6, 0, 17, 0, 11, 0, 3, 15, 17, 0, 1, 0, 3, 0, Route118_EventScript_1510FB, 0, 0, 0 + object_event 19, MAP_OBJ_GFX_STEVEN, 0, 44, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 966, 0, 0 + object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route118_EventScript_1B15B2, 1121, 0, 0 + +Route118_MapCoordEvents:: @ 8383864 + coord_event 43, 11, 3, 0, 0x4071, 0, 0, Route118_EventScript_150FAE + coord_event 44, 11, 3, 0, 0x4071, 0, 0, Route118_EventScript_150FCE + coord_event 45, 11, 3, 0, 0x4071, 0, 0, Route118_EventScript_150FE4 + +Route118_MapBGEvents:: @ 8383894 + bg_event 47, 14, 0, 8, 0, ITEM_MASTER_BALL, 0, 0 + bg_event 13, 6, 0, 0, 0, Route118_EventScript_150F9C + bg_event 56, 8, 0, 0, 0, Route118_EventScript_150FA5 + bg_event 67, 6, 0, 8, 0, ITEM_LUXURY_BALL, 0, 0 + bg_event 29, 5, 0, 8, 0, ITEM_HARBOR_MAIL, 0, 0 + bg_event 47, 5, 0, 8, 0, ITEM_SPELON_BERRY, 0, 0 + bg_event 46, 5, 0, 8, 0, ITEM_PETAYA_BERRY, 0, 0 + bg_event 31, 13, 3, 7, 0, ITEM_IRON, 67, 0 + bg_event 12, 14, 3, 7, 0, ITEM_HEART_SCALE, 66, 0 + +Route118_MapEvents:: @ 8383900 + map_events Route118_MapObjects, 0x0, Route118_MapCoordEvents, Route118_MapBGEvents + diff --git a/data/maps/events/Route119.s b/data/maps/events/Route119.s new file mode 100644 index 000000000..e9cbd7300 --- /dev/null +++ b/data/maps/events/Route119.s @@ -0,0 +1,95 @@ +Route119_MapObjects:: @ 8383914 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 5, 0, 3, 12, 0, 0, 0, 0, 34, 0, Route119_EventScript_1A14DD, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 5, 0, 3, 12, 0, 0, 0, 0, 35, 0, Route119_EventScript_1A14DD, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 26, 0, 5, 0, 3, 12, 0, 0, 0, 0, 36, 0, Route119_EventScript_1A14DD, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 12, 0, 123, 0, 3, 59, 0, 0, 1, 0, 1, 0, Route119_EventScript_151491, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_MANIAC, 0, 26, 0, 123, 0, 3, 60, 0, 0, 1, 0, 1, 0, Route119_EventScript_151463, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_MANIAC, 0, 5, 0, 125, 0, 3, 62, 0, 0, 1, 0, 1, 0, Route119_EventScript_15144C, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_CAMPER, 0, 7, 0, 74, 0, 3, 18, 0, 0, 1, 0, 3, 0, Route119_EventScript_1514BF, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_MANIAC, 0, 28, 0, 116, 0, 3, 60, 0, 0, 1, 0, 1, 0, Route119_EventScript_151435, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_PICNICKER, 0, 35, 0, 83, 0, 4, 8, 0, 0, 1, 0, 2, 0, Route119_EventScript_1514FD, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 34, 0, 122, 0, 3, 61, 0, 0, 1, 0, 1, 0, Route119_EventScript_15147A, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_BUG_CATCHER, 0, 17, 0, 128, 0, 3, 61, 0, 0, 1, 0, 1, 0, Route119_EventScript_1514A8, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 28, 0, 16, 0, 3, 57, 0, 0, 1, 0, 2, 0, Route119_EventScript_151569, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 49, 0, 3, 58, 0, 0, 1, 0, 3, 0, Route119_EventScript_151580, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_MAN_6, 0, 10, 0, 50, 0, 4, 10, 0, 0, 1, 0, 3, 0, Route119_EventScript_15153B, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_MAN_6, 0, 8, 0, 62, 0, 3, 8, 0, 0, 1, 0, 3, 0, Route119_EventScript_151552, 0, 0, 0 + object_event 16, 240, 0, 25, 0, 32, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 851, 0, 0 + object_event 17, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 121, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15BF, 1024, 0, 0 + object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 4, 0, 96, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15CC, 1025, 0, 0 + object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15D9, 1026, 0, 0 + object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 25, 0, 76, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15E6, 1027, 0, 0 + object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15F3, 1028, 0, 0 + object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 117, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B1600, 1029, 0, 0 + object_event 23, 241, 0, 13, 0, 33, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515C5, 890, 0, 0 + object_event 24, 241, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, 890, 0, 0 + object_event 25, 243, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, 923, 0, 0 + object_event 26, MAP_OBJ_GFX_BOY_3, 0, 31, 0, 109, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515F3, 0, 0, 0 + object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, Route119_EventScript_1A14DD, 0, 0, 0 + object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, Route119_EventScript_1A14DD, 0, 0, 0 + object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, Route119_EventScript_1A14DD, 0, 0, 0 + object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, Route119_EventScript_1A14DD, 0, 0, 0 + object_event 31, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 0, 133, 0, 3, 5, 18, 0, 0, 0, 0, 0, Route119_EventScript_15141A, 0, 0, 0 + object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route119_EventScript_1B160D, 1106, 0, 0 + object_event 33, MAP_OBJ_GFX_BOY_2, 0, 35, 0, 93, 0, 4, 2, 17, 0, 0, 0, 0, 0, Route119_EventScript_1515FC, 0, 0, 0 + object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 29, 0, 6, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route119_EventScript_151597, 0, 0, 0 + object_event 35, MAP_OBJ_GFX_KECLEON_1, 0, 31, 0, 6, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A057A, 989, 0, 0 + object_event 36, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 13, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A0587, 990, 0, 0 + object_event 37, MAP_OBJ_GFX_FISHERMAN, 0, 13, 0, 104, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route119_EventScript_1515AE, 0, 0, 0 + +Route119_MapWarps:: @ 8383C8C + warp_def 6, 32, 0, 0, Route119_WeatherInstitute_1F + warp_def 33, 109, 0, 0, Route119_House + +Route119_MapCoordEvents:: @ 8383C9C + coord_event 25, 31, 0, 0, 0x4072, 0, 0, Route119_EventScript_1511C5 + coord_event 26, 31, 0, 0, 0x4072, 0, 0, Route119_EventScript_1511D0 + coord_event 28, 13, 0, 0, 20, 0, 0, 0x0 + coord_event 29, 13, 3, 0, 20, 0, 0, 0x0 + coord_event 30, 13, 3, 0, 20, 0, 0, 0x0 + coord_event 31, 13, 3, 0, 20, 0, 0, 0x0 + coord_event 32, 13, 3, 0, 20, 0, 0, 0x0 + coord_event 33, 13, 3, 0, 20, 0, 0, 0x0 + coord_event 15, 133, 3, 0, 20, 0, 0, 0x0 + coord_event 16, 132, 3, 0, 20, 0, 0, 0x0 + coord_event 17, 131, 3, 0, 20, 0, 0, 0x0 + coord_event 18, 130, 3, 0, 20, 0, 0, 0x0 + coord_event 19, 131, 3, 0, 20, 0, 0, 0x0 + coord_event 20, 132, 3, 0, 20, 0, 0, 0x0 + coord_event 21, 133, 3, 0, 20, 0, 0, 0x0 + coord_event 36, 6, 3, 0, 2, 0, 0, 0x0 + coord_event 36, 7, 3, 0, 2, 0, 0, 0x0 + coord_event 35, 8, 3, 0, 2, 0, 0, 0x0 + coord_event 35, 9, 3, 0, 2, 0, 0, 0x0 + coord_event 34, 10, 3, 0, 2, 0, 0, 0x0 + coord_event 16, 137, 3, 0, 2, 0, 0, 0x0 + coord_event 17, 137, 3, 0, 2, 0, 0, 0x0 + coord_event 18, 137, 3, 0, 2, 0, 0, 0x0 + coord_event 19, 137, 3, 0, 2, 0, 0, 0x0 + coord_event 20, 137, 3, 0, 2, 0, 0, 0x0 + +Route119_MapBGEvents:: @ 8383E2C + bg_event 9, 33, 0, 0, 0, Route119_EventScript_15142C + bg_event 27, 19, 0, 0, 0, Route119_EventScript_151423 + bg_event 5, 2, 0, 8, 0, ITEM_DRAGON_SCALE, 0, 0 + bg_event 4, 89, 0, 8, 0, ITEM_LIGHT_BALL, 0, 0 + bg_event 5, 15, 0, 8, 0, ITEM_POISON_BARB, 0, 0 + bg_event 7, 101, 3, 8, 0, ITEM_NEVER_MELT_ICE, 0, 0 + bg_event 34, 24, 3, 8, 0, ITEM_LAX_INCENSE, 0, 0 + bg_event 31, 73, 3, 8, 0, 231, 0, 0 + bg_event 16, 81, 0, 8, 0, ITEM_TINY_MUSHROOM, 0, 0 + bg_event 16, 28, 0, 8, 0, 113, 0, 0 + bg_event 17, 82, 3, 7, 0, ITEM_CALCIUM, 5, 0 + bg_event 38, 63, 3, 7, 0, ITEM_ULTRA_BALL, 6, 0 + bg_event 26, 81, 0, 8, 0, ITEM_FULL_HEAL, 0, 0 + bg_event 19, 76, 0, 8, 0, ITEM_LANSAT_BERRY, 0, 0 + bg_event 18, 76, 0, 8, 0, ITEM_DEEP_SEA_SCALE, 0, 0 + bg_event 4, 15, 0, 8, 0, ITEM_METAL_POWDER, 0, 0 + bg_event 6, 2, 0, 8, 0, 233, 0, 0 + bg_event 26, 120, 3, 7, 0, ITEM_FULL_HEAL, 68, 0 + bg_event 20, 29, 3, 7, 0, ITEM_MAX_ETHER, 87, 0 + bg_event 28, 9, 0, 0, 0, Route119_EventScript_151605 + +Route119_MapEvents:: @ 8383F1C + map_events Route119_MapObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents + diff --git a/data/maps/events/Route119_House.s b/data/maps/events/Route119_House.s new file mode 100644 index 000000000..7686460c0 --- /dev/null +++ b/data/maps/events/Route119_House.s @@ -0,0 +1,16 @@ +Route119_House_MapObjects:: @ 8392F40 + object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route119_House_EventScript_163DDE, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WINGULL, 0, 1, 0, 6, 0, 3, 2, 34, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WINGULL, 0, 0, 0, 4, 0, 3, 2, 19, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WINGULL, 0, 2, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_WINGULL, 0, 8, 0, 5, 0, 3, 2, 35, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_WINGULL, 0, 6, 0, 6, 0, 3, 2, 34, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_WINGULL, 0, 5, 0, 3, 0, 3, 2, 49, 0, 0, 0, 0, 0, Route119_House_EventScript_163DE7, 0, 0, 0 + +Route119_House_MapWarps:: @ 8392FE8 + warp_def 3, 8, 0, 1, Route119 + warp_def 4, 8, 0, 1, Route119 + +Route119_House_MapEvents:: @ 8392FF8 + map_events Route119_House_MapObjects, Route119_House_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Route119_WeatherInstitute_1F.s b/data/maps/events/Route119_WeatherInstitute_1F.s new file mode 100644 index 000000000..bd3760b88 --- /dev/null +++ b/data/maps/events/Route119_WeatherInstitute_1F.s @@ -0,0 +1,21 @@ +Route119_WeatherInstitute_1F_MapObjects:: @ 8392DC0 + object_event 1, 241, 0, 15, 0, 3, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route119_WeatherInstitute_1F_EventScript_163C94, 890, 0, 0 + object_event 2, 242, 0, 10, 0, 5, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_1F_EventScript_163CAB, 890, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_5, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, 892, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_5, 0, 2, 0, 11, 0, 3, 1, 1, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, 892, 0, 0 + object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 14, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C4D, 0, 0, 0 + +Route119_WeatherInstitute_1F_MapWarps:: @ 8392E38 + warp_def 9, 12, 0, 0, Route119 + warp_def 10, 12, 0, 0, Route119 + warp_def 17, 1, 0, 0, Route119_WeatherInstitute_2F + +Route119_WeatherInstitute_1F_MapBGEvents:: @ 8392E50 + bg_event 1, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 + bg_event 1, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 + bg_event 0, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 + bg_event 0, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 + +Route119_WeatherInstitute_1F_MapEvents:: @ 8392E80 + map_events Route119_WeatherInstitute_1F_MapObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents + diff --git a/data/maps/events/Route119_WeatherInstitute_2F.s b/data/maps/events/Route119_WeatherInstitute_2F.s new file mode 100644 index 000000000..02437d9f1 --- /dev/null +++ b/data/maps/events/Route119_WeatherInstitute_2F.s @@ -0,0 +1,14 @@ +Route119_WeatherInstitute_2F_MapObjects:: @ 8392E94 + object_event 1, 241, 0, 15, 0, 6, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route119_WeatherInstitute_2F_EventScript_163CFC, 890, 0, 0 + object_event 2, 241, 0, 10, 0, 8, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_2F_EventScript_163D13, 890, 0, 0 + object_event 3, 242, 0, 4, 0, 6, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, 890, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 893, 0, 0 + object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 18, 0, 6, 0, 3, 1, 18, 0, 0, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163DCC, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_MAN_5, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 893, 0, 0 + +Route119_WeatherInstitute_2F_MapWarps:: @ 8392F24 + warp_def 17, 1, 0, 2, Route119_WeatherInstitute_1F + +Route119_WeatherInstitute_2F_MapEvents:: @ 8392F2C + map_events Route119_WeatherInstitute_2F_MapObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Route120.s b/data/maps/events/Route120.s new file mode 100644 index 000000000..eaba9195f --- /dev/null +++ b/data/maps/events/Route120.s @@ -0,0 +1,87 @@ +Route120_MapObjects:: @ 8383F30 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 4, 0, 79, 0, 3, 12, 0, 0, 0, 0, 46, 0, Route120_EventScript_1A14DD, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 79, 0, 3, 12, 0, 0, 0, 0, 45, 0, Route120_EventScript_1A14DD, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 79, 0, 3, 12, 0, 0, 0, 0, 44, 0, Route120_EventScript_1A14DD, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 79, 0, 3, 12, 0, 0, 0, 0, 43, 0, Route120_EventScript_1A14DD, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 24, 0, 3, 12, 0, 0, 0, 0, 37, 0, Route120_EventScript_1A14DD, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 24, 0, 3, 12, 0, 0, 0, 0, 38, 0, Route120_EventScript_1A14DD, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 24, 0, 3, 12, 0, 0, 0, 0, 39, 0, Route120_EventScript_1A14DD, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 92, 0, 5, 12, 0, 0, 0, 0, 40, 0, Route120_EventScript_1A14DD, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 10, 0, 92, 0, 5, 12, 0, 0, 0, 0, 41, 0, Route120_EventScript_1A14DD, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 92, 0, 5, 12, 0, 0, 0, 0, 42, 0, Route120_EventScript_1A14DD, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 22, 0, 3, 14, 0, 0, 1, 0, 3, 0, Route120_EventScript_1519B3, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_MAN_6, 0, 32, 0, 14, 0, 3, 10, 0, 0, 1, 0, 3, 0, Route120_EventScript_1519CA, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_CAMPER, 0, 27, 0, 51, 0, 3, 9, 0, 0, 1, 0, 7, 0, Route120_EventScript_151A08, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_PICNICKER, 0, 36, 0, 45, 0, 3, 9, 0, 0, 1, 0, 2, 0, Route120_EventScript_151A1F, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_MANIAC, 0, 19, 0, 80, 0, 5, 15, 0, 0, 1, 0, 3, 0, Route120_EventScript_151A36, 0, 0, 0 + object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 20, 0, 55, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B161A, 1030, 0, 0 + object_event 17, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4C2, 798, 0, 0 + object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, 798, 0, 0 + object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, 902, 0, 0 + object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, 902, 0, 0 + object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B0DCC, 17, 0, 0 + object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 89, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B1627, 1031, 0, 0 + object_event 23, MAP_OBJ_GFX_BEAUTY, 0, 14, 0, 92, 0, 5, 5, 1, 0, 0, 0, 0, 0, Route120_EventScript_151739, 0, 0, 0 + object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 28, 0, 35, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A74, 0, 0, 0 + object_event 25, MAP_OBJ_GFX_HIKER, 0, 9, 0, 60, 0, 3, 21, 0, 0, 1, 0, 4, 0, Route120_EventScript_151A8B, 0, 0, 0 + object_event 26, MAP_OBJ_GFX_WOMAN_7, 0, 16, 0, 6, 0, 3, 23, 0, 0, 1, 0, 4, 0, Route120_EventScript_151AA2, 0, 0, 0 + object_event 27, MAP_OBJ_GFX_WOMAN_7, 0, 18, 0, 34, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route120_EventScript_151AB9, 0, 0, 0 + object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 22, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1641, 1108, 0, 0 + object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 23, 0, 82, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1634, 1107, 0, 0 + object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 12, 0, 16, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_151998, 970, 0, 0 + object_event 31, MAP_OBJ_GFX_STEVEN, 0, 13, 0, 15, 0, 4, 8, 17, 0, 0, 0, 0, 0, Route120_EventScript_151853, 972, 0, 0 + object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B0DCC, 20, 0, 0 + object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B0DCC, 18, 0, 0 + object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 10, 0, 72, 0, 3, 58, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AD0, 0, 0, 0 + object_event 35, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 19, 0, 28, 0, 3, 57, 17, 0, 1, 0, 3, 0, Route120_EventScript_151AE7, 0, 0, 0 + object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 981, 0, 0 + object_event 37, MAP_OBJ_GFX_KECLEON_1, 0, 20, 0, 11, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0539, 982, 0, 0 + object_event 38, MAP_OBJ_GFX_KECLEON_1, 0, 27, 0, 2, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0546, 985, 0, 0 + object_event 39, MAP_OBJ_GFX_KECLEON_1, 0, 4, 0, 77, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0553, 986, 0, 0 + object_event 40, MAP_OBJ_GFX_KECLEON_1, 0, 7, 0, 51, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A056D, 988, 0, 0 + object_event 41, MAP_OBJ_GFX_KECLEON_1, 0, 19, 0, 48, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0560, 987, 0, 0 + +Route120_MapWarps:: @ 8384308 + warp_def 7, 55, 0, 0, AncientTomb + warp_def 19, 23, 1, 0, ScorchedSlab + +Route120_MapCoordEvents:: @ 8384318 + coord_event 7, 15, 0, 0, 3, 0, 0, 0x0 + coord_event 7, 16, 0, 0, 3, 0, 0, 0x0 + coord_event 22, 61, 3, 0, 3, 0, 0, 0x0 + coord_event 12, 64, 3, 0, 3, 0, 0, 0x0 + coord_event 35, 63, 3, 0, 1, 0, 0, 0x0 + coord_event 36, 63, 3, 0, 1, 0, 0, 0x0 + coord_event 37, 63, 3, 0, 1, 0, 0, 0x0 + coord_event 38, 63, 3, 0, 1, 0, 0, 0x0 + coord_event 32, 88, 5, 0, 1, 0, 0, 0x0 + coord_event 28, 15, 0, 0, 2, 0, 0, 0x0 + coord_event 28, 16, 0, 0, 2, 0, 0, 0x0 + coord_event 28, 17, 3, 0, 2, 0, 0, 0x0 + coord_event 32, 89, 5, 0, 1, 0, 0, 0x0 + coord_event 32, 90, 5, 0, 1, 0, 0, 0x0 + coord_event 32, 91, 5, 0, 1, 0, 0, 0x0 + coord_event 10, 75, 3, 0, 1, 0, 0, 0x0 + coord_event 11, 75, 3, 0, 1, 0, 0, 0x0 + coord_event 12, 75, 3, 0, 1, 0, 0, 0x0 + coord_event 13, 75, 3, 0, 1, 0, 0, 0x0 + +Route120_MapBGEvents:: @ 8384448 + bg_event 27, 3, 3, 0, 0, Route120_EventScript_1519A1 + bg_event 38, 88, 3, 0, 0, Route120_EventScript_1519AA + bg_event 28, 62, 0, 8, 0, 101, 0, 0 + bg_event 30, 62, 0, 8, 0, ITEM_HEART_SCALE, 0, 0 + bg_event 26, 10, 0, 8, 0, ITEM_LUCKY_PUNCH, 0, 0 + bg_event 29, 85, 5, 8, 0, 232, 0, 0 + bg_event 18, 12, 0, 8, 0, ITEM_SUN_STONE, 0, 0 + bg_event 38, 54, 0, 8, 0, ITEM_SOFT_SAND, 0, 0 + bg_event 31, 23, 0, 8, 0, ITEM_SPELL_TAG, 0, 0 + bg_event 9, 1, 3, 7, 0, ITEM_RARE_CANDY, 71, 0 + bg_event 31, 11, 3, 7, 0, ITEM_REVIVE, 84, 0 + bg_event 0, 86, 3, 7, 0, ITEM_RARE_CANDY, 69, 0 + bg_event 24, 42, 3, 7, 0, ITEM_ZINC, 70, 0 + bg_event 5, 76, 0, 8, 0, ITEM_HARD_STONE, 0, 0 + +Route120_MapEvents:: @ 83844F0 + map_events Route120_MapObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents + diff --git a/data/maps/events/Route121.s b/data/maps/events/Route121.s new file mode 100644 index 000000000..296f84ce4 --- /dev/null +++ b/data/maps/events/Route121.s @@ -0,0 +1,47 @@ +Route121_MapObjects:: @ 8384504 + object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 29, 0, 14, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route121_EventScript_151B0A, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 2, 0, 3, 12, 0, 0, 0, 0, 47, 0, Route121_EventScript_1A14DD, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 2, 0, 3, 12, 0, 0, 0, 0, 48, 0, Route121_EventScript_1A14DD, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 16, 0, 2, 0, 3, 12, 0, 0, 0, 0, 49, 0, Route121_EventScript_1A14DD, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 2, 0, 3, 12, 0, 0, 0, 0, 50, 0, Route121_EventScript_1A14DD, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 64, 0, 14, 0, 3, 12, 0, 0, 0, 0, 51, 0, Route121_EventScript_1A14DD, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 65, 0, 14, 0, 3, 12, 0, 0, 0, 0, 52, 0, Route121_EventScript_1A14DD, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 66, 0, 14, 0, 3, 12, 0, 0, 0, 0, 53, 0, Route121_EventScript_1A14DD, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, Route121_EventScript_1A14DD, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_LASS, 0, 39, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BDE, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_LASS, 0, 40, 0, 9, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route121_EventScript_151BF9, 0, 0, 0 + object_event 12, 241, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 + object_event 13, 241, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 + object_event 14, 241, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 914, 0, 0 + object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route121_EventScript_1B0DCC, 17, 0, 0 + object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route121_EventScript_1B0DCC, 18, 0, 0 + object_event 17, MAP_OBJ_GFX_WOMAN_2, 0, 63, 0, 5, 0, 3, 9, 0, 0, 1, 0, 4, 0, Route121_EventScript_151B72, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_GENTLEMAN, 0, 55, 0, 8, 0, 3, 17, 0, 0, 1, 0, 3, 0, Route121_EventScript_151B89, 0, 0, 0 + object_event 19, MAP_OBJ_GFX_HEX_MANIAC, 0, 11, 0, 10, 0, 3, 15, 0, 0, 1, 0, 4, 0, Route121_EventScript_151BC7, 0, 0, 0 + object_event 20, MAP_OBJ_GFX_BEAUTY, 0, 22, 0, 5, 0, 3, 17, 0, 0, 1, 0, 4, 0, Route121_EventScript_151C14, 0, 0, 0 + object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 55, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B164E, 1103, 0, 0 + object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B0DCC, 19, 0, 0 + +Route121_MapWarps:: @ 8384714 + warp_def 37, 5, 0, 2, Route121_SafariZoneEntrance + +Route121_MapCoordEvents:: @ 838471C + coord_event 25, 5, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25 + coord_event 25, 6, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25 + coord_event 25, 7, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25 + coord_event 25, 8, 3, 0, 0x4074, 0, 0, Route121_EventScript_151B25 + +Route121_MapBGEvents:: @ 838475C + bg_event 32, 14, 0, 0, 0, Route121_EventScript_151B13 + bg_event 40, 11, 0, 8, 0, ITEM_PREMIER_BALL, 0, 0 + bg_event 18, 13, 0, 8, 0, ITEM_SUPER_POTION, 0, 0 + bg_event 43, 7, 0, 8, 0, ITEM_NOMEL_BERRY, 0, 0 + bg_event 42, 7, 0, 8, 0, ITEM_APICOT_BERRY, 0, 0 + bg_event 39, 6, 0, 0, 0, Route121_EventScript_151B1C + bg_event 23, 10, 3, 7, 0, ITEM_HP_UP, 39, 0 + bg_event 58, 3, 3, 7, 0, ITEM_NUGGET, 40, 0 + bg_event 72, 5, 3, 7, 0, ITEM_FULL_HEAL, 73, 0 + +Route121_MapEvents:: @ 83847C8 + map_events Route121_MapObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents + diff --git a/data/maps/events/Route121_SafariZoneEntrance.s b/data/maps/events/Route121_SafariZoneEntrance.s new file mode 100644 index 000000000..335688067 --- /dev/null +++ b/data/maps/events/Route121_SafariZoneEntrance.s @@ -0,0 +1,20 @@ +Route121_SafariZoneEntrance_MapObjects:: @ 838BA34 + object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 17, 0, 9, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C351, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_CAMPER, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C35A, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_CAMPER, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + +Route121_SafariZoneEntrance_MapWarps:: @ 838BA7C + warp_def 2, 5, 0, 0, SafariZone_Southeast + warp_def 3, 5, 0, 0, SafariZone_Southeast + warp_def 14, 13, 0, 0, Route121 + warp_def 15, 13, 0, 0, Route121 + +Route121_SafariZoneEntrance_MapCoordEvents:: @ 838BA9C + coord_event 8, 4, 3, 0, 0x4001, 0, 0, Route121_SafariZoneEntrance_EventScript_15C383 + +Route121_SafariZoneEntrance_MapBGEvents:: @ 838BAAC + bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C487 + +Route121_SafariZoneEntrance_MapEvents:: @ 838BAB8 + map_events Route121_SafariZoneEntrance_MapObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents + diff --git a/data/maps/events/Route122.s b/data/maps/events/Route122.s new file mode 100644 index 000000000..588b56e41 --- /dev/null +++ b/data/maps/events/Route122.s @@ -0,0 +1,6 @@ +Route122_MapWarps:: @ 83847DC + warp_def 22, 29, 0, 0, MtPyre_1F + +Route122_MapEvents:: @ 83847E4 + map_events 0x0, Route122_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Route123.s b/data/maps/events/Route123.s new file mode 100644 index 000000000..06cdfa2cc --- /dev/null +++ b/data/maps/events/Route123.s @@ -0,0 +1,77 @@ +Route123_MapObjects:: @ 83847F8 + object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 3, 0, 3, 12, 0, 0, 0, 0, 58, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 3, 0, 3, 12, 0, 0, 0, 0, 59, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 3, 0, 3, 12, 0, 0, 0, 0, 60, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 3, 0, 3, 12, 0, 0, 0, 0, 61, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 81, 0, 1, 0, 3, 12, 0, 0, 0, 0, 62, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 82, 0, 1, 0, 3, 12, 0, 0, 0, 0, 63, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 83, 0, 1, 0, 3, 12, 0, 0, 0, 0, 64, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 70, 0, 12, 0, 3, 24, 0, 0, 1, 0, 1, 0, Route123_EventScript_151CD1, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_MAN_4, 0, 58, 0, 7, 0, 3, 17, 0, 0, 1, 0, 2, 0, Route123_EventScript_151CE8, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 5, 0, 3, 12, 0, 0, 0, 0, 65, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 5, 0, 3, 12, 0, 0, 0, 0, 72, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 5, 0, 3, 12, 0, 0, 0, 0, 73, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 74, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 3, 0, 3, 12, 0, 0, 0, 0, 79, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B0DCC, 17, 0, 0 + object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B0DCC, 18, 0, 0 + object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B0DCC, 19, 0, 0 + object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B165B, 1032, 0, 0 + object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 139, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B1668, 1033, 0, 0 + object_event 23, MAP_OBJ_GFX_GIRL_3, 0, 108, 0, 13, 0, 3, 15, 0, 0, 0, 0, 0, 0, Route123_EventScript_151C5D, 0, 0, 0 + object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 109, 0, 13, 0, 3, 12, 0, 0, 0, 0, 87, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 26, MAP_OBJ_GFX_BERRY_TREE, 0, 111, 0, 13, 0, 3, 12, 0, 0, 0, 0, 89, 0, Route123_EventScript_1A14DD, 0, 0, 0 + object_event 27, MAP_OBJ_GFX_WOMAN_3, 0, 16, 0, 9, 0, 3, 23, 0, 0, 1, 0, 2, 0, Route123_EventScript_151CFF, 0, 0, 0 + object_event 28, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route123_EventScript_151DAD, 0, 0, 0 + object_event 29, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, Route123_EventScript_151D92, 0, 0, 0 + object_event 30, MAP_OBJ_GFX_PSYCHIC_M, 0, 138, 0, 12, 0, 3, 9, 0, 0, 1, 0, 6, 0, Route123_EventScript_151D16, 0, 0, 0 + object_event 31, MAP_OBJ_GFX_LASS, 0, 50, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route123_EventScript_151D54, 0, 0, 0 + object_event 32, MAP_OBJ_GFX_HEX_MANIAC, 0, 87, 0, 14, 0, 3, 1, 0, 0, 1, 0, 3, 0, Route123_EventScript_151DC8, 0, 0, 0 + object_event 33, MAP_OBJ_GFX_ITEM_BALL, 0, 27, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1675, 1104, 0, 0 + object_event 34, MAP_OBJ_GFX_ITEM_BALL, 0, 75, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1682, 1109, 0, 0 + +Route123_MapWarps:: @ 8384B28 + warp_def 22, 6, 0, 0, Route123_BerryMastersHouse + +Route123_MapCoordEvents:: @ 8384B30 + coord_event 90, 16, 3, 0, 21, 0, 0, 0x0 + coord_event 92, 9, 3, 0, 21, 0, 0, 0x0 + coord_event 93, 12, 3, 0, 21, 0, 0, 0x0 + coord_event 92, 13, 3, 0, 21, 0, 0, 0x0 + coord_event 91, 14, 3, 0, 21, 0, 0, 0x0 + coord_event 19, 13, 3, 0, 21, 0, 0, 0x0 + coord_event 19, 12, 3, 0, 21, 0, 0, 0x0 + coord_event 34, 13, 3, 0, 21, 0, 0, 0x0 + coord_event 19, 14, 3, 0, 21, 0, 0, 0x0 + coord_event 19, 15, 3, 0, 21, 0, 0, 0x0 + coord_event 19, 16, 3, 0, 21, 0, 0, 0x0 + coord_event 108, 14, 3, 0, 2, 0, 0, 0x0 + coord_event 109, 15, 3, 0, 2, 0, 0, 0x0 + coord_event 110, 16, 3, 0, 2, 0, 0, 0x0 + coord_event 111, 17, 3, 0, 2, 0, 0, 0x0 + coord_event 112, 18, 3, 0, 2, 0, 0, 0x0 + coord_event 9, 12, 3, 0, 2, 0, 0, 0x0 + coord_event 9, 13, 3, 0, 2, 0, 0, 0x0 + coord_event 9, 14, 3, 0, 2, 0, 0, 0x0 + coord_event 9, 15, 3, 0, 2, 0, 0, 0x0 + coord_event 9, 16, 3, 0, 2, 0, 0, 0x0 + coord_event 94, 10, 3, 0, 21, 0, 0, 0x0 + +Route123_MapBGEvents:: @ 8384C90 + bg_event 117, 10, 0, 0, 0, Route123_EventScript_151CBF + bg_event 47, 3, 0, 8, 0, 82, 0, 0 + bg_event 49, 3, 0, 8, 0, 92, 0, 0 + bg_event 10, 12, 3, 0, 0, Route123_EventScript_151CB6 + bg_event 75, 1, 3, 7, 0, ITEM_SUPER_REPEL, 7, 0 + bg_event 20, 7, 3, 0, 0, Route123_EventScript_151CC8 + bg_event 57, 5, 0, 8, 0, ITEM_SUPER_REPEL, 0, 0 + bg_event 12, 1, 3, 7, 0, ITEM_REVIVE, 41, 0 + bg_event 91, 15, 3, 7, 0, ITEM_HYPER_POTION, 74, 0 + +Route123_MapEvents:: @ 8384CFC + map_events Route123_MapObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents + diff --git a/data/maps/events/Route123_BerryMastersHouse.s b/data/maps/events/Route123_BerryMastersHouse.s new file mode 100644 index 000000000..42f9d7e1c --- /dev/null +++ b/data/maps/events/Route123_BerryMastersHouse.s @@ -0,0 +1,11 @@ +Route123_BerryMastersHouse_MapObjects:: @ 8392D6C + object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_1639E9, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_163A64, 0, 0, 0 + +Route123_BerryMastersHouse_MapWarps:: @ 8392D9C + warp_def 3, 7, 0, 0, Route123 + warp_def 4, 7, 0, 0, Route123 + +Route123_BerryMastersHouse_MapEvents:: @ 8392DAC + map_events Route123_BerryMastersHouse_MapObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Route124.s b/data/maps/events/Route124.s new file mode 100644 index 000000000..4b9dc496a --- /dev/null +++ b/data/maps/events/Route124.s @@ -0,0 +1,21 @@ +Route124_MapObjects:: @ 8384D10 + object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 58, 0, 59, 0, 1, 1, 5, 0, 1, 0, 3, 0, Route124_EventScript_151DF8, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 33, 0, 25, 0, 1, 52, 53, 0, 1, 0, 3, 0, Route124_EventScript_151E0F, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 14, 0, 27, 0, 1, 24, 0, 0, 1, 0, 3, 0, Route124_EventScript_151E26, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 49, 0, 45, 0, 1, 24, 134, 0, 1, 0, 3, 0, Route124_EventScript_151E64, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_SWIMMER_M, 0, 60, 0, 74, 0, 1, 28, 7, 0, 1, 0, 2, 0, Route124_EventScript_151E7B, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 28, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B168F, 1092, 0, 0 + object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 31, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B169C, 1093, 0, 0 + object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 58, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B16A9, 1066, 0, 0 + object_event 9, MAP_OBJ_GFX_SWIMMER_F, 0, 18, 0, 44, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route124_EventScript_151E92, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 0, 44, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route124_EventScript_151ED8, 0, 0, 0 + +Route124_MapWarps:: @ 8384E00 + warp_def 70, 48, 3, 0, Route124_DivingTreasureHuntersHouse + +Route124_MapBGEvents:: @ 8384E08 + bg_event 73, 48, 3, 0, 0, Route124_EventScript_151DEF + +Route124_MapEvents:: @ 8384E14 + map_events Route124_MapObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents + diff --git a/data/maps/events/Route125.s b/data/maps/events/Route125.s new file mode 100644 index 000000000..bf9696563 --- /dev/null +++ b/data/maps/events/Route125.s @@ -0,0 +1,21 @@ +Route125_MapObjects:: @ 8384E28 + object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 46, 0, 9, 0, 1, 23, 0, 0, 1, 0, 2, 0, Route125_EventScript_151F2E, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 9, 0, 32, 0, 1, 10, 82, 0, 1, 0, 2, 0, Route125_EventScript_151F45, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 31, 0, 33, 0, 1, 28, 6, 0, 1, 0, 3, 0, Route125_EventScript_151F5C, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 39, 0, 20, 0, 1, 52, 153, 0, 1, 0, 3, 0, Route125_EventScript_151F73, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_SAILOR, 0, 23, 0, 28, 0, 3, 14, 0, 0, 1, 0, 2, 0, Route125_EventScript_151F8A, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_LASS, 0, 20, 0, 21, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route125_EventScript_151FC8, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_LASS, 0, 21, 0, 21, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route125_EventScript_151FE3, 0, 0, 0 + +Route125_MapWarps:: @ 8384ED0 + warp_def 22, 19, 0, 0, ShoalCave_LowTideEntranceRoom + +Route125_MapBGEvents:: @ 8384ED8 + bg_event 53, 10, 0, 8, 0, ITEM_ULTRA_BALL, 0, 0 + bg_event 55, 11, 0, 8, 0, ITEM_HEAL_POWDER, 0, 0 + bg_event 7, 25, 0, 8, 0, ITEM_RETRO_MAIL, 0, 0 + bg_event 24, 32, 0, 8, 0, ITEM_PINAP_BERRY, 0, 0 + +Route125_MapEvents:: @ 8384F08 + map_events Route125_MapObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents + diff --git a/data/maps/events/Route126.s b/data/maps/events/Route126.s new file mode 100644 index 000000000..a70e471d1 --- /dev/null +++ b/data/maps/events/Route126.s @@ -0,0 +1,10 @@ +Route126_MapObjects:: @ 8384F1C + object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 55, 0, 22, 0, 1, 51, 58, 0, 1, 0, 3, 0, Route126_EventScript_15200E, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 33, 0, 63, 0, 1, 28, 9, 0, 1, 0, 3, 0, Route126_EventScript_152025, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 9, 0, 49, 0, 1, 7, 0, 0, 1, 0, 3, 0, Route126_EventScript_15203C, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 64, 0, 44, 0, 1, 24, 0, 0, 1, 0, 3, 0, Route126_EventScript_152053, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route126_EventScript_1B16B6, 1105, 0, 0 + +Route126_MapEvents:: @ 8384F94 + map_events Route126_MapObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/events/Route127.s b/data/maps/events/Route127.s new file mode 100644 index 000000000..4b261a435 --- /dev/null +++ b/data/maps/events/Route127.s @@ -0,0 +1,21 @@ +Route127_MapObjects:: @ 8384FA8 + object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 18, 0, 68, 0, 1, 14, 0, 0, 1, 0, 2, 0, Route127_EventScript_15207A, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 45, 0, 44, 0, 1, 21, 0, 0, 1, 0, 4, 0, Route127_EventScript_152091, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16C3, 1034, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 64, 0, 39, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16D0, 1035, 0, 0 + object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 53, 0, 13, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520A8, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 52, 0, 25, 0, 3, 8, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520D6, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_FISHERMAN, 0, 64, 0, 19, 0, 3, 10, 17, 0, 1, 0, 0, 0, Route127_EventScript_1520BF, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_MAN_6, 0, 12, 0, 18, 0, 3, 24, 17, 0, 1, 0, 2, 0, Route127_EventScript_152104, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_BLACK_BELT, 0, 63, 0, 63, 0, 3, 1, 17, 0, 1, 0, 3, 0, Route127_EventScript_1520ED, 0, 0, 0 + +Route127_MapBGEvents:: @ 8385080 + bg_event 59, 67, 0, 8, 0, ITEM_ENERGY_ROOT, 0, 0 + bg_event 59, 72, 0, 8, 0, ITEM_SITRUS_BERRY, 0, 0 + bg_event 67, 63, 0, 8, 0, ITEM_WEPEAR_BERRY, 0, 0 + bg_event 61, 21, 0, 8, 0, ITEM_FIGY_BERRY, 0, 0 + bg_event 45, 24, 0, 8, 0, ITEM_GLITTER_MAIL, 0, 0 + +Route127_MapEvents:: @ 83850BC + map_events Route127_MapObjects, 0x0, 0x0, Route127_MapBGEvents + diff --git a/data/maps/events/Route128.s b/data/maps/events/Route128.s new file mode 100644 index 000000000..d49492d21 --- /dev/null +++ b/data/maps/events/Route128.s @@ -0,0 +1,18 @@ +Route128_MapObjects:: @ 83850D0 + object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 77, 0, 24, 0, 1, 48, 85, 0, 1, 0, 3, 0, Route128_EventScript_1522A4, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 35, 0, 34, 0, 1, 28, 5, 0, 1, 0, 7, 0, Route128_EventScript_1522E2, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_STEVEN, 0, 40, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 834, 0, 0 + object_event 4, 246, 0, 37, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, 944, 0, 0 + object_event 5, 247, 0, 38, 0, 21, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, 945, 0, 0 + object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 63, 0, 28, 0, 3, 7, 17, 0, 1, 0, 0, 0, Route128_EventScript_15234E, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_MAN_4, 0, 24, 0, 8, 0, 3, 17, 17, 0, 1, 0, 2, 0, Route128_EventScript_152337, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 47, 0, 9, 0, 3, 10, 17, 0, 1, 0, 3, 0, Route128_EventScript_152320, 0, 0, 0 + +Route128_MapBGEvents:: @ 8385190 + bg_event 49, 9, 3, 7, 0, ITEM_HEART_SCALE, 92, 0 + bg_event 57, 21, 3, 7, 0, ITEM_HEART_SCALE, 93, 0 + bg_event 31, 33, 3, 7, 0, ITEM_HEART_SCALE, 94, 0 + +Route128_MapEvents:: @ 83851B4 + map_events Route128_MapObjects, 0x0, 0x0, Route128_MapBGEvents + diff --git a/data/maps/events/Route129.s b/data/maps/events/Route129.s new file mode 100644 index 000000000..400f26457 --- /dev/null +++ b/data/maps/events/Route129.s @@ -0,0 +1,9 @@ +Route129_MapObjects:: @ 83851C8 + object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 15, 0, 23, 0, 1, 50, 67, 0, 1, 0, 3, 0, Route129_EventScript_152366, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 35, 0, 9, 0, 1, 52, 37, 0, 1, 0, 2, 0, Route129_EventScript_15237D, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 9, 0, 14, 0, 1, 1, 17, 0, 1, 0, 2, 0, Route129_EventScript_1523AB, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_SWIMMER_M, 0, 28, 0, 16, 0, 1, 24, 17, 0, 1, 0, 2, 0, Route129_EventScript_152394, 0, 0, 0 + +Route129_MapEvents:: @ 8385228 + map_events Route129_MapObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/events/Route130.s b/data/maps/events/Route130.s new file mode 100644 index 000000000..754002e0b --- /dev/null +++ b/data/maps/events/Route130.s @@ -0,0 +1,8 @@ +Route130_MapObjects:: @ 838523C + object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 7, 0, 26, 0, 1, 29, 99, 0, 1, 0, 3, 0, Route130_EventScript_152410, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 68, 0, 22, 0, 1, 13, 17, 0, 1, 0, 3, 0, Route130_EventScript_152427, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, Route130_EventScript_1A14DD, 17, 0, 0 + +Route130_MapEvents:: @ 8385284 + map_events Route130_MapObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/events/Route131.s b/data/maps/events/Route131.s new file mode 100644 index 000000000..7337299cb --- /dev/null +++ b/data/maps/events/Route131.s @@ -0,0 +1,14 @@ +Route131_MapObjects:: @ 8385298 + object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 17, 0, 25, 0, 1, 29, 117, 0, 1, 0, 3, 0, Route131_EventScript_152452, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 36, 0, 26, 0, 1, 8, 0, 0, 1, 0, 3, 0, Route131_EventScript_152469, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 33, 0, 28, 0, 1, 7, 0, 0, 1, 0, 4, 0, Route131_EventScript_152480, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 45, 0, 23, 0, 1, 47, 65, 0, 1, 0, 3, 0, Route131_EventScript_152497, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_SWIMMER_F, 0, 9, 0, 16, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route131_EventScript_1524AE, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 0, 16, 0, 1, 8, 17, 0, 1, 0, 0, 0, Route131_EventScript_1524C9, 0, 0, 0 + +Route131_MapWarps:: @ 8385328 + warp_def 36, 6, 3, 0, SkyPillar_Entrance + +Route131_MapEvents:: @ 8385330 + map_events Route131_MapObjects, Route131_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Route132.s b/data/maps/events/Route132.s new file mode 100644 index 000000000..ea5d79b9a --- /dev/null +++ b/data/maps/events/Route132.s @@ -0,0 +1,10 @@ +Route132_MapObjects:: @ 8385344 + object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 7, 0, 3, 0, 1, 46, 51, 0, 1, 0, 2, 0, Route132_EventScript_1524E5, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 41, 0, 16, 0, 1, 49, 68, 0, 1, 0, 2, 0, Route132_EventScript_1524FC, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 10, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route132_EventScript_1B16DD, 1036, 0, 0 + object_event 4, MAP_OBJ_GFX_BLACK_BELT, 0, 46, 0, 28, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route132_EventScript_15252A, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 9, 0, 16, 0, 3, 8, 0, 0, 1, 0, 1, 0, Route132_EventScript_152513, 0, 0, 0 + +Route132_MapEvents:: @ 83853BC + map_events Route132_MapObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/events/Route133.s b/data/maps/events/Route133.s new file mode 100644 index 000000000..229bdcda4 --- /dev/null +++ b/data/maps/events/Route133.s @@ -0,0 +1,12 @@ +Route133_MapObjects:: @ 83853D0 + object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 6, 0, 4, 0, 1, 1, 0, 0, 1, 0, 3, 0, Route133_EventScript_152542, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 68, 0, 24, 0, 1, 8, 0, 0, 1, 0, 3, 0, Route133_EventScript_152570, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 69, 0, 24, 0, 1, 8, 0, 0, 1, 0, 3, 0, Route133_EventScript_152559, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 58, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16EA, 1037, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16F7, 1038, 0, 0 + object_event 6, MAP_OBJ_GFX_MAN_6, 0, 37, 0, 16, 0, 3, 13, 17, 0, 1, 0, 1, 0, Route133_EventScript_15259E, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_MAN_4, 0, 7, 0, 14, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route133_EventScript_152587, 0, 0, 0 + +Route133_MapEvents:: @ 8385478 + map_events Route133_MapObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/events/Route134.s b/data/maps/events/Route134.s new file mode 100644 index 000000000..e763a11ed --- /dev/null +++ b/data/maps/events/Route134.s @@ -0,0 +1,10 @@ +Route134_MapObjects:: @ 838548C + object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 52, 0, 9, 0, 1, 49, 83, 0, 1, 0, 2, 0, Route134_EventScript_1525C4, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 45, 0, 5, 0, 1, 1, 0, 0, 1, 0, 3, 0, Route134_EventScript_1525DB, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_4, 0, 41, 0, 23, 0, 3, 10, 0, 0, 1, 0, 1, 0, Route134_EventScript_152609, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_6, 0, 65, 0, 14, 0, 3, 18, 0, 0, 1, 0, 2, 0, Route134_EventScript_1525F2, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 56, 0, 16, 0, 3, 27, 10, 0, 1, 0, 3, 0, Route134_EventScript_152620, 0, 0, 0 + +Route134_MapEvents:: @ 8385504 + map_events Route134_MapObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/events/RustboroCity.s b/data/maps/events/RustboroCity.s new file mode 100644 index 000000000..ba75bd731 --- /dev/null +++ b/data/maps/events/RustboroCity.s @@ -0,0 +1,60 @@ +RustboroCity_MapObjects:: @ 837FD14 + object_event 1, MAP_OBJ_GFX_WOMAN_7, 0, 22, 0, 34, 0, 3, 3, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3B1, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 19, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C386, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 25, 0, 37, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C401, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 0, 46, 0, 3, 3, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3F8, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BOY_2, 0, 12, 0, 45, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3D9, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_MAN_4, 0, 26, 0, 23, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3BA, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 24, 0, 51, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C449, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 0, 51, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C45F, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_MAN_2, 0, 30, 0, 10, 0, 3, 10, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C5FF, 732, 0, 0 + object_event 10, 241, 0, 13, 0, 21, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 731, 0, 0 + object_event 11, MAP_OBJ_GFX_MAN_7, 0, 13, 0, 34, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C3A5, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 36, 0, 51, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, 1041, 0, 0 + object_event 13, MAP_OBJ_GFX_MAN_5, 0, 19, 0, 27, 0, 3, 8, 16, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C475, 0, 0, 0 + object_event 14, 240, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, 814, 0, 0 + +RustboroCity_MapWarps:: @ 837FE64 + warp_def 27, 19, 0, 0, RustboroCity_Gym + warp_def 13, 30, 0, 0, RustboroCity_Flat1_1F + warp_def 16, 45, 0, 0, RustboroCity_Mart + warp_def 16, 38, 0, 0, RustboroCity_PokemonCenter_1F + warp_def 27, 34, 0, 0, RustboroCity_PokemonSchool + warp_def 11, 15, 0, 0, RustboroCity_DevonCorp_1F + warp_def 12, 15, 0, 1, RustboroCity_DevonCorp_1F + warp_def 33, 19, 0, 0, RustboroCity_House1 + warp_def 9, 38, 0, 0, RustboroCity_CuttersHouse + warp_def 30, 28, 0, 0, RustboroCity_House2 + warp_def 5, 51, 0, 0, RustboroCity_Flat2_1F + warp_def 26, 46, 0, 0, RustboroCity_House3 + +RustboroCity_MapCoordEvents:: @ 837FEC4 + coord_event 23, 20, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C481 + coord_event 23, 21, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C498 + coord_event 23, 22, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C4AF + coord_event 23, 23, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C4C6 + coord_event 23, 24, 3, 0, 0x405a, 1, 0, RustboroCity_EventScript_14C4DD + coord_event 30, 9, 3, 0, 0x405a, 2, 0, RustboroCity_EventScript_14C620 + coord_event 29, 10, 3, 0, 0x405a, 2, 0, RustboroCity_EventScript_14C62C + coord_event 30, 11, 3, 0, 0x405a, 2, 0, RustboroCity_EventScript_14C638 + coord_event 30, 12, 3, 0, 0x405a, 2, 0, RustboroCity_EventScript_14C644 + coord_event 30, 9, 3, 0, 0x405a, 4, 0, RustboroCity_EventScript_14C74D + coord_event 31, 10, 3, 0, 0x405a, 4, 0, RustboroCity_EventScript_14C759 + coord_event 30, 11, 3, 0, 0x405a, 4, 0, RustboroCity_EventScript_14C765 + coord_event 30, 12, 3, 0, 0x405a, 4, 0, RustboroCity_EventScript_14C771 + +RustboroCity_MapBGEvents:: @ 837FF94 + bg_event 23, 19, 0, 0, 0, RustboroCity_EventScript_14C41C + bg_event 25, 35, 0, 0, 0, RustboroCity_EventScript_14C437 + bg_event 17, 45, 0, 1, 0, RustboroCity_EventScript_1A00E1 + bg_event 18, 38, 0, 1, 0, RustboroCity_EventScript_1A00EA + bg_event 19, 49, 0, 0, 0, RustboroCity_EventScript_14C42E + bg_event 18, 45, 0, 1, 0, RustboroCity_EventScript_1A00E1 + bg_event 17, 38, 0, 1, 0, RustboroCity_EventScript_1A00EA + bg_event 17, 20, 0, 0, 0, RustboroCity_EventScript_14C413 + bg_event 30, 8, 0, 0, 0, RustboroCity_EventScript_14C40A + bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_14C440 + +RustboroCity_MapEvents:: @ 838000C + map_events RustboroCity_MapObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents + diff --git a/data/maps/events/RustboroCity_CuttersHouse.s b/data/maps/events/RustboroCity_CuttersHouse.s new file mode 100644 index 000000000..d0cca63f3 --- /dev/null +++ b/data/maps/events/RustboroCity_CuttersHouse.s @@ -0,0 +1,11 @@ +RustboroCity_CuttersHouse_MapObjects:: @ 8388D9C + object_event 1, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D27, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LASS, 0, 9, 0, 2, 0, 3, 5, 1, 0, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D5D, 0, 0, 0 + +RustboroCity_CuttersHouse_MapWarps:: @ 8388DCC + warp_def 5, 8, 0, 8, RustboroCity + warp_def 6, 8, 0, 8, RustboroCity + +RustboroCity_CuttersHouse_MapEvents:: @ 8388DDC + map_events RustboroCity_CuttersHouse_MapObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.s b/data/maps/events/RustboroCity_DevonCorp_1F.s new file mode 100644 index 000000000..798de776b --- /dev/null +++ b/data/maps/events/RustboroCity_DevonCorp_1F.s @@ -0,0 +1,13 @@ +RustboroCity_DevonCorp_1F_MapObjects:: @ 838880C + object_event 1, MAP_OBJ_GFX_MAN_7, 0, 2, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157422, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_7, 0, 15, 0, 5, 0, 3, 2, 18, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157454, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 5, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_15748F, 0, 0, 0 + +RustboroCity_DevonCorp_1F_MapWarps:: @ 8388854 + warp_def 5, 8, 0, 5, RustboroCity + warp_def 6, 8, 0, 6, RustboroCity + warp_def 14, 1, 0, 0, RustboroCity_DevonCorp_2F + +RustboroCity_DevonCorp_1F_MapEvents:: @ 838886C + map_events RustboroCity_DevonCorp_1F_MapObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.s b/data/maps/events/RustboroCity_DevonCorp_2F.s new file mode 100644 index 000000000..f9c5a8665 --- /dev/null +++ b/data/maps/events/RustboroCity_DevonCorp_2F.s @@ -0,0 +1,14 @@ +RustboroCity_DevonCorp_2F_MapObjects:: @ 8388880 + object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574E2, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 1, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574F9, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 2, 0, 6, 0, 3, 15, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157523, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 10, 0, 5, 0, 3, 7, 160, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_15754D, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 14, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157564, 0, 0, 0 + +RustboroCity_DevonCorp_2F_MapWarps:: @ 83888F8 + warp_def 14, 1, 0, 2, RustboroCity_DevonCorp_1F + warp_def 2, 1, 0, 0, RustboroCity_DevonCorp_3F + +RustboroCity_DevonCorp_2F_MapEvents:: @ 8388908 + map_events RustboroCity_DevonCorp_2F_MapObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.s b/data/maps/events/RustboroCity_DevonCorp_3F.s new file mode 100644 index 000000000..a0b6f8ad9 --- /dev/null +++ b/data/maps/events/RustboroCity_DevonCorp_3F.s @@ -0,0 +1,15 @@ +RustboroCity_DevonCorp_3F_MapObjects:: @ 838891C + object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 17, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578B0, 949, 0, 0 + object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 15, 0, 5, 0, 3, 76, 17, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0, 0, 0 + +RustboroCity_DevonCorp_3F_MapWarps:: @ 8388964 + warp_def 2, 1, 0, 1, RustboroCity_DevonCorp_2F + +RustboroCity_DevonCorp_3F_MapBGEvents:: @ 838896C + bg_event 1, 5, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF + bg_event 1, 7, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF + +RustboroCity_DevonCorp_3F_MapEvents:: @ 8388984 + map_events RustboroCity_DevonCorp_3F_MapObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents + diff --git a/data/maps/events/RustboroCity_Flat1_1F.s b/data/maps/events/RustboroCity_Flat1_1F.s new file mode 100644 index 000000000..252fd1423 --- /dev/null +++ b/data/maps/events/RustboroCity_Flat1_1F.s @@ -0,0 +1,12 @@ +RustboroCity_Flat1_1F_MapObjects:: @ 8388CB8 + object_event 1, MAP_OBJ_GFX_MAN_4, 0, 9, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C60, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 12, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C69, 0, 0, 0 + +RustboroCity_Flat1_1F_MapWarps:: @ 8388CE8 + warp_def 6, 7, 0, 1, RustboroCity + warp_def 7, 7, 0, 1, RustboroCity + warp_def 2, 1, 0, 0, RustboroCity_Flat1_2F + +RustboroCity_Flat1_1F_MapEvents:: @ 8388D00 + map_events RustboroCity_Flat1_1F_MapObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/RustboroCity_Flat1_2F.s b/data/maps/events/RustboroCity_Flat1_2F.s new file mode 100644 index 000000000..7041d8f6e --- /dev/null +++ b/data/maps/events/RustboroCity_Flat1_2F.s @@ -0,0 +1,9 @@ +RustboroCity_Flat1_2F_MapObjects:: @ 8388D14 + object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 8, 0, 6, 0, 3, 5, 19, 0, 0, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_157C73, 0, 0, 0 + +RustboroCity_Flat1_2F_MapWarps:: @ 8388D2C + warp_def 2, 1, 0, 2, RustboroCity_Flat1_1F + +RustboroCity_Flat1_2F_MapEvents:: @ 8388D34 + map_events RustboroCity_Flat1_2F_MapObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/RustboroCity_Flat2_1F.s b/data/maps/events/RustboroCity_Flat2_1F.s new file mode 100644 index 000000000..8f958c45f --- /dev/null +++ b/data/maps/events/RustboroCity_Flat2_1F.s @@ -0,0 +1,12 @@ +RustboroCity_Flat2_1F_MapObjects:: @ 8388E44 + object_event 1, MAP_OBJ_GFX_SKITTY, 0, 11, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D83, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 8, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D7A, 0, 0, 0 + +RustboroCity_Flat2_1F_MapWarps:: @ 8388E74 + warp_def 2, 8, 0, 10, RustboroCity + warp_def 3, 8, 0, 10, RustboroCity + warp_def 3, 1, 0, 0, RustboroCity_Flat2_2F + +RustboroCity_Flat2_1F_MapEvents:: @ 8388E8C + map_events RustboroCity_Flat2_1F_MapObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/RustboroCity_Flat2_2F.s b/data/maps/events/RustboroCity_Flat2_2F.s new file mode 100644 index 000000000..1fdd2fa7c --- /dev/null +++ b/data/maps/events/RustboroCity_Flat2_2F.s @@ -0,0 +1,11 @@ +RustboroCity_Flat2_2F_MapObjects:: @ 8388EA0 + object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 11, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157D97, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 3, 0, 3, 5, 2, 0, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157DA0, 0, 0, 0 + +RustboroCity_Flat2_2F_MapWarps:: @ 8388ED0 + warp_def 3, 1, 0, 2, RustboroCity_Flat2_1F + warp_def 1, 1, 0, 0, RustboroCity_Flat2_3F + +RustboroCity_Flat2_2F_MapEvents:: @ 8388EE0 + map_events RustboroCity_Flat2_2F_MapObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/RustboroCity_Flat2_3F.s b/data/maps/events/RustboroCity_Flat2_3F.s new file mode 100644 index 000000000..acb76be3f --- /dev/null +++ b/data/maps/events/RustboroCity_Flat2_3F.s @@ -0,0 +1,10 @@ +RustboroCity_Flat2_3F_MapObjects:: @ 8388EF4 + object_event 1, MAP_OBJ_GFX_MAN_7, 0, 7, 0, 3, 0, 3, 5, 2, 0, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DDA, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DE3, 0, 0, 0 + +RustboroCity_Flat2_3F_MapWarps:: @ 8388F24 + warp_def 1, 1, 0, 1, RustboroCity_Flat2_2F + +RustboroCity_Flat2_3F_MapEvents:: @ 8388F2C + map_events RustboroCity_Flat2_3F_MapObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/RustboroCity_Gym.s b/data/maps/events/RustboroCity_Gym.s new file mode 100644 index 000000000..929a4ffbd --- /dev/null +++ b/data/maps/events/RustboroCity_Gym.s @@ -0,0 +1,17 @@ +RustboroCity_Gym_MapObjects:: @ 8388998 + object_event 1, MAP_OBJ_GFX_ROXANNE, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_Gym_EventScript_1578D9, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 7, 0, 12, 0, 3, 9, 0, 0, 1, 0, 3, 0, RustboroCity_Gym_EventScript_157960, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 3, 0, 7, 0, 3, 10, 0, 0, 1, 0, 3, 0, RustboroCity_Gym_EventScript_157977, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_2, 0, 3, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_Gym_EventScript_15798E, 0, 0, 0 + +RustboroCity_Gym_MapWarps:: @ 83889F8 + warp_def 5, 18, 0, 0, RustboroCity + warp_def 6, 18, 0, 0, RustboroCity + +RustboroCity_Gym_MapBGEvents:: @ 8388A08 + bg_event 2, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579AD + bg_event 8, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579BD + +RustboroCity_Gym_MapEvents:: @ 8388A20 + map_events RustboroCity_Gym_MapObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents + diff --git a/data/maps/events/RustboroCity_House1.s b/data/maps/events/RustboroCity_House1.s new file mode 100644 index 000000000..bf11dafb5 --- /dev/null +++ b/data/maps/events/RustboroCity_House1.s @@ -0,0 +1,11 @@ +RustboroCity_House1_MapObjects:: @ 8388D48 + object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_House1_EventScript_157C7D, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_HIKER, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_House1_EventScript_157D1D, 0, 0, 0 + +RustboroCity_House1_MapWarps:: @ 8388D78 + warp_def 5, 7, 0, 7, RustboroCity + warp_def 6, 7, 0, 7, RustboroCity + +RustboroCity_House1_MapEvents:: @ 8388D88 + map_events RustboroCity_House1_MapObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/RustboroCity_House2.s b/data/maps/events/RustboroCity_House2.s new file mode 100644 index 000000000..f069ba0f5 --- /dev/null +++ b/data/maps/events/RustboroCity_House2.s @@ -0,0 +1,11 @@ +RustboroCity_House2_MapObjects:: @ 8388DF0 + object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D67, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D70, 0, 0, 0 + +RustboroCity_House2_MapWarps:: @ 8388E20 + warp_def 5, 8, 0, 9, RustboroCity + warp_def 6, 8, 0, 9, RustboroCity + +RustboroCity_House2_MapEvents:: @ 8388E30 + map_events RustboroCity_House2_MapObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/RustboroCity_House3.s b/data/maps/events/RustboroCity_House3.s new file mode 100644 index 000000000..5c57aeee0 --- /dev/null +++ b/data/maps/events/RustboroCity_House3.s @@ -0,0 +1,12 @@ +RustboroCity_House3_MapObjects:: @ 8388F40 + object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DED, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DF6, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_PIKACHU, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DFF, 0, 0, 0 + +RustboroCity_House3_MapWarps:: @ 8388F88 + warp_def 5, 8, 0, 11, RustboroCity + warp_def 6, 8, 0, 11, RustboroCity + +RustboroCity_House3_MapEvents:: @ 8388F98 + map_events RustboroCity_House3_MapObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/RustboroCity_Mart.s b/data/maps/events/RustboroCity_Mart.s new file mode 100644 index 000000000..ece3348c1 --- /dev/null +++ b/data/maps/events/RustboroCity_Mart.s @@ -0,0 +1,13 @@ +RustboroCity_Mart_MapObjects:: @ 8388C34 + object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157BD4, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BOY_1, 0, 2, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C4D, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 8, 0, 4, 0, 3, 3, 16, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C44, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 8, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C56, 0, 0, 0 + +RustboroCity_Mart_MapWarps:: @ 8388C94 + warp_def 3, 7, 0, 2, RustboroCity + warp_def 4, 7, 0, 2, RustboroCity + +RustboroCity_Mart_MapEvents:: @ 8388CA4 + map_events RustboroCity_Mart_MapObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.s b/data/maps/events/RustboroCity_PokemonCenter_1F.s new file mode 100644 index 000000000..36e1e386d --- /dev/null +++ b/data/maps/events/RustboroCity_PokemonCenter_1F.s @@ -0,0 +1,14 @@ +RustboroCity_PokemonCenter_1F_MapObjects:: @ 8388B24 + object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B88, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_1, 0, 11, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B96, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BOY_1, 0, 3, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B9F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 10, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157BA8, 0, 0, 0 + +RustboroCity_PokemonCenter_1F_MapWarps:: @ 8388B84 + warp_def 7, 8, 3, 3, RustboroCity + warp_def 6, 8, 3, 3, RustboroCity + warp_def 1, 6, 4, 0, RustboroCity_PokemonCenter_2F + +RustboroCity_PokemonCenter_1F_MapEvents:: @ 8388B9C + map_events RustboroCity_PokemonCenter_1F_MapObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.s b/data/maps/events/RustboroCity_PokemonCenter_2F.s new file mode 100644 index 000000000..df450209c --- /dev/null +++ b/data/maps/events/RustboroCity_PokemonCenter_2F.s @@ -0,0 +1,15 @@ +RustboroCity_PokemonCenter_2F_MapObjects:: @ 8388BB0 + object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC1, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC7, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BCD, 0, 0, 0 + +RustboroCity_PokemonCenter_2F_MapWarps:: @ 8388BF8 + warp_def 1, 5, 4, 2, RustboroCity_PokemonCenter_1F + warp_def 5, 1, 0, 0, SingleBattleColosseum + warp_def 8, 1, 0, 0, TradeCenter + warp_def 11, 1, 0, 0, RecordCorner + warp_def 0, 0, 0, 0, DoubleBattleColosseum + +RustboroCity_PokemonCenter_2F_MapEvents:: @ 8388C20 + map_events RustboroCity_PokemonCenter_2F_MapObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/RustboroCity_PokemonSchool.s b/data/maps/events/RustboroCity_PokemonSchool.s new file mode 100644 index 000000000..7dd504a9b --- /dev/null +++ b/data/maps/events/RustboroCity_PokemonSchool.s @@ -0,0 +1,22 @@ +RustboroCity_PokemonSchool_MapObjects:: @ 8388A34 + object_event 1, MAP_OBJ_GFX_BOY_5, 0, 8, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157A98, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BOY_5, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AA1, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BOY_4, 0, 3, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AAA, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_LASS, 0, 10, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AB3, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 3, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157ABC, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_GENTLEMAN, 0, 5, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157ACE, 0, 0, 0 + +RustboroCity_PokemonSchool_MapWarps:: @ 8388AC4 + warp_def 5, 10, 0, 4, RustboroCity + warp_def 6, 10, 0, 4, RustboroCity + +RustboroCity_PokemonSchool_MapBGEvents:: @ 8388AD4 + bg_event 5, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 4, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 6, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 7, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 3, 5, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AC5 + +RustboroCity_PokemonSchool_MapEvents:: @ 8388B10 + map_events RustboroCity_PokemonSchool_MapObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents + diff --git a/data/maps/events/RusturfTunnel.s b/data/maps/events/RusturfTunnel.s new file mode 100644 index 000000000..a37826dc3 --- /dev/null +++ b/data/maps/events/RusturfTunnel.s @@ -0,0 +1,27 @@ +RusturfTunnel_MapObjects:: @ 838BD2C + object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, 807, 0, 0 + object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B0EB7, 931, 0, 0 + object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, 1048, 0, 0 + object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, 1049, 0, 0 + object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 879, 0, 0 + object_event 6, 241, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, 878, 0, 0 + object_event 7, MAP_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, 880, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B0EB7, 932, 0, 0 + object_event 9, MAP_OBJ_GFX_HIKER, 0, 32, 0, 13, 0, 3, 9, 17, 0, 1, 0, 3, 0, RusturfTunnel_EventScript_15CACD, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, 983, 0, 0 + +RusturfTunnel_MapWarps:: @ 838BE1C + warp_def 4, 10, 3, 0, Route116 + warp_def 29, 16, 3, 4, VerdanturfTown + warp_def 18, 20, 3, 2, Route116 + +RusturfTunnel_MapCoordEvents:: @ 838BE34 + coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C999 + coord_event 9, 4, 3, 0, 0x409a, 2, 0, RusturfTunnel_EventScript_15C9AB + coord_event 9, 5, 3, 0, 0x409a, 2, 0, RusturfTunnel_EventScript_15C9AB + coord_event 25, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C99F + coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9A5 + +RusturfTunnel_MapEvents:: @ 838BE84 + map_events RusturfTunnel_MapObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 + diff --git a/data/maps/events/SSTidalCorridor.s b/data/maps/events/SSTidalCorridor.s new file mode 100644 index 000000000..58fe0f3db --- /dev/null +++ b/data/maps/events/SSTidalCorridor.s @@ -0,0 +1,34 @@ +SSTidalCorridor_MapObjects:: @ 83916F8 + object_event 1, MAP_OBJ_GFX_SAILOR, 0, 1, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FDD6, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SAILOR, 0, 16, 0, 7, 0, 3, 3, 32, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FE60, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD96, 950, 0, 0 + object_event 4, MAP_OBJ_GFX_WINGULL, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD9F, 950, 0, 0 + +SSTidalCorridor_MapWarps:: @ 8391758 + warp_def 4, 9, 3, 0, SSTidalRooms + warp_def 7, 9, 3, 2, SSTidalRooms + warp_def 10, 9, 3, 4, SSTidalRooms + warp_def 13, 9, 3, 6, SSTidalRooms + warp_def 4, 3, 3, 8, SSTidalRooms + warp_def 7, 3, 3, 9, SSTidalRooms + warp_def 10, 3, 3, 10, SSTidalRooms + warp_def 13, 3, 3, 11, SSTidalRooms + warp_def 16, 2, 3, 0, SSTidalLowerDeck + +SSTidalCorridor_MapBGEvents:: @ 83917A0 + bg_event 2, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A + bg_event 4, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A + bg_event 6, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A + bg_event 8, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A + bg_event 10, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A + bg_event 12, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A + bg_event 14, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A + bg_event 16, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A + bg_event 5, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDB2 + bg_event 8, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDBB + bg_event 11, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDC4 + bg_event 14, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDCD + +SSTidalCorridor_MapEvents:: @ 8391830 + map_events SSTidalCorridor_MapObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents + diff --git a/data/maps/events/SSTidalLowerDeck.s b/data/maps/events/SSTidalLowerDeck.s new file mode 100644 index 000000000..6309cc767 --- /dev/null +++ b/data/maps/events/SSTidalLowerDeck.s @@ -0,0 +1,13 @@ +SSTidalLowerDeck_MapObjects:: @ 8391844 + object_event 1, MAP_OBJ_GFX_SAILOR, 0, 10, 0, 4, 0, 3, 46, 68, 0, 1, 0, 3, 0, SSTidalLowerDeck_EventScript_15FED7, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SAILOR, 0, 7, 0, 4, 0, 3, 50, 71, 0, 1, 0, 3, 0, SSTidalLowerDeck_EventScript_15FEEE, 0, 0, 0 + +SSTidalLowerDeck_MapWarps:: @ 8391874 + warp_def 15, 2, 3, 8, SSTidalCorridor + +SSTidalLowerDeck_MapBGEvents:: @ 839187C + bg_event 0, 2, 0, 7, 0, ITEM_LEFTOVERS, 35, 0 + +SSTidalLowerDeck_MapEvents:: @ 8391888 + map_events SSTidalLowerDeck_MapObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents + diff --git a/data/maps/events/SSTidalRooms.s b/data/maps/events/SSTidalRooms.s new file mode 100644 index 000000000..c0eb92d5a --- /dev/null +++ b/data/maps/events/SSTidalRooms.s @@ -0,0 +1,31 @@ +SSTidalRooms_MapObjects:: @ 839189C + object_event 1, MAP_OBJ_GFX_MAN_3, 0, 4, 0, 7, 0, 3, 10, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FF5D, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 34, 0, 11, 0, 3, 9, 0, 0, 1, 0, 3, 0, SSTidalRooms_EventScript_15FF74, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 21, 0, 5, 0, 3, 10, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FF8B, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_MAN_5, 0, 7, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FFA2, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 13, 0, 3, 8, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FFBD, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BOY_4, 0, 22, 0, 11, 0, 3, 8, 17, 0, 1, 0, 3, 0, SSTidalRooms_EventScript_15FFD8, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 15, 0, 6, 0, 3, 9, 0, 0, 1, 0, 0, 0, SSTidalRooms_EventScript_15FFEF, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_MANIAC, 0, 28, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSTidalRooms_EventScript_15FF06, 951, 0, 0 + +SSTidalRooms_MapWarps:: @ 839195C + warp_def 4, 16, 0, 0, SSTidalCorridor + warp_def 5, 16, 0, 0, SSTidalCorridor + warp_def 13, 16, 0, 1, SSTidalCorridor + warp_def 14, 16, 0, 1, SSTidalCorridor + warp_def 22, 16, 0, 2, SSTidalCorridor + warp_def 23, 16, 0, 2, SSTidalCorridor + warp_def 31, 16, 0, 3, SSTidalCorridor + warp_def 32, 16, 0, 3, SSTidalCorridor + warp_def 4, 1, 0, 4, SSTidalCorridor + warp_def 13, 1, 0, 5, SSTidalCorridor + warp_def 22, 1, 0, 6, SSTidalCorridor + warp_def 31, 1, 0, 7, SSTidalCorridor + +SSTidalRooms_MapBGEvents:: @ 83919BC + bg_event 15, 11, 0, 0, 0, SSTidalRooms_EventScript_15FF47 + bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_15FF47 + +SSTidalRooms_MapEvents:: @ 83919D4 + map_events SSTidalRooms_MapObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents + diff --git a/data/maps/events/SafariZone_Northeast.s b/data/maps/events/SafariZone_Northeast.s new file mode 100644 index 000000000..be0fa2ffa --- /dev/null +++ b/data/maps/events/SafariZone_Northeast.s @@ -0,0 +1,14 @@ +SafariZone_Northeast_MapObjects:: @ 8391A2C + object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 22, 0, 9, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_160011, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_5, 0, 6, 0, 29, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_16001A, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B0EB7, 17, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B0EB7, 18, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B0EB7, 19, 0, 0 + object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B0EB7, 20, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B0EB7, 21, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B0EB7, 22, 0, 0 + object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B1919, 1119, 0, 0 + +SafariZone_Northeast_MapEvents:: @ 8391B04 + map_events SafariZone_Northeast_MapObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/events/SafariZone_Northwest.s b/data/maps/events/SafariZone_Northwest.s new file mode 100644 index 000000000..700e88986 --- /dev/null +++ b/data/maps/events/SafariZone_Northwest.s @@ -0,0 +1,7 @@ +SafariZone_Northwest_MapObjects:: @ 83919E8 + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 8, 0, 8, 0, 5, 8, 0, 0, 0, 0, 0, 0, SafariZone_Northwest_EventScript_160007, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 33, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northwest_EventScript_1B190C, 1094, 0, 0 + +SafariZone_Northwest_MapEvents:: @ 8391A18 + map_events SafariZone_Northwest_MapObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/events/SafariZone_RestHouse.s b/data/maps/events/SafariZone_RestHouse.s new file mode 100644 index 000000000..2e0474133 --- /dev/null +++ b/data/maps/events/SafariZone_RestHouse.s @@ -0,0 +1,12 @@ +SafariZone_RestHouse_MapObjects:: @ 8391EC0 + object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 7, 0, 4, 0, 0, 10, 17, 0, 0, 0, 0, 0, SafariZone_RestHouse_EventScript_160C2F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_PSYCHIC_M, 0, 8, 0, 4, 0, 0, 9, 17, 0, 0, 0, 0, 0, SafariZone_RestHouse_EventScript_160C38, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 2, 0, 5, 0, 3, 10, 17, 0, 0, 0, 0, 0, SafariZone_RestHouse_EventScript_160C41, 0, 0, 0 + +SafariZone_RestHouse_MapWarps:: @ 8391F08 + warp_def 3, 8, 0, 0, SafariZone_Southwest + warp_def 4, 8, 0, 0, SafariZone_Southwest + +SafariZone_RestHouse_MapEvents:: @ 8391F18 + map_events SafariZone_RestHouse_MapObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SafariZone_Southeast.s b/data/maps/events/SafariZone_Southeast.s new file mode 100644 index 000000000..ab172ba0c --- /dev/null +++ b/data/maps/events/SafariZone_Southeast.s @@ -0,0 +1,12 @@ +SafariZone_Southeast_MapObjects:: @ 8391B70 + object_event 1, MAP_OBJ_GFX_CAMPER, 0, 32, 0, 34, 0, 4, 8, 0, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_1600A7, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BOY_1, 0, 26, 0, 28, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_16008C, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_5, 0, 16, 0, 6, 0, 5, 8, 0, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_160095, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 15, 0, 31, 0, 3, 2, 17, 0, 0, 0, 0, 0, SafariZone_Southeast_EventScript_16009E, 0, 0, 0 + +SafariZone_Southeast_MapWarps:: @ 8391BD0 + warp_def 32, 33, 0, 0, Route121_SafariZoneEntrance + +SafariZone_Southeast_MapEvents:: @ 8391BD8 + map_events SafariZone_Southeast_MapObjects, SafariZone_Southeast_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SafariZone_Southwest.s b/data/maps/events/SafariZone_Southwest.s new file mode 100644 index 000000000..b552c4d0f --- /dev/null +++ b/data/maps/events/SafariZone_Southwest.s @@ -0,0 +1,13 @@ +SafariZone_Southwest_MapObjects:: @ 8391B18 + object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 22, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_160024, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_1B1926, 1131, 0, 0 + +SafariZone_Southwest_MapWarps:: @ 8391B48 + warp_def 29, 7, 3, 0, SafariZone_RestHouse + +SafariZone_Southwest_MapBGEvents:: @ 8391B50 + bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_16002D + +SafariZone_Southwest_MapEvents:: @ 8391B5C + map_events SafariZone_Southwest_MapObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents + diff --git a/data/maps/events/ScorchedSlab.s b/data/maps/events/ScorchedSlab.s new file mode 100644 index 000000000..508381a9c --- /dev/null +++ b/data/maps/events/ScorchedSlab.s @@ -0,0 +1,9 @@ +ScorchedSlab_MapObjects:: @ 838E988 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, 1079, 0, 0 + +ScorchedSlab_MapWarps:: @ 838E9A0 + warp_def 7, 16, 1, 1, Route120 + +ScorchedSlab_MapEvents:: @ 838E9A8 + map_events ScorchedSlab_MapObjects, ScorchedSlab_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SeafloorCavern_Entrance.s b/data/maps/events/SeafloorCavern_Entrance.s new file mode 100644 index 000000000..5a3e66e57 --- /dev/null +++ b/data/maps/events/SeafloorCavern_Entrance.s @@ -0,0 +1,7 @@ +SeafloorCavern_Entrance_MapWarps:: @ 838D094 + warp_def 10, 18, 3, 0, Underwater4 + warp_def 10, 1, 3, 0, SeafloorCavern_Room1 + +SeafloorCavern_Entrance_MapEvents:: @ 838D0A4 + map_events 0x0, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SeafloorCavern_Room1.s b/data/maps/events/SeafloorCavern_Room1.s new file mode 100644 index 000000000..804888368 --- /dev/null +++ b/data/maps/events/SeafloorCavern_Room1.s @@ -0,0 +1,15 @@ +SeafloorCavern_Room1_MapObjects:: @ 838D0B8 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_1B0FCB, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_1B0FCB, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_1B0EB7, 19, 0, 0 + object_event 4, 241, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, 946, 0, 0 + object_event 5, 241, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, 946, 0, 0 + +SeafloorCavern_Room1_MapWarps:: @ 838D130 + warp_def 5, 18, 3, 1, SeafloorCavern_Entrance + warp_def 17, 13, 3, 0, SeafloorCavern_Room5 + warp_def 6, 2, 3, 0, SeafloorCavern_Room2 + +SeafloorCavern_Room1_MapEvents:: @ 838D148 + map_events SeafloorCavern_Room1_MapObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SeafloorCavern_Room2.s b/data/maps/events/SeafloorCavern_Room2.s new file mode 100644 index 000000000..66ce9694e --- /dev/null +++ b/data/maps/events/SeafloorCavern_Room2.s @@ -0,0 +1,20 @@ +SeafloorCavern_Room2_MapObjects:: @ 838D15C + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_1B0FCB, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_1B0FCB, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_1B0FCB, 19, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_1B0FCB, 20, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_1B0FCB, 21, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_1B0FCB, 22, 0, 0 + object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_1B0EB7, 24, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_1B0EB7, 25, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_1B0FCB, 23, 0, 0 + +SeafloorCavern_Room2_MapWarps:: @ 838D234 + warp_def 12, 19, 3, 2, SeafloorCavern_Room1 + warp_def 5, 19, 3, 0, SeafloorCavern_Room4 + warp_def 5, 2, 3, 0, SeafloorCavern_Room6 + warp_def 12, 2, 3, 0, SeafloorCavern_Room7 + +SeafloorCavern_Room2_MapEvents:: @ 838D254 + map_events SeafloorCavern_Room2_MapObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SeafloorCavern_Room3.s b/data/maps/events/SeafloorCavern_Room3.s new file mode 100644 index 000000000..b653deafd --- /dev/null +++ b/data/maps/events/SeafloorCavern_Room3.s @@ -0,0 +1,20 @@ +SeafloorCavern_Room3_MapObjects:: @ 838D268 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_1B0FCB, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_1B0FCB, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_1B0FCB, 19, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_1B0FCB, 20, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_1B0FCB, 21, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_1B0FCB, 22, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_1B0FCB, 23, 0, 0 + object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_1B0FCB, 24, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_1B0FCB, 25, 0, 0 + object_event 10, 242, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, 946, 0, 0 + +SeafloorCavern_Room3_MapWarps:: @ 838D358 + warp_def 8, 1, 3, 1, SeafloorCavern_Room8 + warp_def 10, 13, 3, 1, SeafloorCavern_Room7 + warp_def 4, 15, 3, 1, SeafloorCavern_Room6 + +SeafloorCavern_Room3_MapEvents:: @ 838D370 + map_events SeafloorCavern_Room3_MapObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SeafloorCavern_Room4.s b/data/maps/events/SeafloorCavern_Room4.s new file mode 100644 index 000000000..5d598836d --- /dev/null +++ b/data/maps/events/SeafloorCavern_Room4.s @@ -0,0 +1,12 @@ +SeafloorCavern_Room4_MapObjects:: @ 838D384 + object_event 1, 241, 0, 4, 0, 8, 0, 3, 23, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room4_EventScript_15DACB, 946, 0, 0 + +SeafloorCavern_Room4_MapWarps:: @ 838D39C + warp_def 13, 1, 3, 1, SeafloorCavern_Room2 + warp_def 4, 1, 3, 1, SeafloorCavern_Room5 + warp_def 9, 10, 3, 2, SeafloorCavern_Room5 + warp_def 10, 15, 3, 1, SeafloorCavern_Entrance + +SeafloorCavern_Room4_MapEvents:: @ 838D3BC + map_events SeafloorCavern_Room4_MapObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SeafloorCavern_Room5.s b/data/maps/events/SeafloorCavern_Room5.s new file mode 100644 index 000000000..2a037ad1d --- /dev/null +++ b/data/maps/events/SeafloorCavern_Room5.s @@ -0,0 +1,16 @@ +SeafloorCavern_Room5_MapObjects:: @ 838D3D0 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_1B0FCB, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_1B0FCB, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_1B0FCB, 19, 0, 0 + object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_1B0EB7, 21, 0, 0 + object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_1B0EB7, 22, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_1B0FCB, 20, 0, 0 + +SeafloorCavern_Room5_MapWarps:: @ 838D460 + warp_def 4, 1, 3, 1, SeafloorCavern_Room1 + warp_def 15, 12, 3, 1, SeafloorCavern_Room4 + warp_def 7, 17, 3, 2, SeafloorCavern_Room4 + +SeafloorCavern_Room5_MapEvents:: @ 838D478 + map_events SeafloorCavern_Room5_MapObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SeafloorCavern_Room6.s b/data/maps/events/SeafloorCavern_Room6.s new file mode 100644 index 000000000..42bb93ce7 --- /dev/null +++ b/data/maps/events/SeafloorCavern_Room6.s @@ -0,0 +1,8 @@ +SeafloorCavern_Room6_MapWarps:: @ 838D48C + warp_def 11, 21, 3, 2, SeafloorCavern_Room2 + warp_def 4, 1, 3, 2, SeafloorCavern_Room3 + warp_def 14, 8, 1, 1, SeafloorCavern_Entrance + +SeafloorCavern_Room6_MapEvents:: @ 838D4A4 + map_events 0x0, SeafloorCavern_Room6_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SeafloorCavern_Room7.s b/data/maps/events/SeafloorCavern_Room7.s new file mode 100644 index 000000000..7c6c05a1c --- /dev/null +++ b/data/maps/events/SeafloorCavern_Room7.s @@ -0,0 +1,7 @@ +SeafloorCavern_Room7_MapWarps:: @ 838D4B8 + warp_def 3, 23, 3, 3, SeafloorCavern_Room2 + warp_def 5, 1, 3, 1, SeafloorCavern_Room3 + +SeafloorCavern_Room7_MapEvents:: @ 838D4C8 + map_events 0x0, SeafloorCavern_Room7_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SeafloorCavern_Room8.s b/data/maps/events/SeafloorCavern_Room8.s new file mode 100644 index 000000000..dbd4af805 --- /dev/null +++ b/data/maps/events/SeafloorCavern_Room8.s @@ -0,0 +1,21 @@ +SeafloorCavern_Room8_MapObjects:: @ 838D4DC + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 18, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 19, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 20, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 21, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 22, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 23, 0, 0 + object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 24, 0, 0 + object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 25, 0, 0 + object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 26, 0, 0 + object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 27, 0, 0 + object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_1B0FCB, 28, 0, 0 + +SeafloorCavern_Room8_MapWarps:: @ 838D5FC + warp_def 5, 2, 3, 0, SeafloorCavern_Room9 + warp_def 5, 12, 3, 0, SeafloorCavern_Room3 + +SeafloorCavern_Room8_MapEvents:: @ 838D60C + map_events SeafloorCavern_Room8_MapObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SeafloorCavern_Room9.s b/data/maps/events/SeafloorCavern_Room9.s new file mode 100644 index 000000000..8fac0af19 --- /dev/null +++ b/data/maps/events/SeafloorCavern_Room9.s @@ -0,0 +1,18 @@ +SeafloorCavern_Room9_MapObjects:: @ 838D620 + object_event 1, 248, 0, 17, 0, 38, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 859, 0, 0 + object_event 2, 246, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 828, 0, 0 + object_event 3, 247, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 829, 0, 0 + object_event 4, 244, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 831, 0, 0 + object_event 5, 245, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 831, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 14, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, 1090, 0, 0 + object_event 7, 249, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, 733, 0, 0 + +SeafloorCavern_Room9_MapWarps:: @ 838D6C8 + warp_def 5, 4, 3, 0, SeafloorCavern_Room8 + +SeafloorCavern_Room9_MapCoordEvents:: @ 838D6D0 + coord_event 17, 42, 3, 0, 0x40a2, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA + +SeafloorCavern_Room9_MapEvents:: @ 838D6E0 + map_events SeafloorCavern_Room9_MapObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 + diff --git a/data/maps/events/SealedChamber_InnerRoom.s b/data/maps/events/SealedChamber_InnerRoom.s new file mode 100644 index 000000000..3f6077e8e --- /dev/null +++ b/data/maps/events/SealedChamber_InnerRoom.s @@ -0,0 +1,17 @@ +SealedChamber_InnerRoom_MapWarps:: @ 838E900 + warp_def 10, 19, 3, 0, SealedChamber_OuterRoom + +SealedChamber_InnerRoom_MapBGEvents:: @ 838E908 + bg_event 10, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 + bg_event 6, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F249 + bg_event 14, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F257 + bg_event 4, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F265 + bg_event 16, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F273 + bg_event 6, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F281 + bg_event 14, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F28F + bg_event 9, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 + bg_event 11, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 + +SealedChamber_InnerRoom_MapEvents:: @ 838E974 + map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents + diff --git a/data/maps/events/SealedChamber_OuterRoom.s b/data/maps/events/SealedChamber_OuterRoom.s new file mode 100644 index 000000000..9b95fb06c --- /dev/null +++ b/data/maps/events/SealedChamber_OuterRoom.s @@ -0,0 +1,37 @@ +SealedChamber_OuterRoom_MapWarps:: @ 838E788 + warp_def 10, 2, 3, 0, SealedChamber_InnerRoom + +SealedChamber_OuterRoom_MapBGEvents:: @ 838E790 + bg_event 5, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C + bg_event 5, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F13A + bg_event 5, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F148 + bg_event 5, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F156 + bg_event 11, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F164 + bg_event 11, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F172 + bg_event 11, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F180 + bg_event 11, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F19C + bg_event 16, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F18E + bg_event 16, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1AA + bg_event 10, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1B8 + bg_event 6, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C + bg_event 4, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C + bg_event 4, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F13A + bg_event 6, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F13A + bg_event 4, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F148 + bg_event 6, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F148 + bg_event 4, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F156 + bg_event 6, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F156 + bg_event 10, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F164 + bg_event 12, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F164 + bg_event 10, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F172 + bg_event 12, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F172 + bg_event 10, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F180 + bg_event 12, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F180 + bg_event 10, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F19C + bg_event 12, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F19C + bg_event 9, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1D9 + bg_event 11, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1D9 + +SealedChamber_OuterRoom_MapEvents:: @ 838E8EC + map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents + diff --git a/data/maps/events/SecretBase_BlueCave1.s b/data/maps/events/SecretBase_BlueCave1.s new file mode 100644 index 000000000..08ffdfdd1 --- /dev/null +++ b/data/maps/events/SecretBase_BlueCave1.s @@ -0,0 +1,23 @@ +SecretBase_BlueCave1_MapObjects:: @ 838F18C + object_event 1, 255, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_BlueCave1_MapWarps:: @ 838F2F4 + warp_def 5, 7, 0, 126, NONE + +SecretBase_BlueCave1_MapEvents:: @ 838F2FC + map_events SecretBase_BlueCave1_MapObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_BlueCave2.s b/data/maps/events/SecretBase_BlueCave2.s new file mode 100644 index 000000000..46f66a0be --- /dev/null +++ b/data/maps/events/SecretBase_BlueCave2.s @@ -0,0 +1,23 @@ +SecretBase_BlueCave2_MapObjects:: @ 838FAA4 + object_event 1, 255, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_BlueCave2_MapWarps:: @ 838FC0C + warp_def 7, 5, 0, 126, NONE + +SecretBase_BlueCave2_MapEvents:: @ 838FC14 + map_events SecretBase_BlueCave2_MapObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_BlueCave3.s b/data/maps/events/SecretBase_BlueCave3.s new file mode 100644 index 000000000..487042edd --- /dev/null +++ b/data/maps/events/SecretBase_BlueCave3.s @@ -0,0 +1,23 @@ +SecretBase_BlueCave3_MapObjects:: @ 83903BC + object_event 1, 255, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_BlueCave3_MapWarps:: @ 8390524 + warp_def 4, 15, 0, 126, NONE + +SecretBase_BlueCave3_MapEvents:: @ 839052C + map_events SecretBase_BlueCave3_MapObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_BlueCave4.s b/data/maps/events/SecretBase_BlueCave4.s new file mode 100644 index 000000000..949532d0b --- /dev/null +++ b/data/maps/events/SecretBase_BlueCave4.s @@ -0,0 +1,23 @@ +SecretBase_BlueCave4_MapObjects:: @ 8390CD4 + object_event 1, 255, 0, 5, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_BlueCave4_MapWarps:: @ 8390E3C + warp_def 4, 15, 0, 126, NONE + +SecretBase_BlueCave4_MapEvents:: @ 8390E44 + map_events SecretBase_BlueCave4_MapObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_BrownCave1.s b/data/maps/events/SecretBase_BrownCave1.s new file mode 100644 index 000000000..8f3c7b160 --- /dev/null +++ b/data/maps/events/SecretBase_BrownCave1.s @@ -0,0 +1,23 @@ +SecretBase_BrownCave1_MapObjects:: @ 838F008 + object_event 1, 255, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_BrownCave1_MapWarps:: @ 838F170 + warp_def 5, 7, 0, 126, NONE + +SecretBase_BrownCave1_MapEvents:: @ 838F178 + map_events SecretBase_BrownCave1_MapObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_BrownCave2.s b/data/maps/events/SecretBase_BrownCave2.s new file mode 100644 index 000000000..1cc098a3d --- /dev/null +++ b/data/maps/events/SecretBase_BrownCave2.s @@ -0,0 +1,23 @@ +SecretBase_BrownCave2_MapObjects:: @ 838F920 + object_event 1, 255, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_BrownCave2_MapWarps:: @ 838FA88 + warp_def 1, 7, 0, 126, NONE + +SecretBase_BrownCave2_MapEvents:: @ 838FA90 + map_events SecretBase_BrownCave2_MapObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_BrownCave3.s b/data/maps/events/SecretBase_BrownCave3.s new file mode 100644 index 000000000..40a318b15 --- /dev/null +++ b/data/maps/events/SecretBase_BrownCave3.s @@ -0,0 +1,23 @@ +SecretBase_BrownCave3_MapObjects:: @ 8390238 + object_event 1, 255, 0, 1, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_BrownCave3_MapWarps:: @ 83903A0 + warp_def 11, 9, 0, 126, NONE + +SecretBase_BrownCave3_MapEvents:: @ 83903A8 + map_events SecretBase_BrownCave3_MapObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_BrownCave4.s b/data/maps/events/SecretBase_BrownCave4.s new file mode 100644 index 000000000..9b5572e02 --- /dev/null +++ b/data/maps/events/SecretBase_BrownCave4.s @@ -0,0 +1,23 @@ +SecretBase_BrownCave4_MapObjects:: @ 8390B50 + object_event 1, 255, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_BrownCave4_MapWarps:: @ 8390CB8 + warp_def 2, 8, 0, 126, NONE + +SecretBase_BrownCave4_MapEvents:: @ 8390CC0 + map_events SecretBase_BrownCave4_MapObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_RedCave1.s b/data/maps/events/SecretBase_RedCave1.s new file mode 100644 index 000000000..1e44ffb93 --- /dev/null +++ b/data/maps/events/SecretBase_RedCave1.s @@ -0,0 +1,23 @@ +SecretBase_RedCave1_MapObjects:: @ 838EE84 + object_event 1, 255, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_RedCave1_MapWarps:: @ 838EFEC + warp_def 5, 7, 0, 126, NONE + +SecretBase_RedCave1_MapEvents:: @ 838EFF4 + map_events SecretBase_RedCave1_MapObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_RedCave2.s b/data/maps/events/SecretBase_RedCave2.s new file mode 100644 index 000000000..e4c5c8961 --- /dev/null +++ b/data/maps/events/SecretBase_RedCave2.s @@ -0,0 +1,23 @@ +SecretBase_RedCave2_MapObjects:: @ 838F79C + object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_RedCave2_MapWarps:: @ 838F904 + warp_def 3, 14, 0, 126, NONE + +SecretBase_RedCave2_MapEvents:: @ 838F90C + map_events SecretBase_RedCave2_MapObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_RedCave3.s b/data/maps/events/SecretBase_RedCave3.s new file mode 100644 index 000000000..7841943ea --- /dev/null +++ b/data/maps/events/SecretBase_RedCave3.s @@ -0,0 +1,23 @@ +SecretBase_RedCave3_MapObjects:: @ 83900B4 + object_event 1, 255, 0, 12, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_RedCave3_MapWarps:: @ 839021C + warp_def 3, 6, 0, 126, NONE + +SecretBase_RedCave3_MapEvents:: @ 8390224 + map_events SecretBase_RedCave3_MapObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_RedCave4.s b/data/maps/events/SecretBase_RedCave4.s new file mode 100644 index 000000000..1a3564abe --- /dev/null +++ b/data/maps/events/SecretBase_RedCave4.s @@ -0,0 +1,23 @@ +SecretBase_RedCave4_MapObjects:: @ 83909CC + object_event 1, 255, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_RedCave4_MapWarps:: @ 8390B34 + warp_def 2, 12, 0, 126, NONE + +SecretBase_RedCave4_MapEvents:: @ 8390B3C + map_events SecretBase_RedCave4_MapObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_Shrub1.s b/data/maps/events/SecretBase_Shrub1.s new file mode 100644 index 000000000..e7a1f5f3a --- /dev/null +++ b/data/maps/events/SecretBase_Shrub1.s @@ -0,0 +1,23 @@ +SecretBase_Shrub1_MapObjects:: @ 838F618 + object_event 1, 255, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_Shrub1_MapWarps:: @ 838F780 + warp_def 5, 7, 0, 126, NONE + +SecretBase_Shrub1_MapEvents:: @ 838F788 + map_events SecretBase_Shrub1_MapObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_Shrub2.s b/data/maps/events/SecretBase_Shrub2.s new file mode 100644 index 000000000..b8c5cfac7 --- /dev/null +++ b/data/maps/events/SecretBase_Shrub2.s @@ -0,0 +1,23 @@ +SecretBase_Shrub2_MapObjects:: @ 838FF30 + object_event 1, 255, 0, 13, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_Shrub2_MapWarps:: @ 8390098 + warp_def 7, 5, 0, 126, NONE + +SecretBase_Shrub2_MapEvents:: @ 83900A0 + map_events SecretBase_Shrub2_MapObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_Shrub3.s b/data/maps/events/SecretBase_Shrub3.s new file mode 100644 index 000000000..30496e5cf --- /dev/null +++ b/data/maps/events/SecretBase_Shrub3.s @@ -0,0 +1,23 @@ +SecretBase_Shrub3_MapObjects:: @ 8390848 + object_event 1, 255, 0, 5, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_Shrub3_MapWarps:: @ 83909B0 + warp_def 6, 9, 0, 126, NONE + +SecretBase_Shrub3_MapEvents:: @ 83909B8 + map_events SecretBase_Shrub3_MapObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_Shrub4.s b/data/maps/events/SecretBase_Shrub4.s new file mode 100644 index 000000000..b6e7d14b7 --- /dev/null +++ b/data/maps/events/SecretBase_Shrub4.s @@ -0,0 +1,23 @@ +SecretBase_Shrub4_MapObjects:: @ 8391160 + object_event 1, 255, 0, 9, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_Shrub4_MapWarps:: @ 83912C8 + warp_def 11, 8, 0, 126, NONE + +SecretBase_Shrub4_MapEvents:: @ 83912D0 + map_events SecretBase_Shrub4_MapObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_Tree1.s b/data/maps/events/SecretBase_Tree1.s new file mode 100644 index 000000000..dee9340d6 --- /dev/null +++ b/data/maps/events/SecretBase_Tree1.s @@ -0,0 +1,23 @@ +SecretBase_Tree1_MapObjects:: @ 838F494 + object_event 1, 255, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_Tree1_MapWarps:: @ 838F5FC + warp_def 5, 7, 0, 126, NONE + +SecretBase_Tree1_MapEvents:: @ 838F604 + map_events SecretBase_Tree1_MapObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_Tree2.s b/data/maps/events/SecretBase_Tree2.s new file mode 100644 index 000000000..5b9e3ece0 --- /dev/null +++ b/data/maps/events/SecretBase_Tree2.s @@ -0,0 +1,23 @@ +SecretBase_Tree2_MapObjects:: @ 838FDAC + object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_Tree2_MapWarps:: @ 838FF14 + warp_def 3, 14, 0, 126, NONE + +SecretBase_Tree2_MapEvents:: @ 838FF1C + map_events SecretBase_Tree2_MapObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_Tree3.s b/data/maps/events/SecretBase_Tree3.s new file mode 100644 index 000000000..1ddc6eb09 --- /dev/null +++ b/data/maps/events/SecretBase_Tree3.s @@ -0,0 +1,23 @@ +SecretBase_Tree3_MapObjects:: @ 83906C4 + object_event 1, 255, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_Tree3_MapWarps:: @ 839082C + warp_def 8, 6, 0, 126, NONE + +SecretBase_Tree3_MapEvents:: @ 8390834 + map_events SecretBase_Tree3_MapObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_Tree4.s b/data/maps/events/SecretBase_Tree4.s new file mode 100644 index 000000000..7eb7a36e5 --- /dev/null +++ b/data/maps/events/SecretBase_Tree4.s @@ -0,0 +1,23 @@ +SecretBase_Tree4_MapObjects:: @ 8390FDC + object_event 1, 255, 0, 10, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_Tree4_MapWarps:: @ 8391144 + warp_def 7, 12, 0, 126, NONE + +SecretBase_Tree4_MapEvents:: @ 839114C + map_events SecretBase_Tree4_MapObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_YellowCave1.s b/data/maps/events/SecretBase_YellowCave1.s new file mode 100644 index 000000000..f08d926ba --- /dev/null +++ b/data/maps/events/SecretBase_YellowCave1.s @@ -0,0 +1,23 @@ +SecretBase_YellowCave1_MapObjects:: @ 838F310 + object_event 1, 255, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_YellowCave1_MapWarps:: @ 838F478 + warp_def 5, 7, 0, 126, NONE + +SecretBase_YellowCave1_MapEvents:: @ 838F480 + map_events SecretBase_YellowCave1_MapObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_YellowCave2.s b/data/maps/events/SecretBase_YellowCave2.s new file mode 100644 index 000000000..7120e785c --- /dev/null +++ b/data/maps/events/SecretBase_YellowCave2.s @@ -0,0 +1,23 @@ +SecretBase_YellowCave2_MapObjects:: @ 838FC28 + object_event 1, 255, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_YellowCave2_MapWarps:: @ 838FD90 + warp_def 12, 7, 0, 126, NONE + +SecretBase_YellowCave2_MapEvents:: @ 838FD98 + map_events SecretBase_YellowCave2_MapObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_YellowCave3.s b/data/maps/events/SecretBase_YellowCave3.s new file mode 100644 index 000000000..85d70bed0 --- /dev/null +++ b/data/maps/events/SecretBase_YellowCave3.s @@ -0,0 +1,23 @@ +SecretBase_YellowCave3_MapObjects:: @ 8390540 + object_event 1, 255, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_YellowCave3_MapWarps:: @ 83906A8 + warp_def 5, 9, 0, 126, NONE + +SecretBase_YellowCave3_MapEvents:: @ 83906B0 + map_events SecretBase_YellowCave3_MapObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SecretBase_YellowCave4.s b/data/maps/events/SecretBase_YellowCave4.s new file mode 100644 index 000000000..2997ddc91 --- /dev/null +++ b/data/maps/events/SecretBase_YellowCave4.s @@ -0,0 +1,23 @@ +SecretBase_YellowCave4_MapObjects:: @ 8390E58 + object_event 1, 255, 0, 9, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, 173, 0, 0 + object_event 2, 240, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, 241, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, 242, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, 243, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, 244, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, 245, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 8, 246, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 180, 0, 0 + object_event 9, 247, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 181, 0, 0 + object_event 10, 248, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 182, 0, 0 + object_event 11, 249, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 183, 0, 0 + object_event 12, 250, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 184, 0, 0 + object_event 13, 251, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 185, 0, 0 + object_event 14, 252, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 186, 0, 0 + object_event 15, 253, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 187, 0, 0 + +SecretBase_YellowCave4_MapWarps:: @ 8390FC0 + warp_def 6, 12, 0, 126, NONE + +SecretBase_YellowCave4_MapEvents:: @ 8390FC8 + map_events SecretBase_YellowCave4_MapObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/ShoalCave_HighTideEntranceRoom.s b/data/maps/events/ShoalCave_HighTideEntranceRoom.s new file mode 100644 index 000000000..96551e11c --- /dev/null +++ b/data/maps/events/ShoalCave_HighTideEntranceRoom.s @@ -0,0 +1,3 @@ +ShoalCave_HighTideEntranceRoom_MapEvents:: @ 838DEAC + map_events 0x0, 0x0, 0x0, 0x0 + diff --git a/data/maps/events/ShoalCave_HighTideInnerRoom.s b/data/maps/events/ShoalCave_HighTideInnerRoom.s new file mode 100644 index 000000000..b66bfbc4a --- /dev/null +++ b/data/maps/events/ShoalCave_HighTideInnerRoom.s @@ -0,0 +1,3 @@ +ShoalCave_HighTideInnerRoom_MapEvents:: @ 838DEC0 + map_events 0x0, 0x0, 0x0, 0x0 + diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.s b/data/maps/events/ShoalCave_LowTideEntranceRoom.s new file mode 100644 index 000000000..582a1d9bd --- /dev/null +++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.s @@ -0,0 +1,13 @@ +ShoalCave_LowTideEntranceRoom_MapObjects:: @ 838DCDC + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 30, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_1B19F6, 1081, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 18, 0, 15, 0, 3, 9, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_15E076, 0, 0, 0 + +ShoalCave_LowTideEntranceRoom_MapWarps:: @ 838DD0C + warp_def 20, 30, 3, 0, Route125 + warp_def 19, 5, 3, 0, ShoalCave_LowTideInnerRoom + warp_def 6, 2, 3, 6, ShoalCave_LowTideInnerRoom + warp_def 27, 2, 3, 7, ShoalCave_LowTideInnerRoom + +ShoalCave_LowTideEntranceRoom_MapEvents:: @ 838DD2C + map_events ShoalCave_LowTideEntranceRoom_MapObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.s b/data/maps/events/ShoalCave_LowTideIceRoom.s new file mode 100644 index 000000000..236ed44fb --- /dev/null +++ b/data/maps/events/ShoalCave_LowTideIceRoom.s @@ -0,0 +1,10 @@ +ShoalCave_LowTideIceRoom_MapObjects:: @ 838EDE0 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A1D, 1112, 0, 0 + object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 12, 0, 21, 0, 4, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, 1113, 0, 0 + +ShoalCave_LowTideIceRoom_MapWarps:: @ 838EE10 + warp_def 17, 10, 3, 3, ShoalCave_LowTideLowerRoom + +ShoalCave_LowTideIceRoom_MapEvents:: @ 838EE18 + map_events ShoalCave_LowTideIceRoom_MapObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.s b/data/maps/events/ShoalCave_LowTideInnerRoom.s new file mode 100644 index 000000000..f69475f70 --- /dev/null +++ b/data/maps/events/ShoalCave_LowTideInnerRoom.s @@ -0,0 +1,24 @@ +ShoalCave_LowTideInnerRoom_MapObjects:: @ 838DD40 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 26, 0, 14, 0, 5, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, 1082, 0, 0 + +ShoalCave_LowTideInnerRoom_MapWarps:: @ 838DD58 + warp_def 34, 29, 3, 1, ShoalCave_LowTideEntranceRoom + warp_def 38, 15, 3, 0, ShoalCave_LowTideStairsRoom + warp_def 42, 4, 3, 1, ShoalCave_LowTideStairsRoom + warp_def 19, 14, 4, 0, ShoalCave_LowTideLowerRoom + warp_def 15, 19, 3, 1, ShoalCave_LowTideLowerRoom + warp_def 30, 25, 3, 2, ShoalCave_LowTideLowerRoom + warp_def 14, 33, 5, 2, ShoalCave_LowTideEntranceRoom + warp_def 40, 33, 5, 3, ShoalCave_LowTideEntranceRoom + +ShoalCave_LowTideInnerRoom_MapBGEvents:: @ 838DD98 + bg_event 31, 8, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E329 + bg_event 14, 26, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E365 + bg_event 41, 20, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E257 + bg_event 41, 10, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E293 + bg_event 6, 9, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E2C5 + bg_event 16, 13, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E2F7 + +ShoalCave_LowTideInnerRoom_MapEvents:: @ 838DDE0 + map_events ShoalCave_LowTideInnerRoom_MapObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents + diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.s b/data/maps/events/ShoalCave_LowTideLowerRoom.s new file mode 100644 index 000000000..1c810a328 --- /dev/null +++ b/data/maps/events/ShoalCave_LowTideLowerRoom.s @@ -0,0 +1,16 @@ +ShoalCave_LowTideLowerRoom_MapObjects:: @ 838DE3C + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_1B0FCB, 17, 0, 0 + object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 11, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0, 0, 0 + +ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C + warp_def 7, 2, 3, 3, ShoalCave_LowTideInnerRoom + warp_def 2, 6, 3, 4, ShoalCave_LowTideInnerRoom + warp_def 19, 11, 3, 5, ShoalCave_LowTideInnerRoom + warp_def 28, 11, 3, 0, ShoalCave_LowTideIceRoom + +ShoalCave_LowTideLowerRoom_MapBGEvents:: @ 838DE8C + bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E413 + +ShoalCave_LowTideLowerRoom_MapEvents:: @ 838DE98 + map_events ShoalCave_LowTideLowerRoom_MapObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents + diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.s b/data/maps/events/ShoalCave_LowTideStairsRoom.s new file mode 100644 index 000000000..544f0f347 --- /dev/null +++ b/data/maps/events/ShoalCave_LowTideStairsRoom.s @@ -0,0 +1,13 @@ +ShoalCave_LowTideStairsRoom_MapObjects:: @ 838DDF4 + object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, 1083, 0, 0 + +ShoalCave_LowTideStairsRoom_MapWarps:: @ 838DE0C + warp_def 3, 12, 3, 1, ShoalCave_LowTideInnerRoom + warp_def 7, 4, 3, 2, ShoalCave_LowTideInnerRoom + +ShoalCave_LowTideStairsRoom_MapBGEvents:: @ 838DE1C + bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_15E3B7 + +ShoalCave_LowTideStairsRoom_MapEvents:: @ 838DE28 + map_events ShoalCave_LowTideStairsRoom_MapObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents + diff --git a/data/maps/events/SingleBattleColosseum.s b/data/maps/events/SingleBattleColosseum.s new file mode 100644 index 000000000..a7af56d3a --- /dev/null +++ b/data/maps/events/SingleBattleColosseum.s @@ -0,0 +1,14 @@ +SingleBattleColosseum_MapObjects:: @ 83912E4 + object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SingleBattleColosseum_EventScript_1A449E, 0, 0, 0 + +SingleBattleColosseum_MapWarps:: @ 83912FC + warp_def 6, 8, 3, 127, NONE + warp_def 7, 8, 3, 127, NONE + +SingleBattleColosseum_MapCoordEvents:: @ 839130C + coord_event 3, 5, 3, 0, 0x4000, 0, 0, SingleBattleColosseum_EventScript_1A436F + coord_event 10, 5, 3, 0, 0x4000, 0, 0, SingleBattleColosseum_EventScript_1A4379 + +SingleBattleColosseum_MapEvents:: @ 839132C + map_events SingleBattleColosseum_MapObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 + diff --git a/data/maps/events/SkyPillar_1F.s b/data/maps/events/SkyPillar_1F.s new file mode 100644 index 000000000..8758265d4 --- /dev/null +++ b/data/maps/events/SkyPillar_1F.s @@ -0,0 +1,8 @@ +SkyPillar_1F_MapWarps:: @ 838ED38 + warp_def 6, 13, 3, 1, SkyPillar_Outside + warp_def 7, 13, 3, 1, SkyPillar_Outside + warp_def 10, 1, 3, 0, SkyPillar_2F + +SkyPillar_1F_MapEvents:: @ 838ED50 + map_events 0x0, SkyPillar_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SkyPillar_2F.s b/data/maps/events/SkyPillar_2F.s new file mode 100644 index 000000000..4f4eb72a0 --- /dev/null +++ b/data/maps/events/SkyPillar_2F.s @@ -0,0 +1,7 @@ +SkyPillar_2F_MapWarps:: @ 838ED64 + warp_def 10, 1, 3, 2, SkyPillar_1F + warp_def 3, 1, 3, 0, SkyPillar_3F + +SkyPillar_2F_MapEvents:: @ 838ED74 + map_events 0x0, SkyPillar_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SkyPillar_3F.s b/data/maps/events/SkyPillar_3F.s new file mode 100644 index 000000000..401a899db --- /dev/null +++ b/data/maps/events/SkyPillar_3F.s @@ -0,0 +1,8 @@ +SkyPillar_3F_MapWarps:: @ 838ED88 + warp_def 3, 1, 3, 1, SkyPillar_2F + warp_def 11, 1, 3, 0, SkyPillar_4F + warp_def 7, 1, 3, 1, SkyPillar_4F + +SkyPillar_3F_MapEvents:: @ 838EDA0 + map_events 0x0, SkyPillar_3F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SkyPillar_4F.s b/data/maps/events/SkyPillar_4F.s new file mode 100644 index 000000000..4cc78e723 --- /dev/null +++ b/data/maps/events/SkyPillar_4F.s @@ -0,0 +1,8 @@ +SkyPillar_4F_MapWarps:: @ 838EDB4 + warp_def 11, 1, 3, 1, SkyPillar_3F + warp_def 7, 1, 3, 2, SkyPillar_3F + warp_def 3, 1, 3, 0, SkyPillar_5F + +SkyPillar_4F_MapEvents:: @ 838EDCC + map_events 0x0, SkyPillar_4F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SkyPillar_5F.s b/data/maps/events/SkyPillar_5F.s new file mode 100644 index 000000000..2753a225f --- /dev/null +++ b/data/maps/events/SkyPillar_5F.s @@ -0,0 +1,7 @@ +SkyPillar_5F_MapWarps:: @ 838EE2C + warp_def 3, 1, 3, 2, SkyPillar_4F + warp_def 10, 1, 3, 0, SkyPillar_Top + +SkyPillar_5F_MapEvents:: @ 838EE3C + map_events 0x0, SkyPillar_5F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SkyPillar_Entrance.s b/data/maps/events/SkyPillar_Entrance.s new file mode 100644 index 000000000..03ba9a035 --- /dev/null +++ b/data/maps/events/SkyPillar_Entrance.s @@ -0,0 +1,7 @@ +SkyPillar_Entrance_MapWarps:: @ 838ECF0 + warp_def 6, 16, 3, 0, Route131 + warp_def 14, 4, 3, 0, SkyPillar_Outside + +SkyPillar_Entrance_MapEvents:: @ 838ED00 + map_events 0x0, SkyPillar_Entrance_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SkyPillar_Outside.s b/data/maps/events/SkyPillar_Outside.s new file mode 100644 index 000000000..cf8cb36ff --- /dev/null +++ b/data/maps/events/SkyPillar_Outside.s @@ -0,0 +1,7 @@ +SkyPillar_Outside_MapWarps:: @ 838ED14 + warp_def 17, 13, 3, 1, SkyPillar_Entrance + warp_def 14, 5, 3, 0, SkyPillar_1F + +SkyPillar_Outside_MapEvents:: @ 838ED24 + map_events 0x0, SkyPillar_Outside_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SkyPillar_Top.s b/data/maps/events/SkyPillar_Top.s new file mode 100644 index 000000000..73bf6337c --- /dev/null +++ b/data/maps/events/SkyPillar_Top.s @@ -0,0 +1,9 @@ +SkyPillar_Top_MapObjects:: @ 838EE50 + object_event 1, MAP_OBJ_GFX_RAYQUAZA, 0, 14, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, SkyPillar_Top_EventScript_15F316, 773, 0, 0 + +SkyPillar_Top_MapWarps:: @ 838EE68 + warp_def 16, 14, 3, 1, SkyPillar_5F + +SkyPillar_Top_MapEvents:: @ 838EE70 + map_events SkyPillar_Top_MapObjects, SkyPillar_Top_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SlateportCity.s b/data/maps/events/SlateportCity.s new file mode 100644 index 000000000..dfd7bdc87 --- /dev/null +++ b/data/maps/events/SlateportCity.s @@ -0,0 +1,63 @@ +SlateportCity_MapObjects:: @ 837F7AC + object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 21, 0, 11, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBD6, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_1, 0, 35, 0, 27, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBF3, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BOY_4, 0, 15, 0, 13, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BBB5, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 26, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BC14, 0, 0, 0 + object_event 5, 240, 0, 31, 0, 27, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, 882, 0, 0 + object_event 6, MAP_OBJ_GFX_COOK, 0, 5, 0, 43, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB3F, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 20, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB60, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 8, 0, 42, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BB81, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 29, 0, 13, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C017, 835, 0, 0 + object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 28, 0, 14, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C020, 835, 0, 0 + object_event 11, MAP_OBJ_GFX_SCIENTIST_1, 0, 28, 0, 13, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, 840, 0, 0 + object_event 12, MAP_OBJ_GFX_SAILOR, 0, 35, 0, 36, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCE2, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_SAILOR, 0, 28, 0, 46, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCEB, 0, 0, 0 + object_event 14, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 50, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCF4, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_MAN_4, 0, 16, 0, 46, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCFD, 0, 0, 0 + object_event 16, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 12, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD06, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 24, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCB8, 0, 0, 0 + object_event 18, MAP_OBJ_GFX_WOMAN_7, 0, 15, 0, 31, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BCD9, 0, 0, 0 + object_event 19, 241, 0, 30, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, 882, 0, 0 + object_event 20, 241, 0, 29, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, 882, 0, 0 + object_event 21, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 6, 0, 38, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE20, 0, 0, 0 + object_event 22, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 5, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDF2, 0, 0, 0 + object_event 23, MAP_OBJ_GFX_MAN_6, 0, 34, 0, 51, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C029, 0, 0, 0 + object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 47, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAE0, 0, 0, 0 + object_event 25, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 11, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE9A, 948, 0, 0 + object_event 26, MAP_OBJ_GFX_MAN_3, 0, 5, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BAB6, 0, 0, 0 + object_event 27, 241, 0, 22, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD7F, 882, 0, 0 + object_event 28, 241, 0, 23, 0, 27, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD96, 882, 0, 0 + object_event 29, 241, 0, 24, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDAD, 882, 0, 0 + object_event 30, 241, 0, 21, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDC4, 882, 0, 0 + object_event 31, 241, 0, 20, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDDB, 882, 0, 0 + +SlateportCity_MapWarps:: @ 837FA94 + warp_def 19, 19, 0, 0, SlateportCity_PokemonCenter_1F + warp_def 13, 26, 0, 0, SlateportCity_Mart + warp_def 26, 38, 0, 0, SlateportCity_SternsShipyard_1F + warp_def 10, 12, 0, 0, SlateportCity_ContestLobby + warp_def 4, 26, 0, 0, SlateportCity_PokemonFanClub + warp_def 30, 26, 0, 0, SlateportCity_OceanicMuseum_1F + warp_def 5, 19, 0, 0, SlateportCity_House1 + warp_def 31, 26, 0, 1, SlateportCity_OceanicMuseum_1F + warp_def 28, 12, 0, 0, SlateportCity_Harbor + warp_def 40, 7, 0, 2, SlateportCity_Harbor + warp_def 21, 44, 0, 0, SlateportCity_House2 + +SlateportCity_MapBGEvents:: @ 837FAEC + bg_event 8, 19, 0, 0, 0, SlateportCity_EventScript_14BCAF + bg_event 20, 19, 0, 1, 0, SlateportCity_EventScript_1A00EA + bg_event 21, 19, 0, 1, 0, SlateportCity_EventScript_1A00EA + bg_event 14, 26, 0, 1, 0, SlateportCity_EventScript_1A00E1 + bg_event 24, 12, 0, 0, 0, SlateportCity_EventScript_14BC91 + bg_event 15, 26, 0, 1, 0, SlateportCity_EventScript_1A00E1 + bg_event 14, 51, 0, 0, 0, SlateportCity_EventScript_14BC88 + bg_event 26, 26, 0, 0, 0, SlateportCity_EventScript_14BC76 + bg_event 16, 22, 0, 0, 0, SlateportCity_EventScript_14BC7F + bg_event 8, 26, 0, 0, 0, SlateportCity_EventScript_14BC6D + bg_event 7, 13, 0, 0, 0, SlateportCity_EventScript_14BC33 + bg_event 23, 38, 0, 0, 0, SlateportCity_EventScript_14BC3C + +SlateportCity_MapEvents:: @ 837FB7C + map_events SlateportCity_MapObjects, SlateportCity_MapWarps, 0x0, SlateportCity_MapBGEvents + diff --git a/data/maps/events/SlateportCity_ContestHall.s b/data/maps/events/SlateportCity_ContestHall.s new file mode 100644 index 000000000..398ac47f4 --- /dev/null +++ b/data/maps/events/SlateportCity_ContestHall.s @@ -0,0 +1,26 @@ +SlateportCity_ContestHall_MapObjects:: @ 83878A4 + object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 19, 0, 15, 0, 3, 2, 34, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15554C, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 4, 0, 3, 2, 51, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155555, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 9, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15559F, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 12, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555B4, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_GIRL_1, 0, 7, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555C9, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_BOY_2, 0, 9, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555DE, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_BOY_1, 0, 11, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555F3, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_FAT_MAN, 0, 13, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155608, 0, 0, 0 + object_event 9, MAP_OBJ_GFX_MANIAC, 0, 8, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15561D, 0, 0, 0 + object_event 10, MAP_OBJ_GFX_HIKER, 0, 12, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155632, 0, 0, 0 + object_event 11, MAP_OBJ_GFX_BOY_3, 0, 5, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15565C, 0, 0, 0 + object_event 12, MAP_OBJ_GFX_BOY_1, 0, 15, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155647, 0, 0, 0 + object_event 13, MAP_OBJ_GFX_SAILOR, 0, 0, 0, 17, 0, 3, 2, 65, 0, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15555E, 0, 0, 0 + +SlateportCity_ContestHall_MapWarps:: @ 83879DC + warp_def 10, 17, 0, 2, SlateportCity_ContestLobby + warp_def 11, 17, 0, 2, SlateportCity_ContestLobby + +SlateportCity_ContestHall_MapBGEvents:: @ 83879EC + bg_event 12, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671 + bg_event 8, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671 + +SlateportCity_ContestHall_MapEvents:: @ 8387A04 + map_events SlateportCity_ContestHall_MapObjects, SlateportCity_ContestHall_MapWarps, 0x0, SlateportCity_ContestHall_MapBGEvents + diff --git a/data/maps/events/SlateportCity_ContestLobby.s b/data/maps/events/SlateportCity_ContestLobby.s new file mode 100644 index 000000000..2833e91dd --- /dev/null +++ b/data/maps/events/SlateportCity_ContestLobby.s @@ -0,0 +1,24 @@ +SlateportCity_ContestLobby_MapObjects:: @ 8387788 + object_event 1, MAP_OBJ_GFX_TEALA, 0, 5, 0, 2, 0, 3, 8, 48, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15541D, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7795, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554DE, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_GIRL_1, 0, 9, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554E7, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, 803, 0, 0 + object_event 6, MAP_OBJ_GFX_BOY_1, 0, 13, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_155536, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F9, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_WOMAN_3, 0, 12, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F0, 0, 0, 0 + +SlateportCity_ContestLobby_MapWarps:: @ 8387848 + warp_def 5, 6, 0, 3, SlateportCity + warp_def 6, 6, 0, 3, SlateportCity + warp_def 1, 1, 0, 0, SlateportCity_ContestHall + +SlateportCity_ContestLobby_MapBGEvents:: @ 8387860 + bg_event 10, 3, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7829 + bg_event 12, 5, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B761E + bg_event 11, 1, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15552F + bg_event 13, 1, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15908D + +SlateportCity_ContestLobby_MapEvents:: @ 8387890 + map_events SlateportCity_ContestLobby_MapObjects, SlateportCity_ContestLobby_MapWarps, 0x0, SlateportCity_ContestLobby_MapBGEvents + diff --git a/data/maps/events/SlateportCity_Harbor.s b/data/maps/events/SlateportCity_Harbor.s new file mode 100644 index 000000000..8ed7a8b99 --- /dev/null +++ b/data/maps/events/SlateportCity_Harbor.s @@ -0,0 +1,25 @@ +SlateportCity_Harbor_MapObjects:: @ 8387F30 + object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, 905, 0, 0 + object_event 2, MAP_OBJ_GFX_SAILOR, 0, 4, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, 905, 0, 0 + object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 1, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, 905, 0, 0 + object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, 841, 0, 0 + object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 860, 0, 0 + object_event 6, 241, 0, 7, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 845, 0, 0 + object_event 7, 246, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 846, 0, 0 + object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 848, 0, 0 + +SlateportCity_Harbor_MapWarps:: @ 8387FF0 + warp_def 11, 14, 0, 8, SlateportCity + warp_def 12, 14, 0, 8, SlateportCity + warp_def 19, 15, 0, 9, SlateportCity + warp_def 20, 15, 0, 9, SlateportCity + +SlateportCity_Harbor_MapCoordEvents:: @ 8388010 + coord_event 8, 11, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155F9B + coord_event 8, 12, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155FA7 + coord_event 8, 13, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155FB3 + coord_event 8, 14, 3, 0, 0x40a0, 1, 0, SlateportCity_Harbor_EventScript_155FBF + +SlateportCity_Harbor_MapEvents:: @ 8388050 + map_events SlateportCity_Harbor_MapObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 + diff --git a/data/maps/events/SlateportCity_House1.s b/data/maps/events/SlateportCity_House1.s new file mode 100644 index 000000000..f1628d47a --- /dev/null +++ b/data/maps/events/SlateportCity_House1.s @@ -0,0 +1,10 @@ +SlateportCity_House1_MapObjects:: @ 8387A18 + object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_House1_EventScript_15567B, 0, 0, 0 + +SlateportCity_House1_MapWarps:: @ 8387A30 + warp_def 3, 7, 0, 6, SlateportCity + warp_def 4, 7, 0, 6, SlateportCity + +SlateportCity_House1_MapEvents:: @ 8387A40 + map_events SlateportCity_House1_MapObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SlateportCity_House2.s b/data/maps/events/SlateportCity_House2.s new file mode 100644 index 000000000..689949166 --- /dev/null +++ b/data/maps/events/SlateportCity_House2.s @@ -0,0 +1,11 @@ +SlateportCity_House2_MapObjects:: @ 8388064 + object_event 1, MAP_OBJ_GFX_MAN_3, 0, 4, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_House2_EventScript_156390, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 7, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_House2_EventScript_156399, 0, 0, 0 + +SlateportCity_House2_MapWarps:: @ 8388094 + warp_def 3, 7, 0, 10, SlateportCity + warp_def 4, 7, 0, 10, SlateportCity + +SlateportCity_House2_MapEvents:: @ 83880A4 + map_events SlateportCity_House2_MapObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SlateportCity_Mart.s b/data/maps/events/SlateportCity_Mart.s new file mode 100644 index 000000000..7b8406575 --- /dev/null +++ b/data/maps/events/SlateportCity_Mart.s @@ -0,0 +1,12 @@ +SlateportCity_Mart_MapObjects:: @ 83881B0 + object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156411, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 4, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_Mart_EventScript_15643E, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_4, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156447, 0, 0, 0 + +SlateportCity_Mart_MapWarps:: @ 83881F8 + warp_def 3, 7, 0, 1, SlateportCity + warp_def 4, 7, 0, 1, SlateportCity + +SlateportCity_Mart_MapEvents:: @ 8388208 + map_events SlateportCity_Mart_MapObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.s b/data/maps/events/SlateportCity_OceanicMuseum_1F.s new file mode 100644 index 000000000..488140043 --- /dev/null +++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.s @@ -0,0 +1,43 @@ +SlateportCity_OceanicMuseum_1F_MapObjects:: @ 8387B38 + object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0 + object_event 2, 241, 0, 18, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, 883, 0, 0 + object_event 3, 241, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, 883, 0, 0 + object_event 4, 241, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, 883, 0, 0 + object_event 5, 240, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, 883, 0, 0 + object_event 6, 241, 0, 14, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, 883, 0, 0 + object_event 7, MAP_OBJ_GFX_BEAUTY, 0, 12, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0, 0, 0 + object_event 8, 241, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, 883, 0, 0 + object_event 9, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, 961, 0, 0 + object_event 10, MAP_OBJ_GFX_MANIAC, 0, 10, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, 961, 0, 0 + object_event 11, MAP_OBJ_GFX_MAN_3, 0, 17, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, 961, 0, 0 + object_event 12, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, 961, 0, 0 + object_event 13, 241, 0, 9, 0, 4, 0, 3, 21, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, 965, 0, 0 + object_event 14, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, 961, 0, 0 + +SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88 + warp_def 9, 8, 0, 5, SlateportCity + warp_def 10, 8, 0, 7, SlateportCity + warp_def 6, 1, 0, 0, SlateportCity_OceanicMuseum_2F + +SlateportCity_OceanicMuseum_1F_MapCoordEvents:: @ 8387CA0 + coord_event 9, 7, 3, 0, 0x40aa, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4 + coord_event 10, 7, 3, 0, 0x40aa, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5 + +SlateportCity_OceanicMuseum_1F_MapBGEvents:: @ 8387CC0 + bg_event 2, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BC5 + bg_event 2, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BCE + bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BD7 + bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE0 + bg_event 10, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BD7 + bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE0 + bg_event 15, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE9 + bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BF2 + bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BFB + bg_event 2, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C04 + bg_event 3, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C04 + bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C0D + bg_event 17, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C0D + +SlateportCity_OceanicMuseum_1F_MapEvents:: @ 8387D5C + map_events SlateportCity_OceanicMuseum_1F_MapObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents + diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.s b/data/maps/events/SlateportCity_OceanicMuseum_2F.s new file mode 100644 index 000000000..6e35d33ca --- /dev/null +++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.s @@ -0,0 +1,38 @@ +SlateportCity_OceanicMuseum_2F_MapObjects:: @ 8387D70 + object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, 887, 0, 0 + object_event 2, 246, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 886, 0, 0 + object_event 3, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 884, 0, 0 + object_event 4, 241, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 885, 0, 0 + object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 12, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, 961, 0, 0 + object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 9, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, 961, 0, 0 + object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, 961, 0, 0 + +SlateportCity_OceanicMuseum_2F_MapWarps:: @ 8387E18 + warp_def 6, 1, 0, 2, SlateportCity_OceanicMuseum_1F + +SlateportCity_OceanicMuseum_2F_MapBGEvents:: @ 8387E20 + bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EDA + bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EE3 + bg_event 4, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F22 + bg_event 4, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F22 + bg_event 3, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19 + bg_event 2, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19 + bg_event 3, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19 + bg_event 3, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + bg_event 4, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + bg_event 13, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F2B + bg_event 14, 7, 3, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F2B + bg_event 18, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F07 + bg_event 19, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F07 + bg_event 15, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EFE + bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EFE + bg_event 8, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EF5 + bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EF5 + bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EEC + bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EEC + bg_event 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + bg_event 4, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + +SlateportCity_OceanicMuseum_2F_MapEvents:: @ 8387F1C + map_events SlateportCity_OceanicMuseum_2F_MapObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents + diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.s b/data/maps/events/SlateportCity_PokemonCenter_1F.s new file mode 100644 index 000000000..de0938a00 --- /dev/null +++ b/data/maps/events/SlateportCity_PokemonCenter_1F.s @@ -0,0 +1,13 @@ +SlateportCity_PokemonCenter_1F_MapObjects:: @ 83880B8 + object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563CE, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SAILOR, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563DC, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 10, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563E5, 0, 0, 0 + +SlateportCity_PokemonCenter_1F_MapWarps:: @ 8388100 + warp_def 7, 8, 3, 0, SlateportCity + warp_def 6, 8, 3, 0, SlateportCity + warp_def 1, 6, 4, 0, SlateportCity_PokemonCenter_2F + +SlateportCity_PokemonCenter_1F_MapEvents:: @ 8388118 + map_events SlateportCity_PokemonCenter_1F_MapObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.s b/data/maps/events/SlateportCity_PokemonCenter_2F.s new file mode 100644 index 000000000..2de928343 --- /dev/null +++ b/data/maps/events/SlateportCity_PokemonCenter_2F.s @@ -0,0 +1,15 @@ +SlateportCity_PokemonCenter_2F_MapObjects:: @ 838812C + object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_1563FE, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_156404, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_15640A, 0, 0, 0 + +SlateportCity_PokemonCenter_2F_MapWarps:: @ 8388174 + warp_def 1, 5, 4, 2, SlateportCity_PokemonCenter_1F + warp_def 5, 1, 0, 0, SingleBattleColosseum + warp_def 8, 1, 0, 0, TradeCenter + warp_def 11, 1, 0, 0, RecordCorner + warp_def 0, 0, 0, 0, DoubleBattleColosseum + +SlateportCity_PokemonCenter_2F_MapEvents:: @ 838819C + map_events SlateportCity_PokemonCenter_2F_MapObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SlateportCity_PokemonFanClub.s b/data/maps/events/SlateportCity_PokemonFanClub.s new file mode 100644 index 000000000..55870c257 --- /dev/null +++ b/data/maps/events/SlateportCity_PokemonFanClub.s @@ -0,0 +1,17 @@ +SlateportCity_PokemonFanClub_MapObjects:: @ 8387A54 + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 11, 0, 4, 0, 0, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A7F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 0, 5, 0, 0, 3, 16, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A88, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_REPORTER_F, 0, 11, 0, 5, 0, 0, 7, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_1ADFA0, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 6, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A15, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_GENTLEMAN, 0, 6, 0, 5, 0, 4, 8, 0, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_15576B, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_ZIGZAGOON, 0, 3, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AA4, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_SKITTY, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A91, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_AZUMARILL, 0, 10, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AB7, 0, 0, 0 + +SlateportCity_PokemonFanClub_MapWarps:: @ 8387B14 + warp_def 6, 10, 0, 4, SlateportCity + warp_def 7, 10, 0, 4, SlateportCity + +SlateportCity_PokemonFanClub_MapEvents:: @ 8387B24 + map_events SlateportCity_PokemonFanClub_MapObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.s b/data/maps/events/SlateportCity_SternsShipyard_1F.s new file mode 100644 index 000000000..f57a7be9e --- /dev/null +++ b/data/maps/events/SlateportCity_SternsShipyard_1F.s @@ -0,0 +1,14 @@ +SlateportCity_SternsShipyard_1F_MapObjects:: @ 8387698 + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 5, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_155336, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553E3, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 18, 0, 8, 0, 3, 5, 1, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553EC, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 11, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, 869, 0, 0 + +SlateportCity_SternsShipyard_1F_MapWarps:: @ 83876F8 + warp_def 2, 14, 0, 2, SlateportCity + warp_def 3, 14, 0, 2, SlateportCity + warp_def 3, 1, 0, 0, SlateportCity_SternsShipyard_2F + +SlateportCity_SternsShipyard_1F_MapEvents:: @ 8387710 + map_events SlateportCity_SternsShipyard_1F_MapObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.s b/data/maps/events/SlateportCity_SternsShipyard_2F.s new file mode 100644 index 000000000..e5571ec62 --- /dev/null +++ b/data/maps/events/SlateportCity_SternsShipyard_2F.s @@ -0,0 +1,11 @@ +SlateportCity_SternsShipyard_2F_MapObjects:: @ 8387724 + object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 8, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_1553FF, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 9, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_155408, 0, 0, 0 + +SlateportCity_SternsShipyard_2F_MapWarps:: @ 838776C + warp_def 3, 1, 0, 2, SlateportCity_SternsShipyard_1F + +SlateportCity_SternsShipyard_2F_MapEvents:: @ 8387774 + map_events SlateportCity_SternsShipyard_2F_MapObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SootopolisCity.s b/data/maps/events/SootopolisCity.s new file mode 100644 index 000000000..d1015b814 --- /dev/null +++ b/data/maps/events/SootopolisCity.s @@ -0,0 +1,41 @@ +SootopolisCity_MapObjects:: @ 8380608 + object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 29, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, 855, 0, 0 + object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 33, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, 856, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 36, 0, 21, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, 854, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 47, 0, 42, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, 854, 0, 0 + object_event 5, MAP_OBJ_GFX_WALLACE, 0, 32, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, 816, 0, 0 + object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 9, 0, 43, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D19F, 854, 0, 0 + object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 51, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, 854, 0, 0 + object_event 8, MAP_OBJ_GFX_BOY_1, 0, 43, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, 854, 0, 0 + object_event 9, MAP_OBJ_GFX_MAN_1, 0, 26, 0, 4, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D287, 854, 0, 0 + object_event 10, MAP_OBJ_GFX_STEVEN, 0, 30, 0, 21, 0, 3, 10, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D498, 973, 0, 0 + object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 49, 0, 34, 0, 3, 3, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2A6, 854, 0, 0 + +SootopolisCity_MapWarps:: @ 8380710 + warp_def 43, 31, 0, 0, SootopolisCity_PokemonCenter_1F + warp_def 17, 29, 0, 0, SootopolisCity_Mart + warp_def 31, 32, 0, 0, SootopolisCity_Gym_1F + warp_def 31, 16, 3, 0, CaveOfOrigin_Entrance + warp_def 9, 6, 0, 0, SootopolisCity_House1 + warp_def 45, 6, 0, 0, SootopolisCity_House2 + warp_def 9, 17, 0, 0, SootopolisCity_House3 + warp_def 44, 17, 0, 0, SootopolisCity_House4 + warp_def 9, 26, 0, 0, SootopolisCity_House5 + warp_def 53, 28, 0, 0, SootopolisCity_House6 + warp_def 8, 35, 0, 0, SootopolisCity_House7 + warp_def 48, 25, 0, 0, SootopolisCity_House8 + +SootopolisCity_MapCoordEvents:: @ 8380770 + coord_event 25, 6, 3, 0, 0x405e, 1, 0, SootopolisCity_EventScript_14D308 + +SootopolisCity_MapBGEvents:: @ 8380780 + bg_event 32, 34, 0, 0, 0, SootopolisCity_EventScript_14D2ED + bg_event 19, 29, 0, 1, 0, SootopolisCity_EventScript_1A00E1 + bg_event 44, 31, 0, 1, 0, SootopolisCity_EventScript_1A00EA + bg_event 45, 31, 0, 1, 0, SootopolisCity_EventScript_1A00EA + bg_event 18, 29, 0, 1, 0, SootopolisCity_EventScript_1A00E1 + bg_event 41, 37, 0, 0, 0, SootopolisCity_EventScript_14D2F6 + +SootopolisCity_MapEvents:: @ 83807C8 + map_events SootopolisCity_MapObjects, SootopolisCity_MapWarps, SootopolisCity_MapCoordEvents, SootopolisCity_MapBGEvents + diff --git a/data/maps/events/SootopolisCity_Gym_1F.s b/data/maps/events/SootopolisCity_Gym_1F.s new file mode 100644 index 000000000..f8f1ad0d8 --- /dev/null +++ b/data/maps/events/SootopolisCity_Gym_1F.s @@ -0,0 +1,16 @@ +SootopolisCity_Gym_1F_MapObjects:: @ 838ACF0 + object_event 1, MAP_OBJ_GFX_WALLACE, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, 815, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_2, 0, 7, 0, 24, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B084, 0, 0, 0 + +SootopolisCity_Gym_1F_MapWarps:: @ 838AD20 + warp_def 8, 25, 0, 2, SootopolisCity + warp_def 9, 25, 0, 2, SootopolisCity + warp_def 11, 22, 3, 0, SootopolisCity_Gym_B1F + +SootopolisCity_Gym_1F_MapBGEvents:: @ 838AD38 + bg_event 6, 24, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B0A3 + bg_event 10, 24, 0, 1, 0, SootopolisCity_Gym_1F_EventScript_15B0B3 + +SootopolisCity_Gym_1F_MapEvents:: @ 838AD50 + map_events SootopolisCity_Gym_1F_MapObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents + diff --git a/data/maps/events/SootopolisCity_Gym_B1F.s b/data/maps/events/SootopolisCity_Gym_B1F.s new file mode 100644 index 000000000..3814c5852 --- /dev/null +++ b/data/maps/events/SootopolisCity_Gym_B1F.s @@ -0,0 +1,16 @@ +SootopolisCity_Gym_B1F_MapObjects:: @ 838AD64 + object_event 1, MAP_OBJ_GFX_LASS, 0, 7, 0, 19, 0, 3, 10, 0, 0, 1, 0, 1, 0, SootopolisCity_Gym_B1F_EventScript_15B0D8, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 9, 0, 17, 0, 3, 9, 0, 0, 1, 0, 1, 0, SootopolisCity_Gym_B1F_EventScript_15B11D, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 9, 0, 14, 0, 3, 9, 0, 0, 1, 0, 1, 0, SootopolisCity_Gym_B1F_EventScript_15B106, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 6, 0, 13, 0, 3, 10, 0, 0, 1, 0, 5, 0, SootopolisCity_Gym_B1F_EventScript_15B134, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 3, 0, 9, 0, 3, 10, 0, 0, 1, 0, 4, 0, SootopolisCity_Gym_B1F_EventScript_15B162, 0, 0, 0 + object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 11, 0, 9, 0, 3, 9, 0, 0, 1, 0, 2, 0, SootopolisCity_Gym_B1F_EventScript_15B179, 0, 0, 0 + object_event 7, MAP_OBJ_GFX_LASS, 0, 8, 0, 7, 0, 3, 8, 0, 0, 1, 0, 2, 0, SootopolisCity_Gym_B1F_EventScript_15B0EF, 0, 0, 0 + object_event 8, MAP_OBJ_GFX_BEAUTY, 0, 12, 0, 7, 0, 3, 9, 0, 0, 1, 0, 3, 0, SootopolisCity_Gym_B1F_EventScript_15B14B, 0, 0, 0 + +SootopolisCity_Gym_B1F_MapWarps:: @ 838AE24 + warp_def 11, 22, 3, 2, SootopolisCity_Gym_1F + +SootopolisCity_Gym_B1F_MapEvents:: @ 838AE2C + map_events SootopolisCity_Gym_B1F_MapObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SootopolisCity_House1.s b/data/maps/events/SootopolisCity_House1.s new file mode 100644 index 000000000..3c5959ea6 --- /dev/null +++ b/data/maps/events/SootopolisCity_House1.s @@ -0,0 +1,11 @@ +SootopolisCity_House1_MapObjects:: @ 838AFA4 + object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B29B, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B2D1, 0, 0, 0 + +SootopolisCity_House1_MapWarps:: @ 838AFD4 + warp_def 3, 6, 0, 4, SootopolisCity + warp_def 4, 6, 0, 4, SootopolisCity + +SootopolisCity_House1_MapEvents:: @ 838AFE4 + map_events SootopolisCity_House1_MapObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SootopolisCity_House2.s b/data/maps/events/SootopolisCity_House2.s new file mode 100644 index 000000000..c96b634c7 --- /dev/null +++ b/data/maps/events/SootopolisCity_House2.s @@ -0,0 +1,10 @@ +SootopolisCity_House2_MapObjects:: @ 838AFF8 + object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 3, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House2_EventScript_15B2E5, 0, 0, 0 + +SootopolisCity_House2_MapWarps:: @ 838B010 + warp_def 3, 6, 0, 5, SootopolisCity + warp_def 4, 6, 0, 5, SootopolisCity + +SootopolisCity_House2_MapEvents:: @ 838B020 + map_events SootopolisCity_House2_MapObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SootopolisCity_House3.s b/data/maps/events/SootopolisCity_House3.s new file mode 100644 index 000000000..65aabc255 --- /dev/null +++ b/data/maps/events/SootopolisCity_House3.s @@ -0,0 +1,11 @@ +SootopolisCity_House3_MapObjects:: @ 838B034 + object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 2, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_House3_EventScript_15B31A, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House3_EventScript_15B343, 0, 0, 0 + +SootopolisCity_House3_MapWarps:: @ 838B064 + warp_def 3, 6, 0, 6, SootopolisCity + warp_def 4, 6, 0, 6, SootopolisCity + +SootopolisCity_House3_MapEvents:: @ 838B074 + map_events SootopolisCity_House3_MapObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SootopolisCity_House4.s b/data/maps/events/SootopolisCity_House4.s new file mode 100644 index 000000000..33e197f9f --- /dev/null +++ b/data/maps/events/SootopolisCity_House4.s @@ -0,0 +1,12 @@ +SootopolisCity_House4_MapObjects:: @ 838B088 + object_event 1, MAP_OBJ_GFX_MAN_1, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B34D, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 5, 0, 2, 0, 3, 7, 33, 0, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B356, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_AZUMARILL, 0, 2, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B35F, 0, 0, 0 + +SootopolisCity_House4_MapWarps:: @ 838B0D0 + warp_def 3, 6, 0, 7, SootopolisCity + warp_def 4, 6, 0, 7, SootopolisCity + +SootopolisCity_House4_MapEvents:: @ 838B0E0 + map_events SootopolisCity_House4_MapObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SootopolisCity_House5.s b/data/maps/events/SootopolisCity_House5.s new file mode 100644 index 000000000..2ad8c1efd --- /dev/null +++ b/data/maps/events/SootopolisCity_House5.s @@ -0,0 +1,11 @@ +SootopolisCity_House5_MapObjects:: @ 838B0F4 + object_event 1, MAP_OBJ_GFX_MANIAC, 0, 3, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B373, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 6, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B37C, 0, 0, 0 + +SootopolisCity_House5_MapWarps:: @ 838B124 + warp_def 3, 6, 0, 8, SootopolisCity + warp_def 4, 6, 0, 8, SootopolisCity + +SootopolisCity_House5_MapEvents:: @ 838B134 + map_events SootopolisCity_House5_MapObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SootopolisCity_House6.s b/data/maps/events/SootopolisCity_House6.s new file mode 100644 index 000000000..f56d0d6ef --- /dev/null +++ b/data/maps/events/SootopolisCity_House6.s @@ -0,0 +1,10 @@ +SootopolisCity_House6_MapObjects:: @ 838B148 + object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 4, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House6_EventScript_15B386, 0, 0, 0 + +SootopolisCity_House6_MapWarps:: @ 838B160 + warp_def 3, 6, 0, 9, SootopolisCity + warp_def 4, 6, 0, 9, SootopolisCity + +SootopolisCity_House6_MapEvents:: @ 838B170 + map_events SootopolisCity_House6_MapObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SootopolisCity_House7.s b/data/maps/events/SootopolisCity_House7.s new file mode 100644 index 000000000..a737e74b2 --- /dev/null +++ b/data/maps/events/SootopolisCity_House7.s @@ -0,0 +1,11 @@ +SootopolisCity_House7_MapObjects:: @ 838B184 + object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 5, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_House7_EventScript_15B3EE, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 1, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_House7_EventScript_15B3F7, 0, 0, 0 + +SootopolisCity_House7_MapWarps:: @ 838B1B4 + warp_def 3, 6, 0, 10, SootopolisCity + warp_def 4, 6, 0, 10, SootopolisCity + +SootopolisCity_House7_MapEvents:: @ 838B1C4 + map_events SootopolisCity_House7_MapObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SootopolisCity_House8.s b/data/maps/events/SootopolisCity_House8.s new file mode 100644 index 000000000..f484d37f2 --- /dev/null +++ b/data/maps/events/SootopolisCity_House8.s @@ -0,0 +1,15 @@ +SootopolisCity_House8_MapObjects:: @ 838B1D8 + object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B492, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_HIKER, 0, 5, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B401, 0, 0, 0 + +SootopolisCity_House8_MapWarps:: @ 838B208 + warp_def 3, 6, 0, 11, SootopolisCity + warp_def 4, 6, 0, 11, SootopolisCity + +SootopolisCity_House8_MapBGEvents:: @ 838B218 + bg_event 5, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B523 + bg_event 2, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B531 + +SootopolisCity_House8_MapEvents:: @ 838B230 + map_events SootopolisCity_House8_MapObjects, SootopolisCity_House8_MapWarps, 0x0, SootopolisCity_House8_MapBGEvents + diff --git a/data/maps/events/SootopolisCity_Mart.s b/data/maps/events/SootopolisCity_Mart.s new file mode 100644 index 000000000..07c83773d --- /dev/null +++ b/data/maps/events/SootopolisCity_Mart.s @@ -0,0 +1,12 @@ +SootopolisCity_Mart_MapObjects:: @ 838AF38 + object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B21B, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 5, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B24A, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 9, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B272, 0, 0, 0 + +SootopolisCity_Mart_MapWarps:: @ 838AF80 + warp_def 3, 7, 0, 1, SootopolisCity + warp_def 4, 7, 0, 1, SootopolisCity + +SootopolisCity_Mart_MapEvents:: @ 838AF90 + map_events SootopolisCity_Mart_MapObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.s b/data/maps/events/SootopolisCity_PokemonCenter_1F.s new file mode 100644 index 000000000..640eb2389 --- /dev/null +++ b/data/maps/events/SootopolisCity_PokemonCenter_1F.s @@ -0,0 +1,13 @@ +SootopolisCity_PokemonCenter_1F_MapObjects:: @ 838AE40 + object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15BC70, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 12, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1A8, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 7, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1D0, 0, 0, 0 + +SootopolisCity_PokemonCenter_1F_MapWarps:: @ 838AE88 + warp_def 7, 8, 3, 0, SootopolisCity + warp_def 6, 8, 3, 0, SootopolisCity + warp_def 1, 6, 4, 0, SootopolisCity_PokemonCenter_2F + +SootopolisCity_PokemonCenter_1F_MapEvents:: @ 838AEA0 + map_events SootopolisCity_PokemonCenter_1F_MapObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.s b/data/maps/events/SootopolisCity_PokemonCenter_2F.s new file mode 100644 index 000000000..b149402ca --- /dev/null +++ b/data/maps/events/SootopolisCity_PokemonCenter_2F.s @@ -0,0 +1,15 @@ +SootopolisCity_PokemonCenter_2F_MapObjects:: @ 838AEB4 + object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B208, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B20E, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B214, 0, 0, 0 + +SootopolisCity_PokemonCenter_2F_MapWarps:: @ 838AEFC + warp_def 1, 5, 4, 2, SootopolisCity_PokemonCenter_1F + warp_def 5, 1, 0, 0, SingleBattleColosseum + warp_def 8, 1, 0, 0, TradeCenter + warp_def 11, 1, 0, 0, RecordCorner + warp_def 0, 0, 0, 0, DoubleBattleColosseum + +SootopolisCity_PokemonCenter_2F_MapEvents:: @ 838AF24 + map_events SootopolisCity_PokemonCenter_2F_MapObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/SouthernIsland_Exterior.s b/data/maps/events/SouthernIsland_Exterior.s new file mode 100644 index 000000000..30a77ac29 --- /dev/null +++ b/data/maps/events/SouthernIsland_Exterior.s @@ -0,0 +1,14 @@ +SouthernIsland_Exterior_MapObjects:: @ 8391E00 + object_event 1, MAP_OBJ_GFX_SAILOR, 0, 13, 0, 23, 0, 3, 7, 0, 0, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_160AE0, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 13, 0, 25, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + +SouthernIsland_Exterior_MapWarps:: @ 8391E30 + warp_def 14, 5, 3, 0, SouthernIsland_Interior + warp_def 15, 5, 3, 1, SouthernIsland_Interior + +SouthernIsland_Exterior_MapBGEvents:: @ 8391E40 + bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_160B4A + +SouthernIsland_Exterior_MapEvents:: @ 8391E4C + map_events SouthernIsland_Exterior_MapObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents + diff --git a/data/maps/events/SouthernIsland_Interior.s b/data/maps/events/SouthernIsland_Interior.s new file mode 100644 index 000000000..0f718c43a --- /dev/null +++ b/data/maps/events/SouthernIsland_Interior.s @@ -0,0 +1,14 @@ +SouthernIsland_Interior_MapObjects:: @ 8391E60 + object_event 1, 240, 0, 13, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 910, 0, 0 + object_event 2, 241, 0, 13, 0, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, 911, 0, 0 + +SouthernIsland_Interior_MapWarps:: @ 8391E90 + warp_def 13, 18, 3, 0, SouthernIsland_Exterior + warp_def 14, 18, 3, 1, SouthernIsland_Exterior + +SouthernIsland_Interior_MapBGEvents:: @ 8391EA0 + bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_160B9B + +SouthernIsland_Interior_MapEvents:: @ 8391EAC + map_events SouthernIsland_Interior_MapObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents + diff --git a/data/maps/events/TradeCenter.s b/data/maps/events/TradeCenter.s new file mode 100644 index 000000000..b837208d9 --- /dev/null +++ b/data/maps/events/TradeCenter.s @@ -0,0 +1,14 @@ +TradeCenter_MapObjects:: @ 8391340 + object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, TradeCenter_EventScript_1A44AD, 0, 0, 0 + +TradeCenter_MapWarps:: @ 8391358 + warp_def 5, 8, 3, 127, NONE + warp_def 6, 8, 3, 127, NONE + +TradeCenter_MapCoordEvents:: @ 8391368 + coord_event 4, 5, 3, 0, 0x4000, 0, 0, TradeCenter_EventScript_1A43F0 + coord_event 7, 5, 3, 0, 0x4000, 0, 0, TradeCenter_EventScript_1A43FA + +TradeCenter_MapEvents:: @ 8391388 + map_events TradeCenter_MapObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 + diff --git a/data/maps/events/Underwater1.s b/data/maps/events/Underwater1.s new file mode 100644 index 000000000..cc1b41c03 --- /dev/null +++ b/data/maps/events/Underwater1.s @@ -0,0 +1,12 @@ +Underwater1_MapBGEvents:: @ 8385518 + bg_event 42, 51, 0, 7, 0, ITEM_CARBOS, 8, 0 + bg_event 14, 40, 0, 7, 0, ITEM_GREEN_SHARD, 9, 0 + bg_event 66, 34, 3, 7, 0, ITEM_PEARL, 10, 0 + bg_event 64, 54, 3, 7, 0, ITEM_BIG_PEARL, 11, 0 + bg_event 70, 64, 3, 7, 0, ITEM_HEART_SCALE, 13, 0 + bg_event 42, 5, 3, 7, 0, ITEM_CALCIUM, 36, 0 + bg_event 45, 36, 3, 7, 0, ITEM_HEART_SCALE, 38, 0 + +Underwater1_MapEvents:: @ 838556C + map_events 0x0, 0x0, 0x0, Underwater1_MapBGEvents + diff --git a/data/maps/events/Underwater2.s b/data/maps/events/Underwater2.s new file mode 100644 index 000000000..ca025905f --- /dev/null +++ b/data/maps/events/Underwater2.s @@ -0,0 +1,16 @@ +Underwater2_MapWarps:: @ 8385580 + warp_def 45, 65, 0, 0, Underwater_SootopolisCity + +Underwater2_MapBGEvents:: @ 8385588 + bg_event 30, 17, 3, 7, 0, ITEM_HEART_SCALE, 14, 0 + bg_event 41, 19, 3, 7, 0, ITEM_ULTRA_BALL, 15, 0 + bg_event 63, 19, 3, 7, 0, ITEM_STARDUST, 16, 0 + bg_event 10, 36, 3, 7, 0, ITEM_PEARL, 17, 0 + bg_event 11, 39, 3, 7, 0, ITEM_IRON, 19, 0 + bg_event 12, 35, 3, 7, 0, ITEM_YELLOW_SHARD, 18, 0 + bg_event 65, 60, 3, 7, 0, ITEM_BIG_PEARL, 20, 0 + bg_event 9, 77, 3, 7, 0, ITEM_BLUE_SHARD, 12, 0 + +Underwater2_MapEvents:: @ 83855E8 + map_events 0x0, Underwater2_MapWarps, 0x0, Underwater2_MapBGEvents + diff --git a/data/maps/events/Underwater3.s b/data/maps/events/Underwater3.s new file mode 100644 index 000000000..7fa02cd71 --- /dev/null +++ b/data/maps/events/Underwater3.s @@ -0,0 +1,9 @@ +Underwater3_MapBGEvents:: @ 83855FC + bg_event 12, 42, 3, 7, 0, ITEM_STAR_PIECE, 21, 0 + bg_event 50, 36, 3, 7, 0, ITEM_HP_UP, 22, 0 + bg_event 34, 72, 3, 7, 0, ITEM_HEART_SCALE, 23, 0 + bg_event 72, 20, 3, 7, 0, ITEM_RED_SHARD, 24, 0 + +Underwater3_MapEvents:: @ 838562C + map_events 0x0, 0x0, 0x0, Underwater3_MapBGEvents + diff --git a/data/maps/events/Underwater4.s b/data/maps/events/Underwater4.s new file mode 100644 index 000000000..97fc15c1b --- /dev/null +++ b/data/maps/events/Underwater4.s @@ -0,0 +1,10 @@ +Underwater4_MapWarps:: @ 8385640 + warp_def 38, 26, 3, 0, Underwater_SeafloorCavern + +Underwater4_MapBGEvents:: @ 8385648 + bg_event 38, 19, 3, 7, 0, ITEM_PROTEIN, 25, 0 + bg_event 69, 18, 3, 7, 0, ITEM_PEARL, 26, 0 + +Underwater4_MapEvents:: @ 8385660 + map_events 0x0, Underwater4_MapWarps, 0x0, Underwater4_MapBGEvents + diff --git a/data/maps/events/Underwater_Route134.s b/data/maps/events/Underwater_Route134.s new file mode 100644 index 000000000..1212a3e71 --- /dev/null +++ b/data/maps/events/Underwater_Route134.s @@ -0,0 +1,6 @@ +Underwater_Route134_MapWarps:: @ 838E744 + warp_def 8, 8, 0, 0, Underwater_SealedChamber + +Underwater_Route134_MapEvents:: @ 838E74C + map_events 0x0, Underwater_Route134_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Underwater_SeafloorCavern.s b/data/maps/events/Underwater_SeafloorCavern.s new file mode 100644 index 000000000..dbc3638ed --- /dev/null +++ b/data/maps/events/Underwater_SeafloorCavern.s @@ -0,0 +1,12 @@ +Underwater_SeafloorCavern_MapObjects:: @ 838D018 + object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0 + object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0 + object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0 + object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, 980, 0, 0 + +Underwater_SeafloorCavern_MapWarps:: @ 838D078 + warp_def 6, 7, 0, 0, Underwater4 + +Underwater_SeafloorCavern_MapEvents:: @ 838D080 + map_events Underwater_SeafloorCavern_MapObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/Underwater_SealedChamber.s b/data/maps/events/Underwater_SealedChamber.s new file mode 100644 index 000000000..e0cbafb31 --- /dev/null +++ b/data/maps/events/Underwater_SealedChamber.s @@ -0,0 +1,9 @@ +Underwater_SealedChamber_MapWarps:: @ 838E760 + warp_def 7, 1, 0, 0, Underwater_Route134 + +Underwater_SealedChamber_MapBGEvents:: @ 838E768 + bg_event 12, 43, 0, 0, 0, Underwater_SealedChamber_EventScript_15F0B8 + +Underwater_SealedChamber_MapEvents:: @ 838E774 + map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents + diff --git a/data/maps/events/Underwater_SootopolisCity.s b/data/maps/events/Underwater_SootopolisCity.s new file mode 100644 index 000000000..9e55744e1 --- /dev/null +++ b/data/maps/events/Underwater_SootopolisCity.s @@ -0,0 +1,7 @@ +Underwater_SootopolisCity_MapWarps:: @ 838BE98 + warp_def 9, 8, 0, 0, Underwater2 + warp_def 10, 8, 0, 0, Underwater2 + +Underwater_SootopolisCity_MapEvents:: @ 838BEA8 + map_events 0x0, Underwater_SootopolisCity_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/UnknownMap_25_29.s b/data/maps/events/UnknownMap_25_29.s new file mode 100644 index 000000000..5f3412382 --- /dev/null +++ b/data/maps/events/UnknownMap_25_29.s @@ -0,0 +1 @@ +UnknownMap_25_29_MapEvents:: @ 8391604 diff --git a/data/maps/events/UnknownMap_25_30.s b/data/maps/events/UnknownMap_25_30.s new file mode 100644 index 000000000..8ce359a0b --- /dev/null +++ b/data/maps/events/UnknownMap_25_30.s @@ -0,0 +1 @@ +UnknownMap_25_30_MapEvents:: @ 8391604 diff --git a/data/maps/events/UnknownMap_25_31.s b/data/maps/events/UnknownMap_25_31.s new file mode 100644 index 000000000..f2eabe57f --- /dev/null +++ b/data/maps/events/UnknownMap_25_31.s @@ -0,0 +1 @@ +UnknownMap_25_31_MapEvents:: @ 8391604 diff --git a/data/maps/events/UnknownMap_25_32.s b/data/maps/events/UnknownMap_25_32.s new file mode 100644 index 000000000..aa0435850 --- /dev/null +++ b/data/maps/events/UnknownMap_25_32.s @@ -0,0 +1 @@ +UnknownMap_25_32_MapEvents:: @ 8391604 diff --git a/data/maps/events/UnknownMap_25_33.s b/data/maps/events/UnknownMap_25_33.s new file mode 100644 index 000000000..db91b6ef5 --- /dev/null +++ b/data/maps/events/UnknownMap_25_33.s @@ -0,0 +1 @@ +UnknownMap_25_33_MapEvents:: @ 8391604 diff --git a/data/maps/events/UnknownMap_25_34.s b/data/maps/events/UnknownMap_25_34.s new file mode 100644 index 000000000..9b1faa0d7 --- /dev/null +++ b/data/maps/events/UnknownMap_25_34.s @@ -0,0 +1,3 @@ +UnknownMap_25_34_MapEvents:: @ 8391604 + map_events LinkContestRoom1_MapObjects, 0x0, 0x0, 0x0 + diff --git a/data/maps/events/VerdanturfTown.s b/data/maps/events/VerdanturfTown.s new file mode 100644 index 000000000..af83cf9fb --- /dev/null +++ b/data/maps/events/VerdanturfTown.s @@ -0,0 +1,28 @@ +VerdanturfTown_MapObjects:: @ 8380F00 + object_event 1, MAP_OBJ_GFX_MAN_2, 0, 4, 0, 17, 0, 3, 5, 1, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E899, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 0, 2, 0, 3, 9, 1, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E866, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_BOY_1, 0, 11, 0, 9, 0, 3, 3, 16, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E8AB, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_CAMPER, 0, 6, 0, 10, 0, 3, 5, 1, 0, 0, 0, 0, 0, VerdanturfTown_EventScript_14E8A2, 0, 0, 0 + +VerdanturfTown_MapWarps:: @ 8380F60 + warp_def 4, 7, 0, 0, VerdanturfTown_ContestLobby + warp_def 12, 3, 0, 0, VerdanturfTown_Mart + warp_def 16, 3, 0, 0, VerdanturfTown_PokemonCenter_1F + warp_def 10, 14, 0, 0, VerdanturfTown_WandasHouse + warp_def 8, 1, 0, 1, RusturfTunnel + warp_def 1, 14, 0, 0, VerdanturfTown_FriendshipRatersHouse + warp_def 17, 15, 0, 0, VerdanturfTown_House + +VerdanturfTown_MapBGEvents:: @ 8380F98 + bg_event 14, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1 + bg_event 14, 6, 0, 0, 0, VerdanturfTown_EventScript_14E8CA + bg_event 17, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00EA + bg_event 7, 14, 0, 0, 0, VerdanturfTown_EventScript_14E8D3 + bg_event 13, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1 + bg_event 18, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00EA + bg_event 3, 8, 0, 0, 0, VerdanturfTown_EventScript_14E8DC + bg_event 7, 3, 0, 0, 0, VerdanturfTown_EventScript_14E8E5 + +VerdanturfTown_MapEvents:: @ 8380FF8 + map_events VerdanturfTown_MapObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents + diff --git a/data/maps/events/VerdanturfTown_ContestHall.s b/data/maps/events/VerdanturfTown_ContestHall.s new file mode 100644 index 000000000..373bca14d --- /dev/null +++ b/data/maps/events/VerdanturfTown_ContestHall.s @@ -0,0 +1,16 @@ +VerdanturfTown_ContestHall_MapObjects:: @ 8386AEC + object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 0, 7, 0, 0, 2, 49, 0, 0, 0, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA9, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BOY_3, 0, 20, 0, 15, 0, 0, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_ContestHall_EventScript_153E97, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 0, 8, 0, 3, 2, 34, 0, 0, 0, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA0, 0, 0, 0 + +VerdanturfTown_ContestHall_MapWarps:: @ 8386B34 + warp_def 11, 17, 0, 2, VerdanturfTown_ContestLobby + warp_def 10, 17, 0, 2, VerdanturfTown_ContestLobby + +VerdanturfTown_ContestHall_MapBGEvents:: @ 8386B44 + bg_event 12, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2 + bg_event 8, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2 + +VerdanturfTown_ContestHall_MapEvents:: @ 8386B5C + map_events VerdanturfTown_ContestHall_MapObjects, VerdanturfTown_ContestHall_MapWarps, 0x0, VerdanturfTown_ContestHall_MapBGEvents + diff --git a/data/maps/events/VerdanturfTown_ContestLobby.s b/data/maps/events/VerdanturfTown_ContestLobby.s new file mode 100644 index 000000000..3a61c341a --- /dev/null +++ b/data/maps/events/VerdanturfTown_ContestLobby.s @@ -0,0 +1,22 @@ +VerdanturfTown_ContestLobby_MapObjects:: @ 8386A00 + object_event 1, MAP_OBJ_GFX_TEALA, 0, 5, 0, 2, 0, 3, 8, 48, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153D76, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 11, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B77A0, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 14, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E47, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_BOY_2, 0, 1, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E3E, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, 801, 0, 0 + object_event 6, MAP_OBJ_GFX_BOY_3, 0, 0, 0, 3, 0, 3, 3, 16, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E80, 0, 0, 0 + +VerdanturfTown_ContestLobby_MapWarps:: @ 8386A90 + warp_def 5, 6, 0, 0, VerdanturfTown + warp_def 6, 6, 0, 0, VerdanturfTown + warp_def 1, 1, 0, 1, VerdanturfTown_ContestHall + +VerdanturfTown_ContestLobby_MapBGEvents:: @ 8386AA8 + bg_event 10, 3, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B782F + bg_event 12, 5, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B763F + bg_event 11, 1, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E37 + bg_event 13, 1, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E89 + +VerdanturfTown_ContestLobby_MapEvents:: @ 8386AD8 + map_events VerdanturfTown_ContestLobby_MapObjects, VerdanturfTown_ContestLobby_MapWarps, 0x0, VerdanturfTown_ContestLobby_MapBGEvents + diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.s b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.s new file mode 100644 index 000000000..e5c7c6c7d --- /dev/null +++ b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.s @@ -0,0 +1,11 @@ +VerdanturfTown_FriendshipRatersHouse_MapObjects:: @ 8386D88 + object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 3, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154030, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_PIKACHU, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9, 0, 0, 0 + +VerdanturfTown_FriendshipRatersHouse_MapWarps:: @ 8386DB8 + warp_def 3, 7, 0, 5, VerdanturfTown + warp_def 4, 7, 0, 5, VerdanturfTown + +VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 8386DC8 + map_events VerdanturfTown_FriendshipRatersHouse_MapObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/VerdanturfTown_House.s b/data/maps/events/VerdanturfTown_House.s new file mode 100644 index 000000000..6bfd73eac --- /dev/null +++ b/data/maps/events/VerdanturfTown_House.s @@ -0,0 +1,11 @@ +VerdanturfTown_House_MapObjects:: @ 8386DDC + object_event 1, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540ED, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 4, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540F6, 0, 0, 0 + +VerdanturfTown_House_MapWarps:: @ 8386E0C + warp_def 3, 8, 0, 6, VerdanturfTown + warp_def 4, 8, 0, 6, VerdanturfTown + +VerdanturfTown_House_MapEvents:: @ 8386E1C + map_events VerdanturfTown_House_MapObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/VerdanturfTown_Mart.s b/data/maps/events/VerdanturfTown_Mart.s new file mode 100644 index 000000000..b85f000b2 --- /dev/null +++ b/data/maps/events/VerdanturfTown_Mart.s @@ -0,0 +1,13 @@ +VerdanturfTown_Mart_MapObjects:: @ 8386B70 + object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 1, 0, 3, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EBC, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_BOY_2, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EEE, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 8, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EF7, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_LASS, 0, 3, 0, 2, 0, 3, 9, 17, 0, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153F00, 0, 0, 0 + +VerdanturfTown_Mart_MapWarps:: @ 8386BD0 + warp_def 3, 7, 0, 1, VerdanturfTown + warp_def 4, 7, 0, 1, VerdanturfTown + +VerdanturfTown_Mart_MapEvents:: @ 8386BE0 + map_events VerdanturfTown_Mart_MapObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.s b/data/maps/events/VerdanturfTown_PokemonCenter_1F.s new file mode 100644 index 000000000..ae89432a3 --- /dev/null +++ b/data/maps/events/VerdanturfTown_PokemonCenter_1F.s @@ -0,0 +1,13 @@ +VerdanturfTown_PokemonCenter_1F_MapObjects:: @ 8386BF4 + object_event 1, MAP_OBJ_GFX_NURSE, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F18, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 4, 0, 5, 0, 3, 5, 1, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F26, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F2F, 0, 0, 0 + +VerdanturfTown_PokemonCenter_1F_MapWarps:: @ 8386C3C + warp_def 7, 8, 3, 2, VerdanturfTown + warp_def 6, 8, 3, 2, VerdanturfTown + warp_def 1, 6, 4, 0, VerdanturfTown_PokemonCenter_2F + +VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 8386C54 + map_events VerdanturfTown_PokemonCenter_1F_MapObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.s b/data/maps/events/VerdanturfTown_PokemonCenter_2F.s new file mode 100644 index 000000000..1a4114ba6 --- /dev/null +++ b/data/maps/events/VerdanturfTown_PokemonCenter_2F.s @@ -0,0 +1,15 @@ +VerdanturfTown_PokemonCenter_2F_MapObjects:: @ 8386C68 + object_event 1, MAP_OBJ_GFX_TEALA, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F48, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_TEALA, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F4E, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_TEALA, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F54, 0, 0, 0 + +VerdanturfTown_PokemonCenter_2F_MapWarps:: @ 8386CB0 + warp_def 1, 5, 4, 2, VerdanturfTown_PokemonCenter_1F + warp_def 5, 1, 0, 0, SingleBattleColosseum + warp_def 8, 1, 0, 0, TradeCenter + warp_def 11, 1, 0, 0, RecordCorner + warp_def 0, 0, 0, 0, DoubleBattleColosseum + +VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 8386CD8 + map_events VerdanturfTown_PokemonCenter_2F_MapObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/VerdanturfTown_WandasHouse.s b/data/maps/events/VerdanturfTown_WandasHouse.s new file mode 100644 index 000000000..7fc3e4cc2 --- /dev/null +++ b/data/maps/events/VerdanturfTown_WandasHouse.s @@ -0,0 +1,14 @@ +VerdanturfTown_WandasHouse_MapObjects:: @ 8386CEC + object_event 1, MAP_OBJ_GFX_WALLY, 0, 14, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, 806, 0, 0 + object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, 808, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, 809, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 2, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FEA, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, 984, 0, 0 + +VerdanturfTown_WandasHouse_MapWarps:: @ 8386D64 + warp_def 7, 7, 0, 3, VerdanturfTown + warp_def 8, 7, 0, 3, VerdanturfTown + +VerdanturfTown_WandasHouse_MapEvents:: @ 8386D74 + map_events VerdanturfTown_WandasHouse_MapObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/VictoryRoad_1F.s b/data/maps/events/VictoryRoad_1F.s new file mode 100644 index 000000000..c02f109c2 --- /dev/null +++ b/data/maps/events/VictoryRoad_1F.s @@ -0,0 +1,27 @@ +VictoryRoad_1F_MapObjects:: @ 838D8E4 + object_event 1, MAP_OBJ_GFX_MAN_4, 0, 33, 0, 22, 0, 3, 8, 0, 0, 1, 0, 3, 0, VictoryRoad_1F_EventScript_15DF6F, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 6, 0, 15, 0, 4, 9, 0, 0, 1, 0, 4, 0, VictoryRoad_1F_EventScript_15DF9D, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_MAN_4, 0, 27, 0, 34, 0, 3, 18, 0, 0, 1, 0, 3, 0, VictoryRoad_1F_EventScript_15DF86, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WALLY, 0, 31, 0, 12, 0, 3, 7, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF28, 858, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 40, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, 1084, 0, 0 + object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 37, 0, 39, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, 1085, 0, 0 + object_event 7, MAP_OBJ_GFX_WALLY, 0, 31, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF31, 751, 0, 0 + +VictoryRoad_1F_MapWarps:: @ 838D98C + warp_def 15, 40, 3, 2, EverGrandeCity + warp_def 39, 5, 3, 3, EverGrandeCity + warp_def 21, 32, 3, 5, VictoryRoad_B1F + warp_def 42, 38, 4, 2, VictoryRoad_B1F + warp_def 9, 14, 4, 4, VictoryRoad_B1F + +VictoryRoad_1F_MapCoordEvents:: @ 838D9B4 + coord_event 34, 3, 3, 0, 0x40c3, 0, 0, VictoryRoad_1F_EventScript_15DE97 + coord_event 34, 4, 3, 0, 0x40c3, 0, 0, VictoryRoad_1F_EventScript_15DEAB + coord_event 34, 5, 3, 0, 0x40c3, 0, 0, VictoryRoad_1F_EventScript_15DEBF + +VictoryRoad_1F_MapBGEvents:: @ 838D9E4 + bg_event 30, 39, 4, 7, 0, ITEM_ULTRA_BALL, 81, 0 + +VictoryRoad_1F_MapEvents:: @ 838D9F0 + map_events VictoryRoad_1F_MapObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents + diff --git a/data/maps/events/VictoryRoad_B1F.s b/data/maps/events/VictoryRoad_B1F.s new file mode 100644 index 000000000..8fabd723c --- /dev/null +++ b/data/maps/events/VictoryRoad_B1F.s @@ -0,0 +1,33 @@ +VictoryRoad_B1F_MapObjects:: @ 838DA04 + object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0FCB, 19, 0, 0 + object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0FCB, 20, 0, 0 + object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0FCB, 17, 0, 0 + object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0FCB, 18, 0, 0 + object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0FCB, 23, 0, 0 + object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0FCB, 22, 0, 0 + object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0FCB, 30, 0, 0 + object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0EB7, 25, 0, 0 + object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0EB7, 26, 0, 0 + object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0EB7, 27, 0, 0 + object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0EB7, 28, 0, 0 + object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0EB7, 29, 0, 0 + object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0FCB, 31, 0, 0 + object_event 14, MAP_OBJ_GFX_MAN_4, 0, 37, 0, 12, 0, 3, 9, 0, 0, 1, 0, 3, 0, VictoryRoad_B1F_EventScript_15DFB5, 0, 0, 0 + object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 26, 0, 16, 0, 3, 7, 0, 0, 1, 0, 4, 0, VictoryRoad_B1F_EventScript_15DFCC, 0, 0, 0 + object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 5, 0, 21, 0, 3, 9, 0, 0, 1, 0, 2, 0, VictoryRoad_B1F_EventScript_15DFE3, 0, 0, 0 + object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B0EB7, 32, 0, 0 + object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 42, 0, 8, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, 1086, 0, 0 + object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, 1087, 0, 0 + +VictoryRoad_B1F_MapWarps:: @ 838DBCC + warp_def 30, 25, 3, 0, VictoryRoad_B2F + warp_def 17, 16, 3, 2, VictoryRoad_B2F + warp_def 42, 25, 3, 3, VictoryRoad_1F + warp_def 42, 2, 4, 1, VictoryRoad_B2F + warp_def 8, 3, 3, 4, VictoryRoad_1F + warp_def 20, 21, 3, 2, VictoryRoad_1F + warp_def 5, 26, 3, 3, VictoryRoad_B2F + +VictoryRoad_B1F_MapEvents:: @ 838DC04 + map_events VictoryRoad_B1F_MapObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 + diff --git a/data/maps/events/VictoryRoad_B2F.s b/data/maps/events/VictoryRoad_B2F.s new file mode 100644 index 000000000..139259691 --- /dev/null +++ b/data/maps/events/VictoryRoad_B2F.s @@ -0,0 +1,20 @@ +VictoryRoad_B2F_MapObjects:: @ 838DC18 + object_event 1, MAP_OBJ_GFX_MAN_4, 0, 15, 0, 6, 0, 3, 8, 17, 0, 1, 0, 2, 0, VictoryRoad_B2F_EventScript_15DFFB, 0, 0, 0 + object_event 2, MAP_OBJ_GFX_MAN_4, 0, 43, 0, 14, 0, 3, 7, 17, 0, 1, 0, 4, 0, VictoryRoad_B2F_EventScript_15E012, 0, 0, 0 + object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 2, 0, 17, 0, 3, 8, 17, 0, 1, 0, 2, 0, VictoryRoad_B2F_EventScript_15E029, 0, 0, 0 + object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 35, 0, 22, 0, 3, 9, 17, 0, 1, 0, 2, 0, VictoryRoad_B2F_EventScript_15E040, 0, 0, 0 + object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 13, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, 1088, 0, 0 + +VictoryRoad_B2F_MapWarps:: @ 838DC90 + warp_def 30, 25, 3, 0, VictoryRoad_B1F + warp_def 43, 2, 3, 3, VictoryRoad_B1F + warp_def 19, 12, 3, 1, VictoryRoad_B1F + warp_def 5, 26, 3, 6, VictoryRoad_B1F + +VictoryRoad_B2F_MapBGEvents:: @ 838DCB0 + bg_event 28, 5, 3, 7, 0, ITEM_ELIXIR, 82, 0 + bg_event 37, 1, 3, 7, 0, ITEM_MAX_REPEL, 83, 0 + +VictoryRoad_B2F_MapEvents:: @ 838DCC8 + map_events VictoryRoad_B2F_MapObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents + |