diff options
Diffstat (limited to 'data')
435 files changed, 7156 insertions, 7156 deletions
diff --git a/data/debug_mystery_event_scripts.s b/data/debug_mystery_event_scripts.s index 37d7585b2..1d29998ef 100644 --- a/data/debug_mystery_event_scripts.s +++ b/data/debug_mystery_event_scripts.s @@ -3,7 +3,7 @@ #include "constants/flags.h" #include "constants/game_stat.h" #include "constants/items.h" -#include "constants/map_objects.h" +#include "constants/event_objects.h" #include "constants/maps.h" #include "constants/moves.h" #include "constants/opponents.h" diff --git a/data/event_scripts.s b/data/event_scripts.s index 8a3672d7e..68e287939 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -3,7 +3,7 @@ #include "constants/flags.h" #include "constants/game_stat.h" #include "constants/items.h" -#include "constants/map_objects.h" +#include "constants/event_objects.h" #include "constants/maps.h" #include "constants/moves.h" #include "constants/opponents.h" @@ -1038,8 +1038,8 @@ EventScript_19F8E5: return Movement_19F8F0:: - step_59 - step_end + reveal_trainer + end_movement EventScript_19F8F2: special ScrSpecial_ShowTrainerIntroSpeech @@ -1483,9 +1483,9 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA return OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 - step_4f - step_12 - step_end + nurse_joy_bow + delay_4 + end_movement Std_ObtainItem: @ 819FDF7 giveitem VAR_SPECIAL_0, VAR_SPECIAL_1 @@ -1839,11 +1839,11 @@ RustboroCity_EventScript_1A014E:: @ 81A014E end RustboroCity_EventScript_1A0166:: @ 81A0166 - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return RustboroCity_EventScript_1A016C:: @ 81A016C - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return LavaridgeTown_EventScript_1A0172:: @ 81A0172 @@ -1857,11 +1857,11 @@ Route119_EventScript_1A0172:: @ 81A0172 end LavaridgeTown_EventScript_1A018A:: @ 81A018A - setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_MAY_MACH_BIKE + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE return LavaridgeTown_EventScript_1A0190:: @ 81A0190 - setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE return AquaHideout_1F_EventScript_1A0196:: @ 81A0196 @@ -1888,30 +1888,30 @@ SeafloorCavern_Room4_EventScript_1A0196:: @ 81A0196 SeafloorCavern_Room9_EventScript_1A0196:: @ 81A0196 SlateportCity_OceanicMuseum_2F_EventScript_1A0196:: @ 81A0196 .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M - setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_AQUA_MEMBER_F - setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_MAGMA_MEMBER_M - setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_MAGMA_MEMBER_F - setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_ARCHIE - setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_MAXIE + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_ARCHIE + setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_MAXIE .else - setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M - setvar VAR_OBJ_GFX_ID_2, MAP_OBJ_GFX_MAGMA_MEMBER_F - setvar VAR_OBJ_GFX_ID_4, MAP_OBJ_GFX_AQUA_MEMBER_M - setvar VAR_OBJ_GFX_ID_5, MAP_OBJ_GFX_AQUA_MEMBER_F - setvar VAR_OBJ_GFX_ID_6, MAP_OBJ_GFX_MAXIE - setvar VAR_OBJ_GFX_ID_7, MAP_OBJ_GFX_ARCHIE + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_2, EVENT_OBJ_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_4, EVENT_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_5, EVENT_OBJ_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_6, EVENT_OBJ_GFX_MAXIE + setvar VAR_OBJ_GFX_ID_7, EVENT_OBJ_GFX_ARCHIE .endif return CaveOfOrigin_B4F_EventScript_1A01B5:: @ 81A01B5 SeafloorCavern_Room9_EventScript_1A01B5:: @ 81A01B5 .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_KYOGRE_1 - setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_KYOGRE_2 + setvar VAR_OBJ_GFX_ID_8, EVENT_OBJ_GFX_KYOGRE_1 + setvar VAR_OBJ_GFX_ID_9, EVENT_OBJ_GFX_KYOGRE_2 .else - setvar VAR_OBJ_GFX_ID_8, MAP_OBJ_GFX_GROUDON_1 - setvar VAR_OBJ_GFX_ID_9, MAP_OBJ_GFX_GROUDON_2 + setvar VAR_OBJ_GFX_ID_8, EVENT_OBJ_GFX_GROUDON_1 + setvar VAR_OBJ_GFX_ID_9, EVENT_OBJ_GFX_GROUDON_2 .endif return @@ -2228,14 +2228,14 @@ SlateportCity_Harbor_EventScript_1A040E:: @ 81A040E return SlateportCity_Harbor_Movement_1A041C:: @ 81A041C - slow_step_right - slow_step_right - slow_step_right - step_right - step_right - step_right - step_right - step_end + walk_slow_right + walk_slow_right + walk_slow_right + walk_right + walk_right + walk_right + walk_right + end_movement PetalburgCity_Gym_EventScript_1A0424:: @ 81A0424 setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN @@ -2270,8 +2270,8 @@ EventScript_1A0457: @ unreferenced? return Movement_1A047A: - step_up - step_end + walk_up + end_movement BattleTower_Outside_EventScript_1A047C:: @ 81A047C SouthernIsland_Exterior_EventScript_1A047C:: @ 81A047C @@ -2496,28 +2496,28 @@ Route119_EventScript_1A065E:: @ 81A065E FortreeCity_Movement_1A0662:: @ 81A0662 Route119_Movement_1A0662:: @ 81A0662 Route120_Movement_1A0662:: @ 81A0662 - step_55 - step_12 - step_54 - step_12 - step_55 - step_12 - step_54 - step_12 - step_55 - step_13 - step_54 - step_13 - step_55 - step_13 - step_54 - step_13 - step_55 - step_14 - step_54 - step_14 - step_55 - step_end + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_16 + set_invisible + delay_16 + set_visible + end_movement LittlerootTown_ProfessorBirchsLab_EventScript_1A0678:: @ 81A0678 MossdeepCity_StevensHouse_EventScript_1A0678:: @ 81A0678 @@ -2615,8 +2615,8 @@ EverGrandeCity_SidneysRoom_EventScript_1A07FA:: @ 81A07FA return SlateportCity_Movement_1A0831:: @ 81A0831 - step_57 - step_end + emote_question_mark + end_movement AquaHideout_B2F_Movement_1A0833:: @ 81A0833 EverGrandeCity_ChampionsRoom_Movement_1A0833:: @ 81A0833 @@ -2645,8 +2645,8 @@ SlateportCity_Movement_1A0833:: @ 81A0833 SlateportCity_OceanicMuseum_1F_Movement_1A0833:: @ 81A0833 SlateportCity_PokemonFanClub_Movement_1A0833:: @ 81A0833 SootopolisCity_Movement_1A0833:: @ 81A0833 - step_56 - step_end + emote_exclamation_mark + end_movement EverGrandeCity_ChampionsRoom_Movement_1A0835:: @ 81A0835 LavaridgeTown_Movement_1A0835:: @ 81A0835 @@ -2672,10 +2672,10 @@ SlateportCity_Movement_1A0835:: @ 81A0835 SlateportCity_OceanicMuseum_1F_Movement_1A0835:: @ 81A0835 SlateportCity_PokemonFanClub_Movement_1A0835:: @ 81A0835 SootopolisCity_Movement_1A0835:: @ 81A0835 - step_14 - step_14 - step_14 - step_end + delay_16 + delay_16 + delay_16 + end_movement AquaHideout_B2F_Movement_1A0839:: @ 81A0839 EverGrandeCity_PokemonLeague_Movement_1A0839:: @ 81A0839 @@ -2707,12 +2707,12 @@ SeafloorCavern_Room9_Movement_1A0839:: @ 81A0839 SlateportCity_ContestLobby_Movement_1A0839:: @ 81A0839 SlateportCity_Movement_1A0839:: @ 81A0839 SlateportCity_SternsShipyard_1F_Movement_1A0839:: @ 81A0839 - step_3e - step_end + face_player + end_movement @ 81A083B - step_3f - step_end + face_away_player + end_movement EverGrandeCity_PokemonLeague_Movement_1A083D:: @ 81A083D LilycoveCity_ContestHall_Movement_1A083D:: @ 81A083D @@ -2743,8 +2743,8 @@ SlateportCity_Movement_1A083D:: @ 81A083D SlateportCity_OceanicMuseum_2F_Movement_1A083D:: @ 81A083D SlateportCity_SternsShipyard_1F_Movement_1A083D:: @ 81A083D VerdanturfTown_Movement_1A083D:: @ 81A083D - step_4e - step_end + face_original_direction + end_movement Movement_1A083F:: @ 81A083F DewfordTown_Hall_Movement_1A083F:: @ 81A083F @@ -2777,8 +2777,8 @@ SlateportCity_OceanicMuseum_1F_Movement_1A083F:: @ 81A083F SlateportCity_OceanicMuseum_2F_Movement_1A083F:: @ 81A083F SootopolisCity_Movement_1A083F:: @ 81A083F VictoryRoad_1F_Movement_1A083F:: @ 81A083F - step_27 - step_end + walk_in_place_fastest_left + end_movement AquaHideout_B2F_Movement_1A0841:: @ 81A0841 CaveOfOrigin_B4F_Movement_1A0841:: @ 81A0841 @@ -2808,8 +2808,8 @@ SeafloorCavern_Room9_Movement_1A0841:: @ 81A0841 SlateportCity_Harbor_Movement_1A0841:: @ 81A0841 SlateportCity_Movement_1A0841:: @ 81A0841 SlateportCity_OceanicMuseum_2F_Movement_1A0841:: @ 81A0841 - step_26 - step_end + walk_in_place_fastest_up + end_movement AquaHideout_B2F_Movement_1A0843:: @ 81A0843 DewfordTown_Hall_Movement_1A0843:: @ 81A0843 @@ -2840,8 +2840,8 @@ SlateportCity_Movement_1A0843:: @ 81A0843 SlateportCity_OceanicMuseum_1F_Movement_1A0843:: @ 81A0843 SlateportCity_OceanicMuseum_2F_Movement_1A0843:: @ 81A0843 SootopolisCity_Movement_1A0843:: @ 81A0843 - step_28 - step_end + walk_in_place_fastest_right + end_movement BattleTower_Outside_Movement_1A0845:: @ 81A0845 DewfordTown_Hall_Movement_1A0845:: @ 81A0845 @@ -2872,38 +2872,38 @@ SlateportCity_Movement_1A0845:: @ 81A0845 SlateportCity_OceanicMuseum_2F_Movement_1A0845:: @ 81A0845 SootopolisCity_Movement_1A0845:: @ 81A0845 SouthernIsland_Exterior_Movement_1A0845:: @ 81A0845 - step_25 - step_end + walk_in_place_fastest_down + end_movement EverGrandeCity_SidneysRoom_Movement_1A0847:: @ 81A0847 - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement EverGrandeCity_ChampionsRoom_Movement_1A084E:: @ 81A084E - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + end_movement EverGrandeCity_SidneysRoom_Movement_1A0853:: @ 81A0853 - step_14 - step_14 - step_end + delay_16 + delay_16 + end_movement Route110_TrickHouseEntrance_Movement_1A0856:: @ 81A0856 - step_up - step_end + walk_up + end_movement @ 81A0858 - step_up - step_up - step_end + walk_up + walk_up + end_movement PictureBookShelfScript:: @ 81A085B msgbox PictureBookShelfText, 3 @@ -3740,9 +3740,9 @@ SecretBase_RedCave1_EventScript_1A2E08:: @ 81A2E08 end SecretBase_RedCave1_Movement_1A2E11:: @ 81A2E11 - step_up - step_up - step_end + walk_up + walk_up + end_movement gUnknown_081A2E14:: @ 81A2E14 lockall @@ -4875,8 +4875,8 @@ gUnknown_081C6BDE:: @ 81C6BDE end GraniteCave_B1F_Movement_1C6BF7:: @ 81C6BF7 - step_54 - step_end + set_invisible + end_movement @ 81C6BF9 msgbox Text_1C6C2B, 2 diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 45f8ce648..20d3770f9 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -6,7 +6,7 @@ .align 2 gFieldEffectScriptPointers:: @ 81D9B34 - .4byte gFieldEffectScript_ExclamationMarkIcon1 + .4byte gFieldEffectScript_ExclamationMarkIcon .4byte gFieldEffectScript_UseCutOnGrass .4byte gFieldEffectScript_UseCutOnTree .4byte gFieldEffectScript_Shadow @@ -39,7 +39,7 @@ gFieldEffectScriptPointers:: @ 81D9B34 .4byte gFieldEffectScript_NPCFlyOut .4byte gFieldEffectScript_UseFly .4byte gFieldEffectScript_FlyIn - .4byte gFieldEffectScript_ExclamationMarkIcon2 + .4byte gFieldEffectScript_QuestionMarkIcon .4byte gFieldEffectScript_FeetInFlowingWater .4byte gFieldEffectScript_BikeTireTracks .4byte gFieldEffectScript_SandDisguise @@ -71,8 +71,8 @@ gFieldEffectScriptPointers:: @ 81D9B34 .4byte gFieldEffectScript_HallOfFameRecord .4byte gFieldEffectScript_UseTeleport -gFieldEffectScript_ExclamationMarkIcon1: @ 81D9C34 - callnative FldEff_ExclamationMarkIcon1 +gFieldEffectScript_ExclamationMarkIcon: @ 81D9C34 + callnative FldEff_ExclamationMarkIcon end gFieldEffectScript_UseCutOnGrass: @ 81D9C3A @@ -204,8 +204,8 @@ gFieldEffectScript_FlyIn: @ 81D9D3D callnative FldEff_FlyIn end -gFieldEffectScript_ExclamationMarkIcon2: @ 81D9D43 - callnative FldEff_ExclamationMarkIcon2 +gFieldEffectScript_QuestionMarkIcon: @ 81D9D43 + callnative FldEff_QuestionMarkIcon end gFieldEffectScript_FeetInFlowingWater: @ 81D9D49 diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 5ce6c7fb9..5b474fdcf 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -32,8 +32,8 @@ DoTreeCutMovement: @ 81B0E21 end TreeCutMovement: @ 81B0E30 - step_5b - step_end + cut_tree + end_movement CannotUseCut: @ 81B0E32 msgbox CannotUseCutText, 3 @@ -100,8 +100,8 @@ DoRockSmashMovement_Done: @ 81B0F3A end RockSmashMovement: @ 81B0F3C - step_5a - step_end + rock_smash_break + end_movement CannotUseRockSmash: @ 81B0F3E msgbox CannotUseRockSmashText, 3 diff --git a/data/map_events.s b/data/map_events.s index 1531ec30e..02050c401 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,6 +1,6 @@ #include "constants/flags.h" #include "constants/items.h" -#include "constants/map_objects.h" +#include "constants/event_objects.h" #include "constants/maps.h" #include "constants/secret_bases.h" #include "constants/vars.h" diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc index 72740dc29..d05af94d1 100644 --- a/data/maps/events/AbandonedShip_CaptainsOffice.inc +++ b/data/maps/events/AbandonedShip_CaptainsOffice.inc @@ -1,10 +1,10 @@ -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, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1, 0, 0 +AbandonedShip_CaptainsOffice_EventObjects:: @ 838E45C + object_event 1, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1, 0, 0 AbandonedShip_CaptainsOffice_MapWarps:: @ 838E48C warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK warp_def 8, 6, 3, 4, MAP_ABANDONED_SHIP_DECK AbandonedShip_CaptainsOffice_MapEvents:: @ 838E49C - map_events AbandonedShip_CaptainsOffice_MapObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 + map_events AbandonedShip_CaptainsOffice_EventObjects, AbandonedShip_CaptainsOffice_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Corridors_1F.inc b/data/maps/events/AbandonedShip_Corridors_1F.inc index 661fbdb09..afc77d077 100644 --- a/data/maps/events/AbandonedShip_Corridors_1F.inc +++ b/data/maps/events/AbandonedShip_Corridors_1F.inc @@ -1,6 +1,6 @@ -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_EventObjects:: @ 838E120 + object_event 1, EVENT_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, EVENT_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, MAP_ABANDONED_SHIP_DECK @@ -17,4 +17,4 @@ AbandonedShip_Corridors_1F_MapWarps:: @ 838E150 warp_def 3, 3, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_1F AbandonedShip_Corridors_1F_MapEvents:: @ 838E1B0 - map_events AbandonedShip_Corridors_1F_MapObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0 + map_events AbandonedShip_Corridors_1F_EventObjects, AbandonedShip_Corridors_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Corridors_B1F.inc b/data/maps/events/AbandonedShip_Corridors_B1F.inc index d889f1ade..3f2276194 100644 --- a/data/maps/events/AbandonedShip_Corridors_B1F.inc +++ b/data/maps/events/AbandonedShip_Corridors_B1F.inc @@ -1,6 +1,6 @@ -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_EventObjects:: @ 838E238 + object_event 1, EVENT_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, EVENT_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, MAP_ABANDONED_SHIP_ROOMS2_B1F @@ -16,4 +16,4 @@ 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 + map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents diff --git a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc index 998e4eeac..92138ba30 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc +++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc @@ -1,8 +1,8 @@ -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, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1, 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, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, 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, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4, 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, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3, 0, 0 +AbandonedShip_HiddenFloorRooms_EventObjects:: @ 838E540 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18CB, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18D8, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18F2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3, 0, 0 AbandonedShip_HiddenFloorRooms_MapWarps:: @ 838E5A0 warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS @@ -28,4 +28,4 @@ AbandonedShip_HiddenFloorRooms_MapBGEvents:: @ 838E5E8 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 + map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents diff --git a/data/maps/events/AbandonedShip_Room_B1F.inc b/data/maps/events/AbandonedShip_Room_B1F.inc index 22739c99f..373ffc99e 100644 --- a/data/maps/events/AbandonedShip_Room_B1F.inc +++ b/data/maps/events/AbandonedShip_Room_B1F.inc @@ -1,9 +1,9 @@ -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, FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1, 0, 0 +AbandonedShip_Room_B1F_EventObjects:: @ 838E3AC + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1, 0, 0 AbandonedShip_Room_B1F_MapWarps:: @ 838E3C4 warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F warp_def 5, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Room_B1F_MapEvents:: @ 838E3D4 - map_events AbandonedShip_Room_B1F_MapObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0 + map_events AbandonedShip_Room_B1F_EventObjects, AbandonedShip_Room_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms2_1F.inc b/data/maps/events/AbandonedShip_Rooms2_1F.inc index d68dd776d..82ce974f1 100644 --- a/data/maps/events/AbandonedShip_Rooms2_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_1F.inc @@ -1,7 +1,7 @@ -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, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1, 0, 0 +AbandonedShip_Rooms2_1F_EventObjects:: @ 838E3E8 + object_event 1, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1, 0, 0 AbandonedShip_Rooms2_1F_MapWarps:: @ 838E430 warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F @@ -9,4 +9,4 @@ AbandonedShip_Rooms2_1F_MapWarps:: @ 838E430 warp_def 4, 1, 3, 11, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Rooms2_1F_MapEvents:: @ 838E448 - map_events AbandonedShip_Rooms2_1F_MapObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0 + map_events AbandonedShip_Rooms2_1F_EventObjects, AbandonedShip_Rooms2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms2_B1F.inc b/data/maps/events/AbandonedShip_Rooms2_B1F.inc index 8f21e82c4..a138dd35a 100644 --- a/data/maps/events/AbandonedShip_Rooms2_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_B1F.inc @@ -1,6 +1,6 @@ -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, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1, 0, 0 +AbandonedShip_Rooms2_B1F_EventObjects:: @ 838E324 + object_event 1, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1, 0, 0 AbandonedShip_Rooms2_B1F_MapWarps:: @ 838E354 warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F @@ -9,4 +9,4 @@ AbandonedShip_Rooms2_B1F_MapWarps:: @ 838E354 warp_def 14, 7, 3, 0, MAP_ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Rooms2_B1F_MapEvents:: @ 838E374 - map_events AbandonedShip_Rooms2_B1F_MapObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0 + map_events AbandonedShip_Rooms2_B1F_EventObjects, AbandonedShip_Rooms2_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms_1F.inc b/data/maps/events/AbandonedShip_Rooms_1F.inc index 8eaae1853..072752022 100644 --- a/data/maps/events/AbandonedShip_Rooms_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_1F.inc @@ -1,6 +1,6 @@ -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, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1, 0, 0 +AbandonedShip_Rooms_1F_EventObjects:: @ 838E1C4 + object_event 1, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1, 0, 0 AbandonedShip_Rooms_1F_MapWarps:: @ 838E1F4 warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F @@ -11,4 +11,4 @@ AbandonedShip_Rooms_1F_MapWarps:: @ 838E1F4 warp_def 14, 16, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Rooms_1F_MapEvents:: @ 838E224 - map_events AbandonedShip_Rooms_1F_MapObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0 + map_events AbandonedShip_Rooms_1F_EventObjects, AbandonedShip_Rooms_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AbandonedShip_Rooms_B1F.inc b/data/maps/events/AbandonedShip_Rooms_B1F.inc index cb9ce260f..bab5f6593 100644 --- a/data/maps/events/AbandonedShip_Rooms_B1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_B1F.inc @@ -1,6 +1,6 @@ -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, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1, 0, 0 +AbandonedShip_Rooms_B1F_EventObjects:: @ 838E2C8 + object_event 1, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1, 0, 0 AbandonedShip_Rooms_B1F_MapWarps:: @ 838E2F8 warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F @@ -8,4 +8,4 @@ AbandonedShip_Rooms_B1F_MapWarps:: @ 838E2F8 warp_def 22, 1, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Rooms_B1F_MapEvents:: @ 838E310 - map_events AbandonedShip_Rooms_B1F_MapObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 + map_events AbandonedShip_Rooms_B1F_EventObjects, AbandonedShip_Rooms_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AncientTomb.inc b/data/maps/events/AncientTomb.inc index 0aa15569e..13b96c0ee 100644 --- a/data/maps/events/AncientTomb.inc +++ b/data/maps/events/AncientTomb.inc @@ -1,5 +1,5 @@ -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, FLAG_HIDE_REGISTEEL, 0, 0 +AncientTomb_EventObjects:: @ 838E6DC + object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, AncientTomb_EventScript_15F050, FLAG_HIDE_REGISTEEL, 0, 0 AncientTomb_MapWarps:: @ 838E6F4 warp_def 8, 29, 3, 0, MAP_ROUTE120 @@ -12,4 +12,4 @@ AncientTomb_MapBGEvents:: @ 838E70C bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_15F042 AncientTomb_MapEvents:: @ 838E730 - map_events AncientTomb_MapObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents + map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents diff --git a/data/maps/events/AquaHideout_1F.inc b/data/maps/events/AquaHideout_1F.inc index 551585bb6..16107f111 100644 --- a/data/maps/events/AquaHideout_1F.inc +++ b/data/maps/events/AquaHideout_1F.inc @@ -1,7 +1,7 @@ -AquaHideout_1F_MapObjects:: @ 838CD0C - object_event 1, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 20, 0, 4, 0, 3, 50, 93, 0, 1, 0, 3, 0, AquaHideout_1F_EventScript_15D80C, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 +AquaHideout_1F_EventObjects:: @ 838CD0C + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 13, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 14, 0, 11, 0, 3, 8, 0, 0, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 20, 0, 4, 0, 3, 50, 93, 0, 1, 0, 3, 0, AquaHideout_1F_EventScript_15D80C, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 AquaHideout_1F_MapWarps:: @ 838CD54 warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY @@ -9,4 +9,4 @@ AquaHideout_1F_MapWarps:: @ 838CD54 warp_def 22, 1, 3, 0, MAP_AQUA_HIDEOUT_B1F AquaHideout_1F_MapEvents:: @ 838CD6C - map_events AquaHideout_1F_MapObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 + map_events AquaHideout_1F_EventObjects, AquaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AquaHideout_B1F.inc b/data/maps/events/AquaHideout_B1F.inc index c902b1765..c016b9f57 100644 --- a/data/maps/events/AquaHideout_B1F.inc +++ b/data/maps/events/AquaHideout_B1F.inc @@ -1,12 +1,12 @@ -AquaHideout_B1F_MapObjects:: @ 838CD80 - object_event 1, MAP_OBJ_GFX_VAR_1, 0, 27, 0, 18, 0, 3, 24, 0, 0, 1, 0, 3, 0, AquaHideout_B1F_EventScript_15D850, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_1, 0, 6, 0, 6, 0, 3, 9, 0, 0, 1, 0, 5, 0, AquaHideout_B1F_EventScript_15D875, FLAG_HIDE_GRUNTS_HIDEOUTS, 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, FLAG_ITEM_AQUA_HIDEOUT_B1F_1, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 20, 0, 18, 0, 3, 27, 4, 0, 1, 0, 4, 0, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS, 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, FLAG_ITEM_AQUA_HIDEOUT_B1F_2, 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, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 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, FLAG_ITEM_AQUA_HIDEOUT_B1F_3, 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, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0 +AquaHideout_B1F_EventObjects:: @ 838CD80 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 27, 0, 18, 0, 3, 24, 0, 0, 1, 0, 3, 0, AquaHideout_B1F_EventScript_15D850, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 6, 0, 6, 0, 3, 9, 0, 0, 1, 0, 5, 0, AquaHideout_B1F_EventScript_15D875, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, FLAG_ITEM_AQUA_HIDEOUT_B1F_1, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 20, 0, 18, 0, 3, 27, 4, 0, 1, 0, 4, 0, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B198E, FLAG_ITEM_AQUA_HIDEOUT_B1F_2, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B199B, FLAG_ITEM_AQUA_HIDEOUT_B1F_3, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0 AquaHideout_B1F_MapWarps:: @ 838CE40 warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F @@ -36,4 +36,4 @@ AquaHideout_B1F_MapWarps:: @ 838CE40 warp_def 48, 17, 3, 19, MAP_AQUA_HIDEOUT_B1F AquaHideout_B1F_MapEvents:: @ 838CF08 - map_events AquaHideout_B1F_MapObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 + map_events AquaHideout_B1F_EventObjects, AquaHideout_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/AquaHideout_B2F.inc b/data/maps/events/AquaHideout_B2F.inc index e3dade2d0..f27039029 100644 --- a/data/maps/events/AquaHideout_B2F.inc +++ b/data/maps/events/AquaHideout_B2F.inc @@ -1,9 +1,9 @@ -AquaHideout_B2F_MapObjects:: @ 838CF1C - object_event 1, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 10, 0, 3, 45, 52, 0, 1, 0, 3, 0, AquaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 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, FLAG_ITEM_AQUA_HIDEOUT_B2F_1, 0, 0 - object_event 4, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 0, 20, 0, 1, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_2, 0, 10, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, AquaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 +AquaHideout_B2F_EventObjects:: @ 838CF1C + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 23, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 23, 0, 10, 0, 3, 45, 52, 0, 1, 0, 3, 0, AquaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, FLAG_ITEM_AQUA_HIDEOUT_B2F_1, 0, 0 + object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 0, 20, 0, 1, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 10, 0, 6, 0, 3, 7, 17, 0, 1, 0, 4, 0, AquaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 AquaHideout_B2F_MapWarps:: @ 838CF94 warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F @@ -22,4 +22,4 @@ AquaHideout_B2F_MapCoordEvents:: @ 838CFE4 coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD AquaHideout_B2F_MapEvents:: @ 838D004 - map_events AquaHideout_B2F_MapObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 + map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/events/BattleTower_BattleRoom.inc b/data/maps/events/BattleTower_BattleRoom.inc index 02884109f..c872a3fd7 100644 --- a/data/maps/events/BattleTower_BattleRoom.inc +++ b/data/maps/events/BattleTower_BattleRoom.inc @@ -1,10 +1,10 @@ -BattleTower_BattleRoom_MapObjects:: @ 8391DAC - object_event 1, MAP_OBJ_GFX_VAR_0, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT, 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_EventObjects:: @ 8391DAC + object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT, 0, 0 + object_event 2, EVENT_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, MAP_BATTLE_TOWER_LOBBY warp_def 6, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY BattleTower_BattleRoom_MapEvents:: @ 8391DEC - map_events BattleTower_BattleRoom_MapObjects, BattleTower_BattleRoom_MapWarps, 0x0, 0x0 + map_events BattleTower_BattleRoom_EventObjects, BattleTower_BattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleTower_Corridor.inc b/data/maps/events/BattleTower_Corridor.inc index 33b5a779c..cc9b7d4a6 100644 --- a/data/maps/events/BattleTower_Corridor.inc +++ b/data/maps/events/BattleTower_Corridor.inc @@ -1,5 +1,5 @@ -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_EventObjects:: @ 8391D80 + object_event 1, EVENT_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 + map_events BattleTower_Corridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleTower_Elevator.inc b/data/maps/events/BattleTower_Elevator.inc index 7594028b6..de38d5102 100644 --- a/data/maps/events/BattleTower_Elevator.inc +++ b/data/maps/events/BattleTower_Elevator.inc @@ -1,5 +1,5 @@ -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_EventObjects:: @ 8391D54 + object_event 1, EVENT_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 + map_events BattleTower_Elevator_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleTower_Lobby.inc b/data/maps/events/BattleTower_Lobby.inc index a4abdac87..d6e18e78e 100644 --- a/data/maps/events/BattleTower_Lobby.inc +++ b/data/maps/events/BattleTower_Lobby.inc @@ -1,10 +1,10 @@ -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, FLAG_HIDE_REPORTER_BATTLE_TOWER, 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, FLAG_HIDE_AWARD_MAN_BATTLE_TOWER, 0, 0 +BattleTower_Lobby_EventObjects:: @ 8391C8C + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_REPORTER_F, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1AE1FF, FLAG_HIDE_REPORTER_BATTLE_TOWER, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, FLAG_HIDE_AWARD_MAN_BATTLE_TOWER, 0, 0 BattleTower_Lobby_MapWarps:: @ 8391D1C warp_def 6, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE @@ -15,4 +15,4 @@ 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 + map_events BattleTower_Lobby_EventObjects, BattleTower_Lobby_MapWarps, 0x0, BattleTower_Lobby_MapBGEvents diff --git a/data/maps/events/BattleTower_Outside.inc b/data/maps/events/BattleTower_Outside.inc index 902a779f1..9a68375c3 100644 --- a/data/maps/events/BattleTower_Outside.inc +++ b/data/maps/events/BattleTower_Outside.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 8391BEC + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_SS_TIDAL, 0, 19, 0, 26, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_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, MAP_BATTLE_TOWER_LOBBY @@ -12,4 +12,4 @@ 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 + map_events BattleTower_Outside_EventObjects, BattleTower_Outside_MapWarps, 0x0, BattleTower_Outside_MapBGEvents diff --git a/data/maps/events/CaveOfOrigin_B3F.inc b/data/maps/events/CaveOfOrigin_B3F.inc index 6f9544aa2..81fae0378 100644 --- a/data/maps/events/CaveOfOrigin_B3F.inc +++ b/data/maps/events/CaveOfOrigin_B3F.inc @@ -1,5 +1,5 @@ -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, FLAG_ITEM_CAVE_OF_ORIGIN_B3F_1, 0, 0 +CaveOfOrigin_B3F_EventObjects:: @ 838D814 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, FLAG_ITEM_CAVE_OF_ORIGIN_B3F_1, 0, 0 CaveOfOrigin_B3F_MapWarps:: @ 838D82C warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_B2F @@ -11,4 +11,4 @@ CaveOfOrigin_B3F_MapCoordEvents:: @ 838D83C coord_event 8, 5, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB CaveOfOrigin_B3F_MapEvents:: @ 838D86C - map_events CaveOfOrigin_B3F_MapObjects, CaveOfOrigin_B3F_MapWarps, CaveOfOrigin_B3F_MapCoordEvents, 0x0 + map_events CaveOfOrigin_B3F_EventObjects, CaveOfOrigin_B3F_MapWarps, CaveOfOrigin_B3F_MapCoordEvents, 0x0 diff --git a/data/maps/events/CaveOfOrigin_B4F.inc b/data/maps/events/CaveOfOrigin_B4F.inc index ad2217b46..6993230c9 100644 --- a/data/maps/events/CaveOfOrigin_B4F.inc +++ b/data/maps/events/CaveOfOrigin_B4F.inc @@ -1,5 +1,5 @@ -CaveOfOrigin_B4F_MapObjects:: @ 838D880 - object_event 1, MAP_OBJ_GFX_VAR_8, 0, 9, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN, 0, 0 +CaveOfOrigin_B4F_EventObjects:: @ 838D880 + object_event 1, EVENT_OBJ_GFX_VAR_8, 0, 9, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN, 0, 0 CaveOfOrigin_B4F_MapWarps:: @ 838D898 warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F @@ -10,4 +10,4 @@ CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0 coord_event 5, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 CaveOfOrigin_B4F_MapEvents:: @ 838D8D0 - map_events CaveOfOrigin_B4F_MapObjects, CaveOfOrigin_B4F_MapWarps, CaveOfOrigin_B4F_MapCoordEvents, 0x0 + map_events CaveOfOrigin_B4F_EventObjects, CaveOfOrigin_B4F_MapWarps, CaveOfOrigin_B4F_MapCoordEvents, 0x0 diff --git a/data/maps/events/DesertRuins.inc b/data/maps/events/DesertRuins.inc index ada0e0be5..bb2423b61 100644 --- a/data/maps/events/DesertRuins.inc +++ b/data/maps/events/DesertRuins.inc @@ -1,5 +1,5 @@ -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, FLAG_HIDE_REGIROCK, 0, 0 +DesertRuins_EventObjects:: @ 838BEBC + object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, FLAG_HIDE_REGIROCK, 0, 0 DesertRuins_MapWarps:: @ 838BED4 warp_def 8, 29, 3, 1, MAP_ROUTE111 @@ -12,4 +12,4 @@ DesertRuins_MapBGEvents:: @ 838BEEC bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_15CB77 DesertRuins_MapEvents:: @ 838BF10 - map_events DesertRuins_MapObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents + map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc index 8ca6fa7a1..352092f19 100644 --- a/data/maps/events/DewfordTown.inc +++ b/data/maps/events/DewfordTown.inc @@ -1,9 +1,9 @@ -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, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, 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, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD, 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_EventObjects:: @ 8380B88 + object_event 1, EVENT_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, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 9, 0, 3, 9, 16, 0, 0, 0, 3, 0, DewfordTown_EventScript_14E002, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, 0, 0 + object_event 3, EVENT_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, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 8, 0, 1, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD, 0, 0 + object_event 5, EVENT_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, MAP_DEWFORD_TOWN_HALL @@ -20,4 +20,4 @@ DewfordTown_MapBGEvents:: @ 8380C28 bg_event 2, 4, 0, 0, 0, DewfordTown_EventScript_14E0BD DewfordTown_MapEvents:: @ 8380C64 - map_events DewfordTown_MapObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents + map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents diff --git a/data/maps/events/DewfordTown_Gym.inc b/data/maps/events/DewfordTown_Gym.inc index 10a5f8499..9ddf697c2 100644 --- a/data/maps/events/DewfordTown_Gym.inc +++ b/data/maps/events/DewfordTown_Gym.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 8385FBC + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_DEWFORD_TOWN @@ -16,4 +16,4 @@ DewfordTown_Gym_MapBGEvents:: @ 8386044 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 + map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents diff --git a/data/maps/events/DewfordTown_Hall.inc b/data/maps/events/DewfordTown_Hall.inc index 56f7feb18..2944726a9 100644 --- a/data/maps/events/DewfordTown_Hall.inc +++ b/data/maps/events/DewfordTown_Hall.inc @@ -1,13 +1,13 @@ -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, FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL, 0, 0 +DewfordTown_Hall_EventObjects:: @ 8386088 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_MANIAC, 0, 8, 0, 6, 0, 3, 5, 1, 0, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL, 0, 0 DewfordTown_Hall_MapWarps:: @ 8386160 warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN @@ -18,4 +18,4 @@ DewfordTown_Hall_MapBGEvents:: @ 8386170 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 + map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents diff --git a/data/maps/events/DewfordTown_House1.inc b/data/maps/events/DewfordTown_House1.inc index daedf3d19..8d2c57b1b 100644 --- a/data/maps/events/DewfordTown_House1.inc +++ b/data/maps/events/DewfordTown_House1.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 8385E58 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_DEWFORD_TOWN warp_def 4, 7, 0, 3, MAP_DEWFORD_TOWN DewfordTown_House1_MapEvents:: @ 8385EB0 - map_events DewfordTown_House1_MapObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 + map_events DewfordTown_House1_EventObjects, DewfordTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_House2.inc b/data/maps/events/DewfordTown_House2.inc index 0553bc23a..35c5ca369 100644 --- a/data/maps/events/DewfordTown_House2.inc +++ b/data/maps/events/DewfordTown_House2.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 838619C + object_event 1, EVENT_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, EVENT_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, MAP_DEWFORD_TOWN warp_def 4, 8, 0, 4, MAP_DEWFORD_TOWN DewfordTown_House2_MapEvents:: @ 83861DC - map_events DewfordTown_House2_MapObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 + map_events DewfordTown_House2_EventObjects, DewfordTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_PokemonCenter_1F.inc b/data/maps/events/DewfordTown_PokemonCenter_1F.inc index b1a13dd8a..e6e3a095d 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_1F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_1F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 8385EC4 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_DEWFORD_TOWN @@ -9,4 +9,4 @@ DewfordTown_PokemonCenter_1F_MapWarps:: @ 8385F0C warp_def 1, 6, 4, 0, MAP_DEWFORD_TOWN_POKEMON_CENTER_2F DewfordTown_PokemonCenter_1F_MapEvents:: @ 8385F24 - map_events DewfordTown_PokemonCenter_1F_MapObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events DewfordTown_PokemonCenter_1F_EventObjects, DewfordTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown_PokemonCenter_2F.inc b/data/maps/events/DewfordTown_PokemonCenter_2F.inc index 00e066e2f..b4dba9e8b 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_2F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 8385F38 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F @@ -11,4 +11,4 @@ DewfordTown_PokemonCenter_2F_MapWarps:: @ 8385F80 warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM DewfordTown_PokemonCenter_2F_MapEvents:: @ 8385FA8 - map_events DewfordTown_PokemonCenter_2F_MapObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events DewfordTown_PokemonCenter_2F_EventObjects, DewfordTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_ChampionsRoom.inc b/data/maps/events/EverGrandeCity_ChampionsRoom.inc index 2be82cbb4..a6783e800 100644 --- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc +++ b/data/maps/events/EverGrandeCity_ChampionsRoom.inc @@ -1,11 +1,11 @@ -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, MAP_OBJ_GFX_VAR_0, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM, 0, 0 - object_event 3, MAP_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_CHAMPIONS_ROOM, 0, 0 +EverGrandeCity_ChampionsRoom_EventObjects:: @ 838B334 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 6, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM, 0, 0 + object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_CHAMPIONS_ROOM, 0, 0 EverGrandeCity_ChampionsRoom_MapWarps:: @ 838B37C warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_HALL_OF_FAME EverGrandeCity_ChampionsRoom_MapEvents:: @ 838B38C - map_events EverGrandeCity_ChampionsRoom_MapObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_ChampionsRoom_EventObjects, EverGrandeCity_ChampionsRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_DrakesRoom.inc b/data/maps/events/EverGrandeCity_DrakesRoom.inc index e7ac276aa..989c9e562 100644 --- a/data/maps/events/EverGrandeCity_DrakesRoom.inc +++ b/data/maps/events/EverGrandeCity_DrakesRoom.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 838B2F8 + object_event 1, EVENT_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, MAP_EVER_GRANDE_CITY_CORRIDOR3 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR4 EverGrandeCity_DrakesRoom_MapEvents:: @ 838B320 - map_events EverGrandeCity_DrakesRoom_MapObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_DrakesRoom_EventObjects, EverGrandeCity_DrakesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_GlaciasRoom.inc b/data/maps/events/EverGrandeCity_GlaciasRoom.inc index f6c6ce97e..8095e957e 100644 --- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc +++ b/data/maps/events/EverGrandeCity_GlaciasRoom.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 838B2BC + object_event 1, EVENT_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, MAP_EVER_GRANDE_CITY_CORRIDOR2 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR3 EverGrandeCity_GlaciasRoom_MapEvents:: @ 838B2E4 - map_events EverGrandeCity_GlaciasRoom_MapObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_GlaciasRoom_EventObjects, EverGrandeCity_GlaciasRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_HallOfFame.inc b/data/maps/events/EverGrandeCity_HallOfFame.inc index 9290c4530..a1e6532ff 100644 --- a/data/maps/events/EverGrandeCity_HallOfFame.inc +++ b/data/maps/events/EverGrandeCity_HallOfFame.inc @@ -1,8 +1,8 @@ -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_EventObjects:: @ 838B528 + object_event 1, EVENT_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, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM EverGrandeCity_HallOfFame_MapEvents:: @ 838B548 - map_events EverGrandeCity_HallOfFame_MapObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_HallOfFame_EventObjects, EverGrandeCity_HallOfFame_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PhoebesRoom.inc b/data/maps/events/EverGrandeCity_PhoebesRoom.inc index a2de097b8..2957be55c 100644 --- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc +++ b/data/maps/events/EverGrandeCity_PhoebesRoom.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 838B280 + object_event 1, EVENT_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, MAP_EVER_GRANDE_CITY_CORRIDOR1 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR2 EverGrandeCity_PhoebesRoom_MapEvents:: @ 838B2A8 - map_events EverGrandeCity_PhoebesRoom_MapObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_PhoebesRoom_EventObjects, EverGrandeCity_PhoebesRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc index f0709710d..514c809ca 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 838B55C + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_EVER_GRANDE_CITY @@ -9,4 +9,4 @@ EverGrandeCity_PokemonCenter_1F_MapWarps:: @ 838B5A4 warp_def 1, 6, 4, 0, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_2F EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 838B5BC - map_events EverGrandeCity_PokemonCenter_1F_MapObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_PokemonCenter_1F_EventObjects, EverGrandeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc index e7502055a..1f53d8a95 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 838B5D0 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F @@ -11,4 +11,4 @@ EverGrandeCity_PokemonCenter_2F_MapWarps:: @ 838B618 warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 838B640 - map_events EverGrandeCity_PokemonCenter_2F_MapObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_PokemonCenter_2F_EventObjects, EverGrandeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonLeague.inc b/data/maps/events/EverGrandeCity_PokemonLeague.inc index 77247e665..d45503bde 100644 --- a/data/maps/events/EverGrandeCity_PokemonLeague.inc +++ b/data/maps/events/EverGrandeCity_PokemonLeague.inc @@ -1,8 +1,8 @@ -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_EventObjects:: @ 838B494 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_EVER_GRANDE_CITY @@ -11,4 +11,4 @@ EverGrandeCity_PokemonLeague_MapWarps:: @ 838B4F4 warp_def 10, 1, 3, 0, MAP_EVER_GRANDE_CITY_CORRIDOR5 EverGrandeCity_PokemonLeague_MapEvents:: @ 838B514 - map_events EverGrandeCity_PokemonLeague_MapObjects, EverGrandeCity_PokemonLeague_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_PokemonLeague_EventObjects, EverGrandeCity_PokemonLeague_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/events/EverGrandeCity_SidneysRoom.inc index c2a7ce10d..edd9b2194 100644 --- a/data/maps/events/EverGrandeCity_SidneysRoom.inc +++ b/data/maps/events/EverGrandeCity_SidneysRoom.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 838B244 + object_event 1, EVENT_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, MAP_EVER_GRANDE_CITY_CORRIDOR5 warp_def 6, 2, 0, 0, MAP_EVER_GRANDE_CITY_CORRIDOR1 EverGrandeCity_SidneysRoom_MapEvents:: @ 838B26C - map_events EverGrandeCity_SidneysRoom_MapObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_SidneysRoom_EventObjects, EverGrandeCity_SidneysRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown.inc b/data/maps/events/FallarborTown.inc index 025843194..b268b663c 100644 --- a/data/maps/events/FallarborTown.inc +++ b/data/maps/events/FallarborTown.inc @@ -1,8 +1,8 @@ -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, FLAG_HIDE_AZURILL_FALLARBOR, 0, 0 +FallarborTown_EventObjects:: @ 8380E04 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_AZURILL, 0, 8, 0, 12, 0, 3, 1, 1, 0, 0, 0, 0, 0, FallarborTown_EventScript_14E826, FLAG_HIDE_AZURILL_FALLARBOR, 0, 0 FallarborTown_MapWarps:: @ 8380E64 warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART @@ -22,4 +22,4 @@ FallarborTown_MapBGEvents:: @ 8380E8C bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1C FallarborTown_MapEvents:: @ 8380EEC - map_events FallarborTown_MapObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents + map_events FallarborTown_EventObjects, FallarborTown_MapWarps, 0x0, FallarborTown_MapBGEvents diff --git a/data/maps/events/FallarborTown_ContestHall.inc b/data/maps/events/FallarborTown_ContestHall.inc index 30b602e60..2b0bd883f 100644 --- a/data/maps/events/FallarborTown_ContestHall.inc +++ b/data/maps/events/FallarborTown_ContestHall.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 83867DC + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_FALLARBOR_TOWN_CONTEST_LOBBY @@ -12,4 +12,4 @@ FallarborTown_ContestHall_MapBGEvents:: @ 8386834 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 + map_events FallarborTown_ContestHall_EventObjects, FallarborTown_ContestHall_MapWarps, 0x0, FallarborTown_ContestHall_MapBGEvents diff --git a/data/maps/events/FallarborTown_ContestLobby.inc b/data/maps/events/FallarborTown_ContestLobby.inc index 811461c02..4827e1ac1 100644 --- a/data/maps/events/FallarborTown_ContestLobby.inc +++ b/data/maps/events/FallarborTown_ContestLobby.inc @@ -1,10 +1,10 @@ -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, FLAG_HIDE_CONTEST_REPORTER_FALLARBOR, 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_EventObjects:: @ 83866F0 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_FALLARBOR, 0, 0 + object_event 6, EVENT_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, MAP_FALLARBOR_TOWN @@ -18,4 +18,4 @@ FallarborTown_ContestLobby_MapBGEvents:: @ 8386798 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 + map_events FallarborTown_ContestLobby_EventObjects, FallarborTown_ContestLobby_MapWarps, 0x0, FallarborTown_ContestLobby_MapBGEvents diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/events/FallarborTown_House1.inc index e3104fb1d..5687810c3 100644 --- a/data/maps/events/FallarborTown_House1.inc +++ b/data/maps/events/FallarborTown_House1.inc @@ -1,10 +1,10 @@ -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, FLAG_HIDE_PROF_COSMO_FALLARBOR, 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_EventObjects:: @ 8386970 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 4, 0, 3, 2, 17, 0, 0, 0, 0, 0, FallarborTown_House1_EventScript_153BB5, FLAG_HIDE_PROF_COSMO_FALLARBOR, 0, 0 + object_event 2, EVENT_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, MAP_FALLARBOR_TOWN warp_def 4, 8, 0, 3, MAP_FALLARBOR_TOWN FallarborTown_House1_MapEvents:: @ 83869B0 - map_events FallarborTown_House1_MapObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 + map_events FallarborTown_House1_EventObjects, FallarborTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_House2.inc b/data/maps/events/FallarborTown_House2.inc index e24fef7a9..79d198e63 100644 --- a/data/maps/events/FallarborTown_House2.inc +++ b/data/maps/events/FallarborTown_House2.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 83869C4 + object_event 1, EVENT_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, MAP_FALLARBOR_TOWN warp_def 4, 7, 0, 4, MAP_FALLARBOR_TOWN FallarborTown_House2_MapEvents:: @ 83869EC - map_events FallarborTown_House2_MapObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 + map_events FallarborTown_House2_EventObjects, FallarborTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_Mart.inc b/data/maps/events/FallarborTown_Mart.inc index c343e017e..157af947c 100644 --- a/data/maps/events/FallarborTown_Mart.inc +++ b/data/maps/events/FallarborTown_Mart.inc @@ -1,12 +1,12 @@ -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_EventObjects:: @ 838666C + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_FALLARBOR_TOWN warp_def 4, 7, 0, 0, MAP_FALLARBOR_TOWN FallarborTown_Mart_MapEvents:: @ 83866DC - map_events FallarborTown_Mart_MapObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 + map_events FallarborTown_Mart_EventObjects, FallarborTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_PokemonCenter_1F.inc b/data/maps/events/FallarborTown_PokemonCenter_1F.inc index ff2278e29..ce7b4e721 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_1F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ -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, FLAG_HIDE_LANETTE_FALLARBOR, 0, 0 +FallarborTown_PokemonCenter_1F_EventObjects:: @ 8386860 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, FLAG_HIDE_LANETTE_FALLARBOR, 0, 0 FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0 warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN @@ -10,4 +10,4 @@ FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0 warp_def 1, 6, 4, 0, MAP_FALLARBOR_TOWN_POKEMON_CENTER_2F FallarborTown_PokemonCenter_1F_MapEvents:: @ 83868D8 - map_events FallarborTown_PokemonCenter_1F_MapObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events FallarborTown_PokemonCenter_1F_EventObjects, FallarborTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_PokemonCenter_2F.inc b/data/maps/events/FallarborTown_PokemonCenter_2F.inc index 1ae7bba2a..7fffd6150 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_2F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 83868EC + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F @@ -11,4 +11,4 @@ FallarborTown_PokemonCenter_2F_MapWarps:: @ 8386934 warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM FallarborTown_PokemonCenter_2F_MapEvents:: @ 838695C - map_events FallarborTown_PokemonCenter_2F_MapObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events FallarborTown_PokemonCenter_2F_EventObjects, FallarborTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc index 575f92bd5..11e3bd004 100644 --- a/data/maps/events/FieryPath.inc +++ b/data/maps/events/FieryPath.inc @@ -1,16 +1,16 @@ -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, FLAG_ITEM_FIERY_PATH_1, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 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, FLAG_ITEM_FIERY_PATH_2, 0, 0 +FieryPath_EventObjects:: @ 838C718 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17EE, FLAG_ITEM_FIERY_PATH_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 23, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 32, 0, 3, 1, 17, 0, 0, 0, 0, 0, FieryPath_EventScript_1B17E1, FLAG_ITEM_FIERY_PATH_2, 0, 0 FieryPath_MapWarps:: @ 838C7D8 warp_def 26, 36, 3, 4, MAP_ROUTE112 warp_def 26, 4, 3, 5, MAP_ROUTE112 FieryPath_MapEvents:: @ 838C7E8 - map_events FieryPath_MapObjects, FieryPath_MapWarps, 0x0, 0x0 + map_events FieryPath_EventObjects, FieryPath_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity.inc b/data/maps/events/FortreeCity.inc index 4c80997f9..964edc288 100644 --- a/data/maps/events/FortreeCity.inc +++ b/data/maps/events/FortreeCity.inc @@ -1,11 +1,11 @@ -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, FLAG_HIDE_KECLEON_FORTREE, 0, 0 +FortreeCity_EventObjects:: @ 8380020 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 0, 8, 0, 3, 76, 17, 0, 0, 0, 0, 0, FortreeCity_EventScript_14C9B3, FLAG_HIDE_KECLEON_FORTREE, 0, 0 FortreeCity_MapWarps:: @ 83800C8 warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F @@ -27,4 +27,4 @@ FortreeCity_MapBGEvents:: @ 8380110 bg_event 6, 14, 0, 1, 0, FortreeCity_EventScript_1A00E1 FortreeCity_MapEvents:: @ 8380158 - map_events FortreeCity_MapObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents + map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents diff --git a/data/maps/events/FortreeCity_DecorationShop.inc b/data/maps/events/FortreeCity_DecorationShop.inc index 930a73b55..547a1669f 100644 --- a/data/maps/events/FortreeCity_DecorationShop.inc +++ b/data/maps/events/FortreeCity_DecorationShop.inc @@ -1,12 +1,12 @@ -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_EventObjects:: @ 83893E0 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_FORTREE_CITY warp_def 4, 5, 0, 8, MAP_FORTREE_CITY FortreeCity_DecorationShop_MapEvents:: @ 8389450 - map_events FortreeCity_DecorationShop_MapObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 + map_events FortreeCity_DecorationShop_EventObjects, FortreeCity_DecorationShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_Gym.inc b/data/maps/events/FortreeCity_Gym.inc index 523dd3fdc..170c8d941 100644 --- a/data/maps/events/FortreeCity_Gym.inc +++ b/data/maps/events/FortreeCity_Gym.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8389018 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_FORTREE_CITY @@ -15,4 +15,4 @@ FortreeCity_Gym_MapBGEvents:: @ 83890B8 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 + map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents diff --git a/data/maps/events/FortreeCity_House1.inc b/data/maps/events/FortreeCity_House1.inc index 23cd52fdc..8f25008eb 100644 --- a/data/maps/events/FortreeCity_House1.inc +++ b/data/maps/events/FortreeCity_House1.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 8388FAC + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_FORTREE_CITY warp_def 4, 5, 0, 1, MAP_FORTREE_CITY FortreeCity_House1_MapEvents:: @ 8389004 - map_events FortreeCity_House1_MapObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 + map_events FortreeCity_House1_EventObjects, FortreeCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House2.inc b/data/maps/events/FortreeCity_House2.inc index 1c7246100..8ec2431cc 100644 --- a/data/maps/events/FortreeCity_House2.inc +++ b/data/maps/events/FortreeCity_House2.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 8389278 + object_event 1, EVENT_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, MAP_FORTREE_CITY warp_def 4, 5, 0, 4, MAP_FORTREE_CITY FortreeCity_House2_MapEvents:: @ 83892A0 - map_events FortreeCity_House2_MapObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 + map_events FortreeCity_House2_EventObjects, FortreeCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House3.inc b/data/maps/events/FortreeCity_House3.inc index 359953246..18d0e8d8f 100644 --- a/data/maps/events/FortreeCity_House3.inc +++ b/data/maps/events/FortreeCity_House3.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 83892B4 + object_event 1, EVENT_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, EVENT_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, MAP_FORTREE_CITY warp_def 4, 5, 0, 5, MAP_FORTREE_CITY FortreeCity_House3_MapEvents:: @ 83892F4 - map_events FortreeCity_House3_MapObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 + map_events FortreeCity_House3_EventObjects, FortreeCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House4.inc b/data/maps/events/FortreeCity_House4.inc index 0a5f81b6c..0b2f3aa38 100644 --- a/data/maps/events/FortreeCity_House4.inc +++ b/data/maps/events/FortreeCity_House4.inc @@ -1,11 +1,11 @@ -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, FLAG_HIDE_WINGULL_FORTREE_HOUSE, 0, 0 +FortreeCity_House4_EventObjects:: @ 8389308 + object_event 1, EVENT_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, EVENT_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, EVENT_OBJ_GFX_WINGULL, 0, 2, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, FLAG_HIDE_WINGULL_FORTREE_HOUSE, 0, 0 FortreeCity_House4_MapWarps:: @ 8389350 warp_def 3, 5, 0, 6, MAP_FORTREE_CITY warp_def 4, 5, 0, 6, MAP_FORTREE_CITY FortreeCity_House4_MapEvents:: @ 8389360 - map_events FortreeCity_House4_MapObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 + map_events FortreeCity_House4_EventObjects, FortreeCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_House5.inc b/data/maps/events/FortreeCity_House5.inc index 94ff0ebb1..e28864204 100644 --- a/data/maps/events/FortreeCity_House5.inc +++ b/data/maps/events/FortreeCity_House5.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 8389374 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_FORTREE_CITY warp_def 4, 5, 0, 7, MAP_FORTREE_CITY FortreeCity_House5_MapEvents:: @ 83893CC - map_events FortreeCity_House5_MapObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 + map_events FortreeCity_House5_EventObjects, FortreeCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_Mart.inc b/data/maps/events/FortreeCity_Mart.inc index 2353c3c1f..19377fe45 100644 --- a/data/maps/events/FortreeCity_Mart.inc +++ b/data/maps/events/FortreeCity_Mart.inc @@ -1,12 +1,12 @@ -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_EventObjects:: @ 83891F4 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_FORTREE_CITY warp_def 4, 7, 0, 3, MAP_FORTREE_CITY FortreeCity_Mart_MapEvents:: @ 8389264 - map_events FortreeCity_Mart_MapObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 + map_events FortreeCity_Mart_EventObjects, FortreeCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_PokemonCenter_1F.inc b/data/maps/events/FortreeCity_PokemonCenter_1F.inc index bc06da7ca..55fc4523b 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_1F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ -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_EventObjects:: @ 83890E4 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_FORTREE_CITY @@ -10,4 +10,4 @@ FortreeCity_PokemonCenter_1F_MapWarps:: @ 8389144 warp_def 1, 6, 4, 0, MAP_FORTREE_CITY_POKEMON_CENTER_2F FortreeCity_PokemonCenter_1F_MapEvents:: @ 838915C - map_events FortreeCity_PokemonCenter_1F_MapObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events FortreeCity_PokemonCenter_1F_EventObjects, FortreeCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FortreeCity_PokemonCenter_2F.inc b/data/maps/events/FortreeCity_PokemonCenter_2F.inc index f16c59cce..05e2f1ef8 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_2F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 8389170 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_FORTREE_CITY_POKEMON_CENTER_1F @@ -11,4 +11,4 @@ FortreeCity_PokemonCenter_2F_MapWarps:: @ 83891B8 warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM FortreeCity_PokemonCenter_2F_MapEvents:: @ 83891E0 - map_events FortreeCity_PokemonCenter_2F_MapObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events FortreeCity_PokemonCenter_2F_EventObjects, FortreeCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_1F.inc b/data/maps/events/GraniteCave_1F.inc index ade38322f..1854847ae 100644 --- a/data/maps/events/GraniteCave_1F.inc +++ b/data/maps/events/GraniteCave_1F.inc @@ -1,6 +1,6 @@ -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, FLAG_ITEM_GRANITE_CAVE_1F_1, 0, 0 +GraniteCave_1F_EventObjects:: @ 838BF24 + object_event 1, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, FLAG_ITEM_GRANITE_CAVE_1F_1, 0, 0 GraniteCave_1F_MapWarps:: @ 838BF54 warp_def 37, 12, 3, 0, MAP_ROUTE106 @@ -9,4 +9,4 @@ GraniteCave_1F_MapWarps:: @ 838BF54 warp_def 5, 10, 3, 0, MAP_GRANITE_CAVE_STEVENS_ROOM GraniteCave_1F_MapEvents:: @ 838BF74 - map_events GraniteCave_1F_MapObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 + map_events GraniteCave_1F_EventObjects, GraniteCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_B1F.inc b/data/maps/events/GraniteCave_B1F.inc index e50fd09af..2d7ba4a8b 100644 --- a/data/maps/events/GraniteCave_B1F.inc +++ b/data/maps/events/GraniteCave_B1F.inc @@ -1,5 +1,5 @@ -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, FLAG_ITEM_GRANITE_CAVE_B1F_1, 0, 0 +GraniteCave_B1F_EventObjects:: @ 838BF88 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, FLAG_ITEM_GRANITE_CAVE_B1F_1, 0, 0 GraniteCave_B1F_MapWarps:: @ 838BFA0 warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F @@ -11,4 +11,4 @@ GraniteCave_B1F_MapWarps:: @ 838BFA0 warp_def 29, 2, 3, 4, MAP_GRANITE_CAVE_B2F GraniteCave_B1F_MapEvents:: @ 838BFD8 - map_events GraniteCave_B1F_MapObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 + map_events GraniteCave_B1F_EventObjects, GraniteCave_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/GraniteCave_B2F.inc b/data/maps/events/GraniteCave_B2F.inc index e251b3bef..4c7e4b253 100644 --- a/data/maps/events/GraniteCave_B2F.inc +++ b/data/maps/events/GraniteCave_B2F.inc @@ -1,13 +1,13 @@ -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, FLAG_ITEM_GRANITE_CAVE_B2F_1, 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, FLAG_ITEM_GRANITE_CAVE_B2F_2, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0 - object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_17, 0, 0 +GraniteCave_B2F_EventObjects:: @ 838BFEC + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, FLAG_ITEM_GRANITE_CAVE_B2F_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, FLAG_ITEM_GRANITE_CAVE_B2F_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 16, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_17, 0, 0 GraniteCave_B2F_MapWarps:: @ 838C0C4 warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F @@ -21,4 +21,4 @@ GraniteCave_B2F_MapBGEvents:: @ 838C0EC bg_hidden_item_event 15, 11, 3, ITEM_EVERSTONE, FLAG_HIDDEN_ITEM_31 GraniteCave_B2F_MapEvents:: @ 838C104 - map_events GraniteCave_B2F_MapObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents + map_events GraniteCave_B2F_EventObjects, GraniteCave_B2F_MapWarps, 0x0, GraniteCave_B2F_MapBGEvents diff --git a/data/maps/events/GraniteCave_StevensRoom.inc b/data/maps/events/GraniteCave_StevensRoom.inc index efab4fa71..1c8131424 100644 --- a/data/maps/events/GraniteCave_StevensRoom.inc +++ b/data/maps/events/GraniteCave_StevensRoom.inc @@ -1,8 +1,8 @@ -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, FLAG_HIDE_STEVEN_GRANITE_CAVE, 0, 0 +GraniteCave_StevensRoom_EventObjects:: @ 838C118 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, FLAG_HIDE_STEVEN_GRANITE_CAVE, 0, 0 GraniteCave_StevensRoom_MapWarps:: @ 838C130 warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F GraniteCave_StevensRoom_MapEvents:: @ 838C138 - map_events GraniteCave_StevensRoom_MapObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 + map_events GraniteCave_StevensRoom_EventObjects, GraniteCave_StevensRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/InsideOfTruck.inc b/data/maps/events/InsideOfTruck.inc index d89f267e3..866bcf082 100644 --- a/data/maps/events/InsideOfTruck.inc +++ b/data/maps/events/InsideOfTruck.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 8391618 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_NONE @@ -21,4 +21,4 @@ InsideOfTruck_MapBGEvents:: @ 83916A8 bg_event 0, 2, 0, 0, 0, InsideOfTruck_EventScript_15FC8B InsideOfTruck_MapEvents:: @ 83916E4 - map_events InsideOfTruck_MapObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents + map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents diff --git a/data/maps/events/IslandCave.inc b/data/maps/events/IslandCave.inc index 94fbce914..b19b0aae4 100644 --- a/data/maps/events/IslandCave.inc +++ b/data/maps/events/IslandCave.inc @@ -1,5 +1,5 @@ -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, FLAG_HIDE_REGICE, 0, 0 +IslandCave_EventObjects:: @ 838E674 + object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, FLAG_HIDE_REGICE, 0, 0 IslandCave_MapWarps:: @ 838E68C warp_def 8, 29, 3, 0, MAP_ROUTE105 @@ -12,4 +12,4 @@ IslandCave_MapBGEvents:: @ 838E6A4 bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_15EF7C IslandCave_MapEvents:: @ 838E6C8 - map_events IslandCave_MapObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents + map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc index e1103c816..9f5841ed9 100644 --- a/data/maps/events/JaggedPass.inc +++ b/data/maps/events/JaggedPass.inc @@ -1,8 +1,8 @@ -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, FLAG_ITEM_JAGGED_PASS_1, 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_EventObjects:: @ 838C61C + object_event 1, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 0, 24, 0, 3, 1, 0, 0, 0, 0, 0, 0, JaggedPass_EventScript_1B17D4, FLAG_ITEM_JAGGED_PASS_1, 0, 0 + object_event 4, EVENT_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, MAP_ROUTE112 @@ -22,4 +22,4 @@ JaggedPass_MapBGEvents:: @ 838C6EC bg_hidden_item_event 7, 29, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_4C JaggedPass_MapEvents:: @ 838C704 - map_events JaggedPass_MapObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents + map_events JaggedPass_EventObjects, JaggedPass_MapWarps, JaggedPass_MapCoordEvents, JaggedPass_MapBGEvents diff --git a/data/maps/events/LavaridgeTown.inc b/data/maps/events/LavaridgeTown.inc index 27acd168f..d4cdc03fc 100644 --- a/data/maps/events/LavaridgeTown.inc +++ b/data/maps/events/LavaridgeTown.inc @@ -1,13 +1,13 @@ -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, MAP_OBJ_GFX_VAR_3, 0, 6, 0, 16, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_LAVARIDGE_2, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_0, 0, 12, 0, 15, 0, 0, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, FLAG_HIDE_RIVAL_LAVARIDGE_1, 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_EventObjects:: @ 8380C78 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_VAR_3, 0, 6, 0, 16, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_LAVARIDGE_2, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_0, 0, 12, 0, 15, 0, 0, 8, 0, 0, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, FLAG_HIDE_RIVAL_LAVARIDGE_1, 0, 0 + object_event 9, EVENT_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, MAP_LAVARIDGE_TOWN_HERB_SHOP @@ -31,4 +31,4 @@ LavaridgeTown_MapBGEvents:: @ 8380D90 bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_0 LavaridgeTown_MapEvents:: @ 8380DF0 - map_events LavaridgeTown_MapObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents + map_events LavaridgeTown_EventObjects, LavaridgeTown_MapWarps, LavaridgeTown_MapCoordEvents, LavaridgeTown_MapBGEvents diff --git a/data/maps/events/LavaridgeTown_Gym_1F.inc b/data/maps/events/LavaridgeTown_Gym_1F.inc index 0df412932..ad1e462f9 100644 --- a/data/maps/events/LavaridgeTown_Gym_1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_1F.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 838625C + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_LAVARIDGE_TOWN @@ -36,4 +36,4 @@ LavaridgeTown_Gym_1F_MapBGEvents:: @ 83863B4 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 + map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/events/LavaridgeTown_HerbShop.inc index 8223a30c3..b80743404 100644 --- a/data/maps/events/LavaridgeTown_HerbShop.inc +++ b/data/maps/events/LavaridgeTown_HerbShop.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 83861F0 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_LAVARIDGE_TOWN warp_def 4, 7, 0, 0, MAP_LAVARIDGE_TOWN LavaridgeTown_HerbShop_MapEvents:: @ 8386248 - map_events LavaridgeTown_HerbShop_MapObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 + map_events LavaridgeTown_HerbShop_EventObjects, LavaridgeTown_HerbShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_House.inc b/data/maps/events/LavaridgeTown_House.inc index 771b9669b..97bafa5e1 100644 --- a/data/maps/events/LavaridgeTown_House.inc +++ b/data/maps/events/LavaridgeTown_House.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8386494 + object_event 1, EVENT_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, EVENT_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, MAP_LAVARIDGE_TOWN warp_def 4, 7, 0, 4, MAP_LAVARIDGE_TOWN LavaridgeTown_House_MapEvents:: @ 83864D4 - map_events LavaridgeTown_House_MapObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 + map_events LavaridgeTown_House_EventObjects, LavaridgeTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_Mart.inc b/data/maps/events/LavaridgeTown_Mart.inc index ff184b78e..f8fd38f18 100644 --- a/data/maps/events/LavaridgeTown_Mart.inc +++ b/data/maps/events/LavaridgeTown_Mart.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 83864E8 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_LAVARIDGE_TOWN warp_def 4, 7, 0, 2, MAP_LAVARIDGE_TOWN LavaridgeTown_Mart_MapEvents:: @ 8386540 - map_events LavaridgeTown_Mart_MapObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 + map_events LavaridgeTown_Mart_EventObjects, LavaridgeTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc index 5e529bb1e..86d7f462f 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ -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_EventObjects:: @ 8386554 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_LAVARIDGE_TOWN @@ -11,4 +11,4 @@ LavaridgeTown_PokemonCenter_1F_MapWarps:: @ 83865B4 warp_def 2, 1, 0, 5, MAP_LAVARIDGE_TOWN LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 83865D4 - map_events LavaridgeTown_PokemonCenter_1F_MapObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events LavaridgeTown_PokemonCenter_1F_EventObjects, LavaridgeTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc index 39035ba87..cac368263 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 83865E8 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F @@ -11,4 +11,4 @@ LavaridgeTown_PokemonCenter_2F_MapWarps:: @ 8386630 warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 8386658 - map_events LavaridgeTown_PokemonCenter_2F_MapObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events LavaridgeTown_PokemonCenter_2F_EventObjects, LavaridgeTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity.inc b/data/maps/events/LilycoveCity.inc index 4f6acdcb2..0154c04df 100644 --- a/data/maps/events/LilycoveCity.inc +++ b/data/maps/events/LilycoveCity.inc @@ -1,21 +1,21 @@ -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, MAP_OBJ_GFX_VAR_1, 0, 73, 0, 15, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE, 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, FLAG_ITEM_LILYCOVE_1, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_1, 0, 43, 0, 18, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_1, 0, 46, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_1, 0, 45, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_1, 0, 38, 0, 9, 0, 5, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE, 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, MAP_OBJ_GFX_VAR_0, 0, 27, 0, 7, 0, 5, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD46, FLAG_HIDE_RIVAL_LILYCOVE_MART, 0, 0 +LilycoveCity_EventObjects:: @ 838016C + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_VAR_1, 0, 73, 0, 15, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 0, 36, 0, 5, 1, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, FLAG_ITEM_LILYCOVE_1, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_1, 0, 43, 0, 18, 0, 3, 5, 1, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 46, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_1, 0, 45, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_1, 0, 38, 0, 9, 0, 5, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE, 0, 0 + object_event 16, EVENT_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, EVENT_OBJ_GFX_VAR_0, 0, 27, 0, 7, 0, 5, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_EventScript_14CD46, FLAG_HIDE_RIVAL_LILYCOVE_MART, 0, 0 LilycoveCity_MapWarps:: @ 8380304 warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F @@ -50,4 +50,4 @@ LilycoveCity_MapBGEvents:: @ 838037C bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_4B LilycoveCity_MapEvents:: @ 8380418 - map_events LilycoveCity_MapObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents + map_events LilycoveCity_EventObjects, LilycoveCity_MapWarps, 0x0, LilycoveCity_MapBGEvents diff --git a/data/maps/events/LilycoveCity_ContestHall.inc b/data/maps/events/LilycoveCity_ContestHall.inc index 307f23974..c937b924e 100644 --- a/data/maps/events/LilycoveCity_ContestHall.inc +++ b/data/maps/events/LilycoveCity_ContestHall.inc @@ -1,36 +1,36 @@ -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_EventObjects:: @ 8389A18 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_LILYCOVE_CITY_CONTEST_LOBBY @@ -47,4 +47,4 @@ LilycoveCity_ContestHall_MapBGEvents:: @ 8389D38 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 + map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents diff --git a/data/maps/events/LilycoveCity_ContestLobby.inc b/data/maps/events/LilycoveCity_ContestLobby.inc index ccbc645b2..e89c95e9f 100644 --- a/data/maps/events/LilycoveCity_ContestLobby.inc +++ b/data/maps/events/LilycoveCity_ContestLobby.inc @@ -1,18 +1,18 @@ -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, FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1, 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, FLAG_HIDE_CONTEST_REPORTER_LILYCOVE, 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, FLAG_HIDE_ARTIST_LILCOVE_CONTEST, 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_EventObjects:: @ 838984C + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ARTIST, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1, 0, 0 + object_event 5, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_REPORTER_M, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_LILYCOVE, 0, 0 + object_event 9, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ARTIST, 0, 13, 0, 1, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_ARTIST_LILCOVE_CONTEST, 0, 0 + object_event 12, EVENT_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, EVENT_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, EVENT_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, MAP_LILYCOVE_CITY @@ -29,4 +29,4 @@ LilycoveCity_ContestLobby_MapBGEvents:: @ 83899BC 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 + map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc index 63e3ff3be..a17018a8d 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_1F.inc @@ -1,5 +1,5 @@ -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_EventObjects:: @ 8389464 + object_event 1, EVENT_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, MAP_LILYCOVE_CITY @@ -10,4 +10,4 @@ LilycoveCity_CoveLilyMotel_1F_MapCoordEvents:: @ 8389494 coord_event 10, 2, 3, 0, VAR_TEMP_1, 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 + map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc index 32c1181de..588e460e0 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc @@ -1,13 +1,13 @@ -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, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 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, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 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, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 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, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 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, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 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, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 +LilycoveCity_CoveLilyMotel_2F_EventObjects:: @ 83894B8 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 4, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158400, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 0, 3, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 + object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 0, 3, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158412, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE, 0, 0 LilycoveCity_CoveLilyMotel_2F_MapWarps:: @ 8389548 warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8389550 - map_events LilycoveCity_CoveLilyMotel_2F_MapObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 + map_events LilycoveCity_CoveLilyMotel_2F_EventObjects, LilycoveCity_CoveLilyMotel_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc index eea28d624..d03549c1c 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 838A624 + object_event 1, EVENT_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, MAP_NONE warp_def 2, 5, 3, 127, MAP_NONE LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 838A64C - map_events LilycoveCity_DepartmentStoreElevator_MapObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 + map_events LilycoveCity_DepartmentStoreElevator_EventObjects, LilycoveCity_DepartmentStoreElevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc index c5f094b3f..bc0b08b7e 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc @@ -1,7 +1,7 @@ -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, FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART, 0, 0 +LilycoveCity_DepartmentStoreRooftop_EventObjects:: @ 838A5A8 + object_event 1, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 0, 1, 0, 3, 8, 17, 0, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART, 0, 0 LilycoveCity_DepartmentStoreRooftop_MapWarps:: @ 838A5F0 warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F @@ -11,4 +11,4 @@ LilycoveCity_DepartmentStoreRooftop_MapBGEvents:: @ 838A5F8 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 + map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents diff --git a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc index b9104a1ee..a6be96a02 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_1F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_1F.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 838A218 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_LILYCOVE_CITY @@ -16,4 +16,4 @@ 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 + map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents diff --git a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc index 441c43a4c..e3bad14af 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_2F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_2F.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 838A2E8 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F @@ -11,4 +11,4 @@ LilycoveCity_DepartmentStore_2F_MapWarps:: @ 838A360 warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_2F_MapEvents:: @ 838A378 - map_events LilycoveCity_DepartmentStore_2F_MapObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0 + map_events LilycoveCity_DepartmentStore_2F_EventObjects, LilycoveCity_DepartmentStore_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc index 920327ab8..4c949b446 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_3F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_3F.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 838A38C + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F @@ -11,4 +11,4 @@ LilycoveCity_DepartmentStore_3F_MapWarps:: @ 838A404 warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_3F_MapEvents:: @ 838A41C - map_events LilycoveCity_DepartmentStore_3F_MapObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0 + map_events LilycoveCity_DepartmentStore_3F_EventObjects, LilycoveCity_DepartmentStore_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc index a387cfbf2..c50e36efc 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_4F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_4F.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 838A430 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F @@ -11,4 +11,4 @@ LilycoveCity_DepartmentStore_4F_MapWarps:: @ 838A4A8 warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_4F_MapEvents:: @ 838A4C0 - map_events LilycoveCity_DepartmentStore_4F_MapObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0 + map_events LilycoveCity_DepartmentStore_4F_EventObjects, LilycoveCity_DepartmentStore_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc index e794452b9..7762f61bf 100644 --- a/data/maps/events/LilycoveCity_DepartmentStore_5F.inc +++ b/data/maps/events/LilycoveCity_DepartmentStore_5F.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 838A4D4 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F @@ -13,4 +13,4 @@ LilycoveCity_DepartmentStore_5F_MapWarps:: @ 838A57C warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP LilycoveCity_DepartmentStore_5F_MapEvents:: @ 838A594 - map_events LilycoveCity_DepartmentStore_5F_MapObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 + map_events LilycoveCity_DepartmentStore_5F_EventObjects, LilycoveCity_DepartmentStore_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_Harbor.inc b/data/maps/events/LilycoveCity_Harbor.inc index 3f7c592d1..5746ba69c 100644 --- a/data/maps/events/LilycoveCity_Harbor.inc +++ b/data/maps/events/LilycoveCity_Harbor.inc @@ -1,8 +1,8 @@ -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, FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE, 0, 0 - object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR, 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, FLAG_HIDE_FERRY_SAILOR_LILYCOVE, 0, 0 +LilycoveCity_Harbor_EventObjects:: @ 8389F94 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE, 0, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR, 0, 0 + object_event 3, EVENT_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, EVENT_OBJ_GFX_SAILOR, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_FERRY_SAILOR_LILYCOVE, 0, 0 LilycoveCity_Harbor_MapWarps:: @ 8389FF4 warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY @@ -11,4 +11,4 @@ LilycoveCity_Harbor_MapWarps:: @ 8389FF4 warp_def 21, 15, 0, 0, MAP_LILYCOVE_CITY_EMPTY_MAP LilycoveCity_Harbor_MapEvents:: @ 838A014 - map_events LilycoveCity_Harbor_MapObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 + map_events LilycoveCity_Harbor_EventObjects, LilycoveCity_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House1.inc b/data/maps/events/LilycoveCity_House1.inc index 8d6e6b8ce..7ed489819 100644 --- a/data/maps/events/LilycoveCity_House1.inc +++ b/data/maps/events/LilycoveCity_House1.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 838A080 + object_event 1, EVENT_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, EVENT_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, MAP_LILYCOVE_CITY warp_def 4, 8, 0, 8, MAP_LILYCOVE_CITY LilycoveCity_House1_MapEvents:: @ 838A0C0 - map_events LilycoveCity_House1_MapObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 + map_events LilycoveCity_House1_EventObjects, LilycoveCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House2.inc b/data/maps/events/LilycoveCity_House2.inc index 8cb92dfa4..8ad99e8b4 100644 --- a/data/maps/events/LilycoveCity_House2.inc +++ b/data/maps/events/LilycoveCity_House2.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 838A0D4 + object_event 1, EVENT_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, MAP_LILYCOVE_CITY warp_def 3, 7, 0, 9, MAP_LILYCOVE_CITY LilycoveCity_House2_MapEvents:: @ 838A0FC - map_events LilycoveCity_House2_MapObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 + map_events LilycoveCity_House2_EventObjects, LilycoveCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House3.inc b/data/maps/events/LilycoveCity_House3.inc index db7113ef1..45db8cb61 100644 --- a/data/maps/events/LilycoveCity_House3.inc +++ b/data/maps/events/LilycoveCity_House3.inc @@ -1,14 +1,14 @@ -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_EventObjects:: @ 838A110 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_LILYCOVE_CITY warp_def 4, 7, 0, 10, MAP_LILYCOVE_CITY LilycoveCity_House3_MapEvents:: @ 838A1B0 - map_events LilycoveCity_House3_MapObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 + map_events LilycoveCity_House3_EventObjects, LilycoveCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_House4.inc b/data/maps/events/LilycoveCity_House4.inc index 376afb431..30aed0188 100644 --- a/data/maps/events/LilycoveCity_House4.inc +++ b/data/maps/events/LilycoveCity_House4.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 838A1C4 + object_event 1, EVENT_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, EVENT_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, MAP_LILYCOVE_CITY warp_def 4, 8, 0, 11, MAP_LILYCOVE_CITY LilycoveCity_House4_MapEvents:: @ 838A204 - map_events LilycoveCity_House4_MapObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 + map_events LilycoveCity_House4_EventObjects, LilycoveCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc index 1ee241c5c..d4d82a9f7 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_1F.inc @@ -1,14 +1,14 @@ -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, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, 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, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY, 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, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER, 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, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 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, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN, 0, 0 +LilycoveCity_LilycoveMuseum_1F_EventObjects:: @ 8389564 + object_event 1, EVENT_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, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, 0, 0 + object_event 3, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY, 0, 0 + object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 0, 3, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER, 0, 0 + object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 0, 2, 0, 3, 2, 34, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0 + object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 0, 2, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN, 0, 0 LilycoveCity_LilycoveMuseum_1F_MapWarps:: @ 8389654 warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY @@ -34,4 +34,4 @@ LilycoveCity_LilycoveMuseum_1F_MapBGEvents:: @ 838966C 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 + map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents diff --git a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc index 83077f069..6c7671641 100644 --- a/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/maps/events/LilycoveCity_LilycoveMuseum_2F.inc @@ -1,8 +1,8 @@ -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, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL, 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, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 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, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0 +LilycoveCity_LilycoveMuseum_2F_EventObjects:: @ 8389740 + object_event 1, EVENT_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, EVENT_OBJ_GFX_GIRL_2, 0, 19, 0, 10, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 0, 6, 0, 3, 2, 17, 0, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS, 0, 0 LilycoveCity_LilycoveMuseum_2F_MapWarps:: @ 83897A0 warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F @@ -22,4 +22,4 @@ LilycoveCity_LilycoveMuseum_2F_MapBGEvents:: @ 83897A8 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 + map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents diff --git a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc index d4969c39e..ac4ce16b0 100644 --- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc +++ b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 838A044 + object_event 1, EVENT_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, MAP_LILYCOVE_CITY warp_def 4, 7, 0, 7, MAP_LILYCOVE_CITY LilycoveCity_MoveDeletersHouse_MapEvents:: @ 838A06C - map_events LilycoveCity_MoveDeletersHouse_MapObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 + map_events LilycoveCity_MoveDeletersHouse_EventObjects, LilycoveCity_MoveDeletersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc index c0f27f6c7..c768e3e45 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 8389D94 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_LILYCOVE_CITY @@ -9,4 +9,4 @@ LilycoveCity_PokemonCenter_1F_MapWarps:: @ 8389DDC warp_def 1, 6, 4, 0, MAP_LILYCOVE_CITY_POKEMON_CENTER_2F LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8389DF4 - map_events LilycoveCity_PokemonCenter_1F_MapObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events LilycoveCity_PokemonCenter_1F_EventObjects, LilycoveCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc index e1723d489..b0ff8f07f 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 8389E08 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F @@ -11,4 +11,4 @@ LilycoveCity_PokemonCenter_2F_MapWarps:: @ 8389E50 warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8389E78 - map_events LilycoveCity_PokemonCenter_2F_MapObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events LilycoveCity_PokemonCenter_2F_EventObjects, LilycoveCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc index 59e8e03a3..73680e5fd 100644 --- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc @@ -1,16 +1,16 @@ -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, FLAG_HIDE_FANCLUB_LITTLE_BOY, 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, FLAG_HIDE_FANCLUB_BOY, 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, FLAG_HIDE_FANCLUB_LADY, 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, FLAG_HIDE_FANCLUB_OLD_LADY, 0, 0 +LilycoveCity_PokemonTrainerFanClub_EventObjects:: @ 8389EB0 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, FLAG_HIDE_FANCLUB_LITTLE_BOY, 0, 0 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, FLAG_HIDE_FANCLUB_BOY, 0, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, FLAG_HIDE_FANCLUB_LADY, 0, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, FLAG_HIDE_FANCLUB_OLD_LADY, 0, 0 LilycoveCity_PokemonTrainerFanClub_MapWarps:: @ 8389F70 warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY warp_def 5, 13, 0, 5, MAP_LILYCOVE_CITY LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8389F80 - map_events LilycoveCity_PokemonTrainerFanClub_MapObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 + map_events LilycoveCity_PokemonTrainerFanClub_EventObjects, LilycoveCity_PokemonTrainerFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LinkContestRoom1.inc b/data/maps/events/LinkContestRoom1.inc index 1c0ac9368..85736e0c8 100644 --- a/data/maps/events/LinkContestRoom1.inc +++ b/data/maps/events/LinkContestRoom1.inc @@ -1,18 +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, MAP_OBJ_GFX_VAR_0, 0, 4, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_1, 0, 6, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_2, 0, 8, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_6, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_7, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_8, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_9, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_A, 0, 12, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_5, 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, FLAG_LINK_CONTEST_ROOM_POKEBALL, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_3, 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_EventObjects:: @ 839149C + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 4, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 8, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_7, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_8, 0, 9, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_9, 0, 10, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_A, 0, 12, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_5, 0, 2, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_ROOM_POKEBALL, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_3, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 15, EVENT_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/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc index c2842c68e..2fc209077 100644 --- a/data/maps/events/LittlerootTown.inc +++ b/data/maps/events/LittlerootTown.inc @@ -1,10 +1,10 @@ -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, FLAG_HIDE_FAT_MAN_LITTLEROOT, 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, FLAG_HIDE_MOM_LITTLEROOT, 0, 0 - object_event 5, MAP_OBJ_GFX_TRUCK, 0, 2, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_BRENDAN, 0, 0 - object_event 6, MAP_OBJ_GFX_TRUCK, 0, 11, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_MAY, 0, 0 +LittlerootTown_EventObjects:: @ 83808FC + object_event 1, EVENT_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, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 0, 13, 0, 3, 2, 18, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14D6CD, FLAG_HIDE_FAT_MAN_LITTLEROOT, 0, 0 + object_event 3, EVENT_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, EVENT_OBJ_GFX_MOM, 0, 5, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, FLAG_HIDE_MOM_LITTLEROOT, 0, 0 + object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_BRENDAN, 0, 0 + object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 0, 10, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_MAY, 0, 0 LittlerootTown_MapWarps:: @ 838098C warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F @@ -29,4 +29,4 @@ LittlerootTown_MapBGEvents:: @ 8380A34 bg_event 12, 8, 3, 0, 0, LittlerootTown_EventScript_14D834 LittlerootTown_MapEvents:: @ 8380A64 - map_events LittlerootTown_MapObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents + map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents diff --git a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc index 58c8f8993..287818d15 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc @@ -1,9 +1,9 @@ -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, FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS, 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, FLAG_HIDE_MACHOKE_MOVER_2, 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, FLAG_HIDE_MACHOKE_MOVER_1, 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, FLAG_HIDE_BRENDAN_MOM, 0, 0 - object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0 +LittlerootTown_BrendansHouse_1F_EventObjects:: @ 8385674 + object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS, 0, 0 + object_event 2, EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 0, 3, 0, 3, 28, 3, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, FLAG_HIDE_BRENDAN_MOM, 0, 0 + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0 LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN @@ -14,4 +14,4 @@ LittlerootTown_BrendansHouse_1F_MapCoordEvents:: @ 8385704 coord_event 8, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 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 + map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc index 102da33a2..5d4ae676f 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc @@ -1,18 +1,18 @@ -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, FLAG_HIDE_BRENDAN_UPSTAIRS, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 4, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 5, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_MOM, 0, 7, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0 +LittlerootTown_BrendansHouse_2F_EventObjects:: @ 8385728 + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, FLAG_HIDE_BRENDAN_UPSTAIRS, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 4, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 5, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0 LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878 warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F @@ -24,4 +24,4 @@ LittlerootTown_BrendansHouse_2F_MapBGEvents:: @ 8385880 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 + map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents diff --git a/data/maps/events/LittlerootTown_MaysHouse_1F.inc b/data/maps/events/LittlerootTown_MaysHouse_1F.inc index cbeccb348..5fed0bdf6 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc @@ -1,9 +1,9 @@ -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, FLAG_HIDE_MAY_MOM_DOWNSTAIRS, 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, FLAG_HIDE_MACHOKE_MOVER_1, 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, FLAG_HIDE_MACHOKE_MOVER_2, 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, FLAG_HIDE_MAY_MOM, 0, 0 - object_event 5, MAP_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0 +LittlerootTown_MaysHouse_1F_EventObjects:: @ 83858C4 + object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, FLAG_HIDE_MAY_MOM_DOWNSTAIRS, 0, 0 + object_event 2, EVENT_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 0, 5, 0, 3, 65, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1, 0, 0 + object_event 3, EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 0, 3, 0, 3, 27, 3, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, FLAG_HIDE_MAY_MOM, 0, 0 + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 0, 6, 0, 3, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT, 0, 0 LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN @@ -14,4 +14,4 @@ LittlerootTown_MaysHouse_1F_MapCoordEvents:: @ 8385954 coord_event 2, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 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 + map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/events/LittlerootTown_MaysHouse_2F.inc b/data/maps/events/LittlerootTown_MaysHouse_2F.inc index b00a8d57d..e803d3335 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc @@ -1,19 +1,19 @@ -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, FLAG_HIDE_MAY_UPSTAIRS, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 2, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 4, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 5, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 2, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 3, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_MOM, 0, 1, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0 - object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 3, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAY_PICHU_DOLL, 0, 0 +LittlerootTown_MaysHouse_2F_EventObjects:: @ 8385978 + object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 0, 2, 0, 3, 7, 1, 0, 0, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, FLAG_HIDE_MAY_UPSTAIRS, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 1, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 2, 0, 6, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 4, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 5, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 2, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 3, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 0, 1, 0, 3, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS, 0, 0 + object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 0, 4, 0, 4, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MAY_PICHU_DOLL, 0, 0 LittlerootTown_MaysHouse_2F_MapWarps:: @ 8385AE0 warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F @@ -25,4 +25,4 @@ LittlerootTown_MaysHouse_2F_MapBGEvents:: @ 8385AE8 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 + map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents diff --git a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc index 41acfb14e..507dcec85 100644 --- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc @@ -1,7 +1,7 @@ -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, FLAG_HIDE_BIRCH_IN_LAB, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_0, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, FLAG_HIDE_RIVAL_BIRCH_LAB, 0, 0 +LittlerootTown_ProfessorBirchsLab_EventObjects:: @ 8385B2C + object_event 1, EVENT_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, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, FLAG_HIDE_BIRCH_IN_LAB, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, FLAG_HIDE_RIVAL_BIRCH_LAB, 0, 0 LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74 warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN @@ -25,4 +25,4 @@ LittlerootTown_ProfessorBirchsLab_MapBGEvents:: @ 8385B84 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 + map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents diff --git a/data/maps/events/MagmaHideout_1F.inc b/data/maps/events/MagmaHideout_1F.inc index 3601ce8b2..a6f2b1670 100644 --- a/data/maps/events/MagmaHideout_1F.inc +++ b/data/maps/events/MagmaHideout_1F.inc @@ -1,11 +1,11 @@ -MagmaHideout_1F_MapObjects:: @ 838E9BC - object_event 1, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 20, 0, 3, 0, 3, 50, 110, 0, 1, 0, 3, 0, MagmaHideout_1F_EventScript_15D80C, 0, 0, 0 +MagmaHideout_1F_EventObjects:: @ 838E9BC + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 13, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 14, 0, 19, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 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, MAP_LILYCOVE_CITY warp_def 13, 1, 3, 0, MAP_MAGMA_HIDEOUT_B1F MagmaHideout_1F_MapEvents:: @ 838EA14 - map_events MagmaHideout_1F_MapObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 + map_events MagmaHideout_1F_EventObjects, MagmaHideout_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_B1F.inc b/data/maps/events/MagmaHideout_B1F.inc index 01b1bdf63..577d7ad11 100644 --- a/data/maps/events/MagmaHideout_B1F.inc +++ b/data/maps/events/MagmaHideout_B1F.inc @@ -1,12 +1,12 @@ -MagmaHideout_B1F_MapObjects:: @ 838EA28 - object_event 1, MAP_OBJ_GFX_VAR_1, 0, 33, 0, 3, 0, 3, 9, 17, 0, 1, 0, 5, 0, MagmaHideout_B1F_EventScript_15D850, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_1, 0, 41, 0, 17, 0, 3, 23, 17, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D875, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_2, 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, FLAG_ITEM_MAGMA_HIDEOUT_B1F_1, 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, FLAG_ITEM_MAGMA_HIDEOUT_B1F_2, 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, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 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, FLAG_ITEM_MAGMA_HIDEOUT_B1F_3, 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, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0 +MagmaHideout_B1F_EventObjects:: @ 838EA28 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 33, 0, 3, 0, 3, 9, 17, 0, 1, 0, 5, 0, MagmaHideout_B1F_EventScript_15D850, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 41, 0, 17, 0, 3, 23, 17, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D875, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_2, 0, 33, 0, 19, 0, 3, 27, 20, 0, 1, 0, 3, 0, MagmaHideout_B1F_EventScript_15D89A, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, FLAG_ITEM_MAGMA_HIDEOUT_B1F_1, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, FLAG_ITEM_MAGMA_HIDEOUT_B1F_2, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, FLAG_ITEM_MAGMA_HIDEOUT_B1F_3, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MagmaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT, 0, 0 MagmaHideout_B1F_MapWarps:: @ 838EAE8 warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_1F @@ -40,4 +40,4 @@ MagmaHideout_B1F_MapWarps:: @ 838EAE8 warp_def 59, 17, 3, 14, MAP_MAGMA_HIDEOUT_B1F MagmaHideout_B1F_MapEvents:: @ 838EBD0 - map_events MagmaHideout_B1F_MapObjects, MagmaHideout_B1F_MapWarps, 0x0, 0x0 + map_events MagmaHideout_B1F_EventObjects, MagmaHideout_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_B2F.inc b/data/maps/events/MagmaHideout_B2F.inc index 58883c3a2..da6cfd6aa 100644 --- a/data/maps/events/MagmaHideout_B2F.inc +++ b/data/maps/events/MagmaHideout_B2F.inc @@ -1,9 +1,9 @@ -MagmaHideout_B2F_MapObjects:: @ 838EBE4 - object_event 1, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 19, 0, 3, 10, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_1, 0, 31, 0, 11, 0, 3, 51, 71, 0, 1, 0, 3, 0, MagmaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 - object_event 3, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 0, 20, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 13, 0, 3, 0, 3, 9, 17, 0, 1, 0, 4, 0, MagmaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 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, FLAG_ITEM_MAGMA_HIDEOUT_B2F_1, 0, 0 +MagmaHideout_B2F_EventObjects:: @ 838EBE4 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 8, 0, 19, 0, 3, 10, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 31, 0, 11, 0, 3, 51, 71, 0, 1, 0, 3, 0, MagmaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 3, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 0, 20, 0, 1, 10, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 13, 0, 3, 0, 3, 9, 17, 0, 1, 0, 4, 0, MagmaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 0, 20, 0, 3, 8, 17, 0, 0, 0, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, FLAG_ITEM_MAGMA_HIDEOUT_B2F_1, 0, 0 MagmaHideout_B2F_MapWarps:: @ 838EC5C warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_B1F @@ -22,4 +22,4 @@ MagmaHideout_B2F_MapCoordEvents:: @ 838EC9C coord_event 4, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD MagmaHideout_B2F_MapEvents:: @ 838ECDC - map_events MagmaHideout_B2F_MapObjects, MagmaHideout_B2F_MapWarps, MagmaHideout_B2F_MapCoordEvents, 0x0 + map_events MagmaHideout_B2F_EventObjects, MagmaHideout_B2F_MapWarps, MagmaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc index fee44bb1e..12ed46d7b 100644 --- a/data/maps/events/MauvilleCity.inc +++ b/data/maps/events/MauvilleCity.inc @@ -1,13 +1,13 @@ -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, FLAG_HIDE_WALLY_MAUVILLE, 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, FLAG_HIDE_WALLY_FATHER_MAUVILLE, 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, FLAG_HIDE_WATTSON_MAUVILLE, 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, FLAG_ITEM_MAUVILLE_1, 0, 0 +MauvilleCity_EventObjects:: @ 837FB90 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_WALLY, 0, 8, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, FLAG_HIDE_WALLY_MAUVILLE, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 0, 6, 0, 3, 9, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, FLAG_HIDE_WALLY_FATHER_MAUVILLE, 0, 0 + object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, FLAG_HIDE_WATTSON_MAUVILLE, 0, 0 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 0, 19, 0, 3, 1, 17, 0, 0, 0, 0, 0, MauvilleCity_EventScript_1B171E, FLAG_ITEM_MAUVILLE_1, 0, 0 MauvilleCity_MapWarps:: @ 837FC68 warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM @@ -29,4 +29,4 @@ MauvilleCity_MapBGEvents:: @ 837FCA0 bg_event 11, 15, 0, 0, 0, MauvilleCity_EventScript_14C099 MauvilleCity_MapEvents:: @ 837FD00 - map_events MauvilleCity_MapObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents + map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents diff --git a/data/maps/events/MauvilleCity_BikeShop.inc b/data/maps/events/MauvilleCity_BikeShop.inc index c215f96b0..171bcbb2a 100644 --- a/data/maps/events/MauvilleCity_BikeShop.inc +++ b/data/maps/events/MauvilleCity_BikeShop.inc @@ -1,6 +1,6 @@ -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_EventObjects:: @ 8388318 + object_event 1, EVENT_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, EVENT_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, MAP_MAUVILLE_CITY @@ -11,4 +11,4 @@ MauvilleCity_BikeShop_MapBGEvents:: @ 8388358 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 + map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents diff --git a/data/maps/events/MauvilleCity_GameCorner.inc b/data/maps/events/MauvilleCity_GameCorner.inc index bd0b472a2..950bb6447 100644 --- a/data/maps/events/MauvilleCity_GameCorner.inc +++ b/data/maps/events/MauvilleCity_GameCorner.inc @@ -1,16 +1,16 @@ -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_EventObjects:: @ 83883C0 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_MAUVILLE_CITY @@ -43,4 +43,4 @@ MauvilleCity_GameCorner_MapBGEvents:: @ 83884F0 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 + map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents diff --git a/data/maps/events/MauvilleCity_Gym.inc b/data/maps/events/MauvilleCity_Gym.inc index a9bd2a057..648a5e90b 100644 --- a/data/maps/events/MauvilleCity_Gym.inc +++ b/data/maps/events/MauvilleCity_Gym.inc @@ -1,10 +1,10 @@ -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, FLAG_HIDE_WATTSON_MAUVILLE_GYM, 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_EventObjects:: @ 838821C + object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_1565AB, FLAG_HIDE_WATTSON_MAUVILLE_GYM, 0, 0 + object_event 2, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_MAUVILLE_CITY @@ -20,4 +20,4 @@ MauvilleCity_Gym_MapBGEvents:: @ 83882EC 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 + map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents diff --git a/data/maps/events/MauvilleCity_House1.inc b/data/maps/events/MauvilleCity_House1.inc index 86b07e3dd..e908629e0 100644 --- a/data/maps/events/MauvilleCity_House1.inc +++ b/data/maps/events/MauvilleCity_House1.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 8388384 + object_event 1, EVENT_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, MAP_MAUVILLE_CITY warp_def 4, 7, 0, 4, MAP_MAUVILLE_CITY MauvilleCity_House1_MapEvents:: @ 83883AC - map_events MauvilleCity_House1_MapObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 + map_events MauvilleCity_House1_EventObjects, MauvilleCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_House2.inc b/data/maps/events/MauvilleCity_House2.inc index 2e5a39157..4834554ee 100644 --- a/data/maps/events/MauvilleCity_House2.inc +++ b/data/maps/events/MauvilleCity_House2.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 8388624 + object_event 1, EVENT_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, MAP_MAUVILLE_CITY warp_def 4, 8, 0, 6, MAP_MAUVILLE_CITY MauvilleCity_House2_MapEvents:: @ 838864C - map_events MauvilleCity_House2_MapObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 + map_events MauvilleCity_House2_EventObjects, MauvilleCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_Mart.inc b/data/maps/events/MauvilleCity_Mart.inc index 3453c6fce..c638da45d 100644 --- a/data/maps/events/MauvilleCity_Mart.inc +++ b/data/maps/events/MauvilleCity_Mart.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 83887A0 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_MAUVILLE_CITY warp_def 4, 7, 0, 3, MAP_MAUVILLE_CITY MauvilleCity_Mart_MapEvents:: @ 83887F8 - map_events MauvilleCity_Mart_MapObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 + map_events MauvilleCity_Mart_EventObjects, MauvilleCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc index e949ee3d0..d656daf43 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_1F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ -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, MAP_OBJ_GFX_VAR_0, 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_EventObjects:: @ 8388660 + object_event 1, EVENT_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, EVENT_OBJ_GFX_VAR_0, 0, 2, 0, 3, 0, 3, 9, 1, 0, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE744, 0, 0, 0 + object_event 3, EVENT_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, EVENT_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, EVENT_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, MAP_MAUVILLE_CITY @@ -11,4 +11,4 @@ MauvilleCity_PokemonCenter_1F_MapWarps:: @ 83886D8 warp_def 1, 6, 4, 0, MAP_MAUVILLE_CITY_POKEMON_CENTER_2F MauvilleCity_PokemonCenter_1F_MapEvents:: @ 83886F0 - map_events MauvilleCity_PokemonCenter_1F_MapObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events MauvilleCity_PokemonCenter_1F_EventObjects, MauvilleCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc index 501c40012..5a418e9aa 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -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_EventObjects:: @ 8388704 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F @@ -12,4 +12,4 @@ MauvilleCity_PokemonCenter_2F_MapWarps:: @ 8388764 warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM MauvilleCity_PokemonCenter_2F_MapEvents:: @ 838878C - map_events MauvilleCity_PokemonCenter_2F_MapObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events MauvilleCity_PokemonCenter_2F_EventObjects, MauvilleCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MeteorFalls_1F_1R.inc b/data/maps/events/MeteorFalls_1F_1R.inc index 17efa037a..781dde604 100644 --- a/data/maps/events/MeteorFalls_1F_1R.inc +++ b/data/maps/events/MeteorFalls_1F_1R.inc @@ -1,14 +1,14 @@ -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, FLAG_ITEM_METEOR_FALLS_1F_1R_1, 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, FLAG_ITEM_METEOR_FALLS_1F_1R_3, 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, FLAG_ITEM_METEOR_FALLS_1F_1R_2, 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, FLAG_ITEM_METEOR_FALLS_1F_1R_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_1, 0, 12, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_7, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_4, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_4, 0, 6, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 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, FLAG_HIDE_PROF_COSMO_METEOR_FALLS, 0, 0 +MeteorFalls_1F_1R_EventObjects:: @ 838BACC + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B17FB, FLAG_ITEM_METEOR_FALLS_1F_1R_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, FLAG_ITEM_METEOR_FALLS_1F_1R_3, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, FLAG_ITEM_METEOR_FALLS_1F_1R_2, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, FLAG_ITEM_METEOR_FALLS_1F_1R_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 12, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_7, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_4, 0, 6, 0, 20, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_4, 0, 6, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F, 0, 0 + object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 23, 0, 3, 21, 0, 0, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, FLAG_HIDE_PROF_COSMO_METEOR_FALLS, 0, 0 MeteorFalls_1F_1R_MapWarps:: @ 838BBBC warp_def 27, 18, 4, 0, MAP_ROUTE114 @@ -25,4 +25,4 @@ MeteorFalls_1F_1R_MapBGEvents:: @ 838BBF4 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 + map_events MeteorFalls_1F_1R_EventObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents diff --git a/data/maps/events/MeteorFalls_1F_2R.inc b/data/maps/events/MeteorFalls_1F_2R.inc index 060f9a84d..72763e029 100644 --- a/data/maps/events/MeteorFalls_1F_2R.inc +++ b/data/maps/events/MeteorFalls_1F_2R.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 838BC20 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_METEOR_FALLS_1F_1R @@ -14,4 +14,4 @@ MeteorFalls_1F_2R_MapBGEvents:: @ 838BC88 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 + map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents diff --git a/data/maps/events/MeteorFalls_B1F_2R.inc b/data/maps/events/MeteorFalls_B1F_2R.inc index 13e39d682..13bafa5ee 100644 --- a/data/maps/events/MeteorFalls_B1F_2R.inc +++ b/data/maps/events/MeteorFalls_B1F_2R.inc @@ -1,8 +1,8 @@ -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, FLAG_ITEM_METEOR_FALLS_B1F_2R_1, 0, 0 +MeteorFalls_B1F_2R_EventObjects:: @ 838BCF8 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, FLAG_ITEM_METEOR_FALLS_B1F_2R_1, 0, 0 MeteorFalls_B1F_2R_MapWarps:: @ 838BD10 warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R MeteorFalls_B1F_2R_MapEvents:: @ 838BD18 - map_events MeteorFalls_B1F_2R_MapObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 + map_events MeteorFalls_B1F_2R_EventObjects, MeteorFalls_B1F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc index 957d91d5a..b314a4b0b 100644 --- a/data/maps/events/MossdeepCity.inc +++ b/data/maps/events/MossdeepCity.inc @@ -1,13 +1,13 @@ -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, FLAG_ITEM_MOSSDEEP_1, 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_EventObjects:: @ 838042C + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 0, 35, 0, 5, 1, 0, 0, 0, 0, 0, 0, MossdeepCity_EventScript_1B1745, FLAG_ITEM_MOSSDEEP_1, 0, 0 + object_event 7, EVENT_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, EVENT_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, EVENT_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, MAP_MOSSDEEP_CITY_HOUSE1 @@ -38,4 +38,4 @@ MossdeepCity_MapBGEvents:: @ 8380594 bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_14CFE4 MossdeepCity_MapEvents:: @ 83805F4 - map_events MossdeepCity_MapObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents + map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents diff --git a/data/maps/events/MossdeepCity_GameCorner_1F.inc b/data/maps/events/MossdeepCity_GameCorner_1F.inc index f525533b2..cbe87a4b6 100644 --- a/data/maps/events/MossdeepCity_GameCorner_1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_1F.inc @@ -1,5 +1,5 @@ -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_EventObjects:: @ 838AC6C + object_event 1, EVENT_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, MAP_MOSSDEEP_CITY @@ -10,4 +10,4 @@ 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 + map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents diff --git a/data/maps/events/MossdeepCity_GameCorner_B1F.inc b/data/maps/events/MossdeepCity_GameCorner_B1F.inc index dc88e208b..91e8af46e 100644 --- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_B1F.inc @@ -1,8 +1,8 @@ -MossdeepCity_GameCorner_B1F_MapObjects:: @ 838ACBC - object_event 1, MAP_OBJ_GFX_VAR_0, 0, 6, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 +MossdeepCity_GameCorner_B1F_EventObjects:: @ 838ACBC + object_event 1, EVENT_OBJ_GFX_VAR_0, 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, MAP_MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_GameCorner_B1F_MapEvents:: @ 838ACDC - map_events MossdeepCity_GameCorner_B1F_MapObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 + map_events MossdeepCity_GameCorner_B1F_EventObjects, MossdeepCity_GameCorner_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_Gym.inc b/data/maps/events/MossdeepCity_Gym.inc index 21521df5f..6c90f3111 100644 --- a/data/maps/events/MossdeepCity_Gym.inc +++ b/data/maps/events/MossdeepCity_Gym.inc @@ -1,13 +1,13 @@ -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_EventObjects:: @ 838A660 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_MOSSDEEP_CITY @@ -25,4 +25,4 @@ MossdeepCity_Gym_MapBGEvents:: @ 838A758 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 + map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents diff --git a/data/maps/events/MossdeepCity_House1.inc b/data/maps/events/MossdeepCity_House1.inc index ec7bbdc58..5205fac26 100644 --- a/data/maps/events/MossdeepCity_House1.inc +++ b/data/maps/events/MossdeepCity_House1.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 838A7B4 + object_event 1, EVENT_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, EVENT_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, MAP_MOSSDEEP_CITY warp_def 4, 7, 0, 0, MAP_MOSSDEEP_CITY MossdeepCity_House1_MapEvents:: @ 838A7F4 - map_events MossdeepCity_House1_MapObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 + map_events MossdeepCity_House1_EventObjects, MossdeepCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House2.inc b/data/maps/events/MossdeepCity_House2.inc index 6752007d7..6ecd39bb0 100644 --- a/data/maps/events/MossdeepCity_House2.inc +++ b/data/maps/events/MossdeepCity_House2.inc @@ -1,11 +1,11 @@ -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, FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE, 0, 0 +MossdeepCity_House2_EventObjects:: @ 838A808 + object_event 1, EVENT_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, EVENT_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, EVENT_OBJ_GFX_WINGULL, 0, 4, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE, 0, 0 MossdeepCity_House2_MapWarps:: @ 838A850 warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY warp_def 4, 8, 0, 3, MAP_MOSSDEEP_CITY MossdeepCity_House2_MapEvents:: @ 838A860 - map_events MossdeepCity_House2_MapObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 + map_events MossdeepCity_House2_EventObjects, MossdeepCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House3.inc b/data/maps/events/MossdeepCity_House3.inc index 37c96933c..3c0e78f65 100644 --- a/data/maps/events/MossdeepCity_House3.inc +++ b/data/maps/events/MossdeepCity_House3.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 838AA08 + object_event 1, EVENT_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, MAP_MOSSDEEP_CITY warp_def 4, 7, 0, 5, MAP_MOSSDEEP_CITY MossdeepCity_House3_MapEvents:: @ 838AA30 - map_events MossdeepCity_House3_MapObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 + map_events MossdeepCity_House3_EventObjects, MossdeepCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_House4.inc b/data/maps/events/MossdeepCity_House4.inc index 6c07d0101..0aacb14ff 100644 --- a/data/maps/events/MossdeepCity_House4.inc +++ b/data/maps/events/MossdeepCity_House4.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 838AAF8 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_MOSSDEEP_CITY warp_def 3, 7, 0, 7, MAP_MOSSDEEP_CITY MossdeepCity_House4_MapEvents:: @ 838AB50 - map_events MossdeepCity_House4_MapObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 + map_events MossdeepCity_House4_EventObjects, MossdeepCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_Mart.inc b/data/maps/events/MossdeepCity_Mart.inc index 74141c0cc..667e38fea 100644 --- a/data/maps/events/MossdeepCity_Mart.inc +++ b/data/maps/events/MossdeepCity_Mart.inc @@ -1,12 +1,12 @@ -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_EventObjects:: @ 838A984 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_MOSSDEEP_CITY warp_def 4, 7, 0, 4, MAP_MOSSDEEP_CITY MossdeepCity_Mart_MapEvents:: @ 838A9F4 - map_events MossdeepCity_Mart_MapObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 + map_events MossdeepCity_Mart_EventObjects, MossdeepCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc index a9555d59b..007b8aa7e 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_1F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_1F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 838A874 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_MOSSDEEP_CITY @@ -9,4 +9,4 @@ MossdeepCity_PokemonCenter_1F_MapWarps:: @ 838A8BC warp_def 1, 6, 4, 0, MAP_MOSSDEEP_CITY_POKEMON_CENTER_2F MossdeepCity_PokemonCenter_1F_MapEvents:: @ 838A8D4 - map_events MossdeepCity_PokemonCenter_1F_MapObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events MossdeepCity_PokemonCenter_1F_EventObjects, MossdeepCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc index 3f3d05e5a..5d1d78ec1 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -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_EventObjects:: @ 838A8E8 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F @@ -12,4 +12,4 @@ MossdeepCity_PokemonCenter_2F_MapWarps:: @ 838A948 warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM MossdeepCity_PokemonCenter_2F_MapEvents:: @ 838A970 - map_events MossdeepCity_PokemonCenter_2F_MapObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events MossdeepCity_PokemonCenter_2F_EventObjects, MossdeepCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc index ab9872c2f..2d40cd6cf 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 838AB64 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_MOSSDEEP_CITY @@ -11,4 +11,4 @@ MossdeepCity_SpaceCenter_1F_MapWarps:: @ 838ABDC warp_def 13, 1, 0, 0, MAP_MOSSDEEP_CITY_SPACE_CENTER_2F MossdeepCity_SpaceCenter_1F_MapEvents:: @ 838ABF4 - map_events MossdeepCity_SpaceCenter_1F_MapObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0 + map_events MossdeepCity_SpaceCenter_1F_EventObjects, MossdeepCity_SpaceCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc index bcef30b09..3a182b547 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 838AC08 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F MossdeepCity_SpaceCenter_2F_MapEvents:: @ 838AC58 - map_events MossdeepCity_SpaceCenter_2F_MapObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 + map_events MossdeepCity_SpaceCenter_2F_EventObjects, MossdeepCity_SpaceCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity_StevensHouse.inc b/data/maps/events/MossdeepCity_StevensHouse.inc index 1428a7d8a..0c110c354 100644 --- a/data/maps/events/MossdeepCity_StevensHouse.inc +++ b/data/maps/events/MossdeepCity_StevensHouse.inc @@ -1,8 +1,8 @@ -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, FLAG_HIDE_STEVEN_STEVENS_HOUSE, 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, FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE, 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, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1, 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, FLAG_HIDE_STEVENS_LETTER, 0, 0 +MossdeepCity_StevensHouse_EventObjects:: @ 838AA44 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, FLAG_HIDE_STEVEN_STEVENS_HOUSE, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, FLAG_HIDE_STEVENS_LETTER, 0, 0 MossdeepCity_StevensHouse_MapWarps:: @ 838AAA4 warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY @@ -15,4 +15,4 @@ MossdeepCity_StevensHouse_MapBGEvents:: @ 838AAB4 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 + map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents diff --git a/data/maps/events/MtChimney.inc b/data/maps/events/MtChimney.inc index e685159c0..be4492ef6 100644 --- a/data/maps/events/MtChimney.inc +++ b/data/maps/events/MtChimney.inc @@ -1,32 +1,32 @@ -MtChimney_MapObjects:: @ 838C330 - object_event 1, MAP_OBJ_GFX_VAR_7, 0, 24, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_6, 0, 13, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 12, 0, 11, 0, 3, 9, 0, 0, 1, 0, 2, 0, MtChimney_EventScript_15D110, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_1, 0, 32, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_1, 0, 28, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D159, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 19, 0, 39, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_4, 0, 29, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_4, 0, 31, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D107, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 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, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_1, 0, 22, 0, 39, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 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, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 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, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 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, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 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, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 - object_event 16, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 21, 0, 3, 7, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D150, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 - object_event 17, MAP_OBJ_GFX_VAR_1, 0, 21, 0, 19, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 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, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 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, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 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, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 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, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 - object_event 22, MAP_OBJ_GFX_VAR_1, 0, 9, 0, 15, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D127, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 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, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 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, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 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, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 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, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 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, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 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, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 +MtChimney_EventObjects:: @ 838C330 + object_event 1, EVENT_OBJ_GFX_VAR_7, 0, 24, 0, 19, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 13, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 12, 0, 11, 0, 3, 9, 0, 0, 1, 0, 2, 0, MtChimney_EventScript_15D110, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 32, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 28, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D159, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 19, 0, 39, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_4, 0, 29, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_4, 0, 31, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D107, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 16, 0, 37, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15CF95, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 22, 0, 39, 0, 3, 9, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 0, 19, 0, 3, 74, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 0, 18, 0, 3, 64, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 23, 0, 17, 0, 3, 8, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 0, 20, 0, 3, 65, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 0, 19, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 16, EVENT_OBJ_GFX_VAR_1, 0, 23, 0, 21, 0, 3, 7, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D150, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 17, EVENT_OBJ_GFX_VAR_1, 0, 21, 0, 19, 0, 3, 10, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 0, 12, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 0, 12, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 0, 5, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 0, 5, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 22, EVENT_OBJ_GFX_VAR_1, 0, 9, 0, 15, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D127, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 0, 39, 0, 3, 67, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY, 0, 0 + object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 0, 39, 0, 3, 66, 0, 0, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY, 0, 0 + object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 0, 18, 0, 3, 13, 0, 0, 1, 0, 3, 0, MtChimney_EventScript_15D1E3, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 + object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 0, 7, 0, 3, 70, 0, 0, 1, 0, 4, 0, MtChimney_EventScript_15D221, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 + object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 0, 7, 0, 3, 17, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D238, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 + object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 0, 17, 0, 3, 16, 17, 0, 1, 0, 3, 0, MtChimney_EventScript_15D24F, FLAG_HIDE_MT_CHIMNEY_PEOPLE, 0, 0 MtChimney_MapWarps:: @ 838C5D0 warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION @@ -39,4 +39,4 @@ MtChimney_MapBGEvents:: @ 838C5F0 bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_15D1DA MtChimney_MapEvents:: @ 838C608 - map_events MtChimney_MapObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents + map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents diff --git a/data/maps/events/MtChimney_CableCarStation.inc b/data/maps/events/MtChimney_CableCarStation.inc index 971dcda65..bb1505cbe 100644 --- a/data/maps/events/MtChimney_CableCarStation.inc +++ b/data/maps/events/MtChimney_CableCarStation.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 838B828 + object_event 1, EVENT_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, EVENT_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, MAP_MT_CHIMNEY warp_def 7, 11, 0, 1, MAP_MT_CHIMNEY MtChimney_CableCarStation_MapEvents:: @ 838B868 - map_events MtChimney_CableCarStation_MapObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 + map_events MtChimney_CableCarStation_EventObjects, MtChimney_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_1F.inc b/data/maps/events/MtPyre_1F.inc index 480bcdbe9..e06d20bb8 100644 --- a/data/maps/events/MtPyre_1F.inc +++ b/data/maps/events/MtPyre_1F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 838C7FC + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_ROUTE122 @@ -12,4 +12,4 @@ MtPyre_1F_MapWarps:: @ 838C844 warp_def 20, 9, 3, 4, MAP_MT_PYRE_2F MtPyre_1F_MapEvents:: @ 838C874 - map_events MtPyre_1F_MapObjects, MtPyre_1F_MapWarps, 0x0, 0x0 + map_events MtPyre_1F_EventObjects, MtPyre_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_2F.inc b/data/maps/events/MtPyre_2F.inc index 16e1d98b0..1f7a0ec7b 100644 --- a/data/maps/events/MtPyre_2F.inc +++ b/data/maps/events/MtPyre_2F.inc @@ -1,10 +1,10 @@ -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, FLAG_ITEM_MT_PYRE_2F_1, 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_EventObjects:: @ 838C888 + object_event 1, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_2F_EventScript_1B1933, FLAG_ITEM_MT_PYRE_2F_1, 0, 0 + object_event 3, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_MT_PYRE_1F @@ -14,4 +14,4 @@ MtPyre_2F_MapWarps:: @ 838C918 warp_def 11, 9, 3, 5, MAP_MT_PYRE_1F MtPyre_2F_MapEvents:: @ 838C940 - map_events MtPyre_2F_MapObjects, MtPyre_2F_MapWarps, 0x0, 0x0 + map_events MtPyre_2F_EventObjects, MtPyre_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_3F.inc b/data/maps/events/MtPyre_3F.inc index 818d61533..860583271 100644 --- a/data/maps/events/MtPyre_3F.inc +++ b/data/maps/events/MtPyre_3F.inc @@ -1,7 +1,7 @@ -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, FLAG_ITEM_MT_PYRE_3F_1, 0, 0 +MtPyre_3F_EventObjects:: @ 838C954 + object_event 1, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_3F_EventScript_1B1940, FLAG_ITEM_MT_PYRE_3F_1, 0, 0 MtPyre_3F_MapWarps:: @ 838C99C warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F @@ -12,4 +12,4 @@ MtPyre_3F_MapWarps:: @ 838C99C warp_def 6, 12, 3, 3, MAP_MT_PYRE_2F MtPyre_3F_MapEvents:: @ 838C9CC - map_events MtPyre_3F_MapObjects, MtPyre_3F_MapWarps, 0x0, 0x0 + map_events MtPyre_3F_EventObjects, MtPyre_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_4F.inc b/data/maps/events/MtPyre_4F.inc index 4b954a45e..d6719889e 100644 --- a/data/maps/events/MtPyre_4F.inc +++ b/data/maps/events/MtPyre_4F.inc @@ -1,6 +1,6 @@ -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, FLAG_ITEM_MT_PYRE_4F_1, 0, 0 +MtPyre_4F_EventObjects:: @ 838C9E0 + object_event 1, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_4F_EventScript_1B194D, FLAG_ITEM_MT_PYRE_4F_1, 0, 0 MtPyre_4F_MapWarps:: @ 838CA10 warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F @@ -11,4 +11,4 @@ MtPyre_4F_MapWarps:: @ 838CA10 warp_def 2, 12, 3, 3, MAP_MT_PYRE_3F MtPyre_4F_MapEvents:: @ 838CA40 - map_events MtPyre_4F_MapObjects, MtPyre_4F_MapWarps, 0x0, 0x0 + map_events MtPyre_4F_EventObjects, MtPyre_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_5F.inc b/data/maps/events/MtPyre_5F.inc index 9043c95de..9a36a1d98 100644 --- a/data/maps/events/MtPyre_5F.inc +++ b/data/maps/events/MtPyre_5F.inc @@ -1,6 +1,6 @@ -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, FLAG_ITEM_MT_PYRE_5F_1, 0, 0 +MtPyre_5F_EventObjects:: @ 838CA54 + object_event 1, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_5F_EventScript_1B195A, FLAG_ITEM_MT_PYRE_5F_1, 0, 0 MtPyre_5F_MapWarps:: @ 838CA84 warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F @@ -10,4 +10,4 @@ MtPyre_5F_MapWarps:: @ 838CA84 warp_def 12, 12, 3, 3, MAP_MT_PYRE_4F MtPyre_5F_MapEvents:: @ 838CAAC - map_events MtPyre_5F_MapObjects, MtPyre_5F_MapWarps, 0x0, 0x0 + map_events MtPyre_5F_EventObjects, MtPyre_5F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_6F.inc b/data/maps/events/MtPyre_6F.inc index 67597ff58..5fe737f4e 100644 --- a/data/maps/events/MtPyre_6F.inc +++ b/data/maps/events/MtPyre_6F.inc @@ -1,10 +1,10 @@ -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, FLAG_ITEM_MT_PYRE_6F_1, 0, 0 +MtPyre_6F_EventObjects:: @ 838CAC0 + object_event 1, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, MtPyre_6F_EventScript_1B1967, FLAG_ITEM_MT_PYRE_6F_1, 0, 0 MtPyre_6F_MapWarps:: @ 838CAF0 warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F warp_def 1, 10, 3, 2, MAP_MT_PYRE_5F MtPyre_6F_MapEvents:: @ 838CB00 - map_events MtPyre_6F_MapObjects, MtPyre_6F_MapWarps, 0x0, 0x0 + map_events MtPyre_6F_EventObjects, MtPyre_6F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MtPyre_Exterior.inc b/data/maps/events/MtPyre_Exterior.inc index 77668758d..8203afe6c 100644 --- a/data/maps/events/MtPyre_Exterior.inc +++ b/data/maps/events/MtPyre_Exterior.inc @@ -1,6 +1,6 @@ -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, FLAG_ITEM_MT_PYRE_EXTERIOR_1, 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, FLAG_ITEM_MT_PYRE_EXTERIOR_2, 0, 0 +MtPyre_Exterior_EventObjects:: @ 838CB14 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1974, FLAG_ITEM_MT_PYRE_EXTERIOR_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 0, 40, 0, 3, 1, 0, 0, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, FLAG_ITEM_MT_PYRE_EXTERIOR_2, 0, 0 MtPyre_Exterior_MapWarps:: @ 838CB44 warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F @@ -19,4 +19,4 @@ MtPyre_Exterior_MapBGEvents:: @ 838CBAC bg_hidden_item_event 16, 22, 0, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_4E MtPyre_Exterior_MapEvents:: @ 838CBC4 - map_events MtPyre_Exterior_MapObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents + map_events MtPyre_Exterior_EventObjects, MtPyre_Exterior_MapWarps, MtPyre_Exterior_MapCoordEvents, MtPyre_Exterior_MapBGEvents diff --git a/data/maps/events/MtPyre_Summit.inc b/data/maps/events/MtPyre_Summit.inc index 64399add8..7def980b1 100644 --- a/data/maps/events/MtPyre_Summit.inc +++ b/data/maps/events/MtPyre_Summit.inc @@ -1,10 +1,10 @@ -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, MAP_OBJ_GFX_VAR_6, 0, 23, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEADER_MT_PYRE_SUMMIT, 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, MAP_OBJ_GFX_VAR_1, 0, 21, 0, 18, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DA9, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_1, 0, 25, 0, 15, 0, 3, 9, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DC0, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_1, 0, 21, 0, 11, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DD7, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0 +MtPyre_Summit_EventObjects:: @ 838CBD8 + object_event 1, EVENT_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, EVENT_OBJ_GFX_VAR_6, 0, 23, 0, 6, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEADER_MT_PYRE_SUMMIT, 0, 0 + object_event 3, EVENT_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, EVENT_OBJ_GFX_VAR_1, 0, 21, 0, 18, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DA9, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 25, 0, 15, 0, 3, 9, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DC0, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 21, 0, 11, 0, 3, 10, 0, 0, 1, 0, 3, 0, MtPyre_Summit_EventScript_1B2DD7, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT, 0, 0 MtPyre_Summit_MapWarps:: @ 838CC68 warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR @@ -24,4 +24,4 @@ MtPyre_Summit_MapBGEvents:: @ 838CCE0 bg_hidden_item_event 37, 7, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_50 MtPyre_Summit_MapEvents:: @ 838CCF8 - map_events MtPyre_Summit_MapObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents + map_events MtPyre_Summit_EventObjects, MtPyre_Summit_MapWarps, MtPyre_Summit_MapCoordEvents, MtPyre_Summit_MapBGEvents diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc index c88c554c6..d1c5bd06a 100644 --- a/data/maps/events/NewMauville_Inside.inc +++ b/data/maps/events/NewMauville_Inside.inc @@ -1,12 +1,12 @@ -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, FLAG_ITEM_NEW_MAUVILLE_INSIDE_1, 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, FLAG_ITEM_NEW_MAUVILLE_INSIDE_2, 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, FLAG_ITEM_NEW_MAUVILLE_INSIDE_3, 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, FLAG_ITEM_NEW_MAUVILLE_INSIDE_4, 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, FLAG_ITEM_NEW_MAUVILLE_INSIDE_5, 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, FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE, 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, FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE, 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, FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE, 0, 0 +NewMauville_Inside_EventObjects:: @ 838DF08 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B183C, FLAG_ITEM_NEW_MAUVILLE_INSIDE_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 0, 22, 0, 3, 1, 0, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1849, FLAG_ITEM_NEW_MAUVILLE_INSIDE_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1856, FLAG_ITEM_NEW_MAUVILLE_INSIDE_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1863, FLAG_ITEM_NEW_MAUVILLE_INSIDE_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1870, FLAG_ITEM_NEW_MAUVILLE_INSIDE_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E900, FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E91E, FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, NewMauville_Inside_EventScript_15E93C, FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE, 0, 0 NewMauville_Inside_MapWarps:: @ 838DFC8 warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE @@ -34,4 +34,4 @@ NewMauville_Inside_MapBGEvents:: @ 838E070 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 + map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents diff --git a/data/maps/events/OldaleTown.inc b/data/maps/events/OldaleTown.inc index cad717a21..28bbf82d4 100644 --- a/data/maps/events/OldaleTown.inc +++ b/data/maps/events/OldaleTown.inc @@ -1,8 +1,8 @@ -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, MAP_OBJ_GFX_VAR_0, 0, 11, 0, 19, 0, 3, 7, 17, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DF30, FLAG_HIDE_RIVAL_OLDALE_TOWN, 0, 0 +OldaleTown_EventObjects:: @ 8380A78 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_VAR_0, 0, 11, 0, 19, 0, 3, 7, 17, 0, 0, 0, 0, 0, OldaleTown_EventScript_14DF30, FLAG_HIDE_RIVAL_OLDALE_TOWN, 0, 0 OldaleTown_MapWarps:: @ 8380AD8 warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 @@ -24,4 +24,4 @@ OldaleTown_MapBGEvents:: @ 8380B38 bg_event 16, 6, 0, 1, 0, OldaleTown_EventScript_1A00E1 OldaleTown_MapEvents:: @ 8380B74 - map_events OldaleTown_MapObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents + map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents diff --git a/data/maps/events/OldaleTown_House1.inc b/data/maps/events/OldaleTown_House1.inc index 1c2eb5bce..ca5388d3e 100644 --- a/data/maps/events/OldaleTown_House1.inc +++ b/data/maps/events/OldaleTown_House1.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 8385C4C + object_event 1, EVENT_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, MAP_OLDALE_TOWN warp_def 4, 8, 0, 0, MAP_OLDALE_TOWN OldaleTown_House1_MapEvents:: @ 8385C74 - map_events OldaleTown_House1_MapObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 + map_events OldaleTown_House1_EventObjects, OldaleTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_House2.inc b/data/maps/events/OldaleTown_House2.inc index 458ca9420..0b73af8b4 100644 --- a/data/maps/events/OldaleTown_House2.inc +++ b/data/maps/events/OldaleTown_House2.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8385C88 + object_event 1, EVENT_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, EVENT_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, MAP_OLDALE_TOWN warp_def 4, 7, 0, 1, MAP_OLDALE_TOWN OldaleTown_House2_MapEvents:: @ 8385CC8 - map_events OldaleTown_House2_MapObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 + map_events OldaleTown_House2_EventObjects, OldaleTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_Mart.inc b/data/maps/events/OldaleTown_Mart.inc index 839ec3b49..b0bd7691a 100644 --- a/data/maps/events/OldaleTown_Mart.inc +++ b/data/maps/events/OldaleTown_Mart.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 8385DEC + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_OLDALE_TOWN warp_def 4, 7, 0, 3, MAP_OLDALE_TOWN OldaleTown_Mart_MapEvents:: @ 8385E44 - map_events OldaleTown_Mart_MapObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 + map_events OldaleTown_Mart_EventObjects, OldaleTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_PokemonCenter_1F.inc b/data/maps/events/OldaleTown_PokemonCenter_1F.inc index 0c9bdfe8c..639396d28 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_1F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ -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_EventObjects:: @ 8385CDC + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_OLDALE_TOWN @@ -10,4 +10,4 @@ OldaleTown_PokemonCenter_1F_MapWarps:: @ 8385D3C warp_def 1, 6, 4, 0, MAP_OLDALE_TOWN_POKEMON_CENTER_2F OldaleTown_PokemonCenter_1F_MapEvents:: @ 8385D54 - map_events OldaleTown_PokemonCenter_1F_MapObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events OldaleTown_PokemonCenter_1F_EventObjects, OldaleTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/OldaleTown_PokemonCenter_2F.inc b/data/maps/events/OldaleTown_PokemonCenter_2F.inc index e94d29970..6062482e1 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_2F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 8385D68 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_OLDALE_TOWN_POKEMON_CENTER_1F @@ -11,4 +11,4 @@ OldaleTown_PokemonCenter_2F_MapWarps:: @ 8385DB0 warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM OldaleTown_PokemonCenter_2F_MapEvents:: @ 8385DD8 - map_events OldaleTown_PokemonCenter_2F_MapObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events OldaleTown_PokemonCenter_2F_EventObjects, OldaleTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown.inc b/data/maps/events/PacifidlogTown.inc index 2161172a5..b9a8cba7a 100644 --- a/data/maps/events/PacifidlogTown.inc +++ b/data/maps/events/PacifidlogTown.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 838100C + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F @@ -17,4 +17,4 @@ PacifidlogTown_MapBGEvents:: @ 8381084 bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA PacifidlogTown_MapEvents:: @ 83810A8 - map_events PacifidlogTown_MapObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents + map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents diff --git a/data/maps/events/PacifidlogTown_House1.inc b/data/maps/events/PacifidlogTown_House1.inc index 3e0e7dc23..773afb1c1 100644 --- a/data/maps/events/PacifidlogTown_House1.inc +++ b/data/maps/events/PacifidlogTown_House1.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8386F40 + object_event 1, EVENT_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, EVENT_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, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 1, MAP_PACIFIDLOG_TOWN PacifidlogTown_House1_MapEvents:: @ 8386F80 - map_events PacifidlogTown_House1_MapObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 + map_events PacifidlogTown_House1_EventObjects, PacifidlogTown_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House2.inc b/data/maps/events/PacifidlogTown_House2.inc index 7c4de826c..a7fc9f156 100644 --- a/data/maps/events/PacifidlogTown_House2.inc +++ b/data/maps/events/PacifidlogTown_House2.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 8386F94 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 2, MAP_PACIFIDLOG_TOWN PacifidlogTown_House2_MapEvents:: @ 8386FEC - map_events PacifidlogTown_House2_MapObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 + map_events PacifidlogTown_House2_EventObjects, PacifidlogTown_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House3.inc b/data/maps/events/PacifidlogTown_House3.inc index 642613434..e36778e3c 100644 --- a/data/maps/events/PacifidlogTown_House3.inc +++ b/data/maps/events/PacifidlogTown_House3.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8387000 + object_event 1, EVENT_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, EVENT_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, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 3, MAP_PACIFIDLOG_TOWN PacifidlogTown_House3_MapEvents:: @ 8387040 - map_events PacifidlogTown_House3_MapObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 + map_events PacifidlogTown_House3_EventObjects, PacifidlogTown_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House4.inc b/data/maps/events/PacifidlogTown_House4.inc index bf010eaf3..9f65252b2 100644 --- a/data/maps/events/PacifidlogTown_House4.inc +++ b/data/maps/events/PacifidlogTown_House4.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 8387054 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 4, MAP_PACIFIDLOG_TOWN PacifidlogTown_House4_MapEvents:: @ 83870AC - map_events PacifidlogTown_House4_MapObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 + map_events PacifidlogTown_House4_EventObjects, PacifidlogTown_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_House5.inc b/data/maps/events/PacifidlogTown_House5.inc index cd7c5dae0..5f9c8d065 100644 --- a/data/maps/events/PacifidlogTown_House5.inc +++ b/data/maps/events/PacifidlogTown_House5.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 83870C0 + object_event 1, EVENT_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, EVENT_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, MAP_PACIFIDLOG_TOWN warp_def 5, 8, 0, 5, MAP_PACIFIDLOG_TOWN PacifidlogTown_House5_MapEvents:: @ 8387100 - map_events PacifidlogTown_House5_MapObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 + map_events PacifidlogTown_House5_EventObjects, PacifidlogTown_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc index e0990b224..b14439efa 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ -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_EventObjects:: @ 8386E30 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_PACIFIDLOG_TOWN @@ -10,4 +10,4 @@ PacifidlogTown_PokemonCenter_1F_MapWarps:: @ 8386E90 warp_def 1, 6, 4, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_2F PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 8386EA8 - map_events PacifidlogTown_PokemonCenter_1F_MapObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events PacifidlogTown_PokemonCenter_1F_EventObjects, PacifidlogTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc index fb594733e..210b1ccaa 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 8386EBC + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F @@ -11,4 +11,4 @@ PacifidlogTown_PokemonCenter_2F_MapWarps:: @ 8386F04 warp_def 0, 1, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 8386F2C - map_events PacifidlogTown_PokemonCenter_2F_MapObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events PacifidlogTown_PokemonCenter_2F_EventObjects, PacifidlogTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity.inc b/data/maps/events/PetalburgCity.inc index 3b22cca9b..081f60a88 100644 --- a/data/maps/events/PetalburgCity.inc +++ b/data/maps/events/PetalburgCity.inc @@ -1,13 +1,13 @@ -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, FLAG_HIDE_WALLY_MOM_PETALBURG_1, 0, 0 - object_event 2, MAP_OBJ_GFX_WALLY, 0, 15, 0, 10, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG, 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, FLAG_HIDE_WALLY_FATHER_PETALBURG, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 14, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_MOTHER_PETALBURG, 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, FLAG_ITEM_PETALBURG_1, 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, FLAG_ITEM_PETALBURG_2, 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_EventObjects:: @ 837F5F0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 0, 18, 0, 3, 2, 17, 0, 0, 0, 0, 0, PetalburgCity_EventScript_14B7C3, FLAG_HIDE_WALLY_MOM_PETALBURG_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 0, 10, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG, 0, 0 + object_event 3, EVENT_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, EVENT_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, EVENT_OBJ_GFX_MAN_1, 0, 15, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_FATHER_PETALBURG, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 0, 11, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_MOTHER_PETALBURG, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, FLAG_ITEM_PETALBURG_1, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 28, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, FLAG_ITEM_PETALBURG_2, 0, 0 + object_event 9, EVENT_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, MAP_PETALBURG_CITY_HOUSE1 @@ -34,4 +34,4 @@ PetalburgCity_MapBGEvents:: @ 837F738 bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_5F PetalburgCity_MapEvents:: @ 837F798 - map_events PetalburgCity_MapObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents + map_events PetalburgCity_EventObjects, PetalburgCity_MapWarps, PetalburgCity_MapCoordEvents, PetalburgCity_MapBGEvents diff --git a/data/maps/events/PetalburgCity_Gym.inc b/data/maps/events/PetalburgCity_Gym.inc index 781de130d..a2088175a 100644 --- a/data/maps/events/PetalburgCity_Gym.inc +++ b/data/maps/events/PetalburgCity_Gym.inc @@ -1,14 +1,14 @@ -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, FLAG_HIDE_NORMAN_PETALBURG_GYM, 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, FLAG_HIDE_PETALBURG_GYM_GUIDE, 0, 0 - object_event 10, MAP_OBJ_GFX_WALLY, 0, 4, 0, 111, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG_GYM, 0, 0 +PetalburgCity_Gym_EventObjects:: @ 8387168 + object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, FLAG_HIDE_NORMAN_PETALBURG_GYM, 0, 0 + object_event 2, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_MAN_2, 0, 3, 0, 109, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, FLAG_HIDE_PETALBURG_GYM_GUIDE, 0, 0 + object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 0, 111, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG_GYM, 0, 0 PetalburgCity_Gym_MapWarps:: @ 8387258 warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY @@ -67,4 +67,4 @@ PetalburgCity_Gym_MapBGEvents:: @ 8387388 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 + map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents diff --git a/data/maps/events/PetalburgCity_House1.inc b/data/maps/events/PetalburgCity_House1.inc index 9faa2873a..88be35a38 100644 --- a/data/maps/events/PetalburgCity_House1.inc +++ b/data/maps/events/PetalburgCity_House1.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8387444 + object_event 1, EVENT_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, EVENT_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, MAP_PETALBURG_CITY warp_def 4, 8, 0, 0, MAP_PETALBURG_CITY PetalburgCity_House1_MapEvents:: @ 8387484 - map_events PetalburgCity_House1_MapObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 + map_events PetalburgCity_House1_EventObjects, PetalburgCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_House2.inc b/data/maps/events/PetalburgCity_House2.inc index 29a2226d1..862eb9b76 100644 --- a/data/maps/events/PetalburgCity_House2.inc +++ b/data/maps/events/PetalburgCity_House2.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8387498 + object_event 1, EVENT_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, EVENT_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, MAP_PETALBURG_CITY warp_def 4, 7, 0, 4, MAP_PETALBURG_CITY PetalburgCity_House2_MapEvents:: @ 83874D8 - map_events PetalburgCity_House2_MapObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 + map_events PetalburgCity_House2_EventObjects, PetalburgCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_Mart.inc b/data/maps/events/PetalburgCity_Mart.inc index 358618d7e..b12e03f93 100644 --- a/data/maps/events/PetalburgCity_Mart.inc +++ b/data/maps/events/PetalburgCity_Mart.inc @@ -1,12 +1,12 @@ -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_EventObjects:: @ 8387614 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_PETALBURG_CITY warp_def 4, 7, 0, 5, MAP_PETALBURG_CITY PetalburgCity_Mart_MapEvents:: @ 8387684 - map_events PetalburgCity_Mart_MapObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 + map_events PetalburgCity_Mart_EventObjects, PetalburgCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc index 8bdc1e1bf..8c8c34382 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_1F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 83874EC + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_PETALBURG_CITY @@ -11,4 +11,4 @@ PetalburgCity_PokemonCenter_1F_MapWarps:: @ 8387564 warp_def 1, 6, 4, 0, MAP_PETALBURG_CITY_POKEMON_CENTER_2F PetalburgCity_PokemonCenter_1F_MapEvents:: @ 838757C - map_events PetalburgCity_PokemonCenter_1F_MapObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events PetalburgCity_PokemonCenter_1F_EventObjects, PetalburgCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc index cdbefe565..ee99539a1 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 8387590 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_PETALBURG_CITY_POKEMON_CENTER_1F @@ -11,4 +11,4 @@ PetalburgCity_PokemonCenter_2F_MapWarps:: @ 83875D8 warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM PetalburgCity_PokemonCenter_2F_MapEvents:: @ 8387600 - map_events PetalburgCity_PokemonCenter_2F_MapObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events PetalburgCity_PokemonCenter_2F_EventObjects, PetalburgCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgCity_WallysHouse.inc b/data/maps/events/PetalburgCity_WallysHouse.inc index 4485f518d..2f63d397d 100644 --- a/data/maps/events/PetalburgCity_WallysHouse.inc +++ b/data/maps/events/PetalburgCity_WallysHouse.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8387114 + object_event 1, EVENT_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, EVENT_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, MAP_PETALBURG_CITY warp_def 4, 7, 0, 1, MAP_PETALBURG_CITY PetalburgCity_WallysHouse_MapEvents:: @ 8387154 - map_events PetalburgCity_WallysHouse_MapObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 + map_events PetalburgCity_WallysHouse_EventObjects, PetalburgCity_WallysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/PetalburgWoods.inc b/data/maps/events/PetalburgWoods.inc index 91e59d6c5..b17ff069d 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -1,17 +1,17 @@ -PetalburgWoods_MapObjects:: @ 838C14C - object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 - object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_DEVON_PETALBURG_WOODS, 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, FLAG_ITEM_PETALBURG_WOODS_2, 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, FLAG_ITEM_PETALBURG_WOODS_1, 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, FLAG_ITEM_PETALBURG_WOODS_3, 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, FLAG_ITEM_PETALBURG_WOODS_4, 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_EventObjects:: @ 838C14C + object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 26, 0, 17, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 0, 20, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_DEVON_PETALBURG_WOODS, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, FLAG_ITEM_PETALBURG_WOODS_2, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, FLAG_ITEM_PETALBURG_WOODS_1, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, FLAG_ITEM_PETALBURG_WOODS_3, 0, 0 + object_event 8, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1779, FLAG_ITEM_PETALBURG_WOODS_4, 0, 0 + object_event 13, EVENT_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, MAP_ROUTE104 @@ -34,4 +34,4 @@ PetalburgWoods_MapBGEvents:: @ 838C2D4 bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_15CF1E PetalburgWoods_MapEvents:: @ 838C31C - map_events PetalburgWoods_MapObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents + map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents diff --git a/data/maps/events/RecordCorner.inc b/data/maps/events/RecordCorner.inc index d46c252be..df13c8c51 100644 --- a/data/maps/events/RecordCorner.inc +++ b/data/maps/events/RecordCorner.inc @@ -1,5 +1,5 @@ -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_EventObjects:: @ 839139C + object_event 1, EVENT_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, MAP_NONE @@ -14,4 +14,4 @@ RecordCorner_MapCoordEvents:: @ 83913D4 coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4457 RecordCorner_MapEvents:: @ 8391414 - map_events RecordCorner_MapObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 + map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route101.inc b/data/maps/events/Route101.inc index b19dc1cf0..150972393 100644 --- a/data/maps/events/Route101.inc +++ b/data/maps/events/Route101.inc @@ -1,10 +1,10 @@ -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, FLAG_HIDE_BIRCH_BATTLE_POOCHYENA, 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, FLAG_HIDE_BIRCH_STARTERS_BAG, 0, 0 - object_event 4, MAP_OBJ_GFX_POOCHYENA, 0, 10, 0, 13, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_POOCHYENA_ROUTE101, 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, FLAG_HIDE_BIRCH_ROUTE101, 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, FLAG_HIDE_BOY_ROUTE101, 0, 0 +Route101_EventObjects:: @ 83810BC + object_event 1, EVENT_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, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 0, 13, 0, 0, 71, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_BATTLE_POOCHYENA, 0, 0 + object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG, 0, 0 + object_event 4, EVENT_OBJ_GFX_POOCHYENA, 0, 10, 0, 13, 0, 0, 70, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_POOCHYENA_ROUTE101, 0, 0 + object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route101_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE101, 0, 0 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 0, 13, 0, 3, 5, 17, 0, 0, 0, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101, 0, 0 Route101_MapCoordEvents:: @ 838114C coord_event 10, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948 @@ -21,4 +21,4 @@ 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 + map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents diff --git a/data/maps/events/Route102.inc b/data/maps/events/Route102.inc index 2736c7a61..69b31d3f6 100644 --- a/data/maps/events/Route102.inc +++ b/data/maps/events/Route102.inc @@ -1,17 +1,17 @@ -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, FLAG_ITEM_ROUTE102_1, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, S_BerryTree, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, S_BerryTree, 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_EventObjects:: @ 83811FC + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 0, 15, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route102_EventScript_1B1439, FLAG_ITEM_ROUTE102_1, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 0, 2, 0, 3, 12, 0, 0, 0, 0, 2, 0, S_BerryTree, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 0, 2, 0, 3, 12, 0, 0, 0, 0, 1, 0, S_BerryTree, 0, 0, 0 + object_event 9, EVENT_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 + map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents diff --git a/data/maps/events/Route103.inc b/data/maps/events/Route103.inc index abe48ad20..14d9793ae 100644 --- a/data/maps/events/Route103.inc +++ b/data/maps/events/Route103.inc @@ -1,22 +1,22 @@ -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, MAP_OBJ_GFX_VAR_0, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route103_EventScript_14EB92, FLAG_HIDE_RIVAL_ROUTE103, 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, S_BerryTree, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, S_BerryTree, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, S_BerryTree, 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, FLAG_HIDE_BIRCH_ROUTE103, 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, FLAG_ITEM_ROUTE103_1, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 +Route103_EventObjects:: @ 8381300 + object_event 1, EVENT_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, EVENT_OBJ_GFX_VAR_0, 0, 10, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route103_EventScript_14EB92, FLAG_HIDE_RIVAL_ROUTE103, 0, 0 + object_event 3, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 0, 5, 0, 3, 12, 0, 0, 0, 0, 5, 0, S_BerryTree, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 0, 5, 0, 3, 12, 0, 0, 0, 0, 6, 0, S_BerryTree, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 0, 5, 0, 3, 12, 0, 0, 0, 0, 7, 0, S_BerryTree, 0, 0, 0 + object_event 10, EVENT_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, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 0, 3, 0, 3, 2, 17, 0, 0, 0, 0, 0, Route103_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE103, 0, 0 + object_event 12, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 63, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route103_EventScript_1B1446, FLAG_ITEM_ROUTE103_1, 0, 0 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 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 + map_events Route103_EventObjects, 0x0, 0x0, Route103_MapBGEvents diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc index dfbd27da2..ed2464a79 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/events/Route104.inc @@ -1,36 +1,36 @@ -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, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104, 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, FLAG_HIDE_MR_BRINEY_ROUTE104, 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, S_BerryTree, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, S_BerryTree, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 6, 0, 3, 12, 0, 0, 0, 0, 10, 0, S_BerryTree, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 22, 0, 41, 0, 3, 12, 0, 0, 0, 0, 11, 0, S_BerryTree, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 41, 0, 3, 12, 0, 0, 0, 0, 12, 0, S_BerryTree, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 41, 0, 3, 12, 0, 0, 0, 0, 13, 0, S_BerryTree, 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, S_BerryTree, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, S_BerryTree, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, S_BerryTree, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, S_BerryTree, 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, FLAG_ITEM_ROUTE104_1, 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, FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE, 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, FLAG_ITEM_ROUTE104_2, 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, FLAG_ITEM_ROUTE104_3, 0, 0 - object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 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, FLAG_ITEM_ROUTE104_4, 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_EventObjects:: @ 8381488 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 0, 54, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104, 0, 0 + object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 51, 0, 4, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_ROUTE104, 0, 0 + object_event 9, EVENT_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, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 0, 6, 0, 3, 12, 0, 0, 0, 0, 8, 0, S_BerryTree, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 0, 6, 0, 3, 12, 0, 0, 0, 0, 9, 0, S_BerryTree, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 0, 6, 0, 3, 12, 0, 0, 0, 0, 10, 0, S_BerryTree, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 0, 41, 0, 3, 12, 0, 0, 0, 0, 11, 0, S_BerryTree, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 0, 41, 0, 3, 12, 0, 0, 0, 0, 12, 0, S_BerryTree, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 0, 41, 0, 3, 12, 0, 0, 0, 0, 13, 0, S_BerryTree, 0, 0, 0 + object_event 16, EVENT_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, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 0, 22, 0, 3, 12, 0, 0, 0, 0, 3, 0, S_BerryTree, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 0, 23, 0, 3, 12, 0, 0, 0, 0, 4, 0, S_BerryTree, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 0, 24, 0, 3, 12, 0, 0, 0, 0, 75, 0, S_BerryTree, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 0, 25, 0, 3, 12, 0, 0, 0, 0, 76, 0, S_BerryTree, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route104_EventScript_1B1453, FLAG_ITEM_ROUTE104_1, 0, 0 + object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 0, 19, 0, 3, 5, 1, 0, 0, 0, 0, 0, Route104_EventScript_14EF09, FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE, 0, 0 + object_event 23, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B1460, FLAG_ITEM_ROUTE104_2, 0, 0 + object_event 28, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B146D, FLAG_ITEM_ROUTE104_3, 0, 0 + object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 22, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route104_EventScript_1B147A, FLAG_ITEM_ROUTE104_4, 0, 0 + object_event 32, EVENT_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, MAP_ROUTE104_MR_BRINEYS_HOUSE @@ -55,4 +55,4 @@ Route104_MapBGEvents:: @ 83817C8 bg_hidden_item_event 16, 64, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_58 Route104_MapEvents:: @ 8381840 - map_events Route104_MapObjects, Route104_MapWarps, 0x0, Route104_MapBGEvents + map_events Route104_EventObjects, Route104_MapWarps, 0x0, Route104_MapBGEvents diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc index d77b2977a..d05078627 100644 --- a/data/maps/events/Route104_MrBrineysHouse.inc +++ b/data/maps/events/Route104_MrBrineysHouse.inc @@ -1,10 +1,10 @@ -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, FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE, 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, FLAG_HIDE_PEEKO_BRINEY_HOUSE, 0, 0 +Route104_MrBrineysHouse_EventObjects:: @ 838B654 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 3, 0, 3, 50, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE, 0, 0 + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 0, 3, 0, 3, 8, 51, 0, 0, 0, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, FLAG_HIDE_PEEKO_BRINEY_HOUSE, 0, 0 Route104_MrBrineysHouse_MapWarps:: @ 838B684 warp_def 5, 8, 0, 0, MAP_ROUTE104 warp_def 6, 8, 0, 0, MAP_ROUTE104 Route104_MrBrineysHouse_MapEvents:: @ 838B694 - map_events Route104_MrBrineysHouse_MapObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 + map_events Route104_MrBrineysHouse_EventObjects, Route104_MrBrineysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route104_PrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrettyPetalFlowerShop.inc index c02950add..b9143ccea 100644 --- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc +++ b/data/maps/events/Route104_PrettyPetalFlowerShop.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 838B6A8 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_ROUTE104 warp_def 3, 8, 0, 1, MAP_ROUTE104 Route104_PrettyPetalFlowerShop_MapEvents:: @ 838B700 - map_events Route104_PrettyPetalFlowerShop_MapObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 + map_events Route104_PrettyPetalFlowerShop_EventObjects, Route104_PrettyPetalFlowerShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route104_Prototype.inc b/data/maps/events/Route104_Prototype.inc index 80dcf5108..af0e79f4e 100644 --- a/data/maps/events/Route104_Prototype.inc +++ b/data/maps/events/Route104_Prototype.inc @@ -1,16 +1,16 @@ -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_EventObjects:: @ 8391F2C + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP @@ -20,4 +20,4 @@ Route104_Prototype_MapBGEvents:: @ 8392054 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 + map_events Route104_Prototype_EventObjects, Route104_Prototype_MapWarps, 0x0, Route104_Prototype_MapBGEvents diff --git a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc index 4ec99895c..dfa37cf93 100644 --- a/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc +++ b/data/maps/events/Route104_PrototypePrettyPetalFlowerShop.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 8392080 + object_event 1, EVENT_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, MAP_ROUTE104_PROTOTYPE warp_def 3, 8, 0, 0, MAP_ROUTE104_PROTOTYPE Route104_PrototypePrettyPetalFlowerShop_MapEvents:: @ 83920A8 - map_events Route104_PrototypePrettyPetalFlowerShop_MapObjects, Route104_PrototypePrettyPetalFlowerShop_MapWarps, 0x0, 0x0 + map_events Route104_PrototypePrettyPetalFlowerShop_EventObjects, Route104_PrototypePrettyPetalFlowerShop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route105.inc b/data/maps/events/Route105.inc index 5707106bd..dd360d1ef 100644 --- a/data/maps/events/Route105.inc +++ b/data/maps/events/Route105.inc @@ -1,10 +1,10 @@ -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, FLAG_ITEM_ROUTE105_1, 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_EventObjects:: @ 8381854 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 0, 73, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route105_EventScript_1B1487, FLAG_ITEM_ROUTE105_1, 0, 0 + object_event 6, EVENT_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, MAP_ISLAND_CAVE @@ -13,4 +13,4 @@ Route105_MapBGEvents:: @ 83818EC bg_hidden_item_event 15, 68, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_59 Route105_MapEvents:: @ 83818F8 - map_events Route105_MapObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents + map_events Route105_EventObjects, Route105_MapWarps, 0x0, Route105_MapBGEvents diff --git a/data/maps/events/Route106.inc b/data/maps/events/Route106.inc index 7c326ceea..067d514c9 100644 --- a/data/maps/events/Route106.inc +++ b/data/maps/events/Route106.inc @@ -1,9 +1,9 @@ -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, FLAG_ITEM_ROUTE106_1, 0, 0 +Route106_EventObjects:: @ 838190C + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route106_EventScript_1B1494, FLAG_ITEM_ROUTE106_1, 0, 0 Route106_MapWarps:: @ 8381984 warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F @@ -15,4 +15,4 @@ Route106_MapBGEvents:: @ 838198C bg_event 59, 13, 3, 0, 0, Route106_EventScript_14F32F Route106_MapEvents:: @ 83819BC - map_events Route106_MapObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents + map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents diff --git a/data/maps/events/Route107.inc b/data/maps/events/Route107.inc index 363414c2f..70d3a3ba1 100644 --- a/data/maps/events/Route107.inc +++ b/data/maps/events/Route107.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 83819D0 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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 + map_events Route107_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route108.inc b/data/maps/events/Route108.inc index 7b6471080..6f21cd23e 100644 --- a/data/maps/events/Route108.inc +++ b/data/maps/events/Route108.inc @@ -1,8 +1,8 @@ -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_EventObjects:: @ 8381A74 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_ABANDONED_SHIP_DECK @@ -11,4 +11,4 @@ Route108_MapBGEvents:: @ 8381ADC bg_hidden_item_event 38, 14, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_56 Route108_MapEvents:: @ 8381AE8 - map_events Route108_MapObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents + map_events Route108_EventObjects, Route108_MapWarps, 0x0, Route108_MapBGEvents diff --git a/data/maps/events/Route109.inc b/data/maps/events/Route109.inc index 95a635a6e..836ed7690 100644 --- a/data/maps/events/Route109.inc +++ b/data/maps/events/Route109.inc @@ -1,24 +1,24 @@ -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, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109, 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, FLAG_HIDE_MR_BRINEY_ROUTE109, 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, FLAG_ITEM_ROUTE109_1, 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_EventObjects:: @ 8381AFC + object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 0, 26, 0, 1, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 0, 24, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route109_EventScript_14F680, FLAG_HIDE_MR_BRINEY_ROUTE109, 0, 0 + object_event 3, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 0, 48, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route109_EventScript_1B14A1, FLAG_ITEM_ROUTE109_1, 0, 0 + object_event 11, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_ROUTE109_SEASHORE_HOUSE @@ -34,4 +34,4 @@ Route109_MapBGEvents:: @ 8381CE4 bg_hidden_item_event 8, 42, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5B Route109_MapEvents:: @ 8381D44 - map_events Route109_MapObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents + map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents diff --git a/data/maps/events/Route109_SeashoreHouse.inc b/data/maps/events/Route109_SeashoreHouse.inc index abaf7abcc..a63f97429 100644 --- a/data/maps/events/Route109_SeashoreHouse.inc +++ b/data/maps/events/Route109_SeashoreHouse.inc @@ -1,12 +1,12 @@ -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_EventObjects:: @ 83920BC + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_ROUTE109 warp_def 7, 9, 0, 0, MAP_ROUTE109 Route109_SeashoreHouse_MapEvents:: @ 839212C - map_events Route109_SeashoreHouse_MapObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 + map_events Route109_SeashoreHouse_EventObjects, Route109_SeashoreHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route110.inc b/data/maps/events/Route110.inc index 436b44e56..f1551d3c7 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -1,35 +1,35 @@ -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, S_BerryTree, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, S_BerryTree, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, S_BerryTree, 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, FLAG_ITEM_ROUTE110_2, 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, FLAG_ITEM_ROUTE110_1, 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, MAP_OBJ_GFX_VAR_1, 0, 7, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 - object_event 23, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 - object_event 24, MAP_OBJ_GFX_VAR_1, 0, 9, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F972, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 - object_event 25, MAP_OBJ_GFX_VAR_1, 0, 10, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 - object_event 26, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 82, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110, 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, MAP_OBJ_GFX_VAR_0, 0, 34, 0, 54, 0, 3, 14, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE110, 0, 0 - object_event 29, MAP_OBJ_GFX_VAR_3, 0, 34, 0, 54, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110, 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_EventObjects:: @ 8381D58 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 0, 11, 0, 3, 12, 0, 0, 0, 0, 16, 0, S_BerryTree, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 0, 11, 0, 3, 12, 0, 0, 0, 0, 17, 0, S_BerryTree, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 0, 11, 0, 3, 12, 0, 0, 0, 0, 18, 0, S_BerryTree, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 0, 69, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14BB, FLAG_ITEM_ROUTE110_2, 0, 0 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 0, 47, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_EventScript_1B14AE, FLAG_ITEM_ROUTE110_1, 0, 0 + object_event 21, EVENT_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, EVENT_OBJ_GFX_VAR_1, 0, 7, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 23, EVENT_OBJ_GFX_VAR_1, 0, 8, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 24, EVENT_OBJ_GFX_VAR_1, 0, 9, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F972, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 25, EVENT_OBJ_GFX_VAR_1, 0, 10, 0, 83, 0, 3, 7, 0, 0, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 26, EVENT_OBJ_GFX_VAR_1, 0, 8, 0, 82, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110, 0, 0 + object_event 27, EVENT_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, EVENT_OBJ_GFX_VAR_0, 0, 34, 0, 54, 0, 3, 14, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE110, 0, 0 + object_event 29, EVENT_OBJ_GFX_VAR_3, 0, 34, 0, 54, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110, 0, 0 + object_event 30, EVENT_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, EVENT_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, MAP_NEW_MAUVILLE_ENTRANCE @@ -66,4 +66,4 @@ Route110_MapBGEvents:: @ 83820C0 bg_event 13, 16, 0, 0, 0, Route110_EventScript_14F9E6 Route110_MapEvents:: @ 838218C - map_events Route110_MapObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents + map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents diff --git a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc index 4be4faaf3..86bbbe54f 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -1,5 +1,5 @@ -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_EventObjects:: @ 8392CAC + object_event 1, EVENT_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, MAP_ROUTE110 @@ -12,4 +12,4 @@ Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents:: @ 8392CE4 coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 8392D04 - map_events Route110_SeasideCyclingRoadNorthEntrance_MapObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 + map_events Route110_SeasideCyclingRoadNorthEntrance_EventObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc index 68d3e1f4c..743f5a749 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -1,5 +1,5 @@ -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_EventObjects:: @ 8392C40 + object_event 1, EVENT_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, MAP_ROUTE110 @@ -12,4 +12,4 @@ Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents:: @ 8392C78 coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 8392C98 - map_events Route110_SeasideCyclingRoadSouthEntrance_MapObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 + map_events Route110_SeasideCyclingRoadSouthEntrance_EventObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc index ee4e5952e..02aa4e7d8 100644 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ b/data/maps/events/Route110_TrickHouseEnd.inc @@ -1,5 +1,5 @@ -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, FLAG_HIDE_TRICKMASTER_END, 0, 0 +Route110_TrickHouseEnd_EventObjects:: @ 83921D0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, FLAG_HIDE_TRICKMASTER_END, 0, 0 Route110_TrickHouseEnd_MapWarps:: @ 83921E8 warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 @@ -12,4 +12,4 @@ Route110_TrickHouseEnd_MapBGEvents:: @ 8392208 bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1 Route110_TrickHouseEnd_MapEvents:: @ 8392214 - map_events Route110_TrickHouseEnd_MapObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents + map_events Route110_TrickHouseEnd_EventObjects, Route110_TrickHouseEnd_MapWarps, Route110_TrickHouseEnd_MapCoordEvents, Route110_TrickHouseEnd_MapBGEvents diff --git a/data/maps/events/Route110_TrickHouseEntrance.inc b/data/maps/events/Route110_TrickHouseEntrance.inc index 903d893c3..e6a259fa0 100644 --- a/data/maps/events/Route110_TrickHouseEntrance.inc +++ b/data/maps/events/Route110_TrickHouseEntrance.inc @@ -1,5 +1,5 @@ -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, FLAG_HIDE_TRICKMASTER_ENTRANCE, 0, 0 +Route110_TrickHouseEntrance_EventObjects:: @ 8392140 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 0, 2, 0, 3, 9, 0, 0, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, FLAG_HIDE_TRICKMASTER_ENTRANCE, 0, 0 Route110_TrickHouseEntrance_MapWarps:: @ 8392158 warp_def 5, 7, 3, 1, MAP_ROUTE110 @@ -16,4 +16,4 @@ 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 + map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle1.inc b/data/maps/events/Route110_TrickHousePuzzle1.inc index 61ae942ee..14da678f7 100644 --- a/data/maps/events/Route110_TrickHousePuzzle1.inc +++ b/data/maps/events/Route110_TrickHousePuzzle1.inc @@ -1,23 +1,23 @@ -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, S_CuttableTree, FLAG_TEMP_13, 0, 0 - object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 - object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 - object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0 - object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_17, 0, 0 - object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_16, 0, 0 - object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_15, 0, 0 - object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_19, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_18, 0, 0 - object_event 13, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1A, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1C, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1B, 0, 0 - object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1D, 0, 0 - object_event 17, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1E, 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, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1, 0, 0 - object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1F, 0, 0 +Route110_TrickHousePuzzle1_EventObjects:: @ 839225C + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 7, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 + object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 10, 0, 16, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0 + object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 12, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_17, 0, 0 + object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 3, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_16, 0, 0 + object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_15, 0, 0 + object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_19, 0, 0 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_18, 0, 0 + object_event 13, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 9, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1A, 0, 0 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1C, 0, 0 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1B, 0, 0 + object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1D, 0, 0 + object_event 17, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1E, 0, 0 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1, 0, 0 + object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1F, 0, 0 Route110_TrickHousePuzzle1_MapWarps:: @ 8392424 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE @@ -28,4 +28,4 @@ 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 + map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle2.inc b/data/maps/events/Route110_TrickHousePuzzle2.inc index 7adf7b9d2..9f3aa4a9d 100644 --- a/data/maps/events/Route110_TrickHousePuzzle2.inc +++ b/data/maps/events/Route110_TrickHousePuzzle2.inc @@ -1,9 +1,9 @@ -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, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2, 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, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1, 0, 0 +Route110_TrickHousePuzzle2_EventObjects:: @ 839245C + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 0, 19, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A6B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1, 0, 0 Route110_TrickHousePuzzle2_MapWarps:: @ 83924D4 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE @@ -20,4 +20,4 @@ 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 + map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle3.inc b/data/maps/events/Route110_TrickHousePuzzle3.inc index 25381fba6..4e9daf8f0 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ b/data/maps/events/Route110_TrickHousePuzzle3.inc @@ -1,15 +1,15 @@ -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, S_BreakableRock, FLAG_TEMP_11, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 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, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2, 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, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1, 0, 0 - object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0 +Route110_TrickHousePuzzle3_EventObjects:: @ 839254C + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2, 0, 0 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1, 0, 0 + object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 0, 20, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 0, 21, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0 Route110_TrickHousePuzzle3_MapWarps:: @ 8392654 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE @@ -29,4 +29,4 @@ 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 + map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle4.inc b/data/maps/events/Route110_TrickHousePuzzle4.inc index 6c630a082..b5e522344 100644 --- a/data/maps/events/Route110_TrickHousePuzzle4.inc +++ b/data/maps/events/Route110_TrickHousePuzzle4.inc @@ -1,19 +1,19 @@ -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, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 - object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 - object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 - object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0 - object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0 - object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A, 0, 0 - object_event 15, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B, 0, 0 +Route110_TrickHousePuzzle4_EventObjects:: @ 83926FC + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 0, 4, 0, 0, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0 + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0 + object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A, 0, 0 + object_event 15, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B, 0, 0 Route110_TrickHousePuzzle4_MapWarps:: @ 8392864 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE @@ -24,4 +24,4 @@ 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 + map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle5.inc b/data/maps/events/Route110_TrickHousePuzzle5.inc index 3c628eabf..6812ed8f8 100644 --- a/data/maps/events/Route110_TrickHousePuzzle5.inc +++ b/data/maps/events/Route110_TrickHousePuzzle5.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 839289C + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE @@ -30,4 +30,4 @@ 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 + map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle6.inc b/data/maps/events/Route110_TrickHousePuzzle6.inc index f01d5783d..78fa808ce 100644 --- a/data/maps/events/Route110_TrickHousePuzzle6.inc +++ b/data/maps/events/Route110_TrickHousePuzzle6.inc @@ -1,8 +1,8 @@ -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, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1, 0, 0 +Route110_TrickHousePuzzle6_EventObjects:: @ 8392A2C + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1, 0, 0 Route110_TrickHousePuzzle6_MapWarps:: @ 8392A8C warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE @@ -13,4 +13,4 @@ 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 + map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle7.inc b/data/maps/events/Route110_TrickHousePuzzle7.inc index 9468d51bd..7a527f8b7 100644 --- a/data/maps/events/Route110_TrickHousePuzzle7.inc +++ b/data/maps/events/Route110_TrickHousePuzzle7.inc @@ -1,8 +1,8 @@ -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, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1, 0, 0 +Route110_TrickHousePuzzle7_EventObjects:: @ 8392AC4 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1, 0, 0 Route110_TrickHousePuzzle7_MapWarps:: @ 8392B24 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE @@ -21,4 +21,4 @@ Route110_TrickHousePuzzle7_MapBGEvents:: @ 8392B4C 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 + map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents diff --git a/data/maps/events/Route110_TrickHousePuzzle8.inc b/data/maps/events/Route110_TrickHousePuzzle8.inc index 2df410599..49da61b03 100644 --- a/data/maps/events/Route110_TrickHousePuzzle8.inc +++ b/data/maps/events/Route110_TrickHousePuzzle8.inc @@ -1,8 +1,8 @@ -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, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1, 0, 0 +Route110_TrickHousePuzzle8_EventObjects:: @ 8392BA8 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1, 0, 0 Route110_TrickHousePuzzle8_MapWarps:: @ 8392C08 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE @@ -13,4 +13,4 @@ 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 + map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents diff --git a/data/maps/events/Route111.inc b/data/maps/events/Route111.inc index ef205af37..c4cd6e3df 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -1,40 +1,40 @@ -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, FLAG_HIDE_VICTOR_WINSTRATE, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICTORIA_WINSTRATE, 0, 0 - object_event 3, MAP_OBJ_GFX_LASS, 0, 13, 0, 113, 0, 0, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VIVI_WINSTRATE, 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, FLAG_HIDE_VICKI_WINSTRATE, 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, S_BerryTree, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, S_BerryTree, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1, 0, 0 - object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 - object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 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, FLAG_ITEM_ROUTE111_1, 0, 0 - object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, S_BerryTree, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, S_BerryTree, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3, 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, FLAG_ITEM_ROUTE111_2, 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, FLAG_ITEM_ROUTE111_3, 0, 0 - object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 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, FLAG_HIDE_SECRET_POWER_MAN, 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, FLAG_HIDE_ROOT_FOSSIL, 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, FLAG_HIDE_CLAW_FOSSIL, 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_EventObjects:: @ 83821A0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 0, 114, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1501D1, FLAG_HIDE_VICTOR_WINSTRATE, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICTORIA_WINSTRATE, 0, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 0, 113, 0, 0, 8, 1, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VIVI_WINSTRATE, 0, 0 + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 0, 113, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICKI_WINSTRATE, 0, 0 + object_event 5, EVENT_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, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 0, 5, 0, 3, 12, 0, 0, 0, 0, 19, 0, S_BerryTree, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 0, 5, 0, 3, 12, 0, 0, 0, 0, 20, 0, S_BerryTree, 0, 0, 0 + object_event 8, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE442, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1, 0, 0 + object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE422, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1, 0, 0 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 101, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 + object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 100, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 + object_event 17, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 0, 105, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14C8, FLAG_ITEM_ROUTE111_1, 0, 0 + object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 80, 0, S_BerryTree, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 0, 5, 0, 3, 12, 0, 0, 0, 0, 81, 0, S_BerryTree, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE4E2, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 0, 0 + object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE502, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2, 0, 0 + object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3, 0, 0 + object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 0, 86, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route111_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3, 0, 0 + object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 0, 54, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14D5, FLAG_ITEM_ROUTE111_2, 0, 0 + object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 114, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route111_EventScript_1B14E2, FLAG_ITEM_ROUTE111_3, 0, 0 + object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 0, 21, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 + object_event 28, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_BOY_1, 0, 13, 0, 20, 0, 3, 7, 17, 0, 0, 0, 0, 0, Route111_EventScript_1A3858, FLAG_HIDE_SECRET_POWER_MAN, 0, 0 + object_event 34, EVENT_OBJ_GFX_FOSSIL, 0, 32, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150023, FLAG_HIDE_ROOT_FOSSIL, 0, 0 + object_event 35, EVENT_OBJ_GFX_FOSSIL, 0, 33, 0, 38, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route111_EventScript_150069, FLAG_HIDE_CLAW_FOSSIL, 0, 0 + object_event 36, EVENT_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, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE @@ -97,4 +97,4 @@ Route111_MapBGEvents:: @ 8382738 bg_hidden_item_event 35, 66, 0, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_39 Route111_MapEvents:: @ 8382804 - map_events Route111_MapObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents + map_events Route111_EventObjects, Route111_MapWarps, Route111_MapCoordEvents, Route111_MapBGEvents diff --git a/data/maps/events/Route111_OldLadysRestStop.inc b/data/maps/events/Route111_OldLadysRestStop.inc index fbd9b7ab1..235fe9f3c 100644 --- a/data/maps/events/Route111_OldLadysRestStop.inc +++ b/data/maps/events/Route111_OldLadysRestStop.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 838B798 + object_event 1, EVENT_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, MAP_ROUTE111 warp_def 4, 7, 0, 2, MAP_ROUTE111 Route111_OldLadysRestStop_MapEvents:: @ 838B7C0 - map_events Route111_OldLadysRestStop_MapObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 + map_events Route111_OldLadysRestStop_EventObjects, Route111_OldLadysRestStop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route111_WinstrateFamilysHouse.inc b/data/maps/events/Route111_WinstrateFamilysHouse.inc index ef2286c97..895077e0a 100644 --- a/data/maps/events/Route111_WinstrateFamilysHouse.inc +++ b/data/maps/events/Route111_WinstrateFamilysHouse.inc @@ -1,12 +1,12 @@ -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_EventObjects:: @ 838B714 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_ROUTE111 warp_def 4, 7, 0, 0, MAP_ROUTE111 Route111_WinstrateFamilysHouse_MapEvents:: @ 838B784 - map_events Route111_WinstrateFamilysHouse_MapObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 + map_events Route111_WinstrateFamilysHouse_EventObjects, Route111_WinstrateFamilysHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route112.inc b/data/maps/events/Route112.inc index 2169e4d34..8fa72c854 100644 --- a/data/maps/events/Route112.inc +++ b/data/maps/events/Route112.inc @@ -1,16 +1,16 @@ -Route112_MapObjects:: @ 8382818 - object_event 1, MAP_OBJ_GFX_VAR_1, 0, 26, 0, 30, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route112_EventScript_150513, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 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, MAP_OBJ_GFX_VAR_1, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, S_BerryTree, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, S_BerryTree, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, S_BerryTree, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, S_BerryTree, 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, FLAG_ITEM_ROUTE112_1, 0, 0 +Route112_EventObjects:: @ 8382818 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 26, 0, 30, 0, 3, 8, 17, 0, 0, 0, 0, 0, Route112_EventScript_150513, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0 + object_event 2, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_VAR_1, 0, 27, 0, 30, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route112_EventScript_15051C, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 0, 6, 0, 0, 12, 0, 0, 0, 0, 24, 0, S_BerryTree, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 0, 6, 0, 0, 12, 0, 0, 0, 0, 23, 0, S_BerryTree, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 0, 6, 0, 0, 12, 0, 0, 0, 0, 22, 0, S_BerryTree, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 0, 6, 0, 3, 12, 0, 0, 0, 0, 21, 0, S_BerryTree, 0, 0, 0 + object_event 11, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 0, 43, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route112_EventScript_1B14EF, FLAG_ITEM_ROUTE112_1, 0, 0 Route112_MapWarps:: @ 8382938 warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION @@ -26,4 +26,4 @@ Route112_MapBGEvents:: @ 8382968 bg_event 4, 49, 0, 0, 0, Route112_EventScript_150537 Route112_MapEvents:: @ 838298C - map_events Route112_MapObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents + map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents diff --git a/data/maps/events/Route112_CableCarStation.inc b/data/maps/events/Route112_CableCarStation.inc index cc2dfa38a..37d9736f7 100644 --- a/data/maps/events/Route112_CableCarStation.inc +++ b/data/maps/events/Route112_CableCarStation.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 838B7D4 + object_event 1, EVENT_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, EVENT_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, MAP_ROUTE112 warp_def 7, 11, 0, 1, MAP_ROUTE112 Route112_CableCarStation_MapEvents:: @ 838B814 - map_events Route112_CableCarStation_MapObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 + map_events Route112_CableCarStation_EventObjects, Route112_CableCarStation_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc index 1b895d571..12d506346 100644 --- a/data/maps/events/Route113.inc +++ b/data/maps/events/Route113.inc @@ -1,15 +1,15 @@ -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, FLAG_ITEM_ROUTE113_1, 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, FLAG_ITEM_ROUTE113_2, 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_EventObjects:: @ 83829A0 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B14FC, FLAG_ITEM_ROUTE113_1, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 78, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route113_EventScript_1B1509, FLAG_ITEM_ROUTE113_2, 0, 0 + object_event 8, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_ROUTE113_GLASS_WORKSHOP @@ -45,4 +45,4 @@ Route113_MapBGEvents:: @ 8382BE0 bg_hidden_item_event 22, 5, 3, ITEM_TM32_DOUBLE_TEAM, FLAG_HIDDEN_ITEM_1E Route113_MapEvents:: @ 8382C34 - map_events Route113_MapObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents + map_events Route113_EventObjects, Route113_MapWarps, Route113_MapCoordEvents, Route113_MapBGEvents diff --git a/data/maps/events/Route113_GlassWorkshop.inc b/data/maps/events/Route113_GlassWorkshop.inc index 74953c4da..6bf6ebfcb 100644 --- a/data/maps/events/Route113_GlassWorkshop.inc +++ b/data/maps/events/Route113_GlassWorkshop.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8392D18 + object_event 1, EVENT_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, EVENT_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, MAP_ROUTE113 warp_def 4, 8, 0, 0, MAP_ROUTE113 Route113_GlassWorkshop_MapEvents:: @ 8392D58 - map_events Route113_GlassWorkshop_MapObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 + map_events Route113_GlassWorkshop_EventObjects, Route113_GlassWorkshop_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route114.inc b/data/maps/events/Route114.inc index 0687dc0e9..d5fed2373 100644 --- a/data/maps/events/Route114.inc +++ b/data/maps/events/Route114.inc @@ -1,27 +1,27 @@ -Route114_MapObjects:: @ 8382C48 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 43, 0, 3, 12, 0, 0, 0, 0, 77, 0, S_BerryTree, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 44, 0, 3, 12, 0, 0, 0, 0, 78, 0, S_BerryTree, 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, S_BerryTree, 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, FLAG_ITEM_ROUTE114_1, 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, FLAG_ITEM_ROUTE114_2, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 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, S_BreakableRock, FLAG_TEMP_12, 0, 0 - object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 - object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0 - object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 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_EventObjects:: @ 8382C48 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 0, 43, 0, 3, 12, 0, 0, 0, 0, 77, 0, S_BerryTree, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 0, 44, 0, 3, 12, 0, 0, 0, 0, 78, 0, S_BerryTree, 0, 0, 0 + object_event 3, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 0, 45, 0, 3, 12, 0, 0, 0, 0, 68, 0, S_BerryTree, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1516, FLAG_ITEM_ROUTE114_1, 0, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 0, 37, 0, 4, 1, 0, 0, 0, 0, 0, 0, Route114_EventScript_1B1523, FLAG_ITEM_ROUTE114_2, 0, 0 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 0, 43, 0, 4, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 + object_event 12, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 53, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 + object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 0, 54, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 + object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 0, 69, 0, 7, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0 + object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 64, 0, 5, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 + object_event 22, EVENT_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, EVENT_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, MAP_METEOR_FALLS_1F_1R @@ -43,4 +43,4 @@ Route114_MapBGEvents:: @ 8382E88 bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_2A Route114_MapEvents:: @ 8382F18 - map_events Route114_MapObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents + map_events Route114_EventObjects, Route114_MapWarps, 0x0, Route114_MapBGEvents diff --git a/data/maps/events/Route114_FossilManiacsHouse.inc b/data/maps/events/Route114_FossilManiacsHouse.inc index 01fc6106f..0ff682a0b 100644 --- a/data/maps/events/Route114_FossilManiacsHouse.inc +++ b/data/maps/events/Route114_FossilManiacsHouse.inc @@ -1,5 +1,5 @@ -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_EventObjects:: @ 838B87C + object_event 1, EVENT_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, MAP_ROUTE114 @@ -13,4 +13,4 @@ Route114_FossilManiacsHouse_MapBGEvents:: @ 838B8AC 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 + map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents diff --git a/data/maps/events/Route114_FossilManiacsTunnel.inc b/data/maps/events/Route114_FossilManiacsTunnel.inc index 259445d43..4df9b62a9 100644 --- a/data/maps/events/Route114_FossilManiacsTunnel.inc +++ b/data/maps/events/Route114_FossilManiacsTunnel.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 838B8F0 + object_event 1, EVENT_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, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE warp_def 7, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE Route114_FossilManiacsTunnel_MapEvents:: @ 838B918 - map_events Route114_FossilManiacsTunnel_MapObjects, Route114_FossilManiacsTunnel_MapWarps, 0x0, 0x0 + map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc index 3c14720a6..bdf111faf 100644 --- a/data/maps/events/Route114_LanettesHouse.inc +++ b/data/maps/events/Route114_LanettesHouse.inc @@ -1,5 +1,5 @@ -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, FLAG_HIDE_LANETTE, 0, 0 +Route114_LanettesHouse_EventObjects:: @ 838B92C + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, FLAG_HIDE_LANETTE, 0, 0 Route114_LanettesHouse_MapWarps:: @ 838B944 warp_def 5, 7, 0, 2, MAP_ROUTE114 @@ -11,4 +11,4 @@ Route114_LanettesHouse_MapBGEvents:: @ 838B954 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 + map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents diff --git a/data/maps/events/Route115.inc b/data/maps/events/Route115.inc index 157dd82eb..a93da1cdb 100644 --- a/data/maps/events/Route115.inc +++ b/data/maps/events/Route115.inc @@ -1,20 +1,20 @@ -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, S_BerryTree, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 70, 0, S_BerryTree, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 13, 0, 5, 0, 3, 12, 0, 0, 0, 0, 71, 0, S_BerryTree, 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, FLAG_ITEM_ROUTE115_1, 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, FLAG_ITEM_ROUTE115_2, 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, FLAG_ITEM_ROUTE115_3, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, S_BerryTree, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, S_BerryTree, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 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, FLAG_ITEM_ROUTE115_4, 0, 0 +Route115_EventObjects:: @ 8382F2C + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 69, 0, S_BerryTree, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 70, 0, S_BerryTree, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 0, 5, 0, 3, 12, 0, 0, 0, 0, 71, 0, S_BerryTree, 0, 0, 0 + object_event 7, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 0, 60, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B1530, FLAG_ITEM_ROUTE115_1, 0, 0 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B153D, FLAG_ITEM_ROUTE115_2, 0, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 0, 29, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route115_EventScript_1B154A, FLAG_ITEM_ROUTE115_3, 0, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 0, 64, 0, 3, 12, 0, 0, 0, 0, 55, 0, S_BerryTree, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 0, 65, 0, 3, 12, 0, 0, 0, 0, 56, 0, S_BerryTree, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route115_EventScript_1B1557, FLAG_ITEM_ROUTE115_4, 0, 0 Route115_MapWarps:: @ 83830AC warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R @@ -36,4 +36,4 @@ Route115_MapBGEvents:: @ 83830B4 bg_hidden_item_event 15, 49, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_61 Route115_MapEvents:: @ 838315C - map_events Route115_MapObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents + map_events Route115_EventObjects, Route115_MapWarps, 0x0, Route115_MapBGEvents diff --git a/data/maps/events/Route116.inc b/data/maps/events/Route116.inc index ff5ad2643..e3ee5f9d0 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -1,26 +1,26 @@ -Route116_MapObjects:: @ 8383170 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, S_BerryTree, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, S_BerryTree, 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, S_CuttableTree, FLAG_TEMP_11, 0, 0 - object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 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, FLAG_ITEM_ROUTE116_2, 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, FLAG_ITEM_ROUTE116_3, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, S_BerryTree, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, S_BerryTree, 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, FLAG_HIDE_BRINEY_ROUTE116, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 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, S_CuttableTree, FLAG_TEMP_14, 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, FLAG_ITEM_ROUTE116_4, 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, FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116, 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, FLAG_ITEM_ROUTE116_1, 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, FLAG_HIDE_TUNNER_DIGGER_ROUTE116, 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, FLAG_HIDE_LOST_GLASSES_MAN, 0, 0 +Route116_EventObjects:: @ 8383170 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 0, 2, 0, 3, 12, 0, 0, 0, 0, 25, 0, S_BerryTree, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 0, 2, 0, 3, 12, 0, 0, 0, 0, 26, 0, S_BerryTree, 0, 0, 0 + object_event 3, EVENT_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, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 33, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 + object_event 6, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B1571, FLAG_ITEM_ROUTE116_2, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 0, 17, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B157E, FLAG_ITEM_ROUTE116_3, 0, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 0, 2, 0, 3, 12, 0, 0, 0, 0, 66, 0, S_BerryTree, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 0, 2, 0, 3, 12, 0, 0, 0, 0, 67, 0, S_BerryTree, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 46, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_150B5D, FLAG_HIDE_BRINEY_ROUTE116, 0, 0 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 + object_event 13, EVENT_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, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route116_EventScript_1B158B, FLAG_ITEM_ROUTE116_4, 0, 0 + object_event 16, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_MAN_2, 0, 46, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A7B, FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116, 0, 0 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 56, 0, 12, 0, 4, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_1B1564, FLAG_ITEM_ROUTE116_1, 0, 0 + object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 0, 9, 0, 3, 10, 17, 0, 0, 0, 0, 0, Route116_EventScript_150A49, FLAG_HIDE_TUNNER_DIGGER_ROUTE116, 0, 0 + object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route116_EventScript_150B8F, FLAG_HIDE_LOST_GLASSES_MAN, 0, 0 Route116_MapWarps:: @ 8383380 warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL @@ -44,4 +44,4 @@ Route116_MapBGEvents:: @ 83833A8 bg_hidden_item_event 70, 13, 3, ITEM_BLACK_GLASSES, FLAG_HIDDEN_ITEM_BLACK_GLASSES Route116_MapEvents:: @ 838342C - map_events Route116_MapObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents + map_events Route116_EventObjects, Route116_MapWarps, Route116_MapCoordEvents, Route116_MapBGEvents diff --git a/data/maps/events/Route116_TunnelersRestHouse.inc b/data/maps/events/Route116_TunnelersRestHouse.inc index 2676d7a68..c0ef4d054 100644 --- a/data/maps/events/Route116_TunnelersRestHouse.inc +++ b/data/maps/events/Route116_TunnelersRestHouse.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 838B98C + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_ROUTE116 warp_def 5, 8, 0, 1, MAP_ROUTE116 Route116_TunnelersRestHouse_MapEvents:: @ 838B9E4 - map_events Route116_TunnelersRestHouse_MapObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 + map_events Route116_TunnelersRestHouse_EventObjects, Route116_TunnelersRestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route117.inc b/data/maps/events/Route117.inc index ff5c81ead..d13b30d75 100644 --- a/data/maps/events/Route117.inc +++ b/data/maps/events/Route117.inc @@ -1,25 +1,25 @@ -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, S_BerryTree, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, S_BerryTree, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, S_BerryTree, 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, FLAG_ITEM_ROUTE117_1, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 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, FLAG_ITEM_ROUTE117_2, 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_EventObjects:: @ 8383440 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ZIGZAGOON, 0, 33, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 8, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 0, 13, 0, 3, 12, 0, 0, 0, 0, 29, 0, S_BerryTree, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 0, 13, 0, 3, 12, 0, 0, 0, 0, 28, 0, S_BerryTree, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 0, 13, 0, 3, 12, 0, 0, 0, 0, 27, 0, S_BerryTree, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B1598, FLAG_ITEM_ROUTE117_1, 0, 0 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route117_EventScript_1B15A5, FLAG_ITEM_ROUTE117_2, 0, 0 + object_event 17, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_ROUTE117_POKEMON_DAY_CARE @@ -31,4 +31,4 @@ Route117_MapBGEvents:: @ 8383640 bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_48 Route117_MapEvents:: @ 8383670 - map_events Route117_MapObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents + map_events Route117_EventObjects, Route117_MapWarps, 0x0, Route117_MapBGEvents diff --git a/data/maps/events/Route117_PokemonDayCare.inc b/data/maps/events/Route117_PokemonDayCare.inc index b1df05d06..6d322f446 100644 --- a/data/maps/events/Route117_PokemonDayCare.inc +++ b/data/maps/events/Route117_PokemonDayCare.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 838B9F8 + object_event 1, EVENT_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, MAP_ROUTE117 warp_def 3, 8, 0, 0, MAP_ROUTE117 Route117_PokemonDayCare_MapEvents:: @ 838BA20 - map_events Route117_PokemonDayCare_MapObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 + map_events Route117_PokemonDayCare_EventObjects, Route117_PokemonDayCare_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route118.inc b/data/maps/events/Route118.inc index 4d4e3ea9a..71a4797ce 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -1,24 +1,24 @@ -Route118_MapObjects:: @ 8383684 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 5, 0, 3, 12, 0, 0, 0, 0, 31, 0, S_BerryTree, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, S_BerryTree, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, S_BerryTree, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 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, FLAG_HIDE_STEVEN_ROUTE118, 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, FLAG_ITEM_ROUTE118_1, 0, 0 +Route118_EventObjects:: @ 8383684 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 0, 5, 0, 3, 12, 0, 0, 0, 0, 31, 0, S_BerryTree, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 0, 5, 0, 3, 12, 0, 0, 0, 0, 32, 0, S_BerryTree, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 0, 5, 0, 3, 12, 0, 0, 0, 0, 33, 0, S_BerryTree, 0, 0, 0 + object_event 4, EVENT_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, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE462, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1, 0, 0 + object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE482, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1, 0, 0 + object_event 7, EVENT_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, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE522, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 0, 0 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE542, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2, 0, 0 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3, 0, 0 + object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route118_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3, 0, 0 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 13, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_STEVEN, 0, 44, 0, 7, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE118, 0, 0 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1, 0, 0 Route118_MapCoordEvents:: @ 8383864 coord_event 43, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FAE @@ -37,4 +37,4 @@ Route118_MapBGEvents:: @ 8383894 bg_hidden_item_event 12, 14, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_42 Route118_MapEvents:: @ 8383900 - map_events Route118_MapObjects, 0x0, Route118_MapCoordEvents, Route118_MapBGEvents + map_events Route118_EventObjects, 0x0, Route118_MapCoordEvents, Route118_MapBGEvents diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index 2abacdf27..518c540c7 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -1,41 +1,41 @@ -Route119_MapObjects:: @ 8383914 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 24, 0, 5, 0, 3, 12, 0, 0, 0, 0, 34, 0, S_BerryTree, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 25, 0, 5, 0, 3, 12, 0, 0, 0, 0, 35, 0, S_BerryTree, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 26, 0, 5, 0, 3, 12, 0, 0, 0, 0, 36, 0, S_BerryTree, 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, MAP_OBJ_GFX_VAR_0, 0, 25, 0, 32, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119, 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, FLAG_ITEM_ROUTE119_1, 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, FLAG_ITEM_ROUTE119_2, 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, FLAG_ITEM_ROUTE119_3, 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, FLAG_ITEM_ROUTE119_4, 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, FLAG_ITEM_ROUTE119_5, 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, FLAG_ITEM_ROUTE119_6, 0, 0 - object_event 23, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 33, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 - object_event 24, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 - object_event 25, MAP_OBJ_GFX_VAR_3, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE, 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, S_BerryTree, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, S_BerryTree, 0, 0, 0 - object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, S_BerryTree, 0, 0, 0 - object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, S_BerryTree, 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, FLAG_ITEM_ROUTE119_7, 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, FLAG_HIDE_KECLEON_ROUTE119_1, 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, FLAG_HIDE_KECLEON_ROUTE119_2, 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_EventObjects:: @ 8383914 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 0, 5, 0, 3, 12, 0, 0, 0, 0, 34, 0, S_BerryTree, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 0, 5, 0, 3, 12, 0, 0, 0, 0, 35, 0, S_BerryTree, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 0, 5, 0, 3, 12, 0, 0, 0, 0, 36, 0, S_BerryTree, 0, 0, 0 + object_event 4, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_VAR_0, 0, 25, 0, 32, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119, 0, 0 + object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 0, 121, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15BF, FLAG_ITEM_ROUTE119_1, 0, 0 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 0, 96, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15CC, FLAG_ITEM_ROUTE119_2, 0, 0 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 0, 53, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15D9, FLAG_ITEM_ROUTE119_3, 0, 0 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 0, 76, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15E6, FLAG_ITEM_ROUTE119_4, 0, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B15F3, FLAG_ITEM_ROUTE119_5, 0, 0 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 0, 117, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route119_EventScript_1B1600, FLAG_ITEM_ROUTE119_6, 0, 0 + object_event 23, EVENT_OBJ_GFX_VAR_1, 0, 13, 0, 33, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 24, EVENT_OBJ_GFX_VAR_1, 0, 13, 0, 34, 0, 4, 10, 0, 0, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 25, EVENT_OBJ_GFX_VAR_3, 0, 17, 0, 33, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE, 0, 0 + object_event 26, EVENT_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, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 0, 23, 0, 3, 12, 0, 0, 0, 0, 83, 0, S_BerryTree, 0, 0, 0 + object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 0, 23, 0, 3, 12, 0, 0, 0, 0, 84, 0, S_BerryTree, 0, 0, 0 + object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 0, 90, 0, 3, 12, 0, 0, 0, 0, 85, 0, S_BerryTree, 0, 0, 0 + object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 0, 90, 0, 3, 12, 0, 0, 0, 0, 86, 0, S_BerryTree, 0, 0, 0 + object_event 31, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 56, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route119_EventScript_1B160D, FLAG_ITEM_ROUTE119_7, 0, 0 + object_event 33, EVENT_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, EVENT_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, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 0, 6, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A057A, FLAG_HIDE_KECLEON_ROUTE119_1, 0, 0 + object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 0, 13, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route119_EventScript_1A0587, FLAG_HIDE_KECLEON_ROUTE119_2, 0, 0 + object_event 37, EVENT_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, MAP_ROUTE119_WEATHER_INSTITUTE_1F @@ -91,4 +91,4 @@ Route119_MapBGEvents:: @ 8383E2C bg_event 28, 9, 0, 0, 0, Route119_EventScript_151605 Route119_MapEvents:: @ 8383F1C - map_events Route119_MapObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents + map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents diff --git a/data/maps/events/Route119_House.inc b/data/maps/events/Route119_House.inc index 255913651..12c19d557 100644 --- a/data/maps/events/Route119_House.inc +++ b/data/maps/events/Route119_House.inc @@ -1,15 +1,15 @@ -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_EventObjects:: @ 8392F40 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_ROUTE119 warp_def 4, 8, 0, 1, MAP_ROUTE119 Route119_House_MapEvents:: @ 8392FF8 - map_events Route119_House_MapObjects, Route119_House_MapWarps, 0x0, 0x0 + map_events Route119_House_EventObjects, Route119_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route119_WeatherInstitute_1F.inc b/data/maps/events/Route119_WeatherInstitute_1F.inc index e9933edef..0bacbf151 100644 --- a/data/maps/events/Route119_WeatherInstitute_1F.inc +++ b/data/maps/events/Route119_WeatherInstitute_1F.inc @@ -1,9 +1,9 @@ -Route119_WeatherInstitute_1F_MapObjects:: @ 8392DC0 - object_event 1, MAP_OBJ_GFX_VAR_1, 0, 15, 0, 3, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route119_WeatherInstitute_1F_EventScript_163C94, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_2, 0, 10, 0, 5, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_1F_EventScript_163CAB, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 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, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 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, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 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_EventObjects:: @ 8392DC0 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 15, 0, 3, 0, 3, 9, 0, 0, 1, 0, 3, 0, Route119_WeatherInstitute_1F_EventScript_163C94, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_2, 0, 10, 0, 5, 0, 3, 8, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_1F_EventScript_163CAB, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 0, 11, 0, 3, 1, 1, 0, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F, 0, 0 + object_event 5, EVENT_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, MAP_ROUTE119 @@ -17,4 +17,4 @@ Route119_WeatherInstitute_1F_MapBGEvents:: @ 8392E50 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 + map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents diff --git a/data/maps/events/Route119_WeatherInstitute_2F.inc b/data/maps/events/Route119_WeatherInstitute_2F.inc index 2ec794f7f..4af3b5100 100644 --- a/data/maps/events/Route119_WeatherInstitute_2F.inc +++ b/data/maps/events/Route119_WeatherInstitute_2F.inc @@ -1,13 +1,13 @@ -Route119_WeatherInstitute_2F_MapObjects:: @ 8392E94 - object_event 1, MAP_OBJ_GFX_VAR_1, 0, 15, 0, 6, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route119_WeatherInstitute_2F_EventScript_163CFC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_1, 0, 10, 0, 8, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_2F_EventScript_163D13, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_2, 0, 4, 0, 6, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 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, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0 +Route119_WeatherInstitute_2F_EventObjects:: @ 8392E94 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 15, 0, 6, 0, 3, 10, 0, 0, 1, 0, 4, 0, Route119_WeatherInstitute_2F_EventScript_163CFC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 10, 0, 8, 0, 3, 13, 0, 0, 1, 0, 2, 0, Route119_WeatherInstitute_2F_EventScript_163D13, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_2, 0, 4, 0, 6, 0, 3, 10, 0, 0, 1, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 0, 6, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0 + object_event 5, EVENT_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, EVENT_OBJ_GFX_MAN_5, 0, 1, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F, 0, 0 Route119_WeatherInstitute_2F_MapWarps:: @ 8392F24 warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F Route119_WeatherInstitute_2F_MapEvents:: @ 8392F2C - map_events Route119_WeatherInstitute_2F_MapObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 + map_events Route119_WeatherInstitute_2F_EventObjects, Route119_WeatherInstitute_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index ac0e527c7..fb40c9aaf 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -1,45 +1,45 @@ -Route120_MapObjects:: @ 8383F30 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 4, 0, 79, 0, 3, 12, 0, 0, 0, 0, 46, 0, S_BerryTree, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 5, 0, 79, 0, 3, 12, 0, 0, 0, 0, 45, 0, S_BerryTree, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 6, 0, 79, 0, 3, 12, 0, 0, 0, 0, 44, 0, S_BerryTree, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 7, 0, 79, 0, 3, 12, 0, 0, 0, 0, 43, 0, S_BerryTree, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 34, 0, 24, 0, 3, 12, 0, 0, 0, 0, 37, 0, S_BerryTree, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 35, 0, 24, 0, 3, 12, 0, 0, 0, 0, 38, 0, S_BerryTree, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 36, 0, 24, 0, 3, 12, 0, 0, 0, 0, 39, 0, S_BerryTree, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 9, 0, 92, 0, 5, 12, 0, 0, 0, 0, 40, 0, S_BerryTree, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 10, 0, 92, 0, 5, 12, 0, 0, 0, 0, 41, 0, S_BerryTree, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 92, 0, 5, 12, 0, 0, 0, 0, 42, 0, S_BerryTree, 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, FLAG_ITEM_ROUTE120_1, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2, 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, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2, 0, 0 - object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 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, FLAG_ITEM_ROUTE120_2, 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, FLAG_ITEM_ROUTE120_4, 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, FLAG_ITEM_ROUTE120_3, 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, FLAG_HIDE_KECLEON_ROUTE120_1, 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, FLAG_HIDE_STEVEN_ROUTE120, 0, 0 - object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0 - object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 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, FLAG_HIDE_KECLEON_ROUTE120_2, 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, FLAG_HIDE_KECLEON_ROUTE120_3, 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, FLAG_HIDE_KECLEON_ROUTE120_4, 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, FLAG_HIDE_KECLEON_ROUTE120_5, 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, FLAG_HIDE_KECLEON_ROUTE120_7, 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, FLAG_HIDE_KECLEON_ROUTE120_6, 0, 0 +Route120_EventObjects:: @ 8383F30 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 0, 79, 0, 3, 12, 0, 0, 0, 0, 46, 0, S_BerryTree, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 0, 79, 0, 3, 12, 0, 0, 0, 0, 45, 0, S_BerryTree, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 0, 79, 0, 3, 12, 0, 0, 0, 0, 44, 0, S_BerryTree, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 0, 79, 0, 3, 12, 0, 0, 0, 0, 43, 0, S_BerryTree, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 0, 24, 0, 3, 12, 0, 0, 0, 0, 37, 0, S_BerryTree, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 0, 24, 0, 3, 12, 0, 0, 0, 0, 38, 0, S_BerryTree, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 0, 24, 0, 3, 12, 0, 0, 0, 0, 39, 0, S_BerryTree, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 0, 92, 0, 5, 12, 0, 0, 0, 0, 40, 0, S_BerryTree, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 0, 92, 0, 5, 12, 0, 0, 0, 0, 41, 0, S_BerryTree, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 0, 92, 0, 5, 12, 0, 0, 0, 0, 42, 0, S_BerryTree, 0, 0, 0 + object_event 11, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 0, 55, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B161A, FLAG_ITEM_ROUTE120_1, 0, 0 + object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4C2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1, 0, 0 + object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE4A2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1, 0, 0 + object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2, 0, 0 + object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, Route120_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2, 0, 0 + object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 0, 32, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 89, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route120_EventScript_1B1627, FLAG_ITEM_ROUTE120_2, 0, 0 + object_event 23, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1641, FLAG_ITEM_ROUTE120_4, 0, 0 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 0, 82, 0, 5, 1, 17, 0, 0, 0, 0, 0, Route120_EventScript_1B1634, FLAG_ITEM_ROUTE120_3, 0, 0 + object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 0, 16, 0, 4, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_151998, FLAG_HIDE_KECLEON_ROUTE120_1, 0, 0 + object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 0, 15, 0, 4, 8, 17, 0, 0, 0, 0, 0, Route120_EventScript_151853, FLAG_HIDE_STEVEN_ROUTE120, 0, 0 + object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14, 0, 0 + object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 + object_event 34, EVENT_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, EVENT_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, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 0, 16, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_KECLEON_ROUTE120_2, 0, 0 + object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 0, 11, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0539, FLAG_HIDE_KECLEON_ROUTE120_3, 0, 0 + object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 0, 2, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0546, FLAG_HIDE_KECLEON_ROUTE120_4, 0, 0 + object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 0, 77, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0553, FLAG_HIDE_KECLEON_ROUTE120_5, 0, 0 + object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 0, 51, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A056D, FLAG_HIDE_KECLEON_ROUTE120_7, 0, 0 + object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 0, 48, 0, 3, 76, 17, 0, 0, 0, 0, 0, Route120_EventScript_1A0560, FLAG_HIDE_KECLEON_ROUTE120_6, 0, 0 Route120_MapWarps:: @ 8384308 warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB @@ -83,4 +83,4 @@ Route120_MapBGEvents:: @ 8384448 bg_secret_base_event 5, 76, 0, SECRET_BASE_SHRUB1_4 Route120_MapEvents:: @ 83844F0 - map_events Route120_MapObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents + map_events Route120_EventObjects, Route120_MapWarps, Route120_MapCoordEvents, Route120_MapBGEvents diff --git a/data/maps/events/Route121.inc b/data/maps/events/Route121.inc index e799115e5..0921711b0 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -1,26 +1,26 @@ -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, S_BerryTree, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 2, 0, 3, 12, 0, 0, 0, 0, 48, 0, S_BerryTree, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 16, 0, 2, 0, 3, 12, 0, 0, 0, 0, 49, 0, S_BerryTree, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 2, 0, 3, 12, 0, 0, 0, 0, 50, 0, S_BerryTree, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 64, 0, 14, 0, 3, 12, 0, 0, 0, 0, 51, 0, S_BerryTree, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 65, 0, 14, 0, 3, 12, 0, 0, 0, 0, 52, 0, S_BerryTree, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 66, 0, 14, 0, 3, 12, 0, 0, 0, 0, 53, 0, S_BerryTree, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, S_BerryTree, 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, MAP_OBJ_GFX_VAR_1, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_1, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_1, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 - object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 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, FLAG_ITEM_ROUTE121_1, 0, 0 - object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 +Route121_EventObjects:: @ 8384504 + object_event 1, EVENT_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, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 0, 2, 0, 3, 12, 0, 0, 0, 0, 47, 0, S_BerryTree, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 0, 2, 0, 3, 12, 0, 0, 0, 0, 48, 0, S_BerryTree, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 0, 2, 0, 3, 12, 0, 0, 0, 0, 49, 0, S_BerryTree, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 0, 2, 0, 3, 12, 0, 0, 0, 0, 50, 0, S_BerryTree, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 0, 14, 0, 3, 12, 0, 0, 0, 0, 51, 0, S_BerryTree, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 0, 14, 0, 3, 12, 0, 0, 0, 0, 52, 0, S_BerryTree, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 0, 14, 0, 3, 12, 0, 0, 0, 0, 53, 0, S_BerryTree, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 0, 14, 0, 3, 12, 0, 0, 0, 0, 54, 0, S_BerryTree, 0, 0, 0 + object_event 10, EVENT_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, EVENT_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, EVENT_OBJ_GFX_VAR_1, 0, 30, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 30, 0, 7, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_1, 0, 31, 0, 7, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121, 0, 0 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 + object_event 17, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route121_EventScript_1B164E, FLAG_ITEM_ROUTE121_1, 0, 0 + object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 Route121_MapWarps:: @ 8384714 warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE @@ -43,4 +43,4 @@ Route121_MapBGEvents:: @ 838475C bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_49 Route121_MapEvents:: @ 83847C8 - map_events Route121_MapObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents + map_events Route121_EventObjects, Route121_MapWarps, Route121_MapCoordEvents, Route121_MapBGEvents diff --git a/data/maps/events/Route121_SafariZoneEntrance.inc b/data/maps/events/Route121_SafariZoneEntrance.inc index 59b0a37d9..79d8762ba 100644 --- a/data/maps/events/Route121_SafariZoneEntrance.inc +++ b/data/maps/events/Route121_SafariZoneEntrance.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 838BA34 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_SAFARI_ZONE_SOUTHEAST @@ -16,4 +16,4 @@ 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 + map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc index 3c50254cb..9adacca40 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -1,38 +1,38 @@ -Route123_MapObjects:: @ 83847F8 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 3, 0, 3, 12, 0, 0, 0, 0, 58, 0, S_BerryTree, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 3, 0, 3, 12, 0, 0, 0, 0, 59, 0, S_BerryTree, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 14, 0, 3, 0, 3, 12, 0, 0, 0, 0, 60, 0, S_BerryTree, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 3, 0, 3, 12, 0, 0, 0, 0, 61, 0, S_BerryTree, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 81, 0, 1, 0, 3, 12, 0, 0, 0, 0, 62, 0, S_BerryTree, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 82, 0, 1, 0, 3, 12, 0, 0, 0, 0, 63, 0, S_BerryTree, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 83, 0, 1, 0, 3, 12, 0, 0, 0, 0, 64, 0, S_BerryTree, 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, S_BerryTree, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 15, 0, 5, 0, 3, 12, 0, 0, 0, 0, 72, 0, S_BerryTree, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 5, 0, 3, 12, 0, 0, 0, 0, 73, 0, S_BerryTree, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 74, 0, S_BerryTree, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 17, 0, 3, 0, 3, 12, 0, 0, 0, 0, 79, 0, S_BerryTree, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, S_BerryTree, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, S_BerryTree, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, S_BerryTree, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 - object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 - object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 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, FLAG_ITEM_ROUTE123_1, 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, FLAG_ITEM_ROUTE123_2, 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, S_BerryTree, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, S_BerryTree, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_BERRY_TREE, 0, 111, 0, 13, 0, 3, 12, 0, 0, 0, 0, 89, 0, S_BerryTree, 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, FLAG_ITEM_ROUTE123_3, 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, FLAG_ITEM_ROUTE123_4, 0, 0 +Route123_EventObjects:: @ 83847F8 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 0, 3, 0, 3, 12, 0, 0, 0, 0, 58, 0, S_BerryTree, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 0, 3, 0, 3, 12, 0, 0, 0, 0, 59, 0, S_BerryTree, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 0, 3, 0, 3, 12, 0, 0, 0, 0, 60, 0, S_BerryTree, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 0, 3, 0, 3, 12, 0, 0, 0, 0, 61, 0, S_BerryTree, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 0, 1, 0, 3, 12, 0, 0, 0, 0, 62, 0, S_BerryTree, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 0, 1, 0, 3, 12, 0, 0, 0, 0, 63, 0, S_BerryTree, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 0, 1, 0, 3, 12, 0, 0, 0, 0, 64, 0, S_BerryTree, 0, 0, 0 + object_event 8, EVENT_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, EVENT_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, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 0, 5, 0, 3, 12, 0, 0, 0, 0, 65, 0, S_BerryTree, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 0, 5, 0, 3, 12, 0, 0, 0, 0, 72, 0, S_BerryTree, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 0, 5, 0, 3, 12, 0, 0, 0, 0, 73, 0, S_BerryTree, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 0, 5, 0, 3, 12, 0, 0, 0, 0, 74, 0, S_BerryTree, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 0, 3, 0, 3, 12, 0, 0, 0, 0, 79, 0, S_BerryTree, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 0, 3, 0, 3, 12, 0, 0, 0, 0, 14, 0, S_BerryTree, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 0, 5, 0, 3, 12, 0, 0, 0, 0, 15, 0, S_BerryTree, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 0, 5, 0, 3, 12, 0, 0, 0, 0, 30, 0, S_BerryTree, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11, 0, 0 + object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12, 0, 0 + object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13, 0, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B165B, FLAG_ITEM_ROUTE123_1, 0, 0 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 139, 0, 18, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route123_EventScript_1B1668, FLAG_ITEM_ROUTE123_2, 0, 0 + object_event 23, EVENT_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, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 0, 13, 0, 3, 12, 0, 0, 0, 0, 87, 0, S_BerryTree, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 0, 13, 0, 3, 12, 0, 0, 0, 0, 88, 0, S_BerryTree, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 0, 13, 0, 3, 12, 0, 0, 0, 0, 89, 0, S_BerryTree, 0, 0, 0 + object_event 27, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 0, 18, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1675, FLAG_ITEM_ROUTE123_3, 0, 0 + object_event 34, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route123_EventScript_1B1682, FLAG_ITEM_ROUTE123_4, 0, 0 Route123_MapWarps:: @ 8384B28 warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE @@ -73,4 +73,4 @@ Route123_MapBGEvents:: @ 8384C90 bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_4A Route123_MapEvents:: @ 8384CFC - map_events Route123_MapObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents + map_events Route123_EventObjects, Route123_MapWarps, Route123_MapCoordEvents, Route123_MapBGEvents diff --git a/data/maps/events/Route123_BerryMastersHouse.inc b/data/maps/events/Route123_BerryMastersHouse.inc index a17a04e19..9a1f7be68 100644 --- a/data/maps/events/Route123_BerryMastersHouse.inc +++ b/data/maps/events/Route123_BerryMastersHouse.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8392D6C + object_event 1, EVENT_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, EVENT_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, MAP_ROUTE123 warp_def 4, 7, 0, 0, MAP_ROUTE123 Route123_BerryMastersHouse_MapEvents:: @ 8392DAC - map_events Route123_BerryMastersHouse_MapObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 + map_events Route123_BerryMastersHouse_EventObjects, Route123_BerryMastersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route124.inc b/data/maps/events/Route124.inc index eb92f81a4..336d84d6b 100644 --- a/data/maps/events/Route124.inc +++ b/data/maps/events/Route124.inc @@ -1,14 +1,14 @@ -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, FLAG_ITEM_ROUTE124_2, 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, FLAG_ITEM_ROUTE124_3, 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, FLAG_ITEM_ROUTE124_1, 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_EventObjects:: @ 8384D10 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B168F, FLAG_ITEM_ROUTE124_2, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 0, 53, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B169C, FLAG_ITEM_ROUTE124_3, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 0, 11, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route124_EventScript_1B16A9, FLAG_ITEM_ROUTE124_1, 0, 0 + object_event 9, EVENT_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, EVENT_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, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE @@ -17,4 +17,4 @@ 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 + map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents diff --git a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc index 17ec713de..5f67d09e3 100644 --- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc +++ b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc @@ -1,5 +1,5 @@ -Route124_DivingTreasureHuntersHouse_MapObjects:: @ 839300C - object_event 1, MAP_OBJ_GFX_MAN_6, 0, 5, 0, 4, 0, 0, 9, 0, 0, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0, 0, 0 +Route124_DivingTreasureHuntersHouse_EventObjects:: @ 839300C + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 0, 4, 0, 0, 9, 0, 0, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0, 0, 0 Route124_DivingTreasureHuntersHouse_MapWarps:: @ 8393024 warp_def 3, 8, 0, 0, MAP_ROUTE124 @@ -9,4 +9,4 @@ Route124_DivingTreasureHuntersHouse_MapBGEvents:: @ 8393034 bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_164335 Route124_DivingTreasureHuntersHouse_MapEvents:: @ 8393040 - map_events Route124_DivingTreasureHuntersHouse_MapObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents + map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents diff --git a/data/maps/events/Route125.inc b/data/maps/events/Route125.inc index 82767393d..348275707 100644 --- a/data/maps/events/Route125.inc +++ b/data/maps/events/Route125.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 8384E28 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM @@ -17,4 +17,4 @@ Route125_MapBGEvents:: @ 8384ED8 bg_secret_base_event 24, 32, 0, SECRET_BASE_YELLOW_CAVE4_2 Route125_MapEvents:: @ 8384F08 - map_events Route125_MapObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents + map_events Route125_EventObjects, Route125_MapWarps, 0x0, Route125_MapBGEvents diff --git a/data/maps/events/Route126.inc b/data/maps/events/Route126.inc index a8855c41f..fafbb0b5f 100644 --- a/data/maps/events/Route126.inc +++ b/data/maps/events/Route126.inc @@ -1,9 +1,9 @@ -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, FLAG_ITEM_ROUTE126_1, 0, 0 +Route126_EventObjects:: @ 8384F1C + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0, 0, Route126_EventScript_1B16B6, FLAG_ITEM_ROUTE126_1, 0, 0 Route126_MapEvents:: @ 8384F94 - map_events Route126_MapObjects, 0x0, 0x0, 0x0 + map_events Route126_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route127.inc b/data/maps/events/Route127.inc index 6b3d396c9..352336fb1 100644 --- a/data/maps/events/Route127.inc +++ b/data/maps/events/Route127.inc @@ -1,13 +1,13 @@ -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, FLAG_ITEM_ROUTE127_1, 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, FLAG_ITEM_ROUTE127_2, 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_EventObjects:: @ 8384FA8 + object_event 1, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16C3, FLAG_ITEM_ROUTE127_1, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 0, 39, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route127_EventScript_1B16D0, FLAG_ITEM_ROUTE127_2, 0, 0 + object_event 5, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1 @@ -17,4 +17,4 @@ Route127_MapBGEvents:: @ 8385080 bg_secret_base_event 45, 24, 0, SECRET_BASE_YELLOW_CAVE1_3 Route127_MapEvents:: @ 83850BC - map_events Route127_MapObjects, 0x0, 0x0, Route127_MapBGEvents + map_events Route127_EventObjects, 0x0, 0x0, Route127_MapBGEvents diff --git a/data/maps/events/Route128.inc b/data/maps/events/Route128.inc index 2bef2e3ed..4da9598fa 100644 --- a/data/maps/events/Route128.inc +++ b/data/maps/events/Route128.inc @@ -1,12 +1,12 @@ -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, FLAG_HIDE_STEVEN_ROUTE128, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_6, 0, 37, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_ROUTE128, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_7, 0, 38, 0, 21, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_ROUTE128, 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_EventObjects:: @ 83850D0 + object_event 1, EVENT_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, EVENT_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, EVENT_OBJ_GFX_STEVEN, 0, 40, 0, 22, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE128, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_6, 0, 37, 0, 22, 0, 3, 9, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_ROUTE128, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_7, 0, 38, 0, 21, 0, 3, 7, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_ROUTE128, 0, 0 + object_event 6, EVENT_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, EVENT_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, EVENT_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_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5C @@ -14,4 +14,4 @@ Route128_MapBGEvents:: @ 8385190 bg_hidden_item_event 31, 33, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5E Route128_MapEvents:: @ 83851B4 - map_events Route128_MapObjects, 0x0, 0x0, Route128_MapBGEvents + map_events Route128_EventObjects, 0x0, 0x0, Route128_MapBGEvents diff --git a/data/maps/events/Route129.inc b/data/maps/events/Route129.inc index 10716b557..c17118f50 100644 --- a/data/maps/events/Route129.inc +++ b/data/maps/events/Route129.inc @@ -1,8 +1,8 @@ -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_EventObjects:: @ 83851C8 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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 + map_events Route129_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route130.inc b/data/maps/events/Route130.inc index 027519c2d..734d99eea 100644 --- a/data/maps/events/Route130.inc +++ b/data/maps/events/Route130.inc @@ -1,7 +1,7 @@ -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, S_BerryTree, FLAG_TEMP_11, 0, 0 +Route130_EventObjects:: @ 838523C + object_event 1, EVENT_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, EVENT_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, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 0, 9, 0, 3, 12, 0, 0, 0, 0, 82, 0, S_BerryTree, FLAG_TEMP_11, 0, 0 Route130_MapEvents:: @ 8385284 - map_events Route130_MapObjects, 0x0, 0x0, 0x0 + map_events Route130_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route131.inc b/data/maps/events/Route131.inc index d387233d2..b33b43415 100644 --- a/data/maps/events/Route131.inc +++ b/data/maps/events/Route131.inc @@ -1,13 +1,13 @@ -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_EventObjects:: @ 8385298 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_SKY_PILLAR_ENTRANCE Route131_MapEvents:: @ 8385330 - map_events Route131_MapObjects, Route131_MapWarps, 0x0, 0x0 + map_events Route131_EventObjects, Route131_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Route132.inc b/data/maps/events/Route132.inc index 97fc3d5db..592012ef1 100644 --- a/data/maps/events/Route132.inc +++ b/data/maps/events/Route132.inc @@ -1,9 +1,9 @@ -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, FLAG_ITEM_ROUTE132_1, 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_EventObjects:: @ 8385344 + object_event 1, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route132_EventScript_1B16DD, FLAG_ITEM_ROUTE132_1, 0, 0 + object_event 4, EVENT_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, EVENT_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 + map_events Route132_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route133.inc b/data/maps/events/Route133.inc index 3d73ef1c9..78d6ff077 100644 --- a/data/maps/events/Route133.inc +++ b/data/maps/events/Route133.inc @@ -1,11 +1,11 @@ -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, FLAG_ITEM_ROUTE133_1, 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, FLAG_ITEM_ROUTE133_2, 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_EventObjects:: @ 83853D0 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 0, 15, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16EA, FLAG_ITEM_ROUTE133_1, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, Route133_EventScript_1B16F7, FLAG_ITEM_ROUTE133_2, 0, 0 + object_event 6, EVENT_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, EVENT_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 + map_events Route133_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/Route134.inc b/data/maps/events/Route134.inc index a8d2eb030..f2465c521 100644 --- a/data/maps/events/Route134.inc +++ b/data/maps/events/Route134.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 838548C + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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 + map_events Route134_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity.inc b/data/maps/events/RustboroCity.inc index 64a1d1a66..dc53800a1 100644 --- a/data/maps/events/RustboroCity.inc +++ b/data/maps/events/RustboroCity.inc @@ -1,18 +1,18 @@ -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, FLAG_HIDE_DEVON_RUSTBORO, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 21, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO, 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, FLAG_ITEM_RUSTBORO_1, 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, MAP_OBJ_GFX_VAR_0, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO, 0, 0 +RustboroCity_EventObjects:: @ 837FD14 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_MAN_2, 0, 30, 0, 10, 0, 3, 10, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C5FF, FLAG_HIDE_DEVON_RUSTBORO, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 13, 0, 21, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO, 0, 0 + object_event 11, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 0, 51, 0, 3, 1, 0, 0, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, FLAG_ITEM_RUSTBORO_1, 0, 0 + object_event 13, EVENT_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, EVENT_OBJ_GFX_VAR_0, 0, 16, 0, 50, 0, 3, 1, 17, 0, 0, 0, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO, 0, 0 RustboroCity_MapWarps:: @ 837FE64 warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM @@ -56,4 +56,4 @@ RustboroCity_MapBGEvents:: @ 837FF94 bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_14C440 RustboroCity_MapEvents:: @ 838000C - map_events RustboroCity_MapObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents + map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents diff --git a/data/maps/events/RustboroCity_CuttersHouse.inc b/data/maps/events/RustboroCity_CuttersHouse.inc index e26127f38..7b4728217 100644 --- a/data/maps/events/RustboroCity_CuttersHouse.inc +++ b/data/maps/events/RustboroCity_CuttersHouse.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8388D9C + object_event 1, EVENT_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, EVENT_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, MAP_RUSTBORO_CITY warp_def 6, 8, 0, 8, MAP_RUSTBORO_CITY RustboroCity_CuttersHouse_MapEvents:: @ 8388DDC - map_events RustboroCity_CuttersHouse_MapObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 + map_events RustboroCity_CuttersHouse_EventObjects, RustboroCity_CuttersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_1F.inc b/data/maps/events/RustboroCity_DevonCorp_1F.inc index 165089ee7..89bc65aa4 100644 --- a/data/maps/events/RustboroCity_DevonCorp_1F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_1F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 838880C + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_RUSTBORO_CITY @@ -9,4 +9,4 @@ RustboroCity_DevonCorp_1F_MapWarps:: @ 8388854 warp_def 14, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_2F RustboroCity_DevonCorp_1F_MapEvents:: @ 838886C - map_events RustboroCity_DevonCorp_1F_MapObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, 0x0 + map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/events/RustboroCity_DevonCorp_2F.inc index 93335d22e..d521dc4b9 100644 --- a/data/maps/events/RustboroCity_DevonCorp_2F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_2F.inc @@ -1,13 +1,13 @@ -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_EventObjects:: @ 8388880 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_RUSTBORO_CITY_DEVON_CORP_1F warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_DEVON_CORP_3F RustboroCity_DevonCorp_2F_MapEvents:: @ 8388908 - map_events RustboroCity_DevonCorp_2F_MapObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 + map_events RustboroCity_DevonCorp_2F_EventObjects, RustboroCity_DevonCorp_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_DevonCorp_3F.inc b/data/maps/events/RustboroCity_DevonCorp_3F.inc index 41f37c7b1..d7db2db0a 100644 --- a/data/maps/events/RustboroCity_DevonCorp_3F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_3F.inc @@ -1,7 +1,7 @@ -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, FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F, 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_EventObjects:: @ 838891C + object_event 1, EVENT_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, EVENT_OBJ_GFX_MAN_2, 0, 3, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578B0, FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F, 0, 0 + object_event 3, EVENT_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, MAP_RUSTBORO_CITY_DEVON_CORP_2F @@ -11,4 +11,4 @@ RustboroCity_DevonCorp_3F_MapBGEvents:: @ 838896C 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 + map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents diff --git a/data/maps/events/RustboroCity_Flat1_1F.inc b/data/maps/events/RustboroCity_Flat1_1F.inc index d44df7638..b15ce76d1 100644 --- a/data/maps/events/RustboroCity_Flat1_1F.inc +++ b/data/maps/events/RustboroCity_Flat1_1F.inc @@ -1,6 +1,6 @@ -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_EventObjects:: @ 8388CB8 + object_event 1, EVENT_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, EVENT_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, MAP_RUSTBORO_CITY @@ -8,4 +8,4 @@ RustboroCity_Flat1_1F_MapWarps:: @ 8388CE8 warp_def 2, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT1_2F RustboroCity_Flat1_1F_MapEvents:: @ 8388D00 - map_events RustboroCity_Flat1_1F_MapObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0 + map_events RustboroCity_Flat1_1F_EventObjects, RustboroCity_Flat1_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat1_2F.inc b/data/maps/events/RustboroCity_Flat1_2F.inc index 91f1d2f20..e8077080a 100644 --- a/data/maps/events/RustboroCity_Flat1_2F.inc +++ b/data/maps/events/RustboroCity_Flat1_2F.inc @@ -1,8 +1,8 @@ -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_EventObjects:: @ 8388D14 + object_event 1, EVENT_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, MAP_RUSTBORO_CITY_FLAT1_1F RustboroCity_Flat1_2F_MapEvents:: @ 8388D34 - map_events RustboroCity_Flat1_2F_MapObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0 + map_events RustboroCity_Flat1_2F_EventObjects, RustboroCity_Flat1_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_1F.inc b/data/maps/events/RustboroCity_Flat2_1F.inc index 17c11b21f..de4ebf9ab 100644 --- a/data/maps/events/RustboroCity_Flat2_1F.inc +++ b/data/maps/events/RustboroCity_Flat2_1F.inc @@ -1,6 +1,6 @@ -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_EventObjects:: @ 8388E44 + object_event 1, EVENT_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, EVENT_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, MAP_RUSTBORO_CITY @@ -8,4 +8,4 @@ RustboroCity_Flat2_1F_MapWarps:: @ 8388E74 warp_def 3, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_2F RustboroCity_Flat2_1F_MapEvents:: @ 8388E8C - map_events RustboroCity_Flat2_1F_MapObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0 + map_events RustboroCity_Flat2_1F_EventObjects, RustboroCity_Flat2_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_2F.inc b/data/maps/events/RustboroCity_Flat2_2F.inc index b881e1bd2..9fa773e7e 100644 --- a/data/maps/events/RustboroCity_Flat2_2F.inc +++ b/data/maps/events/RustboroCity_Flat2_2F.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8388EA0 + object_event 1, EVENT_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, EVENT_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, MAP_RUSTBORO_CITY_FLAT2_1F warp_def 1, 1, 0, 0, MAP_RUSTBORO_CITY_FLAT2_3F RustboroCity_Flat2_2F_MapEvents:: @ 8388EE0 - map_events RustboroCity_Flat2_2F_MapObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0 + map_events RustboroCity_Flat2_2F_EventObjects, RustboroCity_Flat2_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Flat2_3F.inc b/data/maps/events/RustboroCity_Flat2_3F.inc index 4a00bb8f4..324296f82 100644 --- a/data/maps/events/RustboroCity_Flat2_3F.inc +++ b/data/maps/events/RustboroCity_Flat2_3F.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 8388EF4 + object_event 1, EVENT_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, EVENT_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, MAP_RUSTBORO_CITY_FLAT2_2F RustboroCity_Flat2_3F_MapEvents:: @ 8388F2C - map_events RustboroCity_Flat2_3F_MapObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 + map_events RustboroCity_Flat2_3F_EventObjects, RustboroCity_Flat2_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Gym.inc b/data/maps/events/RustboroCity_Gym.inc index e77b55b7f..5dd7bcdf3 100644 --- a/data/maps/events/RustboroCity_Gym.inc +++ b/data/maps/events/RustboroCity_Gym.inc @@ -1,8 +1,8 @@ -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_EventObjects:: @ 8388998 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_RUSTBORO_CITY @@ -13,4 +13,4 @@ RustboroCity_Gym_MapBGEvents:: @ 8388A08 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 + map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents diff --git a/data/maps/events/RustboroCity_House1.inc b/data/maps/events/RustboroCity_House1.inc index a6471da2e..336ce5c71 100644 --- a/data/maps/events/RustboroCity_House1.inc +++ b/data/maps/events/RustboroCity_House1.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8388D48 + object_event 1, EVENT_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, EVENT_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, MAP_RUSTBORO_CITY warp_def 6, 7, 0, 7, MAP_RUSTBORO_CITY RustboroCity_House1_MapEvents:: @ 8388D88 - map_events RustboroCity_House1_MapObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 + map_events RustboroCity_House1_EventObjects, RustboroCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_House2.inc b/data/maps/events/RustboroCity_House2.inc index 5cdb4fc6c..d7940b241 100644 --- a/data/maps/events/RustboroCity_House2.inc +++ b/data/maps/events/RustboroCity_House2.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8388DF0 + object_event 1, EVENT_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, EVENT_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, MAP_RUSTBORO_CITY warp_def 6, 8, 0, 9, MAP_RUSTBORO_CITY RustboroCity_House2_MapEvents:: @ 8388E30 - map_events RustboroCity_House2_MapObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 + map_events RustboroCity_House2_EventObjects, RustboroCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_House3.inc b/data/maps/events/RustboroCity_House3.inc index 96c2f2699..d2c505b45 100644 --- a/data/maps/events/RustboroCity_House3.inc +++ b/data/maps/events/RustboroCity_House3.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 8388F40 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_RUSTBORO_CITY warp_def 6, 8, 0, 11, MAP_RUSTBORO_CITY RustboroCity_House3_MapEvents:: @ 8388F98 - map_events RustboroCity_House3_MapObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 + map_events RustboroCity_House3_EventObjects, RustboroCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_Mart.inc b/data/maps/events/RustboroCity_Mart.inc index b95aa32af..c589726ca 100644 --- a/data/maps/events/RustboroCity_Mart.inc +++ b/data/maps/events/RustboroCity_Mart.inc @@ -1,12 +1,12 @@ -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_EventObjects:: @ 8388C34 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_RUSTBORO_CITY warp_def 4, 7, 0, 2, MAP_RUSTBORO_CITY RustboroCity_Mart_MapEvents:: @ 8388CA4 - map_events RustboroCity_Mart_MapObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 + map_events RustboroCity_Mart_EventObjects, RustboroCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonCenter_1F.inc b/data/maps/events/RustboroCity_PokemonCenter_1F.inc index 83655d001..685a332a0 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_1F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ -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_EventObjects:: @ 8388B24 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_RUSTBORO_CITY @@ -10,4 +10,4 @@ RustboroCity_PokemonCenter_1F_MapWarps:: @ 8388B84 warp_def 1, 6, 4, 0, MAP_RUSTBORO_CITY_POKEMON_CENTER_2F RustboroCity_PokemonCenter_1F_MapEvents:: @ 8388B9C - map_events RustboroCity_PokemonCenter_1F_MapObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events RustboroCity_PokemonCenter_1F_EventObjects, RustboroCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonCenter_2F.inc b/data/maps/events/RustboroCity_PokemonCenter_2F.inc index d0c39d80f..c8c5952a3 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_2F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 8388BB0 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F @@ -11,4 +11,4 @@ RustboroCity_PokemonCenter_2F_MapWarps:: @ 8388BF8 warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM RustboroCity_PokemonCenter_2F_MapEvents:: @ 8388C20 - map_events RustboroCity_PokemonCenter_2F_MapObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events RustboroCity_PokemonCenter_2F_EventObjects, RustboroCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/RustboroCity_PokemonSchool.inc b/data/maps/events/RustboroCity_PokemonSchool.inc index ef873edb8..cbf1cab76 100644 --- a/data/maps/events/RustboroCity_PokemonSchool.inc +++ b/data/maps/events/RustboroCity_PokemonSchool.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8388A34 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_RUSTBORO_CITY @@ -18,4 +18,4 @@ RustboroCity_PokemonSchool_MapBGEvents:: @ 8388AD4 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 + map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents diff --git a/data/maps/events/RusturfTunnel.inc b/data/maps/events/RusturfTunnel.inc index f0b67df82..f4b39bf7a 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -1,14 +1,14 @@ -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, FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL, 0, 0 - object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1, 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, FLAG_ITEM_RUSTURF_TUNNEL_1, 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, FLAG_ITEM_RUSTURF_TUNNEL_2, 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, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL, 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, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2, 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, FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL, 0, 0 +RusturfTunnel_EventObjects:: @ 838BD2C + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 0, 5, 0, 3, 10, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL, 0, 0 + object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 0, 1, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, FLAG_ITEM_RUSTURF_TUNNEL_1, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 0, 2, 0, 3, 1, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, FLAG_ITEM_RUSTURF_TUNNEL_2, 0, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL, 0, 0 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL, 0, 0 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2, 0, 0 + object_event 9, EVENT_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, EVENT_OBJ_GFX_WOMAN_3, 0, 25, 0, 4, 0, 3, 9, 17, 0, 0, 0, 0, 0, RusturfTunnel_EventScript_15C782, FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL, 0, 0 RusturfTunnel_MapWarps:: @ 838BE1C warp_def 4, 10, 3, 0, MAP_ROUTE116 @@ -23,4 +23,4 @@ RusturfTunnel_MapCoordEvents:: @ 838BE34 coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9A5 RusturfTunnel_MapEvents:: @ 838BE84 - map_events RusturfTunnel_MapObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 + map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/events/SSTidalCorridor.inc b/data/maps/events/SSTidalCorridor.inc index 9ca3db288..eec5f46c7 100644 --- a/data/maps/events/SSTidalCorridor.inc +++ b/data/maps/events/SSTidalCorridor.inc @@ -1,8 +1,8 @@ -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, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL, 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, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL, 0, 0 +SSTidalCorridor_EventObjects:: @ 83916F8 + object_event 1, EVENT_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, EVENT_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, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 0, 2, 0, 3, 8, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD96, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL, 0, 0 + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FD9F, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL, 0, 0 SSTidalCorridor_MapWarps:: @ 8391758 warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS @@ -30,4 +30,4 @@ SSTidalCorridor_MapBGEvents:: @ 83917A0 bg_event 14, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDCD SSTidalCorridor_MapEvents:: @ 8391830 - map_events SSTidalCorridor_MapObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents + map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents diff --git a/data/maps/events/SSTidalLowerDeck.inc b/data/maps/events/SSTidalLowerDeck.inc index 59d783f61..ce47b4c8b 100644 --- a/data/maps/events/SSTidalLowerDeck.inc +++ b/data/maps/events/SSTidalLowerDeck.inc @@ -1,6 +1,6 @@ -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_EventObjects:: @ 8391844 + object_event 1, EVENT_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, EVENT_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, MAP_SS_TIDAL_CORRIDOR @@ -9,4 +9,4 @@ SSTidalLowerDeck_MapBGEvents:: @ 839187C bg_hidden_item_event 0, 2, 0, ITEM_LEFTOVERS, FLAG_HIDDEN_ITEM_23 SSTidalLowerDeck_MapEvents:: @ 8391888 - map_events SSTidalLowerDeck_MapObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents + map_events SSTidalLowerDeck_EventObjects, SSTidalLowerDeck_MapWarps, 0x0, SSTidalLowerDeck_MapBGEvents diff --git a/data/maps/events/SSTidalRooms.inc b/data/maps/events/SSTidalRooms.inc index af5fdbfa4..60d338c9e 100644 --- a/data/maps/events/SSTidalRooms.inc +++ b/data/maps/events/SSTidalRooms.inc @@ -1,12 +1,12 @@ -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, FLAG_HIDE_TM_49_GIVER_SS_TIDAL, 0, 0 +SSTidalRooms_EventObjects:: @ 839189C + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_MANIAC, 0, 28, 0, 5, 0, 3, 7, 17, 0, 0, 0, 0, 0, SSTidalRooms_EventScript_15FF06, FLAG_HIDE_TM_49_GIVER_SS_TIDAL, 0, 0 SSTidalRooms_MapWarps:: @ 839195C warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR @@ -27,4 +27,4 @@ SSTidalRooms_MapBGEvents:: @ 83919BC bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_15FF47 SSTidalRooms_MapEvents:: @ 83919D4 - map_events SSTidalRooms_MapObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents + map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc index 68c32e585..2291cc867 100644 --- a/data/maps/events/SafariZone_Northeast.inc +++ b/data/maps/events/SafariZone_Northeast.inc @@ -1,13 +1,13 @@ -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, S_BreakableRock, FLAG_TEMP_11, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 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, FLAG_ITEM_SAFARI_ZONE_NORTHEAST_1, 0, 0 +SafariZone_Northeast_EventObjects:: @ 8391A2C + object_event 1, EVENT_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, EVENT_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, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 10, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11, 0, 0 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 0, 13, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12, 0, 0 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 0, 14, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14, 0, 0 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northeast_EventScript_1B1919, FLAG_ITEM_SAFARI_ZONE_NORTHEAST_1, 0, 0 SafariZone_Northeast_MapEvents:: @ 8391B04 - map_events SafariZone_Northeast_MapObjects, 0x0, 0x0, 0x0 + map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/events/SafariZone_Northwest.inc index e2cabbd38..5f8b34616 100644 --- a/data/maps/events/SafariZone_Northwest.inc +++ b/data/maps/events/SafariZone_Northwest.inc @@ -1,6 +1,6 @@ -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, FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1, 0, 0 +SafariZone_Northwest_EventObjects:: @ 83919E8 + object_event 1, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 0, 7, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Northwest_EventScript_1B190C, FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1, 0, 0 SafariZone_Northwest_MapEvents:: @ 8391A18 - map_events SafariZone_Northwest_MapObjects, 0x0, 0x0, 0x0 + map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_RestHouse.inc b/data/maps/events/SafariZone_RestHouse.inc index f52e734b7..47418cb7f 100644 --- a/data/maps/events/SafariZone_RestHouse.inc +++ b/data/maps/events/SafariZone_RestHouse.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 8391EC0 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_SAFARI_ZONE_SOUTHWEST warp_def 4, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST SafariZone_RestHouse_MapEvents:: @ 8391F18 - map_events SafariZone_RestHouse_MapObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 + map_events SafariZone_RestHouse_EventObjects, SafariZone_RestHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/events/SafariZone_Southeast.inc index c40dc967d..1babf4640 100644 --- a/data/maps/events/SafariZone_Southeast.inc +++ b/data/maps/events/SafariZone_Southeast.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 8391B70 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE SafariZone_Southeast_MapEvents:: @ 8391BD8 - map_events SafariZone_Southeast_MapObjects, SafariZone_Southeast_MapWarps, 0x0, 0x0 + map_events SafariZone_Southeast_EventObjects, SafariZone_Southeast_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc index 2beec82ae..d93fc9d73 100644 --- a/data/maps/events/SafariZone_Southwest.inc +++ b/data/maps/events/SafariZone_Southwest.inc @@ -1,6 +1,6 @@ -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, FLAG_ITEM_SAFARI_ZONE_SOUTHWEST, 0, 0 +SafariZone_Southwest_EventObjects:: @ 8391B18 + object_event 1, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 0, 3, 1, 17, 0, 0, 0, 0, 0, SafariZone_Southwest_EventScript_1B1926, FLAG_ITEM_SAFARI_ZONE_SOUTHWEST, 0, 0 SafariZone_Southwest_MapWarps:: @ 8391B48 warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE @@ -9,4 +9,4 @@ 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 + map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents diff --git a/data/maps/events/ScorchedSlab.inc b/data/maps/events/ScorchedSlab.inc index 1a4f4d92d..c77b9cac3 100644 --- a/data/maps/events/ScorchedSlab.inc +++ b/data/maps/events/ScorchedSlab.inc @@ -1,8 +1,8 @@ -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, FLAG_ITEM_SCORCHED_SLAB_1, 0, 0 +ScorchedSlab_EventObjects:: @ 838E988 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, FLAG_ITEM_SCORCHED_SLAB_1, 0, 0 ScorchedSlab_MapWarps:: @ 838E9A0 warp_def 7, 16, 1, 1, MAP_ROUTE120 ScorchedSlab_MapEvents:: @ 838E9A8 - map_events ScorchedSlab_MapObjects, ScorchedSlab_MapWarps, 0x0, 0x0 + map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc index 0a003bd34..0331887c2 100644 --- a/data/maps/events/SeafloorCavern_Room1.inc +++ b/data/maps/events/SeafloorCavern_Room1.inc @@ -1,9 +1,9 @@ -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, S_PushableBoulder, FLAG_TEMP_11, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_1, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 +SeafloorCavern_Room1_EventObjects:: @ 838D0B8 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 8, 0, 6, 0, 3, 1, 17, 0, 1, 0, 2, 0, SeafloorCavern_Room1_EventScript_15DA6D, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 15, 0, 10, 0, 3, 16, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room1_EventScript_15DA84, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room1_MapWarps:: @ 838D130 warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE @@ -11,4 +11,4 @@ SeafloorCavern_Room1_MapWarps:: @ 838D130 warp_def 6, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM2 SeafloorCavern_Room1_MapEvents:: @ 838D148 - map_events SeafloorCavern_Room1_MapObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 + map_events SeafloorCavern_Room1_EventObjects, SeafloorCavern_Room1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room2.inc b/data/maps/events/SeafloorCavern_Room2.inc index e9da0033e..8a71cae92 100644 --- a/data/maps/events/SeafloorCavern_Room2.inc +++ b/data/maps/events/SeafloorCavern_Room2.inc @@ -1,13 +1,13 @@ -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, S_PushableBoulder, FLAG_TEMP_11, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_18, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 +SeafloorCavern_Room2_EventObjects:: @ 838D15C + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 14, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_18, 0, 0 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19, 0, 0 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 SeafloorCavern_Room2_MapWarps:: @ 838D234 warp_def 12, 19, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 @@ -16,4 +16,4 @@ SeafloorCavern_Room2_MapWarps:: @ 838D234 warp_def 12, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM7 SeafloorCavern_Room2_MapEvents:: @ 838D254 - map_events SeafloorCavern_Room2_MapObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 + map_events SeafloorCavern_Room2_EventObjects, SeafloorCavern_Room2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room3.inc b/data/maps/events/SeafloorCavern_Room3.inc index 5c686bc37..23085b300 100644 --- a/data/maps/events/SeafloorCavern_Room3.inc +++ b/data/maps/events/SeafloorCavern_Room3.inc @@ -1,14 +1,14 @@ -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, S_PushableBoulder, FLAG_TEMP_11, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_2, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 +SeafloorCavern_Room3_EventObjects:: @ 838D268 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 9, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_2, 0, 10, 0, 5, 0, 3, 8, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room3_EventScript_15DAA8, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room3_MapWarps:: @ 838D358 warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 @@ -16,4 +16,4 @@ SeafloorCavern_Room3_MapWarps:: @ 838D358 warp_def 4, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM6 SeafloorCavern_Room3_MapEvents:: @ 838D370 - map_events SeafloorCavern_Room3_MapObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 + map_events SeafloorCavern_Room3_EventObjects, SeafloorCavern_Room3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room4.inc b/data/maps/events/SeafloorCavern_Room4.inc index be696fc94..9de32240f 100644 --- a/data/maps/events/SeafloorCavern_Room4.inc +++ b/data/maps/events/SeafloorCavern_Room4.inc @@ -1,5 +1,5 @@ -SeafloorCavern_Room4_MapObjects:: @ 838D384 - object_event 1, MAP_OBJ_GFX_VAR_1, 0, 4, 0, 8, 0, 3, 23, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room4_EventScript_15DACB, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 +SeafloorCavern_Room4_EventObjects:: @ 838D384 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 4, 0, 8, 0, 3, 23, 17, 0, 1, 0, 3, 0, SeafloorCavern_Room4_EventScript_15DACB, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room4_MapWarps:: @ 838D39C warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 @@ -8,4 +8,4 @@ SeafloorCavern_Room4_MapWarps:: @ 838D39C warp_def 10, 15, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE SeafloorCavern_Room4_MapEvents:: @ 838D3BC - map_events SeafloorCavern_Room4_MapObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 + map_events SeafloorCavern_Room4_EventObjects, SeafloorCavern_Room4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room5.inc b/data/maps/events/SeafloorCavern_Room5.inc index 887ee1eb9..767084dd2 100644 --- a/data/maps/events/SeafloorCavern_Room5.inc +++ b/data/maps/events/SeafloorCavern_Room5.inc @@ -1,10 +1,10 @@ -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, S_PushableBoulder, FLAG_TEMP_11, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 +SeafloorCavern_Room5_EventObjects:: @ 838D3D0 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 11, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15, 0, 0 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 0, 8, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 SeafloorCavern_Room5_MapWarps:: @ 838D460 warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 @@ -12,4 +12,4 @@ SeafloorCavern_Room5_MapWarps:: @ 838D460 warp_def 7, 17, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM4 SeafloorCavern_Room5_MapEvents:: @ 838D478 - map_events SeafloorCavern_Room5_MapObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 + map_events SeafloorCavern_Room5_EventObjects, SeafloorCavern_Room5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room8.inc b/data/maps/events/SeafloorCavern_Room8.inc index 35d230ff2..e24c53154 100644 --- a/data/maps/events/SeafloorCavern_Room8.inc +++ b/data/maps/events/SeafloorCavern_Room8.inc @@ -1,20 +1,20 @@ -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, S_PushableBoulder, FLAG_TEMP_11, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0 - object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A, 0, 0 - object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B, 0, 0 - object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1C, 0, 0 +SeafloorCavern_Room8_EventObjects:: @ 838D4DC + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18, 0, 0 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19, 0, 0 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A, 0, 0 + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B, 0, 0 + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1C, 0, 0 SeafloorCavern_Room8_MapWarps:: @ 838D5FC warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 warp_def 5, 12, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM3 SeafloorCavern_Room8_MapEvents:: @ 838D60C - map_events SeafloorCavern_Room8_MapObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 + map_events SeafloorCavern_Room8_EventObjects, SeafloorCavern_Room8_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room9.inc b/data/maps/events/SeafloorCavern_Room9.inc index 09a94cf27..97997f3b6 100644 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ b/data/maps/events/SeafloorCavern_Room9.inc @@ -1,11 +1,11 @@ -SeafloorCavern_Room9_MapObjects:: @ 838D620 - object_event 1, MAP_OBJ_GFX_VAR_8, 0, 17, 0, 38, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_6, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_7, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_4, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_5, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 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, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_9, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN, 0, 0 +SeafloorCavern_Room9_EventObjects:: @ 838D620 + object_event 1, EVENT_OBJ_GFX_VAR_8, 0, 17, 0, 38, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_7, 0, 9, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_4, 0, 8, 0, 41, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_5, 0, 8, 0, 42, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_9, 0, 17, 0, 38, 0, 3, 8, 17, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN, 0, 0 SeafloorCavern_Room9_MapWarps:: @ 838D6C8 warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 @@ -14,4 +14,4 @@ SeafloorCavern_Room9_MapCoordEvents:: @ 838D6D0 coord_event 17, 42, 3, 0, VAR_SEAFLOOR_CAVERN_STATE, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA SeafloorCavern_Room9_MapEvents:: @ 838D6E0 - map_events SeafloorCavern_Room9_MapObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 + map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave1.inc b/data/maps/events/SecretBase_BlueCave1.inc index 72fd09222..14d726040 100644 --- a/data/maps/events/SecretBase_BlueCave1.inc +++ b/data/maps/events/SecretBase_BlueCave1.inc @@ -1,22 +1,22 @@ -SecretBase_BlueCave1_MapObjects:: @ 838F18C - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_BlueCave1_EventObjects:: @ 838F18C + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 4, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BlueCave1_MapWarps:: @ 838F2F4 warp_def 5, 7, 0, 126, MAP_NONE SecretBase_BlueCave1_MapEvents:: @ 838F2FC - map_events SecretBase_BlueCave1_MapObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 + map_events SecretBase_BlueCave1_EventObjects, SecretBase_BlueCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave2.inc b/data/maps/events/SecretBase_BlueCave2.inc index 6f599527b..af2ff42dd 100644 --- a/data/maps/events/SecretBase_BlueCave2.inc +++ b/data/maps/events/SecretBase_BlueCave2.inc @@ -1,22 +1,22 @@ -SecretBase_BlueCave2_MapObjects:: @ 838FAA4 - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_BlueCave2_EventObjects:: @ 838FAA4 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BlueCave2_MapWarps:: @ 838FC0C warp_def 7, 5, 0, 126, MAP_NONE SecretBase_BlueCave2_MapEvents:: @ 838FC14 - map_events SecretBase_BlueCave2_MapObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 + map_events SecretBase_BlueCave2_EventObjects, SecretBase_BlueCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave3.inc b/data/maps/events/SecretBase_BlueCave3.inc index f9b4cbe91..a7b18b152 100644 --- a/data/maps/events/SecretBase_BlueCave3.inc +++ b/data/maps/events/SecretBase_BlueCave3.inc @@ -1,22 +1,22 @@ -SecretBase_BlueCave3_MapObjects:: @ 83903BC - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_BlueCave3_EventObjects:: @ 83903BC + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BlueCave3_MapWarps:: @ 8390524 warp_def 4, 15, 0, 126, MAP_NONE SecretBase_BlueCave3_MapEvents:: @ 839052C - map_events SecretBase_BlueCave3_MapObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 + map_events SecretBase_BlueCave3_EventObjects, SecretBase_BlueCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BlueCave4.inc b/data/maps/events/SecretBase_BlueCave4.inc index 75ac8b0cb..ac2bce45f 100644 --- a/data/maps/events/SecretBase_BlueCave4.inc +++ b/data/maps/events/SecretBase_BlueCave4.inc @@ -1,22 +1,22 @@ -SecretBase_BlueCave4_MapObjects:: @ 8390CD4 - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_BlueCave4_EventObjects:: @ 8390CD4 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 0, 13, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BlueCave4_MapWarps:: @ 8390E3C warp_def 4, 15, 0, 126, MAP_NONE SecretBase_BlueCave4_MapEvents:: @ 8390E44 - map_events SecretBase_BlueCave4_MapObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 + map_events SecretBase_BlueCave4_EventObjects, SecretBase_BlueCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave1.inc b/data/maps/events/SecretBase_BrownCave1.inc index 88978e210..61df99fac 100644 --- a/data/maps/events/SecretBase_BrownCave1.inc +++ b/data/maps/events/SecretBase_BrownCave1.inc @@ -1,22 +1,22 @@ -SecretBase_BrownCave1_MapObjects:: @ 838F008 - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_BrownCave1_EventObjects:: @ 838F008 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BrownCave1_MapWarps:: @ 838F170 warp_def 5, 7, 0, 126, MAP_NONE SecretBase_BrownCave1_MapEvents:: @ 838F178 - map_events SecretBase_BrownCave1_MapObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 + map_events SecretBase_BrownCave1_EventObjects, SecretBase_BrownCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave2.inc b/data/maps/events/SecretBase_BrownCave2.inc index e3648a538..51aa17e69 100644 --- a/data/maps/events/SecretBase_BrownCave2.inc +++ b/data/maps/events/SecretBase_BrownCave2.inc @@ -1,22 +1,22 @@ -SecretBase_BrownCave2_MapObjects:: @ 838F920 - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_BrownCave2_EventObjects:: @ 838F920 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 11, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BrownCave2_MapWarps:: @ 838FA88 warp_def 1, 7, 0, 126, MAP_NONE SecretBase_BrownCave2_MapEvents:: @ 838FA90 - map_events SecretBase_BrownCave2_MapObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 + map_events SecretBase_BrownCave2_EventObjects, SecretBase_BrownCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave3.inc b/data/maps/events/SecretBase_BrownCave3.inc index 7d8e140cc..8cbb4755a 100644 --- a/data/maps/events/SecretBase_BrownCave3.inc +++ b/data/maps/events/SecretBase_BrownCave3.inc @@ -1,22 +1,22 @@ -SecretBase_BrownCave3_MapObjects:: @ 8390238 - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 1, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_BrownCave3_EventObjects:: @ 8390238 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BrownCave3_MapWarps:: @ 83903A0 warp_def 11, 9, 0, 126, MAP_NONE SecretBase_BrownCave3_MapEvents:: @ 83903A8 - map_events SecretBase_BrownCave3_MapObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 + map_events SecretBase_BrownCave3_EventObjects, SecretBase_BrownCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_BrownCave4.inc b/data/maps/events/SecretBase_BrownCave4.inc index 614e20c89..10f086ef8 100644 --- a/data/maps/events/SecretBase_BrownCave4.inc +++ b/data/maps/events/SecretBase_BrownCave4.inc @@ -1,22 +1,22 @@ -SecretBase_BrownCave4_MapObjects:: @ 8390B50 - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_BrownCave4_EventObjects:: @ 8390B50 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_BrownCave4_MapWarps:: @ 8390CB8 warp_def 2, 8, 0, 126, MAP_NONE SecretBase_BrownCave4_MapEvents:: @ 8390CC0 - map_events SecretBase_BrownCave4_MapObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 + map_events SecretBase_BrownCave4_EventObjects, SecretBase_BrownCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave1.inc b/data/maps/events/SecretBase_RedCave1.inc index d9fee6da1..5284323a7 100644 --- a/data/maps/events/SecretBase_RedCave1.inc +++ b/data/maps/events/SecretBase_RedCave1.inc @@ -1,22 +1,22 @@ -SecretBase_RedCave1_MapObjects:: @ 838EE84 - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_RedCave1_EventObjects:: @ 838EE84 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_RedCave1_MapWarps:: @ 838EFEC warp_def 5, 7, 0, 126, MAP_NONE SecretBase_RedCave1_MapEvents:: @ 838EFF4 - map_events SecretBase_RedCave1_MapObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 + map_events SecretBase_RedCave1_EventObjects, SecretBase_RedCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave2.inc b/data/maps/events/SecretBase_RedCave2.inc index f73de0783..cbade9d66 100644 --- a/data/maps/events/SecretBase_RedCave2.inc +++ b/data/maps/events/SecretBase_RedCave2.inc @@ -1,22 +1,22 @@ -SecretBase_RedCave2_MapObjects:: @ 838F79C - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_RedCave2_EventObjects:: @ 838F79C + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_RedCave2_MapWarps:: @ 838F904 warp_def 3, 14, 0, 126, MAP_NONE SecretBase_RedCave2_MapEvents:: @ 838F90C - map_events SecretBase_RedCave2_MapObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 + map_events SecretBase_RedCave2_EventObjects, SecretBase_RedCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave3.inc b/data/maps/events/SecretBase_RedCave3.inc index 639207929..caa053e69 100644 --- a/data/maps/events/SecretBase_RedCave3.inc +++ b/data/maps/events/SecretBase_RedCave3.inc @@ -1,22 +1,22 @@ -SecretBase_RedCave3_MapObjects:: @ 83900B4 - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 12, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_RedCave3_EventObjects:: @ 83900B4 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 12, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_RedCave3_MapWarps:: @ 839021C warp_def 3, 6, 0, 126, MAP_NONE SecretBase_RedCave3_MapEvents:: @ 8390224 - map_events SecretBase_RedCave3_MapObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 + map_events SecretBase_RedCave3_EventObjects, SecretBase_RedCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_RedCave4.inc b/data/maps/events/SecretBase_RedCave4.inc index ffa6596a9..66f4db715 100644 --- a/data/maps/events/SecretBase_RedCave4.inc +++ b/data/maps/events/SecretBase_RedCave4.inc @@ -1,22 +1,22 @@ -SecretBase_RedCave4_MapObjects:: @ 83909CC - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_RedCave4_EventObjects:: @ 83909CC + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_RedCave4_MapWarps:: @ 8390B34 warp_def 2, 12, 0, 126, MAP_NONE SecretBase_RedCave4_MapEvents:: @ 8390B3C - map_events SecretBase_RedCave4_MapObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 + map_events SecretBase_RedCave4_EventObjects, SecretBase_RedCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub1.inc b/data/maps/events/SecretBase_Shrub1.inc index 938ad397e..5225f4be7 100644 --- a/data/maps/events/SecretBase_Shrub1.inc +++ b/data/maps/events/SecretBase_Shrub1.inc @@ -1,22 +1,22 @@ -SecretBase_Shrub1_MapObjects:: @ 838F618 - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_Shrub1_EventObjects:: @ 838F618 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Shrub1_MapWarps:: @ 838F780 warp_def 5, 7, 0, 126, MAP_NONE SecretBase_Shrub1_MapEvents:: @ 838F788 - map_events SecretBase_Shrub1_MapObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 + map_events SecretBase_Shrub1_EventObjects, SecretBase_Shrub1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub2.inc b/data/maps/events/SecretBase_Shrub2.inc index 4ea2a0a79..61175c9e2 100644 --- a/data/maps/events/SecretBase_Shrub2.inc +++ b/data/maps/events/SecretBase_Shrub2.inc @@ -1,22 +1,22 @@ -SecretBase_Shrub2_MapObjects:: @ 838FF30 - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 13, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_Shrub2_EventObjects:: @ 838FF30 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 13, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Shrub2_MapWarps:: @ 8390098 warp_def 7, 5, 0, 126, MAP_NONE SecretBase_Shrub2_MapEvents:: @ 83900A0 - map_events SecretBase_Shrub2_MapObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 + map_events SecretBase_Shrub2_EventObjects, SecretBase_Shrub2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub3.inc b/data/maps/events/SecretBase_Shrub3.inc index fb7b96483..96f92acc1 100644 --- a/data/maps/events/SecretBase_Shrub3.inc +++ b/data/maps/events/SecretBase_Shrub3.inc @@ -1,22 +1,22 @@ -SecretBase_Shrub3_MapObjects:: @ 8390848 - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_Shrub3_EventObjects:: @ 8390848 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Shrub3_MapWarps:: @ 83909B0 warp_def 6, 9, 0, 126, MAP_NONE SecretBase_Shrub3_MapEvents:: @ 83909B8 - map_events SecretBase_Shrub3_MapObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 + map_events SecretBase_Shrub3_EventObjects, SecretBase_Shrub3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Shrub4.inc b/data/maps/events/SecretBase_Shrub4.inc index 0e79ed287..a727555b8 100644 --- a/data/maps/events/SecretBase_Shrub4.inc +++ b/data/maps/events/SecretBase_Shrub4.inc @@ -1,22 +1,22 @@ -SecretBase_Shrub4_MapObjects:: @ 8391160 - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 9, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_Shrub4_EventObjects:: @ 8391160 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 0, 7, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Shrub4_MapWarps:: @ 83912C8 warp_def 11, 8, 0, 126, MAP_NONE SecretBase_Shrub4_MapEvents:: @ 83912D0 - map_events SecretBase_Shrub4_MapObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 + map_events SecretBase_Shrub4_EventObjects, SecretBase_Shrub4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree1.inc b/data/maps/events/SecretBase_Tree1.inc index af6c46e00..a3464e8d2 100644 --- a/data/maps/events/SecretBase_Tree1.inc +++ b/data/maps/events/SecretBase_Tree1.inc @@ -1,22 +1,22 @@ -SecretBase_Tree1_MapObjects:: @ 838F494 - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_Tree1_EventObjects:: @ 838F494 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Tree1_MapWarps:: @ 838F5FC warp_def 5, 7, 0, 126, MAP_NONE SecretBase_Tree1_MapEvents:: @ 838F604 - map_events SecretBase_Tree1_MapObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 + map_events SecretBase_Tree1_EventObjects, SecretBase_Tree1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree2.inc b/data/maps/events/SecretBase_Tree2.inc index 47ee02e45..eab1c676d 100644 --- a/data/maps/events/SecretBase_Tree2.inc +++ b/data/maps/events/SecretBase_Tree2.inc @@ -1,22 +1,22 @@ -SecretBase_Tree2_MapObjects:: @ 838FDAC - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_Tree2_EventObjects:: @ 838FDAC + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Tree2_MapWarps:: @ 838FF14 warp_def 3, 14, 0, 126, MAP_NONE SecretBase_Tree2_MapEvents:: @ 838FF1C - map_events SecretBase_Tree2_MapObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 + map_events SecretBase_Tree2_EventObjects, SecretBase_Tree2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree3.inc b/data/maps/events/SecretBase_Tree3.inc index 972530141..833e01691 100644 --- a/data/maps/events/SecretBase_Tree3.inc +++ b/data/maps/events/SecretBase_Tree3.inc @@ -1,22 +1,22 @@ -SecretBase_Tree3_MapObjects:: @ 83906C4 - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_Tree3_EventObjects:: @ 83906C4 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Tree3_MapWarps:: @ 839082C warp_def 8, 6, 0, 126, MAP_NONE SecretBase_Tree3_MapEvents:: @ 8390834 - map_events SecretBase_Tree3_MapObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 + map_events SecretBase_Tree3_EventObjects, SecretBase_Tree3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_Tree4.inc b/data/maps/events/SecretBase_Tree4.inc index 3746c569a..d2a74e117 100644 --- a/data/maps/events/SecretBase_Tree4.inc +++ b/data/maps/events/SecretBase_Tree4.inc @@ -1,22 +1,22 @@ -SecretBase_Tree4_MapObjects:: @ 8390FDC - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 10, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_Tree4_EventObjects:: @ 8390FDC + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 10, 0, 9, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_Tree4_MapWarps:: @ 8391144 warp_def 7, 12, 0, 126, MAP_NONE SecretBase_Tree4_MapEvents:: @ 839114C - map_events SecretBase_Tree4_MapObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 + map_events SecretBase_Tree4_EventObjects, SecretBase_Tree4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave1.inc b/data/maps/events/SecretBase_YellowCave1.inc index 036dfaa42..aeadee5be 100644 --- a/data/maps/events/SecretBase_YellowCave1.inc +++ b/data/maps/events/SecretBase_YellowCave1.inc @@ -1,22 +1,22 @@ -SecretBase_YellowCave1_MapObjects:: @ 838F310 - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_YellowCave1_EventObjects:: @ 838F310 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_YellowCave1_MapWarps:: @ 838F478 warp_def 5, 7, 0, 126, MAP_NONE SecretBase_YellowCave1_MapEvents:: @ 838F480 - map_events SecretBase_YellowCave1_MapObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 + map_events SecretBase_YellowCave1_EventObjects, SecretBase_YellowCave1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave2.inc b/data/maps/events/SecretBase_YellowCave2.inc index cf7fa415e..5fcea03c6 100644 --- a/data/maps/events/SecretBase_YellowCave2.inc +++ b/data/maps/events/SecretBase_YellowCave2.inc @@ -1,22 +1,22 @@ -SecretBase_YellowCave2_MapObjects:: @ 838FC28 - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_YellowCave2_EventObjects:: @ 838FC28 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_YellowCave2_MapWarps:: @ 838FD90 warp_def 12, 7, 0, 126, MAP_NONE SecretBase_YellowCave2_MapEvents:: @ 838FD98 - map_events SecretBase_YellowCave2_MapObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 + map_events SecretBase_YellowCave2_EventObjects, SecretBase_YellowCave2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave3.inc b/data/maps/events/SecretBase_YellowCave3.inc index 6fc48d147..f91257073 100644 --- a/data/maps/events/SecretBase_YellowCave3.inc +++ b/data/maps/events/SecretBase_YellowCave3.inc @@ -1,22 +1,22 @@ -SecretBase_YellowCave3_MapObjects:: @ 8390540 - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_YellowCave3_EventObjects:: @ 8390540 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_YellowCave3_MapWarps:: @ 83906A8 warp_def 5, 9, 0, 126, MAP_NONE SecretBase_YellowCave3_MapEvents:: @ 83906B0 - map_events SecretBase_YellowCave3_MapObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 + map_events SecretBase_YellowCave3_EventObjects, SecretBase_YellowCave3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SecretBase_YellowCave4.inc b/data/maps/events/SecretBase_YellowCave4.inc index e63dbdb0b..2076c49ee 100644 --- a/data/maps/events/SecretBase_YellowCave4.inc +++ b/data/maps/events/SecretBase_YellowCave4.inc @@ -1,22 +1,22 @@ -SecretBase_YellowCave4_MapObjects:: @ 8390E58 - object_event 1, MAP_OBJ_GFX_VAR_F, 0, 9, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 - object_event 8, MAP_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 - object_event 9, MAP_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 - object_event 10, MAP_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 - object_event 11, MAP_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 - object_event 12, MAP_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 - object_event 14, MAP_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 - object_event 15, MAP_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 +SecretBase_YellowCave4_EventObjects:: @ 8390E58 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 0, 8, 0, 3, 8, 0, 0, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, FLAG_DECORATION_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7, 0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8, 0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9, 0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10, 0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11, 0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13, 0, 0 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 0, 5, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14, 0, 0 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15, 0, 0 SecretBase_YellowCave4_MapWarps:: @ 8390FC0 warp_def 6, 12, 0, 126, MAP_NONE SecretBase_YellowCave4_MapEvents:: @ 8390FC8 - map_events SecretBase_YellowCave4_MapObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 + map_events SecretBase_YellowCave4_EventObjects, SecretBase_YellowCave4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc index 8d38fb3ee..f02848ceb 100644 --- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc @@ -1,6 +1,6 @@ -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, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1, 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_EventObjects:: @ 838DCDC + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_1B19F6, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1, 0, 0 + object_event 2, EVENT_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, MAP_ROUTE125 @@ -9,4 +9,4 @@ ShoalCave_LowTideEntranceRoom_MapWarps:: @ 838DD0C warp_def 27, 2, 3, 7, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM ShoalCave_LowTideEntranceRoom_MapEvents:: @ 838DD2C - map_events ShoalCave_LowTideEntranceRoom_MapObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 + map_events ShoalCave_LowTideEntranceRoom_EventObjects, ShoalCave_LowTideEntranceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideIceRoom.inc b/data/maps/events/ShoalCave_LowTideIceRoom.inc index 6e1b36d08..cd59c665b 100644 --- a/data/maps/events/ShoalCave_LowTideIceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideIceRoom.inc @@ -1,9 +1,9 @@ -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, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1, 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, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_2, 0, 0 +ShoalCave_LowTideIceRoom_EventObjects:: @ 838EDE0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A1D, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 0, 21, 0, 4, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_2, 0, 0 ShoalCave_LowTideIceRoom_MapWarps:: @ 838EE10 warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM ShoalCave_LowTideIceRoom_MapEvents:: @ 838EE18 - map_events ShoalCave_LowTideIceRoom_MapObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 + map_events ShoalCave_LowTideIceRoom_EventObjects, ShoalCave_LowTideIceRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ShoalCave_LowTideInnerRoom.inc b/data/maps/events/ShoalCave_LowTideInnerRoom.inc index c699b5e11..2576b5eb1 100644 --- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideInnerRoom.inc @@ -1,5 +1,5 @@ -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, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_INNER_ROOM_1, 0, 0 +ShoalCave_LowTideInnerRoom_EventObjects:: @ 838DD40 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 0, 14, 0, 5, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_INNER_ROOM_1, 0, 0 ShoalCave_LowTideInnerRoom_MapWarps:: @ 838DD58 warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM @@ -20,4 +20,4 @@ ShoalCave_LowTideInnerRoom_MapBGEvents:: @ 838DD98 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 + map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents diff --git a/data/maps/events/ShoalCave_LowTideLowerRoom.inc b/data/maps/events/ShoalCave_LowTideLowerRoom.inc index ba5a0f495..a95bec17c 100644 --- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc @@ -1,6 +1,6 @@ -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, S_PushableBoulder, FLAG_TEMP_11, 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_EventObjects:: @ 838DE3C + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 0, 3, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 2, EVENT_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, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM @@ -12,4 +12,4 @@ 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 + map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents diff --git a/data/maps/events/ShoalCave_LowTideStairsRoom.inc b/data/maps/events/ShoalCave_LowTideStairsRoom.inc index f4027a22f..135d23273 100644 --- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc +++ b/data/maps/events/ShoalCave_LowTideStairsRoom.inc @@ -1,5 +1,5 @@ -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, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM_1, 0, 0 +ShoalCave_LowTideStairsRoom_EventObjects:: @ 838DDF4 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 0, 12, 0, 3, 1, 17, 0, 0, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM_1, 0, 0 ShoalCave_LowTideStairsRoom_MapWarps:: @ 838DE0C warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM @@ -9,4 +9,4 @@ 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 + map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents diff --git a/data/maps/events/SingleBattleColosseum.inc b/data/maps/events/SingleBattleColosseum.inc index 321653635..a6dae88b2 100644 --- a/data/maps/events/SingleBattleColosseum.inc +++ b/data/maps/events/SingleBattleColosseum.inc @@ -1,5 +1,5 @@ -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_EventObjects:: @ 83912E4 + object_event 1, EVENT_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, MAP_NONE @@ -10,4 +10,4 @@ SingleBattleColosseum_MapCoordEvents:: @ 839130C coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A4379 SingleBattleColosseum_MapEvents:: @ 839132C - map_events SingleBattleColosseum_MapObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 + map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc index 5d5fc52d4..3189195d8 100644 --- a/data/maps/events/SkyPillar_Top.inc +++ b/data/maps/events/SkyPillar_Top.inc @@ -1,8 +1,8 @@ -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, FLAG_HIDE_RAYQUAZA, 0, 0 +SkyPillar_Top_EventObjects:: @ 838EE50 + object_event 1, EVENT_OBJ_GFX_RAYQUAZA, 0, 14, 0, 6, 0, 3, 8, 17, 0, 0, 0, 0, 0, SkyPillar_Top_EventScript_15F316, FLAG_HIDE_RAYQUAZA, 0, 0 SkyPillar_Top_MapWarps:: @ 838EE68 warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F SkyPillar_Top_MapEvents:: @ 838EE70 - map_events SkyPillar_Top_MapObjects, SkyPillar_Top_MapWarps, 0x0, 0x0 + map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc index 05b59b576..97ee3f11b 100644 --- a/data/maps/events/SlateportCity.inc +++ b/data/maps/events/SlateportCity.inc @@ -1,35 +1,35 @@ -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, MAP_OBJ_GFX_VAR_0, 0, 31, 0, 27, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 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, FLAG_HIDE_GABBY_AND_TY_SLATEPORT, 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, FLAG_HIDE_GABBY_AND_TY_SLATEPORT, 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, FLAG_HIDE_STERN_SLATEPORT, 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, MAP_OBJ_GFX_VAR_1, 0, 30, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 - object_event 20, MAP_OBJ_GFX_VAR_1, 0, 29, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 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, FLAG_HIDE_TM_SALESMAN_SLATEPORT, 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, MAP_OBJ_GFX_VAR_1, 0, 22, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 - object_event 28, MAP_OBJ_GFX_VAR_1, 0, 23, 0, 27, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 - object_event 29, MAP_OBJ_GFX_VAR_1, 0, 24, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDAD, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 - object_event 30, MAP_OBJ_GFX_VAR_1, 0, 21, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDC4, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 - object_event 31, MAP_OBJ_GFX_VAR_1, 0, 20, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDDB, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 +SlateportCity_EventObjects:: @ 837F7AC + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_VAR_0, 0, 31, 0, 27, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 6, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 0, 13, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C017, FLAG_HIDE_GABBY_AND_TY_SLATEPORT, 0, 0 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 0, 14, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14C020, FLAG_HIDE_GABBY_AND_TY_SLATEPORT, 0, 0 + object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 0, 13, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, FLAG_HIDE_STERN_SLATEPORT, 0, 0 + object_event 12, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_VAR_1, 0, 30, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 20, EVENT_OBJ_GFX_VAR_1, 0, 29, 0, 27, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 21, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 0, 47, 0, 3, 8, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BE9A, FLAG_HIDE_TM_SALESMAN_SLATEPORT, 0, 0 + object_event 26, EVENT_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, EVENT_OBJ_GFX_VAR_1, 0, 22, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 28, EVENT_OBJ_GFX_VAR_1, 0, 23, 0, 27, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 29, EVENT_OBJ_GFX_VAR_1, 0, 24, 0, 27, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDAD, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 30, EVENT_OBJ_GFX_VAR_1, 0, 21, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDC4, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 + object_event 31, EVENT_OBJ_GFX_VAR_1, 0, 20, 0, 26, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_EventScript_14BDDB, FLAG_HIDE_EVIL_TEAM_SLATEPORT, 0, 0 SlateportCity_MapWarps:: @ 837FA94 warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F @@ -59,4 +59,4 @@ SlateportCity_MapBGEvents:: @ 837FAEC bg_event 23, 38, 0, 0, 0, SlateportCity_EventScript_14BC3C SlateportCity_MapEvents:: @ 837FB7C - map_events SlateportCity_MapObjects, SlateportCity_MapWarps, 0x0, SlateportCity_MapBGEvents + map_events SlateportCity_EventObjects, SlateportCity_MapWarps, 0x0, SlateportCity_MapBGEvents diff --git a/data/maps/events/SlateportCity_ContestHall.inc b/data/maps/events/SlateportCity_ContestHall.inc index 6bb6a4285..3ecb4980f 100644 --- a/data/maps/events/SlateportCity_ContestHall.inc +++ b/data/maps/events/SlateportCity_ContestHall.inc @@ -1,17 +1,17 @@ -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_EventObjects:: @ 83878A4 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_SLATEPORT_CITY_CONTEST_LOBBY @@ -22,4 +22,4 @@ SlateportCity_ContestHall_MapBGEvents:: @ 83879EC 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 + map_events SlateportCity_ContestHall_EventObjects, SlateportCity_ContestHall_MapWarps, 0x0, SlateportCity_ContestHall_MapBGEvents diff --git a/data/maps/events/SlateportCity_ContestLobby.inc b/data/maps/events/SlateportCity_ContestLobby.inc index 0c701e0ca..003893c52 100644 --- a/data/maps/events/SlateportCity_ContestLobby.inc +++ b/data/maps/events/SlateportCity_ContestLobby.inc @@ -1,12 +1,12 @@ -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, FLAG_HIDE_CONTEST_REPORTER_SLATEPORT, 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_EventObjects:: @ 8387788 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_SLATEPORT, 0, 0 + object_event 6, EVENT_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, EVENT_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, EVENT_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, MAP_SLATEPORT_CITY @@ -20,4 +20,4 @@ SlateportCity_ContestLobby_MapBGEvents:: @ 8387860 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 + map_events SlateportCity_ContestLobby_EventObjects, SlateportCity_ContestLobby_MapWarps, 0x0, SlateportCity_ContestLobby_MapBGEvents diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc index 77f0735cd..49c0d95bb 100644 --- a/data/maps/events/SlateportCity_Harbor.inc +++ b/data/maps/events/SlateportCity_Harbor.inc @@ -1,12 +1,12 @@ -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, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 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, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 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, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 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, FLAG_HIDE_STERN_SLATEPORT_HARBOR, 0, 0 - object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_1, 0, 7, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR, 0, 0 - object_event 7, MAP_OBJ_GFX_VAR_6, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR, 0, 0 - object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR, 0, 0 +SlateportCity_Harbor_EventObjects:: @ 8387F30 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 0, 10, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 0, 12, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 0, 12, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR, 0, 0 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 0, 13, 0, 3, 1, 0, 0, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, FLAG_HIDE_STERN_SLATEPORT_HARBOR, 0, 0 + object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 7, 0, 10, 0, 3, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR, 0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 8, 0, 10, 0, 3, 9, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR, 0, 0 + object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 0, 9, 0, 1, 10, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR, 0, 0 SlateportCity_Harbor_MapWarps:: @ 8387FF0 warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY @@ -21,4 +21,4 @@ SlateportCity_Harbor_MapCoordEvents:: @ 8388010 coord_event 8, 14, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FBF SlateportCity_Harbor_MapEvents:: @ 8388050 - map_events SlateportCity_Harbor_MapObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 + map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 diff --git a/data/maps/events/SlateportCity_House1.inc b/data/maps/events/SlateportCity_House1.inc index 6f5f72944..9421b8b73 100644 --- a/data/maps/events/SlateportCity_House1.inc +++ b/data/maps/events/SlateportCity_House1.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 8387A18 + object_event 1, EVENT_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, MAP_SLATEPORT_CITY warp_def 4, 7, 0, 6, MAP_SLATEPORT_CITY SlateportCity_House1_MapEvents:: @ 8387A40 - map_events SlateportCity_House1_MapObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 + map_events SlateportCity_House1_EventObjects, SlateportCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_House2.inc b/data/maps/events/SlateportCity_House2.inc index ae3f01900..e5e2a4a34 100644 --- a/data/maps/events/SlateportCity_House2.inc +++ b/data/maps/events/SlateportCity_House2.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8388064 + object_event 1, EVENT_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, EVENT_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, MAP_SLATEPORT_CITY warp_def 4, 7, 0, 10, MAP_SLATEPORT_CITY SlateportCity_House2_MapEvents:: @ 83880A4 - map_events SlateportCity_House2_MapObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 + map_events SlateportCity_House2_EventObjects, SlateportCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_Mart.inc b/data/maps/events/SlateportCity_Mart.inc index ae111b933..add4d634e 100644 --- a/data/maps/events/SlateportCity_Mart.inc +++ b/data/maps/events/SlateportCity_Mart.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 83881B0 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_SLATEPORT_CITY warp_def 4, 7, 0, 1, MAP_SLATEPORT_CITY SlateportCity_Mart_MapEvents:: @ 8388208 - map_events SlateportCity_Mart_MapObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 + map_events SlateportCity_Mart_EventObjects, SlateportCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc index b432f3c3e..1b80e02d0 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_1F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_1F.inc @@ -1,18 +1,18 @@ -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, MAP_OBJ_GFX_VAR_1, 0, 18, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_1, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 - object_event 5, MAP_OBJ_GFX_VAR_0, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 - object_event 6, MAP_OBJ_GFX_VAR_1, 0, 14, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 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, MAP_OBJ_GFX_VAR_1, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 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, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 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, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 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, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 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, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 - object_event 13, MAP_OBJ_GFX_VAR_1, 0, 9, 0, 4, 0, 3, 21, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM, 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, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 +SlateportCity_OceanicMuseum_1F_EventObjects:: @ 8387B38 + object_event 1, EVENT_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, EVENT_OBJ_GFX_VAR_1, 0, 18, 0, 5, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 12, 0, 2, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 2, 0, 8, 0, 3, 7, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_0, 0, 3, 0, 4, 0, 3, 9, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 0, 4, 0, 3, 10, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 7, EVENT_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, EVENT_OBJ_GFX_VAR_1, 0, 8, 0, 3, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM, 0, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 + object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 0, 2, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 + object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 + object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 0, 8, 0, 3, 7, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 + object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 9, 0, 4, 0, 3, 21, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM, 0, 0 + object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88 warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY @@ -39,4 +39,4 @@ SlateportCity_OceanicMuseum_1F_MapBGEvents:: @ 8387CC0 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 + map_events SlateportCity_OceanicMuseum_1F_EventObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents diff --git a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc index 490c3697f..1aeddb41b 100644 --- a/data/maps/events/SlateportCity_OceanicMuseum_2F.inc +++ b/data/maps/events/SlateportCity_OceanicMuseum_2F.inc @@ -1,11 +1,11 @@ -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, FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_6, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F, 0, 0 - object_event 3, MAP_OBJ_GFX_VAR_1, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F, 0, 0 - object_event 4, MAP_OBJ_GFX_VAR_1, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F, 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, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 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, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 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, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 +SlateportCity_OceanicMuseum_2F_EventObjects:: @ 8387D70 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 0, 6, 0, 3, 8, 0, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F, 0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F, 0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F, 0, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 0, 7, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 0, 3, 0, 3, 10, 17, 0, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS, 0, 0 SlateportCity_OceanicMuseum_2F_MapWarps:: @ 8387E18 warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F @@ -34,4 +34,4 @@ SlateportCity_OceanicMuseum_2F_MapBGEvents:: @ 8387E20 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 + map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents diff --git a/data/maps/events/SlateportCity_PokemonCenter_1F.inc b/data/maps/events/SlateportCity_PokemonCenter_1F.inc index bdfabe5c6..5606731fb 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_1F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_1F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 83880B8 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_SLATEPORT_CITY @@ -9,4 +9,4 @@ SlateportCity_PokemonCenter_1F_MapWarps:: @ 8388100 warp_def 1, 6, 4, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_2F SlateportCity_PokemonCenter_1F_MapEvents:: @ 8388118 - map_events SlateportCity_PokemonCenter_1F_MapObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events SlateportCity_PokemonCenter_1F_EventObjects, SlateportCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_PokemonCenter_2F.inc b/data/maps/events/SlateportCity_PokemonCenter_2F.inc index 2ecc48423..585d4ec51 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_2F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 838812C + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F @@ -11,4 +11,4 @@ SlateportCity_PokemonCenter_2F_MapWarps:: @ 8388174 warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM SlateportCity_PokemonCenter_2F_MapEvents:: @ 838819C - map_events SlateportCity_PokemonCenter_2F_MapObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events SlateportCity_PokemonCenter_2F_EventObjects, SlateportCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_PokemonFanClub.inc b/data/maps/events/SlateportCity_PokemonFanClub.inc index 481886da8..4efb35edf 100644 --- a/data/maps/events/SlateportCity_PokemonFanClub.inc +++ b/data/maps/events/SlateportCity_PokemonFanClub.inc @@ -1,16 +1,16 @@ -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_EventObjects:: @ 8387A54 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_SLATEPORT_CITY warp_def 7, 10, 0, 4, MAP_SLATEPORT_CITY SlateportCity_PokemonFanClub_MapEvents:: @ 8387B24 - map_events SlateportCity_PokemonFanClub_MapObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 + map_events SlateportCity_PokemonFanClub_EventObjects, SlateportCity_PokemonFanClub_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_SternsShipyard_1F.inc b/data/maps/events/SlateportCity_SternsShipyard_1F.inc index a20a2f1b6..cfd9c4f51 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_1F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_1F.inc @@ -1,8 +1,8 @@ -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, FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD, 0, 0 +SlateportCity_SternsShipyard_1F_EventObjects:: @ 8387698 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 0, 11, 0, 3, 2, 33, 0, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD, 0, 0 SlateportCity_SternsShipyard_1F_MapWarps:: @ 83876F8 warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY @@ -10,4 +10,4 @@ SlateportCity_SternsShipyard_1F_MapWarps:: @ 83876F8 warp_def 3, 1, 0, 0, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_2F SlateportCity_SternsShipyard_1F_MapEvents:: @ 8387710 - map_events SlateportCity_SternsShipyard_1F_MapObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0 + map_events SlateportCity_SternsShipyard_1F_EventObjects, SlateportCity_SternsShipyard_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_SternsShipyard_2F.inc b/data/maps/events/SlateportCity_SternsShipyard_2F.inc index e6d3e7636..56b7d66a2 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_2F.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8387724 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 0, 7, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_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, EVENT_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, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F SlateportCity_SternsShipyard_2F_MapEvents:: @ 8387774 - map_events SlateportCity_SternsShipyard_2F_MapObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 + map_events SlateportCity_SternsShipyard_2F_EventObjects, SlateportCity_SternsShipyard_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity.inc b/data/maps/events/SootopolisCity.inc index e725b8e80..7dbf87d44 100644 --- a/data/maps/events/SootopolisCity.inc +++ b/data/maps/events/SootopolisCity.inc @@ -1,15 +1,15 @@ -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, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1, 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, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2, 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, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 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, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 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, FLAG_HIDE_WALLACE_SOOTOPOLIS, 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, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 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, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 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, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 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, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 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, FLAG_HIDE_STEVEN_SOOTOPOLIS, 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, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 +SootopolisCity_EventObjects:: @ 8380608 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 29, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1, 0, 0 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 33, 0, 20, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 36, 0, 21, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 0, 42, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 5, EVENT_OBJ_GFX_WALLACE, 0, 32, 0, 21, 0, 3, 9, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, FLAG_HIDE_WALLACE_SOOTOPOLIS, 0, 0 + object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 9, 0, 43, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D19F, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 51, 0, 14, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 8, EVENT_OBJ_GFX_BOY_1, 0, 43, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAN_1, 0, 26, 0, 4, 0, 3, 5, 1, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D287, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 + object_event 10, EVENT_OBJ_GFX_STEVEN, 0, 30, 0, 21, 0, 3, 10, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D498, FLAG_HIDE_STEVEN_SOOTOPOLIS, 0, 0 + object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 49, 0, 34, 0, 3, 3, 17, 0, 0, 0, 0, 0, SootopolisCity_EventScript_14D2A6, FLAG_HIDE_SOOTOPOLIS_RESIDENTS, 0, 0 SootopolisCity_MapWarps:: @ 8380710 warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F @@ -37,4 +37,4 @@ SootopolisCity_MapBGEvents:: @ 8380780 bg_event 41, 37, 0, 0, 0, SootopolisCity_EventScript_14D2F6 SootopolisCity_MapEvents:: @ 83807C8 - map_events SootopolisCity_MapObjects, SootopolisCity_MapWarps, SootopolisCity_MapCoordEvents, SootopolisCity_MapBGEvents + map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, SootopolisCity_MapCoordEvents, SootopolisCity_MapBGEvents diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc index 4e655191d..942a135c7 100644 --- a/data/maps/events/SootopolisCity_Gym_1F.inc +++ b/data/maps/events/SootopolisCity_Gym_1F.inc @@ -1,6 +1,6 @@ -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, FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM, 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_EventObjects:: @ 838ACF0 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 8, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM, 0, 0 + object_event 2, EVENT_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, MAP_SOOTOPOLIS_CITY @@ -12,4 +12,4 @@ SootopolisCity_Gym_1F_MapBGEvents:: @ 838AD38 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 + map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents diff --git a/data/maps/events/SootopolisCity_Gym_B1F.inc b/data/maps/events/SootopolisCity_Gym_B1F.inc index a1f3c92cb..b063ebe95 100644 --- a/data/maps/events/SootopolisCity_Gym_B1F.inc +++ b/data/maps/events/SootopolisCity_Gym_B1F.inc @@ -1,15 +1,15 @@ -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_EventObjects:: @ 838AD64 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_SOOTOPOLIS_CITY_GYM_1F SootopolisCity_Gym_B1F_MapEvents:: @ 838AE2C - map_events SootopolisCity_Gym_B1F_MapObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 + map_events SootopolisCity_Gym_B1F_EventObjects, SootopolisCity_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House1.inc b/data/maps/events/SootopolisCity_House1.inc index fc6a57516..9b9a583c5 100644 --- a/data/maps/events/SootopolisCity_House1.inc +++ b/data/maps/events/SootopolisCity_House1.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 838AFA4 + object_event 1, EVENT_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, EVENT_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, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 4, MAP_SOOTOPOLIS_CITY SootopolisCity_House1_MapEvents:: @ 838AFE4 - map_events SootopolisCity_House1_MapObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 + map_events SootopolisCity_House1_EventObjects, SootopolisCity_House1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House2.inc b/data/maps/events/SootopolisCity_House2.inc index 5fac2c45e..4e3e51d69 100644 --- a/data/maps/events/SootopolisCity_House2.inc +++ b/data/maps/events/SootopolisCity_House2.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 838AFF8 + object_event 1, EVENT_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, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 5, MAP_SOOTOPOLIS_CITY SootopolisCity_House2_MapEvents:: @ 838B020 - map_events SootopolisCity_House2_MapObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 + map_events SootopolisCity_House2_EventObjects, SootopolisCity_House2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House3.inc b/data/maps/events/SootopolisCity_House3.inc index 343bc0d2b..9908934b5 100644 --- a/data/maps/events/SootopolisCity_House3.inc +++ b/data/maps/events/SootopolisCity_House3.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 838B034 + object_event 1, EVENT_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, EVENT_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, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 6, MAP_SOOTOPOLIS_CITY SootopolisCity_House3_MapEvents:: @ 838B074 - map_events SootopolisCity_House3_MapObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 + map_events SootopolisCity_House3_EventObjects, SootopolisCity_House3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House4.inc b/data/maps/events/SootopolisCity_House4.inc index f50aa1fe1..94cb33ea0 100644 --- a/data/maps/events/SootopolisCity_House4.inc +++ b/data/maps/events/SootopolisCity_House4.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 838B088 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 7, MAP_SOOTOPOLIS_CITY SootopolisCity_House4_MapEvents:: @ 838B0E0 - map_events SootopolisCity_House4_MapObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 + map_events SootopolisCity_House4_EventObjects, SootopolisCity_House4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House5.inc b/data/maps/events/SootopolisCity_House5.inc index f574443e8..cf5eedf4d 100644 --- a/data/maps/events/SootopolisCity_House5.inc +++ b/data/maps/events/SootopolisCity_House5.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 838B0F4 + object_event 1, EVENT_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, EVENT_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, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 8, MAP_SOOTOPOLIS_CITY SootopolisCity_House5_MapEvents:: @ 838B134 - map_events SootopolisCity_House5_MapObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 + map_events SootopolisCity_House5_EventObjects, SootopolisCity_House5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House6.inc b/data/maps/events/SootopolisCity_House6.inc index a943baf27..bde7a4006 100644 --- a/data/maps/events/SootopolisCity_House6.inc +++ b/data/maps/events/SootopolisCity_House6.inc @@ -1,9 +1,9 @@ -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_EventObjects:: @ 838B148 + object_event 1, EVENT_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, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 9, MAP_SOOTOPOLIS_CITY SootopolisCity_House6_MapEvents:: @ 838B170 - map_events SootopolisCity_House6_MapObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 + map_events SootopolisCity_House6_EventObjects, SootopolisCity_House6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House7.inc b/data/maps/events/SootopolisCity_House7.inc index f1ac930cc..198289c1b 100644 --- a/data/maps/events/SootopolisCity_House7.inc +++ b/data/maps/events/SootopolisCity_House7.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 838B184 + object_event 1, EVENT_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, EVENT_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, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 10, MAP_SOOTOPOLIS_CITY SootopolisCity_House7_MapEvents:: @ 838B1C4 - map_events SootopolisCity_House7_MapObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 + map_events SootopolisCity_House7_EventObjects, SootopolisCity_House7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_House8.inc b/data/maps/events/SootopolisCity_House8.inc index b6f35a8d0..60897423f 100644 --- a/data/maps/events/SootopolisCity_House8.inc +++ b/data/maps/events/SootopolisCity_House8.inc @@ -1,6 +1,6 @@ -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_EventObjects:: @ 838B1D8 + object_event 1, EVENT_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, EVENT_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, MAP_SOOTOPOLIS_CITY @@ -11,4 +11,4 @@ SootopolisCity_House8_MapBGEvents:: @ 838B218 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 + map_events SootopolisCity_House8_EventObjects, SootopolisCity_House8_MapWarps, 0x0, SootopolisCity_House8_MapBGEvents diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/events/SootopolisCity_Mart.inc index 0cc9dc532..42f6f94a7 100644 --- a/data/maps/events/SootopolisCity_Mart.inc +++ b/data/maps/events/SootopolisCity_Mart.inc @@ -1,11 +1,11 @@ -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_EventObjects:: @ 838AF38 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_SOOTOPOLIS_CITY warp_def 4, 7, 0, 1, MAP_SOOTOPOLIS_CITY SootopolisCity_Mart_MapEvents:: @ 838AF90 - map_events SootopolisCity_Mart_MapObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 + map_events SootopolisCity_Mart_EventObjects, SootopolisCity_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc index 94091956e..aa2febcc2 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 838AE40 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_SOOTOPOLIS_CITY @@ -9,4 +9,4 @@ SootopolisCity_PokemonCenter_1F_MapWarps:: @ 838AE88 warp_def 1, 6, 4, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_2F SootopolisCity_PokemonCenter_1F_MapEvents:: @ 838AEA0 - map_events SootopolisCity_PokemonCenter_1F_MapObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events SootopolisCity_PokemonCenter_1F_EventObjects, SootopolisCity_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc index 4ce8631e8..8b6107733 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 838AEB4 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F @@ -11,4 +11,4 @@ SootopolisCity_PokemonCenter_2F_MapWarps:: @ 838AEFC warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM SootopolisCity_PokemonCenter_2F_MapEvents:: @ 838AF24 - map_events SootopolisCity_PokemonCenter_2F_MapObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events SootopolisCity_PokemonCenter_2F_EventObjects, SootopolisCity_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SouthernIsland_Exterior.inc b/data/maps/events/SouthernIsland_Exterior.inc index da65af081..c1560ddee 100644 --- a/data/maps/events/SouthernIsland_Exterior.inc +++ b/data/maps/events/SouthernIsland_Exterior.inc @@ -1,6 +1,6 @@ -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_EventObjects:: @ 8391E00 + object_event 1, EVENT_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, EVENT_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, MAP_SOUTHERN_ISLAND_INTERIOR @@ -10,4 +10,4 @@ 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 + map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents diff --git a/data/maps/events/SouthernIsland_Interior.inc b/data/maps/events/SouthernIsland_Interior.inc index 065c11315..6f41cd9f3 100644 --- a/data/maps/events/SouthernIsland_Interior.inc +++ b/data/maps/events/SouthernIsland_Interior.inc @@ -1,6 +1,6 @@ -SouthernIsland_Interior_MapObjects:: @ 8391E60 - object_event 1, MAP_OBJ_GFX_VAR_0, 0, 13, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_FLYING, 0, 0 - object_event 2, MAP_OBJ_GFX_VAR_1, 0, 13, 0, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY, 0, 0 +SouthernIsland_Interior_EventObjects:: @ 8391E60 + object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 13, 0, 12, 0, 3, 7, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_FLYING, 0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 13, 0, 2, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY, 0, 0 SouthernIsland_Interior_MapWarps:: @ 8391E90 warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR @@ -10,4 +10,4 @@ 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 + map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc index cae954321..e59aea71a 100644 --- a/data/maps/events/TradeCenter.inc +++ b/data/maps/events/TradeCenter.inc @@ -1,5 +1,5 @@ -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_EventObjects:: @ 8391340 + object_event 1, EVENT_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, MAP_NONE @@ -10,4 +10,4 @@ TradeCenter_MapCoordEvents:: @ 8391368 coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43FA TradeCenter_MapEvents:: @ 8391388 - map_events TradeCenter_MapObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 + map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/events/Underwater_SeafloorCavern.inc index fa8c12c65..fbede2e15 100644 --- a/data/maps/events/Underwater_SeafloorCavern.inc +++ b/data/maps/events/Underwater_SeafloorCavern.inc @@ -1,11 +1,11 @@ -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, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 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, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 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, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 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, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0 +Underwater_SeafloorCavern_EventObjects:: @ 838D018 + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0 + object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0 + object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0 + object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 0, 4, 0, 3, 76, 17, 0, 0, 0, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION, 0, 0 Underwater_SeafloorCavern_MapWarps:: @ 838D078 warp_def 6, 7, 0, 0, MAP_UNDERWATER4 Underwater_SeafloorCavern_MapEvents:: @ 838D080 - map_events Underwater_SeafloorCavern_MapObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 + map_events Underwater_SeafloorCavern_EventObjects, Underwater_SeafloorCavern_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/events/UnknownMap_25_34.inc index f3778b3eb..7cca882bc 100644 --- a/data/maps/events/UnknownMap_25_34.inc +++ b/data/maps/events/UnknownMap_25_34.inc @@ -1,2 +1,2 @@ UnknownMap_25_34_MapEvents:: @ 8391604 - map_events LinkContestRoom1_MapObjects, 0x0, 0x0, 0x0 + map_events LinkContestRoom1_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown.inc b/data/maps/events/VerdanturfTown.inc index b8f74073e..51557480a 100644 --- a/data/maps/events/VerdanturfTown.inc +++ b/data/maps/events/VerdanturfTown.inc @@ -1,8 +1,8 @@ -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_EventObjects:: @ 8380F00 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_VERDANTURF_TOWN_CONTEST_LOBBY @@ -24,4 +24,4 @@ VerdanturfTown_MapBGEvents:: @ 8380F98 bg_event 7, 3, 0, 0, 0, VerdanturfTown_EventScript_14E8E5 VerdanturfTown_MapEvents:: @ 8380FF8 - map_events VerdanturfTown_MapObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents + map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents diff --git a/data/maps/events/VerdanturfTown_ContestHall.inc b/data/maps/events/VerdanturfTown_ContestHall.inc index 4e21027c4..cec6f89d0 100644 --- a/data/maps/events/VerdanturfTown_ContestHall.inc +++ b/data/maps/events/VerdanturfTown_ContestHall.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 8386AEC + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_VERDANTURF_TOWN_CONTEST_LOBBY @@ -12,4 +12,4 @@ VerdanturfTown_ContestHall_MapBGEvents:: @ 8386B44 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 + map_events VerdanturfTown_ContestHall_EventObjects, VerdanturfTown_ContestHall_MapWarps, 0x0, VerdanturfTown_ContestHall_MapBGEvents diff --git a/data/maps/events/VerdanturfTown_ContestLobby.inc b/data/maps/events/VerdanturfTown_ContestLobby.inc index 465bb2fde..0a565dd8d 100644 --- a/data/maps/events/VerdanturfTown_ContestLobby.inc +++ b/data/maps/events/VerdanturfTown_ContestLobby.inc @@ -1,10 +1,10 @@ -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, FLAG_HIDE_CONTEST_REPORTER_VERDANTURF, 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_EventObjects:: @ 8386A00 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_VERDANTURF, 0, 0 + object_event 6, EVENT_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, MAP_VERDANTURF_TOWN @@ -18,4 +18,4 @@ VerdanturfTown_ContestLobby_MapBGEvents:: @ 8386AA8 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 + map_events VerdanturfTown_ContestLobby_EventObjects, VerdanturfTown_ContestLobby_MapWarps, 0x0, VerdanturfTown_ContestLobby_MapBGEvents diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc index 8a731fab0..7ca82cc8f 100644 --- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8386D88 + object_event 1, EVENT_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, EVENT_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, MAP_VERDANTURF_TOWN warp_def 4, 7, 0, 5, MAP_VERDANTURF_TOWN VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 8386DC8 - map_events VerdanturfTown_FriendshipRatersHouse_MapObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 + map_events VerdanturfTown_FriendshipRatersHouse_EventObjects, VerdanturfTown_FriendshipRatersHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_House.inc b/data/maps/events/VerdanturfTown_House.inc index 5bf1c7cae..85ff00200 100644 --- a/data/maps/events/VerdanturfTown_House.inc +++ b/data/maps/events/VerdanturfTown_House.inc @@ -1,10 +1,10 @@ -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_EventObjects:: @ 8386DDC + object_event 1, EVENT_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, EVENT_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, MAP_VERDANTURF_TOWN warp_def 4, 8, 0, 6, MAP_VERDANTURF_TOWN VerdanturfTown_House_MapEvents:: @ 8386E1C - map_events VerdanturfTown_House_MapObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 + map_events VerdanturfTown_House_EventObjects, VerdanturfTown_House_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_Mart.inc b/data/maps/events/VerdanturfTown_Mart.inc index 341055a52..41a65f22f 100644 --- a/data/maps/events/VerdanturfTown_Mart.inc +++ b/data/maps/events/VerdanturfTown_Mart.inc @@ -1,12 +1,12 @@ -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_EventObjects:: @ 8386B70 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, MAP_VERDANTURF_TOWN warp_def 4, 7, 0, 1, MAP_VERDANTURF_TOWN VerdanturfTown_Mart_MapEvents:: @ 8386BE0 - map_events VerdanturfTown_Mart_MapObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 + map_events VerdanturfTown_Mart_EventObjects, VerdanturfTown_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc index db6d4400b..f9c98b790 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 8386BF4 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_VERDANTURF_TOWN @@ -9,4 +9,4 @@ VerdanturfTown_PokemonCenter_1F_MapWarps:: @ 8386C3C warp_def 1, 6, 4, 0, MAP_VERDANTURF_TOWN_POKEMON_CENTER_2F VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 8386C54 - map_events VerdanturfTown_PokemonCenter_1F_MapObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events VerdanturfTown_PokemonCenter_1F_EventObjects, VerdanturfTown_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc index 43cd0dc12..8dd05fccb 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc @@ -1,7 +1,7 @@ -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_EventObjects:: @ 8386C68 + object_event 1, EVENT_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, EVENT_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, EVENT_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, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F @@ -11,4 +11,4 @@ VerdanturfTown_PokemonCenter_2F_MapWarps:: @ 8386CB0 warp_def 0, 0, 0, 0, MAP_DOUBLE_BATTLE_COLOSSEUM VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 8386CD8 - map_events VerdanturfTown_PokemonCenter_2F_MapObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events VerdanturfTown_PokemonCenter_2F_EventObjects, VerdanturfTown_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_WandasHouse.inc b/data/maps/events/VerdanturfTown_WandasHouse.inc index 26c178a87..0694222a1 100644 --- a/data/maps/events/VerdanturfTown_WandasHouse.inc +++ b/data/maps/events/VerdanturfTown_WandasHouse.inc @@ -1,13 +1,13 @@ -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, FLAG_HIDE_WALLY_WANDAS_HOUSE, 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, FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE, 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, FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE, 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, FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE, 0, 0 +VerdanturfTown_WandasHouse_EventObjects:: @ 8386CEC + object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 0, 5, 0, 3, 2, 17, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, FLAG_HIDE_WALLY_WANDAS_HOUSE, 0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 0, 4, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 0, 2, 0, 3, 8, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE, 0, 0 + object_event 4, EVENT_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, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 0, 5, 0, 3, 9, 0, 0, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE, 0, 0 VerdanturfTown_WandasHouse_MapWarps:: @ 8386D64 warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN warp_def 8, 7, 0, 3, MAP_VERDANTURF_TOWN VerdanturfTown_WandasHouse_MapEvents:: @ 8386D74 - map_events VerdanturfTown_WandasHouse_MapObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 + map_events VerdanturfTown_WandasHouse_EventObjects, VerdanturfTown_WandasHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VictoryRoad_1F.inc b/data/maps/events/VictoryRoad_1F.inc index 31e1cebb6..48f81c2f0 100644 --- a/data/maps/events/VictoryRoad_1F.inc +++ b/data/maps/events/VictoryRoad_1F.inc @@ -1,11 +1,11 @@ -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, FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD, 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, FLAG_ITEM_VICTORY_ROAD_1F_1, 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, FLAG_ITEM_VICTORY_ROAD_1F_2, 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, FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD, 0, 0 +VictoryRoad_1F_EventObjects:: @ 838D8E4 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_WALLY, 0, 31, 0, 12, 0, 3, 7, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF28, FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 0, 26, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, FLAG_ITEM_VICTORY_ROAD_1F_1, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 0, 39, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, FLAG_ITEM_VICTORY_ROAD_1F_2, 0, 0 + object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 0, 9, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_1F_EventScript_15DF31, FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD, 0, 0 VictoryRoad_1F_MapWarps:: @ 838D98C warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY @@ -23,4 +23,4 @@ VictoryRoad_1F_MapBGEvents:: @ 838D9E4 bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_51 VictoryRoad_1F_MapEvents:: @ 838D9F0 - map_events VictoryRoad_1F_MapObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents + map_events VictoryRoad_1F_EventObjects, VictoryRoad_1F_MapWarps, VictoryRoad_1F_MapCoordEvents, VictoryRoad_1F_MapBGEvents diff --git a/data/maps/events/VictoryRoad_B1F.inc b/data/maps/events/VictoryRoad_B1F.inc index 0c30a96fa..ea7803ac3 100644 --- a/data/maps/events/VictoryRoad_B1F.inc +++ b/data/maps/events/VictoryRoad_B1F.inc @@ -1,23 +1,23 @@ -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, S_PushableBoulder, FLAG_TEMP_13, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1E, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19, 0, 0 - object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1A, 0, 0 - object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1B, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1C, 0, 0 - object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1D, 0, 0 - object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1F, 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, S_BreakableRock, FLAG_VICTORY_ROAD_ROCK, 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, FLAG_ITEM_VICTORY_ROAD_B1F_1, 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, FLAG_ITEM_VICTORY_ROAD_B1F_2, 0, 0 +VictoryRoad_B1F_EventObjects:: @ 838DA04 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14, 0, 0 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 0, 7, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11, 0, 0 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 0, 10, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16, 0, 0 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 0, 6, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1E, 0, 0 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 0, 5, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19, 0, 0 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1A, 0, 0 + object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 0, 12, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1B, 0, 0 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 0, 25, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1C, 0, 0 + object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 0, 26, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1D, 0, 0 + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 0, 4, 0, 3, 1, 0, 0, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1F, 0, 0 + object_event 14, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, S_BreakableRock, FLAG_VICTORY_ROAD_ROCK, 0, 0 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 0, 8, 0, 4, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, FLAG_ITEM_VICTORY_ROAD_B1F_1, 0, 0 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, FLAG_ITEM_VICTORY_ROAD_B1F_2, 0, 0 VictoryRoad_B1F_MapWarps:: @ 838DBCC warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F @@ -29,4 +29,4 @@ VictoryRoad_B1F_MapWarps:: @ 838DBCC warp_def 5, 26, 3, 3, MAP_VICTORY_ROAD_B2F VictoryRoad_B1F_MapEvents:: @ 838DC04 - map_events VictoryRoad_B1F_MapObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 + map_events VictoryRoad_B1F_EventObjects, VictoryRoad_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/VictoryRoad_B2F.inc b/data/maps/events/VictoryRoad_B2F.inc index ffa8252d5..bd882db79 100644 --- a/data/maps/events/VictoryRoad_B2F.inc +++ b/data/maps/events/VictoryRoad_B2F.inc @@ -1,9 +1,9 @@ -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, FLAG_ITEM_VICTORY_ROAD_B2F_1, 0, 0 +VictoryRoad_B2F_EventObjects:: @ 838DC18 + object_event 1, EVENT_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, EVENT_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, EVENT_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, EVENT_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, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 0, 8, 0, 3, 1, 17, 0, 0, 0, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, FLAG_ITEM_VICTORY_ROAD_B2F_1, 0, 0 VictoryRoad_B2F_MapWarps:: @ 838DC90 warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F @@ -16,4 +16,4 @@ VictoryRoad_B2F_MapBGEvents:: @ 838DCB0 bg_hidden_item_event 37, 1, 3, ITEM_MAX_REPEL, FLAG_HIDDEN_ITEM_53 VictoryRoad_B2F_MapEvents:: @ 838DCC8 - map_events VictoryRoad_B2F_MapObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents + map_events VictoryRoad_B2F_EventObjects, VictoryRoad_B2F_MapWarps, 0x0, VictoryRoad_B2F_MapBGEvents diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc index 9fb808074..286a2786f 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,5 +1,5 @@ S_BerryTree:: @ 81A14DD - special FieldObjectInteractionGetBerryTreeData + special EventObjectInteractionGetBerryTreeData switch VAR_SPECIAL_4 case 255, Route102_EventScript_1A1533 case 0, Route102_EventScript_1A153D @@ -108,10 +108,10 @@ Route102_EventScript_1A15F9:: @ 81A15F9 goto_if_eq Route102_EventScript_1A164B Route102_EventScript_1A161D:: @ 81A161D - special FieldObjectInteractionPickBerryTree + special EventObjectInteractionPickBerryTree compare VAR_SPECIAL_4, 0 goto_if_eq Route102_EventScript_1A1642 - special FieldObjectInteractionRemoveBerryTree + special EventObjectInteractionRemoveBerryTree message Route102_Text_1A17FD playfanfare BGM_ME_KINOMI waitmessage @@ -139,7 +139,7 @@ Route102_EventScript_1A164B:: @ 81A164B gUnknown_081A1654:: @ 81A1654 lockall - special FieldObjectInteractionGetBerryTreeData + special EventObjectInteractionGetBerryTreeData call Route102_EventScript_1A16A9 releaseall end @@ -159,13 +159,13 @@ Route102_EventScript_1A168D:: @ 81A168D end gUnknown_081A168F:: @ 81A168F - special FieldObjectInteractionGetBerryTreeData + special EventObjectInteractionGetBerryTreeData lockall Route102_EventScript_1A1693:: @ 81A1693 message Route102_Text_1A1912 waitmessage - special FieldObjectInteractionWaterBerryTree + special EventObjectInteractionWaterBerryTree special DoWateringBerryTreeAnim waitstate message Route102_Text_1A1925 @@ -175,7 +175,7 @@ Route102_EventScript_1A1693:: @ 81A1693 end Route102_EventScript_1A16A9:: @ 81A16A9 - special FieldObjectInteractionPlantBerryTree + special EventObjectInteractionPlantBerryTree incrementgamestat GAME_STAT_PLANTED_BERRIES message Route102_Text_1A16FB waitmessage diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 0e2012de9..a6fa56078 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -566,31 +566,31 @@ OldaleTown_PokemonCenter_2F_EventScript_1A434B:: @ 81A434B end OldaleTown_PokemonCenter_2F_Movement_1A4354:: @ 81A4354 - step_00 - step_end + face_down + end_movement OldaleTown_PokemonCenter_2F_Movement_1A4356:: @ 81A4356 - step_03 - step_end + face_right + end_movement OldaleTown_PokemonCenter_2F_Movement_1A4358:: @ 81A4358 - step_down - step_down - step_end + walk_down + walk_down + end_movement OldaleTown_PokemonCenter_2F_Movement_1A435B:: @ 81A435B - step_right - step_up - step_up - step_end + walk_right + walk_up + walk_up + end_movement OldaleTown_PokemonCenter_2F_Movement_1A435F:: @ 81A435F - step_up - step_end + walk_up + end_movement OldaleTown_PokemonCenter_2F_Movement_1A4361:: @ 81A4361 - step_02 - step_end + face_left + end_movement gUnknown_081A4363:: @ 81A4363 lockall diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 7f0f6b710..ec603257d 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1152,184 +1152,184 @@ LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B return LinkContestRoom1_Movement_1A5D85:: @ 81A5D85 - step_down - step_end + walk_down + end_movement LinkContestRoom1_Movement_1A5D87:: @ 81A5D87 - step_40 - step_up - step_41 - step_end + lock_facing_direction + walk_up + unlock_facing_direction + end_movement LinkContestRoom1_Movement_1A5D8B:: @ 81A5D8B - step_28 - step_end + walk_in_place_fastest_right + end_movement LinkContestRoom1_Movement_1A5D8D:: @ 81A5D8D - step_58 - step_end + emote_heart + end_movement LinkContestRoom1_Movement_1A5D8F:: @ 81A5D8F - step_25 - step_end + walk_in_place_fastest_down + end_movement LinkContestRoom1_Movement_1A5D91:: @ 81A5D91 - step_left - step_left - step_25 - step_end + walk_left + walk_left + walk_in_place_fastest_down + end_movement LinkContestRoom1_Movement_1A5D95:: @ 81A5D95 - step_right - step_right - step_25 - step_end + walk_right + walk_right + walk_in_place_fastest_down + end_movement LinkContestRoom1_Movement_1A5D99:: @ 81A5D99 - step_up - step_25 - step_end + walk_up + walk_in_place_fastest_down + end_movement LinkContestRoom1_Movement_1A5D9C:: @ 81A5D9C - step_14 - step_14 - step_end + delay_16 + delay_16 + end_movement LinkContestRoom1_Movement_1A5D9F:: @ 81A5D9F - step_28 - step_end + walk_in_place_fastest_right + end_movement LinkContestRoom1_Movement_1A5DA1:: @ 81A5DA1 - step_27 - step_end + walk_in_place_fastest_left + end_movement LinkContestRoom1_Movement_1A5DA3:: @ 81A5DA3 - step_25 - step_end + walk_in_place_fastest_down + end_movement LinkContestRoom1_Movement_1A5DA5:: @ 81A5DA5 - step_left - step_left - step_up - step_end + walk_left + walk_left + walk_up + end_movement LinkContestRoom1_Movement_1A5DA9:: @ 81A5DA9 - step_left - step_left - step_left - step_left - step_up - step_end + walk_left + walk_left + walk_left + walk_left + walk_up + end_movement LinkContestRoom1_Movement_1A5DAF:: @ 81A5DAF - step_02 - step_14 - step_4e - step_end + face_left + delay_16 + face_original_direction + end_movement LinkContestRoom1_Movement_1A5DB3:: @ 81A5DB3 - step_01 - step_14 - step_4e - step_end + face_up + delay_16 + face_original_direction + end_movement LinkContestRoom1_Movement_1A5DB7:: @ 81A5DB7 - step_03 - step_14 - step_4e - step_end + face_right + delay_16 + face_original_direction + end_movement LinkContestRoom1_Movement_1A5DBB:: @ 81A5DBB - step_00 - step_14 - step_4e - step_end + face_down + delay_16 + face_original_direction + end_movement LinkContestRoom1_Movement_1A5DBF:: @ 81A5DBF - step_01 - step_end + face_up + end_movement LinkContestRoom1_Movement_1A5DC1:: @ 81A5DC1 - step_01 - step_14 - step_28 - step_end + face_up + delay_16 + walk_in_place_fastest_right + end_movement LinkContestRoom1_Movement_1A5DC5:: @ 81A5DC5 - step_27 - step_14 - step_14 - step_25 - step_end + walk_in_place_fastest_left + delay_16 + delay_16 + walk_in_place_fastest_down + end_movement LinkContestRoom1_Movement_1A5DCA:: @ 81A5DCA - step_14 - step_14 - step_25 - step_end + delay_16 + delay_16 + walk_in_place_fastest_down + end_movement LinkContestRoom1_Movement_1A5DCE:: @ 81A5DCE - step_up - step_right - step_right - step_right - step_26 - step_end + walk_up + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement LinkContestRoom1_Movement_1A5DD4:: @ 81A5DD4 - step_17 - step_17 - step_17 - step_15 - step_26 - step_end + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_down + walk_in_place_fastest_up + end_movement LinkContestRoom1_Movement_1A5DDA:: @ 81A5DDA - step_up - step_right - step_26 - step_end + walk_up + walk_right + walk_in_place_fastest_up + end_movement LinkContestRoom1_Movement_1A5DDE:: @ 81A5DDE - step_17 - step_15 - step_26 - step_end + walk_fast_left + walk_fast_down + walk_in_place_fastest_up + end_movement LinkContestRoom1_Movement_1A5DE2:: @ 81A5DE2 - step_up - step_left - step_26 - step_end + walk_up + walk_left + walk_in_place_fastest_up + end_movement LinkContestRoom1_Movement_1A5DE6:: @ 81A5DE6 - step_18 - step_15 - step_26 - step_end + walk_fast_right + walk_fast_down + walk_in_place_fastest_up + end_movement LinkContestRoom1_Movement_1A5DEA:: @ 81A5DEA - step_up - step_left - step_left - step_left - step_26 - step_end + walk_up + walk_left + walk_left + walk_left + walk_in_place_fastest_up + end_movement LinkContestRoom1_Movement_1A5DF0:: @ 81A5DF0 - step_18 - step_18 - step_18 - step_15 - step_26 - step_end + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_in_place_fastest_up + end_movement LinkContestRoom1_Movement_1A5DF6:: @ 81A5DF6 - step_right - step_right - step_up - step_end + walk_right + walk_right + walk_up + end_movement LinkContestRoom1_Movement_1A5DFA:: @ 81A5DFA - step_up - step_end + walk_up + end_movement diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index fc5df6abe..8d226887e 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -233,26 +233,26 @@ Route117_PokemonDayCare_EventScript_1B2539:: @ 81B2539 end Route117_PokemonDayCare_Movement_1B2543:: @ 81B2543 - step_14 - step_14 - step_02 - step_14 - step_14 - step_03 - step_14 - step_14 - step_01 - slow_step_up - step_54 - step_14 - step_14 - step_14 - step_14 - step_14 - step_00 - step_55 - slow_step_down - step_end + delay_16 + delay_16 + face_left + delay_16 + delay_16 + face_right + delay_16 + delay_16 + face_up + walk_slow_up + set_invisible + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + face_down + set_visible + walk_slow_down + end_movement @ 81B2557 end diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 5ddcf4a65..957d56609 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -201,7 +201,7 @@ Route120_EventScript_1AE582:: @ 81AE582 Route111_EventScript_1AE5A2:: @ 81AE5A2 special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToFieldObjectLocalIds + special GabbyAndTySetScriptVarsToEventObjectLocalIds compare FACING, 2 call_if_eq Route111_EventScript_1AE5E0 compare FACING, 1 @@ -234,7 +234,7 @@ Route111_EventScript_1AE60F:: @ 81AE60F Route118_EventScript_1AE60F:: @ 81AE60F Route120_EventScript_1AE60F:: @ 81AE60F special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToFieldObjectLocalIds + special GabbyAndTySetScriptVarsToEventObjectLocalIds compare FACING, 2 call_if_eq Route111_EventScript_1AE5E0 compare FACING, 1 @@ -256,16 +256,16 @@ Route120_EventScript_1AE60F:: @ 81AE60F end Route111_Movement_1AE699:: @ 81AE699 - step_1d - step_end + walk_in_place_down + end_movement Route111_Movement_1AE69B:: @ 81AE69B - step_1e - step_end + walk_in_place_up + end_movement Route111_Movement_1AE69D:: @ 81AE69D - step_1f - step_end + walk_in_place_left + end_movement Route111_EventScript_1AE69F:: @ 81AE69F msgbox Route111_Text_1AC60B, MSGBOX_YESNO diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index d7b47cdfd..37830a00e 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -70,18 +70,18 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD end AquaHideout_B2F_Movement_15D958:: @ 815D958 - step_left - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + end_movement AquaHideout_B2F_Movement_15D95D:: @ 815D95D - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + end_movement AquaHideout_B2F_EventScript_15D962:: @ 815D962 MagmaHideout_B2F_EventScript_15D962:: @ 815D962 diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index ce7d7c0e9..f540777ee 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -120,46 +120,46 @@ BattleTower_BattleRoom_EventScript_160AB1:: @ 8160AB1 end BattleTower_BattleRoom_Movement_160AB7:: @ 8160AB7 - step_up - step_up - step_up - step_03 - step_end + walk_up + walk_up + walk_up + face_right + end_movement BattleTower_BattleRoom_Movement_160ABC:: @ 8160ABC - step_00 - step_end + face_down + end_movement BattleTower_BattleRoom_Movement_160ABE:: @ 8160ABE - step_03 - step_end + face_right + end_movement BattleTower_BattleRoom_Movement_160AC0:: @ 8160AC0 - step_down - step_down - step_down - step_down - step_02 - step_end + walk_down + walk_down + walk_down + walk_down + face_left + end_movement BattleTower_BattleRoom_Movement_160AC6:: @ 8160AC6 - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + end_movement BattleTower_BattleRoom_Movement_160ACB:: @ 8160ACB - step_right - step_right - step_right - step_up - step_end + walk_right + walk_right + walk_right + walk_up + end_movement BattleTower_BattleRoom_Movement_160AD0:: @ 8160AD0 - step_down - step_left - step_left - step_left - step_03 - step_end + walk_down + walk_left + walk_left + walk_left + face_right + end_movement diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 965da8d9c..d9d73b832 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -40,19 +40,19 @@ BattleTower_Corridor_EventScript_1608C2:: @ 81608C2 end BattleTower_Corridor_Movement_1608D1:: @ 81608D1 - step_right + walk_right BattleTower_Corridor_Movement_1608D2:: @ 81608D2 - step_right - step_right + walk_right + walk_right BattleTower_Corridor_Movement_1608D4:: @ 81608D4 - step_right + walk_right BattleTower_Corridor_Movement_1608D5:: @ 81608D5 - step_right - step_right - step_right - step_up - step_54 - step_end + walk_right + walk_right + walk_right + walk_up + set_invisible + end_movement diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index 6749c5623..f3373ee6e 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -33,25 +33,25 @@ BattleTower_Elevator_EventScript_16082B:: @ 816082B end BattleTower_Elevator_Movement_160835:: @ 8160835 - step_up - step_right - step_00 - step_end + walk_up + walk_right + face_down + end_movement BattleTower_Elevator_Movement_160839:: @ 8160839 - step_up - step_up - step_00 - step_end + walk_up + walk_up + face_down + end_movement BattleTower_Elevator_Movement_16083D:: @ 816083D - step_down - step_down - step_54 - step_end + walk_down + walk_down + set_invisible + end_movement BattleTower_Elevator_Movement_160841:: @ 8160841 - step_right - step_down - step_down - step_end + walk_right + walk_down + walk_down + end_movement diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 57eb62dfe..24637ee75 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -19,7 +19,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C compare VAR_SPECIAL_7, 50 goto_if_lt BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER - special sub_810F8FC + special TryInitBattleTowerAwardManEventObject return BattleTower_Lobby_EventScript_1602CD:: @ 81602CD @@ -27,7 +27,7 @@ BattleTower_Lobby_EventScript_1602CD:: @ 81602CD compare VAR_SPECIAL_7, 100 goto_if_lt BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER - special sub_810F8FC + special TryInitBattleTowerAwardManEventObject return BattleTower_Lobby_EventScript_1602E4:: @ 81602E4 @@ -304,30 +304,30 @@ BattleTower_Lobby_EventScript_160664:: @ 8160664 return BattleTower_Lobby_Movement_160693:: @ 8160693 - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + end_movement BattleTower_Lobby_Movement_160697:: @ 8160697 - step_up - step_54 - step_end + walk_up + set_invisible + end_movement BattleTower_Lobby_Movement_16069A:: @ 816069A - step_up - step_up - step_54 - step_end + walk_up + walk_up + set_invisible + end_movement @ 816069E - step_16 - step_16 - step_16 - step_16 - step_16 - step_54 - step_end + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + set_invisible + end_movement BattleTower_Lobby_EventScript_1606A5:: @ 81606A5 lock diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index bba6d89bc..aeec7023f 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -89,9 +89,9 @@ CaveOfOrigin_B4F_EventScript_15DE73:: @ 815DE73 return CaveOfOrigin_B4F_Movement_15DE7D:: @ 815DE7D - step_5e - step_60 - step_14 - step_14 - step_61 - step_end + init_affine_anim + walk_down_affine_0 + delay_16 + delay_16 + walk_down_affine_1 + end_movement diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index e7aeccbd0..63f8c45b9 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -193,402 +193,402 @@ DewfordTown_EventScript_14E28A:: @ 814E28A return DewfordTown_Movement_14E293:: @ 814E293 - step_up - step_up - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_up - step_up - step_left - step_left - step_17 - step_17 - step_17 - step_17 - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_17 - step_17 - step_17 - step_17 - step_16 - step_16 - step_16 - step_16 - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_16 - step_16 - step_16 - step_16 - step_17 - step_17 - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_17 - step_17 - step_16 - step_16 - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_16 - step_16 - step_16 - step_16 - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_up + walk_up + walk_left + walk_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_left + walk_fast_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_up + walk_up + walk_up + walk_up + end_movement DewfordTown_Movement_14E356:: @ 814E356 - step_right - step_18 - step_18 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_18 - step_18 - step_16 - step_16 - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + walk_right + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement DewfordTown_Movement_14E402:: @ 814E402 - step_right - step_up - step_end + walk_right + walk_up + end_movement DewfordTown_Movement_14E405:: @ 814E405 - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + end_movement DewfordTown_Movement_14E409:: @ 814E409 - step_up - step_up - step_up - step_25 - step_end + walk_up + walk_up + walk_up + walk_in_place_fastest_down + end_movement DewfordTown_Movement_14E40E:: @ 814E40E - step_up - step_end + walk_up + end_movement DewfordTown_Movement_14E410:: @ 814E410 - step_up - step_up - step_end + walk_up + walk_up + end_movement DewfordTown_EventScript_14E413:: @ 814E413 lock diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 45d389b28..602c4776e 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -241,12 +241,12 @@ DewfordTown_Hall_EventScript_153583:: @ 8153583 return DewfordTown_Hall_Movement_153599:: @ 8153599 - step_1f - step_end + walk_in_place_left + end_movement DewfordTown_Hall_Movement_15359B:: @ 815359B - step_20 - step_end + walk_in_place_right + end_movement DewfordTown_Hall_EventScript_15359D:: @ 815359D lock diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 78009271b..a4406c8e6 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -33,9 +33,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE end EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 - step_up - step_up - step_end + walk_up + walk_up + end_movement EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 playbgm BGM_DAIGO, FALSE @@ -163,64 +163,64 @@ EverGrandeCity_ChampionsRoom_EventScript_15B9D2:: @ 815B9D2 return EverGrandeCity_ChampionsRoom_Movement_15B9DD:: @ 815B9DD - step_up - step_up - step_end + walk_up + walk_up + end_movement EverGrandeCity_ChampionsRoom_Movement_15B9E0:: @ 815B9E0 - step_up - step_14 - step_up - step_13 - step_54 - step_end + walk_up + delay_16 + walk_up + delay_8 + set_invisible + end_movement EverGrandeCity_ChampionsRoom_Movement_15B9E6:: @ 815B9E6 - step_up - step_up - step_up - step_up - step_up - step_left - step_up - step_28 - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_up + walk_in_place_fastest_right + end_movement EverGrandeCity_ChampionsRoom_Movement_15B9EF:: @ 815B9EF - step_26 - step_14 - step_28 - step_14 - step_26 - step_13 - step_28 - step_14 - step_end + walk_in_place_fastest_up + delay_16 + walk_in_place_fastest_right + delay_16 + walk_in_place_fastest_up + delay_8 + walk_in_place_fastest_right + delay_16 + end_movement EverGrandeCity_ChampionsRoom_Movement_15B9F8:: @ 815B9F8 - step_right - step_up - step_end + walk_right + walk_up + end_movement EverGrandeCity_ChampionsRoom_Movement_15B9FB:: @ 815B9FB - step_up - step_up - step_25 - step_end + walk_up + walk_up + walk_in_place_fastest_down + end_movement EverGrandeCity_ChampionsRoom_Movement_15B9FF:: @ 815B9FF - step_up - step_13 - step_54 - step_end + walk_up + delay_8 + set_invisible + end_movement EverGrandeCity_ChampionsRoom_Movement_15BA03:: @ 815BA03 - step_up - step_up - step_up - step_up - step_up - step_right - step_up - step_27 - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_up + walk_in_place_fastest_left + end_movement diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index c57f311b2..6cfc5ae27 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -67,18 +67,18 @@ EverGrandeCity_HallOfFame_EventScript_15BC4D:: @ 815BC4D end EverGrandeCity_HallOfFame_Movement_15BC59:: @ 815BC59 - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement EverGrandeCity_HallOfFame_Movement_15BC60:: @ 815BC60 - step_up - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index a8eb820ea..0138f99f1 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -99,23 +99,23 @@ EverGrandeCity_PokemonLeague_EventScript_15BB57:: @ 815BB57 end EverGrandeCity_PokemonLeague_Movement_15BB76:: @ 815BB76 - step_down - step_left - step_26 - step_end + walk_down + walk_left + walk_in_place_fastest_up + end_movement EverGrandeCity_PokemonLeague_Movement_15BB7A:: @ 815BB7A - step_down - step_right - step_26 - step_end + walk_down + walk_right + walk_in_place_fastest_up + end_movement EverGrandeCity_PokemonLeague_Movement_15BB7E:: @ 815BB7E - step_left - step_25 - step_end + walk_left + walk_in_place_fastest_down + end_movement EverGrandeCity_PokemonLeague_Movement_15BB81:: @ 815BB81 - step_right - step_25 - step_end + walk_right + walk_in_place_fastest_down + end_movement diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 11dd6159e..5386fec4f 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -46,46 +46,46 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 return FallarborTown_ContestLobby_Movement_153A70:: @ 8153A70 - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement FallarborTown_ContestLobby_Movement_153A7A:: @ 8153A7A - step_27 - step_end + walk_in_place_fastest_left + end_movement FallarborTown_ContestLobby_Movement_153A7C:: @ 8153A7C - step_left - step_25 - step_end + walk_left + walk_in_place_fastest_down + end_movement FallarborTown_ContestLobby_Movement_153A7F:: @ 8153A7F - step_down - step_down - step_26 - step_end + walk_down + walk_down + walk_in_place_fastest_up + end_movement FallarborTown_ContestLobby_Movement_153A83:: @ 8153A83 - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement FallarborTown_ContestLobby_Movement_153A8C:: @ 8153A8C - step_28 - step_end + walk_in_place_fastest_right + end_movement FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E msgbox FallarborTown_ContestLobby_Text_177141, 2 diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 93a5115af..6ae897ec8 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -53,29 +53,29 @@ FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 end FallarborTown_PokemonCenter_1F_Movement_153B74:: @ 8153B74 - step_right - step_down - step_down - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_13 - step_end + walk_right + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + delay_8 + end_movement FallarborTown_PokemonCenter_1F_Movement_153B81:: @ 8153B81 - step_down - step_down - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_13 - step_end + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + delay_8 + end_movement diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index e576df5bd..342e2fdc3 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -86,5 +86,5 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4 end FortreeCity_Movement_14CA13:: @ 814CA13 - step_right - step_end + walk_right + end_movement diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index 490ef0c9b..77e43be34 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -46,12 +46,12 @@ FortreeCity_House4_EventScript_158204:: @ 8158204 end FortreeCity_House4_Movement_158218:: @ 8158218 - step_15 - step_15 - step_18 - step_25 - step_13 - step_end + walk_fast_down + walk_fast_down + walk_fast_right + walk_in_place_fastest_down + delay_8 + end_movement FortreeCity_House4_EventScript_15821E:: @ 815821E lock diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index d33813680..013703e92 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -42,21 +42,21 @@ GraniteCave_StevensRoom_EventScript_15CC83:: @ 815CC83 return GraniteCave_StevensRoom_Movement_15CC8C:: @ 815CC8C - step_up - step_up - step_up - step_up - step_up - step_13 - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + delay_8 + end_movement GraniteCave_StevensRoom_Movement_15CC93:: @ 815CC93 - step_left - step_up - step_up - step_up - step_right - step_up - step_up - step_13 - step_end + walk_left + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + delay_8 + end_movement diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index a7f71baf6..f14601747 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -185,57 +185,57 @@ LavaridgeTown_EventScript_14E6DD:: @ 814E6DD return LavaridgeTown_Movement_14E6E8:: @ 814E6E8 - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement LavaridgeTown_Movement_14E6EF:: @ 814E6EF - step_18 - step_18 - step_18 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement LavaridgeTown_Movement_14E6FA:: @ 814E6FA - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_end + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement LavaridgeTown_Movement_14E703:: @ 814E703 - step_15 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_end + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement LavaridgeTown_Movement_14E70E:: @ 814E70E - step_down - step_end + walk_down + end_movement LavaridgeTown_EventScript_14E710:: @ 814E710 - specialvar RESULT, player_get_direction_lower_nybble + specialvar RESULT, GetPlayerFacingDirection compare RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E721 end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index a04629903..4784a4903 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -145,46 +145,46 @@ LilycoveCity_ContestLobby_EventScript_158A37:: @ 8158A37 return LilycoveCity_ContestLobby_Movement_158A3B:: @ 8158A3B - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_end + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + end_movement LilycoveCity_ContestLobby_Movement_158A43:: @ 8158A43 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement LilycoveCity_ContestLobby_Movement_158A4C:: @ 8158A4C - step_27 - step_end + walk_in_place_fastest_left + end_movement LilycoveCity_ContestLobby_Movement_158A4E:: @ 8158A4E - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + end_movement LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52 - step_14 - step_14 - step_14 - step_14 - step_16 - step_16 - step_16 - step_28 - step_end + delay_16 + delay_16 + delay_16 + delay_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_in_place_fastest_right + end_movement LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158A6A @@ -258,47 +258,47 @@ LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 return LilycoveCity_ContestLobby_Movement_158B64:: @ 8158B64 - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_end + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement LilycoveCity_ContestLobby_Movement_158B6D:: @ 8158B6D - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement LilycoveCity_ContestLobby_Movement_158B76:: @ 8158B76 - step_28 - step_end + walk_in_place_fastest_right + end_movement LilycoveCity_ContestLobby_Movement_158B78:: @ 8158B78 - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + end_movement LilycoveCity_ContestLobby_Movement_158B7C:: @ 8158B7C - step_14 - step_14 - step_14 - step_14 - step_16 - step_16 - step_16 - step_27 - step_end + delay_16 + delay_16 + delay_16 + delay_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_in_place_fastest_left + end_movement LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 lockall @@ -518,50 +518,50 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B return LilycoveCity_ContestLobby_Movement_158E8E:: @ 8158E8E - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement LilycoveCity_ContestLobby_Movement_158E99:: @ 8158E99 - step_28 - step_right - step_end + walk_in_place_fastest_right + walk_right + end_movement LilycoveCity_ContestLobby_Movement_158E9C:: @ 8158E9C - step_right - step_right - step_25 - step_end + walk_right + walk_right + walk_in_place_fastest_down + end_movement LilycoveCity_ContestLobby_Movement_158EA0:: @ 8158EA0 - step_down - step_down - step_26 - step_end + walk_down + walk_down + walk_in_place_fastest_up + end_movement LilycoveCity_ContestLobby_Movement_158EA4:: @ 8158EA4 - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE - step_27 - step_end + walk_in_place_fastest_left + end_movement LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 specialvar RESULT, sub_80C5044 @@ -655,48 +655,48 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 return LilycoveCity_ContestLobby_Movement_158FFE:: @ 8158FFE - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement LilycoveCity_ContestLobby_Movement_159008:: @ 8159008 - step_27 - step_left - step_end + walk_in_place_fastest_left + walk_left + end_movement LilycoveCity_ContestLobby_Movement_15900B:: @ 815900B - step_left - step_left - step_25 - step_end + walk_left + walk_left + walk_in_place_fastest_down + end_movement LilycoveCity_ContestLobby_Movement_15900F:: @ 815900F - step_down - step_down - step_26 - step_end + walk_down + walk_down + walk_in_place_fastest_up + end_movement LilycoveCity_ContestLobby_Movement_159013:: @ 8159013 - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement LilycoveCity_ContestLobby_Movement_15901C:: @ 815901C - step_28 - step_end + walk_in_place_fastest_right + end_movement LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E msgbox LilycoveCity_ContestLobby_Text_188D3C, 2 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index b80b0873b..c3eca04f4 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -57,18 +57,18 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D end LilycoveCity_CoveLilyMotel_1F_Movement_158395:: @ 8158395 - step_03 - step_40 - step_left - step_41 - step_end + face_right + lock_facing_direction + walk_left + unlock_facing_direction + end_movement LilycoveCity_CoveLilyMotel_1F_Movement_15839A:: @ 815839A - step_up - step_end + walk_up + end_movement LilycoveCity_CoveLilyMotel_1F_Movement_15839C:: @ 815839C - step_00 - step_down - step_01 - step_end + face_down + walk_down + face_up + end_movement diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index d32107396..57ad4b85b 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -140,17 +140,17 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE end LilycoveCity_Harbor_Movement_159A86:: @ 8159A86 - step_right - step_26 - step_end + walk_right + walk_in_place_fastest_up + end_movement LilycoveCity_Harbor_Movement_159A89:: @ 8159A89 - step_up - step_end + walk_up + end_movement @ 8159A8B - step_up - step_end + walk_up + end_movement LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D lock diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 95338f231..b45261aca 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -70,23 +70,23 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7:: @ 81584E7 end LilycoveCity_LilycoveMuseum_1F_Movement_1584FC:: @ 81584FC - step_up - step_end + walk_up + end_movement LilycoveCity_LilycoveMuseum_1F_Movement_1584FE:: @ 81584FE - step_left - step_up - step_end + walk_left + walk_up + end_movement LilycoveCity_LilycoveMuseum_1F_Movement_158501:: @ 8158501 - step_right - step_up - step_end + walk_right + walk_up + end_movement LilycoveCity_LilycoveMuseum_1F_Movement_158504:: @ 8158504 - step_up - step_up - step_end + walk_up + walk_up + end_movement LilycoveCity_LilycoveMuseum_1F_EventScript_158507:: @ 8158507 msgbox LilycoveCity_LilycoveMuseum_1F_Text_18757F, 3 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 9cf3ecbd7..1643c3a8b 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -81,13 +81,13 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A end LilycoveCity_LilycoveMuseum_2F_Movement_1586D3:: @ 81586D3 - step_27 - step_end + walk_in_place_fastest_left + end_movement LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5 - step_01 - step_14 - step_end + face_up + delay_16 + end_movement LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 85ee953ac..bab091a0e 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -29,36 +29,36 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15939F:: @ 815939F end LilycoveCity_PokemonTrainerFanClub_Movement_1593FA:: @ 81593FA - step_13 - step_25 - step_down - step_down - step_down - step_left - step_left - step_end + delay_8 + walk_in_place_fastest_down + walk_down + walk_down + walk_down + walk_left + walk_left + end_movement LilycoveCity_PokemonTrainerFanClub_Movement_159402:: @ 8159402 - step_17 - step_17 - step_15 - step_15 - step_17 - step_15 - step_end + walk_fast_left + walk_fast_left + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_down + end_movement LilycoveCity_PokemonTrainerFanClub_Movement_159409:: @ 8159409 - step_down - step_28 - step_end + walk_down + walk_in_place_fastest_right + end_movement LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C - step_49 - step_16 - step_16 - step_18 - step_25 - step_end + jump_in_place_right + walk_fast_up + walk_fast_up + walk_fast_right + walk_in_place_fastest_down + end_movement LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 compare VAR_LILYCOVE_FAN_CLUB_STATE, 1 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 57ad9aae5..9f328bc4a 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -131,43 +131,43 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B return LittlerootTown_Movement_14D6AC:: @ 814D6AC - step_down - step_end + walk_down + end_movement LittlerootTown_Movement_14D6AE:: @ 814D6AE - step_down - step_27 - step_end + walk_down + walk_in_place_fastest_left + end_movement LittlerootTown_Movement_14D6B1:: @ 814D6B1 - step_14 - step_13 - step_up - step_end + delay_16 + delay_8 + walk_up + end_movement LittlerootTown_Movement_14D6B5:: @ 814D6B5 - step_up - step_54 - step_end + walk_up + set_invisible + end_movement LittlerootTown_Movement_14D6B8:: @ 814D6B8 - step_14 - step_13 - step_right - step_26 - step_end + delay_16 + delay_8 + walk_right + walk_in_place_fastest_up + end_movement LittlerootTown_Movement_14D6BD:: @ 814D6BD - step_up - step_up - step_end + walk_up + walk_up + end_movement LittlerootTown_Movement_14D6C0:: @ 814D6C0 - step_45 - step_14 - step_14 - step_14 - step_end + jump_right + delay_16 + delay_16 + delay_16 + end_movement LittlerootTown_EventScript_14D6C5:: @ 814D6C5 lockall @@ -235,42 +235,42 @@ LittlerootTown_EventScript_14D755:: @ 814D755 return LittlerootTown_Movement_14D779:: @ 814D779 - step_03 - step_13 - step_51 - step_49 - step_13 - step_18 - step_18 - step_18 - step_18 - step_16 - step_16 - step_17 - step_00 - step_end + face_right + delay_8 + disable_jump_landing_ground_effect + jump_in_place_right + delay_8 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_left + face_down + end_movement LittlerootTown_Movement_14D787:: @ 814D787 - step_down - step_end + walk_down + end_movement LittlerootTown_Movement_14D789:: @ 814D789 - step_right - step_down - step_down - step_left - step_left - step_left - step_left - step_up - step_25 - step_end + walk_right + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_up + walk_in_place_fastest_down + end_movement LittlerootTown_Movement_14D793:: @ 814D793 - step_40 - step_down - step_41 - step_end + lock_facing_direction + walk_down + unlock_facing_direction + end_movement LittlerootTown_EventScript_14D797:: @ 814D797 lockall @@ -283,28 +283,28 @@ LittlerootTown_EventScript_14D797:: @ 814D797 end LittlerootTown_Movement_14D7B3:: @ 814D7B3 - step_03 - step_13 - step_51 - step_49 - step_13 - step_18 - step_18 - step_18 - step_16 - step_16 - step_18 - step_00 - step_end + face_right + delay_8 + disable_jump_landing_ground_effect + jump_in_place_right + delay_8 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_right + face_down + end_movement LittlerootTown_Movement_14D7C0:: @ 814D7C0 - step_left - step_down - step_left - step_left - step_left - step_25 - step_end + walk_left + walk_down + walk_left + walk_left + walk_left + walk_in_place_fastest_down + end_movement LittlerootTown_EventScript_14D7C7:: @ 814D7C7 lockall @@ -686,154 +686,154 @@ LittlerootTown_EventScript_14DC50:: @ 814DC50 return LittlerootTown_Movement_14DC76:: @ 814DC76 - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement LittlerootTown_Movement_14DC7D:: @ 814DC7D - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement LittlerootTown_Movement_14DC84:: @ 814DC84 - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + end_movement LittlerootTown_Movement_14DC89:: @ 814DC89 - step_right - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement LittlerootTown_Movement_14DC8F:: @ 814DC8F - step_right - step_right - step_end + walk_right + walk_right + end_movement LittlerootTown_Movement_14DC92:: @ 814DC92 - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + end_movement LittlerootTown_Movement_14DC96:: @ 814DC96 - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + end_movement LittlerootTown_Movement_14DC9A:: @ 814DC9A - step_left - step_left - step_end + walk_left + walk_left + end_movement LittlerootTown_Movement_14DC9D:: @ 814DC9D - step_left - step_left - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement LittlerootTown_Movement_14DCA3:: @ 814DCA3 - step_left - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + end_movement LittlerootTown_Movement_14DCA8:: @ 814DCA8 - step_down - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement LittlerootTown_Movement_14DCAE:: @ 814DCAE - step_down - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement LittlerootTown_Movement_14DCB4:: @ 814DCB4 - step_left - step_left - step_left - step_left - step_26 - step_end + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up + end_movement LittlerootTown_Movement_14DCBA:: @ 814DCBA - step_left - step_left - step_left - step_left - step_left - step_26 - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up + end_movement LittlerootTown_Movement_14DCC1:: @ 814DCC1 - step_left - step_left - step_26 - step_end + walk_left + walk_left + walk_in_place_fastest_up + end_movement LittlerootTown_Movement_14DCC5:: @ 814DCC5 - step_left - step_left - step_left - step_26 - step_end + walk_left + walk_left + walk_left + walk_in_place_fastest_up + end_movement LittlerootTown_Movement_14DCCA:: @ 814DCCA - step_right - step_right - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement LittlerootTown_Movement_14DCCF:: @ 814DCCF - step_right - step_right - step_26 - step_end + walk_right + walk_right + walk_in_place_fastest_up + end_movement LittlerootTown_Movement_14DCD3:: @ 814DCD3 - step_right - step_right - step_right - step_right - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement LittlerootTown_Movement_14DCDA:: @ 814DCDA - step_right - step_right - step_right - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement LittlerootTown_Movement_14DCE0:: @ 814DCE0 - step_up - step_end + walk_up + end_movement LittlerootTown_EventScript_14DCE2:: @ 814DCE2 lock diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 1de2e91a4..340f50894 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -70,8 +70,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA end LittlerootTown_BrendansHouse_1F_Movement_152720:: @ 8152720 - step_up - step_end + walk_up + end_movement LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722 lockall @@ -105,13 +105,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 end LittlerootTown_BrendansHouse_1F_Movement_152782:: @ 8152782 - step_down - step_right - step_right - step_right - step_right - step_right - step_end + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 lockall diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 8096589aa..ad7257e0b 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -70,8 +70,8 @@ LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938 end LittlerootTown_MaysHouse_1F_Movement_15295E:: @ 815295E - step_up - step_end + walk_up + end_movement LittlerootTown_MaysHouse_1F_EventScript_152960:: @ 8152960 lockall @@ -105,13 +105,13 @@ LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 end LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0 - step_down - step_left - step_left - step_left - step_left - step_left - step_end + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement @ 81529C7 lockall diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index ede58e7a5..e716962b7 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -138,52 +138,52 @@ LittlerootTown_BrendansHouse_2F_EventScript_152C08:: @ 8152C08 return LittlerootTown_BrendansHouse_2F_Movement_152C11:: @ 8152C11 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_13 - step_end + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + delay_8 + end_movement LittlerootTown_BrendansHouse_2F_Movement_152C1C:: @ 8152C1C - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_13 - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + delay_8 + end_movement LittlerootTown_BrendansHouse_2F_Movement_152C25:: @ 8152C25 - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_13 - step_end + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + delay_8 + end_movement LittlerootTown_BrendansHouse_2F_Movement_152C30:: @ 8152C30 - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_13 - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + delay_8 + end_movement gUnknown_08152C39:: @ 8152C39 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 7608ba65d..6b2867f54 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -73,14 +73,14 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D4A:: @ 8152D4A end LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 lock @@ -174,9 +174,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E8E:: @ 8152E8E return LittlerootTown_ProfessorBirchsLab_Movement_152E97:: @ 8152E97 - step_down - step_27 - step_end + walk_down + walk_in_place_fastest_left + end_movement LittlerootTown_ProfessorBirchsLab_EventScript_152E9A:: @ 8152E9A msgbox LittlerootTown_ProfessorBirchsLab_Text_1746A2, 3 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 852f24f2a..bd4f8ab3d 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -186,96 +186,96 @@ MauvilleCity_EventScript_14C292:: @ 814C292 end MauvilleCity_Movement_14C2AA:: @ 814C2AA - step_left - step_left - step_down - step_down - step_left - step_end + walk_left + walk_left + walk_down + walk_down + walk_left + end_movement MauvilleCity_Movement_14C2B0:: @ 814C2B0 - step_down - step_down - step_left - step_left - step_left - step_end + walk_down + walk_down + walk_left + walk_left + walk_left + end_movement MauvilleCity_Movement_14C2B6:: @ 814C2B6 - step_14 - step_14 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + delay_16 + delay_16 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement MauvilleCity_Movement_14C2C1:: @ 814C2C1 - step_14 - step_14 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + delay_16 + delay_16 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement MauvilleCity_Movement_14C2CC:: @ 814C2CC - step_left - step_left - step_left - step_down - step_down - step_end + walk_left + walk_left + walk_left + walk_down + walk_down + end_movement MauvilleCity_Movement_14C2D2:: @ 814C2D2 - step_left - step_down - step_down - step_left - step_left - step_end + walk_left + walk_down + walk_down + walk_left + walk_left + end_movement MauvilleCity_Movement_14C2D8:: @ 814C2D8 - step_right - step_right - step_26 - step_end + walk_right + walk_right + walk_in_place_fastest_up + end_movement MauvilleCity_Movement_14C2DC:: @ 814C2DC - step_right - step_up - step_end + walk_right + walk_up + end_movement MauvilleCity_Movement_14C2DF:: @ 814C2DF - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement MauvilleCity_Movement_14C2E8:: @ 814C2E8 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement MauvilleCity_EventScript_14C2F2:: @ 814C2F2 lock diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 272d7ed6e..ee2c5b1dc 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -83,134 +83,134 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C end MeteorFalls_1F_1R_Movement_15C5EE:: @ 815C5EE - step_right - step_right - step_end + walk_right + walk_right + end_movement MeteorFalls_1F_1R_Movement_15C5F1:: @ 815C5F1 - step_16 - step_16 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_end + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement MeteorFalls_1F_1R_Movement_15C5FC:: @ 815C5FC - step_16 - step_16 - step_16 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_end + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement MeteorFalls_1F_1R_Movement_15C608:: @ 815C608 - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement MeteorFalls_1F_1R_Movement_15C60F:: @ 815C60F - step_14 - step_14 - step_right - step_right - step_right - step_right - step_right - step_end + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement MeteorFalls_1F_1R_Movement_15C617:: @ 815C617 - step_14 - step_14 - step_right - step_right - step_right - step_right - step_right - step_end + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement MeteorFalls_1F_1R_Movement_15C61F:: @ 815C61F - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement MeteorFalls_1F_1R_Movement_15C628:: @ 815C628 - step_right - step_right - step_up - step_up - step_27 - step_end + walk_right + walk_right + walk_up + walk_up + walk_in_place_fastest_left + end_movement MeteorFalls_1F_1R_Movement_15C62E:: @ 815C62E - step_up - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement MeteorFalls_1F_1R_Movement_15C639:: @ 815C639 - step_right - step_right - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement MeteorFalls_1F_1R_Movement_15C63E:: @ 815C63E - step_up - step_up - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement MeteorFalls_1F_1R_Movement_15C64A:: @ 815C64A - step_right - step_right - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F - step_25 - step_12 - step_28 - step_40 - step_left - step_41 - step_end + walk_in_place_fastest_down + delay_4 + walk_in_place_fastest_right + lock_facing_direction + walk_left + unlock_facing_direction + end_movement MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656 lock diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 364778613..4d9989d82 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -73,13 +73,13 @@ MossdeepCity_GameCorner_1F_EventScript_15AD34:: @ 815AD34 return MossdeepCity_GameCorner_1F_Movement_15AD3D:: @ 815AD3D - step_down - step_end + walk_down + end_movement MossdeepCity_GameCorner_1F_Movement_15AD3F:: @ 815AD3F - step_right - step_25 - step_end + walk_right + walk_in_place_fastest_down + end_movement MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 lock @@ -154,32 +154,32 @@ MossdeepCity_GameCorner_1F_EventScript_15AE28:: @ 815AE28 return MossdeepCity_GameCorner_1F_Movement_15AE3A:: @ 815AE3A - step_14 - step_up - step_up - step_end + delay_16 + walk_up + walk_up + end_movement MossdeepCity_GameCorner_1F_Movement_15AE3E:: @ 815AE3E - step_14 - step_right - step_up - step_end + delay_16 + walk_right + walk_up + end_movement MossdeepCity_GameCorner_1F_Movement_15AE42:: @ 815AE42 - step_14 - step_left - step_up - step_end + delay_16 + walk_left + walk_up + end_movement MossdeepCity_GameCorner_1F_Movement_15AE46:: @ 815AE46 - step_left - step_28 - step_end + walk_left + walk_in_place_fastest_right + end_movement MossdeepCity_GameCorner_1F_Movement_15AE49:: @ 815AE49 - step_right - step_27 - step_end + walk_right + walk_in_place_fastest_left + end_movement MossdeepCity_GameCorner_1F_EventScript_15AE4C:: @ 815AE4C msgbox MossdeepCity_GameCorner_1F_Text_18E631, 3 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index f62693756..0af775590 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -59,19 +59,19 @@ MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE return MossdeepCity_GameCorner_B1F_Movement_15AEF9:: @ 815AEF9 - step_down - step_down - step_down - step_right - step_right - step_end + walk_down + walk_down + walk_down + walk_right + walk_right + end_movement MossdeepCity_GameCorner_B1F_Movement_15AEFF:: @ 815AEFF - step_left - step_left - step_up - step_up - step_up - step_up - step_13 - step_end + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + delay_8 + end_movement diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 0ae02fba4..a17d09e10 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -212,9 +212,9 @@ MossdeepCity_Gym_EventScript_15A7ED:: @ 815A7ED end MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7 - step_14 - step_14 - step_end + delay_16 + delay_16 + end_movement MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA lockall diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index 415dbfc33..c8bccdd52 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -38,17 +38,17 @@ MossdeepCity_House2_EventScript_15A8B9:: @ 815A8B9 return MossdeepCity_House2_Movement_15A8C4:: @ 815A8C4 - step_18 - step_15 - step_15 - step_17 - step_15 - step_13 - step_end + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_down + delay_8 + end_movement MossdeepCity_House2_Movement_15A8CB:: @ 815A8CB - step_15 - step_15 - step_15 - step_13 - step_end + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 + end_movement diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 0f1aace1d..d415e7fc9 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -51,22 +51,22 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B end MossdeepCity_StevensHouse_Movement_15AA6E:: @ 815AA6E - step_left - step_left - step_left - step_left - step_left - step_left - step_25 - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_down + end_movement MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76 - step_up - step_right - step_right - step_right - step_26 - step_end + walk_up + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C lockall diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index ac7c00013..f13850570 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -59,250 +59,250 @@ MtChimney_EventScript_15D018:: @ 815D018 end MtChimney_Movement_15D025:: @ 815D025 - step_up - step_up - step_up - step_up - step_up - step_up - step_right - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + end_movement MtChimney_Movement_15D02D:: @ 815D02D - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement MtChimney_Movement_15D036:: @ 815D036 - step_up - step_up - step_up - step_up - step_up - step_right - step_right - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + end_movement MtChimney_Movement_15D03E:: @ 815D03E - step_left - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement @ 815D048 - step_down - step_down - step_down - step_down - step_down - step_left - step_left - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + end_movement @ 815D05A - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + end_movement @ 815D063 - step_right - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_end + walk_right + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + end_movement @ 815D072 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_left - step_left - step_down - step_down - step_down - step_left - step_left - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down - step_end + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + end_movement @ 815D08B - step_14 - step_14 - step_14 - step_down - step_down - step_down - step_left - step_left - step_left - step_down - step_end + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + end_movement @ 815D096 - step_14 - step_left - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_end + delay_16 + walk_left + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + end_movement @ 815D0A6 - step_14 - step_left - step_left - step_down - step_down - step_down - step_left - step_left - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down - step_end + delay_16 + walk_left + walk_left + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + end_movement @ 815D0B7 - step_14 - step_down - step_left - step_left - step_left - step_left - step_25 - step_end + delay_16 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_down + end_movement @ 815D0BF - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + end_movement @ 815D0CD - step_down - step_end + walk_down + end_movement @ 815D0CF - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement @ 815D0D7 - step_14 - step_14 - step_27 - step_14 - step_down - step_down - step_down - step_down - step_down - step_end + delay_16 + delay_16 + walk_in_place_fastest_left + delay_16 + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement @ 815D0E1 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_27 - step_14 - step_down - step_down - step_end + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left + delay_16 + walk_down + walk_down + end_movement @ 815D0EC - step_40 - step_17 - step_41 - step_03 - step_end + lock_facing_direction + walk_fast_left + unlock_facing_direction + face_right + end_movement @ 815D0F1 - step_left - step_28 - step_14 - step_end + walk_left + walk_in_place_fastest_right + delay_16 + end_movement MtChimney_EventScript_15D0F5:: @ 815D0F5 .ifdef SAPPHIRE diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 1f98778d6..7161e8800 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -59,29 +59,29 @@ MtChimney_CableCarStation_EventScript_15C19B:: @ 815C19B end MtChimney_CableCarStation_Movement_15C1A5:: @ 815C1A5 - step_up - step_up - step_left - step_28 - step_end + walk_up + walk_up + walk_left + walk_in_place_fastest_right + end_movement MtChimney_CableCarStation_Movement_15C1AA:: @ 815C1AA - step_14 - step_right - step_down - step_down - step_end + delay_16 + walk_right + walk_down + walk_down + end_movement MtChimney_CableCarStation_Movement_15C1AF:: @ 815C1AF - step_up - step_up - step_up - step_14 - step_end + walk_up + walk_up + walk_up + delay_16 + end_movement MtChimney_CableCarStation_Movement_15C1B4:: @ 815C1B4 - step_down - step_down - step_down - step_14 - step_end + walk_down + walk_down + walk_down + delay_16 + end_movement diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index d37100938..36b72ad12 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -110,30 +110,30 @@ MtPyre_Summit_EventScript_15D5CA:: @ 815D5CA return MtPyre_Summit_Movement_15D5DF:: @ 815D5DF - step_down - step_down - step_27 - step_end + walk_down + walk_down + walk_in_place_fastest_left + end_movement MtPyre_Summit_Movement_15D5E3:: @ 815D5E3 - step_down - step_end + walk_down + end_movement MtPyre_Summit_Movement_15D5E5:: @ 815D5E5 - step_down - step_down - step_28 - step_end + walk_down + walk_down + walk_in_place_fastest_right + end_movement MtPyre_Summit_Movement_15D5E9:: @ 815D5E9 - step_left - step_25 - step_end + walk_left + walk_in_place_fastest_down + end_movement MtPyre_Summit_Movement_15D5EC:: @ 815D5EC - step_right - step_25 - step_end + walk_right + walk_in_place_fastest_down + end_movement MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF lock @@ -319,47 +319,47 @@ MtPyre_Summit_EventScript_15D795:: @ 815D795 return MtPyre_Summit_Movement_15D7A0:: @ 815D7A0 - step_left - step_25 - step_end + walk_left + walk_in_place_fastest_down + end_movement MtPyre_Summit_Movement_15D7A3:: @ 815D7A3 - step_end + end_movement MtPyre_Summit_Movement_15D7A4:: @ 815D7A4 - step_right - step_25 - step_end + walk_right + walk_in_place_fastest_down + end_movement MtPyre_Summit_Movement_15D7A7:: @ 815D7A7 - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement MtPyre_Summit_Movement_15D7B0:: @ 815D7B0 - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement MtPyre_Summit_Movement_15D7B9:: @ 815D7B9 - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 9b1c9dd80..5385272b8 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -91,101 +91,101 @@ OldaleTown_EventScript_14DE83:: @ 814DE83 end OldaleTown_Movement_14DE8E:: @ 814DE8E - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_25 - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down + end_movement OldaleTown_Movement_14DE97:: @ 814DE97 - step_left - step_up - step_up - step_right - step_up - step_up - step_up - step_up - step_up - step_25 - step_end + walk_left + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down + end_movement OldaleTown_Movement_14DEA2:: @ 814DEA2 - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_25 - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down + end_movement @ 814DEAB - step_up - step_up - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_up - step_up - step_13 - step_25 - step_end + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + delay_8 + walk_in_place_fastest_down + end_movement OldaleTown_Movement_14DEB9:: @ 814DEB9 - step_right - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement OldaleTown_Movement_14DEC1:: @ 814DEC1 - step_14 - step_14 - step_14 - step_14 - step_up - step_up - step_up - step_up - step_up - step_end + delay_16 + delay_16 + delay_16 + delay_16 + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement OldaleTown_Movement_14DECB:: @ 814DECB - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement @ 814DED3 - step_left - step_up - step_up - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_up - step_end + walk_left + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up + end_movement OldaleTown_EventScript_14DEDF:: @ 814DEDF lock @@ -278,41 +278,41 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6 end OldaleTown_Movement_14DFDE:: @ 814DFDE - step_left - step_left - step_end + walk_left + walk_left + end_movement OldaleTown_Movement_14DFE1:: @ 814DFE1 - step_left - step_end + walk_left + end_movement OldaleTown_Movement_14DFE3:: @ 814DFE3 - step_02 - step_end + face_left + end_movement OldaleTown_Movement_14DFE5:: @ 814DFE5 - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement OldaleTown_Movement_14DFEC:: @ 814DFEC - step_13 - step_right - step_end + delay_8 + walk_right + end_movement OldaleTown_Movement_14DFEF:: @ 814DFEF - step_16 - step_27 - step_40 - step_right - step_41 - step_end + walk_fast_up + walk_in_place_fastest_left + lock_facing_direction + walk_right + unlock_facing_direction + end_movement OldaleTown_Movement_14DFF5:: @ 814DFF5 - step_down - step_left - step_end + walk_down + walk_left + end_movement diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index cb47a0edd..03013f66c 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -65,78 +65,78 @@ PetalburgCity_EventScript_14B7C3:: @ 814B7C3 end PetalburgCity_Movement_14B7CC:: @ 814B7CC - step_13 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_28 - step_end + delay_8 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_in_place_fastest_right + end_movement PetalburgCity_Movement_14B7ED:: @ 814B7ED - step_13 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_right - step_14 - step_26 - step_14 - step_14 - step_28 - step_end + delay_8 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_right + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_right + end_movement PetalburgCity_EventScript_14B812:: @ 814B812 msgbox PetalburgCity_Text_1645BB, 3 @@ -268,160 +268,160 @@ PetalburgCity_EventScript_14B99B:: @ 814B99B return @ 814B9AD - step_14 - step_14 - step_14 - step_end + delay_16 + delay_16 + delay_16 + end_movement PetalburgCity_Movement_14B9B1:: @ 814B9B1 - step_right - step_right - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement PetalburgCity_Movement_14B9B6:: @ 814B9B6 - step_right - step_right - step_end + walk_right + walk_right + end_movement PetalburgCity_Movement_14B9B9:: @ 814B9B9 - step_right - step_right - step_right - step_25 - step_end + walk_right + walk_right + walk_right + walk_in_place_fastest_down + end_movement PetalburgCity_Movement_14B9BE:: @ 814B9BE - step_down - step_right - step_right - step_right - step_25 - step_end + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_down + end_movement PetalburgCity_Movement_14B9C4:: @ 814B9C4 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_right + walk_in_place_fastest_up + end_movement PetalburgCity_Movement_14B9CF:: @ 814B9CF - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_right - step_26 - step_end + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_right + walk_in_place_fastest_up + end_movement PetalburgCity_Movement_14B9DD:: @ 814B9DD - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_right + walk_in_place_fastest_up + end_movement PetalburgCity_Movement_14B9E8:: @ 814B9E8 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_right + walk_in_place_fastest_up + end_movement PetalburgCity_Movement_14B9F4:: @ 814B9F4 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement PetalburgCity_Movement_14BA01:: @ 814BA01 - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_end + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + end_movement PetalburgCity_Movement_14BA0B:: @ 814BA0B - step_14 - step_14 - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_end + delay_16 + delay_16 + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + end_movement PetalburgCity_Movement_14BA18:: @ 814BA18 - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_end + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + end_movement PetalburgCity_Movement_14BA22:: @ 814BA22 - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_end + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + end_movement PetalburgCity_EventScript_14BA2D:: @ 814BA2D msgbox PetalburgCity_Text_16438A, 2 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 1dc1a77ec..59828c28d 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -88,11 +88,11 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C end PetalburgCity_Gym_Movement_1545B4:: @ 81545B4 - step_down - step_down - step_down - step_14 - step_end + walk_down + walk_down + walk_down + delay_16 + end_movement PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 lock @@ -471,109 +471,109 @@ PetalburgCity_Gym_EventScript_154B09:: @ 8154B09 return @ 8154B14 - step_26 - step_14 - step_14 - step_14 - step_14 - step_14 - step_13 - step_25 - step_end + walk_in_place_fastest_up + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_down + end_movement PetalburgCity_Gym_Movement_154B1D:: @ 8154B1D - step_14 - step_up - step_14 - step_13 - step_up - step_right - step_up - step_up - step_27 - step_end + delay_16 + walk_up + delay_16 + delay_8 + walk_up + walk_right + walk_up + walk_up + walk_in_place_fastest_left + end_movement PetalburgCity_Gym_Movement_154B27:: @ 8154B27 - step_14 - step_up - step_14 - step_13 - step_up - step_up - step_end + delay_16 + walk_up + delay_16 + delay_8 + walk_up + walk_up + end_movement PetalburgCity_Gym_Movement_154B2E:: @ 8154B2E - step_down - step_down - step_down - step_down - step_26 - step_14 - step_1d - step_end + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down + end_movement PetalburgCity_Gym_Movement_154B36:: @ 8154B36 - step_down - step_down - step_right - step_down - step_26 - step_14 - step_1d - step_end + walk_down + walk_down + walk_right + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down + end_movement PetalburgCity_Gym_Movement_154B3E:: @ 8154B3E - step_down - step_down - step_down - step_26 - step_14 - step_1d - step_end + walk_down + walk_down + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down + end_movement PetalburgCity_Gym_Movement_154B45:: @ 8154B45 - step_14 - step_14 - step_14 - step_down - step_down - step_down - step_13 - step_end + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + delay_8 + end_movement PetalburgCity_Gym_Movement_154B4D:: @ 8154B4D - step_14 - step_14 - step_right - step_down - step_down - step_down - step_down - step_down - step_13 - step_end + delay_16 + delay_16 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + delay_8 + end_movement PetalburgCity_Gym_Movement_154B57:: @ 8154B57 - step_14 - step_14 - step_down - step_down - step_down - step_down - step_13 - step_end + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_down + delay_8 + end_movement PetalburgCity_Gym_Movement_154B5F:: @ 8154B5F - step_25 - step_14 - step_14 - step_down - step_down - step_down - step_right - step_down - step_13 - step_end + walk_in_place_fastest_down + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_right + walk_down + delay_8 + end_movement PetalburgCity_Gym_EventScript_154B69:: @ 8154B69 msgbox PetalburgCity_Gym_Text_17AB17, 4 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 17908440c..1d5fbeaf2 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -116,119 +116,119 @@ PetalburgWoods_EventScript_15CE69:: @ 815CE69 end PetalburgWoods_Movement_15CE73:: @ 815CE73 - step_01 - step_14 - step_03 - step_14 - step_02 - step_14 - step_00 - step_14 - step_03 - step_14 - step_01 - step_14 - step_end + face_up + delay_16 + face_right + delay_16 + face_left + delay_16 + face_down + delay_16 + face_right + delay_16 + face_up + delay_16 + end_movement PetalburgWoods_Movement_15CE80:: @ 815CE80 - step_18 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement PetalburgWoods_Movement_15CE89:: @ 815CE89 - step_14 - step_3e - step_down - step_down - step_end + delay_16 + face_player + walk_down + walk_down + end_movement PetalburgWoods_Movement_15CE8E:: @ 815CE8E - step_14 - step_3e - step_down - step_down - step_down - step_28 - step_end + delay_16 + face_player + walk_down + walk_down + walk_down + walk_in_place_fastest_right + end_movement PetalburgWoods_Movement_15CE95:: @ 815CE95 - step_17 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement PetalburgWoods_Movement_15CE9E:: @ 815CE9E - step_18 - step_15 - step_15 - step_17 - step_26 - step_end + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_in_place_fastest_up + end_movement PetalburgWoods_Movement_15CEA4:: @ 815CEA4 - step_15 - step_18 - step_26 - step_end + walk_fast_down + walk_fast_right + walk_in_place_fastest_up + end_movement PetalburgWoods_Movement_15CEA8:: @ 815CEA8 - step_25 - step_14 - step_14 - step_14 - step_14 - step_14 - step_01 - step_end + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + face_up + end_movement PetalburgWoods_Movement_15CEB0:: @ 815CEB0 - step_15 - step_15 - step_end + walk_fast_down + walk_fast_down + end_movement PetalburgWoods_Movement_15CEB3:: @ 815CEB3 - step_40 - step_up - step_41 - step_end + lock_facing_direction + walk_up + unlock_facing_direction + end_movement PetalburgWoods_Movement_15CEB7:: @ 815CEB7 - step_16 - step_16 - step_16 - step_16 - step_16 - step_14 - step_14 - step_end + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + delay_16 + delay_16 + end_movement PetalburgWoods_Movement_15CEBF:: @ 815CEBF - step_15 - step_15 - step_15 - step_end + walk_fast_down + walk_fast_down + walk_fast_down + end_movement PetalburgWoods_Movement_15CEC3:: @ 815CEC3 - step_down - step_down - step_14 - step_14 - step_end + walk_down + walk_down + delay_16 + delay_16 + end_movement PetalburgWoods_Movement_15CEC8:: @ 815CEC8 - step_down - step_end + walk_down + end_movement PetalburgWoods_EventScript_15CECA:: @ 815CECA msgbox PetalburgWoods_Text_1953AC, 2 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 6840c45f4..a4af7ceb4 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -69,138 +69,138 @@ Route101_EventScript_14E9E4:: @ 814E9E4 end Route101_Movement_14E9FA:: @ 814E9FA - step_up - step_end + walk_up + end_movement Route101_Movement_14E9FC:: @ 814E9FC - step_right - step_end + walk_right + end_movement Route101_Movement_14E9FE:: @ 814E9FE - step_down - step_end + walk_down + end_movement Route101_Movement_14EA00:: @ 814EA00 - step_16 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_end + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + end_movement Route101_Movement_14EA1F:: @ 814EA1F - step_16 - step_18 - step_18 - step_18 - step_18 - step_16 - step_end + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + end_movement @ 814EA26 - step_end + end_movement Route101_Movement_14EA27:: @ 814EA27 - step_23 - step_23 - step_23 - step_23 - step_end + walk_in_place_fast_left + walk_in_place_fast_left + walk_in_place_fast_left + walk_in_place_fast_left + end_movement Route101_Movement_14EA2C:: @ 814EA2C - step_16 - step_16 - step_16 - step_16 - step_end + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement Route101_Movement_14EA31:: @ 814EA31 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 - step_16 - step_16 - step_18 - step_18 - step_18 - step_15 - step_15 - step_17 - step_17 - step_17 - step_end + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fast_left + end_movement Route101_Movement_14EA50:: @ 814EA50 - step_18 - step_18 - step_18 - step_18 - step_16 - step_16 - step_end + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + end_movement @ 814EA57 - step_end + end_movement Route101_Movement_14EA58:: @ 814EA58 - step_24 - step_24 - step_24 - step_24 - step_end + walk_in_place_fast_right + walk_in_place_fast_right + walk_in_place_fast_right + walk_in_place_fast_right + end_movement @ 814EA5D - step_up - step_up - step_end + walk_up + walk_up + end_movement @ 814EA60 - step_up - step_left - step_up - step_end + walk_up + walk_left + walk_up + end_movement Route101_EventScript_14EA64:: @ 814EA64 msgbox Route101_Text_16D25E, 2 @@ -242,5 +242,5 @@ Route101_EventScript_14EA7F:: @ 814EA7F end Route101_Movement_14EAD7:: @ 814EAD7 - step_right - step_end + walk_right + end_movement diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 22c3fa391..94d0aa8d6 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -129,30 +129,30 @@ Route103_EventScript_14ED46:: @ 814ED46 end Route103_Movement_14ED67:: @ 814ED67 - step_left - step_down - step_down - step_end + walk_left + walk_down + walk_down + end_movement Route103_Movement_14ED6B:: @ 814ED6B - fast_step_down - step_14 - step_down - step_down - step_down - step_end + jump_2_down + delay_16 + walk_down + walk_down + walk_down + end_movement Route103_Movement_14ED71:: @ 814ED71 - step_down - step_down - step_end + walk_down + walk_down + end_movement Route103_Movement_14ED74:: @ 814ED74 - fast_step_down - step_14 - step_down - step_down - step_end + jump_2_down + delay_16 + walk_down + walk_down + end_movement Route103_EventScript_14ED79:: @ 814ED79 msgbox Route103_Text_16D950, 2 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 2d44d4dfd..8fda04ea5 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -168,227 +168,227 @@ Route104_EventScript_14F095:: @ 814F095 end Route104_Movement_14F09F:: @ 814F09F - step_down - step_down - step_down - step_down - step_15 - step_15 - step_15 - step_15 - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_15 - step_15 - step_15 - step_15 - step_18 - step_18 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_18 - step_18 - step_15 - step_15 - step_15 - step_15 - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_15 - step_15 - step_15 - step_15 - step_18 - step_18 - step_18 - step_18 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_30 - step_18 - step_18 - step_18 - step_18 - step_right - step_right - step_down - step_down - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_right + walk_right + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_down + walk_down + end_movement Route104_Movement_14F162:: @ 814F162 - step_left - step_down - step_down - step_end + walk_left + walk_down + walk_down + end_movement Route104_Movement_14F166:: @ 814F166 - step_down - step_end + walk_down + end_movement Route104_Movement_14F168:: @ 814F168 - step_down - step_left - step_28 - step_end + walk_down + walk_left + walk_in_place_fastest_right + end_movement Route104_Movement_14F16C:: @ 814F16C - step_down - step_down - step_end + walk_down + walk_down + end_movement Route104_Movement_14F16F:: @ 814F16F - step_down - step_27 - step_end + walk_down + walk_in_place_fastest_left + end_movement Route104_EventScript_14F172:: @ 814F172 trainerbattle 0, OPPONENT_IVAN, 0, Route104_Text_1B85EB, Route104_Text_1B8637 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index c70365b6a..6f24b2142 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -62,211 +62,211 @@ Route109_EventScript_14F548:: @ 814F548 end Route109_Movement_14F5BF:: @ 814F5BF - step_25 - step_down - step_down - step_15 - step_15 - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_2d - step_15 - step_15 - step_17 - step_17 - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_2f - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_left - step_left - step_25 - step_end + walk_in_place_fastest_down + walk_down + walk_down + walk_fast_down + walk_fast_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fastest_down + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fastest_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_left + walk_left + walk_in_place_fastest_down + end_movement Route109_Movement_14F66D:: @ 814F66D - step_down - step_down - step_end + walk_down + walk_down + end_movement Route109_Movement_14F670:: @ 814F670 - step_down - step_down - step_left - step_28 - step_end + walk_down + walk_down + walk_left + walk_in_place_fastest_right + end_movement Route109_Movement_14F675:: @ 814F675 - step_right - step_down - step_end + walk_right + walk_down + end_movement Route109_Movement_14F678:: @ 814F678 - step_left - step_down - step_end + walk_left + walk_down + end_movement Route109_Movement_14F67B:: @ 814F67B - step_down - step_end + walk_down + end_movement Route109_Movement_14F67D:: @ 814F67D - step_down - step_27 - step_end + walk_down + walk_in_place_fastest_left + end_movement Route109_EventScript_14F680:: @ 814F680 lock diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 070340760..8245b3107 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -492,48 +492,48 @@ Route110_EventScript_14FF66:: @ 814FF66 return Route110_Movement_14FF6E:: @ 814FF6E - step_down - step_left - step_25 - step_end + walk_down + walk_left + walk_in_place_fastest_down + end_movement Route110_Movement_14FF72:: @ 814FF72 - step_down - step_end + walk_down + end_movement Route110_Movement_14FF74:: @ 814FF74 - step_down - step_right - step_25 - step_end + walk_down + walk_right + walk_in_place_fastest_down + end_movement Route110_Movement_14FF78:: @ 814FF78 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement Route110_Movement_14FF80:: @ 814FF80 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_15 - step_end + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_down + end_movement Route110_Movement_14FF89:: @ 814FF89 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index f05e2caa2..8d6465c89 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -48,8 +48,8 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523 end Route110_SeasideCyclingRoadNorthEntrance_Movement_163538:: @ 8163538 - step_left - step_end + walk_left + end_movement Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A @ Coord event directly in front of the gatesman heading right to left diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 2f54753ab..edae49291 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -27,8 +27,8 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6:: @ 81634A6 end Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB - step_left - step_end + walk_left + end_movement Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD lockall diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 2c2215a42..ca992427c 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -243,9 +243,9 @@ Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 end Route110_TrickHouseEnd_Movement_161CE8:: @ 8161CE8 - step_down - step_end + walk_down + end_movement Route110_TrickHouseEnd_Movement_161CEA:: @ 8161CEA - step_48 - step_end + jump_in_place_left + end_movement diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index e7468ec4f..a14ce2e2d 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -298,27 +298,27 @@ Route110_TrickHouseEntrance_EventScript_16130C:: @ 816130C Route110_TrickHouseEnd_Movement_161315:: @ 8161315 Route110_TrickHouseEntrance_Movement_161315:: @ 8161315 - step_01 - step_12 - step_02 - step_12 - step_00 - step_12 - step_03 - step_12 - step_end + face_up + delay_4 + face_left + delay_4 + face_down + delay_4 + face_right + delay_4 + end_movement Route110_TrickHouseEnd_Movement_16131E:: @ 816131E Route110_TrickHouseEntrance_Movement_16131E:: @ 816131E - step_01 - step_52 - step_32 - step_32 - step_32 - step_32 - step_32 - step_32 - step_end + face_up + disable_anim + slide_up + slide_up + slide_up + slide_up + slide_up + slide_up + end_movement Route110_TrickHouseEntrance_EventScript_161327:: @ 8161327 msgbox Route110_TrickHouseEntrance_Text_19BCFD, 4 @@ -513,8 +513,8 @@ Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD end Route110_TrickHouseEntrance_Movement_16165E:: @ 816165E - step_54 - step_end + set_invisible + end_movement Route110_TrickHouseEntrance_EventScript_161660:: @ 8161660 warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 5ec1a4d64..a7f283b2d 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -646,80 +646,80 @@ Route110_TrickHousePuzzle5_EventScript_163082:: @ 8163082 return Route110_TrickHousePuzzle5_Movement_16308D:: @ 816308D - step_left - step_end + walk_left + end_movement Route110_TrickHousePuzzle5_Movement_16308F:: @ 816308F - step_left - step_left - step_end + walk_left + walk_left + end_movement Route110_TrickHousePuzzle5_Movement_163092:: @ 8163092 - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + end_movement Route110_TrickHousePuzzle5_Movement_163096:: @ 8163096 - step_right - step_end + walk_right + end_movement Route110_TrickHousePuzzle5_Movement_163098:: @ 8163098 - step_right - step_right - step_end + walk_right + walk_right + end_movement Route110_TrickHousePuzzle5_Movement_16309B:: @ 816309B - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + end_movement Route110_TrickHouseEntrance_Movement_16309F:: @ 816309F Route110_TrickHousePuzzle5_Movement_16309F:: @ 816309F - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_02 - step_11 - step_03 - step_11 - step_00 - step_end + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_left + delay_2 + face_right + delay_2 + face_down + end_movement diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 99fa29efb..3e1570aff 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -92,28 +92,28 @@ Route111_EventScript_1500A5:: @ 81500A5 end Route111_Movement_1500AF:: @ 81500AF - step_55 - step_12 - step_54 - step_12 - step_55 - step_12 - step_54 - step_12 - step_55 - step_13 - step_54 - step_13 - step_55 - step_13 - step_54 - step_13 - step_55 - step_14 - step_54 - step_14 - step_55 - step_end + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_4 + set_invisible + delay_4 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_8 + set_invisible + delay_8 + set_visible + delay_16 + set_invisible + delay_16 + set_visible + end_movement Route111_EventScript_1500C5:: @ 81500C5 lock @@ -202,20 +202,20 @@ Route111_EventScript_1501A9:: @ 81501A9 return Route111_Movement_1501B4:: @ 81501B4 - step_up - step_end + walk_up + end_movement Route111_Movement_1501B6:: @ 81501B6 - step_down - step_end + walk_down + end_movement Route111_Movement_1501B8:: @ 81501B8 - step_left - step_end + walk_left + end_movement Route111_Movement_1501BA:: @ 81501BA - step_right - step_end + walk_right + end_movement Route111_EventScript_1501BC:: @ 81501BC setweather WEATHER_SUNNY @@ -321,19 +321,19 @@ Route111_EventScript_15034F:: @ 815034F return Route111_Movement_150356:: @ 8150356 - step_26 - step_up - step_end + walk_in_place_fastest_up + walk_up + end_movement Route111_Movement_150359:: @ 8150359 - step_down - step_end + walk_down + end_movement Route111_Movement_15035B:: @ 815035B - step_14 - step_14 - step_14 - step_end + delay_16 + delay_16 + delay_16 + end_movement Route111_EventScript_15035F:: @ 815035F msgbox Route111_Text_16FC9C, 3 diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 570075078..a593ccccc 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -60,29 +60,29 @@ Route112_CableCarStation_EventScript_15C0DC:: @ 815C0DC end Route112_CableCarStation_Movement_15C0E6:: @ 815C0E6 - step_up - step_up - step_right - step_27 - step_end + walk_up + walk_up + walk_right + walk_in_place_fastest_left + end_movement Route112_CableCarStation_Movement_15C0EB:: @ 815C0EB - step_14 - step_left - step_down - step_down - step_end + delay_16 + walk_left + walk_down + walk_down + end_movement Route112_CableCarStation_Movement_15C0F0:: @ 815C0F0 - step_up - step_up - step_up - step_14 - step_end + walk_up + walk_up + walk_up + delay_16 + end_movement Route112_CableCarStation_Movement_15C0F5:: @ 815C0F5 - step_down - step_down - step_down - step_14 - step_end + walk_down + walk_down + walk_down + delay_16 + end_movement diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index eea14e25d..77fbf57a4 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -79,28 +79,28 @@ Route116_EventScript_150B12:: @ 8150B12 end Route116_Movement_150B1C:: @ 8150B1C - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement Route116_Movement_150B25:: @ 8150B25 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement Route116_EventScript_150B30:: @ 8150B30 msgbox Route116_Text_170A46, 3 @@ -200,29 +200,29 @@ Route116_EventScript_150C42:: @ 8150C42 return Route116_Movement_150C4D:: @ 8150C4D - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement Route116_Movement_150C57:: @ 8150C57 - step_up - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement Route116_EventScript_150C62:: @ 8150C62 trainerbattle 0, OPPONENT_JOEY, 0, Route116_Text_1BD02B, Route116_Text_1BD04C diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 569a7103e..b938d0cc2 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -109,54 +109,54 @@ Route118_EventScript_15105E:: @ 815105E return Route118_Movement_151069:: @ 8151069 - step_left - step_end + walk_left + end_movement Route118_Movement_15106B:: @ 815106B - step_right - step_end + walk_right + end_movement Route118_Movement_15106D:: @ 815106D - fast_step_down - step_14 - step_down - step_end + jump_2_down + delay_16 + walk_down + end_movement Route118_Movement_151071:: @ 8151071 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement Route118_Movement_15107C:: @ 815107C - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement Route118_Movement_151086:: @ 8151086 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement Route118_EventScript_15108F:: @ 815108F trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 30eed9cc0..b1f2d33bf 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -202,54 +202,54 @@ Route119_EventScript_1513E1:: @ 81513E1 return Route119_Movement_1513F0:: @ 81513F0 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_16 - step_end + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + end_movement Route119_Movement_1513FA:: @ 81513FA - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_16 - step_end + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + end_movement Route119_Movement_151405:: @ 8151405 - step_18 - step_16 - step_16 - step_16 - step_18 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement Route119_Movement_15140F:: @ 815140F - step_17 - step_16 - step_16 - step_16 - step_18 - step_18 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement Route119_EventScript_15141A:: @ 815141A msgbox Route119_Text_171698, 2 diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 81037941f..32c264acc 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -79,10 +79,10 @@ Route119_WeatherInstitute_2F_EventScript_163DBE:: @ 8163DBE end Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8 - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + end_movement Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC lock diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index eb696b45b..6f561391f 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -263,9 +263,9 @@ Route120_EventScript_15198A:: @ 815198A return Route120_Movement_151995:: @ 8151995 - step_down - step_left - step_end + walk_down + walk_left + end_movement Route120_EventScript_151998:: @ 8151998 msgbox Route120_Text_171B93, 2 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 6108b129d..5fe7f6330 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -34,37 +34,37 @@ Route121_EventScript_151B25:: @ 8151B25 end Route121_Movement_151B57:: @ 8151B57 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement Route121_Movement_151B60:: @ 8151B60 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement Route121_Movement_151B69:: @ 8151B69 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement Route121_EventScript_151B72:: @ 8151B72 trainerbattle 0, OPPONENT_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 2648e19ce..6e9ae80fd 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -16,15 +16,15 @@ Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333 end Route121_SafariZoneEntrance_Movement_15C348:: @ 815C348 - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement Route121_SafariZoneEntrance_EventScript_15C351:: @ 815C351 msgbox Route121_SafariZoneEntrance_Text_1C35D0, 2 @@ -119,19 +119,19 @@ Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C end Route121_SafariZoneEntrance_Movement_15C47C:: @ 815C47C - step_right - step_end + walk_right + end_movement Route121_SafariZoneEntrance_Movement_15C47E:: @ 815C47E - step_left - step_left - step_left - step_left - step_left - step_left - step_down - step_14 - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + delay_16 + end_movement Route121_SafariZoneEntrance_EventScript_15C487:: @ 815C487 msgbox Route121_SafariZoneEntrance_Text_1C3E4B, 3 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index f580a7e0b..ec4fb954e 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -86,98 +86,98 @@ Route128_EventScript_15213F:: @ 815213F end @ 815225E - step_17 - step_end + walk_fast_left + end_movement @ 8152260 - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement Route128_Movement_15226D:: @ 815226D - step_up - step_end + walk_up + end_movement Route128_Movement_15226F:: @ 815226F - step_17 - step_end + walk_fast_left + end_movement Route128_Movement_152271:: @ 8152271 - step_15 - step_27 - step_14 - step_28 - step_14 - step_14 - step_25 - step_end + walk_fast_down + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_down + end_movement Route128_Movement_152279:: @ 8152279 - step_40 - slow_step_up - step_14 - step_41 - step_end + lock_facing_direction + walk_slow_up + delay_16 + unlock_facing_direction + end_movement Route128_Movement_15227E:: @ 815227E - step_17 - step_17 - step_17 - step_28 - step_end + walk_fast_left + walk_fast_left + walk_fast_left + walk_in_place_fastest_right + end_movement Route128_Movement_152283:: @ 8152283 - step_14 - step_14 - step_16 - step_17 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + delay_16 + delay_16 + walk_fast_up + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement Route128_Movement_152290:: @ 8152290 - step_left - step_left - step_end + walk_left + walk_left + end_movement Route128_Movement_152293:: @ 8152293 - step_left - step_25 - step_end + walk_left + walk_in_place_fastest_down + end_movement Route128_Movement_152296:: @ 8152296 - step_17 - step_17 - step_17 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement Route128_Movement_1522A1:: @ 81522A1 - step_right - step_25 - step_end + walk_right + walk_in_place_fastest_down + end_movement Route128_EventScript_1522A4:: @ 81522A4 trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 415138d67..72699ab79 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -224,101 +224,101 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 return @ 814C5B0 - step_30 - step_30 - step_18 - step_18 - step_18 - step_18 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement RustboroCity_Movement_14C5C2:: @ 814C5C2 - step_30 - step_30 - step_18 - step_18 - step_18 - step_18 - step_18 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_end + walk_fastest_right + walk_fastest_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + end_movement RustboroCity_Movement_14C5D3:: @ 814C5D3 - step_right - step_right - step_right - step_right - step_right - step_right - step_26 - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up + end_movement RustboroCity_Movement_14C5DB:: @ 814C5DB - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + end_movement RustboroCity_Movement_14C5E3:: @ 814C5E3 - step_down - step_right - step_right - step_end + walk_down + walk_right + walk_right + end_movement RustboroCity_Movement_14C5E7:: @ 814C5E7 - step_down - step_down - step_right - step_right - step_end + walk_down + walk_down + walk_right + walk_right + end_movement RustboroCity_Movement_14C5EC:: @ 814C5EC - step_down - step_down - step_right - step_right - step_end + walk_down + walk_down + walk_right + walk_right + end_movement RustboroCity_Movement_14C5F1:: @ 814C5F1 - step_down - step_down - step_down - step_right - step_right - step_end + walk_down + walk_down + walk_down + walk_right + walk_right + end_movement RustboroCity_Movement_14C5F7:: @ 814C5F7 - step_down - step_down - step_down - step_right - step_right - step_right - step_25 - step_end + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_down + end_movement RustboroCity_EventScript_14C5FF:: @ 814C5FF lock @@ -425,8 +425,8 @@ RustboroCity_EventScript_14C715:: @ 814C715 return RustboroCity_Movement_14C74B:: @ 814C74B - step_down - step_end + walk_down + end_movement RustboroCity_EventScript_14C74D:: @ 814C74D lockall diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 0b71effee..e68269437 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -69,79 +69,79 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 end @ 81577FE - step_up - step_up - step_up - step_27 - step_end + walk_up + walk_up + walk_up + walk_in_place_fastest_left + end_movement RustboroCity_DevonCorp_3F_Movement_157803:: @ 8157803 - step_right - step_right - step_right - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_27 - step_end + walk_right + walk_right + walk_right + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_left + end_movement RustboroCity_DevonCorp_3F_Movement_157812:: @ 8157812 - step_14 - step_25 - step_end + delay_16 + walk_in_place_fastest_down + end_movement RustboroCity_DevonCorp_3F_Movement_157815:: @ 8157815 - step_right - step_right - step_right - step_down - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_down + walk_right + walk_right + walk_right + walk_right + end_movement RustboroCity_DevonCorp_3F_Movement_15781E:: @ 815781E - step_left - step_left - step_left - step_left - step_up - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left + end_movement RustboroCity_DevonCorp_3F_Movement_157827:: @ 8157827 - step_right - step_right - step_right - step_right - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835 - step_14 - step_14 - step_down - step_down - step_28 - step_end + delay_16 + delay_16 + walk_down + walk_down + walk_in_place_fastest_right + end_movement RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B lock diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 155df8de5..f8193cbb8 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -112,53 +112,53 @@ RustboroCity_PokemonSchool_EventScript_157B34:: @ 8157B34 end RustboroCity_PokemonSchool_Movement_157B49:: @ 8157B49 - step_left - step_down - step_down - step_right - step_25 - step_14 - step_14 - step_14 - step_down - step_27 - step_14 - step_14 - step_right - step_14 - step_14 - step_13 - step_up - step_left - step_left - step_up - step_up - step_right - step_end + walk_left + walk_down + walk_down + walk_right + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + walk_down + walk_in_place_fastest_left + delay_16 + delay_16 + walk_right + delay_16 + delay_16 + delay_8 + walk_up + walk_left + walk_left + walk_up + walk_up + walk_right + end_movement RustboroCity_PokemonSchool_Movement_157B60:: @ 8157B60 - step_right - step_right - step_down - step_down - step_left - step_left - step_25 - step_14 - step_14 - step_14 - step_down - step_27 - step_14 - step_14 - step_right - step_14 - step_14 - step_13 - step_up - step_right - step_up - step_up - step_left - step_left - step_end + walk_right + walk_right + walk_down + walk_down + walk_left + walk_left + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + walk_down + walk_in_place_fastest_left + delay_16 + delay_16 + walk_right + delay_16 + delay_16 + delay_8 + walk_up + walk_right + walk_up + walk_up + walk_left + walk_left + end_movement diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 06f2dfa82..1aae9faba 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -155,114 +155,114 @@ RusturfTunnel_EventScript_15C92D:: @ 815C92D return RusturfTunnel_Movement_15C945:: @ 815C945 - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement RusturfTunnel_Movement_15C951:: @ 815C951 - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement @ 815C95D - step_left - step_28 - step_end + walk_left + walk_in_place_fastest_right + end_movement @ 815C960 - step_down - step_26 - step_13 - step_28 - step_end + walk_down + walk_in_place_fastest_up + delay_8 + walk_in_place_fastest_right + end_movement @ 815C965 - step_up - step_25 - step_13 - step_28 - step_end + walk_up + walk_in_place_fastest_down + delay_8 + walk_in_place_fastest_right + end_movement RusturfTunnel_Movement_15C96A:: @ 815C96A - step_left - step_28 - step_end + walk_left + walk_in_place_fastest_right + end_movement RusturfTunnel_Movement_15C96D:: @ 815C96D - step_right - step_27 - step_end + walk_right + walk_in_place_fastest_left + end_movement RusturfTunnel_Movement_15C970:: @ 815C970 - step_up - step_28 - step_end + walk_up + walk_in_place_fastest_right + end_movement RusturfTunnel_Movement_15C973:: @ 815C973 - step_right - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement RusturfTunnel_Movement_15C980:: @ 815C980 - step_up - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_end + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + end_movement RusturfTunnel_Movement_15C98D:: @ 815C98D - step_right - step_end + walk_right + end_movement RusturfTunnel_Movement_15C98F:: @ 815C98F - step_22 - step_22 - step_16 - step_18 - step_end + walk_in_place_fast_up + walk_in_place_fast_up + walk_fast_up + walk_fast_right + end_movement RusturfTunnel_Movement_15C994:: @ 815C994 - step_24 - step_24 - step_18 - step_26 - step_end + walk_in_place_fast_right + walk_in_place_fast_right + walk_fast_right + walk_in_place_fastest_up + end_movement RusturfTunnel_EventScript_15C999:: @ 815C999 setvar VAR_TEMP_1, 1 @@ -290,10 +290,10 @@ RusturfTunnel_EventScript_15C9AB:: @ 815C9AB end RusturfTunnel_Movement_15C9D3:: @ 815C9D3 - step_40 - step_right - step_41 - step_end + lock_facing_direction + walk_right + unlock_facing_direction + end_movement RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 lock @@ -349,70 +349,70 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA end RusturfTunnel_Movement_15CA99:: @ 815CA99 - step_00 - step_40 - step_up - step_41 - step_27 - step_end + face_down + lock_facing_direction + walk_up + unlock_facing_direction + walk_in_place_fastest_left + end_movement RusturfTunnel_Movement_15CA9F:: @ 815CA9F - step_down - step_26 - step_end + walk_down + walk_in_place_fastest_up + end_movement RusturfTunnel_Movement_15CAA2:: @ 815CAA2 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_end + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + end_movement RusturfTunnel_Movement_15CAAC:: @ 815CAAC - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement RusturfTunnel_Movement_15CAB4:: @ 815CAB4 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement RusturfTunnel_Movement_15CAC0:: @ 815CAC0 - step_14 - step_right - step_end + delay_16 + walk_right + end_movement RusturfTunnel_Movement_15CAC3:: @ 815CAC3 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement RusturfTunnel_EventScript_15CACD:: @ 815CACD trainerbattle 0, OPPONENT_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 493aa55a1..d7d581891 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -29,13 +29,13 @@ SafariZone_Southeast_EventScript_16007F:: @ 816007F return SafariZone_Southeast_Movement_160087:: @ 8160087 - step_down - step_end + walk_down + end_movement SafariZone_Southeast_Movement_160089:: @ 8160089 - step_right - step_25 - step_end + walk_right + walk_in_place_fastest_down + end_movement SafariZone_Southeast_EventScript_16008C:: @ 816008C msgbox SafariZone_Southeast_Text_1C3B71, 2 @@ -99,20 +99,20 @@ SafariZone_Southeast_EventScript_160139:: @ 8160139 end SafariZone_Southeast_Movement_16014B:: @ 816014B - step_up - step_end + walk_up + end_movement SafariZone_Southeast_Movement_16014D:: @ 816014D - step_right - step_26 - step_end + walk_right + walk_in_place_fastest_up + end_movement SafariZone_Southeast_Movement_160150:: @ 8160150 - step_left - step_28 - step_end + walk_left + walk_in_place_fastest_right + end_movement SafariZone_Southeast_Movement_160153:: @ 8160153 - step_down - step_26 - step_end + walk_down + walk_in_place_fastest_up + end_movement diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index f9cd83cac..eb46278dd 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -216,76 +216,76 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA end SeafloorCavern_Room9_Movement_15DD36:: @ 815DD36 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement @ 815DD3E - step_left - step_left - step_end + walk_left + walk_left + end_movement SeafloorCavern_Room9_Movement_15DD41:: @ 815DD41 - step_left - step_14 - step_end + walk_left + delay_16 + end_movement @ 815DD44 - step_right - step_end + walk_right + end_movement SeafloorCavern_Room9_Movement_15DD46:: @ 815DD46 - step_01 - step_40 - step_down - step_41 - step_28 - step_end + face_up + lock_facing_direction + walk_down + unlock_facing_direction + walk_in_place_fastest_right + end_movement SeafloorCavern_Room9_Movement_15DD4C:: @ 815DD4C - step_14 - step_14 - slow_step_down - step_14 - step_14 - step_14 - slow_step_down - step_14 - step_14 - step_14 - step_end + delay_16 + delay_16 + walk_slow_down + delay_16 + delay_16 + delay_16 + walk_slow_down + delay_16 + delay_16 + delay_16 + end_movement SeafloorCavern_Room9_Movement_15DD57:: @ 815DD57 - step_32 - step_32 - step_end + slide_up + slide_up + end_movement SeafloorCavern_Room9_Movement_15DD5A:: @ 815DD5A - step_18 - step_18 - step_18 - step_18 - step_18 - step_end + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement SeafloorCavern_Room9_Movement_15DD60:: @ 815DD60 - step_right - step_right - step_end + walk_right + walk_right + end_movement SeafloorCavern_Room9_Movement_15DD63:: @ 815DD63 - step_18 - step_18 - step_18 - step_18 - step_end + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement SeafloorCavern_Room9_Movement_15DD68:: @ 815DD68 - step_14 - step_14 - step_end + delay_16 + delay_16 + end_movement diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 213fc3163..7d244e633 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -4,11 +4,11 @@ SlateportCity_MapScripts:: @ 814BA36 SlateportCity_MapScript1_14BA3C:: @ 814BA3C .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_AQUA_MEMBER_F - setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M .else - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_MAGMA_MEMBER_F - setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M .endif setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 call SlateportCity_EventScript_14BA5C @@ -537,96 +537,96 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC end SlateportCity_Movement_14BFCD:: @ 814BFCD - step_14 - step_14 - step_57 - step_28 - step_14 - step_14 - step_27 - step_end + delay_16 + delay_16 + emote_question_mark + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_left + end_movement SlateportCity_Movement_14BFD5:: @ 814BFD5 - step_57 - step_26 - step_14 - step_25 - step_14 - step_14 - step_27 - step_end + emote_question_mark + walk_in_place_fastest_up + delay_16 + walk_in_place_fastest_down + delay_16 + delay_16 + walk_in_place_fastest_left + end_movement SlateportCity_Movement_14BFDD:: @ 814BFDD - step_14 - step_left - step_left - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + delay_16 + walk_left + walk_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement SlateportCity_Movement_14BFEA:: @ 814BFEA - step_down - step_left - step_left - step_left - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_down + walk_left + walk_left + walk_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement @ 814BFF8 - step_down - step_26 - step_end + walk_down + walk_in_place_fastest_up + end_movement SlateportCity_Movement_14BFFB:: @ 814BFFB - step_right - step_up - step_up - step_54 - step_end + walk_right + walk_up + walk_up + set_invisible + end_movement SlateportCity_Movement_14C000:: @ 814C000 - step_14 - step_14 - step_14 - step_14 - step_14 - step_down - step_left - step_end + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_down + walk_left + end_movement SlateportCity_Movement_14C008:: @ 814C008 - step_28 - step_14 - step_14 - step_right - step_up - step_end + walk_in_place_fastest_right + delay_16 + delay_16 + walk_right + walk_up + end_movement SlateportCity_Movement_14C00E:: @ 814C00E - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_25 - step_end + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_down + end_movement SlateportCity_EventScript_14C017:: @ 814C017 msgbox SlateportCity_Text_165425, 3 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 22f797968..fd26671dd 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -46,46 +46,46 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 return SlateportCity_ContestLobby_Movement_1554C0:: @ 81554C0 - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement SlateportCity_ContestLobby_Movement_1554CA:: @ 81554CA - step_27 - step_end + walk_in_place_fastest_left + end_movement SlateportCity_ContestLobby_Movement_1554CC:: @ 81554CC - step_left - step_25 - step_end + walk_left + walk_in_place_fastest_down + end_movement SlateportCity_ContestLobby_Movement_1554CF:: @ 81554CF - step_down - step_down - step_26 - step_end + walk_down + walk_down + walk_in_place_fastest_up + end_movement SlateportCity_ContestLobby_Movement_1554D3:: @ 81554D3 - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement SlateportCity_ContestLobby_Movement_1554DC:: @ 81554DC - step_28 - step_end + walk_in_place_fastest_right + end_movement SlateportCity_ContestLobby_EventScript_1554DE:: @ 81554DE msgbox SlateportCity_ContestLobby_Text_17C937, 2 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 82a17b0a6..8ab61661a 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -101,59 +101,59 @@ SlateportCity_Harbor_EventScript_156086:: @ 8156086 return SlateportCity_Harbor_Movement_15609B:: @ 815609B - step_14 - step_14 - step_43 - step_54 - step_end + delay_16 + delay_16 + jump_up + set_invisible + end_movement @ 81560A0 - step_14 - step_14 - step_43 - step_54 - step_end + delay_16 + delay_16 + jump_up + set_invisible + end_movement SlateportCity_Harbor_Movement_1560A5:: @ 81560A5 - step_14 - step_14 - step_14 - step_14 - step_right - step_right - step_right - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_end + delay_16 + delay_16 + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + end_movement SlateportCity_Harbor_Movement_1560B3:: @ 81560B3 - step_left - step_left - step_left - step_left - step_up - step_end + walk_left + walk_left + walk_left + walk_left + walk_up + end_movement SlateportCity_Harbor_Movement_1560B9:: @ 81560B9 - step_left - step_left - step_up - step_left - step_end + walk_left + walk_left + walk_up + walk_left + end_movement SlateportCity_Harbor_Movement_1560BE:: @ 81560BE - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + end_movement SlateportCity_Harbor_Movement_1560C2:: @ 81560C2 - step_up - step_end + walk_up + end_movement SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 lock @@ -247,13 +247,13 @@ SlateportCity_Harbor_EventScript_1561EF:: @ 81561EF return SlateportCity_Harbor_Movement_1561FA:: @ 81561FA - step_right - step_26 - step_end + walk_right + walk_in_place_fastest_up + end_movement SlateportCity_Harbor_Movement_1561FD:: @ 81561FD - step_up - step_end + walk_up + end_movement SlateportCity_Harbor_EventScript_1561FF:: @ 81561FF msgbox SlateportCity_Harbor_Text_17FC07, 2 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 45ca62167..cb65f1be5 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -4,11 +4,11 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0 .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_AQUA_MEMBER_F - setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_AQUA_MEMBER_M .else - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_MAGMA_MEMBER_F - setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_MAGMA_MEMBER_M .endif end @@ -74,8 +74,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B7B:: @ 8155B7B end SlateportCity_OceanicMuseum_1F_Movement_155B8D:: @ 8155B8D - step_down - step_end + walk_down + end_movement SlateportCity_OceanicMuseum_1F_EventScript_155B8F:: @ 8155B8F msgbox SlateportCity_OceanicMuseum_1F_Text_17E2BB, 2 @@ -199,19 +199,19 @@ SlateportCity_OceanicMuseum_1F_EventScript_155CC2:: @ 8155CC2 end SlateportCity_OceanicMuseum_1F_Movement_155CCC:: @ 8155CCC - step_00 - step_15 - step_15 - step_15 - step_15 - step_13 - step_end + face_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 + end_movement SlateportCity_OceanicMuseum_1F_Movement_155CD3:: @ 8155CD3 - step_18 - step_15 - step_15 - step_15 - step_15 - step_13 - step_end + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 + end_movement diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index d84982e2e..6947d52b1 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -114,104 +114,104 @@ SlateportCity_OceanicMuseum_2F_EventScript_155E83:: @ 8155E83 return SlateportCity_OceanicMuseum_2F_Movement_155E8E:: @ 8155E8E - step_left - step_down - step_27 - step_end + walk_left + walk_down + walk_in_place_fastest_left + end_movement SlateportCity_OceanicMuseum_2F_Movement_155E92:: @ 8155E92 - step_up - step_left - step_left - step_down - step_27 - step_end + walk_up + walk_left + walk_left + walk_down + walk_in_place_fastest_left + end_movement SlateportCity_OceanicMuseum_2F_Movement_155E98:: @ 8155E98 - step_up - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_left - step_left - step_up - step_up - step_13 - step_end + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_left + walk_left + walk_up + walk_up + delay_8 + end_movement SlateportCity_OceanicMuseum_2F_Movement_155EA6:: @ 8155EA6 - step_right - step_end + walk_right + end_movement SlateportCity_OceanicMuseum_2F_Movement_155EA8:: @ 8155EA8 - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + end_movement SlateportCity_OceanicMuseum_2F_Movement_155EB2:: @ 8155EB2 - step_right - step_end + walk_right + end_movement SlateportCity_OceanicMuseum_2F_Movement_155EB4:: @ 8155EB4 - step_down - step_right - step_25 - step_end + walk_down + walk_right + walk_in_place_fastest_down + end_movement SlateportCity_OceanicMuseum_2F_Movement_155EB8:: @ 8155EB8 - step_down - step_down - step_down - step_right - step_right - step_right - step_end + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + end_movement SlateportCity_OceanicMuseum_2F_Movement_155EBF:: @ 8155EBF - step_40 - step_left - step_41 - step_end + lock_facing_direction + walk_left + unlock_facing_direction + end_movement SlateportCity_OceanicMuseum_2F_Movement_155EC3:: @ 8155EC3 - step_down - step_end + walk_down + end_movement SlateportCity_OceanicMuseum_2F_Movement_155EC5:: @ 8155EC5 - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_end + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + end_movement SlateportCity_OceanicMuseum_2F_Movement_155ECE:: @ 8155ECE - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_13 - step_15 - step_26 - step_end + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_fast_down + walk_in_place_fastest_up + end_movement SlateportCity_OceanicMuseum_2F_EventScript_155EDA:: @ 8155EDA msgbox SlateportCity_OceanicMuseum_2F_Text_17F572, 3 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 6222d3774..f5452a7bb 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -282,146 +282,146 @@ SootopolisCity_EventScript_14D308:: @ 814D308 end SootopolisCity_Movement_14D413:: @ 814D413 - step_left - step_left - step_left - step_end + walk_left + walk_left + walk_left + end_movement SootopolisCity_Movement_14D417:: @ 814D417 - step_right - step_right - step_right - step_up - step_25 - step_end + walk_right + walk_right + walk_right + walk_up + walk_in_place_fastest_down + end_movement SootopolisCity_Movement_14D41D:: @ 814D41D - step_down - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_left - step_left - step_end + walk_down + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + end_movement SootopolisCity_Movement_14D42D:: @ 814D42D - step_left - step_left - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_end + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + end_movement SootopolisCity_Movement_14D440:: @ 814D440 - step_right - step_right - step_right - step_right - step_end + walk_right + walk_right + walk_right + walk_right + end_movement SootopolisCity_Movement_14D445:: @ 814D445 - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_end + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement SootopolisCity_Movement_14D457:: @ 814D457 - step_14 - step_14 - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_end + delay_16 + delay_16 + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement SootopolisCity_Movement_14D46A:: @ 814D46A - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_end + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + end_movement SootopolisCity_Movement_14D47C:: @ 814D47C - step_14 - step_14 - step_left - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_end + delay_16 + delay_16 + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + end_movement SootopolisCity_EventScript_14D48F:: @ 814D48F .ifdef SAPPHIRE diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 0ad6aa027..a404013e0 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -82,8 +82,8 @@ SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 end SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD - step_54 - step_end + set_invisible + end_movement SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 874e3e901..13e4774e2 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -41,13 +41,13 @@ BattleTower_Outside_EventScript_160B3A:: @ 8160B3A return BattleTower_Outside_Movement_160B45:: @ 8160B45 - step_down - step_end + walk_down + end_movement BattleTower_Outside_Movement_160B47:: @ 8160B47 - step_left - step_25 - step_end + walk_left + walk_in_place_fastest_down + end_movement SouthernIsland_Exterior_EventScript_160B4A:: @ 8160B4A msgbox SouthernIsland_Exterior_Text_1C52FB, 3 diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 1a537cfb0..7094ebed8 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -13,9 +13,9 @@ SouthernIsland_Interior_EventScript_160B68:: @ 8160B68 SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C .ifdef SAPPHIRE - setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_LATIOS + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIOS .else - setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_LATIAS + setvar VAR_OBJ_GFX_ID_1, EVENT_OBJ_GFX_LATIAS .endif call SouthernIsland_Interior_EventScript_160B77 end @@ -29,11 +29,11 @@ SouthernIsland_Interior_EventScript_160B77:: @ 8160B77 end SouthernIsland_Interior_EventScript_160B8F:: @ 8160B8F - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return SouthernIsland_Interior_EventScript_160B95:: @ 8160B95 - setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B @@ -76,35 +76,35 @@ SouthernIsland_Interior_EventScript_160C08:: @ 8160C08 end SouthernIsland_Interior_Movement_160C12:: @ 8160C12 - step_up - step_up - step_up - step_end + walk_up + walk_up + walk_up + end_movement SouthernIsland_Interior_Movement_160C16:: @ 8160C16 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_down - step_down - step_down - step_26 - step_end + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_in_place_fastest_up + end_movement SouthernIsland_Interior_Movement_160C22:: @ 8160C22 - step_down - step_down - step_down - step_down - step_down - step_14 - step_14 - step_down - step_down - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_down + end_movement diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 44b9463b4..7377d2298 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -421,9 +421,9 @@ VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB return FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3 - setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL return FallarborTown_ContestLobby_EventScript_15FBF9:: @ 815FBF9 - setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_MAY_NORMAL + setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL return diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 3aef08e94..32661485d 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -46,46 +46,46 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 return VerdanturfTown_ContestLobby_Movement_153E19:: @ 8153E19 - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement VerdanturfTown_ContestLobby_Movement_153E23:: @ 8153E23 - step_27 - step_end + walk_in_place_fastest_left + end_movement VerdanturfTown_ContestLobby_Movement_153E25:: @ 8153E25 - step_left - step_25 - step_end + walk_left + walk_in_place_fastest_down + end_movement VerdanturfTown_ContestLobby_Movement_153E28:: @ 8153E28 - step_down - step_down - step_26 - step_end + walk_down + walk_down + walk_in_place_fastest_up + end_movement VerdanturfTown_ContestLobby_Movement_153E2C:: @ 8153E2C - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 - step_end + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible + end_movement VerdanturfTown_ContestLobby_Movement_153E35:: @ 8153E35 - step_28 - step_end + walk_in_place_fastest_right + end_movement VerdanturfTown_ContestLobby_EventScript_153E37:: @ 8153E37 lockall diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 4f3180318..045189759 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -48,43 +48,43 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 end VictoryRoad_1F_Movement_15DF07:: @ 815DF07 - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_right - step_right - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + end_movement VictoryRoad_1F_Movement_15DF13:: @ 815DF13 - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_right - step_right - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + end_movement VictoryRoad_1F_Movement_15DF1E:: @ 815DF1E - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_right - step_right - step_end + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + end_movement VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 msgbox VictoryRoad_1F_Text_197967, 2 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 3d8f5532f..a1a99fa89 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -32,8 +32,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B69AA:: @ 81B69AA return LittlerootTown_BrendansHouse_1F_Movement_1B69B5:: @ 81B69B5 - step_up - step_end + walk_up + end_movement LittlerootTown_BrendansHouse_1F_EventScript_1B69B7:: @ 81B69B7 LittlerootTown_MaysHouse_1F_EventScript_1B69B7:: @ 81B69B7 @@ -118,34 +118,34 @@ LittlerootTown_BrendansHouse_2F_EventScript_1B6A9B:: @ 81B6A9B return LittlerootTown_BrendansHouse_2F_Movement_1B6AA2:: @ 81B6AA2 - step_13 - step_down - step_27 - step_14 - step_13 - step_left - step_end + delay_8 + walk_down + walk_in_place_fastest_left + delay_16 + delay_8 + walk_left + end_movement LittlerootTown_BrendansHouse_2F_Movement_1B6AA9:: @ 81B6AA9 - step_right - step_up - step_13 - step_end + walk_right + walk_up + delay_8 + end_movement LittlerootTown_BrendansHouse_2F_Movement_1B6AAD:: @ 81B6AAD - step_13 - step_down - step_28 - step_14 - step_13 - step_right - step_end + delay_8 + walk_down + walk_in_place_fastest_right + delay_16 + delay_8 + walk_right + end_movement LittlerootTown_BrendansHouse_2F_Movement_1B6AB4:: @ 81B6AB4 - step_left - step_up - step_13 - step_end + walk_left + walk_up + delay_8 + end_movement LittlerootTown_BrendansHouse_1F_EventScript_1B6AB8:: @ 81B6AB8 LittlerootTown_MaysHouse_1F_EventScript_1B6AB8:: @ 81B6AB8 @@ -226,26 +226,26 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE return LittlerootTown_BrendansHouse_1F_Movement_1B6BDB:: @ 81B6BDB - step_left - step_28 - step_end + walk_left + walk_in_place_fastest_right + end_movement LittlerootTown_MaysHouse_1F_Movement_1B6BDE:: @ 81B6BDE - step_right - step_27 - step_end + walk_right + walk_in_place_fastest_left + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6BE1:: @ 81B6BE1 - step_left - step_down - step_28 - step_end + walk_left + walk_down + walk_in_place_fastest_right + end_movement LittlerootTown_MaysHouse_1F_Movement_1B6BE5:: @ 81B6BE5 - step_right - step_down - step_27 - step_end + walk_right + walk_down + walk_in_place_fastest_left + end_movement LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 @@ -327,32 +327,32 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6CB9:: @ 81B6CB9 end LittlerootTown_BrendansHouse_1F_Movement_1B6CCC:: @ 81B6CCC - step_down - step_down - step_left - step_left - step_left - step_end + walk_down + walk_down + walk_left + walk_left + walk_left + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6CD2:: @ 81B6CD2 - step_left - step_end + walk_left + end_movement LittlerootTown_MaysHouse_1F_Movement_1B6CD4:: @ 81B6CD4 - step_down - step_down - step_right - step_right - step_right - step_end + walk_down + walk_down + walk_right + walk_right + walk_right + end_movement LittlerootTown_MaysHouse_1F_Movement_1B6CDA:: @ 81B6CDA - step_right - step_end + walk_right + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6CDC:: @ 81B6CDC - step_up - step_end + walk_up + end_movement LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE:: @ 81B6CDE LittlerootTown_MaysHouse_1F_EventScript_1B6CDE:: @ 81B6CDE @@ -455,58 +455,58 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6E28:: @ 81B6E28 return LittlerootTown_BrendansHouse_1F_Movement_1B6E33:: @ 81B6E33 - step_right - step_right - step_end + walk_right + walk_right + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6E36:: @ 81B6E36 - step_left - step_left - step_end + walk_left + walk_left + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6E39:: @ 81B6E39 - step_left - step_end + walk_left + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6E3B:: @ 81B6E3B - step_right - step_end + walk_right + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6E3D:: @ 81B6E3D - step_down - step_right - step_right - step_down - step_13 - step_end + walk_down + walk_right + walk_right + walk_down + delay_8 + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6E43:: @ 81B6E43 - step_down - step_left - step_left - step_down - step_13 - step_end + walk_down + walk_left + walk_left + walk_down + delay_8 + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6E49:: @ 81B6E49 - step_14 - step_down - step_down - step_down - step_27 - step_end + delay_16 + walk_down + walk_down + walk_down + walk_in_place_fastest_left + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6E4F:: @ 81B6E4F - step_14 - step_14 - step_14 - step_25 - step_end + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_down + end_movement LittlerootTown_BrendansHouse_1F_Movement_1B6E54:: @ 81B6E54 - step_14 - step_down - step_down - step_down - step_28 - step_end + delay_16 + walk_down + walk_down + walk_down + walk_in_place_fastest_right + end_movement diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 4b21aa99b..6f8cb1176 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -182,8 +182,8 @@ FallarborTown_ContestLobby_Movement_1B7821:: @ 81B7821 LilycoveCity_ContestLobby_Movement_1B7821:: @ 81B7821 SlateportCity_ContestLobby_Movement_1B7821:: @ 81B7821 VerdanturfTown_ContestLobby_Movement_1B7821:: @ 81B7821 - step_28 - step_end + walk_in_place_fastest_right + end_movement FallarborTown_ContestLobby_EventScript_1B7823:: @ 81B7823 goto FallarborTown_ContestLobby_EventScript_1B783B diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 6fe9e9a6e..49b8c5286 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -42,29 +42,29 @@ Route111_EventScript_1A38D9:: @ 81A38D9 end Route111_Movement_1A38E3:: @ 81A38E3 - step_down - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_down - step_down - step_end + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + end_movement Route111_Movement_1A38EF:: @ 81A38EF - step_left - step_down - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_down - step_down - step_end + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + walk_down + end_movement diff --git a/data/specials.inc b/data/specials.inc index bb2065429..2728d98fc 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -51,12 +51,12 @@ gSpecials:: def_special LoadPlayerParty def_special sub_80C5568 def_special sub_8083BDC - def_special FieldObjectInteractionGetBerryTreeData + def_special EventObjectInteractionGetBerryTreeData def_special Berry_FadeAndGoToBerryBagMenu - def_special FieldObjectInteractionPlantBerryTree - def_special FieldObjectInteractionPickBerryTree - def_special FieldObjectInteractionRemoveBerryTree - def_special FieldObjectInteractionWaterBerryTree + def_special EventObjectInteractionPlantBerryTree + def_special EventObjectInteractionPickBerryTree + def_special EventObjectInteractionRemoveBerryTree + def_special EventObjectInteractionWaterBerryTree def_special PlayerHasBerries def_special IsEnigmaBerryValid def_special ScrSpecial_GetTrainerBattleMode @@ -187,7 +187,7 @@ gSpecials:: def_special IsTVShowInSearchOfTrainersAiring def_special GabbyAndTyGetLastQuote def_special GabbyAndTyGetLastBattleTrivia - def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds + def_special GabbyAndTySetScriptVarsToEventObjectLocalIds def_special GetBattleOutcome def_special GetDaycareMonNicknames def_special GetDaycareState @@ -295,7 +295,7 @@ gSpecials:: def_special WaitWeather def_special BufferEReaderTrainerName def_special GetSlotMachineId - def_special player_get_direction_lower_nybble + def_special GetPlayerFacingDirection def_special FoundAbandonedShipRoom1Key def_special FoundAbandonedShipRoom2Key def_special FoundAbandonedShipRoom4Key @@ -337,7 +337,7 @@ gSpecials:: def_special ScriptGetMultiplayerId def_special ScriptGetPartyMonSpecies def_special IsSelectedMonEgg - def_special sub_810F8FC + def_special TryInitBattleTowerAwardManEventObject def_special MoveSecretBase def_special LoadPlayerBag def_special sub_8081924 |