diff options
Diffstat (limited to 'data')
584 files changed, 9858 insertions, 28277 deletions
diff --git a/data/battle_frontier_2.s b/data/battle_frontier_2.s index 8fc2939c6..ce2490579 100644 --- a/data/battle_frontier_2.s +++ b/data/battle_frontier_2.s @@ -1454,43 +1454,43 @@ gUnknown_08612690:: @ 8612690 .4byte 0x00000400, 0x00000800 gUnknown_08612698:: @ 8612698 - step_94 - step_right - step_95 + store_lock_anim + walk_right + free_unlock_anim step_end gUnknown_0861269C:: @ 861269C - step_94 - step_down - step_95 + store_lock_anim + walk_down + free_unlock_anim step_end gUnknown_086126A0:: @ 86126A0 - step_94 - step_left - step_95 + store_lock_anim + walk_left + free_unlock_anim step_end gUnknown_086126A4:: @ 86126A4 - step_94 - step_up - step_95 + store_lock_anim + walk_up + free_unlock_anim step_end gUnknown_086126A8:: @ 86126A8 - step_03 + face_right step_end gUnknown_086126AA:: @ 86126AA - step_00 + face_down step_end gUnknown_086126AC:: @ 86126AC - step_02 + face_left step_end gUnknown_086126AE:: @ 86126AE - step_01 + face_up step_end @ 86126B0 diff --git a/data/cable_car.s b/data/cable_car.s index 32a265c97..c141e593c 100644 --- a/data/cable_car.s +++ b/data/cable_car.s @@ -1,4 +1,4 @@ -#include "constants/map_objects.h" +#include "constants/event_objects.h" .include "asm/macros.inc" .include "constants/constants.inc" @@ -80,14 +80,14 @@ gSpriteTemplate_85CDBCC:: @ 85CDBCC spr_template 3, 1, gOamData_85CDB94, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, nullsub_58 gCableCarPlayerGraphicsIDs:: @ 85CDBE4 - .byte MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL - .byte MAP_OBJ_GFX_RIVAL_MAY_NORMAL + .byte EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL + .byte EVENT_OBJ_GFX_RIVAL_MAY_NORMAL gMtChimneyHikerGraphicsIDs:: @ 85CDBE6 - .byte MAP_OBJ_GFX_HIKER - .byte MAP_OBJ_GFX_CAMPER - .byte MAP_OBJ_GFX_PICNICKER - .byte MAP_OBJ_GFX_ZIGZAGOON_1 @ not used + .byte EVENT_OBJ_GFX_HIKER + .byte EVENT_OBJ_GFX_CAMPER + .byte EVENT_OBJ_GFX_PICNICKER + .byte EVENT_OBJ_GFX_ZIGZAGOON_1 @ not used .align 1 gMtChimneyHikerCoords:: @ 85CDBEA diff --git a/data/event_scripts.s b/data/event_scripts.s index 841a9935c..ec9ddb86a 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -946,7 +946,7 @@ EventScript_27142F:: @ 827142F return Movement_27143A: @ 827143A - step_59 + reveal_trainer step_end EventScript_ShowTrainerIntroMsg:: @ 827143C @@ -1523,8 +1523,8 @@ OldaleTown_PokemonCenter_1F_EventScript_271AC5:: @ 8271AC5 end OldaleTown_PokemonCenter_1F_Movement_271AD0: @ 8271AD0 - step_4f - step_12 + nurse_joy_bow + delay_4 step_end Std_ObtainItem:: @ 8271AD3 @@ -2329,13 +2329,13 @@ SlateportCity_Harbor_EventScript_2721E2:: @ 82721E2 return SlateportCity_Harbor_Movement_2721F0: @ 82721F0 - slow_step_right - slow_step_right - slow_step_right - step_right - step_right - step_right - step_right + walk_slow_right + walk_slow_right + walk_slow_right + walk_right + walk_right + walk_right + walk_right step_end PetalburgCity_Gym_EventScript_2721F8:: @ 82721F8 @@ -2371,7 +2371,7 @@ EventScript_27222B:: @ 827222B return Movement_27224E: @ 827224E - step_up + walk_up step_end BattleFrontier_OutsideWest_EventScript_272250:: @ 8272250 @@ -2533,27 +2533,27 @@ Route119_EventScript_2723C1:: @ 82723C1 FortreeCity_Movement_2723C7: @ 82723C7 Route119_Movement_2723C7: @ 82723C7 Route120_Movement_2723C7: @ 82723C7 - 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 + 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 step_end LittlerootTown_ProfessorBirchsLab_EventScript_2723DD:: @ 82723DD @@ -2652,7 +2652,7 @@ EverGrandeCity_SidneysRoom_EventScript_27255F:: @ 827255F return SlateportCity_Movement_272596: @ 8272596 - step_57 + emote_question_mark step_end AquaHideout_B2F_Movement_272598: @ 8272598 @@ -2697,7 +2697,7 @@ SeafloorCavern_Room9_Movement_272598: @ 8272598 SlateportCity_Movement_272598: @ 8272598 SlateportCity_OceanicMuseum_1F_Movement_272598: @ 8272598 SlateportCity_PokemonFanClub_Movement_272598: @ 8272598 - step_56 + emote_exclamation_mark step_end BattleFrontier_BattleTowerBattleRoom_Movement_27259A: @ 827259A @@ -2738,9 +2738,9 @@ SeafloorCavern_Room9_Movement_27259A: @ 827259A SlateportCity_Movement_27259A: @ 827259A SlateportCity_OceanicMuseum_1F_Movement_27259A: @ 827259A SlateportCity_PokemonFanClub_Movement_27259A: @ 827259A - step_14 - step_14 - step_14 + delay_16 + delay_16 + delay_16 step_end AquaHideout_B2F_Movement_27259E: @ 827259E @@ -2784,11 +2784,11 @@ SeafloorCavern_Room9_Movement_27259E: @ 827259E SlateportCity_Movement_27259E: @ 827259E SlateportCity_SternsShipyard_1F_Movement_27259E: @ 827259E SootopolisCity_Movement_27259E: @ 827259E - step_3e + face_player step_end BattleFrontier_OutsideWest_Movement_2725A0: @ 82725A0 - step_3f + face_away_player step_end BattleFrontier_Lounge3_Movement_2725A2: @ 82725A2 @@ -2825,7 +2825,7 @@ SlateportCity_OceanicMuseum_2F_Movement_2725A2: @ 82725A2 SlateportCity_SternsShipyard_1F_Movement_2725A2: @ 82725A2 SootopolisCity_Movement_2725A2: @ 82725A2 VerdanturfTown_Movement_2725A2: @ 82725A2 - step_4e + face_original_direction step_end AquaHideout_B2F_Movement_2725A4: @ 82725A4 @@ -2869,7 +2869,7 @@ SlateportCity_Movement_2725A4: @ 82725A4 SlateportCity_OceanicMuseum_1F_Movement_2725A4: @ 82725A4 SlateportCity_OceanicMuseum_2F_Movement_2725A4: @ 82725A4 SootopolisCity_Movement_2725A4: @ 82725A4 - step_27 + walk_in_place_fastest_left step_end BattleFrontier_BattleTowerCorridor2_Movement_2725A6: @ 82725A6 @@ -2916,7 +2916,7 @@ SlateportCity_Movement_2725A6: @ 82725A6 SlateportCity_OceanicMuseum_2F_Movement_2725A6: @ 82725A6 SootopolisCity_MysteryEventsHouse_1F_Movement_2725A6: @ 82725A6 VerdanturfTown_BattleTentBattleRoom_Movement_2725A6: @ 82725A6 - step_26 + walk_in_place_fastest_up step_end BattleFrontier_BattleFactoryBattleRoom_Movement_2725A8: @ 82725A8 @@ -2959,7 +2959,7 @@ SlateportCity_OceanicMuseum_1F_Movement_2725A8: @ 82725A8 SlateportCity_OceanicMuseum_2F_Movement_2725A8: @ 82725A8 SootopolisCity_Movement_2725A8: @ 82725A8 VerdanturfTown_BattleTentBattleRoom_Movement_2725A8: @ 82725A8 - step_28 + walk_in_place_fastest_right step_end BattleFrontier_OutsideWest_Movement_2725AA: @ 82725AA @@ -3003,20 +3003,20 @@ SlateportCity_OceanicMuseum_2F_Movement_2725AA: @ 82725AA SouthernIsland_Exterior_Movement_2725AA: @ 82725AA VerdanturfTown_BattleTentBattleRoom_Movement_2725AA: @ 82725AA VictoryRoad_1F_Movement_2725AA: @ 82725AA - step_25 + walk_in_place_fastest_down step_end RustboroCity_Movement_2725AC: @ 82725AC - step_03 + face_right step_end RustboroCity_Movement_2725AE: @ 82725AE - step_02 + face_left step_end BattleFrontier_Mart_Movement_2725B0: @ 82725B0 MeteorFalls_1F_1R_Movement_2725B0: @ 82725B0 - step_00 + face_down step_end MarineCave_End_Movement_2725B2: @ 82725B2 @@ -3025,51 +3025,51 @@ Route118_Movement_2725B2: @ 82725B2 SkyPillar_Top_Movement_2725B2: @ 82725B2 SlateportCity_Movement_2725B2: @ 82725B2 TerraCave_End_Movement_2725B2: @ 82725B2 - step_01 + face_up step_end BattleFrontier_BattleDomeBattleRoom_Movement_2725B4: @ 82725B4 MeteorFalls_1F_1R_Movement_2725B4: @ 82725B4 - step_1d + walk_in_place_down step_end BattleFrontier_BattlePalaceBattleRoom_Movement_2725B6: @ 82725B6 BattleFrontier_BattleTowerBattleRoom_Movement_2725B6: @ 82725B6 - step_1f + walk_in_place_left step_end Route121_Movement_2725B8: @ 82725B8 - step_20 + walk_in_place_right step_end EverGrandeCity_SidneysRoom_Movement_2725BA: @ 82725BA - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end EverGrandeCity_ChampionsRoom_Movement_2725C1: @ 82725C1 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end EverGrandeCity_SidneysRoom_Movement_2725C6: @ 82725C6 - step_14 - step_14 + delay_16 + delay_16 step_end Route110_TrickHouseEntrance_Movement_2725C9: @ 82725C9 - step_up + walk_up step_end Movement_2725CB:: @ 82725CB - step_up - step_up + walk_up + walk_up step_end EventScript_2725CE:: @ 82725CE @@ -4564,8 +4564,8 @@ SecretBase_RedCave1_EventScript_275BAB:: @ 8275BAB end SecretBase_RedCave1_Movement_275BB4: @ 8275BB4 - step_up - step_up + walk_up + walk_up step_end EventScript_275BB7:: @ 8275BB7 @@ -6041,7 +6041,7 @@ gUnknown_082A8350:: @ 82A8350 end GraniteCave_B1F_Movement_2A8369: @ 82A8369 - step_54 + set_invisible step_end LilycoveCity_PokemonCenter_1F_EventScript_2A836B:: @ 82A836B @@ -6549,28 +6549,28 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A89AE:: @ 82A89AE end LilycoveCity_PokemonCenter_1F_Movement_2A89B8: @ 82A89B8 - step_03 - step_13 + face_right + delay_8 step_end LilycoveCity_PokemonCenter_1F_Movement_2A89BB: @ 82A89BB - step_02 - step_13 + face_left + delay_8 step_end LilycoveCity_PokemonCenter_1F_Movement_2A89BE: @ 82A89BE - step_00 + face_down step_end LilycoveCity_PokemonCenter_1F_Movement_2A89C0: @ 82A89C0 - step_3e + face_player step_end LilycoveCity_PokemonCenter_1F_Movement_2A89C2: @ 82A89C2 - step_51 - step_48 - step_51 - step_48 + disable_jump_landing_ground_effect + jump_in_place_left + disable_jump_landing_ground_effect + jump_in_place_left step_end LilycoveCity_PokemonCenter_1F_EventScript_2A89C7:: @ 82A89C7 @@ -10280,24 +10280,24 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6E93:: @ 82B6E93 end BattleFrontier_BattleTowerLobby_Movement_2B6E94: @ 82B6E94 - step_18 + walk_fast_right BattleFrontier_BattleTowerLobby_Movement_2B6E95: @ 82B6E95 - step_15 - step_15 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_54 - step_31 - step_31 - step_31 + walk_fast_down + 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 + set_invisible + slide_down + slide_down + slide_down step_end gText_082B6EA5:: @ 82B6EA5 @@ -13480,7 +13480,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_2C4271:: @ 82C4271 BattleFrontier_BattlePikeRandomRoom1_Movement_2C427A: @ 82C427A BattleFrontier_BattlePikeThreePathRoom_Movement_2C427A: @ 82C427A - step_54 + set_invisible step_end LilycoveCity_ContestLobby_Text_2C427C: @ 82C427C @@ -14701,7 +14701,7 @@ TrainerHill_Entrance_EventScript_2C83DF:: @ 82C83DF end TrainerHill_1F_Movement_2C83EE:: @ 82C83EE - step_54 + set_invisible step_end EventScript_2C83F0:: @ 82C83F0 diff --git a/data/field_effect_misc.s b/data/field_effect_misc.s index ef73c3263..f1b28d906 100644 --- a/data/field_effect_misc.s +++ b/data/field_effect_misc.s @@ -27,7 +27,7 @@ gSpriteImage_858DB78:: @ 858DB78 .align 2 gFieldEffectObjectPalette7:: @ 858DC18 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_07.gbapal" + .incbin "graphics/event_objects/palettes/field_effect_object_palette_07.gbapal" .align 2 gSpriteImage_858DC38:: @ 858DC38 @@ -75,7 +75,7 @@ gSpriteImage_858E138:: @ 858E138 .align 2 gFieldEffectObjectPalette8:: @ 858E1B8 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_08.gbapal" + .incbin "graphics/event_objects/palettes/field_effect_object_palette_08.gbapal" .align 2 gSpriteImage_858E1D8:: @ 858E1D8 @@ -240,5 +240,5 @@ gSpriteAnimTable_858E87C:: @ 858E87C .align 2 gUnknown_0858E880:: @ 858E880 - spr_template 0xffff, 0x1000, gFieldObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy + spr_template 0xffff, 0x1000, gEventObjectBaseOam_32x8, gSpriteAnimTable_858E87C, gUnknown_0858E84C, gDummySpriteAffineAnimTable, SpriteCallbackDummy diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s index 8dfbd6782..581b72e43 100644 --- a/data/field_effect_scripts.s +++ b/data/field_effect_scripts.s @@ -38,7 +38,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4 .4byte gFieldEffectScript_Unknown30 .4byte gFieldEffectScript_UseFly .4byte gFieldEffectScript_FlyIn - .4byte gFieldEffectScript_ExclamationMarkIcon2 + .4byte gFieldEffectScript_QuestionMarkIcon .4byte gFieldEffectScript_FeetInFlowingWater .4byte gFieldEffectScript_BikeTireTracks .4byte gFieldEffectScript_SandDisguisePlaceholder @@ -74,7 +74,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4 .4byte gFieldEffectScript_Unknown66 gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0 - field_eff_callnative FldEff_ExclamationMarkIcon1 + field_eff_callnative FldEff_ExclamationMarkIcon field_eff_end gFieldEffectScript_UseCutOnTallGrass:: @ 82DBAE6 @@ -206,8 +206,8 @@ gFieldEffectScript_FlyIn:: @ 82DBBE9 field_eff_callnative FldEff_FlyIn field_eff_end -gFieldEffectScript_ExclamationMarkIcon2:: @ 82DBBEF - field_eff_callnative FldEff_ExclamationMarkIcon2 +gFieldEffectScript_QuestionMarkIcon:: @ 82DBBEF + field_eff_callnative FldEff_QuestionMarkIcon field_eff_end gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5 diff --git a/data/field_ground_effect.s b/data/field_ground_effect.s index 989d2add7..686d9396b 100644 --- a/data/field_ground_effect.s +++ b/data/field_ground_effect.s @@ -4,66 +4,3 @@ .section .rodata .align 2, 0 -gUnknown_0850E5DC:: @ 850E5DC - .4byte 0x00000020, 0x00000010 - -gUnknown_0850E5E4:: @ 850E5E4 - .4byte MetatileBehavior_IsTallGrass - .4byte MetatileBehavior_IsLongGrass - .4byte MetatileBehavior_IsPuddle - .4byte MetatileBehavior_IsSurfableWaterOrUnderwater - .4byte MetatileBehavior_IsShallowFlowingWater - .4byte ShouldDoJumpLandingDustEffect - -gUnknown_0850E5FC:: @ 850E5FC - .4byte 0x00001000, 0x00002000, 0x00004000, 0x00008000, 0x00004000, 0x00010000 - -gUnknown_0850E614:: @ 850E614 - .4byte MetatileBehavior_IsJumpSouth - .4byte MetatileBehavior_IsJumpNorth - .4byte MetatileBehavior_IsJumpWest - .4byte MetatileBehavior_IsJumpEast - -gUnknown_0850E624:: @ 850E624 - .byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73 - -gUnknown_0850E634:: @ 850E634 - .byte 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x02 - -gUnknown_0850E644:: @ 850E644 - .byte 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01 - -gUnknown_0850E654:: @ 850E654 - .4byte DoTracksGroundEffect_None - .4byte DoTracksGroundEffect_Footprints - .4byte DoTracksGroundEffect_BikeTireTracks - -gUnknown_0850E660:: @ 850E660 - .byte 13, 0 - .byte 24, 0 - -gUnknown_0850E664:: @ 850E664 - .byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04 - -gUnknown_0850E674:: @ 850E674 - .4byte GroundEffect_SpawnOnTallGrass - .4byte GroundEffect_StepOnTallGrass - .4byte GroundEffect_SpawnOnLongGrass - .4byte GroundEffect_StepOnLongGrass - .4byte GroundEffect_WaterReflection - .4byte GroundEffect_IceReflection - .4byte GroundEffect_FlowingWater - .4byte GroundEffect_SandTracks - .4byte GroundEffect_DeepSandTracks - .4byte GroundEffect_Ripple - .4byte GroundEffect_StepOnPuddle - .4byte GroundEffect_SandHeap - .4byte GroundEffect_JumpOnTallGrass - .4byte GroundEffect_JumpOnLongGrass - .4byte GroundEffect_JumpOnShallowWater - .4byte GroundEffect_JumpOnWater - .4byte GroundEffect_JumpLandingDust - .4byte GroundEffect_ShortGrass - .4byte GroundEffect_HotSprings - .4byte GroundEffect_Seaweed - diff --git a/data/field_map_obj.s b/data/field_map_obj.s deleted file mode 100644 index 844612a7c..000000000 --- a/data/field_map_obj.s +++ /dev/null @@ -1,1731 +0,0 @@ -#include "constants/map_objects.h" - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_084975C4:: @ 84975C4 - .byte 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x06, 0x07, 0x08, 0x09, 0x0b, 0x0b, 0x00, 0x00, 0x00, 0x00 - -gUnknown_084975D4:: @ 84975D4 - spr_template 0x0000, 0xFFFF, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject - -gUnknown_084975EC:: @ 84975EC - .4byte CameraObject_0 - .4byte CameraObject_1 - .4byte CameraObject_2 - -@ 84975F8 - .include "data/graphics/field_objects/field_object_graphics.inc" - -gUnknown_08505438:: @ 8505438 - .4byte FieldObjectCB_NoMovement1 - .4byte FieldObjectCB_LookRandomDirections - .4byte FieldObjectCB_GoRandomDirections - .4byte FieldObjectCB_RandomlyGoNorthOrSouth - .4byte FieldObjectCB_RandomlyGoNorthOrSouth - .4byte FieldObjectCB_RandomlyGoEastOrWest - .4byte FieldObjectCB_RandomlyGoEastOrWest - .4byte FieldObjectCB_FaceFixedDirection - .4byte FieldObjectCB_FaceFixedDirection - .4byte FieldObjectCB_FaceFixedDirection - .4byte FieldObjectCB_FaceFixedDirection - .4byte FieldObjectCB_NoMovement2 - .4byte FieldObjectCB_BerryTree - .4byte FieldObjectCB_RandomlyLookNorthOrSouth - .4byte FieldObjectCB_RandomlyLookEastOrWest - .4byte FieldObjectCB_RandomlyLookNorthOrWest - .4byte FieldObjectCB_RandomlyLookNorthOrEast - .4byte FieldObjectCB_RandomlyLookSouthOrWest - .4byte FieldObjectCB_RandomlyLookSouthOrEast - .4byte FieldObjectCB_RandomlyLookNorthOrSouthOrWest - .4byte FieldObjectCB_RandomlyLookNorthOrSouthOrEast - .4byte FieldObjectCB_RandomlyLookNorthOrEastOrWest - .4byte FieldObjectCB_RandomlyLookSouthOrEastOrWest - .4byte FieldObjectCB_LookAroundCounterclockwise - .4byte FieldObjectCB_LookAroundClockwise - .4byte FieldObjectCB_AlternatelyGoInOppositeDirections - .4byte FieldObjectCB_AlternatelyGoInOppositeDirections - .4byte FieldObjectCB_AlternatelyGoInOppositeDirections - .4byte FieldObjectCB_AlternatelyGoInOppositeDirections - .4byte FieldObjectCB_GoInDirectionSequence1 - .4byte FieldObjectCB_GoInDirectionSequence2 - .4byte FieldObjectCB_GoInDirectionSequence3 - .4byte FieldObjectCB_GoInDirectionSequence4 - .4byte FieldObjectCB_GoInDirectionSequence5 - .4byte FieldObjectCB_GoInDirectionSequence6 - .4byte FieldObjectCB_GoInDirectionSequence7 - .4byte FieldObjectCB_GoInDirectionSequence8 - .4byte FieldObjectCB_GoInDirectionSequence9 - .4byte FieldObjectCB_GoInDirectionSequence10 - .4byte FieldObjectCB_GoInDirectionSequence11 - .4byte FieldObjectCB_GoInDirectionSequence12 - .4byte FieldObjectCB_GoInDirectionSequence13 - .4byte FieldObjectCB_GoInDirectionSequence14 - .4byte FieldObjectCB_GoInDirectionSequence15 - .4byte FieldObjectCB_GoInDirectionSequence16 - .4byte FieldObjectCB_GoInDirectionSequence17 - .4byte FieldObjectCB_GoInDirectionSequence18 - .4byte FieldObjectCB_GoInDirectionSequence19 - .4byte FieldObjectCB_GoInDirectionSequence20 - .4byte FieldObjectCB_GoInDirectionSequence21 - .4byte FieldObjectCB_GoInDirectionSequence22 - .4byte FieldObjectCB_GoInDirectionSequence23 - .4byte FieldObjectCB_GoInDirectionSequence24 - .4byte FieldObjectCB_CopyPlayer1 - .4byte FieldObjectCB_CopyPlayer1 - .4byte FieldObjectCB_CopyPlayer1 - .4byte FieldObjectCB_CopyPlayer1 - .4byte FieldObjectCB_TreeDisguise - .4byte FieldObjectCB_MountainDisguise - .4byte FieldObjectCB_CopyPlayer2 - .4byte FieldObjectCB_CopyPlayer2 - .4byte FieldObjectCB_CopyPlayer2 - .4byte FieldObjectCB_CopyPlayer2 - .4byte FieldObjectCB_Hidden1 - .4byte FieldObjectCB_WalkInPlace1 - .4byte FieldObjectCB_WalkInPlace1 - .4byte FieldObjectCB_WalkInPlace1 - .4byte FieldObjectCB_WalkInPlace1 - .4byte FieldObjectCB_WalkInPlace2 - .4byte FieldObjectCB_WalkInPlace2 - .4byte FieldObjectCB_WalkInPlace2 - .4byte FieldObjectCB_WalkInPlace2 - .4byte FieldObjectCB_WalkInPlace3 - .4byte FieldObjectCB_WalkInPlace3 - .4byte FieldObjectCB_WalkInPlace3 - .4byte FieldObjectCB_WalkInPlace3 - .4byte FieldObjectCB_Hidden2 - .4byte FieldObjectCB_WalkInPlace4 - .4byte FieldObjectCB_WalkInPlace4 - .4byte FieldObjectCB_WalkInPlace4 - .4byte FieldObjectCB_WalkInPlace4 - -gUnknown_0850557C:: @ 850557C - .byte 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 - .byte 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -gUnknown_085055CD:: @ 85055CD - .byte 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x04, 0x02, 0x01, 0x03, 0x04, 0x01, 0x01, 0x01, 0x03, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x02, 0x01, 0x03, 0x04, 0x02, 0x04, 0x01 - .byte 0x03, 0x02, 0x03, 0x01, 0x04, 0x03, 0x02, 0x04, 0x01, 0x04, 0x02, 0x03, 0x01, 0x02, 0x01, 0x03, 0x04, 0x02, 0x01, 0x03, 0x04, 0x02, 0x01, 0x03, 0x04, 0x01, 0x01, 0x02, 0x01, 0x03, 0x04, 0x01 - .byte 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, 0x01, 0x01, 0x02, 0x03, 0x04 - - .align 2, 0 -@ 8505620 - .include "data/graphics/field_objects/field_object_graphics_info_pointers.inc" - -@ 85059F8 - .include "data/graphics/field_objects/field_effect_object_template_pointers.inc" - -@ 8505A8C - .include "data/graphics/field_objects/field_object_pic_tables.inc" - -@ 85089FC - .include "data/graphics/field_objects/field_object_anims.inc" - -gUnknown_085094AC:: @ 85094AC - .4byte gFieldObjectImageAnimTable_QuintyPlump - .byte 1, 3, 0, 2 - .4byte gFieldObjectImageAnimTable_Standard - .byte 1, 3, 0, 2 - .4byte gFieldObjectImageAnimTable_BrendanMayNormal - .byte 1, 3, 0, 2 - .4byte gFieldObjectImageAnimTable_AcroBike - .byte 1, 3, 0, 2 - .4byte gFieldObjectImageAnimTable_Surfing - .byte 1, 3, 0, 2 - .4byte gFieldObjectImageAnimTable_Nurse - .byte 1, 3, 0, 2 - .4byte gFieldObjectImageAnimTable_Fishing - .byte 1, 3, 0, 2 - .4byte NULL - .byte 0, 0, 0, 0 - -@ 85094EC - .include "data/graphics/field_objects/field_object_oam.inc" - -@ 8509954 - .include "data/graphics/field_objects/field_object_graphics_info.inc" - -gUnknown_0850BBC8:: @ 850BBC8 - .align 2, 0 - .4byte gFieldObjectPalette0 - .2byte 4355 - .align 2, 0 - .4byte gFieldObjectPalette1 - .2byte 4356 - .align 2, 0 - .4byte gFieldObjectPalette2 - .2byte 4357 - .align 2, 0 - .4byte gFieldObjectPalette3 - .2byte 4358 - .align 2, 0 - .4byte gFieldObjectPalette4 - .2byte 4359 - .align 2, 0 - .4byte gFieldObjectPalette5 - .2byte 4360 - .align 2, 0 - .4byte gFieldObjectPalette6 - .2byte 4361 - .align 2, 0 - .4byte gFieldObjectPalette7 - .2byte 4362 - .align 2, 0 - .4byte gFieldObjectPalette8 - .2byte 4352 - .align 2, 0 - .4byte gFieldObjectPalette9 - .2byte 4353 - .align 2, 0 - .4byte gFieldObjectPalette10 - .2byte 4354 - .align 2, 0 - .4byte gFieldObjectPalette11 - .2byte 4373 - .align 2, 0 - .4byte gFieldObjectPalette12 - .2byte 4363 - .align 2, 0 - .4byte gFieldObjectPalette13 - .2byte 4364 - .align 2, 0 - .4byte gFieldObjectPalette14 - .2byte 4365 - .align 2, 0 - .4byte gFieldObjectPalette15 - .2byte 4366 - .align 2, 0 - .4byte gFieldObjectPalette16 - .2byte 4367 - .align 2, 0 - .4byte gFieldObjectPalette17 - .2byte 4368 - .align 2, 0 - .4byte gFieldObjectPalette18 - .2byte 4369 - .align 2, 0 - .4byte gFieldObjectPalette19 - .2byte 4370 - .align 2, 0 - .4byte gFieldObjectPalette20 - .2byte 4371 - .align 2, 0 - .4byte gFieldObjectPalette21 - .2byte 4372 - .align 2, 0 - .4byte gFieldObjectPalette22 - .2byte 4374 - .align 2, 0 - .4byte gFieldObjectPalette23 - .2byte 4375 - .align 2, 0 - .4byte gFieldObjectPalette24 - .2byte 4376 - .align 2, 0 - .4byte gFieldObjectPalette25 - .2byte 4377 - .align 2, 0 - .4byte gFieldObjectPalette26 - .2byte 4379 - .align 2, 0 - .4byte gFieldObjectPalette27 - .2byte 4380 - .align 2, 0 - .4byte gFieldObjectPalette28 - .2byte 4381 - .align 2, 0 - .4byte gFieldObjectPalette29 - .2byte 4382 - .align 2, 0 - .4byte gFieldObjectPalette30 - .2byte 4383 - .align 2, 0 - .4byte gFieldObjectPalette31 - .2byte 4384 - .align 2, 0 - .4byte gFieldObjectPalette32 - .2byte 4385 - .align 2, 0 - .4byte gFieldObjectPalette33 - .2byte 4386 - .align 2, 0 - .4byte gFieldObjectPalette34 - .2byte 4387 - .align 2, 0 - .4byte NULL - .2byte 0 - .align 2, 0 - -Unknown_0850BCE8:: @ 0850BCE8 -.2byte 0x1101, 0x1101, 0x1101, 0x1101 - -Unknown_0850BCF0:: @ 0850BCF0 -.2byte 0x1111, 0x1111, 0x1111, 0x1111 - -Unknown_0850BCF8:: @ 0850BCF8 -.2byte 0x1115, 0x1115, 0x1115, 0x1115 - -gUnknown_0850BD00:: @ 850BD00 - .2byte 4352, 0 - .4byte Unknown_0850BCE8 - .2byte 4368, 0 - .4byte Unknown_0850BCF0 - .2byte 4373, 0 - .4byte Unknown_0850BCF8 - .2byte 4607, 0 - .4byte NULL - -Unknown_0850BD20:: @ 0850BD20 -.2byte 0x110c, 0x110c, 0x110c, 0x110c - -Unknown_0850BD28:: @ 0x0850bd28 -.2byte 0x110d, 0x110d, 0x110d, 0x110d - -Unknown_0850BD30:: @ 0x0850bd30 -.2byte 0x110e, 0x110e, 0x110e, 0x110e - -Unknown_0850BD38:: @ 0x0850bd38 -.2byte 0x1112, 0x1112, 0x1112, 0x1112 - -Unknown_0850BD40:: @ 0x0850bd40 -.2byte 0x1113, 0x1113, 0x1113, 0x1113 - -Unknown_0850BD48:: @ 0x0850bd48 -.2byte 0x1114, 0x1114, 0x1114, 0x1114 - -Unknown_0850BD50:: @ 0x0850bd50 -.2byte 0x111b, 0x111b, 0x111b, 0x111b - -Unknown_0850BD58:: @ 0x0850bd58 -.2byte 0x1117, 0x1117, 0x1117, 0x1117 - -Unknown_0850BD60:: @ 0x0850bd60 -.2byte 0x1119, 0x1119, 0x1119, 0x1119 - -Unknown_0850BD68:: @ 0x0850bd68 -.2byte 0x1109, 0x1109, 0x1109, 0x1109 - -Unknown_0850BD70:: @ 0x0850bd70 -.2byte 0x111d, 0x111d, 0x111d, 0x111d - -gUnknown_0850BD78:: @ 850BD78 - .2byte 4352, 0 - .4byte Unknown_0850BCE8 - .2byte 4368, 0 - .4byte Unknown_0850BCF0 - .2byte 4363, 0 - .4byte Unknown_0850BD20 - .2byte 4365, 0 - .4byte Unknown_0850BD28 - .2byte 4366, 0 - .4byte Unknown_0850BD30 - .2byte 4370, 0 - .4byte Unknown_0850BD38 - .2byte 4371, 0 - .4byte Unknown_0850BD40 - .2byte 4372, 0 - .4byte Unknown_0850BD48 - .2byte 4374, 0 - .4byte Unknown_0850BD58 - .2byte 4376, 0 - .4byte Unknown_0850BD60 - .2byte 4357, 0 - .4byte Unknown_0850BD68 - .2byte 4379, 0 - .4byte Unknown_0850BD50 - .2byte 4381, 0 - .4byte Unknown_0850BD70 - .2byte 4607, 0 - .4byte NULL - -gUnknown_0850BDE8:: @ 850BDE8 - .2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a -gUnknown_0850BDFC:: - .2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a -gUnknown_0850BE10:: - .2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a -gUnknown_0850BE24:: - .2byte 0x1100, 0x1101, 0x1103, 0x1104, 0x1105, 0x1106, 0x1107, 0x1108, 0x1109, 0x110a - -gUnknown_0850BE38:: @ 850BE38 - .4byte gUnknown_0850BDE8 - .4byte gUnknown_0850BDFC - .4byte gUnknown_0850BE10 - .4byte gUnknown_0850BE24 - -@ 850BE48 - .include "data/graphics/field_objects/berry_tree_graphics_tables.inc" - -@ 850C9C0 - .include "data/graphics/field_objects/field_effect_objects.inc" - - .align 2, 0 - .4byte gFieldObjectPalette2 - .2byte 4113 - - .align 2, 0 -gUnknown_0850D6DC:: @ 850D6DC - .2byte 0x0020, 0x0040, 0x0060, 0x0080, 0x0020, 0x0040, 0x0080, 0x00c0 - -gUnknown_0850D6EC:: @ 850D6EC - .2byte 0x0020, 0x0030, 0x0040, 0x0050 - -gUnknown_0850D6F4:: @ 850D6F4 - .4byte sub_808F44C - .4byte sub_808F460 - .4byte sub_808F48C - .4byte sub_808F4C8 - .4byte sub_808F4E8 - .4byte sub_808F534 - .4byte sub_808F564 - -gUnknown_0850D710:: @ 850D710 - .byte 0x01, 0x02, 0x03, 0x04 - -gUnknown_0850D714:: @ 850D714 - .4byte GetRegularRunningPastFacingDirection - .4byte GetNorthSouthRunningPastFacingDirection - .4byte GetEastWestRunningPastFacingDirection - .4byte GetNorthEastRunningPastFacingDirection - .4byte GetNorthWestRunningPastFacingDirection - .4byte GetSouthEastRunningPastFacingDirection - .4byte GetSouthWestRunningPastFacingDirection - .4byte GetNonEastRunningPastFacingDirection - .4byte GetNonWestRunningPastFacingDirection - .4byte GetNonSouthRunningPastFacingDirection - .4byte GetNonNorthRunningPastFacingDirection - -gUnknown_0850D740:: @ 850D740 - .4byte sub_808F988 - .4byte sub_808F99C - .4byte sub_808F9C8 - .4byte sub_808FA0C - .4byte sub_808FA3C - -gUnknown_0850D754:: @ 850D754 - .4byte sub_808FAC8 - .4byte sub_808FADC - .4byte sub_808FB08 - .4byte sub_808FB44 - .4byte sub_808FB64 - .4byte sub_808FBB0 - .4byte sub_808FBE0 - -gUnknown_0850D770:: @ 850D770 - .byte 0x01, 0x02, 0x00, 0x00 - -gUnknown_0850D774:: @ 850D774 - .4byte sub_808FC4C - .4byte sub_808FC60 - .4byte sub_808FC8C - .4byte sub_808FCC8 - .4byte sub_808FCE8 - .4byte sub_808FD34 - .4byte sub_808FD64 - -gUnknown_0850D790:: @ 850D790 - .byte 0x03, 0x04, 0x00, 0x00 - -gUnknown_0850D794:: @ 850D794 - .4byte sub_808FDD0 - .4byte sub_808FDFC - .4byte sub_808FE1C - -gUnknown_0850D7A0:: @ 850D7A0 - .4byte do_berry_tree_growth_sparkle_1 - .4byte sub_808FF48 - .4byte do_berry_tree_growth_sparkle_2 - .4byte sub_808FFB4 - .4byte sub_8090004 - -gUnknown_0850D7B4:: @ 850D7B4 - .4byte sub_8090094 - .4byte sub_80900A8 - .4byte sub_80900D4 - .4byte sub_8090118 - .4byte sub_8090148 - -gUnknown_0850D7C8:: @ 850D7C8 - .4byte sub_80901D4 - .4byte sub_80901E8 - .4byte sub_8090214 - .4byte sub_8090258 - .4byte sub_8090288 - -gUnknown_0850D7DC:: @ 850D7DC - .4byte sub_8090314 - .4byte sub_8090328 - .4byte sub_8090354 - .4byte sub_8090398 - .4byte sub_80903C8 - -gUnknown_0850D7F0:: @ 850D7F0 - .byte 0x02, 0x03, 0x00, 0x00 - -gUnknown_0850D7F4:: @ 850D7F4 - .4byte sub_8090454 - .4byte sub_8090468 - .4byte sub_8090494 - .4byte sub_80904D8 - .4byte sub_8090508 - -gUnknown_0850D808:: @ 850D808 - .byte 0x02, 0x04, 0x00, 0x00 - -gUnknown_0850D80C:: @ 850D80C - .4byte sub_8090594 - .4byte sub_80905A8 - .4byte sub_80905D4 - .4byte sub_8090618 - .4byte sub_8090648 - -gUnknown_0850D820:: @ 850D820 - .byte 0x01, 0x03, 0x00, 0x00 - -gUnknown_0850D824:: @ 850D824 - .4byte sub_80906D4 - .4byte sub_80906E8 - .4byte sub_8090714 - .4byte sub_8090758 - .4byte sub_8090788 - -gUnknown_0850D838:: @ 850D838 - .byte 0x01, 0x04, 0x00, 0x00 - -gUnknown_0850D83C:: @ 850D83C - .4byte sub_8090814 - .4byte sub_8090828 - .4byte sub_8090854 - .4byte sub_8090898 - .4byte sub_80908C8 - -gUnknown_0850D850:: @ 850D850 - .byte 0x02, 0x01, 0x03, 0x01 - -gUnknown_0850D854:: @ 850D854 - .4byte sub_8090954 - .4byte sub_8090968 - .4byte sub_8090994 - .4byte sub_80909D8 - .4byte sub_8090A08 - -gUnknown_0850D868:: @ 850D868 - .byte 0x01, 0x02, 0x04, 0x01 - -gUnknown_0850D86C:: @ 850D86C - .4byte sub_8090A94 - .4byte sub_8090AA8 - .4byte sub_8090AD4 - .4byte sub_8090B18 - .4byte sub_8090B48 - -gUnknown_0850D880:: @ 850D880 - .byte 0x02, 0x03, 0x04, 0x02 - -gUnknown_0850D884:: @ 850D884 - .4byte sub_8090BD4 - .4byte sub_8090BE8 - .4byte sub_8090C14 - .4byte sub_8090C58 - .4byte sub_8090C88 - -gUnknown_0850D898:: @ 850D898 - .byte 0x03, 0x04, 0x01, 0x01 - -gUnknown_0850D89C:: @ 850D89C - .4byte sub_8090D14 - .4byte sub_8090D40 - .4byte sub_8090D64 - .4byte sub_8090D90 - -gUnknown_0850D8AC:: @ 850D8AC - .byte 0x01, 0x04, 0x03, 0x01, 0x02, 0x00, 0x00, 0x00 - -gUnknown_0850D8B4:: @ 850D8B4 - .4byte sub_8090E18 - .4byte sub_8090E44 - .4byte sub_8090E68 - .4byte sub_8090E94 - -gUnknown_0850D8C4:: @ 850D8C4 - .byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00 - -gUnknown_0850D8CC:: @ 850D8CC - .4byte sub_8090F1C - .4byte sub_8090F30 - .4byte sub_8090F68 - .4byte sub_8091020 - -gUnknown_0850D8DC:: @ 850D8DC - .4byte sub_8091048 - .4byte sub_809117C - .4byte sub_8091110 - -gUnknown_0850D8E8:: @ 850D8E8 - .byte 0x02, 0x04, 0x03, 0x01 - -gUnknown_0850D8EC:: @ 850D8EC - .4byte sub_8091048 - .4byte sub_8091208 - .4byte sub_8091110 - -gUnknown_0850D8F8:: @ 850D8F8 - .byte 0x04, 0x03, 0x01, 0x02 - -gUnknown_0850D8FC:: @ 850D8FC - .4byte sub_8091048 - .4byte sub_8091294 - .4byte sub_8091110 - -gUnknown_0850D908:: @ 850D908 - .byte 0x01, 0x02, 0x04, 0x03 - -gUnknown_0850D90C:: @ 850D90C - .4byte sub_8091048 - .4byte sub_8091320 - .4byte sub_8091110 - -gUnknown_0850D918:: @ 850D918 - .byte 0x03, 0x01, 0x02, 0x04 - -gUnknown_0850D91C:: @ 850D91C - .4byte sub_8091048 - .4byte sub_80913AC - .4byte sub_8091110 - -gUnknown_0850D928:: @ 850D928 - .byte 0x02, 0x03, 0x04, 0x01 - -gUnknown_0850D92C:: @ 850D92C - .4byte sub_8091048 - .4byte sub_8091438 - .4byte sub_8091110 - -gUnknown_0850D938:: @ 850D938 - .byte 0x03, 0x04, 0x01, 0x02 - -gUnknown_0850D93C:: @ 850D93C - .4byte sub_8091048 - .4byte sub_80914C4 - .4byte sub_8091110 - -gUnknown_0850D948:: @ 850D948 - .4byte sub_8091048 - .4byte sub_8091550 - .4byte sub_8091110 - -gUnknown_0850D954:: @ 850D954 - .byte 0x04, 0x01, 0x02, 0x03 - -gUnknown_0850D958:: @ 850D958 - .4byte sub_8091048 - .4byte sub_80915DC - .4byte sub_8091110 - -gUnknown_0850D964:: @ 850D964 - .byte 0x03, 0x02, 0x01, 0x04 - -gUnknown_0850D968:: @ 850D968 - .4byte sub_8091048 - .4byte sub_8091668 - .4byte sub_8091110 - -gUnknown_0850D974:: @ 850D974 - .byte 0x02, 0x01, 0x04, 0x03 - -gUnknown_0850D978:: @ 850D978 - .4byte sub_8091048 - .4byte sub_80916F4 - .4byte sub_8091110 - -gUnknown_0850D984:: @ 850D984 - .byte 0x04, 0x03, 0x02, 0x01 - -gUnknown_0850D988:: @ 850D988 - .4byte sub_8091048 - .4byte sub_8091780 - .4byte sub_8091110 - -gUnknown_0850D994:: @ 850D994 - .byte 0x01, 0x04, 0x03, 0x02 - -gUnknown_0850D998:: @ 850D998 - .4byte sub_8091048 - .4byte sub_809180C - .4byte sub_8091110 - -gUnknown_0850D9A4:: @ 850D9A4 - .byte 0x04, 0x02, 0x01, 0x03 - -gUnknown_0850D9A8:: @ 850D9A8 - .4byte sub_8091048 - .4byte sub_8091898 - .4byte sub_8091110 - -gUnknown_0850D9B4:: @ 850D9B4 - .byte 0x02, 0x01, 0x03, 0x04 - -gUnknown_0850D9B8:: @ 850D9B8 - .4byte sub_8091048 - .4byte sub_8091924 - .4byte sub_8091110 - -gUnknown_0850D9C4:: @ 850D9C4 - .byte 0x03, 0x04, 0x02, 0x01 - -gUnknown_0850D9C8:: @ 850D9C8 - .4byte sub_8091048 - .4byte sub_80919B0 - .4byte sub_8091110 - -gUnknown_0850D9D4:: @ 850D9D4 - .byte 0x01, 0x03, 0x04, 0x02 - -gUnknown_0850D9D8:: @ 850D9D8 - .4byte sub_8091048 - .4byte sub_8091A3C - .4byte sub_8091110 - -gUnknown_0850D9E4:: @ 850D9E4 - .byte 0x02, 0x03, 0x01, 0x04 - -gUnknown_0850D9E8:: @ 850D9E8 - .4byte sub_8091048 - .4byte sub_8091AC8 - .4byte sub_8091110 - -gUnknown_0850D9F4:: @ 850D9F4 - .byte 0x01, 0x04, 0x02, 0x03 - -gUnknown_0850D9F8:: @ 850D9F8 - .4byte sub_8091048 - .4byte sub_8091B54 - .4byte sub_8091110 - -gUnknown_0850DA04:: @ 850DA04 - .byte 0x03, 0x01, 0x04, 0x02 - -gUnknown_0850DA08:: @ 850DA08 - .4byte sub_8091048 - .4byte sub_8091BE0 - .4byte sub_8091110 - -gUnknown_0850DA14:: @ 850DA14 - .byte 0x04, 0x02, 0x03, 0x01 - -gUnknown_0850DA18:: @ 850DA18 - .4byte sub_8091048 - .4byte sub_8091C6C - .4byte sub_8091110 - -gUnknown_0850DA24:: @ 850DA24 - .byte 0x02, 0x04, 0x01, 0x03 - -gUnknown_0850DA28:: @ 850DA28 - .4byte sub_8091048 - .4byte sub_8091CF8 - .4byte sub_8091110 - -gUnknown_0850DA34:: @ 850DA34 - .byte 0x01, 0x03, 0x02, 0x04 - -gUnknown_0850DA38:: @ 850DA38 - .4byte sub_8091048 - .4byte sub_8091D84 - .4byte sub_8091110 - -gUnknown_0850DA44:: @ 850DA44 - .byte 0x03, 0x02, 0x04, 0x01 - -gUnknown_0850DA48:: @ 850DA48 - .4byte sub_8091048 - .4byte sub_8091E10 - .4byte sub_8091110 - -gUnknown_0850DA54:: @ 850DA54 - .byte 0x04, 0x01, 0x03, 0x02 - -gUnknown_0850DA58:: @ 850DA58 - .4byte mss_npc_reset_oampriv3_1_unk2_unk3 - .4byte sub_8091EC0 - .4byte sub_8091F20 - -gUnknown_0850DA64:: @ 850DA64 - .4byte sub_8091F48 - .4byte sub_8091F4C - .4byte sub_8091F94 - .4byte sub_80920A4 - .4byte sub_809215C - .4byte sub_8092214 - .4byte cph_IM_DIFFERENT - .4byte sub_8092314 - .4byte oac_hopping - .4byte sub_8091F48 - .4byte sub_8091F48 - -gUnknown_0850DA90:: @ 850DA90 - .4byte mss_npc_reset_oampriv3_1_unk2_unk3 - .4byte mss_08062EA4 - .4byte sub_8091F20 - -gUnknown_0850DA9C:: @ 850DA9C - .4byte sub_80926AC - -gUnknown_0850DAA0:: @ 850DAA0 - .4byte sub_8092718 - .4byte sub_80926B8 - -gUnknown_0850DAA8:: @ 850DAA8 - .4byte sub_8092788 - .4byte sub_80926B8 - -gUnknown_0850DAB0:: @ 850DAB0 - .4byte sub_80927F8 - .4byte sub_80926B8 - -gUnknown_0850DAB8:: @ 850DAB8 - .4byte sub_8092868 - .4byte sub_80926B8 - -gUnknown_0850DAC0:: @ 850DAC0 - .4byte sub_80928D8 - .4byte sub_809290C - .4byte sub_809292C - -gUnknown_0850DACC:: @ 850DACC - .byte 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01 - -gUnknown_0850DAD5:: @ 850DAD5 - .byte 0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05 - -gUnknown_0850DADE:: @ 850DADE - .byte 0x08, 0x08, 0x09, 0x0a, 0x0b, 0x08, 0x08, 0x09, 0x09 - -gUnknown_0850DAE7:: @ 850DAE7 - .byte 0x0c, 0x0c, 0x0d, 0x0e, 0x0f, 0x0c, 0x0c, 0x0d, 0x0d - -gUnknown_0850DAF0:: @ 850DAF0 - .byte 0x10, 0x10, 0x11, 0x12, 0x13, 0x10, 0x10, 0x11, 0x11 - -gUnknown_0850DAF9:: @ 850DAF9 - .byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15 - -gUnknown_0850DB02:: @ 850DB02 - .byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15 - -gUnknown_0850DB0B:: @ 850DB0B - .byte 0x18, 0x18, 0x19, 0x1a, 0x1b, 0x18, 0x18, 0x19, 0x19 - -gUnknown_0850DB14:: @ 850DB14 - .byte 0x1c, 0x1c, 0x1d, 0x1e, 0x1f, 0x1c, 0x1c, 0x1d, 0x1d - -gUnknown_0850DB1D:: @ 850DB1D - .byte 0x20, 0x20, 0x21, 0x22, 0x23, 0x20, 0x20, 0x21, 0x21 - -gUnknown_0850DB26:: @ 850DB26 - .byte 0x24, 0x24, 0x25, 0x26, 0x27, 0x24, 0x24, 0x25, 0x25 - -gUnknown_0850DB2F:: @ 850DB2F - .byte 0x00, 0x00, 0x01, 0x02, 0x03, 0x00, 0x00, 0x01, 0x01 - -gUnknown_0850DB38:: @ 850DB38 - .byte 0x04, 0x04, 0x05, 0x06, 0x07, 0x04, 0x04, 0x05, 0x05 - -gUnknown_0850DB41:: @ 850DB41 - .byte 0x08, 0x08, 0x09, 0x0a, 0x0b, 0x08, 0x08, 0x09, 0x09 - -gUnknown_0850DB4A:: @ 850DB4A - .byte 0x14, 0x14, 0x15, 0x16, 0x17, 0x14, 0x14, 0x15, 0x15 - -gUnknown_0850DB53:: @ 850DB53 - .byte 0x08, 0x08, 0x07, 0x09, 0x0a, 0x08, 0x08, 0x07, 0x07 - - .align 2, 0 -gUnknown_0850DB5C:: @ 850DB5C - .4byte MetatileBehavior_IsSouthBlocked - .4byte MetatileBehavior_IsNorthBlocked - .4byte MetatileBehavior_IsWestBlocked - .4byte MetatileBehavior_IsEastBlocked - -gUnknown_0850DB6C:: @ 850DB6C - .4byte MetatileBehavior_IsNorthBlocked - .4byte MetatileBehavior_IsSouthBlocked - .4byte MetatileBehavior_IsEastBlocked - .4byte MetatileBehavior_IsWestBlocked - -gUnknown_0850DB7C:: @ 850DB7C - .2byte 0x0000, 0x0000, 0x0000, 0x0001, 0x0000, 0xffff, 0xffff, 0x0000, 0x0001, 0x0000, 0xffff, 0x0001, 0x0001, 0x0001, 0xffff, 0xffff - .2byte 0x0001, 0xffff - -gUnknown_0850DBA0:: @ 850DBA0 - .byte 0x00, 0x00, 0x01, 0x02, 0x03 - -gUnknown_0850DBA5:: @ 850DBA5 - .byte 0x04, 0x04, 0x05, 0x06, 0x07 - -gUnknown_0850DBAA:: @ 850DBAA - .byte 0x08, 0x08, 0x09, 0x0a, 0x0b - -gUnknown_0850DBAF:: @ 850DBAF - .byte 0x15, 0x15, 0x16, 0x17, 0x18 - -gUnknown_0850DBB4:: @ 850DBB4 - .byte 0x29, 0x29, 0x2a, 0x2b, 0x2c - -gUnknown_0850DBB9:: @ 850DBB9 - .byte 0x2d, 0x2d, 0x2e, 0x2f, 0x30 - -gUnknown_0850DBBE:: @ 850DBBE - .byte 0x31, 0x31, 0x32, 0x33, 0x34 - -gUnknown_0850DBC3:: @ 850DBC3 - .byte 0x35, 0x35, 0x36, 0x37, 0x38 - -gUnknown_0850DBC8:: @ 850DBC8 - .byte 0x0c, 0x0c, 0x0d, 0x0e, 0x0f - -gUnknown_0850DBCD:: @ 850DBCD - .byte 0x46, 0x46, 0x47, 0x48, 0x49 - -gUnknown_0850DBD2:: @ 850DBD2 - .byte 0x4b, 0x4b, 0x4a, 0x4d, 0x4c - -gUnknown_0850DBD7:: @ 850DBD7 - .byte 0x42, 0x42, 0x43, 0x44, 0x45 - -gUnknown_0850DBDC:: @ 850DBDC - .byte 0x3a, 0x3a, 0x3b, 0x3c, 0x3d - -gUnknown_0850DBE1:: @ 850DBE1 - .byte 0x19, 0x19, 0x1a, 0x1b, 0x1c - -gUnknown_0850DBE6:: @ 850DBE6 - .byte 0x1d, 0x1d, 0x1e, 0x1f, 0x20 - -gUnknown_0850DBEB:: @ 850DBEB - .byte 0x21, 0x21, 0x22, 0x23, 0x24 - -gUnknown_0850DBF0:: @ 850DBF0 - .byte 0x25, 0x25, 0x26, 0x27, 0x28 - -gUnknown_0850DBF5:: @ 850DBF5 - .byte 0x64, 0x64, 0x65, 0x66, 0x67 - -gUnknown_0850DBFA:: @ 850DBFA - .byte 0x68, 0x68, 0x69, 0x6a, 0x6b - -gUnknown_0850DBFF:: @ 850DBFF - .byte 0x6c, 0x6c, 0x6d, 0x6e, 0x6f - -gUnknown_0850DC04:: @ 850DC04 - .byte 0x70, 0x70, 0x71, 0x72, 0x73 - -gUnknown_0850DC09:: @ 850DC09 - .byte 0x74, 0x74, 0x75, 0x76, 0x77 - -gUnknown_0850DC0E:: @ 850DC0E - .byte 0x78, 0x78, 0x79, 0x7a, 0x7b - -gUnknown_0850DC13:: @ 850DC13 - .byte 0x7c, 0x7c, 0x7d, 0x7e, 0x7f - -gUnknown_0850DC18:: @ 850DC18 - .byte 0x80, 0x80, 0x81, 0x82, 0x83 - -gUnknown_0850DC1D:: @ 850DC1D - .byte 0x84, 0x84, 0x85, 0x86, 0x87 - -gUnknown_0850DC22:: @ 850DC22 - .byte 0x88, 0x88, 0x89, 0x8a, 0x8b - -gUnknown_0850DC27:: @ 850DC27 - .byte 0x02, 0x01, 0x04, 0x03, 0x08, 0x07, 0x06, 0x05 - -gUnknown_0850DC2F:: @ 850DC2F - .byte 0x02, 0x01, 0x04, 0x03, 0x01, 0x02, 0x03, 0x04, 0x03, 0x04, 0x02, 0x01, 0x04, 0x03, 0x01, 0x02 - -gUnknown_0850DC3F:: @ 850DC3F - .byte 0x02, 0x01, 0x04, 0x03, 0x01, 0x02, 0x03, 0x04, 0x04, 0x03, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01, 0x00 - - .align 2, 0 -gUnknown_0850DC50:: @ 850DC50 -.4byte gUnknown_0850DEC8 -.4byte gUnknown_0850DED0 -.4byte gUnknown_0850DED8 -.4byte gUnknown_0850DEE0 -.4byte gUnknown_0850DF2C -.4byte gUnknown_0850DF38 -.4byte gUnknown_0850DF44 -.4byte gUnknown_0850DF50 -.4byte gUnknown_0850DF8C -.4byte gUnknown_0850DF98 -.4byte gUnknown_0850DFA4 -.4byte gUnknown_0850DFB0 -.4byte gUnknown_0850DFC8 -.4byte gUnknown_0850DFD4 -.4byte gUnknown_0850DFE0 -.4byte gUnknown_0850DFEC -.4byte gUnknown_0850DFF8 -.4byte gUnknown_0850E004 -.4byte gUnknown_0850E010 -.4byte gUnknown_0850E01C -.4byte gUnknown_0850E028 -.4byte gUnknown_0850E034 -.4byte gUnknown_0850E040 -.4byte gUnknown_0850E04C -.4byte gUnknown_0850E058 -.4byte gUnknown_0850E064 -.4byte gUnknown_0850E070 -.4byte gUnknown_0850E07C -.4byte gUnknown_0850E088 -.4byte gUnknown_0850E094 -.4byte gUnknown_0850E0A0 -.4byte gUnknown_0850E0AC -.4byte gUnknown_0850E0B8 -.4byte gUnknown_0850E0C4 -.4byte gUnknown_0850E0D0 -.4byte gUnknown_0850E0DC -.4byte gUnknown_0850E0E8 -.4byte gUnknown_0850E0F4 -.4byte gUnknown_0850E100 -.4byte gUnknown_0850E10C -.4byte gUnknown_0850E118 -.4byte gUnknown_0850E124 -.4byte gUnknown_0850E130 -.4byte gUnknown_0850E13C -.4byte gUnknown_0850E148 -.4byte gUnknown_0850E154 -.4byte gUnknown_0850E160 -.4byte gUnknown_0850E16C -.4byte gUnknown_0850E178 -.4byte gUnknown_0850E184 -.4byte gUnknown_0850E190 -.4byte gUnknown_0850E19C -.4byte gUnknown_0850E1A8 -.4byte gUnknown_0850E1B4 -.4byte gUnknown_0850E1C0 -.4byte gUnknown_0850E1CC -.4byte gUnknown_0850E1D8 -.4byte gUnknown_0850E1E4 -.4byte gUnknown_0850E1F0 -.4byte gUnknown_0850E1FC -.4byte gUnknown_0850E208 -.4byte gUnknown_0850E214 -.4byte gUnknown_0850E220 -.4byte gUnknown_0850E228 -.4byte gUnknown_0850E230 -.4byte gUnknown_0850E238 -.4byte gUnknown_0850E240 -.4byte gUnknown_0850E24C -.4byte gUnknown_0850E258 -.4byte gUnknown_0850E264 -.4byte gUnknown_0850E270 -.4byte gUnknown_0850E27C -.4byte gUnknown_0850E288 -.4byte gUnknown_0850E294 -.4byte gUnknown_0850E2A0 -.4byte gUnknown_0850E2AC -.4byte gUnknown_0850E2B8 -.4byte gUnknown_0850E2C4 -.4byte gUnknown_0850E2D0 -.4byte gUnknown_0850E2D8 -.4byte gUnknown_0850E2E4 -.4byte gUnknown_0850E2EC -.4byte gUnknown_0850E2F4 -.4byte gUnknown_0850E2FC -.4byte gUnknown_0850E304 -.4byte gUnknown_0850E30C -.4byte gUnknown_0850E314 -.4byte gUnknown_0850E31C -.4byte gUnknown_0850E324 -.4byte gUnknown_0850E32C -.4byte gUnknown_0850E338 -.4byte gUnknown_0850E348 -.4byte gUnknown_0850E358 -.4byte gUnknown_0850E360 -.4byte gUnknown_0850E368 -.4byte gUnknown_0850E370 -.4byte gUnknown_0850E378 -.4byte gUnknown_0850E380 -.4byte gUnknown_0850E388 -.4byte gUnknown_0850E394 -.4byte gUnknown_0850E3B8 -.4byte gUnknown_0850E3C0 -.4byte gUnknown_0850E3C8 -.4byte gUnknown_0850E3D0 -.4byte gUnknown_0850E3D8 -.4byte gUnknown_0850E3E4 -.4byte gUnknown_0850E3F0 -.4byte gUnknown_0850E3FC -.4byte gUnknown_0850E408 -.4byte gUnknown_0850E414 -.4byte gUnknown_0850E420 -.4byte gUnknown_0850E42C -.4byte gUnknown_0850E474 -.4byte gUnknown_0850E480 -.4byte gUnknown_0850E48C -.4byte gUnknown_0850E498 -.4byte gUnknown_0850E4A4 -.4byte gUnknown_0850E4B0 -.4byte gUnknown_0850E4BC -.4byte gUnknown_0850E4C8 -.4byte gUnknown_0850E4D4 -.4byte gUnknown_0850E4E0 -.4byte gUnknown_0850E4EC -.4byte gUnknown_0850E4F8 -.4byte gUnknown_0850E504 -.4byte gUnknown_0850E510 -.4byte gUnknown_0850E51C -.4byte gUnknown_0850E528 -.4byte gUnknown_0850E534 -.4byte gUnknown_0850E540 -.4byte gUnknown_0850E54C -.4byte gUnknown_0850E558 -.4byte gUnknown_0850E564 -.4byte gUnknown_0850E570 -.4byte gUnknown_0850E57C -.4byte gUnknown_0850E588 -.4byte gUnknown_0850E594 -.4byte gUnknown_0850E5A0 -.4byte gUnknown_0850E5AC -.4byte gUnknown_0850E5B8 -.4byte gUnknown_0850DF5C -.4byte gUnknown_0850DF68 -.4byte gUnknown_0850DF74 -.4byte gUnknown_0850DF80 -.4byte gUnknown_0850DEFC -.4byte gUnknown_0850DF08 -.4byte gUnknown_0850DF14 -.4byte gUnknown_0850DF20 -.4byte gUnknown_0850E854 -.4byte gUnknown_0850E85C -.4byte gUnknown_0850E3A0 -.4byte gUnknown_0850E3AC -.4byte gUnknown_0850E5C4 -.4byte gUnknown_0850E5CC -.4byte gUnknown_0850E5D4 -.4byte gUnknown_0850E468 -.4byte gUnknown_0850E864 -.4byte gUnknown_0850E870 - -gUnknown_0850DEC8:: @ 850DEC8 - .4byte sub_8093950 - .4byte sub_80964BC - -gUnknown_0850DED0:: - .4byte sub_8093960 - .4byte sub_80964BC - -gUnknown_0850DED8:: - .4byte sub_8093970 - .4byte sub_80964BC - -gUnknown_0850DEE0:: - .4byte sub_8093980 - .4byte sub_80964BC - -gUnknown_0850DEE8:: @ 850DEE8 - .4byte get_go_image_anim_num - .4byte get_go_fast_image_anim_num - .4byte get_go_fast_image_anim_num - .4byte get_go_faster_image_anim_num - .4byte get_go_fastest_image_anim_num - -gUnknown_0850DEFC:: - .4byte sub_8093BC4 - .4byte sub_8093BC4_2 - .4byte sub_80964BC -gUnknown_0850DF08:: - .4byte sub_8093C04 - .4byte sub_8093C04_2 - .4byte sub_80964BC -gUnknown_0850DF14:: - .4byte sub_8093C44 - .4byte sub_8093C44_2 - .4byte sub_80964BC -gUnknown_0850DF20:: - .4byte sub_8093C84 - .4byte sub_8093C84_2 - .4byte sub_80964BC -gUnknown_0850DF2C:: - .4byte sub_8093CC4 - .4byte sub_8093CC4_2 - .4byte sub_80964BC -gUnknown_0850DF38:: - .4byte sub_8093D04 - .4byte sub_8093D04_2 - .4byte sub_80964BC -gUnknown_0850DF44:: - .4byte sub_8093D44 - .4byte sub_8093D44_2 - .4byte sub_80964BC -gUnknown_0850DF50:: - .4byte sub_8093D84 - .4byte sub_8093D84_2 - .4byte sub_80964BC -gUnknown_0850DF5C:: - .4byte sub_8093DC4 - .4byte sub_8093DC4_2 - .4byte sub_80964BC -gUnknown_0850DF68:: - .4byte sub_8093E04 - .4byte sub_8093E04_2 - .4byte sub_80964BC -gUnknown_0850DF74:: - .4byte sub_8093E44 - .4byte sub_8093E44_2 - .4byte sub_80964BC -gUnknown_0850DF80:: - .4byte sub_8093E84 - .4byte sub_8093E84_2 - .4byte sub_80964BC -gUnknown_0850DF8C:: - .4byte sub_8093EC4 - .4byte sub_8093EC4_2 - .4byte sub_80964BC -gUnknown_0850DF98:: - .4byte sub_8093F04 - .4byte sub_8093F04_2 - .4byte sub_80964BC -gUnknown_0850DFA4:: - .4byte sub_8093F44 - .4byte sub_8093F44_2 - .4byte sub_80964BC -gUnknown_0850DFB0:: - .4byte sub_8093F84 - .4byte sub_8093F84_2 - .4byte sub_80964BC - -gUnknown_0850DFBC:: @ 850DFBC - .byte 0x00, 0x00, 0x01, 0x00, 0x01, 0x00 - -gUnknown_0850DFC2:: @ 850DFC2 - .byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00 - -gUnknown_0850DFC8:: @ 850DFC8 - .4byte sub_8094230 - .4byte sub_8094230_2 - .4byte sub_80964BC -gUnknown_0850DFD4:: - .4byte sub_8094288 - .4byte sub_8094288_2 - .4byte sub_80964BC -gUnknown_0850DFE0:: - .4byte sub_80942E0 - .4byte sub_80942E0_2 - .4byte sub_80964BC -gUnknown_0850DFEC:: - .4byte sub_8094338 - .4byte sub_8094338_2 - .4byte sub_80964BC -gUnknown_0850DFF8:: - .4byte sub_80943B4 - .4byte sub_8094398 - .4byte sub_80964B8 -gUnknown_0850E004:: - .4byte sub_80943D4 - .4byte sub_8094398 - .4byte sub_80964B8 -gUnknown_0850E010:: - .4byte sub_80943F4 - .4byte sub_8094398 - .4byte sub_80964B8 -gUnknown_0850E01C:: - .4byte sub_8094414 - .4byte sub_8094398 - .4byte sub_80964B8 -gUnknown_0850E028:: - .4byte sub_8094434 - .4byte sub_8094398 - .4byte sub_80964B8 -gUnknown_0850E034:: - .4byte sub_8094454 - .4byte sub_8094454_2 - .4byte sub_80964BC -gUnknown_0850E040:: - .4byte sub_8094494 - .4byte sub_8094494_2 - .4byte sub_80964BC -gUnknown_0850E04C:: - .4byte sub_80944D4 - .4byte sub_80944D4_2 - .4byte sub_80964BC -gUnknown_0850E058:: - .4byte sub_8094514 - .4byte sub_8094514_2 - .4byte sub_80964BC -gUnknown_0850E064:: - .4byte sub_8094600 - .4byte sub_80945C4 - .4byte sub_80964BC -gUnknown_0850E070:: - .4byte sub_8094638 - .4byte sub_80945C4 - .4byte sub_80964BC -gUnknown_0850E07C:: - .4byte sub_8094670 - .4byte sub_80945C4 - .4byte sub_80964BC -gUnknown_0850E088:: - .4byte sub_80946A8 - .4byte sub_80945C4 - .4byte sub_80964BC -gUnknown_0850E094:: - .4byte sub_80946E0 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E0A0:: - .4byte sub_8094718 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E0AC:: - .4byte sub_8094750 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E0B8:: - .4byte sub_8094788 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E0C4:: - .4byte sub_80947C0 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E0D0:: - .4byte sub_80947F8 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E0DC:: - .4byte sub_8094830 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E0E8:: - .4byte sub_8094868 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E0F4:: - .4byte sub_80948A0 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E100:: - .4byte sub_80948D8 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E10C:: - .4byte sub_8094910 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E118:: - .4byte sub_8094948 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E124:: - .4byte sub_8094980 - .4byte sub_8094980_2 - .4byte sub_80964BC -gUnknown_0850E130:: - .4byte sub_80949C0 - .4byte sub_80949C0_2 - .4byte sub_80964BC -gUnknown_0850E13C:: - .4byte sub_8094A00 - .4byte sub_8094A00_2 - .4byte sub_80964BC -gUnknown_0850E148:: - .4byte sub_8094A40 - .4byte sub_8094A40_2 - .4byte sub_80964BC -gUnknown_0850E154:: - .4byte sub_8094A80 - .4byte sub_8094A80_2 - .4byte sub_80964BC -gUnknown_0850E160:: - .4byte sub_8094AC0 - .4byte sub_8094AC0_2 - .4byte sub_80964BC -gUnknown_0850E16C:: - .4byte sub_8094B00 - .4byte sub_8094B00_2 - .4byte sub_80964BC -gUnknown_0850E178:: - .4byte sub_8094B40 - .4byte sub_8094B40_2 - .4byte sub_80964BC -gUnknown_0850E184:: - .4byte sub_8094B80 - .4byte sub_8094B80_2 - .4byte sub_80964BC -gUnknown_0850E190:: - .4byte sub_8094BC0 - .4byte sub_8094BC0_2 - .4byte sub_80964BC -gUnknown_0850E19C:: - .4byte sub_8094C00 - .4byte sub_8094C00_2 - .4byte sub_80964BC -gUnknown_0850E1A8:: - .4byte sub_8094C40 - .4byte sub_8094C40_2 - .4byte sub_80964BC -gUnknown_0850E1B4:: - .4byte sub_8094C80 - .4byte sub_8094C80_2 - .4byte sub_80964BC -gUnknown_0850E1C0:: - .4byte sub_8094CC0 - .4byte sub_8094CC0_2 - .4byte sub_80964BC -gUnknown_0850E1CC:: - .4byte sub_8094D00 - .4byte sub_8094D00_2 - .4byte sub_80964BC -gUnknown_0850E1D8:: - .4byte sub_8094D40 - .4byte sub_8094D40_2 - .4byte sub_80964BC -gUnknown_0850E1E4:: - .4byte sub_8094DAC - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E1F0:: - .4byte sub_8094E18 - .4byte sub_8094E18_2 - .4byte sub_80964BC -gUnknown_0850E1FC:: - .4byte sub_8094E60 - .4byte sub_8094E60_2 - .4byte sub_80964BC -gUnknown_0850E208:: - .4byte sub_8094EB8 - .4byte sub_8094EB8_2 - .4byte sub_80964BC -gUnknown_0850E214:: - .4byte sub_8094710 - .4byte sub_8094710_2 - .4byte sub_80964BC -gUnknown_0850E220:: - .4byte sub_8094F38 - .4byte sub_80964BC -gUnknown_0850E228:: - .4byte sub_8094F94 - .4byte sub_80964BC -gUnknown_0850E230:: - .4byte sub_8094FF8 - .4byte sub_80964BC -gUnknown_0850E238:: - .4byte sub_8095008 - .4byte sub_80964BC -gUnknown_0850E240:: - .4byte sub_8095018 - .4byte sub_8095018_2 - .4byte sub_80964BC -gUnknown_0850E24C:: - .4byte sub_8095070 - .4byte sub_8095070_2 - .4byte sub_80964BC -gUnknown_0850E258:: - .4byte sub_80950C8 - .4byte sub_80950C8_2 - .4byte sub_80964BC -gUnknown_0850E264:: - .4byte sub_8095120 - .4byte sub_8095120_2 - .4byte sub_80964BC -gUnknown_0850E270:: - .4byte sub_8095178 - .4byte sub_8095178_2 - .4byte sub_80964BC -gUnknown_0850E27C:: - .4byte sub_80951D0 - .4byte sub_80951D0_2 - .4byte sub_80964BC -gUnknown_0850E288:: - .4byte sub_8095228 - .4byte sub_8095228_2 - .4byte sub_80964BC -gUnknown_0850E294:: - .4byte sub_8095280 - .4byte sub_8095280_2 - .4byte sub_80964BC -gUnknown_0850E2A0:: - .4byte sub_80952D8 - .4byte sub_80952D8_2 - .4byte sub_80964BC -gUnknown_0850E2AC:: - .4byte sub_8095330 - .4byte sub_8095330_2 - .4byte sub_80964BC -gUnknown_0850E2B8:: - .4byte sub_8095388 - .4byte sub_8095388_2 - .4byte sub_80964BC -gUnknown_0850E2C4:: - .4byte sub_80953E0 - .4byte sub_80953E0_2 - .4byte sub_80964BC -gUnknown_0850E2D0:: - .4byte sub_8095438 - .4byte sub_80964BC -gUnknown_0850E2D8:: - .4byte sub_8095450 - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E2E4:: - .4byte sub_8095460 - .4byte sub_80964B8 -gUnknown_0850E2EC:: - .4byte sub_8095470 - .4byte sub_80964B8 -gUnknown_0850E2F4:: - .4byte sub_8095480 - .4byte sub_80964B8 -gUnknown_0850E2FC:: - .4byte sub_8095490 - .4byte sub_80964B8 -gUnknown_0850E304:: - .4byte sub_80954BC - .4byte sub_80964B8 -gUnknown_0850E30C:: - .4byte sub_80954CC - .4byte sub_80964B8 -gUnknown_0850E314:: - .4byte do_exclamation_mark_bubble_1 - .4byte sub_80964B8 -gUnknown_0850E31C:: - .4byte do_exclamation_mark_bubble_2 - .4byte sub_80964B8 -gUnknown_0850E324:: - .4byte do_heart_bubble - .4byte sub_80964B8 -gUnknown_0850E32C:: - .4byte sub_8095548 - .4byte sub_809558C - .4byte sub_80964B8 -gUnknown_0850E338:: - .4byte sub_80955AC - .4byte sub_80955C8 - .4byte sub_80955EC - .4byte sub_80964B8 -gUnknown_0850E348:: - .4byte sub_8095628 - .4byte sub_8095644 - .4byte sub_8095668 - .4byte sub_80964B8 -gUnknown_0850E358:: - .4byte sub_80956A4 - .4byte sub_80964B8 -gUnknown_0850E360:: - .4byte sub_80956B4 - .4byte sub_80964B8 -gUnknown_0850E368:: - .4byte sub_80956C4 - .4byte sub_80964B8 -gUnknown_0850E370:: - .4byte sub_80956F4 - .4byte sub_80964B8 -gUnknown_0850E378:: - .4byte sub_8095724 - .4byte sub_80964B8 -gUnknown_0850E380:: - .4byte sub_8095730 - .4byte sub_80964B8 -gUnknown_0850E388:: - .4byte sub_8095740 - .4byte sub_8095740_2 - .4byte sub_80964BC -gUnknown_0850E394:: - .4byte sub_80957A0 - .4byte sub_80957A0_2 - .4byte sub_80964BC -gUnknown_0850E3A0:: - .4byte sub_8095800 - .4byte sub_8095800_2 - .4byte sub_80964BC -gUnknown_0850E3AC:: - .4byte sub_8095860 - .4byte sub_8095860_2 - .4byte sub_80964BC -gUnknown_0850E3B8:: - .4byte sub_8095900 - .4byte sub_80964BC -gUnknown_0850E3C0:: - .4byte sub_8095910 - .4byte sub_80964BC -gUnknown_0850E3C8:: - .4byte sub_8095920 - .4byte sub_80964BC -gUnknown_0850E3D0:: - .4byte sub_8095930 - .4byte sub_80964BC -gUnknown_0850E3D8:: - .4byte sub_8095940 - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E3E4:: - .4byte sub_8095964 - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E3F0:: - .4byte sub_8095988 - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E3FC:: - .4byte sub_80959AC - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E408:: - .4byte sub_80959D0 - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E414:: - .4byte sub_80959F4 - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E420:: - .4byte sub_8095A18 - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E42C:: - .4byte sub_8095A3C - .4byte sub_8094DC4 - .4byte sub_80964BC - .4byte sub_8095A60 - .4byte sub_8094DC4 - .4byte sub_80964BC - .4byte sub_8095A84 - .4byte sub_8094DC4 - .4byte sub_80964BC - .4byte sub_8095AA8 - .4byte sub_8094DC4 - .4byte sub_80964BC - .4byte sub_8095ACC - .4byte sub_8094DC4 - .4byte sub_80964BC -gUnknown_0850E468:: - .4byte sub_8095B44 - .4byte sub_8095B64 - .4byte sub_80964BC -gUnknown_0850E474:: - .4byte sub_8095BC8 - .4byte sub_8095BC8_2 - .4byte sub_80964BC -gUnknown_0850E480:: - .4byte sub_8095C20 - .4byte sub_8095C20_2 - .4byte sub_80964BC -gUnknown_0850E48C:: - .4byte sub_8095C78 - .4byte sub_8095C78_2 - .4byte sub_80964BC -gUnknown_0850E498:: - .4byte sub_8095CD0 - .4byte sub_8095CD0_2 - .4byte sub_80964BC -gUnknown_0850E4A4:: - .4byte sub_8095D28 - .4byte sub_8095D28_2 - .4byte sub_80964BC -gUnknown_0850E4B0:: - .4byte sub_8095D80 - .4byte sub_8095D80_2 - .4byte sub_80964BC -gUnknown_0850E4BC:: - .4byte sub_8095DD8 - .4byte sub_8095DD8_2 - .4byte sub_80964BC -gUnknown_0850E4C8:: - .4byte sub_8095E30 - .4byte sub_8095E30_2 - .4byte sub_80964BC -gUnknown_0850E4D4:: - .4byte sub_8095E88 - .4byte sub_8095E88_2 - .4byte sub_80964BC -gUnknown_0850E4E0:: - .4byte sub_8095EE0 - .4byte sub_8095EE0_2 - .4byte sub_80964BC -gUnknown_0850E4EC:: - .4byte sub_8095F38 - .4byte sub_8095F38_2 - .4byte sub_80964BC -gUnknown_0850E4F8:: - .4byte sub_8095F90 - .4byte sub_8095F90_2 - .4byte sub_80964BC -gUnknown_0850E504:: - .4byte sub_8095FE8 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E510:: - .4byte sub_8096020 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E51C:: - .4byte sub_8096058 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E528:: - .4byte sub_8096090 - .4byte sub_809459C - .4byte sub_80964BC -gUnknown_0850E534:: - .4byte sub_8096100 - .4byte sub_8096100_2 - .4byte sub_80964BC -gUnknown_0850E540:: - .4byte sub_8096140 - .4byte sub_8096140_2 - .4byte sub_80964BC -gUnknown_0850E54C:: - .4byte sub_8096180 - .4byte sub_8096180_2 - .4byte sub_80964BC -gUnknown_0850E558:: - .4byte sub_80961C0 - .4byte sub_80961C0_2 - .4byte sub_80964BC -gUnknown_0850E564:: - .4byte sub_8096230 - .4byte sub_8096230_2 - .4byte sub_80964BC -gUnknown_0850E570:: - .4byte sub_8096270 - .4byte sub_8096270_2 - .4byte sub_80964BC -gUnknown_0850E57C:: - .4byte sub_80962B0 - .4byte sub_80962B0_2 - .4byte sub_80964BC -gUnknown_0850E588:: - .4byte sub_80962F0 - .4byte sub_80962F0_2 - .4byte sub_80964BC -gUnknown_0850E594:: - .4byte sub_8096368 - .4byte sub_8096368_2 - .4byte sub_80964BC -gUnknown_0850E5A0:: - .4byte sub_80963A8 - .4byte sub_80963A8_2 - .4byte sub_80964BC -gUnknown_0850E5AC:: - .4byte sub_80963E8 - .4byte sub_80963E8_2 - .4byte sub_80964BC -gUnknown_0850E5B8:: - .4byte sub_8096428 - .4byte sub_8096428_2 - .4byte sub_80964BC -gUnknown_0850E5C4:: - .4byte sub_8096468 - .4byte sub_80964B8 -gUnknown_0850E5CC:: - .4byte sub_809647C - .4byte sub_80964B8 -gUnknown_0850E5D4:: - .4byte sub_8096494 - .4byte sub_80964B8 - diff --git a/data/graphics/field_objects/berry_tree_graphics_tables.inc b/data/graphics/field_objects/berry_tree_graphics_tables.inc deleted file mode 100644 index 8d716d759..000000000 --- a/data/graphics/field_objects/berry_tree_graphics_tables.inc +++ /dev/null @@ -1,635 +0,0 @@ - .align 2 -gFieldObjectPicTable_PechaBerryTree:: @ 850BE48 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_PechaBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_PechaBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_PechaBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_PechaBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_PechaBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_PechaBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Pecha:: @ 850BE90 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_KelpsyBerryTree:: @ 850BE98 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_KelpsyBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_KelpsyBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_KelpsyBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_KelpsyBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_KelpsyBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_KelpsyBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Kelpsy:: @ 850BEE0 - berry_tree_palette_slot_table 2 - - .align 2 -gFieldObjectPicTable_WepearBerryTree:: @ 850BEE8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_WepearBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_WepearBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_WepearBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_WepearBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_WepearBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_WepearBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Wepear:: @ 850BF30 - berry_tree_palette_slot_table 2 - - .align 2 -gFieldObjectPicTable_IapapaBerryTree:: @ 850BF38 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_IapapaBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_IapapaBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_IapapaBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_IapapaBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_IapapaBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_IapapaBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Iapapa:: @ 850BF80 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_CheriBerryTree:: @ 850BF88 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_CheriBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_CheriBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_CheriBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_CheriBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_CheriBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_CheriBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Cheri:: @ 850BFD0 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_FigyBerryTree:: @ 850BFD8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_FigyBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_FigyBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_FigyBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_FigyBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_FigyBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_FigyBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Figy:: @ 850C020 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_MagoBerryTree:: @ 850C028 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_MagoBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_MagoBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_MagoBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_MagoBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_MagoBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_MagoBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Mago:: @ 850C070 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_LumBerryTree:: @ 850C078 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_LumBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_LumBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_LumBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_LumBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_LumBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_LumBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Lum:: @ 850C0C0 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_RazzBerryTree:: @ 850C0C8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_RazzBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_RazzBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_RazzBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_RazzBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_RazzBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_RazzBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Razz:: @ 850C110 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_GrepaBerryTree:: @ 850C118 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_GrepaBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_GrepaBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_GrepaBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_GrepaBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_GrepaBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_GrepaBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Grepa:: @ 850C160 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_RabutaBerryTree:: @ 850C168 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_RabutaBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_RabutaBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_RabutaBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_RabutaBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_RabutaBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_RabutaBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Rabuta:: @ 850C1B0 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_NomelBerryTree:: @ 850C1B8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_NomelBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_NomelBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_NomelBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_NomelBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_NomelBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_NomelBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Nomel:: @ 850C200 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_LeppaBerryTree:: @ 850C208 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_LeppaBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_LeppaBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_LeppaBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_LeppaBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_LeppaBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_LeppaBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Leppa:: @ 850C250 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_LiechiBerryTree:: @ 850C258 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_LiechiBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_LiechiBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_LiechiBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_LiechiBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_LiechiBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_LiechiBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Liechi:: @ 850C2A0 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_HondewBerryTree:: @ 850C2A8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_HondewBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_HondewBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_HondewBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_HondewBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_HondewBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_HondewBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Hondew:: @ 850C2F0 - berry_tree_palette_slot_table 5 - - .align 2 -gFieldObjectPicTable_AguavBerryTree:: @ 850C2F8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_AguavBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_AguavBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_AguavBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_AguavBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_AguavBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_AguavBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Aguav:: @ 850C340 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_WikiBerryTree:: @ 850C348 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_WikiBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_WikiBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_WikiBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_WikiBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_WikiBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_WikiBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Wiki:: @ 850C390 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_PomegBerryTree:: @ 850C398 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_PomegBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_PomegBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_PomegBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_PomegBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_PomegBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_PomegBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Pomeg:: @ 850C3E0 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_RawstBerryTree:: @ 850C3E8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_RawstBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_RawstBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_RawstBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_RawstBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_RawstBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_RawstBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Rawst:: @ 850C430 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_SpelonBerryTree:: @ 850C438 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_SpelonBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_SpelonBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_SpelonBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_SpelonBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_SpelonBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_SpelonBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Spelon:: @ 850C480 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_ChestoBerryTree:: @ 850C488 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_ChestoBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_ChestoBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_ChestoBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_ChestoBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_ChestoBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_ChestoBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Chesto:: @ 850C4D0 - berry_tree_palette_slot_table 2 - - .align 2 -gFieldObjectPicTable_OranBerryTree:: @ 850C4D8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_OranBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_OranBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_OranBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_OranBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_OranBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_OranBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Oran:: @ 850C520 - berry_tree_palette_slot_table 2 - - .align 2 -gFieldObjectPicTable_PersimBerryTree:: @ 850C528 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_PersimBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_PersimBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_PersimBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_PersimBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_PersimBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_PersimBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Persim:: @ 850C570 - berry_tree_palette_slot_table 2 - - .align 2 -gFieldObjectPicTable_SitrusBerryTree:: @ 850C578 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_SitrusBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_SitrusBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_SitrusBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_SitrusBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_SitrusBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_SitrusBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Sitrus:: @ 850C5C0 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_AspearBerryTree:: @ 850C5C8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_AspearBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_AspearBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_AspearBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_AspearBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_AspearBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_AspearBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Aspear:: @ 850C610 - berry_tree_palette_slot_table 3 - - .align 2 -gFieldObjectPicTable_PamtreBerryTree:: @ 850C618 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_PamtreBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_PamtreBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_PamtreBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_PamtreBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_PamtreBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_PamtreBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Pamtre:: @ 850C660 - berry_tree_palette_slot_table 2 - - .align 2 -gFieldObjectPicTable_CornnBerryTree:: @ 850C668 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_CornnBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_CornnBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_CornnBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_CornnBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_CornnBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_CornnBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Cornn:: @ 850C6B0 - berry_tree_palette_slot_table 2 - - .align 2 -gFieldObjectPicTable_LansatBerryTree:: @ 850C6B8 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_LansatBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_LansatBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_LansatBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_LansatBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_LansatBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_LansatBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Lansat:: @ 850C700 - berry_tree_palette_slot_table 2 - - .align 2 -gFieldObjectPicTable_DurinBerryTree:: @ 850C708 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_DurinBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_DurinBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_DurinBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_DurinBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_DurinBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_DurinBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Durin:: @ 850C750 - berry_tree_palette_slot_table 4 - - .align 2 -gFieldObjectPicTable_TamatoBerryTree:: @ 850C758 - obj_tiles gFieldObjectPic_BerryTreeDirtPile, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_0, 0x80 - obj_tiles gFieldObjectPic_BerryTreeSprout_1, 0x80 - obj_tiles gFieldObjectPic_TamatoBerryTree_0, 0x100 - obj_tiles gFieldObjectPic_TamatoBerryTree_1, 0x100 - obj_tiles gFieldObjectPic_TamatoBerryTree_2, 0x100 - obj_tiles gFieldObjectPic_TamatoBerryTree_3, 0x100 - obj_tiles gFieldObjectPic_TamatoBerryTree_4, 0x100 - obj_tiles gFieldObjectPic_TamatoBerryTree_5, 0x100 - - .align 2 -gBerryTreePaletteSlotTable_Tamato:: @ 850C7A0 - berry_tree_palette_slot_table 2 - - .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES - -gBerryTreeFieldObjectGraphicsIdTable:: @ 850C7AA - .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte MAP_OBJ_GFX_BERRY_TREE_EARLY_STAGES - .byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES - .byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES - .byte MAP_OBJ_GFX_BERRY_TREE_LATE_STAGES - - .align 2 -gBerryTreePicTablePointers:: @ 850C7B0 - .4byte gFieldObjectPicTable_CheriBerryTree @ Cheri - .4byte gFieldObjectPicTable_ChestoBerryTree @ Chesto - .4byte gFieldObjectPicTable_PechaBerryTree @ Pecha - .4byte gFieldObjectPicTable_RawstBerryTree @ Rawst - .4byte gFieldObjectPicTable_AspearBerryTree @ Aspear - .4byte gFieldObjectPicTable_LeppaBerryTree @ Leppa - .4byte gFieldObjectPicTable_OranBerryTree @ Oran - .4byte gFieldObjectPicTable_PersimBerryTree @ Persim - .4byte gFieldObjectPicTable_LumBerryTree @ Lum - .4byte gFieldObjectPicTable_SitrusBerryTree @ Sitrus - .4byte gFieldObjectPicTable_FigyBerryTree @ Figy - .4byte gFieldObjectPicTable_WikiBerryTree @ Wiki - .4byte gFieldObjectPicTable_MagoBerryTree @ Mago - .4byte gFieldObjectPicTable_AguavBerryTree @ Aguav - .4byte gFieldObjectPicTable_IapapaBerryTree @ Iapapa - .4byte gFieldObjectPicTable_RazzBerryTree @ Razz - .4byte gFieldObjectPicTable_RazzBerryTree @ Bluk - .4byte gFieldObjectPicTable_MagoBerryTree @ Nanab - .4byte gFieldObjectPicTable_WepearBerryTree @ Wepear - .4byte gFieldObjectPicTable_IapapaBerryTree @ Pinap - .4byte gFieldObjectPicTable_PomegBerryTree @ Pomeg - .4byte gFieldObjectPicTable_KelpsyBerryTree @ Kelpsy - .4byte gFieldObjectPicTable_WepearBerryTree @ Qualot - .4byte gFieldObjectPicTable_HondewBerryTree @ Hondew - .4byte gFieldObjectPicTable_GrepaBerryTree @ Grepa - .4byte gFieldObjectPicTable_TamatoBerryTree @ Tamato - .4byte gFieldObjectPicTable_CornnBerryTree @ Cornn - .4byte gFieldObjectPicTable_PomegBerryTree @ Magost - .4byte gFieldObjectPicTable_RabutaBerryTree @ Rabuta - .4byte gFieldObjectPicTable_NomelBerryTree @ Nomel - .4byte gFieldObjectPicTable_SpelonBerryTree @ Spelon - .4byte gFieldObjectPicTable_PamtreBerryTree @ Pamtre - .4byte gFieldObjectPicTable_RabutaBerryTree @ Watmel - .4byte gFieldObjectPicTable_DurinBerryTree @ Durin - .4byte gFieldObjectPicTable_HondewBerryTree @ Belue - .4byte gFieldObjectPicTable_LiechiBerryTree @ Liechi - .4byte gFieldObjectPicTable_HondewBerryTree @ Ganlon - .4byte gFieldObjectPicTable_AguavBerryTree @ Salac - .4byte gFieldObjectPicTable_PomegBerryTree @ Petaya - .4byte gFieldObjectPicTable_GrepaBerryTree @ Apicot - .4byte gFieldObjectPicTable_LansatBerryTree @ Lansat - .4byte gFieldObjectPicTable_CornnBerryTree @ Starf - .4byte gFieldObjectPicTable_DurinBerryTree @ Enigma - - .align 2 -gBerryTreePaletteSlotTablePointers:: @ 850C85C - .4byte gBerryTreePaletteSlotTable_Cheri @ Cheri - .4byte gBerryTreePaletteSlotTable_Chesto @ Chesto - .4byte gBerryTreePaletteSlotTable_Pecha @ Pecha - .4byte gBerryTreePaletteSlotTable_Rawst @ Rawst - .4byte gBerryTreePaletteSlotTable_Aspear @ Aspear - .4byte gBerryTreePaletteSlotTable_Leppa @ Leppa - .4byte gBerryTreePaletteSlotTable_Oran @ Oran - .4byte gBerryTreePaletteSlotTable_Persim @ Persim - .4byte gBerryTreePaletteSlotTable_Lum @ Lum - .4byte gBerryTreePaletteSlotTable_Sitrus @ Sitrus - .4byte gBerryTreePaletteSlotTable_Figy @ Figy - .4byte gBerryTreePaletteSlotTable_Wiki @ Wiki - .4byte gBerryTreePaletteSlotTable_Mago @ Mago - .4byte gBerryTreePaletteSlotTable_Aguav @ Aguav - .4byte gBerryTreePaletteSlotTable_Iapapa @ Iapapa - .4byte gBerryTreePaletteSlotTable_Razz @ Razz - .4byte gBerryTreePaletteSlotTable_Razz @ Bluk - .4byte gBerryTreePaletteSlotTable_Mago @ Nanab - .4byte gBerryTreePaletteSlotTable_Wepear @ Wepear - .4byte gBerryTreePaletteSlotTable_Iapapa @ Pinap - .4byte gBerryTreePaletteSlotTable_Pomeg @ Pomeg - .4byte gBerryTreePaletteSlotTable_Kelpsy @ Kelpsy - .4byte gBerryTreePaletteSlotTable_Wepear @ Qualot - .4byte gBerryTreePaletteSlotTable_Hondew @ Hondew - .4byte gBerryTreePaletteSlotTable_Grepa @ Grepa - .4byte gBerryTreePaletteSlotTable_Tamato @ Tamato - .4byte gBerryTreePaletteSlotTable_Cornn @ Cornn - .4byte gBerryTreePaletteSlotTable_Pomeg @ Magost - .4byte gBerryTreePaletteSlotTable_Rabuta @ Rabuta - .4byte gBerryTreePaletteSlotTable_Nomel @ Nomel - .4byte gBerryTreePaletteSlotTable_Spelon @ Spelon - .4byte gBerryTreePaletteSlotTable_Pamtre @ Pamtre - .4byte gBerryTreePaletteSlotTable_Rabuta @ Watmel - .4byte gBerryTreePaletteSlotTable_Durin @ Durin - .4byte gBerryTreePaletteSlotTable_Hondew @ Belue - .4byte gBerryTreePaletteSlotTable_Liechi @ Liechi - .4byte gBerryTreePaletteSlotTable_Hondew @ Ganlon - .4byte gBerryTreePaletteSlotTable_Aguav @ Salac - .4byte gBerryTreePaletteSlotTable_Pomeg @ Petaya - .4byte gBerryTreePaletteSlotTable_Grepa @ Apicot - .4byte gBerryTreePaletteSlotTable_Lansat @ Lansat - .4byte gBerryTreePaletteSlotTable_Cornn @ Starf - .4byte gBerryTreePaletteSlotTable_Durin @ Enigma - - .align 2 -gBerryTreeFieldObjectGraphicsIdTablePointers:: @ 850C908 - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Cheri - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Chesto - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Pecha - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Rawst - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Aspear - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Leppa - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Oran - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Persim - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Lum - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Sitrus - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Figy - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Wiki - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Mago - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Aguav - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Iapapa - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Razz - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Bluk - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Nanab - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Wepear - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Pinap - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Pomeg - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Kelpsy - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Qualot - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Hondew - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Grepa - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Tamato - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Cornn - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Magost - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Rabuta - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Nomel - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Spelon - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Pamtre - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Watmel - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Durin - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Belue - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Liechi - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Ganlon - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Salac - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Petaya - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Apicot - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Lansat - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Starf - .4byte gBerryTreeFieldObjectGraphicsIdTable @ Enigma - -@ extras - .4byte gBerryTreeFieldObjectGraphicsIdTable - .4byte gBerryTreeFieldObjectGraphicsIdTable - .4byte gBerryTreeFieldObjectGraphicsIdTable diff --git a/data/graphics/field_objects/field_effect_object_template_pointers.inc b/data/graphics/field_objects/field_effect_object_template_pointers.inc deleted file mode 100644 index 846cdf6c2..000000000 --- a/data/graphics/field_objects/field_effect_object_template_pointers.inc +++ /dev/null @@ -1,39 +0,0 @@ - .align 2 -gFieldEffectObjectTemplatePointers:: @ 85059F8 - .4byte gFieldEffectObjectTemplate_ShadowSmall - .4byte gFieldEffectObjectTemplate_ShadowMedium - .4byte gFieldEffectObjectTemplate_ShadowLarge - .4byte gFieldEffectObjectTemplate_ShadowExtraLarge - .4byte gFieldEffectObjectTemplate_TallGrass - .4byte gFieldEffectObjectTemplate_Ripple - .4byte gFieldEffectObjectTemplate_Ash - .4byte gFieldEffectObjectTemplate_SurfBlob - .4byte gFieldEffectObjectTemplate_Arrow - .4byte gFieldEffectObjectTemplate_GroundImpactDust - .4byte gFieldEffectObjectTemplate_BikeHopTallGrass - .4byte gFieldEffectObjectTemplate_SandFootprints - .4byte gFieldEffectObjectTemplate_BikeHopBigSplash - .4byte gFieldEffectObjectTemplate_Splash - .4byte gFieldEffectObjectTemplate_BikeHopSmallSplash - .4byte gFieldEffectObjectTemplate_LongGrass - .4byte gFieldEffectObjectTemplate_Unknown16 - .4byte gFieldEffectObjectTemplate_Unknown17 - .4byte gFieldEffectObjectTemplate_Unknown18 - .4byte gFieldEffectObjectTemplate_Unknown19 - .4byte gFieldEffectObjectTemplate_Unknown20 - .4byte gFieldEffectObjectTemplate_Unknown21 - .4byte gFieldEffectObjectTemplate_BerryTreeGrowthSparkle - .4byte gFieldEffectObjectTemplate_DeepSandFootprints - .4byte gFieldEffectObjectTemplate_TreeDisguise - .4byte gFieldEffectObjectTemplate_MountainDisguise - .4byte gFieldEffectObjectTemplate_Bird - .4byte gFieldEffectObjectTemplate_BikeTireTracks - .4byte gFieldEffectObjectTemplate_SandDisguisePlaceholder - .4byte gFieldEffectObjectTemplate_Unknown29 - .4byte gFieldEffectObjectTemplate_ShortGrass - .4byte gFieldEffectObjectTemplate_HotSpringsWater - .4byte gFieldEffectObjectTemplate_JumpOutOfAsh - .4byte gFieldEffectObjectTemplate_Unknown33 - .4byte gFieldEffectObjectTemplate_Bubbles - .4byte gFieldEffectObjectTemplate_Unknown35 - .4byte gFieldEffectObjectTemplate_Rayquaza diff --git a/data/graphics/field_objects/field_effect_objects.inc b/data/graphics/field_objects/field_effect_objects.inc deleted file mode 100644 index 2c1ce3c4c..000000000 --- a/data/graphics/field_objects/field_effect_objects.inc +++ /dev/null @@ -1,1208 +0,0 @@ - - .align 2 -gFieldEffectObjectPaletteInfo0:: @ 850C9C0 - obj_pal gFieldEffectObjectPalette0, 0x1004 - - .align 2 -gFieldEffectObjectPaletteInfo1:: @ 850C9C8 - obj_pal gFieldEffectObjectPalette1, 0x1005 - - .align 2 -gFieldEffectObjectImageAnim_850C9D0:: @ 850C9D0 - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Shadow:: @ 850C9D8 - .4byte gFieldEffectObjectImageAnim_850C9D0 - - .align 2 -gFieldEffectObjectPicTable_ShadowSmall:: @ 850C9DC - obj_tiles gFieldEffectObjectPic_ShadowSmall, 0x20 - - .align 2 -gFieldEffectObjectPicTable_ShadowMedium:: @ 850C9E4 - obj_tiles gFieldEffectObjectPic_ShadowMedium, 0x40 - - .align 2 -gFieldEffectObjectPicTable_ShadowLarge:: @ 850C9EC - obj_tiles gFieldEffectObjectPic_ShadowLarge, 0x80 - - .align 2 -gFieldEffectObjectPicTable_ShadowExtraLarge:: @ 850C9F4 - obj_tiles gFieldEffectObjectPic_ShadowExtraLarge, 0x400 - - .align 2 -gFieldEffectObjectTemplate_ShadowSmall:: @ 850C9FC - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_8x8 - .4byte gFieldEffectObjectImageAnimTable_Shadow - .4byte gFieldEffectObjectPicTable_ShadowSmall - .4byte gDummySpriteAffineAnimTable - .4byte oamc_shadow - - .align 2 -gFieldEffectObjectTemplate_ShadowMedium:: @ 850CA14 - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_16x8 - .4byte gFieldEffectObjectImageAnimTable_Shadow - .4byte gFieldEffectObjectPicTable_ShadowMedium - .4byte gDummySpriteAffineAnimTable - .4byte oamc_shadow - - .align 2 -gFieldEffectObjectTemplate_ShadowLarge:: @ 850CA2C - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_32x8 - .4byte gFieldEffectObjectImageAnimTable_Shadow - .4byte gFieldEffectObjectPicTable_ShadowLarge - .4byte gDummySpriteAffineAnimTable - .4byte oamc_shadow - - .align 2 -gFieldEffectObjectTemplate_ShadowExtraLarge:: @ 850CA44 - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_64x32 - .4byte gFieldEffectObjectImageAnimTable_Shadow - .4byte gFieldEffectObjectPicTable_ShadowExtraLarge - .4byte gDummySpriteAffineAnimTable - .4byte oamc_shadow - - .align 2 -gFieldEffectObjectPicTable_TallGrass:: @ 850CA5C - obj_tiles gFieldEffectObjectPic_TallGrass_0, 0x80 - obj_tiles gFieldEffectObjectPic_TallGrass_1, 0x80 - obj_tiles gFieldEffectObjectPic_TallGrass_2, 0x80 - obj_tiles gFieldEffectObjectPic_TallGrass_3, 0x80 - obj_tiles gFieldEffectObjectPic_TallGrass_4, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CA84:: @ 850CA84 - obj_image_anim_frame 1, 10 - obj_image_anim_frame 2, 10 - obj_image_anim_frame 3, 10 - obj_image_anim_frame 4, 10 - obj_image_anim_frame 0, 10 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_TallGrass:: @ 850CA9C - .4byte gFieldEffectObjectImageAnim_850CA84 - - .align 2 -gFieldEffectObjectTemplate_TallGrass:: @ 850CAA0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_TallGrass - .4byte gFieldEffectObjectPicTable_TallGrass - .4byte gDummySpriteAffineAnimTable - .4byte unc_grass_normal - - .align 2 -gFieldEffectObjectPicTable_Ripple:: @ 850CAB8 - obj_tiles gFieldEffectObjectPic_Ripple_0, 0x80 - obj_tiles gFieldEffectObjectPic_Ripple_1, 0x80 - obj_tiles gFieldEffectObjectPic_Ripple_2, 0x80 - obj_tiles gFieldEffectObjectPic_Ripple_3, 0x80 - obj_tiles gFieldEffectObjectPic_Ripple_4, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CAE0:: @ 850CAE0 - obj_image_anim_frame 0, 12 - obj_image_anim_frame 1, 9 - obj_image_anim_frame 2, 9 - obj_image_anim_frame 3, 9 - obj_image_anim_frame 0, 9 - obj_image_anim_frame 1, 9 - obj_image_anim_frame 2, 11 - obj_image_anim_frame 4, 11 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Ripple:: @ 850CB04 - .4byte gFieldEffectObjectImageAnim_850CAE0 - - .align 2 -gFieldEffectObjectTemplate_Ripple:: @ 850CB08 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Ripple - .4byte gFieldEffectObjectPicTable_Ripple - .4byte gDummySpriteAffineAnimTable - .4byte sub_81561D0 - - .align 2 -gFieldEffectObjectPicTable_Ash:: @ 850CB20 - obj_tiles gFieldEffectObjectPic_Ash_0, 0x80 - obj_tiles gFieldEffectObjectPic_Ash_1, 0x80 - obj_tiles gFieldEffectObjectPic_Ash_2, 0x80 - obj_tiles gFieldEffectObjectPic_Ash_3, 0x80 - obj_tiles gFieldEffectObjectPic_Ash_4, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CB48:: @ 850CB48 - obj_image_anim_frame 0, 12 - obj_image_anim_frame 1, 12 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 12 - obj_image_anim_frame 4, 12 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Ash:: @ 850CB60 - .4byte gFieldEffectObjectImageAnim_850CB48 - - .align 2 -gFieldEffectObjectTemplate_Ash:: @ 850CB64 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Ash - .4byte gFieldEffectObjectPicTable_Ash - .4byte gDummySpriteAffineAnimTable - .4byte sub_8155460 - - .align 2 -gFieldEffectObjectPicTable_SurfBlob:: @ 850CB7C - obj_tiles gFieldEffectObjectPic_SurfBlob_0, 0x200 - obj_tiles gFieldEffectObjectPic_SurfBlob_1, 0x200 - obj_tiles gFieldEffectObjectPic_SurfBlob_2, 0x200 - - .align 2 -gFieldEffectObjectImageAnim_850CB94:: @ 850CB94 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnim_850CB9C:: @ 850CB9C - obj_image_anim_frame 1, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnim_850CBA4:: @ 850CBA4 - obj_image_anim_frame 2, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnim_850CBAC:: @ 850CBAC - obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnimTable_SurfBlob:: @ 850CBB4 - .4byte gFieldEffectObjectImageAnim_850CB94 - .4byte gFieldEffectObjectImageAnim_850CB9C - .4byte gFieldEffectObjectImageAnim_850CBA4 - .4byte gFieldEffectObjectImageAnim_850CBAC - - .align 2 -gFieldEffectObjectTemplate_SurfBlob:: @ 850CBC4 - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldEffectObjectImageAnimTable_SurfBlob - .4byte gFieldEffectObjectPicTable_SurfBlob - .4byte gDummySpriteAffineAnimTable - .4byte sub_8155658 - - .align 2 -gFieldEffectObjectPicTable_Arrow:: @ 850CBDC - obj_tiles gFieldEffectObjectPic_Arrow_0, 0x80 - obj_tiles gFieldEffectObjectPic_Arrow_1, 0x80 - obj_tiles gFieldEffectObjectPic_Arrow_2, 0x80 - obj_tiles gFieldEffectObjectPic_Arrow_3, 0x80 - obj_tiles gFieldEffectObjectPic_Arrow_4, 0x80 - obj_tiles gFieldEffectObjectPic_Arrow_5, 0x80 - obj_tiles gFieldEffectObjectPic_Arrow_6, 0x80 - obj_tiles gFieldEffectObjectPic_Arrow_7, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CC1C:: @ 850CC1C - obj_image_anim_frame 3, 32 - obj_image_anim_frame 7, 32 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnim_850CC28:: @ 850CC28 - obj_image_anim_frame 0, 32 - obj_image_anim_frame 4, 32 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnim_850CC34:: @ 850CC34 - obj_image_anim_frame 1, 32 - obj_image_anim_frame 5, 32 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnim_850CC40:: @ 850CC40 - obj_image_anim_frame 2, 32 - obj_image_anim_frame 6, 32 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnimTable_Arrow:: @ 850CC4C - .4byte gFieldEffectObjectImageAnim_850CC1C - .4byte gFieldEffectObjectImageAnim_850CC28 - .4byte gFieldEffectObjectImageAnim_850CC34 - .4byte gFieldEffectObjectImageAnim_850CC40 - - .align 2 -gFieldEffectObjectTemplate_Arrow:: @ 850CC5C - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Arrow - .4byte gFieldEffectObjectPicTable_Arrow - .4byte gDummySpriteAffineAnimTable - .4byte SpriteCallbackDummy - - .align 2 -gFieldEffectObjectPicTable_GroundImpactDust:: @ 850CC74 - obj_tiles gFieldEffectObjectPic_GroundImpactDust_0, 0x40 - obj_tiles gFieldEffectObjectPic_GroundImpactDust_1, 0x40 - obj_tiles gFieldEffectObjectPic_GroundImpactDust_2, 0x40 - - .align 2 -gFieldEffectObjectImageAnim_850CC8C:: @ 850CC8C - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_GroundImpactDust:: @ 850CC9C - .4byte gFieldEffectObjectImageAnim_850CC8C - - .align 2 -gFieldEffectObjectTemplate_GroundImpactDust:: @ 850CCA0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x8 - .4byte gFieldEffectObjectImageAnimTable_GroundImpactDust - .4byte gFieldEffectObjectPicTable_GroundImpactDust - .4byte gDummySpriteAffineAnimTable - .4byte sub_8156194 - - .align 2 -gFieldEffectObjectPicTable_BikeHopTallGrass:: @ 850CCB8 - obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_0, 0x40 - obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_1, 0x40 - obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_2, 0x40 - obj_tiles gFieldEffectObjectPic_BikeHopTallGrass_3, 0x40 - - .align 2 -gFieldEffectObjectImageAnim_850CCD8:: @ 850CCD8 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_BikeHopTallGrass:: @ 850CCEC - .4byte gFieldEffectObjectImageAnim_850CCD8 - - .align 2 -gFieldEffectObjectTemplate_BikeHopTallGrass:: @ 850CCF0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x8 - .4byte gFieldEffectObjectImageAnimTable_BikeHopTallGrass - .4byte gFieldEffectObjectPicTable_BikeHopTallGrass - .4byte gDummySpriteAffineAnimTable - .4byte sub_8156194 - - .align 2 -gFieldEffectObjectPicTable_SandFootprints:: @ 850CD08 - obj_tiles gFieldEffectObjectPic_SandFootprints_0, 0x80 - obj_tiles gFieldEffectObjectPic_SandFootprints_1, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CD18:: @ 850CD18 - obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CD20:: @ 850CD20 - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CD28:: @ 850CD28 - obj_image_anim_frame 1, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CD30:: @ 850CD30 - obj_image_anim_frame 1, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_SandFootprints:: @ 850CD38 - .4byte gFieldEffectObjectImageAnim_850CD18 - .4byte gFieldEffectObjectImageAnim_850CD18 - .4byte gFieldEffectObjectImageAnim_850CD20 - .4byte gFieldEffectObjectImageAnim_850CD28 - .4byte gFieldEffectObjectImageAnim_850CD30 - - .align 2 -gFieldEffectObjectTemplate_SandFootprints:: @ 850CD4C - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_SandFootprints - .4byte gFieldEffectObjectPicTable_SandFootprints - .4byte gDummySpriteAffineAnimTable - .4byte sub_8154C60 - - .align 2 -gFieldEffectObjectPicTable_DeepSandFootprints:: @ 850CD64 - obj_tiles gFieldEffectObjectPic_DeepSandFootprints_0, 0x80 - obj_tiles gFieldEffectObjectPic_DeepSandFootprints_1, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CD74:: @ 850CD74 - obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_V_FLIP - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CD7C:: @ 850CD7C - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CD84:: @ 850CD84 - obj_image_anim_frame 1, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CD8C:: @ 850CD8C - obj_image_anim_frame 1, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_DeepSandFootprints:: @ 850CD94 - .4byte gFieldEffectObjectImageAnim_850CD74 - .4byte gFieldEffectObjectImageAnim_850CD74 - .4byte gFieldEffectObjectImageAnim_850CD7C - .4byte gFieldEffectObjectImageAnim_850CD84 - .4byte gFieldEffectObjectImageAnim_850CD8C - - .align 2 -gFieldEffectObjectTemplate_DeepSandFootprints:: @ 850CDA8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_DeepSandFootprints - .4byte gFieldEffectObjectPicTable_DeepSandFootprints - .4byte gDummySpriteAffineAnimTable - .4byte sub_8154C60 - - .align 2 -gFieldEffectObjectPicTable_BikeTireTracks:: @ 850CDC0 - obj_tiles gFieldEffectObjectPic_BikeTireTracks_0, 0x80 - obj_tiles gFieldEffectObjectPic_BikeTireTracks_1, 0x80 - obj_tiles gFieldEffectObjectPic_BikeTireTracks_2, 0x80 - obj_tiles gFieldEffectObjectPic_BikeTireTracks_3, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CDE0:: @ 850CDE0 - obj_image_anim_frame 2, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CDE8:: @ 850CDE8 - obj_image_anim_frame 2, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CDF0:: @ 850CDF0 - obj_image_anim_frame 1, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CDF8:: @ 850CDF8 - obj_image_anim_frame 1, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CE00:: @ 850CE00 - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CE08:: @ 850CE08 - obj_image_anim_frame 0, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CE10:: @ 850CE10 - obj_image_anim_frame 3, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CE18:: @ 850CE18 - obj_image_anim_frame 3, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_BikeTireTracks:: @ 850CE20 - .4byte gFieldEffectObjectImageAnim_850CDE0 - .4byte gFieldEffectObjectImageAnim_850CDE0 - .4byte gFieldEffectObjectImageAnim_850CDE8 - .4byte gFieldEffectObjectImageAnim_850CDF0 - .4byte gFieldEffectObjectImageAnim_850CDF8 - .4byte gFieldEffectObjectImageAnim_850CE00 - .4byte gFieldEffectObjectImageAnim_850CE08 - .4byte gFieldEffectObjectImageAnim_850CE10 - .4byte gFieldEffectObjectImageAnim_850CE18 - - .align 2 -gFieldEffectObjectTemplate_BikeTireTracks:: @ 850CE44 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_BikeTireTracks - .4byte gFieldEffectObjectPicTable_BikeTireTracks - .4byte gDummySpriteAffineAnimTable - .4byte sub_8154C60 - - .align 2 -gFieldEffectObjectPicTable_BikeHopBigSplash:: @ 850CE5C - obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_0, 0x80 - obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_1, 0x80 - obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_2, 0x80 - obj_tiles gFieldEffectObjectPic_BikeHopBigSplash_3, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CE7C:: @ 850CE7C - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_BikeHopBigSplash:: @ 850CE90 - .4byte gFieldEffectObjectImageAnim_850CE7C - - .align 2 -gFieldEffectObjectTemplate_BikeHopBigSplash:: @ 850CE94 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_BikeHopBigSplash - .4byte gFieldEffectObjectPicTable_BikeHopBigSplash - .4byte gDummySpriteAffineAnimTable - .4byte sub_8156194 - - .align 2 -gFieldEffectObjectPicTable_Splash:: @ 850CEAC - obj_tiles gFieldEffectObjectPic_Splash_0, 0x40 - obj_tiles gFieldEffectObjectPic_Splash_1, 0x40 - - .align 2 -gFieldEffectObjectImageAnim_850CEBC:: @ 850CEBC - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850CEC8:: @ 850CEC8 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnimTable_Splash:: @ 850CEEC - .4byte gFieldEffectObjectImageAnim_850CEBC - .4byte gFieldEffectObjectImageAnim_850CEC8 - - .align 2 -gFieldEffectObjectTemplate_Splash:: @ 850CEF4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x8 - .4byte gFieldEffectObjectImageAnimTable_Splash - .4byte gFieldEffectObjectPicTable_Splash - .4byte gDummySpriteAffineAnimTable - .4byte sub_8154D90 - - .align 2 -gFieldEffectObjectPicTable_BikeHopSmallSplash:: @ 850CF0C - obj_tiles gFieldEffectObjectPic_BikeHopSmallSplash_0, 0x40 - obj_tiles gFieldEffectObjectPic_BikeHopSmallSplash_1, 0x40 - obj_tiles gFieldEffectObjectPic_BikeHopSmallSplash_2, 0x40 - - .align 2 -gFieldEffectObjectImageAnim_850CF24:: @ 850CF24 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_BikeHopSmallSplash:: @ 850CF34 - .4byte gFieldEffectObjectImageAnim_850CF24 - - .align 2 -gFieldEffectObjectTemplate_BikeHopSmallSplash:: @ 850CF38 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x8 - .4byte gFieldEffectObjectImageAnimTable_BikeHopSmallSplash - .4byte gFieldEffectObjectPicTable_BikeHopSmallSplash - .4byte gDummySpriteAffineAnimTable - .4byte sub_8156194 - - .align 2 -gFieldEffectObjectPicTable_LongGrass:: @ 850CF50 - obj_tiles gFieldEffectObjectPic_LongGrass_0, 0x80 - obj_tiles gFieldEffectObjectPic_LongGrass_1, 0x80 - obj_tiles gFieldEffectObjectPic_LongGrass_2, 0x80 - obj_tiles gFieldEffectObjectPic_LongGrass_3, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CF70:: @ 850CF70 - obj_image_anim_frame 1, 3 - obj_image_anim_frame 2, 3 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_LongGrass:: @ 850CF90 - .4byte gFieldEffectObjectImageAnim_850CF70 - - .align 2 -gFieldEffectObjectTemplate_LongGrass:: @ 850CF94 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_LongGrass - .4byte gFieldEffectObjectPicTable_LongGrass - .4byte gDummySpriteAffineAnimTable - .4byte unc_grass_tall - - .align 2 -gFieldEffectObjectPicTable_Unknown16:: @ 850CFAC - obj_tiles gFieldEffectObjectPic_Unknown16_0, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown16_1, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown16_2, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown16_3, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown16_4, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown16_5, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850CFDC:: @ 850CFDC - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 5, 8 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Unknown16:: @ 850CFF8 - .4byte gFieldEffectObjectImageAnim_850CFDC - - .align 2 -gFieldEffectObjectTemplate_Unknown16:: @ 850CFFC - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown16 - .4byte gFieldEffectObjectPicTable_Unknown16 - .4byte gDummySpriteAffineAnimTable - .4byte sub_8156194 - - .align 2 -gFieldEffectObjectPicTable_Unknown17:: @ 850D014 - obj_tiles gFieldEffectObjectPic_Unknown16_5, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown17_0, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown17_1, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown17_2, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown17_3, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown17_4, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown17_5, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown17_6, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown17_7, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D05C:: @ 850D05C - obj_image_anim_frame 0, 10 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_frame 7, 4 - obj_image_anim_frame 8, 4 - obj_image_anim_jump 7 - - .align 2 -gFieldEffectObjectImageAnimTable_Unknown17:: @ 850D084 - .4byte gFieldEffectObjectImageAnim_850D05C - - .align 2 -gFieldEffectObjectTemplate_Unknown17:: @ 850D088 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown17 - .4byte gFieldEffectObjectPicTable_Unknown17 - .4byte gDummySpriteAffineAnimTable - .4byte sub_81561D0 - - .align 2 -gFieldEffectObjectPicTable_Unknown18:: @ 850D0A0 - obj_tiles gFieldEffectObjectPic_Unknown18_0, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown18_1, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown18_2, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown18_3, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D0C0:: @ 850D0C0 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnimTable_Unknown18:: @ 850D0DC - .4byte gFieldEffectObjectImageAnim_850D0C0 - - .align 2 -gFieldEffectObjectTemplate_Unknown18:: @ 850D0E0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown18 - .4byte gFieldEffectObjectPicTable_Unknown18 - .4byte gDummySpriteAffineAnimTable - .4byte sub_81561D0 - - .align 2 -gFieldEffectObjectPicTable_Unknown19:: @ 850D0F8 - obj_tiles gFieldEffectObjectPic_Unknown19_0, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown19_1, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown19_2, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown19_3, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D118:: @ 850D118 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnimTable_Unknown19:: @ 850D12C - .4byte gFieldEffectObjectImageAnim_850D118 - - .align 2 -gFieldEffectObjectTemplate_Unknown19:: @ 850D130 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown19 - .4byte gFieldEffectObjectPicTable_Unknown19 - .4byte gDummySpriteAffineAnimTable - .4byte sub_81561D0 - - .align 2 -gFieldEffectObjectPicTable_Unknown29:: @ 850D148 - obj_tiles gFieldEffectObjectPic_Unknown29_0, 0x40 - obj_tiles gFieldEffectObjectPic_Unknown29_1, 0x40 - obj_tiles gFieldEffectObjectPic_Unknown29_2, 0x40 - - .align 2 -gFieldEffectObjectImageAnim_850D160:: @ 850D160 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Unknown29:: @ 850D170 - .4byte gFieldEffectObjectImageAnim_850D160 - - .align 2 -gFieldEffectObjectTemplate_Unknown29:: @ 850D174 - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x8 - .4byte gFieldEffectObjectImageAnimTable_Unknown29 - .4byte gFieldEffectObjectPicTable_Unknown29 - .4byte gDummySpriteAffineAnimTable - .4byte sub_81559BC - - .align 2 -gFieldEffectObjectPicTable_Unknown20:: @ 850D18C - obj_tiles gFieldEffectObjectPic_Unknown20_0, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown20_1, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown20_2, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown20_3, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D1AC:: @ 850D1AC - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldEffectObjectImageAnimTable_Unknown20:: @ 850D1C8 - .4byte gFieldEffectObjectImageAnim_850D1AC - - .align 2 -gFieldEffectObjectTemplate_Unknown20:: @ 850D1CC - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown20 - .4byte gFieldEffectObjectPicTable_Unknown20 - .4byte gDummySpriteAffineAnimTable - .4byte sub_81561D0 - - .align 2 -gFieldEffectObjectRotScalAnim_850D1E4:: @ 850D1E4 - obj_rot_scal_anim_frame 0xFF00, 0x100, -128, 0 - obj_rot_scal_anim_frame 0x1, 0x0, 0, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 - obj_rot_scal_anim_frame 0xFFFF, 0x0, 0, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 - obj_rot_scal_anim_frame 0xFFFF, 0x0, 0, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 - obj_rot_scal_anim_frame 0x1, 0x0, 0, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 - obj_rot_scal_anim_jump 1 - - .align 2 -gFieldEffectObjectRotScalAnim_850D234:: @ 850D234 - obj_rot_scal_anim_frame 0x100, 0x100, -128, 0 - obj_rot_scal_anim_frame 0xFFFF, 0x0, 0, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 - obj_rot_scal_anim_frame 0x1, 0x0, 0, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 - obj_rot_scal_anim_frame 0x1, 0x0, 0, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 - obj_rot_scal_anim_frame 0xFFFF, 0x0, 0, 4 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 8 - obj_rot_scal_anim_jump 1 - - .align 2 -gFieldEffectObjectRotScalAnimTable_Unknown21:: @ 850D284 - .4byte gFieldEffectObjectRotScalAnim_850D1E4 - .4byte gFieldEffectObjectRotScalAnim_850D234 - - .align 2 -gFieldEffectObjectTemplate_Unknown21:: @ 850D28C - .2byte 0x0 @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gDummyOamData - .4byte gDummySpriteAnimTable - .4byte NULL - .4byte gFieldEffectObjectRotScalAnimTable_Unknown21 - .4byte SpriteCallbackDummy - - .align 2 -gFieldEffectObjectPicTable_BerryTreeGrowthSparkle:: @ 850D2A4 - obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_0, 0x80 - obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_1, 0x80 - obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_2, 0x80 - obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_3, 0x80 - obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_4, 0x80 - obj_tiles gFieldEffectObjectPic_BerryTreeGrowthSparkle_5, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D2D4:: @ 850D2D4 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 5, 8 - obj_image_anim_loop 0 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 5, 4 - obj_image_anim_loop 3 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 5, 8 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle:: @ 850D328 - .4byte gFieldEffectObjectImageAnim_850D2D4 - - .align 2 -gFieldEffectObjectTemplate_BerryTreeGrowthSparkle:: @ 850D32C - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_BerryTreeGrowthSparkle - .4byte gFieldEffectObjectPicTable_BerryTreeGrowthSparkle - .4byte gDummySpriteAffineAnimTable - .4byte sub_81561D0 - - .align 2 -gFieldEffectObjectPicTable_TreeDisguise:: @ 850D344 - obj_tiles gFieldEffectObjectPic_TreeDisguise_0, 0x100 - obj_tiles gFieldEffectObjectPic_TreeDisguise_1, 0x100 - obj_tiles gFieldEffectObjectPic_TreeDisguise_2, 0x100 - obj_tiles gFieldEffectObjectPic_TreeDisguise_3, 0x100 - obj_tiles gFieldEffectObjectPic_TreeDisguise_4, 0x100 - obj_tiles gFieldEffectObjectPic_TreeDisguise_5, 0x100 - obj_tiles gFieldEffectObjectPic_TreeDisguise_6, 0x100 - - .align 2 -gFieldEffectObjectImageAnim_850D37C:: @ 850D37C - obj_image_anim_frame 0, 16 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850D384:: @ 850D384 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_TreeDisguise:: @ 850D3A4 - .4byte gFieldEffectObjectImageAnim_850D37C - .4byte gFieldEffectObjectImageAnim_850D384 - - .align 2 -gFieldEffectObjectTemplate_TreeDisguise:: @ 850D3AC - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldEffectObjectImageAnimTable_TreeDisguise - .4byte gFieldEffectObjectPicTable_TreeDisguise - .4byte gDummySpriteAffineAnimTable - .4byte sub_8155C88 - - .align 2 -gFieldEffectObjectPicTable_MountainDisguise:: @ 850D3C4 - obj_tiles gFieldEffectObjectPic_MountainDisguise_0, 0x100 - obj_tiles gFieldEffectObjectPic_MountainDisguise_1, 0x100 - obj_tiles gFieldEffectObjectPic_MountainDisguise_2, 0x100 - obj_tiles gFieldEffectObjectPic_MountainDisguise_3, 0x100 - obj_tiles gFieldEffectObjectPic_MountainDisguise_4, 0x100 - obj_tiles gFieldEffectObjectPic_MountainDisguise_5, 0x100 - obj_tiles gFieldEffectObjectPic_MountainDisguise_6, 0x100 - - .align 2 -gFieldEffectObjectImageAnim_850D3FC:: @ 850D3FC - obj_image_anim_frame 0, 16 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnim_850D404:: @ 850D404 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_MountainDisguise:: @ 850D424 - .4byte gFieldEffectObjectImageAnim_850D3FC - .4byte gFieldEffectObjectImageAnim_850D404 - - .align 2 -gFieldEffectObjectTemplate_MountainDisguise:: @ 850D42C - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldEffectObjectImageAnimTable_MountainDisguise - .4byte gFieldEffectObjectPicTable_MountainDisguise - .4byte gDummySpriteAffineAnimTable - .4byte sub_8155C88 - - .align 2 -gFieldEffectObjectPicTable_SandDisguisePlaceholder:: @ 850D444 - obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_0, 0x100 - obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_1, 0x100 - obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_2, 0x100 - obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_3, 0x100 - obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_4, 0x100 - obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_5, 0x100 - obj_tiles gFieldEffectObjectPic_SandDisguisePlaceholder_6, 0x100 - - .align 2 -gFieldEffectObjectTemplate_SandDisguisePlaceholder:: @ 850D47C - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldEffectObjectImageAnimTable_TreeDisguise - .4byte gFieldEffectObjectPicTable_SandDisguisePlaceholder - .4byte gDummySpriteAffineAnimTable - .4byte sub_8155C88 - - .align 2 -gFieldEffectObjectPicTable_Bird:: @ 850D494 - obj_tiles gFieldEffectObjectPic_Bird, 0x200 - - .align 2 -gFieldEffectObjectImageAnim_850D49C:: @ 850D49C - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Bird:: @ 850D4A4 - .4byte gFieldEffectObjectImageAnim_850D49C - - .align 2 -gFieldEffectObjectTemplate_Bird:: @ 850D4A8 - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldEffectObjectImageAnimTable_Bird - .4byte gFieldEffectObjectPicTable_Bird - .4byte gDummySpriteAffineAnimTable - .4byte SpriteCallbackDummy - - .align 2 -gFieldEffectObjectPicTable_ShortGrass:: @ 850D4C0 - obj_tiles gFieldEffectObjectPic_ShortGrass_0, 0x80 - obj_tiles gFieldEffectObjectPic_ShortGrass_1, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D4D0:: @ 850D4D0 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_ShortGrass:: @ 850D4DC - .4byte gFieldEffectObjectImageAnim_850D4D0 - - .align 2 -gFieldEffectObjectTemplate_ShortGrass:: @ 850D4E0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_ShortGrass - .4byte gFieldEffectObjectPicTable_ShortGrass - .4byte gDummySpriteAffineAnimTable - .4byte sub_8154A10 - - .align 2 -gFieldEffectObjectPicTable_HotSpringsWater:: @ 850D4F8 - obj_tiles gFieldEffectObjectPic_HotSpringsWater, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D500:: @ 850D500 - obj_image_anim_frame 0, 4 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_HotSpringsWater:: @ 850D508 - .4byte gFieldEffectObjectImageAnim_850D500 - - .align 2 -gFieldEffectObjectTemplate_HotSpringsWater:: @ 850D50C - .2byte 0xFFFF @ tiles tag - .2byte 0x1005 @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_HotSpringsWater - .4byte gFieldEffectObjectPicTable_HotSpringsWater - .4byte gDummySpriteAffineAnimTable - .4byte sub_8155158 - - .align 2 -gFieldEffectObjectPicTable_JumpOutOfAsh:: @ 850D524 - obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_0, 0x80 - obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_1, 0x80 - obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_2, 0x80 - obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_3, 0x80 - obj_tiles gFieldEffectObjectPic_JumpOutOfAsh_4, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D54C:: @ 850D54C - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_frame 2, 6 - obj_image_anim_frame 3, 6 - obj_image_anim_frame 4, 6 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_JumpOutOfAsh:: @ 850D564 - .4byte gFieldEffectObjectImageAnim_850D54C - - .align 2 -gFieldEffectObjectTemplate_JumpOutOfAsh:: @ 850D568 - .2byte 0xFFFF @ tiles tag - .2byte 0x100D @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_JumpOutOfAsh - .4byte gFieldEffectObjectPicTable_JumpOutOfAsh - .4byte gDummySpriteAffineAnimTable - .4byte sub_80B7CAC - - .align 2 -gFieldEffectObjectPaletteInfo2:: @ 850D580 - obj_pal gFieldEffectObjectPalette2, 0x100D - - .align 2 -gFieldEffectObjectPicTable_Unknown33:: @ 850D588 - obj_tiles gFieldEffectObjectPic_Unknown33_0, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown33_1, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown33_2, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown33_3, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown33_4, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D5B0:: @ 850D5B0 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_frame 2, 6 - obj_image_anim_frame 3, 6 - obj_image_anim_frame 4, 6 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Unknown33:: @ 850D5C8 - .4byte gFieldEffectObjectImageAnim_850D5B0 - - .align 2 -gFieldEffectObjectTemplate_Unknown33:: @ 850D5CC - .2byte 0xFFFF @ tiles tag - .2byte 0x100D @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown33 - .4byte gFieldEffectObjectPicTable_Unknown33 - .4byte gDummySpriteAffineAnimTable - .4byte sub_80B7A58 - - .align 2 -gFieldEffectObjectPicTable_Bubbles:: @ 850D5E4 - obj_tiles gFieldEffectObjectPic_Bubbles_0, 0x100 - obj_tiles gFieldEffectObjectPic_Bubbles_1, 0x100 - obj_tiles gFieldEffectObjectPic_Bubbles_2, 0x100 - obj_tiles gFieldEffectObjectPic_Bubbles_3, 0x100 - obj_tiles gFieldEffectObjectPic_Bubbles_4, 0x100 - obj_tiles gFieldEffectObjectPic_Bubbles_5, 0x100 - obj_tiles gFieldEffectObjectPic_Bubbles_6, 0x100 - obj_tiles gFieldEffectObjectPic_Bubbles_7, 0x100 - - .align 2 -gFieldEffectObjectImageAnim_850D624:: @ 850D624 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 6 - obj_image_anim_frame 4, 6 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_frame 7, 4 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Bubbles:: @ 850D648 - .4byte gFieldEffectObjectImageAnim_850D624 - - .align 2 -gFieldEffectObjectTemplate_Bubbles:: @ 850D64C - .2byte 0xFFFF @ tiles tag - .2byte 0x1004 @ palette tag - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldEffectObjectImageAnimTable_Bubbles - .4byte gFieldEffectObjectPicTable_Bubbles - .4byte gDummySpriteAffineAnimTable - .4byte sub_8155AEC - - .align 2 -gFieldEffectObjectPicTable_Unknown35:: @ 850D664 - obj_tiles gFieldEffectObjectPic_Unknown35_0, 0x80 - obj_tiles gFieldEffectObjectPic_Unknown35_1, 0x80 - - .align 2 -gFieldEffectObjectImageAnim_850D674:: @ 850D674 - obj_image_anim_frame 0, 3 - obj_image_anim_frame 1, 5 - obj_image_anim_frame 0, 5 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Unknown35:: @ 850D684 - .4byte gFieldEffectObjectImageAnim_850D674 - - .align 2 -gFieldEffectObjectTemplate_Unknown35:: @ 850D688 - .2byte 0xFFFF @ tiles tag - .2byte 0x100F @ palette tag - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldEffectObjectImageAnimTable_Unknown35 - .4byte gFieldEffectObjectPicTable_Unknown35 - .4byte gDummySpriteAffineAnimTable - .4byte sub_8155E50 - - .align 2 -gFieldEffectObjectPaletteInfo3:: @ 850D6A0 - obj_pal gFieldEffectObjectPalette3, 0x100F - - .align 2 -gFieldEffectObjectImageAnim_850D6A8:: @ 850D6A8 - obj_image_anim_frame 0, 1 - obj_image_anim_end - - .align 2 -gFieldEffectObjectImageAnimTable_Rayquaza:: @ 850D6B0 - .4byte gFieldEffectObjectImageAnim_850D6A8 - - .align 2 -gFieldEffectObjectPicTable_Rayquaza:: @ 850D6B4 - obj_tiles gFieldObjectPic_Rayquaza_0, 0x200 - - .align 2 -gFieldEffectObjectTemplate_Rayquaza:: @ 850D6BC - .2byte 0xFFFF @ tiles tag - .2byte 0xFFFF @ palette tag - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldEffectObjectImageAnimTable_Rayquaza - .4byte gFieldEffectObjectPicTable_Rayquaza - .4byte gDummySpriteAffineAnimTable - .4byte sub_8155F80 diff --git a/data/graphics/field_objects/field_object_anims.inc b/data/graphics/field_objects/field_object_anims.inc deleted file mode 100644 index d75df6d9d..000000000 --- a/data/graphics/field_objects/field_object_anims.inc +++ /dev/null @@ -1,1029 +0,0 @@ - .align 2 -gFieldObjectImageAnim_StayStill:: @ 85089FC - obj_image_anim_frame 0, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpFaceSouth:: @ 8508A10 - obj_image_anim_frame 0, 16 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpFaceNorth:: @ 8508A18 - obj_image_anim_frame 1, 16 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpFaceWest:: @ 8508A20 - obj_image_anim_frame 2, 16 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpFaceEast:: @ 8508A28 - obj_image_anim_frame 2, 16, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoSouth:: @ 8508A30 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 3, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 8 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoNorth:: @ 8508A44 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 4, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 8 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoWest:: @ 8508A58 - obj_image_anim_frame 5, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 6, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoEast:: @ 8508A6C - obj_image_anim_frame 5, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 6, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFastSouth:: @ 8508A80 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 3, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFastNorth:: @ 8508A94 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFastWest:: @ 8508AA8 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFastEast:: @ 8508ABC - obj_image_anim_frame 5, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 6, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFasterSouth:: @ 8508AD0 - obj_image_anim_frame 3, 2 - obj_image_anim_frame 0, 2 - obj_image_anim_frame 3, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 2 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFasterNorth:: @ 8508AE4 - obj_image_anim_frame 4, 2 - obj_image_anim_frame 1, 2 - obj_image_anim_frame 4, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 2 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFasterWest:: @ 8508AF8 - obj_image_anim_frame 5, 2 - obj_image_anim_frame 2, 2 - obj_image_anim_frame 6, 2 - obj_image_anim_frame 2, 2 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFasterEast:: @ 8508B0C - obj_image_anim_frame 5, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 6, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFastestSouth:: @ 8508B20 - obj_image_anim_frame 3, 1 - obj_image_anim_frame 0, 1 - obj_image_anim_frame 3, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFastestNorth:: @ 8508B34 - obj_image_anim_frame 4, 1 - obj_image_anim_frame 1, 1 - obj_image_anim_frame 4, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFastestWest:: @ 8508B48 - obj_image_anim_frame 5, 1 - obj_image_anim_frame 2, 1 - obj_image_anim_frame 6, 1 - obj_image_anim_frame 2, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_QuintyPlumpGoFastestEast:: @ 8508B5C - obj_image_anim_frame 5, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 6, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_FaceSouth:: @ 8508B70 - obj_image_anim_frame 0, 16 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_FaceNorth:: @ 8508B78 - obj_image_anim_frame 1, 16 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_FaceWest:: @ 8508B80 - obj_image_anim_frame 2, 16 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_FaceEast:: @ 8508B88 - obj_image_anim_frame 2, 16, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoSouth:: @ 8508B90 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 0, 8 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoNorth:: @ 8508BA4 - obj_image_anim_frame 5, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 6, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoWest:: @ 8508BB8 - obj_image_anim_frame 7, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 8, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoEast:: @ 8508BCC - obj_image_anim_frame 7, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 8, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 8, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFastSouth:: @ 8508BE0 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 4, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFastNorth:: @ 8508BF4 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFastWest:: @ 8508C08 - obj_image_anim_frame 7, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 8, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFastEast:: @ 8508C1C - obj_image_anim_frame 7, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFasterSouth:: @ 8508C30 - obj_image_anim_frame 3, 2 - obj_image_anim_frame 0, 2 - obj_image_anim_frame 4, 2 - obj_image_anim_frame 0, 2 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFasterNorth:: @ 8508C44 - obj_image_anim_frame 5, 2 - obj_image_anim_frame 1, 2 - obj_image_anim_frame 6, 2 - obj_image_anim_frame 1, 2 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFasterWest:: @ 8508C58 - obj_image_anim_frame 7, 2 - obj_image_anim_frame 2, 2 - obj_image_anim_frame 8, 2 - obj_image_anim_frame 2, 2 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFasterEast:: @ 8508C6C - obj_image_anim_frame 7, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 8, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 2, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFastestSouth:: @ 8508C80 - obj_image_anim_frame 3, 1 - obj_image_anim_frame 0, 1 - obj_image_anim_frame 4, 1 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFastestNorth:: @ 8508C94 - obj_image_anim_frame 5, 1 - obj_image_anim_frame 1, 1 - obj_image_anim_frame 6, 1 - obj_image_anim_frame 1, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFastestWest:: @ 8508CA8 - obj_image_anim_frame 7, 1 - obj_image_anim_frame 2, 1 - obj_image_anim_frame 8, 1 - obj_image_anim_frame 2, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GoFastestEast:: @ 8508CBC - obj_image_anim_frame 7, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 8, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 1, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_RunSouth:: @ 8508CD0 - obj_image_anim_frame 12, 5 - obj_image_anim_frame 9, 3 - obj_image_anim_frame 13, 5 - obj_image_anim_frame 9, 3 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_RunNorth:: @ 8508CE4 - obj_image_anim_frame 14, 5 - obj_image_anim_frame 10, 3 - obj_image_anim_frame 15, 5 - obj_image_anim_frame 10, 3 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_RunWest:: @ 8508CF8 - obj_image_anim_frame 16, 5 - obj_image_anim_frame 11, 3 - obj_image_anim_frame 17, 5 - obj_image_anim_frame 11, 3 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_RunEast:: @ 8508D0C - obj_image_anim_frame 16, 5, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 11, 3, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 17, 5, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 11, 3, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_FieldMove:: @ 8508D20 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 4, 8 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_GetOnOffSurfBlobSouth:: @ 8508D38 - obj_image_anim_frame 9, 32 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GetOnOffSurfBlobNorth:: @ 8508D40 - obj_image_anim_frame 10, 32 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GetOnOffSurfBlobWest:: @ 8508D48 - obj_image_anim_frame 11, 32 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_GetOnOffSurfBlobEast:: @ 8508D50 - obj_image_anim_frame 11, 32, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_BunnyHoppyBackWheelSouth:: @ 8508D58 - obj_image_anim_frame 9, 4 - obj_image_anim_frame 10, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BunnyHoppyBackWheelNorth:: @ 8508D64 - obj_image_anim_frame 13, 4 - obj_image_anim_frame 14, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BunnyHoppyBackWheelWest:: @ 8508D70 - obj_image_anim_frame 17, 4 - obj_image_anim_frame 18, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BunnyHoppyBackWheelEast:: @ 8508D7C - obj_image_anim_frame 17, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 18, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BunnyHoppyFrontWheelSouth:: @ 8508D88 - obj_image_anim_frame 11, 4 - obj_image_anim_frame 12, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BunnyHoppyFrontWheelNorth:: @ 8508D94 - obj_image_anim_frame 15, 4 - obj_image_anim_frame 16, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BunnyHoppyFrontWheelWest:: @ 8508DA0 - obj_image_anim_frame 19, 4 - obj_image_anim_frame 20, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BunnyHoppyFrontWheelEast:: @ 8508DAC - obj_image_anim_frame 19, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 20, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_StandingWheelieBackWheelSouth:: @ 8508DB8 - obj_image_anim_frame 9, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_StandingWheelieBackWheelNorth:: @ 8508DC4 - obj_image_anim_frame 13, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_StandingWheelieBackWheelWest:: @ 8508DD0 - obj_image_anim_frame 17, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_StandingWheelieBackWheelEast:: @ 8508DDC - obj_image_anim_frame 17, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_StandingWheelieFrontWheelSouth:: @ 8508DE8 - obj_image_anim_frame 11, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_StandingWheelieFrontWheelNorth:: @ 8508DF4 - obj_image_anim_frame 15, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_StandingWheelieFrontWheelWest:: @ 8508E00 - obj_image_anim_frame 19, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_StandingWheelieFrontWheelEast:: @ 8508E0C - obj_image_anim_frame 19, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_MovingWheelieSouth:: @ 8508E18 - obj_image_anim_frame 21, 4 - obj_image_anim_frame 10, 4 - obj_image_anim_frame 22, 4 - obj_image_anim_frame 10, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_MovingWheelieNorth:: @ 8508E2C - obj_image_anim_frame 23, 4 - obj_image_anim_frame 14, 4 - obj_image_anim_frame 24, 4 - obj_image_anim_frame 14, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_MovingWheelieWest:: @ 8508E40 - obj_image_anim_frame 25, 4 - obj_image_anim_frame 18, 4 - obj_image_anim_frame 26, 4 - obj_image_anim_frame 18, 4 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_MovingWheelieEast:: @ 8508E54 - obj_image_anim_frame 25, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 18, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 26, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 18, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_BerryTreeStage0:: @ 8508E68 - obj_image_anim_frame 0, 32 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BerryTreeStage1:: @ 8508E70 - obj_image_anim_frame 1, 32 - obj_image_anim_frame 2, 32 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BerryTreeStage2:: @ 8508E7C - obj_image_anim_frame 3, 48 - obj_image_anim_frame 4, 48 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BerryTreeStage3:: @ 8508E88 - obj_image_anim_frame 5, 32 - obj_image_anim_frame 5, 32 - obj_image_anim_frame 6, 32 - obj_image_anim_frame 6, 32 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_BerryTreeStage4:: @ 8508E9C - obj_image_anim_frame 7, 48 - obj_image_anim_frame 7, 48 - obj_image_anim_frame 8, 48 - obj_image_anim_frame 8, 48 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_NurseBow:: @ 8508EB0 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 9, 32 - obj_image_anim_frame 0, 8 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_RockBreak:: @ 8508EC0 - obj_image_anim_frame 0, 8 - obj_image_anim_frame 1, 8 - obj_image_anim_frame 2, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_TreeCut:: @ 8508ED4 - obj_image_anim_frame 0, 6 - obj_image_anim_frame 1, 6 - obj_image_anim_frame 2, 6 - obj_image_anim_frame 3, 6 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_TakeOutRodSouth:: @ 8508EE8 - obj_image_anim_frame 8, 4 - obj_image_anim_frame 9, 4 - obj_image_anim_frame 10, 4 - obj_image_anim_frame 11, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_TakeOutRodNorth:: @ 8508EFC - obj_image_anim_frame 4, 4 - obj_image_anim_frame 5, 4 - obj_image_anim_frame 6, 4 - obj_image_anim_frame 7, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_TakeOutRodWest:: @ 8508F10 - obj_image_anim_frame 0, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 3, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_TakeOutRodEast:: @ 8508F24 - obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 3, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_PutAwayRodSouth:: @ 8508F38 - obj_image_anim_frame 11, 4 - obj_image_anim_frame 10, 6 - obj_image_anim_frame 9, 6 - obj_image_anim_frame 8, 6 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_PutAwayRodNorth:: @ 8508F4C - obj_image_anim_frame 7, 4 - obj_image_anim_frame 6, 6 - obj_image_anim_frame 5, 6 - obj_image_anim_frame 4, 6 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_PutAwayRodWest:: @ 8508F60 - obj_image_anim_frame 3, 4 - obj_image_anim_frame 2, 4 - obj_image_anim_frame 1, 4 - obj_image_anim_frame 0, 4 - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_PutAwayRodEast:: @ 8508F74 - obj_image_anim_frame 3, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 2, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 1, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_end - - .align 2 -gFieldObjectImageAnim_HookedPokemonSouth:: @ 8508F88 - obj_image_anim_frame 10, 6 - obj_image_anim_frame 11, 6 - obj_image_anim_loop 1 - obj_image_anim_frame 11, 30 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_HookedPokemonNorth:: @ 8508F9C - obj_image_anim_frame 6, 6 - obj_image_anim_frame 7, 6 - obj_image_anim_loop 1 - obj_image_anim_frame 7, 30 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_HookedPokemonWest:: @ 8508FB0 - obj_image_anim_frame 2, 6 - obj_image_anim_frame 3, 6 - obj_image_anim_loop 1 - obj_image_anim_frame 3, 30 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_HookedPokemonEast:: @ 8508FC4 - obj_image_anim_frame 2, 6, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_frame 3, 6, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_loop 1 - obj_image_anim_frame 3, 30, OBJ_IMAGE_ANIM_H_FLIP - obj_image_anim_jump 0 - - .align 2 -gFieldObjectRotScalAnim_8508FD8:: @ 8508FD8 - obj_rot_scal_anim_frame 0x0, 0x0, 1, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 1 - obj_rot_scal_anim_loop 7 - obj_rot_scal_anim_jump 0 - - .align 2 -gFieldObjectRotScalAnim_8509008:: @ 8509008 - obj_rot_scal_anim_frame 0x0, 0x0, -1, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 1 - obj_rot_scal_anim_loop 15 - obj_rot_scal_anim_frame 0x0, 0x0, 1, 1 - obj_rot_scal_anim_frame 0x0, 0x0, 0, 1 - obj_rot_scal_anim_loop 15 - obj_rot_scal_anim_jump 0 - - .align 2 -gFieldObjectRotScalAnim_8509040:: @ 8509040 - obj_rot_scal_anim_frame 0x100, 0x100, 10, 0 - obj_rot_scal_anim_end - - .align 2 -gFieldObjectRotScalAnim_8509050:: @ 8509050 - obj_rot_scal_anim_frame 0x100, 0x100, 10, 0 - obj_rot_scal_anim_end - - .align 2 -gFieldObjectRotScalAnim_8509060:: @ 8509060 - obj_rot_scal_anim_frame 0x0, 0x0, -1, 1 - obj_rot_scal_anim_loop 8 - obj_rot_scal_anim_end - - .align 2 -gFieldObjectRotScalAnim_8509078:: @ 8509078 - obj_rot_scal_anim_frame 0x0, 0x0, 1, 1 - obj_rot_scal_anim_loop 8 - obj_rot_scal_anim_end - - .align 2 -gFieldObjectImageAnim_HoOhFlapWings:: @ 8509090 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_frame 3, 8 - obj_image_anim_frame 4, 8 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_HoOhStayStill:: @ 85090A4 - obj_image_anim_frame 3, 16 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnimTable_Inanimate:: @ 85090AC - .4byte gFieldObjectImageAnim_StayStill - - .align 2 -gFieldObjectImageAnimTable_QuintyPlump:: @ 85090B0 - .4byte gFieldObjectImageAnim_QuintyPlumpFaceSouth - .4byte gFieldObjectImageAnim_QuintyPlumpFaceNorth - .4byte gFieldObjectImageAnim_QuintyPlumpFaceWest - .4byte gFieldObjectImageAnim_QuintyPlumpFaceEast - .4byte gFieldObjectImageAnim_QuintyPlumpGoSouth - .4byte gFieldObjectImageAnim_QuintyPlumpGoNorth - .4byte gFieldObjectImageAnim_QuintyPlumpGoWest - .4byte gFieldObjectImageAnim_QuintyPlumpGoEast - .4byte gFieldObjectImageAnim_QuintyPlumpGoFastSouth - .4byte gFieldObjectImageAnim_QuintyPlumpGoFastNorth - .4byte gFieldObjectImageAnim_QuintyPlumpGoFastWest - .4byte gFieldObjectImageAnim_QuintyPlumpGoFastEast - .4byte gFieldObjectImageAnim_QuintyPlumpGoFasterSouth - .4byte gFieldObjectImageAnim_QuintyPlumpGoFasterNorth - .4byte gFieldObjectImageAnim_QuintyPlumpGoFasterWest - .4byte gFieldObjectImageAnim_QuintyPlumpGoFasterEast - .4byte gFieldObjectImageAnim_QuintyPlumpGoFastestSouth - .4byte gFieldObjectImageAnim_QuintyPlumpGoFastestNorth - .4byte gFieldObjectImageAnim_QuintyPlumpGoFastestWest - .4byte gFieldObjectImageAnim_QuintyPlumpGoFastestEast - - .align 2 -gFieldObjectImageAnimTable_Standard:: @ 8509100 - .4byte gFieldObjectImageAnim_FaceSouth - .4byte gFieldObjectImageAnim_FaceNorth - .4byte gFieldObjectImageAnim_FaceWest - .4byte gFieldObjectImageAnim_FaceEast - .4byte gFieldObjectImageAnim_GoSouth - .4byte gFieldObjectImageAnim_GoNorth - .4byte gFieldObjectImageAnim_GoWest - .4byte gFieldObjectImageAnim_GoEast - .4byte gFieldObjectImageAnim_GoFastSouth - .4byte gFieldObjectImageAnim_GoFastNorth - .4byte gFieldObjectImageAnim_GoFastWest - .4byte gFieldObjectImageAnim_GoFastEast - .4byte gFieldObjectImageAnim_GoFasterSouth - .4byte gFieldObjectImageAnim_GoFasterNorth - .4byte gFieldObjectImageAnim_GoFasterWest - .4byte gFieldObjectImageAnim_GoFasterEast - .4byte gFieldObjectImageAnim_GoFastestSouth - .4byte gFieldObjectImageAnim_GoFastestNorth - .4byte gFieldObjectImageAnim_GoFastestWest - .4byte gFieldObjectImageAnim_GoFastestEast - - .align 2 -gFieldObjectImageAnimTable_HoOh:: @ 8509150 - .4byte gFieldObjectImageAnim_FaceSouth - .4byte gFieldObjectImageAnim_FaceNorth - .4byte gFieldObjectImageAnim_FaceWest - .4byte gFieldObjectImageAnim_FaceEast - .4byte gFieldObjectImageAnim_HoOhFlapWings - .4byte gFieldObjectImageAnim_HoOhStayStill - .4byte gFieldObjectImageAnim_GoWest - .4byte gFieldObjectImageAnim_GoEast - .4byte gFieldObjectImageAnim_GoFastSouth - .4byte gFieldObjectImageAnim_GoFastNorth - .4byte gFieldObjectImageAnim_GoFastWest - .4byte gFieldObjectImageAnim_GoFastEast - .4byte gFieldObjectImageAnim_GoFasterSouth - .4byte gFieldObjectImageAnim_GoFasterNorth - .4byte gFieldObjectImageAnim_GoFasterWest - .4byte gFieldObjectImageAnim_GoFasterEast - .4byte gFieldObjectImageAnim_GoFastestSouth - .4byte gFieldObjectImageAnim_GoFastestNorth - .4byte gFieldObjectImageAnim_GoFastestWest - .4byte gFieldObjectImageAnim_GoFastestEast - - .align 2 -gFieldObjectImageAnimTable_Groudon3:: @ 85091A0 - .4byte gFieldObjectImageAnim_FaceSouth - .4byte gFieldObjectImageAnim_FaceNorth - .4byte gFieldObjectImageAnim_FaceWest - .4byte gFieldObjectImageAnim_FaceEast - .4byte gFieldObjectImageAnim_GoSouth - .4byte gFieldObjectImageAnim_GoEast - .4byte gFieldObjectImageAnim_GoWest - .4byte gFieldObjectImageAnim_GoEast - .4byte gFieldObjectImageAnim_GoFastSouth - .4byte gFieldObjectImageAnim_GoFastEast - .4byte gFieldObjectImageAnim_GoFastWest - .4byte gFieldObjectImageAnim_GoFastEast - .4byte gFieldObjectImageAnim_GoFasterSouth - .4byte gFieldObjectImageAnim_GoFasterEast - .4byte gFieldObjectImageAnim_GoFasterWest - .4byte gFieldObjectImageAnim_GoFasterEast - .4byte gFieldObjectImageAnim_GoFastestSouth - .4byte gFieldObjectImageAnim_GoFastestEast - .4byte gFieldObjectImageAnim_GoFastestWest - .4byte gFieldObjectImageAnim_GoFastestEast - - .align 2 -gFieldObjectImageAnim_85091F0:: @ 85091F0 - obj_image_anim_frame 1, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_85091F8:: @ 85091F8 - obj_image_anim_frame 4, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_8509200:: @ 8509200 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_8509208:: @ 8509208 - obj_image_anim_frame 2, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_8509210:: @ 8509210 - obj_image_anim_frame 3, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_8509218:: @ 8509218 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_8509220:: @ 8509220 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_8509228:: @ 8509228 - obj_image_anim_frame 0, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnim_8509230:: @ 8509230 - obj_image_anim_frame 3, 1 - obj_image_anim_jump 0 - - .align 2 -gFieldObjectImageAnimTable_Rayquaza2:: @ 8509238 - .4byte gFieldObjectImageAnim_8509218 - .4byte gFieldObjectImageAnim_8509220 - .4byte gFieldObjectImageAnim_8509228 - .4byte gFieldObjectImageAnim_8509230 - .4byte gFieldObjectImageAnim_8509200 - .4byte gFieldObjectImageAnim_85091F8 - .4byte gFieldObjectImageAnim_8509208 - .4byte gFieldObjectImageAnim_8509210 - .4byte gFieldObjectImageAnim_8509200 - .4byte gFieldObjectImageAnim_85091F8 - .4byte gFieldObjectImageAnim_85091F0 - .4byte gFieldObjectImageAnim_8509210 - .4byte gFieldObjectImageAnim_8509200 - .4byte gFieldObjectImageAnim_85091F8 - .4byte gFieldObjectImageAnim_8509208 - .4byte gFieldObjectImageAnim_8509210 - .4byte gFieldObjectImageAnim_8509200 - .4byte gFieldObjectImageAnim_85091F8 - .4byte gFieldObjectImageAnim_8509208 - .4byte gFieldObjectImageAnim_8509210 - - .align 2 -gFieldObjectImageAnimTable_BrendanMayNormal:: @ 8509288 - .4byte gFieldObjectImageAnim_FaceSouth - .4byte gFieldObjectImageAnim_FaceNorth - .4byte gFieldObjectImageAnim_FaceWest - .4byte gFieldObjectImageAnim_FaceEast - .4byte gFieldObjectImageAnim_GoSouth - .4byte gFieldObjectImageAnim_GoNorth - .4byte gFieldObjectImageAnim_GoWest - .4byte gFieldObjectImageAnim_GoEast - .4byte gFieldObjectImageAnim_GoFastSouth - .4byte gFieldObjectImageAnim_GoFastNorth - .4byte gFieldObjectImageAnim_GoFastWest - .4byte gFieldObjectImageAnim_GoFastEast - .4byte gFieldObjectImageAnim_GoFasterSouth - .4byte gFieldObjectImageAnim_GoFasterNorth - .4byte gFieldObjectImageAnim_GoFasterWest - .4byte gFieldObjectImageAnim_GoFasterEast - .4byte gFieldObjectImageAnim_GoFastestSouth - .4byte gFieldObjectImageAnim_GoFastestNorth - .4byte gFieldObjectImageAnim_GoFastestWest - .4byte gFieldObjectImageAnim_GoFastestEast - .4byte gFieldObjectImageAnim_RunSouth - .4byte gFieldObjectImageAnim_RunNorth - .4byte gFieldObjectImageAnim_RunWest - .4byte gFieldObjectImageAnim_RunEast - - .align 2 -gFieldObjectImageAnimTable_AcroBike:: @ 85092E8 - .4byte gFieldObjectImageAnim_FaceSouth - .4byte gFieldObjectImageAnim_FaceNorth - .4byte gFieldObjectImageAnim_FaceWest - .4byte gFieldObjectImageAnim_FaceEast - .4byte gFieldObjectImageAnim_GoSouth - .4byte gFieldObjectImageAnim_GoNorth - .4byte gFieldObjectImageAnim_GoWest - .4byte gFieldObjectImageAnim_GoEast - .4byte gFieldObjectImageAnim_GoFastSouth - .4byte gFieldObjectImageAnim_GoFastNorth - .4byte gFieldObjectImageAnim_GoFastWest - .4byte gFieldObjectImageAnim_GoFastEast - .4byte gFieldObjectImageAnim_GoFasterSouth - .4byte gFieldObjectImageAnim_GoFasterNorth - .4byte gFieldObjectImageAnim_GoFasterWest - .4byte gFieldObjectImageAnim_GoFasterEast - .4byte gFieldObjectImageAnim_GoFastestSouth - .4byte gFieldObjectImageAnim_GoFastestNorth - .4byte gFieldObjectImageAnim_GoFastestWest - .4byte gFieldObjectImageAnim_GoFastestEast - .4byte gFieldObjectImageAnim_BunnyHoppyBackWheelSouth - .4byte gFieldObjectImageAnim_BunnyHoppyBackWheelNorth - .4byte gFieldObjectImageAnim_BunnyHoppyBackWheelWest - .4byte gFieldObjectImageAnim_BunnyHoppyBackWheelEast - .4byte gFieldObjectImageAnim_BunnyHoppyFrontWheelSouth - .4byte gFieldObjectImageAnim_BunnyHoppyFrontWheelNorth - .4byte gFieldObjectImageAnim_BunnyHoppyFrontWheelWest - .4byte gFieldObjectImageAnim_BunnyHoppyFrontWheelEast - .4byte gFieldObjectImageAnim_StandingWheelieBackWheelSouth - .4byte gFieldObjectImageAnim_StandingWheelieBackWheelNorth - .4byte gFieldObjectImageAnim_StandingWheelieBackWheelWest - .4byte gFieldObjectImageAnim_StandingWheelieBackWheelEast - .4byte gFieldObjectImageAnim_StandingWheelieFrontWheelSouth - .4byte gFieldObjectImageAnim_StandingWheelieFrontWheelNorth - .4byte gFieldObjectImageAnim_StandingWheelieFrontWheelWest - .4byte gFieldObjectImageAnim_StandingWheelieFrontWheelEast - .4byte gFieldObjectImageAnim_MovingWheelieSouth - .4byte gFieldObjectImageAnim_MovingWheelieNorth - .4byte gFieldObjectImageAnim_MovingWheelieWest - .4byte gFieldObjectImageAnim_MovingWheelieEast - - .align 2 -gFieldObjectImageAnimTable_Surfing:: @ 8509388 - .4byte gFieldObjectImageAnim_FaceSouth - .4byte gFieldObjectImageAnim_FaceNorth - .4byte gFieldObjectImageAnim_FaceWest - .4byte gFieldObjectImageAnim_FaceEast - .4byte gFieldObjectImageAnim_GoSouth - .4byte gFieldObjectImageAnim_GoNorth - .4byte gFieldObjectImageAnim_GoWest - .4byte gFieldObjectImageAnim_GoEast - .4byte gFieldObjectImageAnim_GoFastSouth - .4byte gFieldObjectImageAnim_GoFastNorth - .4byte gFieldObjectImageAnim_GoFastWest - .4byte gFieldObjectImageAnim_GoFastEast - .4byte gFieldObjectImageAnim_GoFasterSouth - .4byte gFieldObjectImageAnim_GoFasterNorth - .4byte gFieldObjectImageAnim_GoFasterWest - .4byte gFieldObjectImageAnim_GoFasterEast - .4byte gFieldObjectImageAnim_GoFastestSouth - .4byte gFieldObjectImageAnim_GoFastestNorth - .4byte gFieldObjectImageAnim_GoFastestWest - .4byte gFieldObjectImageAnim_GoFastestEast - .4byte gFieldObjectImageAnim_GetOnOffSurfBlobSouth - .4byte gFieldObjectImageAnim_GetOnOffSurfBlobNorth - .4byte gFieldObjectImageAnim_GetOnOffSurfBlobWest - .4byte gFieldObjectImageAnim_GetOnOffSurfBlobEast - - .align 2 -gFieldObjectImageAnimTable_Nurse:: @ 85093E8 - .4byte gFieldObjectImageAnim_FaceSouth - .4byte gFieldObjectImageAnim_FaceNorth - .4byte gFieldObjectImageAnim_FaceWest - .4byte gFieldObjectImageAnim_FaceEast - .4byte gFieldObjectImageAnim_GoSouth - .4byte gFieldObjectImageAnim_GoNorth - .4byte gFieldObjectImageAnim_GoWest - .4byte gFieldObjectImageAnim_GoEast - .4byte gFieldObjectImageAnim_GoFastSouth - .4byte gFieldObjectImageAnim_GoFastNorth - .4byte gFieldObjectImageAnim_GoFastWest - .4byte gFieldObjectImageAnim_GoFastEast - .4byte gFieldObjectImageAnim_GoFasterSouth - .4byte gFieldObjectImageAnim_GoFasterNorth - .4byte gFieldObjectImageAnim_GoFasterWest - .4byte gFieldObjectImageAnim_GoFasterEast - .4byte gFieldObjectImageAnim_GoFastestSouth - .4byte gFieldObjectImageAnim_GoFastestNorth - .4byte gFieldObjectImageAnim_GoFastestWest - .4byte gFieldObjectImageAnim_GoFastestEast - .4byte gFieldObjectImageAnim_NurseBow - - .align 2 -gFieldObjectImageAnimTable_FieldMove:: @ 850943C - .4byte gFieldObjectImageAnim_FieldMove - - .align 2 -gFieldObjectImageAnimTable_BerryTree:: @ 8509440 - .4byte gFieldObjectImageAnim_BerryTreeStage0 - .4byte gFieldObjectImageAnim_BerryTreeStage1 - .4byte gFieldObjectImageAnim_BerryTreeStage2 - .4byte gFieldObjectImageAnim_BerryTreeStage3 - .4byte gFieldObjectImageAnim_BerryTreeStage4 - - .align 2 -gFieldObjectImageAnimTable_BreakableRock:: @ 8509454 - .4byte gFieldObjectImageAnim_StayStill - .4byte gFieldObjectImageAnim_RockBreak - - .align 2 -gFieldObjectImageAnimTable_CuttableTree:: @ 850945C - .4byte gFieldObjectImageAnim_StayStill - .4byte gFieldObjectImageAnim_TreeCut - - .align 2 -gFieldObjectImageAnimTable_Fishing:: @ 8509464 - .4byte gFieldObjectImageAnim_TakeOutRodSouth - .4byte gFieldObjectImageAnim_TakeOutRodNorth - .4byte gFieldObjectImageAnim_TakeOutRodWest - .4byte gFieldObjectImageAnim_TakeOutRodEast - .4byte gFieldObjectImageAnim_PutAwayRodSouth - .4byte gFieldObjectImageAnim_PutAwayRodNorth - .4byte gFieldObjectImageAnim_PutAwayRodWest - .4byte gFieldObjectImageAnim_PutAwayRodEast - .4byte gFieldObjectImageAnim_HookedPokemonSouth - .4byte gFieldObjectImageAnim_HookedPokemonNorth - .4byte gFieldObjectImageAnim_HookedPokemonWest - .4byte gFieldObjectImageAnim_HookedPokemonEast - - .align 2 -gFieldObjectRotScalAnimTable_KyogreGroudon:: @ 8509494 - .4byte gFieldObjectRotScalAnim_8508FD8 - .4byte gFieldObjectRotScalAnim_8509008 - .4byte gFieldObjectRotScalAnim_8509050 - .4byte gFieldObjectRotScalAnim_8509040 - .4byte gFieldObjectRotScalAnim_8509078 - .4byte gFieldObjectRotScalAnim_8509060 diff --git a/data/graphics/field_objects/field_object_graphics.inc b/data/graphics/field_objects/field_object_graphics.inc deleted file mode 100644 index 59333b9a4..000000000 --- a/data/graphics/field_objects/field_object_graphics.inc +++ /dev/null @@ -1,6530 +0,0 @@ - .align 2 -gFieldObjectPic_BrendanNormal_0:: @ 84975F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/00.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_1:: @ 84976F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/01.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_2:: @ 84977F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/02.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_3:: @ 84978F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/03.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_4:: @ 84979F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/04.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_5:: @ 8497AF8 - .incbin "graphics/map_objects/pics/people/brendan/normal/05.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_6:: @ 8497BF8 - .incbin "graphics/map_objects/pics/people/brendan/normal/06.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_7:: @ 8497CF8 - .incbin "graphics/map_objects/pics/people/brendan/normal/07.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_8:: @ 8497DF8 - .incbin "graphics/map_objects/pics/people/brendan/normal/08.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_9:: @ 8497EF8 - .incbin "graphics/map_objects/pics/people/brendan/normal/09.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_10:: @ 8497FF8 - .incbin "graphics/map_objects/pics/people/brendan/normal/10.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_11:: @ 84980F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/11.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_12:: @ 84981F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/12.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_13:: @ 84982F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/13.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_14:: @ 84983F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/14.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_15:: @ 84984F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/15.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_16:: @ 84985F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/16.4bpp" - - .align 2 -gFieldObjectPic_BrendanNormal_17:: @ 84986F8 - .incbin "graphics/map_objects/pics/people/brendan/normal/17.4bpp" - - .align 2 -gFieldObjectPalette8:: @ 84987F8 - .incbin "graphics/map_objects/palettes/field_object_palette_08.gbapal" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_0:: @ 8498818 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/00.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_1:: @ 8498918 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/01.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_2:: @ 8498A18 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/02.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_3:: @ 8498B18 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/03.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_4:: @ 8498C18 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/04.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_5:: @ 8498D18 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/05.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_6:: @ 8498E18 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/06.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_7:: @ 8498F18 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/07.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_8:: @ 8499018 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/08.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_9:: @ 8499118 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/09.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_10:: @ 8499218 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/10.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_11:: @ 8499318 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/11.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_12:: @ 8499418 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/12.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_13:: @ 8499518 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/13.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_14:: @ 8499618 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/14.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_15:: @ 8499718 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/15.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_16:: @ 8499818 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/16.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireBrendan_17:: @ 8499918 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_brendan/17.4bpp" - - .align 2 -gFieldObjectPalette33:: @ 8499A18 - .incbin "graphics/map_objects/palettes/field_object_palette_33.gbapal" - - .space 0x1E0 - - .align 2 -gFieldObjectPalette9:: @ 8499C18 - .incbin "graphics/map_objects/palettes/field_object_palette_09.gbapal" - - .align 2 -gFieldObjectPalette10:: @ 8499C38 - .incbin "graphics/map_objects/palettes/field_object_palette_10.gbapal" - - .align 2 -gFieldObjectPic_BrendanFieldMove_0:: @ 8499C58 - .incbin "graphics/map_objects/pics/people/brendan/field_move/0.4bpp" - - .align 2 -gFieldObjectPic_BrendanFieldMove_1:: @ 8499E58 - .incbin "graphics/map_objects/pics/people/brendan/field_move/1.4bpp" - - .align 2 -gFieldObjectPic_BrendanFieldMove_2:: @ 849A058 - .incbin "graphics/map_objects/pics/people/brendan/field_move/2.4bpp" - - .align 2 -gFieldObjectPic_BrendanFieldMove_3:: @ 849A258 - .incbin "graphics/map_objects/pics/people/brendan/field_move/3.4bpp" - - .align 2 -gFieldObjectPic_BrendanFieldMove_4:: @ 849A458 - .incbin "graphics/map_objects/pics/people/brendan/field_move/4.4bpp" - - .align 2 -gFieldObjectPic_BrendanSurfing_0:: @ 849A658 - .incbin "graphics/map_objects/pics/people/brendan/surfing/0.4bpp" - - .align 2 -gFieldObjectPic_BrendanSurfing_3:: @ 849A858 - .incbin "graphics/map_objects/pics/people/brendan/surfing/3.4bpp" - - .align 2 -gFieldObjectPic_BrendanSurfing_1:: @ 849AA58 - .incbin "graphics/map_objects/pics/people/brendan/surfing/1.4bpp" - - .align 2 -gFieldObjectPic_BrendanSurfing_4:: @ 849AC58 - .incbin "graphics/map_objects/pics/people/brendan/surfing/4.4bpp" - - .align 2 -gFieldObjectPic_BrendanSurfing_2:: @ 849AE58 - .incbin "graphics/map_objects/pics/people/brendan/surfing/2.4bpp" - - .align 2 -gFieldObjectPic_BrendanSurfing_5:: @ 849B058 - .incbin "graphics/map_objects/pics/people/brendan/surfing/5.4bpp" - - .align 2 -gFieldObjectPic_BrendanMachBike_0:: @ 849B258 - .incbin "graphics/map_objects/pics/people/brendan/mach_bike/0.4bpp" - - .align 2 -gFieldObjectPic_BrendanMachBike_1:: @ 849B458 - .incbin "graphics/map_objects/pics/people/brendan/mach_bike/1.4bpp" - - .align 2 -gFieldObjectPic_BrendanMachBike_2:: @ 849B658 - .incbin "graphics/map_objects/pics/people/brendan/mach_bike/2.4bpp" - - .align 2 -gFieldObjectPic_BrendanMachBike_3:: @ 849B858 - .incbin "graphics/map_objects/pics/people/brendan/mach_bike/3.4bpp" - - .align 2 -gFieldObjectPic_BrendanMachBike_4:: @ 849BA58 - .incbin "graphics/map_objects/pics/people/brendan/mach_bike/4.4bpp" - - .align 2 -gFieldObjectPic_BrendanMachBike_5:: @ 849BC58 - .incbin "graphics/map_objects/pics/people/brendan/mach_bike/5.4bpp" - - .align 2 -gFieldObjectPic_BrendanMachBike_6:: @ 849BE58 - .incbin "graphics/map_objects/pics/people/brendan/mach_bike/6.4bpp" - - .align 2 -gFieldObjectPic_BrendanMachBike_7:: @ 849C058 - .incbin "graphics/map_objects/pics/people/brendan/mach_bike/7.4bpp" - - .align 2 -gFieldObjectPic_BrendanMachBike_8:: @ 849C258 - .incbin "graphics/map_objects/pics/people/brendan/mach_bike/8.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_0:: @ 849C458 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/00.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_1:: @ 849C658 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/01.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_2:: @ 849C858 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/02.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_3:: @ 849CA58 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/03.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_4:: @ 849CC58 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/04.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_5:: @ 849CE58 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/05.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_6:: @ 849D058 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/06.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_7:: @ 849D258 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/07.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_8:: @ 849D458 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/08.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_9:: @ 849D658 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/09.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_10:: @ 849D858 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/10.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_11:: @ 849DA58 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/11.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_12:: @ 849DC58 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/12.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_13:: @ 849DE58 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/13.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_14:: @ 849E058 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/14.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_15:: @ 849E258 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/15.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_16:: @ 849E458 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/16.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_17:: @ 849E658 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/17.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_18:: @ 849E858 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/18.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_19:: @ 849EA58 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/19.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_20:: @ 849EC58 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/20.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_21:: @ 849EE58 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/21.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_22:: @ 849F058 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/22.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_23:: @ 849F258 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/23.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_24:: @ 849F458 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/24.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_25:: @ 849F658 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/25.4bpp" - - .align 2 -gFieldObjectPic_BrendanAcroBike_26:: @ 849F858 - .incbin "graphics/map_objects/pics/people/brendan/acro_bike/26.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_0:: @ 849FA58 - .incbin "graphics/map_objects/pics/people/brendan/fishing/00.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_1:: @ 849FC58 - .incbin "graphics/map_objects/pics/people/brendan/fishing/01.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_2:: @ 849FE58 - .incbin "graphics/map_objects/pics/people/brendan/fishing/02.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_3:: @ 84A0058 - .incbin "graphics/map_objects/pics/people/brendan/fishing/03.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_4:: @ 84A0258 - .incbin "graphics/map_objects/pics/people/brendan/fishing/04.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_5:: @ 84A0458 - .incbin "graphics/map_objects/pics/people/brendan/fishing/05.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_6:: @ 84A0658 - .incbin "graphics/map_objects/pics/people/brendan/fishing/06.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_7:: @ 84A0858 - .incbin "graphics/map_objects/pics/people/brendan/fishing/07.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_8:: @ 84A0A58 - .incbin "graphics/map_objects/pics/people/brendan/fishing/08.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_9:: @ 84A0C58 - .incbin "graphics/map_objects/pics/people/brendan/fishing/09.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_10:: @ 84A0E58 - .incbin "graphics/map_objects/pics/people/brendan/fishing/10.4bpp" - - .align 2 -gFieldObjectPic_BrendanFishing_11:: @ 84A1058 - .incbin "graphics/map_objects/pics/people/brendan/fishing/11.4bpp" - - .align 2 -gFieldObjectPic_BrendanWatering_0:: @ 84A1258 - .incbin "graphics/map_objects/pics/people/brendan/watering/0.4bpp" - - .align 2 -gFieldObjectPic_BrendanWatering_3:: @ 84A1458 - .incbin "graphics/map_objects/pics/people/brendan/watering/3.4bpp" - - .align 2 -gFieldObjectPic_BrendanWatering_1:: @ 84A1658 - .incbin "graphics/map_objects/pics/people/brendan/watering/1.4bpp" - - .align 2 -gFieldObjectPic_BrendanWatering_4:: @ 84A1858 - .incbin "graphics/map_objects/pics/people/brendan/watering/4.4bpp" - - .align 2 -gFieldObjectPic_BrendanWatering_2:: @ 84A1A58 - .incbin "graphics/map_objects/pics/people/brendan/watering/2.4bpp" - - .align 2 -gFieldObjectPic_BrendanWatering_5:: @ 84A1C58 - .incbin "graphics/map_objects/pics/people/brendan/watering/5.4bpp" - - .align 2 -gFieldObjectPic_BrendanDecorating:: @ 84A1E58 - .incbin "graphics/map_objects/pics/people/brendan/decorating.4bpp" - - .align 2 -gFieldObjectPic_MayDecorating:: @ 84A1F58 - .incbin "graphics/map_objects/pics/people/may/decorating.4bpp" - - .align 2 -gFieldObjectPic_BrendanUnderwater_0:: @ 84A2058 - .incbin "graphics/map_objects/pics/people/brendan/underwater/0.4bpp" - - .align 2 -gFieldObjectPic_BrendanUnderwater_1:: @ 84A2258 - .incbin "graphics/map_objects/pics/people/brendan/underwater/1.4bpp" - - .align 2 -gFieldObjectPic_BrendanUnderwater_2:: @ 84A2458 - .incbin "graphics/map_objects/pics/people/brendan/underwater/2.4bpp" - - .align 2 -gFieldObjectPic_BrendanUnderwater_3:: @ 84A2658 - .incbin "graphics/map_objects/pics/people/brendan/underwater/3.4bpp" - - .align 2 -gFieldObjectPic_MayUnderwater_0:: @ 84A2858 - .incbin "graphics/map_objects/pics/people/may/underwater/0.4bpp" - - .align 2 -gFieldObjectPic_MayUnderwater_1:: @ 84A2A58 - .incbin "graphics/map_objects/pics/people/may/underwater/1.4bpp" - - .align 2 -gFieldObjectPic_MayUnderwater_2:: @ 84A2C58 - .incbin "graphics/map_objects/pics/people/may/underwater/2.4bpp" - - .align 2 -gFieldObjectPic_MayUnderwater_3:: @ 84A2E58 - .incbin "graphics/map_objects/pics/people/may/underwater/3.4bpp" - - .align 2 -gFieldObjectPalette11:: @ 84A3058 - .incbin "graphics/map_objects/palettes/field_object_palette_11.gbapal" - - .align 2 -gFieldObjectPic_MayNormal_0:: @ 84A3078 - .incbin "graphics/map_objects/pics/people/may/normal/00.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_1:: @ 84A3178 - .incbin "graphics/map_objects/pics/people/may/normal/01.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_2:: @ 84A3278 - .incbin "graphics/map_objects/pics/people/may/normal/02.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_3:: @ 84A3378 - .incbin "graphics/map_objects/pics/people/may/normal/03.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_4:: @ 84A3478 - .incbin "graphics/map_objects/pics/people/may/normal/04.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_5:: @ 84A3578 - .incbin "graphics/map_objects/pics/people/may/normal/05.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_6:: @ 84A3678 - .incbin "graphics/map_objects/pics/people/may/normal/06.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_7:: @ 84A3778 - .incbin "graphics/map_objects/pics/people/may/normal/07.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_8:: @ 84A3878 - .incbin "graphics/map_objects/pics/people/may/normal/08.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_9:: @ 84A3978 - .incbin "graphics/map_objects/pics/people/may/normal/09.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_10:: @ 84A3A78 - .incbin "graphics/map_objects/pics/people/may/normal/10.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_11:: @ 84A3B78 - .incbin "graphics/map_objects/pics/people/may/normal/11.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_12:: @ 84A3C78 - .incbin "graphics/map_objects/pics/people/may/normal/12.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_13:: @ 84A3D78 - .incbin "graphics/map_objects/pics/people/may/normal/13.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_14:: @ 84A3E78 - .incbin "graphics/map_objects/pics/people/may/normal/14.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_15:: @ 84A3F78 - .incbin "graphics/map_objects/pics/people/may/normal/15.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_16:: @ 84A4078 - .incbin "graphics/map_objects/pics/people/may/normal/16.4bpp" - - .align 2 -gFieldObjectPic_MayNormal_17:: @ 84A4178 - .incbin "graphics/map_objects/pics/people/may/normal/17.4bpp" - - .align 2 -gFieldObjectPalette17:: @ 84A4278 - .incbin "graphics/map_objects/palettes/field_object_palette_17.gbapal" - - .align 2 -gFieldObjectPalette18:: @ 84A4298 - .incbin "graphics/map_objects/palettes/field_object_palette_18.gbapal" - - .align 2 -gFieldObjectPic_RubySapphireMay_0:: @ 84A42B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/00.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_1:: @ 84A43B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/01.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_2:: @ 84A44B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/02.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_3:: @ 84A45B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/03.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_4:: @ 84A46B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/04.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_5:: @ 84A47B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/05.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_6:: @ 84A48B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/06.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_7:: @ 84A49B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/07.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_8:: @ 84A4AB8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/08.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_9:: @ 84A4BB8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/09.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_10:: @ 84A4CB8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/10.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_11:: @ 84A4DB8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/11.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_12:: @ 84A4EB8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/12.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_13:: @ 84A4FB8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/13.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_14:: @ 84A50B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/14.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_15:: @ 84A51B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/15.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_16:: @ 84A52B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/16.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireMay_17:: @ 84A53B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_may/17.4bpp" - - .align 2 -gFieldObjectPalette34:: @ 84A54B8 - .incbin "graphics/map_objects/palettes/field_object_palette_34.gbapal" - - .align 2 -gUnusedFieldObjectPalette:: @ 84A54D8 - .incbin "graphics/map_objects/palettes/unused_palette.gbapal" - - .space 0x1C0 - - .align 2 -gFieldObjectPic_MayMachBike_0:: @ 84A56B8 - .incbin "graphics/map_objects/pics/people/may/mach_bike/0.4bpp" - - .align 2 -gFieldObjectPic_MayMachBike_1:: @ 84A58B8 - .incbin "graphics/map_objects/pics/people/may/mach_bike/1.4bpp" - - .align 2 -gFieldObjectPic_MayMachBike_2:: @ 84A5AB8 - .incbin "graphics/map_objects/pics/people/may/mach_bike/2.4bpp" - - .align 2 -gFieldObjectPic_MayMachBike_3:: @ 84A5CB8 - .incbin "graphics/map_objects/pics/people/may/mach_bike/3.4bpp" - - .align 2 -gFieldObjectPic_MayMachBike_4:: @ 84A5EB8 - .incbin "graphics/map_objects/pics/people/may/mach_bike/4.4bpp" - - .align 2 -gFieldObjectPic_MayMachBike_5:: @ 84A60B8 - .incbin "graphics/map_objects/pics/people/may/mach_bike/5.4bpp" - - .align 2 -gFieldObjectPic_MayMachBike_6:: @ 84A62B8 - .incbin "graphics/map_objects/pics/people/may/mach_bike/6.4bpp" - - .align 2 -gFieldObjectPic_MayMachBike_7:: @ 84A64B8 - .incbin "graphics/map_objects/pics/people/may/mach_bike/7.4bpp" - - .align 2 -gFieldObjectPic_MayMachBike_8:: @ 84A66B8 - .incbin "graphics/map_objects/pics/people/may/mach_bike/8.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_0:: @ 84A68B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/00.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_1:: @ 84A6AB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/01.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_2:: @ 84A6CB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/02.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_3:: @ 84A6EB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/03.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_4:: @ 84A70B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/04.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_5:: @ 84A72B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/05.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_6:: @ 84A74B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/06.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_7:: @ 84A76B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/07.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_8:: @ 84A78B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/08.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_9:: @ 84A7AB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/09.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_10:: @ 84A7CB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/10.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_11:: @ 84A7EB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/11.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_12:: @ 84A80B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/12.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_13:: @ 84A82B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/13.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_14:: @ 84A84B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/14.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_15:: @ 84A86B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/15.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_16:: @ 84A88B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/16.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_17:: @ 84A8AB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/17.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_18:: @ 84A8CB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/18.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_19:: @ 84A8EB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/19.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_20:: @ 84A90B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/20.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_21:: @ 84A92B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/21.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_22:: @ 84A94B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/22.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_23:: @ 84A96B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/23.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_24:: @ 84A98B8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/24.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_25:: @ 84A9AB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/25.4bpp" - - .align 2 -gFieldObjectPic_MayAcroBike_26:: @ 84A9CB8 - .incbin "graphics/map_objects/pics/people/may/acro_bike/26.4bpp" - - .align 2 -gFieldObjectPic_MaySurfing_0:: @ 84A9EB8 - .incbin "graphics/map_objects/pics/people/may/surfing/0.4bpp" - - .align 2 -gFieldObjectPic_MaySurfing_3:: @ 84AA0B8 - .incbin "graphics/map_objects/pics/people/may/surfing/3.4bpp" - - .align 2 -gFieldObjectPic_MaySurfing_1:: @ 84AA2B8 - .incbin "graphics/map_objects/pics/people/may/surfing/1.4bpp" - - .align 2 -gFieldObjectPic_MaySurfing_4:: @ 84AA4B8 - .incbin "graphics/map_objects/pics/people/may/surfing/4.4bpp" - - .align 2 -gFieldObjectPic_MaySurfing_2:: @ 84AA6B8 - .incbin "graphics/map_objects/pics/people/may/surfing/2.4bpp" - - .align 2 -gFieldObjectPic_MaySurfing_5:: @ 84AA8B8 - .incbin "graphics/map_objects/pics/people/may/surfing/5.4bpp" - - .align 2 -gFieldObjectPic_MayFieldMove_0:: @ 84AAAB8 - .incbin "graphics/map_objects/pics/people/may/field_move/0.4bpp" - - .align 2 -gFieldObjectPic_MayFieldMove_1:: @ 84AACB8 - .incbin "graphics/map_objects/pics/people/may/field_move/1.4bpp" - - .align 2 -gFieldObjectPic_MayFieldMove_2:: @ 84AAEB8 - .incbin "graphics/map_objects/pics/people/may/field_move/2.4bpp" - - .align 2 -gFieldObjectPic_MayFieldMove_3:: @ 84AB0B8 - .incbin "graphics/map_objects/pics/people/may/field_move/3.4bpp" - - .align 2 -gFieldObjectPic_MayFieldMove_4:: @ 84AB2B8 - .incbin "graphics/map_objects/pics/people/may/field_move/4.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_0:: @ 84AB4B8 - .incbin "graphics/map_objects/pics/people/may/fishing/00.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_1:: @ 84AB6B8 - .incbin "graphics/map_objects/pics/people/may/fishing/01.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_2:: @ 84AB8B8 - .incbin "graphics/map_objects/pics/people/may/fishing/02.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_3:: @ 84ABAB8 - .incbin "graphics/map_objects/pics/people/may/fishing/03.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_4:: @ 84ABCB8 - .incbin "graphics/map_objects/pics/people/may/fishing/04.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_5:: @ 84ABEB8 - .incbin "graphics/map_objects/pics/people/may/fishing/05.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_6:: @ 84AC0B8 - .incbin "graphics/map_objects/pics/people/may/fishing/06.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_7:: @ 84AC2B8 - .incbin "graphics/map_objects/pics/people/may/fishing/07.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_8:: @ 84AC4B8 - .incbin "graphics/map_objects/pics/people/may/fishing/08.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_9:: @ 84AC6B8 - .incbin "graphics/map_objects/pics/people/may/fishing/09.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_10:: @ 84AC8B8 - .incbin "graphics/map_objects/pics/people/may/fishing/10.4bpp" - - .align 2 -gFieldObjectPic_MayFishing_11:: @ 84ACAB8 - .incbin "graphics/map_objects/pics/people/may/fishing/11.4bpp" - - .align 2 -gFieldObjectPic_MayWatering_0:: @ 84ACCB8 - .incbin "graphics/map_objects/pics/people/may/watering/0.4bpp" - - .align 2 -gFieldObjectPic_MayWatering_3:: @ 84ACEB8 - .incbin "graphics/map_objects/pics/people/may/watering/3.4bpp" - - .align 2 -gFieldObjectPic_MayWatering_1:: @ 84AD0B8 - .incbin "graphics/map_objects/pics/people/may/watering/1.4bpp" - - .align 2 -gFieldObjectPic_MayWatering_4:: @ 84AD2B8 - .incbin "graphics/map_objects/pics/people/may/watering/4.4bpp" - - .align 2 -gFieldObjectPic_MayWatering_2:: @ 84AD4B8 - .incbin "graphics/map_objects/pics/people/may/watering/2.4bpp" - - .align 2 -gFieldObjectPic_MayWatering_5:: @ 84AD6B8 - .incbin "graphics/map_objects/pics/people/may/watering/5.4bpp" - - .align 2 -gFieldObjectPalette0:: @ 84AD8B8 - .incbin "graphics/map_objects/palettes/field_object_palette_00.gbapal" - - .align 2 -gFieldObjectPalette1:: @ 84AD8D8 - .incbin "graphics/map_objects/palettes/field_object_palette_01.gbapal" - - .align 2 -gFieldObjectPalette2:: @ 84AD8F8 - .incbin "graphics/map_objects/palettes/field_object_palette_02.gbapal" - - .align 2 -gFieldObjectPalette3:: @ 84AD918 - .incbin "graphics/map_objects/palettes/field_object_palette_03.gbapal" - - .align 2 -gFieldObjectPalette4:: @ 84AD938 - .incbin "graphics/map_objects/palettes/field_object_palette_04.gbapal" - - .align 2 -gFieldObjectPalette5:: @ 84AD958 - .incbin "graphics/map_objects/palettes/field_object_palette_05.gbapal" - - .align 2 -gFieldObjectPalette6:: @ 84AD978 - .incbin "graphics/map_objects/palettes/field_object_palette_06.gbapal" - - .align 2 -gFieldObjectPalette7:: @ 84AD998 - .incbin "graphics/map_objects/palettes/field_object_palette_07.gbapal" - - .align 2 -gFieldObjectPic_LittleBoy1_0:: @ 84AD9B8 - .incbin "graphics/map_objects/pics/people/little_boy_1/0.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy1_1:: @ 84ADA38 - .incbin "graphics/map_objects/pics/people/little_boy_1/1.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy1_2:: @ 84ADAB8 - .incbin "graphics/map_objects/pics/people/little_boy_1/2.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy1_3:: @ 84ADB38 - .incbin "graphics/map_objects/pics/people/little_boy_1/3.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy1_4:: @ 84ADBB8 - .incbin "graphics/map_objects/pics/people/little_boy_1/4.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy1_5:: @ 84ADC38 - .incbin "graphics/map_objects/pics/people/little_boy_1/5.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy1_6:: @ 84ADCB8 - .incbin "graphics/map_objects/pics/people/little_boy_1/6.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy1_7:: @ 84ADD38 - .incbin "graphics/map_objects/pics/people/little_boy_1/7.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy1_8:: @ 84ADDB8 - .incbin "graphics/map_objects/pics/people/little_boy_1/8.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl1_0:: @ 84ADE38 - .incbin "graphics/map_objects/pics/people/little_girl_1/0.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl1_1:: @ 84ADF38 - .incbin "graphics/map_objects/pics/people/little_girl_1/1.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl1_2:: @ 84AE038 - .incbin "graphics/map_objects/pics/people/little_girl_1/2.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl1_3:: @ 84AE138 - .incbin "graphics/map_objects/pics/people/little_girl_1/3.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl1_4:: @ 84AE238 - .incbin "graphics/map_objects/pics/people/little_girl_1/4.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl1_5:: @ 84AE338 - .incbin "graphics/map_objects/pics/people/little_girl_1/5.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl1_6:: @ 84AE438 - .incbin "graphics/map_objects/pics/people/little_girl_1/6.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl1_7:: @ 84AE538 - .incbin "graphics/map_objects/pics/people/little_girl_1/7.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl1_8:: @ 84AE638 - .incbin "graphics/map_objects/pics/people/little_girl_1/8.4bpp" - - .align 2 -gFieldObjectPic_Boy1_0:: @ 84AE738 - .incbin "graphics/map_objects/pics/people/boy_1/0.4bpp" - - .align 2 -gFieldObjectPic_Boy1_1:: @ 84AE838 - .incbin "graphics/map_objects/pics/people/boy_1/1.4bpp" - - .align 2 -gFieldObjectPic_Boy1_2:: @ 84AE938 - .incbin "graphics/map_objects/pics/people/boy_1/2.4bpp" - - .align 2 -gFieldObjectPic_Boy1_3:: @ 84AEA38 - .incbin "graphics/map_objects/pics/people/boy_1/3.4bpp" - - .align 2 -gFieldObjectPic_Boy1_4:: @ 84AEB38 - .incbin "graphics/map_objects/pics/people/boy_1/4.4bpp" - - .align 2 -gFieldObjectPic_Boy1_5:: @ 84AEC38 - .incbin "graphics/map_objects/pics/people/boy_1/5.4bpp" - - .align 2 -gFieldObjectPic_Boy1_6:: @ 84AED38 - .incbin "graphics/map_objects/pics/people/boy_1/6.4bpp" - - .align 2 -gFieldObjectPic_Boy1_7:: @ 84AEE38 - .incbin "graphics/map_objects/pics/people/boy_1/7.4bpp" - - .align 2 -gFieldObjectPic_Boy1_8:: @ 84AEF38 - .incbin "graphics/map_objects/pics/people/boy_1/8.4bpp" - - .align 2 -gFieldObjectPic_Girl1_0:: @ 84AF038 - .incbin "graphics/map_objects/pics/people/girl_1/0.4bpp" - - .align 2 -gFieldObjectPic_Girl1_1:: @ 84AF138 - .incbin "graphics/map_objects/pics/people/girl_1/1.4bpp" - - .align 2 -gFieldObjectPic_Girl1_2:: @ 84AF238 - .incbin "graphics/map_objects/pics/people/girl_1/2.4bpp" - - .align 2 -gFieldObjectPic_Girl1_3:: @ 84AF338 - .incbin "graphics/map_objects/pics/people/girl_1/3.4bpp" - - .align 2 -gFieldObjectPic_Girl1_4:: @ 84AF438 - .incbin "graphics/map_objects/pics/people/girl_1/4.4bpp" - - .align 2 -gFieldObjectPic_Girl1_5:: @ 84AF538 - .incbin "graphics/map_objects/pics/people/girl_1/5.4bpp" - - .align 2 -gFieldObjectPic_Girl1_6:: @ 84AF638 - .incbin "graphics/map_objects/pics/people/girl_1/6.4bpp" - - .align 2 -gFieldObjectPic_Girl1_7:: @ 84AF738 - .incbin "graphics/map_objects/pics/people/girl_1/7.4bpp" - - .align 2 -gFieldObjectPic_Girl1_8:: @ 84AF838 - .incbin "graphics/map_objects/pics/people/girl_1/8.4bpp" - - .align 2 -gFieldObjectPic_Boy2_0:: @ 84AF938 - .incbin "graphics/map_objects/pics/people/boy_2/0.4bpp" - - .align 2 -gFieldObjectPic_Boy2_1:: @ 84AFA38 - .incbin "graphics/map_objects/pics/people/boy_2/1.4bpp" - - .align 2 -gFieldObjectPic_Boy2_2:: @ 84AFB38 - .incbin "graphics/map_objects/pics/people/boy_2/2.4bpp" - - .align 2 -gFieldObjectPic_Boy2_3:: @ 84AFC38 - .incbin "graphics/map_objects/pics/people/boy_2/3.4bpp" - - .align 2 -gFieldObjectPic_Boy2_4:: @ 84AFD38 - .incbin "graphics/map_objects/pics/people/boy_2/4.4bpp" - - .align 2 -gFieldObjectPic_Boy2_5:: @ 84AFE38 - .incbin "graphics/map_objects/pics/people/boy_2/5.4bpp" - - .align 2 -gFieldObjectPic_Boy2_6:: @ 84AFF38 - .incbin "graphics/map_objects/pics/people/boy_2/6.4bpp" - - .align 2 -gFieldObjectPic_Boy2_7:: @ 84B0038 - .incbin "graphics/map_objects/pics/people/boy_2/7.4bpp" - - .align 2 -gFieldObjectPic_Boy2_8:: @ 84B0138 - .incbin "graphics/map_objects/pics/people/boy_2/8.4bpp" - - .align 2 -gFieldObjectPic_Girl2_0:: @ 84B0238 - .incbin "graphics/map_objects/pics/people/girl_2/0.4bpp" - - .align 2 -gFieldObjectPic_Girl2_1:: @ 84B0338 - .incbin "graphics/map_objects/pics/people/girl_2/1.4bpp" - - .align 2 -gFieldObjectPic_Girl2_2:: @ 84B0438 - .incbin "graphics/map_objects/pics/people/girl_2/2.4bpp" - - .align 2 -gFieldObjectPic_Girl2_3:: @ 84B0538 - .incbin "graphics/map_objects/pics/people/girl_2/3.4bpp" - - .align 2 -gFieldObjectPic_Girl2_4:: @ 84B0638 - .incbin "graphics/map_objects/pics/people/girl_2/4.4bpp" - - .align 2 -gFieldObjectPic_Girl2_5:: @ 84B0738 - .incbin "graphics/map_objects/pics/people/girl_2/5.4bpp" - - .align 2 -gFieldObjectPic_Girl2_6:: @ 84B0838 - .incbin "graphics/map_objects/pics/people/girl_2/6.4bpp" - - .align 2 -gFieldObjectPic_Girl2_7:: @ 84B0938 - .incbin "graphics/map_objects/pics/people/girl_2/7.4bpp" - - .align 2 -gFieldObjectPic_Girl2_8:: @ 84B0A38 - .incbin "graphics/map_objects/pics/people/girl_2/8.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy2_0:: @ 84B0B38 - .incbin "graphics/map_objects/pics/people/little_boy_2/0.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy2_1:: @ 84B0BB8 - .incbin "graphics/map_objects/pics/people/little_boy_2/1.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy2_2:: @ 84B0C38 - .incbin "graphics/map_objects/pics/people/little_boy_2/2.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy2_3:: @ 84B0CB8 - .incbin "graphics/map_objects/pics/people/little_boy_2/3.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy2_4:: @ 84B0D38 - .incbin "graphics/map_objects/pics/people/little_boy_2/4.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy2_5:: @ 84B0DB8 - .incbin "graphics/map_objects/pics/people/little_boy_2/5.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy2_6:: @ 84B0E38 - .incbin "graphics/map_objects/pics/people/little_boy_2/6.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy2_7:: @ 84B0EB8 - .incbin "graphics/map_objects/pics/people/little_boy_2/7.4bpp" - - .align 2 -gFieldObjectPic_LittleBoy2_8:: @ 84B0F38 - .incbin "graphics/map_objects/pics/people/little_boy_2/8.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl2_0:: @ 84B0FB8 - .incbin "graphics/map_objects/pics/people/little_girl_2/0.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl2_1:: @ 84B1038 - .incbin "graphics/map_objects/pics/people/little_girl_2/1.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl2_2:: @ 84B10B8 - .incbin "graphics/map_objects/pics/people/little_girl_2/2.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl2_3:: @ 84B1138 - .incbin "graphics/map_objects/pics/people/little_girl_2/3.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl2_4:: @ 84B11B8 - .incbin "graphics/map_objects/pics/people/little_girl_2/4.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl2_5:: @ 84B1238 - .incbin "graphics/map_objects/pics/people/little_girl_2/5.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl2_6:: @ 84B12B8 - .incbin "graphics/map_objects/pics/people/little_girl_2/6.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl2_7:: @ 84B1338 - .incbin "graphics/map_objects/pics/people/little_girl_2/7.4bpp" - - .align 2 -gFieldObjectPic_LittleGirl2_8:: @ 84B13B8 - .incbin "graphics/map_objects/pics/people/little_girl_2/8.4bpp" - - .align 2 -gFieldObjectPic_Boy3_0:: @ 84B1438 - .incbin "graphics/map_objects/pics/people/boy_3/0.4bpp" - - .align 2 -gFieldObjectPic_Boy3_1:: @ 84B1538 - .incbin "graphics/map_objects/pics/people/boy_3/1.4bpp" - - .align 2 -gFieldObjectPic_Boy3_2:: @ 84B1638 - .incbin "graphics/map_objects/pics/people/boy_3/2.4bpp" - - .align 2 -gFieldObjectPic_Boy3_3:: @ 84B1738 - .incbin "graphics/map_objects/pics/people/boy_3/3.4bpp" - - .align 2 -gFieldObjectPic_Boy3_4:: @ 84B1838 - .incbin "graphics/map_objects/pics/people/boy_3/4.4bpp" - - .align 2 -gFieldObjectPic_Boy3_5:: @ 84B1938 - .incbin "graphics/map_objects/pics/people/boy_3/5.4bpp" - - .align 2 -gFieldObjectPic_Boy3_6:: @ 84B1A38 - .incbin "graphics/map_objects/pics/people/boy_3/6.4bpp" - - .align 2 -gFieldObjectPic_Boy3_7:: @ 84B1B38 - .incbin "graphics/map_objects/pics/people/boy_3/7.4bpp" - - .align 2 -gFieldObjectPic_Boy3_8:: @ 84B1C38 - .incbin "graphics/map_objects/pics/people/boy_3/8.4bpp" - - .align 2 -gFieldObjectPic_Girl3_0:: @ 84B1D38 - .incbin "graphics/map_objects/pics/people/girl_3/0.4bpp" - - .align 2 -gFieldObjectPic_Girl3_1:: @ 84B1E38 - .incbin "graphics/map_objects/pics/people/girl_3/1.4bpp" - - .align 2 -gFieldObjectPic_Girl3_2:: @ 84B1F38 - .incbin "graphics/map_objects/pics/people/girl_3/2.4bpp" - - .align 2 -gFieldObjectPic_Girl3_3:: @ 84B2038 - .incbin "graphics/map_objects/pics/people/girl_3/3.4bpp" - - .align 2 -gFieldObjectPic_Girl3_4:: @ 84B2138 - .incbin "graphics/map_objects/pics/people/girl_3/4.4bpp" - - .align 2 -gFieldObjectPic_Girl3_5:: @ 84B2238 - .incbin "graphics/map_objects/pics/people/girl_3/5.4bpp" - - .align 2 -gFieldObjectPic_Girl3_6:: @ 84B2338 - .incbin "graphics/map_objects/pics/people/girl_3/6.4bpp" - - .align 2 -gFieldObjectPic_Girl3_7:: @ 84B2438 - .incbin "graphics/map_objects/pics/people/girl_3/7.4bpp" - - .align 2 -gFieldObjectPic_Girl3_8:: @ 84B2538 - .incbin "graphics/map_objects/pics/people/girl_3/8.4bpp" - - .align 2 -gFieldObjectPic_Boy4_0:: @ 84B2638 - .incbin "graphics/map_objects/pics/people/boy_4/0.4bpp" - - .align 2 -gFieldObjectPic_Boy4_1:: @ 84B2738 - .incbin "graphics/map_objects/pics/people/boy_4/1.4bpp" - - .align 2 -gFieldObjectPic_Boy4_2:: @ 84B2838 - .incbin "graphics/map_objects/pics/people/boy_4/2.4bpp" - - .align 2 -gFieldObjectPic_Boy4_3:: @ 84B2938 - .incbin "graphics/map_objects/pics/people/boy_4/3.4bpp" - - .align 2 -gFieldObjectPic_Boy4_4:: @ 84B2A38 - .incbin "graphics/map_objects/pics/people/boy_4/4.4bpp" - - .align 2 -gFieldObjectPic_Boy4_5:: @ 84B2B38 - .incbin "graphics/map_objects/pics/people/boy_4/5.4bpp" - - .align 2 -gFieldObjectPic_Boy4_6:: @ 84B2C38 - .incbin "graphics/map_objects/pics/people/boy_4/6.4bpp" - - .align 2 -gFieldObjectPic_Boy4_7:: @ 84B2D38 - .incbin "graphics/map_objects/pics/people/boy_4/7.4bpp" - - .align 2 -gFieldObjectPic_Boy4_8:: @ 84B2E38 - .incbin "graphics/map_objects/pics/people/boy_4/8.4bpp" - - .align 2 -gFieldObjectPic_Woman1_0:: @ 84B2F38 - .incbin "graphics/map_objects/pics/people/woman_1/0.4bpp" - - .align 2 -gFieldObjectPic_Woman1_1:: @ 84B3038 - .incbin "graphics/map_objects/pics/people/woman_1/1.4bpp" - - .align 2 -gFieldObjectPic_Woman1_2:: @ 84B3138 - .incbin "graphics/map_objects/pics/people/woman_1/2.4bpp" - - .align 2 -gFieldObjectPic_Woman1_3:: @ 84B3238 - .incbin "graphics/map_objects/pics/people/woman_1/3.4bpp" - - .align 2 -gFieldObjectPic_Woman1_4:: @ 84B3338 - .incbin "graphics/map_objects/pics/people/woman_1/4.4bpp" - - .align 2 -gFieldObjectPic_Woman1_5:: @ 84B3438 - .incbin "graphics/map_objects/pics/people/woman_1/5.4bpp" - - .align 2 -gFieldObjectPic_Woman1_6:: @ 84B3538 - .incbin "graphics/map_objects/pics/people/woman_1/6.4bpp" - - .align 2 -gFieldObjectPic_Woman1_7:: @ 84B3638 - .incbin "graphics/map_objects/pics/people/woman_1/7.4bpp" - - .align 2 -gFieldObjectPic_Woman1_8:: @ 84B3738 - .incbin "graphics/map_objects/pics/people/woman_1/8.4bpp" - - .align 2 -gFieldObjectPic_FatMan_0:: @ 84B3838 - .incbin "graphics/map_objects/pics/people/fat_man/0.4bpp" - - .align 2 -gFieldObjectPic_FatMan_1:: @ 84B3938 - .incbin "graphics/map_objects/pics/people/fat_man/1.4bpp" - - .align 2 -gFieldObjectPic_FatMan_2:: @ 84B3A38 - .incbin "graphics/map_objects/pics/people/fat_man/2.4bpp" - - .align 2 -gFieldObjectPic_FatMan_3:: @ 84B3B38 - .incbin "graphics/map_objects/pics/people/fat_man/3.4bpp" - - .align 2 -gFieldObjectPic_FatMan_4:: @ 84B3C38 - .incbin "graphics/map_objects/pics/people/fat_man/4.4bpp" - - .align 2 -gFieldObjectPic_FatMan_5:: @ 84B3D38 - .incbin "graphics/map_objects/pics/people/fat_man/5.4bpp" - - .align 2 -gFieldObjectPic_FatMan_6:: @ 84B3E38 - .incbin "graphics/map_objects/pics/people/fat_man/6.4bpp" - - .align 2 -gFieldObjectPic_FatMan_7:: @ 84B3F38 - .incbin "graphics/map_objects/pics/people/fat_man/7.4bpp" - - .align 2 -gFieldObjectPic_FatMan_8:: @ 84B4038 - .incbin "graphics/map_objects/pics/people/fat_man/8.4bpp" - - .align 2 -gFieldObjectPic_Woman2_0:: @ 84B4138 - .incbin "graphics/map_objects/pics/people/woman_2/0.4bpp" - - .align 2 -gFieldObjectPic_Woman2_1:: @ 84B4238 - .incbin "graphics/map_objects/pics/people/woman_2/1.4bpp" - - .align 2 -gFieldObjectPic_Woman2_2:: @ 84B4338 - .incbin "graphics/map_objects/pics/people/woman_2/2.4bpp" - - .align 2 -gFieldObjectPic_Woman2_3:: @ 84B4438 - .incbin "graphics/map_objects/pics/people/woman_2/3.4bpp" - - .align 2 -gFieldObjectPic_Woman2_4:: @ 84B4538 - .incbin "graphics/map_objects/pics/people/woman_2/4.4bpp" - - .align 2 -gFieldObjectPic_Woman2_5:: @ 84B4638 - .incbin "graphics/map_objects/pics/people/woman_2/5.4bpp" - - .align 2 -gFieldObjectPic_Woman2_6:: @ 84B4738 - .incbin "graphics/map_objects/pics/people/woman_2/6.4bpp" - - .align 2 -gFieldObjectPic_Woman2_7:: @ 84B4838 - .incbin "graphics/map_objects/pics/people/woman_2/7.4bpp" - - .align 2 -gFieldObjectPic_Woman2_8:: @ 84B4938 - .incbin "graphics/map_objects/pics/people/woman_2/8.4bpp" - - .align 2 -gFieldObjectPic_Man1_0:: @ 84B4A38 - .incbin "graphics/map_objects/pics/people/man_1/0.4bpp" - - .align 2 -gFieldObjectPic_Man1_1:: @ 84B4B38 - .incbin "graphics/map_objects/pics/people/man_1/1.4bpp" - - .align 2 -gFieldObjectPic_Man1_2:: @ 84B4C38 - .incbin "graphics/map_objects/pics/people/man_1/2.4bpp" - - .align 2 -gFieldObjectPic_Man1_3:: @ 84B4D38 - .incbin "graphics/map_objects/pics/people/man_1/3.4bpp" - - .align 2 -gFieldObjectPic_Man1_4:: @ 84B4E38 - .incbin "graphics/map_objects/pics/people/man_1/4.4bpp" - - .align 2 -gFieldObjectPic_Man1_5:: @ 84B4F38 - .incbin "graphics/map_objects/pics/people/man_1/5.4bpp" - - .align 2 -gFieldObjectPic_Man1_6:: @ 84B5038 - .incbin "graphics/map_objects/pics/people/man_1/6.4bpp" - - .align 2 -gFieldObjectPic_Man1_7:: @ 84B5138 - .incbin "graphics/map_objects/pics/people/man_1/7.4bpp" - - .align 2 -gFieldObjectPic_Man1_8:: @ 84B5238 - .incbin "graphics/map_objects/pics/people/man_1/8.4bpp" - - .align 2 -gFieldObjectPic_Woman3_0:: @ 84B5338 - .incbin "graphics/map_objects/pics/people/woman_3/0.4bpp" - - .align 2 -gFieldObjectPic_Woman3_1:: @ 84B5438 - .incbin "graphics/map_objects/pics/people/woman_3/1.4bpp" - - .align 2 -gFieldObjectPic_Woman3_2:: @ 84B5538 - .incbin "graphics/map_objects/pics/people/woman_3/2.4bpp" - - .align 2 -gFieldObjectPic_Woman3_3:: @ 84B5638 - .incbin "graphics/map_objects/pics/people/woman_3/3.4bpp" - - .align 2 -gFieldObjectPic_Woman3_4:: @ 84B5738 - .incbin "graphics/map_objects/pics/people/woman_3/4.4bpp" - - .align 2 -gFieldObjectPic_Woman3_5:: @ 84B5838 - .incbin "graphics/map_objects/pics/people/woman_3/5.4bpp" - - .align 2 -gFieldObjectPic_Woman3_6:: @ 84B5938 - .incbin "graphics/map_objects/pics/people/woman_3/6.4bpp" - - .align 2 -gFieldObjectPic_Woman3_7:: @ 84B5A38 - .incbin "graphics/map_objects/pics/people/woman_3/7.4bpp" - - .align 2 -gFieldObjectPic_Woman3_8:: @ 84B5B38 - .incbin "graphics/map_objects/pics/people/woman_3/8.4bpp" - - .align 2 -gFieldObjectPic_OldMan1_0:: @ 84B5C38 - .incbin "graphics/map_objects/pics/people/old_man_1/0.4bpp" - - .align 2 -gFieldObjectPic_OldMan1_1:: @ 84B5D38 - .incbin "graphics/map_objects/pics/people/old_man_1/1.4bpp" - - .align 2 -gFieldObjectPic_OldMan1_2:: @ 84B5E38 - .incbin "graphics/map_objects/pics/people/old_man_1/2.4bpp" - - .align 2 -gFieldObjectPic_OldMan1_3:: @ 84B5F38 - .incbin "graphics/map_objects/pics/people/old_man_1/3.4bpp" - - .align 2 -gFieldObjectPic_OldMan1_4:: @ 84B6038 - .incbin "graphics/map_objects/pics/people/old_man_1/4.4bpp" - - .align 2 -gFieldObjectPic_OldMan1_5:: @ 84B6138 - .incbin "graphics/map_objects/pics/people/old_man_1/5.4bpp" - - .align 2 -gFieldObjectPic_OldMan1_6:: @ 84B6238 - .incbin "graphics/map_objects/pics/people/old_man_1/6.4bpp" - - .align 2 -gFieldObjectPic_OldMan1_7:: @ 84B6338 - .incbin "graphics/map_objects/pics/people/old_man_1/7.4bpp" - - .align 2 -gFieldObjectPic_OldMan1_8:: @ 84B6438 - .incbin "graphics/map_objects/pics/people/old_man_1/8.4bpp" - - .align 2 -gFieldObjectPic_OldWoman1_0:: @ 84B6538 - .incbin "graphics/map_objects/pics/people/old_woman_1/0.4bpp" - - .align 2 -gFieldObjectPic_OldWoman1_1:: @ 84B6638 - .incbin "graphics/map_objects/pics/people/old_woman_1/1.4bpp" - - .align 2 -gFieldObjectPic_OldWoman1_2:: @ 84B6738 - .incbin "graphics/map_objects/pics/people/old_woman_1/2.4bpp" - - .align 2 -gFieldObjectPic_OldWoman1_3:: @ 84B6838 - .incbin "graphics/map_objects/pics/people/old_woman_1/3.4bpp" - - .align 2 -gFieldObjectPic_OldWoman1_4:: @ 84B6938 - .incbin "graphics/map_objects/pics/people/old_woman_1/4.4bpp" - - .align 2 -gFieldObjectPic_OldWoman1_5:: @ 84B6A38 - .incbin "graphics/map_objects/pics/people/old_woman_1/5.4bpp" - - .align 2 -gFieldObjectPic_OldWoman1_6:: @ 84B6B38 - .incbin "graphics/map_objects/pics/people/old_woman_1/6.4bpp" - - .align 2 -gFieldObjectPic_OldWoman1_7:: @ 84B6C38 - .incbin "graphics/map_objects/pics/people/old_woman_1/7.4bpp" - - .align 2 -gFieldObjectPic_OldWoman1_8:: @ 84B6D38 - .incbin "graphics/map_objects/pics/people/old_woman_1/8.4bpp" - - .align 2 -gFieldObjectPic_Man2_0:: @ 84B6E38 - .incbin "graphics/map_objects/pics/people/man_2/0.4bpp" - - .align 2 -gFieldObjectPic_Man2_1:: @ 84B6F38 - .incbin "graphics/map_objects/pics/people/man_2/1.4bpp" - - .align 2 -gFieldObjectPic_Man2_2:: @ 84B7038 - .incbin "graphics/map_objects/pics/people/man_2/2.4bpp" - - .align 2 -gFieldObjectPic_Man2_3:: @ 84B7138 - .incbin "graphics/map_objects/pics/people/man_2/3.4bpp" - - .align 2 -gFieldObjectPic_Man2_4:: @ 84B7238 - .incbin "graphics/map_objects/pics/people/man_2/4.4bpp" - - .align 2 -gFieldObjectPic_Man2_5:: @ 84B7338 - .incbin "graphics/map_objects/pics/people/man_2/5.4bpp" - - .align 2 -gFieldObjectPic_Man2_6:: @ 84B7438 - .incbin "graphics/map_objects/pics/people/man_2/6.4bpp" - - .align 2 -gFieldObjectPic_Man2_7:: @ 84B7538 - .incbin "graphics/map_objects/pics/people/man_2/7.4bpp" - - .align 2 -gFieldObjectPic_Man2_8:: @ 84B7638 - .incbin "graphics/map_objects/pics/people/man_2/8.4bpp" - - .align 2 -gFieldObjectPic_Woman4_0:: @ 84B7738 - .incbin "graphics/map_objects/pics/people/woman_4/0.4bpp" - - .align 2 -gFieldObjectPic_Woman4_1:: @ 84B7838 - .incbin "graphics/map_objects/pics/people/woman_4/1.4bpp" - - .align 2 -gFieldObjectPic_Woman4_2:: @ 84B7938 - .incbin "graphics/map_objects/pics/people/woman_4/2.4bpp" - - .align 2 -gFieldObjectPic_Woman4_3:: @ 84B7A38 - .incbin "graphics/map_objects/pics/people/woman_4/3.4bpp" - - .align 2 -gFieldObjectPic_Woman4_4:: @ 84B7B38 - .incbin "graphics/map_objects/pics/people/woman_4/4.4bpp" - - .align 2 -gFieldObjectPic_Woman4_5:: @ 84B7C38 - .incbin "graphics/map_objects/pics/people/woman_4/5.4bpp" - - .align 2 -gFieldObjectPic_Woman4_6:: @ 84B7D38 - .incbin "graphics/map_objects/pics/people/woman_4/6.4bpp" - - .align 2 -gFieldObjectPic_Woman4_7:: @ 84B7E38 - .incbin "graphics/map_objects/pics/people/woman_4/7.4bpp" - - .align 2 -gFieldObjectPic_Woman4_8:: @ 84B7F38 - .incbin "graphics/map_objects/pics/people/woman_4/8.4bpp" - - .align 2 -gFieldObjectPic_Man3_0:: @ 84B8038 - .incbin "graphics/map_objects/pics/people/man_3/0.4bpp" - - .align 2 -gFieldObjectPic_Man3_1:: @ 84B8138 - .incbin "graphics/map_objects/pics/people/man_3/1.4bpp" - - .align 2 -gFieldObjectPic_Man3_2:: @ 84B8238 - .incbin "graphics/map_objects/pics/people/man_3/2.4bpp" - - .align 2 -gFieldObjectPic_Man3_3:: @ 84B8338 - .incbin "graphics/map_objects/pics/people/man_3/3.4bpp" - - .align 2 -gFieldObjectPic_Man3_4:: @ 84B8438 - .incbin "graphics/map_objects/pics/people/man_3/4.4bpp" - - .align 2 -gFieldObjectPic_Man3_5:: @ 84B8538 - .incbin "graphics/map_objects/pics/people/man_3/5.4bpp" - - .align 2 -gFieldObjectPic_Man3_6:: @ 84B8638 - .incbin "graphics/map_objects/pics/people/man_3/6.4bpp" - - .align 2 -gFieldObjectPic_Man3_7:: @ 84B8738 - .incbin "graphics/map_objects/pics/people/man_3/7.4bpp" - - .align 2 -gFieldObjectPic_Man3_8:: @ 84B8838 - .incbin "graphics/map_objects/pics/people/man_3/8.4bpp" - - .align 2 -gFieldObjectPic_Woman5_0:: @ 84B8938 - .incbin "graphics/map_objects/pics/people/woman_5/0.4bpp" - - .align 2 -gFieldObjectPic_Woman5_1:: @ 84B8A38 - .incbin "graphics/map_objects/pics/people/woman_5/1.4bpp" - - .align 2 -gFieldObjectPic_Woman5_2:: @ 84B8B38 - .incbin "graphics/map_objects/pics/people/woman_5/2.4bpp" - - .align 2 -gFieldObjectPic_Woman5_3:: @ 84B8C38 - .incbin "graphics/map_objects/pics/people/woman_5/3.4bpp" - - .align 2 -gFieldObjectPic_Woman5_4:: @ 84B8D38 - .incbin "graphics/map_objects/pics/people/woman_5/4.4bpp" - - .align 2 -gFieldObjectPic_Woman5_5:: @ 84B8E38 - .incbin "graphics/map_objects/pics/people/woman_5/5.4bpp" - - .align 2 -gFieldObjectPic_Woman5_6:: @ 84B8F38 - .incbin "graphics/map_objects/pics/people/woman_5/6.4bpp" - - .align 2 -gFieldObjectPic_Woman5_7:: @ 84B9038 - .incbin "graphics/map_objects/pics/people/woman_5/7.4bpp" - - .align 2 -gFieldObjectPic_Woman5_8:: @ 84B9138 - .incbin "graphics/map_objects/pics/people/woman_5/8.4bpp" - - .align 2 -gFieldObjectPic_Cook_0:: @ 84B9238 - .incbin "graphics/map_objects/pics/people/cook/0.4bpp" - - .align 2 -gFieldObjectPic_Cook_1:: @ 84B9338 - .incbin "graphics/map_objects/pics/people/cook/1.4bpp" - - .align 2 -gFieldObjectPic_Cook_2:: @ 84B9438 - .incbin "graphics/map_objects/pics/people/cook/2.4bpp" - - .align 2 -gFieldObjectPic_Woman6_0:: @ 84B9538 - .incbin "graphics/map_objects/pics/people/woman_6/0.4bpp" - - .align 2 -gFieldObjectPic_Woman6_1:: @ 84B9638 - .incbin "graphics/map_objects/pics/people/woman_6/1.4bpp" - - .align 2 -gFieldObjectPic_Woman6_2:: @ 84B9738 - .incbin "graphics/map_objects/pics/people/woman_6/2.4bpp" - - .align 2 -gFieldObjectPic_Woman6_3:: @ 84B9838 - .incbin "graphics/map_objects/pics/people/woman_6/3.4bpp" - - .align 2 -gFieldObjectPic_Woman6_4:: @ 84B9938 - .incbin "graphics/map_objects/pics/people/woman_6/4.4bpp" - - .align 2 -gFieldObjectPic_Woman6_5:: @ 84B9A38 - .incbin "graphics/map_objects/pics/people/woman_6/5.4bpp" - - .align 2 -gFieldObjectPic_Woman6_6:: @ 84B9B38 - .incbin "graphics/map_objects/pics/people/woman_6/6.4bpp" - - .align 2 -gFieldObjectPic_Woman6_7:: @ 84B9C38 - .incbin "graphics/map_objects/pics/people/woman_6/7.4bpp" - - .align 2 -gFieldObjectPic_Woman6_8:: @ 84B9D38 - .incbin "graphics/map_objects/pics/people/woman_6/8.4bpp" - - .align 2 -gFieldObjectPic_OldMan2_0:: @ 84B9E38 - .incbin "graphics/map_objects/pics/people/old_man_2/0.4bpp" - - .align 2 -gFieldObjectPic_OldMan2_1:: @ 84B9F38 - .incbin "graphics/map_objects/pics/people/old_man_2/1.4bpp" - - .align 2 -gFieldObjectPic_OldMan2_2:: @ 84BA038 - .incbin "graphics/map_objects/pics/people/old_man_2/2.4bpp" - - .align 2 -gFieldObjectPic_OldWoman2_0:: @ 84BA138 - .incbin "graphics/map_objects/pics/people/old_woman_2/0.4bpp" - - .align 2 -gFieldObjectPic_OldWoman2_1:: @ 84BA238 - .incbin "graphics/map_objects/pics/people/old_woman_2/1.4bpp" - - .align 2 -gFieldObjectPic_OldWoman2_2:: @ 84BA338 - .incbin "graphics/map_objects/pics/people/old_woman_2/2.4bpp" - - .align 2 -gFieldObjectPic_OldWoman2_3:: @ 84BA438 - .incbin "graphics/map_objects/pics/people/old_woman_2/3.4bpp" - - .align 2 -gFieldObjectPic_OldWoman2_4:: @ 84BA538 - .incbin "graphics/map_objects/pics/people/old_woman_2/4.4bpp" - - .align 2 -gFieldObjectPic_OldWoman2_5:: @ 84BA638 - .incbin "graphics/map_objects/pics/people/old_woman_2/5.4bpp" - - .align 2 -gFieldObjectPic_OldWoman2_6:: @ 84BA738 - .incbin "graphics/map_objects/pics/people/old_woman_2/6.4bpp" - - .align 2 -gFieldObjectPic_OldWoman2_7:: @ 84BA838 - .incbin "graphics/map_objects/pics/people/old_woman_2/7.4bpp" - - .align 2 -gFieldObjectPic_OldWoman2_8:: @ 84BA938 - .incbin "graphics/map_objects/pics/people/old_woman_2/8.4bpp" - - .align 2 -gFieldObjectPic_Camper_0:: @ 84BAA38 - .incbin "graphics/map_objects/pics/people/camper/0.4bpp" - - .align 2 -gFieldObjectPic_Camper_1:: @ 84BAB38 - .incbin "graphics/map_objects/pics/people/camper/1.4bpp" - - .align 2 -gFieldObjectPic_Camper_2:: @ 84BAC38 - .incbin "graphics/map_objects/pics/people/camper/2.4bpp" - - .align 2 -gFieldObjectPic_Camper_3:: @ 84BAD38 - .incbin "graphics/map_objects/pics/people/camper/3.4bpp" - - .align 2 -gFieldObjectPic_Camper_4:: @ 84BAE38 - .incbin "graphics/map_objects/pics/people/camper/4.4bpp" - - .align 2 -gFieldObjectPic_Camper_5:: @ 84BAF38 - .incbin "graphics/map_objects/pics/people/camper/5.4bpp" - - .align 2 -gFieldObjectPic_Camper_6:: @ 84BB038 - .incbin "graphics/map_objects/pics/people/camper/6.4bpp" - - .align 2 -gFieldObjectPic_Camper_7:: @ 84BB138 - .incbin "graphics/map_objects/pics/people/camper/7.4bpp" - - .align 2 -gFieldObjectPic_Camper_8:: @ 84BB238 - .incbin "graphics/map_objects/pics/people/camper/8.4bpp" - - .align 2 -gFieldObjectPic_Picnicker_0:: @ 84BB338 - .incbin "graphics/map_objects/pics/people/picnicker/0.4bpp" - - .align 2 -gFieldObjectPic_Picnicker_1:: @ 84BB438 - .incbin "graphics/map_objects/pics/people/picnicker/1.4bpp" - - .align 2 -gFieldObjectPic_Picnicker_2:: @ 84BB538 - .incbin "graphics/map_objects/pics/people/picnicker/2.4bpp" - - .align 2 -gFieldObjectPic_Picnicker_3:: @ 84BB638 - .incbin "graphics/map_objects/pics/people/picnicker/3.4bpp" - - .align 2 -gFieldObjectPic_Picnicker_4:: @ 84BB738 - .incbin "graphics/map_objects/pics/people/picnicker/4.4bpp" - - .align 2 -gFieldObjectPic_Picnicker_5:: @ 84BB838 - .incbin "graphics/map_objects/pics/people/picnicker/5.4bpp" - - .align 2 -gFieldObjectPic_Picnicker_6:: @ 84BB938 - .incbin "graphics/map_objects/pics/people/picnicker/6.4bpp" - - .align 2 -gFieldObjectPic_Picnicker_7:: @ 84BBA38 - .incbin "graphics/map_objects/pics/people/picnicker/7.4bpp" - - .align 2 -gFieldObjectPic_Picnicker_8:: @ 84BBB38 - .incbin "graphics/map_objects/pics/people/picnicker/8.4bpp" - - .align 2 -gFieldObjectPic_Man4_0:: @ 84BBC38 - .incbin "graphics/map_objects/pics/people/man_4/0.4bpp" - - .align 2 -gFieldObjectPic_Man4_1:: @ 84BBD38 - .incbin "graphics/map_objects/pics/people/man_4/1.4bpp" - - .align 2 -gFieldObjectPic_Man4_2:: @ 84BBE38 - .incbin "graphics/map_objects/pics/people/man_4/2.4bpp" - - .align 2 -gFieldObjectPic_Man4_3:: @ 84BBF38 - .incbin "graphics/map_objects/pics/people/man_4/3.4bpp" - - .align 2 -gFieldObjectPic_Man4_4:: @ 84BC038 - .incbin "graphics/map_objects/pics/people/man_4/4.4bpp" - - .align 2 -gFieldObjectPic_Man4_5:: @ 84BC138 - .incbin "graphics/map_objects/pics/people/man_4/5.4bpp" - - .align 2 -gFieldObjectPic_Man4_6:: @ 84BC238 - .incbin "graphics/map_objects/pics/people/man_4/6.4bpp" - - .align 2 -gFieldObjectPic_Man4_7:: @ 84BC338 - .incbin "graphics/map_objects/pics/people/man_4/7.4bpp" - - .align 2 -gFieldObjectPic_Man4_8:: @ 84BC438 - .incbin "graphics/map_objects/pics/people/man_4/8.4bpp" - - .align 2 -gFieldObjectPic_Woman7_0:: @ 84BC538 - .incbin "graphics/map_objects/pics/people/woman_7/0.4bpp" - - .align 2 -gFieldObjectPic_Woman7_1:: @ 84BC638 - .incbin "graphics/map_objects/pics/people/woman_7/1.4bpp" - - .align 2 -gFieldObjectPic_Woman7_2:: @ 84BC738 - .incbin "graphics/map_objects/pics/people/woman_7/2.4bpp" - - .align 2 -gFieldObjectPic_Woman7_3:: @ 84BC838 - .incbin "graphics/map_objects/pics/people/woman_7/3.4bpp" - - .align 2 -gFieldObjectPic_Woman7_4:: @ 84BC938 - .incbin "graphics/map_objects/pics/people/woman_7/4.4bpp" - - .align 2 -gFieldObjectPic_Woman7_5:: @ 84BCA38 - .incbin "graphics/map_objects/pics/people/woman_7/5.4bpp" - - .align 2 -gFieldObjectPic_Woman7_6:: @ 84BCB38 - .incbin "graphics/map_objects/pics/people/woman_7/6.4bpp" - - .align 2 -gFieldObjectPic_Woman7_7:: @ 84BCC38 - .incbin "graphics/map_objects/pics/people/woman_7/7.4bpp" - - .align 2 -gFieldObjectPic_Woman7_8:: @ 84BCD38 - .incbin "graphics/map_objects/pics/people/woman_7/8.4bpp" - - .align 2 -gFieldObjectPic_Youngster_0:: @ 84BCE38 - .incbin "graphics/map_objects/pics/people/youngster/0.4bpp" - - .align 2 -gFieldObjectPic_Youngster_1:: @ 84BCF38 - .incbin "graphics/map_objects/pics/people/youngster/1.4bpp" - - .align 2 -gFieldObjectPic_Youngster_2:: @ 84BD038 - .incbin "graphics/map_objects/pics/people/youngster/2.4bpp" - - .align 2 -gFieldObjectPic_Youngster_3:: @ 84BD138 - .incbin "graphics/map_objects/pics/people/youngster/3.4bpp" - - .align 2 -gFieldObjectPic_Youngster_4:: @ 84BD238 - .incbin "graphics/map_objects/pics/people/youngster/4.4bpp" - - .align 2 -gFieldObjectPic_Youngster_5:: @ 84BD338 - .incbin "graphics/map_objects/pics/people/youngster/5.4bpp" - - .align 2 -gFieldObjectPic_Youngster_6:: @ 84BD438 - .incbin "graphics/map_objects/pics/people/youngster/6.4bpp" - - .align 2 -gFieldObjectPic_Youngster_7:: @ 84BD538 - .incbin "graphics/map_objects/pics/people/youngster/7.4bpp" - - .align 2 -gFieldObjectPic_Youngster_8:: @ 84BD638 - .incbin "graphics/map_objects/pics/people/youngster/8.4bpp" - - .align 2 -gFieldObjectPic_BugCatcher_0:: @ 84BD738 - .incbin "graphics/map_objects/pics/people/bug_catcher/0.4bpp" - - .align 2 -gFieldObjectPic_BugCatcher_1:: @ 84BD838 - .incbin "graphics/map_objects/pics/people/bug_catcher/1.4bpp" - - .align 2 -gFieldObjectPic_BugCatcher_2:: @ 84BD938 - .incbin "graphics/map_objects/pics/people/bug_catcher/2.4bpp" - - .align 2 -gFieldObjectPic_BugCatcher_3:: @ 84BDA38 - .incbin "graphics/map_objects/pics/people/bug_catcher/3.4bpp" - - .align 2 -gFieldObjectPic_BugCatcher_4:: @ 84BDB38 - .incbin "graphics/map_objects/pics/people/bug_catcher/4.4bpp" - - .align 2 -gFieldObjectPic_BugCatcher_5:: @ 84BDC38 - .incbin "graphics/map_objects/pics/people/bug_catcher/5.4bpp" - - .align 2 -gFieldObjectPic_BugCatcher_6:: @ 84BDD38 - .incbin "graphics/map_objects/pics/people/bug_catcher/6.4bpp" - - .align 2 -gFieldObjectPic_BugCatcher_7:: @ 84BDE38 - .incbin "graphics/map_objects/pics/people/bug_catcher/7.4bpp" - - .align 2 -gFieldObjectPic_BugCatcher_8:: @ 84BDF38 - .incbin "graphics/map_objects/pics/people/bug_catcher/8.4bpp" - - .align 2 -gFieldObjectPic_PsychicM_0:: @ 84BE038 - .incbin "graphics/map_objects/pics/people/psychic_m/0.4bpp" - - .align 2 -gFieldObjectPic_PsychicM_1:: @ 84BE138 - .incbin "graphics/map_objects/pics/people/psychic_m/1.4bpp" - - .align 2 -gFieldObjectPic_PsychicM_2:: @ 84BE238 - .incbin "graphics/map_objects/pics/people/psychic_m/2.4bpp" - - .align 2 -gFieldObjectPic_PsychicM_3:: @ 84BE338 - .incbin "graphics/map_objects/pics/people/psychic_m/3.4bpp" - - .align 2 -gFieldObjectPic_PsychicM_4:: @ 84BE438 - .incbin "graphics/map_objects/pics/people/psychic_m/4.4bpp" - - .align 2 -gFieldObjectPic_PsychicM_5:: @ 84BE538 - .incbin "graphics/map_objects/pics/people/psychic_m/5.4bpp" - - .align 2 -gFieldObjectPic_PsychicM_6:: @ 84BE638 - .incbin "graphics/map_objects/pics/people/psychic_m/6.4bpp" - - .align 2 -gFieldObjectPic_PsychicM_7:: @ 84BE738 - .incbin "graphics/map_objects/pics/people/psychic_m/7.4bpp" - - .align 2 -gFieldObjectPic_PsychicM_8:: @ 84BE838 - .incbin "graphics/map_objects/pics/people/psychic_m/8.4bpp" - - .align 2 -gFieldObjectPic_SchoolKidM_0:: @ 84BE938 - .incbin "graphics/map_objects/pics/people/school_kid_m/0.4bpp" - - .align 2 -gFieldObjectPic_SchoolKidM_1:: @ 84BEA38 - .incbin "graphics/map_objects/pics/people/school_kid_m/1.4bpp" - - .align 2 -gFieldObjectPic_SchoolKidM_2:: @ 84BEB38 - .incbin "graphics/map_objects/pics/people/school_kid_m/2.4bpp" - - .align 2 -gFieldObjectPic_SchoolKidM_3:: @ 84BEC38 - .incbin "graphics/map_objects/pics/people/school_kid_m/3.4bpp" - - .align 2 -gFieldObjectPic_SchoolKidM_4:: @ 84BED38 - .incbin "graphics/map_objects/pics/people/school_kid_m/4.4bpp" - - .align 2 -gFieldObjectPic_SchoolKidM_5:: @ 84BEE38 - .incbin "graphics/map_objects/pics/people/school_kid_m/5.4bpp" - - .align 2 -gFieldObjectPic_SchoolKidM_6:: @ 84BEF38 - .incbin "graphics/map_objects/pics/people/school_kid_m/6.4bpp" - - .align 2 -gFieldObjectPic_SchoolKidM_7:: @ 84BF038 - .incbin "graphics/map_objects/pics/people/school_kid_m/7.4bpp" - - .align 2 -gFieldObjectPic_SchoolKidM_8:: @ 84BF138 - .incbin "graphics/map_objects/pics/people/school_kid_m/8.4bpp" - - .align 2 -gFieldObjectPic_Maniac_0:: @ 84BF238 - .incbin "graphics/map_objects/pics/people/maniac/0.4bpp" - - .align 2 -gFieldObjectPic_Maniac_1:: @ 84BF338 - .incbin "graphics/map_objects/pics/people/maniac/1.4bpp" - - .align 2 -gFieldObjectPic_Maniac_2:: @ 84BF438 - .incbin "graphics/map_objects/pics/people/maniac/2.4bpp" - - .align 2 -gFieldObjectPic_Maniac_3:: @ 84BF538 - .incbin "graphics/map_objects/pics/people/maniac/3.4bpp" - - .align 2 -gFieldObjectPic_Maniac_4:: @ 84BF638 - .incbin "graphics/map_objects/pics/people/maniac/4.4bpp" - - .align 2 -gFieldObjectPic_Maniac_5:: @ 84BF738 - .incbin "graphics/map_objects/pics/people/maniac/5.4bpp" - - .align 2 -gFieldObjectPic_Maniac_6:: @ 84BF838 - .incbin "graphics/map_objects/pics/people/maniac/6.4bpp" - - .align 2 -gFieldObjectPic_Maniac_7:: @ 84BF938 - .incbin "graphics/map_objects/pics/people/maniac/7.4bpp" - - .align 2 -gFieldObjectPic_Maniac_8:: @ 84BFA38 - .incbin "graphics/map_objects/pics/people/maniac/8.4bpp" - - .align 2 -gFieldObjectPic_HexManiac_0:: @ 84BFB38 - .incbin "graphics/map_objects/pics/people/hex_maniac/0.4bpp" - - .align 2 -gFieldObjectPic_HexManiac_1:: @ 84BFC38 - .incbin "graphics/map_objects/pics/people/hex_maniac/1.4bpp" - - .align 2 -gFieldObjectPic_HexManiac_2:: @ 84BFD38 - .incbin "graphics/map_objects/pics/people/hex_maniac/2.4bpp" - - .align 2 -gFieldObjectPic_HexManiac_3:: @ 84BFE38 - .incbin "graphics/map_objects/pics/people/hex_maniac/3.4bpp" - - .align 2 -gFieldObjectPic_HexManiac_4:: @ 84BFF38 - .incbin "graphics/map_objects/pics/people/hex_maniac/4.4bpp" - - .align 2 -gFieldObjectPic_HexManiac_5:: @ 84C0038 - .incbin "graphics/map_objects/pics/people/hex_maniac/5.4bpp" - - .align 2 -gFieldObjectPic_HexManiac_6:: @ 84C0138 - .incbin "graphics/map_objects/pics/people/hex_maniac/6.4bpp" - - .align 2 -gFieldObjectPic_HexManiac_7:: @ 84C0238 - .incbin "graphics/map_objects/pics/people/hex_maniac/7.4bpp" - - .align 2 -gFieldObjectPic_HexManiac_8:: @ 84C0338 - .incbin "graphics/map_objects/pics/people/hex_maniac/8.4bpp" - - .align 2 -gFieldObjectPic_UnusedWoman_0:: @ 84C0438 - .incbin "graphics/map_objects/pics/people/unused_woman/0.4bpp" - - .align 2 -gFieldObjectPic_UnusedWoman_1:: @ 84C0538 - .incbin "graphics/map_objects/pics/people/unused_woman/1.4bpp" - - .align 2 -gFieldObjectPic_UnusedWoman_2:: @ 84C0638 - .incbin "graphics/map_objects/pics/people/unused_woman/2.4bpp" - - .align 2 -gFieldObjectPic_UnusedWoman_3:: @ 84C0738 - .incbin "graphics/map_objects/pics/people/unused_woman/3.4bpp" - - .align 2 -gFieldObjectPic_UnusedWoman_4:: @ 84C0838 - .incbin "graphics/map_objects/pics/people/unused_woman/4.4bpp" - - .align 2 -gFieldObjectPic_UnusedWoman_5:: @ 84C0938 - .incbin "graphics/map_objects/pics/people/unused_woman/5.4bpp" - - .align 2 -gFieldObjectPic_UnusedWoman_6:: @ 84C0A38 - .incbin "graphics/map_objects/pics/people/unused_woman/6.4bpp" - - .align 2 -gFieldObjectPic_UnusedWoman_7:: @ 84C0B38 - .incbin "graphics/map_objects/pics/people/unused_woman/7.4bpp" - - .align 2 -gFieldObjectPic_UnusedWoman_8:: @ 84C0C38 - .incbin "graphics/map_objects/pics/people/unused_woman/8.4bpp" - - .align 2 -gFieldObjectPic_SwimmerM_0:: @ 84C0D38 - .incbin "graphics/map_objects/pics/people/swimmer_m/0.4bpp" - - .align 2 -gFieldObjectPic_SwimmerM_1:: @ 84C0E38 - .incbin "graphics/map_objects/pics/people/swimmer_m/1.4bpp" - - .align 2 -gFieldObjectPic_SwimmerM_2:: @ 84C0F38 - .incbin "graphics/map_objects/pics/people/swimmer_m/2.4bpp" - - .align 2 -gFieldObjectPic_SwimmerM_3:: @ 84C1038 - .incbin "graphics/map_objects/pics/people/swimmer_m/3.4bpp" - - .align 2 -gFieldObjectPic_SwimmerM_4:: @ 84C1138 - .incbin "graphics/map_objects/pics/people/swimmer_m/4.4bpp" - - .align 2 -gFieldObjectPic_SwimmerM_5:: @ 84C1238 - .incbin "graphics/map_objects/pics/people/swimmer_m/5.4bpp" - - .align 2 -gFieldObjectPic_SwimmerM_6:: @ 84C1338 - .incbin "graphics/map_objects/pics/people/swimmer_m/6.4bpp" - - .align 2 -gFieldObjectPic_SwimmerM_7:: @ 84C1438 - .incbin "graphics/map_objects/pics/people/swimmer_m/7.4bpp" - - .align 2 -gFieldObjectPic_SwimmerM_8:: @ 84C1538 - .incbin "graphics/map_objects/pics/people/swimmer_m/8.4bpp" - - .align 2 -gFieldObjectPic_SwimmerF_0:: @ 84C1638 - .incbin "graphics/map_objects/pics/people/swimmer_f/0.4bpp" - - .align 2 -gFieldObjectPic_SwimmerF_1:: @ 84C1738 - .incbin "graphics/map_objects/pics/people/swimmer_f/1.4bpp" - - .align 2 -gFieldObjectPic_SwimmerF_2:: @ 84C1838 - .incbin "graphics/map_objects/pics/people/swimmer_f/2.4bpp" - - .align 2 -gFieldObjectPic_SwimmerF_3:: @ 84C1938 - .incbin "graphics/map_objects/pics/people/swimmer_f/3.4bpp" - - .align 2 -gFieldObjectPic_SwimmerF_4:: @ 84C1A38 - .incbin "graphics/map_objects/pics/people/swimmer_f/4.4bpp" - - .align 2 -gFieldObjectPic_SwimmerF_5:: @ 84C1B38 - .incbin "graphics/map_objects/pics/people/swimmer_f/5.4bpp" - - .align 2 -gFieldObjectPic_SwimmerF_6:: @ 84C1C38 - .incbin "graphics/map_objects/pics/people/swimmer_f/6.4bpp" - - .align 2 -gFieldObjectPic_SwimmerF_7:: @ 84C1D38 - .incbin "graphics/map_objects/pics/people/swimmer_f/7.4bpp" - - .align 2 -gFieldObjectPic_SwimmerF_8:: @ 84C1E38 - .incbin "graphics/map_objects/pics/people/swimmer_f/8.4bpp" - - .align 2 -gFieldObjectPic_BlackBelt_0:: @ 84C1F38 - .incbin "graphics/map_objects/pics/people/black_belt/0.4bpp" - - .align 2 -gFieldObjectPic_BlackBelt_1:: @ 84C2038 - .incbin "graphics/map_objects/pics/people/black_belt/1.4bpp" - - .align 2 -gFieldObjectPic_BlackBelt_2:: @ 84C2138 - .incbin "graphics/map_objects/pics/people/black_belt/2.4bpp" - - .align 2 -gFieldObjectPic_BlackBelt_3:: @ 84C2238 - .incbin "graphics/map_objects/pics/people/black_belt/3.4bpp" - - .align 2 -gFieldObjectPic_BlackBelt_4:: @ 84C2338 - .incbin "graphics/map_objects/pics/people/black_belt/4.4bpp" - - .align 2 -gFieldObjectPic_BlackBelt_5:: @ 84C2438 - .incbin "graphics/map_objects/pics/people/black_belt/5.4bpp" - - .align 2 -gFieldObjectPic_BlackBelt_6:: @ 84C2538 - .incbin "graphics/map_objects/pics/people/black_belt/6.4bpp" - - .align 2 -gFieldObjectPic_BlackBelt_7:: @ 84C2638 - .incbin "graphics/map_objects/pics/people/black_belt/7.4bpp" - - .align 2 -gFieldObjectPic_BlackBelt_8:: @ 84C2738 - .incbin "graphics/map_objects/pics/people/black_belt/8.4bpp" - - .align 2 -gFieldObjectPic_Beauty_0:: @ 84C2838 - .incbin "graphics/map_objects/pics/people/beauty/0.4bpp" - - .align 2 -gFieldObjectPic_Beauty_1:: @ 84C2938 - .incbin "graphics/map_objects/pics/people/beauty/1.4bpp" - - .align 2 -gFieldObjectPic_Beauty_2:: @ 84C2A38 - .incbin "graphics/map_objects/pics/people/beauty/2.4bpp" - - .align 2 -gFieldObjectPic_Beauty_3:: @ 84C2B38 - .incbin "graphics/map_objects/pics/people/beauty/3.4bpp" - - .align 2 -gFieldObjectPic_Beauty_4:: @ 84C2C38 - .incbin "graphics/map_objects/pics/people/beauty/4.4bpp" - - .align 2 -gFieldObjectPic_Beauty_5:: @ 84C2D38 - .incbin "graphics/map_objects/pics/people/beauty/5.4bpp" - - .align 2 -gFieldObjectPic_Beauty_6:: @ 84C2E38 - .incbin "graphics/map_objects/pics/people/beauty/6.4bpp" - - .align 2 -gFieldObjectPic_Beauty_7:: @ 84C2F38 - .incbin "graphics/map_objects/pics/people/beauty/7.4bpp" - - .align 2 -gFieldObjectPic_Beauty_8:: @ 84C3038 - .incbin "graphics/map_objects/pics/people/beauty/8.4bpp" - - .align 2 -gFieldObjectPic_Scientist1_0:: @ 84C3138 - .incbin "graphics/map_objects/pics/people/scientist_1/0.4bpp" - - .align 2 -gFieldObjectPic_Scientist1_1:: @ 84C3238 - .incbin "graphics/map_objects/pics/people/scientist_1/1.4bpp" - - .align 2 -gFieldObjectPic_Scientist1_2:: @ 84C3338 - .incbin "graphics/map_objects/pics/people/scientist_1/2.4bpp" - - .align 2 -gFieldObjectPic_Scientist1_3:: @ 84C3438 - .incbin "graphics/map_objects/pics/people/scientist_1/3.4bpp" - - .align 2 -gFieldObjectPic_Scientist1_4:: @ 84C3538 - .incbin "graphics/map_objects/pics/people/scientist_1/4.4bpp" - - .align 2 -gFieldObjectPic_Scientist1_5:: @ 84C3638 - .incbin "graphics/map_objects/pics/people/scientist_1/5.4bpp" - - .align 2 -gFieldObjectPic_Scientist1_6:: @ 84C3738 - .incbin "graphics/map_objects/pics/people/scientist_1/6.4bpp" - - .align 2 -gFieldObjectPic_Scientist1_7:: @ 84C3838 - .incbin "graphics/map_objects/pics/people/scientist_1/7.4bpp" - - .align 2 -gFieldObjectPic_Scientist1_8:: @ 84C3938 - .incbin "graphics/map_objects/pics/people/scientist_1/8.4bpp" - - .align 2 -gFieldObjectPic_Lass_0:: @ 84C3A38 - .incbin "graphics/map_objects/pics/people/lass/0.4bpp" - - .align 2 -gFieldObjectPic_Lass_1:: @ 84C3B38 - .incbin "graphics/map_objects/pics/people/lass/1.4bpp" - - .align 2 -gFieldObjectPic_Lass_2:: @ 84C3C38 - .incbin "graphics/map_objects/pics/people/lass/2.4bpp" - - .align 2 -gFieldObjectPic_Lass_3:: @ 84C3D38 - .incbin "graphics/map_objects/pics/people/lass/3.4bpp" - - .align 2 -gFieldObjectPic_Lass_4:: @ 84C3E38 - .incbin "graphics/map_objects/pics/people/lass/4.4bpp" - - .align 2 -gFieldObjectPic_Lass_5:: @ 84C3F38 - .incbin "graphics/map_objects/pics/people/lass/5.4bpp" - - .align 2 -gFieldObjectPic_Lass_6:: @ 84C4038 - .incbin "graphics/map_objects/pics/people/lass/6.4bpp" - - .align 2 -gFieldObjectPic_Lass_7:: @ 84C4138 - .incbin "graphics/map_objects/pics/people/lass/7.4bpp" - - .align 2 -gFieldObjectPic_Lass_8:: @ 84C4238 - .incbin "graphics/map_objects/pics/people/lass/8.4bpp" - - .align 2 -gFieldObjectPic_Gentleman_0:: @ 84C4338 - .incbin "graphics/map_objects/pics/people/gentleman/0.4bpp" - - .align 2 -gFieldObjectPic_Gentleman_1:: @ 84C4438 - .incbin "graphics/map_objects/pics/people/gentleman/1.4bpp" - - .align 2 -gFieldObjectPic_Gentleman_2:: @ 84C4538 - .incbin "graphics/map_objects/pics/people/gentleman/2.4bpp" - - .align 2 -gFieldObjectPic_Gentleman_3:: @ 84C4638 - .incbin "graphics/map_objects/pics/people/gentleman/3.4bpp" - - .align 2 -gFieldObjectPic_Gentleman_4:: @ 84C4738 - .incbin "graphics/map_objects/pics/people/gentleman/4.4bpp" - - .align 2 -gFieldObjectPic_Gentleman_5:: @ 84C4838 - .incbin "graphics/map_objects/pics/people/gentleman/5.4bpp" - - .align 2 -gFieldObjectPic_Gentleman_6:: @ 84C4938 - .incbin "graphics/map_objects/pics/people/gentleman/6.4bpp" - - .align 2 -gFieldObjectPic_Gentleman_7:: @ 84C4A38 - .incbin "graphics/map_objects/pics/people/gentleman/7.4bpp" - - .align 2 -gFieldObjectPic_Gentleman_8:: @ 84C4B38 - .incbin "graphics/map_objects/pics/people/gentleman/8.4bpp" - - .align 2 -gFieldObjectPic_Sailor_0:: @ 84C4C38 - .incbin "graphics/map_objects/pics/people/sailor/0.4bpp" - - .align 2 -gFieldObjectPic_Sailor_1:: @ 84C4D38 - .incbin "graphics/map_objects/pics/people/sailor/1.4bpp" - - .align 2 -gFieldObjectPic_Sailor_2:: @ 84C4E38 - .incbin "graphics/map_objects/pics/people/sailor/2.4bpp" - - .align 2 -gFieldObjectPic_Sailor_3:: @ 84C4F38 - .incbin "graphics/map_objects/pics/people/sailor/3.4bpp" - - .align 2 -gFieldObjectPic_Sailor_4:: @ 84C5038 - .incbin "graphics/map_objects/pics/people/sailor/4.4bpp" - - .align 2 -gFieldObjectPic_Sailor_5:: @ 84C5138 - .incbin "graphics/map_objects/pics/people/sailor/5.4bpp" - - .align 2 -gFieldObjectPic_Sailor_6:: @ 84C5238 - .incbin "graphics/map_objects/pics/people/sailor/6.4bpp" - - .align 2 -gFieldObjectPic_Sailor_7:: @ 84C5338 - .incbin "graphics/map_objects/pics/people/sailor/7.4bpp" - - .align 2 -gFieldObjectPic_Sailor_8:: @ 84C5438 - .incbin "graphics/map_objects/pics/people/sailor/8.4bpp" - - .align 2 -gFieldObjectPic_Fisherman_0:: @ 84C5538 - .incbin "graphics/map_objects/pics/people/fisherman/0.4bpp" - - .align 2 -gFieldObjectPic_Fisherman_1:: @ 84C5638 - .incbin "graphics/map_objects/pics/people/fisherman/1.4bpp" - - .align 2 -gFieldObjectPic_Fisherman_2:: @ 84C5738 - .incbin "graphics/map_objects/pics/people/fisherman/2.4bpp" - - .align 2 -gFieldObjectPic_Fisherman_3:: @ 84C5838 - .incbin "graphics/map_objects/pics/people/fisherman/3.4bpp" - - .align 2 -gFieldObjectPic_Fisherman_4:: @ 84C5938 - .incbin "graphics/map_objects/pics/people/fisherman/4.4bpp" - - .align 2 -gFieldObjectPic_Fisherman_5:: @ 84C5A38 - .incbin "graphics/map_objects/pics/people/fisherman/5.4bpp" - - .align 2 -gFieldObjectPic_Fisherman_6:: @ 84C5B38 - .incbin "graphics/map_objects/pics/people/fisherman/6.4bpp" - - .align 2 -gFieldObjectPic_Fisherman_7:: @ 84C5C38 - .incbin "graphics/map_objects/pics/people/fisherman/7.4bpp" - - .align 2 -gFieldObjectPic_Fisherman_8:: @ 84C5D38 - .incbin "graphics/map_objects/pics/people/fisherman/8.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteM_0:: @ 84C5E38 - .incbin "graphics/map_objects/pics/people/running_triathlete_m/0.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteM_1:: @ 84C5F38 - .incbin "graphics/map_objects/pics/people/running_triathlete_m/1.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteM_2:: @ 84C6038 - .incbin "graphics/map_objects/pics/people/running_triathlete_m/2.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteM_3:: @ 84C6138 - .incbin "graphics/map_objects/pics/people/running_triathlete_m/3.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteM_4:: @ 84C6238 - .incbin "graphics/map_objects/pics/people/running_triathlete_m/4.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteM_5:: @ 84C6338 - .incbin "graphics/map_objects/pics/people/running_triathlete_m/5.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteM_6:: @ 84C6438 - .incbin "graphics/map_objects/pics/people/running_triathlete_m/6.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteM_7:: @ 84C6538 - .incbin "graphics/map_objects/pics/people/running_triathlete_m/7.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteM_8:: @ 84C6638 - .incbin "graphics/map_objects/pics/people/running_triathlete_m/8.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteF_0:: @ 84C6738 - .incbin "graphics/map_objects/pics/people/running_triathlete_f/0.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteF_1:: @ 84C6838 - .incbin "graphics/map_objects/pics/people/running_triathlete_f/1.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteF_2:: @ 84C6938 - .incbin "graphics/map_objects/pics/people/running_triathlete_f/2.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteF_3:: @ 84C6A38 - .incbin "graphics/map_objects/pics/people/running_triathlete_f/3.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteF_4:: @ 84C6B38 - .incbin "graphics/map_objects/pics/people/running_triathlete_f/4.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteF_5:: @ 84C6C38 - .incbin "graphics/map_objects/pics/people/running_triathlete_f/5.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteF_6:: @ 84C6D38 - .incbin "graphics/map_objects/pics/people/running_triathlete_f/6.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteF_7:: @ 84C6E38 - .incbin "graphics/map_objects/pics/people/running_triathlete_f/7.4bpp" - - .align 2 -gFieldObjectPic_RunningTriathleteF_8:: @ 84C6F38 - .incbin "graphics/map_objects/pics/people/running_triathlete_f/8.4bpp" - - .align 2 -gFieldObjectPic_TuberF_0:: @ 84C7038 - .incbin "graphics/map_objects/pics/people/tuber_f/0.4bpp" - - .align 2 -gFieldObjectPic_TuberF_1:: @ 84C70B8 - .incbin "graphics/map_objects/pics/people/tuber_f/1.4bpp" - - .align 2 -gFieldObjectPic_TuberF_2:: @ 84C7138 - .incbin "graphics/map_objects/pics/people/tuber_f/2.4bpp" - - .align 2 -gFieldObjectPic_TuberF_3:: @ 84C71B8 - .incbin "graphics/map_objects/pics/people/tuber_f/3.4bpp" - - .align 2 -gFieldObjectPic_TuberF_4:: @ 84C7238 - .incbin "graphics/map_objects/pics/people/tuber_f/4.4bpp" - - .align 2 -gFieldObjectPic_TuberF_5:: @ 84C72B8 - .incbin "graphics/map_objects/pics/people/tuber_f/5.4bpp" - - .align 2 -gFieldObjectPic_TuberF_6:: @ 84C7338 - .incbin "graphics/map_objects/pics/people/tuber_f/6.4bpp" - - .align 2 -gFieldObjectPic_TuberF_7:: @ 84C73B8 - .incbin "graphics/map_objects/pics/people/tuber_f/7.4bpp" - - .align 2 -gFieldObjectPic_TuberF_8:: @ 84C7438 - .incbin "graphics/map_objects/pics/people/tuber_f/8.4bpp" - - .align 2 -gFieldObjectPic_TuberM_0:: @ 84C74B8 - .incbin "graphics/map_objects/pics/people/tuber_m/0.4bpp" - - .align 2 -gFieldObjectPic_TuberM_1:: @ 84C7538 - .incbin "graphics/map_objects/pics/people/tuber_m/1.4bpp" - - .align 2 -gFieldObjectPic_TuberM_2:: @ 84C75B8 - .incbin "graphics/map_objects/pics/people/tuber_m/2.4bpp" - - .align 2 -gFieldObjectPic_TuberM_3:: @ 84C7638 - .incbin "graphics/map_objects/pics/people/tuber_m/3.4bpp" - - .align 2 -gFieldObjectPic_TuberM_4:: @ 84C76B8 - .incbin "graphics/map_objects/pics/people/tuber_m/4.4bpp" - - .align 2 -gFieldObjectPic_TuberM_5:: @ 84C7738 - .incbin "graphics/map_objects/pics/people/tuber_m/5.4bpp" - - .align 2 -gFieldObjectPic_TuberM_6:: @ 84C77B8 - .incbin "graphics/map_objects/pics/people/tuber_m/6.4bpp" - - .align 2 -gFieldObjectPic_TuberM_7:: @ 84C7838 - .incbin "graphics/map_objects/pics/people/tuber_m/7.4bpp" - - .align 2 -gFieldObjectPic_TuberM_8:: @ 84C78B8 - .incbin "graphics/map_objects/pics/people/tuber_m/8.4bpp" - - .align 2 -gFieldObjectPic_Hiker_0:: @ 84C7938 - .incbin "graphics/map_objects/pics/people/hiker/0.4bpp" - - .align 2 -gFieldObjectPic_Hiker_1:: @ 84C7A38 - .incbin "graphics/map_objects/pics/people/hiker/1.4bpp" - - .align 2 -gFieldObjectPic_Hiker_2:: @ 84C7B38 - .incbin "graphics/map_objects/pics/people/hiker/2.4bpp" - - .align 2 -gFieldObjectPic_Hiker_3:: @ 84C7C38 - .incbin "graphics/map_objects/pics/people/hiker/3.4bpp" - - .align 2 -gFieldObjectPic_Hiker_4:: @ 84C7D38 - .incbin "graphics/map_objects/pics/people/hiker/4.4bpp" - - .align 2 -gFieldObjectPic_Hiker_5:: @ 84C7E38 - .incbin "graphics/map_objects/pics/people/hiker/5.4bpp" - - .align 2 -gFieldObjectPic_Hiker_6:: @ 84C7F38 - .incbin "graphics/map_objects/pics/people/hiker/6.4bpp" - - .align 2 -gFieldObjectPic_Hiker_7:: @ 84C8038 - .incbin "graphics/map_objects/pics/people/hiker/7.4bpp" - - .align 2 -gFieldObjectPic_Hiker_8:: @ 84C8138 - .incbin "graphics/map_objects/pics/people/hiker/8.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteM_0:: @ 84C8238 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_m/0.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteM_1:: @ 84C8438 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_m/1.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteM_2:: @ 84C8638 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_m/2.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteM_3:: @ 84C8838 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_m/3.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteM_4:: @ 84C8A38 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_m/4.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteM_5:: @ 84C8C38 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_m/5.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteM_6:: @ 84C8E38 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_m/6.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteM_7:: @ 84C9038 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_m/7.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteM_8:: @ 84C9238 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_m/8.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteF_0:: @ 84C9438 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_f/0.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteF_1:: @ 84C9638 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_f/1.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteF_2:: @ 84C9838 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_f/2.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteF_3:: @ 84C9A38 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_f/3.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteF_4:: @ 84C9C38 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_f/4.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteF_5:: @ 84C9E38 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_f/5.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteF_6:: @ 84CA038 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_f/6.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteF_7:: @ 84CA238 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_f/7.4bpp" - - .align 2 -gFieldObjectPic_CyclingTriathleteF_8:: @ 84CA438 - .incbin "graphics/map_objects/pics/people/cycling_triathlete_f/8.4bpp" - - .align 2 -gFieldObjectPic_Man5_0:: @ 84CA638 - .incbin "graphics/map_objects/pics/people/man_5/0.4bpp" - - .align 2 -gFieldObjectPic_Man5_1:: @ 84CA738 - .incbin "graphics/map_objects/pics/people/man_5/1.4bpp" - - .align 2 -gFieldObjectPic_Man5_2:: @ 84CA838 - .incbin "graphics/map_objects/pics/people/man_5/2.4bpp" - - .align 2 -gFieldObjectPic_Man5_3:: @ 84CA938 - .incbin "graphics/map_objects/pics/people/man_5/3.4bpp" - - .align 2 -gFieldObjectPic_Man5_4:: @ 84CAA38 - .incbin "graphics/map_objects/pics/people/man_5/4.4bpp" - - .align 2 -gFieldObjectPic_Man5_5:: @ 84CAB38 - .incbin "graphics/map_objects/pics/people/man_5/5.4bpp" - - .align 2 -gFieldObjectPic_Man5_6:: @ 84CAC38 - .incbin "graphics/map_objects/pics/people/man_5/6.4bpp" - - .align 2 -gFieldObjectPic_Man5_7:: @ 84CAD38 - .incbin "graphics/map_objects/pics/people/man_5/7.4bpp" - - .align 2 -gFieldObjectPic_Man5_8:: @ 84CAE38 - .incbin "graphics/map_objects/pics/people/man_5/8.4bpp" - - .align 2 -gFieldObjectPic_Man6_0:: @ 84CAF38 - .incbin "graphics/map_objects/pics/people/man_6/0.4bpp" - - .align 2 -gFieldObjectPic_Man6_1:: @ 84CB038 - .incbin "graphics/map_objects/pics/people/man_6/1.4bpp" - - .align 2 -gFieldObjectPic_Man6_2:: @ 84CB138 - .incbin "graphics/map_objects/pics/people/man_6/2.4bpp" - - .align 2 -gFieldObjectPic_Man6_3:: @ 84CB238 - .incbin "graphics/map_objects/pics/people/man_6/3.4bpp" - - .align 2 -gFieldObjectPic_Man6_4:: @ 84CB338 - .incbin "graphics/map_objects/pics/people/man_6/4.4bpp" - - .align 2 -gFieldObjectPic_Man6_5:: @ 84CB438 - .incbin "graphics/map_objects/pics/people/man_6/5.4bpp" - - .align 2 -gFieldObjectPic_Man6_6:: @ 84CB538 - .incbin "graphics/map_objects/pics/people/man_6/6.4bpp" - - .align 2 -gFieldObjectPic_Man6_7:: @ 84CB638 - .incbin "graphics/map_objects/pics/people/man_6/7.4bpp" - - .align 2 -gFieldObjectPic_Man6_8:: @ 84CB738 - .incbin "graphics/map_objects/pics/people/man_6/8.4bpp" - - .align 2 -gFieldObjectPic_Nurse_0:: @ 84CB838 - .incbin "graphics/map_objects/pics/people/nurse/0.4bpp" - - .align 2 -gFieldObjectPic_Nurse_1:: @ 84CB938 - .incbin "graphics/map_objects/pics/people/nurse/1.4bpp" - - .align 2 -gFieldObjectPic_Nurse_2:: @ 84CBA38 - .incbin "graphics/map_objects/pics/people/nurse/2.4bpp" - - .align 2 -gFieldObjectPic_Nurse_3:: @ 84CBB38 - .incbin "graphics/map_objects/pics/people/nurse/3.4bpp" - - .align 2 -gFieldObjectPic_ItemBall:: @ 84CBC38 - .incbin "graphics/map_objects/pics/misc/item_ball.4bpp" - - .align 2 -gFieldObjectPic_ProfBirch_0:: @ 84CBCB8 - .incbin "graphics/map_objects/pics/people/prof_birch/0.4bpp" - - .align 2 -gFieldObjectPic_ProfBirch_1:: @ 84CBDB8 - .incbin "graphics/map_objects/pics/people/prof_birch/1.4bpp" - - .align 2 -gFieldObjectPic_ProfBirch_2:: @ 84CBEB8 - .incbin "graphics/map_objects/pics/people/prof_birch/2.4bpp" - - .align 2 -gFieldObjectPic_ProfBirch_3:: @ 84CBFB8 - .incbin "graphics/map_objects/pics/people/prof_birch/3.4bpp" - - .align 2 -gFieldObjectPic_ProfBirch_4:: @ 84CC0B8 - .incbin "graphics/map_objects/pics/people/prof_birch/4.4bpp" - - .align 2 -gFieldObjectPic_ProfBirch_5:: @ 84CC1B8 - .incbin "graphics/map_objects/pics/people/prof_birch/5.4bpp" - - .align 2 -gFieldObjectPic_ProfBirch_6:: @ 84CC2B8 - .incbin "graphics/map_objects/pics/people/prof_birch/6.4bpp" - - .align 2 -gFieldObjectPic_ProfBirch_7:: @ 84CC3B8 - .incbin "graphics/map_objects/pics/people/prof_birch/7.4bpp" - - .align 2 -gFieldObjectPic_ProfBirch_8:: @ 84CC4B8 - .incbin "graphics/map_objects/pics/people/prof_birch/8.4bpp" - - .align 2 -gFieldObjectPic_ReporterM_0:: @ 84CC5B8 - .incbin "graphics/map_objects/pics/people/reporter_m/0.4bpp" - - .align 2 -gFieldObjectPic_ReporterM_1:: @ 84CC6B8 - .incbin "graphics/map_objects/pics/people/reporter_m/1.4bpp" - - .align 2 -gFieldObjectPic_ReporterM_2:: @ 84CC7B8 - .incbin "graphics/map_objects/pics/people/reporter_m/2.4bpp" - - .align 2 -gFieldObjectPic_ReporterM_3:: @ 84CC8B8 - .incbin "graphics/map_objects/pics/people/reporter_m/3.4bpp" - - .align 2 -gFieldObjectPic_ReporterM_4:: @ 84CC9B8 - .incbin "graphics/map_objects/pics/people/reporter_m/4.4bpp" - - .align 2 -gFieldObjectPic_ReporterM_5:: @ 84CCAB8 - .incbin "graphics/map_objects/pics/people/reporter_m/5.4bpp" - - .align 2 -gFieldObjectPic_ReporterM_6:: @ 84CCBB8 - .incbin "graphics/map_objects/pics/people/reporter_m/6.4bpp" - - .align 2 -gFieldObjectPic_ReporterM_7:: @ 84CCCB8 - .incbin "graphics/map_objects/pics/people/reporter_m/7.4bpp" - - .align 2 -gFieldObjectPic_ReporterM_8:: @ 84CCDB8 - .incbin "graphics/map_objects/pics/people/reporter_m/8.4bpp" - - .align 2 -gFieldObjectPic_ReporterF_0:: @ 84CCEB8 - .incbin "graphics/map_objects/pics/people/reporter_f/0.4bpp" - - .align 2 -gFieldObjectPic_ReporterF_1:: @ 84CCFB8 - .incbin "graphics/map_objects/pics/people/reporter_f/1.4bpp" - - .align 2 -gFieldObjectPic_ReporterF_2:: @ 84CD0B8 - .incbin "graphics/map_objects/pics/people/reporter_f/2.4bpp" - - .align 2 -gFieldObjectPic_ReporterF_3:: @ 84CD1B8 - .incbin "graphics/map_objects/pics/people/reporter_f/3.4bpp" - - .align 2 -gFieldObjectPic_ReporterF_4:: @ 84CD2B8 - .incbin "graphics/map_objects/pics/people/reporter_f/4.4bpp" - - .align 2 -gFieldObjectPic_ReporterF_5:: @ 84CD3B8 - .incbin "graphics/map_objects/pics/people/reporter_f/5.4bpp" - - .align 2 -gFieldObjectPic_ReporterF_6:: @ 84CD4B8 - .incbin "graphics/map_objects/pics/people/reporter_f/6.4bpp" - - .align 2 -gFieldObjectPic_ReporterF_7:: @ 84CD5B8 - .incbin "graphics/map_objects/pics/people/reporter_f/7.4bpp" - - .align 2 -gFieldObjectPic_ReporterF_8:: @ 84CD6B8 - .incbin "graphics/map_objects/pics/people/reporter_f/8.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan1_0:: @ 84CD7B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_1/0.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan1_1:: @ 84CD8B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_1/1.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan1_2:: @ 84CD9B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_1/2.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan1_3:: @ 84CDAB8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_1/3.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan1_4:: @ 84CDBB8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_1/4.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan1_5:: @ 84CDCB8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_1/5.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan1_6:: @ 84CDDB8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_1/6.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan1_7:: @ 84CDEB8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_1/7.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan1_8:: @ 84CDFB8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_1/8.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan2_0:: @ 84CE0B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_2/0.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan2_1:: @ 84CE1B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_2/1.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan2_2:: @ 84CE2B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_2/2.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan2_3:: @ 84CE3B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_2/3.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan2_4:: @ 84CE4B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_2/4.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan2_5:: @ 84CE5B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_2/5.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan2_6:: @ 84CE6B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_2/6.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan2_7:: @ 84CE7B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_2/7.4bpp" - - .align 2 -gFieldObjectPic_MauvilleOldMan2_8:: @ 84CE8B8 - .incbin "graphics/map_objects/pics/people/mauville_old_man_2/8.4bpp" - - .align 2 -gFieldObjectPic_MartEmployee_0:: @ 84CE9B8 - .incbin "graphics/map_objects/pics/people/mart_employee/0.4bpp" - - .align 2 -gFieldObjectPic_MartEmployee_1:: @ 84CEAB8 - .incbin "graphics/map_objects/pics/people/mart_employee/1.4bpp" - - .align 2 -gFieldObjectPic_MartEmployee_2:: @ 84CEBB8 - .incbin "graphics/map_objects/pics/people/mart_employee/2.4bpp" - - .align 2 -gFieldObjectPic_MartEmployee_3:: @ 84CECB8 - .incbin "graphics/map_objects/pics/people/mart_employee/3.4bpp" - - .align 2 -gFieldObjectPic_MartEmployee_4:: @ 84CEDB8 - .incbin "graphics/map_objects/pics/people/mart_employee/4.4bpp" - - .align 2 -gFieldObjectPic_MartEmployee_5:: @ 84CEEB8 - .incbin "graphics/map_objects/pics/people/mart_employee/5.4bpp" - - .align 2 -gFieldObjectPic_MartEmployee_6:: @ 84CEFB8 - .incbin "graphics/map_objects/pics/people/mart_employee/6.4bpp" - - .align 2 -gFieldObjectPic_MartEmployee_7:: @ 84CF0B8 - .incbin "graphics/map_objects/pics/people/mart_employee/7.4bpp" - - .align 2 -gFieldObjectPic_MartEmployee_8:: @ 84CF1B8 - .incbin "graphics/map_objects/pics/people/mart_employee/8.4bpp" - - .align 2 -gFieldObjectPic_RooftopSaleWoman_0:: @ 84CF2B8 - .incbin "graphics/map_objects/pics/people/rooftop_sale_woman/0.4bpp" - - .align 2 -gFieldObjectPic_RooftopSaleWoman_1:: @ 84CF3B8 - .incbin "graphics/map_objects/pics/people/rooftop_sale_woman/1.4bpp" - - .align 2 -gFieldObjectPic_RooftopSaleWoman_2:: @ 84CF4B8 - .incbin "graphics/map_objects/pics/people/rooftop_sale_woman/2.4bpp" - - .align 2 -gFieldObjectPic_RooftopSaleWoman_3:: @ 84CF5B8 - .incbin "graphics/map_objects/pics/people/rooftop_sale_woman/3.4bpp" - - .align 2 -gFieldObjectPic_RooftopSaleWoman_4:: @ 84CF6B8 - .incbin "graphics/map_objects/pics/people/rooftop_sale_woman/4.4bpp" - - .align 2 -gFieldObjectPic_RooftopSaleWoman_5:: @ 84CF7B8 - .incbin "graphics/map_objects/pics/people/rooftop_sale_woman/5.4bpp" - - .align 2 -gFieldObjectPic_RooftopSaleWoman_6:: @ 84CF8B8 - .incbin "graphics/map_objects/pics/people/rooftop_sale_woman/6.4bpp" - - .align 2 -gFieldObjectPic_RooftopSaleWoman_7:: @ 84CF9B8 - .incbin "graphics/map_objects/pics/people/rooftop_sale_woman/7.4bpp" - - .align 2 -gFieldObjectPic_RooftopSaleWoman_8:: @ 84CFAB8 - .incbin "graphics/map_objects/pics/people/rooftop_sale_woman/8.4bpp" - - .align 2 -gFieldObjectPic_Teala_0:: @ 84CFBB8 - .incbin "graphics/map_objects/pics/people/teala/0.4bpp" - - .align 2 -gFieldObjectPic_Teala_1:: @ 84CFCB8 - .incbin "graphics/map_objects/pics/people/teala/1.4bpp" - - .align 2 -gFieldObjectPic_Teala_2:: @ 84CFDB8 - .incbin "graphics/map_objects/pics/people/teala/2.4bpp" - - .align 2 -gFieldObjectPic_Teala_3:: @ 84CFEB8 - .incbin "graphics/map_objects/pics/people/teala/3.4bpp" - - .align 2 -gFieldObjectPic_Teala_4:: @ 84CFFB8 - .incbin "graphics/map_objects/pics/people/teala/4.4bpp" - - .align 2 -gFieldObjectPic_Teala_5:: @ 84D00B8 - .incbin "graphics/map_objects/pics/people/teala/5.4bpp" - - .align 2 -gFieldObjectPic_Teala_6:: @ 84D01B8 - .incbin "graphics/map_objects/pics/people/teala/6.4bpp" - - .align 2 -gFieldObjectPic_Teala_7:: @ 84D02B8 - .incbin "graphics/map_objects/pics/people/teala/7.4bpp" - - .align 2 -gFieldObjectPic_Teala_8:: @ 84D03B8 - .incbin "graphics/map_objects/pics/people/teala/8.4bpp" - - .align 2 -gFieldObjectPic_Artist_0:: @ 84D04B8 - .incbin "graphics/map_objects/pics/people/artist/0.4bpp" - - .align 2 -gFieldObjectPic_Artist_1:: @ 84D05B8 - .incbin "graphics/map_objects/pics/people/artist/1.4bpp" - - .align 2 -gFieldObjectPic_Artist_2:: @ 84D06B8 - .incbin "graphics/map_objects/pics/people/artist/2.4bpp" - - .align 2 -gFieldObjectPic_Artist_3:: @ 84D07B8 - .incbin "graphics/map_objects/pics/people/artist/3.4bpp" - - .align 2 -gFieldObjectPic_Artist_4:: @ 84D08B8 - .incbin "graphics/map_objects/pics/people/artist/4.4bpp" - - .align 2 -gFieldObjectPic_Artist_5:: @ 84D09B8 - .incbin "graphics/map_objects/pics/people/artist/5.4bpp" - - .align 2 -gFieldObjectPic_Artist_6:: @ 84D0AB8 - .incbin "graphics/map_objects/pics/people/artist/6.4bpp" - - .align 2 -gFieldObjectPic_Artist_7:: @ 84D0BB8 - .incbin "graphics/map_objects/pics/people/artist/7.4bpp" - - .align 2 -gFieldObjectPic_Artist_8:: @ 84D0CB8 - .incbin "graphics/map_objects/pics/people/artist/8.4bpp" - - .align 2 -gFieldObjectPic_Cameraman_0:: @ 84D0DB8 - .incbin "graphics/map_objects/pics/people/cameraman/0.4bpp" - - .align 2 -gFieldObjectPic_Cameraman_1:: @ 84D0EB8 - .incbin "graphics/map_objects/pics/people/cameraman/1.4bpp" - - .align 2 -gFieldObjectPic_Cameraman_2:: @ 84D0FB8 - .incbin "graphics/map_objects/pics/people/cameraman/2.4bpp" - - .align 2 -gFieldObjectPic_Cameraman_3:: @ 84D10B8 - .incbin "graphics/map_objects/pics/people/cameraman/3.4bpp" - - .align 2 -gFieldObjectPic_Cameraman_4:: @ 84D11B8 - .incbin "graphics/map_objects/pics/people/cameraman/4.4bpp" - - .align 2 -gFieldObjectPic_Cameraman_5:: @ 84D12B8 - .incbin "graphics/map_objects/pics/people/cameraman/5.4bpp" - - .align 2 -gFieldObjectPic_Cameraman_6:: @ 84D13B8 - .incbin "graphics/map_objects/pics/people/cameraman/6.4bpp" - - .align 2 -gFieldObjectPic_Cameraman_7:: @ 84D14B8 - .incbin "graphics/map_objects/pics/people/cameraman/7.4bpp" - - .align 2 -gFieldObjectPic_Cameraman_8:: @ 84D15B8 - .incbin "graphics/map_objects/pics/people/cameraman/8.4bpp" - - .align 2 -gFieldObjectPic_Scientist2_0:: @ 84D16B8 - .incbin "graphics/map_objects/pics/people/scientist_2/0.4bpp" - - .align 2 -gFieldObjectPic_Scientist2_1:: @ 84D17B8 - .incbin "graphics/map_objects/pics/people/scientist_2/1.4bpp" - - .align 2 -gFieldObjectPic_Scientist2_2:: @ 84D18B8 - .incbin "graphics/map_objects/pics/people/scientist_2/2.4bpp" - - .align 2 -gFieldObjectPic_Scientist2_3:: @ 84D19B8 - .incbin "graphics/map_objects/pics/people/scientist_2/3.4bpp" - - .align 2 -gFieldObjectPic_Scientist2_4:: @ 84D1AB8 - .incbin "graphics/map_objects/pics/people/scientist_2/4.4bpp" - - .align 2 -gFieldObjectPic_Scientist2_5:: @ 84D1BB8 - .incbin "graphics/map_objects/pics/people/scientist_2/5.4bpp" - - .align 2 -gFieldObjectPic_Scientist2_6:: @ 84D1CB8 - .incbin "graphics/map_objects/pics/people/scientist_2/6.4bpp" - - .align 2 -gFieldObjectPic_Scientist2_7:: @ 84D1DB8 - .incbin "graphics/map_objects/pics/people/scientist_2/7.4bpp" - - .align 2 -gFieldObjectPic_Scientist2_8:: @ 84D1EB8 - .incbin "graphics/map_objects/pics/people/scientist_2/8.4bpp" - - .align 2 -gFieldObjectPic_Man7_0:: @ 84D1FB8 - .incbin "graphics/map_objects/pics/people/man_7/0.4bpp" - - .align 2 -gFieldObjectPic_Man7_1:: @ 84D20B8 - .incbin "graphics/map_objects/pics/people/man_7/1.4bpp" - - .align 2 -gFieldObjectPic_Man7_2:: @ 84D21B8 - .incbin "graphics/map_objects/pics/people/man_7/2.4bpp" - - .align 2 -gFieldObjectPic_Man7_3:: @ 84D22B8 - .incbin "graphics/map_objects/pics/people/man_7/3.4bpp" - - .align 2 -gFieldObjectPic_Man7_4:: @ 84D23B8 - .incbin "graphics/map_objects/pics/people/man_7/4.4bpp" - - .align 2 -gFieldObjectPic_Man7_5:: @ 84D24B8 - .incbin "graphics/map_objects/pics/people/man_7/5.4bpp" - - .align 2 -gFieldObjectPic_Man7_6:: @ 84D25B8 - .incbin "graphics/map_objects/pics/people/man_7/6.4bpp" - - .align 2 -gFieldObjectPic_Man7_7:: @ 84D26B8 - .incbin "graphics/map_objects/pics/people/man_7/7.4bpp" - - .align 2 -gFieldObjectPic_Man7_8:: @ 84D27B8 - .incbin "graphics/map_objects/pics/people/man_7/8.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberM_0:: @ 84D28B8 - .incbin "graphics/map_objects/pics/people/aqua_member_m/0.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberM_1:: @ 84D29B8 - .incbin "graphics/map_objects/pics/people/aqua_member_m/1.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberM_2:: @ 84D2AB8 - .incbin "graphics/map_objects/pics/people/aqua_member_m/2.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberM_3:: @ 84D2BB8 - .incbin "graphics/map_objects/pics/people/aqua_member_m/3.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberM_4:: @ 84D2CB8 - .incbin "graphics/map_objects/pics/people/aqua_member_m/4.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberM_5:: @ 84D2DB8 - .incbin "graphics/map_objects/pics/people/aqua_member_m/5.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberM_6:: @ 84D2EB8 - .incbin "graphics/map_objects/pics/people/aqua_member_m/6.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberM_7:: @ 84D2FB8 - .incbin "graphics/map_objects/pics/people/aqua_member_m/7.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberM_8:: @ 84D30B8 - .incbin "graphics/map_objects/pics/people/aqua_member_m/8.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberF_0:: @ 84D31B8 - .incbin "graphics/map_objects/pics/people/aqua_member_f/0.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberF_1:: @ 84D32B8 - .incbin "graphics/map_objects/pics/people/aqua_member_f/1.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberF_2:: @ 84D33B8 - .incbin "graphics/map_objects/pics/people/aqua_member_f/2.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberF_3:: @ 84D34B8 - .incbin "graphics/map_objects/pics/people/aqua_member_f/3.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberF_4:: @ 84D35B8 - .incbin "graphics/map_objects/pics/people/aqua_member_f/4.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberF_5:: @ 84D36B8 - .incbin "graphics/map_objects/pics/people/aqua_member_f/5.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberF_6:: @ 84D37B8 - .incbin "graphics/map_objects/pics/people/aqua_member_f/6.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberF_7:: @ 84D38B8 - .incbin "graphics/map_objects/pics/people/aqua_member_f/7.4bpp" - - .align 2 -gFieldObjectPic_AquaMemberF_8:: @ 84D39B8 - .incbin "graphics/map_objects/pics/people/aqua_member_f/8.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberM_0:: @ 84D3AB8 - .incbin "graphics/map_objects/pics/people/magma_member_m/0.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberM_1:: @ 84D3BB8 - .incbin "graphics/map_objects/pics/people/magma_member_m/1.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberM_2:: @ 84D3CB8 - .incbin "graphics/map_objects/pics/people/magma_member_m/2.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberM_3:: @ 84D3DB8 - .incbin "graphics/map_objects/pics/people/magma_member_m/3.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberM_4:: @ 84D3EB8 - .incbin "graphics/map_objects/pics/people/magma_member_m/4.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberM_5:: @ 84D3FB8 - .incbin "graphics/map_objects/pics/people/magma_member_m/5.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberM_6:: @ 84D40B8 - .incbin "graphics/map_objects/pics/people/magma_member_m/6.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberM_7:: @ 84D41B8 - .incbin "graphics/map_objects/pics/people/magma_member_m/7.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberM_8:: @ 84D42B8 - .incbin "graphics/map_objects/pics/people/magma_member_m/8.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberF_0:: @ 84D43B8 - .incbin "graphics/map_objects/pics/people/magma_member_f/0.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberF_1:: @ 84D44B8 - .incbin "graphics/map_objects/pics/people/magma_member_f/1.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberF_2:: @ 84D45B8 - .incbin "graphics/map_objects/pics/people/magma_member_f/2.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberF_3:: @ 84D46B8 - .incbin "graphics/map_objects/pics/people/magma_member_f/3.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberF_4:: @ 84D47B8 - .incbin "graphics/map_objects/pics/people/magma_member_f/4.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberF_5:: @ 84D48B8 - .incbin "graphics/map_objects/pics/people/magma_member_f/5.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberF_6:: @ 84D49B8 - .incbin "graphics/map_objects/pics/people/magma_member_f/6.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberF_7:: @ 84D4AB8 - .incbin "graphics/map_objects/pics/people/magma_member_f/7.4bpp" - - .align 2 -gFieldObjectPic_MagmaMemberF_8:: @ 84D4BB8 - .incbin "graphics/map_objects/pics/people/magma_member_f/8.4bpp" - - .align 2 -gFieldObjectPic_Sidney_0:: @ 84D4CB8 - .incbin "graphics/map_objects/pics/people/sidney/0.4bpp" - - .align 2 -gFieldObjectPic_Sidney_1:: @ 84D4DB8 - .incbin "graphics/map_objects/pics/people/sidney/1.4bpp" - - .align 2 -gFieldObjectPic_Sidney_2:: @ 84D4EB8 - .incbin "graphics/map_objects/pics/people/sidney/2.4bpp" - - .align 2 -gFieldObjectPic_Phoebe_0:: @ 84D4FB8 - .incbin "graphics/map_objects/pics/people/phoebe/0.4bpp" - - .align 2 -gFieldObjectPic_Phoebe_1:: @ 84D50B8 - .incbin "graphics/map_objects/pics/people/phoebe/1.4bpp" - - .align 2 -gFieldObjectPic_Phoebe_2:: @ 84D51B8 - .incbin "graphics/map_objects/pics/people/phoebe/2.4bpp" - - .align 2 -gFieldObjectPic_Glacia_0:: @ 84D52B8 - .incbin "graphics/map_objects/pics/people/glacia/0.4bpp" - - .align 2 -gFieldObjectPic_Glacia_1:: @ 84D53B8 - .incbin "graphics/map_objects/pics/people/glacia/1.4bpp" - - .align 2 -gFieldObjectPic_Glacia_2:: @ 84D54B8 - .incbin "graphics/map_objects/pics/people/glacia/2.4bpp" - - .align 2 -gFieldObjectPic_Drake_0:: @ 84D55B8 - .incbin "graphics/map_objects/pics/people/drake/0.4bpp" - - .align 2 -gFieldObjectPic_Drake_1:: @ 84D56B8 - .incbin "graphics/map_objects/pics/people/drake/1.4bpp" - - .align 2 -gFieldObjectPic_Drake_2:: @ 84D57B8 - .incbin "graphics/map_objects/pics/people/drake/2.4bpp" - - .align 2 -gFieldObjectPic_Roxanne_0:: @ 84D58B8 - .incbin "graphics/map_objects/pics/people/roxanne/0.4bpp" - - .align 2 -gFieldObjectPic_Roxanne_1:: @ 84D59B8 - .incbin "graphics/map_objects/pics/people/roxanne/1.4bpp" - - .align 2 -gFieldObjectPic_Roxanne_2:: @ 84D5AB8 - .incbin "graphics/map_objects/pics/people/roxanne/2.4bpp" - - .align 2 -gFieldObjectPic_Brawly_0:: @ 84D5BB8 - .incbin "graphics/map_objects/pics/people/brawly/0.4bpp" - - .align 2 -gFieldObjectPic_Brawly_1:: @ 84D5CB8 - .incbin "graphics/map_objects/pics/people/brawly/1.4bpp" - - .align 2 -gFieldObjectPic_Brawly_2:: @ 84D5DB8 - .incbin "graphics/map_objects/pics/people/brawly/2.4bpp" - - .align 2 -gFieldObjectPic_Wattson_0:: @ 84D5EB8 - .incbin "graphics/map_objects/pics/people/wattson/0.4bpp" - - .align 2 -gFieldObjectPic_Wattson_1:: @ 84D5FB8 - .incbin "graphics/map_objects/pics/people/wattson/1.4bpp" - - .align 2 -gFieldObjectPic_Wattson_2:: @ 84D60B8 - .incbin "graphics/map_objects/pics/people/wattson/2.4bpp" - - .align 2 -gFieldObjectPic_Flannery_0:: @ 84D61B8 - .incbin "graphics/map_objects/pics/people/flannery/0.4bpp" - - .align 2 -gFieldObjectPic_Flannery_1:: @ 84D62B8 - .incbin "graphics/map_objects/pics/people/flannery/1.4bpp" - - .align 2 -gFieldObjectPic_Flannery_2:: @ 84D63B8 - .incbin "graphics/map_objects/pics/people/flannery/2.4bpp" - - .align 2 -gFieldObjectPic_Norman_0:: @ 84D64B8 - .incbin "graphics/map_objects/pics/people/norman/0.4bpp" - - .align 2 -gFieldObjectPic_Norman_1:: @ 84D65B8 - .incbin "graphics/map_objects/pics/people/norman/1.4bpp" - - .align 2 -gFieldObjectPic_Norman_2:: @ 84D66B8 - .incbin "graphics/map_objects/pics/people/norman/2.4bpp" - - .align 2 -gFieldObjectPic_Norman_3:: @ 84D67B8 - .incbin "graphics/map_objects/pics/people/norman/3.4bpp" - - .align 2 -gFieldObjectPic_Norman_4:: @ 84D68B8 - .incbin "graphics/map_objects/pics/people/norman/4.4bpp" - - .align 2 -gFieldObjectPic_Norman_5:: @ 84D69B8 - .incbin "graphics/map_objects/pics/people/norman/5.4bpp" - - .align 2 -gFieldObjectPic_Norman_6:: @ 84D6AB8 - .incbin "graphics/map_objects/pics/people/norman/6.4bpp" - - .align 2 -gFieldObjectPic_Norman_7:: @ 84D6BB8 - .incbin "graphics/map_objects/pics/people/norman/7.4bpp" - - .align 2 -gFieldObjectPic_Norman_8:: @ 84D6CB8 - .incbin "graphics/map_objects/pics/people/norman/8.4bpp" - - .align 2 -gFieldObjectPic_Winona_0:: @ 84D6DB8 - .incbin "graphics/map_objects/pics/people/winona/0.4bpp" - - .align 2 -gFieldObjectPic_Winona_1:: @ 84D6EB8 - .incbin "graphics/map_objects/pics/people/winona/1.4bpp" - - .align 2 -gFieldObjectPic_Winona_2:: @ 84D6FB8 - .incbin "graphics/map_objects/pics/people/winona/2.4bpp" - - .align 2 -gFieldObjectPic_Liza_0:: @ 84D70B8 - .incbin "graphics/map_objects/pics/people/liza/0.4bpp" - - .align 2 -gFieldObjectPic_Liza_1:: @ 84D71B8 - .incbin "graphics/map_objects/pics/people/liza/1.4bpp" - - .align 2 -gFieldObjectPic_Liza_2:: @ 84D72B8 - .incbin "graphics/map_objects/pics/people/liza/2.4bpp" - - .align 2 -gFieldObjectPic_Tate_0:: @ 84D73B8 - .incbin "graphics/map_objects/pics/people/tate/0.4bpp" - - .align 2 -gFieldObjectPic_Tate_1:: @ 84D74B8 - .incbin "graphics/map_objects/pics/people/tate/1.4bpp" - - .align 2 -gFieldObjectPic_Tate_2:: @ 84D75B8 - .incbin "graphics/map_objects/pics/people/tate/2.4bpp" - - .align 2 -gFieldObjectPic_Wallace_0:: @ 84D76B8 - .incbin "graphics/map_objects/pics/people/wallace/0.4bpp" - - .align 2 -gFieldObjectPic_Wallace_1:: @ 84D77B8 - .incbin "graphics/map_objects/pics/people/wallace/1.4bpp" - - .align 2 -gFieldObjectPic_Wallace_2:: @ 84D78B8 - .incbin "graphics/map_objects/pics/people/wallace/2.4bpp" - - .align 2 -gFieldObjectPic_Wallace_3:: @ 84D79B8 - .incbin "graphics/map_objects/pics/people/wallace/3.4bpp" - - .align 2 -gFieldObjectPic_Wallace_4:: @ 84D7AB8 - .incbin "graphics/map_objects/pics/people/wallace/4.4bpp" - - .align 2 -gFieldObjectPic_Wallace_5:: @ 84D7BB8 - .incbin "graphics/map_objects/pics/people/wallace/5.4bpp" - - .align 2 -gFieldObjectPic_Wallace_6:: @ 84D7CB8 - .incbin "graphics/map_objects/pics/people/wallace/6.4bpp" - - .align 2 -gFieldObjectPic_Wallace_7:: @ 84D7DB8 - .incbin "graphics/map_objects/pics/people/wallace/7.4bpp" - - .align 2 -gFieldObjectPic_Wallace_8:: @ 84D7EB8 - .incbin "graphics/map_objects/pics/people/wallace/8.4bpp" - - .align 2 -gFieldObjectPic_Steven_0:: @ 84D7FB8 - .incbin "graphics/map_objects/pics/people/steven/0.4bpp" - - .align 2 -gFieldObjectPic_Steven_1:: @ 84D80B8 - .incbin "graphics/map_objects/pics/people/steven/1.4bpp" - - .align 2 -gFieldObjectPic_Steven_2:: @ 84D81B8 - .incbin "graphics/map_objects/pics/people/steven/2.4bpp" - - .align 2 -gFieldObjectPic_Steven_3:: @ 84D82B8 - .incbin "graphics/map_objects/pics/people/steven/3.4bpp" - - .align 2 -gFieldObjectPic_Steven_4:: @ 84D83B8 - .incbin "graphics/map_objects/pics/people/steven/4.4bpp" - - .align 2 -gFieldObjectPic_Steven_5:: @ 84D84B8 - .incbin "graphics/map_objects/pics/people/steven/5.4bpp" - - .align 2 -gFieldObjectPic_Steven_6:: @ 84D85B8 - .incbin "graphics/map_objects/pics/people/steven/6.4bpp" - - .align 2 -gFieldObjectPic_Steven_7:: @ 84D86B8 - .incbin "graphics/map_objects/pics/people/steven/7.4bpp" - - .align 2 -gFieldObjectPic_Steven_8:: @ 84D87B8 - .incbin "graphics/map_objects/pics/people/steven/8.4bpp" - - .align 2 -gFieldObjectPic_Wally_0:: @ 84D88B8 - .incbin "graphics/map_objects/pics/people/wally/0.4bpp" - - .align 2 -gFieldObjectPic_Wally_1:: @ 84D89B8 - .incbin "graphics/map_objects/pics/people/wally/1.4bpp" - - .align 2 -gFieldObjectPic_Wally_2:: @ 84D8AB8 - .incbin "graphics/map_objects/pics/people/wally/2.4bpp" - - .align 2 -gFieldObjectPic_Wally_3:: @ 84D8BB8 - .incbin "graphics/map_objects/pics/people/wally/3.4bpp" - - .align 2 -gFieldObjectPic_Wally_4:: @ 84D8CB8 - .incbin "graphics/map_objects/pics/people/wally/4.4bpp" - - .align 2 -gFieldObjectPic_Wally_5:: @ 84D8DB8 - .incbin "graphics/map_objects/pics/people/wally/5.4bpp" - - .align 2 -gFieldObjectPic_Wally_6:: @ 84D8EB8 - .incbin "graphics/map_objects/pics/people/wally/6.4bpp" - - .align 2 -gFieldObjectPic_Wally_7:: @ 84D8FB8 - .incbin "graphics/map_objects/pics/people/wally/7.4bpp" - - .align 2 -gFieldObjectPic_Wally_8:: @ 84D90B8 - .incbin "graphics/map_objects/pics/people/wally/8.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireLittleBoy_0:: @ 84D91B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/0.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireLittleBoy_1:: @ 84D9238 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/1.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireLittleBoy_2:: @ 84D92B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/2.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireLittleBoy_3:: @ 84D9338 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/3.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireLittleBoy_4:: @ 84D93B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/4.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireLittleBoy_5:: @ 84D9438 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/5.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireLittleBoy_6:: @ 84D94B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/6.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireLittleBoy_7:: @ 84D9538 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/7.4bpp" - - .align 2 -gFieldObjectPic_RubySapphireLittleBoy_8:: @ 84D95B8 - .incbin "graphics/map_objects/pics/people/ruby_sapphire_little_boy/8.4bpp" - - .align 2 -gFieldObjectPic_HotSpringsOldWoman_0:: @ 84D9638 - .incbin "graphics/map_objects/pics/people/hot_springs_old_woman/0.4bpp" - - .align 2 -gFieldObjectPic_HotSpringsOldWoman_1:: @ 84D9738 - .incbin "graphics/map_objects/pics/people/hot_springs_old_woman/1.4bpp" - - .align 2 -gFieldObjectPic_HotSpringsOldWoman_2:: @ 84D9838 - .incbin "graphics/map_objects/pics/people/hot_springs_old_woman/2.4bpp" - - .align 2 -gFieldObjectPic_HotSpringsOldWoman_3:: @ 84D9938 - .incbin "graphics/map_objects/pics/people/hot_springs_old_woman/3.4bpp" - - .align 2 -gFieldObjectPic_HotSpringsOldWoman_4:: @ 84D9A38 - .incbin "graphics/map_objects/pics/people/hot_springs_old_woman/4.4bpp" - - .align 2 -gFieldObjectPic_HotSpringsOldWoman_5:: @ 84D9B38 - .incbin "graphics/map_objects/pics/people/hot_springs_old_woman/5.4bpp" - - .align 2 -gFieldObjectPic_HotSpringsOldWoman_6:: @ 84D9C38 - .incbin "graphics/map_objects/pics/people/hot_springs_old_woman/6.4bpp" - - .align 2 -gFieldObjectPic_HotSpringsOldWoman_7:: @ 84D9D38 - .incbin "graphics/map_objects/pics/people/hot_springs_old_woman/7.4bpp" - - .align 2 -gFieldObjectPic_HotSpringsOldWoman_8:: @ 84D9E38 - .incbin "graphics/map_objects/pics/people/hot_springs_old_woman/8.4bpp" - - .align 2 -gFieldObjectPic_LatiasLatios_0:: @ 84D9F38 - .incbin "graphics/map_objects/pics/pokemon/latias_latios/0.4bpp" - - .align 2 -gFieldObjectPic_LatiasLatios_1:: @ 84DA138 - .incbin "graphics/map_objects/pics/pokemon/latias_latios/1.4bpp" - - .align 2 -gFieldObjectPic_LatiasLatios_2:: @ 84DA338 - .incbin "graphics/map_objects/pics/pokemon/latias_latios/2.4bpp" - - .align 2 -gFieldObjectPic_Boy5_0:: @ 84DA538 - .incbin "graphics/map_objects/pics/people/boy_5/0.4bpp" - - .align 2 -gFieldObjectPic_Boy5_1:: @ 84DA638 - .incbin "graphics/map_objects/pics/people/boy_5/1.4bpp" - - .align 2 -gFieldObjectPic_Boy5_2:: @ 84DA738 - .incbin "graphics/map_objects/pics/people/boy_5/2.4bpp" - - .align 2 -gFieldObjectPic_ContestOldMan_0:: @ 84DA838 - .incbin "graphics/map_objects/pics/people/contest_old_man/0.4bpp" - - .align 2 -gFieldObjectPic_ContestOldMan_1:: @ 84DA938 - .incbin "graphics/map_objects/pics/people/contest_old_man/1.4bpp" - - .align 2 -gFieldObjectPic_ContestOldMan_2:: @ 84DAA38 - .incbin "graphics/map_objects/pics/people/contest_old_man/2.4bpp" - - .align 2 -gFieldObjectPic_ContestOldMan_3:: @ 84DAB38 - .incbin "graphics/map_objects/pics/people/contest_old_man/3.4bpp" - - .align 2 -gFieldObjectPic_ContestOldMan_4:: @ 84DAC38 - .incbin "graphics/map_objects/pics/people/contest_old_man/4.4bpp" - - .align 2 -gFieldObjectPic_ContestOldMan_5:: @ 84DAD38 - .incbin "graphics/map_objects/pics/people/contest_old_man/5.4bpp" - - .align 2 -gFieldObjectPic_ContestOldMan_6:: @ 84DAE38 - .incbin "graphics/map_objects/pics/people/contest_old_man/6.4bpp" - - .align 2 -gFieldObjectPic_ContestOldMan_7:: @ 84DAF38 - .incbin "graphics/map_objects/pics/people/contest_old_man/7.4bpp" - - .align 2 -gFieldObjectPic_ContestOldMan_8:: @ 84DB038 - .incbin "graphics/map_objects/pics/people/contest_old_man/8.4bpp" - - .align 2 -gFieldObjectPic_Archie_0:: @ 84DB138 - .incbin "graphics/map_objects/pics/people/archie/0.4bpp" - - .align 2 -gFieldObjectPic_Archie_1:: @ 84DB238 - .incbin "graphics/map_objects/pics/people/archie/1.4bpp" - - .align 2 -gFieldObjectPic_Archie_2:: @ 84DB338 - .incbin "graphics/map_objects/pics/people/archie/2.4bpp" - - .align 2 -gFieldObjectPic_Archie_3:: @ 84DB438 - .incbin "graphics/map_objects/pics/people/archie/3.4bpp" - - .align 2 -gFieldObjectPic_Archie_4:: @ 84DB538 - .incbin "graphics/map_objects/pics/people/archie/4.4bpp" - - .align 2 -gFieldObjectPic_Archie_5:: @ 84DB638 - .incbin "graphics/map_objects/pics/people/archie/5.4bpp" - - .align 2 -gFieldObjectPic_Archie_6:: @ 84DB738 - .incbin "graphics/map_objects/pics/people/archie/6.4bpp" - - .align 2 -gFieldObjectPic_Archie_7:: @ 84DB838 - .incbin "graphics/map_objects/pics/people/archie/7.4bpp" - - .align 2 -gFieldObjectPic_Archie_8:: @ 84DB938 - .incbin "graphics/map_objects/pics/people/archie/8.4bpp" - - .align 2 -gFieldObjectPic_Maxie_0:: @ 84DBA38 - .incbin "graphics/map_objects/pics/people/maxie/0.4bpp" - - .align 2 -gFieldObjectPic_Maxie_1:: @ 84DBB38 - .incbin "graphics/map_objects/pics/people/maxie/1.4bpp" - - .align 2 -gFieldObjectPic_Maxie_2:: @ 84DBC38 - .incbin "graphics/map_objects/pics/people/maxie/2.4bpp" - - .align 2 -gFieldObjectPic_Maxie_3:: @ 84DBD38 - .incbin "graphics/map_objects/pics/people/maxie/3.4bpp" - - .align 2 -gFieldObjectPic_Maxie_4:: @ 84DBE38 - .incbin "graphics/map_objects/pics/people/maxie/4.4bpp" - - .align 2 -gFieldObjectPic_Maxie_5:: @ 84DBF38 - .incbin "graphics/map_objects/pics/people/maxie/5.4bpp" - - .align 2 -gFieldObjectPic_Maxie_6:: @ 84DC038 - .incbin "graphics/map_objects/pics/people/maxie/6.4bpp" - - .align 2 -gFieldObjectPic_Maxie_7:: @ 84DC138 - .incbin "graphics/map_objects/pics/people/maxie/7.4bpp" - - .align 2 -gFieldObjectPic_Maxie_8:: @ 84DC238 - .incbin "graphics/map_objects/pics/people/maxie/8.4bpp" - - .align 2 -gFieldObjectPic_KyogreFront_0:: @ 84DC338 - .incbin "graphics/map_objects/pics/pokemon/kyogre_front/0.4bpp" - - .align 2 -gFieldObjectPic_KyogreFront_1:: @ 84DC538 - .incbin "graphics/map_objects/pics/pokemon/kyogre_front/1.4bpp" - - .align 2 -gFieldObjectPic_KyogreSide_0:: @ 84DC738 - .incbin "graphics/map_objects/pics/pokemon/kyogre_side/0.4bpp" - - .align 2 -gFieldObjectPic_KyogreSide_1:: @ 84DC938 - .incbin "graphics/map_objects/pics/pokemon/kyogre_side/1.4bpp" - - .align 2 -gFieldObjectPic_GroudonFront_0:: @ 84DCB38 - .incbin "graphics/map_objects/pics/pokemon/groudon_front/0.4bpp" - - .align 2 -gFieldObjectPic_GroudonFront_1:: @ 84DCD38 - .incbin "graphics/map_objects/pics/pokemon/groudon_front/1.4bpp" - - .align 2 -gFieldObjectPic_GroudonSide_0:: @ 84DCF38 - .incbin "graphics/map_objects/pics/pokemon/groudon_side/0.4bpp" - - .align 2 -gFieldObjectPic_GroudonSide_1:: @ 84DD138 - .incbin "graphics/map_objects/pics/pokemon/groudon_side/1.4bpp" - - .align 2 -gFieldObjectPic_Regi:: @ 84DD338 - .incbin "graphics/map_objects/pics/pokemon/regi.4bpp" - - .align 2 -gFieldObjectPic_Skitty_0:: @ 84DD538 - .incbin "graphics/map_objects/pics/pokemon/skitty/0.4bpp" - - .align 2 -gFieldObjectPic_Skitty_1:: @ 84DD5B8 - .incbin "graphics/map_objects/pics/pokemon/skitty/1.4bpp" - - .align 2 -gFieldObjectPic_Skitty_2:: @ 84DD638 - .incbin "graphics/map_objects/pics/pokemon/skitty/2.4bpp" - - .align 2 -gFieldObjectPic_Kecleon_0:: @ 84DD6B8 - .incbin "graphics/map_objects/pics/pokemon/kecleon/0.4bpp" - - .align 2 -gFieldObjectPic_Kecleon_1:: @ 84DD738 - .incbin "graphics/map_objects/pics/pokemon/kecleon/1.4bpp" - - .align 2 -gFieldObjectPic_Kecleon_2:: @ 84DD7B8 - .incbin "graphics/map_objects/pics/pokemon/kecleon/2.4bpp" - - .align 2 -gFieldObjectPic_Rayquaza_0:: @ 84DD838 - .incbin "graphics/map_objects/pics/pokemon/rayquaza/0.4bpp" - - .align 2 -gFieldObjectPic_Rayquaza_1:: @ 84DE038 - .incbin "graphics/map_objects/pics/pokemon/rayquaza/1.4bpp" - - .align 2 -gFieldObjectPic_Rayquaza_2:: @ 84DE838 - .incbin "graphics/map_objects/pics/pokemon/rayquaza/2.4bpp" - - .align 2 -gFieldObjectPic_Rayquaza_3:: @ 84DF038 - .incbin "graphics/map_objects/pics/pokemon/rayquaza/3.4bpp" - - .align 2 -gFieldObjectPic_Rayquaza_4:: @ 84DF838 - .incbin "graphics/map_objects/pics/pokemon/rayquaza/4.4bpp" - - .align 2 -gFieldObjectPic_RayquazaStill:: @ 84E0038 - .incbin "graphics/map_objects/pics/pokemon/rayquaza_still.4bpp" - - .align 2 -gFieldObjectPic_Zigzagoon_0:: @ 84E0838 - .incbin "graphics/map_objects/pics/pokemon/zigzagoon/0.4bpp" - - .align 2 -gFieldObjectPic_Zigzagoon_1:: @ 84E08B8 - .incbin "graphics/map_objects/pics/pokemon/zigzagoon/1.4bpp" - - .align 2 -gFieldObjectPic_Zigzagoon_2:: @ 84E0938 - .incbin "graphics/map_objects/pics/pokemon/zigzagoon/2.4bpp" - - .align 2 -gFieldObjectPic_Pikachu_0:: @ 84E09B8 - .incbin "graphics/map_objects/pics/pokemon/pikachu/0.4bpp" - - .align 2 -gFieldObjectPic_Pikachu_1:: @ 84E0A38 - .incbin "graphics/map_objects/pics/pokemon/pikachu/1.4bpp" - - .align 2 -gFieldObjectPic_Pikachu_2:: @ 84E0AB8 - .incbin "graphics/map_objects/pics/pokemon/pikachu/2.4bpp" - - .align 2 -gFieldObjectPic_Azumarill_0:: @ 84E0B38 - .incbin "graphics/map_objects/pics/pokemon/azumarill/0.4bpp" - - .align 2 -gFieldObjectPic_Azumarill_1:: @ 84E0BB8 - .incbin "graphics/map_objects/pics/pokemon/azumarill/1.4bpp" - - .align 2 -gFieldObjectPic_Azumarill_2:: @ 84E0C38 - .incbin "graphics/map_objects/pics/pokemon/azumarill/2.4bpp" - - .align 2 -gFieldObjectPic_Wingull_0:: @ 84E0CB8 - .incbin "graphics/map_objects/pics/pokemon/wingull/0.4bpp" - - .align 2 -gFieldObjectPic_Wingull_3:: @ 84E0D38 - .incbin "graphics/map_objects/pics/pokemon/wingull/3.4bpp" - - .align 2 -gFieldObjectPic_Wingull_1:: @ 84E0DB8 - .incbin "graphics/map_objects/pics/pokemon/wingull/1.4bpp" - - .align 2 -gFieldObjectPic_Wingull_4:: @ 84E0E38 - .incbin "graphics/map_objects/pics/pokemon/wingull/4.4bpp" - - .align 2 -gFieldObjectPic_Wingull_2:: @ 84E0EB8 - .incbin "graphics/map_objects/pics/pokemon/wingull/2.4bpp" - - .align 2 -gFieldObjectPic_Wingull_5:: @ 84E0F38 - .incbin "graphics/map_objects/pics/pokemon/wingull/5.4bpp" - - .align 2 -gFieldObjectPic_TuberMSwimming_0:: @ 84E0FB8 - .incbin "graphics/map_objects/pics/people/tuber_m_swimming/0.4bpp" - - .align 2 -gFieldObjectPic_TuberMSwimming_1:: @ 84E1038 - .incbin "graphics/map_objects/pics/people/tuber_m_swimming/1.4bpp" - - .align 2 -gFieldObjectPic_TuberMSwimming_2:: @ 84E10B8 - .incbin "graphics/map_objects/pics/people/tuber_m_swimming/2.4bpp" - - .align 2 -gFieldObjectPic_TuberMSwimming_3:: @ 84E1138 - .incbin "graphics/map_objects/pics/people/tuber_m_swimming/3.4bpp" - - .align 2 -gFieldObjectPic_TuberMSwimming_4:: @ 84E11B8 - .incbin "graphics/map_objects/pics/people/tuber_m_swimming/4.4bpp" - - .align 2 -gFieldObjectPic_TuberMSwimming_5:: @ 84E1238 - .incbin "graphics/map_objects/pics/people/tuber_m_swimming/5.4bpp" - - .align 2 -gFieldObjectPic_TuberMSwimming_6:: @ 84E12B8 - .incbin "graphics/map_objects/pics/people/tuber_m_swimming/6.4bpp" - - .align 2 -gFieldObjectPic_TuberMSwimming_7:: @ 84E1338 - .incbin "graphics/map_objects/pics/people/tuber_m_swimming/7.4bpp" - - .align 2 -gFieldObjectPic_TuberMSwimming_8:: @ 84E13B8 - .incbin "graphics/map_objects/pics/people/tuber_m_swimming/8.4bpp" - - .align 2 -gFieldObjectPic_Azurill_0:: @ 84E1438 - .incbin "graphics/map_objects/pics/pokemon/azurill/0.4bpp" - - .align 2 -gFieldObjectPic_Azurill_1:: @ 84E14B8 - .incbin "graphics/map_objects/pics/pokemon/azurill/1.4bpp" - - .align 2 -gFieldObjectPic_Azurill_2:: @ 84E1538 - .incbin "graphics/map_objects/pics/pokemon/azurill/2.4bpp" - - .align 2 -gFieldObjectPic_Mom_0:: @ 84E15B8 - .incbin "graphics/map_objects/pics/people/mom/0.4bpp" - - .align 2 -gFieldObjectPic_Mom_1:: @ 84E16B8 - .incbin "graphics/map_objects/pics/people/mom/1.4bpp" - - .align 2 -gFieldObjectPic_Mom_2:: @ 84E17B8 - .incbin "graphics/map_objects/pics/people/mom/2.4bpp" - - .align 2 -gFieldObjectPic_Mom_3:: @ 84E18B8 - .incbin "graphics/map_objects/pics/people/mom/3.4bpp" - - .align 2 -gFieldObjectPic_Mom_4:: @ 84E19B8 - .incbin "graphics/map_objects/pics/people/mom/4.4bpp" - - .align 2 -gFieldObjectPic_Mom_5:: @ 84E1AB8 - .incbin "graphics/map_objects/pics/people/mom/5.4bpp" - - .align 2 -gFieldObjectPic_Mom_6:: @ 84E1BB8 - .incbin "graphics/map_objects/pics/people/mom/6.4bpp" - - .align 2 -gFieldObjectPic_Mom_7:: @ 84E1CB8 - .incbin "graphics/map_objects/pics/people/mom/7.4bpp" - - .align 2 -gFieldObjectPic_Mom_8:: @ 84E1DB8 - .incbin "graphics/map_objects/pics/people/mom/8.4bpp" - - .align 2 -gFieldObjectPalette22:: @ 84E1EB8 - .incbin "graphics/map_objects/palettes/field_object_palette_22.gbapal" - - .align 2 -gFieldObjectPalette23:: @ 84E1ED8 - .incbin "graphics/map_objects/palettes/field_object_palette_23.gbapal" - - .align 2 -gFieldObjectPalette24:: @ 84E1EF8 - .incbin "graphics/map_objects/palettes/field_object_palette_24.gbapal" - - .align 2 -gFieldObjectPalette25:: @ 84E1F18 - .incbin "graphics/map_objects/palettes/field_object_palette_25.gbapal" - - .align 2 -gFieldObjectPic_UnusedNatuDoll:: @ 84E1F38 - .incbin "graphics/map_objects/pics/dolls/unused_natu_doll.4bpp" - - .align 2 -gFieldObjectPic_UnusedMagnemiteDoll:: @ 84E1FB8 - .incbin "graphics/map_objects/pics/dolls/unused_magnemite_doll.4bpp" - - .align 2 -gFieldObjectPic_UnusedSquirtleDoll:: @ 84E2038 - .incbin "graphics/map_objects/pics/dolls/unused_squirtle_doll.4bpp" - - .align 2 -gFieldObjectPic_UnusedWooperDoll:: @ 84E20B8 - .incbin "graphics/map_objects/pics/dolls/unused_wooper_doll.4bpp" - - .align 2 -gFieldObjectPic_UnusedPikachuDoll:: @ 84E2138 - .incbin "graphics/map_objects/pics/dolls/unused_pikachu_doll.4bpp" - - .align 2 -gFieldObjectPic_UnusedPorygon2Doll:: @ 84E21B8 - .incbin "graphics/map_objects/pics/dolls/unused_porygon2_doll.4bpp" - - .align 2 -gFieldObjectPic_PichuDoll:: @ 84E2238 - .incbin "graphics/map_objects/pics/dolls/pichu_doll.4bpp" - - .align 2 -gFieldObjectPic_PikachuDoll:: @ 84E22B8 - .incbin "graphics/map_objects/pics/dolls/pikachu_doll.4bpp" - - .align 2 -gFieldObjectPic_MarillDoll:: @ 84E2338 - .incbin "graphics/map_objects/pics/dolls/marill_doll.4bpp" - - .align 2 -gFieldObjectPic_TogepiDoll:: @ 84E23B8 - .incbin "graphics/map_objects/pics/dolls/togepi_doll.4bpp" - - .align 2 -gFieldObjectPic_CyndaquilDoll:: @ 84E2438 - .incbin "graphics/map_objects/pics/dolls/cyndaquil_doll.4bpp" - - .align 2 -gFieldObjectPic_ChikoritaDoll:: @ 84E24B8 - .incbin "graphics/map_objects/pics/dolls/chikorita_doll.4bpp" - - .align 2 -gFieldObjectPic_TotodileDoll:: @ 84E2538 - .incbin "graphics/map_objects/pics/dolls/totodile_doll.4bpp" - - .align 2 -gFieldObjectPic_JigglypuffDoll:: @ 84E25B8 - .incbin "graphics/map_objects/pics/dolls/jigglypuff_doll.4bpp" - - .align 2 -gFieldObjectPic_MeowthDoll:: @ 84E2638 - .incbin "graphics/map_objects/pics/dolls/meowth_doll.4bpp" - - .align 2 -gFieldObjectPic_ClefairyDoll:: @ 84E26B8 - .incbin "graphics/map_objects/pics/dolls/clefairy_doll.4bpp" - - .align 2 -gFieldObjectPic_DittoDoll:: @ 84E2738 - .incbin "graphics/map_objects/pics/dolls/ditto_doll.4bpp" - - .align 2 -gFieldObjectPic_SmoochumDoll:: @ 84E27B8 - .incbin "graphics/map_objects/pics/dolls/smoochum_doll.4bpp" - - .align 2 -gFieldObjectPic_TreeckoDoll:: @ 84E2838 - .incbin "graphics/map_objects/pics/dolls/treecko_doll.4bpp" - - .align 2 -gFieldObjectPic_TorchicDoll:: @ 84E28B8 - .incbin "graphics/map_objects/pics/dolls/torchic_doll.4bpp" - - .align 2 -gFieldObjectPic_MudkipDoll:: @ 84E2938 - .incbin "graphics/map_objects/pics/dolls/mudkip_doll.4bpp" - - .align 2 -gFieldObjectPic_DuskullDoll:: @ 84E29B8 - .incbin "graphics/map_objects/pics/dolls/duskull_doll.4bpp" - - .align 2 -gFieldObjectPic_WynautDoll:: @ 84E2A38 - .incbin "graphics/map_objects/pics/dolls/wynaut_doll.4bpp" - - .align 2 -gFieldObjectPic_BaltoyDoll:: @ 84E2AB8 - .incbin "graphics/map_objects/pics/dolls/baltoy_doll.4bpp" - - .align 2 -gFieldObjectPic_KecleonDoll:: @ 84E2B38 - .incbin "graphics/map_objects/pics/dolls/kecleon_doll.4bpp" - - .align 2 -gFieldObjectPic_AzurillDoll:: @ 84E2BB8 - .incbin "graphics/map_objects/pics/dolls/azurill_doll.4bpp" - - .align 2 -gFieldObjectPic_SkittyDoll:: @ 84E2C38 - .incbin "graphics/map_objects/pics/dolls/skitty_doll.4bpp" - - .align 2 -gFieldObjectPic_SwabluDoll:: @ 84E2CB8 - .incbin "graphics/map_objects/pics/dolls/swablu_doll.4bpp" - - .align 2 -gFieldObjectPic_GulpinDoll:: @ 84E2D38 - .incbin "graphics/map_objects/pics/dolls/gulpin_doll.4bpp" - - .align 2 -gFieldObjectPic_LotadDoll:: @ 84E2DB8 - .incbin "graphics/map_objects/pics/dolls/lotad_doll.4bpp" - - .align 2 -gFieldObjectPic_SeedotDoll:: @ 84E2E38 - .incbin "graphics/map_objects/pics/dolls/seedot_doll.4bpp" - - .align 2 -gFieldObjectPic_PikaCushion:: @ 84E2EB8 - .incbin "graphics/map_objects/pics/cushions/pika_cushion.4bpp" - - .align 2 -gFieldObjectPic_RoundCushion:: @ 84E2F38 - .incbin "graphics/map_objects/pics/cushions/round_cushion.4bpp" - - .align 2 -gFieldObjectPic_KissCushion:: @ 84E2FB8 - .incbin "graphics/map_objects/pics/cushions/kiss_cushion.4bpp" - - .align 2 -gFieldObjectPic_ZigzagCushion:: @ 84E3038 - .incbin "graphics/map_objects/pics/cushions/zigzag_cushion.4bpp" - - .align 2 -gFieldObjectPic_SpinCushion:: @ 84E30B8 - .incbin "graphics/map_objects/pics/cushions/spin_cushion.4bpp" - - .align 2 -gFieldObjectPic_DiamondCushion:: @ 84E3138 - .incbin "graphics/map_objects/pics/cushions/diamond_cushion.4bpp" - - .align 2 -gFieldObjectPic_BallCushion:: @ 84E31B8 - .incbin "graphics/map_objects/pics/cushions/ball_cushion.4bpp" - - .align 2 -gFieldObjectPic_GrassCushion:: @ 84E3238 - .incbin "graphics/map_objects/pics/cushions/grass_cushion.4bpp" - - .align 2 -gFieldObjectPic_FireCushion:: @ 84E32B8 - .incbin "graphics/map_objects/pics/cushions/fire_cushion.4bpp" - - .align 2 -gFieldObjectPic_WaterCushion:: @ 84E3338 - .incbin "graphics/map_objects/pics/cushions/water_cushion.4bpp" - - .align 2 -gFieldObjectPic_BigSnorlaxDoll:: @ 84E33B8 - .incbin "graphics/map_objects/pics/dolls/big_snorlax_doll.4bpp" - - .align 2 -gFieldObjectPic_BigRhydonDoll:: @ 84E35B8 - .incbin "graphics/map_objects/pics/dolls/big_rhydon_doll.4bpp" - - .align 2 -gFieldObjectPic_BigLaprasDoll:: @ 84E37B8 - .incbin "graphics/map_objects/pics/dolls/big_lapras_doll.4bpp" - - .align 2 -gFieldObjectPic_BigVenusaurDoll:: @ 84E39B8 - .incbin "graphics/map_objects/pics/dolls/big_venusaur_doll.4bpp" - - .align 2 -gFieldObjectPic_BigCharizardDoll:: @ 84E3BB8 - .incbin "graphics/map_objects/pics/dolls/big_charizard_doll.4bpp" - - .align 2 -gFieldObjectPic_BigBlastoiseDoll:: @ 84E3DB8 - .incbin "graphics/map_objects/pics/dolls/big_blastoise_doll.4bpp" - - .align 2 -gFieldObjectPic_BigWailmerDoll:: @ 84E3FB8 - .incbin "graphics/map_objects/pics/dolls/big_wailmer_doll.4bpp" - - .align 2 -gFieldObjectPic_BigRegirockDoll:: @ 84E41B8 - .incbin "graphics/map_objects/pics/dolls/big_regirock_doll.4bpp" - - .align 2 -gFieldObjectPic_BigRegiceDoll:: @ 84E43B8 - .incbin "graphics/map_objects/pics/dolls/big_regice_doll.4bpp" - - .align 2 -gFieldObjectPic_BigRegisteelDoll:: @ 84E45B8 - .incbin "graphics/map_objects/pics/dolls/big_registeel_doll.4bpp" - - .align 2 -gFieldObjectPic_CuttableTree_0:: @ 84E47B8 - .incbin "graphics/map_objects/pics/misc/cuttable_tree/0.4bpp" - - .align 2 -gFieldObjectPic_CuttableTree_1:: @ 84E4838 - .incbin "graphics/map_objects/pics/misc/cuttable_tree/1.4bpp" - - .align 2 -gFieldObjectPic_CuttableTree_2:: @ 84E48B8 - .incbin "graphics/map_objects/pics/misc/cuttable_tree/2.4bpp" - - .align 2 -gFieldObjectPic_CuttableTree_3:: @ 84E4938 - .incbin "graphics/map_objects/pics/misc/cuttable_tree/3.4bpp" - - .align 2 -gFieldObjectPic_BreakableRock_0:: @ 84E49B8 - .incbin "graphics/map_objects/pics/misc/breakable_rock/0.4bpp" - - .align 2 -gFieldObjectPic_BreakableRock_1:: @ 84E4A38 - .incbin "graphics/map_objects/pics/misc/breakable_rock/1.4bpp" - - .align 2 -gFieldObjectPic_BreakableRock_2:: @ 84E4AB8 - .incbin "graphics/map_objects/pics/misc/breakable_rock/2.4bpp" - - .align 2 -gFieldObjectPic_BreakableRock_3:: @ 84E4B38 - .incbin "graphics/map_objects/pics/misc/breakable_rock/3.4bpp" - - .align 2 -gFieldObjectPic_PushableBoulder:: @ 84E4BB8 - .incbin "graphics/map_objects/pics/misc/pushable_boulder.4bpp" - - .align 2 -gFieldObjectPic_MrBrineysBoat_0:: @ 84E4C38 - .incbin "graphics/map_objects/pics/misc/mr_brineys_boat/0.4bpp" - - .align 2 -gFieldObjectPic_MrBrineysBoat_1:: @ 84E4E38 - .incbin "graphics/map_objects/pics/misc/mr_brineys_boat/1.4bpp" - - .align 2 -gFieldObjectPic_MrBrineysBoat_2:: @ 84E5038 - .incbin "graphics/map_objects/pics/misc/mr_brineys_boat/2.4bpp" - - .align 2 -gFieldObjectPic_Fossil:: @ 84E5238 - .incbin "graphics/map_objects/pics/misc/fossil.4bpp" - - .align 2 -gFieldObjectPic_SubmarineShadow:: @ 84E52B8 - .incbin "graphics/map_objects/pics/misc/submarine_shadow.4bpp" - - .align 2 -gFieldObjectPalette26:: @ 84E5838 - .incbin "graphics/map_objects/palettes/field_object_palette_26.gbapal" - - .align 2 -gFieldObjectPic_Truck:: @ 84E5858 - .incbin "graphics/map_objects/pics/misc/truck.4bpp" - - .align 2 -gFieldObjectPalette14:: @ 84E5CD8 - .incbin "graphics/map_objects/palettes/field_object_palette_14.gbapal" - - .align 2 -gFieldObjectPic_VigorothCarryingBox_0:: @ 84E5CF8 - .incbin "graphics/map_objects/pics/pokemon/vigoroth_carrying_box/0.4bpp" - - .align 2 -gFieldObjectPic_VigorothCarryingBox_1:: @ 84E5EF8 - .incbin "graphics/map_objects/pics/pokemon/vigoroth_carrying_box/1.4bpp" - - .align 2 -gFieldObjectPic_VigorothCarryingBox_2:: @ 84E60F8 - .incbin "graphics/map_objects/pics/pokemon/vigoroth_carrying_box/2.4bpp" - - .align 2 -gFieldObjectPic_VigorothFacingAway_0:: @ 84E62F8 - .incbin "graphics/map_objects/pics/pokemon/vigoroth_facing_away/0.4bpp" - - .align 2 -gFieldObjectPic_VigorothFacingAway_1:: @ 84E64F8 - .incbin "graphics/map_objects/pics/pokemon/vigoroth_facing_away/1.4bpp" - - .align 2 -gFieldObjectPalette15:: @ 84E66F8 - .incbin "graphics/map_objects/palettes/field_object_palette_15.gbapal" - - .align 2 -gFieldObjectPic_BirchsBag:: @ 84E6718 - .incbin "graphics/map_objects/pics/misc/birchs_bag.4bpp" - - .align 2 -gFieldObjectPic_EnemyZigzagoon_0:: @ 84E6798 - .incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/0.4bpp" - - .align 2 -gFieldObjectPic_EnemyZigzagoon_1:: @ 84E6998 - .incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/1.4bpp" - - .align 2 -gFieldObjectPic_EnemyZigzagoon_2:: @ 84E6B98 - .incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/2.4bpp" - - .align 2 -gFieldObjectPic_EnemyZigzagoon_3:: @ 84E6D98 - .incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/3.4bpp" - - .align 2 -gFieldObjectPic_EnemyZigzagoon_4:: @ 84E6F98 - .incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/4.4bpp" - - .align 2 -gFieldObjectPic_EnemyZigzagoon_5:: @ 84E7198 - .incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/5.4bpp" - - .align 2 -gFieldObjectPic_EnemyZigzagoon_6:: @ 84E7398 - .incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/6.4bpp" - - .align 2 -gFieldObjectPic_EnemyZigzagoon_7:: @ 84E7598 - .incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/7.4bpp" - - .align 2 -gFieldObjectPic_EnemyZigzagoon_8:: @ 84E7798 - .incbin "graphics/map_objects/pics/pokemon/enemy_zigzagoon/8.4bpp" - - .align 2 -gFieldObjectPalette16:: @ 84E7998 - .incbin "graphics/map_objects/palettes/field_object_palette_16.gbapal" - - .align 2 -gFieldObjectPic_Poochyena_0:: @ 84E79B8 - .incbin "graphics/map_objects/pics/pokemon/poochyena/0.4bpp" - - .align 2 -gFieldObjectPic_Poochyena_1:: @ 84E7BB8 - .incbin "graphics/map_objects/pics/pokemon/poochyena/1.4bpp" - - .align 2 -gFieldObjectPic_Poochyena_2:: @ 84E7DB8 - .incbin "graphics/map_objects/pics/pokemon/poochyena/2.4bpp" - - .align 2 -gFieldObjectPic_Poochyena_3:: @ 84E7FB8 - .incbin "graphics/map_objects/pics/pokemon/poochyena/3.4bpp" - - .align 2 -gFieldObjectPic_Poochyena_4:: @ 84E81B8 - .incbin "graphics/map_objects/pics/pokemon/poochyena/4.4bpp" - - .align 2 -gFieldObjectPic_Poochyena_5:: @ 84E83B8 - .incbin "graphics/map_objects/pics/pokemon/poochyena/5.4bpp" - - .align 2 -gFieldObjectPic_Poochyena_6:: @ 84E85B8 - .incbin "graphics/map_objects/pics/pokemon/poochyena/6.4bpp" - - .align 2 -gFieldObjectPic_Poochyena_7:: @ 84E87B8 - .incbin "graphics/map_objects/pics/pokemon/poochyena/7.4bpp" - - .align 2 -gFieldObjectPic_Poochyena_8:: @ 84E89B8 - .incbin "graphics/map_objects/pics/pokemon/poochyena/8.4bpp" - - .align 2 -gFieldObjectPalette27:: @ 84E8BB8 - .incbin "graphics/map_objects/palettes/field_object_palette_27.gbapal" - - .align 2 -gFieldObjectPic_CableCar:: @ 84E8BD8 - .incbin "graphics/map_objects/pics/misc/cable_car.4bpp" - - .align 2 -gFieldObjectPalette20:: @ 84E93D8 - .incbin "graphics/map_objects/palettes/field_object_palette_20.gbapal" - - .align 2 -gFieldObjectPic_SSTidal:: @ 84E93F8 - .incbin "graphics/map_objects/pics/misc/ss_tidal.4bpp" - - .align 2 -gFieldObjectPalette21:: @ 84E9B78 - .incbin "graphics/map_objects/palettes/field_object_palette_21.gbapal" - - .align 2 -gFieldEffectObjectPic_BerryTreeGrowthSparkle_0:: @ 84E9B98 - .incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/0.4bpp" - - .align 2 -gFieldEffectObjectPic_BerryTreeGrowthSparkle_1:: @ 84E9C18 - .incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/1.4bpp" - - .align 2 -gFieldEffectObjectPic_BerryTreeGrowthSparkle_2:: @ 84E9C98 - .incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/2.4bpp" - - .align 2 -gFieldEffectObjectPic_BerryTreeGrowthSparkle_3:: @ 84E9D18 - .incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/3.4bpp" - - .align 2 -gFieldEffectObjectPic_BerryTreeGrowthSparkle_4:: @ 84E9D98 - .incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/4.4bpp" - - .align 2 -gFieldEffectObjectPic_BerryTreeGrowthSparkle_5:: @ 84E9E18 - .incbin "graphics/map_objects/pics/effects/berry_tree_growth_sparkle/5.4bpp" - - .align 2 -gFieldObjectPic_BerryTreeDirtPile:: @ 84E9E98 - .incbin "graphics/map_objects/pics/berry_trees/dirt_pile.4bpp" - - .align 2 -gFieldObjectPic_BerryTreeSprout_0:: @ 84E9F18 - .incbin "graphics/map_objects/pics/berry_trees/sprout/0.4bpp" - - .align 2 -gFieldObjectPic_BerryTreeSprout_1:: @ 84E9F98 - .incbin "graphics/map_objects/pics/berry_trees/sprout/1.4bpp" - - .align 2 -gFieldObjectPic_PechaBerryTree_0:: @ 84EA018 - .incbin "graphics/map_objects/pics/berry_trees/pecha/0.4bpp" - - .align 2 -gFieldObjectPic_PechaBerryTree_1:: @ 84EA118 - .incbin "graphics/map_objects/pics/berry_trees/pecha/1.4bpp" - - .align 2 -gFieldObjectPic_PechaBerryTree_2:: @ 84EA218 - .incbin "graphics/map_objects/pics/berry_trees/pecha/2.4bpp" - - .align 2 -gFieldObjectPic_PechaBerryTree_3:: @ 84EA318 - .incbin "graphics/map_objects/pics/berry_trees/pecha/3.4bpp" - - .align 2 -gFieldObjectPic_PechaBerryTree_4:: @ 84EA418 - .incbin "graphics/map_objects/pics/berry_trees/pecha/4.4bpp" - - .align 2 -gFieldObjectPic_PechaBerryTree_5:: @ 84EA518 - .incbin "graphics/map_objects/pics/berry_trees/pecha/5.4bpp" - - .align 2 -gFieldObjectPic_KelpsyBerryTree_0:: @ 84EA618 - .incbin "graphics/map_objects/pics/berry_trees/kelpsy/0.4bpp" - - .align 2 -gFieldObjectPic_KelpsyBerryTree_1:: @ 84EA718 - .incbin "graphics/map_objects/pics/berry_trees/kelpsy/1.4bpp" - - .align 2 -gFieldObjectPic_KelpsyBerryTree_2:: @ 84EA818 - .incbin "graphics/map_objects/pics/berry_trees/kelpsy/2.4bpp" - - .align 2 -gFieldObjectPic_KelpsyBerryTree_3:: @ 84EA918 - .incbin "graphics/map_objects/pics/berry_trees/kelpsy/3.4bpp" - - .align 2 -gFieldObjectPic_KelpsyBerryTree_4:: @ 84EAA18 - .incbin "graphics/map_objects/pics/berry_trees/kelpsy/4.4bpp" - - .align 2 -gFieldObjectPic_KelpsyBerryTree_5:: @ 84EAB18 - .incbin "graphics/map_objects/pics/berry_trees/kelpsy/5.4bpp" - - .align 2 -gFieldObjectPic_WepearBerryTree_0:: @ 84EAC18 - .incbin "graphics/map_objects/pics/berry_trees/wepear/0.4bpp" - - .align 2 -gFieldObjectPic_WepearBerryTree_1:: @ 84EAD18 - .incbin "graphics/map_objects/pics/berry_trees/wepear/1.4bpp" - - .align 2 -gFieldObjectPic_WepearBerryTree_2:: @ 84EAE18 - .incbin "graphics/map_objects/pics/berry_trees/wepear/2.4bpp" - - .align 2 -gFieldObjectPic_WepearBerryTree_3:: @ 84EAF18 - .incbin "graphics/map_objects/pics/berry_trees/wepear/3.4bpp" - - .align 2 -gFieldObjectPic_WepearBerryTree_4:: @ 84EB018 - .incbin "graphics/map_objects/pics/berry_trees/wepear/4.4bpp" - - .align 2 -gFieldObjectPic_WepearBerryTree_5:: @ 84EB118 - .incbin "graphics/map_objects/pics/berry_trees/wepear/5.4bpp" - - .align 2 -gFieldObjectPic_IapapaBerryTree_0:: @ 84EB218 - .incbin "graphics/map_objects/pics/berry_trees/iapapa/0.4bpp" - - .align 2 -gFieldObjectPic_IapapaBerryTree_1:: @ 84EB318 - .incbin "graphics/map_objects/pics/berry_trees/iapapa/1.4bpp" - - .align 2 -gFieldObjectPic_IapapaBerryTree_2:: @ 84EB418 - .incbin "graphics/map_objects/pics/berry_trees/iapapa/2.4bpp" - - .align 2 -gFieldObjectPic_IapapaBerryTree_3:: @ 84EB518 - .incbin "graphics/map_objects/pics/berry_trees/iapapa/3.4bpp" - - .align 2 -gFieldObjectPic_IapapaBerryTree_4:: @ 84EB618 - .incbin "graphics/map_objects/pics/berry_trees/iapapa/4.4bpp" - - .align 2 -gFieldObjectPic_IapapaBerryTree_5:: @ 84EB718 - .incbin "graphics/map_objects/pics/berry_trees/iapapa/5.4bpp" - - .align 2 -gFieldObjectPic_CheriBerryTree_0:: @ 84EB818 - .incbin "graphics/map_objects/pics/berry_trees/cheri/0.4bpp" - - .align 2 -gFieldObjectPic_CheriBerryTree_1:: @ 84EB918 - .incbin "graphics/map_objects/pics/berry_trees/cheri/1.4bpp" - - .align 2 -gFieldObjectPic_CheriBerryTree_2:: @ 84EBA18 - .incbin "graphics/map_objects/pics/berry_trees/cheri/2.4bpp" - - .align 2 -gFieldObjectPic_CheriBerryTree_3:: @ 84EBB18 - .incbin "graphics/map_objects/pics/berry_trees/cheri/3.4bpp" - - .align 2 -gFieldObjectPic_CheriBerryTree_4:: @ 84EBC18 - .incbin "graphics/map_objects/pics/berry_trees/cheri/4.4bpp" - - .align 2 -gFieldObjectPic_CheriBerryTree_5:: @ 84EBD18 - .incbin "graphics/map_objects/pics/berry_trees/cheri/5.4bpp" - - .align 2 -gFieldObjectPic_FigyBerryTree_0:: @ 84EBE18 - .incbin "graphics/map_objects/pics/berry_trees/figy/0.4bpp" - - .align 2 -gFieldObjectPic_FigyBerryTree_1:: @ 84EBF18 - .incbin "graphics/map_objects/pics/berry_trees/figy/1.4bpp" - - .align 2 -gFieldObjectPic_FigyBerryTree_2:: @ 84EC018 - .incbin "graphics/map_objects/pics/berry_trees/figy/2.4bpp" - - .align 2 -gFieldObjectPic_FigyBerryTree_3:: @ 84EC118 - .incbin "graphics/map_objects/pics/berry_trees/figy/3.4bpp" - - .align 2 -gFieldObjectPic_FigyBerryTree_4:: @ 84EC218 - .incbin "graphics/map_objects/pics/berry_trees/figy/4.4bpp" - - .align 2 -gFieldObjectPic_FigyBerryTree_5:: @ 84EC318 - .incbin "graphics/map_objects/pics/berry_trees/figy/5.4bpp" - - .align 2 -gFieldObjectPic_MagoBerryTree_0:: @ 84EC418 - .incbin "graphics/map_objects/pics/berry_trees/mago/0.4bpp" - - .align 2 -gFieldObjectPic_MagoBerryTree_1:: @ 84EC518 - .incbin "graphics/map_objects/pics/berry_trees/mago/1.4bpp" - - .align 2 -gFieldObjectPic_MagoBerryTree_2:: @ 84EC618 - .incbin "graphics/map_objects/pics/berry_trees/mago/2.4bpp" - - .align 2 -gFieldObjectPic_MagoBerryTree_3:: @ 84EC718 - .incbin "graphics/map_objects/pics/berry_trees/mago/3.4bpp" - - .align 2 -gFieldObjectPic_MagoBerryTree_4:: @ 84EC818 - .incbin "graphics/map_objects/pics/berry_trees/mago/4.4bpp" - - .align 2 -gFieldObjectPic_MagoBerryTree_5:: @ 84EC918 - .incbin "graphics/map_objects/pics/berry_trees/mago/5.4bpp" - - .align 2 -gFieldObjectPic_LumBerryTree_0:: @ 84ECA18 - .incbin "graphics/map_objects/pics/berry_trees/lum/0.4bpp" - - .align 2 -gFieldObjectPic_LumBerryTree_1:: @ 84ECB18 - .incbin "graphics/map_objects/pics/berry_trees/lum/1.4bpp" - - .align 2 -gFieldObjectPic_LumBerryTree_2:: @ 84ECC18 - .incbin "graphics/map_objects/pics/berry_trees/lum/2.4bpp" - - .align 2 -gFieldObjectPic_LumBerryTree_3:: @ 84ECD18 - .incbin "graphics/map_objects/pics/berry_trees/lum/3.4bpp" - - .align 2 -gFieldObjectPic_LumBerryTree_4:: @ 84ECE18 - .incbin "graphics/map_objects/pics/berry_trees/lum/4.4bpp" - - .align 2 -gFieldObjectPic_LumBerryTree_5:: @ 84ECF18 - .incbin "graphics/map_objects/pics/berry_trees/lum/5.4bpp" - - .align 2 -gFieldObjectPic_RazzBerryTree_0:: @ 84ED018 - .incbin "graphics/map_objects/pics/berry_trees/razz/0.4bpp" - - .align 2 -gFieldObjectPic_RazzBerryTree_1:: @ 84ED118 - .incbin "graphics/map_objects/pics/berry_trees/razz/1.4bpp" - - .align 2 -gFieldObjectPic_RazzBerryTree_2:: @ 84ED218 - .incbin "graphics/map_objects/pics/berry_trees/razz/2.4bpp" - - .align 2 -gFieldObjectPic_RazzBerryTree_3:: @ 84ED318 - .incbin "graphics/map_objects/pics/berry_trees/razz/3.4bpp" - - .align 2 -gFieldObjectPic_RazzBerryTree_4:: @ 84ED418 - .incbin "graphics/map_objects/pics/berry_trees/razz/4.4bpp" - - .align 2 -gFieldObjectPic_RazzBerryTree_5:: @ 84ED518 - .incbin "graphics/map_objects/pics/berry_trees/razz/5.4bpp" - - .align 2 -gFieldObjectPic_GrepaBerryTree_0:: @ 84ED618 - .incbin "graphics/map_objects/pics/berry_trees/grepa/0.4bpp" - - .align 2 -gFieldObjectPic_GrepaBerryTree_1:: @ 84ED718 - .incbin "graphics/map_objects/pics/berry_trees/grepa/1.4bpp" - - .align 2 -gFieldObjectPic_GrepaBerryTree_2:: @ 84ED818 - .incbin "graphics/map_objects/pics/berry_trees/grepa/2.4bpp" - - .align 2 -gFieldObjectPic_GrepaBerryTree_3:: @ 84ED918 - .incbin "graphics/map_objects/pics/berry_trees/grepa/3.4bpp" - - .align 2 -gFieldObjectPic_GrepaBerryTree_4:: @ 84EDA18 - .incbin "graphics/map_objects/pics/berry_trees/grepa/4.4bpp" - - .align 2 -gFieldObjectPic_GrepaBerryTree_5:: @ 84EDB18 - .incbin "graphics/map_objects/pics/berry_trees/grepa/5.4bpp" - - .align 2 -gFieldObjectPic_RabutaBerryTree_0:: @ 84EDC18 - .incbin "graphics/map_objects/pics/berry_trees/rabuta/0.4bpp" - - .align 2 -gFieldObjectPic_RabutaBerryTree_1:: @ 84EDD18 - .incbin "graphics/map_objects/pics/berry_trees/rabuta/1.4bpp" - - .align 2 -gFieldObjectPic_RabutaBerryTree_2:: @ 84EDE18 - .incbin "graphics/map_objects/pics/berry_trees/rabuta/2.4bpp" - - .align 2 -gFieldObjectPic_RabutaBerryTree_3:: @ 84EDF18 - .incbin "graphics/map_objects/pics/berry_trees/rabuta/3.4bpp" - - .align 2 -gFieldObjectPic_RabutaBerryTree_4:: @ 84EE018 - .incbin "graphics/map_objects/pics/berry_trees/rabuta/4.4bpp" - - .align 2 -gFieldObjectPic_RabutaBerryTree_5:: @ 84EE118 - .incbin "graphics/map_objects/pics/berry_trees/rabuta/5.4bpp" - - .align 2 -gFieldObjectPic_NomelBerryTree_0:: @ 84EE218 - .incbin "graphics/map_objects/pics/berry_trees/nomel/0.4bpp" - - .align 2 -gFieldObjectPic_NomelBerryTree_1:: @ 84EE318 - .incbin "graphics/map_objects/pics/berry_trees/nomel/1.4bpp" - - .align 2 -gFieldObjectPic_NomelBerryTree_2:: @ 84EE418 - .incbin "graphics/map_objects/pics/berry_trees/nomel/2.4bpp" - - .align 2 -gFieldObjectPic_NomelBerryTree_3:: @ 84EE518 - .incbin "graphics/map_objects/pics/berry_trees/nomel/3.4bpp" - - .align 2 -gFieldObjectPic_NomelBerryTree_4:: @ 84EE618 - .incbin "graphics/map_objects/pics/berry_trees/nomel/4.4bpp" - - .align 2 -gFieldObjectPic_NomelBerryTree_5:: @ 84EE718 - .incbin "graphics/map_objects/pics/berry_trees/nomel/5.4bpp" - - .align 2 -gFieldObjectPic_LeppaBerryTree_0:: @ 84EE818 - .incbin "graphics/map_objects/pics/berry_trees/leppa/0.4bpp" - - .align 2 -gFieldObjectPic_LeppaBerryTree_1:: @ 84EE918 - .incbin "graphics/map_objects/pics/berry_trees/leppa/1.4bpp" - - .align 2 -gFieldObjectPic_LeppaBerryTree_2:: @ 84EEA18 - .incbin "graphics/map_objects/pics/berry_trees/leppa/2.4bpp" - - .align 2 -gFieldObjectPic_LeppaBerryTree_3:: @ 84EEB18 - .incbin "graphics/map_objects/pics/berry_trees/leppa/3.4bpp" - - .align 2 -gFieldObjectPic_LeppaBerryTree_4:: @ 84EEC18 - .incbin "graphics/map_objects/pics/berry_trees/leppa/4.4bpp" - - .align 2 -gFieldObjectPic_LeppaBerryTree_5:: @ 84EED18 - .incbin "graphics/map_objects/pics/berry_trees/leppa/5.4bpp" - - .align 2 -gFieldObjectPic_LiechiBerryTree_0:: @ 84EEE18 - .incbin "graphics/map_objects/pics/berry_trees/liechi/0.4bpp" - - .align 2 -gFieldObjectPic_LiechiBerryTree_1:: @ 84EEF18 - .incbin "graphics/map_objects/pics/berry_trees/liechi/1.4bpp" - - .align 2 -gFieldObjectPic_LiechiBerryTree_2:: @ 84EF018 - .incbin "graphics/map_objects/pics/berry_trees/liechi/2.4bpp" - - .align 2 -gFieldObjectPic_LiechiBerryTree_3:: @ 84EF118 - .incbin "graphics/map_objects/pics/berry_trees/liechi/3.4bpp" - - .align 2 -gFieldObjectPic_LiechiBerryTree_4:: @ 84EF218 - .incbin "graphics/map_objects/pics/berry_trees/liechi/4.4bpp" - - .align 2 -gFieldObjectPic_LiechiBerryTree_5:: @ 84EF318 - .incbin "graphics/map_objects/pics/berry_trees/liechi/5.4bpp" - - .align 2 -gFieldObjectPic_HondewBerryTree_0:: @ 84EF418 - .incbin "graphics/map_objects/pics/berry_trees/hondew/0.4bpp" - - .align 2 -gFieldObjectPic_HondewBerryTree_1:: @ 84EF518 - .incbin "graphics/map_objects/pics/berry_trees/hondew/1.4bpp" - - .align 2 -gFieldObjectPic_HondewBerryTree_2:: @ 84EF618 - .incbin "graphics/map_objects/pics/berry_trees/hondew/2.4bpp" - - .align 2 -gFieldObjectPic_HondewBerryTree_3:: @ 84EF718 - .incbin "graphics/map_objects/pics/berry_trees/hondew/3.4bpp" - - .align 2 -gFieldObjectPic_HondewBerryTree_4:: @ 84EF818 - .incbin "graphics/map_objects/pics/berry_trees/hondew/4.4bpp" - - .align 2 -gFieldObjectPic_HondewBerryTree_5:: @ 84EF918 - .incbin "graphics/map_objects/pics/berry_trees/hondew/5.4bpp" - - .align 2 -gFieldObjectPic_AguavBerryTree_0:: @ 84EFA18 - .incbin "graphics/map_objects/pics/berry_trees/aguav/0.4bpp" - - .align 2 -gFieldObjectPic_AguavBerryTree_1:: @ 84EFB18 - .incbin "graphics/map_objects/pics/berry_trees/aguav/1.4bpp" - - .align 2 -gFieldObjectPic_AguavBerryTree_2:: @ 84EFC18 - .incbin "graphics/map_objects/pics/berry_trees/aguav/2.4bpp" - - .align 2 -gFieldObjectPic_AguavBerryTree_3:: @ 84EFD18 - .incbin "graphics/map_objects/pics/berry_trees/aguav/3.4bpp" - - .align 2 -gFieldObjectPic_AguavBerryTree_4:: @ 84EFE18 - .incbin "graphics/map_objects/pics/berry_trees/aguav/4.4bpp" - - .align 2 -gFieldObjectPic_AguavBerryTree_5:: @ 84EFF18 - .incbin "graphics/map_objects/pics/berry_trees/aguav/5.4bpp" - - .align 2 -gFieldObjectPic_WikiBerryTree_0:: @ 84F0018 - .incbin "graphics/map_objects/pics/berry_trees/wiki/0.4bpp" - - .align 2 -gFieldObjectPic_WikiBerryTree_1:: @ 84F0118 - .incbin "graphics/map_objects/pics/berry_trees/wiki/1.4bpp" - - .align 2 -gFieldObjectPic_WikiBerryTree_2:: @ 84F0218 - .incbin "graphics/map_objects/pics/berry_trees/wiki/2.4bpp" - - .align 2 -gFieldObjectPic_WikiBerryTree_3:: @ 84F0318 - .incbin "graphics/map_objects/pics/berry_trees/wiki/3.4bpp" - - .align 2 -gFieldObjectPic_WikiBerryTree_4:: @ 84F0418 - .incbin "graphics/map_objects/pics/berry_trees/wiki/4.4bpp" - - .align 2 -gFieldObjectPic_WikiBerryTree_5:: @ 84F0518 - .incbin "graphics/map_objects/pics/berry_trees/wiki/5.4bpp" - - .align 2 -gFieldObjectPic_PomegBerryTree_0:: @ 84F0618 - .incbin "graphics/map_objects/pics/berry_trees/pomeg/0.4bpp" - - .align 2 -gFieldObjectPic_PomegBerryTree_1:: @ 84F0718 - .incbin "graphics/map_objects/pics/berry_trees/pomeg/1.4bpp" - - .align 2 -gFieldObjectPic_PomegBerryTree_2:: @ 84F0818 - .incbin "graphics/map_objects/pics/berry_trees/pomeg/2.4bpp" - - .align 2 -gFieldObjectPic_PomegBerryTree_3:: @ 84F0918 - .incbin "graphics/map_objects/pics/berry_trees/pomeg/3.4bpp" - - .align 2 -gFieldObjectPic_PomegBerryTree_4:: @ 84F0A18 - .incbin "graphics/map_objects/pics/berry_trees/pomeg/4.4bpp" - - .align 2 -gFieldObjectPic_PomegBerryTree_5:: @ 84F0B18 - .incbin "graphics/map_objects/pics/berry_trees/pomeg/5.4bpp" - - .align 2 -gFieldObjectPic_RawstBerryTree_0:: @ 84F0C18 - .incbin "graphics/map_objects/pics/berry_trees/rawst/0.4bpp" - - .align 2 -gFieldObjectPic_RawstBerryTree_1:: @ 84F0D18 - .incbin "graphics/map_objects/pics/berry_trees/rawst/1.4bpp" - - .align 2 -gFieldObjectPic_RawstBerryTree_2:: @ 84F0E18 - .incbin "graphics/map_objects/pics/berry_trees/rawst/2.4bpp" - - .align 2 -gFieldObjectPic_RawstBerryTree_3:: @ 84F0F18 - .incbin "graphics/map_objects/pics/berry_trees/rawst/3.4bpp" - - .align 2 -gFieldObjectPic_RawstBerryTree_4:: @ 84F1018 - .incbin "graphics/map_objects/pics/berry_trees/rawst/4.4bpp" - - .align 2 -gFieldObjectPic_RawstBerryTree_5:: @ 84F1118 - .incbin "graphics/map_objects/pics/berry_trees/rawst/5.4bpp" - - .align 2 -gFieldObjectPic_SpelonBerryTree_0:: @ 84F1218 - .incbin "graphics/map_objects/pics/berry_trees/spelon/0.4bpp" - - .align 2 -gFieldObjectPic_SpelonBerryTree_1:: @ 84F1318 - .incbin "graphics/map_objects/pics/berry_trees/spelon/1.4bpp" - - .align 2 -gFieldObjectPic_SpelonBerryTree_2:: @ 84F1418 - .incbin "graphics/map_objects/pics/berry_trees/spelon/2.4bpp" - - .align 2 -gFieldObjectPic_SpelonBerryTree_3:: @ 84F1518 - .incbin "graphics/map_objects/pics/berry_trees/spelon/3.4bpp" - - .align 2 -gFieldObjectPic_SpelonBerryTree_4:: @ 84F1618 - .incbin "graphics/map_objects/pics/berry_trees/spelon/4.4bpp" - - .align 2 -gFieldObjectPic_SpelonBerryTree_5:: @ 84F1718 - .incbin "graphics/map_objects/pics/berry_trees/spelon/5.4bpp" - - .align 2 -gFieldObjectPic_ChestoBerryTree_0:: @ 84F1818 - .incbin "graphics/map_objects/pics/berry_trees/chesto/0.4bpp" - - .align 2 -gFieldObjectPic_ChestoBerryTree_1:: @ 84F1918 - .incbin "graphics/map_objects/pics/berry_trees/chesto/1.4bpp" - - .align 2 -gFieldObjectPic_ChestoBerryTree_2:: @ 84F1A18 - .incbin "graphics/map_objects/pics/berry_trees/chesto/2.4bpp" - - .align 2 -gFieldObjectPic_ChestoBerryTree_3:: @ 84F1B18 - .incbin "graphics/map_objects/pics/berry_trees/chesto/3.4bpp" - - .align 2 -gFieldObjectPic_ChestoBerryTree_4:: @ 84F1C18 - .incbin "graphics/map_objects/pics/berry_trees/chesto/4.4bpp" - - .align 2 -gFieldObjectPic_ChestoBerryTree_5:: @ 84F1D18 - .incbin "graphics/map_objects/pics/berry_trees/chesto/5.4bpp" - - .align 2 -gFieldObjectPic_OranBerryTree_0:: @ 84F1E18 - .incbin "graphics/map_objects/pics/berry_trees/oran/0.4bpp" - - .align 2 -gFieldObjectPic_OranBerryTree_1:: @ 84F1F18 - .incbin "graphics/map_objects/pics/berry_trees/oran/1.4bpp" - - .align 2 -gFieldObjectPic_OranBerryTree_2:: @ 84F2018 - .incbin "graphics/map_objects/pics/berry_trees/oran/2.4bpp" - - .align 2 -gFieldObjectPic_OranBerryTree_3:: @ 84F2118 - .incbin "graphics/map_objects/pics/berry_trees/oran/3.4bpp" - - .align 2 -gFieldObjectPic_OranBerryTree_4:: @ 84F2218 - .incbin "graphics/map_objects/pics/berry_trees/oran/4.4bpp" - - .align 2 -gFieldObjectPic_OranBerryTree_5:: @ 84F2318 - .incbin "graphics/map_objects/pics/berry_trees/oran/5.4bpp" - - .align 2 -gFieldObjectPic_PersimBerryTree_0:: @ 84F2418 - .incbin "graphics/map_objects/pics/berry_trees/persim/0.4bpp" - - .align 2 -gFieldObjectPic_PersimBerryTree_1:: @ 84F2518 - .incbin "graphics/map_objects/pics/berry_trees/persim/1.4bpp" - - .align 2 -gFieldObjectPic_PersimBerryTree_2:: @ 84F2618 - .incbin "graphics/map_objects/pics/berry_trees/persim/2.4bpp" - - .align 2 -gFieldObjectPic_PersimBerryTree_3:: @ 84F2718 - .incbin "graphics/map_objects/pics/berry_trees/persim/3.4bpp" - - .align 2 -gFieldObjectPic_PersimBerryTree_4:: @ 84F2818 - .incbin "graphics/map_objects/pics/berry_trees/persim/4.4bpp" - - .align 2 -gFieldObjectPic_PersimBerryTree_5:: @ 84F2918 - .incbin "graphics/map_objects/pics/berry_trees/persim/5.4bpp" - - .align 2 -gFieldObjectPic_SitrusBerryTree_0:: @ 84F2A18 - .incbin "graphics/map_objects/pics/berry_trees/sitrus/0.4bpp" - - .align 2 -gFieldObjectPic_SitrusBerryTree_1:: @ 84F2B18 - .incbin "graphics/map_objects/pics/berry_trees/sitrus/1.4bpp" - - .align 2 -gFieldObjectPic_SitrusBerryTree_2:: @ 84F2C18 - .incbin "graphics/map_objects/pics/berry_trees/sitrus/2.4bpp" - - .align 2 -gFieldObjectPic_SitrusBerryTree_3:: @ 84F2D18 - .incbin "graphics/map_objects/pics/berry_trees/sitrus/3.4bpp" - - .align 2 -gFieldObjectPic_SitrusBerryTree_4:: @ 84F2E18 - .incbin "graphics/map_objects/pics/berry_trees/sitrus/4.4bpp" - - .align 2 -gFieldObjectPic_SitrusBerryTree_5:: @ 84F2F18 - .incbin "graphics/map_objects/pics/berry_trees/sitrus/5.4bpp" - - .align 2 -gFieldObjectPic_AspearBerryTree_0:: @ 84F3018 - .incbin "graphics/map_objects/pics/berry_trees/aspear/0.4bpp" - - .align 2 -gFieldObjectPic_AspearBerryTree_1:: @ 84F3118 - .incbin "graphics/map_objects/pics/berry_trees/aspear/1.4bpp" - - .align 2 -gFieldObjectPic_AspearBerryTree_2:: @ 84F3218 - .incbin "graphics/map_objects/pics/berry_trees/aspear/2.4bpp" - - .align 2 -gFieldObjectPic_AspearBerryTree_3:: @ 84F3318 - .incbin "graphics/map_objects/pics/berry_trees/aspear/3.4bpp" - - .align 2 -gFieldObjectPic_AspearBerryTree_4:: @ 84F3418 - .incbin "graphics/map_objects/pics/berry_trees/aspear/4.4bpp" - - .align 2 -gFieldObjectPic_AspearBerryTree_5:: @ 84F3518 - .incbin "graphics/map_objects/pics/berry_trees/aspear/5.4bpp" - - .align 2 -gFieldObjectPic_PamtreBerryTree_0:: @ 84F3618 - .incbin "graphics/map_objects/pics/berry_trees/pamtre/0.4bpp" - - .align 2 -gFieldObjectPic_PamtreBerryTree_1:: @ 84F3718 - .incbin "graphics/map_objects/pics/berry_trees/pamtre/1.4bpp" - - .align 2 -gFieldObjectPic_PamtreBerryTree_2:: @ 84F3818 - .incbin "graphics/map_objects/pics/berry_trees/pamtre/2.4bpp" - - .align 2 -gFieldObjectPic_PamtreBerryTree_3:: @ 84F3918 - .incbin "graphics/map_objects/pics/berry_trees/pamtre/3.4bpp" - - .align 2 -gFieldObjectPic_PamtreBerryTree_4:: @ 84F3A18 - .incbin "graphics/map_objects/pics/berry_trees/pamtre/4.4bpp" - - .align 2 -gFieldObjectPic_PamtreBerryTree_5:: @ 84F3B18 - .incbin "graphics/map_objects/pics/berry_trees/pamtre/5.4bpp" - - .align 2 -gFieldObjectPic_CornnBerryTree_0:: @ 84F3C18 - .incbin "graphics/map_objects/pics/berry_trees/cornn/0.4bpp" - - .align 2 -gFieldObjectPic_CornnBerryTree_1:: @ 84F3D18 - .incbin "graphics/map_objects/pics/berry_trees/cornn/1.4bpp" - - .align 2 -gFieldObjectPic_CornnBerryTree_2:: @ 84F3E18 - .incbin "graphics/map_objects/pics/berry_trees/cornn/2.4bpp" - - .align 2 -gFieldObjectPic_CornnBerryTree_3:: @ 84F3F18 - .incbin "graphics/map_objects/pics/berry_trees/cornn/3.4bpp" - - .align 2 -gFieldObjectPic_CornnBerryTree_4:: @ 84F4018 - .incbin "graphics/map_objects/pics/berry_trees/cornn/4.4bpp" - - .align 2 -gFieldObjectPic_CornnBerryTree_5:: @ 84F4118 - .incbin "graphics/map_objects/pics/berry_trees/cornn/5.4bpp" - - .align 2 -gFieldObjectPic_LansatBerryTree_0:: @ 84F4218 - .incbin "graphics/map_objects/pics/berry_trees/lansat/0.4bpp" - - .align 2 -gFieldObjectPic_LansatBerryTree_1:: @ 84F4318 - .incbin "graphics/map_objects/pics/berry_trees/lansat/1.4bpp" - - .align 2 -gFieldObjectPic_LansatBerryTree_2:: @ 84F4418 - .incbin "graphics/map_objects/pics/berry_trees/lansat/2.4bpp" - - .align 2 -gFieldObjectPic_LansatBerryTree_3:: @ 84F4518 - .incbin "graphics/map_objects/pics/berry_trees/lansat/3.4bpp" - - .align 2 -gFieldObjectPic_LansatBerryTree_4:: @ 84F4618 - .incbin "graphics/map_objects/pics/berry_trees/lansat/4.4bpp" - - .align 2 -gFieldObjectPic_LansatBerryTree_5:: @ 84F4718 - .incbin "graphics/map_objects/pics/berry_trees/lansat/5.4bpp" - - .align 2 -gFieldObjectPic_DurinBerryTree_0:: @ 84F4818 - .incbin "graphics/map_objects/pics/berry_trees/durin/0.4bpp" - - .align 2 -gFieldObjectPic_DurinBerryTree_1:: @ 84F4918 - .incbin "graphics/map_objects/pics/berry_trees/durin/1.4bpp" - - .align 2 -gFieldObjectPic_DurinBerryTree_2:: @ 84F4A18 - .incbin "graphics/map_objects/pics/berry_trees/durin/2.4bpp" - - .align 2 -gFieldObjectPic_DurinBerryTree_3:: @ 84F4B18 - .incbin "graphics/map_objects/pics/berry_trees/durin/3.4bpp" - - .align 2 -gFieldObjectPic_DurinBerryTree_4:: @ 84F4C18 - .incbin "graphics/map_objects/pics/berry_trees/durin/4.4bpp" - - .align 2 -gFieldObjectPic_DurinBerryTree_5:: @ 84F4D18 - .incbin "graphics/map_objects/pics/berry_trees/durin/5.4bpp" - - .align 2 -gFieldObjectPic_TamatoBerryTree_0:: @ 84F4E18 - .incbin "graphics/map_objects/pics/berry_trees/tamato/0.4bpp" - - .align 2 -gFieldObjectPic_TamatoBerryTree_1:: @ 84F4F18 - .incbin "graphics/map_objects/pics/berry_trees/tamato/1.4bpp" - - .align 2 -gFieldObjectPic_TamatoBerryTree_2:: @ 84F5018 - .incbin "graphics/map_objects/pics/berry_trees/tamato/2.4bpp" - - .align 2 -gFieldObjectPic_TamatoBerryTree_3:: @ 84F5118 - .incbin "graphics/map_objects/pics/berry_trees/tamato/3.4bpp" - - .align 2 -gFieldObjectPic_TamatoBerryTree_4:: @ 84F5218 - .incbin "graphics/map_objects/pics/berry_trees/tamato/4.4bpp" - - .align 2 -gFieldObjectPic_TamatoBerryTree_5:: @ 84F5318 - .incbin "graphics/map_objects/pics/berry_trees/tamato/5.4bpp" - - .align 2 -gFieldEffectObjectPic_SurfBlob_0:: @ 84F5418 - .incbin "graphics/map_objects/pics/effects/surf_blob/0.4bpp" - - .align 2 -gFieldEffectObjectPic_SurfBlob_1:: @ 84F5618 - .incbin "graphics/map_objects/pics/effects/surf_blob/1.4bpp" - - .align 2 -gFieldEffectObjectPic_SurfBlob_2:: @ 84F5818 - .incbin "graphics/map_objects/pics/effects/surf_blob/2.4bpp" - - .align 2 -gFieldObjectPic_QuintyPlump_0:: @ 84F5A18 - .incbin "graphics/map_objects/pics/people/quinty_plump/0.4bpp" - - .align 2 -gFieldObjectPic_QuintyPlump_1:: @ 84F5C18 - .incbin "graphics/map_objects/pics/people/quinty_plump/1.4bpp" - - .align 2 -gFieldObjectPic_QuintyPlump_2:: @ 84F5E18 - .incbin "graphics/map_objects/pics/people/quinty_plump/2.4bpp" - - .align 2 -gFieldObjectPic_QuintyPlump_3:: @ 84F6018 - .incbin "graphics/map_objects/pics/people/quinty_plump/3.4bpp" - - .align 2 -gFieldObjectPic_QuintyPlump_4:: @ 84F6218 - .incbin "graphics/map_objects/pics/people/quinty_plump/4.4bpp" - - .align 2 -gFieldObjectPic_QuintyPlump_5:: @ 84F6418 - .incbin "graphics/map_objects/pics/people/quinty_plump/5.4bpp" - - .align 2 -gFieldObjectPic_QuintyPlump_6:: @ 84F6618 - .incbin "graphics/map_objects/pics/people/quinty_plump/6.4bpp" - - .align 2 -gFieldObjectPalette12:: @ 84F6818 - .incbin "graphics/map_objects/palettes/field_object_palette_12.gbapal" - - .align 2 -gFieldObjectPalette13:: @ 84F6838 - .incbin "graphics/map_objects/palettes/field_object_palette_13.gbapal" - - .align 2 -gFieldEffectObjectPic_ShadowSmall:: @ 84F6858 - .incbin "graphics/map_objects/pics/effects/shadow_small.4bpp" - - .align 2 -gFieldEffectObjectPic_ShadowMedium:: @ 84F6878 - .incbin "graphics/map_objects/pics/effects/shadow_medium.4bpp" - - .align 2 -gFieldEffectObjectPic_ShadowLarge:: @ 84F68B8 - .incbin "graphics/map_objects/pics/effects/shadow_large.4bpp" - - .align 2 -gFieldEffectObjectPic_ShadowExtraLarge:: @ 84F6938 - .incbin "graphics/map_objects/pics/effects/shadow_extra_large.4bpp" - -gUnknown_084F6D38:: @ 84F6D38 - .incbin "graphics/map_objects/pics/effects/unknown_4F6D38/0.4bpp" - - .align 2 -gFieldEffectObjectPalette6:: @ 84F6E98 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_06.gbapal" - - .align 2 -gFieldEffectObjectPic_Ripple_0:: @ 84F6EB8 - .incbin "graphics/map_objects/pics/effects/ripple/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Ripple_1:: @ 84F6F38 - .incbin "graphics/map_objects/pics/effects/ripple/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Ripple_2:: @ 84F6FB8 - .incbin "graphics/map_objects/pics/effects/ripple/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Ripple_3:: @ 84F7038 - .incbin "graphics/map_objects/pics/effects/ripple/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Ripple_4:: @ 84F70B8 - .incbin "graphics/map_objects/pics/effects/ripple/4.4bpp" - - .align 2 -gFieldEffectObjectPic_Ash_0:: @ 84F7138 - .incbin "graphics/map_objects/pics/effects/ash/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Ash_1:: @ 84F71B8 - .incbin "graphics/map_objects/pics/effects/ash/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Ash_2:: @ 84F7238 - .incbin "graphics/map_objects/pics/effects/ash/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Ash_3:: @ 84F72B8 - .incbin "graphics/map_objects/pics/effects/ash/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Ash_4:: @ 84F7338 - .incbin "graphics/map_objects/pics/effects/ash/4.4bpp" - - .align 2 -gFieldEffectObjectPic_Arrow_0:: @ 84F73B8 - .incbin "graphics/map_objects/pics/effects/arrow/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Arrow_1:: @ 84F7438 - .incbin "graphics/map_objects/pics/effects/arrow/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Arrow_2:: @ 84F74B8 - .incbin "graphics/map_objects/pics/effects/arrow/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Arrow_3:: @ 84F7538 - .incbin "graphics/map_objects/pics/effects/arrow/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Arrow_4:: @ 84F75B8 - .incbin "graphics/map_objects/pics/effects/arrow/4.4bpp" - - .align 2 -gFieldEffectObjectPic_Arrow_5:: @ 84F7638 - .incbin "graphics/map_objects/pics/effects/arrow/5.4bpp" - - .align 2 -gFieldEffectObjectPic_Arrow_6:: @ 84F76B8 - .incbin "graphics/map_objects/pics/effects/arrow/6.4bpp" - - .align 2 -gFieldEffectObjectPic_Arrow_7:: @ 84F7738 - .incbin "graphics/map_objects/pics/effects/arrow/7.4bpp" - - .align 2 -gFieldEffectObjectPalette0:: @ 84F77B8 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_00.gbapal" - - .align 2 -gFieldEffectObjectPalette1:: @ 84F77D8 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_01.gbapal" - - .align 2 -gFieldEffectObjectPic_GroundImpactDust_0:: @ 84F77F8 - .incbin "graphics/map_objects/pics/effects/ground_impact_dust/0.4bpp" - - .align 2 -gFieldEffectObjectPic_GroundImpactDust_1:: @ 84F7838 - .incbin "graphics/map_objects/pics/effects/ground_impact_dust/1.4bpp" - - .align 2 -gFieldEffectObjectPic_GroundImpactDust_2:: @ 84F7878 - .incbin "graphics/map_objects/pics/effects/ground_impact_dust/2.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopTallGrass_0:: @ 84F78B8 - .incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/0.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopTallGrass_1:: @ 84F78F8 - .incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/1.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopTallGrass_2:: @ 84F7938 - .incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/2.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopTallGrass_3:: @ 84F7978 - .incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/3.4bpp" - -gUnusedGrass_0:: @4F79B8 - .incbin "graphics/map_objects/pics/effects/unused_grass/0.4bpp" - -gUnusedGrass_1:: @4F7A38 - .incbin "graphics/map_objects/pics/effects/unused_grass/1.4bpp" - -gUnusedGrass_2:: @4F7AB8 - .incbin "graphics/map_objects/pics/effects/unused_grass/2.4bpp" - -gUnusedGrass_3:: @4F7B38 - .incbin "graphics/map_objects/pics/effects/unused_grass/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown16_0:: @ 84F7BB8 - .incbin "graphics/map_objects/pics/effects/unknown_16/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown16_1:: @ 84F7C38 - .incbin "graphics/map_objects/pics/effects/unknown_16/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown16_2:: @ 84F7CB8 - .incbin "graphics/map_objects/pics/effects/unknown_16/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown16_3:: @ 84F7D38 - .incbin "graphics/map_objects/pics/effects/unknown_16/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown16_4:: @ 84F7DB8 - .incbin "graphics/map_objects/pics/effects/unknown_16/4.4bpp" - -gUnknown_084F7E38:: @ 84F7E38 - .incbin "graphics/map_objects/pics/effects/unknown_4F7E38/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown16_5:: @ 84F7EB8 - .incbin "graphics/map_objects/pics/effects/unknown_16/5.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown17_0:: @ 84F7F38 - .incbin "graphics/map_objects/pics/effects/unknown_17/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown17_1:: @ 84F7FB8 - .incbin "graphics/map_objects/pics/effects/unknown_17/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown17_2:: @ 84F8038 - .incbin "graphics/map_objects/pics/effects/unknown_17/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown17_3:: @ 84F80B8 - .incbin "graphics/map_objects/pics/effects/unknown_17/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown17_4:: @ 84F8138 - .incbin "graphics/map_objects/pics/effects/unknown_17/4.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown17_5:: @ 84F81B8 - .incbin "graphics/map_objects/pics/effects/unknown_17/5.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown17_6:: @ 84F8238 - .incbin "graphics/map_objects/pics/effects/unknown_17/6.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown17_7:: @ 84F82B8 - .incbin "graphics/map_objects/pics/effects/unknown_17/7.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown18_0:: @ 84F8338 - .incbin "graphics/map_objects/pics/effects/unknown_18/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown18_1:: @ 84F83B8 - .incbin "graphics/map_objects/pics/effects/unknown_18/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown18_2:: @ 84F8438 - .incbin "graphics/map_objects/pics/effects/unknown_18/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown18_3:: @ 84F84B8 - .incbin "graphics/map_objects/pics/effects/unknown_18/3.4bpp" - - .align 2 -gFieldEffectObjectPic_LongGrass_0:: @ 84F8538 - .incbin "graphics/map_objects/pics/effects/long_grass/0.4bpp" - - .align 2 -gFieldEffectObjectPic_LongGrass_1:: @ 84F85B8 - .incbin "graphics/map_objects/pics/effects/long_grass/1.4bpp" - - .align 2 -gFieldEffectObjectPic_LongGrass_2:: @ 84F8638 - .incbin "graphics/map_objects/pics/effects/long_grass/2.4bpp" - - .align 2 -gFieldEffectObjectPic_LongGrass_3:: @ 84F86B8 - .incbin "graphics/map_objects/pics/effects/long_grass/3.4bpp" - - .align 2 -gFieldEffectObjectPic_TallGrass_0:: @ 84F8738 - .incbin "graphics/map_objects/pics/effects/tall_grass/0.4bpp" - - .align 2 -gFieldEffectObjectPic_TallGrass_1:: @ 84F87B8 - .incbin "graphics/map_objects/pics/effects/tall_grass/1.4bpp" - - .align 2 -gFieldEffectObjectPic_TallGrass_2:: @ 84F8838 - .incbin "graphics/map_objects/pics/effects/tall_grass/2.4bpp" - - .align 2 -gFieldEffectObjectPic_TallGrass_3:: @ 84F88B8 - .incbin "graphics/map_objects/pics/effects/tall_grass/3.4bpp" - - .align 2 -gFieldEffectObjectPic_TallGrass_4:: @ 84F8938 - .incbin "graphics/map_objects/pics/effects/tall_grass/4.4bpp" - - .align 2 -gFieldEffectObjectPic_ShortGrass_0:: @ 84F89B8 - .incbin "graphics/map_objects/pics/effects/short_grass/0.4bpp" - - .align 2 -gFieldEffectObjectPic_ShortGrass_1:: @ 84F8A38 - .incbin "graphics/map_objects/pics/effects/short_grass/1.4bpp" - - .align 2 -gFieldEffectObjectPic_SandFootprints_0:: @ 84F8AB8 - .incbin "graphics/map_objects/pics/effects/sand_footprints/0.4bpp" - - .align 2 -gFieldEffectObjectPic_SandFootprints_1:: @ 84F8B38 - .incbin "graphics/map_objects/pics/effects/sand_footprints/1.4bpp" - - .align 2 -gFieldEffectObjectPic_DeepSandFootprints_0:: @ 84F8BB8 - .incbin "graphics/map_objects/pics/effects/deep_sand_footprints/0.4bpp" - - .align 2 -gFieldEffectObjectPic_DeepSandFootprints_1:: @ 84F8C38 - .incbin "graphics/map_objects/pics/effects/deep_sand_footprints/1.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeTireTracks_0:: @ 84F8CB8 - .incbin "graphics/map_objects/pics/effects/bike_tire_tracks/0.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeTireTracks_1:: @ 84F8D38 - .incbin "graphics/map_objects/pics/effects/bike_tire_tracks/1.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeTireTracks_2:: @ 84F8DB8 - .incbin "graphics/map_objects/pics/effects/bike_tire_tracks/2.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeTireTracks_3:: @ 84F8E38 - .incbin "graphics/map_objects/pics/effects/bike_tire_tracks/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown19_0:: @ 84F8EB8 - .incbin "graphics/map_objects/pics/effects/unknown_19/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown19_1:: @ 84F8F38 - .incbin "graphics/map_objects/pics/effects/unknown_19/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown19_2:: @ 84F8FB8 - .incbin "graphics/map_objects/pics/effects/unknown_19/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown19_3:: @ 84F9038 - .incbin "graphics/map_objects/pics/effects/unknown_19/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown29_0:: @ 84F90B8 - .incbin "graphics/map_objects/pics/effects/unknown_29/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown29_1:: @ 84F90F8 - .incbin "graphics/map_objects/pics/effects/unknown_29/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown29_2:: @ 84F9138 - .incbin "graphics/map_objects/pics/effects/unknown_29/2.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopBigSplash_0:: @ 84F9178 - .incbin "graphics/map_objects/pics/effects/bike_hop_big_splash/0.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopBigSplash_1:: @ 84F91F8 - .incbin "graphics/map_objects/pics/effects/bike_hop_big_splash/1.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopBigSplash_2:: @ 84F9278 - .incbin "graphics/map_objects/pics/effects/bike_hop_big_splash/2.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopBigSplash_3:: @ 84F92F8 - .incbin "graphics/map_objects/pics/effects/bike_hop_big_splash/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Splash_0:: @ 84F9378 - .incbin "graphics/map_objects/pics/effects/splash/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Splash_1:: @ 84F93B8 - .incbin "graphics/map_objects/pics/effects/splash/1.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopSmallSplash_0:: @ 84F93F8 - .incbin "graphics/map_objects/pics/effects/bike_hop_small_splash/0.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopSmallSplash_1:: @ 84F9438 - .incbin "graphics/map_objects/pics/effects/bike_hop_small_splash/1.4bpp" - - .align 2 -gFieldEffectObjectPic_BikeHopSmallSplash_2:: @ 84F9478 - .incbin "graphics/map_objects/pics/effects/bike_hop_small_splash/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown20_0:: @ 84F94B8 - .incbin "graphics/map_objects/pics/effects/unknown_20/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown20_1:: @ 84F9538 - .incbin "graphics/map_objects/pics/effects/unknown_20/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown20_2:: @ 84F95B8 - .incbin "graphics/map_objects/pics/effects/unknown_20/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown20_3:: @ 84F9638 - .incbin "graphics/map_objects/pics/effects/unknown_20/3.4bpp" - - .align 2 -@ unreferenced -gFieldEffectObjectPic_Unknown20_4:: @ 84F96B8 - .incbin "graphics/map_objects/pics/effects/unknown_20/4.4bpp" - - .align 2 -gFieldEffectObjectPic_TreeDisguise_0:: @ 84F9738 - .incbin "graphics/map_objects/pics/effects/tree_disguise/0.4bpp" - - .align 2 -gFieldEffectObjectPic_TreeDisguise_1:: @ 84F9838 - .incbin "graphics/map_objects/pics/effects/tree_disguise/1.4bpp" - - .align 2 -gFieldEffectObjectPic_TreeDisguise_2:: @ 84F9938 - .incbin "graphics/map_objects/pics/effects/tree_disguise/2.4bpp" - - .align 2 -gFieldEffectObjectPic_TreeDisguise_3:: @ 84F9A38 - .incbin "graphics/map_objects/pics/effects/tree_disguise/3.4bpp" - - .align 2 -gFieldEffectObjectPic_TreeDisguise_4:: @ 84F9B38 - .incbin "graphics/map_objects/pics/effects/tree_disguise/4.4bpp" - - .align 2 -gFieldEffectObjectPic_TreeDisguise_5:: @ 84F9C38 - .incbin "graphics/map_objects/pics/effects/tree_disguise/5.4bpp" - - .align 2 -gFieldEffectObjectPic_TreeDisguise_6:: @ 84F9D38 - .incbin "graphics/map_objects/pics/effects/tree_disguise/6.4bpp" - - .align 2 -gFieldEffectObjectPic_MountainDisguise_0:: @ 84F9E38 - .incbin "graphics/map_objects/pics/effects/mountain_disguise/0.4bpp" - - .align 2 -gFieldEffectObjectPic_MountainDisguise_1:: @ 84F9F38 - .incbin "graphics/map_objects/pics/effects/mountain_disguise/1.4bpp" - - .align 2 -gFieldEffectObjectPic_MountainDisguise_2:: @ 84FA038 - .incbin "graphics/map_objects/pics/effects/mountain_disguise/2.4bpp" - - .align 2 -gFieldEffectObjectPic_MountainDisguise_3:: @ 84FA138 - .incbin "graphics/map_objects/pics/effects/mountain_disguise/3.4bpp" - - .align 2 -gFieldEffectObjectPic_MountainDisguise_4:: @ 84FA238 - .incbin "graphics/map_objects/pics/effects/mountain_disguise/4.4bpp" - - .align 2 -gFieldEffectObjectPic_MountainDisguise_5:: @ 84FA338 - .incbin "graphics/map_objects/pics/effects/mountain_disguise/5.4bpp" - - .align 2 -gFieldEffectObjectPic_MountainDisguise_6:: @ 84FA438 - .incbin "graphics/map_objects/pics/effects/mountain_disguise/6.4bpp" - - .align 2 -gFieldEffectObjectPic_SandDisguisePlaceholder_0:: @ 84FA538 - .incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/0.4bpp" - - .align 2 -gFieldEffectObjectPic_SandDisguisePlaceholder_1:: @ 84FA638 - .incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/1.4bpp" - - .align 2 -gFieldEffectObjectPic_SandDisguisePlaceholder_2:: @ 84FA738 - .incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/2.4bpp" - - .align 2 -gFieldEffectObjectPic_SandDisguisePlaceholder_3:: @ 84FA838 - .incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/3.4bpp" - - .align 2 -gFieldEffectObjectPic_SandDisguisePlaceholder_4:: @ 84FA938 - .incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/4.4bpp" - - .align 2 -gFieldEffectObjectPic_SandDisguisePlaceholder_5:: @ 84FAA38 - .incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/5.4bpp" - - .align 2 -gFieldEffectObjectPic_SandDisguisePlaceholder_6:: @ 84FAB38 - .incbin "graphics/map_objects/pics/effects/sand_disguise_placeholder/6.4bpp" - - .align 2 -gFieldEffectObjectPic_HotSpringsWater:: @ 84FAC38 - .incbin "graphics/map_objects/pics/effects/hot_springs_water.4bpp" - - .align 2 -gFieldEffectObjectPalette2:: @ 84FACB8 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_02.gbapal" - - .align 2 -gFieldEffectObjectPic_JumpOutOfAsh_0:: @ 84FACD8 - .incbin "graphics/map_objects/pics/effects/jump_out_of_ash/0.4bpp" - - .align 2 -gFieldEffectObjectPic_JumpOutOfAsh_1:: @ 84FAD58 - .incbin "graphics/map_objects/pics/effects/jump_out_of_ash/1.4bpp" - - .align 2 -gFieldEffectObjectPic_JumpOutOfAsh_2:: @ 84FADD8 - .incbin "graphics/map_objects/pics/effects/jump_out_of_ash/2.4bpp" - - .align 2 -gFieldEffectObjectPic_JumpOutOfAsh_3:: @ 84FAE58 - .incbin "graphics/map_objects/pics/effects/jump_out_of_ash/3.4bpp" - - .align 2 -gFieldEffectObjectPic_JumpOutOfAsh_4:: @ 84FAED8 - .incbin "graphics/map_objects/pics/effects/jump_out_of_ash/4.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown33_0:: @ 84FAF58 - .incbin "graphics/map_objects/pics/effects/unknown_33/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown33_1:: @ 84FAFD8 - .incbin "graphics/map_objects/pics/effects/unknown_33/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown33_2:: @ 84FB058 - .incbin "graphics/map_objects/pics/effects/unknown_33/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown33_3:: @ 84FB0D8 - .incbin "graphics/map_objects/pics/effects/unknown_33/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown33_4:: @ 84FB158 - .incbin "graphics/map_objects/pics/effects/unknown_33/4.4bpp" - - .align 2 -gFieldEffectObjectPic_Bubbles_0:: @ 84FB1D8 - .incbin "graphics/map_objects/pics/effects/bubbles/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Bubbles_1:: @ 84FB2D8 - .incbin "graphics/map_objects/pics/effects/bubbles/1.4bpp" - - .align 2 -gFieldEffectObjectPic_Bubbles_2:: @ 84FB3D8 - .incbin "graphics/map_objects/pics/effects/bubbles/2.4bpp" - - .align 2 -gFieldEffectObjectPic_Bubbles_3:: @ 84FB4D8 - .incbin "graphics/map_objects/pics/effects/bubbles/3.4bpp" - - .align 2 -gFieldEffectObjectPic_Bubbles_4:: @ 84FB5D8 - .incbin "graphics/map_objects/pics/effects/bubbles/4.4bpp" - - .align 2 -gFieldEffectObjectPic_Bubbles_5:: @ 84FB6D8 - .incbin "graphics/map_objects/pics/effects/bubbles/5.4bpp" - - .align 2 -gFieldEffectObjectPic_Bubbles_6:: @ 84FB7D8 - .incbin "graphics/map_objects/pics/effects/bubbles/6.4bpp" - - .align 2 -gFieldEffectObjectPic_Bubbles_7:: @ 84FB8D8 - .incbin "graphics/map_objects/pics/effects/bubbles/7.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown35_0:: @ 84FB9D8 - .incbin "graphics/map_objects/pics/effects/unknown_35/0.4bpp" - - .align 2 -gFieldEffectObjectPic_Unknown35_1:: @ 84FBA58 - .incbin "graphics/map_objects/pics/effects/unknown_35/1.4bpp" - - .align 2 -gFieldEffectObjectPalette3:: @ 84FBAD8 - .incbin "graphics/map_objects/palettes/field_effect_object_palette_03.gbapal" - - .align 2 -gFieldEffectObjectPic_Bird:: @ 84FBAF8 - .incbin "graphics/map_objects/pics/effects/bird.4bpp" - - .align 2 -gFieldObjectPic_Juan_0:: @ 84FBCF8 - .incbin "graphics/map_objects/pics/people/juan/0.4bpp" - - .align 2 -gFieldObjectPic_Juan_1:: @ 84FBDF8 - .incbin "graphics/map_objects/pics/people/juan/1.4bpp" - - .align 2 -gFieldObjectPic_Juan_2:: @ 84FBEF8 - .incbin "graphics/map_objects/pics/people/juan/2.4bpp" - - .align 2 -gFieldObjectPic_Juan_3:: @ 84FBFF8 - .incbin "graphics/map_objects/pics/people/juan/3.4bpp" - - .align 2 -gFieldObjectPic_Juan_4:: @ 84FC0F8 - .incbin "graphics/map_objects/pics/people/juan/4.4bpp" - - .align 2 -gFieldObjectPic_Juan_5:: @ 84FC1F8 - .incbin "graphics/map_objects/pics/people/juan/5.4bpp" - - .align 2 -gFieldObjectPic_Juan_6:: @ 84FC2F8 - .incbin "graphics/map_objects/pics/people/juan/6.4bpp" - - .align 2 -gFieldObjectPic_Juan_7:: @ 84FC3F8 - .incbin "graphics/map_objects/pics/people/juan/7.4bpp" - - .align 2 -gFieldObjectPic_Juan_8:: @ 84FC4F8 - .incbin "graphics/map_objects/pics/people/juan/8.4bpp" - - .align 2 -gFieldObjectPic_Scott_0:: @ 84FC5F8 - .incbin "graphics/map_objects/pics/people/scott/0.4bpp" - - .align 2 -gFieldObjectPic_Scott_1:: @ 84FC6F8 - .incbin "graphics/map_objects/pics/people/scott/1.4bpp" - - .align 2 -gFieldObjectPic_Scott_2:: @ 84FC7F8 - .incbin "graphics/map_objects/pics/people/scott/2.4bpp" - - .align 2 -gFieldObjectPic_Scott_3:: @ 84FC8F8 - .incbin "graphics/map_objects/pics/people/scott/3.4bpp" - - .align 2 -gFieldObjectPic_Scott_4:: @ 84FC9F8 - .incbin "graphics/map_objects/pics/people/scott/4.4bpp" - - .align 2 -gFieldObjectPic_Scott_5:: @ 84FCAF8 - .incbin "graphics/map_objects/pics/people/scott/5.4bpp" - - .align 2 -gFieldObjectPic_Scott_6:: @ 84FCBF8 - .incbin "graphics/map_objects/pics/people/scott/6.4bpp" - - .align 2 -gFieldObjectPic_Scott_7:: @ 84FCCF8 - .incbin "graphics/map_objects/pics/people/scott/7.4bpp" - - .align 2 -gFieldObjectPic_Scott_8:: @ 84FCDF8 - .incbin "graphics/map_objects/pics/people/scott/8.4bpp" - - .align 2 -gFieldObjectPic_Statue:: @ 84FCEF8 - .incbin "graphics/map_objects/pics/misc/statue.4bpp" - - .align 2 -gFieldObjectPic_Kirlia_0:: @ 84FCFF8 - .incbin "graphics/map_objects/pics/pokemon/kirlia/0.4bpp" - - .align 2 -gFieldObjectPic_Kirlia_1:: @ 84FD0F8 - .incbin "graphics/map_objects/pics/pokemon/kirlia/1.4bpp" - - .align 2 -gFieldObjectPic_Kirlia_2:: @ 84FD1F8 - .incbin "graphics/map_objects/pics/pokemon/kirlia/2.4bpp" - - .align 2 -gFieldObjectPic_Kirlia_3:: @ 84FD2F8 - .incbin "graphics/map_objects/pics/pokemon/kirlia/3.4bpp" - - .align 2 -gFieldObjectPic_Kirlia_4:: @ 84FD3F8 - .incbin "graphics/map_objects/pics/pokemon/kirlia/4.4bpp" - - .align 2 -gFieldObjectPic_Kirlia_5:: @ 84FD4F8 - .incbin "graphics/map_objects/pics/pokemon/kirlia/5.4bpp" - - .align 2 -gFieldObjectPic_Kirlia_6:: @ 84FD5F8 - .incbin "graphics/map_objects/pics/pokemon/kirlia/6.4bpp" - - .align 2 -gFieldObjectPic_Kirlia_7:: @ 84FD6F8 - .incbin "graphics/map_objects/pics/pokemon/kirlia/7.4bpp" - - .align 2 -gFieldObjectPic_Kirlia_8:: @ 84FD7F8 - .incbin "graphics/map_objects/pics/pokemon/kirlia/8.4bpp" - - .align 2 -gFieldObjectPic_Dusclops_0:: @ 84FD8F8 - .incbin "graphics/map_objects/pics/pokemon/dusclops/0.4bpp" - - .align 2 -gFieldObjectPic_Dusclops_1:: @ 84FD9F8 - .incbin "graphics/map_objects/pics/pokemon/dusclops/1.4bpp" - - .align 2 -gFieldObjectPic_Dusclops_2:: @ 84FDAF8 - .incbin "graphics/map_objects/pics/pokemon/dusclops/2.4bpp" - - .align 2 -gFieldObjectPic_Dusclops_3:: @ 84FDBF8 - .incbin "graphics/map_objects/pics/pokemon/dusclops/3.4bpp" - - .align 2 -gFieldObjectPic_Dusclops_4:: @ 84FDCF8 - .incbin "graphics/map_objects/pics/pokemon/dusclops/4.4bpp" - - .align 2 -gFieldObjectPic_Dusclops_5:: @ 84FDDF8 - .incbin "graphics/map_objects/pics/pokemon/dusclops/5.4bpp" - - .align 2 -gFieldObjectPic_Dusclops_6:: @ 84FDEF8 - .incbin "graphics/map_objects/pics/pokemon/dusclops/6.4bpp" - - .align 2 -gFieldObjectPic_Dusclops_7:: @ 84FDFF8 - .incbin "graphics/map_objects/pics/pokemon/dusclops/7.4bpp" - - .align 2 -gFieldObjectPic_Dusclops_8:: @ 84FE0F8 - .incbin "graphics/map_objects/pics/pokemon/dusclops/8.4bpp" - - .align 2 -gFieldObjectPic_MysteryEventDeliveryman_0:: @ 84FE1F8 - .incbin "graphics/map_objects/pics/people/mystery_event_deliveryman/0.4bpp" - - .align 2 -gFieldObjectPic_MysteryEventDeliveryman_1:: @ 84FE2F8 - .incbin "graphics/map_objects/pics/people/mystery_event_deliveryman/1.4bpp" - - .align 2 -gFieldObjectPic_MysteryEventDeliveryman_2:: @ 84FE3F8 - .incbin "graphics/map_objects/pics/people/mystery_event_deliveryman/2.4bpp" - - .align 2 -gFieldObjectPic_UnionRoomAttendant_0:: @ 84FE4F8 - .incbin "graphics/map_objects/pics/people/union_room_attendant/0.4bpp" - - .align 2 -gFieldObjectPic_UnionRoomAttendant_1:: @ 84FE5F8 - .incbin "graphics/map_objects/pics/people/union_room_attendant/1.4bpp" - - .align 2 -gFieldObjectPic_UnionRoomAttendant_2:: @ 84FE6F8 - .incbin "graphics/map_objects/pics/people/union_room_attendant/2.4bpp" - - .align 2 -gFieldObjectPic_MovingBox:: @ 84FE7F8 - .incbin "graphics/map_objects/pics/misc/moving_box.4bpp" - - .align 2 -gFieldObjectPalette19:: @ 84FE878 - .incbin "graphics/map_objects/palettes/field_object_palette_19.gbapal" - - .align 2 -gFieldObjectPic_Sudowoodo_0:: @ 84FE898 - .incbin "graphics/map_objects/pics/pokemon/sudowoodo/0.4bpp" - - .align 2 -gFieldObjectPic_Sudowoodo_1:: @ 84FE998 - .incbin "graphics/map_objects/pics/pokemon/sudowoodo/1.4bpp" - - .align 2 -gFieldObjectPic_Sudowoodo_2:: @ 84FEA98 - .incbin "graphics/map_objects/pics/pokemon/sudowoodo/2.4bpp" - - .align 2 -gFieldObjectPic_Mew_0:: @ 84FEB98 - .incbin "graphics/map_objects/pics/pokemon/mew/0.4bpp" - - .align 2 -gFieldObjectPic_Mew_1:: @ 84FEC98 - .incbin "graphics/map_objects/pics/pokemon/mew/1.4bpp" - - .align 2 -gFieldObjectPic_Mew_2:: @ 84FED98 - .incbin "graphics/map_objects/pics/pokemon/mew/2.4bpp" - - .align 2 -gFieldObjectPic_Mew_3:: @ 84FEE98 - .incbin "graphics/map_objects/pics/pokemon/mew/3.4bpp" - - .align 2 -gFieldObjectPic_Mew_4:: @ 84FEF98 - .incbin "graphics/map_objects/pics/pokemon/mew/4.4bpp" - - .align 2 -gFieldObjectPic_Mew_5:: @ 84FF098 - .incbin "graphics/map_objects/pics/pokemon/mew/5.4bpp" - - .align 2 -gFieldObjectPic_Mew_6:: @ 84FF198 - .incbin "graphics/map_objects/pics/pokemon/mew/6.4bpp" - - .align 2 -gFieldObjectPic_Mew_7:: @ 84FF298 - .incbin "graphics/map_objects/pics/pokemon/mew/7.4bpp" - - .align 2 -gFieldObjectPic_Mew_8:: @ 84FF398 - .incbin "graphics/map_objects/pics/pokemon/mew/8.4bpp" - - .align 2 -gFieldObjectPalette28:: @ 84FF498 - .incbin "graphics/map_objects/palettes/field_object_palette_28.gbapal" - - .align 2 -gFieldObjectPic_Red_0:: @ 84FF4B8 - .incbin "graphics/map_objects/pics/people/red/0.4bpp" - - .align 2 -gFieldObjectPic_Red_1:: @ 84FF5B8 - .incbin "graphics/map_objects/pics/people/red/1.4bpp" - - .align 2 -gFieldObjectPic_Red_2:: @ 84FF6B8 - .incbin "graphics/map_objects/pics/people/red/2.4bpp" - - .align 2 -gFieldObjectPic_Red_3:: @ 84FF7B8 - .incbin "graphics/map_objects/pics/people/red/3.4bpp" - - .align 2 -gFieldObjectPic_Red_4:: @ 84FF8B8 - .incbin "graphics/map_objects/pics/people/red/4.4bpp" - - .align 2 -gFieldObjectPic_Red_5:: @ 84FF9B8 - .incbin "graphics/map_objects/pics/people/red/5.4bpp" - - .align 2 -gFieldObjectPic_Red_6:: @ 84FFAB8 - .incbin "graphics/map_objects/pics/people/red/6.4bpp" - - .align 2 -gFieldObjectPic_Red_7:: @ 84FFBB8 - .incbin "graphics/map_objects/pics/people/red/7.4bpp" - - .align 2 -gFieldObjectPic_Red_8:: @ 84FFCB8 - .incbin "graphics/map_objects/pics/people/red/8.4bpp" - - .align 2 -gFieldObjectPic_Leaf_0:: @ 84FFDB8 - .incbin "graphics/map_objects/pics/people/leaf/0.4bpp" - - .align 2 -gFieldObjectPic_Leaf_1:: @ 84FFEB8 - .incbin "graphics/map_objects/pics/people/leaf/1.4bpp" - - .align 2 -gFieldObjectPic_Leaf_2:: @ 84FFFB8 - .incbin "graphics/map_objects/pics/people/leaf/2.4bpp" - - .align 2 -gFieldObjectPic_Leaf_3:: @ 85000B8 - .incbin "graphics/map_objects/pics/people/leaf/3.4bpp" - - .align 2 -gFieldObjectPic_Leaf_4:: @ 85001B8 - .incbin "graphics/map_objects/pics/people/leaf/4.4bpp" - - .align 2 -gFieldObjectPic_Leaf_5:: @ 85002B8 - .incbin "graphics/map_objects/pics/people/leaf/5.4bpp" - - .align 2 -gFieldObjectPic_Leaf_6:: @ 85003B8 - .incbin "graphics/map_objects/pics/people/leaf/6.4bpp" - - .align 2 -gFieldObjectPic_Leaf_7:: @ 85004B8 - .incbin "graphics/map_objects/pics/people/leaf/7.4bpp" - - .align 2 -gFieldObjectPic_Leaf_8:: @ 85005B8 - .incbin "graphics/map_objects/pics/people/leaf/8.4bpp" - - .align 2 -gFieldObjectPalette30:: @ 85006B8 - .incbin "graphics/map_objects/palettes/field_object_palette_30.gbapal" - - .align 2 -gFieldObjectPic_BirthIslandStone:: @ 85006D8 - .incbin "graphics/map_objects/pics/misc/birth_island_stone.4bpp" - - .align 2 -gFieldObjectPalette29:: @ 85008D8 - .incbin "graphics/map_objects/palettes/field_object_palette_29.gbapal" - - .align 2 -gFieldObjectPic_Deoxys_0:: @ 85008F8 - .incbin "graphics/map_objects/pics/pokemon/deoxys/0.4bpp" - - .align 2 -gFieldObjectPic_Deoxys_1:: @ 8500AF8 - .incbin "graphics/map_objects/pics/pokemon/deoxys/1.4bpp" - - .align 2 -gFieldObjectPic_Anabel_0:: @ 8500CF8 - .incbin "graphics/map_objects/pics/people/anabel/0.4bpp" - - .align 2 -gFieldObjectPic_Anabel_1:: @ 8500DF8 - .incbin "graphics/map_objects/pics/people/anabel/1.4bpp" - - .align 2 -gFieldObjectPic_Anabel_2:: @ 8500EF8 - .incbin "graphics/map_objects/pics/people/anabel/2.4bpp" - - .align 2 -gFieldObjectPic_Anabel_3:: @ 8500FF8 - .incbin "graphics/map_objects/pics/people/anabel/3.4bpp" - - .align 2 -gFieldObjectPic_Anabel_4:: @ 85010F8 - .incbin "graphics/map_objects/pics/people/anabel/4.4bpp" - - .align 2 -gFieldObjectPic_Anabel_5:: @ 85011F8 - .incbin "graphics/map_objects/pics/people/anabel/5.4bpp" - - .align 2 -gFieldObjectPic_Anabel_6:: @ 85012F8 - .incbin "graphics/map_objects/pics/people/anabel/6.4bpp" - - .align 2 -gFieldObjectPic_Anabel_7:: @ 85013F8 - .incbin "graphics/map_objects/pics/people/anabel/7.4bpp" - - .align 2 -gFieldObjectPic_Anabel_8:: @ 85014F8 - .incbin "graphics/map_objects/pics/people/anabel/8.4bpp" - - .align 2 -gFieldObjectPic_Tucker_0:: @ 85015F8 - .incbin "graphics/map_objects/pics/people/tucker/0.4bpp" - - .align 2 -gFieldObjectPic_Tucker_1:: @ 85016F8 - .incbin "graphics/map_objects/pics/people/tucker/1.4bpp" - - .align 2 -gFieldObjectPic_Tucker_2:: @ 85017F8 - .incbin "graphics/map_objects/pics/people/tucker/2.4bpp" - - .align 2 -gFieldObjectPic_Tucker_3:: @ 85018F8 - .incbin "graphics/map_objects/pics/people/tucker/3.4bpp" - - .align 2 -gFieldObjectPic_Tucker_4:: @ 85019F8 - .incbin "graphics/map_objects/pics/people/tucker/4.4bpp" - - .align 2 -gFieldObjectPic_Tucker_5:: @ 8501AF8 - .incbin "graphics/map_objects/pics/people/tucker/5.4bpp" - - .align 2 -gFieldObjectPic_Tucker_6:: @ 8501BF8 - .incbin "graphics/map_objects/pics/people/tucker/6.4bpp" - - .align 2 -gFieldObjectPic_Tucker_7:: @ 8501CF8 - .incbin "graphics/map_objects/pics/people/tucker/7.4bpp" - - .align 2 -gFieldObjectPic_Tucker_8:: @ 8501DF8 - .incbin "graphics/map_objects/pics/people/tucker/8.4bpp" - - .align 2 -gFieldObjectPic_Spenser_0:: @ 8501EF8 - .incbin "graphics/map_objects/pics/people/spenser/0.4bpp" - - .align 2 -gFieldObjectPic_Spenser_1:: @ 8501FF8 - .incbin "graphics/map_objects/pics/people/spenser/1.4bpp" - - .align 2 -gFieldObjectPic_Spenser_2:: @ 85020F8 - .incbin "graphics/map_objects/pics/people/spenser/2.4bpp" - - .align 2 -gFieldObjectPic_Spenser_3:: @ 85021F8 - .incbin "graphics/map_objects/pics/people/spenser/3.4bpp" - - .align 2 -gFieldObjectPic_Spenser_4:: @ 85022F8 - .incbin "graphics/map_objects/pics/people/spenser/4.4bpp" - - .align 2 -gFieldObjectPic_Spenser_5:: @ 85023F8 - .incbin "graphics/map_objects/pics/people/spenser/5.4bpp" - - .align 2 -gFieldObjectPic_Spenser_6:: @ 85024F8 - .incbin "graphics/map_objects/pics/people/spenser/6.4bpp" - - .align 2 -gFieldObjectPic_Spenser_7:: @ 85025F8 - .incbin "graphics/map_objects/pics/people/spenser/7.4bpp" - - .align 2 -gFieldObjectPic_Spenser_8:: @ 85026F8 - .incbin "graphics/map_objects/pics/people/spenser/8.4bpp" - - .align 2 -gFieldObjectPic_Greta_0:: @ 85027F8 - .incbin "graphics/map_objects/pics/people/greta/0.4bpp" - - .align 2 -gFieldObjectPic_Greta_1:: @ 85028F8 - .incbin "graphics/map_objects/pics/people/greta/1.4bpp" - - .align 2 -gFieldObjectPic_Greta_2:: @ 85029F8 - .incbin "graphics/map_objects/pics/people/greta/2.4bpp" - - .align 2 -gFieldObjectPic_Greta_3:: @ 8502AF8 - .incbin "graphics/map_objects/pics/people/greta/3.4bpp" - - .align 2 -gFieldObjectPic_Greta_4:: @ 8502BF8 - .incbin "graphics/map_objects/pics/people/greta/4.4bpp" - - .align 2 -gFieldObjectPic_Greta_5:: @ 8502CF8 - .incbin "graphics/map_objects/pics/people/greta/5.4bpp" - - .align 2 -gFieldObjectPic_Greta_6:: @ 8502DF8 - .incbin "graphics/map_objects/pics/people/greta/6.4bpp" - - .align 2 -gFieldObjectPic_Greta_7:: @ 8502EF8 - .incbin "graphics/map_objects/pics/people/greta/7.4bpp" - - .align 2 -gFieldObjectPic_Greta_8:: @ 8502FF8 - .incbin "graphics/map_objects/pics/people/greta/8.4bpp" - - .align 2 -gFieldObjectPic_Noland_0:: @ 85030F8 - .incbin "graphics/map_objects/pics/people/noland/0.4bpp" - - .align 2 -gFieldObjectPic_Noland_1:: @ 85031F8 - .incbin "graphics/map_objects/pics/people/noland/1.4bpp" - - .align 2 -gFieldObjectPic_Noland_2:: @ 85032F8 - .incbin "graphics/map_objects/pics/people/noland/2.4bpp" - - .align 2 -gFieldObjectPic_Noland_3:: @ 85033F8 - .incbin "graphics/map_objects/pics/people/noland/3.4bpp" - - .align 2 -gFieldObjectPic_Noland_4:: @ 85034F8 - .incbin "graphics/map_objects/pics/people/noland/4.4bpp" - - .align 2 -gFieldObjectPic_Noland_5:: @ 85035F8 - .incbin "graphics/map_objects/pics/people/noland/5.4bpp" - - .align 2 -gFieldObjectPic_Noland_6:: @ 85036F8 - .incbin "graphics/map_objects/pics/people/noland/6.4bpp" - - .align 2 -gFieldObjectPic_Noland_7:: @ 85037F8 - .incbin "graphics/map_objects/pics/people/noland/7.4bpp" - - .align 2 -gFieldObjectPic_Noland_8:: @ 85038F8 - .incbin "graphics/map_objects/pics/people/noland/8.4bpp" - - .align 2 -gFieldObjectPic_Lucy_0:: @ 85039F8 - .incbin "graphics/map_objects/pics/people/lucy/0.4bpp" - - .align 2 -gFieldObjectPic_Lucy_1:: @ 8503AF8 - .incbin "graphics/map_objects/pics/people/lucy/1.4bpp" - - .align 2 -gFieldObjectPic_Lucy_2:: @ 8503BF8 - .incbin "graphics/map_objects/pics/people/lucy/2.4bpp" - - .align 2 -gFieldObjectPic_Lucy_3:: @ 8503CF8 - .incbin "graphics/map_objects/pics/people/lucy/3.4bpp" - - .align 2 -gFieldObjectPic_Lucy_4:: @ 8503DF8 - .incbin "graphics/map_objects/pics/people/lucy/4.4bpp" - - .align 2 -gFieldObjectPic_Lucy_5:: @ 8503EF8 - .incbin "graphics/map_objects/pics/people/lucy/5.4bpp" - - .align 2 -gFieldObjectPic_Lucy_6:: @ 8503FF8 - .incbin "graphics/map_objects/pics/people/lucy/6.4bpp" - - .align 2 -gFieldObjectPic_Lucy_7:: @ 85040F8 - .incbin "graphics/map_objects/pics/people/lucy/7.4bpp" - - .align 2 -gFieldObjectPic_Lucy_8:: @ 85041F8 - .incbin "graphics/map_objects/pics/people/lucy/8.4bpp" - - .align 2 -gFieldObjectPic_Brandon_0:: @ 85042F8 - .incbin "graphics/map_objects/pics/people/brandon/0.4bpp" - - .align 2 -gFieldObjectPic_Brandon_1:: @ 85043F8 - .incbin "graphics/map_objects/pics/people/brandon/1.4bpp" - - .align 2 -gFieldObjectPic_Brandon_2:: @ 85044F8 - .incbin "graphics/map_objects/pics/people/brandon/2.4bpp" - - .align 2 -gFieldObjectPic_Brandon_3:: @ 85045F8 - .incbin "graphics/map_objects/pics/people/brandon/3.4bpp" - - .align 2 -gFieldObjectPic_Brandon_4:: @ 85046F8 - .incbin "graphics/map_objects/pics/people/brandon/4.4bpp" - - .align 2 -gFieldObjectPic_Brandon_5:: @ 85047F8 - .incbin "graphics/map_objects/pics/people/brandon/5.4bpp" - - .align 2 -gFieldObjectPic_Brandon_6:: @ 85048F8 - .incbin "graphics/map_objects/pics/people/brandon/6.4bpp" - - .align 2 -gFieldObjectPic_Brandon_7:: @ 85049F8 - .incbin "graphics/map_objects/pics/people/brandon/7.4bpp" - - .align 2 -gFieldObjectPic_Brandon_8:: @ 8504AF8 - .incbin "graphics/map_objects/pics/people/brandon/8.4bpp" - - .align 2 -gFieldObjectPic_Lugia_0:: @ 8504BF8 - .incbin "graphics/map_objects/pics/pokemon/lugia/0.4bpp" - - .align 2 -gFieldObjectPic_Lugia_1:: @ 8504DF8 - .incbin "graphics/map_objects/pics/pokemon/lugia/1.4bpp" - - .align 2 -gFieldObjectPalette32:: @ 8504FF8 - .incbin "graphics/map_objects/palettes/field_object_palette_32.gbapal" - - .align 2 -gFieldObjectPic_HoOh_0:: @ 8505018 - .incbin "graphics/map_objects/pics/pokemon/ho_oh/0.4bpp" - - .align 2 -gFieldObjectPic_HoOh_1:: @ 8505218 - .incbin "graphics/map_objects/pics/pokemon/ho_oh/1.4bpp" - - .align 2 -gFieldObjectPalette31:: @ 8505418 - .incbin "graphics/map_objects/palettes/field_object_palette_31.gbapal" diff --git a/data/graphics/field_objects/field_object_graphics_info.inc b/data/graphics/field_objects/field_object_graphics_info.inc deleted file mode 100644 index 6a0778adf..000000000 --- a/data/graphics/field_objects/field_object_graphics_info.inc +++ /dev/null @@ -1,4164 +0,0 @@ - .align 2 -gFieldObjectGraphicsInfo_BrendanNormal:: @ 8509954 - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_BrendanMayNormal - .4byte gFieldObjectPicTable_BrendanNormal - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BrendanMachBike:: @ 8509978 - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_BrendanMachBike - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BrendanAcroBike:: @ 850999C - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_AcroBike - .4byte gFieldObjectPicTable_BrendanAcroBike - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BrendanSurfing:: @ 85099C0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Surfing - .4byte gFieldObjectPicTable_BrendanSurfing - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BrendanFieldMove:: @ 85099E4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_FieldMove - .4byte gFieldObjectPicTable_BrendanFieldMove - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_QuintyPlump:: @ 8509A08 - .2byte 0xFFFF @ tiles tag - .2byte 0x110B @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_L << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_QuintyPlump - .4byte gFieldObjectPicTable_QuintyPlump - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_LittleBoy1:: @ 8509A2C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_LittleBoy1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_LittleGirl1:: @ 8509A50 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_LittleGirl1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Boy1:: @ 8509A74 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Boy1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Girl1:: @ 8509A98 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Girl1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Boy2:: @ 8509ABC - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Boy2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Girl2:: @ 8509AE0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Girl2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_LittleBoy2:: @ 8509B04 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_LittleBoy2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_LittleGirl2:: @ 8509B28 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_LittleGirl2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Boy3:: @ 8509B4C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Boy3 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Girl3:: @ 8509B70 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Girl3 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Boy4:: @ 8509B94 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Boy4 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Woman1:: @ 8509BB8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Woman1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_FatMan:: @ 8509BDC - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_FatMan - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Woman2:: @ 8509C00 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Woman2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Man1:: @ 8509C24 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Man1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Woman3:: @ 8509C48 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Woman3 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_OldMan1:: @ 8509C6C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_OldMan1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_OldWoman1:: @ 8509C90 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_OldWoman1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Man2:: @ 8509CB4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Man2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Woman4:: @ 8509CD8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Woman4 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Man3:: @ 8509CFC - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Man3 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Woman5:: @ 8509D20 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Woman5 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Cook:: @ 8509D44 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Cook - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Woman6:: @ 8509D68 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Woman6 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_OldMan2:: @ 8509D8C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_OldMan2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_OldWoman2:: @ 8509DB0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_OldWoman2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Camper:: @ 8509DD4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Camper - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Picnicker:: @ 8509DF8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Picnicker - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Man4:: @ 8509E1C - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Man4 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Woman7:: @ 8509E40 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Woman7 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Youngster:: @ 8509E64 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Youngster - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BugCatcher:: @ 8509E88 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_BugCatcher - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_PsychicM:: @ 8509EAC - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_PsychicM - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SchoolKidM:: @ 8509ED0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_SchoolKidM - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Maniac:: @ 8509EF4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Maniac - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_HexManiac:: @ 8509F18 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_HexManiac - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Rayquaza1:: @ 8509F3C - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 2048 @ image size - .2byte 64 @ width - .2byte 64 @ height - .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_64x64 - .4byte gFieldObjectSpriteOamTables_64x64 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_RayquazaStill - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SwimmerM:: @ 8509F60 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_SwimmerM - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SwimmerF:: @ 8509F84 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_SwimmerF - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BlackBelt:: @ 8509FA8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_BlackBelt - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Beauty:: @ 8509FCC - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Beauty - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Scientist1:: @ 8509FF0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Scientist1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Lass:: @ 850A014 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Lass - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Gentleman:: @ 850A038 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Gentleman - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Sailor:: @ 850A05C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Sailor - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Fisherman:: @ 850A080 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Fisherman - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RunningTriathleteM:: @ 850A0A4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_RunningTriathleteM - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RunningTriathleteF:: @ 850A0C8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_RunningTriathleteF - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_TuberF:: @ 850A0EC - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_TuberF - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_TuberM:: @ 850A110 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_TuberM - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Hiker:: @ 850A134 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Hiker - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_CyclingTriathleteM:: @ 850A158 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_AcroBike - .4byte gFieldObjectPicTable_CyclingTriathleteM - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_CyclingTriathleteF:: @ 850A17C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_AcroBike - .4byte gFieldObjectPicTable_CyclingTriathleteF - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Nurse:: @ 850A1A0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Nurse - .4byte gFieldObjectPicTable_Nurse - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_ItemBall:: @ 850A1C4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_ItemBall - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BerryTree:: @ 850A1E8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte NULL @ sprite OAM tables - .4byte gFieldObjectImageAnimTable_BerryTree - .4byte gFieldObjectPicTable_PechaBerryTree - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BerryTreeEarlyStages:: @ 850A20C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_BerryTree - .4byte gFieldObjectPicTable_PechaBerryTree - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BerryTreeLateStages:: @ 850A230 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_BerryTree - .4byte gFieldObjectPicTable_PechaBerryTree - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_ProfBirch:: @ 850A254 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_ProfBirch - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Man5:: @ 850A278 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Man5 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Man6:: @ 850A29C - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Man6 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_ReporterM:: @ 850A2C0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_ReporterM - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_ReporterF:: @ 850A2E4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_ReporterF - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Bard:: @ 850A308 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MauvilleOldMan1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Hipster:: @ 850A32C - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MauvilleOldMan1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Trader:: @ 850A350 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MauvilleOldMan1 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Storyteller:: @ 850A374 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MauvilleOldMan2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Giddy:: @ 850A398 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MauvilleOldMan2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1:: @ 850A3BC - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MauvilleOldMan2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2:: @ 850A3E0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MauvilleOldMan2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_UnusedNatuDoll:: @ 850A404 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_UnusedNatuDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_UnusedMagnemiteDoll:: @ 850A428 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_UnusedMagnemiteDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_UnusedSquirtleDoll:: @ 850A44C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_UnusedSquirtleDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_UnusedWooperDoll:: @ 850A470 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_UnusedWooperDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_UnusedPikachuDoll:: @ 850A494 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_UnusedPikachuDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_UnusedPorygon2Doll:: @ 850A4B8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_UnusedPorygon2Doll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_CuttableTree:: @ 850A4DC - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_CuttableTree - .4byte gFieldObjectPicTable_CuttableTree - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MartEmployee:: @ 850A500 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MartEmployee - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RooftopSaleWoman:: @ 850A524 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_RooftopSaleWoman - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Teala:: @ 850A548 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Teala - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BreakableRock:: @ 850A56C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_BreakableRock - .4byte gFieldObjectPicTable_BreakableRock - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_PushableBoulder:: @ 850A590 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_PushableBoulder - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MrBrineysBoat:: @ 850A5B4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MrBrineysBoat - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MayNormal:: @ 850A5D8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_BrendanMayNormal - .4byte gFieldObjectPicTable_MayNormal - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MayMachBike:: @ 850A5FC - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MayMachBike - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MayAcroBike:: @ 850A620 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_AcroBike - .4byte gFieldObjectPicTable_MayAcroBike - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MaySurfing:: @ 850A644 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Surfing - .4byte gFieldObjectPicTable_MaySurfing - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MayFieldMove:: @ 850A668 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_FieldMove - .4byte gFieldObjectPicTable_MayFieldMove - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Truck:: @ 850A68C - .2byte 0xFFFF @ tiles tag - .2byte 0x110D @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 1152 @ image size - .2byte 48 @ width - .2byte 48 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_Truck - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_Truck - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_VigorothCarryingBox:: @ 850A6B0 - .2byte 0xFFFF @ tiles tag - .2byte 0x110E @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_VigorothCarryingBox - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_VigorothFacingAway:: @ 850A6D4 - .2byte 0xFFFF @ tiles tag - .2byte 0x110E @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_VigorothFacingAway - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BirchsBag:: @ 850A6F8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BirchsBag - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_EnemyZigzagoon:: @ 850A71C - .2byte 0xFFFF @ tiles tag - .2byte 0x110F @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_EnemyZigzagoon - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Poochyena:: @ 850A740 - .2byte 0xFFFF @ tiles tag - .2byte 0x111C @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Poochyena - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Artist:: @ 850A764 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Artist - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalBrendanNormal:: @ 850A788 - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_BrendanMayNormal - .4byte gFieldObjectPicTable_BrendanNormal - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalBrendanMachBike:: @ 850A7AC - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_BrendanMachBike - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalBrendanAcroBike:: @ 850A7D0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_AcroBike - .4byte gFieldObjectPicTable_BrendanAcroBike - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalBrendanSurfing:: @ 850A7F4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Surfing - .4byte gFieldObjectPicTable_BrendanSurfing - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalBrendanFieldMove:: @ 850A818 - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_FieldMove - .4byte gFieldObjectPicTable_BrendanFieldMove - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalMayNormal:: @ 850A83C - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_BrendanMayNormal - .4byte gFieldObjectPicTable_MayNormal - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalMayMachBike:: @ 850A860 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MayMachBike - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalMayAcroBike:: @ 850A884 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_BIKE_TIRE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_AcroBike - .4byte gFieldObjectPicTable_MayAcroBike - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalMaySurfing:: @ 850A8A8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Surfing - .4byte gFieldObjectPicTable_MaySurfing - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RivalMayFieldMove:: @ 850A8CC - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_FieldMove - .4byte gFieldObjectPicTable_MayFieldMove - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Cameraman:: @ 850A8F0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Cameraman - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BrendanUnderwater:: @ 850A914 - .2byte 0xFFFF @ tiles tag - .2byte 0x1115 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_BrendanUnderwater - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MayUnderwater:: @ 850A938 - .2byte 0xFFFF @ tiles tag - .2byte 0x1115 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MayUnderwater - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MovingBox:: @ 850A95C - .2byte 0xFFFF @ tiles tag - .2byte 0x1112 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_MovingBox - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_CableCar:: @ 850A980 - .2byte 0xFFFF @ tiles tag - .2byte 0x1113 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 2048 @ image size - .2byte 64 @ width - .2byte 64 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_64x64 - .4byte gFieldObjectSpriteOamTables_64x64 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_CableCar - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Scientist2:: @ 850A9A4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Scientist2 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Man7:: @ 850A9C8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Man7 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_AquaMemberM:: @ 850A9EC - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_AquaMemberM - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_AquaMemberF:: @ 850AA10 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_AquaMemberF - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MagmaMemberM:: @ 850AA34 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MagmaMemberM - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MagmaMemberF:: @ 850AA58 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MagmaMemberF - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Sidney:: @ 850AA7C - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Sidney - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Phoebe:: @ 850AAA0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Phoebe - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Glacia:: @ 850AAC4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Glacia - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Drake:: @ 850AAE8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Drake - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Roxanne:: @ 850AB0C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Roxanne - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Brawly:: @ 850AB30 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Brawly - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Wattson:: @ 850AB54 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Wattson - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Flannery:: @ 850AB78 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Flannery - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Norman:: @ 850AB9C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Norman - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Winona:: @ 850ABC0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Winona - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Liza:: @ 850ABE4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Liza - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Tate:: @ 850AC08 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Tate - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Wallace:: @ 850AC2C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Wallace - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Steven:: @ 850AC50 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Steven - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Wally:: @ 850AC74 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Wally - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RubySapphireLittleBoy:: @ 850AC98 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_RubySapphireLittleBoy - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BrendanFishing:: @ 850ACBC - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Fishing - .4byte gFieldObjectPicTable_BrendanFishing - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MayFishing:: @ 850ACE0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Fishing - .4byte gFieldObjectPicTable_MayFishing - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_HotSpringsOldWoman:: @ 850AD04 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_HotSpringsOldWoman - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SSTidal:: @ 850AD28 - .2byte 0xFFFF @ tiles tag - .2byte 0x1114 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 1920 @ image size - .2byte 96 @ width - .2byte 40 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_8x8 - .4byte gFieldObjectSpriteOamTables_SSTidal - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_SSTidal - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SubmarineShadow:: @ 850AD4C - .2byte 0xFFFF @ tiles tag - .2byte 0x111B @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 1408 @ image size - .2byte 88 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_8x8 - .4byte gFieldObjectSpriteOamTables_SubmarineShadow - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_SubmarineShadow - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_PichuDoll:: @ 850AD70 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_PichuDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_PikachuDoll:: @ 850AD94 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_PikachuDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MarillDoll:: @ 850ADB8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_MarillDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_TogepiDoll:: @ 850ADDC - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_TogepiDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_CyndaquilDoll:: @ 850AE00 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_CyndaquilDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_ChikoritaDoll:: @ 850AE24 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_ChikoritaDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_TotodileDoll:: @ 850AE48 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_TotodileDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_JigglypuffDoll:: @ 850AE6C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_JigglypuffDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MeowthDoll:: @ 850AE90 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_MeowthDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_ClefairyDoll:: @ 850AEB4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_ClefairyDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_DittoDoll:: @ 850AED8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_DittoDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SmoochumDoll:: @ 850AEFC - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_SmoochumDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_TreeckoDoll:: @ 850AF20 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_TreeckoDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_TorchicDoll:: @ 850AF44 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_TorchicDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MudkipDoll:: @ 850AF68 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_MudkipDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_DuskullDoll:: @ 850AF8C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_DuskullDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_WynautDoll:: @ 850AFB0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_WynautDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BaltoyDoll:: @ 850AFD4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BaltoyDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_KecleonDoll:: @ 850AFF8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_KecleonDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_AzurillDoll:: @ 850B01C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_AzurillDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SkittyDoll:: @ 850B040 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_SkittyDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SwabluDoll:: @ 850B064 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_SwabluDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_GulpinDoll:: @ 850B088 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_GulpinDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_LotadDoll:: @ 850B0AC - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_LotadDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SeedotDoll:: @ 850B0D0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_SeedotDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_PikaCushion:: @ 850B0F4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_PikaCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RoundCushion:: @ 850B118 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_RoundCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_KissCushion:: @ 850B13C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_KissCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_ZigzagCushion:: @ 850B160 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_ZigzagCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_SpinCushion:: @ 850B184 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_SpinCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_DiamondCushion:: @ 850B1A8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_DiamondCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BallCushion:: @ 850B1CC - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BallCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_GrassCushion:: @ 850B1F0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_GrassCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_FireCushion:: @ 850B214 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_FireCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_WaterCushion:: @ 850B238 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_WaterCushion - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigSnorlaxDoll:: @ 850B25C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigSnorlaxDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigRhydonDoll:: @ 850B280 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigRhydonDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigLaprasDoll:: @ 850B2A4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigLaprasDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigVenusaurDoll:: @ 850B2C8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigVenusaurDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigCharizardDoll:: @ 850B2EC - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigCharizardDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigBlastoiseDoll:: @ 850B310 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigBlastoiseDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigWailmerDoll:: @ 850B334 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigWailmerDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigRegirockDoll:: @ 850B358 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigRegirockDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigRegiceDoll:: @ 850B37C - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigRegiceDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BigRegisteelDoll:: @ 850B3A0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BigRegisteelDoll - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Latias:: @ 850B3C4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_LatiasLatios - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Latios:: @ 850B3E8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_LatiasLatios - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Boy5:: @ 850B40C - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Boy5 - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_ContestOldMan:: @ 850B430 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_ContestOldMan - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BrendanWatering:: @ 850B454 - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_BrendanWatering - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MayWatering:: @ 850B478 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 0 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MayWatering - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BrendanDecorating:: @ 850B49C - .2byte 0xFFFF @ tiles tag - .2byte 0x1100 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BrendanDecorating - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MayDecorating:: @ 850B4C0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_MayDecorating - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Archie:: @ 850B4E4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Archie - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Maxie:: @ 850B508 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Maxie - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Kyogre1:: @ 850B52C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_KyogreFront - .4byte gFieldObjectRotScalAnimTable_KyogreGroudon - - .align 2 -gFieldObjectGraphicsInfo_Groudon1:: @ 850B550 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_GroudonFront - .4byte gFieldObjectRotScalAnimTable_KyogreGroudon - - .align 2 -gFieldObjectGraphicsInfo_Kyogre3:: @ 850B574 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_KyogreSide - .4byte gFieldObjectRotScalAnimTable_KyogreGroudon - - .align 2 -gFieldObjectGraphicsInfo_Groudon3:: @ 850B598 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Groudon3 - .4byte gFieldObjectPicTable_GroudonSide - .4byte gFieldObjectRotScalAnimTable_KyogreGroudon - - .align 2 -gFieldObjectGraphicsInfo_Fossil:: @ 850B5BC - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte F_INANIMATE | (SHADOW_SIZE_S << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_NONE - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_Fossil - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Regirock:: @ 850B5E0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Regi - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Regice:: @ 850B604 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Regi - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Registeel:: @ 850B628 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Regi - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Skitty:: @ 850B64C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Skitty - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Kecleon1:: @ 850B670 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Kecleon - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Kyogre2:: @ 850B694 - .2byte 0xFFFF @ tiles tag - .2byte 0x1116 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_KyogreFront - .4byte gFieldObjectRotScalAnimTable_KyogreGroudon - - .align 2 -gFieldObjectGraphicsInfo_Groudon2:: @ 850B6B8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1118 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_GroudonFront - .4byte gFieldObjectRotScalAnimTable_KyogreGroudon - - .align 2 -gFieldObjectGraphicsInfo_Rayquaza2:: @ 850B6DC - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 2048 @ image size - .2byte 64 @ width - .2byte 64 @ height - .byte F_DISABLE_REFLECTION_PALETTE_LOAD | (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_64x64 - .4byte gFieldObjectSpriteOamTables_64x64 - .4byte gFieldObjectImageAnimTable_Rayquaza2 - .4byte gFieldObjectPicTable_Rayquaza - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Zigzagoon:: @ 850B700 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Zigzagoon - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Pikachu:: @ 850B724 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Pikachu - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Azumarill:: @ 850B748 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Azumarill - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Wingull:: @ 850B76C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Wingull - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Kecleon2:: @ 850B790 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Kecleon - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_TuberMSwimming:: @ 850B7B4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1104 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 3 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_TuberMSwimming - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Azurill:: @ 850B7D8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 128 @ image size - .2byte 16 @ width - .2byte 16 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x16 - .4byte gFieldObjectSpriteOamTables_16x16 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Azurill - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Mom:: @ 850B7FC - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Mom - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_LinkBrendan:: @ 850B820 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_BrendanMayNormal - .4byte gFieldObjectPicTable_BrendanNormal - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_LinkMay:: @ 850B844 - .2byte 0xFFFF @ tiles tag - .2byte 0x1110 @ palette tag - .2byte 0x1102 @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_BrendanMayNormal - .4byte gFieldObjectPicTable_MayNormal - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Juan:: @ 850B868 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Juan - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Scott:: @ 850B88C - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Scott - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_MysteryEventDeliveryman:: @ 850B8B0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_MysteryEventDeliveryman - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Statue:: @ 850B8D4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_Statue - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Kirlia:: @ 850B8F8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_S << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Kirlia - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Dusclops:: @ 850B91C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Dusclops - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_UnionRoomAttendant:: @ 850B940 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_UnionRoomAttendant - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Red:: @ 850B964 - .2byte 0xFFFF @ tiles tag - .2byte 0x111D @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Red - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Leaf:: @ 850B988 - .2byte 0xFFFF @ tiles tag - .2byte 0x111D @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Leaf - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Sudowoodo:: @ 850B9AC - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Sudowoodo - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Mew:: @ 850B9D0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Mew - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Deoxys:: @ 850B9F4 - .2byte 0xFFFF @ tiles tag - .2byte 0x111E @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Deoxys - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_BirthIslandStone:: @ 850BA18 - .2byte 0xFFFF @ tiles tag - .2byte 0x111F @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte F_INANIMATE | (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Inanimate - .4byte gFieldObjectPicTable_BirthIslandStone - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Anabel:: @ 850BA3C - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Anabel - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Tucker:: @ 850BA60 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Tucker - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Greta:: @ 850BA84 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Greta - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Spenser:: @ 850BAA8 - .2byte 0xFFFF @ tiles tag - .2byte 0x1103 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 2 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Spenser - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Noland:: @ 850BACC - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Noland - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Lucy:: @ 850BAF0 - .2byte 0xFFFF @ tiles tag - .2byte 0x1106 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 5 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Lucy - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Brandon:: @ 850BB14 - .2byte 0xFFFF @ tiles tag - .2byte 0x1105 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 4 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Brandon - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RubySapphireBrendan:: @ 850BB38 - .2byte 0xFFFF @ tiles tag - .2byte 0x1122 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_RubySapphireBrendan - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_RubySapphireMay:: @ 850BB5C - .2byte 0xFFFF @ tiles tag - .2byte 0x1123 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 256 @ image size - .2byte 16 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_16x32 - .4byte gFieldObjectSpriteOamTables_16x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_RubySapphireMay - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_Lugia:: @ 850BB80 - .2byte 0xFFFF @ tiles tag - .2byte 0x1121 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_Standard - .4byte gFieldObjectPicTable_Lugia - .4byte gDummySpriteAffineAnimTable - - .align 2 -gFieldObjectGraphicsInfo_HoOh:: @ 850BBA4 - .2byte 0xFFFF @ tiles tag - .2byte 0x1120 @ palette tag - .2byte 0x11FF @ palette tag 2 - .2byte 512 @ image size - .2byte 32 @ width - .2byte 32 @ height - .byte (SHADOW_SIZE_M << 4) | 10 @ flags, shadow size, palette slot - .byte TRACKS_FOOT - .2byte 0 @ padding - .4byte gFieldObjectBaseOam_32x32 - .4byte gFieldObjectSpriteOamTables_32x32 - .4byte gFieldObjectImageAnimTable_HoOh - .4byte gFieldObjectPicTable_HoOh - .4byte gDummySpriteAffineAnimTable diff --git a/data/graphics/field_objects/field_object_graphics_info_pointers.inc b/data/graphics/field_objects/field_object_graphics_info_pointers.inc deleted file mode 100644 index 1faea449c..000000000 --- a/data/graphics/field_objects/field_object_graphics_info_pointers.inc +++ /dev/null @@ -1,251 +0,0 @@ - .align 2 -gFieldObjectGraphicsInfoPointers:: @ 8505620 - .4byte gFieldObjectGraphicsInfo_BrendanNormal - .4byte gFieldObjectGraphicsInfo_BrendanMachBike - .4byte gFieldObjectGraphicsInfo_BrendanSurfing - .4byte gFieldObjectGraphicsInfo_BrendanFieldMove - .4byte gFieldObjectGraphicsInfo_QuintyPlump - .4byte gFieldObjectGraphicsInfo_LittleBoy1 - .4byte gFieldObjectGraphicsInfo_LittleGirl1 - .4byte gFieldObjectGraphicsInfo_Boy1 - .4byte gFieldObjectGraphicsInfo_Girl1 - .4byte gFieldObjectGraphicsInfo_Boy2 - .4byte gFieldObjectGraphicsInfo_Girl2 - .4byte gFieldObjectGraphicsInfo_LittleBoy2 - .4byte gFieldObjectGraphicsInfo_LittleGirl2 - .4byte gFieldObjectGraphicsInfo_Boy3 - .4byte gFieldObjectGraphicsInfo_Girl3 - .4byte gFieldObjectGraphicsInfo_Boy4 - .4byte gFieldObjectGraphicsInfo_Woman1 - .4byte gFieldObjectGraphicsInfo_FatMan - .4byte gFieldObjectGraphicsInfo_Woman2 - .4byte gFieldObjectGraphicsInfo_Man1 - .4byte gFieldObjectGraphicsInfo_Woman3 - .4byte gFieldObjectGraphicsInfo_OldMan1 - .4byte gFieldObjectGraphicsInfo_OldWoman1 - .4byte gFieldObjectGraphicsInfo_Man2 - .4byte gFieldObjectGraphicsInfo_Woman4 - .4byte gFieldObjectGraphicsInfo_Man3 - .4byte gFieldObjectGraphicsInfo_Woman5 - .4byte gFieldObjectGraphicsInfo_Cook - .4byte gFieldObjectGraphicsInfo_Woman6 - .4byte gFieldObjectGraphicsInfo_OldMan2 - .4byte gFieldObjectGraphicsInfo_OldWoman2 - .4byte gFieldObjectGraphicsInfo_Camper - .4byte gFieldObjectGraphicsInfo_Picnicker - .4byte gFieldObjectGraphicsInfo_Man4 - .4byte gFieldObjectGraphicsInfo_Woman7 - .4byte gFieldObjectGraphicsInfo_Youngster - .4byte gFieldObjectGraphicsInfo_BugCatcher - .4byte gFieldObjectGraphicsInfo_PsychicM - .4byte gFieldObjectGraphicsInfo_SchoolKidM - .4byte gFieldObjectGraphicsInfo_Maniac - .4byte gFieldObjectGraphicsInfo_HexManiac - .4byte gFieldObjectGraphicsInfo_Rayquaza1 - .4byte gFieldObjectGraphicsInfo_SwimmerM - .4byte gFieldObjectGraphicsInfo_SwimmerF - .4byte gFieldObjectGraphicsInfo_BlackBelt - .4byte gFieldObjectGraphicsInfo_Beauty - .4byte gFieldObjectGraphicsInfo_Scientist1 - .4byte gFieldObjectGraphicsInfo_Lass - .4byte gFieldObjectGraphicsInfo_Gentleman - .4byte gFieldObjectGraphicsInfo_Sailor - .4byte gFieldObjectGraphicsInfo_Fisherman - .4byte gFieldObjectGraphicsInfo_RunningTriathleteM - .4byte gFieldObjectGraphicsInfo_RunningTriathleteF - .4byte gFieldObjectGraphicsInfo_TuberF - .4byte gFieldObjectGraphicsInfo_TuberM - .4byte gFieldObjectGraphicsInfo_Hiker - .4byte gFieldObjectGraphicsInfo_CyclingTriathleteM - .4byte gFieldObjectGraphicsInfo_CyclingTriathleteF - .4byte gFieldObjectGraphicsInfo_Nurse - .4byte gFieldObjectGraphicsInfo_ItemBall - .4byte gFieldObjectGraphicsInfo_BerryTree - .4byte gFieldObjectGraphicsInfo_BerryTreeEarlyStages - .4byte gFieldObjectGraphicsInfo_BerryTreeLateStages - .4byte gFieldObjectGraphicsInfo_BrendanAcroBike - .4byte gFieldObjectGraphicsInfo_ProfBirch - .4byte gFieldObjectGraphicsInfo_Man5 - .4byte gFieldObjectGraphicsInfo_Man6 - .4byte gFieldObjectGraphicsInfo_ReporterM - .4byte gFieldObjectGraphicsInfo_ReporterF - .4byte gFieldObjectGraphicsInfo_Bard - .4byte gFieldObjectGraphicsInfo_Anabel - .4byte gFieldObjectGraphicsInfo_Tucker - .4byte gFieldObjectGraphicsInfo_Greta - .4byte gFieldObjectGraphicsInfo_Spenser - .4byte gFieldObjectGraphicsInfo_Noland - .4byte gFieldObjectGraphicsInfo_Lucy - .4byte gFieldObjectGraphicsInfo_UnusedNatuDoll - .4byte gFieldObjectGraphicsInfo_UnusedMagnemiteDoll - .4byte gFieldObjectGraphicsInfo_UnusedSquirtleDoll - .4byte gFieldObjectGraphicsInfo_UnusedWooperDoll - .4byte gFieldObjectGraphicsInfo_UnusedPikachuDoll - .4byte gFieldObjectGraphicsInfo_UnusedPorygon2Doll - .4byte gFieldObjectGraphicsInfo_CuttableTree - .4byte gFieldObjectGraphicsInfo_MartEmployee - .4byte gFieldObjectGraphicsInfo_RooftopSaleWoman - .4byte gFieldObjectGraphicsInfo_Teala - .4byte gFieldObjectGraphicsInfo_BreakableRock - .4byte gFieldObjectGraphicsInfo_PushableBoulder - .4byte gFieldObjectGraphicsInfo_MrBrineysBoat - .4byte gFieldObjectGraphicsInfo_MayNormal - .4byte gFieldObjectGraphicsInfo_MayMachBike - .4byte gFieldObjectGraphicsInfo_MayAcroBike - .4byte gFieldObjectGraphicsInfo_MaySurfing - .4byte gFieldObjectGraphicsInfo_MayFieldMove - .4byte gFieldObjectGraphicsInfo_Truck - .4byte gFieldObjectGraphicsInfo_VigorothCarryingBox - .4byte gFieldObjectGraphicsInfo_VigorothFacingAway - .4byte gFieldObjectGraphicsInfo_BirchsBag - .4byte gFieldObjectGraphicsInfo_EnemyZigzagoon - .4byte gFieldObjectGraphicsInfo_Artist - .4byte gFieldObjectGraphicsInfo_RivalBrendanNormal - .4byte gFieldObjectGraphicsInfo_RivalBrendanMachBike - .4byte gFieldObjectGraphicsInfo_RivalBrendanAcroBike - .4byte gFieldObjectGraphicsInfo_RivalBrendanSurfing - .4byte gFieldObjectGraphicsInfo_RivalBrendanFieldMove - .4byte gFieldObjectGraphicsInfo_RivalMayNormal - .4byte gFieldObjectGraphicsInfo_RivalMayMachBike - .4byte gFieldObjectGraphicsInfo_RivalMayAcroBike - .4byte gFieldObjectGraphicsInfo_RivalMaySurfing - .4byte gFieldObjectGraphicsInfo_RivalMayFieldMove - .4byte gFieldObjectGraphicsInfo_Cameraman - .4byte gFieldObjectGraphicsInfo_BrendanUnderwater - .4byte gFieldObjectGraphicsInfo_MayUnderwater - .4byte gFieldObjectGraphicsInfo_MovingBox - .4byte gFieldObjectGraphicsInfo_CableCar - .4byte gFieldObjectGraphicsInfo_Scientist2 - .4byte gFieldObjectGraphicsInfo_Man7 - .4byte gFieldObjectGraphicsInfo_AquaMemberM - .4byte gFieldObjectGraphicsInfo_AquaMemberF - .4byte gFieldObjectGraphicsInfo_MagmaMemberM - .4byte gFieldObjectGraphicsInfo_MagmaMemberF - .4byte gFieldObjectGraphicsInfo_Sidney - .4byte gFieldObjectGraphicsInfo_Phoebe - .4byte gFieldObjectGraphicsInfo_Glacia - .4byte gFieldObjectGraphicsInfo_Drake - .4byte gFieldObjectGraphicsInfo_Roxanne - .4byte gFieldObjectGraphicsInfo_Brawly - .4byte gFieldObjectGraphicsInfo_Wattson - .4byte gFieldObjectGraphicsInfo_Flannery - .4byte gFieldObjectGraphicsInfo_Norman - .4byte gFieldObjectGraphicsInfo_Winona - .4byte gFieldObjectGraphicsInfo_Liza - .4byte gFieldObjectGraphicsInfo_Tate - .4byte gFieldObjectGraphicsInfo_Wallace - .4byte gFieldObjectGraphicsInfo_Steven - .4byte gFieldObjectGraphicsInfo_Wally - .4byte gFieldObjectGraphicsInfo_RubySapphireLittleBoy - .4byte gFieldObjectGraphicsInfo_BrendanFishing - .4byte gFieldObjectGraphicsInfo_MayFishing - .4byte gFieldObjectGraphicsInfo_HotSpringsOldWoman - .4byte gFieldObjectGraphicsInfo_SSTidal - .4byte gFieldObjectGraphicsInfo_SubmarineShadow - .4byte gFieldObjectGraphicsInfo_PichuDoll - .4byte gFieldObjectGraphicsInfo_PikachuDoll - .4byte gFieldObjectGraphicsInfo_MarillDoll - .4byte gFieldObjectGraphicsInfo_TogepiDoll - .4byte gFieldObjectGraphicsInfo_CyndaquilDoll - .4byte gFieldObjectGraphicsInfo_ChikoritaDoll - .4byte gFieldObjectGraphicsInfo_TotodileDoll - .4byte gFieldObjectGraphicsInfo_JigglypuffDoll - .4byte gFieldObjectGraphicsInfo_MeowthDoll - .4byte gFieldObjectGraphicsInfo_ClefairyDoll - .4byte gFieldObjectGraphicsInfo_DittoDoll - .4byte gFieldObjectGraphicsInfo_SmoochumDoll - .4byte gFieldObjectGraphicsInfo_TreeckoDoll - .4byte gFieldObjectGraphicsInfo_TorchicDoll - .4byte gFieldObjectGraphicsInfo_MudkipDoll - .4byte gFieldObjectGraphicsInfo_DuskullDoll - .4byte gFieldObjectGraphicsInfo_WynautDoll - .4byte gFieldObjectGraphicsInfo_BaltoyDoll - .4byte gFieldObjectGraphicsInfo_KecleonDoll - .4byte gFieldObjectGraphicsInfo_AzurillDoll - .4byte gFieldObjectGraphicsInfo_SkittyDoll - .4byte gFieldObjectGraphicsInfo_SwabluDoll - .4byte gFieldObjectGraphicsInfo_GulpinDoll - .4byte gFieldObjectGraphicsInfo_LotadDoll - .4byte gFieldObjectGraphicsInfo_SeedotDoll - .4byte gFieldObjectGraphicsInfo_PikaCushion - .4byte gFieldObjectGraphicsInfo_RoundCushion - .4byte gFieldObjectGraphicsInfo_KissCushion - .4byte gFieldObjectGraphicsInfo_ZigzagCushion - .4byte gFieldObjectGraphicsInfo_SpinCushion - .4byte gFieldObjectGraphicsInfo_DiamondCushion - .4byte gFieldObjectGraphicsInfo_BallCushion - .4byte gFieldObjectGraphicsInfo_GrassCushion - .4byte gFieldObjectGraphicsInfo_FireCushion - .4byte gFieldObjectGraphicsInfo_WaterCushion - .4byte gFieldObjectGraphicsInfo_BigSnorlaxDoll - .4byte gFieldObjectGraphicsInfo_BigRhydonDoll - .4byte gFieldObjectGraphicsInfo_BigLaprasDoll - .4byte gFieldObjectGraphicsInfo_BigVenusaurDoll - .4byte gFieldObjectGraphicsInfo_BigCharizardDoll - .4byte gFieldObjectGraphicsInfo_BigBlastoiseDoll - .4byte gFieldObjectGraphicsInfo_BigWailmerDoll - .4byte gFieldObjectGraphicsInfo_BigRegirockDoll - .4byte gFieldObjectGraphicsInfo_BigRegiceDoll - .4byte gFieldObjectGraphicsInfo_BigRegisteelDoll - .4byte gFieldObjectGraphicsInfo_Latias - .4byte gFieldObjectGraphicsInfo_Latios - .4byte gFieldObjectGraphicsInfo_Boy5 - .4byte gFieldObjectGraphicsInfo_ContestOldMan - .4byte gFieldObjectGraphicsInfo_BrendanWatering - .4byte gFieldObjectGraphicsInfo_MayWatering - .4byte gFieldObjectGraphicsInfo_BrendanDecorating - .4byte gFieldObjectGraphicsInfo_MayDecorating - .4byte gFieldObjectGraphicsInfo_Archie - .4byte gFieldObjectGraphicsInfo_Maxie - .4byte gFieldObjectGraphicsInfo_Kyogre1 - .4byte gFieldObjectGraphicsInfo_Groudon1 - .4byte gFieldObjectGraphicsInfo_Fossil - .4byte gFieldObjectGraphicsInfo_Regirock - .4byte gFieldObjectGraphicsInfo_Regice - .4byte gFieldObjectGraphicsInfo_Registeel - .4byte gFieldObjectGraphicsInfo_Skitty - .4byte gFieldObjectGraphicsInfo_Kecleon1 - .4byte gFieldObjectGraphicsInfo_Kyogre2 - .4byte gFieldObjectGraphicsInfo_Groudon2 - .4byte gFieldObjectGraphicsInfo_Rayquaza2 - .4byte gFieldObjectGraphicsInfo_Zigzagoon - .4byte gFieldObjectGraphicsInfo_Pikachu - .4byte gFieldObjectGraphicsInfo_Azumarill - .4byte gFieldObjectGraphicsInfo_Wingull - .4byte gFieldObjectGraphicsInfo_Kecleon2 - .4byte gFieldObjectGraphicsInfo_TuberMSwimming - .4byte gFieldObjectGraphicsInfo_Azurill - .4byte gFieldObjectGraphicsInfo_Mom - .4byte gFieldObjectGraphicsInfo_LinkBrendan - .4byte gFieldObjectGraphicsInfo_LinkMay - .4byte gFieldObjectGraphicsInfo_Juan - .4byte gFieldObjectGraphicsInfo_Scott - .4byte gFieldObjectGraphicsInfo_Poochyena - .4byte gFieldObjectGraphicsInfo_Kyogre3 - .4byte gFieldObjectGraphicsInfo_Groudon3 - .4byte gFieldObjectGraphicsInfo_MysteryEventDeliveryman - .4byte gFieldObjectGraphicsInfo_Statue - .4byte gFieldObjectGraphicsInfo_Kirlia - .4byte gFieldObjectGraphicsInfo_Dusclops - .4byte gFieldObjectGraphicsInfo_UnionRoomAttendant - .4byte gFieldObjectGraphicsInfo_Sudowoodo - .4byte gFieldObjectGraphicsInfo_Mew - .4byte gFieldObjectGraphicsInfo_Red - .4byte gFieldObjectGraphicsInfo_Leaf - .4byte gFieldObjectGraphicsInfo_Deoxys - .4byte gFieldObjectGraphicsInfo_BirthIslandStone - .4byte gFieldObjectGraphicsInfo_Brandon - .4byte gFieldObjectGraphicsInfo_RubySapphireBrendan - .4byte gFieldObjectGraphicsInfo_RubySapphireMay - .4byte gFieldObjectGraphicsInfo_Lugia - .4byte gFieldObjectGraphicsInfo_HoOh - - .align 2 -gMauvilleOldManGraphicsInfoPointers:: @ 85059DC - .4byte gFieldObjectGraphicsInfo_Bard - .4byte gFieldObjectGraphicsInfo_Hipster - .4byte gFieldObjectGraphicsInfo_Trader - .4byte gFieldObjectGraphicsInfo_Storyteller - .4byte gFieldObjectGraphicsInfo_Giddy - .4byte gFieldObjectGraphicsInfo_UnusedMauvilleOldMan1 - .4byte gFieldObjectGraphicsInfo_UnusedMauvilleOldMan2 diff --git a/data/graphics/field_objects/field_object_oam.inc b/data/graphics/field_objects/field_object_oam.inc deleted file mode 100644 index ea4da1c02..000000000 --- a/data/graphics/field_objects/field_object_oam.inc +++ /dev/null @@ -1,465 +0,0 @@ - .align 2 -gFieldObjectBaseOam_8x8:: @ 85094EC - .4byte OAM_SIZE_8x8 - .2byte 2 << 10 @ priority - - .align 2 -gFieldObjectBaseOam_16x8:: @ 85094F4 - .4byte OAM_SIZE_16x8 - .2byte 2 << 10 @ priority - - .align 2 -gFieldObjectBaseOam_16x16:: @ 85094FC - .4byte OAM_SIZE_16x16 - .2byte 2 << 10 @ priority - - .align 2 -gFieldObjectBaseOam_32x8:: @ 8509504 - .4byte OAM_SIZE_32x8 - .2byte 2 << 10 @ priority - - .align 2 -gFieldObjectBaseOam_64x32:: @ 850950C - .4byte OAM_SIZE_64x32 - .2byte 2 << 10 @ priority - - .align 2 -gFieldObjectBaseOam_16x32:: @ 8509514 - .4byte OAM_SIZE_16x32 - .2byte 2 << 10 @ priority - - .align 2 -gFieldObjectBaseOam_32x32:: @ 850951C - .4byte OAM_SIZE_32x32 - .2byte 2 << 10 @ priority - - .align 2 -gFieldObjectBaseOam_64x64:: @ 8509524 - .4byte OAM_SIZE_64x64 - .2byte 2 << 10 @ priority - - .align 2 -gFieldObjectSpriteOamTable_16x16_0:: @ 850952C - subsprite -8, -8, 2, 0, 16x16 - - .align 2 -gFieldObjectSpriteOamTable_16x16_1:: @ 8509530 - subsprite -8, -8, 1, 0, 16x16 - - .align 2 -gFieldObjectSpriteOamTable_16x16_2:: @ 8509534 - subsprite -8, -8, 2, 0, 16x8 - subsprite -8, 0, 3, 2, 16x8 - - .align 2 -gFieldObjectSpriteOamTable_16x16_3:: @ 850953C - subsprite -8, -8, 2, 0, 16x16 - subsprite -8, -8, 3, 0, 16x16 - - .align 2 -gFieldObjectSpriteOamTable_16x16_4:: @ 8509544 - subsprite -8, -8, 1, 0, 16x16 - subsprite -8, -8, 3, 0, 16x16 - - .align 2 -gFieldObjectSpriteOamTables_16x16:: @ 850954C - .4byte 0 @ number of sprites - .4byte NULL @ unknown - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x16_0 @ below high bridge - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x16_1 @ above high bridge - - .4byte 2 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x16_2 @ unknown - - .4byte 2 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x16_3 @ long grass below high bridge - - .4byte 2 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x16_4 @ long grass above high bridge - - .align 2 -gFieldObjectSpriteOamTable_16x32_0:: @ 850957C - subsprite -8, -16, 2, 0, 16x32 - - .align 2 -gFieldObjectSpriteOamTable_16x32_1:: @ 8509580 - subsprite -8, -16, 1, 0, 16x32 - - .align 2 -gFieldObjectSpriteOamTable_16x32_2:: @ 8509584 - subsprite -8, -16, 2, 0, 16x16 - subsprite -8, 0, 2, 4, 16x8 - subsprite -8, 8, 3, 6, 16x8 - - .align 2 -gFieldObjectSpriteOamTable_16x32_3:: @ 8509590 - subsprite -8, -16, 2, 0, 16x16 - subsprite -8, 0, 3, 4, 16x16 - - .align 2 -gFieldObjectSpriteOamTable_16x32_4:: @ 8509598 - subsprite -8, -16, 1, 0, 16x16 - subsprite -8, 0, 3, 4, 16x16 - - .align 2 -gFieldObjectSpriteOamTables_16x32:: @ 85095A0 - .4byte 0 @ number of sprites - .4byte NULL @ unknown - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x32_0 @ below high bridge - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x32_1 @ above high bridge - - .4byte 3 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x32_2 @ unknown - - .4byte 2 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x32_3 @ long grass below high bridge - - .4byte 2 @ number of sprites - .4byte gFieldObjectSpriteOamTable_16x32_4 @ long grass above high bridge - - .align 2 -gFieldObjectSpriteOamTable_32x32_0:: @ 85095D0 - subsprite -16, -16, 2, 0, 32x32 - - .align 2 -gFieldObjectSpriteOamTable_32x32_1:: @ 85095D4 - subsprite -16, -16, 1, 0, 32x32 - - .align 2 -gFieldObjectSpriteOamTable_32x32_2:: @ 85095D8 - subsprite -16, -16, 2, 0, 32x16 - subsprite -16, 0, 2, 8, 32x8 - subsprite -16, 8, 3, 12, 32x8 - - .align 2 -gFieldObjectSpriteOamTable_32x32_3:: @ 85095E4 - subsprite -16, -16, 2, 0, 32x16 - subsprite -16, 0, 3, 8, 32x16 - - .align 2 -gFieldObjectSpriteOamTable_32x32_4:: @ 85095EC - subsprite -16, -16, 1, 0, 32x16 - subsprite -16, 0, 3, 8, 32x16 - - .align 2 -gFieldObjectSpriteOamTables_32x32:: @ 85095F4 - .4byte 0 @ number of sprites - .4byte NULL @ unknown - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_32x32_0 @ below high bridge - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_32x32_1 @ above high bridge - - .4byte 3 @ number of sprites - .4byte gFieldObjectSpriteOamTable_32x32_2 @ unknown - - .4byte 2 @ number of sprites - .4byte gFieldObjectSpriteOamTable_32x32_3 @ long grass below high bridge - - .4byte 2 @ number of sprites - .4byte gFieldObjectSpriteOamTable_32x32_4 @ long grass above high bridge - - .align 2 -gFieldObjectSpriteOamTable_Truck_0:: @ 8509624 - subsprite -24, -24, 2, 0, 32x8 - subsprite 8, -24, 2, 4, 16x8 - subsprite -24, -16, 2, 6, 32x8 - subsprite 8, -16, 2, 10, 16x8 - subsprite -24, -8, 2, 12, 32x8 - subsprite 8, -8, 2, 16, 16x8 - subsprite -24, 0, 2, 18, 32x8 - subsprite 8, 0, 2, 22, 16x8 - subsprite -24, 8, 2, 24, 32x8 - subsprite 8, 8, 2, 28, 16x8 - subsprite -24, 16, 2, 30, 32x8 - subsprite 8, 16, 2, 34, 16x8 - - .align 2 -gFieldObjectSpriteOamTables_Truck:: @ 8509654 - .4byte 12 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Truck_0 @ unknown - - .4byte 12 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Truck_0 @ below high bridge - - .4byte 12 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Truck_0 @ above high bridge - - .4byte 12 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Truck_0 @ unknown - - .4byte 12 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Truck_0 @ long grass below high bridge - - .4byte 12 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Truck_0 @ long grass above high bridge - - .align 2 -gFieldObjectSpriteOamTable_Unused_0:: @ 8509684 - subsprite -32, -16, 2, 0, 64x32 - - .align 2 -gFieldObjectSpriteOamTable_Unused_1:: @ 8509688 - subsprite -32, -16, 1, 0, 64x32 - - .align 2 -gFieldObjectSpriteOamTable_Unused_2:: @ 850968C - subsprite -32, -16, 2, 0, 64x32 - - .align 2 -gFieldObjectSpriteOamTable_Unused_3:: @ 8509690 - subsprite -32, -16, 2, 0, 64x32 - - .align 2 -gFieldObjectSpriteOamTables_Unused:: @ 8509694 - .4byte 0 @ number of sprites - .4byte NULL @ unknown - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Unused_0 @ below high bridge - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Unused_1 @ above high bridge - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Unused_2 @ unknown - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Unused_3 @ long grass below high bridge - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_Unused_3 @ long grass above high bridge - - .align 2 -gFieldObjectSpriteOamTable_64x64_0:: @ 85096C4 - subsprite -32, -32, 2, 0, 64x64 - - .align 2 -gFieldObjectSpriteOamTable_64x64_1:: @ 85096C8 - subsprite -32, -32, 1, 0, 64x64 - - .align 2 -gFieldObjectSpriteOamTable_64x64_2:: @ 85096CC - subsprite -32, -32, 2, 0, 64x64 - - .align 2 -gFieldObjectSpriteOamTable_64x64_3:: @ 85096D0 - subsprite -32, -32, 2, 0, 64x64 - - .align 2 -gFieldObjectSpriteOamTables_64x64:: @ 85096D4 - .4byte 0 @ number of sprites - .4byte NULL @ unknown - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_64x64_0 @ below high bridge - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_64x64_1 @ above high bridge - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_64x64_2 @ unknown - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_64x64_3 @ long grass below high bridge - - .4byte 1 @ number of sprites - .4byte gFieldObjectSpriteOamTable_64x64_3 @ long grass above high bridge - - .align 2 -gFieldObjectSpriteOamTable_SSTidal_0:: @ 8509704 - subsprite -48, -20, 2, 0, 32x8 - subsprite -16, -20, 2, 4, 32x8 - subsprite 16, -20, 2, 8, 32x8 - subsprite -48, -12, 2, 12, 32x8 - subsprite -16, -12, 2, 16, 32x8 - subsprite 16, -12, 2, 20, 32x8 - subsprite -48, -4, 2, 24, 32x8 - subsprite -16, -4, 2, 28, 32x8 - subsprite 16, -4, 2, 32, 32x8 - subsprite -48, 4, 2, 36, 32x8 - subsprite -16, 4, 2, 40, 32x8 - subsprite 16, 4, 2, 44, 32x8 - subsprite -48, 12, 2, 48, 32x8 - subsprite -16, 12, 2, 52, 32x8 - subsprite 16, 12, 2, 56, 32x8 - - .align 2 -gFieldObjectSpriteOamTable_SSTidal_1:: @ 8509740 - subsprite -48, -20, 1, 0, 32x8 - subsprite -16, -20, 1, 4, 32x8 - subsprite 16, -20, 1, 8, 32x8 - subsprite -48, -12, 1, 12, 32x8 - subsprite -16, -12, 1, 16, 32x8 - subsprite 16, -12, 1, 20, 32x8 - subsprite -48, -4, 1, 24, 32x8 - subsprite -16, -4, 1, 28, 32x8 - subsprite 16, -4, 1, 32, 32x8 - subsprite -48, 4, 1, 36, 32x8 - subsprite -16, 4, 1, 40, 32x8 - subsprite 16, 4, 1, 44, 32x8 - subsprite -48, 12, 1, 48, 32x8 - subsprite -16, 12, 1, 52, 32x8 - subsprite 16, 12, 1, 56, 32x8 - - .align 2 -gFieldObjectSpriteOamTable_SSTidal_2:: @ 850977C - subsprite -48, -20, 2, 0, 32x8 - subsprite -16, -20, 2, 4, 32x8 - subsprite 16, -20, 2, 8, 32x8 - subsprite -48, -12, 2, 12, 32x8 - subsprite -16, -12, 2, 16, 32x8 - subsprite 16, -12, 2, 20, 32x8 - subsprite -48, -4, 2, 24, 32x8 - subsprite -16, -4, 2, 28, 32x8 - subsprite 16, -4, 2, 32, 32x8 - subsprite -48, 4, 2, 36, 32x8 - subsprite -16, 4, 2, 40, 32x8 - subsprite 16, 4, 2, 44, 32x8 - subsprite -48, 12, 2, 48, 32x8 - subsprite -16, 12, 2, 52, 32x8 - subsprite 16, 12, 2, 56, 32x8 - - .align 2 -gFieldObjectSpriteOamTable_SSTidal_3:: @ 85097B8 - subsprite -48, -20, 1, 0, 32x8 - subsprite -16, -20, 1, 4, 32x8 - subsprite 16, -20, 1, 8, 32x8 - subsprite -48, -12, 1, 12, 32x8 - subsprite -16, -12, 1, 16, 32x8 - subsprite 16, -12, 1, 20, 32x8 - subsprite -48, -4, 2, 24, 32x8 - subsprite -16, -4, 2, 28, 32x8 - subsprite 16, -4, 2, 32, 32x8 - subsprite -48, 4, 2, 36, 32x8 - subsprite -16, 4, 2, 40, 32x8 - subsprite 16, 4, 2, 44, 32x8 - subsprite -48, 12, 2, 48, 32x8 - subsprite -16, 12, 2, 52, 32x8 - subsprite 16, 12, 2, 56, 32x8 - - .align 2 -gFieldObjectSpriteOamTables_SSTidal:: @ 85097F4 - .4byte 15 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SSTidal_0 @ unknown - - .4byte 15 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SSTidal_0 @ below high bridge - - .4byte 15 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SSTidal_1 @ above high bridge - - .4byte 15 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SSTidal_2 @ unknown - - .4byte 15 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SSTidal_3 @ long grass below high bridge - - .4byte 15 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SSTidal_3 @ long grass above high bridge - - .align 2 -gFieldObjectSpriteOamTable_SubmarineShadow_0:: @ 8509824 - subsprite -48, -20, 2, 0, 32x8 - subsprite -16, -20, 2, 4, 32x8 - subsprite 16, -20, 2, 8, 16x8 - subsprite 32, -20, 2, 10, 8x8 - subsprite -48, -12, 2, 11, 32x8 - subsprite -16, -12, 2, 15, 32x8 - subsprite 16, -12, 2, 19, 16x8 - subsprite 32, -12, 2, 21, 8x8 - subsprite -48, -4, 2, 22, 32x8 - subsprite -16, -4, 2, 26, 32x8 - subsprite 16, -4, 2, 30, 16x8 - subsprite 32, -4, 2, 32, 8x8 - subsprite -48, 4, 2, 33, 32x8 - subsprite -16, 4, 2, 37, 32x8 - subsprite 16, 4, 2, 41, 16x8 - subsprite 32, 4, 2, 43, 8x8 - - .align 2 -gFieldObjectSpriteOamTable_SubmarineShadow_1:: @ 8509864 - subsprite -48, -20, 1, 0, 32x8 - subsprite -16, -20, 1, 4, 32x8 - subsprite 16, -20, 1, 8, 16x8 - subsprite 32, -20, 1, 10, 8x8 - subsprite -48, -12, 1, 11, 32x8 - subsprite -16, -12, 1, 15, 32x8 - subsprite 16, -12, 1, 19, 16x8 - subsprite 32, -12, 1, 21, 8x8 - subsprite -48, -4, 1, 22, 32x8 - subsprite -16, -4, 1, 26, 32x8 - subsprite 16, -4, 1, 30, 16x8 - subsprite 32, -4, 1, 32, 8x8 - subsprite -48, 4, 1, 33, 32x8 - subsprite -16, 4, 1, 37, 32x8 - subsprite 16, 4, 1, 41, 16x8 - subsprite 32, 4, 1, 43, 8x8 - - .align 2 -gFieldObjectSpriteOamTable_SubmarineShadow_2:: @ 85098A4 - subsprite -48, -20, 2, 0, 32x8 - subsprite -16, -20, 2, 4, 32x8 - subsprite 16, -20, 2, 8, 16x8 - subsprite 32, -20, 2, 10, 8x8 - subsprite -48, -12, 2, 11, 32x8 - subsprite -16, -12, 2, 15, 32x8 - subsprite 16, -12, 2, 19, 16x8 - subsprite 32, -12, 2, 21, 8x8 - subsprite -48, -4, 2, 22, 32x8 - subsprite -16, -4, 2, 26, 32x8 - subsprite 16, -4, 2, 30, 16x8 - subsprite 32, -4, 2, 32, 8x8 - subsprite -48, 4, 2, 33, 32x8 - subsprite -16, 4, 2, 37, 32x8 - subsprite 16, 4, 2, 41, 16x8 - subsprite 32, 4, 2, 43, 8x8 - - .align 2 -gFieldObjectSpriteOamTable_SubmarineShadow_3:: @ 85098E4 - subsprite -48, -20, 1, 0, 32x8 - subsprite -16, -20, 1, 4, 32x8 - subsprite 16, -20, 1, 8, 16x8 - subsprite 32, -20, 1, 10, 8x8 - subsprite -48, -12, 1, 11, 32x8 - subsprite -16, -12, 1, 15, 32x8 - subsprite 16, -12, 1, 19, 16x8 - subsprite 32, -12, 1, 21, 8x8 - subsprite -48, -4, 2, 22, 32x8 - subsprite -16, -4, 2, 26, 32x8 - subsprite 16, -4, 2, 30, 16x8 - subsprite 32, -4, 2, 32, 8x8 - subsprite -48, 4, 2, 33, 32x8 - subsprite -16, 4, 2, 37, 32x8 - subsprite 16, 4, 2, 41, 16x8 - subsprite 32, 4, 2, 43, 8x8 - - .align 2 -gFieldObjectSpriteOamTables_SubmarineShadow:: @ 8509924 - .4byte 16 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 @ unknown - - .4byte 16 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SubmarineShadow_0 @ below high bridge - - .4byte 16 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SubmarineShadow_1 @ above high bridge - - .4byte 16 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SubmarineShadow_2 @ unknown - - .4byte 16 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 @ long grass below high bridge - - .4byte 16 @ number of sprites - .4byte gFieldObjectSpriteOamTable_SubmarineShadow_3 @ long grass above high bridge diff --git a/data/graphics/field_objects/field_object_pic_tables.inc b/data/graphics/field_objects/field_object_pic_tables.inc deleted file mode 100644 index abd09d7c4..000000000 --- a/data/graphics/field_objects/field_object_pic_tables.inc +++ /dev/null @@ -1,2174 +0,0 @@ - .align 2 -gFieldObjectPicTable_BrendanNormal:: @ 8505A8C - obj_tiles gFieldObjectPic_BrendanNormal_0, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_1, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_2, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_3, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_4, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_5, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_6, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_7, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_8, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_9, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_10, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_11, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_12, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_13, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_14, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_15, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_16, 0x100 - obj_tiles gFieldObjectPic_BrendanNormal_17, 0x100 - - .align 2 -gFieldObjectPicTable_BrendanMachBike:: @ 8505B1C - obj_tiles gFieldObjectPic_BrendanMachBike_0, 0x200 - obj_tiles gFieldObjectPic_BrendanMachBike_1, 0x200 - obj_tiles gFieldObjectPic_BrendanMachBike_2, 0x200 - obj_tiles gFieldObjectPic_BrendanMachBike_3, 0x200 - obj_tiles gFieldObjectPic_BrendanMachBike_4, 0x200 - obj_tiles gFieldObjectPic_BrendanMachBike_5, 0x200 - obj_tiles gFieldObjectPic_BrendanMachBike_6, 0x200 - obj_tiles gFieldObjectPic_BrendanMachBike_7, 0x200 - obj_tiles gFieldObjectPic_BrendanMachBike_8, 0x200 - - .align 2 -gFieldObjectPicTable_BrendanAcroBike:: @ 8505B64 - obj_tiles gFieldObjectPic_BrendanAcroBike_0, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_1, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_2, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_3, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_4, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_5, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_6, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_7, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_8, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_9, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_10, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_11, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_12, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_13, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_14, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_15, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_16, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_17, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_18, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_19, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_20, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_21, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_22, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_23, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_24, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_25, 0x200 - obj_tiles gFieldObjectPic_BrendanAcroBike_26, 0x200 - - .align 2 -gFieldObjectPicTable_BrendanSurfing:: @ 8505C3C - obj_tiles gFieldObjectPic_BrendanSurfing_0, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_1, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_2, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_0, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_0, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_1, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_1, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_2, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_2, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_3, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_4, 0x200 - obj_tiles gFieldObjectPic_BrendanSurfing_5, 0x200 - - .align 2 -gFieldObjectPicTable_BrendanUnderwater:: @ 8505C9C - obj_tiles gFieldObjectPic_BrendanUnderwater_0, 0x200 - obj_tiles gFieldObjectPic_BrendanUnderwater_1, 0x200 - obj_tiles gFieldObjectPic_BrendanUnderwater_2, 0x200 - obj_tiles gFieldObjectPic_BrendanUnderwater_0, 0x200 - obj_tiles gFieldObjectPic_BrendanUnderwater_0, 0x200 - obj_tiles gFieldObjectPic_BrendanUnderwater_1, 0x200 - obj_tiles gFieldObjectPic_BrendanUnderwater_1, 0x200 - obj_tiles gFieldObjectPic_BrendanUnderwater_2, 0x200 - obj_tiles gFieldObjectPic_BrendanUnderwater_2, 0x200 - - .align 2 -gFieldObjectPicTable_BrendanFieldMove:: @ 8505CE4 - obj_tiles gFieldObjectPic_BrendanFieldMove_0, 0x200 - obj_tiles gFieldObjectPic_BrendanFieldMove_1, 0x200 - obj_tiles gFieldObjectPic_BrendanFieldMove_2, 0x200 - obj_tiles gFieldObjectPic_BrendanFieldMove_3, 0x200 - obj_tiles gFieldObjectPic_BrendanFieldMove_4, 0x200 - - .align 2 -gFieldObjectPicTable_QuintyPlump:: @ 8505D0C - obj_tiles gFieldObjectPic_QuintyPlump_0, 0x200 - obj_tiles gFieldObjectPic_QuintyPlump_1, 0x200 - obj_tiles gFieldObjectPic_QuintyPlump_2, 0x200 - obj_tiles gFieldObjectPic_QuintyPlump_3, 0x200 - obj_tiles gFieldObjectPic_QuintyPlump_4, 0x200 - obj_tiles gFieldObjectPic_QuintyPlump_5, 0x200 - obj_tiles gFieldObjectPic_QuintyPlump_6, 0x200 - - .align 2 -gFieldObjectPicTable_LittleBoy1:: @ 8505D44 - obj_tiles gFieldObjectPic_LittleBoy1_0, 0x80 - obj_tiles gFieldObjectPic_LittleBoy1_1, 0x80 - obj_tiles gFieldObjectPic_LittleBoy1_2, 0x80 - obj_tiles gFieldObjectPic_LittleBoy1_3, 0x80 - obj_tiles gFieldObjectPic_LittleBoy1_4, 0x80 - obj_tiles gFieldObjectPic_LittleBoy1_5, 0x80 - obj_tiles gFieldObjectPic_LittleBoy1_6, 0x80 - obj_tiles gFieldObjectPic_LittleBoy1_7, 0x80 - obj_tiles gFieldObjectPic_LittleBoy1_8, 0x80 - - .align 2 -gFieldObjectPicTable_LittleGirl1:: @ 8505D8C - obj_tiles gFieldObjectPic_LittleGirl1_0, 0x100 - obj_tiles gFieldObjectPic_LittleGirl1_1, 0x100 - obj_tiles gFieldObjectPic_LittleGirl1_2, 0x100 - obj_tiles gFieldObjectPic_LittleGirl1_3, 0x100 - obj_tiles gFieldObjectPic_LittleGirl1_4, 0x100 - obj_tiles gFieldObjectPic_LittleGirl1_5, 0x100 - obj_tiles gFieldObjectPic_LittleGirl1_6, 0x100 - obj_tiles gFieldObjectPic_LittleGirl1_7, 0x100 - obj_tiles gFieldObjectPic_LittleGirl1_8, 0x100 - - .align 2 -gFieldObjectPicTable_Boy1:: @ 8505DD4 - obj_tiles gFieldObjectPic_Boy1_0, 0x100 - obj_tiles gFieldObjectPic_Boy1_1, 0x100 - obj_tiles gFieldObjectPic_Boy1_2, 0x100 - obj_tiles gFieldObjectPic_Boy1_3, 0x100 - obj_tiles gFieldObjectPic_Boy1_4, 0x100 - obj_tiles gFieldObjectPic_Boy1_5, 0x100 - obj_tiles gFieldObjectPic_Boy1_6, 0x100 - obj_tiles gFieldObjectPic_Boy1_7, 0x100 - obj_tiles gFieldObjectPic_Boy1_8, 0x100 - - .align 2 -gFieldObjectPicTable_Girl1:: @ 8505E1C - obj_tiles gFieldObjectPic_Girl1_0, 0x100 - obj_tiles gFieldObjectPic_Girl1_1, 0x100 - obj_tiles gFieldObjectPic_Girl1_2, 0x100 - obj_tiles gFieldObjectPic_Girl1_3, 0x100 - obj_tiles gFieldObjectPic_Girl1_4, 0x100 - obj_tiles gFieldObjectPic_Girl1_5, 0x100 - obj_tiles gFieldObjectPic_Girl1_6, 0x100 - obj_tiles gFieldObjectPic_Girl1_7, 0x100 - obj_tiles gFieldObjectPic_Girl1_8, 0x100 - - .align 2 -gFieldObjectPicTable_Boy2:: @ 8505E64 - obj_tiles gFieldObjectPic_Boy2_0, 0x100 - obj_tiles gFieldObjectPic_Boy2_1, 0x100 - obj_tiles gFieldObjectPic_Boy2_2, 0x100 - obj_tiles gFieldObjectPic_Boy2_3, 0x100 - obj_tiles gFieldObjectPic_Boy2_4, 0x100 - obj_tiles gFieldObjectPic_Boy2_5, 0x100 - obj_tiles gFieldObjectPic_Boy2_6, 0x100 - obj_tiles gFieldObjectPic_Boy2_7, 0x100 - obj_tiles gFieldObjectPic_Boy2_8, 0x100 - - .align 2 -gFieldObjectPicTable_Girl2:: @ 8505EAC - obj_tiles gFieldObjectPic_Girl2_0, 0x100 - obj_tiles gFieldObjectPic_Girl2_1, 0x100 - obj_tiles gFieldObjectPic_Girl2_2, 0x100 - obj_tiles gFieldObjectPic_Girl2_3, 0x100 - obj_tiles gFieldObjectPic_Girl2_4, 0x100 - obj_tiles gFieldObjectPic_Girl2_5, 0x100 - obj_tiles gFieldObjectPic_Girl2_6, 0x100 - obj_tiles gFieldObjectPic_Girl2_7, 0x100 - obj_tiles gFieldObjectPic_Girl2_8, 0x100 - - .align 2 -gFieldObjectPicTable_LittleBoy2:: @ 8505EF4 - obj_tiles gFieldObjectPic_LittleBoy2_0, 0x80 - obj_tiles gFieldObjectPic_LittleBoy2_1, 0x80 - obj_tiles gFieldObjectPic_LittleBoy2_2, 0x80 - obj_tiles gFieldObjectPic_LittleBoy2_3, 0x80 - obj_tiles gFieldObjectPic_LittleBoy2_4, 0x80 - obj_tiles gFieldObjectPic_LittleBoy2_5, 0x80 - obj_tiles gFieldObjectPic_LittleBoy2_6, 0x80 - obj_tiles gFieldObjectPic_LittleBoy2_7, 0x80 - obj_tiles gFieldObjectPic_LittleBoy2_8, 0x80 - - .align 2 -gFieldObjectPicTable_LittleGirl2:: @ 8505F3C - obj_tiles gFieldObjectPic_LittleGirl2_0, 0x80 - obj_tiles gFieldObjectPic_LittleGirl2_1, 0x80 - obj_tiles gFieldObjectPic_LittleGirl2_2, 0x80 - obj_tiles gFieldObjectPic_LittleGirl2_3, 0x80 - obj_tiles gFieldObjectPic_LittleGirl2_4, 0x80 - obj_tiles gFieldObjectPic_LittleGirl2_5, 0x80 - obj_tiles gFieldObjectPic_LittleGirl2_6, 0x80 - obj_tiles gFieldObjectPic_LittleGirl2_7, 0x80 - obj_tiles gFieldObjectPic_LittleGirl2_8, 0x80 - - .align 2 -gFieldObjectPicTable_Boy3:: @ 8505F84 - obj_tiles gFieldObjectPic_Boy3_0, 0x100 - obj_tiles gFieldObjectPic_Boy3_1, 0x100 - obj_tiles gFieldObjectPic_Boy3_2, 0x100 - obj_tiles gFieldObjectPic_Boy3_3, 0x100 - obj_tiles gFieldObjectPic_Boy3_4, 0x100 - obj_tiles gFieldObjectPic_Boy3_5, 0x100 - obj_tiles gFieldObjectPic_Boy3_6, 0x100 - obj_tiles gFieldObjectPic_Boy3_7, 0x100 - obj_tiles gFieldObjectPic_Boy3_8, 0x100 - - .align 2 -gFieldObjectPicTable_Girl3:: @ 8505FCC - obj_tiles gFieldObjectPic_Girl3_0, 0x100 - obj_tiles gFieldObjectPic_Girl3_1, 0x100 - obj_tiles gFieldObjectPic_Girl3_2, 0x100 - obj_tiles gFieldObjectPic_Girl3_3, 0x100 - obj_tiles gFieldObjectPic_Girl3_4, 0x100 - obj_tiles gFieldObjectPic_Girl3_5, 0x100 - obj_tiles gFieldObjectPic_Girl3_6, 0x100 - obj_tiles gFieldObjectPic_Girl3_7, 0x100 - obj_tiles gFieldObjectPic_Girl3_8, 0x100 - - .align 2 -gFieldObjectPicTable_Boy4:: @ 8506014 - obj_tiles gFieldObjectPic_Boy4_0, 0x100 - obj_tiles gFieldObjectPic_Boy4_1, 0x100 - obj_tiles gFieldObjectPic_Boy4_2, 0x100 - obj_tiles gFieldObjectPic_Boy4_3, 0x100 - obj_tiles gFieldObjectPic_Boy4_4, 0x100 - obj_tiles gFieldObjectPic_Boy4_5, 0x100 - obj_tiles gFieldObjectPic_Boy4_6, 0x100 - obj_tiles gFieldObjectPic_Boy4_7, 0x100 - obj_tiles gFieldObjectPic_Boy4_8, 0x100 - - .align 2 -gFieldObjectPicTable_Woman1:: @ 850605C - obj_tiles gFieldObjectPic_Woman1_0, 0x100 - obj_tiles gFieldObjectPic_Woman1_1, 0x100 - obj_tiles gFieldObjectPic_Woman1_2, 0x100 - obj_tiles gFieldObjectPic_Woman1_3, 0x100 - obj_tiles gFieldObjectPic_Woman1_4, 0x100 - obj_tiles gFieldObjectPic_Woman1_5, 0x100 - obj_tiles gFieldObjectPic_Woman1_6, 0x100 - obj_tiles gFieldObjectPic_Woman1_7, 0x100 - obj_tiles gFieldObjectPic_Woman1_8, 0x100 - - .align 2 -gFieldObjectPicTable_FatMan:: @ 85060A4 - obj_tiles gFieldObjectPic_FatMan_0, 0x100 - obj_tiles gFieldObjectPic_FatMan_1, 0x100 - obj_tiles gFieldObjectPic_FatMan_2, 0x100 - obj_tiles gFieldObjectPic_FatMan_3, 0x100 - obj_tiles gFieldObjectPic_FatMan_4, 0x100 - obj_tiles gFieldObjectPic_FatMan_5, 0x100 - obj_tiles gFieldObjectPic_FatMan_6, 0x100 - obj_tiles gFieldObjectPic_FatMan_7, 0x100 - obj_tiles gFieldObjectPic_FatMan_8, 0x100 - - .align 2 -gFieldObjectPicTable_Woman2:: @ 85060EC - obj_tiles gFieldObjectPic_Woman2_0, 0x100 - obj_tiles gFieldObjectPic_Woman2_1, 0x100 - obj_tiles gFieldObjectPic_Woman2_2, 0x100 - obj_tiles gFieldObjectPic_Woman2_3, 0x100 - obj_tiles gFieldObjectPic_Woman2_4, 0x100 - obj_tiles gFieldObjectPic_Woman2_5, 0x100 - obj_tiles gFieldObjectPic_Woman2_6, 0x100 - obj_tiles gFieldObjectPic_Woman2_7, 0x100 - obj_tiles gFieldObjectPic_Woman2_8, 0x100 - - .align 2 -gFieldObjectPicTable_Man1:: @ 8506134 - obj_tiles gFieldObjectPic_Man1_0, 0x100 - obj_tiles gFieldObjectPic_Man1_1, 0x100 - obj_tiles gFieldObjectPic_Man1_2, 0x100 - obj_tiles gFieldObjectPic_Man1_3, 0x100 - obj_tiles gFieldObjectPic_Man1_4, 0x100 - obj_tiles gFieldObjectPic_Man1_5, 0x100 - obj_tiles gFieldObjectPic_Man1_6, 0x100 - obj_tiles gFieldObjectPic_Man1_7, 0x100 - obj_tiles gFieldObjectPic_Man1_8, 0x100 - - .align 2 -gFieldObjectPicTable_Woman3:: @ 850617C - obj_tiles gFieldObjectPic_Woman3_0, 0x100 - obj_tiles gFieldObjectPic_Woman3_1, 0x100 - obj_tiles gFieldObjectPic_Woman3_2, 0x100 - obj_tiles gFieldObjectPic_Woman3_3, 0x100 - obj_tiles gFieldObjectPic_Woman3_4, 0x100 - obj_tiles gFieldObjectPic_Woman3_5, 0x100 - obj_tiles gFieldObjectPic_Woman3_6, 0x100 - obj_tiles gFieldObjectPic_Woman3_7, 0x100 - obj_tiles gFieldObjectPic_Woman3_8, 0x100 - - .align 2 -gFieldObjectPicTable_OldMan1:: @ 85061C4 - obj_tiles gFieldObjectPic_OldMan1_0, 0x100 - obj_tiles gFieldObjectPic_OldMan1_1, 0x100 - obj_tiles gFieldObjectPic_OldMan1_2, 0x100 - obj_tiles gFieldObjectPic_OldMan1_3, 0x100 - obj_tiles gFieldObjectPic_OldMan1_4, 0x100 - obj_tiles gFieldObjectPic_OldMan1_5, 0x100 - obj_tiles gFieldObjectPic_OldMan1_6, 0x100 - obj_tiles gFieldObjectPic_OldMan1_7, 0x100 - obj_tiles gFieldObjectPic_OldMan1_8, 0x100 - - .align 2 -gFieldObjectPicTable_OldWoman1:: @ 850620C - obj_tiles gFieldObjectPic_OldWoman1_0, 0x100 - obj_tiles gFieldObjectPic_OldWoman1_1, 0x100 - obj_tiles gFieldObjectPic_OldWoman1_2, 0x100 - obj_tiles gFieldObjectPic_OldWoman1_3, 0x100 - obj_tiles gFieldObjectPic_OldWoman1_4, 0x100 - obj_tiles gFieldObjectPic_OldWoman1_5, 0x100 - obj_tiles gFieldObjectPic_OldWoman1_6, 0x100 - obj_tiles gFieldObjectPic_OldWoman1_7, 0x100 - obj_tiles gFieldObjectPic_OldWoman1_8, 0x100 - - .align 2 -gFieldObjectPicTable_Man2:: @ 8506254 - obj_tiles gFieldObjectPic_Man2_0, 0x100 - obj_tiles gFieldObjectPic_Man2_1, 0x100 - obj_tiles gFieldObjectPic_Man2_2, 0x100 - obj_tiles gFieldObjectPic_Man2_3, 0x100 - obj_tiles gFieldObjectPic_Man2_4, 0x100 - obj_tiles gFieldObjectPic_Man2_5, 0x100 - obj_tiles gFieldObjectPic_Man2_6, 0x100 - obj_tiles gFieldObjectPic_Man2_7, 0x100 - obj_tiles gFieldObjectPic_Man2_8, 0x100 - - .align 2 -gFieldObjectPicTable_Woman4:: @ 850629C - obj_tiles gFieldObjectPic_Woman4_0, 0x100 - obj_tiles gFieldObjectPic_Woman4_1, 0x100 - obj_tiles gFieldObjectPic_Woman4_2, 0x100 - obj_tiles gFieldObjectPic_Woman4_3, 0x100 - obj_tiles gFieldObjectPic_Woman4_4, 0x100 - obj_tiles gFieldObjectPic_Woman4_5, 0x100 - obj_tiles gFieldObjectPic_Woman4_6, 0x100 - obj_tiles gFieldObjectPic_Woman4_7, 0x100 - obj_tiles gFieldObjectPic_Woman4_8, 0x100 - - .align 2 -gFieldObjectPicTable_Man3:: @ 85062E4 - obj_tiles gFieldObjectPic_Man3_0, 0x100 - obj_tiles gFieldObjectPic_Man3_1, 0x100 - obj_tiles gFieldObjectPic_Man3_2, 0x100 - obj_tiles gFieldObjectPic_Man3_3, 0x100 - obj_tiles gFieldObjectPic_Man3_4, 0x100 - obj_tiles gFieldObjectPic_Man3_5, 0x100 - obj_tiles gFieldObjectPic_Man3_6, 0x100 - obj_tiles gFieldObjectPic_Man3_7, 0x100 - obj_tiles gFieldObjectPic_Man3_8, 0x100 - - .align 2 -gFieldObjectPicTable_Woman5:: @ 850632C - obj_tiles gFieldObjectPic_Woman5_0, 0x100 - obj_tiles gFieldObjectPic_Woman5_1, 0x100 - obj_tiles gFieldObjectPic_Woman5_2, 0x100 - obj_tiles gFieldObjectPic_Woman5_3, 0x100 - obj_tiles gFieldObjectPic_Woman5_4, 0x100 - obj_tiles gFieldObjectPic_Woman5_5, 0x100 - obj_tiles gFieldObjectPic_Woman5_6, 0x100 - obj_tiles gFieldObjectPic_Woman5_7, 0x100 - obj_tiles gFieldObjectPic_Woman5_8, 0x100 - - .align 2 -gFieldObjectPicTable_Cook:: @ 8506374 - obj_tiles gFieldObjectPic_Cook_0, 0x100 - obj_tiles gFieldObjectPic_Cook_1, 0x100 - obj_tiles gFieldObjectPic_Cook_2, 0x100 - obj_tiles gFieldObjectPic_Cook_0, 0x100 - obj_tiles gFieldObjectPic_Cook_0, 0x100 - obj_tiles gFieldObjectPic_Cook_1, 0x100 - obj_tiles gFieldObjectPic_Cook_1, 0x100 - obj_tiles gFieldObjectPic_Cook_2, 0x100 - obj_tiles gFieldObjectPic_Cook_2, 0x100 - - .align 2 -gFieldObjectPicTable_Woman6:: @ 85063BC - obj_tiles gFieldObjectPic_Woman6_0, 0x100 - obj_tiles gFieldObjectPic_Woman6_1, 0x100 - obj_tiles gFieldObjectPic_Woman6_2, 0x100 - obj_tiles gFieldObjectPic_Woman6_3, 0x100 - obj_tiles gFieldObjectPic_Woman6_4, 0x100 - obj_tiles gFieldObjectPic_Woman6_5, 0x100 - obj_tiles gFieldObjectPic_Woman6_6, 0x100 - obj_tiles gFieldObjectPic_Woman6_7, 0x100 - obj_tiles gFieldObjectPic_Woman6_8, 0x100 - - .align 2 -gFieldObjectPicTable_OldMan2:: @ 8506404 - obj_tiles gFieldObjectPic_OldMan2_0, 0x100 - obj_tiles gFieldObjectPic_OldMan2_1, 0x100 - obj_tiles gFieldObjectPic_OldMan2_2, 0x100 - obj_tiles gFieldObjectPic_OldMan2_0, 0x100 - obj_tiles gFieldObjectPic_OldMan2_0, 0x100 - obj_tiles gFieldObjectPic_OldMan2_1, 0x100 - obj_tiles gFieldObjectPic_OldMan2_1, 0x100 - obj_tiles gFieldObjectPic_OldMan2_2, 0x100 - obj_tiles gFieldObjectPic_OldMan2_2, 0x100 - - .align 2 -gFieldObjectPicTable_OldWoman2:: @ 850644C - obj_tiles gFieldObjectPic_OldWoman2_0, 0x100 - obj_tiles gFieldObjectPic_OldWoman2_1, 0x100 - obj_tiles gFieldObjectPic_OldWoman2_2, 0x100 - obj_tiles gFieldObjectPic_OldWoman2_3, 0x100 - obj_tiles gFieldObjectPic_OldWoman2_4, 0x100 - obj_tiles gFieldObjectPic_OldWoman2_5, 0x100 - obj_tiles gFieldObjectPic_OldWoman2_6, 0x100 - obj_tiles gFieldObjectPic_OldWoman2_7, 0x100 - obj_tiles gFieldObjectPic_OldWoman2_8, 0x100 - - .align 2 -gFieldObjectPicTable_Camper:: @ 8506494 - obj_tiles gFieldObjectPic_Camper_0, 0x100 - obj_tiles gFieldObjectPic_Camper_1, 0x100 - obj_tiles gFieldObjectPic_Camper_2, 0x100 - obj_tiles gFieldObjectPic_Camper_3, 0x100 - obj_tiles gFieldObjectPic_Camper_4, 0x100 - obj_tiles gFieldObjectPic_Camper_5, 0x100 - obj_tiles gFieldObjectPic_Camper_6, 0x100 - obj_tiles gFieldObjectPic_Camper_7, 0x100 - obj_tiles gFieldObjectPic_Camper_8, 0x100 - - .align 2 -gFieldObjectPicTable_Picnicker:: @ 85064DC - obj_tiles gFieldObjectPic_Picnicker_0, 0x100 - obj_tiles gFieldObjectPic_Picnicker_1, 0x100 - obj_tiles gFieldObjectPic_Picnicker_2, 0x100 - obj_tiles gFieldObjectPic_Picnicker_3, 0x100 - obj_tiles gFieldObjectPic_Picnicker_4, 0x100 - obj_tiles gFieldObjectPic_Picnicker_5, 0x100 - obj_tiles gFieldObjectPic_Picnicker_6, 0x100 - obj_tiles gFieldObjectPic_Picnicker_7, 0x100 - obj_tiles gFieldObjectPic_Picnicker_8, 0x100 - - .align 2 -gFieldObjectPicTable_Man4:: @ 8506524 - obj_tiles gFieldObjectPic_Man4_0, 0x100 - obj_tiles gFieldObjectPic_Man4_1, 0x100 - obj_tiles gFieldObjectPic_Man4_2, 0x100 - obj_tiles gFieldObjectPic_Man4_3, 0x100 - obj_tiles gFieldObjectPic_Man4_4, 0x100 - obj_tiles gFieldObjectPic_Man4_5, 0x100 - obj_tiles gFieldObjectPic_Man4_6, 0x100 - obj_tiles gFieldObjectPic_Man4_7, 0x100 - obj_tiles gFieldObjectPic_Man4_8, 0x100 - - .align 2 -gFieldObjectPicTable_Woman7:: @ 850656C - obj_tiles gFieldObjectPic_Woman7_0, 0x100 - obj_tiles gFieldObjectPic_Woman7_1, 0x100 - obj_tiles gFieldObjectPic_Woman7_2, 0x100 - obj_tiles gFieldObjectPic_Woman7_3, 0x100 - obj_tiles gFieldObjectPic_Woman7_4, 0x100 - obj_tiles gFieldObjectPic_Woman7_5, 0x100 - obj_tiles gFieldObjectPic_Woman7_6, 0x100 - obj_tiles gFieldObjectPic_Woman7_7, 0x100 - obj_tiles gFieldObjectPic_Woman7_8, 0x100 - - .align 2 -gFieldObjectPicTable_Youngster:: @ 85065B4 - obj_tiles gFieldObjectPic_Youngster_0, 0x100 - obj_tiles gFieldObjectPic_Youngster_1, 0x100 - obj_tiles gFieldObjectPic_Youngster_2, 0x100 - obj_tiles gFieldObjectPic_Youngster_3, 0x100 - obj_tiles gFieldObjectPic_Youngster_4, 0x100 - obj_tiles gFieldObjectPic_Youngster_5, 0x100 - obj_tiles gFieldObjectPic_Youngster_6, 0x100 - obj_tiles gFieldObjectPic_Youngster_7, 0x100 - obj_tiles gFieldObjectPic_Youngster_8, 0x100 - - .align 2 -gFieldObjectPicTable_BugCatcher:: @ 85065FC - obj_tiles gFieldObjectPic_BugCatcher_0, 0x100 - obj_tiles gFieldObjectPic_BugCatcher_1, 0x100 - obj_tiles gFieldObjectPic_BugCatcher_2, 0x100 - obj_tiles gFieldObjectPic_BugCatcher_3, 0x100 - obj_tiles gFieldObjectPic_BugCatcher_4, 0x100 - obj_tiles gFieldObjectPic_BugCatcher_5, 0x100 - obj_tiles gFieldObjectPic_BugCatcher_6, 0x100 - obj_tiles gFieldObjectPic_BugCatcher_7, 0x100 - obj_tiles gFieldObjectPic_BugCatcher_8, 0x100 - - .align 2 -gFieldObjectPicTable_PsychicM:: @ 8506644 - obj_tiles gFieldObjectPic_PsychicM_0, 0x100 - obj_tiles gFieldObjectPic_PsychicM_1, 0x100 - obj_tiles gFieldObjectPic_PsychicM_2, 0x100 - obj_tiles gFieldObjectPic_PsychicM_3, 0x100 - obj_tiles gFieldObjectPic_PsychicM_4, 0x100 - obj_tiles gFieldObjectPic_PsychicM_5, 0x100 - obj_tiles gFieldObjectPic_PsychicM_6, 0x100 - obj_tiles gFieldObjectPic_PsychicM_7, 0x100 - obj_tiles gFieldObjectPic_PsychicM_8, 0x100 - - .align 2 -gFieldObjectPicTable_SchoolKidM:: @ 850668C - obj_tiles gFieldObjectPic_SchoolKidM_0, 0x100 - obj_tiles gFieldObjectPic_SchoolKidM_1, 0x100 - obj_tiles gFieldObjectPic_SchoolKidM_2, 0x100 - obj_tiles gFieldObjectPic_SchoolKidM_3, 0x100 - obj_tiles gFieldObjectPic_SchoolKidM_4, 0x100 - obj_tiles gFieldObjectPic_SchoolKidM_5, 0x100 - obj_tiles gFieldObjectPic_SchoolKidM_6, 0x100 - obj_tiles gFieldObjectPic_SchoolKidM_7, 0x100 - obj_tiles gFieldObjectPic_SchoolKidM_8, 0x100 - - .align 2 -gFieldObjectPicTable_Maniac:: @ 85066D4 - obj_tiles gFieldObjectPic_Maniac_0, 0x100 - obj_tiles gFieldObjectPic_Maniac_1, 0x100 - obj_tiles gFieldObjectPic_Maniac_2, 0x100 - obj_tiles gFieldObjectPic_Maniac_3, 0x100 - obj_tiles gFieldObjectPic_Maniac_4, 0x100 - obj_tiles gFieldObjectPic_Maniac_5, 0x100 - obj_tiles gFieldObjectPic_Maniac_6, 0x100 - obj_tiles gFieldObjectPic_Maniac_7, 0x100 - obj_tiles gFieldObjectPic_Maniac_8, 0x100 - - .align 2 -gFieldObjectPicTable_HexManiac:: @ 850671C - obj_tiles gFieldObjectPic_HexManiac_0, 0x100 - obj_tiles gFieldObjectPic_HexManiac_1, 0x100 - obj_tiles gFieldObjectPic_HexManiac_2, 0x100 - obj_tiles gFieldObjectPic_HexManiac_3, 0x100 - obj_tiles gFieldObjectPic_HexManiac_4, 0x100 - obj_tiles gFieldObjectPic_HexManiac_5, 0x100 - obj_tiles gFieldObjectPic_HexManiac_6, 0x100 - obj_tiles gFieldObjectPic_HexManiac_7, 0x100 - obj_tiles gFieldObjectPic_HexManiac_8, 0x100 - - .align 2 -gFieldObjectPicTable_SwimmerM:: @ 8506764 - obj_tiles gFieldObjectPic_SwimmerM_0, 0x100 - obj_tiles gFieldObjectPic_SwimmerM_1, 0x100 - obj_tiles gFieldObjectPic_SwimmerM_2, 0x100 - obj_tiles gFieldObjectPic_SwimmerM_3, 0x100 - obj_tiles gFieldObjectPic_SwimmerM_4, 0x100 - obj_tiles gFieldObjectPic_SwimmerM_5, 0x100 - obj_tiles gFieldObjectPic_SwimmerM_6, 0x100 - obj_tiles gFieldObjectPic_SwimmerM_7, 0x100 - obj_tiles gFieldObjectPic_SwimmerM_8, 0x100 - - .align 2 -gFieldObjectPicTable_SwimmerF:: @ 85067AC - obj_tiles gFieldObjectPic_SwimmerF_0, 0x100 - obj_tiles gFieldObjectPic_SwimmerF_1, 0x100 - obj_tiles gFieldObjectPic_SwimmerF_2, 0x100 - obj_tiles gFieldObjectPic_SwimmerF_3, 0x100 - obj_tiles gFieldObjectPic_SwimmerF_4, 0x100 - obj_tiles gFieldObjectPic_SwimmerF_5, 0x100 - obj_tiles gFieldObjectPic_SwimmerF_6, 0x100 - obj_tiles gFieldObjectPic_SwimmerF_7, 0x100 - obj_tiles gFieldObjectPic_SwimmerF_8, 0x100 - - .align 2 -gFieldObjectPicTable_BlackBelt:: @ 85067F4 - obj_tiles gFieldObjectPic_BlackBelt_0, 0x100 - obj_tiles gFieldObjectPic_BlackBelt_1, 0x100 - obj_tiles gFieldObjectPic_BlackBelt_2, 0x100 - obj_tiles gFieldObjectPic_BlackBelt_3, 0x100 - obj_tiles gFieldObjectPic_BlackBelt_4, 0x100 - obj_tiles gFieldObjectPic_BlackBelt_5, 0x100 - obj_tiles gFieldObjectPic_BlackBelt_6, 0x100 - obj_tiles gFieldObjectPic_BlackBelt_7, 0x100 - obj_tiles gFieldObjectPic_BlackBelt_8, 0x100 - - .align 2 -gFieldObjectPicTable_Beauty:: @ 850683C - obj_tiles gFieldObjectPic_Beauty_0, 0x100 - obj_tiles gFieldObjectPic_Beauty_1, 0x100 - obj_tiles gFieldObjectPic_Beauty_2, 0x100 - obj_tiles gFieldObjectPic_Beauty_3, 0x100 - obj_tiles gFieldObjectPic_Beauty_4, 0x100 - obj_tiles gFieldObjectPic_Beauty_5, 0x100 - obj_tiles gFieldObjectPic_Beauty_6, 0x100 - obj_tiles gFieldObjectPic_Beauty_7, 0x100 - obj_tiles gFieldObjectPic_Beauty_8, 0x100 - - .align 2 -gFieldObjectPicTable_Scientist1:: @ 8506884 - obj_tiles gFieldObjectPic_Scientist1_0, 0x100 - obj_tiles gFieldObjectPic_Scientist1_1, 0x100 - obj_tiles gFieldObjectPic_Scientist1_2, 0x100 - obj_tiles gFieldObjectPic_Scientist1_3, 0x100 - obj_tiles gFieldObjectPic_Scientist1_4, 0x100 - obj_tiles gFieldObjectPic_Scientist1_5, 0x100 - obj_tiles gFieldObjectPic_Scientist1_6, 0x100 - obj_tiles gFieldObjectPic_Scientist1_7, 0x100 - obj_tiles gFieldObjectPic_Scientist1_8, 0x100 - - .align 2 -gFieldObjectPicTable_Lass:: @ 85068CC - obj_tiles gFieldObjectPic_Lass_0, 0x100 - obj_tiles gFieldObjectPic_Lass_1, 0x100 - obj_tiles gFieldObjectPic_Lass_2, 0x100 - obj_tiles gFieldObjectPic_Lass_3, 0x100 - obj_tiles gFieldObjectPic_Lass_4, 0x100 - obj_tiles gFieldObjectPic_Lass_5, 0x100 - obj_tiles gFieldObjectPic_Lass_6, 0x100 - obj_tiles gFieldObjectPic_Lass_7, 0x100 - obj_tiles gFieldObjectPic_Lass_8, 0x100 - - .align 2 -gFieldObjectPicTable_Gentleman:: @ 8506914 - obj_tiles gFieldObjectPic_Gentleman_0, 0x100 - obj_tiles gFieldObjectPic_Gentleman_1, 0x100 - obj_tiles gFieldObjectPic_Gentleman_2, 0x100 - obj_tiles gFieldObjectPic_Gentleman_3, 0x100 - obj_tiles gFieldObjectPic_Gentleman_4, 0x100 - obj_tiles gFieldObjectPic_Gentleman_5, 0x100 - obj_tiles gFieldObjectPic_Gentleman_6, 0x100 - obj_tiles gFieldObjectPic_Gentleman_7, 0x100 - obj_tiles gFieldObjectPic_Gentleman_8, 0x100 - - .align 2 -gFieldObjectPicTable_Sailor:: @ 850695C - obj_tiles gFieldObjectPic_Sailor_0, 0x100 - obj_tiles gFieldObjectPic_Sailor_1, 0x100 - obj_tiles gFieldObjectPic_Sailor_2, 0x100 - obj_tiles gFieldObjectPic_Sailor_3, 0x100 - obj_tiles gFieldObjectPic_Sailor_4, 0x100 - obj_tiles gFieldObjectPic_Sailor_5, 0x100 - obj_tiles gFieldObjectPic_Sailor_6, 0x100 - obj_tiles gFieldObjectPic_Sailor_7, 0x100 - obj_tiles gFieldObjectPic_Sailor_8, 0x100 - - .align 2 -gFieldObjectPicTable_Fisherman:: @ 85069A4 - obj_tiles gFieldObjectPic_Fisherman_0, 0x100 - obj_tiles gFieldObjectPic_Fisherman_1, 0x100 - obj_tiles gFieldObjectPic_Fisherman_2, 0x100 - obj_tiles gFieldObjectPic_Fisherman_3, 0x100 - obj_tiles gFieldObjectPic_Fisherman_4, 0x100 - obj_tiles gFieldObjectPic_Fisherman_5, 0x100 - obj_tiles gFieldObjectPic_Fisherman_6, 0x100 - obj_tiles gFieldObjectPic_Fisherman_7, 0x100 - obj_tiles gFieldObjectPic_Fisherman_8, 0x100 - - .align 2 -gFieldObjectPicTable_RunningTriathleteM:: @ 85069EC - obj_tiles gFieldObjectPic_RunningTriathleteM_0, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteM_1, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteM_2, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteM_3, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteM_4, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteM_5, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteM_6, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteM_7, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteM_8, 0x100 - - .align 2 -gFieldObjectPicTable_RunningTriathleteF:: @ 8506A34 - obj_tiles gFieldObjectPic_RunningTriathleteF_0, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteF_1, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteF_2, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteF_3, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteF_4, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteF_5, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteF_6, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteF_7, 0x100 - obj_tiles gFieldObjectPic_RunningTriathleteF_8, 0x100 - - .align 2 -gFieldObjectPicTable_TuberF:: @ 8506A7C - obj_tiles gFieldObjectPic_TuberF_0, 0x80 - obj_tiles gFieldObjectPic_TuberF_1, 0x80 - obj_tiles gFieldObjectPic_TuberF_2, 0x80 - obj_tiles gFieldObjectPic_TuberF_3, 0x80 - obj_tiles gFieldObjectPic_TuberF_4, 0x80 - obj_tiles gFieldObjectPic_TuberF_5, 0x80 - obj_tiles gFieldObjectPic_TuberF_6, 0x80 - obj_tiles gFieldObjectPic_TuberF_7, 0x80 - obj_tiles gFieldObjectPic_TuberF_8, 0x80 - - .align 2 -gFieldObjectPicTable_TuberM:: @ 8506AC4 - obj_tiles gFieldObjectPic_TuberM_0, 0x80 - obj_tiles gFieldObjectPic_TuberM_1, 0x80 - obj_tiles gFieldObjectPic_TuberM_2, 0x80 - obj_tiles gFieldObjectPic_TuberM_3, 0x80 - obj_tiles gFieldObjectPic_TuberM_4, 0x80 - obj_tiles gFieldObjectPic_TuberM_5, 0x80 - obj_tiles gFieldObjectPic_TuberM_6, 0x80 - obj_tiles gFieldObjectPic_TuberM_7, 0x80 - obj_tiles gFieldObjectPic_TuberM_8, 0x80 - - .align 2 -gFieldObjectPicTable_Hiker:: @ 8506B0C - obj_tiles gFieldObjectPic_Hiker_0, 0x100 - obj_tiles gFieldObjectPic_Hiker_1, 0x100 - obj_tiles gFieldObjectPic_Hiker_2, 0x100 - obj_tiles gFieldObjectPic_Hiker_3, 0x100 - obj_tiles gFieldObjectPic_Hiker_4, 0x100 - obj_tiles gFieldObjectPic_Hiker_5, 0x100 - obj_tiles gFieldObjectPic_Hiker_6, 0x100 - obj_tiles gFieldObjectPic_Hiker_7, 0x100 - obj_tiles gFieldObjectPic_Hiker_8, 0x100 - - .align 2 -gFieldObjectPicTable_CyclingTriathleteM:: @ 8506B54 - obj_tiles gFieldObjectPic_CyclingTriathleteM_0, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteM_1, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteM_2, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteM_3, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteM_4, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteM_5, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteM_6, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteM_7, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteM_8, 0x200 - - .align 2 -gFieldObjectPicTable_CyclingTriathleteF:: @ 8506B9C - obj_tiles gFieldObjectPic_CyclingTriathleteF_0, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteF_1, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteF_2, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteF_3, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteF_4, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteF_5, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteF_6, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteF_7, 0x200 - obj_tiles gFieldObjectPic_CyclingTriathleteF_8, 0x200 - - .align 2 -gFieldObjectPicTable_Nurse:: @ 8506BE4 - obj_tiles gFieldObjectPic_Nurse_0, 0x100 - obj_tiles gFieldObjectPic_Nurse_1, 0x100 - obj_tiles gFieldObjectPic_Nurse_2, 0x100 - obj_tiles gFieldObjectPic_Nurse_0, 0x100 - obj_tiles gFieldObjectPic_Nurse_0, 0x100 - obj_tiles gFieldObjectPic_Nurse_1, 0x100 - obj_tiles gFieldObjectPic_Nurse_1, 0x100 - obj_tiles gFieldObjectPic_Nurse_2, 0x100 - obj_tiles gFieldObjectPic_Nurse_2, 0x100 - obj_tiles gFieldObjectPic_Nurse_3, 0x100 - - .align 2 -gFieldObjectPicTable_ItemBall:: @ 8506C34 - obj_tiles gFieldObjectPic_ItemBall, 0x80 - - .align 2 -gFieldObjectPicTable_ProfBirch:: @ 8506C3C - obj_tiles gFieldObjectPic_ProfBirch_0, 0x100 - obj_tiles gFieldObjectPic_ProfBirch_1, 0x100 - obj_tiles gFieldObjectPic_ProfBirch_2, 0x100 - obj_tiles gFieldObjectPic_ProfBirch_3, 0x100 - obj_tiles gFieldObjectPic_ProfBirch_4, 0x100 - obj_tiles gFieldObjectPic_ProfBirch_5, 0x100 - obj_tiles gFieldObjectPic_ProfBirch_6, 0x100 - obj_tiles gFieldObjectPic_ProfBirch_7, 0x100 - obj_tiles gFieldObjectPic_ProfBirch_8, 0x100 - - .align 2 -gFieldObjectPicTable_Man5:: @ 8506C84 - obj_tiles gFieldObjectPic_Man5_0, 0x100 - obj_tiles gFieldObjectPic_Man5_1, 0x100 - obj_tiles gFieldObjectPic_Man5_2, 0x100 - obj_tiles gFieldObjectPic_Man5_3, 0x100 - obj_tiles gFieldObjectPic_Man5_4, 0x100 - obj_tiles gFieldObjectPic_Man5_5, 0x100 - obj_tiles gFieldObjectPic_Man5_6, 0x100 - obj_tiles gFieldObjectPic_Man5_7, 0x100 - obj_tiles gFieldObjectPic_Man5_8, 0x100 - - .align 2 -gFieldObjectPicTable_Man6:: @ 8506CCC - obj_tiles gFieldObjectPic_Man6_0, 0x100 - obj_tiles gFieldObjectPic_Man6_1, 0x100 - obj_tiles gFieldObjectPic_Man6_2, 0x100 - obj_tiles gFieldObjectPic_Man6_3, 0x100 - obj_tiles gFieldObjectPic_Man6_4, 0x100 - obj_tiles gFieldObjectPic_Man6_5, 0x100 - obj_tiles gFieldObjectPic_Man6_6, 0x100 - obj_tiles gFieldObjectPic_Man6_7, 0x100 - obj_tiles gFieldObjectPic_Man6_8, 0x100 - - .align 2 -gFieldObjectPicTable_ReporterM:: @ 8506D14 - obj_tiles gFieldObjectPic_ReporterM_0, 0x100 - obj_tiles gFieldObjectPic_ReporterM_1, 0x100 - obj_tiles gFieldObjectPic_ReporterM_2, 0x100 - obj_tiles gFieldObjectPic_ReporterM_3, 0x100 - obj_tiles gFieldObjectPic_ReporterM_4, 0x100 - obj_tiles gFieldObjectPic_ReporterM_5, 0x100 - obj_tiles gFieldObjectPic_ReporterM_6, 0x100 - obj_tiles gFieldObjectPic_ReporterM_7, 0x100 - obj_tiles gFieldObjectPic_ReporterM_8, 0x100 - - .align 2 -gFieldObjectPicTable_ReporterF:: @ 8506D5C - obj_tiles gFieldObjectPic_ReporterF_0, 0x100 - obj_tiles gFieldObjectPic_ReporterF_1, 0x100 - obj_tiles gFieldObjectPic_ReporterF_2, 0x100 - obj_tiles gFieldObjectPic_ReporterF_3, 0x100 - obj_tiles gFieldObjectPic_ReporterF_4, 0x100 - obj_tiles gFieldObjectPic_ReporterF_5, 0x100 - obj_tiles gFieldObjectPic_ReporterF_6, 0x100 - obj_tiles gFieldObjectPic_ReporterF_7, 0x100 - obj_tiles gFieldObjectPic_ReporterF_8, 0x100 - - .align 2 -gFieldObjectPicTable_MauvilleOldMan1:: @ 8506DA4 - obj_tiles gFieldObjectPic_MauvilleOldMan1_0, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan1_1, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan1_2, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan1_3, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan1_4, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan1_5, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan1_6, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan1_7, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan1_8, 0x100 - - .align 2 -gFieldObjectPicTable_MauvilleOldMan2:: @ 8506DEC - obj_tiles gFieldObjectPic_MauvilleOldMan2_0, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan2_1, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan2_2, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan2_3, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan2_4, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan2_5, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan2_6, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan2_7, 0x100 - obj_tiles gFieldObjectPic_MauvilleOldMan2_8, 0x100 - - .align 2 -gFieldObjectPicTable_UnusedNatuDoll:: @ 8506E34 - obj_tiles gFieldObjectPic_UnusedNatuDoll, 0x80 - - .align 2 -gFieldObjectPicTable_UnusedMagnemiteDoll:: @ 8506E3C - obj_tiles gFieldObjectPic_UnusedMagnemiteDoll, 0x80 - - .align 2 -gFieldObjectPicTable_UnusedSquirtleDoll:: @ 8506E44 - obj_tiles gFieldObjectPic_UnusedSquirtleDoll, 0x80 - - .align 2 -gFieldObjectPicTable_UnusedWooperDoll:: @ 8506E4C - obj_tiles gFieldObjectPic_UnusedWooperDoll, 0x80 - - .align 2 -gFieldObjectPicTable_UnusedPikachuDoll:: @ 8506E54 - obj_tiles gFieldObjectPic_UnusedPikachuDoll, 0x80 - - .align 2 -gFieldObjectPicTable_UnusedPorygon2Doll:: @ 8506E5C - obj_tiles gFieldObjectPic_UnusedPorygon2Doll, 0x80 - - .align 2 -gFieldObjectPicTable_CuttableTree:: @ 8506E64 - obj_tiles gFieldObjectPic_CuttableTree_0, 0x80 - obj_tiles gFieldObjectPic_CuttableTree_1, 0x80 - obj_tiles gFieldObjectPic_CuttableTree_2, 0x80 - obj_tiles gFieldObjectPic_CuttableTree_3, 0x80 - - .align 2 -gFieldObjectPicTable_MartEmployee:: @ 8506E84 - obj_tiles gFieldObjectPic_MartEmployee_0, 0x100 - obj_tiles gFieldObjectPic_MartEmployee_1, 0x100 - obj_tiles gFieldObjectPic_MartEmployee_2, 0x100 - obj_tiles gFieldObjectPic_MartEmployee_3, 0x100 - obj_tiles gFieldObjectPic_MartEmployee_4, 0x100 - obj_tiles gFieldObjectPic_MartEmployee_5, 0x100 - obj_tiles gFieldObjectPic_MartEmployee_6, 0x100 - obj_tiles gFieldObjectPic_MartEmployee_7, 0x100 - obj_tiles gFieldObjectPic_MartEmployee_8, 0x100 - - .align 2 -gFieldObjectPicTable_RooftopSaleWoman:: @ 8506ECC - obj_tiles gFieldObjectPic_RooftopSaleWoman_0, 0x100 - obj_tiles gFieldObjectPic_RooftopSaleWoman_1, 0x100 - obj_tiles gFieldObjectPic_RooftopSaleWoman_2, 0x100 - obj_tiles gFieldObjectPic_RooftopSaleWoman_3, 0x100 - obj_tiles gFieldObjectPic_RooftopSaleWoman_4, 0x100 - obj_tiles gFieldObjectPic_RooftopSaleWoman_5, 0x100 - obj_tiles gFieldObjectPic_RooftopSaleWoman_6, 0x100 - obj_tiles gFieldObjectPic_RooftopSaleWoman_7, 0x100 - obj_tiles gFieldObjectPic_RooftopSaleWoman_8, 0x100 - - .align 2 -gFieldObjectPicTable_Teala:: @ 8506F14 - obj_tiles gFieldObjectPic_Teala_0, 0x100 - obj_tiles gFieldObjectPic_Teala_1, 0x100 - obj_tiles gFieldObjectPic_Teala_2, 0x100 - obj_tiles gFieldObjectPic_Teala_3, 0x100 - obj_tiles gFieldObjectPic_Teala_4, 0x100 - obj_tiles gFieldObjectPic_Teala_5, 0x100 - obj_tiles gFieldObjectPic_Teala_6, 0x100 - obj_tiles gFieldObjectPic_Teala_7, 0x100 - obj_tiles gFieldObjectPic_Teala_8, 0x100 - - .align 2 -gFieldObjectPicTable_BreakableRock:: @ 8506F5C - obj_tiles gFieldObjectPic_BreakableRock_0, 0x80 - obj_tiles gFieldObjectPic_BreakableRock_1, 0x80 - obj_tiles gFieldObjectPic_BreakableRock_2, 0x80 - obj_tiles gFieldObjectPic_BreakableRock_3, 0x80 - - .align 2 -gFieldObjectPicTable_PushableBoulder:: @ 8506F7C - obj_tiles gFieldObjectPic_PushableBoulder, 0x80 - - .align 2 -gFieldObjectPicTable_MrBrineysBoat:: @ 8506F84 - obj_tiles gFieldObjectPic_MrBrineysBoat_0, 0x200 - obj_tiles gFieldObjectPic_MrBrineysBoat_1, 0x200 - obj_tiles gFieldObjectPic_MrBrineysBoat_2, 0x200 - obj_tiles gFieldObjectPic_MrBrineysBoat_0, 0x200 - obj_tiles gFieldObjectPic_MrBrineysBoat_0, 0x200 - obj_tiles gFieldObjectPic_MrBrineysBoat_1, 0x200 - obj_tiles gFieldObjectPic_MrBrineysBoat_1, 0x200 - obj_tiles gFieldObjectPic_MrBrineysBoat_2, 0x200 - obj_tiles gFieldObjectPic_MrBrineysBoat_2, 0x200 - - .align 2 -gFieldObjectPicTable_Truck:: @ 8506FCC - obj_tiles gFieldObjectPic_Truck, 0x480 - - .align 2 -gFieldObjectPicTable_VigorothCarryingBox:: @ 8506FD4 - obj_tiles gFieldObjectPic_VigorothCarryingBox_0, 0x200 - obj_tiles gFieldObjectPic_VigorothCarryingBox_0, 0x200 - obj_tiles gFieldObjectPic_VigorothCarryingBox_0, 0x200 - obj_tiles gFieldObjectPic_VigorothCarryingBox_1, 0x200 - obj_tiles gFieldObjectPic_VigorothCarryingBox_2, 0x200 - obj_tiles gFieldObjectPic_VigorothCarryingBox_1, 0x200 - obj_tiles gFieldObjectPic_VigorothCarryingBox_2, 0x200 - obj_tiles gFieldObjectPic_VigorothCarryingBox_1, 0x200 - obj_tiles gFieldObjectPic_VigorothCarryingBox_2, 0x200 - - .align 2 -gFieldObjectPicTable_VigorothFacingAway:: @ 850701C - obj_tiles gFieldObjectPic_VigorothFacingAway_0, 0x200 - obj_tiles gFieldObjectPic_VigorothFacingAway_0, 0x200 - obj_tiles gFieldObjectPic_VigorothFacingAway_0, 0x200 - obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200 - obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200 - obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200 - obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200 - obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200 - obj_tiles gFieldObjectPic_VigorothFacingAway_1, 0x200 - - .align 2 -gFieldObjectPicTable_BirchsBag:: @ 8507064 - obj_tiles gFieldObjectPic_BirchsBag, 0x80 - - .align 2 -gFieldObjectPicTable_EnemyZigzagoon:: @ 850706C - obj_tiles gFieldObjectPic_EnemyZigzagoon_0, 0x200 - obj_tiles gFieldObjectPic_EnemyZigzagoon_1, 0x200 - obj_tiles gFieldObjectPic_EnemyZigzagoon_2, 0x200 - obj_tiles gFieldObjectPic_EnemyZigzagoon_3, 0x200 - obj_tiles gFieldObjectPic_EnemyZigzagoon_4, 0x200 - obj_tiles gFieldObjectPic_EnemyZigzagoon_5, 0x200 - obj_tiles gFieldObjectPic_EnemyZigzagoon_6, 0x200 - obj_tiles gFieldObjectPic_EnemyZigzagoon_7, 0x200 - obj_tiles gFieldObjectPic_EnemyZigzagoon_8, 0x200 - - .align 2 -gFieldObjectPicTable_Poochyena:: @ 85070B4 - obj_tiles gFieldObjectPic_Poochyena_0, 0x200 - obj_tiles gFieldObjectPic_Poochyena_1, 0x200 - obj_tiles gFieldObjectPic_Poochyena_2, 0x200 - obj_tiles gFieldObjectPic_Poochyena_3, 0x200 - obj_tiles gFieldObjectPic_Poochyena_4, 0x200 - obj_tiles gFieldObjectPic_Poochyena_5, 0x200 - obj_tiles gFieldObjectPic_Poochyena_6, 0x200 - obj_tiles gFieldObjectPic_Poochyena_7, 0x200 - obj_tiles gFieldObjectPic_Poochyena_8, 0x200 - - .align 2 -gFieldObjectPicTable_Artist:: @ 85070FC - obj_tiles gFieldObjectPic_Artist_0, 0x100 - obj_tiles gFieldObjectPic_Artist_1, 0x100 - obj_tiles gFieldObjectPic_Artist_2, 0x100 - obj_tiles gFieldObjectPic_Artist_3, 0x100 - obj_tiles gFieldObjectPic_Artist_4, 0x100 - obj_tiles gFieldObjectPic_Artist_5, 0x100 - obj_tiles gFieldObjectPic_Artist_6, 0x100 - obj_tiles gFieldObjectPic_Artist_7, 0x100 - obj_tiles gFieldObjectPic_Artist_8, 0x100 - - .align 2 -gFieldObjectPicTable_MayNormal:: @ 8507144 - obj_tiles gFieldObjectPic_MayNormal_0, 0x100 - obj_tiles gFieldObjectPic_MayNormal_1, 0x100 - obj_tiles gFieldObjectPic_MayNormal_2, 0x100 - obj_tiles gFieldObjectPic_MayNormal_3, 0x100 - obj_tiles gFieldObjectPic_MayNormal_4, 0x100 - obj_tiles gFieldObjectPic_MayNormal_5, 0x100 - obj_tiles gFieldObjectPic_MayNormal_6, 0x100 - obj_tiles gFieldObjectPic_MayNormal_7, 0x100 - obj_tiles gFieldObjectPic_MayNormal_8, 0x100 - obj_tiles gFieldObjectPic_MayNormal_9, 0x100 - obj_tiles gFieldObjectPic_MayNormal_10, 0x100 - obj_tiles gFieldObjectPic_MayNormal_11, 0x100 - obj_tiles gFieldObjectPic_MayNormal_12, 0x100 - obj_tiles gFieldObjectPic_MayNormal_13, 0x100 - obj_tiles gFieldObjectPic_MayNormal_14, 0x100 - obj_tiles gFieldObjectPic_MayNormal_15, 0x100 - obj_tiles gFieldObjectPic_MayNormal_16, 0x100 - obj_tiles gFieldObjectPic_MayNormal_17, 0x100 - - .align 2 -gFieldObjectPicTable_MayMachBike:: @ 85071D4 - obj_tiles gFieldObjectPic_MayMachBike_0, 0x200 - obj_tiles gFieldObjectPic_MayMachBike_1, 0x200 - obj_tiles gFieldObjectPic_MayMachBike_2, 0x200 - obj_tiles gFieldObjectPic_MayMachBike_3, 0x200 - obj_tiles gFieldObjectPic_MayMachBike_4, 0x200 - obj_tiles gFieldObjectPic_MayMachBike_5, 0x200 - obj_tiles gFieldObjectPic_MayMachBike_6, 0x200 - obj_tiles gFieldObjectPic_MayMachBike_7, 0x200 - obj_tiles gFieldObjectPic_MayMachBike_8, 0x200 - - .align 2 -gFieldObjectPicTable_MayAcroBike:: @ 850721C - obj_tiles gFieldObjectPic_MayAcroBike_0, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_1, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_2, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_3, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_4, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_5, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_6, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_7, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_8, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_9, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_10, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_11, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_12, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_13, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_14, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_15, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_16, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_17, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_18, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_19, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_20, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_21, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_22, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_23, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_24, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_25, 0x200 - obj_tiles gFieldObjectPic_MayAcroBike_26, 0x200 - - .align 2 -gFieldObjectPicTable_MaySurfing:: @ 85072F4 - obj_tiles gFieldObjectPic_MaySurfing_0, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_1, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_2, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_0, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_0, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_1, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_1, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_2, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_2, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_3, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_4, 0x200 - obj_tiles gFieldObjectPic_MaySurfing_5, 0x200 - - .align 2 -gFieldObjectPicTable_MayUnderwater:: @ 8507354 - obj_tiles gFieldObjectPic_MayUnderwater_0, 0x200 - obj_tiles gFieldObjectPic_MayUnderwater_1, 0x200 - obj_tiles gFieldObjectPic_MayUnderwater_2, 0x200 - obj_tiles gFieldObjectPic_MayUnderwater_0, 0x200 - obj_tiles gFieldObjectPic_MayUnderwater_0, 0x200 - obj_tiles gFieldObjectPic_MayUnderwater_1, 0x200 - obj_tiles gFieldObjectPic_MayUnderwater_1, 0x200 - obj_tiles gFieldObjectPic_MayUnderwater_2, 0x200 - obj_tiles gFieldObjectPic_MayUnderwater_2, 0x200 - - .align 2 -gFieldObjectPicTable_MayFieldMove:: @ 850739C - obj_tiles gFieldObjectPic_MayFieldMove_0, 0x200 - obj_tiles gFieldObjectPic_MayFieldMove_1, 0x200 - obj_tiles gFieldObjectPic_MayFieldMove_2, 0x200 - obj_tiles gFieldObjectPic_MayFieldMove_3, 0x200 - obj_tiles gFieldObjectPic_MayFieldMove_4, 0x200 - - .align 2 -gFieldObjectPicTable_Cameraman:: @ 85073C4 - obj_tiles gFieldObjectPic_Cameraman_0, 0x100 - obj_tiles gFieldObjectPic_Cameraman_1, 0x100 - obj_tiles gFieldObjectPic_Cameraman_2, 0x100 - obj_tiles gFieldObjectPic_Cameraman_3, 0x100 - obj_tiles gFieldObjectPic_Cameraman_4, 0x100 - obj_tiles gFieldObjectPic_Cameraman_5, 0x100 - obj_tiles gFieldObjectPic_Cameraman_6, 0x100 - obj_tiles gFieldObjectPic_Cameraman_7, 0x100 - obj_tiles gFieldObjectPic_Cameraman_8, 0x100 - - .align 2 -gFieldObjectPicTable_MovingBox:: @ 850740C - obj_tiles gFieldObjectPic_MovingBox, 0x80 - - .align 2 -gFieldObjectPicTable_CableCar:: @ 8507414 - obj_tiles gFieldObjectPic_CableCar, 0x800 - - .align 2 -gFieldObjectPicTable_Scientist2:: @ 850741C - obj_tiles gFieldObjectPic_Scientist2_0, 0x100 - obj_tiles gFieldObjectPic_Scientist2_1, 0x100 - obj_tiles gFieldObjectPic_Scientist2_2, 0x100 - obj_tiles gFieldObjectPic_Scientist2_3, 0x100 - obj_tiles gFieldObjectPic_Scientist2_4, 0x100 - obj_tiles gFieldObjectPic_Scientist2_5, 0x100 - obj_tiles gFieldObjectPic_Scientist2_6, 0x100 - obj_tiles gFieldObjectPic_Scientist2_7, 0x100 - obj_tiles gFieldObjectPic_Scientist2_8, 0x100 - - .align 2 -gFieldObjectPicTable_Man7:: @ 8507464 - obj_tiles gFieldObjectPic_Man7_0, 0x100 - obj_tiles gFieldObjectPic_Man7_1, 0x100 - obj_tiles gFieldObjectPic_Man7_2, 0x100 - obj_tiles gFieldObjectPic_Man7_3, 0x100 - obj_tiles gFieldObjectPic_Man7_4, 0x100 - obj_tiles gFieldObjectPic_Man7_5, 0x100 - obj_tiles gFieldObjectPic_Man7_6, 0x100 - obj_tiles gFieldObjectPic_Man7_7, 0x100 - obj_tiles gFieldObjectPic_Man7_8, 0x100 - - .align 2 -gFieldObjectPicTable_AquaMemberM:: @ 85074AC - obj_tiles gFieldObjectPic_AquaMemberM_0, 0x100 - obj_tiles gFieldObjectPic_AquaMemberM_1, 0x100 - obj_tiles gFieldObjectPic_AquaMemberM_2, 0x100 - obj_tiles gFieldObjectPic_AquaMemberM_3, 0x100 - obj_tiles gFieldObjectPic_AquaMemberM_4, 0x100 - obj_tiles gFieldObjectPic_AquaMemberM_5, 0x100 - obj_tiles gFieldObjectPic_AquaMemberM_6, 0x100 - obj_tiles gFieldObjectPic_AquaMemberM_7, 0x100 - obj_tiles gFieldObjectPic_AquaMemberM_8, 0x100 - - .align 2 -gFieldObjectPicTable_AquaMemberF:: @ 85074F4 - obj_tiles gFieldObjectPic_AquaMemberF_0, 0x100 - obj_tiles gFieldObjectPic_AquaMemberF_1, 0x100 - obj_tiles gFieldObjectPic_AquaMemberF_2, 0x100 - obj_tiles gFieldObjectPic_AquaMemberF_3, 0x100 - obj_tiles gFieldObjectPic_AquaMemberF_4, 0x100 - obj_tiles gFieldObjectPic_AquaMemberF_5, 0x100 - obj_tiles gFieldObjectPic_AquaMemberF_6, 0x100 - obj_tiles gFieldObjectPic_AquaMemberF_7, 0x100 - obj_tiles gFieldObjectPic_AquaMemberF_8, 0x100 - - .align 2 -gFieldObjectPicTable_MagmaMemberM:: @ 850753C - obj_tiles gFieldObjectPic_MagmaMemberM_0, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberM_1, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberM_2, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberM_3, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberM_4, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberM_5, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberM_6, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberM_7, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberM_8, 0x100 - - .align 2 -gFieldObjectPicTable_MagmaMemberF:: @ 8507584 - obj_tiles gFieldObjectPic_MagmaMemberF_0, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberF_1, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberF_2, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberF_3, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberF_4, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberF_5, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberF_6, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberF_7, 0x100 - obj_tiles gFieldObjectPic_MagmaMemberF_8, 0x100 - - .align 2 -gFieldObjectPicTable_Sidney:: @ 85075CC - obj_tiles gFieldObjectPic_Sidney_0, 0x100 - obj_tiles gFieldObjectPic_Sidney_1, 0x100 - obj_tiles gFieldObjectPic_Sidney_2, 0x100 - obj_tiles gFieldObjectPic_Sidney_0, 0x100 - obj_tiles gFieldObjectPic_Sidney_0, 0x100 - obj_tiles gFieldObjectPic_Sidney_1, 0x100 - obj_tiles gFieldObjectPic_Sidney_1, 0x100 - obj_tiles gFieldObjectPic_Sidney_2, 0x100 - obj_tiles gFieldObjectPic_Sidney_2, 0x100 - - .align 2 -gFieldObjectPicTable_Phoebe:: @ 8507614 - obj_tiles gFieldObjectPic_Phoebe_0, 0x100 - obj_tiles gFieldObjectPic_Phoebe_1, 0x100 - obj_tiles gFieldObjectPic_Phoebe_2, 0x100 - obj_tiles gFieldObjectPic_Phoebe_0, 0x100 - obj_tiles gFieldObjectPic_Phoebe_0, 0x100 - obj_tiles gFieldObjectPic_Phoebe_1, 0x100 - obj_tiles gFieldObjectPic_Phoebe_1, 0x100 - obj_tiles gFieldObjectPic_Phoebe_2, 0x100 - obj_tiles gFieldObjectPic_Phoebe_2, 0x100 - - .align 2 -gFieldObjectPicTable_Glacia:: @ 850765C - obj_tiles gFieldObjectPic_Glacia_0, 0x100 - obj_tiles gFieldObjectPic_Glacia_1, 0x100 - obj_tiles gFieldObjectPic_Glacia_2, 0x100 - obj_tiles gFieldObjectPic_Glacia_0, 0x100 - obj_tiles gFieldObjectPic_Glacia_0, 0x100 - obj_tiles gFieldObjectPic_Glacia_1, 0x100 - obj_tiles gFieldObjectPic_Glacia_1, 0x100 - obj_tiles gFieldObjectPic_Glacia_2, 0x100 - obj_tiles gFieldObjectPic_Glacia_2, 0x100 - - .align 2 -gFieldObjectPicTable_Drake:: @ 85076A4 - obj_tiles gFieldObjectPic_Drake_0, 0x100 - obj_tiles gFieldObjectPic_Drake_1, 0x100 - obj_tiles gFieldObjectPic_Drake_2, 0x100 - obj_tiles gFieldObjectPic_Drake_0, 0x100 - obj_tiles gFieldObjectPic_Drake_0, 0x100 - obj_tiles gFieldObjectPic_Drake_1, 0x100 - obj_tiles gFieldObjectPic_Drake_1, 0x100 - obj_tiles gFieldObjectPic_Drake_2, 0x100 - obj_tiles gFieldObjectPic_Drake_2, 0x100 - - .align 2 -gFieldObjectPicTable_Roxanne:: @ 85076EC - obj_tiles gFieldObjectPic_Roxanne_0, 0x100 - obj_tiles gFieldObjectPic_Roxanne_1, 0x100 - obj_tiles gFieldObjectPic_Roxanne_2, 0x100 - obj_tiles gFieldObjectPic_Roxanne_0, 0x100 - obj_tiles gFieldObjectPic_Roxanne_0, 0x100 - obj_tiles gFieldObjectPic_Roxanne_1, 0x100 - obj_tiles gFieldObjectPic_Roxanne_1, 0x100 - obj_tiles gFieldObjectPic_Roxanne_2, 0x100 - obj_tiles gFieldObjectPic_Roxanne_2, 0x100 - - .align 2 -gFieldObjectPicTable_Brawly:: @ 8507734 - obj_tiles gFieldObjectPic_Brawly_0, 0x100 - obj_tiles gFieldObjectPic_Brawly_1, 0x100 - obj_tiles gFieldObjectPic_Brawly_2, 0x100 - obj_tiles gFieldObjectPic_Brawly_0, 0x100 - obj_tiles gFieldObjectPic_Brawly_0, 0x100 - obj_tiles gFieldObjectPic_Brawly_1, 0x100 - obj_tiles gFieldObjectPic_Brawly_1, 0x100 - obj_tiles gFieldObjectPic_Brawly_2, 0x100 - obj_tiles gFieldObjectPic_Brawly_2, 0x100 - - .align 2 -gFieldObjectPicTable_Wattson:: @ 850777C - obj_tiles gFieldObjectPic_Wattson_0, 0x100 - obj_tiles gFieldObjectPic_Wattson_1, 0x100 - obj_tiles gFieldObjectPic_Wattson_2, 0x100 - obj_tiles gFieldObjectPic_Wattson_0, 0x100 - obj_tiles gFieldObjectPic_Wattson_0, 0x100 - obj_tiles gFieldObjectPic_Wattson_1, 0x100 - obj_tiles gFieldObjectPic_Wattson_1, 0x100 - obj_tiles gFieldObjectPic_Wattson_2, 0x100 - obj_tiles gFieldObjectPic_Wattson_2, 0x100 - - .align 2 -gFieldObjectPicTable_Flannery:: @ 85077C4 - obj_tiles gFieldObjectPic_Flannery_0, 0x100 - obj_tiles gFieldObjectPic_Flannery_1, 0x100 - obj_tiles gFieldObjectPic_Flannery_2, 0x100 - obj_tiles gFieldObjectPic_Flannery_0, 0x100 - obj_tiles gFieldObjectPic_Flannery_0, 0x100 - obj_tiles gFieldObjectPic_Flannery_1, 0x100 - obj_tiles gFieldObjectPic_Flannery_1, 0x100 - obj_tiles gFieldObjectPic_Flannery_2, 0x100 - obj_tiles gFieldObjectPic_Flannery_2, 0x100 - - .align 2 -gFieldObjectPicTable_Norman:: @ 850780C - obj_tiles gFieldObjectPic_Norman_0, 0x100 - obj_tiles gFieldObjectPic_Norman_1, 0x100 - obj_tiles gFieldObjectPic_Norman_2, 0x100 - obj_tiles gFieldObjectPic_Norman_3, 0x100 - obj_tiles gFieldObjectPic_Norman_4, 0x100 - obj_tiles gFieldObjectPic_Norman_5, 0x100 - obj_tiles gFieldObjectPic_Norman_6, 0x100 - obj_tiles gFieldObjectPic_Norman_7, 0x100 - obj_tiles gFieldObjectPic_Norman_8, 0x100 - - .align 2 -gFieldObjectPicTable_Winona:: @ 8507854 - obj_tiles gFieldObjectPic_Winona_0, 0x100 - obj_tiles gFieldObjectPic_Winona_1, 0x100 - obj_tiles gFieldObjectPic_Winona_2, 0x100 - obj_tiles gFieldObjectPic_Winona_0, 0x100 - obj_tiles gFieldObjectPic_Winona_0, 0x100 - obj_tiles gFieldObjectPic_Winona_1, 0x100 - obj_tiles gFieldObjectPic_Winona_1, 0x100 - obj_tiles gFieldObjectPic_Winona_2, 0x100 - obj_tiles gFieldObjectPic_Winona_2, 0x100 - - .align 2 -gFieldObjectPicTable_Liza:: @ 850789C - obj_tiles gFieldObjectPic_Liza_0, 0x100 - obj_tiles gFieldObjectPic_Liza_1, 0x100 - obj_tiles gFieldObjectPic_Liza_2, 0x100 - obj_tiles gFieldObjectPic_Liza_0, 0x100 - obj_tiles gFieldObjectPic_Liza_0, 0x100 - obj_tiles gFieldObjectPic_Liza_1, 0x100 - obj_tiles gFieldObjectPic_Liza_1, 0x100 - obj_tiles gFieldObjectPic_Liza_2, 0x100 - obj_tiles gFieldObjectPic_Liza_2, 0x100 - - .align 2 -gFieldObjectPicTable_Tate:: @ 85078E4 - obj_tiles gFieldObjectPic_Tate_0, 0x100 - obj_tiles gFieldObjectPic_Tate_1, 0x100 - obj_tiles gFieldObjectPic_Tate_2, 0x100 - obj_tiles gFieldObjectPic_Tate_0, 0x100 - obj_tiles gFieldObjectPic_Tate_0, 0x100 - obj_tiles gFieldObjectPic_Tate_1, 0x100 - obj_tiles gFieldObjectPic_Tate_1, 0x100 - obj_tiles gFieldObjectPic_Tate_2, 0x100 - obj_tiles gFieldObjectPic_Tate_2, 0x100 - - .align 2 -gFieldObjectPicTable_Wallace:: @ 850792C - obj_tiles gFieldObjectPic_Wallace_0, 0x100 - obj_tiles gFieldObjectPic_Wallace_1, 0x100 - obj_tiles gFieldObjectPic_Wallace_2, 0x100 - obj_tiles gFieldObjectPic_Wallace_3, 0x100 - obj_tiles gFieldObjectPic_Wallace_4, 0x100 - obj_tiles gFieldObjectPic_Wallace_5, 0x100 - obj_tiles gFieldObjectPic_Wallace_6, 0x100 - obj_tiles gFieldObjectPic_Wallace_7, 0x100 - obj_tiles gFieldObjectPic_Wallace_8, 0x100 - - .align 2 -gFieldObjectPicTable_Steven:: @ 8507974 - obj_tiles gFieldObjectPic_Steven_0, 0x100 - obj_tiles gFieldObjectPic_Steven_1, 0x100 - obj_tiles gFieldObjectPic_Steven_2, 0x100 - obj_tiles gFieldObjectPic_Steven_3, 0x100 - obj_tiles gFieldObjectPic_Steven_4, 0x100 - obj_tiles gFieldObjectPic_Steven_5, 0x100 - obj_tiles gFieldObjectPic_Steven_6, 0x100 - obj_tiles gFieldObjectPic_Steven_7, 0x100 - obj_tiles gFieldObjectPic_Steven_8, 0x100 - - .align 2 -gFieldObjectPicTable_Wally:: @ 85079BC - obj_tiles gFieldObjectPic_Wally_0, 0x100 - obj_tiles gFieldObjectPic_Wally_1, 0x100 - obj_tiles gFieldObjectPic_Wally_2, 0x100 - obj_tiles gFieldObjectPic_Wally_3, 0x100 - obj_tiles gFieldObjectPic_Wally_4, 0x100 - obj_tiles gFieldObjectPic_Wally_5, 0x100 - obj_tiles gFieldObjectPic_Wally_6, 0x100 - obj_tiles gFieldObjectPic_Wally_7, 0x100 - obj_tiles gFieldObjectPic_Wally_8, 0x100 - - .align 2 -gFieldObjectPicTable_RubySapphireLittleBoy:: @ 8507A04 - obj_tiles gFieldObjectPic_RubySapphireLittleBoy_0, 0x80 - obj_tiles gFieldObjectPic_RubySapphireLittleBoy_1, 0x80 - obj_tiles gFieldObjectPic_RubySapphireLittleBoy_2, 0x80 - obj_tiles gFieldObjectPic_RubySapphireLittleBoy_3, 0x80 - obj_tiles gFieldObjectPic_RubySapphireLittleBoy_4, 0x80 - obj_tiles gFieldObjectPic_RubySapphireLittleBoy_5, 0x80 - obj_tiles gFieldObjectPic_RubySapphireLittleBoy_6, 0x80 - obj_tiles gFieldObjectPic_RubySapphireLittleBoy_7, 0x80 - obj_tiles gFieldObjectPic_RubySapphireLittleBoy_8, 0x80 - - .align 2 -gFieldObjectPicTable_BrendanFishing:: @ 8507A4C - obj_tiles gFieldObjectPic_BrendanFishing_0, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_1, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_2, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_3, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_4, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_5, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_6, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_7, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_8, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_9, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_10, 0x200 - obj_tiles gFieldObjectPic_BrendanFishing_11, 0x200 - - .align 2 -gFieldObjectPicTable_MayFishing:: @ 8507AAC - obj_tiles gFieldObjectPic_MayFishing_0, 0x200 - obj_tiles gFieldObjectPic_MayFishing_1, 0x200 - obj_tiles gFieldObjectPic_MayFishing_2, 0x200 - obj_tiles gFieldObjectPic_MayFishing_3, 0x200 - obj_tiles gFieldObjectPic_MayFishing_4, 0x200 - obj_tiles gFieldObjectPic_MayFishing_5, 0x200 - obj_tiles gFieldObjectPic_MayFishing_6, 0x200 - obj_tiles gFieldObjectPic_MayFishing_7, 0x200 - obj_tiles gFieldObjectPic_MayFishing_8, 0x200 - obj_tiles gFieldObjectPic_MayFishing_9, 0x200 - obj_tiles gFieldObjectPic_MayFishing_10, 0x200 - obj_tiles gFieldObjectPic_MayFishing_11, 0x200 - - .align 2 -gFieldObjectPicTable_HotSpringsOldWoman:: @ 8507B0C - obj_tiles gFieldObjectPic_HotSpringsOldWoman_0, 0x100 - obj_tiles gFieldObjectPic_HotSpringsOldWoman_1, 0x100 - obj_tiles gFieldObjectPic_HotSpringsOldWoman_2, 0x100 - obj_tiles gFieldObjectPic_HotSpringsOldWoman_3, 0x100 - obj_tiles gFieldObjectPic_HotSpringsOldWoman_4, 0x100 - obj_tiles gFieldObjectPic_HotSpringsOldWoman_5, 0x100 - obj_tiles gFieldObjectPic_HotSpringsOldWoman_6, 0x100 - obj_tiles gFieldObjectPic_HotSpringsOldWoman_7, 0x100 - obj_tiles gFieldObjectPic_HotSpringsOldWoman_8, 0x100 - - .align 2 -gFieldObjectPicTable_SSTidal:: @ 8507B54 - obj_tiles gFieldObjectPic_SSTidal, 0x780 - obj_tiles gFieldObjectPic_SSTidal, 0x780 - obj_tiles gFieldObjectPic_SSTidal, 0x780 - obj_tiles gFieldObjectPic_SSTidal, 0x780 - obj_tiles gFieldObjectPic_SSTidal, 0x780 - obj_tiles gFieldObjectPic_SSTidal, 0x780 - obj_tiles gFieldObjectPic_SSTidal, 0x780 - obj_tiles gFieldObjectPic_SSTidal, 0x780 - obj_tiles gFieldObjectPic_SSTidal, 0x780 - - .align 2 -gFieldObjectPicTable_SubmarineShadow:: @ 8507B9C - obj_tiles gFieldObjectPic_SubmarineShadow, 0x580 - obj_tiles gFieldObjectPic_SubmarineShadow, 0x580 - obj_tiles gFieldObjectPic_SubmarineShadow, 0x580 - obj_tiles gFieldObjectPic_SubmarineShadow, 0x580 - obj_tiles gFieldObjectPic_SubmarineShadow, 0x580 - obj_tiles gFieldObjectPic_SubmarineShadow, 0x580 - obj_tiles gFieldObjectPic_SubmarineShadow, 0x580 - obj_tiles gFieldObjectPic_SubmarineShadow, 0x580 - obj_tiles gFieldObjectPic_SubmarineShadow, 0x580 - - .align 2 -gFieldObjectPicTable_PichuDoll:: @ 8507BE4 - obj_tiles gFieldObjectPic_PichuDoll, 0x80 - - .align 2 -gFieldObjectPicTable_PikachuDoll:: @ 8507BEC - obj_tiles gFieldObjectPic_PikachuDoll, 0x80 - - .align 2 -gFieldObjectPicTable_MarillDoll:: @ 8507BF4 - obj_tiles gFieldObjectPic_MarillDoll, 0x80 - - .align 2 -gFieldObjectPicTable_TogepiDoll:: @ 8507BFC - obj_tiles gFieldObjectPic_TogepiDoll, 0x80 - - .align 2 -gFieldObjectPicTable_CyndaquilDoll:: @ 8507C04 - obj_tiles gFieldObjectPic_CyndaquilDoll, 0x80 - - .align 2 -gFieldObjectPicTable_ChikoritaDoll:: @ 8507C0C - obj_tiles gFieldObjectPic_ChikoritaDoll, 0x80 - - .align 2 -gFieldObjectPicTable_TotodileDoll:: @ 8507C14 - obj_tiles gFieldObjectPic_TotodileDoll, 0x80 - - .align 2 -gFieldObjectPicTable_JigglypuffDoll:: @ 8507C1C - obj_tiles gFieldObjectPic_JigglypuffDoll, 0x80 - - .align 2 -gFieldObjectPicTable_MeowthDoll:: @ 8507C24 - obj_tiles gFieldObjectPic_MeowthDoll, 0x80 - - .align 2 -gFieldObjectPicTable_ClefairyDoll:: @ 8507C2C - obj_tiles gFieldObjectPic_ClefairyDoll, 0x80 - - .align 2 -gFieldObjectPicTable_DittoDoll:: @ 8507C34 - obj_tiles gFieldObjectPic_DittoDoll, 0x80 - - .align 2 -gFieldObjectPicTable_SmoochumDoll:: @ 8507C3C - obj_tiles gFieldObjectPic_SmoochumDoll, 0x80 - - .align 2 -gFieldObjectPicTable_TreeckoDoll:: @ 8507C44 - obj_tiles gFieldObjectPic_TreeckoDoll, 0x80 - - .align 2 -gFieldObjectPicTable_TorchicDoll:: @ 8507C4C - obj_tiles gFieldObjectPic_TorchicDoll, 0x80 - - .align 2 -gFieldObjectPicTable_MudkipDoll:: @ 8507C54 - obj_tiles gFieldObjectPic_MudkipDoll, 0x80 - - .align 2 -gFieldObjectPicTable_DuskullDoll:: @ 8507C5C - obj_tiles gFieldObjectPic_DuskullDoll, 0x80 - - .align 2 -gFieldObjectPicTable_WynautDoll:: @ 8507C64 - obj_tiles gFieldObjectPic_WynautDoll, 0x80 - - .align 2 -gFieldObjectPicTable_BaltoyDoll:: @ 8507C6C - obj_tiles gFieldObjectPic_BaltoyDoll, 0x80 - - .align 2 -gFieldObjectPicTable_KecleonDoll:: @ 8507C74 - obj_tiles gFieldObjectPic_KecleonDoll, 0x80 - - .align 2 -gFieldObjectPicTable_AzurillDoll:: @ 8507C7C - obj_tiles gFieldObjectPic_AzurillDoll, 0x80 - - .align 2 -gFieldObjectPicTable_SkittyDoll:: @ 8507C84 - obj_tiles gFieldObjectPic_SkittyDoll, 0x80 - - .align 2 -gFieldObjectPicTable_SwabluDoll:: @ 8507C8C - obj_tiles gFieldObjectPic_SwabluDoll, 0x80 - - .align 2 -gFieldObjectPicTable_GulpinDoll:: @ 8507C94 - obj_tiles gFieldObjectPic_GulpinDoll, 0x80 - - .align 2 -gFieldObjectPicTable_LotadDoll:: @ 8507C9C - obj_tiles gFieldObjectPic_LotadDoll, 0x80 - - .align 2 -gFieldObjectPicTable_SeedotDoll:: @ 8507CA4 - obj_tiles gFieldObjectPic_SeedotDoll, 0x80 - - .align 2 -gFieldObjectPicTable_PikaCushion:: @ 8507CAC - obj_tiles gFieldObjectPic_PikaCushion, 0x80 - - .align 2 -gFieldObjectPicTable_RoundCushion:: @ 8507CB4 - obj_tiles gFieldObjectPic_RoundCushion, 0x80 - - .align 2 -gFieldObjectPicTable_KissCushion:: @ 8507CBC - obj_tiles gFieldObjectPic_KissCushion, 0x80 - - .align 2 -gFieldObjectPicTable_ZigzagCushion:: @ 8507CC4 - obj_tiles gFieldObjectPic_ZigzagCushion, 0x80 - - .align 2 -gFieldObjectPicTable_SpinCushion:: @ 8507CCC - obj_tiles gFieldObjectPic_SpinCushion, 0x80 - - .align 2 -gFieldObjectPicTable_DiamondCushion:: @ 8507CD4 - obj_tiles gFieldObjectPic_DiamondCushion, 0x80 - - .align 2 -gFieldObjectPicTable_BallCushion:: @ 8507CDC - obj_tiles gFieldObjectPic_BallCushion, 0x80 - - .align 2 -gFieldObjectPicTable_GrassCushion:: @ 8507CE4 - obj_tiles gFieldObjectPic_GrassCushion, 0x80 - - .align 2 -gFieldObjectPicTable_FireCushion:: @ 8507CEC - obj_tiles gFieldObjectPic_FireCushion, 0x80 - - .align 2 -gFieldObjectPicTable_WaterCushion:: @ 8507CF4 - obj_tiles gFieldObjectPic_WaterCushion, 0x80 - - .align 2 -gFieldObjectPicTable_BigSnorlaxDoll:: @ 8507CFC - obj_tiles gFieldObjectPic_BigSnorlaxDoll, 0x200 - - .align 2 -gFieldObjectPicTable_BigRhydonDoll:: @ 8507D04 - obj_tiles gFieldObjectPic_BigRhydonDoll, 0x200 - - .align 2 -gFieldObjectPicTable_BigLaprasDoll:: @ 8507D0C - obj_tiles gFieldObjectPic_BigLaprasDoll, 0x200 - - .align 2 -gFieldObjectPicTable_BigVenusaurDoll:: @ 8507D14 - obj_tiles gFieldObjectPic_BigVenusaurDoll, 0x200 - - .align 2 -gFieldObjectPicTable_BigCharizardDoll:: @ 8507D1C - obj_tiles gFieldObjectPic_BigCharizardDoll, 0x200 - - .align 2 -gFieldObjectPicTable_BigBlastoiseDoll:: @ 8507D24 - obj_tiles gFieldObjectPic_BigBlastoiseDoll, 0x200 - - .align 2 -gFieldObjectPicTable_BigWailmerDoll:: @ 8507D2C - obj_tiles gFieldObjectPic_BigWailmerDoll, 0x200 - - .align 2 -gFieldObjectPicTable_BigRegirockDoll:: @ 8507D34 - obj_tiles gFieldObjectPic_BigRegirockDoll, 0x200 - - .align 2 -gFieldObjectPicTable_BigRegiceDoll:: @ 8507D3C - obj_tiles gFieldObjectPic_BigRegiceDoll, 0x200 - - .align 2 -gFieldObjectPicTable_BigRegisteelDoll:: @ 8507D44 - obj_tiles gFieldObjectPic_BigRegisteelDoll, 0x200 - - .align 2 -gFieldObjectPicTable_LatiasLatios:: @ 8507D4C - obj_tiles gFieldObjectPic_LatiasLatios_0, 0x200 - obj_tiles gFieldObjectPic_LatiasLatios_0, 0x200 - obj_tiles gFieldObjectPic_LatiasLatios_0, 0x200 - obj_tiles gFieldObjectPic_LatiasLatios_1, 0x200 - obj_tiles gFieldObjectPic_LatiasLatios_2, 0x200 - obj_tiles gFieldObjectPic_LatiasLatios_1, 0x200 - obj_tiles gFieldObjectPic_LatiasLatios_2, 0x200 - obj_tiles gFieldObjectPic_LatiasLatios_1, 0x200 - obj_tiles gFieldObjectPic_LatiasLatios_2, 0x200 - - .align 2 -gFieldObjectPicTable_Boy5:: @ 8507D94 - obj_tiles gFieldObjectPic_Boy5_0, 0x100 - obj_tiles gFieldObjectPic_Boy5_1, 0x100 - obj_tiles gFieldObjectPic_Boy5_2, 0x100 - obj_tiles gFieldObjectPic_Boy5_0, 0x100 - obj_tiles gFieldObjectPic_Boy5_0, 0x100 - obj_tiles gFieldObjectPic_Boy5_1, 0x100 - obj_tiles gFieldObjectPic_Boy5_1, 0x100 - obj_tiles gFieldObjectPic_Boy5_2, 0x100 - obj_tiles gFieldObjectPic_Boy5_2, 0x100 - - .align 2 -gFieldObjectPicTable_ContestOldMan:: @ 8507DDC - obj_tiles gFieldObjectPic_ContestOldMan_0, 0x100 - obj_tiles gFieldObjectPic_ContestOldMan_1, 0x100 - obj_tiles gFieldObjectPic_ContestOldMan_2, 0x100 - obj_tiles gFieldObjectPic_ContestOldMan_3, 0x100 - obj_tiles gFieldObjectPic_ContestOldMan_4, 0x100 - obj_tiles gFieldObjectPic_ContestOldMan_5, 0x100 - obj_tiles gFieldObjectPic_ContestOldMan_6, 0x100 - obj_tiles gFieldObjectPic_ContestOldMan_7, 0x100 - obj_tiles gFieldObjectPic_ContestOldMan_8, 0x100 - - .align 2 -gFieldObjectPicTable_BrendanWatering:: @ 8507E24 - obj_tiles gFieldObjectPic_BrendanWatering_0, 0x200 - obj_tiles gFieldObjectPic_BrendanWatering_1, 0x200 - obj_tiles gFieldObjectPic_BrendanWatering_2, 0x200 - obj_tiles gFieldObjectPic_BrendanWatering_3, 0x200 - obj_tiles gFieldObjectPic_BrendanWatering_3, 0x200 - obj_tiles gFieldObjectPic_BrendanWatering_4, 0x200 - obj_tiles gFieldObjectPic_BrendanWatering_4, 0x200 - obj_tiles gFieldObjectPic_BrendanWatering_5, 0x200 - obj_tiles gFieldObjectPic_BrendanWatering_5, 0x200 - - .align 2 -gFieldObjectPicTable_MayWatering:: @ 8507E6C - obj_tiles gFieldObjectPic_MayWatering_0, 0x200 - obj_tiles gFieldObjectPic_MayWatering_1, 0x200 - obj_tiles gFieldObjectPic_MayWatering_2, 0x200 - obj_tiles gFieldObjectPic_MayWatering_3, 0x200 - obj_tiles gFieldObjectPic_MayWatering_3, 0x200 - obj_tiles gFieldObjectPic_MayWatering_4, 0x200 - obj_tiles gFieldObjectPic_MayWatering_4, 0x200 - obj_tiles gFieldObjectPic_MayWatering_5, 0x200 - obj_tiles gFieldObjectPic_MayWatering_5, 0x200 - - .align 2 -gFieldObjectPicTable_BrendanDecorating:: @ 8507EB4 - obj_tiles gFieldObjectPic_BrendanDecorating, 0x100 - - .align 2 -gFieldObjectPicTable_MayDecorating:: @ 8507EBC - obj_tiles gFieldObjectPic_MayDecorating, 0x100 - - .align 2 -gFieldObjectPicTable_Archie:: @ 8507EC4 - obj_tiles gFieldObjectPic_Archie_0, 0x100 - obj_tiles gFieldObjectPic_Archie_1, 0x100 - obj_tiles gFieldObjectPic_Archie_2, 0x100 - obj_tiles gFieldObjectPic_Archie_3, 0x100 - obj_tiles gFieldObjectPic_Archie_4, 0x100 - obj_tiles gFieldObjectPic_Archie_5, 0x100 - obj_tiles gFieldObjectPic_Archie_6, 0x100 - obj_tiles gFieldObjectPic_Archie_7, 0x100 - obj_tiles gFieldObjectPic_Archie_8, 0x100 - - .align 2 -gFieldObjectPicTable_Maxie:: @ 8507F0C - obj_tiles gFieldObjectPic_Maxie_0, 0x100 - obj_tiles gFieldObjectPic_Maxie_1, 0x100 - obj_tiles gFieldObjectPic_Maxie_2, 0x100 - obj_tiles gFieldObjectPic_Maxie_3, 0x100 - obj_tiles gFieldObjectPic_Maxie_4, 0x100 - obj_tiles gFieldObjectPic_Maxie_5, 0x100 - obj_tiles gFieldObjectPic_Maxie_6, 0x100 - obj_tiles gFieldObjectPic_Maxie_7, 0x100 - obj_tiles gFieldObjectPic_Maxie_8, 0x100 - - .align 2 -gFieldObjectPicTable_KyogreFront:: @ 8507F54 - obj_tiles gFieldObjectPic_KyogreFront_0, 0x200 - obj_tiles gFieldObjectPic_KyogreFront_0, 0x200 - obj_tiles gFieldObjectPic_KyogreFront_0, 0x200 - obj_tiles gFieldObjectPic_KyogreFront_1, 0x200 - obj_tiles gFieldObjectPic_KyogreFront_1, 0x200 - obj_tiles gFieldObjectPic_KyogreFront_1, 0x200 - obj_tiles gFieldObjectPic_KyogreFront_1, 0x200 - obj_tiles gFieldObjectPic_KyogreFront_1, 0x200 - obj_tiles gFieldObjectPic_KyogreFront_1, 0x200 - - .align 2 -gFieldObjectPicTable_GroudonFront:: @ 8507F9C - obj_tiles gFieldObjectPic_GroudonFront_0, 0x200 - obj_tiles gFieldObjectPic_GroudonFront_0, 0x200 - obj_tiles gFieldObjectPic_GroudonFront_0, 0x200 - obj_tiles gFieldObjectPic_GroudonFront_1, 0x200 - obj_tiles gFieldObjectPic_GroudonFront_1, 0x200 - obj_tiles gFieldObjectPic_GroudonFront_1, 0x200 - obj_tiles gFieldObjectPic_GroudonFront_1, 0x200 - obj_tiles gFieldObjectPic_GroudonFront_1, 0x200 - obj_tiles gFieldObjectPic_GroudonFront_1, 0x200 - - .align 2 -gFieldObjectPicTable_KyogreSide:: @ 8507FE4 - obj_tiles gFieldObjectPic_KyogreSide_0, 0x200 - obj_tiles gFieldObjectPic_KyogreSide_0, 0x200 - obj_tiles gFieldObjectPic_KyogreSide_0, 0x200 - obj_tiles gFieldObjectPic_KyogreSide_1, 0x200 - obj_tiles gFieldObjectPic_KyogreSide_1, 0x200 - obj_tiles gFieldObjectPic_KyogreSide_1, 0x200 - obj_tiles gFieldObjectPic_KyogreSide_1, 0x200 - obj_tiles gFieldObjectPic_KyogreSide_1, 0x200 - obj_tiles gFieldObjectPic_KyogreSide_1, 0x200 - - .align 2 -gFieldObjectPicTable_GroudonSide:: @ 850802C - obj_tiles gFieldObjectPic_GroudonSide_0, 0x200 - obj_tiles gFieldObjectPic_GroudonSide_0, 0x200 - obj_tiles gFieldObjectPic_GroudonSide_0, 0x200 - obj_tiles gFieldObjectPic_GroudonSide_1, 0x200 - obj_tiles gFieldObjectPic_GroudonSide_1, 0x200 - obj_tiles gFieldObjectPic_GroudonSide_1, 0x200 - obj_tiles gFieldObjectPic_GroudonSide_1, 0x200 - obj_tiles gFieldObjectPic_GroudonSide_1, 0x200 - obj_tiles gFieldObjectPic_GroudonSide_1, 0x200 - - .align 2 -gFieldObjectPicTable_Fossil:: @ 8508074 - obj_tiles gFieldObjectPic_Fossil, 0x80 - - .align 2 -gFieldObjectPicTable_Regi:: @ 850807C - obj_tiles gFieldObjectPic_Regi, 0x200 - obj_tiles gFieldObjectPic_Regi, 0x200 - obj_tiles gFieldObjectPic_Regi, 0x200 - obj_tiles gFieldObjectPic_Regi, 0x200 - obj_tiles gFieldObjectPic_Regi, 0x200 - obj_tiles gFieldObjectPic_Regi, 0x200 - obj_tiles gFieldObjectPic_Regi, 0x200 - obj_tiles gFieldObjectPic_Regi, 0x200 - obj_tiles gFieldObjectPic_Regi, 0x200 - - .align 2 -gFieldObjectPicTable_Skitty:: @ 85080C4 - obj_tiles gFieldObjectPic_Skitty_0, 0x80 - obj_tiles gFieldObjectPic_Skitty_1, 0x80 - obj_tiles gFieldObjectPic_Skitty_2, 0x80 - obj_tiles gFieldObjectPic_Skitty_0, 0x80 - obj_tiles gFieldObjectPic_Skitty_0, 0x80 - obj_tiles gFieldObjectPic_Skitty_1, 0x80 - obj_tiles gFieldObjectPic_Skitty_1, 0x80 - obj_tiles gFieldObjectPic_Skitty_2, 0x80 - obj_tiles gFieldObjectPic_Skitty_2, 0x80 - - .align 2 -gFieldObjectPicTable_Kecleon:: @ 850810C - obj_tiles gFieldObjectPic_Kecleon_0, 0x80 - obj_tiles gFieldObjectPic_Kecleon_1, 0x80 - obj_tiles gFieldObjectPic_Kecleon_2, 0x80 - obj_tiles gFieldObjectPic_Kecleon_0, 0x80 - obj_tiles gFieldObjectPic_Kecleon_0, 0x80 - obj_tiles gFieldObjectPic_Kecleon_1, 0x80 - obj_tiles gFieldObjectPic_Kecleon_1, 0x80 - obj_tiles gFieldObjectPic_Kecleon_2, 0x80 - obj_tiles gFieldObjectPic_Kecleon_2, 0x80 - - .align 2 -gFieldObjectPicTable_Rayquaza:: @ 8508154 - obj_tiles gFieldObjectPic_Rayquaza_0, 0x800 - obj_tiles gFieldObjectPic_Rayquaza_1, 0x800 - obj_tiles gFieldObjectPic_Rayquaza_2, 0x800 - obj_tiles gFieldObjectPic_Rayquaza_3, 0x800 - obj_tiles gFieldObjectPic_Rayquaza_4, 0x800 - - .align 2 -gFieldObjectPicTable_RayquazaStill:: @ 850817C - obj_tiles gFieldObjectPic_RayquazaStill, 0x800 - obj_tiles gFieldObjectPic_RayquazaStill, 0x800 - obj_tiles gFieldObjectPic_RayquazaStill, 0x800 - obj_tiles gFieldObjectPic_RayquazaStill, 0x800 - obj_tiles gFieldObjectPic_RayquazaStill, 0x800 - obj_tiles gFieldObjectPic_RayquazaStill, 0x800 - obj_tiles gFieldObjectPic_RayquazaStill, 0x800 - obj_tiles gFieldObjectPic_RayquazaStill, 0x800 - obj_tiles gFieldObjectPic_RayquazaStill, 0x800 - - .align 2 -gFieldObjectPicTable_Zigzagoon:: @ 85081C4 - obj_tiles gFieldObjectPic_Zigzagoon_0, 0x80 - obj_tiles gFieldObjectPic_Zigzagoon_1, 0x80 - obj_tiles gFieldObjectPic_Zigzagoon_2, 0x80 - obj_tiles gFieldObjectPic_Zigzagoon_0, 0x80 - obj_tiles gFieldObjectPic_Zigzagoon_0, 0x80 - obj_tiles gFieldObjectPic_Zigzagoon_1, 0x80 - obj_tiles gFieldObjectPic_Zigzagoon_1, 0x80 - obj_tiles gFieldObjectPic_Zigzagoon_2, 0x80 - obj_tiles gFieldObjectPic_Zigzagoon_2, 0x80 - - .align 2 -gFieldObjectPicTable_Pikachu:: @ 850820C - obj_tiles gFieldObjectPic_Pikachu_0, 0x80 - obj_tiles gFieldObjectPic_Pikachu_1, 0x80 - obj_tiles gFieldObjectPic_Pikachu_2, 0x80 - obj_tiles gFieldObjectPic_Pikachu_0, 0x80 - obj_tiles gFieldObjectPic_Pikachu_0, 0x80 - obj_tiles gFieldObjectPic_Pikachu_1, 0x80 - obj_tiles gFieldObjectPic_Pikachu_1, 0x80 - obj_tiles gFieldObjectPic_Pikachu_2, 0x80 - obj_tiles gFieldObjectPic_Pikachu_2, 0x80 - - .align 2 -gFieldObjectPicTable_Azumarill:: @ 8508254 - obj_tiles gFieldObjectPic_Azumarill_0, 0x80 - obj_tiles gFieldObjectPic_Azumarill_1, 0x80 - obj_tiles gFieldObjectPic_Azumarill_2, 0x80 - obj_tiles gFieldObjectPic_Azumarill_0, 0x80 - obj_tiles gFieldObjectPic_Azumarill_0, 0x80 - obj_tiles gFieldObjectPic_Azumarill_1, 0x80 - obj_tiles gFieldObjectPic_Azumarill_1, 0x80 - obj_tiles gFieldObjectPic_Azumarill_2, 0x80 - obj_tiles gFieldObjectPic_Azumarill_2, 0x80 - - .align 2 -gFieldObjectPicTable_Wingull:: @ 850829C - obj_tiles gFieldObjectPic_Wingull_0, 0x80 - obj_tiles gFieldObjectPic_Wingull_1, 0x80 - obj_tiles gFieldObjectPic_Wingull_2, 0x80 - obj_tiles gFieldObjectPic_Wingull_3, 0x80 - obj_tiles gFieldObjectPic_Wingull_3, 0x80 - obj_tiles gFieldObjectPic_Wingull_4, 0x80 - obj_tiles gFieldObjectPic_Wingull_4, 0x80 - obj_tiles gFieldObjectPic_Wingull_5, 0x80 - obj_tiles gFieldObjectPic_Wingull_5, 0x80 - - .align 2 -gFieldObjectPicTable_TuberMSwimming:: @ 85082E4 - obj_tiles gFieldObjectPic_TuberMSwimming_0, 0x80 - obj_tiles gFieldObjectPic_TuberMSwimming_1, 0x80 - obj_tiles gFieldObjectPic_TuberMSwimming_2, 0x80 - obj_tiles gFieldObjectPic_TuberMSwimming_3, 0x80 - obj_tiles gFieldObjectPic_TuberMSwimming_4, 0x80 - obj_tiles gFieldObjectPic_TuberMSwimming_5, 0x80 - obj_tiles gFieldObjectPic_TuberMSwimming_6, 0x80 - obj_tiles gFieldObjectPic_TuberMSwimming_7, 0x80 - obj_tiles gFieldObjectPic_TuberMSwimming_8, 0x80 - - .align 2 -gFieldObjectPicTable_Azurill:: @ 850832C - obj_tiles gFieldObjectPic_Azurill_0, 0x80 - obj_tiles gFieldObjectPic_Azurill_1, 0x80 - obj_tiles gFieldObjectPic_Azurill_2, 0x80 - obj_tiles gFieldObjectPic_Azurill_0, 0x80 - obj_tiles gFieldObjectPic_Azurill_0, 0x80 - obj_tiles gFieldObjectPic_Azurill_1, 0x80 - obj_tiles gFieldObjectPic_Azurill_1, 0x80 - obj_tiles gFieldObjectPic_Azurill_2, 0x80 - obj_tiles gFieldObjectPic_Azurill_2, 0x80 - - .align 2 -gFieldObjectPicTable_Mom:: @ 8508374 - obj_tiles gFieldObjectPic_Mom_0, 0x100 - obj_tiles gFieldObjectPic_Mom_1, 0x100 - obj_tiles gFieldObjectPic_Mom_2, 0x100 - obj_tiles gFieldObjectPic_Mom_3, 0x100 - obj_tiles gFieldObjectPic_Mom_4, 0x100 - obj_tiles gFieldObjectPic_Mom_5, 0x100 - obj_tiles gFieldObjectPic_Mom_6, 0x100 - obj_tiles gFieldObjectPic_Mom_7, 0x100 - obj_tiles gFieldObjectPic_Mom_8, 0x100 - - .align 2 -gFieldObjectPicTable_Scott:: @ 85083BC - obj_tiles gFieldObjectPic_Scott_0, 0x100 - obj_tiles gFieldObjectPic_Scott_1, 0x100 - obj_tiles gFieldObjectPic_Scott_2, 0x100 - obj_tiles gFieldObjectPic_Scott_3, 0x100 - obj_tiles gFieldObjectPic_Scott_4, 0x100 - obj_tiles gFieldObjectPic_Scott_5, 0x100 - obj_tiles gFieldObjectPic_Scott_6, 0x100 - obj_tiles gFieldObjectPic_Scott_7, 0x100 - obj_tiles gFieldObjectPic_Scott_8, 0x100 - - .align 2 -gFieldObjectPicTable_Juan:: @ 8508404 - obj_tiles gFieldObjectPic_Juan_0, 0x100 - obj_tiles gFieldObjectPic_Juan_1, 0x100 - obj_tiles gFieldObjectPic_Juan_2, 0x100 - obj_tiles gFieldObjectPic_Juan_3, 0x100 - obj_tiles gFieldObjectPic_Juan_4, 0x100 - obj_tiles gFieldObjectPic_Juan_5, 0x100 - obj_tiles gFieldObjectPic_Juan_6, 0x100 - obj_tiles gFieldObjectPic_Juan_7, 0x100 - obj_tiles gFieldObjectPic_Juan_8, 0x100 - - .align 2 -gFieldObjectPicTable_MysteryEventDeliveryman:: @ 850844C - obj_tiles gFieldObjectPic_MysteryEventDeliveryman_0, 0x100 - obj_tiles gFieldObjectPic_MysteryEventDeliveryman_1, 0x100 - obj_tiles gFieldObjectPic_MysteryEventDeliveryman_2, 0x100 - obj_tiles gFieldObjectPic_MysteryEventDeliveryman_0, 0x100 - obj_tiles gFieldObjectPic_MysteryEventDeliveryman_0, 0x100 - obj_tiles gFieldObjectPic_MysteryEventDeliveryman_1, 0x100 - obj_tiles gFieldObjectPic_MysteryEventDeliveryman_1, 0x100 - obj_tiles gFieldObjectPic_MysteryEventDeliveryman_2, 0x100 - obj_tiles gFieldObjectPic_MysteryEventDeliveryman_2, 0x100 - - .align 2 -gFieldObjectPicTable_Statue:: @ 8508494 - obj_tiles gFieldObjectPic_Statue, 0x100 - - .align 2 -gFieldObjectPicTable_Dusclops:: @ 850849C - obj_tiles gFieldObjectPic_Dusclops_0, 0x100 - obj_tiles gFieldObjectPic_Dusclops_1, 0x100 - obj_tiles gFieldObjectPic_Dusclops_2, 0x100 - obj_tiles gFieldObjectPic_Dusclops_3, 0x100 - obj_tiles gFieldObjectPic_Dusclops_4, 0x100 - obj_tiles gFieldObjectPic_Dusclops_5, 0x100 - obj_tiles gFieldObjectPic_Dusclops_6, 0x100 - obj_tiles gFieldObjectPic_Dusclops_7, 0x100 - obj_tiles gFieldObjectPic_Dusclops_8, 0x100 - - .align 2 -gFieldObjectPicTable_Kirlia:: @ 85084E4 - obj_tiles gFieldObjectPic_Kirlia_0, 0x100 - obj_tiles gFieldObjectPic_Kirlia_1, 0x100 - obj_tiles gFieldObjectPic_Kirlia_2, 0x100 - obj_tiles gFieldObjectPic_Kirlia_3, 0x100 - obj_tiles gFieldObjectPic_Kirlia_4, 0x100 - obj_tiles gFieldObjectPic_Kirlia_5, 0x100 - obj_tiles gFieldObjectPic_Kirlia_6, 0x100 - obj_tiles gFieldObjectPic_Kirlia_7, 0x100 - obj_tiles gFieldObjectPic_Kirlia_8, 0x100 - - .align 2 -gFieldObjectPicTable_UnionRoomAttendant:: @ 850852C - obj_tiles gFieldObjectPic_UnionRoomAttendant_0, 0x100 - obj_tiles gFieldObjectPic_UnionRoomAttendant_1, 0x100 - obj_tiles gFieldObjectPic_UnionRoomAttendant_2, 0x100 - obj_tiles gFieldObjectPic_UnionRoomAttendant_0, 0x100 - obj_tiles gFieldObjectPic_UnionRoomAttendant_0, 0x100 - obj_tiles gFieldObjectPic_UnionRoomAttendant_1, 0x100 - obj_tiles gFieldObjectPic_UnionRoomAttendant_1, 0x100 - obj_tiles gFieldObjectPic_UnionRoomAttendant_2, 0x100 - obj_tiles gFieldObjectPic_UnionRoomAttendant_2, 0x100 - - .align 2 -gFieldObjectPicTable_Sudowoodo:: @ 8508574 - obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100 - obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100 - obj_tiles gFieldObjectPic_Sudowoodo_1, 0x100 - obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100 - obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100 - obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100 - obj_tiles gFieldObjectPic_Sudowoodo_0, 0x100 - obj_tiles gFieldObjectPic_Sudowoodo_1, 0x100 - obj_tiles gFieldObjectPic_Sudowoodo_2, 0x100 - - .align 2 -gFieldObjectPicTable_Mew:: @ 85085BC - obj_tiles gFieldObjectPic_Mew_0, 0x100 - obj_tiles gFieldObjectPic_Mew_1, 0x100 - obj_tiles gFieldObjectPic_Mew_2, 0x100 - obj_tiles gFieldObjectPic_Mew_3, 0x100 - obj_tiles gFieldObjectPic_Mew_4, 0x100 - obj_tiles gFieldObjectPic_Mew_5, 0x100 - obj_tiles gFieldObjectPic_Mew_6, 0x100 - obj_tiles gFieldObjectPic_Mew_7, 0x100 - obj_tiles gFieldObjectPic_Mew_8, 0x100 - - .align 2 -gFieldObjectPicTable_Red:: @ 8508604 - obj_tiles gFieldObjectPic_Red_0, 0x100 - obj_tiles gFieldObjectPic_Red_1, 0x100 - obj_tiles gFieldObjectPic_Red_2, 0x100 - obj_tiles gFieldObjectPic_Red_3, 0x100 - obj_tiles gFieldObjectPic_Red_4, 0x100 - obj_tiles gFieldObjectPic_Red_5, 0x100 - obj_tiles gFieldObjectPic_Red_6, 0x100 - obj_tiles gFieldObjectPic_Red_7, 0x100 - obj_tiles gFieldObjectPic_Red_8, 0x100 - - .align 2 -gFieldObjectPicTable_Leaf:: @ 850864C - obj_tiles gFieldObjectPic_Leaf_0, 0x100 - obj_tiles gFieldObjectPic_Leaf_1, 0x100 - obj_tiles gFieldObjectPic_Leaf_2, 0x100 - obj_tiles gFieldObjectPic_Leaf_3, 0x100 - obj_tiles gFieldObjectPic_Leaf_4, 0x100 - obj_tiles gFieldObjectPic_Leaf_5, 0x100 - obj_tiles gFieldObjectPic_Leaf_6, 0x100 - obj_tiles gFieldObjectPic_Leaf_7, 0x100 - obj_tiles gFieldObjectPic_Leaf_8, 0x100 - - .align 2 -gFieldObjectPicTable_Deoxys:: @ 8508694 - obj_tiles gFieldObjectPic_Deoxys_0, 0x200 - obj_tiles gFieldObjectPic_Deoxys_0, 0x200 - obj_tiles gFieldObjectPic_Deoxys_0, 0x200 - obj_tiles gFieldObjectPic_Deoxys_0, 0x200 - obj_tiles gFieldObjectPic_Deoxys_1, 0x200 - obj_tiles gFieldObjectPic_Deoxys_0, 0x200 - obj_tiles gFieldObjectPic_Deoxys_1, 0x200 - obj_tiles gFieldObjectPic_Deoxys_0, 0x200 - obj_tiles gFieldObjectPic_Deoxys_0, 0x200 - - .align 2 -gFieldObjectPicTable_BirthIslandStone:: @ 85086DC - obj_tiles gFieldObjectPic_BirthIslandStone, 0x200 - - .align 2 -gFieldObjectPicTable_Anabel:: @ 85086E4 - obj_tiles gFieldObjectPic_Anabel_0, 0x100 - obj_tiles gFieldObjectPic_Anabel_1, 0x100 - obj_tiles gFieldObjectPic_Anabel_2, 0x100 - obj_tiles gFieldObjectPic_Anabel_3, 0x100 - obj_tiles gFieldObjectPic_Anabel_4, 0x100 - obj_tiles gFieldObjectPic_Anabel_5, 0x100 - obj_tiles gFieldObjectPic_Anabel_6, 0x100 - obj_tiles gFieldObjectPic_Anabel_7, 0x100 - obj_tiles gFieldObjectPic_Anabel_8, 0x100 - - .align 2 -gFieldObjectPicTable_Tucker:: @ 850872C - obj_tiles gFieldObjectPic_Tucker_0, 0x100 - obj_tiles gFieldObjectPic_Tucker_1, 0x100 - obj_tiles gFieldObjectPic_Tucker_2, 0x100 - obj_tiles gFieldObjectPic_Tucker_3, 0x100 - obj_tiles gFieldObjectPic_Tucker_4, 0x100 - obj_tiles gFieldObjectPic_Tucker_5, 0x100 - obj_tiles gFieldObjectPic_Tucker_6, 0x100 - obj_tiles gFieldObjectPic_Tucker_7, 0x100 - obj_tiles gFieldObjectPic_Tucker_8, 0x100 - - .align 2 -gFieldObjectPicTable_Spenser:: @ 8508774 - obj_tiles gFieldObjectPic_Spenser_0, 0x100 - obj_tiles gFieldObjectPic_Spenser_1, 0x100 - obj_tiles gFieldObjectPic_Spenser_2, 0x100 - obj_tiles gFieldObjectPic_Spenser_3, 0x100 - obj_tiles gFieldObjectPic_Spenser_4, 0x100 - obj_tiles gFieldObjectPic_Spenser_5, 0x100 - obj_tiles gFieldObjectPic_Spenser_6, 0x100 - obj_tiles gFieldObjectPic_Spenser_7, 0x100 - obj_tiles gFieldObjectPic_Spenser_8, 0x100 - - .align 2 -gFieldObjectPicTable_Greta:: @ 85087BC - obj_tiles gFieldObjectPic_Greta_0, 0x100 - obj_tiles gFieldObjectPic_Greta_1, 0x100 - obj_tiles gFieldObjectPic_Greta_2, 0x100 - obj_tiles gFieldObjectPic_Greta_3, 0x100 - obj_tiles gFieldObjectPic_Greta_4, 0x100 - obj_tiles gFieldObjectPic_Greta_5, 0x100 - obj_tiles gFieldObjectPic_Greta_6, 0x100 - obj_tiles gFieldObjectPic_Greta_7, 0x100 - obj_tiles gFieldObjectPic_Greta_8, 0x100 - - .align 2 -gFieldObjectPicTable_Noland:: @ 8508804 - obj_tiles gFieldObjectPic_Noland_0, 0x100 - obj_tiles gFieldObjectPic_Noland_1, 0x100 - obj_tiles gFieldObjectPic_Noland_2, 0x100 - obj_tiles gFieldObjectPic_Noland_3, 0x100 - obj_tiles gFieldObjectPic_Noland_4, 0x100 - obj_tiles gFieldObjectPic_Noland_5, 0x100 - obj_tiles gFieldObjectPic_Noland_6, 0x100 - obj_tiles gFieldObjectPic_Noland_7, 0x100 - obj_tiles gFieldObjectPic_Noland_8, 0x100 - - .align 2 -gFieldObjectPicTable_Lucy:: @ 850884C - obj_tiles gFieldObjectPic_Lucy_0, 0x100 - obj_tiles gFieldObjectPic_Lucy_1, 0x100 - obj_tiles gFieldObjectPic_Lucy_2, 0x100 - obj_tiles gFieldObjectPic_Lucy_3, 0x100 - obj_tiles gFieldObjectPic_Lucy_4, 0x100 - obj_tiles gFieldObjectPic_Lucy_5, 0x100 - obj_tiles gFieldObjectPic_Lucy_6, 0x100 - obj_tiles gFieldObjectPic_Lucy_7, 0x100 - obj_tiles gFieldObjectPic_Lucy_8, 0x100 - - .align 2 -gFieldObjectPicTable_Brandon:: @ 8508894 - obj_tiles gFieldObjectPic_Brandon_0, 0x100 - obj_tiles gFieldObjectPic_Brandon_1, 0x100 - obj_tiles gFieldObjectPic_Brandon_2, 0x100 - obj_tiles gFieldObjectPic_Brandon_3, 0x100 - obj_tiles gFieldObjectPic_Brandon_4, 0x100 - obj_tiles gFieldObjectPic_Brandon_5, 0x100 - obj_tiles gFieldObjectPic_Brandon_6, 0x100 - obj_tiles gFieldObjectPic_Brandon_7, 0x100 - obj_tiles gFieldObjectPic_Brandon_8, 0x100 - - .align 2 -gFieldObjectPicTable_Lugia:: @ 85088DC - obj_tiles gFieldObjectPic_Lugia_0, 0x200 - obj_tiles gFieldObjectPic_Lugia_0, 0x200 - obj_tiles gFieldObjectPic_Lugia_0, 0x200 - obj_tiles gFieldObjectPic_Lugia_0, 0x200 - obj_tiles gFieldObjectPic_Lugia_1, 0x200 - obj_tiles gFieldObjectPic_Lugia_0, 0x200 - obj_tiles gFieldObjectPic_Lugia_1, 0x200 - obj_tiles gFieldObjectPic_Lugia_0, 0x200 - obj_tiles gFieldObjectPic_Lugia_1, 0x200 - - .align 2 -gFieldObjectPicTable_HoOh:: @ 8508924 - obj_tiles gFieldObjectPic_HoOh_0, 0x200 - obj_tiles gFieldObjectPic_HoOh_0, 0x200 - obj_tiles gFieldObjectPic_HoOh_0, 0x200 - obj_tiles gFieldObjectPic_HoOh_0, 0x200 - obj_tiles gFieldObjectPic_HoOh_1, 0x200 - obj_tiles gFieldObjectPic_HoOh_0, 0x200 - obj_tiles gFieldObjectPic_HoOh_1, 0x200 - obj_tiles gFieldObjectPic_HoOh_0, 0x200 - obj_tiles gFieldObjectPic_HoOh_1, 0x200 - - .align 2 -gFieldObjectPicTable_RubySapphireBrendan:: @ 850896C - obj_tiles gFieldObjectPic_RubySapphireBrendan_0, 0x100 - obj_tiles gFieldObjectPic_RubySapphireBrendan_1, 0x100 - obj_tiles gFieldObjectPic_RubySapphireBrendan_2, 0x100 - obj_tiles gFieldObjectPic_RubySapphireBrendan_3, 0x100 - obj_tiles gFieldObjectPic_RubySapphireBrendan_4, 0x100 - obj_tiles gFieldObjectPic_RubySapphireBrendan_5, 0x100 - obj_tiles gFieldObjectPic_RubySapphireBrendan_6, 0x100 - obj_tiles gFieldObjectPic_RubySapphireBrendan_7, 0x100 - obj_tiles gFieldObjectPic_RubySapphireBrendan_8, 0x100 - - .align 2 -gFieldObjectPicTable_RubySapphireMay:: @ 85089B4 - obj_tiles gFieldObjectPic_RubySapphireMay_0, 0x100 - obj_tiles gFieldObjectPic_RubySapphireMay_1, 0x100 - obj_tiles gFieldObjectPic_RubySapphireMay_2, 0x100 - obj_tiles gFieldObjectPic_RubySapphireMay_3, 0x100 - obj_tiles gFieldObjectPic_RubySapphireMay_4, 0x100 - obj_tiles gFieldObjectPic_RubySapphireMay_5, 0x100 - obj_tiles gFieldObjectPic_RubySapphireMay_6, 0x100 - obj_tiles gFieldObjectPic_RubySapphireMay_7, 0x100 - obj_tiles gFieldObjectPic_RubySapphireMay_8, 0x100 diff --git a/data/map_events.s b/data/map_events.s index 8784ee047..228380e7b 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/vars.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/map_obj_8097404.s b/data/map_obj_8097404.s deleted file mode 100644 index 719a78266..000000000 --- a/data/map_obj_8097404.s +++ /dev/null @@ -1,130 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 -gUnknown_0850E6C4:: @ 850E6C4 - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - .4byte little_step - - .align 2 -gUnknown_0850E704:: @ 850E704 - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - .4byte double_little_steps - - .align 2 -gUnknown_0850E724:: @ 850E724 - .4byte double_little_steps - .4byte triple_little_steps - .4byte triple_little_steps - .4byte double_little_steps - .4byte triple_little_steps - .4byte triple_little_steps - - .align 2 -gUnknown_0850E73C:: @ 850E73C - .4byte quad_little_steps - .4byte quad_little_steps - .4byte quad_little_steps - .4byte quad_little_steps - - .align 2 -gUnknown_0850E74C:: @ 850E74C - .4byte oct_little_steps - .4byte oct_little_steps - - .align 2 -gUnknown_0850E754:: @ 850E754 - .4byte gUnknown_0850E6C4 - .4byte gUnknown_0850E704 - .4byte gUnknown_0850E724 - .4byte gUnknown_0850E73C - .4byte gUnknown_0850E74C - - .align 1 -gUnknown_0850E768:: @ 850E768 - .2byte 0x0010, 0x0008, 0x0006, 0x0004, 0x0002 - -gUnknown_0850E772:: @ 850E772 - .byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01 - .byte 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00 - .byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - -gUnknown_0850E7BA:: @ 850E7BA - .byte 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00 - .byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00 - .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe - -gUnknown_0850E802:: @ 850E802 - .byte 0xfc, 0xfa, 0xf8, 0xf6, 0xf5, 0xf4, 0xf4, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xfa, 0xfc, 0x00, 0x00 - -gUnknown_0850E812:: @ 850E812 - .byte 0x00, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, 0x00, 0x00 - -gUnknown_0850E822:: @ 850E822 - .byte 0xfe, 0xfc, 0xfa, 0xf8, 0xf7, 0xf6, 0xf6, 0xf6, 0xf7, 0xf8, 0xfa, 0xfb, 0xfd, 0xfe, 0x00, 0x00 - - .align 2 -gUnknown_0850E834:: @ 850E834 - .4byte gUnknown_0850E802 - .4byte gUnknown_0850E812 - .4byte gUnknown_0850E822 - - .align 1 -gUnknown_0850E840:: @ 850E840 - .byte 0x10, 0x00, 0x10, 0x00, 0x20, 0x00 - - .align 1 -gUnknown_0850E846:: @ 850E846 - .byte 0x00, 0x00, 0x01, 0x00 - - .align 1 -gUnknown_0850E84A:: @ 850E84A - .byte 0x20, 0x00, 0x20, 0x00, 0x40, 0x00 - - .align 1 -gUnknown_0850E850:: @ 850E850 - .byte 0x01, 0x01, 0x02, 0x00 - -// referenced in data/field_map_obj.s - .align 2 -gUnknown_0850E854:: - .4byte sub_8097E50 - .4byte sub_80964B8 - - .align 2 -gUnknown_0850E85C:: - .4byte sub_8097EF0 - .4byte sub_80964B8 - - .align 2 -gUnknown_0850E864:: - .4byte sub_80980C0 - .4byte sub_80980D0 - .4byte sub_8098124 - - .align 2 -gUnknown_0850E870:: - .4byte sub_80980F4 - .4byte sub_8098108 - .4byte sub_8098124 diff --git a/data/maps/events/AbandonedShip_CaptainsOffice.inc b/data/maps/events/AbandonedShip_CaptainsOffice.inc index b2bc10ebb..ddfab5eab 100644 --- a/data/maps/events/AbandonedShip_CaptainsOffice.inc +++ b/data/maps/events/AbandonedShip_CaptainsOffice.inc @@ -1,11 +1,11 @@ -AbandonedShip_CaptainsOffice_MapObjects: @ 8536A5C - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 3, 1, 17, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100, 0, 0 +AbandonedShip_CaptainsOffice_EventObjects: @ 8536A5C + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_2387E2, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 6, 3, 1, 17, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_29126E, 1100, 0, 0 AbandonedShip_CaptainsOffice_MapWarps: @ 8536A8C warp_def 7, 6, 3, 4, ABANDONED_SHIP_DECK warp_def 8, 6, 3, 4, ABANDONED_SHIP_DECK AbandonedShip_CaptainsOffice_MapEvents:: @ 8536A9C - 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 a2b3b906f..c3cf0f54d 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: @ 85366C0 - object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 17, 7, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TUBER_M, 0, 0, 5, 10, 3, 45, 116, 0, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0, 0, 0 +AbandonedShip_Corridors_1F_EventObjects: @ 85366C0 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 17, 7, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_1F_EventScript_2379A5, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 0, 5, 10, 3, 45, 116, 0, 1, 3, AbandonedShip_Corridors_1F_EventScript_2379AE, 0, 0, 0 AbandonedShip_Corridors_1F_MapWarps: @ 85366F0 warp_def 9, 11, 3, 2, ABANDONED_SHIP_DECK @@ -17,5 +17,5 @@ AbandonedShip_Corridors_1F_MapWarps: @ 85366F0 warp_def 3, 3, 3, 2, ABANDONED_SHIP_ROOMS_2_1F AbandonedShip_Corridors_1F_MapEvents:: @ 8536750 - 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 637e658ce..8903de197 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: @ 8536808 - object_event 1, MAP_OBJ_GFX_TUBER_M, 0, 0, 2, 8, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0, 0, 0 +AbandonedShip_Corridors_B1F_EventObjects: @ 8536808 + object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 0, 2, 8, 3, 2, 17, 0, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DBF, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_237E13, 0, 0, 0 AbandonedShip_Corridors_B1F_MapWarps: @ 8536838 warp_def 6, 4, 3, 2, ABANDONED_SHIP_ROOMS_2_B1F @@ -16,5 +16,5 @@ AbandonedShip_Corridors_B1F_MapBGEvents: @ 8536878 bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_237DC8 AbandonedShip_Corridors_B1F_MapEvents:: @ 8536884 - 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 21a4370ce..27756e5a3 100644 --- a/data/maps/events/AbandonedShip_HiddenFloorRooms.inc +++ b/data/maps/events/AbandonedShip_HiddenFloorRooms.inc @@ -1,8 +1,8 @@ -AbandonedShip_HiddenFloorRooms_MapObjects: @ 8536B40 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101, 0, 0 +AbandonedShip_HiddenFloorRooms_EventObjects: @ 8536B40 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_29127B, 1077, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291288, 1078, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_2912A2, 1102, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 11, 3, 1, 17, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_291295, 1101, 0, 0 AbandonedShip_HiddenFloorRooms_MapWarps: @ 8536BA0 warp_def 6, 14, 3, 0, ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS @@ -28,5 +28,5 @@ AbandonedShip_HiddenFloorRooms_MapBGEvents: @ 8536BE8 bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_238DF3 AbandonedShip_HiddenFloorRooms_MapEvents:: @ 8536C60 - 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 d22e24bde..67411fcf9 100644 --- a/data/maps/events/AbandonedShip_Room_B1F.inc +++ b/data/maps/events/AbandonedShip_Room_B1F.inc @@ -1,10 +1,10 @@ -AbandonedShip_Room_B1F_MapObjects: @ 853697C - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098, 0, 0 +AbandonedShip_Room_B1F_EventObjects: @ 853697C + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Room_B1F_EventScript_291254, 1098, 0, 0 AbandonedShip_Room_B1F_MapWarps: @ 8536994 warp_def 4, 7, 3, 5, ABANDONED_SHIP_CORRIDORS_B1F warp_def 5, 7, 3, 5, ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Room_B1F_MapEvents:: @ 85369A4 - 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 ac5f57a53..4791919f6 100644 --- a/data/maps/events/AbandonedShip_Rooms2_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms2_1F.inc @@ -1,9 +1,9 @@ -AbandonedShip_Rooms2_1F_MapObjects: @ 85369B8 - object_event 1, MAP_OBJ_GFX_MAN_5, 0, 0, 7, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099, 0, 0 - object_event 4, MAP_OBJ_GFX_HIKER, 0, 0, 3, 2, 3, 10, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_TUBER_F, 0, 0, 7, 2, 3, 9, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0, 0, 0 +AbandonedShip_Rooms2_1F_EventObjects: @ 85369B8 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 0, 7, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_2380A7, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 13, 3, 8, 0, 0, 1, 1, AbandonedShip_Rooms2_1F_EventScript_23810B, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_1F_EventScript_291261, 1099, 0, 0 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 0, 3, 2, 3, 10, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_238186, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_TUBER_F, 0, 0, 7, 2, 3, 9, 17, 0, 1, 3, AbandonedShip_Rooms2_1F_EventScript_23816F, 0, 0, 0 AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30 warp_def 4, 16, 3, 8, ABANDONED_SHIP_CORRIDORS_1F @@ -11,5 +11,5 @@ AbandonedShip_Rooms2_1F_MapWarps: @ 8536A30 warp_def 4, 1, 3, 11, ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Rooms2_1F_MapEvents:: @ 8536A48 - 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 08846936a..e28a2ed5b 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: @ 85368F4 - object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 3, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097, 0, 0 +AbandonedShip_Rooms2_B1F_EventObjects: @ 85368F4 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_238025, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 3, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_291247, 1097, 0, 0 AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924 warp_def 4, 7, 3, 1, ABANDONED_SHIP_CORRIDORS_B1F @@ -9,5 +9,5 @@ AbandonedShip_Rooms2_B1F_MapWarps: @ 8536924 warp_def 14, 7, 3, 0, ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Rooms2_B1F_MapEvents:: @ 8536944 - 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 7e358ef75..fe9b6f7da 100644 --- a/data/maps/events/AbandonedShip_Rooms_1F.inc +++ b/data/maps/events/AbandonedShip_Rooms_1F.inc @@ -1,8 +1,8 @@ -AbandonedShip_Rooms_1F_MapObjects: @ 8536764 - object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 12, 5, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095, 0, 0 - object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 0, 10, 11, 3, 8, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 10, 16, 3, 16, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0, 0, 0 +AbandonedShip_Rooms_1F_EventObjects: @ 8536764 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 12, 5, 3, 2, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_237A93, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_1F_EventScript_29122D, 1095, 0, 0 + object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 0, 10, 11, 3, 8, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237AB3, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 10, 16, 3, 16, 17, 0, 1, 4, AbandonedShip_Rooms_1F_EventScript_237A9C, 0, 0, 0 AbandonedShip_Rooms_1F_MapWarps: @ 85367C4 warp_def 4, 16, 3, 4, ABANDONED_SHIP_CORRIDORS_1F @@ -13,5 +13,5 @@ AbandonedShip_Rooms_1F_MapWarps: @ 85367C4 warp_def 14, 16, 3, 5, ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Rooms_1F_MapEvents:: @ 85367F4 - 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 4627c4ab7..631b33746 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: @ 8536898 - object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096, 0, 0 +AbandonedShip_Rooms_B1F_EventObjects: @ 8536898 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_237FC6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_29123A, 1096, 0, 0 AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8 warp_def 4, 1, 3, 2, ABANDONED_SHIP_CORRIDORS_B1F @@ -8,5 +8,5 @@ AbandonedShip_Rooms_B1F_MapWarps: @ 85368C8 warp_def 22, 1, 3, 4, ABANDONED_SHIP_CORRIDORS_B1F AbandonedShip_Rooms_B1F_MapEvents:: @ 85368E0 - 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 667ab3876..a0bde74e3 100644 --- a/data/maps/events/AncientTomb.inc +++ b/data/maps/events/AncientTomb.inc @@ -1,5 +1,5 @@ -AncientTomb_MapObjects: @ 8536CDC - object_event 1, MAP_OBJ_GFX_REGISTEEL, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937, 0, 0 +AncientTomb_EventObjects: @ 8536CDC + object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_23905A, 937, 0, 0 AncientTomb_MapWarps: @ 8536CF4 warp_def 8, 29, 3, 0, ROUTE_120 @@ -12,5 +12,5 @@ AncientTomb_MapBGEvents: @ 8536D0C bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_239050 AncientTomb_MapEvents:: @ 8536D30 - 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 4c418b286..d5b9f17d6 100644 --- a/data/maps/events/AquaHideout_1F.inc +++ b/data/maps/events/AquaHideout_1F.inc @@ -1,7 +1,7 @@ -AquaHideout_1F_MapObjects: @ 8535304 - object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821, 0, 0 - object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822, 0, 0 - object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 4, 3, 50, 93, 0, 1, 3, AquaHideout_1F_EventScript_2334F8, 924, 0, 0 +AquaHideout_1F_EventObjects: @ 8535304 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_233494, 821, 0, 0 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_2334C6, 822, 0, 0 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 4, 3, 50, 93, 0, 1, 3, AquaHideout_1F_EventScript_2334F8, 924, 0, 0 AquaHideout_1F_MapWarps: @ 853534C warp_def 13, 27, 1, 6, LILYCOVE_CITY @@ -9,5 +9,5 @@ AquaHideout_1F_MapWarps: @ 853534C warp_def 22, 1, 3, 0, AQUA_HIDEOUT_B1F AquaHideout_1F_MapEvents:: @ 8535364 - 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 b62157d6f..c1b2f36b7 100644 --- a/data/maps/events/AquaHideout_B1F.inc +++ b/data/maps/events/AquaHideout_B1F.inc @@ -1,13 +1,13 @@ -AquaHideout_B1F_MapObjects: @ 8535378 - object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 16, 3, 8, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924, 0, 0 - object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071, 0, 0 - object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 20, 18, 3, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291358, 1124, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291365, 1132, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_233A38, 978, 0, 0 - object_event 9, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 28, 21, 3, 7, 17, 0, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924, 0, 0 +AquaHideout_B1F_EventObjects: @ 8535378 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 16, 3, 8, 0, 0, 1, 4, AquaHideout_B1F_EventScript_233A85, 924, 0, 0 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_233AB0, 924, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_291372, 1071, 0, 0 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 20, 18, 3, 23, 4, 0, 1, 4, AquaHideout_B1F_EventScript_233AD5, 924, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291358, 1124, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 9, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_2339EB, 977, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_291365, 1132, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 10, 3, 1, 17, 0, 0, 0, AquaHideout_B1F_EventScript_233A38, 978, 0, 0 + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 28, 21, 3, 7, 17, 0, 1, 4, AquaHideout_B1F_EventScript_233AEC, 924, 0, 0 AquaHideout_B1F_MapWarps: @ 8535450 warp_def 29, 1, 3, 2, AQUA_HIDEOUT_1F @@ -37,5 +37,5 @@ AquaHideout_B1F_MapWarps: @ 8535450 warp_def 48, 17, 3, 19, AQUA_HIDEOUT_B1F AquaHideout_B1F_MapEvents:: @ 8535518 - 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 24f97a1ea..54ef390fd 100644 --- a/data/maps/events/AquaHideout_B2F.inc +++ b/data/maps/events/AquaHideout_B2F.inc @@ -1,10 +1,10 @@ -AquaHideout_B2F_MapObjects: @ 853552C - object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924, 0, 0 - object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 10, 3, 45, 52, 0, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072, 0, 0 - object_event 4, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943, 0, 0 - object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 7, 5, 3, 10, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924, 0, 0 - object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 5, 3, 9, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924, 0, 0 +AquaHideout_B2F_EventObjects: @ 853552C + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_233E09, 924, 0, 0 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 10, 3, 45, 52, 0, 1, 3, AquaHideout_B2F_EventScript_233E8A, 924, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_29137F, 1072, 0, 0 + object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, 943, 0, 0 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 7, 5, 3, 10, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EAF, 924, 0, 0 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 5, 3, 9, 17, 0, 1, 5, AquaHideout_B2F_EventScript_233EC6, 924, 0, 0 AquaHideout_B2F_MapWarps: @ 85355BC warp_def 18, 1, 3, 1, AQUA_HIDEOUT_B1F @@ -23,5 +23,5 @@ AquaHideout_B2F_MapCoordEvents: @ 853560C coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_233DE5 AquaHideout_B2F_MapEvents:: @ 853562C - 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/ArtisanCave_1F.inc b/data/maps/events/ArtisanCave_1F.inc index 148408aa9..e5899ef05 100644 --- a/data/maps/events/ArtisanCave_1F.inc +++ b/data/maps/events/ArtisanCave_1F.inc @@ -1,10 +1,10 @@ -ArtisanCave_1F_MapObjects: @ 8537774 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163, 0, 0 +ArtisanCave_1F_EventObjects: @ 8537774 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, ArtisanCave_1F_EventScript_2914D1, 1163, 0, 0 ArtisanCave_1F_MapWarps: @ 853778C warp_def 10, 17, 0, 13, BATTLE_FRONTIER_OUTSIDE_EAST warp_def 6, 5, 0, 1, ARTISAN_CAVE_B1F ArtisanCave_1F_MapEvents:: @ 853779C - map_events ArtisanCave_1F_MapObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0 + map_events ArtisanCave_1F_EventObjects, ArtisanCave_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/ArtisanCave_B1F.inc b/data/maps/events/ArtisanCave_B1F.inc index 38a978c9b..af24f4b4a 100644 --- a/data/maps/events/ArtisanCave_B1F.inc +++ b/data/maps/events/ArtisanCave_B1F.inc @@ -1,5 +1,5 @@ -ArtisanCave_B1F_MapObjects: @ 8537708 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 32, 38, 3, 1, 17, 0, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162, 0, 0 +ArtisanCave_B1F_EventObjects: @ 8537708 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 32, 38, 3, 1, 17, 0, 0, 0, ArtisanCave_B1F_EventScript_2914C4, 1162, 0, 0 ArtisanCave_B1F_MapWarps: @ 8537720 warp_def 8, 48, 0, 10, BATTLE_FRONTIER_OUTSIDE_WEST @@ -12,5 +12,5 @@ ArtisanCave_B1F_MapBGEvents: @ 8537730 bg_event 19, 43, 0, 7, 0, ITEM_IRON, 104, 0 ArtisanCave_B1F_MapEvents:: @ 8537760 - map_events ArtisanCave_B1F_MapObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents + map_events ArtisanCave_B1F_EventObjects, ArtisanCave_B1F_MapWarps, 0x0, ArtisanCave_B1F_MapBGEvents diff --git a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc b/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc index fee53156b..029a59b41 100644 --- a/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleArenaBattleRoom.inc @@ -1,14 +1,14 @@ -BattleFrontier_BattleArenaBattleRoom_MapObjects: @ 853C8EC - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 10, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 5, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 4, 5, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 11, 5, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_HIPSTER, 0, 0, 15, 6, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_TRADER, 0, 0, 0, 6, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleArenaBattleRoom_EventObjects: @ 853C8EC + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 10, 3, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 5, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 4, 5, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 5, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 0, 15, 6, 3, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 6, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleArenaBattleRoom_MapEvents:: @ 853C9C4 - map_events BattleFrontier_BattleArenaBattleRoom_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleArenaBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc b/data/maps/events/BattleFrontier_BattleArenaCorridor.inc index d35c35ad0..657f912e3 100644 --- a/data/maps/events/BattleFrontier_BattleArenaCorridor.inc +++ b/data/maps/events/BattleFrontier_BattleArenaCorridor.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleArenaCorridor_MapObjects: @ 853C8C0 - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 9, 12, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleArenaCorridor_EventObjects: @ 853C8C0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 9, 12, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleArenaCorridor_MapEvents:: @ 853C8D8 - map_events BattleFrontier_BattleArenaCorridor_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleArenaCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleArenaLobby.inc b/data/maps/events/BattleFrontier_BattleArenaLobby.inc index ec84dfb77..3add19881 100644 --- a/data/maps/events/BattleFrontier_BattleArenaLobby.inc +++ b/data/maps/events/BattleFrontier_BattleArenaLobby.inc @@ -1,9 +1,9 @@ -BattleFrontier_BattleArenaLobby_MapObjects: @ 853C814 - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 7, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 2, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_6, 0, 0, 14, 11, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CAMPER, 0, 0, 14, 12, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 14, 10, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0, 0, 0 +BattleFrontier_BattleArenaLobby_EventObjects: @ 853C814 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 7, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_255DF4, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 2, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560C1, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 0, 14, 11, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560AF, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 0, 14, 12, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560B8, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 14, 10, 3, 9, 17, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560A6, 0, 0, 0 BattleFrontier_BattleArenaLobby_MapWarps: @ 853C88C warp_def 7, 12, 3, 1, BATTLE_FRONTIER_OUTSIDE_EAST @@ -13,5 +13,5 @@ BattleFrontier_BattleArenaLobby_MapBGEvents: @ 853C894 bg_event 1, 7, 0, 0, 0, BattleFrontier_BattleArenaLobby_EventScript_2560CA BattleFrontier_BattleArenaLobby_MapEvents:: @ 853C8AC - map_events BattleFrontier_BattleArenaLobby_MapObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents + map_events BattleFrontier_BattleArenaLobby_EventObjects, BattleFrontier_BattleArenaLobby_MapWarps, 0x0, BattleFrontier_BattleArenaLobby_MapBGEvents diff --git a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc b/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc index 3f0429bf2..595d14b60 100644 --- a/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleDomeBattleRoom.inc @@ -1,20 +1,20 @@ -BattleFrontier_BattleDomeBattleRoom_MapObjects: @ 853C1C4 - object_event 1, MAP_OBJ_GFX_REPORTER_M, 0, 0, 5, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 7, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 9, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 11, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 16, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 4, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 16, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_CAMPER, 0, 0, 8, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_FAT_MAN, 0, 0, 12, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_GIRL_2, 0, 0, 13, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_GIRL_1, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_TRADER, 0, 0, 4, 9, 4, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_WOMAN_4, 0, 0, 14, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_HIPSTER, 0, 0, 11, 6, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleDomeBattleRoom_EventObjects: @ 853C1C4 + object_event 1, EVENT_OBJ_GFX_REPORTER_M, 0, 0, 5, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 7, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 9, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 11, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 16, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 4, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 16, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_CAMPER, 0, 0, 8, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_GIRL_2, 0, 0, 13, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 9, 4, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 14, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_HIPSTER, 0, 0, 11, 6, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleDomeBattleRoom_MapEvents:: @ 853C32C - map_events BattleFrontier_BattleDomeBattleRoom_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleDomeBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc b/data/maps/events/BattleFrontier_BattleDomeCorridor.inc index 61b6e019d..9b3f387b1 100644 --- a/data/maps/events/BattleFrontier_BattleDomeCorridor.inc +++ b/data/maps/events/BattleFrontier_BattleDomeCorridor.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomeCorridor_MapObjects: @ 853C14C - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 23, 5, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleDomeCorridor_EventObjects: @ 853C14C + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 23, 5, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleDomeCorridor_MapWarps: @ 853C164 warp_def 6, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST warp_def 7, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattleDomeCorridor_MapEvents:: @ 853C174 - map_events BattleFrontier_BattleDomeCorridor_MapObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0 + map_events BattleFrontier_BattleDomeCorridor_EventObjects, BattleFrontier_BattleDomeCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleDomeLobby.inc b/data/maps/events/BattleFrontier_BattleDomeLobby.inc index 09ebc903c..59605010f 100644 --- a/data/maps/events/BattleFrontier_BattleDomeLobby.inc +++ b/data/maps/events/BattleFrontier_BattleDomeLobby.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomeLobby_MapObjects: @ 853C068 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 5, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 1, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 14, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_FAT_MAN, 0, 0, 18, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_TEALA, 0, 0, 17, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0, 0, 0 +BattleFrontier_BattleDomeLobby_EventObjects: @ 853C068 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A35, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 1, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E10, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 14, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DFE, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 18, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E07, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 14, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249DED, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_TEALA, 0, 0, 17, 10, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249A47, 0, 0, 0 BattleFrontier_BattleDomeLobby_MapWarps: @ 853C0F8 warp_def 11, 16, 0, 1, BATTLE_FRONTIER_OUTSIDE_WEST @@ -17,5 +17,5 @@ BattleFrontier_BattleDomeLobby_MapBGEvents: @ 853C108 bg_event 15, 10, 0, 0, 0, BattleFrontier_BattleDomeLobby_EventScript_249E34 BattleFrontier_BattleDomeLobby_MapEvents:: @ 853C138 - map_events BattleFrontier_BattleDomeLobby_MapObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents + map_events BattleFrontier_BattleDomeLobby_EventObjects, BattleFrontier_BattleDomeLobby_MapWarps, 0x0, BattleFrontier_BattleDomeLobby_MapBGEvents diff --git a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc b/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc index 6d8a8abe8..82da39a63 100644 --- a/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleDomePreBattleRoom.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleDomePreBattleRoom_MapObjects: @ 853C188 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 5, 2, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleDomePreBattleRoom_EventObjects: @ 853C188 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 2, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleDomePreBattleRoom_MapWarps: @ 853C1A0 warp_def 6, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST warp_def 7, 8, 3, 1, BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_BattleDomePreBattleRoom_MapEvents:: @ 853C1B0 - map_events BattleFrontier_BattleDomePreBattleRoom_MapObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0 + map_events BattleFrontier_BattleDomePreBattleRoom_EventObjects, BattleFrontier_BattleDomePreBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc b/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc index 65ce8b684..48fd10c07 100644 --- a/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleFactoryBattleRoom.inc @@ -1,13 +1,13 @@ -BattleFrontier_BattleFactoryBattleRoom_MapObjects: @ 853CADC - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleFactoryBattleRoom_EventObjects: @ 853CADC + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 6, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 12, 8, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 object_event 8, 255, 0, 0, 5, 11, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleFactoryBattleRoom_MapEvents:: @ 853CB9C - map_events BattleFrontier_BattleFactoryBattleRoom_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleFactoryBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc b/data/maps/events/BattleFrontier_BattleFactoryLobby.inc index e9f54cb50..8d514f8a0 100644 --- a/data/maps/events/BattleFrontier_BattleFactoryLobby.inc +++ b/data/maps/events/BattleFrontier_BattleFactoryLobby.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattleFactoryLobby_MapObjects: @ 853C9D8 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 13, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_FAT_MAN, 0, 0, 6, 10, 0, 1, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0, 0, 0 +BattleFrontier_BattleFactoryLobby_EventObjects: @ 853C9D8 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585CB, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 3, 11, 0, 2, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258813, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 14, 11, 0, 8, 0, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_25881C, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 13, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258825, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 6, 10, 0, 1, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258830, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 7, 0, 8, 17, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_2585DD, 0, 0, 0 BattleFrontier_BattleFactoryLobby_MapWarps: @ 853CA68 warp_def 9, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_WEST @@ -16,5 +16,5 @@ BattleFrontier_BattleFactoryLobby_MapBGEvents: @ 853CA78 bg_event 9, 4, 0, 0, 0, BattleFrontier_BattleFactoryLobby_EventScript_258839 BattleFrontier_BattleFactoryLobby_MapEvents:: @ 853CA9C - map_events BattleFrontier_BattleFactoryLobby_MapObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents + map_events BattleFrontier_BattleFactoryLobby_EventObjects, BattleFrontier_BattleFactoryLobby_MapWarps, 0x0, BattleFrontier_BattleFactoryLobby_MapBGEvents diff --git a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc index de03d5945..e1a0529fd 100644 --- a/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleFactoryPreBattleRoom.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleFactoryPreBattleRoom_MapObjects: @ 853CAB0 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 12, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleFactoryPreBattleRoom_EventObjects: @ 853CAB0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 12, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleFactoryPreBattleRoom_MapEvents:: @ 853CAC8 - map_events BattleFrontier_BattleFactoryPreBattleRoom_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleFactoryPreBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc b/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc index 1314bbb40..b5fc13838 100644 --- a/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattlePalaceBattleRoom.inc @@ -1,14 +1,14 @@ -BattleFrontier_BattlePalaceBattleRoom_MapObjects: @ 853C4FC - object_event 1, MAP_OBJ_GFX_TRADER, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 1, 4, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_DUSCLOPS, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_AZURILL, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattlePalaceBattleRoom_EventObjects: @ 853C4FC + object_event 1, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 1, 4, 3, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_DUSCLOPS, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_AZURILL, 0, 0, 13, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattlePalaceBattleRoom_MapWarps: @ 853C574 warp_def 0, 9, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR warp_def 1, 9, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_CORRIDOR BattleFrontier_BattlePalaceBattleRoom_MapEvents:: @ 853C584 - map_events BattleFrontier_BattlePalaceBattleRoom_MapObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0 + map_events BattleFrontier_BattlePalaceBattleRoom_EventObjects, BattleFrontier_BattlePalaceBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc b/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc index dc86a54b8..2b6f7f251 100644 --- a/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc +++ b/data/maps/events/BattleFrontier_BattlePalaceCorridor.inc @@ -1,11 +1,11 @@ -BattleFrontier_BattlePalaceCorridor_MapObjects: @ 853C420 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 12, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_AZURILL, 0, 0, 3, 5, 0, 2, 1, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_KIRLIA, 0, 0, 12, 6, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_PIKACHU, 0, 0, 15, 5, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 9, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 0, 13, 9, 0, 1, 16, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_WINGULL, 0, 0, 3, 10, 0, 2, 33, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattlePalaceCorridor_EventObjects: @ 853C420 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 12, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 0, 3, 5, 0, 2, 1, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_KIRLIA, 0, 0, 12, 6, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_PIKACHU, 0, 0, 15, 5, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 9, 0, 14, 32, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 13, 9, 0, 1, 16, 0, 0, 0, 0x0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 3, 10, 0, 2, 33, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8 warp_def 8, 13, 3, 2, BATTLE_FRONTIER_BATTLE_PALACE_LOBBY @@ -14,5 +14,5 @@ BattleFrontier_BattlePalaceCorridor_MapWarps: @ 853C4C8 warp_def 10, 3, 3, 0, BATTLE_FRONTIER_BATTLE_PALACE_BATTLE_ROOM BattleFrontier_BattlePalaceCorridor_MapEvents:: @ 853C4E8 - map_events BattleFrontier_BattlePalaceCorridor_MapObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0 + map_events BattleFrontier_BattlePalaceCorridor_EventObjects, BattleFrontier_BattlePalaceCorridor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc b/data/maps/events/BattleFrontier_BattlePalaceLobby.inc index 890d545ae..318ac3c49 100644 --- a/data/maps/events/BattleFrontier_BattlePalaceLobby.inc +++ b/data/maps/events/BattleFrontier_BattlePalaceLobby.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePalaceLobby_MapObjects: @ 853C340 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 11, 8, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 24, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 18, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 0, 2, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 19, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0, 0, 0 +BattleFrontier_BattlePalaceLobby_EventObjects: @ 853C340 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D944, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 8, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC82, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 24, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC9D, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 18, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC8B, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 0, 2, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DC94, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 19, 6, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24D956, 0, 0, 0 BattleFrontier_BattlePalaceLobby_MapWarps: @ 853C3D0 warp_def 12, 11, 0, 2, BATTLE_FRONTIER_OUTSIDE_EAST @@ -17,5 +17,5 @@ BattleFrontier_BattlePalaceLobby_MapBGEvents: @ 853C3E8 bg_event 10, 4, 0, 0, 0, BattleFrontier_BattlePalaceLobby_EventScript_24DCA6 BattleFrontier_BattlePalaceLobby_MapEvents:: @ 853C40C - map_events BattleFrontier_BattlePalaceLobby_MapObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents + map_events BattleFrontier_BattlePalaceLobby_EventObjects, BattleFrontier_BattlePalaceLobby_MapWarps, 0x0, BattleFrontier_BattlePalaceLobby_MapBGEvents diff --git a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc b/data/maps/events/BattleFrontier_BattlePikeCorridor.inc index 2e6b8ecc7..1960c0d63 100644 --- a/data/maps/events/BattleFrontier_BattlePikeCorridor.inc +++ b/data/maps/events/BattleFrontier_BattlePikeCorridor.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattlePikeCorridor_MapObjects: @ 853CC54 - object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 6, 6, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattlePikeCorridor_EventObjects: @ 853CC54 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 6, 6, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattlePikeCorridor_MapEvents:: @ 853CC6C - map_events BattleFrontier_BattlePikeCorridor_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattlePikeCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePikeLobby.inc b/data/maps/events/BattleFrontier_BattlePikeLobby.inc index 4580d0358..6def28528 100644 --- a/data/maps/events/BattleFrontier_BattlePikeLobby.inc +++ b/data/maps/events/BattleFrontier_BattlePikeLobby.inc @@ -1,8 +1,8 @@ -BattleFrontier_BattlePikeLobby_MapObjects: @ 853CBB0 - object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 5, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 0, 5, 3, 9, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0, 0, 0 +BattleFrontier_BattlePikeLobby_EventObjects: @ 853CBB0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 5, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25B868, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 10, 9, 3, 7, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAAB, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 0, 5, 3, 9, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAB4, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BABD, 0, 0, 0 BattleFrontier_BattlePikeLobby_MapWarps: @ 853CC10 warp_def 5, 12, 0, 0, BATTLE_FRONTIER_OUTSIDE_WEST @@ -14,5 +14,5 @@ BattleFrontier_BattlePikeLobby_MapBGEvents: @ 853CC28 bg_event 1, 3, 0, 0, 0, BattleFrontier_BattlePikeLobby_EventScript_25BAC6 BattleFrontier_BattlePikeLobby_MapEvents:: @ 853CC40 - map_events BattleFrontier_BattlePikeLobby_MapObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents + map_events BattleFrontier_BattlePikeLobby_EventObjects, BattleFrontier_BattlePikeLobby_MapWarps, 0x0, BattleFrontier_BattlePikeLobby_MapBGEvents diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc index c7c3a36d0..03e0a15e4 100644 --- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc +++ b/data/maps/events/BattleFrontier_BattlePikeRandomRoom1.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattlePikeRandomRoom1_MapObjects: @ 853CD54 - object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 4, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TRADER, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0, 0, 0 +BattleFrontier_BattlePikeRandomRoom1_EventObjects: @ 853CD54 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 4, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TRADER, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_25D88D, 0, 0, 0 BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84 coord_event 4, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C40A2 @@ -12,5 +12,5 @@ BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents: @ 853CD84 coord_event 5, 7, 3, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeRandomRoom1_EventScript_2C408D BattleFrontier_BattlePikeRandomRoom1_MapEvents:: @ 853CDF4 - map_events BattleFrontier_BattlePikeRandomRoom1_MapObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0 + map_events BattleFrontier_BattlePikeRandomRoom1_EventObjects, 0x0, BattleFrontier_BattlePikeRandomRoom1_MapCoordEvents, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc b/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc index 078882617..69c213606 100644 --- a/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc +++ b/data/maps/events/BattleFrontier_BattlePikeRandomRoom2.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattlePikeRandomRoom2_MapObjects: @ 853CE08 - object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 2, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattlePikeRandomRoom2_EventObjects: @ 853CE08 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 2, 4, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattlePikeRandomRoom2_MapEvents:: @ 853CE20 - map_events BattleFrontier_BattlePikeRandomRoom2_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattlePikeRandomRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc b/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc index 7894ab85a..f2bca38c1 100644 --- a/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc +++ b/data/maps/events/BattleFrontier_BattlePikeThreePathRoom.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattlePikeThreePathRoom_MapObjects: @ 853CC80 - object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 4, 10, 3, 10, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_6, 0, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0, 0, 0 +BattleFrontier_BattlePikeThreePathRoom_EventObjects: @ 853CC80 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 4, 10, 3, 10, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25C908, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 8, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_25CABB, 0, 0, 0 BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 coord_event 2, 3, 3, 0, VAR_TEMP_1, 0, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C3F4E @@ -14,5 +14,5 @@ BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents: @ 853CCB0 coord_event 7, 10, 0, 0, VAR_TEMP_3, 1, 0, BattleFrontier_BattlePikeThreePathRoom_EventScript_2C406D BattleFrontier_BattlePikeThreePathRoom_MapEvents:: @ 853CD40 - map_events BattleFrontier_BattlePikeThreePathRoom_MapObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0 + map_events BattleFrontier_BattlePikeThreePathRoom_EventObjects, 0x0, BattleFrontier_BattlePikeThreePathRoom_MapCoordEvents, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc b/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc index 5e5a23fa4..63e7f2acd 100644 --- a/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc +++ b/data/maps/events/BattleFrontier_BattlePointExchangeServiceCorner.inc @@ -1,13 +1,13 @@ -BattleFrontier_BattlePointExchangeServiceCorner_MapObjects: @ 853D018 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 4, 4, 0, 9, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_4, 0, 0, 0, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SAILOR, 0, 0, 14, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 1, 9, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_TEALA, 0, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_TEALA, 0, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_TEALA, 0, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_GIRL_1, 0, 0, 12, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0, 0, 0 +BattleFrontier_BattlePointExchangeServiceCorner_EventObjects: @ 853D018 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 4, 4, 0, 9, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F173, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 0, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7E8, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7DD, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 0, 14, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7D4, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 1, 9, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7CB, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F37C, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_TEALA, 0, 0, 9, 5, 0, 8, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F49F, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 4, 0, 10, 0, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F5F0, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_GIRL_1, 0, 0, 12, 10, 0, 2, 17, 0, 0, 0, BattleFrontier_BattlePointExchangeServiceCorner_EventScript_25F7F1, 0, 0, 0 BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0 warp_def 7, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST @@ -15,5 +15,5 @@ BattleFrontier_BattlePointExchangeServiceCorner_MapWarps: @ 853D0F0 warp_def 8, 10, 0, 6, BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_BattlePointExchangeServiceCorner_MapEvents:: @ 853D108 - map_events BattleFrontier_BattlePointExchangeServiceCorner_MapObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0 + map_events BattleFrontier_BattlePointExchangeServiceCorner_EventObjects, BattleFrontier_BattlePointExchangeServiceCorner_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc b/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc index aba4f907d..7d531b54b 100644 --- a/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc +++ b/data/maps/events/BattleFrontier_BattlePyramidEmptySquare.inc @@ -1,21 +1,21 @@ -BattleFrontier_BattlePyramidEmptySquare_MapObjects: @ 853C62C - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 0, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattlePyramidEmptySquare_EventObjects: @ 853C62C + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 0, 0, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 0, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 0, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 0, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 1, 1, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 3, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 4, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 1, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattlePyramidEmptySquare_MapEvents:: @ 853C7AC - map_events BattleFrontier_BattlePyramidEmptySquare_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattlePyramidEmptySquare_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc b/data/maps/events/BattleFrontier_BattlePyramidLobby.inc index eb56352ed..fccb4abff 100644 --- a/data/maps/events/BattleFrontier_BattlePyramidLobby.inc +++ b/data/maps/events/BattleFrontier_BattlePyramidLobby.inc @@ -1,8 +1,8 @@ -BattleFrontier_BattlePyramidLobby_MapObjects: @ 853C598 - object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 7, 12, 4, 8, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 14, 13, 4, 9, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 0, 2, 15, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_FAT_MAN, 0, 0, 12, 16, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0, 0, 0 +BattleFrontier_BattlePyramidLobby_EventObjects: @ 853C598 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 7, 12, 4, 8, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_2508B1, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 14, 13, 4, 9, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250ACE, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 2, 15, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E83, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 16, 4, 2, 17, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E8C, 0, 0, 0 BattleFrontier_BattlePyramidLobby_MapWarps: @ 853C5F8 warp_def 7, 17, 4, 3, BATTLE_FRONTIER_OUTSIDE_EAST @@ -12,5 +12,5 @@ BattleFrontier_BattlePyramidLobby_MapBGEvents: @ 853C600 bg_event 1, 12, 0, 0, 0, BattleFrontier_BattlePyramidLobby_EventScript_250E95 BattleFrontier_BattlePyramidLobby_MapEvents:: @ 853C618 - map_events BattleFrontier_BattlePyramidLobby_MapObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents + map_events BattleFrontier_BattlePyramidLobby_EventObjects, BattleFrontier_BattlePyramidLobby_MapWarps, 0x0, BattleFrontier_BattlePyramidLobby_MapBGEvents diff --git a/data/maps/events/BattleFrontier_BattlePyramidTop.inc b/data/maps/events/BattleFrontier_BattlePyramidTop.inc index 79e4770ea..a6ca1adea 100644 --- a/data/maps/events/BattleFrontier_BattlePyramidTop.inc +++ b/data/maps/events/BattleFrontier_BattlePyramidTop.inc @@ -1,10 +1,10 @@ -BattleFrontier_BattlePyramidTop_MapObjects: @ 853C7C0 - object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 17, 11, 6, 8, 17, 0, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BRANDON, 0, 0, 17, 7, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattlePyramidTop_EventObjects: @ 853C7C0 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 17, 11, 6, 8, 17, 0, 0, 3, BattleFrontier_BattlePyramidTop_EventScript_2551D0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BRANDON, 0, 0, 17, 7, 0, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattlePyramidTop_MapCoordEvents: @ 853C7F0 coord_event 17, 9, 4, 0, VAR_TEMP_2, 0, 0, BattleFrontier_BattlePyramidTop_EventScript_255256 BattleFrontier_BattlePyramidTop_MapEvents:: @ 853C800 - map_events BattleFrontier_BattlePyramidTop_MapObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0 + map_events BattleFrontier_BattlePyramidTop_EventObjects, 0x0, BattleFrontier_BattlePyramidTop_MapCoordEvents, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc b/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc index c9b46f8ca..af9677524 100644 --- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleTowerBattleRoom.inc @@ -1,12 +1,12 @@ -BattleFrontier_BattleTowerBattleRoom_MapObjects: @ 853B7D0 - object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleTowerBattleRoom_EventObjects: @ 853B7D0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleTowerBattleRoom_MapWarps: @ 853B818 warp_def 5, 8, 0, 2, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY warp_def 6, 8, 0, 2, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY BattleFrontier_BattleTowerBattleRoom_MapEvents:: @ 853B828 - map_events BattleFrontier_BattleTowerBattleRoom_MapObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0 + map_events BattleFrontier_BattleTowerBattleRoom_EventObjects, BattleFrontier_BattleTowerBattleRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc b/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc index afab09840..2d8dcaa07 100644 --- a/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc +++ b/data/maps/events/BattleFrontier_BattleTowerBattleRoom2.inc @@ -1,11 +1,11 @@ -BattleFrontier_BattleTowerBattleRoom2_MapObjects: @ 853BFC4 - object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_TRADER, 0, 0, 4, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0 +BattleFrontier_BattleTowerBattleRoom2_EventObjects: @ 853BFC4 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 1, 3, 8, 0, 0, 0, 0, 0x0, 888, 0, 0 object_event 5, 255, 0, 0, 4, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 6, 254, 0, 0, 5, 8, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleTowerBattleRoom2_MapEvents:: @ 853C054 - map_events BattleFrontier_BattleTowerBattleRoom2_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleTowerBattleRoom2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc b/data/maps/events/BattleFrontier_BattleTowerCorridor.inc index 75d51fb28..a363801f0 100644 --- a/data/maps/events/BattleFrontier_BattleTowerCorridor.inc +++ b/data/maps/events/BattleFrontier_BattleTowerCorridor.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleTowerCorridor_MapObjects: @ 853B7A4 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleTowerCorridor_EventObjects: @ 853B7A4 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleTowerCorridor_MapEvents:: @ 853B7BC - map_events BattleFrontier_BattleTowerCorridor_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleTowerCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc b/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc index 083b877ab..c2f1e30bf 100644 --- a/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc +++ b/data/maps/events/BattleFrontier_BattleTowerCorridor2.inc @@ -1,9 +1,9 @@ -BattleFrontier_BattleTowerCorridor2_MapObjects: @ 853BF50 +BattleFrontier_BattleTowerCorridor2_EventObjects: @ 853BF50 object_event 1, 255, 0, 0, 1, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 14, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 1, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 14, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 3, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 object_event 4, 254, 0, 0, 14, 1, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleTowerCorridor2_MapEvents:: @ 853BFB0 - map_events BattleFrontier_BattleTowerCorridor2_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleTowerCorridor2_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerElevator.inc b/data/maps/events/BattleFrontier_BattleTowerElevator.inc index 4f2a32d89..a4dbc6afa 100644 --- a/data/maps/events/BattleFrontier_BattleTowerElevator.inc +++ b/data/maps/events/BattleFrontier_BattleTowerElevator.inc @@ -1,6 +1,6 @@ -BattleFrontier_BattleTowerElevator_MapObjects: @ 853B778 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_BattleTowerElevator_EventObjects: @ 853B778 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_BattleTowerElevator_MapEvents:: @ 853B790 - map_events BattleFrontier_BattleTowerElevator_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleTowerElevator_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_BattleTowerLobby.inc b/data/maps/events/BattleFrontier_BattleTowerLobby.inc index 35f6e6bca..2faa6a413 100644 --- a/data/maps/events/BattleFrontier_BattleTowerLobby.inc +++ b/data/maps/events/BattleFrontier_BattleTowerLobby.inc @@ -1,13 +1,13 @@ -BattleFrontier_BattleTowerLobby_MapObjects: @ 853B638 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 17, 8, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_1, 0, 0, 15, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 0, 11, 9, 3, 10, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918, 0, 0 - object_event 6, MAP_OBJ_GFX_HIPSTER, 0, 0, 1, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701, 0, 0 - object_event 7, MAP_OBJ_GFX_TEALA, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_TEALA, 0, 0, 14, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_TEALA, 0, 0, 18, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0, 0, 0 +BattleFrontier_BattleTowerLobby_EventObjects: @ 853B638 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23E936, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EEE7, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 17, 8, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFB5, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 0, 15, 9, 3, 2, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EFBE, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 11, 9, 3, 10, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_28CB96, 918, 0, 0 + object_event 6, EVENT_OBJ_GFX_HIPSTER, 0, 0, 1, 5, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_2B688D, 701, 0, 0 + object_event 7, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EA9F, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_TEALA, 0, 0, 14, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23EC08, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_TEALA, 0, 0, 18, 5, 3, 8, 0, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23ED74, 0, 0, 0 BattleFrontier_BattleTowerLobby_MapWarps: @ 853B710 warp_def 12, 9, 3, 0, BATTLE_FRONTIER_OUTSIDE_EAST @@ -22,5 +22,5 @@ BattleFrontier_BattleTowerLobby_MapBGEvents: @ 853B728 bg_event 2, 1, 0, 0, 0, BattleFrontier_BattleTowerLobby_EventScript_23F4BE BattleFrontier_BattleTowerLobby_MapEvents:: @ 853B764 - map_events BattleFrontier_BattleTowerLobby_MapObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents + map_events BattleFrontier_BattleTowerLobby_EventObjects, BattleFrontier_BattleTowerLobby_MapWarps, 0x0, BattleFrontier_BattleTowerLobby_MapBGEvents diff --git a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc index 0292088de..3d2bb6127 100644 --- a/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc +++ b/data/maps/events/BattleFrontier_BattleTowerMultiBattleRoom.inc @@ -1,14 +1,14 @@ -BattleFrontier_BattleTowerMultiBattleRoom_MapObjects: @ 853BE64 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 2, 10, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 17, 11, 3, 14, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 10, 11, 3, 7, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 13, 10, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716, 0, 0 +BattleFrontier_BattleTowerMultiBattleRoom_EventObjects: @ 853BE64 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 2, 10, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29, 711, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 17, 11, 3, 14, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB, 712, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244008, 713, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244015, 714, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 10, 11, 3, 7, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244022, 715, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 13, 10, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24402F, 716, 0, 0 object_event 8, 246, 0, 0, 15, 13, 3, 15, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_24403C, 864, 0, 0 object_event 9, 247, 0, 0, 4, 12, 3, 10, 17, 0, 0, 0, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_244049, 865, 0, 0 BattleFrontier_BattleTowerMultiBattleRoom_MapEvents:: @ 853BF3C - map_events BattleFrontier_BattleTowerMultiBattleRoom_MapObjects, 0x0, 0x0, 0x0 + map_events BattleFrontier_BattleTowerMultiBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge1.inc b/data/maps/events/BattleFrontier_Lounge1.inc index 748d86b6c..b00838290 100644 --- a/data/maps/events/BattleFrontier_Lounge1.inc +++ b/data/maps/events/BattleFrontier_Lounge1.inc @@ -1,11 +1,11 @@ -BattleFrontier_Lounge1_MapObjects: @ 853CFB4 - object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 0, 6, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_3, 0, 0, 7, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 4, 0, 2, 18, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0, 0, 0 +BattleFrontier_Lounge1_EventObjects: @ 853CFB4 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 0, 6, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E775, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 0, 7, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E94D, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 4, 0, 2, 18, 0, 0, 0, BattleFrontier_Lounge1_EventScript_25E956, 0, 0, 0 BattleFrontier_Lounge1_MapWarps: @ 853CFFC warp_def 4, 9, 0, 5, BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge1_MapEvents:: @ 853D004 - map_events BattleFrontier_Lounge1_MapObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Lounge1_EventObjects, BattleFrontier_Lounge1_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge2.inc b/data/maps/events/BattleFrontier_Lounge2.inc index c31e86ab6..0370b2a18 100644 --- a/data/maps/events/BattleFrontier_Lounge2.inc +++ b/data/maps/events/BattleFrontier_Lounge2.inc @@ -1,14 +1,14 @@ -BattleFrontier_Lounge2_MapObjects: @ 853D11C - object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 4, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0, 0, 0 +BattleFrontier_Lounge2_EventObjects: @ 853D11C + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260643, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26073C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260747, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 4, 6, 0, 2, 33, 0, 0, 0, BattleFrontier_Lounge2_EventScript_26075D, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge2_EventScript_260752, 0, 0, 0 BattleFrontier_Lounge2_MapWarps: @ 853D194 warp_def 1, 7, 0, 3, BATTLE_FRONTIER_OUTSIDE_WEST warp_def 2, 7, 0, 3, BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_Lounge2_MapEvents:: @ 853D1A4 - map_events BattleFrontier_Lounge2_MapObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Lounge2_EventObjects, BattleFrontier_Lounge2_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge3.inc b/data/maps/events/BattleFrontier_Lounge3.inc index 0655cea90..6349cd381 100644 --- a/data/maps/events/BattleFrontier_Lounge3.inc +++ b/data/maps/events/BattleFrontier_Lounge3.inc @@ -1,13 +1,13 @@ -BattleFrontier_Lounge3_MapObjects: @ 853D1B8 - object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 4, 6, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 5, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 6, 0, 2, 48, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0, 0, 0 +BattleFrontier_Lounge3_EventObjects: @ 853D1B8 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 6, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261D83, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 0, 8, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FE1, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FC1, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FD1, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 0, 6, 0, 2, 48, 0, 0, 0, BattleFrontier_Lounge3_EventScript_261FB8, 0, 0, 0 BattleFrontier_Lounge3_MapWarps: @ 853D230 warp_def 4, 9, 0, 9, BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge3_MapEvents:: @ 853D238 - map_events BattleFrontier_Lounge3_MapObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Lounge3_EventObjects, BattleFrontier_Lounge3_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge4.inc b/data/maps/events/BattleFrontier_Lounge4.inc index ae4e7c4b7..2076facee 100644 --- a/data/maps/events/BattleFrontier_Lounge4.inc +++ b/data/maps/events/BattleFrontier_Lounge4.inc @@ -1,11 +1,11 @@ -BattleFrontier_Lounge4_MapObjects: @ 853D24C - object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 4, 4, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_COOK, 0, 0, 6, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 0, 5, 0, 10, 18, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0, 0, 0 +BattleFrontier_Lounge4_EventObjects: @ 853D24C + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 4, 4, 0, 7, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26358D, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_COOK, 0, 0, 6, 6, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge4_EventScript_263596, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 0, 5, 0, 10, 18, 0, 0, 0, BattleFrontier_Lounge4_EventScript_26359F, 0, 0, 0 BattleFrontier_Lounge4_MapWarps: @ 853D294 warp_def 4, 9, 0, 6, BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_Lounge4_MapEvents:: @ 853D29C - map_events BattleFrontier_Lounge4_MapObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Lounge4_EventObjects, BattleFrontier_Lounge4_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge5.inc b/data/maps/events/BattleFrontier_Lounge5.inc index cc8759d1d..a8e5f97f5 100644 --- a/data/maps/events/BattleFrontier_Lounge5.inc +++ b/data/maps/events/BattleFrontier_Lounge5.inc @@ -1,13 +1,13 @@ -BattleFrontier_Lounge5_MapObjects: @ 853D2EC - object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 12, 4, 4, 9, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 0, 4, 3, 10, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 11, 7, 0, 1, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0, 0, 0 +BattleFrontier_Lounge5_EventObjects: @ 853D2EC + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 12, 4, 4, 9, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_2645C6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 0, 4, 3, 10, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264617, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264620, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 11, 7, 0, 1, 17, 0, 0, 0, BattleFrontier_Lounge5_EventScript_264629, 0, 0, 0 BattleFrontier_Lounge5_MapWarps: @ 853D34C warp_def 1, 7, 0, 7, BATTLE_FRONTIER_OUTSIDE_EAST warp_def 2, 7, 0, 7, BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge5_MapEvents:: @ 853D35C - map_events BattleFrontier_Lounge5_MapObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Lounge5_EventObjects, BattleFrontier_Lounge5_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge6.inc b/data/maps/events/BattleFrontier_Lounge6.inc index b2aa2b93f..be0db4f08 100644 --- a/data/maps/events/BattleFrontier_Lounge6.inc +++ b/data/maps/events/BattleFrontier_Lounge6.inc @@ -1,9 +1,9 @@ -BattleFrontier_Lounge6_MapObjects: @ 853D370 - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0, 0, 0 +BattleFrontier_Lounge6_EventObjects: @ 853D370 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge6_EventScript_264FED, 0, 0, 0 BattleFrontier_Lounge6_MapWarps: @ 853D388 warp_def 4, 9, 0, 8, BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge6_MapEvents:: @ 853D390 - map_events BattleFrontier_Lounge6_MapObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Lounge6_EventObjects, BattleFrontier_Lounge6_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge7.inc b/data/maps/events/BattleFrontier_Lounge7.inc index 43cb50ddf..b4e6cc5eb 100644 --- a/data/maps/events/BattleFrontier_Lounge7.inc +++ b/data/maps/events/BattleFrontier_Lounge7.inc @@ -1,12 +1,12 @@ -BattleFrontier_Lounge7_MapObjects: @ 853D3A4 - object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 0, 7, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 8, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0, 0, 0 +BattleFrontier_Lounge7_EventObjects: @ 853D3A4 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 0, 7, 0, 2, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656DB, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 5, 0, 10, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265255, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_265445, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 8, 3, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge7_EventScript_2656E4, 0, 0, 0 BattleFrontier_Lounge7_MapWarps: @ 853D404 warp_def 4, 9, 0, 7, BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_Lounge7_MapEvents:: @ 853D40C - map_events BattleFrontier_Lounge7_MapObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Lounge7_EventObjects, BattleFrontier_Lounge7_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge8.inc b/data/maps/events/BattleFrontier_Lounge8.inc index 0420a702f..99aa3333c 100644 --- a/data/maps/events/BattleFrontier_Lounge8.inc +++ b/data/maps/events/BattleFrontier_Lounge8.inc @@ -1,11 +1,11 @@ -BattleFrontier_Lounge8_MapObjects: @ 853D4BC - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 5, 0, 2, 34, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 7, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0, 0, 0 +BattleFrontier_Lounge8_EventObjects: @ 853D4BC + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 5, 0, 2, 34, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676DC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 7, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676CA, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_Lounge8_EventScript_2676D3, 0, 0, 0 BattleFrontier_Lounge8_MapWarps: @ 853D504 warp_def 4, 9, 0, 10, BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge8_MapEvents:: @ 853D50C - map_events BattleFrontier_Lounge8_MapObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Lounge8_EventObjects, BattleFrontier_Lounge8_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Lounge9.inc b/data/maps/events/BattleFrontier_Lounge9.inc index ff96fc94f..7c478fabe 100644 --- a/data/maps/events/BattleFrontier_Lounge9.inc +++ b/data/maps/events/BattleFrontier_Lounge9.inc @@ -1,10 +1,10 @@ -BattleFrontier_Lounge9_MapObjects: @ 853D520 - object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 6, 3, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 +BattleFrontier_Lounge9_EventObjects: @ 853D520 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 6, 3, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 BattleFrontier_Lounge9_MapWarps: @ 853D538 warp_def 1, 9, 0, 11, BATTLE_FRONTIER_OUTSIDE_EAST warp_def 2, 9, 0, 11, BATTLE_FRONTIER_OUTSIDE_EAST BattleFrontier_Lounge9_MapEvents:: @ 853D548 - map_events BattleFrontier_Lounge9_MapObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Lounge9_EventObjects, BattleFrontier_Lounge9_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_Mart.inc b/data/maps/events/BattleFrontier_Mart.inc index 5ce69f2ee..969b54855 100644 --- a/data/maps/events/BattleFrontier_Mart.inc +++ b/data/maps/events/BattleFrontier_Mart.inc @@ -1,13 +1,13 @@ -BattleFrontier_Mart_MapObjects: @ 853D68C - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 8, 4, 3, 9, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0, 0, 0 +BattleFrontier_Mart_EventObjects: @ 853D68C + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267ACC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B0B, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B02, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 8, 4, 3, 9, 0, 0, 0, 0, BattleFrontier_Mart_EventScript_267B20, 0, 0, 0 BattleFrontier_Mart_MapWarps: @ 853D6EC warp_def 3, 7, 0, 4, BATTLE_FRONTIER_OUTSIDE_WEST warp_def 4, 7, 0, 4, BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_Mart_MapEvents:: @ 853D6FC - map_events BattleFrontier_Mart_MapObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0 + map_events BattleFrontier_Mart_EventObjects, BattleFrontier_Mart_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_OutsideEast.inc b/data/maps/events/BattleFrontier_OutsideEast.inc index a99a7fcf0..3d7c53493 100644 --- a/data/maps/events/BattleFrontier_OutsideEast.inc +++ b/data/maps/events/BattleFrontier_OutsideEast.inc @@ -1,30 +1,30 @@ -BattleFrontier_OutsideEast_MapObjects: @ 853BB10 - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 20, 17, 0, 27, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 42, 15, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_HIKER, 0, 0, 53, 6, 0, 8, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 54, 16, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 37, 32, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_COOK, 0, 0, 41, 56, 3, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 46, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 34, 41, 0, 28, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BOY_4, 0, 0, 45, 47, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 59, 35, 0, 26, 97, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 18, 40, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_MAN_1, 0, 0, 17, 40, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 40, 56, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_SUDOWOODO, 0, 0, 54, 62, 3, 8, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842, 0, 0 - object_event 15, MAP_OBJ_GFX_MANIAC, 0, 0, 42, 34, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_GIRL_3, 0, 0, 51, 53, 3, 2, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 62, 18, 0, 46, 98, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_MAN_4, 0, 0, 11, 21, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_WOMAN_7, 0, 0, 10, 21, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_WOMAN_7, 0, 0, 16, 30, 0, 2, 35, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 33, 14, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_MANIAC, 0, 0, 54, 31, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0, 0, 0 - object_event 23, MAP_OBJ_GFX_WOMAN_5, 0, 0, 54, 32, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 58, 55, 3, 17, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 48, 41, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_CAMPER, 0, 0, 29, 14, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0, 0, 0 +BattleFrontier_OutsideEast_EventObjects: @ 853BB10 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 20, 17, 0, 27, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C67, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 42, 15, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C70, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 0, 53, 6, 0, 8, 2, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C79, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 54, 16, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C82, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 37, 32, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C8B, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_COOK, 0, 0, 41, 56, 3, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C94, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 46, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CBB, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 34, 41, 0, 28, 19, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CE1, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BOY_4, 0, 0, 45, 47, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CB2, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 59, 35, 0, 26, 97, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CC4, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 18, 40, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CCD, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_MAN_1, 0, 0, 17, 40, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CD6, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 40, 56, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242C9F, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_SUDOWOODO, 0, 0, 54, 62, 3, 8, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242CEA, 842, 0, 0 + object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 0, 42, 34, 3, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D79, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_GIRL_3, 0, 0, 51, 53, 3, 2, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D82, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 62, 18, 0, 46, 98, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D8B, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 21, 0, 1, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D94, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 10, 21, 0, 10, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242D9D, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 16, 30, 0, 2, 35, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DA6, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 33, 14, 0, 7, 0, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DAF, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 0, 54, 31, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DB8, 0, 0, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 54, 32, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DC3, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 58, 55, 3, 17, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE9, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 48, 41, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242DE0, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_CAMPER, 0, 0, 29, 14, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_242E08, 0, 0, 0 BattleFrontier_OutsideEast_MapWarps: @ 853BD80 warp_def 16, 14, 0, 0, BATTLE_FRONTIER_BATTLE_TOWER_LOBBY @@ -53,5 +53,5 @@ BattleFrontier_OutsideEast_MapBGEvents: @ 853BDF0 bg_event 5, 51, 0, 0, 0, BattleFrontier_OutsideEast_EventScript_271E73 BattleFrontier_OutsideEast_MapEvents:: @ 853BE50 - map_events BattleFrontier_OutsideEast_MapObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents + map_events BattleFrontier_OutsideEast_EventObjects, BattleFrontier_OutsideEast_MapWarps, 0x0, BattleFrontier_OutsideEast_MapBGEvents diff --git a/data/maps/events/BattleFrontier_OutsideWest.inc b/data/maps/events/BattleFrontier_OutsideWest.inc index e6f2eef7d..7923af813 100644 --- a/data/maps/events/BattleFrontier_OutsideWest.inc +++ b/data/maps/events/BattleFrontier_OutsideWest.inc @@ -1,28 +1,28 @@ -BattleFrontier_OutsideWest_MapObjects: @ 853B350 - object_event 1, MAP_OBJ_GFX_BOY_2, 0, 0, 26, 38, 0, 2, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 20, 70, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 0, 19, 68, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 20, 0, 5, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_4, 0, 0, 27, 30, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_7, 0, 0, 33, 41, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_FAT_MAN, 0, 0, 28, 43, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 17, 20, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MANIAC, 0, 0, 13, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_MANIAC, 0, 0, 14, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_MAN_6, 0, 0, 23, 47, 0, 15, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_GIRL_1, 0, 0, 38, 27, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_WOMAN_4, 0, 0, 45, 18, 0, 3, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_CAMPER, 0, 0, 9, 47, 0, 15, 33, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_LASS, 0, 0, 35, 5, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_MAN_2, 0, 0, 11, 66, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_FISHERMAN, 0, 0, 31, 31, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_FISHERMAN, 0, 0, 42, 48, 0, 18, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_FAT_MAN, 0, 0, 38, 22, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_WOMAN_3, 0, 0, 12, 9, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_BOY_1, 0, 0, 12, 10, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 10, 0, 23, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0, 0, 0 - object_event 23, MAP_OBJ_GFX_MAN_5, 0, 0, 8, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 26, 0, 24, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0, 0, 0 +BattleFrontier_OutsideWest_EventObjects: @ 853B350 + object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 0, 26, 38, 0, 2, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D50F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 20, 70, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 0, 19, 68, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D3F0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 20, 0, 5, 8, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D68B, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 27, 30, 0, 2, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D52D, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 33, 41, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D69D, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 28, 43, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6A6, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 17, 20, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D679, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 0, 13, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D536, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 0, 14, 44, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D53D, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 0, 23, 47, 0, 15, 34, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D694, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_GIRL_1, 0, 0, 38, 27, 0, 2, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D5C6, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 45, 18, 0, 3, 49, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D635, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 0, 9, 47, 0, 15, 33, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D57F, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_LASS, 0, 0, 35, 5, 0, 2, 18, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D682, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_MAN_2, 0, 0, 11, 66, 0, 9, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_249E19, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 31, 31, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D667, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 42, 48, 0, 18, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D518, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 38, 22, 0, 3, 48, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6AF, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 12, 9, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6B8, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_BOY_1, 0, 0, 12, 10, 0, 7, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6C3, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 10, 0, 23, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6CE, 0, 0, 0 + object_event 23, EVENT_OBJ_GFX_MAN_5, 0, 0, 8, 5, 0, 8, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6D7, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 26, 0, 24, 17, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_23D6EE, 0, 0, 0 BattleFrontier_OutsideWest_MapWarps: @ 853B590 warp_def 42, 27, 0, 0, BATTLE_FRONTIER_BATTLE_PIKE_LOBBY @@ -45,5 +45,5 @@ BattleFrontier_OutsideWest_MapBGEvents: @ 853B5E8 bg_event 53, 51, 0, 0, 0, BattleFrontier_OutsideWest_EventScript_271E6A BattleFrontier_OutsideWest_MapEvents:: @ 853B624 - map_events BattleFrontier_OutsideWest_MapObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents + map_events BattleFrontier_OutsideWest_EventObjects, BattleFrontier_OutsideWest_MapWarps, 0x0, BattleFrontier_OutsideWest_MapBGEvents diff --git a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc b/data/maps/events/BattleFrontier_PokemonCenter_1F.inc index 0a8974135..262744ce1 100644 --- a/data/maps/events/BattleFrontier_PokemonCenter_1F.inc +++ b/data/maps/events/BattleFrontier_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ -BattleFrontier_PokemonCenter_1F_MapObjects: @ 853D55C - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 4, 5, 3, 14, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 11, 4, 3, 8, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SKITTY, 0, 0, 1, 3, 3, 10, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0, 0, 0 +BattleFrontier_PokemonCenter_1F_EventObjects: @ 853D55C + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267908, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 4, 5, 3, 14, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267916, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 4, 3, 8, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_26791F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267928, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SKITTY, 0, 0, 1, 3, 3, 10, 1, 0, 0, 0, BattleFrontier_PokemonCenter_1F_EventScript_267931, 0, 0, 0 BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4 warp_def 7, 8, 3, 12, BATTLE_FRONTIER_OUTSIDE_EAST @@ -11,5 +11,5 @@ BattleFrontier_PokemonCenter_1F_MapWarps: @ 853D5D4 warp_def 1, 6, 4, 0, BATTLE_FRONTIER_POKEMON_CENTER_2F BattleFrontier_PokemonCenter_1F_MapEvents:: @ 853D5EC - map_events BattleFrontier_PokemonCenter_1F_MapObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0 + map_events BattleFrontier_PokemonCenter_1F_EventObjects, BattleFrontier_PokemonCenter_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc b/data/maps/events/BattleFrontier_PokemonCenter_2F.inc index 44d40453f..f9d9d408a 100644 --- a/data/maps/events/BattleFrontier_PokemonCenter_2F.inc +++ b/data/maps/events/BattleFrontier_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -BattleFrontier_PokemonCenter_2F_MapObjects: @ 853D600 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +BattleFrontier_PokemonCenter_2F_EventObjects: @ 853D600 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, BattleFrontier_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660 warp_def 1, 6, 4, 2, BATTLE_FRONTIER_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ BattleFrontier_PokemonCenter_2F_MapWarps: @ 853D660 warp_def 9, 1, 3, 0, TRADE_CENTER BattleFrontier_PokemonCenter_2F_MapEvents:: @ 853D678 - map_events BattleFrontier_PokemonCenter_2F_MapObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0 + map_events BattleFrontier_PokemonCenter_2F_EventObjects, BattleFrontier_PokemonCenter_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_RankingHall.inc b/data/maps/events/BattleFrontier_RankingHall.inc index 853f83ab7..81058b042 100644 --- a/data/maps/events/BattleFrontier_RankingHall.inc +++ b/data/maps/events/BattleFrontier_RankingHall.inc @@ -1,7 +1,7 @@ -BattleFrontier_RankingHall_MapObjects: @ 853CEB8 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 24, 13, 3, 8, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_3, 0, 0, 44, 11, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0, 0, 0 +BattleFrontier_RankingHall_EventObjects: @ 853CEB8 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 24, 13, 3, 8, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E52F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 4, 10, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E54A, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 0, 44, 11, 3, 2, 17, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E573, 0, 0, 0 BattleFrontier_RankingHall_MapWarps: @ 853CF00 warp_def 26, 14, 3, 4, BATTLE_FRONTIER_OUTSIDE_EAST @@ -22,5 +22,5 @@ BattleFrontier_RankingHall_MapBGEvents: @ 853CF10 bg_event 36, 8, 0, 0, 0, BattleFrontier_RankingHall_EventScript_25E541 BattleFrontier_RankingHall_MapEvents:: @ 853CFA0 - map_events BattleFrontier_RankingHall_MapObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents + map_events BattleFrontier_RankingHall_EventObjects, BattleFrontier_RankingHall_MapWarps, 0x0, BattleFrontier_RankingHall_MapBGEvents diff --git a/data/maps/events/BattleFrontier_ReceptionGate.inc b/data/maps/events/BattleFrontier_ReceptionGate.inc index 641723257..8984c44a0 100644 --- a/data/maps/events/BattleFrontier_ReceptionGate.inc +++ b/data/maps/events/BattleFrontier_ReceptionGate.inc @@ -1,14 +1,14 @@ -BattleFrontier_ReceptionGate_MapObjects: @ 853D420 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 8, 11, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_2, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SCOTT, 0, 0, 4, 5, 3, 8, 17, 0, 0, 0, 0x0, 836, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0, 0, 0 +BattleFrontier_ReceptionGate_EventObjects: @ 853D420 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 11, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2662FC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 8, 11, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266310, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_2, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_266436, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 0, 4, 5, 3, 8, 17, 0, 0, 0, 0x0, 836, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 0, 4, 0, 10, 17, 0, 0, 0, BattleFrontier_ReceptionGate_EventScript_2664F4, 0, 0, 0 BattleFrontier_ReceptionGate_MapWarps: @ 853D498 warp_def 4, 13, 0, 8, BATTLE_FRONTIER_OUTSIDE_WEST warp_def 4, 1, 0, 9, BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_ReceptionGate_MapEvents:: @ 853D4A8 - map_events BattleFrontier_ReceptionGate_MapObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0 + map_events BattleFrontier_ReceptionGate_EventObjects, BattleFrontier_ReceptionGate_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattleFrontier_ScottsHouse.inc b/data/maps/events/BattleFrontier_ScottsHouse.inc index fd9f2f522..4ea329ab9 100644 --- a/data/maps/events/BattleFrontier_ScottsHouse.inc +++ b/data/maps/events/BattleFrontier_ScottsHouse.inc @@ -1,10 +1,10 @@ -BattleFrontier_ScottsHouse_MapObjects: @ 853D2B0 - object_event 1, MAP_OBJ_GFX_SCOTT, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0, 0, 0 +BattleFrontier_ScottsHouse_EventObjects: @ 853D2B0 + object_event 1, EVENT_OBJ_GFX_SCOTT, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, BattleFrontier_ScottsHouse_EventScript_2636A8, 0, 0, 0 BattleFrontier_ScottsHouse_MapWarps: @ 853D2C8 warp_def 2, 7, 3, 5, BATTLE_FRONTIER_OUTSIDE_WEST warp_def 3, 7, 3, 5, BATTLE_FRONTIER_OUTSIDE_WEST BattleFrontier_ScottsHouse_MapEvents:: @ 853D2D8 - map_events BattleFrontier_ScottsHouse_MapObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0 + map_events BattleFrontier_ScottsHouse_EventObjects, BattleFrontier_ScottsHouse_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare01.inc b/data/maps/events/BattlePyramidSquare01.inc index f3c260243..0226b4fdb 100644 --- a/data/maps/events/BattlePyramidSquare01.inc +++ b/data/maps/events/BattlePyramidSquare01.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare01_MapObjects: @ 853A460 - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 3, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 5, 3, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 6, 4, 9, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare01_EventObjects: @ 853A460 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 3, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 3, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 6, 6, 4, 9, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare01_MapEvents:: @ 853A508 - map_events BattlePyramidSquare01_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare01_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare02.inc b/data/maps/events/BattlePyramidSquare02.inc index 790fb67a0..8b14a4a47 100644 --- a/data/maps/events/BattlePyramidSquare02.inc +++ b/data/maps/events/BattlePyramidSquare02.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare02_MapObjects: @ 853A51C - object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 5, 6, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 1, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare02_EventObjects: @ 853A51C + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 6, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 6, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 1, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare02_MapEvents:: @ 853A5C4 - map_events BattlePyramidSquare02_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare02_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare03.inc b/data/maps/events/BattlePyramidSquare03.inc index a8c8c59a7..4b7713426 100644 --- a/data/maps/events/BattlePyramidSquare03.inc +++ b/data/maps/events/BattlePyramidSquare03.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare03_MapObjects: @ 853A5D8 - object_event 1, MAP_OBJ_GFX_BOY_1, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 1, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 0, 6, 4, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 3, 4, 4, 18, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare03_EventObjects: @ 853A5D8 + object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 0, 2, 1, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 1, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 6, 4, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 3, 4, 4, 18, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare03_MapEvents:: @ 853A680 - map_events BattlePyramidSquare03_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare03_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare04.inc b/data/maps/events/BattlePyramidSquare04.inc index ca836e2b5..dd35fcc43 100644 --- a/data/maps/events/BattlePyramidSquare04.inc +++ b/data/maps/events/BattlePyramidSquare04.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare04_MapObjects: @ 853A694 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 2, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 7, 7, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 1, 4, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 4, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare04_EventObjects: @ 853A694 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 2, 4, 17, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 7, 7, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 1, 4, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 6, 4, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare04_MapEvents:: @ 853A73C - map_events BattlePyramidSquare04_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare04_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare05.inc b/data/maps/events/BattlePyramidSquare05.inc index 0486f6283..766ee7626 100644 --- a/data/maps/events/BattlePyramidSquare05.inc +++ b/data/maps/events/BattlePyramidSquare05.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare05_MapObjects: @ 853A750 - object_event 1, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 4, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_2, 0, 0, 3, 7, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 3, 1, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare05_EventObjects: @ 853A750 + object_event 1, EVENT_OBJ_GFX_BOY_2, 0, 0, 6, 4, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 0, 3, 7, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 3, 1, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare05_MapEvents:: @ 853A7F8 - map_events BattlePyramidSquare05_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare05_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare06.inc b/data/maps/events/BattlePyramidSquare06.inc index 65d2f2576..64ab2e226 100644 --- a/data/maps/events/BattlePyramidSquare06.inc +++ b/data/maps/events/BattlePyramidSquare06.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare06_MapObjects: @ 853A80C - object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 5, 2, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 0, 5, 5, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare06_EventObjects: @ 853A80C + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 5, 2, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 0, 5, 5, 4, 15, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 4, 18, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare06_MapEvents:: @ 853A8B4 - map_events BattlePyramidSquare06_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare06_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare07.inc b/data/maps/events/BattlePyramidSquare07.inc index 9a71e2a0b..a3a0734f1 100644 --- a/data/maps/events/BattlePyramidSquare07.inc +++ b/data/maps/events/BattlePyramidSquare07.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare07_MapObjects: @ 853A8C8 - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 0, 6, 4, 10, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 0, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare07_EventObjects: @ 853A8C8 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 0, 6, 4, 10, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 6, 0, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 4, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 4, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare07_MapEvents:: @ 853A970 - map_events BattlePyramidSquare07_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare07_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare08.inc b/data/maps/events/BattlePyramidSquare08.inc index 52a8d4911..dfcfdb451 100644 --- a/data/maps/events/BattlePyramidSquare08.inc +++ b/data/maps/events/BattlePyramidSquare08.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare08_MapObjects: @ 853A984 - object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 2, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 2, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare08_EventObjects: @ 853A984 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 2, 4, 18, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 2, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare08_MapEvents:: @ 853AA2C - map_events BattlePyramidSquare08_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare08_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare09.inc b/data/maps/events/BattlePyramidSquare09.inc index bc90aa649..dc4ab38ee 100644 --- a/data/maps/events/BattlePyramidSquare09.inc +++ b/data/maps/events/BattlePyramidSquare09.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare09_MapObjects: @ 853AA40 - object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 0, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare09_EventObjects: @ 853AA40 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 0, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 3, 5, 4, 15, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare09_MapEvents:: @ 853AAE8 - map_events BattlePyramidSquare09_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare09_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare10.inc b/data/maps/events/BattlePyramidSquare10.inc index 013cd7be6..9e87c6b06 100644 --- a/data/maps/events/BattlePyramidSquare10.inc +++ b/data/maps/events/BattlePyramidSquare10.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare10_MapObjects: @ 853AAFC - object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 0, 3, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 3, 4, 10, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 5, 4, 9, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare10_EventObjects: @ 853AAFC + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 0, 4, 17, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 0, 3, 4, 10, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 6, 5, 4, 9, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 6, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare10_MapEvents:: @ 853ABA4 - map_events BattlePyramidSquare10_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare10_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare11.inc b/data/maps/events/BattlePyramidSquare11.inc index 96dc118e5..b0ce15fb5 100644 --- a/data/maps/events/BattlePyramidSquare11.inc +++ b/data/maps/events/BattlePyramidSquare11.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare11_MapObjects: @ 853ABB8 - object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 2, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 6, 4, 14, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 4, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 7, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare11_EventObjects: @ 853ABB8 + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 3, 2, 4, 8, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 3, 6, 4, 14, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 6, 4, 4, 8, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 0, 6, 7, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare11_MapEvents:: @ 853AC60 - map_events BattlePyramidSquare11_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare11_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare12.inc b/data/maps/events/BattlePyramidSquare12.inc index 10b301d6c..08783200f 100644 --- a/data/maps/events/BattlePyramidSquare12.inc +++ b/data/maps/events/BattlePyramidSquare12.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare12_MapObjects: @ 853AC74 - object_event 1, MAP_OBJ_GFX_WOMAN_1, 0, 0, 7, 5, 4, 9, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 0, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 3, 3, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare12_EventObjects: @ 853AC74 + object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 7, 5, 4, 9, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 0, 5, 4, 10, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 3, 0, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 3, 3, 4, 7, 17, 0, 1, 3, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare12_MapEvents:: @ 853AD1C - map_events BattlePyramidSquare12_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare12_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare13.inc b/data/maps/events/BattlePyramidSquare13.inc index 0a83a5441..a930160cb 100644 --- a/data/maps/events/BattlePyramidSquare13.inc +++ b/data/maps/events/BattlePyramidSquare13.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare13_MapObjects: @ 853AD30 - object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare13_EventObjects: @ 853AD30 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 5, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 5, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 1, 1, 4, 8, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 1, 6, 4, 7, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 0, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare13_MapEvents:: @ 853ADD8 - map_events BattlePyramidSquare13_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare13_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare14.inc b/data/maps/events/BattlePyramidSquare14.inc index 599219cf1..a81c9b5e0 100644 --- a/data/maps/events/BattlePyramidSquare14.inc +++ b/data/maps/events/BattlePyramidSquare14.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare14_MapObjects: @ 853ADEC - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 1, 4, 17, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 4, 16, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare14_EventObjects: @ 853ADEC + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 1, 4, 17, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 1, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 5, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 4, 16, 17, 0, 1, 7, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare14_MapEvents:: @ 853AE94 - map_events BattlePyramidSquare14_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare14_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare15.inc b/data/maps/events/BattlePyramidSquare15.inc index ef92bec9a..fe0d085bd 100644 --- a/data/maps/events/BattlePyramidSquare15.inc +++ b/data/maps/events/BattlePyramidSquare15.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare15_MapObjects: @ 853AEA8 - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare15_EventObjects: @ 853AEA8 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 4, 16, 17, 0, 1, 5, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 1, 4, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 4, 15, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 4, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare15_MapEvents:: @ 853AF50 - map_events BattlePyramidSquare15_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare15_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BattlePyramidSquare16.inc b/data/maps/events/BattlePyramidSquare16.inc index 1d7e44f70..11abe791d 100644 --- a/data/maps/events/BattlePyramidSquare16.inc +++ b/data/maps/events/BattlePyramidSquare16.inc @@ -1,12 +1,12 @@ -BattlePyramidSquare16_MapObjects: @ 853AF64 - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 6, 4, 16, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 0, 0, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 7, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 +BattlePyramidSquare16_EventObjects: @ 853AF64 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 6, 4, 16, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 1, 0, 0, 18, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 7, 4, 15, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 0, 4, 17, 17, 0, 1, 6, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 7, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 2, 4, 1, 17, 0, 0, 0, BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A, 0, 0, 0 BattlePyramidSquare16_MapEvents:: @ 853B00C - map_events BattlePyramidSquare16_MapObjects, 0x0, 0x0, 0x0 + map_events BattlePyramidSquare16_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/BirthIsland_Exterior.inc b/data/maps/events/BirthIsland_Exterior.inc index 457d86314..1d6238e8f 100644 --- a/data/maps/events/BirthIsland_Exterior.inc +++ b/data/maps/events/BirthIsland_Exterior.inc @@ -1,10 +1,10 @@ -BirthIsland_Exterior_MapObjects: @ 853D7DC - object_event 1, MAP_OBJ_GFX_DEOXYS_TRIANGLE, 0, 0, 15, 12, 3, 8, 17, 0, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764, 0, 0 - object_event 2, MAP_OBJ_GFX_DEOXYS, 0, 0, 15, 3, 0, 8, 17, 0, 0, 0, 0x0, 763, 0, 0 +BirthIsland_Exterior_EventObjects: @ 853D7DC + object_event 1, EVENT_OBJ_GFX_DEOXYS_TRIANGLE, 0, 0, 15, 12, 3, 8, 17, 0, 0, 0, BirthIsland_Exterior_EventScript_267F83, 764, 0, 0 + object_event 2, EVENT_OBJ_GFX_DEOXYS, 0, 0, 15, 3, 0, 8, 17, 0, 0, 0, 0x0, 763, 0, 0 BirthIsland_Exterior_MapWarps: @ 853D80C warp_def 15, 24, 0, 0, BIRTH_ISLAND_HARBOR BirthIsland_Exterior_MapEvents:: @ 853D814 - map_events BirthIsland_Exterior_MapObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0 + map_events BirthIsland_Exterior_EventObjects, BirthIsland_Exterior_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/BirthIsland_Harbor.inc b/data/maps/events/BirthIsland_Harbor.inc index e035d2f44..bb2d6036d 100644 --- a/data/maps/events/BirthIsland_Harbor.inc +++ b/data/maps/events/BirthIsland_Harbor.inc @@ -1,10 +1,10 @@ -BirthIsland_Harbor_MapObjects: @ 853D828 - object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 +BirthIsland_Harbor_EventObjects: @ 853D828 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, BirthIsland_Harbor_EventScript_26805D, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 BirthIsland_Harbor_MapWarps: @ 853D858 warp_def 8, 2, 0, 0, BIRTH_ISLAND_EXTERIOR BirthIsland_Harbor_MapEvents:: @ 853D860 - map_events BirthIsland_Harbor_MapObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0 + map_events BirthIsland_Harbor_EventObjects, BirthIsland_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/CaveOfOrigin_B1F.inc b/data/maps/events/CaveOfOrigin_B1F.inc index 9c6cc18c6..148bb22a6 100644 --- a/data/maps/events/CaveOfOrigin_B1F.inc +++ b/data/maps/events/CaveOfOrigin_B1F.inc @@ -1,9 +1,9 @@ -CaveOfOrigin_B1F_MapObjects: @ 8535DD0 - object_event 1, MAP_OBJ_GFX_WALLACE, 0, 0, 9, 13, 3, 7, 17, 0, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820, 0, 0 +CaveOfOrigin_B1F_EventObjects: @ 8535DD0 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 9, 13, 3, 7, 17, 0, 0, 0, CaveOfOrigin_B1F_EventScript_2357A9, 820, 0, 0 CaveOfOrigin_B1F_MapWarps: @ 8535DE8 warp_def 9, 3, 3, 1, CAVE_OF_ORIGIN_1F CaveOfOrigin_B1F_MapEvents:: @ 8535DF0 - map_events CaveOfOrigin_B1F_MapObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0 + map_events CaveOfOrigin_B1F_EventObjects, CaveOfOrigin_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DesertRuins.inc b/data/maps/events/DesertRuins.inc index 4a78cae40..2253dec67 100644 --- a/data/maps/events/DesertRuins.inc +++ b/data/maps/events/DesertRuins.inc @@ -1,5 +1,5 @@ -DesertRuins_MapObjects: @ 8534354 - object_event 1, MAP_OBJ_GFX_REGIROCK, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935, 0, 0 +DesertRuins_EventObjects: @ 8534354 + object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_22DA02, 935, 0, 0 DesertRuins_MapWarps: @ 853436C warp_def 8, 29, 3, 1, ROUTE_111 @@ -12,5 +12,5 @@ DesertRuins_MapBGEvents: @ 8534384 bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_22D9F8 DesertRuins_MapEvents:: @ 85343A8 - map_events DesertRuins_MapObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents + map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents diff --git a/data/maps/events/DesertUnderpass.inc b/data/maps/events/DesertUnderpass.inc index cb5c06874..deb440ff9 100644 --- a/data/maps/events/DesertUnderpass.inc +++ b/data/maps/events/DesertUnderpass.inc @@ -1,9 +1,9 @@ -DesertUnderpass_MapObjects: @ 85376D4 - object_event 1, MAP_OBJ_GFX_FOSSIL, 0, 0, 132, 10, 0, 8, 17, 0, 0, 0, DesertUnderpass_EventScript_23AF41, 874, 0, 0 +DesertUnderpass_EventObjects: @ 85376D4 + object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 0, 132, 10, 0, 8, 17, 0, 0, 0, DesertUnderpass_EventScript_23AF41, 874, 0, 0 DesertUnderpass_MapWarps: @ 85376EC warp_def 10, 12, 0, 2, ROUTE_114_FOSSIL_MANIACS_TUNNEL DesertUnderpass_MapEvents:: @ 85376F4 - map_events DesertUnderpass_MapObjects, DesertUnderpass_MapWarps, 0x0, 0x0 + map_events DesertUnderpass_EventObjects, DesertUnderpass_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/DewfordTown.inc b/data/maps/events/DewfordTown.inc index 3a4e95de9..8bb897125 100644 --- a/data/maps/events/DewfordTown.inc +++ b/data/maps/events/DewfordTown.inc @@ -1,9 +1,9 @@ -DewfordTown_MapObjects: @ 8527964 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 9, 3, 9, 16, 0, 0, 3, DewfordTown_EventScript_1E9511, 740, 0, 0 - object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, 743, 0, 0 - object_event 5, MAP_OBJ_GFX_BOY_1, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0, 0, 0 +DewfordTown_EventObjects: @ 8527964 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95B1, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 9, 3, 9, 16, 0, 0, 3, DewfordTown_EventScript_1E9511, 740, 0, 0 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_1E95D5, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, 743, 0, 0 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_1E9922, 0, 0, 0 DewfordTown_MapWarps: @ 85279DC warp_def 3, 3, 0, 0, DEWFORD_TOWN_HALL @@ -20,5 +20,5 @@ DewfordTown_MapBGEvents: @ 8527A04 bg_event 2, 4, 0, 0, 0, DewfordTown_EventScript_1E95CC DewfordTown_MapEvents:: @ 8527A40 - 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 e9a6b6477..8d7a8e460 100644 --- a/data/maps/events/DewfordTown_Gym.inc +++ b/data/maps/events/DewfordTown_Gym.inc @@ -1,12 +1,12 @@ -DewfordTown_Gym_MapObjects: @ 852DB34 - object_event 1, MAP_OBJ_GFX_BRAWLY, 0, 0, 4, 3, 0, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 18, 0, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 15, 3, 3, 8, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 12, 25, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_2, 0, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 7, 8, 1, 10, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 0, 16, 9, 3, 8, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_SAILOR, 0, 0, 14, 12, 1, 10, 17, 0, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0, 0, 0 +DewfordTown_Gym_EventObjects: @ 852DB34 + object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 0, 4, 3, 0, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC7C2, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 18, 0, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8B7, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 15, 3, 3, 8, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1FC8D9, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 12, 25, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_1FC8FB, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_1FC983, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 7, 8, 1, 10, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC93F, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 0, 16, 9, 3, 8, 17, 0, 1, 3, DewfordTown_Gym_EventScript_1FC961, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_SAILOR, 0, 0, 14, 12, 1, 10, 17, 0, 1, 2, DewfordTown_Gym_EventScript_1FC91D, 0, 0, 0 DewfordTown_Gym_MapWarps: @ 852DBF4 warp_def 5, 27, 0, 2, DEWFORD_TOWN @@ -19,5 +19,5 @@ DewfordTown_Gym_MapBGEvents: @ 852DC04 bg_event 7, 24, 0, 1, 0, DewfordTown_Gym_EventScript_1FC9B2 DewfordTown_Gym_MapEvents:: @ 852DC34 - 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 f5af1fc3c..c4b6600ec 100644 --- a/data/maps/events/DewfordTown_Hall.inc +++ b/data/maps/events/DewfordTown_Hall.inc @@ -1,13 +1,13 @@ -DewfordTown_Hall_MapObjects: @ 852DC48 - object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 2, 3, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 14, 7, 0, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 12, 3, 3, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940, 0, 0 +DewfordTown_Hall_EventObjects: @ 852DC48 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4D0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD4F9, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD50A, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD547, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 5, 2, 3, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD563, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 14, 7, 0, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD57F, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 12, 3, 3, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD62F, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1FD63B, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_1FD7DA, 940, 0, 0 DewfordTown_Hall_MapWarps: @ 852DD20 warp_def 5, 8, 0, 0, DEWFORD_TOWN @@ -18,5 +18,5 @@ DewfordTown_Hall_MapBGEvents: @ 852DD30 bg_event 7, 1, 3, 0, 0, DewfordTown_Hall_EventScript_1FD5A0 DewfordTown_Hall_MapEvents:: @ 852DD48 - 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 1990975c5..72b63dff3 100644 --- a/data/maps/events/DewfordTown_House1.inc +++ b/data/maps/events/DewfordTown_House1.inc @@ -1,12 +1,12 @@ -DewfordTown_House1_MapObjects: @ 852D9C8 - object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 2, 3, 8, 19, 0, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0, 0, 0 +DewfordTown_House1_EventObjects: @ 852D9C8 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3D7, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_1FC3CE, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 4, 2, 3, 8, 19, 0, 0, 0, DewfordTown_House1_EventScript_1FC3E0, 0, 0, 0 DewfordTown_House1_MapWarps: @ 852DA10 warp_def 3, 7, 0, 3, DEWFORD_TOWN warp_def 4, 7, 0, 3, DEWFORD_TOWN DewfordTown_House1_MapEvents:: @ 852DA20 - 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 b487372f6..901046cbc 100644 --- a/data/maps/events/DewfordTown_House2.inc +++ b/data/maps/events/DewfordTown_House2.inc @@ -1,11 +1,11 @@ -DewfordTown_House2_MapObjects: @ 852DD5C - object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_2, 0, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0, 0, 0 +DewfordTown_House2_EventObjects: @ 852DD5C + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE22E, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_1FE271, 0, 0, 0 DewfordTown_House2_MapWarps: @ 852DD8C warp_def 3, 8, 0, 4, DEWFORD_TOWN warp_def 4, 8, 0, 4, DEWFORD_TOWN DewfordTown_House2_MapEvents:: @ 852DD9C - 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 c393ed795..f61966b88 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: @ 852DA34 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 5, 5, 0, 5, 18, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0, 0, 0 +DewfordTown_PokemonCenter_1F_EventObjects: @ 852DA34 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC537, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC545, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 0, 5, 18, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_1FC54E, 0, 0, 0 DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C warp_def 7, 8, 3, 1, DEWFORD_TOWN @@ -9,5 +9,5 @@ DewfordTown_PokemonCenter_1F_MapWarps: @ 852DA7C warp_def 1, 6, 4, 0, DEWFORD_TOWN_POKEMON_CENTER_2F DewfordTown_PokemonCenter_1F_MapEvents:: @ 852DA94 - 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 437441e08..7098e6ed8 100644 --- a/data/maps/events/DewfordTown_PokemonCenter_2F.inc +++ b/data/maps/events/DewfordTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -DewfordTown_PokemonCenter_2F_MapObjects: @ 852DAA8 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +DewfordTown_PokemonCenter_2F_EventObjects: @ 852DAA8 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08 warp_def 1, 6, 4, 2, DEWFORD_TOWN_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ DewfordTown_PokemonCenter_2F_MapWarps: @ 852DB08 warp_def 9, 1, 3, 0, TRADE_CENTER DewfordTown_PokemonCenter_2F_MapEvents:: @ 852DB20 - 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 e5fbb81c1..269645dc6 100644 --- a/data/maps/events/EverGrandeCity_ChampionsRoom.inc +++ b/data/maps/events/EverGrandeCity_ChampionsRoom.inc @@ -1,12 +1,12 @@ -EverGrandeCity_ChampionsRoom_MapObjects: @ 8533700 - object_event 1, MAP_OBJ_GFX_WALLACE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 920, 0, 0 - object_event 3, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921, 0, 0 +EverGrandeCity_ChampionsRoom_EventObjects: @ 8533700 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 920, 0, 0 + object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, 921, 0, 0 EverGrandeCity_ChampionsRoom_MapWarps: @ 8533748 warp_def 6, 12, 3, 1, EVER_GRANDE_CITY_HALL_4 warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_OF_FAME EverGrandeCity_ChampionsRoom_MapEvents:: @ 8533758 - 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 2db37957d..761e321d6 100644 --- a/data/maps/events/EverGrandeCity_DrakesRoom.inc +++ b/data/maps/events/EverGrandeCity_DrakesRoom.inc @@ -1,10 +1,10 @@ -EverGrandeCity_DrakesRoom_MapObjects: @ 85336C4 - object_event 1, MAP_OBJ_GFX_DRAKE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0, 0, 0 +EverGrandeCity_DrakesRoom_EventObjects: @ 85336C4 + object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_2286F3, 0, 0, 0 EverGrandeCity_DrakesRoom_MapWarps: @ 85336DC warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_3 warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_4 EverGrandeCity_DrakesRoom_MapEvents:: @ 85336EC - 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 7d97a2bc6..a8632b8c1 100644 --- a/data/maps/events/EverGrandeCity_GlaciasRoom.inc +++ b/data/maps/events/EverGrandeCity_GlaciasRoom.inc @@ -1,10 +1,10 @@ -EverGrandeCity_GlaciasRoom_MapObjects: @ 8533688 - object_event 1, MAP_OBJ_GFX_GLACIA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0, 0, 0 +EverGrandeCity_GlaciasRoom_EventObjects: @ 8533688 + object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_228469, 0, 0, 0 EverGrandeCity_GlaciasRoom_MapWarps: @ 85336A0 warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_2 warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_3 EverGrandeCity_GlaciasRoom_MapEvents:: @ 85336B0 - 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 18ed3ebdb..0d75ef553 100644 --- a/data/maps/events/EverGrandeCity_HallOfFame.inc +++ b/data/maps/events/EverGrandeCity_HallOfFame.inc @@ -1,9 +1,9 @@ -EverGrandeCity_HallOfFame_MapObjects: @ 85338FC - object_event 1, MAP_OBJ_GFX_WALLACE, 0, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 +EverGrandeCity_HallOfFame_EventObjects: @ 85338FC + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 EverGrandeCity_HallOfFame_MapWarps: @ 8533914 warp_def 7, 11, 3, 1, EVER_GRANDE_CITY_CHAMPIONS_ROOM EverGrandeCity_HallOfFame_MapEvents:: @ 853391C - 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 471bae1fc..dd09ad4a1 100644 --- a/data/maps/events/EverGrandeCity_PhoebesRoom.inc +++ b/data/maps/events/EverGrandeCity_PhoebesRoom.inc @@ -1,10 +1,10 @@ -EverGrandeCity_PhoebesRoom_MapObjects: @ 853364C - object_event 1, MAP_OBJ_GFX_PHOEBE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0, 0, 0 +EverGrandeCity_PhoebesRoom_EventObjects: @ 853364C + object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_2281CB, 0, 0, 0 EverGrandeCity_PhoebesRoom_MapWarps: @ 8533664 warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_1 warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_2 EverGrandeCity_PhoebesRoom_MapEvents:: @ 8533674 - 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 28491f59b..a758c4d73 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ -EverGrandeCity_PokemonCenter_1F_MapObjects: @ 8533930 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SCOTT, 0, 0, 9, 4, 3, 7, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793, 0, 0 +EverGrandeCity_PokemonCenter_1F_EventObjects: @ 8533930 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A59, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A67, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A70, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SCOTT, 0, 0, 9, 4, 3, 7, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_229A79, 793, 0, 0 EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990 warp_def 7, 8, 3, 1, EVER_GRANDE_CITY @@ -10,5 +10,5 @@ EverGrandeCity_PokemonCenter_1F_MapWarps: @ 8533990 warp_def 1, 6, 4, 0, EVER_GRANDE_CITY_POKEMON_CENTER_2F EverGrandeCity_PokemonCenter_1F_MapEvents:: @ 85339A8 - 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 d34c8082f..bbedf59d2 100644 --- a/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc +++ b/data/maps/events/EverGrandeCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -EverGrandeCity_PokemonCenter_2F_MapObjects: @ 85339BC - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +EverGrandeCity_PokemonCenter_2F_EventObjects: @ 85339BC + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C warp_def 1, 6, 4, 2, EVER_GRANDE_CITY_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ EverGrandeCity_PokemonCenter_2F_MapWarps: @ 8533A1C warp_def 9, 1, 3, 0, TRADE_CENTER EverGrandeCity_PokemonCenter_2F_MapEvents:: @ 8533A34 - 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_1F.inc b/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc index ee368c6e1..a19984ea2 100644 --- a/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc +++ b/data/maps/events/EverGrandeCity_PokemonLeague_1F.inc @@ -1,8 +1,8 @@ -EverGrandeCity_PokemonLeague_1F_MapObjects: @ 8533860 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0 +EverGrandeCity_PokemonLeague_1F_EventObjects: @ 8533860 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_2295FC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_22960A, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 11, 2, 3, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_1F_EventScript_229636, 0, 0, 0 EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0 warp_def 9, 11, 3, 0, EVER_GRANDE_CITY @@ -12,5 +12,5 @@ EverGrandeCity_PokemonLeague_1F_MapWarps: @ 85338C0 warp_def 1, 7, 4, 0, EVER_GRANDE_CITY_POKEMON_LEAGUE_2F EverGrandeCity_PokemonLeague_1F_MapEvents:: @ 85338E8 - map_events EverGrandeCity_PokemonLeague_1F_MapObjects, EverGrandeCity_PokemonLeague_1F_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_PokemonLeague_1F_EventObjects, EverGrandeCity_PokemonLeague_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc b/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc index 499aad196..6b85a2fb0 100644 --- a/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc +++ b/data/maps/events/EverGrandeCity_PokemonLeague_2F.inc @@ -1,8 +1,8 @@ -EverGrandeCity_PokemonLeague_2F_MapObjects: @ 8533A48 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702, 0, 0 +EverGrandeCity_PokemonLeague_2F_EventObjects: @ 8533A48 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, EverGrandeCity_PokemonLeague_2F_EventScript_276B03, 702, 0, 0 EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8 warp_def 1, 6, 4, 4, EVER_GRANDE_CITY_POKEMON_LEAGUE_1F @@ -10,5 +10,5 @@ EverGrandeCity_PokemonLeague_2F_MapWarps: @ 8533AA8 warp_def 9, 1, 3, 0, TRADE_CENTER EverGrandeCity_PokemonLeague_2F_MapEvents:: @ 8533AC0 - map_events EverGrandeCity_PokemonLeague_2F_MapObjects, EverGrandeCity_PokemonLeague_2F_MapWarps, 0x0, 0x0 + map_events EverGrandeCity_PokemonLeague_2F_EventObjects, EverGrandeCity_PokemonLeague_2F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/EverGrandeCity_SidneysRoom.inc b/data/maps/events/EverGrandeCity_SidneysRoom.inc index 9ff3d40cb..93d9a879e 100644 --- a/data/maps/events/EverGrandeCity_SidneysRoom.inc +++ b/data/maps/events/EverGrandeCity_SidneysRoom.inc @@ -1,10 +1,10 @@ -EverGrandeCity_SidneysRoom_MapObjects: @ 8533610 - object_event 1, MAP_OBJ_GFX_SIDNEY, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0, 0, 0 +EverGrandeCity_SidneysRoom_EventObjects: @ 8533610 + object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_227F64, 0, 0, 0 EverGrandeCity_SidneysRoom_MapWarps: @ 8533628 warp_def 6, 13, 3, 1, EVER_GRANDE_CITY_HALL_5 warp_def 6, 2, 0, 0, EVER_GRANDE_CITY_HALL_1 EverGrandeCity_SidneysRoom_MapEvents:: @ 8533638 - 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 28dab394b..e9fb7579c 100644 --- a/data/maps/events/FallarborTown.inc +++ b/data/maps/events/FallarborTown.inc @@ -1,8 +1,8 @@ -FallarborTown_MapObjects: @ 8527BE0 - object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 0, 8, 11, 3, 8, 16, 0, 0, 0, FallarborTown_EventScript_1EB22B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 11, 15, 3, 3, 17, 0, 0, 0, FallarborTown_EventScript_1EB234, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_AZURILL, 0, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907, 0, 0 +FallarborTown_EventObjects: @ 8527BE0 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 0, 8, 11, 3, 8, 16, 0, 0, 0, FallarborTown_EventScript_1EB22B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_1EB20C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 11, 15, 3, 3, 17, 0, 0, 0, FallarborTown_EventScript_1EB234, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_1EB23D, 907, 0, 0 FallarborTown_MapWarps: @ 8527C40 warp_def 15, 15, 0, 0, FALLARBOR_TOWN_MART @@ -22,5 +22,5 @@ FallarborTown_MapBGEvents: @ 8527C68 bg_event 2, 15, 3, 7, 0, ITEM_NUGGET, 28, 0 FallarborTown_MapEvents:: @ 8527CC8 - 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_BattleTentBattleRoom.inc b/data/maps/events/FallarborTown_BattleTentBattleRoom.inc index bed082ccb..7c5842ab8 100644 --- a/data/maps/events/FallarborTown_BattleTentBattleRoom.inc +++ b/data/maps/events/FallarborTown_BattleTentBattleRoom.inc @@ -1,8 +1,8 @@ -FallarborTown_BattleTentBattleRoom_MapObjects: @ 852E444 - object_event 1, MAP_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 3, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 +FallarborTown_BattleTentBattleRoom_EventObjects: @ 852E444 + object_event 1, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 3, 2, 0, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 FallarborTown_BattleTentBattleRoom_MapEvents:: @ 852E48C - map_events FallarborTown_BattleTentBattleRoom_MapObjects, 0x0, 0x0, 0x0 + map_events FallarborTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_BattleTentCorridor.inc b/data/maps/events/FallarborTown_BattleTentCorridor.inc index 023ef7f0b..35bca7b85 100644 --- a/data/maps/events/FallarborTown_BattleTentCorridor.inc +++ b/data/maps/events/FallarborTown_BattleTentCorridor.inc @@ -1,6 +1,6 @@ -FallarborTown_BattleTentCorridor_MapObjects: @ 852E418 - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 +FallarborTown_BattleTentCorridor_EventObjects: @ 852E418 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 FallarborTown_BattleTentCorridor_MapEvents:: @ 852E430 - map_events FallarborTown_BattleTentCorridor_MapObjects, 0x0, 0x0, 0x0 + map_events FallarborTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/FallarborTown_BattleTentLobby.inc b/data/maps/events/FallarborTown_BattleTentLobby.inc index 6c0d25020..e261f185f 100644 --- a/data/maps/events/FallarborTown_BattleTentLobby.inc +++ b/data/maps/events/FallarborTown_BattleTentLobby.inc @@ -1,9 +1,9 @@ -FallarborTown_BattleTentLobby_MapObjects: @ 852E370 - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 12, 6, 3, 3, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 10, 9, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SCOTT, 0, 0, 0, 7, 3, 10, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767, 0, 0 +FallarborTown_BattleTentLobby_EventObjects: @ 852E370 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200001, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20020D, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 12, 6, 3, 3, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200216, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 10, 9, 3, 8, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20021F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 0, 7, 3, 10, 17, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_200228, 767, 0, 0 FallarborTown_BattleTentLobby_MapWarps: @ 852E3E8 warp_def 6, 9, 0, 1, FALLARBOR_TOWN @@ -13,5 +13,5 @@ FallarborTown_BattleTentLobby_MapBGEvents: @ 852E3F8 bg_event 4, 5, 0, 0, 0, FallarborTown_BattleTentLobby_EventScript_20024F FallarborTown_BattleTentLobby_MapEvents:: @ 852E404 - map_events FallarborTown_BattleTentLobby_MapObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents + map_events FallarborTown_BattleTentLobby_EventObjects, FallarborTown_BattleTentLobby_MapWarps, 0x0, FallarborTown_BattleTentLobby_MapBGEvents diff --git a/data/maps/events/FallarborTown_House1.inc b/data/maps/events/FallarborTown_House1.inc index 971236802..b3975685c 100644 --- a/data/maps/events/FallarborTown_House1.inc +++ b/data/maps/events/FallarborTown_House1.inc @@ -1,11 +1,11 @@ -FallarborTown_House1_MapObjects: @ 852E5B8 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FallarborTown_House1_EventScript_200F13, 928, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0, 0, 0 +FallarborTown_House1_EventObjects: @ 852E5B8 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FallarborTown_House1_EventScript_200F13, 928, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_200FBC, 0, 0, 0 FallarborTown_House1_MapWarps: @ 852E5E8 warp_def 3, 8, 0, 3, FALLARBOR_TOWN warp_def 4, 8, 0, 3, FALLARBOR_TOWN FallarborTown_House1_MapEvents:: @ 852E5F8 - 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 058c4c5af..d809bf493 100644 --- a/data/maps/events/FallarborTown_House2.inc +++ b/data/maps/events/FallarborTown_House2.inc @@ -1,10 +1,10 @@ -FallarborTown_House2_MapObjects: @ 852E60C - object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0, 0, 0 +FallarborTown_House2_EventObjects: @ 852E60C + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_201383, 0, 0, 0 FallarborTown_House2_MapWarps: @ 852E624 warp_def 3, 7, 0, 4, FALLARBOR_TOWN warp_def 4, 7, 0, 4, FALLARBOR_TOWN FallarborTown_House2_MapEvents:: @ 852E634 - 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 a59da4c66..762db16f9 100644 --- a/data/maps/events/FallarborTown_Mart.inc +++ b/data/maps/events/FallarborTown_Mart.inc @@ -1,14 +1,14 @@ -FallarborTown_Mart_MapObjects: @ 852E2D4 - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SKITTY, 0, 0, 2, 5, 3, 1, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_GIRL_2, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0, 0, 0 +FallarborTown_Mart_EventObjects: @ 852E2D4 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCBF, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCF4, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1FFCFD, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 0, 2, 5, 3, 1, 17, 0, 0, 0, FallarborTown_Mart_EventScript_1FFD06, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, FallarborTown_Mart_EventScript_2C80B6, 0, 0, 0 FallarborTown_Mart_MapWarps: @ 852E34C warp_def 3, 7, 0, 0, FALLARBOR_TOWN warp_def 4, 7, 0, 0, FALLARBOR_TOWN FallarborTown_Mart_MapEvents:: @ 852E35C - 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 19421411e..e6c91a736 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: @ 852E4A0 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871, 0, 0 +FallarborTown_PokemonCenter_1F_EventObjects: @ 852E4A0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BE1, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BEF, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200BF8, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_200C01, 871, 0, 0 FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500 warp_def 7, 8, 3, 2, FALLARBOR_TOWN @@ -10,5 +10,5 @@ FallarborTown_PokemonCenter_1F_MapWarps: @ 852E500 warp_def 1, 6, 4, 0, FALLARBOR_TOWN_POKEMON_CENTER_2F FallarborTown_PokemonCenter_1F_MapEvents:: @ 852E518 - 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 408ecf9db..6ddb7e9c9 100644 --- a/data/maps/events/FallarborTown_PokemonCenter_2F.inc +++ b/data/maps/events/FallarborTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -FallarborTown_PokemonCenter_2F_MapObjects: @ 852E52C - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +FallarborTown_PokemonCenter_2F_EventObjects: @ 852E52C + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C warp_def 1, 6, 4, 2, FALLARBOR_TOWN_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ FallarborTown_PokemonCenter_2F_MapWarps: @ 852E58C warp_def 9, 1, 3, 0, TRADE_CENTER FallarborTown_PokemonCenter_2F_MapEvents:: @ 852E5A4 - 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/FarawayIsland_Entrance.inc b/data/maps/events/FarawayIsland_Entrance.inc index cd321124f..27d98189e 100644 --- a/data/maps/events/FarawayIsland_Entrance.inc +++ b/data/maps/events/FarawayIsland_Entrance.inc @@ -1,6 +1,6 @@ -FarawayIsland_Entrance_MapObjects: @ 853D710 - object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 13, 39, 3, 7, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 13, 41, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 +FarawayIsland_Entrance_EventObjects: @ 853D710 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 13, 39, 3, 7, 0, 0, 0, 0, FarawayIsland_Entrance_EventScript_267CA2, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 13, 41, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 FarawayIsland_Entrance_MapWarps: @ 853D740 warp_def 22, 7, 3, 0, FARAWAY_ISLAND_INTERIOR @@ -15,5 +15,5 @@ FarawayIsland_Entrance_MapBGEvents: @ 853D780 bg_event 3, 32, 0, 1, 0, FarawayIsland_Entrance_EventScript_267CF1 FarawayIsland_Entrance_MapEvents:: @ 853D78C - map_events FarawayIsland_Entrance_MapObjects, FarawayIsland_Entrance_MapWarps, FarawayIsland_Entrance_MapCoordEvents, FarawayIsland_Entrance_MapBGEvents + map_events FarawayIsland_Entrance_EventObjects, FarawayIsland_Entrance_MapWarps, FarawayIsland_Entrance_MapCoordEvents, FarawayIsland_Entrance_MapBGEvents diff --git a/data/maps/events/FarawayIsland_Interior.inc b/data/maps/events/FarawayIsland_Interior.inc index 6f13ca36e..d74eb9d8f 100644 --- a/data/maps/events/FarawayIsland_Interior.inc +++ b/data/maps/events/FarawayIsland_Interior.inc @@ -1,10 +1,10 @@ -FarawayIsland_Interior_MapObjects: @ 853D7A0 - object_event 1, MAP_OBJ_GFX_MEW, 0, 0, 13, 17, 3, 60, 255, 0, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718, 0, 0 +FarawayIsland_Interior_EventObjects: @ 853D7A0 + object_event 1, EVENT_OBJ_GFX_MEW, 0, 0, 13, 17, 3, 60, 255, 0, 0, 1, FarawayIsland_Interior_EventScript_267DF2, 718, 0, 0 FarawayIsland_Interior_MapWarps: @ 853D7B8 warp_def 12, 19, 0, 0, FARAWAY_ISLAND_ENTRANCE warp_def 13, 19, 0, 1, FARAWAY_ISLAND_ENTRANCE FarawayIsland_Interior_MapEvents:: @ 853D7C8 - map_events FarawayIsland_Interior_MapObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0 + map_events FarawayIsland_Interior_EventObjects, FarawayIsland_Interior_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/FieryPath.inc b/data/maps/events/FieryPath.inc index cd360a75f..3b68b1292 100644 --- a/data/maps/events/FieryPath.inc +++ b/data/maps/events/FieryPath.inc @@ -1,17 +1,17 @@ -FieryPath_MapObjects: @ 8534C80 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_29119E, 1091, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 17, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 8, 11, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 12, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 24, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 32, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_291191, 1111, 0, 0 +FieryPath_EventObjects: @ 8534C80 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_29119E, 1091, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 17, 0, 0 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 17, 15, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 18, 0, 0 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 8, 11, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 19, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 12, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 20, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 21, 0, 0 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 24, 3, 1, 0, 0, 0, 0, FieryPath_EventScript_2908BA, 22, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 32, 3, 1, 17, 0, 0, 0, FieryPath_EventScript_291191, 1111, 0, 0 FieryPath_MapWarps: @ 8534D40 warp_def 26, 36, 3, 4, ROUTE_112 warp_def 26, 4, 3, 5, ROUTE_112 FieryPath_MapEvents:: @ 8534D50 - 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 03ff20df1..517d32d53 100644 --- a/data/maps/events/FortreeCity.inc +++ b/data/maps/events/FortreeCity.inc @@ -1,11 +1,11 @@ -FortreeCity_MapObjects: @ 8526B9C - object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 32, 16, 3, 2, 17, 0, 0, 0, FortreeCity_EventScript_1E25DE, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 32, 10, 3, 3, 16, 0, 0, 0, FortreeCity_EventScript_1E25BF, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_1, 0, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BOY_5, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_KECLEON_1, 0, 0, 25, 8, 3, 76, 17, 0, 0, 0, FortreeCity_EventScript_1E2614, 969, 0, 0 +FortreeCity_EventObjects: @ 8526B9C + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25B6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 32, 16, 3, 2, 17, 0, 0, 0, FortreeCity_EventScript_1E25DE, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 32, 10, 3, 3, 16, 0, 0, 0, FortreeCity_EventScript_1E25BF, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25F0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_1E25E7, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_1E25F9, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 25, 8, 3, 76, 17, 0, 0, 0, FortreeCity_EventScript_1E2614, 969, 0, 0 FortreeCity_MapWarps: @ 8526C44 warp_def 5, 6, 0, 0, FORTREE_CITY_POKEMON_CENTER_1F @@ -27,5 +27,5 @@ FortreeCity_MapBGEvents: @ 8526C8C bg_event 6, 14, 0, 1, 0, FortreeCity_EventScript_271E6A FortreeCity_MapEvents:: @ 8526CD4 - 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 7c25059bf..6b7e0f39d 100644 --- a/data/maps/events/FortreeCity_DecorationShop.inc +++ b/data/maps/events/FortreeCity_DecorationShop.inc @@ -1,13 +1,13 @@ -FortreeCity_DecorationShop_MapObjects: @ 85310B0 - object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0, 0, 0 +FortreeCity_DecorationShop_EventObjects: @ 85310B0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21800E, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218017, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_218020, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_21804C, 0, 0, 0 FortreeCity_DecorationShop_MapWarps: @ 8531110 warp_def 3, 5, 0, 8, FORTREE_CITY warp_def 4, 5, 0, 8, FORTREE_CITY FortreeCity_DecorationShop_MapEvents:: @ 8531120 - 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 6e3904b88..a06882772 100644 --- a/data/maps/events/FortreeCity_Gym.inc +++ b/data/maps/events/FortreeCity_Gym.inc @@ -1,12 +1,12 @@ -FortreeCity_Gym_MapObjects: @ 8530C98 - object_event 1, MAP_OBJ_GFX_WINONA, 0, 0, 15, 2, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 14, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 10, 10, 3, 9, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 5, 17, 3, 9, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 9, 8, 3, 8, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_2, 0, 0, 15, 21, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 23, 3, 10, 17, 0, 1, 1, FortreeCity_Gym_EventScript_216704, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MAN_6, 0, 0, 1, 10, 3, 7, 17, 0, 1, 3, FortreeCity_Gym_EventScript_21671B, 0, 0, 0 +FortreeCity_Gym_EventObjects: @ 8530C98 + object_event 1, EVENT_OBJ_GFX_WINONA, 0, 0, 15, 2, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_2165C8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 14, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_2166A8, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 10, 10, 3, 9, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166D6, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 5, 17, 3, 9, 0, 0, 1, 1, FortreeCity_Gym_EventScript_2166ED, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 9, 8, 3, 8, 0, 0, 1, 2, FortreeCity_Gym_EventScript_2166BF, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 0, 15, 21, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_216732, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 23, 3, 10, 17, 0, 1, 1, FortreeCity_Gym_EventScript_216704, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 0, 1, 10, 3, 7, 17, 0, 1, 3, FortreeCity_Gym_EventScript_21671B, 0, 0, 0 FortreeCity_Gym_MapWarps: @ 8530D58 warp_def 15, 24, 0, 2, FORTREE_CITY @@ -17,5 +17,5 @@ FortreeCity_Gym_MapBGEvents: @ 8530D68 bg_event 17, 21, 0, 1, 0, FortreeCity_Gym_EventScript_216761 FortreeCity_Gym_MapEvents:: @ 8530D80 - 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 d1eecfdef..abaae2d40 100644 --- a/data/maps/events/FortreeCity_House1.inc +++ b/data/maps/events/FortreeCity_House1.inc @@ -1,12 +1,12 @@ -FortreeCity_House1_MapObjects: @ 8530C2C - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, FortreeCity_House1_EventScript_21635F, 0, 0, 0 +FortreeCity_House1_EventObjects: @ 8530C2C + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House1_EventScript_2162BB, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_216368, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, FortreeCity_House1_EventScript_21635F, 0, 0, 0 FortreeCity_House1_MapWarps: @ 8530C74 warp_def 3, 5, 0, 1, FORTREE_CITY warp_def 4, 5, 0, 1, FORTREE_CITY FortreeCity_House1_MapEvents:: @ 8530C84 - 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 c54b42a6d..513097503 100644 --- a/data/maps/events/FortreeCity_House2.inc +++ b/data/maps/events/FortreeCity_House2.inc @@ -1,11 +1,11 @@ -FortreeCity_House2_MapObjects: @ 8530F30 - object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 3, 3, 5, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 3, 3, 9, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0, 0, 0 +FortreeCity_House2_EventObjects: @ 8530F30 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 2, 3, 3, 5, 1, 0, 0, 0, FortreeCity_House2_EventScript_2177CB, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 3, 3, 9, 1, 0, 0, 0, FortreeCity_House2_EventScript_2C811E, 0, 0, 0 FortreeCity_House2_MapWarps: @ 8530F60 warp_def 3, 5, 0, 4, FORTREE_CITY warp_def 4, 5, 0, 4, FORTREE_CITY FortreeCity_House2_MapEvents:: @ 8530F70 - 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 7be159493..1b788cbe2 100644 --- a/data/maps/events/FortreeCity_House3.inc +++ b/data/maps/events/FortreeCity_House3.inc @@ -1,11 +1,11 @@ -FortreeCity_House3_MapObjects: @ 8530F84 - object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House3_EventScript_217AF1, 0, 0, 0 +FortreeCity_House3_EventObjects: @ 8530F84 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_217AE8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House3_EventScript_217AF1, 0, 0, 0 FortreeCity_House3_MapWarps: @ 8530FB4 warp_def 3, 5, 0, 5, FORTREE_CITY warp_def 4, 5, 0, 5, FORTREE_CITY FortreeCity_House3_MapEvents:: @ 8530FC4 - 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 d24c12520..a4050a5f6 100644 --- a/data/maps/events/FortreeCity_House4.inc +++ b/data/maps/events/FortreeCity_House4.inc @@ -1,12 +1,12 @@ -FortreeCity_House4_MapObjects: @ 8530FD8 - object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House4_EventScript_217C81, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_3, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WINGULL, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933, 0, 0 +FortreeCity_House4_EventObjects: @ 8530FD8 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, FortreeCity_House4_EventScript_217C81, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217C8A, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_217D20, 933, 0, 0 FortreeCity_House4_MapWarps: @ 8531020 warp_def 3, 5, 0, 6, FORTREE_CITY warp_def 4, 5, 0, 6, FORTREE_CITY FortreeCity_House4_MapEvents:: @ 8531030 - 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 3520e7249..b6bf34354 100644 --- a/data/maps/events/FortreeCity_House5.inc +++ b/data/maps/events/FortreeCity_House5.inc @@ -1,12 +1,12 @@ -FortreeCity_House5_MapObjects: @ 8531044 - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0, 0, 0 +FortreeCity_House5_EventObjects: @ 8531044 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EF2, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_217F04, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_217EFB, 0, 0, 0 FortreeCity_House5_MapWarps: @ 853108C warp_def 3, 5, 0, 7, FORTREE_CITY warp_def 4, 5, 0, 7, FORTREE_CITY FortreeCity_House5_MapEvents:: @ 853109C - 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 acb1e9471..df4877663 100644 --- a/data/maps/events/FortreeCity_Mart.inc +++ b/data/maps/events/FortreeCity_Mart.inc @@ -1,13 +1,13 @@ -FortreeCity_Mart_MapObjects: @ 8530EAC - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 8, 5, 3, 2, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0, 0, 0 +FortreeCity_Mart_EventObjects: @ 8530EAC + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217666, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_217698, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 8, 5, 3, 2, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176A1, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, FortreeCity_Mart_EventScript_2176AA, 0, 0, 0 FortreeCity_Mart_MapWarps: @ 8530F0C warp_def 3, 7, 0, 3, FORTREE_CITY warp_def 4, 7, 0, 3, FORTREE_CITY FortreeCity_Mart_MapEvents:: @ 8530F1C - 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 922e825c7..b6b8cfdce 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: @ 8530D94 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 5, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_3, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0, 0, 0 +FortreeCity_PokemonCenter_1F_EventObjects: @ 8530D94 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173E7, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173F5, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 5, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_2173FE, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_217407, 0, 0, 0 FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4 warp_def 7, 8, 3, 0, FORTREE_CITY @@ -10,5 +10,5 @@ FortreeCity_PokemonCenter_1F_MapWarps: @ 8530DF4 warp_def 1, 6, 4, 0, FORTREE_CITY_POKEMON_CENTER_2F FortreeCity_PokemonCenter_1F_MapEvents:: @ 8530E0C - 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 e5a3f1ac4..c8f2356c4 100644 --- a/data/maps/events/FortreeCity_PokemonCenter_2F.inc +++ b/data/maps/events/FortreeCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -FortreeCity_PokemonCenter_2F_MapObjects: @ 8530E20 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +FortreeCity_PokemonCenter_2F_EventObjects: @ 8530E20 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80 warp_def 1, 6, 4, 2, FORTREE_CITY_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ FortreeCity_PokemonCenter_2F_MapWarps: @ 8530E80 warp_def 9, 1, 3, 0, TRADE_CENTER FortreeCity_PokemonCenter_2F_MapEvents:: @ 8530E98 - 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 1bad3837f..ed546c8df 100644 --- a/data/maps/events/GraniteCave_1F.inc +++ b/data/maps/events/GraniteCave_1F.inc @@ -1,6 +1,6 @@ -GraniteCave_1F_MapObjects: @ 85343BC - object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050, 0, 0 +GraniteCave_1F_EventObjects: @ 85343BC + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_22DA5E, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_291150, 1050, 0, 0 GraniteCave_1F_MapWarps: @ 85343EC warp_def 37, 12, 3, 0, ROUTE_106 @@ -9,5 +9,5 @@ GraniteCave_1F_MapWarps: @ 85343EC warp_def 5, 10, 3, 0, GRANITE_CAVE_STEVENS_ROOM GraniteCave_1F_MapEvents:: @ 853440C - 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 f5981fcbe..7f4e67f33 100644 --- a/data/maps/events/GraniteCave_B1F.inc +++ b/data/maps/events/GraniteCave_B1F.inc @@ -1,5 +1,5 @@ -GraniteCave_B1F_MapObjects: @ 8534420 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051, 0, 0 +GraniteCave_B1F_EventObjects: @ 8534420 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_29115D, 1051, 0, 0 GraniteCave_B1F_MapWarps: @ 8534438 warp_def 25, 13, 3, 1, GRANITE_CAVE_1F @@ -11,5 +11,5 @@ GraniteCave_B1F_MapWarps: @ 8534438 warp_def 29, 2, 3, 4, GRANITE_CAVE_B2F GraniteCave_B1F_MapEvents:: @ 8534470 - 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 ebc9467f4..7c484e9a9 100644 --- a/data/maps/events/GraniteCave_B2F.inc +++ b/data/maps/events/GraniteCave_B2F.inc @@ -1,13 +1,13 @@ -GraniteCave_B2F_MapObjects: @ 8534484 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 16, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 7, 12, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22, 0, 0 - object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 21, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23, 0, 0 +GraniteCave_B2F_EventObjects: @ 8534484 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_29116A, 1053, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_291177, 1054, 0, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 17, 0, 0 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 14, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 18, 0, 0 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 16, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 19, 0, 0 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 7, 12, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 20, 0, 0 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 21, 0, 0 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 22, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 22, 0, 0 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 21, 3, 1, 17, 0, 0, 0, GraniteCave_B2F_EventScript_2907A6, 23, 0, 0 GraniteCave_B2F_MapWarps: @ 853455C warp_def 29, 13, 3, 2, GRANITE_CAVE_B1F @@ -21,5 +21,5 @@ GraniteCave_B2F_MapBGEvents: @ 8534584 bg_event 15, 11, 3, 7, 0, ITEM_EVERSTONE, 49, 0 GraniteCave_B2F_MapEvents:: @ 853459C - 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 eca46cd79..65b343202 100644 --- a/data/maps/events/GraniteCave_StevensRoom.inc +++ b/data/maps/events/GraniteCave_StevensRoom.inc @@ -1,9 +1,9 @@ -GraniteCave_StevensRoom_MapObjects: @ 85345B0 - object_event 1, MAP_OBJ_GFX_STEVEN, 0, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833, 0, 0 +GraniteCave_StevensRoom_EventObjects: @ 85345B0 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_22DC7B, 833, 0, 0 GraniteCave_StevensRoom_MapWarps: @ 85345C8 warp_def 7, 3, 3, 3, GRANITE_CAVE_1F GraniteCave_StevensRoom_MapEvents:: @ 85345D0 - 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 3e888ec44..4cf23e63d 100644 --- a/data/maps/events/InsideOfTruck.inc +++ b/data/maps/events/InsideOfTruck.inc @@ -1,7 +1,7 @@ -InsideOfTruck_MapObjects: @ 853A078 - object_event 1, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MOVING_BOX, 0, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0 +InsideOfTruck_EventObjects: @ 853A078 + object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_23BF6C, 0, 0, 0 InsideOfTruck_MapWarps: @ 853A0C0 warp_def 4, 1, 0, 127, NONE @@ -21,5 +21,5 @@ InsideOfTruck_MapBGEvents: @ 853A108 bg_event 0, 2, 0, 0, 0, InsideOfTruck_EventScript_23BF6C InsideOfTruck_MapEvents:: @ 853A144 - 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 094852c5a..da1f94173 100644 --- a/data/maps/events/IslandCave.inc +++ b/data/maps/events/IslandCave.inc @@ -1,5 +1,5 @@ -IslandCave_MapObjects: @ 8536C74 - object_event 1, MAP_OBJ_GFX_REGICE, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936, 0, 0 +IslandCave_EventObjects: @ 8536C74 + object_event 1, EVENT_OBJ_GFX_REGICE, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_238F58, 936, 0, 0 IslandCave_MapWarps: @ 8536C8C warp_def 8, 29, 3, 0, ROUTE_105 @@ -12,5 +12,5 @@ IslandCave_MapBGEvents: @ 8536CA4 bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_238F1D IslandCave_MapEvents:: @ 8536CC8 - 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 cc862fed1..5d970924d 100644 --- a/data/maps/events/JaggedPass.inc +++ b/data/maps/events/JaggedPass.inc @@ -1,11 +1,11 @@ -JaggedPass_MapObjects: @ 8534AE4 - object_event 1, MAP_OBJ_GFX_HIKER, 0, 0, 10, 8, 3, 10, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_CAMPER, 0, 0, 16, 35, 3, 14, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070, 0, 0 - object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 9, 21, 3, 16, 17, 0, 1, 3, JaggedPass_EventScript_23079C, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 19, 3, 7, 17, 0, 0, 0, JaggedPass_EventScript_230718, 847, 0, 0 - object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 0, 14, 25, 3, 10, 17, 0, 1, 3, JaggedPass_EventScript_230871, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 18, 25, 3, 9, 17, 0, 1, 3, JaggedPass_EventScript_23085A, 0, 0, 0 +JaggedPass_EventObjects: @ 8534AE4 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 0, 10, 8, 3, 10, 0, 0, 1, 3, JaggedPass_EventScript_230785, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 0, 16, 35, 3, 14, 0, 0, 1, 4, JaggedPass_EventScript_2307FB, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_291184, 1070, 0, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 9, 21, 3, 16, 17, 0, 1, 3, JaggedPass_EventScript_23079C, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 19, 3, 7, 17, 0, 0, 0, JaggedPass_EventScript_230718, 847, 0, 0 + object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 0, 14, 25, 3, 10, 17, 0, 1, 3, JaggedPass_EventScript_230871, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 18, 25, 3, 9, 17, 0, 1, 3, JaggedPass_EventScript_23085A, 0, 0, 0 JaggedPass_MapWarps: @ 8534B8C warp_def 14, 40, 3, 2, ROUTE_112 @@ -31,5 +31,5 @@ JaggedPass_MapBGEvents: @ 8534C54 bg_event 7, 29, 3, 7, 0, ITEM_GREAT_BALL, 76, 0 JaggedPass_MapEvents:: @ 8534C6C - 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 0e16fc60c..658056768 100644 --- a/data/maps/events/LavaridgeTown.inc +++ b/data/maps/events/LavaridgeTown.inc @@ -1,13 +1,13 @@ -LavaridgeTown_MapObjects: @ 8527A54 - object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 10, 13, 3, 3, 32, 0, 0, 0, LavaridgeTown_EventScript_1EA720, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 0, 4, 4, 3, 18, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 0, 5, 4, 3, 17, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_GIDDY, 0, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, 930, 0, 0 - object_event 8, MAP_OBJ_GFX_HIPSTER, 0, 0, 12, 15, 0, 8, 0, 0, 0, 0, 0x0, 929, 0, 0 - object_event 9, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 7, 3, 8, 17, 0, 0, 0, LavaridgeTown_EventScript_1EA744, 0, 0, 0 +LavaridgeTown_EventObjects: @ 8527A54 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA73B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA70E, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA717, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 10, 13, 3, 3, 32, 0, 0, 0, LavaridgeTown_EventScript_1EA720, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 0, 4, 4, 3, 18, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA729, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 0, 5, 4, 3, 17, 0, 0, 0, 0, LavaridgeTown_EventScript_1EA732, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_GIDDY, 0, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, 930, 0, 0 + object_event 8, EVENT_OBJ_GFX_HIPSTER, 0, 0, 12, 15, 0, 8, 0, 0, 0, 0, 0x0, 929, 0, 0 + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 7, 3, 8, 17, 0, 0, 0, LavaridgeTown_EventScript_1EA744, 0, 0, 0 LavaridgeTown_MapWarps: @ 8527B2C warp_def 12, 15, 0, 0, LAVARIDGE_TOWN_HERB_SHOP @@ -31,5 +31,5 @@ LavaridgeTown_MapBGEvents: @ 8527B6C bg_event 4, 5, 3, 7, 0, ITEM_ICE_HEAL, 0, 0 LavaridgeTown_MapEvents:: @ 8527BCC - 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 a67522cb8..501cab67f 100644 --- a/data/maps/events/LavaridgeTown_Gym_1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_1F.inc @@ -1,10 +1,10 @@ -LavaridgeTown_Gym_1F_MapObjects: @ 852DE1C - object_event 1, MAP_OBJ_GFX_FLANNERY, 0, 0, 13, 9, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 3, 14, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 2, 15, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_6, 0, 0, 3, 10, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_GIRL_3, 0, 0, 5, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_2, 0, 0, 12, 16, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0, 0, 0 +LavaridgeTown_Gym_1F_EventObjects: @ 852DE1C + object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 0, 13, 9, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE78C, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 14, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE87F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 2, 15, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE900, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 10, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8AF, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1FE8E5, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 0, 12, 16, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_1FE96C, 0, 0, 0 LavaridgeTown_Gym_1F_MapWarps: @ 852DEAC warp_def 13, 18, 3, 1, LAVARIDGE_TOWN @@ -39,5 +39,5 @@ LavaridgeTown_Gym_1F_MapBGEvents: @ 852DF7C bg_event 16, 15, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_1FE99B LavaridgeTown_Gym_1F_MapEvents:: @ 852DF94 - 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_Gym_B1F.inc b/data/maps/events/LavaridgeTown_Gym_B1F.inc index 0c0c4adaa..af1f166ce 100644 --- a/data/maps/events/LavaridgeTown_Gym_B1F.inc +++ b/data/maps/events/LavaridgeTown_Gym_B1F.inc @@ -1,8 +1,8 @@ -LavaridgeTown_Gym_B1F_MapObjects: @ 852DFA8 - object_event 1, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 18, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 3, 6, 0, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_6, 0, 0, 13, 17, 0, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_HIKER, 0, 0, 4, 16, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0, 0, 0 +LavaridgeTown_Gym_B1F_EventObjects: @ 852DFA8 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 18, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE91B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 6, 0, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE8CA, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_6, 0, 0, 13, 17, 0, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE936, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 16, 3, 8, 17, 0, 3, 1, LavaridgeTown_Gym_B1F_EventScript_1FE951, 0, 0, 0 LavaridgeTown_Gym_B1F_MapWarps: @ 852E008 warp_def 10, 18, 3, 2, LAVARIDGE_TOWN_GYM_1F @@ -31,5 +31,5 @@ LavaridgeTown_Gym_B1F_MapWarps: @ 852E008 warp_def 12, 12, 3, 25, LAVARIDGE_TOWN_GYM_1F LavaridgeTown_Gym_B1F_MapEvents:: @ 852E0C8 - map_events LavaridgeTown_Gym_B1F_MapObjects, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 + map_events LavaridgeTown_Gym_B1F_EventObjects, LavaridgeTown_Gym_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/LavaridgeTown_HerbShop.inc b/data/maps/events/LavaridgeTown_HerbShop.inc index 76b5ac368..9fa4c6376 100644 --- a/data/maps/events/LavaridgeTown_HerbShop.inc +++ b/data/maps/events/LavaridgeTown_HerbShop.inc @@ -1,12 +1,12 @@ -LavaridgeTown_HerbShop_MapObjects: @ 852DDB0 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 7, 5, 3, 1, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 3, 5, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0, 0, 0 +LavaridgeTown_HerbShop_EventObjects: @ 852DDB0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4D7, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 7, 5, 3, 1, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE505, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 3, 3, 5, 17, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_1FE4FC, 0, 0, 0 LavaridgeTown_HerbShop_MapWarps: @ 852DDF8 warp_def 3, 7, 0, 0, LAVARIDGE_TOWN warp_def 4, 7, 0, 0, LAVARIDGE_TOWN LavaridgeTown_HerbShop_MapEvents:: @ 852DE08 - 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 82ae945b4..669728b66 100644 --- a/data/maps/events/LavaridgeTown_House.inc +++ b/data/maps/events/LavaridgeTown_House.inc @@ -1,12 +1,12 @@ -LavaridgeTown_House_MapObjects: @ 852E0DC - object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 4, 3, 2, 17, 0, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0, 0, 0 +LavaridgeTown_House_EventObjects: @ 852E0DC + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF912, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, LavaridgeTown_House_EventScript_1FF91B, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 4, 3, 2, 17, 0, 0, 0, LavaridgeTown_House_EventScript_2C804E, 0, 0, 0 LavaridgeTown_House_MapWarps: @ 852E124 warp_def 3, 7, 0, 4, LAVARIDGE_TOWN warp_def 4, 7, 0, 4, LAVARIDGE_TOWN LavaridgeTown_House_MapEvents:: @ 852E134 - 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 db9c02f5e..5230cead9 100644 --- a/data/maps/events/LavaridgeTown_Mart.inc +++ b/data/maps/events/LavaridgeTown_Mart.inc @@ -1,12 +1,12 @@ -LavaridgeTown_Mart_MapObjects: @ 852E148 - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0, 0, 0 +LavaridgeTown_Mart_EventObjects: @ 852E148 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9CE, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FF9FE, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1FFA07, 0, 0, 0 LavaridgeTown_Mart_MapWarps: @ 852E190 warp_def 3, 7, 0, 2, LAVARIDGE_TOWN warp_def 4, 7, 0, 2, LAVARIDGE_TOWN LavaridgeTown_Mart_MapEvents:: @ 852E1A0 - 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 11ed52f9a..8ebf9f16a 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: @ 852E1B4 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 0, 10, 6, 0, 9, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0, 0, 0 +LavaridgeTown_PokemonCenter_1F_EventObjects: @ 852E1B4 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB0E, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB1C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 10, 6, 0, 9, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB25, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_1FFB2E, 0, 0, 0 LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214 warp_def 7, 8, 3, 3, LAVARIDGE_TOWN @@ -11,5 +11,5 @@ LavaridgeTown_PokemonCenter_1F_MapWarps: @ 852E214 warp_def 2, 1, 0, 5, LAVARIDGE_TOWN LavaridgeTown_PokemonCenter_1F_MapEvents:: @ 852E234 - 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 dc0acec14..53fc2b2cc 100644 --- a/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc +++ b/data/maps/events/LavaridgeTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -LavaridgeTown_PokemonCenter_2F_MapObjects: @ 852E248 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +LavaridgeTown_PokemonCenter_2F_EventObjects: @ 852E248 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8 warp_def 1, 6, 4, 2, LAVARIDGE_TOWN_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ LavaridgeTown_PokemonCenter_2F_MapWarps: @ 852E2A8 warp_def 9, 1, 3, 0, TRADE_CENTER LavaridgeTown_PokemonCenter_2F_MapEvents:: @ 852E2C0 - 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 63aed18f8..c7578bec3 100644 --- a/data/maps/events/LilycoveCity.inc +++ b/data/maps/events/LilycoveCity.inc @@ -1,26 +1,26 @@ -LilycoveCity_MapObjects: @ 8526CE8 - object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 32, 20, 3, 3, 16, 0, 0, 0, LilycoveCity_EventScript_1E2C53, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 15, 18, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C2B, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_4, 0, 0, 21, 15, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C4A, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_2, 0, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 0, 35, 27, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C72, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852, 0, 0 - object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042, 0, 0 - object_event 12, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852, 0, 0 - object_event 13, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852, 0, 0 - object_event 14, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852, 0, 0 - object_event 15, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852, 0, 0 - object_event 16, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 50, 7, 5, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2BD8, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_HIPSTER, 0, 0, 27, 7, 5, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2DDE, 971, 0, 0 - object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 16, 23, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E302D, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_WOMAN_4, 0, 0, 41, 25, 3, 9, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CEE, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_MAN_2, 0, 0, 40, 25, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CDD, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_SAILOR, 0, 0, 16, 34, 3, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CCB, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_FAT_MAN, 0, 0, 16, 35, 3, 7, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CD4, 0, 0, 0 +LilycoveCity_EventObjects: @ 8526CE8 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 32, 20, 3, 3, 16, 0, 0, 0, LilycoveCity_EventScript_1E2C53, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 15, 18, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C2B, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C22, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 0, 21, 15, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C4A, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2C91, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 35, 27, 3, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2C72, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2C9A, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CA3, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1E2CAC, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2D7D, 852, 0, 0 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_2910E8, 1042, 0, 0 + object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_1E2DD5, 852, 0, 0 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DBA, 852, 0, 0 + object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DC3, 852, 0, 0 + object_event 15, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_1E2DCC, 852, 0, 0 + object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 50, 7, 5, 2, 17, 0, 0, 0, LilycoveCity_EventScript_1E2BD8, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_HIPSTER, 0, 0, 27, 7, 5, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2DDE, 971, 0, 0 + object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 16, 23, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E302D, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 41, 25, 3, 9, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CEE, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_MAN_2, 0, 0, 40, 25, 3, 10, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CDD, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_SAILOR, 0, 0, 16, 34, 3, 8, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CCB, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 16, 35, 3, 7, 17, 0, 0, 0, LilycoveCity_EventScript_1E2CD4, 0, 0, 0 LilycoveCity_MapWarps: @ 8526EF8 warp_def 27, 6, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_1F @@ -54,5 +54,5 @@ LilycoveCity_MapBGEvents: @ 8526F68 bg_event 64, 31, 0, 7, 0, ITEM_POKE_BALL, 75, 0 LilycoveCity_MapEvents:: @ 8527004 - 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 15501ebfd..c450b0cd3 100644 --- a/data/maps/events/LilycoveCity_ContestHall.inc +++ b/data/maps/events/LilycoveCity_ContestHall.inc @@ -1,36 +1,36 @@ -LilycoveCity_ContestHall_MapObjects: @ 8531850 - object_event 1, MAP_OBJ_GFX_BOY_1, 0, 0, 30, 30, 3, 2, 68, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_3, 0, 0, 11, 7, 3, 2, 51, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 40, 8, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MANIAC, 0, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_WOMAN_6, 0, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 24, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_WOMAN_7, 0, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_WOMAN_4, 0, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_WOMAN_5, 0, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 24, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_WOMAN_2, 0, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_WOMAN_3, 0, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_WOMAN_1, 0, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_MAN_1, 0, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_CAMPER, 0, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0, 0, 0 - object_event 23, MAP_OBJ_GFX_WOMAN_4, 0, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_BOY_2, 0, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_GIRL_2, 0, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_BOY_3, 0, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 40, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0, 0, 0 - object_event 29, MAP_OBJ_GFX_WOMAN_3, 0, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0, 0, 0 - object_event 30, MAP_OBJ_GFX_MAN_1, 0, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0, 0, 0 - object_event 31, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 42, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0, 0, 0 - object_event 32, MAP_OBJ_GFX_SAILOR, 0, 0, 23, 26, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0, 0, 0 +LilycoveCity_ContestHall_EventObjects: @ 8531850 + object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 0, 30, 30, 3, 2, 68, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B485, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 0, 11, 7, 3, 2, 51, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B48E, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 40, 8, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B497, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A9, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4C0, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4D7, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4EE, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B505, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B51C, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 24, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B533, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B56A, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B53C, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B581, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B598, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5AF, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 24, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5C6, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5DD, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B5F4, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B60B, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B639, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B622, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B553, 0, 0, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B650, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B667, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B67E, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B695, 0, 0, 0 + object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6AC, 0, 0, 0 + object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 40, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6C3, 0, 0, 0 + object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B6DA, 0, 0, 0 + object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B71C, 0, 0, 0 + object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 42, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B705, 0, 0, 0 + object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 0, 23, 26, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B4A0, 0, 0, 0 LilycoveCity_ContestHall_MapWarps: @ 8531B50 warp_def 19, 32, 0, 2, LILYCOVE_CITY_CONTEST_LOBBY @@ -47,5 +47,5 @@ LilycoveCity_ContestHall_MapBGEvents: @ 8531B70 bg_event 35, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_21B73C LilycoveCity_ContestHall_MapEvents:: @ 8531BB8 - 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 6fc324f76..c6e900a18 100644 --- a/data/maps/events/LilycoveCity_ContestLobby.inc +++ b/data/maps/events/LilycoveCity_ContestLobby.inc @@ -1,29 +1,29 @@ -LilycoveCity_ContestLobby_MapObjects: @ 8531534 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 14, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 15, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_5, 0, 0, 26, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ARTIST, 0, 0, 9, 1, 0, 1, 0, 0, 0, 0, 0x0, 774, 0, 0 - object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 18, 8, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_GIRL_2, 0, 0, 4, 9, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ARTIST, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_REPORTER_M, 0, 0, 13, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802, 0, 0 - object_event 9, MAP_OBJ_GFX_BOY_1, 0, 0, 23, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_ARTIST, 0, 0, 21, 1, 0, 8, 0, 0, 0, 0, 0x0, 895, 0, 0 - object_event 12, MAP_OBJ_GFX_FISHERMAN, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_FAT_MAN, 0, 0, 0, 8, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 7, 3, 3, 16, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_WOMAN_2, 0, 0, 22, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 5, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873, 0, 0 - object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 0, 24, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_MAN_6, 0, 0, 27, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832, 0, 0 - object_event 19, MAP_OBJ_GFX_CAMPER, 0, 0, 28, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832, 0, 0 - object_event 20, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 28, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832, 0, 0 - object_event 21, MAP_OBJ_GFX_SCIENTIST_2, 0, 0, 26, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832, 0, 0 - object_event 22, MAP_OBJ_GFX_WOMAN_1, 0, 0, 27, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832, 0, 0 - object_event 23, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832, 0, 0 - object_event 24, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 26, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832, 0, 0 - object_event 25, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 9, 10, 3, 10, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0, 0, 0 +LilycoveCity_ContestLobby_EventObjects: @ 8531534 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 14, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A554, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 15, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A806, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 26, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FA2, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 0, 9, 1, 0, 1, 0, 0, 0, 0, 0x0, 774, 0, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 18, 8, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A708, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 0, 4, 9, 3, 2, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A711, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A71A, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 0, 13, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_28CA59, 802, 0, 0 + object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 0, 23, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A768, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FB4, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 0, 21, 1, 0, 8, 0, 0, 0, 0, 0x0, 895, 0, 0 + object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A72C, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 0, 8, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A723, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 8, 7, 3, 3, 16, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A735, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 22, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FAB, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 26, 5, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_293FBD, 873, 0, 0 + object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 0, 24, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A771, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 0, 27, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7B3, 832, 0, 0 + object_event 19, EVENT_OBJ_GFX_CAMPER, 0, 0, 28, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7BE, 832, 0, 0 + object_event 20, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 28, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7C9, 832, 0, 0 + object_event 21, EVENT_OBJ_GFX_SCIENTIST_2, 0, 0, 26, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7D9, 832, 0, 0 + object_event 22, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 27, 7, 3, 7, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7E9, 832, 0, 0 + object_event 23, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A7A8, 832, 0, 0 + object_event 24, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 26, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A798, 832, 0, 0 + object_event 25, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 9, 10, 3, 10, 34, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21ACF1, 0, 0, 0 LilycoveCity_ContestLobby_MapWarps: @ 853178C warp_def 14, 11, 0, 4, LILYCOVE_CITY @@ -46,5 +46,5 @@ LilycoveCity_ContestLobby_MapBGEvents: @ 85317AC bg_event 18, 3, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_21A784 LilycoveCity_ContestLobby_MapEvents:: @ 853183C - 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 e765a7390..d3e5374ff 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: @ 8531134 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0, 0, 0 +LilycoveCity_CoveLilyMotel_1F_EventObjects: @ 8531134 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218189, 0, 0, 0 LilycoveCity_CoveLilyMotel_1F_MapWarps: @ 853114C warp_def 5, 8, 0, 1, LILYCOVE_CITY @@ -10,5 +10,5 @@ LilycoveCity_CoveLilyMotel_1F_MapCoordEvents: @ 8531164 coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_218211 LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 8531174 - 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 dfc0d3bd0..60016ffbf 100644 --- a/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/maps/events/LilycoveCity_CoveLilyMotel_2F.inc @@ -1,15 +1,15 @@ -LilycoveCity_CoveLilyMotel_2F_MapObjects: @ 8531188 - object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925, 0, 0 - object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 10, 3, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925, 0, 0 - object_event 5, MAP_OBJ_GFX_BOY_5, 0, 0, 7, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_3, 0, 0, 4, 4, 3, 9, 17, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925, 0, 0 - object_event 7, MAP_OBJ_GFX_SCOTT, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787, 0, 0 +LilycoveCity_CoveLilyMotel_2F_EventObjects: @ 8531188 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_2186D3, 925, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218729, 925, 0, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218732, 925, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 10, 3, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218720, 925, 0, 0 + object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 0, 7, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_218744, 925, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 4, 4, 3, 9, 17, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21873B, 925, 0, 0 + object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_21874D, 787, 0, 0 LilycoveCity_CoveLilyMotel_2F_MapWarps: @ 8531230 warp_def 2, 1, 0, 2, LILYCOVE_CITY_COVE_LILY_MOTEL_1F LilycoveCity_CoveLilyMotel_2F_MapEvents:: @ 8531238 - 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 6c572ce4d..d9d6b469e 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreElevator.inc @@ -1,10 +1,10 @@ -LilycoveCity_DepartmentStoreElevator_MapObjects: @ 85324B0 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0, 0, 0 +LilycoveCity_DepartmentStoreElevator_EventObjects: @ 85324B0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_220624, 0, 0, 0 LilycoveCity_DepartmentStoreElevator_MapWarps: @ 85324C8 warp_def 1, 5, 3, 127, NONE warp_def 2, 5, 3, 127, NONE LilycoveCity_DepartmentStoreElevator_MapEvents:: @ 85324D8 - 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 eb0ee1a96..7a234183d 100644 --- a/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/maps/events/LilycoveCity_DepartmentStoreRooftop.inc @@ -1,8 +1,8 @@ -LilycoveCity_DepartmentStoreRooftop_MapObjects: @ 853241C - object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 0, 6, 1, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 15, 5, 3, 8, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0, 0, 0 +LilycoveCity_DepartmentStoreRooftop_EventObjects: @ 853241C + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220268, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22028C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 0, 6, 1, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_22022F, 962, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 15, 5, 3, 8, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186, 0, 0, 0 LilycoveCity_DepartmentStoreRooftop_MapWarps: @ 853247C warp_def 13, 3, 0, 2, LILYCOVE_CITY_DEPARTMENT_STORE_5F @@ -12,5 +12,5 @@ LilycoveCity_DepartmentStoreRooftop_MapBGEvents: @ 8532484 bg_event 10, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_220295 LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 853249C - 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 10fb7f16e..ad7d79ac5 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: @ 853208C - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 0, 2, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0, 0, 0 +LilycoveCity_DepartmentStore_1F_EventObjects: @ 853208C + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F693, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F69C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F82F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F838, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F841, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 2, 6, 3, 1, 17, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F84A, 0, 0, 0 LilycoveCity_DepartmentStore_1F_MapWarps: @ 853211C warp_def 8, 7, 0, 0, LILYCOVE_CITY @@ -16,5 +16,5 @@ LilycoveCity_DepartmentStore_1F_MapBGEvents: @ 853213C bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_21F85D LilycoveCity_DepartmentStore_1F_MapEvents:: @ 8532148 - 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 95c4daee0..29169a491 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: @ 853215C - object_event 1, MAP_OBJ_GFX_COOK, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SAILOR, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 10, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0, 0, 0 +LilycoveCity_DepartmentStore_2F_EventObjects: @ 853215C + object_event 1, EVENT_OBJ_GFX_COOK, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB2D, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB36, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB3F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 10, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB7A, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_21FB48, 0, 0, 0 LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4 warp_def 16, 1, 0, 2, LILYCOVE_CITY_DEPARTMENT_STORE_1F @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_2F_MapWarps: @ 85321D4 warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_2F_MapEvents:: @ 85321EC - 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 d51060bba..ff372e132 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: @ 8532200 - object_event 1, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 7, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0, 0, 0 +LilycoveCity_DepartmentStore_3F_EventObjects: @ 8532200 + object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCB6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 7, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCBF, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 13, 5, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FCC8, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC65, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_21FC8C, 0, 0, 0 LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278 warp_def 13, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_2F @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_3F_MapWarps: @ 8532278 warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_3F_MapEvents:: @ 8532290 - 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 4b2f0f00c..ba97f6a98 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: @ 85322A4 - object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 0, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0, 0, 0 +LilycoveCity_DepartmentStore_4F_EventObjects: @ 85322A4 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 0, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDEB, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDF4, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FDFD, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE06, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_21FE2C, 0, 0, 0 LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C warp_def 16, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_3F @@ -11,5 +11,5 @@ LilycoveCity_DepartmentStore_4F_MapWarps: @ 853231C warp_def 2, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_4F_MapEvents:: @ 8532334 - 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 f459b4764..85a6e871a 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: @ 8532348 - object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 7, 3, 17, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_4, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_4, 0, 0, 15, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_4, 0, 0, 17, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 0, 9, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0, 0, 0 +LilycoveCity_DepartmentStore_5F_EventObjects: @ 8532348 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 1, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_2200BC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 7, 3, 17, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22006C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFA6, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_21FFDC, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 15, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22000A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 17, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_22003A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 9, 5, 3, 10, 17, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_220075, 0, 0, 0 LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0 warp_def 13, 1, 0, 1, LILYCOVE_CITY_DEPARTMENT_STORE_4F @@ -13,5 +13,5 @@ LilycoveCity_DepartmentStore_5F_MapWarps: @ 85323F0 warp_def 16, 1, 0, 0, LILYCOVE_CITY_DEPARTMENT_STORE_ROOFTOP LilycoveCity_DepartmentStore_5F_MapEvents:: @ 8532408 - 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 f2088e9d2..d12e31646 100644 --- a/data/maps/events/LilycoveCity_Harbor.inc +++ b/data/maps/events/LilycoveCity_Harbor.inc @@ -1,14 +1,14 @@ -LilycoveCity_Harbor_MapObjects: @ 8531E1C - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908, 0, 0 - object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 861, 0, 0 - object_event 3, MAP_OBJ_GFX_SAILOR, 0, 0, 3, 13, 3, 2, 17, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SAILOR, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, 909, 0, 0 - object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 10, 3, 8, 17, 0, 0, 0, 0x0, 748, 0, 0 +LilycoveCity_Harbor_EventObjects: @ 8531E1C + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E00F, 908, 0, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 861, 0, 0 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 0, 3, 13, 3, 2, 17, 0, 0, 0, LilycoveCity_Harbor_EventScript_21E637, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, 909, 0, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 8, 10, 3, 8, 17, 0, 0, 0, 0x0, 748, 0, 0 LilycoveCity_Harbor_MapWarps: @ 8531E94 warp_def 11, 14, 0, 12, LILYCOVE_CITY warp_def 12, 14, 0, 12, LILYCOVE_CITY LilycoveCity_Harbor_MapEvents:: @ 8531EA4 - 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 1edca4904..f4bef7d8b 100644 --- a/data/maps/events/LilycoveCity_House1.inc +++ b/data/maps/events/LilycoveCity_House1.inc @@ -1,11 +1,11 @@ -LilycoveCity_House1_MapObjects: @ 8531EF4 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0, 0, 0 +LilycoveCity_House1_EventObjects: @ 8531EF4 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House1_EventScript_21ECCE, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_21ECD7, 0, 0, 0 LilycoveCity_House1_MapWarps: @ 8531F24 warp_def 3, 8, 0, 8, LILYCOVE_CITY warp_def 4, 8, 0, 8, LILYCOVE_CITY LilycoveCity_House1_MapEvents:: @ 8531F34 - 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 2321844fa..36f9f50b2 100644 --- a/data/maps/events/LilycoveCity_House2.inc +++ b/data/maps/events/LilycoveCity_House2.inc @@ -1,10 +1,10 @@ -LilycoveCity_House2_MapObjects: @ 8531F48 - object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0, 0, 0 +LilycoveCity_House2_EventObjects: @ 8531F48 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_21ED75, 0, 0, 0 LilycoveCity_House2_MapWarps: @ 8531F60 warp_def 2, 7, 0, 9, LILYCOVE_CITY warp_def 3, 7, 0, 9, LILYCOVE_CITY LilycoveCity_House2_MapEvents:: @ 8531F70 - 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 05b36263a..f7b2e561b 100644 --- a/data/maps/events/LilycoveCity_House3.inc +++ b/data/maps/events/LilycoveCity_House3.inc @@ -1,15 +1,15 @@ -LilycoveCity_House3_MapObjects: @ 8531F84 - object_event 1, MAP_OBJ_GFX_BOY_5, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_5, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_5, 0, 0, 2, 5, 3, 7, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BOY_5, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 7, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0, 0, 0 +LilycoveCity_House3_EventObjects: @ 8531F84 + object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 0, 3, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF3D, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_21EE4B, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EED5, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 0, 2, 5, 3, 7, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EF09, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 0, 2, 3, 3, 8, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EEA1, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 5, 3, 9, 17, 0, 0, 0, LilycoveCity_House3_EventScript_21EE8A, 0, 0, 0 LilycoveCity_House3_MapWarps: @ 8532014 warp_def 3, 7, 0, 10, LILYCOVE_CITY warp_def 4, 7, 0, 10, LILYCOVE_CITY LilycoveCity_House3_MapEvents:: @ 8532024 - 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 9212c1e0e..ebf845f91 100644 --- a/data/maps/events/LilycoveCity_House4.inc +++ b/data/maps/events/LilycoveCity_House4.inc @@ -1,11 +1,11 @@ -LilycoveCity_House4_MapObjects: @ 8532038 - object_event 1, MAP_OBJ_GFX_MAN_5, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0, 0, 0 +LilycoveCity_House4_EventObjects: @ 8532038 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5B5, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, LilycoveCity_House4_EventScript_21F5BE, 0, 0, 0 LilycoveCity_House4_MapWarps: @ 8532068 warp_def 3, 8, 0, 11, LILYCOVE_CITY warp_def 4, 8, 0, 11, LILYCOVE_CITY LilycoveCity_House4_MapEvents:: @ 8532078 - 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 36b9b5ac2..297db7979 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: @ 853124C - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775, 0, 0 - object_event 3, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 13, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ARTIST, 0, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_5, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 0, 11, 3, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776, 0, 0 - object_event 8, MAP_OBJ_GFX_ARTIST, 0, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779, 0, 0 - object_event 9, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 2, 3, 2, 34, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780, 0, 0 - object_event 10, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778, 0, 0 +LilycoveCity_LilycoveMuseum_1F_EventObjects: @ 853124C + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CB9, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218CC2, 775, 0, 0 + object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 13, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DF5, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DFE, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E07, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E10, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 11, 3, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E19, 776, 0, 0 + object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E2B, 779, 0, 0 + object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 2, 3, 2, 34, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E42, 780, 0, 0 + object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 2, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218E22, 778, 0, 0 LilycoveCity_LilycoveMuseum_1F_MapWarps: @ 853133C warp_def 9, 13, 0, 3, LILYCOVE_CITY @@ -34,5 +34,5 @@ LilycoveCity_LilycoveMuseum_1F_MapBGEvents: @ 8531354 bg_event 16, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_218DEC LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 8531414 - 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 829db7b36..3e85e20a1 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: @ 8531428 - object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 19, 10, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_4, 0, 0, 14, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780, 0, 0 +LilycoveCity_LilycoveMuseum_2F_EventObjects: @ 8531428 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219866, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 19, 10, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21998A, 777, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_219993, 780, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 0, 14, 6, 3, 2, 17, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_21999C, 780, 0, 0 LilycoveCity_LilycoveMuseum_2F_MapWarps: @ 8531488 warp_def 13, 1, 0, 2, LILYCOVE_CITY_LILYCOVE_MUSEUM_1F @@ -22,5 +22,5 @@ LilycoveCity_LilycoveMuseum_2F_MapBGEvents: @ 8531490 bg_event 15, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_218DDA LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8531520 - 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 1b5f4bda5..3f89c8aa9 100644 --- a/data/maps/events/LilycoveCity_MoveDeletersHouse.inc +++ b/data/maps/events/LilycoveCity_MoveDeletersHouse.inc @@ -1,10 +1,10 @@ -LilycoveCity_MoveDeletersHouse_MapObjects: @ 8531EB8 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0, 0, 0 +LilycoveCity_MoveDeletersHouse_EventObjects: @ 8531EB8 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_21EA0B, 0, 0, 0 LilycoveCity_MoveDeletersHouse_MapWarps: @ 8531ED0 warp_def 3, 7, 0, 7, LILYCOVE_CITY warp_def 4, 7, 0, 7, LILYCOVE_CITY LilycoveCity_MoveDeletersHouse_MapEvents:: @ 8531EE0 - 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 ba8988b96..741866843 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_1F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ -LilycoveCity_PokemonCenter_1F_MapObjects: @ 8531BCC - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_1, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_HIPSTER, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_TRADER, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993, 0, 0 +LilycoveCity_PokemonCenter_1F_EventObjects: @ 8531BCC + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5E8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5F6, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_21C5FF, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 0, 1, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A836B, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_TRADER, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_2A89C7, 993, 0, 0 LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44 warp_def 7, 8, 3, 2, LILYCOVE_CITY @@ -11,5 +11,5 @@ LilycoveCity_PokemonCenter_1F_MapWarps: @ 8531C44 warp_def 1, 6, 4, 0, LILYCOVE_CITY_POKEMON_CENTER_2F LilycoveCity_PokemonCenter_1F_MapEvents:: @ 8531C5C - 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 024b56427..b8bd67368 100644 --- a/data/maps/events/LilycoveCity_PokemonCenter_2F.inc +++ b/data/maps/events/LilycoveCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -LilycoveCity_PokemonCenter_2F_MapObjects: @ 8531C70 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +LilycoveCity_PokemonCenter_2F_EventObjects: @ 8531C70 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0 warp_def 1, 6, 4, 2, LILYCOVE_CITY_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ LilycoveCity_PokemonCenter_2F_MapWarps: @ 8531CD0 warp_def 9, 1, 3, 0, TRADE_CENTER LilycoveCity_PokemonCenter_2F_MapEvents:: @ 8531CE8 - 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 886927d3e..427d8bc42 100644 --- a/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/maps/events/LilycoveCity_PokemonTrainerFanClub.inc @@ -1,18 +1,18 @@ -LilycoveCity_PokemonTrainerFanClub_MapObjects: @ 8531D20 - object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791, 0, 0 - object_event 6, MAP_OBJ_GFX_BOY_2, 0, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790, 0, 0 - object_event 7, MAP_OBJ_GFX_WOMAN_4, 0, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792, 0, 0 - object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 10, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789, 0, 0 - object_event 9, MAP_OBJ_GFX_BOY_1, 0, 0, 11, 5, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730, 0, 0 +LilycoveCity_PokemonTrainerFanClub_EventObjects: @ 8531D20 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA8E, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CA17, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB05, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CB7C, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CBF3, 791, 0, 0 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CC55, 790, 0, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CCB7, 792, 0, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 10, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD19, 789, 0, 0 + object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 0, 11, 5, 3, 8, 17, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B, 730, 0, 0 LilycoveCity_PokemonTrainerFanClub_MapWarps: @ 8531DF8 warp_def 6, 13, 0, 5, LILYCOVE_CITY warp_def 5, 13, 0, 5, LILYCOVE_CITY LilycoveCity_PokemonTrainerFanClub_MapEvents:: @ 8531E08 - 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 248ca948d..641c1bdd1 100644 --- a/data/maps/events/LinkContestRoom1.inc +++ b/data/maps/events/LinkContestRoom1.inc @@ -1,18 +1,18 @@ -LinkContestRoom1_MapObjects: @ 8539EFC - object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_CONTEST_JUDGE, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_HIPSTER, 0, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_TRADER, 0, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_STORYTELLER, 0, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 +LinkContestRoom1_EventObjects: @ 8539EFC + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_TRADER, 0, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 7, 246, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 8, 247, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 9, 248, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 10, 249, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 object_event 11, 250, 0, 0, 12, 5, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, 86, 0, 0 - object_event 14, MAP_OBJ_GFX_GIDDY, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_ARTIST, 0, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, 86, 0, 0 + object_event 14, EVENT_OBJ_GFX_GIDDY, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 LinkContestRoom1_MapEvents:: @ 853A064 diff --git a/data/maps/events/LittlerootTown.inc b/data/maps/events/LittlerootTown.inc index 763391b09..7a2ed7c9f 100644 --- a/data/maps/events/LittlerootTown.inc +++ b/data/maps/events/LittlerootTown.inc @@ -1,12 +1,12 @@ -LittlerootTown_MapObjects: @ 85276A8 - object_event 1, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 16, 10, 3, 2, 33, 0, 0, 0, LittlerootTown_EventScript_1E8034, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 12, 13, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E8022, 868, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 14, 17, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E802B, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MOM, 0, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752, 0, 0 - object_event 5, MAP_OBJ_GFX_TRUCK, 0, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, 761, 0, 0 - object_event 6, MAP_OBJ_GFX_TRUCK, 0, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, 762, 0, 0 - object_event 7, MAP_OBJ_GFX_HIPSTER, 0, 0, 13, 10, 3, 7, 17, 0, 0, 0, 0x0, 794, 0, 0 - object_event 8, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 14, 10, 3, 7, 17, 0, 0, 0, 0x0, 795, 0, 0 +LittlerootTown_EventObjects: @ 85276A8 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 16, 10, 3, 2, 33, 0, 0, 0, LittlerootTown_EventScript_1E8034, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 12, 13, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E8022, 868, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 14, 17, 3, 2, 18, 0, 0, 0, LittlerootTown_EventScript_1E802B, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MOM, 0, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_1E863D, 752, 0, 0 + object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, 761, 0, 0 + object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, 762, 0, 0 + object_event 7, EVENT_OBJ_GFX_HIPSTER, 0, 0, 13, 10, 3, 7, 17, 0, 0, 0, 0x0, 794, 0, 0 + object_event 8, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 14, 10, 3, 7, 17, 0, 0, 0, 0x0, 795, 0, 0 LittlerootTown_MapWarps: @ 8527768 warp_def 14, 8, 0, 1, LITTLEROOT_TOWN_MAYS_HOUSE_1F @@ -31,5 +31,5 @@ LittlerootTown_MapBGEvents: @ 8527810 bg_event 12, 8, 3, 0, 0, LittlerootTown_EventScript_1E818F LittlerootTown_MapEvents:: @ 8527840 - 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 6f6fc9df4..f97d49985 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_1F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_1F.inc @@ -1,11 +1,11 @@ -LittlerootTown_BrendansHouse_1F_MapObjects: @ 852D08C - object_event 1, MAP_OBJ_GFX_MOM, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758, 0, 0 - object_event 2, MAP_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 0, 1, 3, 3, 28, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755, 0, 0 - object_event 3, MAP_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 0, 4, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 2, 7, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784, 0, 0 - object_event 5, MAP_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 9, 17, 0, 0, 0, 0x0, 734, 0, 0 - object_event 6, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735, 0, 0 - object_event 7, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, 0x0, 745, 0, 0 +LittlerootTown_BrendansHouse_1F_EventObjects: @ 852D08C + object_event 1, EVENT_OBJ_GFX_MOM, 0, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_2929C5, 758, 0, 0 + object_event 2, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 0, 1, 3, 3, 28, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ACD, 755, 0, 0 + object_event 3, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 0, 4, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_292ABA, 754, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 2, 7, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F89F3, 784, 0, 0 + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 9, 17, 0, 0, 0, 0x0, 734, 0, 0 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 5, 3, 5, 17, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F8A3D, 735, 0, 0 + object_event 7, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, 0x0, 745, 0, 0 LittlerootTown_BrendansHouse_1F_MapWarps: @ 852D134 warp_def 9, 8, 0, 1, LITTLEROOT_TOWN @@ -19,5 +19,5 @@ LittlerootTown_BrendansHouse_1F_MapCoordEvents: @ 852D14C coord_event 9, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_BrendansHouse_1F_EventScript_1F78D6 LittlerootTown_BrendansHouse_1F_MapEvents:: @ 852D18C - 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 af470cca5..d7733b800 100644 --- a/data/maps/events/LittlerootTown_BrendansHouse_2F.inc +++ b/data/maps/events/LittlerootTown_BrendansHouse_2F.inc @@ -1,20 +1,20 @@ -LittlerootTown_BrendansHouse_2F_MapObjects: @ 852D1A0 - object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 4, 1, 0, 0, 0, 0, 0x0, 179, 0, 0 +LittlerootTown_BrendansHouse_2F_EventObjects: @ 852D1A0 + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F94C1, 760, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 4, 1, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 2, 3, 1, 0, 0, 0, 0, 0x0, 182, 0, 0 object_event 11, 249, 0, 0, 1, 3, 3, 1, 0, 0, 0, 0, 0x0, 183, 0, 0 object_event 12, 250, 0, 0, 1, 4, 3, 1, 0, 0, 0, 0, 0x0, 184, 0, 0 object_event 13, 251, 0, 0, 1, 5, 0, 1, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, MAP_OBJ_GFX_MOM, 0, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0 - object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817, 0, 0 - object_event 16, MAP_OBJ_GFX_SWABLU_DOLL, 0, 0, 5, 5, 3, 1, 17, 0, 0, 0, 0x0, 815, 0, 0 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0 + object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F8481, 817, 0, 0 + object_event 16, EVENT_OBJ_GFX_SWABLU_DOLL, 0, 0, 5, 5, 3, 1, 17, 0, 0, 0, 0x0, 815, 0, 0 LittlerootTown_BrendansHouse_2F_MapWarps: @ 852D320 warp_def 7, 1, 0, 2, LITTLEROOT_TOWN_BRENDANS_HOUSE_1F @@ -26,5 +26,5 @@ LittlerootTown_BrendansHouse_2F_MapBGEvents: @ 852D328 bg_event 3, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1F865F LittlerootTown_BrendansHouse_2F_MapEvents:: @ 852D358 - 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 68bf13bcd..ccee2d442 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_1F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_1F.inc @@ -1,11 +1,11 @@ -LittlerootTown_MaysHouse_1F_MapObjects: @ 852D36C - object_event 1, MAP_OBJ_GFX_MOM, 0, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759, 0, 0 - object_event 2, MAP_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 0, 6, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754, 0, 0 - object_event 3, MAP_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 0, 9, 3, 3, 27, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 8, 7, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785, 0, 0 - object_event 5, MAP_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, 0x0, 734, 0, 0 - object_event 6, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 5, 3, 5, 17, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736, 0, 0 - object_event 7, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 746, 0, 0 +LittlerootTown_MaysHouse_1F_EventObjects: @ 852D36C + object_event 1, EVENT_OBJ_GFX_MOM, 0, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_2929C5, 759, 0, 0 + object_event 2, EVENT_OBJ_GFX_VIGAROTH_FACING_AWAY, 0, 0, 6, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ABA, 754, 0, 0 + object_event 3, EVENT_OBJ_GFX_VIGAROTH_CARRYING_BOX, 0, 0, 9, 3, 3, 27, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_292ACD, 755, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 8, 7, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F89F3, 785, 0, 0 + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 0, 5, 6, 3, 10, 17, 0, 0, 0, 0x0, 734, 0, 0 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 5, 3, 5, 17, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A3D, 736, 0, 0 + object_event 7, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 746, 0, 0 LittlerootTown_MaysHouse_1F_MapWarps: @ 852D414 warp_def 1, 8, 0, 0, LITTLEROOT_TOWN @@ -19,5 +19,5 @@ LittlerootTown_MaysHouse_1F_MapCoordEvents: @ 852D42C coord_event 3, 3, 0, 0, VAR_0x408D, 2, 0, LittlerootTown_MaysHouse_1F_EventScript_1F8A7F LittlerootTown_MaysHouse_1F_MapEvents:: @ 852D46C - 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 4d26b70d7..40d0f45dc 100644 --- a/data/maps/events/LittlerootTown_MaysHouse_2F.inc +++ b/data/maps/events/LittlerootTown_MaysHouse_2F.inc @@ -1,20 +1,20 @@ -LittlerootTown_MaysHouse_2F_MapObjects: @ 852D480 - object_event 1, MAP_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 1, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 6, 3, 1, 0, 0, 0, 0, 0x0, 179, 0, 0 +LittlerootTown_MaysHouse_2F_EventObjects: @ 852D480 + object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 0, 1, 1, 0, 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F94C1, 722, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 5, 6, 3, 1, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 7, 3, 1, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 7, 3, 1, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 2, 7, 3, 1, 0, 0, 0, 0, 0x0, 182, 0, 0 object_event 11, 249, 0, 0, 3, 7, 3, 1, 0, 0, 0, 0, 0x0, 183, 0, 0 object_event 12, 250, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, 0x0, 184, 0, 0 object_event 13, 251, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, 0x0, 185, 0, 0 - object_event 14, MAP_OBJ_GFX_MOM, 0, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0 - object_event 15, MAP_OBJ_GFX_PICHU_DOLL, 0, 0, 3, 4, 4, 8, 17, 0, 0, 0, 0x0, 849, 0, 0 - object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818, 0, 0 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, 757, 0, 0 + object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 0, 3, 4, 4, 8, 17, 0, 0, 0, 0x0, 849, 0, 0 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 4, 0, 1, 17, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1F9334, 818, 0, 0 LittlerootTown_MaysHouse_2F_MapWarps: @ 852D600 warp_def 1, 1, 0, 2, LITTLEROOT_TOWN_MAYS_HOUSE_1F @@ -26,5 +26,5 @@ LittlerootTown_MaysHouse_2F_MapBGEvents: @ 852D608 bg_event 8, 1, 0, 0, 0, gUnknown_081F9553 LittlerootTown_MaysHouse_2F_MapEvents:: @ 852D638 - 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 cd004bcb7..7930d0f63 100644 --- a/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/maps/events/LittlerootTown_ProfessorBirchsLab.inc @@ -1,10 +1,10 @@ -LittlerootTown_ProfessorBirchsLab_MapObjects: @ 852D64C - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 8, 3, 2, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721, 0, 0 - object_event 3, MAP_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838, 0, 0 +LittlerootTown_ProfessorBirchsLab_EventObjects: @ 852D64C + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 8, 3, 2, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A, 721, 0, 0 + object_event 3, EVENT_OBJ_GFX_HIPSTER, 0, 0, 7, 4, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC, 889, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB, 811, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF, 812, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 8, 3, 8, 17, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA023, 838, 0, 0 LittlerootTown_ProfessorBirchsLab_MapWarps: @ 852D6DC warp_def 6, 12, 0, 2, LITTLEROOT_TOWN @@ -28,5 +28,5 @@ LittlerootTown_ProfessorBirchsLab_MapBGEvents: @ 852D6EC bg_event 11, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 852D7A0 - 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 33a8a4aa0..d590a6c98 100644 --- a/data/maps/events/MagmaHideout_1F.inc +++ b/data/maps/events/MagmaHideout_1F.inc @@ -1,10 +1,10 @@ -MagmaHideout_1F_MapObjects: @ 85371CC - object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 4, 5, 0, 10, 17, 0, 1, 2, MagmaHideout_1F_EventScript_23988C, 857, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 20, 0, 1, 17, 0, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151, 0, 0 - object_event 3, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 30, 20, 3, 9, 17, 0, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19, 0, 0 +MagmaHideout_1F_EventObjects: @ 85371CC + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 4, 5, 0, 10, 17, 0, 1, 2, MagmaHideout_1F_EventScript_23988C, 857, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 20, 0, 1, 17, 0, 0, 0, MagmaHideout_1F_EventScript_2914DE, 1151, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 30, 20, 3, 9, 17, 0, 1, 4, MagmaHideout_1F_EventScript_2398A3, 857, 0, 0 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 17, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 22, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 18, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 23, 3, 1, 0, 0, 0, 0, MagmaHideout_1F_EventScript_2908BA, 19, 0, 0 MagmaHideout_1F_MapWarps: @ 853725C warp_def 10, 34, 3, 4, JAGGED_PASS @@ -13,5 +13,5 @@ MagmaHideout_1F_MapWarps: @ 853725C warp_def 20, 22, 0, 0, MAGMA_HIDEOUT_2F_3R MagmaHideout_1F_MapEvents:: @ 853727C - 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_2F_1R.inc b/data/maps/events/MagmaHideout_2F_1R.inc index 4ac6e0fde..eb2cca275 100644 --- a/data/maps/events/MagmaHideout_2F_1R.inc +++ b/data/maps/events/MagmaHideout_2F_1R.inc @@ -1,8 +1,8 @@ -MagmaHideout_2F_1R_MapObjects: @ 8537290 - object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 18, 19, 3, 51, 69, 0, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857, 0, 0 - object_event 2, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 14, 3, 46, 103, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857, 0, 0 - object_event 3, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 8, 3, 10, 17, 0, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857, 0, 0 - object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 11, 3, 7, 17, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857, 0, 0 +MagmaHideout_2F_1R_EventObjects: @ 8537290 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 18, 19, 3, 51, 69, 0, 1, 1, MagmaHideout_2F_1R_EventScript_239B7F, 857, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 14, 3, 46, 103, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B96, 857, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 8, 3, 10, 17, 0, 1, 7, MagmaHideout_2F_1R_EventScript_239B51, 857, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 11, 3, 7, 17, 0, 1, 3, MagmaHideout_2F_1R_EventScript_239B68, 857, 0, 0 MagmaHideout_2F_1R_MapWarps: @ 85372F0 warp_def 11, 23, 0, 0, MAGMA_HIDEOUT_2F_2R @@ -10,5 +10,5 @@ MagmaHideout_2F_1R_MapWarps: @ 85372F0 warp_def 17, 33, 3, 2, MAGMA_HIDEOUT_3F_1R MagmaHideout_2F_1R_MapEvents:: @ 8537308 - map_events MagmaHideout_2F_1R_MapObjects, MagmaHideout_2F_1R_MapWarps, 0x0, 0x0 + map_events MagmaHideout_2F_1R_EventObjects, MagmaHideout_2F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_2F_2R.inc b/data/maps/events/MagmaHideout_2F_2R.inc index 845da88b2..7d8fb6808 100644 --- a/data/maps/events/MagmaHideout_2F_2R.inc +++ b/data/maps/events/MagmaHideout_2F_2R.inc @@ -1,15 +1,15 @@ -MagmaHideout_2F_2R_MapObjects: @ 853731C - object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 29, 8, 3, 9, 17, 0, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857, 0, 0 - object_event 2, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 25, 11, 3, 10, 17, 0, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 21, 7, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164, 0, 0 - object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 9, 3, 8, 17, 0, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857, 0, 0 - object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 7, 13, 3, 10, 17, 0, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165, 0, 0 +MagmaHideout_2F_2R_EventObjects: @ 853731C + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 29, 8, 3, 9, 17, 0, 1, 7, MagmaHideout_2F_2R_EventScript_239E4D, 857, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 25, 11, 3, 10, 17, 0, 1, 2, MagmaHideout_2F_2R_EventScript_239E36, 857, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 21, 7, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914EB, 1164, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 9, 3, 8, 17, 0, 1, 4, MagmaHideout_2F_2R_EventScript_239E1F, 857, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 7, 13, 3, 10, 17, 0, 1, 1, MagmaHideout_2F_2R_EventScript_239E08, 857, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 17, 0, 0, 0, MagmaHideout_2F_2R_EventScript_2914F8, 1165, 0, 0 MagmaHideout_2F_2R_MapWarps: @ 85373AC warp_def 10, 22, 3, 0, MAGMA_HIDEOUT_2F_1R warp_def 36, 4, 0, 2, MAGMA_HIDEOUT_1F MagmaHideout_2F_2R_MapEvents:: @ 85373BC - map_events MagmaHideout_2F_2R_MapObjects, MagmaHideout_2F_2R_MapWarps, 0x0, 0x0 + map_events MagmaHideout_2F_2R_EventObjects, MagmaHideout_2F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_3F_1R.inc b/data/maps/events/MagmaHideout_3F_1R.inc index 07a53f4fb..4d95b38c0 100644 --- a/data/maps/events/MagmaHideout_3F_1R.inc +++ b/data/maps/events/MagmaHideout_3F_1R.inc @@ -1,7 +1,7 @@ -MagmaHideout_3F_1R_MapObjects: @ 85373D0 - object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 2, 7, 4, 10, 17, 0, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857, 0, 0 - object_event 2, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 21, 21, 0, 9, 17, 0, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 9, 16, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166, 0, 0 +MagmaHideout_3F_1R_EventObjects: @ 85373D0 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 2, 7, 4, 10, 17, 0, 1, 5, MagmaHideout_3F_1R_EventScript_23A1B3, 857, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 21, 21, 0, 9, 17, 0, 1, 4, MagmaHideout_3F_1R_EventScript_23A1CA, 857, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 16, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_1R_EventScript_291505, 1166, 0, 0 MagmaHideout_3F_1R_MapWarps: @ 8537418 warp_def 7, 21, 0, 0, MAGMA_HIDEOUT_4F @@ -9,5 +9,5 @@ MagmaHideout_3F_1R_MapWarps: @ 8537418 warp_def 23, 3, 0, 2, MAGMA_HIDEOUT_2F_1R MagmaHideout_3F_1R_MapEvents:: @ 8537430 - map_events MagmaHideout_3F_1R_MapObjects, MagmaHideout_3F_1R_MapWarps, 0x0, 0x0 + map_events MagmaHideout_3F_1R_EventObjects, MagmaHideout_3F_1R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_3F_2R.inc b/data/maps/events/MagmaHideout_3F_2R.inc index faeacbd12..f653cb151 100644 --- a/data/maps/events/MagmaHideout_3F_2R.inc +++ b/data/maps/events/MagmaHideout_3F_2R.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_2R_MapObjects: @ 8537444 - object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 3, 0, 17, 17, 0, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 9, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167, 0, 0 +MagmaHideout_3F_2R_EventObjects: @ 8537444 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 16, 3, 0, 17, 17, 0, 1, 3, MagmaHideout_3F_2R_EventScript_23A3D5, 857, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 9, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_2R_EventScript_291512, 1167, 0, 0 MagmaHideout_3F_2R_MapWarps: @ 8537474 warp_def 12, 15, 0, 1, MAGMA_HIDEOUT_3F_1R MagmaHideout_3F_2R_MapEvents:: @ 853747C - map_events MagmaHideout_3F_2R_MapObjects, MagmaHideout_3F_2R_MapWarps, 0x0, 0x0 + map_events MagmaHideout_3F_2R_EventObjects, MagmaHideout_3F_2R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_3F_3R.inc b/data/maps/events/MagmaHideout_3F_3R.inc index 386696d9c..b662de7d9 100644 --- a/data/maps/events/MagmaHideout_3F_3R.inc +++ b/data/maps/events/MagmaHideout_3F_3R.inc @@ -1,10 +1,10 @@ -MagmaHideout_3F_3R_MapObjects: @ 8537574 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 9, 19, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059, 0, 0 +MagmaHideout_3F_3R_EventObjects: @ 8537574 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 19, 0, 1, 17, 0, 0, 0, MagmaHideout_3F_3R_EventScript_29152C, 1059, 0, 0 MagmaHideout_3F_3R_MapWarps: @ 853758C warp_def 16, 1, 0, 1, MAGMA_HIDEOUT_2F_3R warp_def 16, 21, 0, 1, MAGMA_HIDEOUT_4F MagmaHideout_3F_3R_MapEvents:: @ 853759C - map_events MagmaHideout_3F_3R_MapObjects, MagmaHideout_3F_3R_MapWarps, 0x0, 0x0 + map_events MagmaHideout_3F_3R_EventObjects, MagmaHideout_3F_3R_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MagmaHideout_4F.inc b/data/maps/events/MagmaHideout_4F.inc index 545eeea92..221775788 100644 --- a/data/maps/events/MagmaHideout_4F.inc +++ b/data/maps/events/MagmaHideout_4F.inc @@ -1,17 +1,17 @@ -MagmaHideout_4F_MapObjects: @ 8537490 - object_event 1, MAP_OBJ_GFX_GROUDON_1, 0, 0, 16, 17, 0, 8, 17, 0, 0, 0, 0x0, 853, 0, 0 - object_event 2, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 31, 22, 0, 10, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857, 0, 0 - object_event 3, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 30, 13, 0, 9, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857, 0, 0 - object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 13, 0, 10, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857, 0, 0 - object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 4, 0, 8, 17, 0, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857, 0, 0 - object_event 6, MAP_OBJ_GFX_MAXIE, 0, 0, 16, 21, 0, 7, 17, 0, 0, 0, MagmaHideout_4F_EventScript_23A560, 857, 0, 0 - object_event 7, MAP_OBJ_GFX_GROUDON_2, 0, 0, 16, 17, 3, 8, 17, 0, 0, 0, 0x0, 850, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 0, 1, 17, 0, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168, 0, 0 +MagmaHideout_4F_EventObjects: @ 8537490 + object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 0, 16, 17, 0, 8, 17, 0, 0, 0, 0x0, 853, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 31, 22, 0, 10, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A68C, 857, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 30, 13, 0, 9, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A6A3, 857, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 13, 0, 10, 17, 0, 1, 3, MagmaHideout_4F_EventScript_23A6BA, 857, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 4, 0, 8, 17, 0, 1, 4, MagmaHideout_4F_EventScript_23A6D1, 857, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAXIE, 0, 0, 16, 21, 0, 7, 17, 0, 0, 0, MagmaHideout_4F_EventScript_23A560, 857, 0, 0 + object_event 7, EVENT_OBJ_GFX_GROUDON_2, 0, 0, 16, 17, 3, 8, 17, 0, 0, 0, 0x0, 850, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 7, 0, 1, 17, 0, 0, 0, MagmaHideout_4F_EventScript_29151F, 1168, 0, 0 MagmaHideout_4F_MapWarps: @ 8537550 warp_def 46, 7, 0, 0, MAGMA_HIDEOUT_3F_1R warp_def 20, 21, 0, 1, MAGMA_HIDEOUT_3F_3R MagmaHideout_4F_MapEvents:: @ 8537560 - map_events MagmaHideout_4F_MapObjects, MagmaHideout_4F_MapWarps, 0x0, 0x0 + map_events MagmaHideout_4F_EventObjects, MagmaHideout_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MarineCave_End.inc b/data/maps/events/MarineCave_End.inc index ad11733e1..b9f6bb020 100644 --- a/data/maps/events/MarineCave_End.inc +++ b/data/maps/events/MarineCave_End.inc @@ -1,5 +1,5 @@ -MarineCave_End_MapObjects: @ 85377E8 - object_event 1, MAP_OBJ_GFX_KYOGRE_1, 0, 0, 9, 22, 1, 8, 17, 0, 0, 0, 0x0, 782, 0, 0 +MarineCave_End_EventObjects: @ 85377E8 + object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 0, 9, 22, 1, 8, 17, 0, 0, 0, 0x0, 782, 0, 0 MarineCave_End_MapWarps: @ 8537800 warp_def 20, 4, 0, 0, MARINE_CAVE_ENTRANCE @@ -8,5 +8,5 @@ MarineCave_End_MapCoordEvents: @ 8537808 coord_event 9, 26, 3, 0, VAR_TEMP_1, 1, 0, MarineCave_End_EventScript_23B01B MarineCave_End_MapEvents:: @ 8537818 - map_events MarineCave_End_MapObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0 + map_events MarineCave_End_EventObjects, MarineCave_End_MapWarps, MarineCave_End_MapCoordEvents, 0x0 diff --git a/data/maps/events/MauvilleCity.inc b/data/maps/events/MauvilleCity.inc index c6da0eb61..6d89267c6 100644 --- a/data/maps/events/MauvilleCity.inc +++ b/data/maps/events/MauvilleCity.inc @@ -1,15 +1,15 @@ -MauvilleCity_MapObjects: @ 852662C - object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 29, 16, 3, 5, 17, 0, 0, 0, MauvilleCity_EventScript_1DF3B3, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_4, 0, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WALLY, 0, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804, 0, 0 - object_event 7, MAP_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805, 0, 0 - object_event 8, MAP_OBJ_GFX_WATTSON, 0, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912, 0, 0 - object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 28, 19, 3, 1, 17, 0, 0, 0, MauvilleCity_EventScript_2910CE, 1116, 0, 0 - object_event 10, MAP_OBJ_GFX_FAT_MAN, 0, 0, 13, 7, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_SCOTT, 0, 0, 12, 14, 3, 7, 0, 0, 0, 0, 0x0, 765, 0, 0 +MauvilleCity_EventObjects: @ 852662C + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 0, 29, 16, 3, 5, 17, 0, 0, 0, MauvilleCity_EventScript_1DF3B3, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_1DF3CE, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3BC, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3C5, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_1DF3FB, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_WALLY, 0, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_1DF452, 804, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_1DF41D, 805, 0, 0 + object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_1DF73A, 912, 0, 0 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 28, 19, 3, 1, 17, 0, 0, 0, MauvilleCity_EventScript_2910CE, 1116, 0, 0 + object_event 10, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 13, 7, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_2C7F7E, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_SCOTT, 0, 0, 12, 14, 3, 7, 0, 0, 0, 0, 0x0, 765, 0, 0 MauvilleCity_MapWarps: @ 8526734 warp_def 8, 5, 0, 0, MAUVILLE_CITY_GYM @@ -31,5 +31,5 @@ MauvilleCity_MapBGEvents: @ 852676C bg_event 11, 15, 0, 0, 0, MauvilleCity_EventScript_1DF3F2 MauvilleCity_MapEvents:: @ 85267CC - 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 e8e3ef7be..0252834f4 100644 --- a/data/maps/events/MauvilleCity_BikeShop.inc +++ b/data/maps/events/MauvilleCity_BikeShop.inc @@ -1,6 +1,6 @@ -MauvilleCity_BikeShop_MapObjects: @ 852FE80 - object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 7, 6, 3, 2, 17, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0, 0, 0 +MauvilleCity_BikeShop_EventObjects: @ 852FE80 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EBBC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 6, 3, 2, 17, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20ED31, 0, 0, 0 MauvilleCity_BikeShop_MapWarps: @ 852FEB0 warp_def 3, 8, 0, 2, MAUVILLE_CITY @@ -11,5 +11,5 @@ MauvilleCity_BikeShop_MapBGEvents: @ 852FEC0 bg_event 11, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_20EDAE MauvilleCity_BikeShop_MapEvents:: @ 852FED8 - 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 1a84504f5..57e34caad 100644 --- a/data/maps/events/MauvilleCity_GameCorner.inc +++ b/data/maps/events/MauvilleCity_GameCorner.inc @@ -1,16 +1,16 @@ -MauvilleCity_GameCorner_MapObjects: @ 852FF28 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BEAUTY, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_GIRL_2, 0, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_3, 0, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 20, 8, 3, 9, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_COOK, 0, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BEAUTY, 0, 0, 13, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_MAN_4, 0, 0, 1, 7, 3, 10, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_MANIAC, 0, 0, 9, 8, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 6, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0, 0, 0 +MauvilleCity_GameCorner_EventObjects: @ 852FF28 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210125, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21012E, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FBB9, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FCF1, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210137, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_21021D, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 20, 8, 3, 9, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210279, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_COOK, 0, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210289, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 0, 13, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_20FE9F, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 0, 1, 7, 3, 10, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_210299, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 0, 9, 8, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102B6, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 6, 3, 9, 17, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2102C6, 0, 0, 0 MauvilleCity_GameCorner_MapWarps: @ 8530048 warp_def 11, 10, 3, 5, MAUVILLE_CITY @@ -43,5 +43,5 @@ MauvilleCity_GameCorner_MapBGEvents: @ 8530058 bg_event 19, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_2A5ADF MauvilleCity_GameCorner_MapEvents:: @ 8530178 - 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 44ae41601..c493d4b8b 100644 --- a/data/maps/events/MauvilleCity_Gym.inc +++ b/data/maps/events/MauvilleCity_Gym.inc @@ -1,11 +1,11 @@ -MauvilleCity_Gym_MapObjects: @ 852FD5C - object_event 1, MAP_OBJ_GFX_WATTSON, 0, 0, 5, 2, 0, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 7, 8, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 1, 16, 0, 7, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 5, 10, 0, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 1, 13, 0, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_2, 0, 0, 7, 20, 0, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MANIAC, 0, 0, 7, 10, 3, 7, 17, 0, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0, 0, 0 +MauvilleCity_Gym_EventObjects: @ 852FD5C + object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 0, 5, 2, 0, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20DEEB, 913, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 8, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_20E0D0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 1, 16, 0, 7, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0FE, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 5, 10, 0, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0E7, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 1, 13, 0, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_20E0B9, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 0, 7, 20, 0, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_20E12C, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 0, 7, 10, 3, 7, 17, 0, 1, 1, MauvilleCity_Gym_EventScript_20E115, 0, 0, 0 MauvilleCity_Gym_MapWarps: @ 852FE04 warp_def 4, 20, 0, 0, MAUVILLE_CITY @@ -22,5 +22,5 @@ MauvilleCity_Gym_MapBGEvents: @ 852FE54 bg_event 6, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_20E15B MauvilleCity_Gym_MapEvents:: @ 852FE6C - 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 9b30d3119..1a1f241b5 100644 --- a/data/maps/events/MauvilleCity_House1.inc +++ b/data/maps/events/MauvilleCity_House1.inc @@ -1,10 +1,10 @@ -MauvilleCity_House1_MapObjects: @ 852FEEC - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0, 0, 0 +MauvilleCity_House1_EventObjects: @ 852FEEC + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_20F976, 0, 0, 0 MauvilleCity_House1_MapWarps: @ 852FF04 warp_def 3, 7, 0, 4, MAUVILLE_CITY warp_def 4, 7, 0, 4, MAUVILLE_CITY MauvilleCity_House1_MapEvents:: @ 852FF14 - 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 5328de49f..a51483770 100644 --- a/data/maps/events/MauvilleCity_House2.inc +++ b/data/maps/events/MauvilleCity_House2.inc @@ -1,10 +1,10 @@ -MauvilleCity_House2_MapObjects: @ 853018C - object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0, 0, 0 +MauvilleCity_House2_EventObjects: @ 853018C + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_210C5D, 0, 0, 0 MauvilleCity_House2_MapWarps: @ 85301A4 warp_def 3, 8, 0, 6, MAUVILLE_CITY warp_def 4, 8, 0, 6, MAUVILLE_CITY MauvilleCity_House2_MapEvents:: @ 85301B4 - 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 257d047cd..866c0c311 100644 --- a/data/maps/events/MauvilleCity_Mart.inc +++ b/data/maps/events/MauvilleCity_Mart.inc @@ -1,12 +1,12 @@ -MauvilleCity_Mart_MapObjects: @ 8530310 - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0, 0, 0 +MauvilleCity_Mart_EventObjects: @ 8530310 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_2110E6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_21111C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_211125, 0, 0, 0 MauvilleCity_Mart_MapWarps: @ 8530358 warp_def 3, 7, 0, 3, MAUVILLE_CITY warp_def 4, 7, 0, 3, MAUVILLE_CITY MauvilleCity_Mart_MapEvents:: @ 8530368 - 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 725e52ef3..b8b7ed7d6 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: @ 85301C8 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 0, 8, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 0, 11, 4, 3, 3, 16, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 2, 8, 3, 1, 17, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0, 0, 0 +MauvilleCity_PokemonCenter_1F_EventObjects: @ 85301C8 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E78, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_28E066, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 8, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E86, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 11, 4, 3, 3, 16, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E8F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 2, 8, 3, 1, 17, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_210E98, 0, 0, 0 MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240 warp_def 7, 8, 3, 1, MAUVILLE_CITY @@ -11,5 +11,5 @@ MauvilleCity_PokemonCenter_1F_MapWarps: @ 8530240 warp_def 1, 6, 4, 0, MAUVILLE_CITY_POKEMON_CENTER_2F MauvilleCity_PokemonCenter_1F_MapEvents:: @ 8530258 - 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 9e5cb6e81..9e8de4b75 100644 --- a/data/maps/events/MauvilleCity_PokemonCenter_2F.inc +++ b/data/maps/events/MauvilleCity_PokemonCenter_2F.inc @@ -1,9 +1,9 @@ -MauvilleCity_PokemonCenter_2F_MapObjects: @ 853026C - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 - object_event 5, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0, 0, 0 +MauvilleCity_PokemonCenter_2F_EventObjects: @ 853026C + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 + object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 8, 8, 3, 7, 17, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_21102F, 0, 0, 0 MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4 warp_def 1, 6, 4, 2, MAUVILLE_CITY_POKEMON_CENTER_1F @@ -11,5 +11,5 @@ MauvilleCity_PokemonCenter_2F_MapWarps: @ 85302E4 warp_def 9, 1, 3, 0, TRADE_CENTER MauvilleCity_PokemonCenter_2F_MapEvents:: @ 85302FC - 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 29ecbf043..76eb4f6dd 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: @ 8533F74 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 14, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 5, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 26, 32, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047, 0, 0 - object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, 939, 0, 0 - object_event 6, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, 939, 0, 0 - object_event 7, MAP_OBJ_GFX_ARCHIE, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0 - object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0 - object_event 9, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, 938, 0, 0 - object_event 10, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942, 0, 0 +MeteorFalls_1F_1R_EventObjects: @ 8533F74 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911AB, 1044, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 14, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911C5, 1046, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 5, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911B8, 1045, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 32, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_2911D2, 1047, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, 939, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, 939, 0, 0 + object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, 938, 0, 0 + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, 938, 0, 0 + object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_22BF25, 942, 0, 0 MeteorFalls_1F_1R_MapWarps: @ 8534064 warp_def 27, 18, 4, 0, ROUTE_114 @@ -25,5 +25,5 @@ MeteorFalls_1F_1R_MapBGEvents: @ 85340A4 bg_event 9, 58, 0, 0, 0, 0x0 MeteorFalls_1F_1R_MapEvents:: @ 85340B0 - 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 180b4f722..1a85565fa 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: @ 85340C4 - object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 13, 2, 3, 8, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0, 0, 0 +MeteorFalls_1F_2R_EventObjects: @ 85340C4 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 13, 2, 3, 8, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C4DE, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C540, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 7, 12, 3, 8, 17, 0, 1, 1, MeteorFalls_1F_2R_EventScript_22C5A4, 0, 0, 0 MeteorFalls_1F_2R_MapWarps: @ 853410C warp_def 10, 29, 3, 2, METEOR_FALLS_1F_1R @@ -13,5 +13,5 @@ MeteorFalls_1F_2R_MapBGEvents: @ 853412C bg_event 9, 58, 0, 0, 0, 0x0 MeteorFalls_1F_2R_MapEvents:: @ 8534138 - 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 e208273cf..454946506 100644 --- a/data/maps/events/MeteorFalls_B1F_2R.inc +++ b/data/maps/events/MeteorFalls_B1F_2R.inc @@ -1,9 +1,9 @@ -MeteorFalls_B1F_2R_MapObjects: @ 8534190 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 3, 1, 17, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080, 0, 0 +MeteorFalls_B1F_2R_EventObjects: @ 8534190 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 3, 3, 1, 17, 0, 0, 0, MeteorFalls_B1F_2R_EventScript_2911DF, 1080, 0, 0 MeteorFalls_B1F_2R_MapWarps: @ 85341A8 warp_def 5, 15, 3, 3, METEOR_FALLS_B1F_1R MeteorFalls_B1F_2R_MapEvents:: @ 85341B0 - 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/MeteorFalls_StevensCave.inc b/data/maps/events/MeteorFalls_StevensCave.inc index e9f3d0db6..e66dda119 100644 --- a/data/maps/events/MeteorFalls_StevensCave.inc +++ b/data/maps/events/MeteorFalls_StevensCave.inc @@ -1,9 +1,9 @@ -MeteorFalls_StevensCave_MapObjects: @ 85378B0 - object_event 1, MAP_OBJ_GFX_STEVEN, 0, 0, 19, 3, 3, 7, 17, 0, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0, 0, 0 +MeteorFalls_StevensCave_EventObjects: @ 85378B0 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 19, 3, 3, 7, 17, 0, 0, 0, MeteorFalls_StevensCave_EventScript_23B182, 0, 0, 0 MeteorFalls_StevensCave_MapWarps: @ 85378C8 warp_def 10, 29, 3, 5, METEOR_FALLS_1F_1R MeteorFalls_StevensCave_MapEvents:: @ 85378D0 - map_events MeteorFalls_StevensCave_MapObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0 + map_events MeteorFalls_StevensCave_EventObjects, MeteorFalls_StevensCave_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MirageTower_3F.inc b/data/maps/events/MirageTower_3F.inc index 956965d5f..fe6a0f73f 100644 --- a/data/maps/events/MirageTower_3F.inc +++ b/data/maps/events/MirageTower_3F.inc @@ -1,11 +1,11 @@ -MirageTower_3F_MapObjects: @ 853761C - object_event 1, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 7, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 8, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 18, 0, 0 +MirageTower_3F_EventObjects: @ 853761C + object_event 1, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 7, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 17, 0, 0 + object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 4, 8, 3, 1, 17, 0, 0, 0, MirageTower_3F_EventScript_2907A6, 18, 0, 0 MirageTower_3F_MapWarps: @ 853764C warp_def 18, 12, 3, 0, MIRAGE_TOWER_2F warp_def 2, 4, 0, 0, MIRAGE_TOWER_4F MirageTower_3F_MapEvents:: @ 853765C - map_events MirageTower_3F_MapObjects, MirageTower_3F_MapWarps, 0x0, 0x0 + map_events MirageTower_3F_EventObjects, MirageTower_3F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MirageTower_4F.inc b/data/maps/events/MirageTower_4F.inc index 1042dc803..4d07ff4c3 100644 --- a/data/maps/events/MirageTower_4F.inc +++ b/data/maps/events/MirageTower_4F.inc @@ -1,11 +1,11 @@ -MirageTower_4F_MapObjects: @ 8537670 - object_event 1, MAP_OBJ_GFX_FOSSIL, 0, 0, 5, 4, 4, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD48, 963, 0, 0 - object_event 2, MAP_OBJ_GFX_FOSSIL, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD89, 964, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, MirageTower_4F_EventScript_2907A6, 17, 0, 0 +MirageTower_4F_EventObjects: @ 8537670 + object_event 1, EVENT_OBJ_GFX_FOSSIL, 0, 0, 5, 4, 4, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD48, 963, 0, 0 + object_event 2, EVENT_OBJ_GFX_FOSSIL, 0, 0, 7, 4, 0, 8, 17, 0, 0, 0, MirageTower_4F_EventScript_23AD89, 964, 0, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 6, 7, 3, 1, 17, 0, 0, 0, MirageTower_4F_EventScript_2907A6, 17, 0, 0 MirageTower_4F_MapWarps: @ 85376B8 warp_def 1, 4, 3, 1, MIRAGE_TOWER_3F MirageTower_4F_MapEvents:: @ 85376C0 - map_events MirageTower_4F_MapObjects, MirageTower_4F_MapWarps, 0x0, 0x0 + map_events MirageTower_4F_EventObjects, MirageTower_4F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/MossdeepCity.inc b/data/maps/events/MossdeepCity.inc index d048ecb5d..a5dfb9df9 100644 --- a/data/maps/events/MossdeepCity.inc +++ b/data/maps/events/MossdeepCity.inc @@ -1,21 +1,21 @@ -MossdeepCity_MapObjects: @ 8527018 - object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 38, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AD1, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 32, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AB2, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 21, 5, 3, 16, 0, 0, 0, MossdeepCity_EventScript_1E4AF0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_GIRL_1, 0, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043, 0, 0 - object_event 7, MAP_OBJ_GFX_MAN_1, 0, 0, 55, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_WOMAN_1, 0, 0, 56, 21, 7, 10, 17, 0, 0, 0, MossdeepCity_EventScript_1E4B0B, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BOY_2, 0, 0, 23, 13, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4C26, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 23, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0 - object_event 11, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 24, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0 - object_event 12, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 25, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0 - object_event 13, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 26, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0 - object_event 14, MAP_OBJ_GFX_MAXIE, 0, 0, 45, 25, 5, 9, 17, 0, 0, 0, 0x0, 823, 0, 0 - object_event 15, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 19, 25, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_2C81EE, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_SCOTT, 0, 0, 61, 29, 5, 17, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788, 0, 0 - object_event 17, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 31, 29, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_1E4C7C, 0, 0, 0 +MossdeepCity_EventObjects: @ 8527018 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 38, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AD1, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_1E4AF9, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 32, 12, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4AB2, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 26, 21, 5, 3, 16, 0, 0, 0, MossdeepCity_EventScript_1E4AF0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_1E4B02, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_2910F5, 1043, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 0, 55, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C10, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 56, 21, 7, 10, 17, 0, 0, 0, MossdeepCity_EventScript_1E4B0B, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 0, 23, 13, 5, 2, 17, 0, 0, 0, MossdeepCity_EventScript_1E4C26, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 23, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0 + object_event 11, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 24, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0 + object_event 12, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 25, 5, 8, 17, 0, 0, 0, 0x0, 823, 0, 0 + object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 44, 26, 5, 7, 17, 0, 0, 0, 0x0, 823, 0, 0 + object_event 14, EVENT_OBJ_GFX_MAXIE, 0, 0, 45, 25, 5, 9, 17, 0, 0, 0, 0x0, 823, 0, 0 + object_event 15, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 19, 25, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_2C81EE, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_SCOTT, 0, 0, 61, 29, 5, 17, 0, 0, 0, 0, MossdeepCity_EventScript_1E4C85, 788, 0, 0 + object_event 17, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 31, 29, 3, 64, 51, 0, 0, 0, MossdeepCity_EventScript_1E4C7C, 0, 0, 0 MossdeepCity_MapWarps: @ 85271B0 warp_def 28, 9, 0, 0, MOSSDEEP_CITY_HOUSE_1 @@ -52,5 +52,5 @@ MossdeepCity_MapBGEvents: @ 85272A0 bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_1E4B14 MossdeepCity_MapEvents:: @ 8527300 - 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 c4477a44b..cbcb8b76f 100644 --- a/data/maps/events/MossdeepCity_GameCorner_1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_1F.inc @@ -1,6 +1,6 @@ -MossdeepCity_GameCorner_1F_MapObjects: @ 8532F40 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0, 0, 0 +MossdeepCity_GameCorner_1F_EventObjects: @ 8532F40 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B54, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_224B4B, 0, 0, 0 MossdeepCity_GameCorner_1F_MapWarps: @ 8532F70 warp_def 5, 9, 0, 9, MOSSDEEP_CITY @@ -13,5 +13,5 @@ MossdeepCity_GameCorner_1F_MapBGEvents: @ 8532F88 bg_event 1, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_277E96 MossdeepCity_GameCorner_1F_MapEvents:: @ 8532FAC - 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 ed9b4f660..a043926a7 100644 --- a/data/maps/events/MossdeepCity_GameCorner_B1F.inc +++ b/data/maps/events/MossdeepCity_GameCorner_B1F.inc @@ -1,9 +1,9 @@ -MossdeepCity_GameCorner_B1F_MapObjects: @ 8532FC0 - object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 +MossdeepCity_GameCorner_B1F_EventObjects: @ 8532FC0 + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0, 0, 0 MossdeepCity_GameCorner_B1F_MapWarps: @ 8532FD8 warp_def 3, 1, 0, 2, MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_GameCorner_B1F_MapEvents:: @ 8532FE0 - 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 57a717638..2a152d8f6 100644 --- a/data/maps/events/MossdeepCity_Gym.inc +++ b/data/maps/events/MossdeepCity_Gym.inc @@ -1,40 +1,40 @@ -MossdeepCity_Gym_MapObjects: @ 85324EC - object_event 1, MAP_OBJ_GFX_TATE, 0, 0, 23, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 30, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 5, 20, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 4, 29, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_LASS, 0, 0, 4, 23, 0, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 9, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_LASS, 0, 0, 6, 3, 0, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MAN_2, 0, 0, 5, 33, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_LIZA, 0, 0, 24, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 2, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 1, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 21, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 7, 9, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 9, 8, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 7, 5, 3, 10, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 23, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 33, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 22, 25, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 26, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_LASS, 0, 0, 25, 25, 0, 9, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 22, 23, 3, 8, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0, 0, 0 - object_event 29, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 30, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 31, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 22, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 32, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 25, 22, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0, 0, 0 - object_event 33, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 34, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 35, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 36, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 25, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 +MossdeepCity_Gym_EventObjects: @ 85324EC + object_event 1, EVENT_OBJ_GFX_TATE, 0, 0, 23, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 30, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220AFD, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 5, 20, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B2B, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 4, 29, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B70, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_LASS, 0, 0, 4, 23, 0, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B59, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 6, 9, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B14, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 0, 6, 3, 0, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_220B42, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 0, 5, 33, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220C11, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_LIZA, 0, 0, 24, 7, 0, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_220898, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 2, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 1, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 30, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 29, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 5, 21, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 7, 9, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 9, 8, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B9E, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 7, 5, 3, 10, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220B87, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 6, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 11, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 23, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 33, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 12, 34, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 22, 25, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BCC, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 26, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 27, EVENT_OBJ_GFX_LASS, 0, 0, 25, 25, 0, 9, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BB5, 0, 0, 0 + object_event 28, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 22, 23, 3, 8, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BFA, 0, 0, 0 + object_event 29, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 30, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 21, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 31, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 22, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 32, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 25, 22, 3, 7, 17, 0, 1, 1, MossdeepCity_Gym_EventScript_220BE3, 0, 0, 0 + object_event 33, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 22, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 34, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 24, 23, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 35, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 6, 5, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 36, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 23, 25, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 MossdeepCity_Gym_MapWarps: @ 853284C warp_def 6, 35, 3, 1, MOSSDEEP_CITY @@ -68,5 +68,5 @@ MossdeepCity_Gym_MapBGEvents: @ 853294C bg_event 8, 34, 0, 1, 0, MossdeepCity_Gym_EventScript_220C43 MossdeepCity_Gym_MapEvents:: @ 8532964 - 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 c83a09c5c..bddde5c81 100644 --- a/data/maps/events/MossdeepCity_House1.inc +++ b/data/maps/events/MossdeepCity_House1.inc @@ -1,11 +1,11 @@ -MossdeepCity_House1_MapObjects: @ 8532978 - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 3, 3, 3, 3, 17, 0, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0, 0, 0 +MossdeepCity_House1_EventObjects: @ 8532978 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 3, 3, 3, 3, 17, 0, 0, 0, MossdeepCity_House1_EventScript_221FD6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_222006, 0, 0, 0 MossdeepCity_House1_MapWarps: @ 85329A8 warp_def 3, 7, 0, 0, MOSSDEEP_CITY warp_def 4, 7, 0, 0, MOSSDEEP_CITY MossdeepCity_House1_MapEvents:: @ 85329B8 - 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 08ab80348..e8e120c77 100644 --- a/data/maps/events/MossdeepCity_House2.inc +++ b/data/maps/events/MossdeepCity_House2.inc @@ -1,12 +1,12 @@ -MossdeepCity_House2_MapObjects: @ 85329CC - object_event 1, MAP_OBJ_GFX_MAN_5, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WINGULL, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934, 0, 0 +MossdeepCity_House2_EventObjects: @ 85329CC + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220DF, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220E8, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_2220F1, 934, 0, 0 MossdeepCity_House2_MapWarps: @ 8532A14 warp_def 3, 8, 0, 3, MOSSDEEP_CITY warp_def 4, 8, 0, 3, MOSSDEEP_CITY MossdeepCity_House2_MapEvents:: @ 8532A24 - 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 21c008770..5fec469e8 100644 --- a/data/maps/events/MossdeepCity_House3.inc +++ b/data/maps/events/MossdeepCity_House3.inc @@ -1,10 +1,10 @@ -MossdeepCity_House3_MapObjects: @ 8532BD4 - object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0, 0, 0 +MossdeepCity_House3_EventObjects: @ 8532BD4 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_2225C3, 0, 0, 0 MossdeepCity_House3_MapWarps: @ 8532BEC warp_def 3, 7, 0, 5, MOSSDEEP_CITY warp_def 4, 7, 0, 5, MOSSDEEP_CITY MossdeepCity_House3_MapEvents:: @ 8532BFC - 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 76245850f..923bbe86d 100644 --- a/data/maps/events/MossdeepCity_House4.inc +++ b/data/maps/events/MossdeepCity_House4.inc @@ -1,12 +1,12 @@ -MossdeepCity_House4_MapObjects: @ 8532CAC - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 6, 3, 5, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SKITTY, 0, 0, 2, 4, 3, 1, 17, 0, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0, 0, 0 +MossdeepCity_House4_EventObjects: @ 8532CAC + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_222DD8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 6, 3, 5, 1, 0, 0, 0, MossdeepCity_House4_EventScript_222DF7, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 0, 2, 4, 3, 1, 17, 0, 0, 0, MossdeepCity_House4_EventScript_222E1E, 0, 0, 0 MossdeepCity_House4_MapWarps: @ 8532CF4 warp_def 4, 7, 0, 7, MOSSDEEP_CITY warp_def 3, 7, 0, 7, MOSSDEEP_CITY MossdeepCity_House4_MapEvents:: @ 8532D04 - 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 4a49376ba..c8bbd0a41 100644 --- a/data/maps/events/MossdeepCity_Mart.inc +++ b/data/maps/events/MossdeepCity_Mart.inc @@ -1,13 +1,13 @@ -MossdeepCity_Mart_MapObjects: @ 8532B50 - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_2, 0, 0, 8, 3, 3, 3, 16, 0, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SAILOR, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, MossdeepCity_Mart_EventScript_222408, 0, 0, 0 +MossdeepCity_Mart_EventObjects: @ 8532B50 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223C8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_2223F6, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 0, 8, 3, 3, 3, 16, 0, 0, 0, MossdeepCity_Mart_EventScript_2223FF, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 0, 5, 3, 3, 2, 17, 0, 0, 0, MossdeepCity_Mart_EventScript_222408, 0, 0, 0 MossdeepCity_Mart_MapWarps: @ 8532BB0 warp_def 3, 7, 0, 4, MOSSDEEP_CITY warp_def 4, 7, 0, 4, MOSSDEEP_CITY MossdeepCity_Mart_MapEvents:: @ 8532BC0 - 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 30e5d395c..17052105d 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: @ 8532A38 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_3, 0, 0, 8, 4, 3, 7, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0, 0, 0 +MossdeepCity_PokemonCenter_1F_EventObjects: @ 8532A38 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22224E, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 8, 4, 3, 7, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_22225C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_222265, 0, 0, 0 MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80 warp_def 7, 8, 3, 2, MOSSDEEP_CITY @@ -9,5 +9,5 @@ MossdeepCity_PokemonCenter_1F_MapWarps: @ 8532A80 warp_def 1, 6, 4, 0, MOSSDEEP_CITY_POKEMON_CENTER_2F MossdeepCity_PokemonCenter_1F_MapEvents:: @ 8532A98 - 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 7eda9d522..13a189b51 100644 --- a/data/maps/events/MossdeepCity_PokemonCenter_2F.inc +++ b/data/maps/events/MossdeepCity_PokemonCenter_2F.inc @@ -1,9 +1,9 @@ -MossdeepCity_PokemonCenter_2F_MapObjects: @ 8532AAC - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 11, 7, 3, 5, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0, 0, 0 +MossdeepCity_PokemonCenter_2F_EventObjects: @ 8532AAC + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 11, 7, 3, 5, 17, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_22235B, 0, 0, 0 MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24 warp_def 1, 6, 4, 2, MOSSDEEP_CITY_POKEMON_CENTER_1F @@ -11,5 +11,5 @@ MossdeepCity_PokemonCenter_2F_MapWarps: @ 8532B24 warp_def 9, 1, 3, 0, TRADE_CENTER MossdeepCity_PokemonCenter_2F_MapEvents:: @ 8532B3C - 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 4e2062365..8352fe02c 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_1F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_1F.inc @@ -1,15 +1,15 @@ -MossdeepCity_SpaceCenter_1F_MapObjects: @ 8532D18 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SAILOR, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 0, 14, 7, 3, 3, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 12, 9, 3, 9, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756, 0, 0 - object_event 7, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 11, 6, 3, 9, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756, 0, 0 - object_event 8, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 10, 2, 3, 8, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756, 0, 0 - object_event 9, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 13, 2, 3, 8, 17, 0, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756, 0, 0 - object_event 10, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 5, 0, 76, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737, 0, 0 - object_event 11, MAP_OBJ_GFX_STEVEN, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753, 0, 0 +MossdeepCity_SpaceCenter_1F_EventObjects: @ 8532D18 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 7, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_222FD8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223063, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22308E, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 10, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_223168, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 14, 7, 3, 3, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_22312D, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 12, 9, 3, 9, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231DA, 756, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 11, 6, 3, 9, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_2231F1, 756, 0, 0 + object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 10, 2, 3, 8, 17, 0, 1, 2, MossdeepCity_SpaceCenter_1F_EventScript_223208, 756, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 13, 2, 3, 8, 17, 0, 1, 0, MossdeepCity_SpaceCenter_1F_EventScript_22321F, 756, 0, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 2, 5, 0, 76, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231CF, 737, 0, 0 + object_event 11, EVENT_OBJ_GFX_STEVEN, 0, 0, 1, 4, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_2231B9, 753, 0, 0 MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20 warp_def 7, 9, 0, 8, MOSSDEEP_CITY @@ -17,5 +17,5 @@ MossdeepCity_SpaceCenter_1F_MapWarps: @ 8532E20 warp_def 13, 1, 0, 0, MOSSDEEP_CITY_SPACE_CENTER_2F MossdeepCity_SpaceCenter_1F_MapEvents:: @ 8532E38 - 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 3de11be87..ac3bc8c7a 100644 --- a/data/maps/events/MossdeepCity_SpaceCenter_2F.inc +++ b/data/maps/events/MossdeepCity_SpaceCenter_2F.inc @@ -1,17 +1,17 @@ -MossdeepCity_SpaceCenter_2F_MapObjects: @ 8532E4C - object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 6, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_STEVEN, 0, 0, 1, 8, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863, 0, 0 - object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 2, 3, 10, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862, 0, 0 - object_event 6, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 13, 3, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862, 0, 0 - object_event 7, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 2, 3, 9, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862, 0, 0 - object_event 8, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 0, 8, 3, 10, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862, 0, 0 - object_event 9, MAP_OBJ_GFX_MAXIE, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862, 0, 0 +MossdeepCity_SpaceCenter_2F_EventObjects: @ 8532E4C + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 6, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F03, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223EC8, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 5, 6, 3, 2, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223E8D, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_STEVEN, 0, 0, 1, 8, 3, 8, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F7A, 863, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 2, 3, 10, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F3E, 862, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 13, 3, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F50, 862, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 14, 2, 3, 9, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F47, 862, 0, 0 + object_event 8, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 0, 8, 3, 10, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F59, 862, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAXIE, 0, 0, 1, 9, 3, 7, 17, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_223F6F, 862, 0, 0 MossdeepCity_SpaceCenter_2F_MapWarps: @ 8532F24 warp_def 13, 1, 0, 2, MOSSDEEP_CITY_SPACE_CENTER_1F MossdeepCity_SpaceCenter_2F_MapEvents:: @ 8532F2C - 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 523088c40..4d9658312 100644 --- a/data/maps/events/MossdeepCity_StevensHouse.inc +++ b/data/maps/events/MossdeepCity_StevensHouse.inc @@ -1,7 +1,7 @@ -MossdeepCity_StevensHouse_MapObjects: @ 8532C10 - object_event 1, MAP_OBJ_GFX_STEVEN, 0, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 3, 1, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727, 0, 0 +MossdeepCity_StevensHouse_EventObjects: @ 8532C10 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222912, 967, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 3, 3, 1, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_222841, 968, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_22291B, 727, 0, 0 MossdeepCity_StevensHouse_MapWarps: @ 8532C58 warp_def 3, 7, 0, 6, MOSSDEEP_CITY @@ -14,5 +14,5 @@ MossdeepCity_StevensHouse_MapBGEvents: @ 8532C68 bg_event 10, 6, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_222909 MossdeepCity_StevensHouse_MapEvents:: @ 8532C98 - 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 5f026066a..e4eeb764d 100644 --- a/data/maps/events/MtChimney.inc +++ b/data/maps/events/MtChimney.inc @@ -1,34 +1,34 @@ -MtChimney_MapObjects: @ 85347C8 - object_event 1, MAP_OBJ_GFX_ARCHIE, 0, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926, 0, 0 - object_event 2, MAP_OBJ_GFX_MAXIE, 0, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927, 0, 0 - object_event 3, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927, 0, 0 - object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927, 0, 0 - object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927, 0, 0 - object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926, 0, 0 - object_event 7, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926, 0, 0 - object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926, 0, 0 - object_event 9, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994, 0, 0 - object_event 10, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927, 0, 0 - object_event 11, MAP_OBJ_GFX_POOCHYENA, 0, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 - object_event 12, MAP_OBJ_GFX_POOCHYENA, 0, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 - object_event 13, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927, 0, 0 - object_event 14, MAP_OBJ_GFX_POOCHYENA, 0, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 - object_event 15, MAP_OBJ_GFX_POOCHYENA, 0, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 - object_event 16, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927, 0, 0 - object_event 17, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927, 0, 0 - object_event 18, MAP_OBJ_GFX_POOCHYENA, 0, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 - object_event 19, MAP_OBJ_GFX_POOCHYENA, 0, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 - object_event 20, MAP_OBJ_GFX_POOCHYENA, 0, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 - object_event 21, MAP_OBJ_GFX_POOCHYENA, 0, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 - object_event 22, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 9, 16, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927, 0, 0 - object_event 23, MAP_OBJ_GFX_POOCHYENA, 0, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 - object_event 24, MAP_OBJ_GFX_POOCHYENA, 0, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 - object_event 25, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877, 0, 0 - object_event 26, MAP_OBJ_GFX_BEAUTY, 0, 0, 14, 7, 3, 70, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877, 0, 0 - object_event 27, MAP_OBJ_GFX_BEAUTY, 0, 0, 29, 7, 3, 17, 17, 0, 1, 3, MtChimney_EventScript_22F1C3, 877, 0, 0 - object_event 28, MAP_OBJ_GFX_BEAUTY, 0, 0, 27, 17, 3, 16, 17, 0, 1, 3, MtChimney_EventScript_22F1DA, 877, 0, 0 - object_event 29, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 13, 16, 3, 9, 17, 0, 1, 3, MtChimney_EventScript_22F1F1, 927, 0, 0 - object_event 30, MAP_OBJ_GFX_HIKER, 0, 0, 7, 7, 3, 10, 17, 0, 1, 6, MtChimney_EventScript_22F208, 877, 0, 0 +MtChimney_EventObjects: @ 85347C8 + object_event 1, EVENT_OBJ_GFX_ARCHIE, 0, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22EDD5, 926, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAXIE, 0, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EE0B, 927, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_22F06E, 927, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C0, 927, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F0B7, 927, 0, 0 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F05C, 926, 0, 0 + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F053, 926, 0, 0 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F065, 926, 0, 0 + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22EEF3, 994, 0, 0 + object_event 10, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_22F0C9, 927, 0, 0 + object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 + object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 + object_event 13, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_22F0A5, 927, 0, 0 + object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 + object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 + object_event 16, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_22F0AE, 927, 0, 0 + object_event 17, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_22F09C, 927, 0, 0 + object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 + object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 + object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 + object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 + object_event 22, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 9, 16, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_22F085, 927, 0, 0 + object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_22F0DB, 926, 0, 0 + object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_22F0D2, 927, 0, 0 + object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_22F14A, 877, 0, 0 + object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 0, 14, 7, 3, 70, 0, 0, 1, 6, MtChimney_EventScript_22F1AC, 877, 0, 0 + object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 0, 29, 7, 3, 17, 17, 0, 1, 3, MtChimney_EventScript_22F1C3, 877, 0, 0 + object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 0, 27, 17, 3, 16, 17, 0, 1, 3, MtChimney_EventScript_22F1DA, 877, 0, 0 + object_event 29, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 13, 16, 3, 9, 17, 0, 1, 3, MtChimney_EventScript_22F1F1, 927, 0, 0 + object_event 30, EVENT_OBJ_GFX_HIKER, 0, 0, 7, 7, 3, 10, 17, 0, 1, 6, MtChimney_EventScript_22F208, 877, 0, 0 MtChimney_MapWarps: @ 8534A98 warp_def 17, 36, 0, 0, MT_CHIMNEY_CABLE_CAR_STATION @@ -41,5 +41,5 @@ MtChimney_MapBGEvents: @ 8534AB8 bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_22F141 MtChimney_MapEvents:: @ 8534AD0 - 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 deb754157..1c791072c 100644 --- a/data/maps/events/MtChimney_CableCarStation.inc +++ b/data/maps/events/MtChimney_CableCarStation.inc @@ -1,11 +1,11 @@ -MtChimney_CableCarStation_MapObjects: @ 8533CA8 - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 +MtChimney_CableCarStation_EventObjects: @ 8533CA8 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_22AC4B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 MtChimney_CableCarStation_MapWarps: @ 8533CD8 warp_def 6, 11, 0, 0, MT_CHIMNEY warp_def 7, 11, 0, 1, MT_CHIMNEY MtChimney_CableCarStation_MapEvents:: @ 8533CE8 - 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 5270f92fd..aedb94c2f 100644 --- a/data/maps/events/MtPyre_1F.inc +++ b/data/maps/events/MtPyre_1F.inc @@ -1,7 +1,7 @@ -MtPyre_1F_MapObjects: @ 8534D64 - object_event 1, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 21, 2, 3, 8, 17, 0, 0, 0, MtPyre_1F_EventScript_230F3F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 17, 8, 3, 7, 17, 0, 0, 0, MtPyre_1F_EventScript_230F78, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_5, 0, 0, 13, 10, 3, 9, 17, 0, 0, 0, MtPyre_1F_EventScript_230F81, 0, 0, 0 +MtPyre_1F_EventObjects: @ 8534D64 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 21, 2, 3, 8, 17, 0, 0, 0, MtPyre_1F_EventScript_230F3F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 17, 8, 3, 7, 17, 0, 0, 0, MtPyre_1F_EventScript_230F78, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 13, 10, 3, 9, 17, 0, 0, 0, MtPyre_1F_EventScript_230F81, 0, 0, 0 MtPyre_1F_MapWarps: @ 8534DAC warp_def 17, 18, 3, 0, ROUTE_122 @@ -12,5 +12,5 @@ MtPyre_1F_MapWarps: @ 8534DAC warp_def 20, 9, 3, 4, MT_PYRE_2F MtPyre_1F_MapEvents:: @ 8534DDC - 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 86659ac47..d75442cd6 100644 --- a/data/maps/events/MtPyre_2F.inc +++ b/data/maps/events/MtPyre_2F.inc @@ -1,12 +1,12 @@ -MtPyre_2F_MapObjects: @ 8534DF0 - object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 3, 6, 3, 10, 17, 0, 1, 2, MtPyre_2F_EventScript_231128, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 3, 1, 17, 0, 0, 0, MtPyre_2F_EventScript_2912FD, 1129, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_1, 0, 0, 9, 3, 3, 10, 17, 0, 0, 0, MtPyre_2F_EventScript_231116, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_3, 0, 0, 12, 10, 3, 8, 17, 0, 0, 0, MtPyre_2F_EventScript_23111F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 0, 2, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23115A, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_5, 0, 0, 3, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23113F, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 6, 9, 3, 7, 17, 0, 1, 2, MtPyre_2F_EventScript_23118C, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 6, 3, 17, 17, 0, 1, 2, MtPyre_2F_EventScript_231175, 0, 0, 0 +MtPyre_2F_EventObjects: @ 8534DF0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 6, 3, 10, 17, 0, 1, 2, MtPyre_2F_EventScript_231128, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 10, 3, 1, 17, 0, 0, 0, MtPyre_2F_EventScript_2912FD, 1129, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 9, 3, 3, 10, 17, 0, 0, 0, MtPyre_2F_EventScript_231116, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 0, 12, 10, 3, 8, 17, 0, 0, 0, MtPyre_2F_EventScript_23111F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 2, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23115A, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 0, 3, 9, 3, 8, 17, 0, 1, 1, MtPyre_2F_EventScript_23113F, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 6, 9, 3, 7, 17, 0, 1, 2, MtPyre_2F_EventScript_23118C, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 6, 3, 17, 17, 0, 1, 2, MtPyre_2F_EventScript_231175, 0, 0, 0 MtPyre_2F_MapWarps: @ 8534EB0 warp_def 2, 1, 3, 4, MT_PYRE_1F @@ -16,5 +16,5 @@ MtPyre_2F_MapWarps: @ 8534EB0 warp_def 11, 9, 3, 5, MT_PYRE_1F MtPyre_2F_MapEvents:: @ 8534ED8 - 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 96dcae630..e52cd546b 100644 --- a/data/maps/events/MtPyre_3F.inc +++ b/data/maps/events/MtPyre_3F.inc @@ -1,8 +1,8 @@ -MtPyre_3F_MapObjects: @ 8534EEC - object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 4, 3, 18, 17, 0, 1, 4, MtPyre_3F_EventScript_231753, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LASS, 0, 0, 11, 4, 3, 17, 17, 0, 1, 4, MtPyre_3F_EventScript_23176A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 3, 1, 17, 0, 0, 0, MtPyre_3F_EventScript_29130A, 1120, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 14, 17, 0, 1, 4, MtPyre_3F_EventScript_231781, 0, 0, 0 +MtPyre_3F_EventObjects: @ 8534EEC + object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 1, 4, 3, 18, 17, 0, 1, 4, MtPyre_3F_EventScript_231753, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 0, 11, 4, 3, 17, 17, 0, 1, 4, MtPyre_3F_EventScript_23176A, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 7, 3, 1, 17, 0, 0, 0, MtPyre_3F_EventScript_29130A, 1120, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 14, 17, 0, 1, 4, MtPyre_3F_EventScript_231781, 0, 0, 0 MtPyre_3F_MapWarps: @ 8534F4C warp_def 10, 1, 3, 1, MT_PYRE_2F @@ -13,5 +13,5 @@ MtPyre_3F_MapWarps: @ 8534F4C warp_def 6, 12, 3, 3, MT_PYRE_2F MtPyre_3F_MapEvents:: @ 8534F7C - 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 2792fa422..1804f4615 100644 --- a/data/maps/events/MtPyre_4F.inc +++ b/data/maps/events/MtPyre_4F.inc @@ -1,6 +1,6 @@ -MtPyre_4F_MapObjects: @ 8534F90 - object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 7, 3, 24, 17, 0, 1, 2, MtPyre_4F_EventScript_231C6E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 11, 3, 1, 17, 0, 0, 0, MtPyre_4F_EventScript_291317, 1130, 0, 0 +MtPyre_4F_EventObjects: @ 8534F90 + object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 7, 3, 24, 17, 0, 1, 2, MtPyre_4F_EventScript_231C6E, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 11, 3, 1, 17, 0, 0, 0, MtPyre_4F_EventScript_291317, 1130, 0, 0 MtPyre_4F_MapWarps: @ 8534FC0 warp_def 10, 1, 3, 1, MT_PYRE_5F @@ -11,5 +11,5 @@ MtPyre_4F_MapWarps: @ 8534FC0 warp_def 2, 12, 3, 3, MT_PYRE_3F MtPyre_4F_MapEvents:: @ 8534FF0 - 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 f92f77965..ce7851f62 100644 --- a/data/maps/events/MtPyre_5F.inc +++ b/data/maps/events/MtPyre_5F.inc @@ -1,6 +1,6 @@ -MtPyre_5F_MapObjects: @ 8535004 - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 3, 7, 3, 17, 17, 0, 1, 2, MtPyre_5F_EventScript_231BC9, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, MtPyre_5F_EventScript_291324, 1052, 0, 0 +MtPyre_5F_EventObjects: @ 8535004 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 3, 7, 3, 17, 17, 0, 1, 2, MtPyre_5F_EventScript_231BC9, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, MtPyre_5F_EventScript_291324, 1052, 0, 0 MtPyre_5F_MapWarps: @ 8535034 warp_def 2, 1, 3, 0, MT_PYRE_6F @@ -10,5 +10,5 @@ MtPyre_5F_MapWarps: @ 8535034 warp_def 12, 12, 3, 3, MT_PYRE_4F MtPyre_5F_MapEvents:: @ 853505C - 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 be6459981..b271e116c 100644 --- a/data/maps/events/MtPyre_6F.inc +++ b/data/maps/events/MtPyre_6F.inc @@ -1,12 +1,12 @@ -MtPyre_6F_MapObjects: @ 8535070 - object_event 1, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 3, 3, 23, 17, 0, 1, 3, MtPyre_6F_EventScript_231D3B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, MtPyre_6F_EventScript_291331, 1089, 0, 0 - object_event 3, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 10, 3, 3, 24, 17, 0, 1, 3, MtPyre_6F_EventScript_231D9D, 0, 0, 0 +MtPyre_6F_EventObjects: @ 8535070 + object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 6, 3, 3, 23, 17, 0, 1, 3, MtPyre_6F_EventScript_231D3B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 9, 3, 1, 17, 0, 0, 0, MtPyre_6F_EventScript_291331, 1089, 0, 0 + object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 10, 3, 3, 24, 17, 0, 1, 3, MtPyre_6F_EventScript_231D9D, 0, 0, 0 MtPyre_6F_MapWarps: @ 85350B8 warp_def 2, 1, 3, 0, MT_PYRE_5F warp_def 1, 10, 3, 2, MT_PYRE_5F MtPyre_6F_MapEvents:: @ 85350C8 - 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 5a6101968..a45d2ec2e 100644 --- a/data/maps/events/MtPyre_Exterior.inc +++ b/data/maps/events/MtPyre_Exterior.inc @@ -1,6 +1,6 @@ -MtPyre_Exterior_MapObjects: @ 85350DC - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074, 0, 0 +MtPyre_Exterior_EventObjects: @ 85350DC + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29133E, 1073, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_29134B, 1074, 0, 0 MtPyre_Exterior_MapWarps: @ 853510C warp_def 10, 42, 3, 1, MT_PYRE_1F @@ -19,5 +19,5 @@ MtPyre_Exterior_MapBGEvents: @ 8535174 bg_event 16, 22, 0, 7, 0, ITEM_MAX_ETHER, 78, 0 MtPyre_Exterior_MapEvents:: @ 853518C - 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 261721fb9..696d9ead3 100644 --- a/data/maps/events/MtPyre_Summit.inc +++ b/data/maps/events/MtPyre_Summit.inc @@ -1,12 +1,12 @@ -MtPyre_Summit_MapObjects: @ 85351A0 - object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 22, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ARCHIE, 0, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, 916, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 15, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917, 0, 0 - object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 18, 3, 9, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917, 0, 0 - object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 11, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917, 0, 0 - object_event 7, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 25, 11, 3, 9, 17, 0, 1, 3, MtPyre_Summit_EventScript_232442, 917, 0, 0 - object_event 8, MAP_OBJ_GFX_MAXIE, 0, 0, 23, 6, 3, 7, 17, 0, 0, 0, 0x0, 856, 0, 0 +MtPyre_Summit_EventObjects: @ 85351A0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 22, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_23213C, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, 916, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 23, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_2321A2, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 15, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_2323FD, 917, 0, 0 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 18, 3, 9, 0, 0, 1, 3, MtPyre_Summit_EventScript_232414, 917, 0, 0 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 11, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_23242B, 917, 0, 0 + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 25, 11, 3, 9, 17, 0, 1, 3, MtPyre_Summit_EventScript_232442, 917, 0, 0 + object_event 8, EVENT_OBJ_GFX_MAXIE, 0, 0, 23, 6, 3, 7, 17, 0, 0, 0, 0x0, 856, 0, 0 MtPyre_Summit_MapWarps: @ 8535260 warp_def 22, 31, 3, 1, MT_PYRE_EXTERIOR @@ -26,5 +26,5 @@ MtPyre_Summit_MapBGEvents: @ 85352D8 bg_event 37, 7, 3, 7, 0, ITEM_RARE_CANDY, 80, 0 MtPyre_Summit_MapEvents:: @ 85352F0 - 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/NavelRock_Bottom.inc b/data/maps/events/NavelRock_Bottom.inc index 6de1313e9..af7cffea3 100644 --- a/data/maps/events/NavelRock_Bottom.inc +++ b/data/maps/events/NavelRock_Bottom.inc @@ -1,9 +1,9 @@ -NavelRock_Bottom_MapObjects: @ 853DD50 - object_event 1, MAP_OBJ_GFX_LUGIA, 0, 0, 11, 13, 0, 8, 17, 0, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800, 0, 0 +NavelRock_Bottom_EventObjects: @ 853DD50 + object_event 1, EVENT_OBJ_GFX_LUGIA, 0, 0, 11, 13, 0, 8, 17, 0, 0, 0, NavelRock_Bottom_EventScript_2692A2, 800, 0, 0 NavelRock_Bottom_MapWarps: @ 853DD68 warp_def 14, 19, 0, 0, NAVEL_ROCK_DOWN_11 NavelRock_Bottom_MapEvents:: @ 853DD70 - map_events NavelRock_Bottom_MapObjects, NavelRock_Bottom_MapWarps, 0x0, 0x0 + map_events NavelRock_Bottom_EventObjects, NavelRock_Bottom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Harbor.inc b/data/maps/events/NavelRock_Harbor.inc index eab9c8fc6..21102a474 100644 --- a/data/maps/events/NavelRock_Harbor.inc +++ b/data/maps/events/NavelRock_Harbor.inc @@ -1,10 +1,10 @@ -NavelRock_Harbor_MapObjects: @ 853DA24 - object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 +NavelRock_Harbor_EventObjects: @ 853DA24 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 8, 5, 0, 7, 17, 0, 0, 0, NavelRock_Harbor_EventScript_2690BD, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 7, 1, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 NavelRock_Harbor_MapWarps: @ 853DA54 warp_def 8, 2, 0, 0, NAVEL_ROCK_EXTERIOR NavelRock_Harbor_MapEvents:: @ 853DA5C - map_events NavelRock_Harbor_MapObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0 + map_events NavelRock_Harbor_EventObjects, NavelRock_Harbor_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/NavelRock_Top.inc b/data/maps/events/NavelRock_Top.inc index 695011311..34e93223f 100644 --- a/data/maps/events/NavelRock_Top.inc +++ b/data/maps/events/NavelRock_Top.inc @@ -1,5 +1,5 @@ -NavelRock_Top_MapObjects: @ 853DB74 - object_event 1, MAP_OBJ_GFX_HOOH, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 801, 0, 0 +NavelRock_Top_EventObjects: @ 853DB74 + object_event 1, EVENT_OBJ_GFX_HOOH, 0, 0, 12, 4, 0, 8, 17, 0, 0, 0, 0x0, 801, 0, 0 NavelRock_Top_MapWarps: @ 853DB8C warp_def 13, 20, 3, 1, NAVEL_ROCK_UP_4 @@ -11,5 +11,5 @@ NavelRock_Top_MapBGEvents: @ 853DBA4 bg_event 12, 9, 3, 7, 0, ITEM_SACRED_ASH, 109, 0 NavelRock_Top_MapEvents:: @ 853DBB0 - map_events NavelRock_Top_MapObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents + map_events NavelRock_Top_EventObjects, NavelRock_Top_MapWarps, NavelRock_Top_MapCoordEvents, NavelRock_Top_MapBGEvents diff --git a/data/maps/events/NewMauville_Inside.inc b/data/maps/events/NewMauville_Inside.inc index a2d81c9c1..141fd04d4 100644 --- a/data/maps/events/NewMauville_Inside.inc +++ b/data/maps/events/NewMauville_Inside.inc @@ -1,12 +1,12 @@ -NewMauville_Inside_MapObjects: @ 85364A8 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 39, 4, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291206, 1110, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 17, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291213, 1122, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291220, 1123, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 25, 18, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377AF, 974, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377FC, 975, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_237849, 976, 0, 0 +NewMauville_Inside_EventObjects: @ 85364A8 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911EC, 1075, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_2911F9, 1076, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 39, 4, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291206, 1110, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 17, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291213, 1122, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_291220, 1123, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 25, 18, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377AF, 974, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 11, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_2377FC, 975, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 10, 3, 1, 17, 0, 0, 0, NewMauville_Inside_EventScript_237849, 976, 0, 0 NewMauville_Inside_MapWarps: @ 8536568 warp_def 32, 33, 3, 1, NEW_MAUVILLE_ENTRANCE @@ -34,5 +34,5 @@ NewMauville_Inside_MapBGEvents: @ 8536610 bg_event 35, 2, 0, 0, 0, NewMauville_Inside_EventScript_23778F NewMauville_Inside_MapEvents:: @ 8536670 - 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 2f2929eb5..6278db428 100644 --- a/data/maps/events/OldaleTown.inc +++ b/data/maps/events/OldaleTown.inc @@ -1,8 +1,8 @@ -OldaleTown_MapObjects: @ 8527854 - object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_HIPSTER, 0, 0, 11, 19, 3, 7, 17, 0, 0, 0, OldaleTown_EventScript_1E9070, 979, 0, 0 +OldaleTown_EventObjects: @ 8527854 + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_1E8EF3, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_1E8EFC, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_1E901F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_HIPSTER, 0, 0, 11, 19, 3, 7, 17, 0, 0, 0, OldaleTown_EventScript_1E9070, 979, 0, 0 OldaleTown_MapWarps: @ 85278B4 warp_def 5, 7, 0, 0, OLDALE_TOWN_HOUSE_1 @@ -24,5 +24,5 @@ OldaleTown_MapBGEvents: @ 8527914 bg_event 16, 6, 0, 1, 0, OldaleTown_EventScript_271E6A OldaleTown_MapEvents:: @ 8527950 - 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 1a8edcbc6..93ffb8d72 100644 --- a/data/maps/events/OldaleTown_House1.inc +++ b/data/maps/events/OldaleTown_House1.inc @@ -1,10 +1,10 @@ -OldaleTown_House1_MapObjects: @ 852D7B4 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0, 0, 0 +OldaleTown_House1_EventObjects: @ 852D7B4 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, OldaleTown_House1_EventScript_1FBE86, 0, 0, 0 OldaleTown_House1_MapWarps: @ 852D7CC warp_def 3, 8, 0, 0, OLDALE_TOWN warp_def 4, 8, 0, 0, OLDALE_TOWN OldaleTown_House1_MapEvents:: @ 852D7DC - 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 c86bc109c..474487423 100644 --- a/data/maps/events/OldaleTown_House2.inc +++ b/data/maps/events/OldaleTown_House2.inc @@ -1,11 +1,11 @@ -OldaleTown_House2_MapObjects: @ 852D7F0 - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0, 0, 0 +OldaleTown_House2_EventObjects: @ 852D7F0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF5B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_1FBF64, 0, 0, 0 OldaleTown_House2_MapWarps: @ 852D820 warp_def 3, 7, 0, 1, OLDALE_TOWN warp_def 4, 7, 0, 1, OLDALE_TOWN OldaleTown_House2_MapEvents:: @ 852D830 - 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 6a58118c8..57e963cd5 100644 --- a/data/maps/events/OldaleTown_Mart.inc +++ b/data/maps/events/OldaleTown_Mart.inc @@ -1,12 +1,12 @@ -OldaleTown_Mart_MapObjects: @ 852D95C - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 9, 4, 3, 3, 16, 0, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0, 0, 0 +OldaleTown_Mart_EventObjects: @ 852D95C + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC240, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_1FC28A, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 9, 4, 3, 3, 16, 0, 0, 0, OldaleTown_Mart_EventScript_1FC2A9, 0, 0, 0 OldaleTown_Mart_MapWarps: @ 852D9A4 warp_def 3, 7, 0, 3, OLDALE_TOWN warp_def 4, 7, 0, 3, OLDALE_TOWN OldaleTown_Mart_MapEvents:: @ 852D9B4 - 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 a6e424f27..65465578b 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: @ 852D844 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 3, 7, 3, 10, 17, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0, 0, 0 +OldaleTown_PokemonCenter_1F_EventObjects: @ 852D844 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC01A, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC028, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC031, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 3, 7, 3, 10, 17, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_1FC03A, 0, 0, 0 OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4 warp_def 7, 8, 3, 2, OLDALE_TOWN @@ -10,5 +10,5 @@ OldaleTown_PokemonCenter_1F_MapWarps: @ 852D8A4 warp_def 1, 6, 4, 0, OLDALE_TOWN_POKEMON_CENTER_2F OldaleTown_PokemonCenter_1F_MapEvents:: @ 852D8BC - 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 d520c6bcf..cbf3356a0 100644 --- a/data/maps/events/OldaleTown_PokemonCenter_2F.inc +++ b/data/maps/events/OldaleTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -OldaleTown_PokemonCenter_2F_MapObjects: @ 852D8D0 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +OldaleTown_PokemonCenter_2F_EventObjects: @ 852D8D0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 3, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930 warp_def 1, 6, 4, 2, OLDALE_TOWN_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ OldaleTown_PokemonCenter_2F_MapWarps: @ 852D930 warp_def 9, 1, 3, 0, TRADE_CENTER OldaleTown_PokemonCenter_2F_MapEvents:: @ 852D948 - 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 1667ccc87..b0df30af1 100644 --- a/data/maps/events/PacifidlogTown.inc +++ b/data/maps/events/PacifidlogTown.inc @@ -1,7 +1,7 @@ -PacifidlogTown_MapObjects: @ 8527DE8 - object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_FISHERMAN, 0, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0, 0, 0 +PacifidlogTown_EventObjects: @ 8527DE8 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBACC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAD5, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_1EBAC3, 0, 0, 0 PacifidlogTown_MapWarps: @ 8527E30 warp_def 8, 15, 0, 0, PACIFIDLOG_TOWN_POKEMON_CENTER_1F @@ -17,5 +17,5 @@ PacifidlogTown_MapBGEvents: @ 8527E60 bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_271E73 PacifidlogTown_MapEvents:: @ 8527E84 - 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 5f2c3b905..a60d8eedc 100644 --- a/data/maps/events/PacifidlogTown_House1.inc +++ b/data/maps/events/PacifidlogTown_House1.inc @@ -1,11 +1,11 @@ -PacifidlogTown_House1_MapObjects: @ 852EBA0 - object_event 1, MAP_OBJ_GFX_MAN_6, 0, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0, 0, 0 +PacifidlogTown_House1_EventObjects: @ 852EBA0 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_20365D, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_203666, 0, 0, 0 PacifidlogTown_House1_MapWarps: @ 852EBD0 warp_def 4, 8, 0, 1, PACIFIDLOG_TOWN warp_def 5, 8, 0, 1, PACIFIDLOG_TOWN PacifidlogTown_House1_MapEvents:: @ 852EBE0 - 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 743395c72..26147f726 100644 --- a/data/maps/events/PacifidlogTown_House2.inc +++ b/data/maps/events/PacifidlogTown_House2.inc @@ -1,12 +1,12 @@ -PacifidlogTown_House2_MapObjects: @ 852EBF4 - object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 3, 5, 3, 8, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203792, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_AZURILL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203891, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_AZURILL, 0, 0, 1, 7, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0, 0, 0 +PacifidlogTown_House2_EventObjects: @ 852EBF4 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 3, 5, 3, 8, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203792, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_203891, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 0, 1, 7, 3, 1, 17, 0, 0, 0, PacifidlogTown_House2_EventScript_2038AC, 0, 0, 0 PacifidlogTown_House2_MapWarps: @ 852EC3C warp_def 4, 8, 0, 2, PACIFIDLOG_TOWN warp_def 5, 8, 0, 2, PACIFIDLOG_TOWN PacifidlogTown_House2_MapEvents:: @ 852EC4C - 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 85d7c4f53..8f3292936 100644 --- a/data/maps/events/PacifidlogTown_House3.inc +++ b/data/maps/events/PacifidlogTown_House3.inc @@ -1,11 +1,11 @@ -PacifidlogTown_House3_MapObjects: @ 852EC60 - object_event 1, MAP_OBJ_GFX_GIRL_2, 0, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 17, 0, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0, 0, 0 +PacifidlogTown_House3_EventObjects: @ 852EC60 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_203CB5, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 17, 0, 0, 0, PacifidlogTown_House3_EventScript_203C11, 0, 0, 0 PacifidlogTown_House3_MapWarps: @ 852EC90 warp_def 4, 8, 0, 3, PACIFIDLOG_TOWN warp_def 5, 8, 0, 3, PACIFIDLOG_TOWN PacifidlogTown_House3_MapEvents:: @ 852ECA0 - 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 b552a566c..1d88d3be7 100644 --- a/data/maps/events/PacifidlogTown_House4.inc +++ b/data/maps/events/PacifidlogTown_House4.inc @@ -1,12 +1,12 @@ -PacifidlogTown_House4_MapObjects: @ 852ECB4 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 7, 5, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0, 0, 0 +PacifidlogTown_House4_EventObjects: @ 852ECB4 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_203F55, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 7, 5, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F4C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, PacifidlogTown_House4_EventScript_203F5E, 0, 0, 0 PacifidlogTown_House4_MapWarps: @ 852ECFC warp_def 4, 8, 0, 4, PACIFIDLOG_TOWN warp_def 5, 8, 0, 4, PACIFIDLOG_TOWN PacifidlogTown_House4_MapEvents:: @ 852ED0C - 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 e078fc612..51cbaaa39 100644 --- a/data/maps/events/PacifidlogTown_House5.inc +++ b/data/maps/events/PacifidlogTown_House5.inc @@ -1,11 +1,11 @@ -PacifidlogTown_House5_MapObjects: @ 852ED20 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0, 0, 0 +PacifidlogTown_House5_EventObjects: @ 852ED20 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204111, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_204137, 0, 0, 0 PacifidlogTown_House5_MapWarps: @ 852ED50 warp_def 4, 8, 0, 5, PACIFIDLOG_TOWN warp_def 5, 8, 0, 5, PACIFIDLOG_TOWN PacifidlogTown_House5_MapEvents:: @ 852ED60 - 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 3a28af372..f67b4269e 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_1F.inc @@ -1,9 +1,9 @@ -PacifidlogTown_PokemonCenter_1F_MapObjects: @ 852EA70 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 10, 6, 3, 9, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_6, 0, 0, 12, 8, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0, 0, 0 +PacifidlogTown_PokemonCenter_1F_EventObjects: @ 852EA70 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034B6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 10, 6, 3, 9, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034D6, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 0, 2, 2, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034C4, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 4, 5, 3, 1, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2034CD, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 0, 12, 8, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE, 0, 0, 0 PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8 warp_def 7, 8, 3, 0, PACIFIDLOG_TOWN @@ -11,5 +11,5 @@ PacifidlogTown_PokemonCenter_1F_MapWarps: @ 852EAE8 warp_def 1, 6, 4, 0, PACIFIDLOG_TOWN_POKEMON_CENTER_2F PacifidlogTown_PokemonCenter_1F_MapEvents:: @ 852EB00 - 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 2ae1cc480..26b9cf591 100644 --- a/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc +++ b/data/maps/events/PacifidlogTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -PacifidlogTown_PokemonCenter_2F_MapObjects: @ 852EB14 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +PacifidlogTown_PokemonCenter_2F_EventObjects: @ 852EB14 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74 warp_def 1, 6, 4, 2, PACIFIDLOG_TOWN_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ PacifidlogTown_PokemonCenter_2F_MapWarps: @ 852EB74 warp_def 9, 1, 3, 0, TRADE_CENTER PacifidlogTown_PokemonCenter_2F_MapEvents:: @ 852EB8C - 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 ad696f7ff..171790f56 100644 --- a/data/maps/events/PetalburgCity.inc +++ b/data/maps/events/PetalburgCity.inc @@ -1,13 +1,13 @@ -PetalburgCity_MapObjects: @ 8525FD0 - object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 16, 18, 3, 2, 17, 0, 0, 0, PetalburgCity_EventScript_1DC3FD, 728, 0, 0 - object_event 2, MAP_OBJ_GFX_WALLY, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 726, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 20, 10, 3, 3, 16, 0, 0, 0, PetalburgCity_EventScript_1DC488, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_3, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 830, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040, 0, 0 - object_event 8, MAP_OBJ_GFX_BOY_2, 0, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_SCOTT, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, 0x0, 995, 0, 0 +PetalburgCity_EventObjects: @ 8525FD0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 16, 18, 3, 2, 17, 0, 0, 0, PetalburgCity_EventScript_1DC3FD, 728, 0, 0 + object_event 2, EVENT_OBJ_GFX_WALLY, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 726, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_1DC3E6, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 20, 10, 3, 3, 16, 0, 0, 0, PetalburgCity_EventScript_1DC488, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, 830, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910B4, 1039, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_2910C1, 1040, 0, 0 + object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1DC82E, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_SCOTT, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, 0x0, 995, 0, 0 PetalburgCity_MapWarps: @ 85260A8 warp_def 10, 19, 0, 0, PETALBURG_CITY_HOUSE_1 @@ -38,5 +38,5 @@ PetalburgCity_MapBGEvents: @ 8526158 bg_event 11, 29, 3, 7, 0, ITEM_RARE_CANDY, 95, 0 PetalburgCity_MapEvents:: @ 85261B8 - 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 2ee8771a0..bdd6d2da4 100644 --- a/data/maps/events/PetalburgCity_Gym.inc +++ b/data/maps/events/PetalburgCity_Gym.inc @@ -1,15 +1,15 @@ -PetalburgCity_Gym_MapObjects: @ 852EDC8 - object_event 1, MAP_OBJ_GFX_NORMAN, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_2, 0, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781, 0, 0 - object_event 10, MAP_OBJ_GFX_WALLY, 0, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, 866, 0, 0 - object_event 11, MAP_OBJ_GFX_MAN_3, 0, 0, 1, 7, 3, 7, 17, 0, 0, 0, 0x0, 824, 0, 0 +PetalburgCity_Gym_EventObjects: @ 852EDC8 + object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 0, 4, 2, 0, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_2049F1, 772, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054AA, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053BA, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2053F6, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_2054E6, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205432, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_205522, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_20546E, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_20574F, 781, 0, 0 + object_event 10, EVENT_OBJ_GFX_WALLY, 0, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, 866, 0, 0 + object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 0, 1, 7, 3, 7, 17, 0, 0, 0, 0x0, 824, 0, 0 PetalburgCity_Gym_MapWarps: @ 852EED0 warp_def 4, 111, 3, 2, PETALBURG_CITY @@ -68,5 +68,5 @@ PetalburgCity_Gym_MapBGEvents: @ 852F000 bg_event 7, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_20577E PetalburgCity_Gym_MapEvents:: @ 852F0A8 - 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 59ffd7eca..c078d6876 100644 --- a/data/maps/events/PetalburgCity_House1.inc +++ b/data/maps/events/PetalburgCity_House1.inc @@ -1,11 +1,11 @@ -PetalburgCity_House1_MapObjects: @ 852F0BC - object_event 1, MAP_OBJ_GFX_GIRL_1, 0, 0, 7, 4, 3, 2, 34, 0, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0, 0, 0 +PetalburgCity_House1_EventObjects: @ 852F0BC + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 0, 7, 4, 3, 2, 34, 0, 0, 0, PetalburgCity_House1_EventScript_2077A3, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_20779A, 0, 0, 0 PetalburgCity_House1_MapWarps: @ 852F0EC warp_def 3, 8, 0, 0, PETALBURG_CITY warp_def 4, 8, 0, 0, PETALBURG_CITY PetalburgCity_House1_MapEvents:: @ 852F0FC - 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 14ca86ab8..b6570b5e9 100644 --- a/data/maps/events/PetalburgCity_House2.inc +++ b/data/maps/events/PetalburgCity_House2.inc @@ -1,11 +1,11 @@ -PetalburgCity_House2_MapObjects: @ 852F110 - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 3, 2, 17, 0, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0, 0, 0 +PetalburgCity_House2_EventObjects: @ 852F110 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 5, 3, 2, 17, 0, 0, 0, PetalburgCity_House2_EventScript_2078F3, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_2078FC, 0, 0, 0 PetalburgCity_House2_MapWarps: @ 852F140 warp_def 3, 7, 0, 4, PETALBURG_CITY warp_def 4, 7, 0, 4, PETALBURG_CITY PetalburgCity_House2_MapEvents:: @ 852F150 - 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 e5f1a1d3d..0413f795a 100644 --- a/data/maps/events/PetalburgCity_Mart.inc +++ b/data/maps/events/PetalburgCity_Mart.inc @@ -1,13 +1,13 @@ -PetalburgCity_Mart_MapObjects: @ 852F294 - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0, 0, 0 +PetalburgCity_Mart_EventObjects: @ 852F294 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207D69, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DE8, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DDF, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_207DD6, 0, 0, 0 PetalburgCity_Mart_MapWarps: @ 852F2F4 warp_def 3, 7, 0, 5, PETALBURG_CITY warp_def 4, 7, 0, 5, PETALBURG_CITY PetalburgCity_Mart_MapEvents:: @ 852F304 - 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 3395f43b4..5c940de5a 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: @ 852F164 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 9, 6, 3, 2, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 5, 4, 3, 1, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0, 0, 0 +PetalburgCity_PokemonCenter_1F_EventObjects: @ 852F164 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_2079FC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_291539, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A0A, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 9, 6, 3, 2, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A13, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 4, 3, 1, 17, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_207A1C, 0, 0, 0 PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC warp_def 7, 8, 3, 3, PETALBURG_CITY @@ -11,5 +11,5 @@ PetalburgCity_PokemonCenter_1F_MapWarps: @ 852F1DC warp_def 1, 6, 4, 0, PETALBURG_CITY_POKEMON_CENTER_2F PetalburgCity_PokemonCenter_1F_MapEvents:: @ 852F1F4 - 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 5506670c5..99312ac96 100644 --- a/data/maps/events/PetalburgCity_PokemonCenter_2F.inc +++ b/data/maps/events/PetalburgCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -PetalburgCity_PokemonCenter_2F_MapObjects: @ 852F208 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +PetalburgCity_PokemonCenter_2F_EventObjects: @ 852F208 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268 warp_def 1, 6, 4, 2, PETALBURG_CITY_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ PetalburgCity_PokemonCenter_2F_MapWarps: @ 852F268 warp_def 9, 1, 3, 0, TRADE_CENTER PetalburgCity_PokemonCenter_2F_MapEvents:: @ 852F280 - 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 df04a0695..e7107f07a 100644 --- a/data/maps/events/PetalburgCity_WallysHouse.inc +++ b/data/maps/events/PetalburgCity_WallysHouse.inc @@ -1,11 +1,11 @@ -PetalburgCity_WallysHouse_MapObjects: @ 852ED74 - object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0, 0, 0 +PetalburgCity_WallysHouse_EventObjects: @ 852ED74 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_204278, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_2042C0, 0, 0, 0 PetalburgCity_WallysHouse_MapWarps: @ 852EDA4 warp_def 3, 7, 0, 1, PETALBURG_CITY warp_def 4, 7, 0, 1, PETALBURG_CITY PetalburgCity_WallysHouse_MapEvents:: @ 852EDB4 - 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 5d6c10149..bb9b69f35 100644 --- a/data/maps/events/PetalburgWoods.inc +++ b/data/maps/events/PetalburgWoods.inc @@ -1,17 +1,17 @@ -PetalburgWoods_MapObjects: @ 85345E4 - object_event 1, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 10, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 11, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, 725, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_2, 0, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, 724, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058, 0, 0 - object_event 8, MAP_OBJ_GFX_BOY_2, 0, 0, 15, 19, 3, 3, 33, 0, 0, 0, PetalburgWoods_EventScript_22E210, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BOY_3, 0, 0, 30, 34, 3, 2, 18, 0, 0, 0, PetalburgWoods_EventScript_22E219, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 26, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_291129, 1117, 0, 0 - object_event 13, MAP_OBJ_GFX_GIRL_2, 0, 0, 33, 5, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_22E222, 0, 0, 0 +PetalburgWoods_EventObjects: @ 85345E4 + object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 10, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 17, 0, 0 + object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 19, 11, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_2906BB, 18, 0, 0 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, 725, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, 724, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_29110F, 1056, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_291102, 1055, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_29111C, 1058, 0, 0 + object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 0, 15, 19, 3, 3, 33, 0, 0, 0, PetalburgWoods_EventScript_22E210, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_22E26D, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_22E284, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 0, 30, 34, 3, 2, 18, 0, 0, 0, PetalburgWoods_EventScript_22E219, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 26, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_291129, 1117, 0, 0 + object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 0, 33, 5, 3, 1, 17, 0, 0, 0, PetalburgWoods_EventScript_22E222, 0, 0, 0 PetalburgWoods_MapWarps: @ 853471C warp_def 14, 5, 0, 2, ROUTE_104 @@ -34,5 +34,5 @@ PetalburgWoods_MapBGEvents: @ 853476C bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_22E264 PetalburgWoods_MapEvents:: @ 85347B4 - 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 672abbbd4..ad9f6625d 100644 --- a/data/maps/events/RecordCorner.inc +++ b/data/maps/events/RecordCorner.inc @@ -1,5 +1,5 @@ -RecordCorner_MapObjects: @ 8539DFC - object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0, 0, 0 +RecordCorner_EventObjects: @ 8539DFC + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_2774C6, 0, 0, 0 RecordCorner_MapWarps: @ 8539E14 warp_def 8, 9, 3, 127, NONE @@ -14,5 +14,5 @@ RecordCorner_MapCoordEvents: @ 8539E34 coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827745C RecordCorner_MapEvents:: @ 8539E74 - 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 aa8389e29..e942526ba 100644 --- a/data/maps/events/Route101.inc +++ b/data/maps/events/Route101.inc @@ -1,10 +1,10 @@ -Route101_MapObjects: @ 8527E98 - object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, 720, 0, 0 - object_event 3, MAP_OBJ_GFX_BIRCHS_BAG, 0, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700, 0, 0 - object_event 4, MAP_OBJ_GFX_ZIGZAGOON_1, 0, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, 750, 0, 0 - object_event 5, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_272141, 897, 0, 0 - object_event 6, MAP_OBJ_GFX_BOY_2, 0, 0, 2, 13, 3, 5, 17, 0, 0, 0, Route101_EventScript_1EBE04, 991, 0, 0 +Route101_EventObjects: @ 8527E98 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBDFB, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, 720, 0, 0 + object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_1EBE16, 700, 0, 0 + object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_1, 0, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, 750, 0, 0 + object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_272141, 897, 0, 0 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 0, 2, 13, 3, 5, 17, 0, 0, 0, Route101_EventScript_1EBE04, 991, 0, 0 Route101_MapCoordEvents: @ 8527F28 coord_event 10, 19, 3, 0, VAR_0x4060, 1, 0, Route101_EventScript_1EBCDE @@ -21,5 +21,5 @@ Route101_MapBGEvents: @ 8527FB8 bg_event 5, 9, 0, 0, 0, Route101_EventScript_1EBE0D Route101_MapEvents:: @ 8527FC4 - 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 e128d9652..8b1551f09 100644 --- a/data/maps/events/Route102.inc +++ b/data/maps/events/Route102.inc @@ -1,18 +1,18 @@ -Route102_MapObjects: @ 8527FD8 - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_1EC105, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BOY_1, 0, 0, 37, 4, 3, 2, 17, 0, 0, 0, Route102_EventScript_1EC0FC, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 24, 2, 3, 12, 0, 0, 0, 2, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 25, 2, 3, 12, 0, 0, 0, 1, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 19, 4, 3, 8, 17, 0, 1, 3, Route102_EventScript_1EC1E1, 0, 0, 0 +Route102_EventObjects: @ 8527FD8 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_1EC0E1, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_1EC105, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_1EC1B3, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_1EC1CA, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 0, 37, 4, 3, 2, 17, 0, 0, 0, Route102_EventScript_1EC0FC, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_290CD8, 1000, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 24, 2, 3, 12, 0, 0, 0, 2, BerryTreeScript, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 25, 2, 3, 12, 0, 0, 0, 1, BerryTreeScript, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 19, 4, 3, 8, 17, 0, 1, 3, Route102_EventScript_1EC1E1, 0, 0, 0 Route102_MapBGEvents: @ 85280B0 bg_event 17, 2, 0, 0, 0, Route102_EventScript_1EC0F3 bg_event 40, 9, 0, 0, 0, Route102_EventScript_1EC0EA Route102_MapEvents:: @ 85280C8 - 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 0b1bae04a..cdd07bab1 100644 --- a/data/maps/events/Route103.inc +++ b/data/maps/events/Route103.inc @@ -1,24 +1,24 @@ -Route103_MapObjects: @ 85280DC - object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 10, 3, 3, 10, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 0, 71, 11, 3, 18, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 65, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 64, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 0, 50, 8, 3, 26, 16, 0, 1, 3, Route103_EventScript_1EC6D1, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 58, 5, 3, 12, 0, 0, 0, 5, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 59, 5, 3, 12, 0, 0, 0, 6, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 60, 5, 3, 12, 0, 0, 0, 7, BerryTreeScript, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BOY_1, 0, 0, 20, 10, 3, 2, 33, 0, 0, 0, Route103_EventScript_1EC5D9, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, Route103_EventScript_272141, 898, 0, 0 - object_event 12, MAP_OBJ_GFX_MAN_3, 0, 0, 56, 13, 3, 10, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 50, 5, 3, 1, 17, 0, 0, 0, Route103_EventScript_290CE5, 1114, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 67, 7, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 18, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 72, 8, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 19, 0, 0 - object_event 16, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 67, 5, 3, 8, 17, 0, 1, 2, Route103_EventScript_1EC761, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_MAN_6, 0, 0, 67, 9, 3, 7, 17, 0, 1, 2, Route103_EventScript_1EC74A, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 36, 6, 1, 26, 49, 0, 1, 5, Route103_EventScript_1EC78F, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 36, 13, 1, 25, 49, 0, 1, 5, Route103_EventScript_1EC778, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 64, 7, 0, 1, 17, 0, 0, 0, Route103_EventScript_290CF2, 1137, 0, 0 +Route103_EventObjects: @ 85280DC + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_1EC5E2, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 10, 3, 3, 10, 0, 0, 0, 0, Route103_EventScript_1EC3C1, 723, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 71, 11, 3, 18, 0, 0, 1, 3, Route103_EventScript_1EC5F4, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 65, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC66E, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 64, 12, 3, 8, 0, 0, 1, 1, Route103_EventScript_1EC60B, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 50, 8, 3, 26, 16, 0, 1, 3, Route103_EventScript_1EC6D1, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 58, 5, 3, 12, 0, 0, 0, 5, BerryTreeScript, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 59, 5, 3, 12, 0, 0, 0, 6, BerryTreeScript, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 60, 5, 3, 12, 0, 0, 0, 7, BerryTreeScript, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 0, 20, 10, 3, 2, 33, 0, 0, 0, Route103_EventScript_1EC5D9, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 7, 3, 3, 2, 17, 0, 0, 0, Route103_EventScript_272141, 898, 0, 0 + object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 0, 56, 13, 3, 10, 0, 0, 1, 5, Route103_EventScript_1EC6E8, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 50, 5, 3, 1, 17, 0, 0, 0, Route103_EventScript_290CE5, 1114, 0, 0 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 67, 7, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 18, 0, 0 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 72, 8, 3, 1, 17, 0, 0, 0, Route103_EventScript_2906BB, 19, 0, 0 + object_event 16, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 67, 5, 3, 8, 17, 0, 1, 2, Route103_EventScript_1EC761, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 0, 67, 9, 3, 7, 17, 0, 1, 2, Route103_EventScript_1EC74A, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 36, 6, 1, 26, 49, 0, 1, 5, Route103_EventScript_1EC78F, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 36, 13, 1, 25, 49, 0, 1, 5, Route103_EventScript_1EC778, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 64, 7, 0, 1, 17, 0, 0, 0, Route103_EventScript_290CF2, 1137, 0, 0 Route103_MapWarps: @ 85282BC warp_def 45, 6, 0, 0, ALTERING_CAVE @@ -27,5 +27,5 @@ Route103_MapBGEvents: @ 85282C4 bg_event 11, 9, 0, 0, 0, Route103_EventScript_1EC5EB Route103_MapEvents:: @ 85282D0 - map_events Route103_MapObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents + map_events Route103_EventObjects, Route103_MapWarps, 0x0, Route103_MapBGEvents diff --git a/data/maps/events/Route104.inc b/data/maps/events/Route104.inc index 2913f96c4..66a9e0edb 100644 --- a/data/maps/events/Route104.inc +++ b/data/maps/events/Route104.inc @@ -1,38 +1,38 @@ -Route104_MapObjects: @ 85282E4 - object_event 1, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 25, 49, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED006, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_1, 0, 0, 27, 63, 3, 3, 16, 0, 0, 0, Route104_EventScript_1ED045, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 0, 30, 50, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED04E, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_GIRL_3, 0, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_1ED090, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, 742, 0, 0 - object_event 8, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, 738, 0, 0 - object_event 9, MAP_OBJ_GFX_FISHERMAN, 0, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 34, 6, 3, 12, 0, 0, 0, 8, BerryTreeScript, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 35, 6, 3, 12, 0, 0, 0, 9, BerryTreeScript, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 36, 6, 3, 12, 0, 0, 0, 10, BerryTreeScript, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 22, 41, 3, 12, 0, 0, 0, 11, BerryTreeScript, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 23, 41, 3, 12, 0, 0, 0, 12, BerryTreeScript, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 24, 41, 3, 12, 0, 0, 0, 13, BerryTreeScript, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 37, 8, 3, 9, 17, 0, 0, 0, Route104_EventScript_1ECF8C, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 22, 3, 12, 0, 0, 0, 3, BerryTreeScript, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 23, 3, 12, 0, 0, 0, 4, BerryTreeScript, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 24, 3, 12, 0, 0, 0, 75, BerryTreeScript, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 3, 25, 3, 12, 0, 0, 0, 76, BerryTreeScript, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002, 0, 0 - object_event 22, MAP_OBJ_GFX_WOMAN_7, 0, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906, 0, 0 - object_event 23, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 27, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED597, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_BOY_4, 0, 0, 21, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_WOMAN_3, 0, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D0C, 1057, 0, 0 - object_event 28, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 18, 67, 3, 46, 101, 0, 1, 2, Route104_EventScript_1ED376, 0, 0, 0 - object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 37, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D19, 1115, 0, 0 - object_event 30, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_2906BB, 17, 0, 0 - object_event 31, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 8, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D26, 1135, 0, 0 - object_event 32, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 26, 3, 1, 17, 0, 0, 0, Route104_EventScript_1ED057, 0, 0, 0 - object_event 33, MAP_OBJ_GFX_FISHERMAN, 0, 0, 15, 59, 3, 9, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0, 0, 0 - object_event 34, MAP_OBJ_GFX_HIPSTER, 0, 0, 17, 50, 0, 1, 17, 0, 0, 0, Route104_EventScript_1ECC9E, 719, 0, 0 +Route104_EventObjects: @ 85282E4 + object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_1ED00F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 25, 49, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED006, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_1ED38D, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 0, 27, 63, 3, 3, 16, 0, 0, 0, Route104_EventScript_1ED045, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 30, 50, 3, 2, 17, 0, 0, 0, Route104_EventScript_1ED04E, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_1ED090, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, 742, 0, 0 + object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, 738, 0, 0 + object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_1ED35F, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 34, 6, 3, 12, 0, 0, 0, 8, BerryTreeScript, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 35, 6, 3, 12, 0, 0, 0, 9, BerryTreeScript, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 36, 6, 3, 12, 0, 0, 0, 10, BerryTreeScript, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 22, 41, 3, 12, 0, 0, 0, 11, BerryTreeScript, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 23, 41, 3, 12, 0, 0, 0, 12, BerryTreeScript, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 24, 41, 3, 12, 0, 0, 0, 13, BerryTreeScript, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 37, 8, 3, 9, 17, 0, 0, 0, Route104_EventScript_1ECF8C, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 22, 3, 12, 0, 0, 0, 3, BerryTreeScript, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 23, 3, 12, 0, 0, 0, 4, BerryTreeScript, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 24, 3, 12, 0, 0, 0, 75, BerryTreeScript, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 3, 25, 3, 12, 0, 0, 0, 76, BerryTreeScript, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_290CFF, 1002, 0, 0 + object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_1ECFCD, 906, 0, 0 + object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 27, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED597, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 28, 15, 3, 8, 0, 0, 1, 1, Route104_EventScript_1ED5B6, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 0, 21, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_1ED43B, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_1ED4E9, 0, 0, 0 + object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D0C, 1057, 0, 0 + object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 18, 67, 3, 46, 101, 0, 1, 2, Route104_EventScript_1ED376, 0, 0, 0 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D19, 1115, 0, 0 + object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 22, 3, 1, 17, 0, 0, 0, Route104_EventScript_2906BB, 17, 0, 0 + object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 8, 3, 1, 17, 0, 0, 0, Route104_EventScript_290D26, 1135, 0, 0 + object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 26, 3, 1, 17, 0, 0, 0, Route104_EventScript_1ED057, 0, 0, 0 + object_event 33, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 15, 59, 3, 9, 0, 0, 1, 0, Route104_EventScript_1ED5D5, 0, 0, 0 + object_event 34, EVENT_OBJ_GFX_HIPSTER, 0, 0, 17, 50, 0, 1, 17, 0, 0, 0, Route104_EventScript_1ECC9E, 719, 0, 0 Route104_MapWarps: @ 8528614 warp_def 17, 50, 0, 0, ROUTE_104_MR_BRINEYS_HOUSE @@ -60,5 +60,5 @@ Route104_MapBGEvents: @ 8528664 bg_event 16, 64, 3, 7, 0, ITEM_HEART_SCALE, 88, 0 Route104_MapEvents:: @ 85286DC - map_events Route104_MapObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents + map_events Route104_EventObjects, Route104_MapWarps, Route104_MapCoordEvents, Route104_MapBGEvents diff --git a/data/maps/events/Route104_MrBrineysHouse.inc b/data/maps/events/Route104_MrBrineysHouse.inc index c643b364b..2088faf16 100644 --- a/data/maps/events/Route104_MrBrineysHouse.inc +++ b/data/maps/events/Route104_MrBrineysHouse.inc @@ -1,11 +1,11 @@ -Route104_MrBrineysHouse_MapObjects: @ 8533AD4 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 3, 3, 50, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739, 0, 0 - object_event 2, MAP_OBJ_GFX_WINGULL, 0, 0, 6, 3, 3, 8, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881, 0, 0 +Route104_MrBrineysHouse_EventObjects: @ 8533AD4 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 3, 3, 50, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229D67, 739, 0, 0 + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 0, 6, 3, 3, 8, 51, 0, 0, 0, Route104_MrBrineysHouse_EventScript_229E5D, 881, 0, 0 Route104_MrBrineysHouse_MapWarps: @ 8533B04 warp_def 5, 8, 0, 0, ROUTE_104 warp_def 6, 8, 0, 0, ROUTE_104 Route104_MrBrineysHouse_MapEvents:: @ 8533B14 - 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 08f2390c0..2d6d7fe37 100644 --- a/data/maps/events/Route104_PrettyPetalFlowerShop.inc +++ b/data/maps/events/Route104_PrettyPetalFlowerShop.inc @@ -1,12 +1,12 @@ -Route104_PrettyPetalFlowerShop_MapObjects: @ 8533B28 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_1, 0, 0, 11, 6, 4, 2, 34, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0, 0, 0 +Route104_PrettyPetalFlowerShop_EventObjects: @ 8533B28 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A373, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A40C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 0, 11, 6, 4, 2, 34, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_22A442, 0, 0, 0 Route104_PrettyPetalFlowerShop_MapWarps: @ 8533B70 warp_def 2, 8, 0, 1, ROUTE_104 warp_def 3, 8, 0, 1, ROUTE_104 Route104_PrettyPetalFlowerShop_MapEvents:: @ 8533B80 - 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/Route105.inc b/data/maps/events/Route105.inc index c27cff262..b7583aabd 100644 --- a/data/maps/events/Route105.inc +++ b/data/maps/events/Route105.inc @@ -1,12 +1,12 @@ -Route105_MapObjects: @ 85286F0 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 19, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_1EE261, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 27, 36, 1, 27, 7, 0, 1, 3, Route105_EventScript_1EE278, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 8, 45, 1, 25, 112, 0, 1, 3, Route105_EventScript_1EE28F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 19, 9, 1, 24, 80, 0, 1, 3, Route105_EventScript_1EE2A6, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_290D33, 1003, 0, 0 - object_event 6, MAP_OBJ_GFX_HIKER, 0, 0, 17, 48, 3, 26, 112, 0, 1, 3, Route105_EventScript_1EE24A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MAN_6, 0, 0, 4, 54, 3, 8, 32, 0, 1, 2, Route105_EventScript_1EE2BD, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_HIKER, 0, 0, 4, 58, 3, 7, 32, 0, 1, 4, Route105_EventScript_1EE2D4, 0, 0, 0 +Route105_EventObjects: @ 85286F0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 19, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_1EE261, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 27, 36, 1, 27, 7, 0, 1, 3, Route105_EventScript_1EE278, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 8, 45, 1, 25, 112, 0, 1, 3, Route105_EventScript_1EE28F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 19, 9, 1, 24, 80, 0, 1, 3, Route105_EventScript_1EE2A6, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_290D33, 1003, 0, 0 + object_event 6, EVENT_OBJ_GFX_HIKER, 0, 0, 17, 48, 3, 26, 112, 0, 1, 3, Route105_EventScript_1EE24A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 0, 4, 54, 3, 8, 32, 0, 1, 2, Route105_EventScript_1EE2BD, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_HIKER, 0, 0, 4, 58, 3, 7, 32, 0, 1, 4, Route105_EventScript_1EE2D4, 0, 0, 0 Route105_MapWarps: @ 85287B0 warp_def 9, 20, 0, 0, ISLAND_CAVE @@ -16,5 +16,5 @@ Route105_MapBGEvents: @ 85287B8 bg_event 5, 56, 3, 7, 0, ITEM_BIG_PEARL, 111, 0 Route105_MapEvents:: @ 85287D0 - 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 ee4beeddd..866a894fa 100644 --- a/data/maps/events/Route106.inc +++ b/data/maps/events/Route106.inc @@ -1,9 +1,9 @@ -Route106_MapObjects: @ 85287E4 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 18, 5, 1, 27, 4, 0, 1, 3, Route106_EventScript_1EE493, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 29, 10, 1, 1, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_FISHERMAN, 0, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_FISHERMAN, 0, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_1EE523, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_290D40, 1004, 0, 0 +Route106_EventObjects: @ 85287E4 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 18, 5, 1, 27, 4, 0, 1, 3, Route106_EventScript_1EE493, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 29, 10, 1, 1, 0, 0, 1, 3, Route106_EventScript_1EE4AA, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_1EE4C1, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_1EE523, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_290D40, 1004, 0, 0 Route106_MapWarps: @ 852885C warp_def 48, 16, 0, 0, GRANITE_CAVE_1F @@ -15,5 +15,5 @@ Route106_MapBGEvents: @ 8528864 bg_event 59, 13, 3, 0, 0, Route106_EventScript_1EE48A Route106_MapEvents:: @ 8528894 - 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 8498a0f42..87d734ed4 100644 --- a/data/maps/events/Route107.inc +++ b/data/maps/events/Route107.inc @@ -1,12 +1,12 @@ -Route107_MapObjects: @ 85288A8 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 41, 10, 1, 24, 17, 0, 1, 3, Route107_EventScript_1EE595, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 23, 11, 1, 52, 38, 0, 1, 2, Route107_EventScript_1EE5AC, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 16, 7, 1, 13, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 50, 11, 1, 65, 17, 0, 1, 5, Route107_EventScript_1EE625, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 33, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE63C, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 32, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE657, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 50, 5, 1, 64, 17, 0, 1, 5, Route107_EventScript_1EE672, 0, 0, 0 +Route107_EventObjects: @ 85288A8 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 41, 10, 1, 24, 17, 0, 1, 3, Route107_EventScript_1EE595, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 23, 11, 1, 52, 38, 0, 1, 2, Route107_EventScript_1EE5AC, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 16, 7, 1, 13, 0, 0, 1, 5, Route107_EventScript_1EE60E, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 50, 11, 1, 65, 17, 0, 1, 5, Route107_EventScript_1EE625, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 33, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE63C, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 32, 4, 1, 8, 17, 0, 1, 1, Route107_EventScript_1EE657, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 50, 5, 1, 64, 17, 0, 1, 5, Route107_EventScript_1EE672, 0, 0, 0 Route107_MapEvents:: @ 8528950 - 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 340a3bd3f..61a4b521a 100644 --- a/data/maps/events/Route108.inc +++ b/data/maps/events/Route108.inc @@ -1,11 +1,11 @@ -Route108_MapObjects: @ 8528964 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 52, 13, 1, 45, 51, 0, 1, 3, Route108_EventScript_1EE68A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 35, 12, 1, 13, 17, 0, 1, 3, Route108_EventScript_1EE6B8, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 13, 13, 1, 24, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 8, 7, 1, 20, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 41, 5, 3, 10, 17, 0, 1, 1, Route108_EventScript_1EE6E6, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_SAILOR, 0, 0, 43, 5, 3, 9, 17, 0, 1, 1, Route108_EventScript_1EE6FD, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 42, 4, 3, 1, 17, 0, 0, 0, Route108_EventScript_290D4D, 1139, 0, 0 +Route108_EventObjects: @ 8528964 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 52, 13, 1, 45, 51, 0, 1, 3, Route108_EventScript_1EE68A, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 35, 12, 1, 13, 17, 0, 1, 3, Route108_EventScript_1EE6B8, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 13, 13, 1, 24, 0, 0, 1, 3, Route108_EventScript_1EE6A1, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 8, 7, 1, 20, 6, 0, 1, 3, Route108_EventScript_1EE6CF, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 41, 5, 3, 10, 17, 0, 1, 1, Route108_EventScript_1EE6E6, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 0, 43, 5, 3, 9, 17, 0, 1, 1, Route108_EventScript_1EE6FD, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 42, 4, 3, 1, 17, 0, 0, 0, Route108_EventScript_290D4D, 1139, 0, 0 Route108_MapWarps: @ 8528A0C warp_def 29, 6, 3, 0, ABANDONED_SHIP_DECK @@ -14,5 +14,5 @@ Route108_MapBGEvents: @ 8528A14 bg_event 38, 14, 3, 7, 0, ITEM_RARE_CANDY, 86, 0 Route108_MapEvents:: @ 8528A20 - 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 aab8c40c0..d1e85b36c 100644 --- a/data/maps/events/Route109.inc +++ b/data/maps/events/Route109.inc @@ -1,28 +1,28 @@ -Route109_MapObjects: @ 8528A34 - object_event 1, MAP_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, 744, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_1EE910, 741, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 25, 39, 1, 15, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SAILOR, 0, 0, 15, 17, 4, 8, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_SAILOR, 0, 0, 24, 13, 3, 9, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_TUBER_M, 0, 0, 19, 10, 3, 8, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_TUBER_F, 0, 0, 22, 7, 3, 80, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_1EE995, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 46, 3, 1, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005, 0, 0 - object_event 11, MAP_OBJ_GFX_TUBER_F, 0, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_TUBER_F, 0, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 0, 21, 56, 0, 9, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_TUBER_M, 0, 0, 24, 18, 3, 10, 17, 0, 0, 0, Route109_EventScript_1EE99E, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_TUBER_F, 0, 0, 25, 18, 3, 9, 17, 0, 0, 0, Route109_EventScript_1EE9B5, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_WOMAN_2, 0, 0, 30, 32, 3, 8, 17, 0, 0, 0, Route109_EventScript_1EEA06, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_WOMAN_5, 0, 0, 8, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBBD, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_MAN_5, 0, 0, 9, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBA2, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 33, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA0F, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 32, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA18, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_TUBER_F, 0, 0, 17, 13, 3, 80, 17, 0, 1, 6, Route109_EventScript_1EEBEF, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_TUBER_M, 0, 0, 27, 7, 3, 79, 17, 0, 1, 4, Route109_EventScript_1EEBD8, 0, 0, 0 - object_event 23, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 25, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_290D67, 1140, 0, 0 - object_event 24, MAP_OBJ_GFX_MAN_6, 0, 0, 17, 56, 3, 80, 17, 0, 1, 3, Route109_EventScript_1EEC06, 0, 0, 0 +Route109_EventObjects: @ 8528A34 + object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, 744, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_1EE910, 741, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_1EEA3D, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 25, 39, 1, 15, 0, 0, 1, 5, Route109_EventScript_1EEA54, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 0, 15, 17, 4, 8, 0, 0, 1, 1, Route109_EventScript_1EEA6B, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 0, 24, 13, 3, 9, 0, 0, 1, 6, Route109_EventScript_1EEA82, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 0, 19, 10, 3, 8, 0, 0, 1, 3, Route109_EventScript_1EEA99, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 0, 22, 7, 3, 80, 0, 0, 1, 4, Route109_EventScript_1EEAFB, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_1EE995, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 46, 3, 1, 0, 0, 0, 0, Route109_EventScript_290D5A, 1005, 0, 0 + object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_1EEB74, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_1EEB5D, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 21, 56, 0, 9, 0, 0, 1, 3, Route109_EventScript_1EEB8B, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 0, 24, 18, 3, 10, 17, 0, 0, 0, Route109_EventScript_1EE99E, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 0, 25, 18, 3, 9, 17, 0, 0, 0, Route109_EventScript_1EE9B5, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 30, 32, 3, 8, 17, 0, 0, 0, Route109_EventScript_1EEA06, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 8, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBBD, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 0, 9, 41, 3, 8, 17, 0, 1, 1, Route109_EventScript_1EEBA2, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 33, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA0F, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 32, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_1EEA18, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 0, 17, 13, 3, 80, 17, 0, 1, 6, Route109_EventScript_1EEBEF, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 0, 27, 7, 3, 79, 17, 0, 1, 4, Route109_EventScript_1EEBD8, 0, 0, 0 + object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 25, 6, 3, 1, 17, 0, 0, 0, Route109_EventScript_290D67, 1140, 0, 0 + object_event 24, EVENT_OBJ_GFX_MAN_6, 0, 0, 17, 56, 3, 80, 17, 0, 1, 3, Route109_EventScript_1EEC06, 0, 0, 0 Route109_MapWarps: @ 8528C74 warp_def 12, 5, 0, 0, ROUTE_109_SEASHORE_HOUSE @@ -38,5 +38,5 @@ Route109_MapBGEvents: @ 8528C7C bg_event 8, 42, 3, 7, 0, ITEM_HEART_SCALE, 91, 0 Route109_MapEvents:: @ 8528CDC - 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 1e2332451..7ded7ed23 100644 --- a/data/maps/events/Route109_SeashoreHouse.inc +++ b/data/maps/events/Route109_SeashoreHouse.inc @@ -1,13 +1,13 @@ -Route109_SeashoreHouse_MapObjects: @ 853DDE8 - object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TUBER_M, 0, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0, 0, 0 +Route109_SeashoreHouse_EventObjects: @ 853DDE8 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_2693FE, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694E2, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_269518, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_2694FD, 0, 0, 0 Route109_SeashoreHouse_MapWarps: @ 853DE48 warp_def 6, 9, 0, 0, ROUTE_109 warp_def 7, 9, 0, 0, ROUTE_109 Route109_SeashoreHouse_MapEvents:: @ 853DE58 - 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 2b8e1571d..9dd5649fb 100644 --- a/data/maps/events/Route110.inc +++ b/data/maps/events/Route110.inc @@ -1,40 +1,40 @@ -Route110_MapObjects: @ 8528CF0 - object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF338, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 14, 69, 3, 3, 16, 0, 0, 0, Route110_EventScript_1EF326, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 9, 57, 4, 2, 17, 0, 0, 0, Route110_EventScript_1EF314, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 11, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF31D, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 27, 24, 4, 2, 49, 0, 0, 0, Route110_EventScript_1EF30B, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BOY_3, 0, 0, 15, 7, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF302, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 16, 73, 4, 49, 226, 0, 1, 3, Route110_EventScript_1EF529, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 31, 4, 51, 26, 0, 1, 3, Route110_EventScript_1EF4B0, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 30, 31, 4, 9, 17, 0, 1, 4, Route110_EventScript_1EF540, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 16, 55, 4, 45, 68, 0, 1, 3, Route110_EventScript_1EF4C7, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 3, 39, 3, 10, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_LASS, 0, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_1EF409, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_MANIAC, 0, 0, 34, 40, 3, 67, 0, 0, 1, 4, Route110_EventScript_1EF420, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_1EF482, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 5, 11, 3, 12, 0, 0, 0, 16, BerryTreeScript, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 6, 11, 3, 12, 0, 0, 0, 17, BerryTreeScript, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 7, 11, 3, 12, 0, 0, 0, 18, BerryTreeScript, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D81, 1007, 0, 0 - object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D74, 1006, 0, 0 - object_event 21, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2AA, 900, 0, 0 - object_event 23, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900, 0, 0 - object_event 24, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900, 0, 0 - object_event 25, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900, 0, 0 - object_event 26, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 82, 3, 8, 0, 0, 0, 0, 0x0, 900, 0, 0 - object_event 27, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 21, 78, 4, 51, 23, 0, 1, 2, Route110_EventScript_1EF499, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_HIPSTER, 0, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, 919, 0, 0 - object_event 29, MAP_OBJ_GFX_GIDDY, 0, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, 922, 0, 0 - object_event 30, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_1EF604, 0, 0, 0 - object_event 31, MAP_OBJ_GFX_WOMAN_2, 0, 0, 10, 76, 3, 9, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0, 0, 0 - object_event 32, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 76, 3, 10, 17, 0, 1, 2, Route110_EventScript_1EF61C, 0, 0, 0 - object_event 33, MAP_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 10, 39, 3, 9, 17, 0, 1, 6, Route110_EventScript_1EF64A, 0, 0, 0 - object_event 34, MAP_OBJ_GFX_MAN_6, 0, 0, 36, 40, 3, 66, 17, 0, 1, 3, Route110_EventScript_1EF633, 0, 0, 0 - object_event 35, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 6, 38, 3, 1, 17, 0, 0, 0, Route110_EventScript_290D8E, 1141, 0, 0 - object_event 36, MAP_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 79, 3, 1, 17, 0, 0, 0, 0x0, 837, 0, 0 +Route110_EventObjects: @ 8528CF0 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF338, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_1EF32F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 14, 69, 3, 3, 16, 0, 0, 0, Route110_EventScript_1EF326, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 9, 57, 4, 2, 17, 0, 0, 0, Route110_EventScript_1EF314, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 10, 11, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF31D, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 27, 24, 4, 2, 49, 0, 0, 0, Route110_EventScript_1EF30B, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 0, 15, 7, 3, 2, 17, 0, 0, 0, Route110_EventScript_1EF302, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 16, 73, 4, 49, 226, 0, 1, 3, Route110_EventScript_1EF529, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 31, 4, 51, 26, 0, 1, 3, Route110_EventScript_1EF4B0, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 30, 31, 4, 9, 17, 0, 1, 4, Route110_EventScript_1EF540, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 16, 55, 4, 45, 68, 0, 1, 3, Route110_EventScript_1EF4C7, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 3, 39, 3, 10, 0, 0, 1, 6, Route110_EventScript_1EF3F2, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_LASS, 0, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_1EF409, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 0, 34, 40, 3, 67, 0, 0, 1, 4, Route110_EventScript_1EF420, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_1EF482, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 5, 11, 3, 12, 0, 0, 0, 16, BerryTreeScript, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 6, 11, 3, 12, 0, 0, 0, 17, BerryTreeScript, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 7, 11, 3, 12, 0, 0, 0, 18, BerryTreeScript, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D81, 1007, 0, 0 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_290D74, 1006, 0, 0 + object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_1EF3B7, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2AA, 900, 0, 0 + object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2C0, 900, 0, 0 + object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2D6, 900, 0, 0 + object_event 25, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_1EF2EC, 900, 0, 0 + object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 82, 3, 8, 0, 0, 0, 0, 0x0, 900, 0, 0 + object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 21, 78, 4, 51, 23, 0, 1, 2, Route110_EventScript_1EF499, 0, 0, 0 + object_event 28, EVENT_OBJ_GFX_HIPSTER, 0, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, 919, 0, 0 + object_event 29, EVENT_OBJ_GFX_GIDDY, 0, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, 922, 0, 0 + object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_1EF604, 0, 0, 0 + object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 10, 76, 3, 9, 0, 0, 1, 2, Route110_EventScript_1EF5A2, 0, 0, 0 + object_event 32, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 76, 3, 10, 17, 0, 1, 2, Route110_EventScript_1EF61C, 0, 0, 0 + object_event 33, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 0, 10, 39, 3, 9, 17, 0, 1, 6, Route110_EventScript_1EF64A, 0, 0, 0 + object_event 34, EVENT_OBJ_GFX_MAN_6, 0, 0, 36, 40, 3, 66, 17, 0, 1, 3, Route110_EventScript_1EF633, 0, 0, 0 + object_event 35, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 38, 3, 1, 17, 0, 0, 0, Route110_EventScript_290D8E, 1141, 0, 0 + object_event 36, EVENT_OBJ_GFX_PROF_BIRCH, 0, 0, 9, 79, 3, 1, 17, 0, 0, 0, 0x0, 837, 0, 0 Route110_MapWarps: @ 8529050 warp_def 35, 24, 3, 0, NEW_MAUVILLE_ENTRANCE @@ -75,5 +75,5 @@ Route110_MapBGEvents: @ 8529110 bg_event 13, 16, 0, 0, 0, Route110_EventScript_1EF34A Route110_MapEvents:: @ 85291DC - 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_SeasideCyclingRoadEntrance1.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc index 37d3065c5..23f896e4b 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadEntrance1.inc @@ -1,5 +1,5 @@ -Route110_SeasideCyclingRoadEntrance1_MapObjects: @ 853E9A0 - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78, 0, 0, 0 +Route110_SeasideCyclingRoadEntrance1_EventObjects: @ 853E9A0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EA78, 0, 0, 0 Route110_SeasideCyclingRoadEntrance1_MapWarps: @ 853E9B8 warp_def 1, 5, 0, 4, ROUTE_110 @@ -12,5 +12,5 @@ Route110_SeasideCyclingRoadEntrance1_MapCoordEvents: @ 853E9D8 coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6 Route110_SeasideCyclingRoadEntrance1_MapEvents:: @ 853E9F8 - map_events Route110_SeasideCyclingRoadEntrance1_MapObjects, Route110_SeasideCyclingRoadEntrance1_MapWarps, Route110_SeasideCyclingRoadEntrance1_MapCoordEvents, 0x0 + map_events Route110_SeasideCyclingRoadEntrance1_EventObjects, Route110_SeasideCyclingRoadEntrance1_MapWarps, Route110_SeasideCyclingRoadEntrance1_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc index 38e02b9ce..f988f9751 100644 --- a/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc +++ b/data/maps/events/Route110_SeasideCyclingRoadEntrance2.inc @@ -1,5 +1,5 @@ -Route110_SeasideCyclingRoadEntrance2_MapObjects: @ 853EA0C - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4, 0, 0, 0 +Route110_SeasideCyclingRoadEntrance2_EventObjects: @ 853EA0C + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EBC4, 0, 0, 0 Route110_SeasideCyclingRoadEntrance2_MapWarps: @ 853EA24 warp_def 1, 5, 0, 2, ROUTE_110 @@ -12,5 +12,5 @@ Route110_SeasideCyclingRoadEntrance2_MapCoordEvents: @ 853EA44 coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13 Route110_SeasideCyclingRoadEntrance2_MapEvents:: @ 853EA64 - map_events Route110_SeasideCyclingRoadEntrance2_MapObjects, Route110_SeasideCyclingRoadEntrance2_MapWarps, Route110_SeasideCyclingRoadEntrance2_MapCoordEvents, 0x0 + map_events Route110_SeasideCyclingRoadEntrance2_EventObjects, Route110_SeasideCyclingRoadEntrance2_MapWarps, Route110_SeasideCyclingRoadEntrance2_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route110_TrickHouseEnd.inc b/data/maps/events/Route110_TrickHouseEnd.inc index 34ebbc229..62640ab29 100644 --- a/data/maps/events/Route110_TrickHouseEnd.inc +++ b/data/maps/events/Route110_TrickHouseEnd.inc @@ -1,5 +1,5 @@ -Route110_TrickHouseEnd_MapObjects: @ 853DEFC - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899, 0, 0 +Route110_TrickHouseEnd_EventObjects: @ 853DEFC + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_26AD17, 899, 0, 0 Route110_TrickHouseEnd_MapWarps: @ 853DF14 warp_def 10, 1, 3, 2, ROUTE_110_TRICK_HOUSE_PUZZLE_1 @@ -12,5 +12,5 @@ Route110_TrickHouseEnd_MapBGEvents: @ 853DF34 bg_event 4, 5, 3, 7, 0, ITEM_NUGGET, 1, 0 Route110_TrickHouseEnd_MapEvents:: @ 853DF40 - 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 a87df306b..c6a31119f 100644 --- a/data/maps/events/Route110_TrickHouseEntrance.inc +++ b/data/maps/events/Route110_TrickHouseEntrance.inc @@ -1,5 +1,5 @@ -Route110_TrickHouseEntrance_MapObjects: @ 853DE6C - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872, 0, 0 +Route110_TrickHouseEntrance_EventObjects: @ 853DE6C + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_269D3B, 872, 0, 0 Route110_TrickHouseEntrance_MapWarps: @ 853DE84 warp_def 5, 7, 3, 1, ROUTE_110 @@ -16,5 +16,5 @@ Route110_TrickHouseEntrance_MapBGEvents: @ 853DEDC bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_26A0D3 Route110_TrickHouseEntrance_MapEvents:: @ 853DEE8 - 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 002ad0532..40da83bb8 100644 --- a/data/maps/events/Route110_TrickHousePuzzle1.inc +++ b/data/maps/events/Route110_TrickHousePuzzle1.inc @@ -1,19 +1,19 @@ -Route110_TrickHousePuzzle1_MapObjects: @ 853DF88 - object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 14, 20, 3, 9, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 14, 8, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 2, 15, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19, 0, 0 - object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 18, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18, 0, 0 - object_event 6, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 14, 14, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20, 0, 0 - object_event 7, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23, 0, 0 - object_event 8, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22, 0, 0 - object_event 9, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21, 0, 0 - object_event 10, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25, 0, 0 - object_event 11, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27, 0, 0 - object_event 13, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 9, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30, 0, 0 +Route110_TrickHousePuzzle1_EventObjects: @ 853DF88 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 14, 20, 3, 9, 0, 0, 1, 6, Route110_TrickHousePuzzle1_EventScript_26B948, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 14, 8, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B95F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 2, 15, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_26B976, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 19, 0, 0 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 18, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 18, 0, 0 + object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 14, 14, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 20, 0, 0 + object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 23, 0, 0 + object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 22, 0, 0 + object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 11, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 21, 0, 0 + object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 25, 0, 0 + object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 13, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 24, 0, 0 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 0, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 27, 0, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 4, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_29140E, 1060, 0, 0 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 28, 0, 0 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 2, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_2906BB, 30, 0, 0 Route110_TrickHousePuzzle1_MapWarps: @ 853E0F0 warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE @@ -24,5 +24,5 @@ Route110_TrickHousePuzzle1_MapBGEvents: @ 853E108 bg_event 3, 16, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_26B92B Route110_TrickHousePuzzle1_MapEvents:: @ 853E114 - 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 92f2bad01..ed03f5d79 100644 --- a/data/maps/events/Route110_TrickHousePuzzle2.inc +++ b/data/maps/events/Route110_TrickHousePuzzle2.inc @@ -1,9 +1,9 @@ -Route110_TrickHousePuzzle2_MapObjects: @ 853E128 - object_event 1, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 13, 10, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 10, 17, 3, 8, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_3, 0, 0, 11, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061, 0, 0 +Route110_TrickHousePuzzle2_EventObjects: @ 853E128 + object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 13, 10, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_26BC75, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 10, 17, 3, 8, 0, 0, 1, 4, Route110_TrickHousePuzzle2_EventScript_26BC8C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 0, 11, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_26BCA3, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_291428, 1062, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_29141B, 1061, 0, 0 Route110_TrickHousePuzzle2_MapWarps: @ 853E1A0 warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE @@ -20,5 +20,5 @@ Route110_TrickHousePuzzle2_MapBGEvents: @ 853E1F8 bg_event 14, 14, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_26BBC0 Route110_TrickHousePuzzle2_MapEvents:: @ 853E204 - 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 c3070fafe..0097717fa 100644 --- a/data/maps/events/Route110_TrickHousePuzzle3.inc +++ b/data/maps/events/Route110_TrickHousePuzzle3.inc @@ -1,11 +1,11 @@ -Route110_TrickHousePuzzle3_MapObjects: @ 853E218 - object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 7, 19, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_PICNICKER, 0, 0, 4, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_HIKER, 0, 0, 10, 10, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 1, 20, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 21, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22, 0, 0 +Route110_TrickHousePuzzle3_EventObjects: @ 853E218 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 7, 19, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle3_EventScript_26C5C4, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 0, 4, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5DB, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 0, 10, 10, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_26C5F2, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 1, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291442, 1064, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_291435, 1063, 0, 0 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 1, 20, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 21, 0, 0 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 2, 21, 3, 1, 17, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_2907A6, 22, 0, 0 Route110_TrickHousePuzzle3_MapWarps: @ 853E2C0 warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE @@ -22,5 +22,5 @@ Route110_TrickHousePuzzle3_MapBGEvents: @ 853E318 bg_event 0, 14, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_26C5A7 Route110_TrickHousePuzzle3_MapEvents:: @ 853E324 - 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 79731353c..b6e4b2f07 100644 --- a/data/maps/events/Route110_TrickHousePuzzle4.inc +++ b/data/maps/events/Route110_TrickHousePuzzle4.inc @@ -1,18 +1,18 @@ -Route110_TrickHousePuzzle4_MapObjects: @ 853E338 - object_event 1, MAP_OBJ_GFX_GIRL_3, 0, 0, 2, 2, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 14, 7, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 14, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21, 0, 0 - object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22, 0, 0 - object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23, 0, 0 - object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24, 0, 0 - object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 14, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25, 0, 0 - object_event 14, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26, 0, 0 +Route110_TrickHousePuzzle4_EventObjects: @ 853E338 + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 0, 2, 2, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_26C87E, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 14, 7, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C8AC, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 14, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_26C895, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_29144F, 1065, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 17, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 5, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 18, 0, 0 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 16, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 19, 0, 0 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 6, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 20, 0, 0 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 21, 0, 0 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 22, 0, 0 + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 23, 0, 0 + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 24, 0, 0 + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 14, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 25, 0, 0 + object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 15, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_2908BA, 26, 0, 0 Route110_TrickHousePuzzle4_MapWarps: @ 853E488 warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE @@ -23,5 +23,5 @@ Route110_TrickHousePuzzle4_MapBGEvents: @ 853E4A0 bg_event 14, 13, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_26C861 Route110_TrickHousePuzzle4_MapEvents:: @ 853E4AC - 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 801448b12..7ae53cdad 100644 --- a/data/maps/events/Route110_TrickHousePuzzle5.inc +++ b/data/maps/events/Route110_TrickHousePuzzle5.inc @@ -1,9 +1,9 @@ -Route110_TrickHousePuzzle5_MapObjects: @ 853E4C0 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 6, 17, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 0, 7, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_1, 0, 0, 14, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_1, 0, 0, 14, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_1, 0, 0, 10, 4, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0, 0, 0 +Route110_TrickHousePuzzle5_EventObjects: @ 853E4C0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 6, 17, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB32, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 0, 7, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB53, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 0, 14, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB74, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 0, 14, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB95, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 0, 10, 4, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CBB6, 0, 0, 0 Route110_TrickHousePuzzle5_MapWarps: @ 853E538 warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE @@ -38,5 +38,5 @@ Route110_TrickHousePuzzle5_MapBGEvents: @ 853E6B0 bg_event 11, 21, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_26CB15 Route110_TrickHousePuzzle5_MapEvents:: @ 853E6BC - 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 d08169a76..a36e7cd72 100644 --- a/data/maps/events/Route110_TrickHousePuzzle6.inc +++ b/data/maps/events/Route110_TrickHousePuzzle6.inc @@ -1,8 +1,8 @@ -Route110_TrickHousePuzzle6_MapObjects: @ 853E6D0 - object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 0, 7, 9, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_6, 0, 0, 11, 10, 3, 10, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 4, 5, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 11, 21, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067, 0, 0 +Route110_TrickHousePuzzle6_EventObjects: @ 853E6D0 + object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 0, 7, 9, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DDE1, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 0, 11, 10, 3, 10, 0, 0, 1, 3, Route110_TrickHousePuzzle6_EventScript_26DDF8, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 4, 5, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle6_EventScript_26DE0F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 21, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_29145C, 1067, 0, 0 Route110_TrickHousePuzzle6_MapWarps: @ 853E730 warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE @@ -13,5 +13,5 @@ Route110_TrickHousePuzzle6_MapBGEvents: @ 853E748 bg_event 0, 10, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_26DDC4 Route110_TrickHousePuzzle6_MapEvents:: @ 853E754 - 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 8da2bab85..39ee27853 100644 --- a/data/maps/events/Route110_TrickHousePuzzle7.inc +++ b/data/maps/events/Route110_TrickHousePuzzle7.inc @@ -1,13 +1,13 @@ -Route110_TrickHousePuzzle7_MapObjects: @ 853E768 - object_event 1, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 20, 0, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LASS, 0, 0, 10, 2, 0, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 8, 17, 0, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 5, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068, 0, 0 - object_event 5, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 2, 3, 8, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_LASS, 0, 0, 8, 13, 3, 7, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 9, 12, 3, 9, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 17, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 6, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 +Route110_TrickHousePuzzle7_EventObjects: @ 853E768 + object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 20, 0, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E389, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 0, 10, 2, 0, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3B7, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 8, 17, 0, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3A0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 5, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_291469, 1068, 0, 0 + object_event 5, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 9, 2, 3, 8, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3E5, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_LASS, 0, 0, 8, 13, 3, 7, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3CE, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 9, 12, 3, 9, 17, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_26E3FC, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 17, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_TRICK_HOUSE_STATUE, 0, 0, 4, 6, 0, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 Route110_TrickHousePuzzle7_MapWarps: @ 853E840 warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE @@ -34,5 +34,5 @@ Route110_TrickHousePuzzle7_MapBGEvents: @ 853E8E8 bg_event 6, 17, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_26E1D0 Route110_TrickHousePuzzle7_MapEvents:: @ 853E8F4 - 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 5d942affa..2e44e5b74 100644 --- a/data/maps/events/Route110_TrickHousePuzzle8.inc +++ b/data/maps/events/Route110_TrickHousePuzzle8.inc @@ -1,8 +1,8 @@ -Route110_TrickHousePuzzle8_MapObjects: @ 853E908 - object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 1, 10, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 8, 17, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 2, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069, 0, 0 +Route110_TrickHousePuzzle8_EventObjects: @ 853E908 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 1, 10, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E81F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 4, 2, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E84D, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 8, 17, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_26E836, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_291476, 1069, 0, 0 Route110_TrickHousePuzzle8_MapWarps: @ 853E968 warp_def 0, 21, 3, 2, ROUTE_110_TRICK_HOUSE_ENTRANCE @@ -13,5 +13,5 @@ Route110_TrickHousePuzzle8_MapBGEvents: @ 853E980 bg_event 3, 21, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_26E802 Route110_TrickHousePuzzle8_MapEvents:: @ 853E98C - 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 9c79e2c52..bfd09e58e 100644 --- a/data/maps/events/Route111.inc +++ b/data/maps/events/Route111.inc @@ -1,50 +1,50 @@ -Route111_MapObjects: @ 85291F0 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 769, 0, 0 - object_event 3, MAP_OBJ_GFX_LASS, 0, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, 770, 0, 0 - object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 771, 0, 0 - object_event 5, MAP_OBJ_GFX_PICNICKER, 0, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F121B, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 22, 5, 3, 12, 0, 0, 0, 19, BerryTreeScript, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 23, 5, 3, 12, 0, 0, 0, 20, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MAN_4, 0, 0, 8, 91, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1189, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_CAMPER, 0, 0, 29, 37, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1204, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_HIKER, 0, 0, 27, 69, 3, 50, 34, 0, 1, 2, Route111_EventScript_1F1260, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_CAMPER, 0, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1F1232, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_PICNICKER, 0, 0, 32, 66, 3, 24, 0, 0, 1, 3, Route111_EventScript_1F1249, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDF6, 796, 0, 0 - object_event 14, MAP_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796, 0, 0 - object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 101, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 100, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 18, 0, 0 - object_event 17, MAP_OBJ_GFX_GIRL_1, 0, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 33, 104, 3, 1, 0, 0, 0, 0, Route111_EventScript_290D9B, 1008, 0, 0 - object_event 19, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 80, BerryTreeScript, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 19, 5, 3, 12, 0, 0, 0, 81, BerryTreeScript, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CE96, 799, 0, 0 - object_event 22, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799, 0, 0 - object_event 23, MAP_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF16, 903, 0, 0 - object_event 24, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF36, 903, 0, 0 - object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009, 0, 0 - object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010, 0, 0 - object_event 27, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 22, 21, 3, 1, 0, 0, 0, 0, Route111_EventScript_2906BB, 19, 0, 0 - object_event 28, MAP_OBJ_GFX_PICNICKER, 0, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0, 0, 0 - object_event 29, MAP_OBJ_GFX_CAMPER, 0, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0, 0, 0 - object_event 30, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0, 0, 0 - object_event 31, MAP_OBJ_GFX_WOMAN_7, 0, 0, 11, 11, 3, 7, 4, 0, 1, 4, Route111_EventScript_1F1369, 0, 0, 0 - object_event 32, MAP_OBJ_GFX_MAN_4, 0, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1307, 0, 0, 0 - object_event 33, MAP_OBJ_GFX_BOY_1, 0, 0, 13, 20, 3, 7, 17, 0, 0, 0, Route111_EventScript_2765FF, 960, 0, 0 - object_event 34, MAP_OBJ_GFX_MAN_5, 0, 0, 20, 114, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1192, 0, 0, 0 - object_event 35, MAP_OBJ_GFX_CAMPER, 0, 0, 26, 132, 3, 9, 17, 0, 1, 5, Route111_EventScript_1F13F9, 0, 0, 0 - object_event 36, MAP_OBJ_GFX_WOMAN_3, 0, 0, 20, 132, 3, 10, 17, 0, 1, 5, Route111_EventScript_1F1410, 0, 0, 0 - object_event 37, MAP_OBJ_GFX_PICNICKER, 0, 0, 19, 121, 3, 7, 17, 0, 1, 2, Route111_EventScript_1F13E2, 0, 0, 0 - object_event 38, MAP_OBJ_GFX_MAN_6, 0, 0, 16, 119, 3, 10, 17, 0, 1, 3, Route111_EventScript_1F13CB, 0, 0, 0 - object_event 39, MAP_OBJ_GFX_HIKER, 0, 0, 29, 77, 3, 14, 17, 0, 1, 7, Route111_EventScript_1F143E, 0, 0, 0 - object_event 40, MAP_OBJ_GFX_PICNICKER, 0, 0, 22, 77, 3, 10, 17, 0, 1, 6, Route111_EventScript_1F1427, 0, 0, 0 - object_event 41, MAP_OBJ_GFX_CAMPER, 0, 0, 37, 77, 3, 9, 17, 0, 1, 7, Route111_EventScript_1F1455, 0, 0, 0 - object_event 42, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 118, 3, 1, 17, 0, 0, 0, Route111_EventScript_290DC2, 1142, 0, 0 - object_event 43, MAP_OBJ_GFX_HIKER, 0, 0, 14, 56, 3, 16, 17, 0, 0, 0, Route111_EventScript_1F119B, 0, 0, 0 - object_event 44, MAP_OBJ_GFX_FOSSIL, 0, 0, 20, 53, 3, 8, 17, 0, 0, 0, 0x0, 876, 0, 0 - object_event 45, MAP_OBJ_GFX_HIPSTER, 0, 0, 19, 53, 3, 8, 17, 0, 0, 0, 0x0, 875, 0, 0 - object_event 46, MAP_OBJ_GFX_FAT_MAN, 0, 0, 19, 101, 3, 7, 17, 0, 0, 0, Route111_EventScript_1F11E4, 843, 0, 0 +Route111_EventObjects: @ 85291F0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1F0FC5, 768, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 769, 0, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, 770, 0, 0 + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, 771, 0, 0 + object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F121B, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 22, 5, 3, 12, 0, 0, 0, 19, BerryTreeScript, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 23, 5, 3, 12, 0, 0, 0, 20, BerryTreeScript, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 0, 8, 91, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1189, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 0, 29, 37, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1204, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_HIKER, 0, 0, 27, 69, 3, 50, 34, 0, 1, 2, Route111_EventScript_1F1260, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1F1232, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 0, 32, 66, 3, 24, 0, 0, 1, 3, Route111_EventScript_1F1249, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDF6, 796, 0, 0 + object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CDD6, 796, 0, 0 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 101, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 17, 0, 0 + object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 100, 3, 1, 0, 0, 0, 0, Route111_EventScript_2907A6, 18, 0, 0 + object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1F0EB9, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 33, 104, 3, 1, 0, 0, 0, 0, Route111_EventScript_290D9B, 1008, 0, 0 + object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 80, BerryTreeScript, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 19, 5, 3, 12, 0, 0, 0, 81, BerryTreeScript, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CE96, 799, 0, 0 + object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CEB6, 799, 0, 0 + object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF16, 903, 0, 0 + object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_28CF36, 903, 0, 0 + object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DA8, 1009, 0, 0 + object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_290DB5, 1010, 0, 0 + object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 22, 21, 3, 1, 0, 0, 0, 0, Route111_EventScript_2906BB, 19, 0, 0 + object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_1F12D9, 0, 0, 0 + object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_1F12C2, 0, 0, 0 + object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_1F12F0, 0, 0, 0 + object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 11, 11, 3, 7, 4, 0, 1, 4, Route111_EventScript_1F1369, 0, 0, 0 + object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_1F1307, 0, 0, 0 + object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 0, 13, 20, 3, 7, 17, 0, 0, 0, Route111_EventScript_2765FF, 960, 0, 0 + object_event 34, EVENT_OBJ_GFX_MAN_5, 0, 0, 20, 114, 3, 2, 17, 0, 0, 0, Route111_EventScript_1F1192, 0, 0, 0 + object_event 35, EVENT_OBJ_GFX_CAMPER, 0, 0, 26, 132, 3, 9, 17, 0, 1, 5, Route111_EventScript_1F13F9, 0, 0, 0 + object_event 36, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 20, 132, 3, 10, 17, 0, 1, 5, Route111_EventScript_1F1410, 0, 0, 0 + object_event 37, EVENT_OBJ_GFX_PICNICKER, 0, 0, 19, 121, 3, 7, 17, 0, 1, 2, Route111_EventScript_1F13E2, 0, 0, 0 + object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 0, 16, 119, 3, 10, 17, 0, 1, 3, Route111_EventScript_1F13CB, 0, 0, 0 + object_event 39, EVENT_OBJ_GFX_HIKER, 0, 0, 29, 77, 3, 14, 17, 0, 1, 7, Route111_EventScript_1F143E, 0, 0, 0 + object_event 40, EVENT_OBJ_GFX_PICNICKER, 0, 0, 22, 77, 3, 10, 17, 0, 1, 6, Route111_EventScript_1F1427, 0, 0, 0 + object_event 41, EVENT_OBJ_GFX_CAMPER, 0, 0, 37, 77, 3, 9, 17, 0, 1, 7, Route111_EventScript_1F1455, 0, 0, 0 + object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 118, 3, 1, 17, 0, 0, 0, Route111_EventScript_290DC2, 1142, 0, 0 + object_event 43, EVENT_OBJ_GFX_HIKER, 0, 0, 14, 56, 3, 16, 17, 0, 0, 0, Route111_EventScript_1F119B, 0, 0, 0 + object_event 44, EVENT_OBJ_GFX_FOSSIL, 0, 0, 20, 53, 3, 8, 17, 0, 0, 0, 0x0, 876, 0, 0 + object_event 45, EVENT_OBJ_GFX_HIPSTER, 0, 0, 19, 53, 3, 8, 17, 0, 0, 0, 0x0, 875, 0, 0 + object_event 46, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 19, 101, 3, 7, 17, 0, 0, 0, Route111_EventScript_1F11E4, 843, 0, 0 Route111_MapWarps: @ 8529640 warp_def 13, 113, 0, 0, ROUTE_111_WINSTRATE_FAMILYS_HOUSE @@ -110,5 +110,5 @@ Route111_MapBGEvents: @ 8529888 bg_event 24, 116, 0, 0, 0, Route111_EventScript_1F146C Route111_MapEvents:: @ 8529960 - 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 05510b62d..3cb500bdc 100644 --- a/data/maps/events/Route111_OldLadysRestStop.inc +++ b/data/maps/events/Route111_OldLadysRestStop.inc @@ -1,10 +1,10 @@ -Route111_OldLadysRestStop_MapObjects: @ 8533C18 - object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0, 0, 0 +Route111_OldLadysRestStop_EventObjects: @ 8533C18 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_22A920, 0, 0, 0 Route111_OldLadysRestStop_MapWarps: @ 8533C30 warp_def 3, 7, 0, 2, ROUTE_111 warp_def 4, 7, 0, 2, ROUTE_111 Route111_OldLadysRestStop_MapEvents:: @ 8533C40 - 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 402b6e180..bd7567d81 100644 --- a/data/maps/events/Route111_WinstrateFamilysHouse.inc +++ b/data/maps/events/Route111_WinstrateFamilysHouse.inc @@ -1,13 +1,13 @@ -Route111_WinstrateFamilysHouse_MapObjects: @ 8533B94 - object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0, 0, 0 +Route111_WinstrateFamilysHouse_EventObjects: @ 8533B94 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4E8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A48D, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4A2, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_22A4FD, 0, 0, 0 Route111_WinstrateFamilysHouse_MapWarps: @ 8533BF4 warp_def 3, 7, 0, 0, ROUTE_111 warp_def 4, 7, 0, 0, ROUTE_111 Route111_WinstrateFamilysHouse_MapEvents:: @ 8533C04 - 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 56bd16935..e2b26846e 100644 --- a/data/maps/events/Route112.inc +++ b/data/maps/events/Route112.inc @@ -1,18 +1,18 @@ -Route112_MapObjects: @ 8529974 - object_event 1, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 30, 3, 7, 17, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0 - object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_PICNICKER, 0, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_HIKER, 0, 0, 15, 40, 3, 16, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 27, 30, 3, 7, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 27, 6, 0, 12, 0, 0, 0, 24, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 28, 6, 0, 12, 0, 0, 0, 23, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 29, 6, 0, 12, 0, 0, 0, 22, BerryTreeScript, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 30, 6, 3, 12, 0, 0, 0, 21, BerryTreeScript, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_HIKER, 0, 0, 8, 50, 3, 26, 48, 0, 0, 0, Route112_EventScript_1F1E61, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011, 0, 0 - object_event 13, MAP_OBJ_GFX_MAN_6, 0, 0, 31, 7, 3, 18, 17, 0, 1, 3, Route112_EventScript_1F1F11, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 0, 31, 11, 3, 15, 17, 0, 1, 3, Route112_EventScript_1F1F28, 0, 0, 0 +Route112_EventObjects: @ 8529974 + object_event 1, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 26, 30, 3, 7, 17, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_1F1E6A, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_1F1EE3, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1F1EFA, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_HIKER, 0, 0, 15, 40, 3, 16, 0, 0, 1, 3, Route112_EventScript_1F1E81, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 27, 30, 3, 7, 0, 0, 0, 0, Route112_EventScript_1F1DB7, 819, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 27, 6, 0, 12, 0, 0, 0, 24, BerryTreeScript, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 28, 6, 0, 12, 0, 0, 0, 23, BerryTreeScript, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 29, 6, 0, 12, 0, 0, 0, 22, BerryTreeScript, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 30, 6, 3, 12, 0, 0, 0, 21, BerryTreeScript, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_HIKER, 0, 0, 8, 50, 3, 26, 48, 0, 0, 0, Route112_EventScript_1F1E61, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_290DCF, 1011, 0, 0 + object_event 13, EVENT_OBJ_GFX_MAN_6, 0, 0, 31, 7, 3, 18, 17, 0, 1, 3, Route112_EventScript_1F1F11, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 31, 11, 3, 15, 17, 0, 1, 3, Route112_EventScript_1F1F28, 0, 0, 0 Route112_MapWarps: @ 8529AC4 warp_def 28, 27, 0, 0, ROUTE_112_CABLE_CAR_STATION @@ -28,5 +28,5 @@ Route112_MapBGEvents: @ 8529AF4 bg_event 4, 49, 0, 0, 0, Route112_EventScript_1F1E58 Route112_MapEvents:: @ 8529B18 - 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 e1f001aad..e33f6cb77 100644 --- a/data/maps/events/Route112_CableCarStation.inc +++ b/data/maps/events/Route112_CableCarStation.inc @@ -1,11 +1,11 @@ -Route112_CableCarStation_MapObjects: @ 8533C54 - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 +Route112_CableCarStation_EventObjects: @ 8533C54 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_22AB17, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 Route112_CableCarStation_MapWarps: @ 8533C84 warp_def 6, 11, 0, 0, ROUTE_112 warp_def 7, 11, 0, 1, ROUTE_112 Route112_CableCarStation_MapEvents:: @ 8533C94 - 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 f1d07a671..4d5376cce 100644 --- a/data/maps/events/Route113.inc +++ b/data/maps/events/Route113.inc @@ -1,20 +1,20 @@ -Route113_MapObjects: @ 8529B2C - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_1F2193, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 36, 10, 3, 3, 16, 0, 0, 0, Route113_EventScript_1F218A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_7, 0, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 79, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013, 0, 0 - object_event 8, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F2250, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 71, 2, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 45, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22C9, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 46, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22E4, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 15, 15, 3, 1, 17, 0, 0, 0, Route113_EventScript_290DF6, 1143, 0, 0 - object_event 13, MAP_OBJ_GFX_MANIAC, 0, 0, 75, 3, 3, 9, 17, 0, 1, 4, Route113_EventScript_1F2344, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_CAMPER, 0, 0, 71, 4, 3, 7, 17, 0, 1, 1, Route113_EventScript_1F232D, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_PICNICKER, 0, 0, 7, 6, 3, 26, 49, 0, 1, 6, Route113_EventScript_1F22FF, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_MAN_6, 0, 0, 7, 13, 3, 25, 49, 0, 1, 6, Route113_EventScript_1F2316, 0, 0, 0 +Route113_EventObjects: @ 8529B2C + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_1F2193, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 36, 10, 3, 3, 16, 0, 0, 0, Route113_EventScript_1F218A, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_1F21C0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_1F21D7, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_1F21EE, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DDC, 1012, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 79, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_290DE9, 1013, 0, 0 + object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F2250, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 71, 2, 3, 63, 0, 0, 3, 1, Route113_EventScript_1F22B2, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 45, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22C9, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 46, 6, 3, 8, 17, 0, 1, 1, Route113_EventScript_1F22E4, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 15, 15, 3, 1, 17, 0, 0, 0, Route113_EventScript_290DF6, 1143, 0, 0 + object_event 13, EVENT_OBJ_GFX_MANIAC, 0, 0, 75, 3, 3, 9, 17, 0, 1, 4, Route113_EventScript_1F2344, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_CAMPER, 0, 0, 71, 4, 3, 7, 17, 0, 1, 1, Route113_EventScript_1F232D, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_PICNICKER, 0, 0, 7, 6, 3, 26, 49, 0, 1, 6, Route113_EventScript_1F22FF, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 13, 3, 25, 49, 0, 1, 6, Route113_EventScript_1F2316, 0, 0, 0 Route113_MapWarps: @ 8529CAC warp_def 33, 5, 0, 0, ROUTE_113_GLASS_WORKSHOP @@ -53,5 +53,5 @@ Route113_MapBGEvents: @ 8529DF4 bg_event 73, 3, 3, 7, 0, ITEM_NUGGET, 98, 0 Route113_MapEvents:: @ 8529E54 - 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 0191f8578..85d84324c 100644 --- a/data/maps/events/Route113_GlassWorkshop.inc +++ b/data/maps/events/Route113_GlassWorkshop.inc @@ -1,11 +1,11 @@ -Route113_GlassWorkshop_MapObjects: @ 853EA78 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0, 0, 0 +Route113_GlassWorkshop_EventObjects: @ 853EA78 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_26ED1E, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 5, 4, 3, 2, 17, 0, 0, 0, Route113_GlassWorkshop_EventScript_26F194, 0, 0, 0 Route113_GlassWorkshop_MapWarps: @ 853EAA8 warp_def 3, 8, 0, 0, ROUTE_113 warp_def 4, 8, 0, 0, ROUTE_113 Route113_GlassWorkshop_MapEvents:: @ 853EAB8 - 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 800af012c..1a7b58289 100644 --- a/data/maps/events/Route114.inc +++ b/data/maps/events/Route114.inc @@ -1,31 +1,31 @@ -Route114_MapObjects: @ 8529E68 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 43, 3, 12, 0, 0, 0, 77, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 44, 3, 12, 0, 0, 0, 78, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_HIKER, 0, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1F2640, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_HIKER, 0, 0, 30, 72, 5, 9, 0, 0, 1, 4, Route114_EventScript_1F2657, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_CAMPER, 0, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_1F266E, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_PICNICKER, 0, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_1F2685, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MANIAC, 0, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_1F269C, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 45, 3, 12, 0, 0, 0, 68, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_290E03, 1014, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_290E10, 1015, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 43, 4, 1, 0, 0, 0, 0, Route114_EventScript_2907A6, 17, 0, 0 - object_event 12, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_POOCHYENA, 0, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F2612, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_MAN_5, 0, 0, 27, 42, 3, 3, 16, 0, 0, 0, Route114_EventScript_1F2582, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 0, 25, 6, 3, 8, 0, 0, 1, 0, Route114_EventScript_1F2777, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_FISHERMAN, 0, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1F2760, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_MAN_6, 0, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 53, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 18, 0, 0 - object_event 19, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 30, 54, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 19, 0, 0 - object_event 20, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 22, 69, 7, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 20, 0, 0 - object_event 21, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 64, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 21, 0, 0 - object_event 22, MAP_OBJ_GFX_LASS, 0, 0, 24, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F27A9, 0, 0, 0 - object_event 23, MAP_OBJ_GFX_LASS, 0, 0, 23, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F278E, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_PICNICKER, 0, 0, 28, 20, 3, 7, 17, 0, 1, 3, Route114_EventScript_1F27DB, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_PICNICKER, 0, 0, 26, 72, 5, 18, 17, 0, 1, 4, Route114_EventScript_1F27C4, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 19, 3, 1, 17, 0, 0, 0, Route114_EventScript_290E1D, 1160, 0, 0 - object_event 27, MAP_OBJ_GFX_FISHERMAN, 0, 0, 28, 16, 3, 17, 17, 0, 1, 3, Route114_EventScript_1F27F2, 0, 0, 0 +Route114_EventObjects: @ 8529E68 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 43, 3, 12, 0, 0, 0, 77, BerryTreeScript, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 44, 3, 12, 0, 0, 0, 78, BerryTreeScript, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1F2640, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 0, 30, 72, 5, 9, 0, 0, 1, 4, Route114_EventScript_1F2657, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_1F266E, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_1F2685, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_1F269C, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 45, 3, 12, 0, 0, 0, 68, BerryTreeScript, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_290E03, 1014, 0, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_290E10, 1015, 0, 0 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 43, 4, 1, 0, 0, 0, 0, Route114_EventScript_2907A6, 17, 0, 0 + object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F25D1, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1F2612, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 0, 27, 42, 3, 3, 16, 0, 0, 0, Route114_EventScript_1F2582, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 25, 6, 3, 8, 0, 0, 1, 0, Route114_EventScript_1F2777, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1F2760, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_1F26FE, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 53, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 18, 0, 0 + object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 30, 54, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 19, 0, 0 + object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 22, 69, 7, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 20, 0, 0 + object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 64, 5, 1, 17, 0, 0, 0, Route114_EventScript_2907A6, 21, 0, 0 + object_event 22, EVENT_OBJ_GFX_LASS, 0, 0, 24, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F27A9, 0, 0, 0 + object_event 23, EVENT_OBJ_GFX_LASS, 0, 0, 23, 44, 3, 8, 17, 0, 1, 1, Route114_EventScript_1F278E, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_PICNICKER, 0, 0, 28, 20, 3, 7, 17, 0, 1, 3, Route114_EventScript_1F27DB, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_PICNICKER, 0, 0, 26, 72, 5, 18, 17, 0, 1, 4, Route114_EventScript_1F27C4, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 19, 3, 1, 17, 0, 0, 0, Route114_EventScript_290E1D, 1160, 0, 0 + object_event 27, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 28, 16, 3, 17, 17, 0, 1, 3, Route114_EventScript_1F27F2, 0, 0, 0 Route114_MapWarps: @ 852A0F0 warp_def 8, 63, 0, 0, METEOR_FALLS_1F_1R @@ -49,5 +49,5 @@ Route114_MapBGEvents: @ 852A118 bg_event 7, 30, 3, 7, 0, ITEM_REVIVE, 42, 0 Route114_MapEvents:: @ 852A1A8 - 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 e20e9c54c..ef9ad911a 100644 --- a/data/maps/events/Route114_FossilManiacsHouse.inc +++ b/data/maps/events/Route114_FossilManiacsHouse.inc @@ -1,5 +1,5 @@ -Route114_FossilManiacsHouse_MapObjects: @ 8533CFC - object_event 1, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 3, 2, 3, 8, 17, 0, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0, 0, 0 +Route114_FossilManiacsHouse_EventObjects: @ 8533CFC + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 3, 2, 3, 8, 17, 0, 0, 0, Route114_FossilManiacsHouse_EventScript_22AD3A, 0, 0, 0 Route114_FossilManiacsHouse_MapWarps: @ 8533D14 warp_def 4, 7, 0, 1, ROUTE_114 @@ -13,5 +13,5 @@ Route114_FossilManiacsHouse_MapBGEvents: @ 8533D2C bg_event 8, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_22AD7C Route114_FossilManiacsHouse_MapEvents:: @ 8533D5C - 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 3fb19d06e..5521303f7 100644 --- a/data/maps/events/Route114_FossilManiacsTunnel.inc +++ b/data/maps/events/Route114_FossilManiacsTunnel.inc @@ -1,5 +1,5 @@ -Route114_FossilManiacsTunnel_MapObjects: @ 8533D70 - object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 5, 3, 3, 7, 17, 0, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0, 0, 0 +Route114_FossilManiacsTunnel_EventObjects: @ 8533D70 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 5, 3, 3, 7, 17, 0, 0, 0, Route114_FossilManiacsTunnel_EventScript_22AF87, 0, 0, 0 Route114_FossilManiacsTunnel_MapWarps: @ 8533D88 warp_def 6, 25, 3, 2, ROUTE_114_FOSSIL_MANIACS_HOUSE @@ -11,5 +11,5 @@ Route114_FossilManiacsTunnel_MapCoordEvents: @ 8533DA0 coord_event 6, 4, 3, 0, VAR_0x40CC, 1, 0, Route114_FossilManiacsTunnel_EventScript_22AF66 Route114_FossilManiacsTunnel_MapEvents:: @ 8533DC0 - map_events Route114_FossilManiacsTunnel_MapObjects, Route114_FossilManiacsTunnel_MapWarps, Route114_FossilManiacsTunnel_MapCoordEvents, 0x0 + map_events Route114_FossilManiacsTunnel_EventObjects, Route114_FossilManiacsTunnel_MapWarps, Route114_FossilManiacsTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/events/Route114_LanettesHouse.inc b/data/maps/events/Route114_LanettesHouse.inc index c6e493c73..1182d95f2 100644 --- a/data/maps/events/Route114_LanettesHouse.inc +++ b/data/maps/events/Route114_LanettesHouse.inc @@ -1,5 +1,5 @@ -Route114_LanettesHouse_MapObjects: @ 8533DD4 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870, 0, 0 +Route114_LanettesHouse_EventObjects: @ 8533DD4 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_22B2D2, 870, 0, 0 Route114_LanettesHouse_MapWarps: @ 8533DEC warp_def 5, 7, 0, 2, ROUTE_114 @@ -11,5 +11,5 @@ Route114_LanettesHouse_MapBGEvents: @ 8533DFC bg_event 7, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_22B345 Route114_LanettesHouse_MapEvents:: @ 8533E20 - 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 e59081620..63924166c 100644 --- a/data/maps/events/Route115.inc +++ b/data/maps/events/Route115.inc @@ -1,27 +1,27 @@ -Route115_MapObjects: @ 852A1BC - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 18, 68, 3, 2, 17, 0, 0, 0, Route115_EventScript_1F2973, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_1F298E, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 27, 53, 3, 15, 17, 0, 1, 4, Route115_EventScript_1F2A07, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 69, BerryTreeScript, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 13, 5, 3, 12, 0, 0, 0, 70, BerryTreeScript, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 71, BerryTreeScript, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_GIRL_3, 0, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 19, 15, 3, 27, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MANIAC, 0, 0, 24, 62, 3, 18, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016, 0, 0 - object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 18, 7, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E37, 1017, 0, 0 - object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E44, 1018, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 64, 3, 12, 0, 0, 0, 55, BerryTreeScript, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 31, 65, 3, 12, 0, 0, 0, 56, BerryTreeScript, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 50, 3, 1, 17, 0, 0, 0, Route115_EventScript_2907A6, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 56, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E51, 1118, 0, 0 - object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 10, 15, 3, 46, 51, 0, 1, 2, Route115_EventScript_1F2AE2, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 11, 12, 3, 57, 17, 0, 1, 3, Route115_EventScript_1F2AF9, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_GIRL_3, 0, 0, 15, 7, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B27, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_LASS, 0, 0, 10, 7, 3, 10, 17, 0, 1, 4, Route115_EventScript_1F2B10, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_LASS, 0, 0, 28, 62, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B3E, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 26, 67, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E6B, 1161, 0, 0 - object_event 23, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 14, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E5E, 1144, 0, 0 +Route115_EventObjects: @ 852A1BC + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 18, 68, 3, 2, 17, 0, 0, 0, Route115_EventScript_1F2973, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_1F298E, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 27, 53, 3, 15, 17, 0, 1, 4, Route115_EventScript_1F2A07, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 69, BerryTreeScript, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 13, 5, 3, 12, 0, 0, 0, 70, BerryTreeScript, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 71, BerryTreeScript, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1F2A69, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 19, 15, 3, 27, 5, 0, 1, 2, Route115_EventScript_1F29F0, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 0, 24, 62, 3, 18, 0, 0, 1, 4, Route115_EventScript_1F2ACB, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E2A, 1016, 0, 0 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 18, 7, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E37, 1017, 0, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_290E44, 1018, 0, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 64, 3, 12, 0, 0, 0, 55, BerryTreeScript, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 31, 65, 3, 12, 0, 0, 0, 56, BerryTreeScript, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 29, 50, 3, 1, 17, 0, 0, 0, Route115_EventScript_2907A6, 17, 0, 0 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 56, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E51, 1118, 0, 0 + object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 10, 15, 3, 46, 51, 0, 1, 2, Route115_EventScript_1F2AE2, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 11, 12, 3, 57, 17, 0, 1, 3, Route115_EventScript_1F2AF9, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_GIRL_3, 0, 0, 15, 7, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B27, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_LASS, 0, 0, 10, 7, 3, 10, 17, 0, 1, 4, Route115_EventScript_1F2B10, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_LASS, 0, 0, 28, 62, 3, 9, 17, 0, 1, 4, Route115_EventScript_1F2B3E, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 67, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E6B, 1161, 0, 0 + object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 14, 3, 1, 17, 0, 0, 0, Route115_EventScript_290E5E, 1144, 0, 0 Route115_MapWarps: @ 852A3E4 warp_def 27, 37, 0, 1, METEOR_FALLS_1F_1R @@ -45,5 +45,5 @@ Route115_MapBGEvents: @ 852A3FC bg_event 15, 49, 3, 7, 0, ITEM_HEART_SCALE, 97, 0 Route115_MapEvents:: @ 852A4A4 - 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 a28f44e92..25bc3891c 100644 --- a/data/maps/events/Route116.inc +++ b/data/maps/events/Route116.inc @@ -1,32 +1,32 @@ -Route116_MapObjects: @ 852A4B8 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 2, 3, 12, 0, 0, 0, 25, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 19, 2, 3, 12, 0, 0, 0, 26, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 21, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 17, 0, 0 - object_event 5, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 10, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 18, 0, 0 - object_event 6, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E85, 1019, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E92, 1020, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 20, 2, 3, 12, 0, 0, 0, 66, BerryTreeScript, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 21, 2, 3, 12, 0, 0, 0, 67, BerryTreeScript, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 28, 11, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 19, 0, 0 - object_event 13, MAP_OBJ_GFX_HIKER, 0, 0, 36, 17, 3, 15, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 24, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 20, 0, 0 - object_event 15, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021, 0, 0 - object_event 16, MAP_OBJ_GFX_LASS, 0, 0, 26, 6, 3, 10, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_GIRL_3, 0, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 28, 8, 3, 7, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_MAN_2, 0, 0, 46, 11, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2CA2, 947, 0, 0 - object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 55, 12, 4, 1, 17, 0, 0, 0, Route116_EventScript_290E78, 1001, 0, 0 - object_event 21, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 38, 9, 3, 10, 17, 0, 0, 0, Route116_EventScript_1F2C70, 894, 0, 0 - object_event 22, MAP_OBJ_GFX_MANIAC, 0, 0, 74, 13, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2DB6, 813, 0, 0 - object_event 23, MAP_OBJ_GFX_WOMAN_3, 0, 0, 33, 8, 3, 7, 0, 0, 1, 1, Route116_EventScript_1F3041, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_BOY_2, 0, 0, 33, 5, 3, 8, 0, 0, 1, 2, Route116_EventScript_1F3058, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 34, 7, 0, 1, 17, 0, 0, 0, Route116_EventScript_290EAC, 1146, 0, 0 - object_event 26, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 30, 5, 3, 1, 17, 0, 0, 0, Route116_EventScript_2906BB, 21, 0, 0 - object_event 27, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 36, 13, 3, 18, 17, 0, 1, 5, Route116_EventScript_1F3086, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_HIKER, 0, 0, 42, 13, 3, 9, 17, 0, 1, 5, Route116_EventScript_1F306F, 0, 0, 0 +Route116_EventObjects: @ 852A4B8 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 2, 3, 12, 0, 0, 0, 25, BerryTreeScript, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 19, 2, 3, 12, 0, 0, 0, 26, BerryTreeScript, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_1F2E89, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 21, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 17, 0, 0 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 10, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 18, 0, 0 + object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_1F2EA0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E85, 1019, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E92, 1020, 0, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 20, 2, 3, 12, 0, 0, 0, 66, BerryTreeScript, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 21, 2, 3, 12, 0, 0, 0, 67, BerryTreeScript, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_1F2D84, 891, 0, 0 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 28, 11, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 19, 0, 0 + object_event 13, EVENT_OBJ_GFX_HIKER, 0, 0, 36, 17, 3, 15, 0, 0, 1, 3, Route116_EventScript_1F2F65, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 24, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_2906BB, 20, 0, 0 + object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_290E9F, 1021, 0, 0 + object_event 16, EVENT_OBJ_GFX_LASS, 0, 0, 26, 6, 3, 10, 0, 0, 1, 2, Route116_EventScript_1F2F7C, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_1F2F93, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 28, 8, 3, 7, 0, 0, 1, 4, Route116_EventScript_1F2EB7, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 0, 46, 11, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2CA2, 947, 0, 0 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 55, 12, 4, 1, 17, 0, 0, 0, Route116_EventScript_290E78, 1001, 0, 0 + object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 38, 9, 3, 10, 17, 0, 0, 0, Route116_EventScript_1F2C70, 894, 0, 0 + object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 0, 74, 13, 3, 1, 17, 0, 0, 0, Route116_EventScript_1F2DB6, 813, 0, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 33, 8, 3, 7, 0, 0, 1, 1, Route116_EventScript_1F3041, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_BOY_2, 0, 0, 33, 5, 3, 8, 0, 0, 1, 2, Route116_EventScript_1F3058, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 34, 7, 0, 1, 17, 0, 0, 0, Route116_EventScript_290EAC, 1146, 0, 0 + object_event 26, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 30, 5, 3, 1, 17, 0, 0, 0, Route116_EventScript_2906BB, 21, 0, 0 + object_event 27, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 36, 13, 3, 18, 17, 0, 1, 5, Route116_EventScript_1F3086, 0, 0, 0 + object_event 28, EVENT_OBJ_GFX_HIKER, 0, 0, 42, 13, 3, 9, 17, 0, 1, 5, Route116_EventScript_1F306F, 0, 0, 0 Route116_MapWarps: @ 852A758 warp_def 47, 8, 0, 0, RUSTURF_TUNNEL @@ -52,5 +52,5 @@ Route116_MapBGEvents: @ 852A790 bg_event 70, 13, 3, 7, 0, ITEM_BLACK_GLASSES, 96, 0 Route116_MapEvents:: @ 852A814 - 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 bc159312e..da8f9c1a0 100644 --- a/data/maps/events/Route116_TunnelersRestHouse.inc +++ b/data/maps/events/Route116_TunnelersRestHouse.inc @@ -1,12 +1,12 @@ -Route116_TunnelersRestHouse_MapObjects: @ 8533E34 - object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0, 0, 0 +Route116_TunnelersRestHouse_EventObjects: @ 8533E34 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B85A, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 0, 3, 6, 3, 1, 17, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B86C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_22B863, 0, 0, 0 Route116_TunnelersRestHouse_MapWarps: @ 8533E7C warp_def 4, 8, 0, 1, ROUTE_116 warp_def 5, 8, 0, 1, ROUTE_116 Route116_TunnelersRestHouse_MapEvents:: @ 8533E8C - 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 5b0e89239..4478507ae 100644 --- a/data/maps/events/Route117.inc +++ b/data/maps/events/Route117.inc @@ -1,28 +1,28 @@ -Route117_MapObjects: @ 852A828 - object_event 1, MAP_OBJ_GFX_WOMAN_1, 0, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_1F399A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 25, 5, 3, 40, 34, 0, 0, 0, Route117_EventScript_1F39A3, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_291C18, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 33, 3, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_KECLEON_1, 0, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_AZUMARILL, 0, 0, 42, 2, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_PIKACHU, 0, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 38, 16, 3, 28, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_WOMAN_3, 0, 0, 8, 10, 3, 23, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_MAN_5, 0, 0, 33, 11, 3, 16, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 41, 13, 3, 12, 0, 0, 0, 29, BerryTreeScript, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 42, 13, 3, 12, 0, 0, 0, 28, BerryTreeScript, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 43, 13, 3, 12, 0, 0, 0, 27, BerryTreeScript, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EB9, 1022, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 2, 3, 1, 0, 0, 0, 0, Route117_EventScript_2906BB, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023, 0, 0 - object_event 17, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 26, 13, 3, 33, 34, 0, 1, 5, Route117_EventScript_1F3AF6, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_MANIAC, 0, 0, 17, 12, 3, 7, 17, 0, 1, 4, Route117_EventScript_1F3B58, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_LASS, 0, 0, 43, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_LASS, 0, 0, 42, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_GIRL_2, 0, 0, 48, 10, 3, 2, 17, 0, 0, 0, Route117_EventScript_1F39AC, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_LASS, 0, 0, 15, 4, 3, 10, 17, 0, 1, 4, Route117_EventScript_1F3C4E, 0, 0, 0 - object_event 23, MAP_OBJ_GFX_GIRL_3, 0, 0, 21, 4, 3, 9, 17, 0, 1, 4, Route117_EventScript_1F3C65, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 16, 4, 3, 28, 20, 0, 1, 4, Route117_EventScript_1F3C37, 0, 0, 0 +Route117_EventObjects: @ 852A828 + object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_1F399A, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 25, 5, 3, 40, 34, 0, 0, 0, Route117_EventScript_1F39A3, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_291C18, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 33, 3, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 42, 2, 3, 1, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 38, 16, 3, 28, 8, 0, 1, 4, Route117_EventScript_1F3A94, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 8, 10, 3, 23, 0, 0, 1, 3, Route117_EventScript_1F3A32, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 0, 33, 11, 3, 16, 0, 0, 1, 4, Route117_EventScript_1F39D0, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 41, 13, 3, 12, 0, 0, 0, 29, BerryTreeScript, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 42, 13, 3, 12, 0, 0, 0, 28, BerryTreeScript, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 43, 13, 3, 12, 0, 0, 0, 27, BerryTreeScript, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EB9, 1022, 0, 0 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 2, 3, 1, 0, 0, 0, 0, Route117_EventScript_2906BB, 17, 0, 0 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_290EC6, 1023, 0, 0 + object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 26, 13, 3, 33, 34, 0, 1, 5, Route117_EventScript_1F3AF6, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 0, 17, 12, 3, 7, 17, 0, 1, 4, Route117_EventScript_1F3B58, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_LASS, 0, 0, 43, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3BD3, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_LASS, 0, 0, 42, 6, 3, 8, 0, 0, 1, 1, Route117_EventScript_1F3B6F, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 0, 48, 10, 3, 2, 17, 0, 0, 0, Route117_EventScript_1F39AC, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_LASS, 0, 0, 15, 4, 3, 10, 17, 0, 1, 4, Route117_EventScript_1F3C4E, 0, 0, 0 + object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 0, 21, 4, 3, 9, 17, 0, 1, 4, Route117_EventScript_1F3C65, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 0, 16, 4, 3, 28, 20, 0, 1, 4, Route117_EventScript_1F3C37, 0, 0, 0 Route117_MapWarps: @ 852AA68 warp_def 51, 5, 0, 0, ROUTE_117_POKEMON_DAY_CARE @@ -34,5 +34,5 @@ Route117_MapBGEvents: @ 852AA70 bg_event 3, 18, 3, 7, 0, ITEM_REPEL, 72, 0 Route117_MapEvents:: @ 852AAA0 - 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 e9625991f..363c2132f 100644 --- a/data/maps/events/Route117_PokemonDayCare.inc +++ b/data/maps/events/Route117_PokemonDayCare.inc @@ -1,10 +1,10 @@ -Route117_PokemonDayCare_MapObjects: @ 8533EA0 - object_event 1, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0, 0, 0 +Route117_PokemonDayCare_EventObjects: @ 8533EA0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_291D11, 0, 0, 0 Route117_PokemonDayCare_MapWarps: @ 8533EB8 warp_def 2, 8, 0, 0, ROUTE_117 warp_def 3, 8, 0, 0, ROUTE_117 Route117_PokemonDayCare_MapEvents:: @ 8533EC8 - 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 40e1e4b70..73ba40dd2 100644 --- a/data/maps/events/Route118.inc +++ b/data/maps/events/Route118.inc @@ -1,25 +1,25 @@ -Route118_MapObjects: @ 852AAB4 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 35, 5, 3, 12, 0, 0, 0, 31, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 36, 5, 3, 12, 0, 0, 0, 32, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 37, 5, 3, 12, 0, 0, 0, 33, BerryTreeScript, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_6, 0, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_1F4079, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE16, 797, 0, 0 - object_event 6, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE36, 797, 0, 0 - object_event 7, MAP_OBJ_GFX_GIRL_2, 0, 0, 12, 10, 3, 2, 17, 0, 0, 0, Route118_EventScript_1F3E73, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CED6, 901, 0, 0 - object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901, 0, 0 - object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF16, 904, 0, 0 - object_event 11, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF36, 904, 0, 0 - object_event 12, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 38, 8, 3, 1, 0, 0, 0, 0, Route118_EventScript_2906BB, 17, 0, 0 - object_event 13, MAP_OBJ_GFX_FISHERMAN, 0, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 7, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_FISHERMAN, 0, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1F4000, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_MAN_6, 0, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_1F4090, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_FISHERMAN, 0, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_MAN_6, 0, 0, 17, 11, 3, 15, 17, 0, 1, 3, Route118_EventScript_1F4017, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_STEVEN, 0, 0, 44, 7, 3, 8, 17, 0, 0, 0, 0x0, 966, 0, 0 - object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 69, 7, 3, 1, 17, 0, 0, 0, Route118_EventScript_290ED3, 1121, 0, 0 - object_event 21, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 7, 7, 3, 8, 17, 0, 1, 4, Route118_EventScript_1F40A7, 0, 0, 0 +Route118_EventObjects: @ 852AAB4 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 35, 5, 3, 12, 0, 0, 0, 31, BerryTreeScript, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 36, 5, 3, 12, 0, 0, 0, 32, BerryTreeScript, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 37, 5, 3, 12, 0, 0, 0, 33, BerryTreeScript, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_1F4079, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE16, 797, 0, 0 + object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CE36, 797, 0, 0 + object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 0, 12, 10, 3, 2, 17, 0, 0, 0, Route118_EventScript_1F3E73, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CED6, 901, 0, 0 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CEF6, 901, 0, 0 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF16, 904, 0, 0 + object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_28CF36, 904, 0, 0 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 38, 8, 3, 1, 0, 0, 0, 0, Route118_EventScript_2906BB, 17, 0, 0 + object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_1F3E14, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 7, 12, 3, 7, 0, 0, 1, 4, Route118_EventScript_1F3F87, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1F4000, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_1F4090, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1F3FE9, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 0, 17, 11, 3, 15, 17, 0, 1, 3, Route118_EventScript_1F4017, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 0, 44, 7, 3, 8, 17, 0, 0, 0, 0x0, 966, 0, 0 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 69, 7, 3, 1, 17, 0, 0, 0, Route118_EventScript_290ED3, 1121, 0, 0 + object_event 21, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 7, 7, 3, 8, 17, 0, 1, 4, Route118_EventScript_1F40A7, 0, 0, 0 Route118_MapWarps: @ 852ACAC warp_def 42, 6, 0, 0, TERRA_CAVE_ENTRANCE @@ -42,5 +42,5 @@ Route118_MapBGEvents: @ 852ACEC bg_event 12, 14, 3, 7, 0, ITEM_HEART_SCALE, 66, 0 Route118_MapEvents:: @ 852AD58 - map_events Route118_MapObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents + map_events Route118_EventObjects, Route118_MapWarps, Route118_MapCoordEvents, Route118_MapBGEvents diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index e78006b3c..96db2d944 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -1,47 +1,47 @@ -Route119_MapObjects: @ 852AD6C - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 24, 5, 3, 12, 0, 0, 0, 34, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 25, 5, 3, 12, 0, 0, 0, 35, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 26, 5, 3, 12, 0, 0, 0, 36, BerryTreeScript, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MANIAC, 0, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MANIAC, 0, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_1F479D, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_CAMPER, 0, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1F4810, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MANIAC, 0, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F4786, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_PICNICKER, 0, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1F4872, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 28, 14, 3, 57, 0, 0, 1, 1, Route119_EventScript_1F4902, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_1F4919, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_MAN_6, 0, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_MAN_6, 0, 0, 8, 63, 3, 8, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_HIPSTER, 0, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, 851, 0, 0 - object_event 17, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024, 0, 0 - object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EED, 1025, 0, 0 - object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026, 0, 0 - object_event 20, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F07, 1027, 0, 0 - object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F14, 1028, 0, 0 - object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F21, 1029, 0, 0 - object_event 23, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890, 0, 0 - object_event 24, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890, 0, 0 - object_event 25, MAP_OBJ_GFX_GIDDY, 0, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, 923, 0, 0 - object_event 26, MAP_OBJ_GFX_BOY_3, 0, 0, 31, 109, 3, 8, 17, 0, 0, 0, Route119_EventScript_1F49D1, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 8, 23, 3, 12, 0, 0, 0, 83, BerryTreeScript, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 9, 23, 3, 12, 0, 0, 0, 84, BerryTreeScript, 0, 0, 0 - object_event 29, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 29, 90, 3, 12, 0, 0, 0, 85, BerryTreeScript, 0, 0, 0 - object_event 30, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 30, 90, 3, 12, 0, 0, 0, 86, BerryTreeScript, 0, 0, 0 - object_event 31, MAP_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 133, 3, 5, 18, 0, 0, 0, Route119_EventScript_1F476B, 0, 0, 0 - object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 56, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F2E, 1106, 0, 0 - object_event 33, MAP_OBJ_GFX_BOY_2, 0, 0, 35, 93, 4, 2, 17, 0, 0, 0, Route119_EventScript_1F49DA, 0, 0, 0 - object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 57, 17, 0, 1, 3, Route119_EventScript_1F4930, 0, 0, 0 - object_event 35, MAP_OBJ_GFX_KECLEON_1, 0, 0, 31, 6, 3, 76, 17, 0, 0, 0, Route119_EventScript_27231C, 989, 0, 0 - object_event 36, MAP_OBJ_GFX_KECLEON_1, 0, 0, 25, 15, 3, 76, 17, 0, 0, 0, Route119_EventScript_272329, 990, 0, 0 - object_event 37, MAP_OBJ_GFX_FISHERMAN, 0, 0, 13, 104, 3, 10, 17, 0, 1, 0, Route119_EventScript_1F4947, 0, 0, 0 - object_event 38, MAP_OBJ_GFX_WOMAN_3, 0, 0, 8, 68, 3, 7, 17, 0, 1, 5, Route119_EventScript_1F498C, 0, 0, 0 - object_event 39, MAP_OBJ_GFX_MAN_6, 0, 0, 16, 52, 3, 10, 17, 0, 1, 3, Route119_EventScript_1F4975, 0, 0, 0 - object_event 40, MAP_OBJ_GFX_MAN_6, 0, 0, 32, 15, 3, 9, 17, 0, 1, 4, Route119_EventScript_1F495E, 0, 0, 0 - object_event 41, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 19, 5, 4, 1, 17, 0, 0, 0, Route119_EventScript_291399, 1134, 0, 0 - object_event 42, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 24, 42, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F3B, 1147, 0, 0 - object_event 43, MAP_OBJ_GFX_SCOTT, 0, 0, 28, 25, 3, 8, 0, 0, 0, 0, 0x0, 786, 0, 0 +Route119_EventObjects: @ 852AD6C + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 24, 5, 3, 12, 0, 0, 0, 34, BerryTreeScript, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 25, 5, 3, 12, 0, 0, 0, 35, BerryTreeScript, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 26, 5, 3, 12, 0, 0, 0, 36, BerryTreeScript, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_1F47E2, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F47B4, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_1F479D, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1F4810, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_1F4786, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1F4872, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47CB, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1F47F9, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 28, 14, 3, 57, 0, 0, 1, 1, Route119_EventScript_1F4902, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_1F4919, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_1F48D4, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 0, 8, 63, 3, 8, 0, 0, 1, 5, Route119_EventScript_1F48EB, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_HIPSTER, 0, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, 851, 0, 0 + object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EE0, 1024, 0, 0 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EED, 1025, 0, 0 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_290EFA, 1026, 0, 0 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F07, 1027, 0, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F14, 1028, 0, 0 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_290F21, 1029, 0, 0 + object_event 23, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49A3, 890, 0, 0 + object_event 24, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1F49BA, 890, 0, 0 + object_event 25, EVENT_OBJ_GFX_GIDDY, 0, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, 923, 0, 0 + object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 0, 31, 109, 3, 8, 17, 0, 0, 0, Route119_EventScript_1F49D1, 0, 0, 0 + object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 8, 23, 3, 12, 0, 0, 0, 83, BerryTreeScript, 0, 0, 0 + object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 9, 23, 3, 12, 0, 0, 0, 84, BerryTreeScript, 0, 0, 0 + object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 29, 90, 3, 12, 0, 0, 0, 85, BerryTreeScript, 0, 0, 0 + object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 30, 90, 3, 12, 0, 0, 0, 86, BerryTreeScript, 0, 0, 0 + object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 0, 19, 133, 3, 5, 18, 0, 0, 0, Route119_EventScript_1F476B, 0, 0, 0 + object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 56, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F2E, 1106, 0, 0 + object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 0, 35, 93, 4, 2, 17, 0, 0, 0, Route119_EventScript_1F49DA, 0, 0, 0 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 29, 6, 3, 57, 17, 0, 1, 3, Route119_EventScript_1F4930, 0, 0, 0 + object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 31, 6, 3, 76, 17, 0, 0, 0, Route119_EventScript_27231C, 989, 0, 0 + object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 25, 15, 3, 76, 17, 0, 0, 0, Route119_EventScript_272329, 990, 0, 0 + object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 13, 104, 3, 10, 17, 0, 1, 0, Route119_EventScript_1F4947, 0, 0, 0 + object_event 38, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 8, 68, 3, 7, 17, 0, 1, 5, Route119_EventScript_1F498C, 0, 0, 0 + object_event 39, EVENT_OBJ_GFX_MAN_6, 0, 0, 16, 52, 3, 10, 17, 0, 1, 3, Route119_EventScript_1F4975, 0, 0, 0 + object_event 40, EVENT_OBJ_GFX_MAN_6, 0, 0, 32, 15, 3, 9, 17, 0, 1, 4, Route119_EventScript_1F495E, 0, 0, 0 + object_event 41, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 19, 5, 4, 1, 17, 0, 0, 0, Route119_EventScript_291399, 1134, 0, 0 + object_event 42, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 24, 42, 3, 1, 17, 0, 0, 0, Route119_EventScript_290F3B, 1147, 0, 0 + object_event 43, EVENT_OBJ_GFX_SCOTT, 0, 0, 28, 25, 3, 8, 0, 0, 0, 0, 0x0, 786, 0, 0 Route119_MapWarps: @ 852B174 warp_def 6, 32, 0, 0, ROUTE_119_WEATHER_INSTITUTE_1F @@ -95,5 +95,5 @@ Route119_MapBGEvents: @ 852B2F4 bg_event 28, 9, 0, 0, 0, Route119_EventScript_1F49E3 Route119_MapEvents:: @ 852B3E4 - 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 7033c505a..38c35b40a 100644 --- a/data/maps/events/Route119_House.inc +++ b/data/maps/events/Route119_House.inc @@ -1,16 +1,16 @@ -Route119_House_MapObjects: @ 853ECD0 - object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_270966, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WINGULL, 0, 0, 1, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WINGULL, 0, 0, 0, 4, 3, 2, 19, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WINGULL, 0, 0, 2, 2, 3, 2, 17, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WINGULL, 0, 0, 8, 5, 3, 2, 35, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WINGULL, 0, 0, 6, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_WINGULL, 0, 0, 5, 3, 3, 2, 49, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 +Route119_House_EventObjects: @ 853ECD0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_270966, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 0, 1, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 0, 4, 3, 2, 19, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 0, 2, 2, 3, 2, 17, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 0, 8, 5, 3, 2, 35, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 0, 6, 6, 3, 2, 34, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 5, 3, 3, 2, 49, 0, 0, 0, Route119_House_EventScript_27096F, 0, 0, 0 Route119_House_MapWarps: @ 853ED78 warp_def 3, 8, 0, 1, ROUTE_119 warp_def 4, 8, 0, 1, ROUTE_119 Route119_House_MapEvents:: @ 853ED88 - 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 01a53d75a..6fa459ac6 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: @ 853EB20 - object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 3, 3, 9, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890, 0, 0 - object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 10, 5, 3, 8, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_5, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 2, 11, 3, 1, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892, 0, 0 - object_event 5, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 14, 11, 3, 2, 17, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0, 0, 0 +Route119_WeatherInstitute_1F_EventObjects: @ 853EB20 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 3, 3, 9, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_26FB29, 890, 0, 0 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 10, 5, 3, 8, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_26FB40, 890, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB0F, 892, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 2, 11, 3, 1, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAC8, 892, 0, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 14, 11, 3, 2, 17, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FAA4, 0, 0, 0 Route119_WeatherInstitute_1F_MapWarps: @ 853EB98 warp_def 9, 12, 0, 0, ROUTE_119 @@ -17,5 +17,5 @@ Route119_WeatherInstitute_1F_MapBGEvents: @ 853EBB0 bg_event 0, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_26FB18 Route119_WeatherInstitute_1F_MapEvents:: @ 853EBE0 - 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 3a68ca865..0f838709c 100644 --- a/data/maps/events/Route119_WeatherInstitute_2F.inc +++ b/data/maps/events/Route119_WeatherInstitute_2F.inc @@ -1,16 +1,16 @@ -Route119_WeatherInstitute_2F_MapObjects: @ 853EBF4 - object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890, 0, 0 - object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890, 0, 0 - object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0 - object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 18, 6, 3, 1, 18, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_5, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0 - object_event 7, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 16, 6, 3, 9, 17, 0, 0, 0, 0x0, 992, 0, 0 - object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 19, 6, 3, 9, 17, 0, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890, 0, 0 +Route119_WeatherInstitute_2F_EventObjects: @ 853EBF4 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_26FF7F, 890, 0, 0 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_26FF96, 890, 0, 0 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_26FFAD, 890, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 18, 6, 3, 1, 18, 0, 0, 0, Route119_WeatherInstitute_2F_EventScript_27018B, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 893, 0, 0 + object_event 7, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 16, 6, 3, 9, 17, 0, 0, 0, 0x0, 992, 0, 0 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 19, 6, 3, 9, 17, 0, 1, 3, Route119_WeatherInstitute_2F_EventScript_26FF68, 890, 0, 0 Route119_WeatherInstitute_2F_MapWarps: @ 853ECB4 warp_def 17, 1, 0, 2, ROUTE_119_WEATHER_INSTITUTE_1F Route119_WeatherInstitute_2F_MapEvents:: @ 853ECBC - 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 6206e713f..6f227115c 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -1,48 +1,48 @@ -Route120_MapObjects: @ 852B3F8 - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 4, 79, 3, 12, 0, 0, 0, 46, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 5, 79, 3, 12, 0, 0, 0, 45, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 6, 79, 3, 12, 0, 0, 0, 44, BerryTreeScript, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 7, 79, 3, 12, 0, 0, 0, 43, BerryTreeScript, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 34, 24, 3, 12, 0, 0, 0, 37, BerryTreeScript, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 35, 24, 3, 12, 0, 0, 0, 38, BerryTreeScript, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 36, 24, 3, 12, 0, 0, 0, 39, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 9, 92, 5, 12, 0, 0, 0, 40, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 10, 92, 5, 12, 0, 0, 0, 41, BerryTreeScript, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 11, 92, 5, 12, 0, 0, 0, 42, BerryTreeScript, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_MAN_6, 0, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_MAN_6, 0, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_CAMPER, 0, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_1F5850, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_PICNICKER, 0, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_1F5867, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_MANIAC, 0, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_1F587E, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F48, 1030, 0, 0 - object_event 17, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE76, 798, 0, 0 - object_event 18, MAP_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE56, 798, 0, 0 - object_event 19, MAP_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF16, 902, 0, 0 - object_event 20, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF36, 902, 0, 0 - object_event 21, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 32, 3, 1, 0, 0, 0, 0, Route120_EventScript_2906BB, 17, 0, 0 - object_event 22, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F55, 1031, 0, 0 - object_event 23, MAP_OBJ_GFX_BEAUTY, 0, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_1F5527, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_WOMAN_7, 0, 0, 31, 37, 3, 15, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_HIKER, 0, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_WOMAN_7, 0, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_1F590E, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_WOMAN_7, 0, 0, 18, 34, 3, 9, 0, 0, 1, 3, Route120_EventScript_1F5925, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 22, 13, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F6F, 1108, 0, 0 - object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 23, 82, 5, 1, 17, 0, 0, 0, Route120_EventScript_290F62, 1107, 0, 0 - object_event 30, MAP_OBJ_GFX_KECLEON_1, 0, 0, 12, 16, 4, 76, 17, 0, 0, 0, Route120_EventScript_1F57BC, 970, 0, 0 - object_event 31, MAP_OBJ_GFX_STEVEN, 0, 0, 13, 15, 4, 8, 17, 0, 0, 0, Route120_EventScript_1F5641, 972, 0, 0 - object_event 32, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 20, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 20, 0, 0 - object_event 33, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 18, 0, 0 - object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 10, 72, 3, 58, 17, 0, 1, 3, Route120_EventScript_1F593C, 0, 0, 0 - object_event 35, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 28, 3, 57, 17, 0, 1, 3, Route120_EventScript_1F5953, 0, 0, 0 - object_event 36, MAP_OBJ_GFX_KECLEON_2, 0, 0, 12, 16, 3, 8, 17, 0, 0, 0, 0x0, 981, 0, 0 - object_event 37, MAP_OBJ_GFX_KECLEON_1, 0, 0, 20, 11, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722DB, 982, 0, 0 - object_event 38, MAP_OBJ_GFX_KECLEON_1, 0, 0, 27, 2, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722E8, 985, 0, 0 - object_event 39, MAP_OBJ_GFX_KECLEON_1, 0, 0, 4, 77, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722F5, 986, 0, 0 - object_event 40, MAP_OBJ_GFX_KECLEON_1, 0, 0, 7, 51, 3, 76, 17, 0, 0, 0, Route120_EventScript_27230F, 988, 0, 0 - object_event 41, MAP_OBJ_GFX_KECLEON_1, 0, 0, 19, 48, 3, 76, 17, 0, 0, 0, Route120_EventScript_272302, 987, 0, 0 - object_event 42, MAP_OBJ_GFX_GIRL_3, 0, 0, 19, 32, 3, 7, 17, 0, 1, 3, Route120_EventScript_1F5981, 0, 0, 0 - object_event 43, MAP_OBJ_GFX_MAN_4, 0, 0, 14, 34, 3, 10, 17, 0, 1, 3, Route120_EventScript_1F596A, 0, 0, 0 - object_event 44, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 24, 33, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F7C, 1148, 0, 0 +Route120_EventObjects: @ 852B3F8 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 4, 79, 3, 12, 0, 0, 0, 46, BerryTreeScript, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 5, 79, 3, 12, 0, 0, 0, 45, BerryTreeScript, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 6, 79, 3, 12, 0, 0, 0, 44, BerryTreeScript, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 7, 79, 3, 12, 0, 0, 0, 43, BerryTreeScript, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 34, 24, 3, 12, 0, 0, 0, 37, BerryTreeScript, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 35, 24, 3, 12, 0, 0, 0, 38, BerryTreeScript, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 36, 24, 3, 12, 0, 0, 0, 39, BerryTreeScript, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 9, 92, 5, 12, 0, 0, 0, 40, BerryTreeScript, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 10, 92, 5, 12, 0, 0, 0, 41, BerryTreeScript, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 11, 92, 5, 12, 0, 0, 0, 42, BerryTreeScript, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1F57D7, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1F57EE, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_1F5850, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_1F5867, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_1F587E, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F48, 1030, 0, 0 + object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE76, 798, 0, 0 + object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CE56, 798, 0, 0 + object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF16, 902, 0, 0 + object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_28CF36, 902, 0, 0 + object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 35, 32, 3, 1, 0, 0, 0, 0, Route120_EventScript_2906BB, 17, 0, 0 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_290F55, 1031, 0, 0 + object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_1F5527, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 31, 37, 3, 15, 0, 0, 1, 4, Route120_EventScript_1F58E0, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_HIKER, 0, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_1F58F7, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_1F590E, 0, 0, 0 + object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 18, 34, 3, 9, 0, 0, 1, 3, Route120_EventScript_1F5925, 0, 0, 0 + object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 22, 13, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F6F, 1108, 0, 0 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 23, 82, 5, 1, 17, 0, 0, 0, Route120_EventScript_290F62, 1107, 0, 0 + object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 12, 16, 4, 76, 17, 0, 0, 0, Route120_EventScript_1F57BC, 970, 0, 0 + object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 0, 13, 15, 4, 8, 17, 0, 0, 0, Route120_EventScript_1F5641, 972, 0, 0 + object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 20, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 20, 0, 0 + object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 15, 1, 3, 1, 17, 0, 0, 0, Route120_EventScript_2906BB, 18, 0, 0 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 10, 72, 3, 58, 17, 0, 1, 3, Route120_EventScript_1F593C, 0, 0, 0 + object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 19, 28, 3, 57, 17, 0, 1, 3, Route120_EventScript_1F5953, 0, 0, 0 + object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 0, 12, 16, 3, 8, 17, 0, 0, 0, 0x0, 981, 0, 0 + object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 20, 11, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722DB, 982, 0, 0 + object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 27, 2, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722E8, 985, 0, 0 + object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 4, 77, 3, 76, 17, 0, 0, 0, Route120_EventScript_2722F5, 986, 0, 0 + object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 7, 51, 3, 76, 17, 0, 0, 0, Route120_EventScript_27230F, 988, 0, 0 + object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 19, 48, 3, 76, 17, 0, 0, 0, Route120_EventScript_272302, 987, 0, 0 + object_event 42, EVENT_OBJ_GFX_GIRL_3, 0, 0, 19, 32, 3, 7, 17, 0, 1, 3, Route120_EventScript_1F5981, 0, 0, 0 + object_event 43, EVENT_OBJ_GFX_MAN_4, 0, 0, 14, 34, 3, 10, 17, 0, 1, 3, Route120_EventScript_1F596A, 0, 0, 0 + object_event 44, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 24, 33, 3, 1, 17, 0, 0, 0, Route120_EventScript_290F7C, 1148, 0, 0 Route120_MapWarps: @ 852B818 warp_def 7, 55, 0, 0, ANCIENT_TOMB @@ -86,5 +86,5 @@ Route120_MapBGEvents: @ 852B958 bg_event 5, 76, 0, 8, 0, ITEM_HARD_STONE, 0, 0 Route120_MapEvents:: @ 852BA00 - 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 b58fe4858..ec6ced043 100644 --- a/data/maps/events/Route121.inc +++ b/data/maps/events/Route121.inc @@ -1,33 +1,33 @@ -Route121_MapObjects: @ 852BA14 - object_event 1, MAP_OBJ_GFX_WOMAN_4, 0, 0, 29, 14, 3, 10, 17, 0, 0, 0, Route121_EventScript_1F5DFD, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 2, 3, 12, 0, 0, 0, 47, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 15, 2, 3, 12, 0, 0, 0, 48, BerryTreeScript, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 16, 2, 3, 12, 0, 0, 0, 49, BerryTreeScript, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 17, 2, 3, 12, 0, 0, 0, 50, BerryTreeScript, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 64, 14, 3, 12, 0, 0, 0, 51, BerryTreeScript, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 65, 14, 3, 12, 0, 0, 0, 52, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 66, 14, 3, 12, 0, 0, 0, 53, BerryTreeScript, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 67, 14, 3, 12, 0, 0, 0, 54, BerryTreeScript, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_LASS, 0, 0, 39, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_LASS, 0, 0, 40, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, 914, 0, 0 - object_event 13, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, 914, 0, 0 - object_event 14, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, 914, 0, 0 - object_event 15, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 5, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 17, 0, 0 - object_event 16, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 65, 4, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 18, 0, 0 - object_event 17, MAP_OBJ_GFX_WOMAN_2, 0, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 55, 8, 3, 9, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0, 0, 0 - object_event 19, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 11, 3, 7, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0, 0, 0 - object_event 20, MAP_OBJ_GFX_BEAUTY, 0, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 55, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F89, 1103, 0, 0 - object_event 22, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 26, 12, 3, 1, 17, 0, 0, 0, Route121_EventScript_2906BB, 19, 0, 0 - object_event 23, MAP_OBJ_GFX_MANIAC, 0, 0, 11, 6, 3, 26, 65, 0, 1, 3, Route121_EventScript_1F5F9C, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_MAN_5, 0, 0, 59, 8, 3, 8, 17, 0, 1, 4, Route121_EventScript_1F5FB3, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_WOMAN_3, 0, 0, 59, 13, 3, 7, 17, 0, 1, 4, Route121_EventScript_1F5FCA, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_MAN_4, 0, 0, 65, 9, 3, 18, 17, 0, 1, 6, Route121_EventScript_1F5FE1, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_WOMAN_7, 0, 0, 72, 9, 3, 17, 17, 0, 1, 6, Route121_EventScript_1F5FF8, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 60, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F96, 1149, 0, 0 - object_event 29, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 38, 13, 3, 1, 17, 0, 0, 0, Route121_EventScript_290FA3, 1150, 0, 0 +Route121_EventObjects: @ 852BA14 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 29, 14, 3, 10, 17, 0, 0, 0, Route121_EventScript_1F5DFD, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 2, 3, 12, 0, 0, 0, 47, BerryTreeScript, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 15, 2, 3, 12, 0, 0, 0, 48, BerryTreeScript, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 16, 2, 3, 12, 0, 0, 0, 49, BerryTreeScript, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 17, 2, 3, 12, 0, 0, 0, 50, BerryTreeScript, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 64, 14, 3, 12, 0, 0, 0, 51, BerryTreeScript, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 65, 14, 3, 12, 0, 0, 0, 52, BerryTreeScript, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 66, 14, 3, 12, 0, 0, 0, 53, BerryTreeScript, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 67, 14, 3, 12, 0, 0, 0, 54, BerryTreeScript, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_LASS, 0, 0, 39, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_LASS, 0, 0, 40, 9, 3, 8, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, 914, 0, 0 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, 914, 0, 0 + object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, 914, 0, 0 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 32, 5, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 17, 0, 0 + object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 65, 4, 3, 1, 0, 0, 0, 0, Route121_EventScript_2906BB, 18, 0, 0 + object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 55, 8, 3, 9, 0, 0, 1, 3, Route121_EventScript_1F5E8B, 0, 0, 0 + object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 11, 11, 3, 7, 0, 0, 1, 4, Route121_EventScript_1F5EED, 0, 0, 0 + object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_1F5F3A, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 55, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F89, 1103, 0, 0 + object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 26, 12, 3, 1, 17, 0, 0, 0, Route121_EventScript_2906BB, 19, 0, 0 + object_event 23, EVENT_OBJ_GFX_MANIAC, 0, 0, 11, 6, 3, 26, 65, 0, 1, 3, Route121_EventScript_1F5F9C, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 0, 59, 8, 3, 8, 17, 0, 1, 4, Route121_EventScript_1F5FB3, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 59, 13, 3, 7, 17, 0, 1, 4, Route121_EventScript_1F5FCA, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_MAN_4, 0, 0, 65, 9, 3, 18, 17, 0, 1, 6, Route121_EventScript_1F5FE1, 0, 0, 0 + object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 72, 9, 3, 17, 17, 0, 1, 6, Route121_EventScript_1F5FF8, 0, 0, 0 + object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 60, 10, 3, 1, 17, 0, 0, 0, Route121_EventScript_290F96, 1149, 0, 0 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 38, 13, 3, 1, 17, 0, 0, 0, Route121_EventScript_290FA3, 1150, 0, 0 Route121_MapWarps: @ 852BCCC warp_def 37, 5, 0, 2, ROUTE_121_SAFARI_ZONE_ENTRANCE @@ -51,5 +51,5 @@ Route121_MapBGEvents: @ 852BD14 bg_event 68, 8, 3, 7, 0, ITEM_MAX_REVIVE, 100, 0 Route121_MapEvents:: @ 852BD8C - 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 258571e17..39bb6123c 100644 --- a/data/maps/events/Route121_SafariZoneEntrance.inc +++ b/data/maps/events/Route121_SafariZoneEntrance.inc @@ -1,7 +1,7 @@ -Route121_SafariZoneEntrance_MapObjects: @ 8533EDC - object_event 1, MAP_OBJ_GFX_PICNICKER, 0, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_CAMPER, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_CAMPER, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 +Route121_SafariZoneEntrance_EventObjects: @ 8533EDC + object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBE6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BBEF, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0, 0, 0 Route121_SafariZoneEntrance_MapWarps: @ 8533F24 warp_def 2, 5, 0, 0, SAFARI_ZONE_SOUTH @@ -16,5 +16,5 @@ Route121_SafariZoneEntrance_MapBGEvents: @ 8533F54 bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_22BD21 Route121_SafariZoneEntrance_MapEvents:: @ 8533F60 - 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 cb60786c0..0521a0592 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -1,47 +1,47 @@ -Route123_MapObjects: @ 852BDBC - object_event 1, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 11, 3, 3, 12, 0, 0, 0, 58, BerryTreeScript, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 12, 3, 3, 12, 0, 0, 0, 59, BerryTreeScript, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 3, 3, 12, 0, 0, 0, 60, BerryTreeScript, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 15, 3, 3, 12, 0, 0, 0, 61, BerryTreeScript, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 81, 1, 3, 12, 0, 0, 0, 62, BerryTreeScript, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 82, 1, 3, 12, 0, 0, 0, 63, BerryTreeScript, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 83, 1, 3, 12, 0, 0, 0, 64, BerryTreeScript, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_4, 0, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 65, BerryTreeScript, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 15, 5, 3, 12, 0, 0, 0, 72, BerryTreeScript, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 17, 5, 3, 12, 0, 0, 0, 73, BerryTreeScript, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 74, BerryTreeScript, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 17, 3, 3, 12, 0, 0, 0, 79, BerryTreeScript, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 18, 3, 3, 12, 0, 0, 0, 14, BerryTreeScript, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 11, 5, 3, 12, 0, 0, 0, 15, BerryTreeScript, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 30, BerryTreeScript, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 101, 13, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 17, 0, 0 - object_event 19, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 129, 14, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 18, 0, 0 - object_event 20, MAP_OBJ_GFX_CUTTABLE_TREE, 0, 0, 92, 9, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 19, 0, 0 - object_event 21, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032, 0, 0 - object_event 22, MAP_OBJ_GFX_GIRL_3, 0, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_1F6151, 0, 0, 0 - object_event 23, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 109, 13, 3, 12, 0, 0, 0, 87, BerryTreeScript, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 110, 13, 3, 12, 0, 0, 0, 88, BerryTreeScript, 0, 0, 0 - object_event 25, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 111, 13, 3, 12, 0, 0, 0, 89, BerryTreeScript, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_WOMAN_3, 0, 0, 18, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0, 0, 0 - object_event 27, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 38, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0, 0, 0 - object_event 28, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 37, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0, 0, 0 - object_event 29, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 138, 12, 3, 9, 0, 0, 1, 7, Route123_EventScript_1F620A, 0, 0, 0 - object_event 30, MAP_OBJ_GFX_LASS, 0, 0, 49, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F626C, 0, 0, 0 - object_event 31, MAP_OBJ_GFX_HEX_MANIAC, 0, 0, 87, 12, 3, 8, 0, 0, 1, 4, Route123_EventScript_1F6304, 0, 0, 0 - object_event 32, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 27, 18, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FBD, 1104, 0, 0 - object_event 33, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 75, 9, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FCA, 1109, 0, 0 - object_event 34, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 138, 14, 3, 57, 17, 0, 1, 1, Route123_EventScript_1F6377, 0, 0, 0 - object_event 35, MAP_OBJ_GFX_WOMAN_3, 0, 0, 138, 16, 3, 7, 17, 0, 1, 1, Route123_EventScript_1F6360, 0, 0, 0 - object_event 36, MAP_OBJ_GFX_MANIAC, 0, 0, 87, 17, 3, 7, 17, 0, 1, 4, Route123_EventScript_1F6349, 0, 0, 0 - object_event 37, MAP_OBJ_GFX_MAN_6, 0, 0, 66, 16, 3, 8, 17, 0, 1, 2, Route123_EventScript_1F63BC, 0, 0, 0 - object_event 38, MAP_OBJ_GFX_MAN_6, 0, 0, 66, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F6332, 0, 0, 0 - object_event 39, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 49, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F631B, 0, 0, 0 - object_event 40, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 43, 15, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FD7, 1152, 0, 0 - object_event 41, MAP_OBJ_GFX_WOMAN_7, 0, 0, 14, 16, 3, 7, 17, 0, 1, 3, Route123_EventScript_1F638E, 0, 0, 0 - object_event 42, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 14, 12, 3, 26, 49, 0, 1, 3, Route123_EventScript_1F63A5, 0, 0, 0 - object_event 43, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 57, 16, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FE4, 1153, 0, 0 +Route123_EventObjects: @ 852BDBC + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 11, 3, 3, 12, 0, 0, 0, 58, BerryTreeScript, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 12, 3, 3, 12, 0, 0, 0, 59, BerryTreeScript, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 3, 3, 12, 0, 0, 0, 60, BerryTreeScript, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 15, 3, 3, 12, 0, 0, 0, 61, BerryTreeScript, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 81, 1, 3, 12, 0, 0, 0, 62, BerryTreeScript, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 82, 1, 3, 12, 0, 0, 0, 63, BerryTreeScript, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 83, 1, 3, 12, 0, 0, 0, 64, BerryTreeScript, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_1F61C5, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_1F61DC, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 14, 5, 3, 12, 0, 0, 0, 65, BerryTreeScript, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 15, 5, 3, 12, 0, 0, 0, 72, BerryTreeScript, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 17, 5, 3, 12, 0, 0, 0, 73, BerryTreeScript, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 5, 3, 12, 0, 0, 0, 74, BerryTreeScript, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 17, 3, 3, 12, 0, 0, 0, 79, BerryTreeScript, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 18, 3, 3, 12, 0, 0, 0, 14, BerryTreeScript, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 11, 5, 3, 12, 0, 0, 0, 15, BerryTreeScript, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 12, 5, 3, 12, 0, 0, 0, 30, BerryTreeScript, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 101, 13, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 17, 0, 0 + object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 129, 14, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 18, 0, 0 + object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 92, 9, 3, 1, 0, 0, 0, 0, Route123_EventScript_2906BB, 19, 0, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_290FB0, 1032, 0, 0 + object_event 22, EVENT_OBJ_GFX_GIRL_3, 0, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_1F6151, 0, 0, 0 + object_event 23, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 109, 13, 3, 12, 0, 0, 0, 87, BerryTreeScript, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 110, 13, 3, 12, 0, 0, 0, 88, BerryTreeScript, 0, 0, 0 + object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 111, 13, 3, 12, 0, 0, 0, 89, BerryTreeScript, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 18, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_1F61F3, 0, 0, 0 + object_event 27, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 38, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62E9, 0, 0, 0 + object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 37, 13, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F62CE, 0, 0, 0 + object_event 29, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 138, 12, 3, 9, 0, 0, 1, 7, Route123_EventScript_1F620A, 0, 0, 0 + object_event 30, EVENT_OBJ_GFX_LASS, 0, 0, 49, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_1F626C, 0, 0, 0 + object_event 31, EVENT_OBJ_GFX_HEX_MANIAC, 0, 0, 87, 12, 3, 8, 0, 0, 1, 4, Route123_EventScript_1F6304, 0, 0, 0 + object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 27, 18, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FBD, 1104, 0, 0 + object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 75, 9, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FCA, 1109, 0, 0 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 138, 14, 3, 57, 17, 0, 1, 1, Route123_EventScript_1F6377, 0, 0, 0 + object_event 35, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 138, 16, 3, 7, 17, 0, 1, 1, Route123_EventScript_1F6360, 0, 0, 0 + object_event 36, EVENT_OBJ_GFX_MANIAC, 0, 0, 87, 17, 3, 7, 17, 0, 1, 4, Route123_EventScript_1F6349, 0, 0, 0 + object_event 37, EVENT_OBJ_GFX_MAN_6, 0, 0, 66, 16, 3, 8, 17, 0, 1, 2, Route123_EventScript_1F63BC, 0, 0, 0 + object_event 38, EVENT_OBJ_GFX_MAN_6, 0, 0, 66, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F6332, 0, 0, 0 + object_event 39, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 49, 19, 3, 7, 17, 0, 1, 2, Route123_EventScript_1F631B, 0, 0, 0 + object_event 40, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 43, 15, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FD7, 1152, 0, 0 + object_event 41, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 14, 16, 3, 7, 17, 0, 1, 3, Route123_EventScript_1F638E, 0, 0, 0 + object_event 42, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 14, 12, 3, 26, 49, 0, 1, 3, Route123_EventScript_1F63A5, 0, 0, 0 + object_event 43, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 57, 16, 3, 1, 17, 0, 0, 0, Route123_EventScript_290FE4, 1153, 0, 0 Route123_MapWarps: @ 852C1C4 warp_def 22, 6, 0, 0, ROUTE_123_BERRY_MASTERS_HOUSE @@ -84,5 +84,5 @@ Route123_MapBGEvents: @ 852C32C bg_event 138, 18, 3, 7, 0, ITEM_RARE_CANDY, 110, 0 Route123_MapEvents:: @ 852C3B0 - 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 cbe15cac1..719dc55c7 100644 --- a/data/maps/events/Route123_BerryMastersHouse.inc +++ b/data/maps/events/Route123_BerryMastersHouse.inc @@ -1,11 +1,11 @@ -Route123_BerryMastersHouse_MapObjects: @ 853EACC - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0, 0, 0 +Route123_BerryMastersHouse_EventObjects: @ 853EACC + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F845, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_26F8C0, 0, 0, 0 Route123_BerryMastersHouse_MapWarps: @ 853EAFC warp_def 3, 7, 0, 0, ROUTE_123 warp_def 4, 7, 0, 0, ROUTE_123 Route123_BerryMastersHouse_MapEvents:: @ 853EB0C - 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 6f40347e9..8cd919a63 100644 --- a/data/maps/events/Route124.inc +++ b/data/maps/events/Route124.inc @@ -1,16 +1,16 @@ -Route124_MapObjects: @ 852C3C4 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 34, 25, 1, 1, 5, 0, 1, 3, Route124_EventScript_1F6585, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 61, 74, 1, 67, 53, 0, 1, 7, Route124_EventScript_1F659C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 49, 45, 1, 24, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 7, 23, 1, 18, 134, 0, 1, 5, Route124_EventScript_1F6615, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 58, 58, 1, 28, 7, 0, 1, 2, Route124_EventScript_1F662C, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 28, 12, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FF1, 1092, 0, 0 - object_event 7, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 53, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FFE, 1093, 0, 0 - object_event 8, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 58, 11, 3, 1, 17, 0, 0, 0, Route124_EventScript_29100B, 1066, 0, 0 - object_event 9, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 18, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F6643, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 17, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F66A7, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 29, 1, 7, 17, 0, 1, 5, Route124_EventScript_1F670B, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 69, 74, 1, 66, 17, 0, 1, 7, Route124_EventScript_1F6722, 0, 0, 0 +Route124_EventObjects: @ 852C3C4 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 34, 25, 1, 1, 5, 0, 1, 3, Route124_EventScript_1F6585, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 61, 74, 1, 67, 53, 0, 1, 7, Route124_EventScript_1F659C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 49, 45, 1, 24, 0, 0, 1, 3, Route124_EventScript_1F65B3, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 7, 23, 1, 18, 134, 0, 1, 5, Route124_EventScript_1F6615, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 58, 58, 1, 28, 7, 0, 1, 2, Route124_EventScript_1F662C, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 28, 12, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FF1, 1092, 0, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 53, 3, 1, 17, 0, 0, 0, Route124_EventScript_290FFE, 1093, 0, 0 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 58, 11, 3, 1, 17, 0, 0, 0, Route124_EventScript_29100B, 1066, 0, 0 + object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 18, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F6643, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 17, 44, 1, 8, 17, 0, 1, 1, Route124_EventScript_1F66A7, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 29, 1, 7, 17, 0, 1, 5, Route124_EventScript_1F670B, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 69, 74, 1, 66, 17, 0, 1, 7, Route124_EventScript_1F6722, 0, 0, 0 Route124_MapWarps: @ 852C4E4 warp_def 70, 48, 3, 0, ROUTE_124_DIVING_TREASURE_HUNTERS_HOUSE @@ -19,5 +19,5 @@ Route124_MapBGEvents: @ 852C4EC bg_event 73, 48, 3, 0, 0, Route124_EventScript_1F657C Route124_MapEvents:: @ 852C4F8 - 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 43c364e8d..1916f36b7 100644 --- a/data/maps/events/Route124_DivingTreasureHuntersHouse.inc +++ b/data/maps/events/Route124_DivingTreasureHuntersHouse.inc @@ -1,5 +1,5 @@ -Route124_DivingTreasureHuntersHouse_MapObjects: @ 853ED9C - object_event 1, MAP_OBJ_GFX_MAN_6, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0, 0, 0 +Route124_DivingTreasureHuntersHouse_EventObjects: @ 853ED9C + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270A32, 0, 0, 0 Route124_DivingTreasureHuntersHouse_MapWarps: @ 853EDB4 warp_def 3, 8, 0, 0, ROUTE_124 @@ -9,4 +9,4 @@ Route124_DivingTreasureHuntersHouse_MapBGEvents: @ 853EDC4 bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_270F63 Route124_DivingTreasureHuntersHouse_MapEvents:: @ 853EDD0 - 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 1211044f2..30fa1f18f 100644 --- a/data/maps/events/Route125.inc +++ b/data/maps/events/Route125.inc @@ -1,14 +1,14 @@ -Route125_MapObjects: @ 852C50C - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 31, 1, 28, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 45, 9, 1, 10, 82, 0, 1, 2, Route125_EventScript_1F67BB, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 38, 24, 1, 28, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 30, 28, 1, 52, 153, 0, 1, 3, Route125_EventScript_1F67E9, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SAILOR, 0, 0, 21, 30, 3, 13, 0, 0, 1, 2, Route125_EventScript_1F6800, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_LASS, 0, 0, 17, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F6862, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_LASS, 0, 0, 18, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F687D, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MAN_6, 0, 0, 43, 19, 3, 28, 18, 0, 1, 3, Route125_EventScript_1F6898, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 48, 19, 3, 27, 18, 0, 1, 3, Route125_EventScript_1F68AF, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 46, 17, 3, 1, 17, 0, 0, 0, Route125_EventScript_291018, 1154, 0, 0 +Route125_EventObjects: @ 852C50C + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 31, 1, 28, 0, 0, 1, 2, Route125_EventScript_1F67A4, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 45, 9, 1, 10, 82, 0, 1, 2, Route125_EventScript_1F67BB, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 38, 24, 1, 28, 6, 0, 1, 3, Route125_EventScript_1F67D2, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 30, 28, 1, 52, 153, 0, 1, 3, Route125_EventScript_1F67E9, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 0, 21, 30, 3, 13, 0, 0, 1, 2, Route125_EventScript_1F6800, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_LASS, 0, 0, 17, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F6862, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 0, 18, 19, 3, 8, 17, 0, 1, 1, Route125_EventScript_1F687D, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 0, 43, 19, 3, 28, 18, 0, 1, 3, Route125_EventScript_1F6898, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 48, 19, 3, 27, 18, 0, 1, 3, Route125_EventScript_1F68AF, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 46, 17, 3, 1, 17, 0, 0, 0, Route125_EventScript_291018, 1154, 0, 0 Route125_MapWarps: @ 852C5FC warp_def 22, 19, 0, 0, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM @@ -20,5 +20,5 @@ Route125_MapBGEvents: @ 852C604 bg_event 24, 32, 0, 8, 0, ITEM_PINAP_BERRY, 0, 0 Route125_MapEvents:: @ 852C634 - 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 e8bfd1a5f..f6d4a71a5 100644 --- a/data/maps/events/Route126.inc +++ b/data/maps/events/Route126.inc @@ -1,14 +1,14 @@ -Route126_MapObjects: @ 852C648 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 51, 65, 1, 51, 58, 0, 1, 3, Route126_EventScript_1F68D6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 56, 22, 1, 28, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 63, 43, 1, 24, 0, 0, 1, 3, Route126_EventScript_1F6904, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 9, 48, 1, 7, 0, 0, 1, 3, Route126_EventScript_1F691B, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 1, 3, 1, 17, 0, 0, 0, Route126_EventScript_291025, 1105, 0, 0 - object_event 6, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 15, 66, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6960, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 66, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6977, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 64, 5, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6949, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 56, 5, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6932, 0, 0, 0 +Route126_EventObjects: @ 852C648 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 51, 65, 1, 51, 58, 0, 1, 3, Route126_EventScript_1F68D6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 56, 22, 1, 28, 9, 0, 1, 3, Route126_EventScript_1F68ED, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 63, 43, 1, 24, 0, 0, 1, 3, Route126_EventScript_1F6904, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 9, 48, 1, 7, 0, 0, 1, 3, Route126_EventScript_1F691B, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 1, 3, 1, 17, 0, 0, 0, Route126_EventScript_291025, 1105, 0, 0 + object_event 6, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 15, 66, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6960, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 66, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6977, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 64, 5, 1, 66, 17, 0, 1, 7, Route126_EventScript_1F6949, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 56, 5, 1, 67, 17, 0, 1, 7, Route126_EventScript_1F6932, 0, 0, 0 Route126_MapEvents:: @ 852C720 - 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 7a486263e..b72a1d629 100644 --- a/data/maps/events/Route127.inc +++ b/data/maps/events/Route127.inc @@ -1,15 +1,15 @@ -Route127_MapObjects: @ 852C734 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 45, 42, 1, 14, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 18, 68, 1, 21, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 0, 0, 0, 0, Route127_EventScript_291032, 1034, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_29103F, 1035, 0, 0 - object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 0, 42, 21, 3, 9, 17, 0, 1, 0, Route127_EventScript_1F6A63, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 0, 64, 19, 3, 10, 17, 0, 1, 0, Route127_EventScript_1F6A91, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_FISHERMAN, 0, 0, 54, 14, 3, 7, 17, 0, 1, 0, Route127_EventScript_1F6A7A, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MAN_6, 0, 0, 15, 23, 3, 9, 17, 0, 1, 2, Route127_EventScript_1F6AA8, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 63, 63, 3, 1, 17, 0, 1, 3, Route127_EventScript_1F6AD6, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_WOMAN_7, 0, 0, 12, 23, 3, 10, 17, 0, 1, 2, Route127_EventScript_1F6ABF, 0, 0, 0 - object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 20, 3, 1, 0, 0, 0, 0, Route127_EventScript_29104C, 1155, 0, 0 +Route127_EventObjects: @ 852C734 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 45, 42, 1, 14, 0, 0, 1, 2, Route127_EventScript_1F6A35, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 18, 68, 1, 21, 0, 0, 1, 4, Route127_EventScript_1F6A4C, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 6, 3, 1, 0, 0, 0, 0, Route127_EventScript_291032, 1034, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_29103F, 1035, 0, 0 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 42, 21, 3, 9, 17, 0, 1, 0, Route127_EventScript_1F6A63, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 64, 19, 3, 10, 17, 0, 1, 0, Route127_EventScript_1F6A91, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 54, 14, 3, 7, 17, 0, 1, 0, Route127_EventScript_1F6A7A, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 0, 15, 23, 3, 9, 17, 0, 1, 2, Route127_EventScript_1F6AA8, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 63, 63, 3, 1, 17, 0, 1, 3, Route127_EventScript_1F6AD6, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 12, 23, 3, 10, 17, 0, 1, 2, Route127_EventScript_1F6ABF, 0, 0, 0 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 20, 3, 1, 0, 0, 0, 0, Route127_EventScript_29104C, 1155, 0, 0 Route127_MapBGEvents: @ 852C83C bg_event 59, 67, 0, 8, 0, ITEM_ENERGY_ROOT, 0, 0 @@ -19,5 +19,5 @@ Route127_MapBGEvents: @ 852C83C bg_event 45, 24, 0, 8, 0, ITEM_GLITTER_MAIL, 0, 0 Route127_MapEvents:: @ 852C878 - 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 b48c8c4a2..e9efddf20 100644 --- a/data/maps/events/Route128.inc +++ b/data/maps/events/Route128.inc @@ -1,14 +1,14 @@ -Route128_MapObjects: @ 852C88C - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 35, 33, 1, 48, 85, 0, 1, 3, Route128_EventScript_1F6CBE, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 78, 24, 1, 28, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_STEVEN, 0, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, 834, 0, 0 - object_event 4, MAP_OBJ_GFX_ARCHIE, 0, 0, 37, 22, 3, 9, 17, 0, 0, 0, 0x0, 944, 0, 0 - object_event 5, MAP_OBJ_GFX_MAXIE, 0, 0, 38, 21, 3, 7, 17, 0, 0, 0, 0x0, 945, 0, 0 - object_event 6, MAP_OBJ_GFX_FISHERMAN, 0, 0, 63, 28, 3, 7, 17, 0, 1, 0, Route128_EventScript_1F6DB0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MAN_4, 0, 0, 47, 9, 3, 10, 17, 0, 1, 3, Route128_EventScript_1F6D99, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 24, 8, 3, 17, 17, 0, 1, 3, Route128_EventScript_1F6D82, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 101, 29, 1, 25, 49, 0, 1, 4, Route128_EventScript_1F6DDE, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 101, 22, 1, 26, 49, 0, 1, 4, Route128_EventScript_1F6DC7, 0, 0, 0 +Route128_EventObjects: @ 852C88C + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 35, 33, 1, 48, 85, 0, 1, 3, Route128_EventScript_1F6CBE, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 78, 24, 1, 28, 5, 0, 1, 7, Route128_EventScript_1F6D20, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, 834, 0, 0 + object_event 4, EVENT_OBJ_GFX_ARCHIE, 0, 0, 37, 22, 3, 9, 17, 0, 0, 0, 0x0, 944, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAXIE, 0, 0, 38, 21, 3, 7, 17, 0, 0, 0, 0x0, 945, 0, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 63, 28, 3, 7, 17, 0, 1, 0, Route128_EventScript_1F6DB0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 0, 47, 9, 3, 10, 17, 0, 1, 3, Route128_EventScript_1F6D99, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 24, 8, 3, 17, 17, 0, 1, 3, Route128_EventScript_1F6D82, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 101, 29, 1, 25, 49, 0, 1, 4, Route128_EventScript_1F6DDE, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 101, 22, 1, 26, 49, 0, 1, 4, Route128_EventScript_1F6DC7, 0, 0, 0 Route128_MapBGEvents: @ 852C97C bg_event 49, 9, 3, 7, 0, ITEM_HEART_SCALE, 92, 0 @@ -16,5 +16,5 @@ Route128_MapBGEvents: @ 852C97C bg_event 31, 33, 3, 7, 0, ITEM_HEART_SCALE, 94, 0 Route128_MapEvents:: @ 852C9A0 - 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 38ac3513c..297b9eeb2 100644 --- a/data/maps/events/Route129.inc +++ b/data/maps/events/Route129.inc @@ -1,10 +1,10 @@ -Route129_MapObjects: @ 852C9B4 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 28, 16, 1, 50, 67, 0, 1, 3, Route129_EventScript_1F72EC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 10, 14, 1, 52, 37, 0, 1, 2, Route129_EventScript_1F7303, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 13, 22, 1, 64, 17, 0, 1, 5, Route129_EventScript_1F7331, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 35, 9, 1, 24, 17, 0, 1, 2, Route129_EventScript_1F731A, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 13, 27, 1, 65, 17, 0, 1, 5, Route129_EventScript_1F7348, 0, 0, 0 +Route129_EventObjects: @ 852C9B4 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 28, 16, 1, 50, 67, 0, 1, 3, Route129_EventScript_1F72EC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 10, 14, 1, 52, 37, 0, 1, 2, Route129_EventScript_1F7303, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 13, 22, 1, 64, 17, 0, 1, 5, Route129_EventScript_1F7331, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 35, 9, 1, 24, 17, 0, 1, 2, Route129_EventScript_1F731A, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 13, 27, 1, 65, 17, 0, 1, 5, Route129_EventScript_1F7348, 0, 0, 0 Route129_MapEvents:: @ 852CA2C - 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 d5bd41cbd..470fa9880 100644 --- a/data/maps/events/Route130.inc +++ b/data/maps/events/Route130.inc @@ -1,9 +1,9 @@ -Route130_MapObjects: @ 852CA40 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 70, 21, 1, 51, 99, 0, 1, 3, Route130_EventScript_1F73BF, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 7, 21, 1, 26, 65, 0, 1, 5, Route130_EventScript_1F73D6, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BERRY_TREE, 0, 0, 52, 9, 3, 12, 0, 0, 0, 82, BerryTreeScript, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 7, 30, 1, 25, 65, 0, 1, 5, Route130_EventScript_1F73ED, 0, 0, 0 +Route130_EventObjects: @ 852CA40 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 70, 21, 1, 51, 99, 0, 1, 3, Route130_EventScript_1F73BF, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 7, 21, 1, 26, 65, 0, 1, 5, Route130_EventScript_1F73D6, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 0, 52, 9, 3, 12, 0, 0, 0, 82, BerryTreeScript, 17, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 7, 30, 1, 25, 65, 0, 1, 5, Route130_EventScript_1F73ED, 0, 0, 0 Route130_MapEvents:: @ 852CAA0 - 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 0f37a4c70..b66f47867 100644 --- a/data/maps/events/Route131.inc +++ b/data/maps/events/Route131.inc @@ -1,16 +1,16 @@ -Route131_MapObjects: @ 852CAB4 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 41, 32, 1, 29, 117, 0, 1, 3, Route131_EventScript_1F7429, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 18, 19, 1, 22, 112, 0, 1, 4, Route131_EventScript_1F7440, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 10, 22, 1, 20, 6, 0, 1, 4, Route131_EventScript_1F7457, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 31, 25, 1, 47, 83, 0, 1, 3, Route131_EventScript_1F746E, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 9, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F7485, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 8, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F74A0, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 52, 20, 1, 26, 49, 0, 1, 5, Route131_EventScript_1F74D2, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 52, 27, 1, 25, 49, 0, 1, 5, Route131_EventScript_1F74BB, 0, 0, 0 +Route131_EventObjects: @ 852CAB4 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 41, 32, 1, 29, 117, 0, 1, 3, Route131_EventScript_1F7429, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 18, 19, 1, 22, 112, 0, 1, 4, Route131_EventScript_1F7440, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 10, 22, 1, 20, 6, 0, 1, 4, Route131_EventScript_1F7457, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 31, 25, 1, 47, 83, 0, 1, 3, Route131_EventScript_1F746E, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 9, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F7485, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 0, 8, 16, 1, 8, 17, 0, 1, 1, Route131_EventScript_1F74A0, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 52, 20, 1, 26, 49, 0, 1, 5, Route131_EventScript_1F74D2, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 52, 27, 1, 25, 49, 0, 1, 5, Route131_EventScript_1F74BB, 0, 0, 0 Route131_MapWarps: @ 852CB74 warp_def 36, 6, 3, 0, SKY_PILLAR_ENTRANCE Route131_MapEvents:: @ 852CB7C - 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 3e1287b7d..825c6fc65 100644 --- a/data/maps/events/Route132.inc +++ b/data/maps/events/Route132.inc @@ -1,15 +1,15 @@ -Route132_MapObjects: @ 852CB90 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 40, 13, 1, 46, 51, 0, 1, 2, Route132_EventScript_1F74EA, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 10, 6, 1, 45, 51, 0, 1, 2, Route132_EventScript_1F7501, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_291059, 1036, 0, 0 - object_event 4, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 9, 15, 3, 8, 0, 0, 1, 4, Route132_EventScript_1F752F, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_FISHERMAN, 0, 0, 49, 28, 3, 10, 0, 0, 1, 1, Route132_EventScript_1F7518, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 33, 26, 3, 8, 17, 0, 1, 4, Route132_EventScript_1F7546, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_WOMAN_7, 0, 0, 33, 31, 3, 25, 65, 0, 1, 4, Route132_EventScript_1F755D, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 21, 30, 3, 7, 17, 0, 1, 4, Route132_EventScript_1F758B, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_4, 0, 0, 21, 25, 3, 26, 65, 0, 1, 4, Route132_EventScript_1F7574, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 20, 27, 3, 1, 17, 0, 0, 0, Route132_EventScript_291066, 1156, 0, 0 +Route132_EventObjects: @ 852CB90 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 40, 13, 1, 46, 51, 0, 1, 2, Route132_EventScript_1F74EA, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 10, 6, 1, 45, 51, 0, 1, 2, Route132_EventScript_1F7501, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_291059, 1036, 0, 0 + object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 9, 15, 3, 8, 0, 0, 1, 4, Route132_EventScript_1F752F, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 49, 28, 3, 10, 0, 0, 1, 1, Route132_EventScript_1F7518, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 33, 26, 3, 8, 17, 0, 1, 4, Route132_EventScript_1F7546, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 33, 31, 3, 25, 65, 0, 1, 4, Route132_EventScript_1F755D, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 21, 30, 3, 7, 17, 0, 1, 4, Route132_EventScript_1F758B, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 0, 21, 25, 3, 26, 65, 0, 1, 4, Route132_EventScript_1F7574, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 20, 27, 3, 1, 17, 0, 0, 0, Route132_EventScript_291066, 1156, 0, 0 Route132_MapEvents:: @ 852CC80 - 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 c6cb4ac3b..6249ca026 100644 --- a/data/maps/events/Route133.inc +++ b/data/maps/events/Route133.inc @@ -1,15 +1,15 @@ -Route133_MapObjects: @ 852CC94 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 68, 27, 1, 25, 32, 0, 1, 3, Route133_EventScript_1F75A3, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 13, 3, 1, 8, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 68, 28, 1, 26, 32, 0, 1, 3, Route133_EventScript_1F75BA, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 53, 12, 3, 1, 0, 0, 0, 0, Route133_EventScript_291073, 1037, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_291080, 1038, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_6, 0, 0, 7, 14, 3, 18, 17, 0, 1, 2, Route133_EventScript_1F75FF, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MAN_4, 0, 0, 37, 15, 3, 18, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 56, 11, 3, 8, 17, 0, 1, 3, Route133_EventScript_1F7616, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 56, 15, 3, 16, 17, 0, 1, 3, Route133_EventScript_1F762D, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 48, 28, 3, 1, 17, 0, 0, 0, Route133_EventScript_29108D, 1157, 0, 0 +Route133_EventObjects: @ 852CC94 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 68, 27, 1, 25, 32, 0, 1, 3, Route133_EventScript_1F75A3, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 13, 3, 1, 8, 0, 0, 1, 3, Route133_EventScript_1F75D1, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 68, 28, 1, 26, 32, 0, 1, 3, Route133_EventScript_1F75BA, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 53, 12, 3, 1, 0, 0, 0, 0, Route133_EventScript_291073, 1037, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_291080, 1038, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 0, 7, 14, 3, 18, 17, 0, 1, 2, Route133_EventScript_1F75FF, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 0, 37, 15, 3, 18, 0, 0, 1, 4, Route133_EventScript_1F75E8, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 56, 11, 3, 8, 17, 0, 1, 3, Route133_EventScript_1F7616, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 56, 15, 3, 16, 17, 0, 1, 3, Route133_EventScript_1F762D, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 48, 28, 3, 1, 17, 0, 0, 0, Route133_EventScript_29108D, 1157, 0, 0 Route133_MapEvents:: @ 852CD84 - 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 6905f533f..6beb27ba5 100644 --- a/data/maps/events/Route134.inc +++ b/data/maps/events/Route134.inc @@ -1,16 +1,16 @@ -Route134_MapObjects: @ 852CD98 - object_event 1, MAP_OBJ_GFX_SWIMMER_M, 0, 0, 49, 9, 1, 49, 83, 0, 1, 2, Route134_EventScript_1F7653, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SWIMMER_F, 0, 0, 58, 7, 1, 1, 0, 0, 1, 3, Route134_EventScript_1F766A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 41, 23, 3, 10, 0, 0, 1, 2, Route134_EventScript_1F7698, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_6, 0, 0, 24, 23, 3, 26, 48, 0, 1, 6, Route134_EventScript_1F7681, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 49, 16, 3, 27, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_7, 0, 0, 43, 23, 1, 9, 17, 0, 1, 2, Route134_EventScript_1F76F4, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_SAILOR, 0, 0, 24, 30, 3, 25, 48, 0, 1, 6, Route134_EventScript_1F770B, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_GIRL_3, 0, 0, 50, 16, 3, 28, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_SAILOR, 0, 0, 63, 14, 3, 18, 17, 0, 1, 3, Route134_EventScript_1F76C6, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 50, 17, 3, 1, 17, 0, 0, 0, Route134_EventScript_29109A, 1158, 0, 0 - object_event 11, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 22, 27, 3, 1, 17, 0, 0, 0, Route134_EventScript_2910A7, 1159, 0, 0 +Route134_EventObjects: @ 852CD98 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 0, 49, 9, 1, 49, 83, 0, 1, 2, Route134_EventScript_1F7653, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 0, 58, 7, 1, 1, 0, 0, 1, 3, Route134_EventScript_1F766A, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 41, 23, 3, 10, 0, 0, 1, 2, Route134_EventScript_1F7698, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 0, 24, 23, 3, 26, 48, 0, 1, 6, Route134_EventScript_1F7681, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 49, 16, 3, 27, 6, 0, 1, 5, Route134_EventScript_1F76AF, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 43, 23, 1, 9, 17, 0, 1, 2, Route134_EventScript_1F76F4, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_SAILOR, 0, 0, 24, 30, 3, 25, 48, 0, 1, 6, Route134_EventScript_1F770B, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_3, 0, 0, 50, 16, 3, 28, 6, 0, 1, 5, Route134_EventScript_1F76DD, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_SAILOR, 0, 0, 63, 14, 3, 18, 17, 0, 1, 3, Route134_EventScript_1F76C6, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 50, 17, 3, 1, 17, 0, 0, 0, Route134_EventScript_29109A, 1158, 0, 0 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 22, 27, 3, 1, 17, 0, 0, 0, Route134_EventScript_2910A7, 1159, 0, 0 Route134_MapEvents:: @ 852CEA0 - 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 26a0c1a11..3efb9fac7 100644 --- a/data/maps/events/RustboroCity.inc +++ b/data/maps/events/RustboroCity.inc @@ -1,20 +1,20 @@ -RustboroCity_MapObjects: @ 85267E0 - object_event 1, MAP_OBJ_GFX_WOMAN_7, 0, 0, 22, 34, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E088A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 19, 13, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E085F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 21, 46, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E08D1, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BOY_2, 0, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_4, 0, 0, 26, 23, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0893, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_2, 0, 0, 30, 10, 3, 10, 17, 0, 0, 0, RustboroCity_EventScript_1E0ADD, 732, 0, 0 - object_event 10, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, 731, 0, 0 - object_event 11, MAP_OBJ_GFX_MAN_7, 0, 0, 13, 34, 3, 2, 17, 0, 0, 0, RustboroCity_EventScript_1E087E, 0, 0, 0 - object_event 12, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041, 0, 0 - object_event 13, MAP_OBJ_GFX_MAN_5, 0, 0, 19, 27, 3, 8, 16, 0, 0, 0, RustboroCity_EventScript_1E094E, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_HIPSTER, 0, 0, 16, 50, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0DB8, 814, 0, 0 - object_event 15, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 11, 15, 0, 1, 17, 0, 0, 0, 0x0, 844, 0, 0 - object_event 16, MAP_OBJ_GFX_BOY_1, 0, 0, 31, 36, 3, 1, 16, 0, 0, 0, RustboroCity_EventScript_1E1236, 0, 0, 0 +RustboroCity_EventObjects: @ 85267E0 + object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 22, 34, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E088A, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 19, 13, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E085F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_1E08DA, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 21, 46, 3, 3, 16, 0, 0, 0, RustboroCity_EventScript_1E08D1, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1E08B2, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 0, 26, 23, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0893, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_1E0922, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_1E0938, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 0, 30, 10, 3, 10, 17, 0, 0, 0, RustboroCity_EventScript_1E0ADD, 732, 0, 0 + object_event 10, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, 731, 0, 0 + object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 0, 13, 34, 3, 2, 17, 0, 0, 0, RustboroCity_EventScript_1E087E, 0, 0, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_2910DB, 1041, 0, 0 + object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 0, 19, 27, 3, 8, 16, 0, 0, 0, RustboroCity_EventScript_1E094E, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_HIPSTER, 0, 0, 16, 50, 3, 1, 17, 0, 0, 0, RustboroCity_EventScript_1E0DB8, 814, 0, 0 + object_event 15, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 11, 15, 0, 1, 17, 0, 0, 0, 0x0, 844, 0, 0 + object_event 16, EVENT_OBJ_GFX_BOY_1, 0, 0, 31, 36, 3, 1, 16, 0, 0, 0, RustboroCity_EventScript_1E1236, 0, 0, 0 RustboroCity_MapWarps: @ 8526960 warp_def 27, 19, 0, 0, RUSTBORO_CITY_GYM @@ -66,5 +66,5 @@ RustboroCity_MapBGEvents: @ 8526B10 bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_1E0919 RustboroCity_MapEvents:: @ 8526B88 - 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 1e779cb1e..bbed60478 100644 --- a/data/maps/events/RustboroCity_CuttersHouse.inc +++ b/data/maps/events/RustboroCity_CuttersHouse.inc @@ -1,11 +1,11 @@ -RustboroCity_CuttersHouse_MapObjects: @ 8530A1C - object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LASS, 0, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0, 0, 0 +RustboroCity_CuttersHouse_EventObjects: @ 8530A1C + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215BD4, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_215C0A, 0, 0, 0 RustboroCity_CuttersHouse_MapWarps: @ 8530A4C warp_def 5, 8, 0, 8, RUSTBORO_CITY warp_def 6, 8, 0, 8, RUSTBORO_CITY RustboroCity_CuttersHouse_MapEvents:: @ 8530A5C - 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 5a92ba2fc..034c44aa3 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: @ 853037C - object_event 1, MAP_OBJ_GFX_MAN_7, 0, 0, 2, 6, 3, 2, 17, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_7, 0, 0, 15, 5, 3, 2, 18, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_4, 0, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0, 0, 0 +RustboroCity_DevonCorp_1F_EventObjects: @ 853037C + object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 0, 2, 6, 3, 2, 17, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211261, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 0, 15, 5, 3, 2, 18, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211293, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_2112CE, 0, 0, 0 RustboroCity_DevonCorp_1F_MapWarps: @ 85303C4 warp_def 5, 8, 0, 5, RUSTBORO_CITY @@ -13,5 +13,5 @@ RustboroCity_DevonCorp_1F_MapBGEvents: @ 85303DC bg_event 8, 2, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_211309 RustboroCity_DevonCorp_1F_MapEvents:: @ 85303F4 - map_events RustboroCity_DevonCorp_1F_MapObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, RustboroCity_DevonCorp_1F_MapBGEvents + map_events RustboroCity_DevonCorp_1F_EventObjects, RustboroCity_DevonCorp_1F_MapWarps, 0x0, RustboroCity_DevonCorp_1F_MapBGEvents diff --git a/data/maps/events/RustboroCity_DevonCorp_2F.inc b/data/maps/events/RustboroCity_DevonCorp_2F.inc index a84456e44..f19ab8110 100644 --- a/data/maps/events/RustboroCity_DevonCorp_2F.inc +++ b/data/maps/events/RustboroCity_DevonCorp_2F.inc @@ -1,15 +1,15 @@ -RustboroCity_DevonCorp_2F_MapObjects: @ 8530408 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 5, 3, 7, 160, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 8, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 5, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0, 0, 0 +RustboroCity_DevonCorp_2F_EventObjects: @ 8530408 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_21186F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211886, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118B0, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 5, 3, 7, 160, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118DA, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 8, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_2118F1, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 14, 5, 3, 7, 17, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_211BCF, 0, 0, 0 RustboroCity_DevonCorp_2F_MapWarps: @ 8530498 warp_def 14, 1, 0, 2, RUSTBORO_CITY_DEVON_CORP_1F warp_def 2, 1, 0, 0, RUSTBORO_CITY_DEVON_CORP_3F RustboroCity_DevonCorp_2F_MapEvents:: @ 85304A8 - 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 ec2d22707..8422ef37a 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: @ 85304BC - object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_2, 0, 0, 3, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949, 0, 0 - object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 15, 5, 3, 76, 17, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0 +RustboroCity_DevonCorp_3F_EventObjects: @ 85304BC + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 0, 3, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_2125E1, 949, 0, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 15, 5, 3, 76, 17, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_21256C, 0, 0, 0 RustboroCity_DevonCorp_3F_MapWarps: @ 8530504 warp_def 2, 1, 0, 1, RUSTBORO_CITY_DEVON_CORP_2F @@ -11,5 +11,5 @@ RustboroCity_DevonCorp_3F_MapBGEvents: @ 853050C bg_event 1, 7, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_212600 RustboroCity_DevonCorp_3F_MapEvents:: @ 8530524 - 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 93185e0fd..66786ea5b 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: @ 8530890 - object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0, 0, 0 +RustboroCity_Flat1_1F_EventObjects: @ 8530890 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 9, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150CE, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_2150D7, 0, 0, 0 RustboroCity_Flat1_1F_MapWarps: @ 85308C0 warp_def 6, 7, 0, 1, RUSTBORO_CITY @@ -8,5 +8,5 @@ RustboroCity_Flat1_1F_MapWarps: @ 85308C0 warp_def 2, 1, 0, 0, RUSTBORO_CITY_FLAT_1_2F RustboroCity_Flat1_1F_MapEvents:: @ 85308D8 - 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 0fa012eda..e56741b49 100644 --- a/data/maps/events/RustboroCity_Flat1_2F.inc +++ b/data/maps/events/RustboroCity_Flat1_2F.inc @@ -1,16 +1,16 @@ -RustboroCity_Flat1_2F_MapObjects: @ 85308EC - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 6, 3, 5, 19, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 5, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SKITTY_DOLL, 0, 0, 9, 4, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_TREECKO_DOLL, 0, 0, 10, 5, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_TORCHIC_DOLL, 0, 0, 10, 6, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 8, 5, 3, 10, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MUDKIP_DOLL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_PIKACHU_DOLL, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 +RustboroCity_Flat1_2F_EventObjects: @ 85308EC + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 6, 3, 5, 19, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_21523D, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 5, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SKITTY_DOLL, 0, 0, 9, 4, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_TREECKO_DOLL, 0, 0, 10, 5, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_TORCHIC_DOLL, 0, 0, 10, 6, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 8, 5, 3, 10, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_21513A, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_MUDKIP_DOLL, 0, 0, 8, 6, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_PIKACHU_DOLL, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, RustboroCity_Flat1_2F_EventScript_215246, 0, 0, 0 RustboroCity_Flat1_2F_MapWarps: @ 85309AC warp_def 2, 1, 0, 2, RUSTBORO_CITY_FLAT_1_1F RustboroCity_Flat1_2F_MapEvents:: @ 85309B4 - 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 937d1afb9..f31acb8b6 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: @ 8530AC4 - object_event 1, MAP_OBJ_GFX_SKITTY, 0, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0, 0, 0 +RustboroCity_Flat2_1F_EventObjects: @ 8530AC4 + object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F80, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_215F77, 0, 0, 0 RustboroCity_Flat2_1F_MapWarps: @ 8530AF4 warp_def 2, 8, 0, 10, RUSTBORO_CITY @@ -8,5 +8,5 @@ RustboroCity_Flat2_1F_MapWarps: @ 8530AF4 warp_def 3, 1, 0, 0, RUSTBORO_CITY_FLAT_2_2F RustboroCity_Flat2_1F_MapEvents:: @ 8530B0C - 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 2ea886e54..3bed978e8 100644 --- a/data/maps/events/RustboroCity_Flat2_2F.inc +++ b/data/maps/events/RustboroCity_Flat2_2F.inc @@ -1,11 +1,11 @@ -RustboroCity_Flat2_2F_MapObjects: @ 8530B20 - object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0, 0, 0 +RustboroCity_Flat2_2F_EventObjects: @ 8530B20 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 11, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FD8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_215FE1, 0, 0, 0 RustboroCity_Flat2_2F_MapWarps: @ 8530B50 warp_def 3, 1, 0, 2, RUSTBORO_CITY_FLAT_2_1F warp_def 1, 1, 0, 0, RUSTBORO_CITY_FLAT_2_3F RustboroCity_Flat2_2F_MapEvents:: @ 8530B60 - 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 44c5bc37a..16f9aa3ea 100644 --- a/data/maps/events/RustboroCity_Flat2_3F.inc +++ b/data/maps/events/RustboroCity_Flat2_3F.inc @@ -1,10 +1,10 @@ -RustboroCity_Flat2_3F_MapObjects: @ 8530B74 - object_event 1, MAP_OBJ_GFX_MAN_7, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_1, 0, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0, 0, 0 +RustboroCity_Flat2_3F_EventObjects: @ 8530B74 + object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216117, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_216120, 0, 0, 0 RustboroCity_Flat2_3F_MapWarps: @ 8530BA4 warp_def 1, 1, 0, 1, RUSTBORO_CITY_FLAT_2_2F RustboroCity_Flat2_3F_MapEvents:: @ 8530BAC - 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 dc395c064..d17c42d67 100644 --- a/data/maps/events/RustboroCity_Gym.inc +++ b/data/maps/events/RustboroCity_Gym.inc @@ -1,9 +1,9 @@ -RustboroCity_Gym_MapObjects: @ 8530538 - object_event 1, MAP_OBJ_GFX_ROXANNE, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 5, 13, 3, 8, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 3, 9, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_2, 0, 0, 3, 18, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_HIKER, 0, 0, 1, 6, 3, 8, 17, 0, 1, 3, RustboroCity_Gym_EventScript_213011, 0, 0, 0 +RustboroCity_Gym_EventObjects: @ 8530538 + object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_212F31, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 5, 13, 3, 8, 0, 0, 1, 2, RustboroCity_Gym_EventScript_212FE3, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 3, 9, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_212FFA, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 0, 3, 18, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_213028, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_HIKER, 0, 0, 1, 6, 3, 8, 17, 0, 1, 3, RustboroCity_Gym_EventScript_213011, 0, 0, 0 RustboroCity_Gym_MapWarps: @ 85305B0 warp_def 5, 19, 0, 0, RUSTBORO_CITY @@ -14,5 +14,5 @@ RustboroCity_Gym_MapBGEvents: @ 85305C0 bg_event 8, 18, 0, 1, 0, RustboroCity_Gym_EventScript_213057 RustboroCity_Gym_MapEvents:: @ 85305D8 - 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 eee616f8a..d07456dc9 100644 --- a/data/maps/events/RustboroCity_House1.inc +++ b/data/maps/events/RustboroCity_House1.inc @@ -1,11 +1,11 @@ -RustboroCity_House1_MapObjects: @ 85309C8 - object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0, 0, 0 +RustboroCity_House1_EventObjects: @ 85309C8 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_21593F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_2159DF, 0, 0, 0 RustboroCity_House1_MapWarps: @ 85309F8 warp_def 5, 7, 0, 7, RUSTBORO_CITY warp_def 6, 7, 0, 7, RUSTBORO_CITY RustboroCity_House1_MapEvents:: @ 8530A08 - 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 b4a00970f..5d45c64d0 100644 --- a/data/maps/events/RustboroCity_House2.inc +++ b/data/maps/events/RustboroCity_House2.inc @@ -1,11 +1,11 @@ -RustboroCity_House2_MapObjects: @ 8530A70 - object_event 1, MAP_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0, 0, 0 +RustboroCity_House2_EventObjects: @ 8530A70 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EB4, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_215EBD, 0, 0, 0 RustboroCity_House2_MapWarps: @ 8530AA0 warp_def 5, 8, 0, 9, RUSTBORO_CITY warp_def 6, 8, 0, 9, RUSTBORO_CITY RustboroCity_House2_MapEvents:: @ 8530AB0 - 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 09cf245e0..61a528cdc 100644 --- a/data/maps/events/RustboroCity_House3.inc +++ b/data/maps/events/RustboroCity_House3.inc @@ -1,12 +1,12 @@ -RustboroCity_House3_MapObjects: @ 8530BC0 - object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0, 0, 0 +RustboroCity_House3_EventObjects: @ 8530BC0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 4, 5, 3, 10, 0, 0, 0, 0, RustboroCity_House3_EventScript_216191, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 7, 5, 3, 9, 0, 0, 0, 0, RustboroCity_House3_EventScript_21619A, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_2161A3, 0, 0, 0 RustboroCity_House3_MapWarps: @ 8530C08 warp_def 5, 8, 0, 11, RUSTBORO_CITY warp_def 6, 8, 0, 11, RUSTBORO_CITY RustboroCity_House3_MapEvents:: @ 8530C18 - 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 28b614d47..e177ee10a 100644 --- a/data/maps/events/RustboroCity_Mart.inc +++ b/data/maps/events/RustboroCity_Mart.inc @@ -1,13 +1,13 @@ -RustboroCity_Mart_MapObjects: @ 853080C - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_1, 0, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_2, 0, 0, 8, 4, 3, 3, 16, 0, 0, 0, RustboroCity_Mart_EventScript_214F74, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BUG_CATCHER, 0, 0, 8, 2, 3, 7, 17, 0, 0, 0, RustboroCity_Mart_EventScript_214F86, 0, 0, 0 +RustboroCity_Mart_EventObjects: @ 853080C + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F06, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_214F7D, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 8, 4, 3, 3, 16, 0, 0, 0, RustboroCity_Mart_EventScript_214F74, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 0, 8, 2, 3, 7, 17, 0, 0, 0, RustboroCity_Mart_EventScript_214F86, 0, 0, 0 RustboroCity_Mart_MapWarps: @ 853086C warp_def 3, 7, 0, 2, RUSTBORO_CITY warp_def 4, 7, 0, 2, RUSTBORO_CITY RustboroCity_Mart_MapEvents:: @ 853087C - 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 9c44870ad..56dd4ef83 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: @ 85306F4 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0, 0, 0 +RustboroCity_PokemonCenter_1F_EventObjects: @ 85306F4 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D76, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D84, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 3, 4, 3, 2, 17, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D8D, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_214D96, 0, 0, 0 RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754 warp_def 7, 8, 3, 3, RUSTBORO_CITY @@ -10,5 +10,5 @@ RustboroCity_PokemonCenter_1F_MapWarps: @ 8530754 warp_def 1, 6, 4, 0, RUSTBORO_CITY_POKEMON_CENTER_2F RustboroCity_PokemonCenter_1F_MapEvents:: @ 853076C - 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 71defda3d..f9e00e26c 100644 --- a/data/maps/events/RustboroCity_PokemonCenter_2F.inc +++ b/data/maps/events/RustboroCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -RustboroCity_PokemonCenter_2F_MapObjects: @ 8530780 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +RustboroCity_PokemonCenter_2F_EventObjects: @ 8530780 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0 warp_def 1, 6, 4, 2, RUSTBORO_CITY_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ RustboroCity_PokemonCenter_2F_MapWarps: @ 85307E0 warp_def 9, 1, 3, 0, TRADE_CENTER RustboroCity_PokemonCenter_2F_MapEvents:: @ 85307F8 - 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 3facee89a..ac0160e7b 100644 --- a/data/maps/events/RustboroCity_PokemonSchool.inc +++ b/data/maps/events/RustboroCity_PokemonSchool.inc @@ -1,11 +1,11 @@ -RustboroCity_PokemonSchool_MapObjects: @ 85305EC - object_event 1, MAP_OBJ_GFX_BOY_5, 0, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_5, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SCHOOL_KID_M, 0, 0, 3, 6, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_SCOTT, 0, 0, 0, 10, 0, 7, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999, 0, 0 +RustboroCity_PokemonSchool_EventObjects: @ 85305EC + object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F5F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F68, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F71, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F7A, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 3, 6, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F83, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 5, 3, 3, 8, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F95, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_SCOTT, 0, 0, 0, 10, 0, 7, 17, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_214040, 999, 0, 0 RustboroCity_PokemonSchool_MapWarps: @ 8530694 warp_def 5, 10, 0, 4, RUSTBORO_CITY @@ -19,5 +19,5 @@ RustboroCity_PokemonSchool_MapBGEvents: @ 85306A4 bg_event 3, 5, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_213F8C RustboroCity_PokemonSchool_MapEvents:: @ 85306E0 - 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 94846323a..5c2a214b9 100644 --- a/data/maps/events/RusturfTunnel.inc +++ b/data/maps/events/RusturfTunnel.inc @@ -1,14 +1,14 @@ -RusturfTunnel_MapObjects: @ 85341C4 - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807, 0, 0 - object_event 2, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 5, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931, 0, 0 - object_event 3, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049, 0, 0 - object_event 5, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, 879, 0, 0 - object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878, 0, 0 - object_event 7, MAP_OBJ_GFX_WINGULL, 0, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 4, 3, 8, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932, 0, 0 - object_event 9, MAP_OBJ_GFX_HIKER, 0, 0, 32, 13, 3, 9, 17, 0, 1, 3, RusturfTunnel_EventScript_22D1B1, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_WOMAN_3, 0, 0, 25, 4, 3, 9, 17, 0, 0, 0, RusturfTunnel_EventScript_22CE5F, 983, 0, 0 +RusturfTunnel_EventObjects: @ 85341C4 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_22CE76, 807, 0, 0 + object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 5, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 931, 0, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291136, 1048, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_291143, 1049, 0, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, 879, 0, 0 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0C2, 878, 0, 0 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_22D0AF, 880, 0, 0 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 24, 4, 3, 8, 0, 0, 0, 0, RusturfTunnel_EventScript_2907A6, 932, 0, 0 + object_event 9, EVENT_OBJ_GFX_HIKER, 0, 0, 32, 13, 3, 9, 17, 0, 1, 3, RusturfTunnel_EventScript_22D1B1, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 25, 4, 3, 9, 17, 0, 0, 0, RusturfTunnel_EventScript_22CE5F, 983, 0, 0 RusturfTunnel_MapWarps: @ 85342B4 warp_def 4, 10, 3, 0, ROUTE_116 @@ -23,5 +23,5 @@ RusturfTunnel_MapCoordEvents: @ 85342CC coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_22D07D RusturfTunnel_MapEvents:: @ 853431C - 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 5d6d73288..1816412d6 100644 --- a/data/maps/events/SSTidalCorridor.inc +++ b/data/maps/events/SSTidalCorridor.inc @@ -1,9 +1,9 @@ -SSTidalCorridor_MapObjects: @ 853A158 - object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 16, 7, 3, 3, 32, 0, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 2, 3, 8, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950, 0, 0 - object_event 4, MAP_OBJ_GFX_WINGULL, 0, 0, 7, 2, 3, 1, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950, 0, 0 - object_event 5, MAP_OBJ_GFX_SCOTT, 0, 0, 9, 10, 3, 9, 0, 0, 0, 0, 0x0, 810, 0, 0 +SSTidalCorridor_EventObjects: @ 853A158 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_23C119, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 16, 7, 3, 3, 32, 0, 0, 0, SSTidalCorridor_EventScript_23C1A3, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 9, 2, 3, 8, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0D9, 950, 0, 0 + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 0, 7, 2, 3, 1, 17, 0, 0, 0, SSTidalCorridor_EventScript_23C0E2, 950, 0, 0 + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 9, 10, 3, 9, 0, 0, 0, 0, 0x0, 810, 0, 0 SSTidalCorridor_MapWarps: @ 853A1D0 warp_def 4, 9, 3, 0, SS_TIDAL_ROOMS @@ -31,5 +31,5 @@ SSTidalCorridor_MapBGEvents: @ 853A218 bg_event 14, 9, 0, 1, 0, SSTidalCorridor_EventScript_23C110 SSTidalCorridor_MapEvents:: @ 853A2A8 - 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 0ce76cf29..e135eceae 100644 --- a/data/maps/events/SSTidalLowerDeck.inc +++ b/data/maps/events/SSTidalLowerDeck.inc @@ -1,6 +1,6 @@ -SSTidalLowerDeck_MapObjects: @ 853A2BC - object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 10, 4, 3, 46, 68, 0, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 7, 4, 3, 50, 71, 0, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0, 0, 0 +SSTidalLowerDeck_EventObjects: @ 853A2BC + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 10, 4, 3, 46, 68, 0, 1, 3, SSTidalLowerDeck_EventScript_23C819, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 7, 4, 3, 50, 71, 0, 1, 3, SSTidalLowerDeck_EventScript_23C830, 0, 0, 0 SSTidalLowerDeck_MapWarps: @ 853A2EC warp_def 15, 2, 3, 8, SS_TIDAL_CORRIDOR @@ -9,5 +9,5 @@ SSTidalLowerDeck_MapBGEvents: @ 853A2F4 bg_event 0, 2, 0, 7, 0, ITEM_LEFTOVERS, 35, 0 SSTidalLowerDeck_MapEvents:: @ 853A300 - 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 81648162b..14aadda5f 100644 --- a/data/maps/events/SSTidalRooms.inc +++ b/data/maps/events/SSTidalRooms.inc @@ -1,12 +1,12 @@ -SSTidalRooms_MapObjects: @ 853A314 - object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MAN_5, 0, 0, 5, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_5, 0, 0, 4, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_BOY_4, 0, 0, 22, 11, 3, 8, 17, 0, 1, 3, SSTidalRooms_EventScript_23CAC4, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_WOMAN_3, 0, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_MANIAC, 0, 0, 28, 5, 3, 7, 17, 0, 0, 0, SSTidalRooms_EventScript_23C9F2, 951, 0, 0 +SSTidalRooms_EventObjects: @ 853A314 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA49, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_23CA60, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_23CA77, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 5, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CA8E, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 4, 14, 3, 8, 0, 0, 1, 1, SSTidalRooms_EventScript_23CAA9, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 0, 22, 11, 3, 8, 17, 0, 1, 3, SSTidalRooms_EventScript_23CAC4, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_23CADB, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 0, 28, 5, 3, 7, 17, 0, 0, 0, SSTidalRooms_EventScript_23C9F2, 951, 0, 0 SSTidalRooms_MapWarps: @ 853A3D4 warp_def 4, 16, 0, 0, SS_TIDAL_CORRIDOR @@ -27,5 +27,5 @@ SSTidalRooms_MapBGEvents: @ 853A434 bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_23CA33 SSTidalRooms_MapEvents:: @ 853A44C - 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_North.inc b/data/maps/events/SafariZone_North.inc index e8ace6482..d11d31fe9 100644 --- a/data/maps/events/SafariZone_North.inc +++ b/data/maps/events/SafariZone_North.inc @@ -1,14 +1,14 @@ -SafariZone_North_MapObjects: @ 853B160 - object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 0, 22, 9, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D254, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_5, 0, 0, 6, 29, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D25D, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 10, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 13, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 28, 14, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 19, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 23, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 20, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 21, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 27, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 22, 0, 0 - object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2912C9, 1119, 0, 0 +SafariZone_North_EventObjects: @ 853B160 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 22, 9, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D254, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 29, 3, 2, 17, 0, 0, 0, SafariZone_North_EventScript_23D25D, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 10, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 17, 0, 0 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 25, 13, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 18, 0, 0 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 28, 14, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 19, 0, 0 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 23, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 20, 0, 0 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 21, 0, 0 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 27, 7, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2907A6, 22, 0, 0 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 6, 3, 1, 17, 0, 0, 0, SafariZone_North_EventScript_2912C9, 1119, 0, 0 SafariZone_North_MapEvents:: @ 853B238 - map_events SafariZone_North_MapObjects, 0x0, 0x0, 0x0 + map_events SafariZone_North_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Northeast.inc b/data/maps/events/SafariZone_Northeast.inc index 84505d6e6..233b55da0 100644 --- a/data/maps/events/SafariZone_Northeast.inc +++ b/data/maps/events/SafariZone_Northeast.inc @@ -1,18 +1,18 @@ -SafariZone_Northeast_MapObjects: @ 853B968 - object_event 1, MAP_OBJ_GFX_BOY_3, 0, 0, 8, 20, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 30, 22, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 11, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 13, 35, 0, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 10, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18, 0, 0 - object_event 9, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169, 0, 0 +SafariZone_Northeast_EventObjects: @ 853B968 + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 0, 8, 20, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3C6, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 30, 22, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3D8, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 11, 11, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 21, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 13, 35, 0, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_23D3CF, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 13, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 19, 0, 0 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 17, 0, 0 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 10, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 20, 0, 0 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2907A6, 18, 0, 0 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 8, 17, 3, 1, 17, 0, 0, 0, SafariZone_Northeast_EventScript_2912E3, 1169, 0, 0 SafariZone_Northeast_MapBGEvents: @ 853BA40 bg_event 31, 35, 3, 7, 0, ITEM_RARE_CANDY, 106, 0 bg_event 21, 5, 3, 7, 0, ITEM_ZINC, 107, 0 SafariZone_Northeast_MapEvents:: @ 853BA58 - map_events SafariZone_Northeast_MapObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents + map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, SafariZone_Northeast_MapBGEvents diff --git a/data/maps/events/SafariZone_Northwest.inc b/data/maps/events/SafariZone_Northwest.inc index 64152d008..41c2fe198 100644 --- a/data/maps/events/SafariZone_Northwest.inc +++ b/data/maps/events/SafariZone_Northwest.inc @@ -1,7 +1,7 @@ -SafariZone_Northwest_MapObjects: @ 853B11C - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 33, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northwest_EventScript_2912BC, 1094, 0, 0 +SafariZone_Northwest_EventObjects: @ 853B11C + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_23D24A, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 33, 7, 3, 1, 17, 0, 0, 0, SafariZone_Northwest_EventScript_2912BC, 1094, 0, 0 SafariZone_Northwest_MapEvents:: @ 853B14C - 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 863c3113a..1ab278781 100644 --- a/data/maps/events/SafariZone_RestHouse.inc +++ b/data/maps/events/SafariZone_RestHouse.inc @@ -1,12 +1,12 @@ -SafariZone_RestHouse_MapObjects: @ 853B8FC - object_event 1, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 7, 4, 0, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_PSYCHIC_M, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 2, 5, 3, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0, 0, 0 +SafariZone_RestHouse_EventObjects: @ 853B8FC + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 7, 4, 0, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BE7, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 8, 4, 0, 9, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 2, 5, 3, 10, 17, 0, 0, 0, SafariZone_RestHouse_EventScript_242BF9, 0, 0, 0 SafariZone_RestHouse_MapWarps: @ 853B944 warp_def 3, 8, 0, 0, SAFARI_ZONE_SOUTHWEST warp_def 4, 8, 0, 0, SAFARI_ZONE_SOUTHWEST SafariZone_RestHouse_MapEvents:: @ 853B954 - 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_South.inc b/data/maps/events/SafariZone_South.inc index 4a0ead84c..c1e293e6f 100644 --- a/data/maps/events/SafariZone_South.inc +++ b/data/maps/events/SafariZone_South.inc @@ -1,14 +1,14 @@ -SafariZone_South_MapObjects: @ 853B2A4 - object_event 1, MAP_OBJ_GFX_CAMPER, 0, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_1, 0, 0, 26, 28, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2CA, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_5, 0, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_YOUNGSTER, 0, 0, 15, 31, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2DC, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_CAMPER, 0, 0, 36, 16, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D390, 717, 0, 0 - object_event 6, MAP_OBJ_GFX_CAMPER, 0, 0, 36, 17, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D3A2, 717, 0, 0 +SafariZone_South_EventObjects: @ 853B2A4 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2E5, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 0, 26, 28, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2CA, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_South_EventScript_23D2D3, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 15, 31, 3, 2, 17, 0, 0, 0, SafariZone_South_EventScript_23D2DC, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 0, 36, 16, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D390, 717, 0, 0 + object_event 6, EVENT_OBJ_GFX_CAMPER, 0, 0, 36, 17, 3, 9, 17, 0, 0, 0, SafariZone_South_EventScript_23D3A2, 717, 0, 0 SafariZone_South_MapWarps: @ 853B334 warp_def 32, 33, 0, 0, ROUTE_121_SAFARI_ZONE_ENTRANCE SafariZone_South_MapEvents:: @ 853B33C - map_events SafariZone_South_MapObjects, SafariZone_South_MapWarps, 0x0, 0x0 + map_events SafariZone_South_EventObjects, SafariZone_South_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SafariZone_Southeast.inc b/data/maps/events/SafariZone_Southeast.inc index 3970e6eb0..61e6b93fe 100644 --- a/data/maps/events/SafariZone_Southeast.inc +++ b/data/maps/events/SafariZone_Southeast.inc @@ -1,14 +1,14 @@ -SafariZone_Southeast_MapObjects: @ 853BA6C - object_event 1, MAP_OBJ_GFX_BOY_4, 0, 0, 7, 7, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 20, 30, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 8, 26, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 31, 15, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170, 0, 0 - object_event 5, MAP_OBJ_GFX_CAMPER, 0, 0, 12, 16, 3, 9, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D399, 747, 0, 0 +SafariZone_Southeast_EventObjects: @ 853BA6C + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 7, 7, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3BD, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 20, 30, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3B4, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 8, 26, 3, 2, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D3AB, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 31, 15, 3, 1, 17, 0, 0, 0, SafariZone_Southeast_EventScript_2912F0, 1170, 0, 0 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 0, 12, 16, 3, 9, 17, 0, 0, 0, SafariZone_Southeast_EventScript_23D399, 747, 0, 0 SafariZone_Southeast_MapBGEvents: @ 853BAE4 bg_event 19, 36, 3, 7, 0, ITEM_PP_UP, 108, 0 bg_event 32, 33, 0, 7, 0, ITEM_FULL_RESTORE, 105, 0 SafariZone_Southeast_MapEvents:: @ 853BAFC - map_events SafariZone_Southeast_MapObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents + map_events SafariZone_Southeast_EventObjects, 0x0, 0x0, SafariZone_Southeast_MapBGEvents diff --git a/data/maps/events/SafariZone_Southwest.inc b/data/maps/events/SafariZone_Southwest.inc index 9edb33ddb..eda3552eb 100644 --- a/data/maps/events/SafariZone_Southwest.inc +++ b/data/maps/events/SafariZone_Southwest.inc @@ -1,6 +1,6 @@ -SafariZone_Southwest_MapObjects: @ 853B24C - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 3, 1, 17, 0, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131, 0, 0 +SafariZone_Southwest_EventObjects: @ 853B24C + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_23D267, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 0, 37, 3, 1, 17, 0, 0, 0, SafariZone_Southwest_EventScript_2912D6, 1131, 0, 0 SafariZone_Southwest_MapWarps: @ 853B27C warp_def 29, 7, 3, 0, SAFARI_ZONE_REST_HOUSE @@ -9,5 +9,5 @@ SafariZone_Southwest_MapBGEvents: @ 853B284 bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_23D270 SafariZone_Southwest_MapEvents:: @ 853B290 - 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 f5c878466..313423b51 100644 --- a/data/maps/events/ScorchedSlab.inc +++ b/data/maps/events/ScorchedSlab.inc @@ -1,9 +1,9 @@ -ScorchedSlab_MapObjects: @ 8536F88 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079, 0, 0 +ScorchedSlab_EventObjects: @ 8536F88 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_2912AF, 1079, 0, 0 ScorchedSlab_MapWarps: @ 8536FA0 warp_def 7, 16, 1, 1, ROUTE_120 ScorchedSlab_MapEvents:: @ 8536FA8 - map_events ScorchedSlab_MapObjects, ScorchedSlab_MapWarps, 0x0, 0x0 + map_events ScorchedSlab_EventObjects, ScorchedSlab_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Entrance.inc b/data/maps/events/SeafloorCavern_Entrance.inc index 3a41757e2..1118c0ab3 100644 --- a/data/maps/events/SeafloorCavern_Entrance.inc +++ b/data/maps/events/SeafloorCavern_Entrance.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Entrance_MapObjects: @ 85356BC - object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941, 0, 0 +SeafloorCavern_Entrance_EventObjects: @ 85356BC + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SeafloorCavern_Entrance_EventScript_234485, 941, 0, 0 SeafloorCavern_Entrance_MapWarps: @ 85356D4 warp_def 10, 18, 3, 0, UNDERWATER_4 warp_def 10, 1, 3, 0, SEAFLOOR_CAVERN_ROOM_1 SeafloorCavern_Entrance_MapEvents:: @ 85356E4 - map_events SeafloorCavern_Entrance_MapObjects, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 + map_events SeafloorCavern_Entrance_EventObjects, SeafloorCavern_Entrance_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SeafloorCavern_Room1.inc b/data/maps/events/SeafloorCavern_Room1.inc index 4a219357c..31fbb7d86 100644 --- a/data/maps/events/SeafloorCavern_Room1.inc +++ b/data/maps/events/SeafloorCavern_Room1.inc @@ -1,9 +1,9 @@ -SeafloorCavern_Room1_MapObjects: @ 85356F8 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 6, 3, 1, 17, 0, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946, 0, 0 - object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 10, 3, 16, 17, 0, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946, 0, 0 +SeafloorCavern_Room1_EventObjects: @ 85356F8 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 17, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2908BA, 18, 0, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 5, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room1_EventScript_2907A6, 19, 0, 0 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 6, 3, 1, 17, 0, 1, 2, SeafloorCavern_Room1_EventScript_2347EC, 946, 0, 0 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 15, 10, 3, 16, 17, 0, 1, 3, SeafloorCavern_Room1_EventScript_234803, 946, 0, 0 SeafloorCavern_Room1_MapWarps: @ 8535770 warp_def 5, 18, 3, 1, SEAFLOOR_CAVERN_ENTRANCE @@ -11,5 +11,5 @@ SeafloorCavern_Room1_MapWarps: @ 8535770 warp_def 6, 2, 3, 0, SEAFLOOR_CAVERN_ROOM_2 SeafloorCavern_Room1_MapEvents:: @ 8535788 - 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 cf0c2dfad..608b45e50 100644 --- a/data/maps/events/SeafloorCavern_Room2.inc +++ b/data/maps/events/SeafloorCavern_Room2.inc @@ -1,12 +1,12 @@ -SeafloorCavern_Room2_MapObjects: @ 853579C - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22, 0, 0 - object_event 6, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24, 0, 0 - object_event 7, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23, 0, 0 +SeafloorCavern_Room2_EventObjects: @ 853579C + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 18, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 10, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 19, 0, 0 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 17, 0, 0 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 21, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 22, 0, 0 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 8, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 24, 0, 0 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 9, 3, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2907A6, 25, 0, 0 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room2_EventScript_2908BA, 23, 0, 0 SeafloorCavern_Room2_MapWarps: @ 853585C warp_def 10, 7, 3, 2, SEAFLOOR_CAVERN_ROOM_1 @@ -15,5 +15,5 @@ SeafloorCavern_Room2_MapWarps: @ 853585C warp_def 11, 1, 3, 0, SEAFLOOR_CAVERN_ROOM_7 SeafloorCavern_Room2_MapEvents:: @ 853587C - 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 964b45a6d..f7c919131 100644 --- a/data/maps/events/SeafloorCavern_Room3.inc +++ b/data/maps/events/SeafloorCavern_Room3.inc @@ -1,13 +1,13 @@ -SeafloorCavern_Room3_MapObjects: @ 8535890 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 9, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25, 0, 0 - object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 9, 5, 3, 9, 17, 0, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946, 0, 0 - object_event 9, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 5, 3, 10, 17, 0, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946, 0, 0 +SeafloorCavern_Room3_EventObjects: @ 8535890 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 18, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 10, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 20, 0, 0 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 9, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 21, 0, 0 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 22, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 23, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 24, 0, 0 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room3_EventScript_2908BA, 25, 0, 0 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 9, 5, 3, 9, 17, 0, 1, 6, SeafloorCavern_Room3_EventScript_234938, 946, 0, 0 + object_event 9, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 5, 3, 10, 17, 0, 1, 4, SeafloorCavern_Room3_EventScript_23494F, 946, 0, 0 SeafloorCavern_Room3_MapWarps: @ 8535968 warp_def 8, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_8 @@ -15,5 +15,5 @@ SeafloorCavern_Room3_MapWarps: @ 8535968 warp_def 4, 15, 3, 1, SEAFLOOR_CAVERN_ROOM_6 SeafloorCavern_Room3_MapEvents:: @ 8535980 - 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 79d57dd72..3b7f6f2ee 100644 --- a/data/maps/events/SeafloorCavern_Room4.inc +++ b/data/maps/events/SeafloorCavern_Room4.inc @@ -1,6 +1,6 @@ -SeafloorCavern_Room4_MapObjects: @ 8535994 - object_event 1, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 8, 3, 17, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946, 0, 0 - object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 5, 12, 3, 7, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946, 0, 0 +SeafloorCavern_Room4_EventObjects: @ 8535994 + object_event 1, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 5, 8, 3, 17, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234C9C, 946, 0, 0 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 5, 12, 3, 7, 17, 0, 1, 3, SeafloorCavern_Room4_EventScript_234CB3, 946, 0, 0 SeafloorCavern_Room4_MapWarps: @ 85359C4 warp_def 13, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_2 @@ -9,5 +9,5 @@ SeafloorCavern_Room4_MapWarps: @ 85359C4 warp_def 10, 15, 3, 1, SEAFLOOR_CAVERN_ENTRANCE SeafloorCavern_Room4_MapEvents:: @ 85359E4 - 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 b88a862ab..4fd74a9c7 100644 --- a/data/maps/events/SeafloorCavern_Room5.inc +++ b/data/maps/events/SeafloorCavern_Room5.inc @@ -1,10 +1,10 @@ -SeafloorCavern_Room5_MapObjects: @ 85359F8 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21, 0, 0 - object_event 5, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20, 0, 0 +SeafloorCavern_Room5_EventObjects: @ 85359F8 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 17, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 11, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 18, 0, 0 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 11, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 19, 0, 0 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 3, 13, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 21, 0, 0 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 13, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2907A6, 22, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 12, 8, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room5_EventScript_2908BA, 20, 0, 0 SeafloorCavern_Room5_MapWarps: @ 8535A88 warp_def 4, 1, 3, 1, SEAFLOOR_CAVERN_ROOM_1 @@ -12,5 +12,5 @@ SeafloorCavern_Room5_MapWarps: @ 8535A88 warp_def 7, 17, 3, 2, SEAFLOOR_CAVERN_ROOM_4 SeafloorCavern_Room5_MapEvents:: @ 8535AA0 - 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 7fd65fc08..65a1da014 100644 --- a/data/maps/events/SeafloorCavern_Room8.inc +++ b/data/maps/events/SeafloorCavern_Room8.inc @@ -1,21 +1,21 @@ -SeafloorCavern_Room8_MapObjects: @ 8535B04 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23, 0, 0 - object_event 8, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24, 0, 0 - object_event 9, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25, 0, 0 - object_event 10, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26, 0, 0 - object_event 11, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27, 0, 0 - object_event 12, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28, 0, 0 +SeafloorCavern_Room8_EventObjects: @ 8535B04 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 17, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 18, 0, 0 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 7, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 19, 0, 0 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 20, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 6, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 21, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 22, 0, 0 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 23, 0, 0 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 5, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 24, 0, 0 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 3, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 25, 0, 0 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 26, 0, 0 + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 6, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 27, 0, 0 + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 7, 4, 3, 1, 0, 0, 0, 0, SeafloorCavern_Room8_EventScript_2908BA, 28, 0, 0 SeafloorCavern_Room8_MapWarps: @ 8535C24 warp_def 5, 2, 3, 0, SEAFLOOR_CAVERN_ROOM_9 warp_def 5, 12, 3, 0, SEAFLOOR_CAVERN_ROOM_3 SeafloorCavern_Room8_MapEvents:: @ 8535C34 - 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 bcd27d030..8c203021c 100644 --- a/data/maps/events/SeafloorCavern_Room9.inc +++ b/data/maps/events/SeafloorCavern_Room9.inc @@ -1,11 +1,11 @@ -SeafloorCavern_Room9_MapObjects: @ 8535C48 - object_event 1, MAP_OBJ_GFX_KYOGRE_1, 0, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, 859, 0, 0 - object_event 2, MAP_OBJ_GFX_ARCHIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 828, 0, 0 - object_event 3, MAP_OBJ_GFX_MAXIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 829, 0, 0 - object_event 4, MAP_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0 - object_event 5, MAP_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090, 0, 0 - object_event 7, MAP_OBJ_GFX_KYOGRE_2, 0, 0, 17, 38, 3, 8, 17, 0, 0, 0, 0x0, 733, 0, 0 +SeafloorCavern_Room9_EventObjects: @ 8535C48 + object_event 1, EVENT_OBJ_GFX_KYOGRE_1, 0, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, 859, 0, 0 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 828, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAXIE, 0, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, 829, 0, 0 + object_event 4, EVENT_OBJ_GFX_MAGMA_MEMBER_M, 0, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAGMA_MEMBER_F, 0, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, 831, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 14, 5, 3, 1, 17, 0, 0, 0, SeafloorCavern_Room9_EventScript_291401, 1090, 0, 0 + object_event 7, EVENT_OBJ_GFX_KYOGRE_2, 0, 0, 17, 38, 3, 8, 17, 0, 0, 0, 0x0, 733, 0, 0 SeafloorCavern_Room9_MapWarps: @ 8535CF0 warp_def 5, 4, 3, 0, SEAFLOOR_CAVERN_ROOM_8 @@ -14,5 +14,5 @@ SeafloorCavern_Room9_MapCoordEvents: @ 8535CF8 coord_event 17, 42, 3, 0, VAR_0x40A2, 0, 0, SeafloorCavern_Room9_EventScript_234DC9 SeafloorCavern_Room9_MapEvents:: @ 8535D08 - 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 eb92a3851..301779af5 100644 --- a/data/maps/events/SecretBase_BlueCave1.inc +++ b/data/maps/events/SecretBase_BlueCave1.inc @@ -1,11 +1,11 @@ -SecretBase_BlueCave1_MapObjects: @ 8537BEC +SecretBase_BlueCave1_EventObjects: @ 8537BEC object_event 1, 255, 0, 0, 4, 2, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_BlueCave1_MapWarps: @ 8537D54 warp_def 5, 7, 0, 126, NONE SecretBase_BlueCave1_MapEvents:: @ 8537D5C - 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 e2db7471f..f919cfae0 100644 --- a/data/maps/events/SecretBase_BlueCave2.inc +++ b/data/maps/events/SecretBase_BlueCave2.inc @@ -1,11 +1,11 @@ -SecretBase_BlueCave2_MapObjects: @ 8538504 +SecretBase_BlueCave2_EventObjects: @ 8538504 object_event 1, 255, 0, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_BlueCave2_MapWarps: @ 853866C warp_def 7, 5, 0, 126, NONE SecretBase_BlueCave2_MapEvents:: @ 8538674 - 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 cc5606ac4..ba2b28eb1 100644 --- a/data/maps/events/SecretBase_BlueCave3.inc +++ b/data/maps/events/SecretBase_BlueCave3.inc @@ -1,11 +1,11 @@ -SecretBase_BlueCave3_MapObjects: @ 8538E1C +SecretBase_BlueCave3_EventObjects: @ 8538E1C object_event 1, 255, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_BlueCave3_MapWarps: @ 8538F84 warp_def 4, 15, 0, 126, NONE SecretBase_BlueCave3_MapEvents:: @ 8538F8C - 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 0efdf765d..cc79f44be 100644 --- a/data/maps/events/SecretBase_BlueCave4.inc +++ b/data/maps/events/SecretBase_BlueCave4.inc @@ -1,11 +1,11 @@ -SecretBase_BlueCave4_MapObjects: @ 8539734 +SecretBase_BlueCave4_EventObjects: @ 8539734 object_event 1, 255, 0, 0, 5, 13, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_BlueCave4_MapWarps: @ 853989C warp_def 4, 15, 0, 126, NONE SecretBase_BlueCave4_MapEvents:: @ 85398A4 - 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 7755a5a09..e937ac1f4 100644 --- a/data/maps/events/SecretBase_BrownCave1.inc +++ b/data/maps/events/SecretBase_BrownCave1.inc @@ -1,11 +1,11 @@ -SecretBase_BrownCave1_MapObjects: @ 8537A68 +SecretBase_BrownCave1_EventObjects: @ 8537A68 object_event 1, 255, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_BrownCave1_MapWarps: @ 8537BD0 warp_def 5, 7, 0, 126, NONE SecretBase_BrownCave1_MapEvents:: @ 8537BD8 - 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 37a1387bf..d3885cb0d 100644 --- a/data/maps/events/SecretBase_BrownCave2.inc +++ b/data/maps/events/SecretBase_BrownCave2.inc @@ -1,11 +1,11 @@ -SecretBase_BrownCave2_MapObjects: @ 8538380 +SecretBase_BrownCave2_EventObjects: @ 8538380 object_event 1, 255, 0, 0, 11, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_BrownCave2_MapWarps: @ 85384E8 warp_def 1, 7, 0, 126, NONE SecretBase_BrownCave2_MapEvents:: @ 85384F0 - 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 14c9905a2..c0ec35e37 100644 --- a/data/maps/events/SecretBase_BrownCave3.inc +++ b/data/maps/events/SecretBase_BrownCave3.inc @@ -1,11 +1,11 @@ -SecretBase_BrownCave3_MapObjects: @ 8538C98 +SecretBase_BrownCave3_EventObjects: @ 8538C98 object_event 1, 255, 0, 0, 1, 7, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_BrownCave3_MapWarps: @ 8538E00 warp_def 11, 9, 0, 126, NONE SecretBase_BrownCave3_MapEvents:: @ 8538E08 - 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 543cb0072..de9250cbb 100644 --- a/data/maps/events/SecretBase_BrownCave4.inc +++ b/data/maps/events/SecretBase_BrownCave4.inc @@ -1,11 +1,11 @@ -SecretBase_BrownCave4_MapObjects: @ 85395B0 +SecretBase_BrownCave4_EventObjects: @ 85395B0 object_event 1, 255, 0, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_BrownCave4_MapWarps: @ 8539718 warp_def 2, 8, 0, 126, NONE SecretBase_BrownCave4_MapEvents:: @ 8539720 - 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 ebc15ecd7..aa664f45c 100644 --- a/data/maps/events/SecretBase_RedCave1.inc +++ b/data/maps/events/SecretBase_RedCave1.inc @@ -1,11 +1,11 @@ -SecretBase_RedCave1_MapObjects: @ 85378E4 +SecretBase_RedCave1_EventObjects: @ 85378E4 object_event 1, 255, 0, 0, 7, 4, 3, 8, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_RedCave1_MapWarps: @ 8537A4C warp_def 5, 7, 0, 126, NONE SecretBase_RedCave1_MapEvents:: @ 8537A54 - 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 ef7958e9a..956e3b03b 100644 --- a/data/maps/events/SecretBase_RedCave2.inc +++ b/data/maps/events/SecretBase_RedCave2.inc @@ -1,11 +1,11 @@ -SecretBase_RedCave2_MapObjects: @ 85381FC +SecretBase_RedCave2_EventObjects: @ 85381FC object_event 1, 255, 0, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_RedCave2_MapWarps: @ 8538364 warp_def 3, 14, 0, 126, NONE SecretBase_RedCave2_MapEvents:: @ 853836C - 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 65dc43026..dfdbec94c 100644 --- a/data/maps/events/SecretBase_RedCave3.inc +++ b/data/maps/events/SecretBase_RedCave3.inc @@ -1,11 +1,11 @@ -SecretBase_RedCave3_MapObjects: @ 8538B14 +SecretBase_RedCave3_EventObjects: @ 8538B14 object_event 1, 255, 0, 0, 12, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_RedCave3_MapWarps: @ 8538C7C warp_def 3, 6, 0, 126, NONE SecretBase_RedCave3_MapEvents:: @ 8538C84 - 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 274a459cd..b485d0ad9 100644 --- a/data/maps/events/SecretBase_RedCave4.inc +++ b/data/maps/events/SecretBase_RedCave4.inc @@ -1,11 +1,11 @@ -SecretBase_RedCave4_MapObjects: @ 853942C +SecretBase_RedCave4_EventObjects: @ 853942C object_event 1, 255, 0, 0, 5, 8, 3, 8, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_RedCave4_MapWarps: @ 8539594 warp_def 2, 12, 0, 126, NONE SecretBase_RedCave4_MapEvents:: @ 853959C - 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 e20d76bc2..545426eea 100644 --- a/data/maps/events/SecretBase_Shrub1.inc +++ b/data/maps/events/SecretBase_Shrub1.inc @@ -1,11 +1,11 @@ -SecretBase_Shrub1_MapObjects: @ 8538078 +SecretBase_Shrub1_EventObjects: @ 8538078 object_event 1, 255, 0, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_Shrub1_MapWarps: @ 85381E0 warp_def 5, 7, 0, 126, NONE SecretBase_Shrub1_MapEvents:: @ 85381E8 - 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 23d023b31..0adb6b76d 100644 --- a/data/maps/events/SecretBase_Shrub2.inc +++ b/data/maps/events/SecretBase_Shrub2.inc @@ -1,11 +1,11 @@ -SecretBase_Shrub2_MapObjects: @ 8538990 +SecretBase_Shrub2_EventObjects: @ 8538990 object_event 1, 255, 0, 0, 13, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_Shrub2_MapWarps: @ 8538AF8 warp_def 7, 5, 0, 126, NONE SecretBase_Shrub2_MapEvents:: @ 8538B00 - 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 5fe624dc3..b8f4d4ed4 100644 --- a/data/maps/events/SecretBase_Shrub3.inc +++ b/data/maps/events/SecretBase_Shrub3.inc @@ -1,11 +1,11 @@ -SecretBase_Shrub3_MapObjects: @ 85392A8 +SecretBase_Shrub3_EventObjects: @ 85392A8 object_event 1, 255, 0, 0, 5, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_Shrub3_MapWarps: @ 8539410 warp_def 6, 9, 0, 126, NONE SecretBase_Shrub3_MapEvents:: @ 8539418 - 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 ad432f6ff..679b313d5 100644 --- a/data/maps/events/SecretBase_Shrub4.inc +++ b/data/maps/events/SecretBase_Shrub4.inc @@ -1,11 +1,11 @@ -SecretBase_Shrub4_MapObjects: @ 8539BC0 +SecretBase_Shrub4_EventObjects: @ 8539BC0 object_event 1, 255, 0, 0, 9, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_Shrub4_MapWarps: @ 8539D28 warp_def 11, 8, 0, 126, NONE SecretBase_Shrub4_MapEvents:: @ 8539D30 - 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 149d5dea3..402081450 100644 --- a/data/maps/events/SecretBase_Tree1.inc +++ b/data/maps/events/SecretBase_Tree1.inc @@ -1,11 +1,11 @@ -SecretBase_Tree1_MapObjects: @ 8537EF4 +SecretBase_Tree1_EventObjects: @ 8537EF4 object_event 1, 255, 0, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree1_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_Tree1_MapWarps: @ 853805C warp_def 5, 7, 0, 126, NONE SecretBase_Tree1_MapEvents:: @ 8538064 - 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 16037e22f..ddfbf094c 100644 --- a/data/maps/events/SecretBase_Tree2.inc +++ b/data/maps/events/SecretBase_Tree2.inc @@ -1,11 +1,11 @@ -SecretBase_Tree2_MapObjects: @ 853880C +SecretBase_Tree2_EventObjects: @ 853880C object_event 1, 255, 0, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree2_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_Tree2_MapWarps: @ 8538974 warp_def 3, 14, 0, 126, NONE SecretBase_Tree2_MapEvents:: @ 853897C - 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 6fbd60683..a13916bc7 100644 --- a/data/maps/events/SecretBase_Tree3.inc +++ b/data/maps/events/SecretBase_Tree3.inc @@ -1,11 +1,11 @@ -SecretBase_Tree3_MapObjects: @ 8539124 +SecretBase_Tree3_EventObjects: @ 8539124 object_event 1, 255, 0, 0, 1, 2, 3, 8, 0, 0, 0, 0, SecretBase_Tree3_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_Tree3_MapWarps: @ 853928C warp_def 8, 6, 0, 126, NONE SecretBase_Tree3_MapEvents:: @ 8539294 - 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 4032d668a..4511b236c 100644 --- a/data/maps/events/SecretBase_Tree4.inc +++ b/data/maps/events/SecretBase_Tree4.inc @@ -1,11 +1,11 @@ -SecretBase_Tree4_MapObjects: @ 8539A3C +SecretBase_Tree4_EventObjects: @ 8539A3C object_event 1, 255, 0, 0, 10, 9, 3, 8, 0, 0, 0, 0, SecretBase_Tree4_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_Tree4_MapWarps: @ 8539BA4 warp_def 7, 12, 0, 126, NONE SecretBase_Tree4_MapEvents:: @ 8539BAC - 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 7d604b093..6fc02d447 100644 --- a/data/maps/events/SecretBase_YellowCave1.inc +++ b/data/maps/events/SecretBase_YellowCave1.inc @@ -1,11 +1,11 @@ -SecretBase_YellowCave1_MapObjects: @ 8537D70 +SecretBase_YellowCave1_EventObjects: @ 8537D70 object_event 1, 255, 0, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_YellowCave1_MapWarps: @ 8537ED8 warp_def 5, 7, 0, 126, NONE SecretBase_YellowCave1_MapEvents:: @ 8537EE0 - 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 592595aa8..646176740 100644 --- a/data/maps/events/SecretBase_YellowCave2.inc +++ b/data/maps/events/SecretBase_YellowCave2.inc @@ -1,11 +1,11 @@ -SecretBase_YellowCave2_MapObjects: @ 8538688 +SecretBase_YellowCave2_EventObjects: @ 8538688 object_event 1, 255, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_YellowCave2_MapWarps: @ 85387F0 warp_def 12, 7, 0, 126, NONE SecretBase_YellowCave2_MapEvents:: @ 85387F8 - 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 bd1f69b1a..32b71c477 100644 --- a/data/maps/events/SecretBase_YellowCave3.inc +++ b/data/maps/events/SecretBase_YellowCave3.inc @@ -1,11 +1,11 @@ -SecretBase_YellowCave3_MapObjects: @ 8538FA0 +SecretBase_YellowCave3_EventObjects: @ 8538FA0 object_event 1, 255, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_YellowCave3_MapWarps: @ 8539108 warp_def 5, 9, 0, 126, NONE SecretBase_YellowCave3_MapEvents:: @ 8539110 - 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 fe52f12bb..187d0dff9 100644 --- a/data/maps/events/SecretBase_YellowCave4.inc +++ b/data/maps/events/SecretBase_YellowCave4.inc @@ -1,11 +1,11 @@ -SecretBase_YellowCave4_MapObjects: @ 85398B8 +SecretBase_YellowCave4_EventObjects: @ 85398B8 object_event 1, 255, 0, 0, 9, 8, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_275D64, 173, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 - object_event 4, MAP_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 - object_event 5, MAP_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 - object_event 7, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, 174, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, 175, 0, 0 + object_event 4, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, 176, 0, 0 + object_event 5, EVENT_OBJ_GFX_GIDDY, 0, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, 177, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, 178, 0, 0 + object_event 7, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, 179, 0, 0 object_event 8, 246, 0, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, 180, 0, 0 object_event 9, 247, 0, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, 181, 0, 0 object_event 10, 248, 0, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, 182, 0, 0 @@ -19,5 +19,5 @@ SecretBase_YellowCave4_MapWarps: @ 8539A20 warp_def 6, 12, 0, 126, NONE SecretBase_YellowCave4_MapEvents:: @ 8539A28 - 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 b19a293ef..dda65b0fe 100644 --- a/data/maps/events/ShoalCave_LowTideEntranceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideEntranceRoom.inc @@ -1,6 +1,6 @@ -ShoalCave_LowTideEntranceRoom_MapObjects: @ 853627C - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 30, 3, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081, 0, 0 - object_event 2, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 18, 15, 3, 9, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0, 0, 0 +ShoalCave_LowTideEntranceRoom_EventObjects: @ 853627C + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 30, 3, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_2913C0, 1081, 0, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 18, 15, 3, 9, 17, 0, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_236DD9, 0, 0, 0 ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC warp_def 20, 30, 3, 0, ROUTE_125 @@ -9,5 +9,5 @@ ShoalCave_LowTideEntranceRoom_MapWarps: @ 85362AC warp_def 27, 2, 3, 7, SHOAL_CAVE_LOW_TIDE_INNER_ROOM ShoalCave_LowTideEntranceRoom_MapEvents:: @ 85362CC - 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 a02a20864..809fb146c 100644 --- a/data/maps/events/ShoalCave_LowTideIceRoom.inc +++ b/data/maps/events/ShoalCave_LowTideIceRoom.inc @@ -1,10 +1,10 @@ -ShoalCave_LowTideIceRoom_MapObjects: @ 8537100 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112, 0, 0 - object_event 2, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 12, 21, 4, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113, 0, 0 +ShoalCave_LowTideIceRoom_EventObjects: @ 8537100 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 8, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913E7, 1112, 0, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 12, 21, 4, 1, 17, 0, 0, 0, ShoalCave_LowTideIceRoom_EventScript_2913F4, 1113, 0, 0 ShoalCave_LowTideIceRoom_MapWarps: @ 8537130 warp_def 17, 10, 3, 3, SHOAL_CAVE_LOW_TIDE_LOWER_ROOM ShoalCave_LowTideIceRoom_MapEvents:: @ 8537138 - 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 8fe34709b..4d48e1aab 100644 --- a/data/maps/events/ShoalCave_LowTideInnerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideInnerRoom.inc @@ -1,5 +1,5 @@ -ShoalCave_LowTideInnerRoom_MapObjects: @ 85362E0 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 26, 14, 5, 1, 17, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082, 0, 0 +ShoalCave_LowTideInnerRoom_EventObjects: @ 85362E0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 26, 14, 5, 1, 17, 0, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_2913CD, 1082, 0, 0 ShoalCave_LowTideInnerRoom_MapWarps: @ 85362F8 warp_def 34, 29, 3, 1, SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM @@ -20,5 +20,5 @@ ShoalCave_LowTideInnerRoom_MapBGEvents: @ 8536338 bg_event 16, 13, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_23705A ShoalCave_LowTideInnerRoom_MapEvents:: @ 8536380 - 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 384b6570f..d3484961e 100644 --- a/data/maps/events/ShoalCave_LowTideLowerRoom.inc +++ b/data/maps/events/ShoalCave_LowTideLowerRoom.inc @@ -1,6 +1,6 @@ -ShoalCave_LowTideLowerRoom_MapObjects: @ 85363DC - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 25, 3, 3, 1, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17, 0, 0 - object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 11, 4, 3, 2, 17, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0, 0, 0 +ShoalCave_LowTideLowerRoom_EventObjects: @ 85363DC + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 25, 3, 3, 1, 0, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2908BA, 17, 0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 11, 4, 3, 2, 17, 0, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_2371B2, 0, 0, 0 ShoalCave_LowTideLowerRoom_MapWarps: @ 853640C warp_def 7, 2, 3, 3, SHOAL_CAVE_LOW_TIDE_INNER_ROOM @@ -12,5 +12,5 @@ ShoalCave_LowTideLowerRoom_MapBGEvents: @ 853642C bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_237176 ShoalCave_LowTideLowerRoom_MapEvents:: @ 8536438 - 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 6592f68d7..556524f05 100644 --- a/data/maps/events/ShoalCave_LowTideStairsRoom.inc +++ b/data/maps/events/ShoalCave_LowTideStairsRoom.inc @@ -1,5 +1,5 @@ -ShoalCave_LowTideStairsRoom_MapObjects: @ 8536394 - object_event 1, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083, 0, 0 +ShoalCave_LowTideStairsRoom_EventObjects: @ 8536394 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 12, 3, 1, 17, 0, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_2913DA, 1083, 0, 0 ShoalCave_LowTideStairsRoom_MapWarps: @ 85363AC warp_def 3, 12, 3, 1, SHOAL_CAVE_LOW_TIDE_INNER_ROOM @@ -9,5 +9,5 @@ ShoalCave_LowTideStairsRoom_MapBGEvents: @ 85363BC bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_23711A ShoalCave_LowTideStairsRoom_MapEvents:: @ 85363C8 - 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 ad8a393d6..382cafe16 100644 --- a/data/maps/events/SingleBattleColosseum.inc +++ b/data/maps/events/SingleBattleColosseum.inc @@ -1,5 +1,5 @@ -SingleBattleColosseum_MapObjects: @ 8539D44 - object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0, 0, 0 +SingleBattleColosseum_EventObjects: @ 8539D44 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_2774A6, 0, 0, 0 SingleBattleColosseum_MapWarps: @ 8539D5C warp_def 6, 8, 3, 127, NONE @@ -10,5 +10,5 @@ SingleBattleColosseum_MapCoordEvents: @ 8539D6C coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_0827737E SingleBattleColosseum_MapEvents:: @ 8539D8C - 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_Outside.inc b/data/maps/events/SkyPillar_Outside.inc index 70a9c5c21..78991499c 100644 --- a/data/maps/events/SkyPillar_Outside.inc +++ b/data/maps/events/SkyPillar_Outside.inc @@ -1,10 +1,10 @@ -SkyPillar_Outside_MapObjects: @ 853701C - object_event 1, MAP_OBJ_GFX_WALLACE, 0, 0, 13, 7, 3, 8, 17, 0, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855, 0, 0 +SkyPillar_Outside_EventObjects: @ 853701C + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 0, 13, 7, 3, 8, 17, 0, 0, 0, SkyPillar_Outside_EventScript_2393F8, 855, 0, 0 SkyPillar_Outside_MapWarps: @ 8537034 warp_def 17, 13, 3, 1, SKY_PILLAR_ENTRANCE warp_def 14, 5, 0, 0, SKY_PILLAR_1F SkyPillar_Outside_MapEvents:: @ 8537044 - map_events SkyPillar_Outside_MapObjects, SkyPillar_Outside_MapWarps, 0x0, 0x0 + map_events SkyPillar_Outside_EventObjects, SkyPillar_Outside_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SkyPillar_Top.inc b/data/maps/events/SkyPillar_Top.inc index 8abe8401f..792f350b8 100644 --- a/data/maps/events/SkyPillar_Top.inc +++ b/data/maps/events/SkyPillar_Top.inc @@ -1,6 +1,6 @@ -SkyPillar_Top_MapObjects: @ 8537170 - object_event 1, MAP_OBJ_GFX_RAYQUAZA_2, 0, 0, 14, 7, 3, 8, 17, 0, 0, 0, 0x0, 773, 0, 0 - object_event 2, MAP_OBJ_GFX_RAYQUAZA_1, 0, 0, 14, 6, 3, 8, 17, 0, 0, 0, SkyPillar_Top_EventScript_239722, 80, 0, 0 +SkyPillar_Top_EventObjects: @ 8537170 + object_event 1, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 0, 14, 7, 3, 8, 17, 0, 0, 0, 0x0, 773, 0, 0 + object_event 2, EVENT_OBJ_GFX_RAYQUAZA_1, 0, 0, 14, 6, 3, 8, 17, 0, 0, 0, SkyPillar_Top_EventScript_239722, 80, 0, 0 SkyPillar_Top_MapWarps: @ 85371A0 warp_def 16, 14, 3, 1, SKY_PILLAR_5F @@ -9,5 +9,5 @@ SkyPillar_Top_MapCoordEvents: @ 85371A8 coord_event 14, 9, 3, 0, VAR_0x40D7, 0, 0, SkyPillar_Top_EventScript_23979A SkyPillar_Top_MapEvents:: @ 85371B8 - map_events SkyPillar_Top_MapObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0 + map_events SkyPillar_Top_EventObjects, SkyPillar_Top_MapWarps, SkyPillar_Top_MapCoordEvents, 0x0 diff --git a/data/maps/events/SlateportCity.inc b/data/maps/events/SlateportCity.inc index a187aaf1f..c429ae7f5 100644 --- a/data/maps/events/SlateportCity.inc +++ b/data/maps/events/SlateportCity.inc @@ -1,39 +1,39 @@ -SlateportCity_MapObjects: @ 85261CC - object_event 1, MAP_OBJ_GFX_FAT_MAN, 0, 0, 21, 11, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCED9, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_1, 0, 0, 34, 29, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_4, 0, 0, 5, 13, 3, 2, 33, 0, 0, 0, SlateportCity_EventScript_1DCEB8, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882, 0, 0 - object_event 6, MAP_OBJ_GFX_COOK, 0, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_OLD_WOMAN_2, 0, 0, 20, 37, 3, 1, 17, 0, 0, 0, SlateportCity_EventScript_1DCE63, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_GIRL_1, 0, 0, 8, 42, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCE84, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_CAMERAMAN, 0, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835, 0, 0 - object_event 10, MAP_OBJ_GFX_REPORTER_F, 0, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835, 0, 0 - object_event 11, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840, 0, 0 - object_event 12, MAP_OBJ_GFX_SAILOR, 0, 0, 37, 41, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0, 0, 0 - object_event 13, MAP_OBJ_GFX_SAILOR, 0, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0, 0, 0 - object_event 14, MAP_OBJ_GFX_WOMAN_2, 0, 0, 9, 50, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFF7, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_MAN_4, 0, 0, 16, 46, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DD000, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_MANIAC, 0, 0, 8, 24, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFBB, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_WOMAN_7, 0, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0, 0, 0 - object_event 18, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882, 0, 0 - object_event 19, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882, 0, 0 - object_event 20, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0, 0, 0 - object_event 22, MAP_OBJ_GFX_MAN_6, 0, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0, 0, 0 - object_event 23, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0, 0, 0 - object_event 24, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 11, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DD1D8, 948, 0, 0 - object_event 25, MAP_OBJ_GFX_MAN_3, 0, 0, 5, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DCDBD, 0, 0, 0 - object_event 26, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 22, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD04E, 882, 0, 0 - object_event 27, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD065, 882, 0, 0 - object_event 28, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 24, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD07C, 882, 0, 0 - object_event 29, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD093, 882, 0, 0 - object_event 30, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD0AA, 882, 0, 0 - object_event 31, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD0C1, 882, 0, 0 - object_event 32, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD14A, 882, 0, 0 - object_event 33, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD153, 882, 0, 0 - object_event 34, MAP_OBJ_GFX_WOMAN_2, 0, 0, 11, 37, 3, 9, 33, 0, 0, 0, SlateportCity_EventScript_1DD36E, 0, 0, 0 - object_event 35, MAP_OBJ_GFX_SCOTT, 0, 0, 10, 12, 0, 8, 33, 0, 0, 0, 0x0, 749, 0, 0 +SlateportCity_EventObjects: @ 85261CC + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 21, 11, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCED9, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 0, 34, 29, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCEF6, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 0, 5, 13, 3, 2, 33, 0, 0, 0, SlateportCity_EventScript_1DCEB8, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCF17, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD009, 882, 0, 0 + object_event 6, EVENT_OBJ_GFX_COOK, 0, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCE42, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 0, 20, 37, 3, 1, 17, 0, 0, 0, SlateportCity_EventScript_1DCE63, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 0, 8, 42, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DCE84, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_1DD353, 835, 0, 0 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_1DD35C, 835, 0, 0 + object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD1F8, 840, 0, 0 + object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 0, 37, 41, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DCFE5, 0, 0, 0 + object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_1DCFEE, 0, 0, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 9, 50, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFF7, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 0, 16, 46, 3, 2, 17, 0, 0, 0, SlateportCity_EventScript_1DD000, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_MANIAC, 0, 0, 8, 24, 3, 3, 16, 0, 0, 0, SlateportCity_EventScript_1DCFBB, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_1DCFDC, 0, 0, 0 + object_event 18, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD020, 882, 0, 0 + object_event 19, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD037, 882, 0, 0 + object_event 20, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_1DD198, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD16A, 0, 0, 0 + object_event 22, EVENT_OBJ_GFX_MAN_6, 0, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DD365, 0, 0, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_1DCDE4, 0, 0, 0 + object_event 24, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 11, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DD1D8, 948, 0, 0 + object_event 25, EVENT_OBJ_GFX_MAN_3, 0, 0, 5, 47, 3, 8, 17, 0, 0, 0, SlateportCity_EventScript_1DCDBD, 0, 0, 0 + object_event 26, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 22, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD04E, 882, 0, 0 + object_event 27, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 23, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD065, 882, 0, 0 + object_event 28, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 24, 27, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD07C, 882, 0, 0 + object_event 29, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 21, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD093, 882, 0, 0 + object_event 30, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 20, 26, 3, 10, 17, 0, 0, 0, SlateportCity_EventScript_1DD0AA, 882, 0, 0 + object_event 31, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 26, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD0C1, 882, 0, 0 + object_event 32, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 28, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD14A, 882, 0, 0 + object_event 33, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 25, 27, 3, 7, 17, 0, 0, 0, SlateportCity_EventScript_1DD153, 882, 0, 0 + object_event 34, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 11, 37, 3, 9, 33, 0, 0, 0, SlateportCity_EventScript_1DD36E, 0, 0, 0 + object_event 35, EVENT_OBJ_GFX_SCOTT, 0, 0, 10, 12, 0, 8, 33, 0, 0, 0, 0x0, 749, 0, 0 SlateportCity_MapWarps: @ 8526514 warp_def 19, 19, 0, 0, SLATEPORT_CITY_POKEMON_CENTER_1F @@ -67,5 +67,5 @@ SlateportCity_MapBGEvents: @ 852657C bg_event 10, 36, 0, 1, 0, SlateportCity_EventScript_1DD643 SlateportCity_MapEvents:: @ 8526618 - map_events SlateportCity_MapObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents + map_events SlateportCity_EventObjects, SlateportCity_MapWarps, SlateportCity_MapCoordEvents, SlateportCity_MapBGEvents diff --git a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc b/data/maps/events/SlateportCity_BattleTentBattleRoom.inc index 8c13a223a..f22969d2a 100644 --- a/data/maps/events/SlateportCity_BattleTentBattleRoom.inc +++ b/data/maps/events/SlateportCity_BattleTentBattleRoom.inc @@ -1,8 +1,8 @@ -SlateportCity_BattleTentBattleRoom_MapObjects: @ 852F4DC - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 +SlateportCity_BattleTentBattleRoom_EventObjects: @ 852F4DC + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 1, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 5, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TRADER, 0, 0, 4, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 SlateportCity_BattleTentBattleRoom_MapEvents:: @ 852F524 - map_events SlateportCity_BattleTentBattleRoom_MapObjects, 0x0, 0x0, 0x0 + map_events SlateportCity_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_BattleTentCorridor.inc b/data/maps/events/SlateportCity_BattleTentCorridor.inc index acd0f732c..6b45c8e26 100644 --- a/data/maps/events/SlateportCity_BattleTentCorridor.inc +++ b/data/maps/events/SlateportCity_BattleTentCorridor.inc @@ -1,6 +1,6 @@ -SlateportCity_BattleTentCorridor_MapObjects: @ 852F4B0 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 +SlateportCity_BattleTentCorridor_EventObjects: @ 852F4B0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 SlateportCity_BattleTentCorridor_MapEvents:: @ 852F4C8 - map_events SlateportCity_BattleTentCorridor_MapObjects, 0x0, 0x0, 0x0 + map_events SlateportCity_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/SlateportCity_BattleTentLobby.inc b/data/maps/events/SlateportCity_BattleTentLobby.inc index 7b0f10331..3368d1ba2 100644 --- a/data/maps/events/SlateportCity_BattleTentLobby.inc +++ b/data/maps/events/SlateportCity_BattleTentLobby.inc @@ -1,9 +1,9 @@ -SlateportCity_BattleTentLobby_MapObjects: @ 852F408 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 1, 5, 3, 2, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 3, 7, 3, 7, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_1, 0, 0, 1, 8, 3, 1, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 0, 11, 8, 3, 9, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0, 0, 0 +SlateportCity_BattleTentLobby_EventObjects: @ 852F408 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_2088AA, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 1, 5, 3, 2, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A3D, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 3, 7, 3, 7, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A7E, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 0, 1, 8, 3, 1, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A87, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 11, 8, 3, 9, 17, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A90, 0, 0, 0 SlateportCity_BattleTentLobby_MapWarps: @ 852F480 warp_def 6, 9, 0, 3, SLATEPORT_CITY @@ -13,5 +13,5 @@ SlateportCity_BattleTentLobby_MapBGEvents: @ 852F490 bg_event 4, 5, 0, 0, 0, SlateportCity_BattleTentLobby_EventScript_208A99 SlateportCity_BattleTentLobby_MapEvents:: @ 852F49C - map_events SlateportCity_BattleTentLobby_MapObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents + map_events SlateportCity_BattleTentLobby_EventObjects, SlateportCity_BattleTentLobby_MapWarps, 0x0, SlateportCity_BattleTentLobby_MapBGEvents diff --git a/data/maps/events/SlateportCity_Harbor.inc b/data/maps/events/SlateportCity_Harbor.inc index 307cfd1c2..b7a767f3c 100644 --- a/data/maps/events/SlateportCity_Harbor.inc +++ b/data/maps/events/SlateportCity_Harbor.inc @@ -1,12 +1,12 @@ -SlateportCity_Harbor_MapObjects: @ 852FA68 - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905, 0, 0 - object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905, 0, 0 - object_event 3, MAP_OBJ_GFX_FAT_MAN, 0, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905, 0, 0 - object_event 4, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841, 0, 0 - object_event 5, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 860, 0, 0 - object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, 845, 0, 0 - object_event 7, MAP_OBJ_GFX_ARCHIE, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, 846, 0, 0 - object_event 8, MAP_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, 848, 0, 0 +SlateportCity_Harbor_EventObjects: @ 852FA68 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CAF1, 905, 0, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC52, 905, 0, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CC99, 905, 0, 0 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_20CCA2, 841, 0, 0 + object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, 860, 0, 0 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, 845, 0, 0 + object_event 7, EVENT_OBJ_GFX_ARCHIE, 0, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, 846, 0, 0 + object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, 848, 0, 0 SlateportCity_Harbor_MapWarps: @ 852FB28 warp_def 11, 14, 0, 8, SLATEPORT_CITY @@ -21,5 +21,5 @@ SlateportCity_Harbor_MapCoordEvents: @ 852FB48 coord_event 8, 14, 3, 0, VAR_0x40A0, 1, 0, SlateportCity_Harbor_EventScript_20C9DF SlateportCity_Harbor_MapEvents:: @ 852FB88 - 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 d5151a0a1..96bf5fba9 100644 --- a/data/maps/events/SlateportCity_House1.inc +++ b/data/maps/events/SlateportCity_House1.inc @@ -1,10 +1,10 @@ -SlateportCity_House1_MapObjects: @ 852F538 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0, 0, 0 +SlateportCity_House1_EventObjects: @ 852F538 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_209AA5, 0, 0, 0 SlateportCity_House1_MapWarps: @ 852F550 warp_def 3, 7, 0, 6, SLATEPORT_CITY warp_def 4, 7, 0, 6, SLATEPORT_CITY SlateportCity_House1_MapEvents:: @ 852F560 - 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 f77f34456..4bd43a5d4 100644 --- a/data/maps/events/SlateportCity_House2.inc +++ b/data/maps/events/SlateportCity_House2.inc @@ -1,11 +1,11 @@ -SlateportCity_House2_MapObjects: @ 852FB9C - object_event 1, MAP_OBJ_GFX_MAN_3, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0, 0, 0 +SlateportCity_House2_EventObjects: @ 852FB9C + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9AF, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_20D9B8, 0, 0, 0 SlateportCity_House2_MapWarps: @ 852FBCC warp_def 3, 7, 0, 10, SLATEPORT_CITY warp_def 4, 7, 0, 10, SLATEPORT_CITY SlateportCity_House2_MapEvents:: @ 852FBDC - 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 bab6768de..c952cf34e 100644 --- a/data/maps/events/SlateportCity_Mart.inc +++ b/data/maps/events/SlateportCity_Mart.inc @@ -1,12 +1,12 @@ -SlateportCity_Mart_MapObjects: @ 852FCF0 - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0, 0, 0 +SlateportCity_Mart_EventObjects: @ 852FCF0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC49, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC76, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_20DC7F, 0, 0, 0 SlateportCity_Mart_MapWarps: @ 852FD38 warp_def 3, 7, 0, 1, SLATEPORT_CITY warp_def 4, 7, 0, 1, SLATEPORT_CITY SlateportCity_Mart_MapEvents:: @ 852FD48 - 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 1ae29ed6f..9f97d892d 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: @ 852F670 - object_event 1, MAP_OBJ_GFX_BEAUTY, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 18, 5, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883, 0, 0 - object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 12, 2, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883, 0, 0 - object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 2, 8, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883, 0, 0 - object_event 5, MAP_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883, 0, 0 - object_event 6, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 4, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883, 0, 0 - object_event 7, MAP_OBJ_GFX_BEAUTY, 0, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 3, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883, 0, 0 - object_event 9, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 2, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961, 0, 0 - object_event 10, MAP_OBJ_GFX_MANIAC, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961, 0, 0 - object_event 11, MAP_OBJ_GFX_MAN_3, 0, 0, 17, 7, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961, 0, 0 - object_event 12, MAP_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 18, 8, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961, 0, 0 - object_event 13, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 4, 3, 21, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965, 0, 0 - object_event 14, MAP_OBJ_GFX_REPORTER_M, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961, 0, 0 +SlateportCity_OceanicMuseum_1F_EventObjects: @ 852F670 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 18, 5, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE5F, 883, 0, 0 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 12, 2, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE68, 883, 0, 0 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 2, 8, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE56, 883, 0, 0 + object_event 5, EVENT_OBJ_GFX_AQUA_MEMBER_F, 0, 0, 3, 4, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE4D, 883, 0, 0 + object_event 6, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 14, 4, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE71, 883, 0, 0 + object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AD96, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 8, 3, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AE7A, 883, 0, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 2, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AED4, 961, 0, 0 + object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 0, 10, 2, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEDD, 961, 0, 0 + object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 0, 17, 7, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEE6, 961, 0, 0 + object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 0, 18, 8, 3, 7, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEEF, 961, 0, 0 + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 9, 4, 3, 21, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AEF8, 965, 0, 0 + object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 0, 7, 4, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_28C883, 961, 0, 0 SlateportCity_OceanicMuseum_1F_MapWarps: @ 852F7C0 warp_def 9, 8, 0, 5, SLATEPORT_CITY @@ -39,5 +39,5 @@ SlateportCity_OceanicMuseum_1F_MapBGEvents: @ 852F7F8 bg_event 17, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_20AECB SlateportCity_OceanicMuseum_1F_MapEvents:: @ 852F894 - 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 5c3f7108d..4bad8a43d 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: @ 852F8A8 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 6, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887, 0, 0 - object_event 2, MAP_OBJ_GFX_ARCHIE, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 886, 0, 0 - object_event 3, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 884, 0, 0 - object_event 4, MAP_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 885, 0, 0 - object_event 5, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 12, 7, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 0, 9, 6, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961, 0, 0 - object_event 7, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961, 0, 0 +SlateportCity_OceanicMuseum_2F_EventObjects: @ 852F8A8 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 13, 6, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BB00, 887, 0, 0 + object_event 2, EVENT_OBJ_GFX_ARCHIE, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 886, 0, 0 + object_event 3, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 884, 0, 0 + object_event 4, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, 885, 0, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 12, 7, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD64, 961, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 9, 6, 3, 1, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD6D, 961, 0, 0 + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 1, 3, 3, 10, 17, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD76, 961, 0, 0 SlateportCity_OceanicMuseum_2F_MapWarps: @ 852F950 warp_def 6, 1, 0, 2, SLATEPORT_CITY_OCEANIC_MUSEUM_1F @@ -34,5 +34,5 @@ SlateportCity_OceanicMuseum_2F_MapBGEvents: @ 852F958 bg_event 4, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_20BD40 SlateportCity_OceanicMuseum_2F_MapEvents:: @ 852FA54 - 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 52f406b71..4a6335695 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: @ 852FBF0 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0, 0, 0 +SlateportCity_PokemonCenter_1F_EventObjects: @ 852FBF0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAD3, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAE1, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_20DAEA, 0, 0, 0 SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38 warp_def 7, 8, 3, 0, SLATEPORT_CITY @@ -9,5 +9,5 @@ SlateportCity_PokemonCenter_1F_MapWarps: @ 852FC38 warp_def 1, 6, 4, 0, SLATEPORT_CITY_POKEMON_CENTER_2F SlateportCity_PokemonCenter_1F_MapEvents:: @ 852FC50 - 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 cd9f74d39..43938e550 100644 --- a/data/maps/events/SlateportCity_PokemonCenter_2F.inc +++ b/data/maps/events/SlateportCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -SlateportCity_PokemonCenter_2F_MapObjects: @ 852FC64 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +SlateportCity_PokemonCenter_2F_EventObjects: @ 852FC64 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4 warp_def 1, 6, 4, 2, SLATEPORT_CITY_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ SlateportCity_PokemonCenter_2F_MapWarps: @ 852FCC4 warp_def 9, 1, 3, 0, TRADE_CENTER SlateportCity_PokemonCenter_2F_MapEvents:: @ 852FCDC - 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 ba18519ef..db5a8b97c 100644 --- a/data/maps/events/SlateportCity_PokemonFanClub.inc +++ b/data/maps/events/SlateportCity_PokemonFanClub.inc @@ -1,18 +1,18 @@ -SlateportCity_PokemonFanClub_MapObjects: @ 852F574 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 1, 5, 0, 3, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_REPORTER_F, 0, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_5, 0, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_ZIGZAGOON_2, 0, 0, 3, 9, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_SKITTY, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_AZUMARILL, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_5, 0, 0, 11, 8, 0, 9, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0, 0, 0 +SlateportCity_PokemonFanClub_EventObjects: @ 852F574 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1E8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 1, 5, 0, 3, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1F1, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_28C943, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A17E, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_209E96, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 0, 3, 9, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A20D, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 0, 8, 3, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A1FA, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 10, 8, 3, 1, 17, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_20A220, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAN_5, 0, 0, 11, 8, 0, 9, 16, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_2C7F16, 0, 0, 0 SlateportCity_PokemonFanClub_MapWarps: @ 852F64C warp_def 6, 10, 0, 4, SLATEPORT_CITY warp_def 7, 10, 0, 4, SLATEPORT_CITY SlateportCity_PokemonFanClub_MapEvents:: @ 852F65C - 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 07e93e516..6169dad1b 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: @ 852F318 - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 5, 5, 3, 8, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 18, 8, 3, 5, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 11, 3, 2, 33, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869, 0, 0 +SlateportCity_SternsShipyard_1F_EventObjects: @ 852F318 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 5, 5, 3, 8, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207F40, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FED, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 18, 8, 3, 5, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FF6, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 11, 3, 2, 33, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_207FFF, 869, 0, 0 SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378 warp_def 2, 14, 0, 2, SLATEPORT_CITY @@ -10,5 +10,5 @@ SlateportCity_SternsShipyard_1F_MapWarps: @ 852F378 warp_def 3, 1, 0, 0, SLATEPORT_CITY_STERNS_SHIPYARD_2F SlateportCity_SternsShipyard_1F_MapEvents:: @ 852F390 - 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 d43e45568..8224ed8ff 100644 --- a/data/maps/events/SlateportCity_SternsShipyard_2F.inc +++ b/data/maps/events/SlateportCity_SternsShipyard_2F.inc @@ -1,11 +1,11 @@ -SlateportCity_SternsShipyard_2F_MapObjects: @ 852F3A4 - object_event 1, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0, 0, 0 +SlateportCity_SternsShipyard_2F_EventObjects: @ 852F3A4 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 8, 4, 3, 10, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_20863E, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_208647, 0, 0, 0 SlateportCity_SternsShipyard_2F_MapWarps: @ 852F3EC warp_def 3, 1, 0, 2, SLATEPORT_CITY_STERNS_SHIPYARD_1F SlateportCity_SternsShipyard_2F_MapEvents:: @ 852F3F4 - 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 6f3bb0111..acb70f285 100644 --- a/data/maps/events/SootopolisCity.inc +++ b/data/maps/events/SootopolisCity.inc @@ -1,22 +1,22 @@ -SootopolisCity_MapObjects: @ 8527314 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 31, 18, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 47, 33, 0, 9, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854, 0, 0 - object_event 3, MAP_OBJ_GFX_GIRL_2, 0, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_BOY_1, 0, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BOY_1, 0, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_MAN_1, 0, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839, 0, 0 - object_event 7, MAP_OBJ_GFX_STEVEN, 0, 0, 20, 36, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6166, 973, 0, 0 - object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 49, 34, 3, 3, 17, 0, 0, 0, SootopolisCity_EventScript_1E6038, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_GROUDON_3, 0, 0, 28, 44, 0, 80, 17, 0, 0, 0, 0x0, 998, 0, 0 - object_event 10, MAP_OBJ_GFX_KYOGRE_3, 0, 0, 34, 44, 1, 79, 17, 0, 0, 0, 0x0, 997, 0, 0 - object_event 11, MAP_OBJ_GFX_RAYQUAZA_2, 0, 0, 31, 41, 1, 10, 17, 0, 0, 0, 0x0, 996, 0, 0 - object_event 12, MAP_OBJ_GFX_MANIAC, 0, 0, 17, 44, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6411, 854, 0, 0 - object_event 13, MAP_OBJ_GFX_GIRL_3, 0, 0, 14, 42, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E63DB, 854, 0, 0 - object_event 14, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 17, 40, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6393, 854, 0, 0 - object_event 15, MAP_OBJ_GFX_BOY_2, 0, 0, 19, 37, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E635D, 854, 0, 0 - object_event 16, MAP_OBJ_GFX_MAXIE, 0, 0, 29, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E64F2, 827, 0, 0 - object_event 17, MAP_OBJ_GFX_ARCHIE, 0, 0, 31, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E651F, 826, 0, 0 - object_event 18, MAP_OBJ_GFX_WALLACE, 0, 0, 31, 18, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6446, 816, 0, 0 +SootopolisCity_EventObjects: @ 8527314 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 31, 18, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E5E8D, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 47, 33, 0, 9, 0, 0, 0, 0, SootopolisCity_EventScript_1E5FE2, 854, 0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E5ED8, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_1E608E, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_1E60E3, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_1E6017, 839, 0, 0 + object_event 7, EVENT_OBJ_GFX_STEVEN, 0, 0, 20, 36, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6166, 973, 0, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 49, 34, 3, 3, 17, 0, 0, 0, SootopolisCity_EventScript_1E6038, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_GROUDON_3, 0, 0, 28, 44, 0, 80, 17, 0, 0, 0, 0x0, 998, 0, 0 + object_event 10, EVENT_OBJ_GFX_KYOGRE_3, 0, 0, 34, 44, 1, 79, 17, 0, 0, 0, 0x0, 997, 0, 0 + object_event 11, EVENT_OBJ_GFX_RAYQUAZA_2, 0, 0, 31, 41, 1, 10, 17, 0, 0, 0, 0x0, 996, 0, 0 + object_event 12, EVENT_OBJ_GFX_MANIAC, 0, 0, 17, 44, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6411, 854, 0, 0 + object_event 13, EVENT_OBJ_GFX_GIRL_3, 0, 0, 14, 42, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E63DB, 854, 0, 0 + object_event 14, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 17, 40, 3, 10, 17, 0, 0, 0, SootopolisCity_EventScript_1E6393, 854, 0, 0 + object_event 15, EVENT_OBJ_GFX_BOY_2, 0, 0, 19, 37, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E635D, 854, 0, 0 + object_event 16, EVENT_OBJ_GFX_MAXIE, 0, 0, 29, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E64F2, 827, 0, 0 + object_event 17, EVENT_OBJ_GFX_ARCHIE, 0, 0, 31, 33, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E651F, 826, 0, 0 + object_event 18, EVENT_OBJ_GFX_WALLACE, 0, 0, 31, 18, 3, 8, 17, 0, 0, 0, SootopolisCity_EventScript_1E6446, 816, 0, 0 SootopolisCity_MapWarps: @ 85274C4 warp_def 43, 31, 0, 0, SOOTOPOLIS_CITY_POKEMON_CENTER_1F @@ -42,5 +42,5 @@ SootopolisCity_MapBGEvents: @ 852752C bg_event 41, 37, 0, 0, 0, SootopolisCity_EventScript_1E6154 SootopolisCity_MapEvents:: @ 8527574 - map_events SootopolisCity_MapObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents + map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, 0x0, SootopolisCity_MapBGEvents diff --git a/data/maps/events/SootopolisCity_Gym_1F.inc b/data/maps/events/SootopolisCity_Gym_1F.inc index b348cebcf..60e02f3fb 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: @ 8532FF4 - object_event 1, MAP_OBJ_GFX_JUAN, 0, 0, 8, 2, 0, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_2, 0, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0, 0, 0 +SootopolisCity_Gym_1F_EventObjects: @ 8532FF4 + object_event 1, EVENT_OBJ_GFX_JUAN, 0, 0, 8, 2, 0, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_224F44, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_225040, 0, 0, 0 SootopolisCity_Gym_1F_MapWarps: @ 8533024 warp_def 8, 25, 0, 2, SOOTOPOLIS_CITY @@ -12,5 +12,5 @@ SootopolisCity_Gym_1F_MapBGEvents: @ 853303C bg_event 10, 24, 0, 1, 0, SootopolisCity_Gym_1F_EventScript_22506F SootopolisCity_Gym_1F_MapEvents:: @ 8533054 - 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 9e0dcbadd..1d490490d 100644 --- a/data/maps/events/SootopolisCity_Gym_B1F.inc +++ b/data/maps/events/SootopolisCity_Gym_B1F.inc @@ -1,18 +1,18 @@ -SootopolisCity_Gym_B1F_MapObjects: @ 8533068 - object_event 1, MAP_OBJ_GFX_LASS, 0, 0, 7, 17, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BEAUTY, 0, 0, 9, 19, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BEAUTY, 0, 0, 11, 9, 0, 7, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_BEAUTY, 0, 0, 5, 6, 3, 8, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_2, 0, 0, 7, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_LASS, 0, 0, 4, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0, 0, 0 - object_event 8, MAP_OBJ_GFX_BEAUTY, 0, 0, 9, 7, 3, 8, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_WOMAN_3, 0, 0, 6, 13, 3, 10, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0, 0, 0 - object_event 10, MAP_OBJ_GFX_WOMAN_2, 0, 0, 10, 13, 3, 9, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0, 0, 0 +SootopolisCity_Gym_B1F_EventObjects: @ 8533068 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 0, 7, 17, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225C8B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 0, 9, 19, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CD0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 12, 7, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_225CB9, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 0, 11, 9, 0, 7, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_225CE7, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 0, 5, 6, 3, 8, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_225D15, 0, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 7, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225D2C, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 0, 4, 8, 3, 10, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_225CA2, 0, 0, 0 + object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 0, 9, 7, 3, 8, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225CFE, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 6, 13, 3, 10, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D5A, 0, 0, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 10, 13, 3, 9, 17, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_225D43, 0, 0, 0 SootopolisCity_Gym_B1F_MapWarps: @ 8533158 warp_def 11, 22, 3, 2, SOOTOPOLIS_CITY_GYM_1F SootopolisCity_Gym_B1F_MapEvents:: @ 8533160 - 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 b7eb626e0..eaaf2d334 100644 --- a/data/maps/events/SootopolisCity_House1.inc +++ b/data/maps/events/SootopolisCity_House1.inc @@ -1,11 +1,11 @@ -SootopolisCity_House1_MapObjects: @ 85332F8 - object_event 1, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_KECLEON_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0, 0, 0 +SootopolisCity_House1_EventObjects: @ 85332F8 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22694D, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_22698E, 0, 0, 0 SootopolisCity_House1_MapWarps: @ 8533328 warp_def 3, 6, 0, 4, SOOTOPOLIS_CITY warp_def 4, 6, 0, 4, SOOTOPOLIS_CITY SootopolisCity_House1_MapEvents:: @ 8533338 - 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 98b1b6712..d00a1fa5f 100644 --- a/data/maps/events/SootopolisCity_House2.inc +++ b/data/maps/events/SootopolisCity_House2.inc @@ -1,10 +1,10 @@ -SootopolisCity_House2_MapObjects: @ 853334C - object_event 1, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0, 0, 0 +SootopolisCity_House2_EventObjects: @ 853334C + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_226A77, 0, 0, 0 SootopolisCity_House2_MapWarps: @ 8533364 warp_def 3, 6, 0, 5, SOOTOPOLIS_CITY warp_def 4, 6, 0, 5, SOOTOPOLIS_CITY SootopolisCity_House2_MapEvents:: @ 8533374 - 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 eaf48fd6e..b6407478c 100644 --- a/data/maps/events/SootopolisCity_House3.inc +++ b/data/maps/events/SootopolisCity_House3.inc @@ -1,11 +1,11 @@ -SootopolisCity_House3_MapObjects: @ 8533388 - object_event 1, MAP_OBJ_GFX_WOMAN_5, 0, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_2, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0, 0, 0 +SootopolisCity_House3_EventObjects: @ 8533388 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_226B72, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 0, 6, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House3_EventScript_226B9B, 0, 0, 0 SootopolisCity_House3_MapWarps: @ 85333B8 warp_def 3, 6, 0, 6, SOOTOPOLIS_CITY warp_def 4, 6, 0, 6, SOOTOPOLIS_CITY SootopolisCity_House3_MapEvents:: @ 85333C8 - 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 eb41cbafb..223cc4f0d 100644 --- a/data/maps/events/SootopolisCity_House4.inc +++ b/data/maps/events/SootopolisCity_House4.inc @@ -1,12 +1,12 @@ -SootopolisCity_House4_MapObjects: @ 85333DC - object_event 1, MAP_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_5, 0, 0, 5, 2, 3, 7, 33, 0, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_AZUMARILL, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, SootopolisCity_House4_EventScript_226D28, 0, 0, 0 +SootopolisCity_House4_EventObjects: @ 85333DC + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_226D16, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 0, 5, 2, 3, 7, 33, 0, 0, 0, SootopolisCity_House4_EventScript_226D1F, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 0, 2, 3, 3, 1, 17, 0, 0, 0, SootopolisCity_House4_EventScript_226D28, 0, 0, 0 SootopolisCity_House4_MapWarps: @ 8533424 warp_def 3, 6, 0, 7, SOOTOPOLIS_CITY warp_def 4, 6, 0, 7, SOOTOPOLIS_CITY SootopolisCity_House4_MapEvents:: @ 8533434 - 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 5bffec912..66a804c1a 100644 --- a/data/maps/events/SootopolisCity_House5.inc +++ b/data/maps/events/SootopolisCity_House5.inc @@ -1,11 +1,11 @@ -SootopolisCity_House5_MapObjects: @ 8533448 - object_event 1, MAP_OBJ_GFX_MANIAC, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_3, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0, 0, 0 +SootopolisCity_House5_EventObjects: @ 8533448 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E94, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_226E9D, 0, 0, 0 SootopolisCity_House5_MapWarps: @ 8533478 warp_def 3, 6, 0, 8, SOOTOPOLIS_CITY warp_def 4, 6, 0, 8, SOOTOPOLIS_CITY SootopolisCity_House5_MapEvents:: @ 8533488 - 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 5f0f5d430..2c27b4ef2 100644 --- a/data/maps/events/SootopolisCity_House6.inc +++ b/data/maps/events/SootopolisCity_House6.inc @@ -1,10 +1,10 @@ -SootopolisCity_House6_MapObjects: @ 853349C - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 4, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0, 0, 0 +SootopolisCity_House6_EventObjects: @ 853349C + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 4, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_House6_EventScript_226F5C, 0, 0, 0 SootopolisCity_House6_MapWarps: @ 85334B4 warp_def 3, 6, 0, 9, SOOTOPOLIS_CITY warp_def 4, 6, 0, 9, SOOTOPOLIS_CITY SootopolisCity_House6_MapEvents:: @ 85334C4 - 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 3a18508a2..fbbbc5579 100644 --- a/data/maps/events/SootopolisCity_House7.inc +++ b/data/maps/events/SootopolisCity_House7.inc @@ -1,11 +1,11 @@ -SootopolisCity_House7_MapObjects: @ 85334D8 - object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_2, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0, 0, 0 +SootopolisCity_House7_EventObjects: @ 85334D8 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 5, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House7_EventScript_2270CC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_House7_EventScript_2270D5, 0, 0, 0 SootopolisCity_House7_MapWarps: @ 8533508 warp_def 3, 6, 0, 10, SOOTOPOLIS_CITY warp_def 4, 6, 0, 10, SOOTOPOLIS_CITY SootopolisCity_House7_MapEvents:: @ 8533518 - 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_LotadAndSeedotHouse.inc b/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc index 0dcb79d1b..ffd6fe203 100644 --- a/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc +++ b/data/maps/events/SootopolisCity_LotadAndSeedotHouse.inc @@ -1,6 +1,6 @@ -SootopolisCity_LotadAndSeedotHouse_MapObjects: @ 853352C - object_event 1, MAP_OBJ_GFX_FISHERMAN, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIKER, 0, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0, 0, 0 +SootopolisCity_LotadAndSeedotHouse_EventObjects: @ 853352C + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22722B, 0, 0, 0 SootopolisCity_LotadAndSeedotHouse_MapWarps: @ 853355C warp_def 3, 6, 0, 11, SOOTOPOLIS_CITY @@ -11,5 +11,5 @@ SootopolisCity_LotadAndSeedotHouse_MapBGEvents: @ 853356C bg_event 2, 1, 0, 0, 0, SootopolisCity_LotadAndSeedotHouse_EventScript_22735B SootopolisCity_LotadAndSeedotHouse_MapEvents:: @ 8533584 - map_events SootopolisCity_LotadAndSeedotHouse_MapObjects, SootopolisCity_LotadAndSeedotHouse_MapWarps, 0x0, SootopolisCity_LotadAndSeedotHouse_MapBGEvents + map_events SootopolisCity_LotadAndSeedotHouse_EventObjects, SootopolisCity_LotadAndSeedotHouse_MapWarps, 0x0, SootopolisCity_LotadAndSeedotHouse_MapBGEvents diff --git a/data/maps/events/SootopolisCity_Mart.inc b/data/maps/events/SootopolisCity_Mart.inc index de29f556b..30ff85620 100644 --- a/data/maps/events/SootopolisCity_Mart.inc +++ b/data/maps/events/SootopolisCity_Mart.inc @@ -1,12 +1,12 @@ -SootopolisCity_Mart_MapObjects: @ 853328C - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_FAT_MAN, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0, 0, 0 +SootopolisCity_Mart_EventObjects: @ 853328C + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_226795, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267C2, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_2267EC, 0, 0, 0 SootopolisCity_Mart_MapWarps: @ 85332D4 warp_def 3, 7, 0, 1, SOOTOPOLIS_CITY warp_def 4, 7, 0, 1, SOOTOPOLIS_CITY SootopolisCity_Mart_MapEvents:: @ 85332E4 - 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_MysteryEventsHouse_1F.inc b/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc index 69865a2aa..f6efd8225 100644 --- a/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc +++ b/data/maps/events/SootopolisCity_MysteryEventsHouse_1F.inc @@ -1,5 +1,5 @@ -SootopolisCity_MysteryEventsHouse_1F_MapObjects: @ 8533598 - object_event 1, MAP_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 4, 0, 10, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0, 0, 0 +SootopolisCity_MysteryEventsHouse_1F_EventObjects: @ 8533598 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 0, 6, 4, 0, 10, 0, 0, 0, 0, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24, 0, 0, 0 SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0 warp_def 3, 7, 0, 12, SOOTOPOLIS_CITY @@ -7,5 +7,5 @@ SootopolisCity_MysteryEventsHouse_1F_MapWarps: @ 85335B0 warp_def 3, 1, 3, 0, SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F SootopolisCity_MysteryEventsHouse_1F_MapEvents:: @ 85335C8 - map_events SootopolisCity_MysteryEventsHouse_1F_MapObjects, SootopolisCity_MysteryEventsHouse_1F_MapWarps, 0x0, 0x0 + map_events SootopolisCity_MysteryEventsHouse_1F_EventObjects, SootopolisCity_MysteryEventsHouse_1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc index 2a02e72f2..faec348c2 100644 --- a/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/maps/events/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -1,9 +1,9 @@ -SootopolisCity_MysteryEventsHouse_B1F_MapObjects: @ 85335DC - object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 +SootopolisCity_MysteryEventsHouse_B1F_EventObjects: @ 85335DC + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 6, 5, 0, 9, 17, 0, 0, 0, 0x0, 0, 0, 0 SootopolisCity_MysteryEventsHouse_B1F_MapWarps: @ 85335F4 warp_def 3, 1, 0, 2, SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F SootopolisCity_MysteryEventsHouse_B1F_MapEvents:: @ 85335FC - map_events SootopolisCity_MysteryEventsHouse_B1F_MapObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0 + map_events SootopolisCity_MysteryEventsHouse_B1F_EventObjects, SootopolisCity_MysteryEventsHouse_B1F_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc index 669ce88ae..afb2d586b 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_1F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ -SootopolisCity_PokemonCenter_1F_MapObjects: @ 8533174 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 12, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 7, 3, 5, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_1, 0, 0, 2, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0, 0, 0 +SootopolisCity_PokemonCenter_1F_EventObjects: @ 8533174 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226500, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 12, 4, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_22650E, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 7, 3, 5, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_226538, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 0, 2, 3, 3, 2, 17, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_2C8256, 0, 0, 0 SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4 warp_def 7, 8, 3, 0, SOOTOPOLIS_CITY @@ -10,5 +10,5 @@ SootopolisCity_PokemonCenter_1F_MapWarps: @ 85331D4 warp_def 1, 6, 4, 0, SOOTOPOLIS_CITY_POKEMON_CENTER_2F SootopolisCity_PokemonCenter_1F_MapEvents:: @ 85331EC - 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 d063a7666..21be152fa 100644 --- a/data/maps/events/SootopolisCity_PokemonCenter_2F.inc +++ b/data/maps/events/SootopolisCity_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -SootopolisCity_PokemonCenter_2F_MapObjects: @ 8533200 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +SootopolisCity_PokemonCenter_2F_EventObjects: @ 8533200 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260 warp_def 1, 6, 4, 2, SOOTOPOLIS_CITY_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ SootopolisCity_PokemonCenter_2F_MapWarps: @ 8533260 warp_def 9, 1, 3, 0, TRADE_CENTER SootopolisCity_PokemonCenter_2F_MapEvents:: @ 8533278 - 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 7c6bc4128..11cc35658 100644 --- a/data/maps/events/SouthernIsland_Exterior.inc +++ b/data/maps/events/SouthernIsland_Exterior.inc @@ -1,6 +1,6 @@ -SouthernIsland_Exterior_MapObjects: @ 853B83C - object_event 1, MAP_OBJ_GFX_SAILOR, 0, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_SS_TIDAL, 0, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 +SouthernIsland_Exterior_EventObjects: @ 853B83C + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_2429D2, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0, 0, 0 SouthernIsland_Exterior_MapWarps: @ 853B86C warp_def 14, 5, 3, 0, SOUTHERN_ISLAND_INTERIOR @@ -10,5 +10,5 @@ SouthernIsland_Exterior_MapBGEvents: @ 853B87C bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_242A3C SouthernIsland_Exterior_MapEvents:: @ 853B888 - 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 a304f1832..6a89414b2 100644 --- a/data/maps/events/SouthernIsland_Interior.inc +++ b/data/maps/events/SouthernIsland_Interior.inc @@ -1,6 +1,6 @@ -SouthernIsland_Interior_MapObjects: @ 853B89C - object_event 1, MAP_OBJ_GFX_HIPSTER, 0, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, 910, 0, 0 - object_event 2, MAP_OBJ_GFX_TRADER, 0, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, 911, 0, 0 +SouthernIsland_Interior_EventObjects: @ 853B89C + object_event 1, EVENT_OBJ_GFX_HIPSTER, 0, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, 910, 0, 0 + object_event 2, EVENT_OBJ_GFX_TRADER, 0, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, 911, 0, 0 SouthernIsland_Interior_MapWarps: @ 853B8CC warp_def 13, 18, 3, 0, SOUTHERN_ISLAND_EXTERIOR @@ -10,5 +10,5 @@ SouthernIsland_Interior_MapBGEvents: @ 853B8DC bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_242AC4 SouthernIsland_Interior_MapEvents:: @ 853B8E8 - 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/TerraCave_End.inc b/data/maps/events/TerraCave_End.inc index 0e3c0f0bb..88dbdf09a 100644 --- a/data/maps/events/TerraCave_End.inc +++ b/data/maps/events/TerraCave_End.inc @@ -1,5 +1,5 @@ -TerraCave_End_MapObjects: @ 8537850 - object_event 1, MAP_OBJ_GFX_GROUDON_1, 0, 0, 17, 22, 1, 8, 17, 0, 0, 0, 0x0, 783, 0, 0 +TerraCave_End_EventObjects: @ 8537850 + object_event 1, EVENT_OBJ_GFX_GROUDON_1, 0, 0, 17, 22, 1, 8, 17, 0, 0, 0, 0x0, 783, 0, 0 TerraCave_End_MapWarps: @ 8537868 warp_def 5, 4, 3, 1, TERRA_CAVE_ENTRANCE @@ -8,5 +8,5 @@ TerraCave_End_MapCoordEvents: @ 8537870 coord_event 17, 26, 3, 0, VAR_TEMP_1, 1, 0, TerraCave_End_EventScript_23B0EC TerraCave_End_MapEvents:: @ 8537880 - map_events TerraCave_End_MapObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0 + map_events TerraCave_End_EventObjects, TerraCave_End_MapWarps, TerraCave_End_MapCoordEvents, 0x0 diff --git a/data/maps/events/TradeCenter.inc b/data/maps/events/TradeCenter.inc index dea4f52c3..25dbd3139 100644 --- a/data/maps/events/TradeCenter.inc +++ b/data/maps/events/TradeCenter.inc @@ -1,5 +1,5 @@ -TradeCenter_MapObjects: @ 8539DA0 - object_event 1, MAP_OBJ_GFX_WOMAN_6, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0, 0, 0 +TradeCenter_EventObjects: @ 8539DA0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_2774B6, 0, 0, 0 TradeCenter_MapWarps: @ 8539DB8 warp_def 5, 8, 3, 127, NONE @@ -10,5 +10,5 @@ TradeCenter_MapCoordEvents: @ 8539DC8 coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, gUnknown_082773FF TradeCenter_MapEvents:: @ 8539DE8 - map_events TradeCenter_MapObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 + map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 diff --git a/data/maps/events/TrainerHill_Elevator.inc b/data/maps/events/TrainerHill_Elevator.inc index 873495876..0a84d3b51 100644 --- a/data/maps/events/TrainerHill_Elevator.inc +++ b/data/maps/events/TrainerHill_Elevator.inc @@ -1,10 +1,10 @@ -TrainerHill_Elevator_MapObjects: @ 853DD84 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 0, 6, 3, 8, 17, 0, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0, 0, 0 +TrainerHill_Elevator_EventObjects: @ 853DD84 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 0, 6, 3, 8, 17, 0, 0, 0, TrainerHill_Elevator_EventScript_26935F, 0, 0, 0 TrainerHill_Elevator_MapWarps: @ 853DD9C warp_def 1, 6, 3, 1, TRAINER_HILL_ROOF warp_def 2, 6, 3, 1, TRAINER_HILL_ROOF TrainerHill_Elevator_MapEvents:: @ 853DDAC - map_events TrainerHill_Elevator_MapObjects, TrainerHill_Elevator_MapWarps, 0x0, 0x0 + map_events TrainerHill_Elevator_EventObjects, TrainerHill_Elevator_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/TrainerHill_Entrance.inc b/data/maps/events/TrainerHill_Entrance.inc index a5574755b..832ab5838 100644 --- a/data/maps/events/TrainerHill_Entrance.inc +++ b/data/maps/events/TrainerHill_Entrance.inc @@ -1,9 +1,9 @@ -TrainerHill_Entrance_MapObjects: @ 853D874 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 11, 6, 3, 9, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_NURSE, 0, 0, 4, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 14, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_GIRL_3, 0, 0, 5, 14, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_MAN_4, 0, 0, 14, 15, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_268391, 0, 0, 0 +TrainerHill_Entrance_EventObjects: @ 853D874 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 11, 6, 3, 9, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681FD, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_NURSE, 0, 0, 4, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2681EF, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 14, 9, 3, 8, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683C7, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 0, 5, 14, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_2683AC, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_4, 0, 0, 14, 15, 3, 2, 17, 0, 0, 0, TrainerHill_Entrance_EventScript_268391, 0, 0, 0 TrainerHill_Entrance_MapWarps: @ 853D8EC warp_def 9, 16, 3, 4, ROUTE_111 @@ -17,5 +17,5 @@ TrainerHill_Entrance_MapBGEvents: @ 853D914 bg_event 8, 10, 0, 1, 0, TrainerHill_Entrance_EventScript_268388 TrainerHill_Entrance_MapEvents:: @ 853D920 - map_events TrainerHill_Entrance_MapObjects, TrainerHill_Entrance_MapWarps, TrainerHill_Entrance_MapCoordEvents, TrainerHill_Entrance_MapBGEvents + map_events TrainerHill_Entrance_EventObjects, TrainerHill_Entrance_MapWarps, TrainerHill_Entrance_MapCoordEvents, TrainerHill_Entrance_MapBGEvents diff --git a/data/maps/events/TrainerHill_Roof.inc b/data/maps/events/TrainerHill_Roof.inc index 4f48ef724..1ae00b9a2 100644 --- a/data/maps/events/TrainerHill_Roof.inc +++ b/data/maps/events/TrainerHill_Roof.inc @@ -1,10 +1,10 @@ -TrainerHill_Roof_MapObjects: @ 853D9C4 - object_event 1, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 12, 7, 3, 8, 17, 0, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0, 0, 0 +TrainerHill_Roof_EventObjects: @ 853D9C4 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 12, 7, 3, 8, 17, 0, 0, 0, TrainerHill_Roof_EventScript_268FB2, 0, 0, 0 TrainerHill_Roof_MapWarps: @ 853D9DC warp_def 9, 5, 3, 1, TRAINER_HILL_4F warp_def 15, 5, 0, 1, TRAINER_HILL_ELEVATOR TrainerHill_Roof_MapEvents:: @ 853D9EC - map_events TrainerHill_Roof_MapObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0 + map_events TrainerHill_Roof_EventObjects, TrainerHill_Roof_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/Underwater_SeafloorCavern.inc b/data/maps/events/Underwater_SeafloorCavern.inc index b284db78f..0bf82c217 100644 --- a/data/maps/events/Underwater_SeafloorCavern.inc +++ b/data/maps/events/Underwater_SeafloorCavern.inc @@ -1,12 +1,12 @@ -Underwater_SeafloorCavern_MapObjects: @ 8535640 - object_event 1, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 - object_event 2, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 - object_event 3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 - object_event 4, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 +Underwater_SeafloorCavern_EventObjects: @ 8535640 + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 5, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 + object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 6, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 + object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 7, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 + object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 8, 4, 3, 76, 17, 0, 0, 0, Underwater_SeafloorCavern_EventScript_2343DC, 980, 0, 0 Underwater_SeafloorCavern_MapWarps: @ 85356A0 warp_def 6, 7, 0, 0, UNDERWATER_4 Underwater_SeafloorCavern_MapEvents:: @ 85356A8 - 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/UnionRoom.inc b/data/maps/events/UnionRoom.inc index be9b40243..c79b11f5d 100644 --- a/data/maps/events/UnionRoom.inc +++ b/data/maps/events/UnionRoom.inc @@ -1,18 +1,18 @@ -UnionRoom_MapObjects: @ 853B020 - object_event 1, MAP_OBJ_GFX_UNION_ROOM_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIDDY, 0, 0, 1, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D204, 706, 0, 0 +UnionRoom_EventObjects: @ 853B020 + object_event 1, EVENT_OBJ_GFX_UNION_ROOM_NURSE, 0, 0, 3, 2, 3, 8, 0, 0, 0, 0, UnionRoom_EventScript_23D236, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIDDY, 0, 0, 1, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D204, 706, 0, 0 object_event 3, 247, 0, 0, 7, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D22C, 710, 0, 0 object_event 4, 246, 0, 0, 1, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D222, 709, 0, 0 - object_event 5, MAP_OBJ_GFX_PLACEHOLDER_2, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D218, 708, 0, 0 - object_event 6, MAP_OBJ_GFX_PLACEHOLDER_1, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D20E, 707, 0, 0 - object_event 7, MAP_OBJ_GFX_STORYTELLER, 0, 0, 10, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1FA, 705, 0, 0 - object_event 8, MAP_OBJ_GFX_TRADER, 0, 0, 13, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1F0, 704, 0, 0 - object_event 9, MAP_OBJ_GFX_HIPSTER, 0, 0, 4, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1E6, 703, 0, 0 + object_event 5, EVENT_OBJ_GFX_PLACEHOLDER_2, 0, 0, 7, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D218, 708, 0, 0 + object_event 6, EVENT_OBJ_GFX_PLACEHOLDER_1, 0, 0, 13, 4, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D20E, 707, 0, 0 + object_event 7, EVENT_OBJ_GFX_STORYTELLER, 0, 0, 10, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1FA, 705, 0, 0 + object_event 8, EVENT_OBJ_GFX_TRADER, 0, 0, 13, 8, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1F0, 704, 0, 0 + object_event 9, EVENT_OBJ_GFX_HIPSTER, 0, 0, 4, 6, 3, 2, 17, 0, 0, 0, UnionRoom_EventScript_23D1E6, 703, 0, 0 UnionRoom_MapWarps: @ 853B0F8 warp_def 7, 11, 3, 127, NONE warp_def 8, 11, 3, 127, NONE UnionRoom_MapEvents:: @ 853B108 - map_events UnionRoom_MapObjects, UnionRoom_MapWarps, 0x0, 0x0 + map_events UnionRoom_EventObjects, UnionRoom_MapWarps, 0x0, 0x0 diff --git a/data/maps/events/UnknownMap_25_34.inc b/data/maps/events/UnknownMap_25_34.inc index 0fcbef3a3..975f08470 100644 --- a/data/maps/events/UnknownMap_25_34.inc +++ b/data/maps/events/UnknownMap_25_34.inc @@ -1,3 +1,3 @@ UnknownMap_25_34_MapEvents:: @ 853A064 - 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 7738701b2..c30969657 100644 --- a/data/maps/events/VerdanturfTown.inc +++ b/data/maps/events/VerdanturfTown.inc @@ -1,8 +1,8 @@ -VerdanturfTown_MapObjects: @ 8527CDC - object_event 1, MAP_OBJ_GFX_MAN_2, 0, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_1, 0, 0, 7, 11, 3, 3, 16, 0, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_CAMPER, 0, 0, 7, 6, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0, 0, 0 +VerdanturfTown_EventObjects: @ 8527CDC + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5A8, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB575, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 0, 7, 11, 3, 3, 16, 0, 0, 0, VerdanturfTown_EventScript_1EB5BA, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 0, 7, 6, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_1EB5B1, 0, 0, 0 VerdanturfTown_MapWarps: @ 8527D3C warp_def 3, 7, 0, 0, VERDANTURF_TOWN_BATTLE_TENT_LOBBY @@ -24,5 +24,5 @@ VerdanturfTown_MapBGEvents: @ 8527D74 bg_event 7, 3, 0, 0, 0, VerdanturfTown_EventScript_1EB5F4 VerdanturfTown_MapEvents:: @ 8527DD4 - 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_BattleTentBattleRoom.inc b/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc index 0db3fc920..20597089a 100644 --- a/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc +++ b/data/maps/events/VerdanturfTown_BattleTentBattleRoom.inc @@ -1,8 +1,8 @@ -VerdanturfTown_BattleTentBattleRoom_MapObjects: @ 852E734 - object_event 1, MAP_OBJ_GFX_TRADER, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_HIPSTER, 0, 0, 11, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 +VerdanturfTown_BattleTentBattleRoom_EventObjects: @ 852E734 + object_event 1, EVENT_OBJ_GFX_TRADER, 0, 0, 2, 8, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_HIPSTER, 0, 0, 11, 1, 3, 8, 17, 0, 0, 0, 0x0, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 4, 0, 10, 17, 0, 0, 0, 0x0, 0, 0, 0 VerdanturfTown_BattleTentBattleRoom_MapEvents:: @ 852E77C - map_events VerdanturfTown_BattleTentBattleRoom_MapObjects, 0x0, 0x0, 0x0 + map_events VerdanturfTown_BattleTentBattleRoom_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc b/data/maps/events/VerdanturfTown_BattleTentCorridor.inc index 7ec4cee10..539cf8b11 100644 --- a/data/maps/events/VerdanturfTown_BattleTentCorridor.inc +++ b/data/maps/events/VerdanturfTown_BattleTentCorridor.inc @@ -1,6 +1,6 @@ -VerdanturfTown_BattleTentCorridor_MapObjects: @ 852E708 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 +VerdanturfTown_BattleTentCorridor_EventObjects: @ 852E708 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 2, 6, 3, 7, 17, 0, 0, 0, 0x0, 0, 0, 0 VerdanturfTown_BattleTentCorridor_MapEvents:: @ 852E720 - map_events VerdanturfTown_BattleTentCorridor_MapObjects, 0x0, 0x0, 0x0 + map_events VerdanturfTown_BattleTentCorridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/events/VerdanturfTown_BattleTentLobby.inc b/data/maps/events/VerdanturfTown_BattleTentLobby.inc index d6b5818da..3f5ea9c68 100644 --- a/data/maps/events/VerdanturfTown_BattleTentLobby.inc +++ b/data/maps/events/VerdanturfTown_BattleTentLobby.inc @@ -1,10 +1,10 @@ -VerdanturfTown_BattleTentLobby_MapObjects: @ 852E648 - object_event 1, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GIRL_1, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_BOY_3, 0, 0, 9, 7, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_BOY_2, 0, 0, 1, 8, 3, 10, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_SCOTT, 0, 0, 12, 6, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766, 0, 0 - object_event 6, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 2, 8, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0, 0, 0 +VerdanturfTown_BattleTentLobby_EventObjects: @ 852E648 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 6, 5, 3, 8, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201873, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 0, 0, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201A7B, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_BOY_3, 0, 0, 9, 7, 3, 2, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201ABC, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 0, 1, 8, 3, 10, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AC5, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_SCOTT, 0, 0, 12, 6, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AD0, 766, 0, 0 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 2, 8, 3, 9, 17, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201AF7, 0, 0, 0 VerdanturfTown_BattleTentLobby_MapWarps: @ 852E6D8 warp_def 6, 9, 0, 0, VERDANTURF_TOWN @@ -14,5 +14,5 @@ VerdanturfTown_BattleTentLobby_MapBGEvents: @ 852E6E8 bg_event 4, 5, 0, 0, 0, VerdanturfTown_BattleTentLobby_EventScript_201B02 VerdanturfTown_BattleTentLobby_MapEvents:: @ 852E6F4 - map_events VerdanturfTown_BattleTentLobby_MapObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents + map_events VerdanturfTown_BattleTentLobby_EventObjects, VerdanturfTown_BattleTentLobby_MapWarps, 0x0, VerdanturfTown_BattleTentLobby_MapBGEvents diff --git a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc index 2441d8d41..03cf2de7a 100644 --- a/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/maps/events/VerdanturfTown_FriendshipRatersHouse.inc @@ -1,11 +1,11 @@ -VerdanturfTown_FriendshipRatersHouse_MapObjects: @ 852E9C8 - object_event 1, MAP_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0, 0, 0 +VerdanturfTown_FriendshipRatersHouse_EventObjects: @ 852E9C8 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_203031, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_2030DA, 0, 0, 0 VerdanturfTown_FriendshipRatersHouse_MapWarps: @ 852E9F8 warp_def 3, 7, 0, 5, VERDANTURF_TOWN warp_def 4, 7, 0, 5, VERDANTURF_TOWN VerdanturfTown_FriendshipRatersHouse_MapEvents:: @ 852EA08 - 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 803f9f666..0f37fe20b 100644 --- a/data/maps/events/VerdanturfTown_House.inc +++ b/data/maps/events/VerdanturfTown_House.inc @@ -1,11 +1,11 @@ -VerdanturfTown_House_MapObjects: @ 852EA1C - object_event 1, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0, 0, 0 +VerdanturfTown_House_EventObjects: @ 852EA1C + object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_20335F, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_203368, 0, 0, 0 VerdanturfTown_House_MapWarps: @ 852EA4C warp_def 3, 8, 0, 6, VERDANTURF_TOWN warp_def 4, 8, 0, 6, VERDANTURF_TOWN VerdanturfTown_House_MapEvents:: @ 852EA5C - 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 6d6ca6a5d..551126235 100644 --- a/data/maps/events/VerdanturfTown_Mart.inc +++ b/data/maps/events/VerdanturfTown_Mart.inc @@ -1,13 +1,13 @@ -VerdanturfTown_Mart_MapObjects: @ 852E790 - object_event 1, MAP_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_BOY_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LASS, 0, 0, 3, 2, 3, 9, 17, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0, 0, 0 +VerdanturfTown_Mart_EventObjects: @ 852E790 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_202587, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025BA, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 0, 8, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025C3, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 0, 3, 2, 3, 9, 17, 0, 0, 0, VerdanturfTown_Mart_EventScript_2025CC, 0, 0, 0 VerdanturfTown_Mart_MapWarps: @ 852E7F0 warp_def 3, 7, 0, 1, VERDANTURF_TOWN warp_def 4, 7, 0, 1, VERDANTURF_TOWN VerdanturfTown_Mart_MapEvents:: @ 852E800 - 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 9534ca9c7..d17513fd5 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_1F.inc @@ -1,8 +1,8 @@ -VerdanturfTown_PokemonCenter_1F_MapObjects: @ 852E814 - object_event 1, MAP_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_GENTLEMAN, 0, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 2, 3, 7, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_LITTLE_BOY_2, 0, 0, 10, 6, 3, 9, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0, 0, 0 +VerdanturfTown_PokemonCenter_1F_EventObjects: @ 852E814 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_20273A, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202748, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 0, 12, 2, 3, 7, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_202751, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 0, 10, 6, 3, 9, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6, 0, 0, 0 VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874 warp_def 7, 8, 3, 2, VERDANTURF_TOWN @@ -10,5 +10,5 @@ VerdanturfTown_PokemonCenter_1F_MapWarps: @ 852E874 warp_def 1, 6, 4, 0, VERDANTURF_TOWN_POKEMON_CENTER_2F VerdanturfTown_PokemonCenter_1F_MapEvents:: @ 852E88C - 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 2649066d8..4fcbd0e08 100644 --- a/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc +++ b/data/maps/events/VerdanturfTown_PokemonCenter_2F.inc @@ -1,8 +1,8 @@ -VerdanturfTown_PokemonCenter_2F_MapObjects: @ 852E8A0 - object_event 1, MAP_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 +VerdanturfTown_PokemonCenter_2F_EventObjects: @ 852E8A0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 6, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_27375B, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 0, 2, 2, 3, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273761, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 0, 10, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_273767, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_MYSTERY_GIFT_MAN, 0, 0, 1, 2, 0, 8, 17, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_276B03, 702, 0, 0 VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900 warp_def 1, 6, 4, 2, VERDANTURF_TOWN_POKEMON_CENTER_1F @@ -10,5 +10,5 @@ VerdanturfTown_PokemonCenter_2F_MapWarps: @ 852E900 warp_def 9, 1, 3, 0, TRADE_CENTER VerdanturfTown_PokemonCenter_2F_MapEvents:: @ 852E918 - 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 2089da649..070092679 100644 --- a/data/maps/events/VerdanturfTown_WandasHouse.inc +++ b/data/maps/events/VerdanturfTown_WandasHouse.inc @@ -1,14 +1,14 @@ -VerdanturfTown_WandasHouse_MapObjects: @ 852E92C - object_event 1, MAP_OBJ_GFX_WALLY, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806, 0, 0 - object_event 2, MAP_OBJ_GFX_BLACK_BELT, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_2, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984, 0, 0 +VerdanturfTown_WandasHouse_EventObjects: @ 852E92C + object_event 1, EVENT_OBJ_GFX_WALLY, 0, 0, 14, 5, 3, 2, 17, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028BF, 806, 0, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_202913, 808, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_2028E1, 809, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20294E, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_20291C, 984, 0, 0 VerdanturfTown_WandasHouse_MapWarps: @ 852E9A4 warp_def 7, 7, 0, 3, VERDANTURF_TOWN warp_def 8, 7, 0, 3, VERDANTURF_TOWN VerdanturfTown_WandasHouse_MapEvents:: @ 852E9B4 - 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 db3554ed4..511782688 100644 --- a/data/maps/events/VictoryRoad_1F.inc +++ b/data/maps/events/VictoryRoad_1F.inc @@ -1,13 +1,13 @@ -VictoryRoad_1F_MapObjects: @ 8535E04 - object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_WOMAN_7, 0, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_MAN_4, 0, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WALLY, 0, 0, 12, 25, 4, 8, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 40, 26, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291483, 1084, 0, 0 - object_event 6, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 37, 39, 4, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291490, 1085, 0, 0 - object_event 7, MAP_OBJ_GFX_WALLY, 0, 0, 31, 9, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E35, 751, 0, 0 - object_event 8, MAP_OBJ_GFX_WOMAN_7, 0, 0, 29, 17, 3, 10, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0, 0, 0 - object_event 9, MAP_OBJ_GFX_MAN_4, 0, 0, 32, 17, 3, 9, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0, 0, 0 +VictoryRoad_1F_EventObjects: @ 8535E04 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E73, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_235EA1, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_235E8A, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WALLY, 0, 0, 12, 25, 4, 8, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E2C, 858, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 40, 26, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291483, 1084, 0, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 39, 4, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_291490, 1085, 0, 0 + object_event 7, EVENT_OBJ_GFX_WALLY, 0, 0, 31, 9, 3, 1, 17, 0, 0, 0, VictoryRoad_1F_EventScript_235E35, 751, 0, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 29, 17, 3, 10, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235ECF, 0, 0, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 0, 32, 17, 3, 9, 17, 0, 1, 2, VictoryRoad_1F_EventScript_235EB8, 0, 0, 0 VictoryRoad_1F_MapWarps: @ 8535EDC warp_def 15, 40, 3, 2, EVER_GRANDE_CITY @@ -24,5 +24,5 @@ VictoryRoad_1F_MapBGEvents: @ 8535F24 bg_event 30, 39, 4, 7, 0, ITEM_ULTRA_BALL, 81, 0 VictoryRoad_1F_MapEvents:: @ 8535F30 - 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 6c57f0662..b251959ae 100644 --- a/data/maps/events/VictoryRoad_B1F.inc +++ b/data/maps/events/VictoryRoad_B1F.inc @@ -1,25 +1,25 @@ -VictoryRoad_B1F_MapObjects: @ 8535F44 - object_event 1, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19, 0, 0 - object_event 2, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20, 0, 0 - object_event 3, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17, 0, 0 - object_event 4, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 10, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18, 0, 0 - object_event 5, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23, 0, 0 - object_event 6, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22, 0, 0 - object_event 7, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 35, 6, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30, 0, 0 - object_event 8, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25, 0, 0 - object_event 9, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26, 0, 0 - object_event 10, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 12, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27, 0, 0 - object_event 11, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28, 0, 0 - object_event 12, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 21, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29, 0, 0 - object_event 13, MAP_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 34, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31, 0, 0 - object_event 14, MAP_OBJ_GFX_MAN_4, 0, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0, 0, 0 - object_event 15, MAP_OBJ_GFX_WOMAN_7, 0, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0, 0, 0 - object_event 16, MAP_OBJ_GFX_WOMAN_7, 0, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0, 0, 0 - object_event 17, MAP_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 34, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21, 0, 0 - object_event 18, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 42, 8, 4, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086, 0, 0 - object_event 19, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 32, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087, 0, 0 - object_event 20, MAP_OBJ_GFX_MAN_4, 0, 0, 14, 16, 3, 8, 17, 0, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0, 0, 0 - object_event 21, MAP_OBJ_GFX_WOMAN_7, 0, 0, 14, 20, 3, 16, 17, 0, 1, 3, VictoryRoad_B1F_EventScript_236541, 0, 0, 0 +VictoryRoad_B1F_EventObjects: @ 8535F44 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 19, 0, 0 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 20, 0, 0 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 4, 7, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 17, 0, 0 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 9, 10, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 18, 0, 0 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 20, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 23, 0, 0 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 21, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 22, 0, 0 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 35, 6, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 30, 0, 0 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 19, 5, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 25, 0, 0 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 26, 0, 0 + object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 18, 12, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 27, 0, 0 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 20, 25, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 28, 0, 0 + object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 21, 26, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 29, 0, 0 + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 0, 34, 4, 3, 1, 0, 0, 0, 0, VictoryRoad_B1F_EventScript_2908BA, 31, 0, 0 + object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_2364E5, 0, 0, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_2364FC, 0, 0, 0 + object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_236513, 0, 0, 0 + object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 0, 34, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2907A6, 21, 0, 0 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 42, 8, 4, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_29149D, 1086, 0, 0 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 32, 3, 3, 1, 17, 0, 0, 0, VictoryRoad_B1F_EventScript_2914AA, 1087, 0, 0 + object_event 20, EVENT_OBJ_GFX_MAN_4, 0, 0, 14, 16, 3, 8, 17, 0, 1, 4, VictoryRoad_B1F_EventScript_23652A, 0, 0, 0 + object_event 21, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 14, 20, 3, 16, 17, 0, 1, 3, VictoryRoad_B1F_EventScript_236541, 0, 0, 0 VictoryRoad_B1F_MapWarps: @ 853613C warp_def 30, 25, 3, 0, VICTORY_ROAD_B2F @@ -31,5 +31,5 @@ VictoryRoad_B1F_MapWarps: @ 853613C warp_def 5, 26, 3, 3, VICTORY_ROAD_B2F VictoryRoad_B1F_MapEvents:: @ 8536174 - 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 09fdb466f..5e702c0c3 100644 --- a/data/maps/events/VictoryRoad_B2F.inc +++ b/data/maps/events/VictoryRoad_B2F.inc @@ -1,11 +1,11 @@ -VictoryRoad_B2F_MapObjects: @ 8536188 - object_event 1, MAP_OBJ_GFX_MAN_4, 0, 0, 15, 6, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0, 0, 0 - object_event 2, MAP_OBJ_GFX_MAN_4, 0, 0, 43, 14, 3, 7, 17, 0, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0, 0, 0 - object_event 3, MAP_OBJ_GFX_WOMAN_7, 0, 0, 2, 17, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236903, 0, 0, 0 - object_event 4, MAP_OBJ_GFX_WOMAN_7, 0, 0, 35, 22, 3, 9, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0, 0, 0 - object_event 5, MAP_OBJ_GFX_ITEM_BALL, 0, 0, 13, 8, 3, 1, 17, 0, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088, 0, 0 - object_event 6, MAP_OBJ_GFX_WOMAN_7, 0, 0, 25, 18, 4, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236948, 0, 0, 0 - object_event 7, MAP_OBJ_GFX_MAN_4, 0, 0, 25, 21, 4, 7, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236931, 0, 0, 0 +VictoryRoad_B2F_EventObjects: @ 8536188 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 0, 15, 6, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_2368D5, 0, 0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 0, 43, 14, 3, 7, 17, 0, 1, 4, VictoryRoad_B2F_EventScript_2368EC, 0, 0, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 2, 17, 3, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236903, 0, 0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 35, 22, 3, 9, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_23691A, 0, 0, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 13, 8, 3, 1, 17, 0, 0, 0, VictoryRoad_B2F_EventScript_2914B7, 1088, 0, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_7, 0, 0, 25, 18, 4, 8, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236948, 0, 0, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 0, 25, 21, 4, 7, 17, 0, 1, 2, VictoryRoad_B2F_EventScript_236931, 0, 0, 0 VictoryRoad_B2F_MapWarps: @ 8536230 warp_def 30, 25, 3, 0, VICTORY_ROAD_B1F @@ -18,5 +18,5 @@ VictoryRoad_B2F_MapBGEvents: @ 8536250 bg_event 37, 1, 3, 7, 0, ITEM_MAX_REPEL, 83, 0 VictoryRoad_B2F_MapEvents:: @ 8536268 - 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 2828036e0..1fda1133f 100644 --- a/data/scripts/berry_tree.inc +++ b/data/scripts/berry_tree.inc @@ -1,5 +1,5 @@ BerryTreeScript:: @ 82742F9 - special FieldObjectInteractionGetBerryTreeData + special EventObjectInteractionGetBerryTreeData switch VAR_0x8004 case 255, Route102_EventScript_27434F case 0, Route102_EventScript_274359 @@ -54,7 +54,7 @@ Route102_EventScript_2743AF:: @ 82743AF Route102_EventScript_2743B1:: @ 82743B1 lockall - special FieldObjectInteractionGetBerryCountString + special EventObjectInteractionGetBerryCountString message Route102_Text_274560 waitmessage waitbuttonpress @@ -62,7 +62,7 @@ Route102_EventScript_2743B1:: @ 82743B1 Route102_EventScript_2743C1:: @ 82743C1 lockall - special FieldObjectInteractionGetBerryName + special EventObjectInteractionGetBerryName message Route102_Text_274579 waitmessage waitbuttonpress @@ -70,7 +70,7 @@ Route102_EventScript_2743C1:: @ 82743C1 Route102_EventScript_2743D1:: @ 82743D1 lockall - special FieldObjectInteractionGetBerryName + special EventObjectInteractionGetBerryName message Route102_Text_27458A waitmessage waitbuttonpress @@ -79,7 +79,7 @@ Route102_EventScript_2743D1:: @ 82743D1 Route102_EventScript_2743E1:: @ 82743E1 call Route102_EventScript_2743F6 lockall - special FieldObjectInteractionGetBerryName + special EventObjectInteractionGetBerryName message Route102_Text_2745AB waitmessage waitbuttonpress @@ -105,7 +105,7 @@ Route102_EventScript_274421:: @ 8274421 buffernumberstring 1, VAR_0x8006 lock faceplayer - special FieldObjectInteractionGetBerryCountString + special EventObjectInteractionGetBerryCountString msgbox Route102_Text_2745EE, 5 compare VAR_RESULT, 1 goto_eq Route102_EventScript_274448 @@ -113,11 +113,11 @@ Route102_EventScript_274421:: @ 8274421 goto_eq Route102_EventScript_274479 Route102_EventScript_274448:: @ 8274448 - special FieldObjectInteractionPickBerryTree + special EventObjectInteractionPickBerryTree compare VAR_0x8004, 0 goto_eq Route102_EventScript_274470 special sub_80EED34 - special FieldObjectInteractionRemoveBerryTree + special EventObjectInteractionRemoveBerryTree message Route102_Text_27461B playfanfare MUS_ME_KINOMI waitmessage @@ -145,7 +145,7 @@ Route102_EventScript_274479:: @ 8274479 Route102_EventScript_274482:: @ 8274482 lockall - special FieldObjectInteractionGetBerryTreeData + special EventObjectInteractionGetBerryTreeData call Route102_EventScript_2744DD releaseall end @@ -154,7 +154,7 @@ Route102_EventScript_27448D:: @ 827448D checkitem ITEM_WAILMER_PAIL, 1 compare VAR_RESULT, 0 goto_eq Route102_EventScript_2744BE - special FieldObjectInteractionGetBerryName + special EventObjectInteractionGetBerryName msgbox Route102_Text_2746E4, 5 compare VAR_RESULT, 1 goto_eq Route102_EventScript_2744C4 @@ -166,14 +166,14 @@ Route102_EventScript_2744BE:: @ 82744BE end Route102_EventScript_2744C0:: @ 82744C0 - special FieldObjectInteractionGetBerryTreeData + special EventObjectInteractionGetBerryTreeData lockall Route102_EventScript_2744C4:: @ 82744C4 - special FieldObjectInteractionGetBerryName + special EventObjectInteractionGetBerryName message Route102_Text_274710 waitmessage - special FieldObjectInteractionWaterBerryTree + special EventObjectInteractionWaterBerryTree special sub_80FAFF8 waitstate message Route102_Text_274723 @@ -183,10 +183,10 @@ Route102_EventScript_2744C4:: @ 82744C4 end Route102_EventScript_2744DD:: @ 82744DD - special FieldObjectInteractionPlantBerryTree + special EventObjectInteractionPlantBerryTree incrementgamestat 3 special sub_80EED10 - special FieldObjectInteractionGetBerryCountString + special EventObjectInteractionGetBerryCountString message Route102_Text_274535 waitmessage waitbuttonpress diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index 9a34d2e61..523aa67ca 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -342,8 +342,8 @@ OldaleTown_PokemonCenter_2F_EventScript_276DE0:: @ 8276DE0 end OldaleTown_PokemonCenter_2F_Movement_276E10: @ 8276E10 - step_up - step_up + walk_up + walk_up step_end OldaleTown_PokemonCenter_2F_EventScript_276E13:: @ 8276E13 @@ -736,52 +736,52 @@ OldaleTown_PokemonCenter_2F_EventScript_27733F:: @ 827733F end OldaleTown_PokemonCenter_2F_Movement_277349: @ 8277349 - step_00 + face_down step_end OldaleTown_PokemonCenter_2F_Movement_27734B: @ 827734B - step_03 + face_right step_end MossdeepCity_GameCorner_1F_Movement_27734D: @ 827734D OldaleTown_PokemonCenter_2F_Movement_27734D: @ 827734D - step_02 + face_left step_end OldaleTown_PokemonCenter_2F_Movement_27734F: @ 827734F - step_down - step_down + walk_down + walk_down step_end Movement_277352: @ 8277352 - step_right - step_up - step_up + walk_right + walk_up + walk_up step_end OldaleTown_PokemonCenter_2F_Movement_277356: @ 8277356 - step_left - step_up - step_up + walk_left + walk_up + walk_up step_end OldaleTown_PokemonCenter_2F_Movement_27735A: @ 827735A - step_up + walk_up step_end OldaleTown_PokemonCenter_2F_Movement_27735C: @ 827735C - step_02 + face_left step_end OldaleTown_PokemonCenter_2F_Movement_27735E: @ 827735E - step_03 + face_right step_end MossdeepCity_GameCorner_1F_Movement_277360: @ 8277360 - step_left - step_up - step_up - step_up + walk_left + walk_up + walk_up + walk_up step_end gUnknown_08277365:: @ 8277365 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index a6a0ebcc2..6a13f39ba 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1248,186 +1248,186 @@ LinkContestRoom1_EventScript_27ACDF:: @ 827ACDF return LinkContestRoom1_Movement_27AD09: @ 827AD09 - step_down + walk_down step_end LinkContestRoom1_Movement_27AD0B: @ 827AD0B - step_40 - step_up - step_41 + lock_facing_direction + walk_up + unlock_facing_direction step_end LinkContestRoom1_Movement_27AD0F: @ 827AD0F - step_28 + walk_in_place_fastest_right step_end LinkContestRoom1_Movement_27AD11: @ 827AD11 - step_58 + emote_heart step_end LinkContestRoom1_Movement_27AD13: @ 827AD13 - step_25 + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD15: @ 827AD15 - step_left - step_left - step_25 + walk_left + walk_left + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD19: @ 827AD19 - step_right - step_right - step_25 + walk_right + walk_right + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD1D: @ 827AD1D - step_up - step_25 + walk_up + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD20: @ 827AD20 - step_14 - step_14 + delay_16 + delay_16 step_end LinkContestRoom1_Movement_27AD23: @ 827AD23 - step_28 + walk_in_place_fastest_right step_end LinkContestRoom1_Movement_27AD25: @ 827AD25 - step_27 + walk_in_place_fastest_left step_end LinkContestRoom1_Movement_27AD27: @ 827AD27 - step_25 + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD29: @ 827AD29 - step_left - step_left - step_up + walk_left + walk_left + walk_up step_end LinkContestRoom1_Movement_27AD2D: @ 827AD2D - step_left - step_left - step_left - step_left - step_up + walk_left + walk_left + walk_left + walk_left + walk_up step_end LinkContestRoom1_Movement_27AD33: @ 827AD33 - step_02 - step_14 - step_4e + face_left + delay_16 + face_original_direction step_end LinkContestRoom1_Movement_27AD37: @ 827AD37 - step_01 - step_14 - step_4e + face_up + delay_16 + face_original_direction step_end LinkContestRoom1_Movement_27AD3B: @ 827AD3B - step_03 - step_14 - step_4e + face_right + delay_16 + face_original_direction step_end LinkContestRoom1_Movement_27AD3F: @ 827AD3F - step_00 - step_14 - step_4e + face_down + delay_16 + face_original_direction step_end LinkContestRoom1_Movement_27AD43: @ 827AD43 - step_01 + face_up step_end LinkContestRoom1_Movement_27AD45: @ 827AD45 - step_01 - step_14 - step_28 + face_up + delay_16 + walk_in_place_fastest_right step_end LinkContestRoom1_Movement_27AD49: @ 827AD49 - step_27 - step_14 - step_14 - step_25 + walk_in_place_fastest_left + delay_16 + delay_16 + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD4E: @ 827AD4E - step_14 - step_14 - step_25 + delay_16 + delay_16 + walk_in_place_fastest_down step_end LinkContestRoom1_Movement_27AD52: @ 827AD52 - step_up - step_right - step_right - step_right - step_26 + walk_up + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD58: @ 827AD58 - step_17 - step_17 - step_17 - step_15 - step_26 + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_down + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD5E: @ 827AD5E - step_up - step_right - step_26 + walk_up + walk_right + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD62: @ 827AD62 - step_17 - step_15 - step_26 + walk_fast_left + walk_fast_down + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD66: @ 827AD66 - step_up - step_left - step_26 + walk_up + walk_left + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD6A: @ 827AD6A - step_18 - step_15 - step_26 + walk_fast_right + walk_fast_down + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD6E: @ 827AD6E - step_up - step_left - step_left - step_left - step_26 + walk_up + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD74: @ 827AD74 - step_18 - step_18 - step_18 - step_15 - step_26 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_down + walk_in_place_fastest_up step_end LinkContestRoom1_Movement_27AD7A: @ 827AD7A - step_right - step_right - step_up + walk_right + walk_right + walk_up step_end LinkContestRoom1_Movement_27AD7E: @ 827AD7E - step_up + walk_up step_end LinkContestRoom1_EventScript_27AD80:: @ 827AD80 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 07ed1b82d..d9b8a89ac 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -240,25 +240,25 @@ Route117_PokemonDayCare_EventScript_291F3D:: @ 8291F3D end Route117_PokemonDayCare_Movement_291F47: @ 8291F47 - 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 + 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 step_end Route117_PokemonDayCare_EventScript_291F5B:: @ 8291F5B diff --git a/data/scripts/field_move_scripts.inc b/data/scripts/field_move_scripts.inc index 44631cc20..df25056ea 100644 --- a/data/scripts/field_move_scripts.inc +++ b/data/scripts/field_move_scripts.inc @@ -43,7 +43,7 @@ Route103_EventScript_290710:: @ 8290710 end Route103_Movement_29071F: @ 829071F - step_5b + cut_tree step_end Route103_EventScript_290721:: @ 8290721 @@ -128,7 +128,7 @@ Route111_EventScript_290829:: @ 8290829 end Route111_Movement_29082B: @ 829082B - step_5a + rock_smash_break step_end Route111_EventScript_29082D:: @ 829082D diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 269ef2530..5a03a0e98 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -213,7 +213,7 @@ Route120_EventScript_28CF36:: @ 828CF36 Route111_EventScript_28CF56:: @ 828CF56 special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToFieldObjectLocalIds + special GabbyAndTySetScriptVarsToEventObjectLocalIds compare VAR_FACING, 2 call_if 1, Route111_EventScript_28CF94 compare VAR_FACING, 1 @@ -247,7 +247,7 @@ Route111_EventScript_28CFC3:: @ 828CFC3 Route118_EventScript_28CFC3:: @ 828CFC3 Route120_EventScript_28CFC3:: @ 828CFC3 special GabbyAndTyBeforeInterview - special GabbyAndTySetScriptVarsToFieldObjectLocalIds + special GabbyAndTySetScriptVarsToEventObjectLocalIds compare VAR_FACING, 2 call_if 1, Route111_EventScript_28CF94 compare VAR_FACING, 1 @@ -270,15 +270,15 @@ Route120_EventScript_28CFC3:: @ 828CFC3 end Route111_Movement_28D04D: @ 828D04D - step_1d + walk_in_place_down step_end Route111_Movement_28D04F: @ 828D04F - step_1e + walk_in_place_up step_end Route111_Movement_28D051: @ 828D051 - step_1f + walk_in_place_left step_end Route111_EventScript_28D053:: @ 828D053 diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index ccf8997d7..fd3868512 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -53,17 +53,17 @@ AquaHideout_B2F_EventScript_233E25:: @ 8233E25 end AquaHideout_B2F_Movement_233E80: @ 8233E80 - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left step_end AquaHideout_B2F_Movement_233E85: @ 8233E85 - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right step_end AquaHideout_B2F_EventScript_233E8A:: @ 8233E8A diff --git a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc index 2f952936f..27ea23b59 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc @@ -457,75 +457,75 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9:: @ 8257BA9 return BattleFrontier_BattleArenaBattleRoom_Movement_257BE2: @ 8257BE2 - step_right - step_right + walk_right + walk_right BattleFrontier_BattleArenaBattleRoom_Movement_257BE4: @ 8257BE4 - step_right + walk_right BattleFrontier_BattleArenaBattleRoom_Movement_257BE5: @ 8257BE5 - step_right + walk_right step_end BattleFrontier_BattleArenaBattleRoom_Movement_257BE7: @ 8257BE7 - step_left - step_left - step_28 + walk_left + walk_left + walk_in_place_fastest_right step_end BattleFrontier_BattleArenaBattleRoom_Movement_257BEB: @ 8257BEB - step_26 + walk_in_place_fastest_up step_end BattleFrontier_BattleArenaBattleRoom_Movement_257BED: @ 8257BED - step_28 + walk_in_place_fastest_right step_end BattleFrontier_BattleArenaBattleRoom_Movement_257BEF: @ 8257BEF - step_left - step_left + walk_left + walk_left BattleFrontier_BattleArenaBattleRoom_Movement_257BF1: @ 8257BF1 - step_left + walk_left BattleFrontier_BattleArenaBattleRoom_Movement_257BF2: @ 8257BF2 - step_left + walk_left step_end BattleFrontier_BattleArenaBattleRoom_Movement_257BF4: @ 8257BF4 - step_17 - step_17 - step_17 - step_17 - step_17 + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left + walk_fast_left step_end BattleFrontier_BattleArenaBattleRoom_Movement_257BFA: @ 8257BFA - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end BattleFrontier_BattleArenaBattleRoom_Movement_257C02: @ 8257C02 - step_51 - step_46 + disable_jump_landing_ground_effect + jump_in_place_down step_end BattleFrontier_BattleArenaBattleRoom_Movement_257C05: @ 8257C05 - step_51 - step_47 + disable_jump_landing_ground_effect + jump_in_place_up step_end BattleFrontier_BattleArenaBattleRoom_Movement_257C08: @ 8257C08 - step_25 + walk_in_place_fastest_down step_end BattleFrontier_BattleArenaBattleRoom_Movement_257C0A: @ 8257C0A - step_28 + walk_in_place_fastest_right step_end BattleFrontier_BattleArenaBattleRoom_MapScript2_257C0C: @ 8257C0C @@ -541,20 +541,20 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257C16:: @ 8257C16 end BattleFrontier_BattleArenaBattleRoom_Movement_257C30: @ 8257C30 - step_down - step_27 - step_14 - step_14 - step_14 - step_14 - step_up - step_up - step_27 + walk_down + walk_in_place_fastest_left + delay_16 + delay_16 + delay_16 + delay_16 + walk_up + walk_up + walk_in_place_fastest_left step_end BattleFrontier_BattleArenaBattleRoom_Movement_257C3A: @ 8257C3A - step_down - step_27 + walk_down + walk_in_place_fastest_left step_end BattleFrontier_BattleArenaBattleRoom_Text_257C3D: @ 8257C3D diff --git a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc b/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc index cecd5b44c..83b602fc4 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaCorridor.inc @@ -25,63 +25,63 @@ BattleFrontier_BattleArenaCorridor_EventScript_2573C9:: @ 82573C9 end BattleFrontier_BattleArenaCorridor_Movement_257417: @ 8257417 - step_up - step_left - step_left - 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_up - step_up - step_right - step_right - step_right + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right step_end BattleFrontier_BattleArenaCorridor_Movement_25742C: @ 825742C - step_right - step_54 + walk_right + set_invisible step_end BattleFrontier_BattleArenaCorridor_Movement_25742F: @ 825742F - step_left - step_left - 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_up - step_up - step_right - step_right - step_right - step_right + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right step_end BattleFrontier_BattleArenaCorridor_Movement_257444: @ 8257444 - step_27 + walk_in_place_fastest_left step_end BattleFrontier_BattleArenaCorridor_Movement_257446: @ 8257446 - step_up - step_25 + walk_up + walk_in_place_fastest_down step_end BattleFrontier_BattleArenaCorridor_Text_257449: @ 8257449 diff --git a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc index 68ac57fcd..7a0695445 100644 --- a/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleArenaLobby.inc @@ -271,39 +271,39 @@ BattleFrontier_BattleArenaLobby_EventScript_256005:: @ 8256005 return BattleFrontier_BattleArenaLobby_Movement_256034: @ 8256034 - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_left - step_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up step_end BattleFrontier_BattleArenaLobby_Movement_25603E: @ 825603E - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleArenaLobby_Movement_256041: @ 8256041 - step_up - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end BattleFrontier_BattleArenaLobby_Movement_25604C: @ 825604C - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleArenaLobby_EventScript_256050:: @ 8256050 @@ -320,26 +320,26 @@ BattleFrontier_BattleArenaLobby_EventScript_256050:: @ 8256050 return BattleFrontier_BattleArenaLobby_Movement_25607F: @ 825607F - step_up - step_up - step_up - step_right - step_right - step_right - step_right - step_up + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_up step_end BattleFrontier_BattleArenaLobby_Movement_256088: @ 8256088 - step_up - step_up - step_up - step_up - step_right - step_right - step_right - step_right - step_26 + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092 diff --git a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc index 52981a07d..c46358aed 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeBattleRoom.inc @@ -669,214 +669,214 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C652:: @ 824C652 BattleFrontier_BattleArenaBattleRoom_Movement_24C773: @ 824C773 BattleFrontier_BattleDomeBattleRoom_Movement_24C773: @ 824C773 - step_54 + set_invisible step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C775: @ 824C775 - step_55 - step_14 - step_up - step_up - step_up - step_right + set_visible + delay_16 + walk_up + walk_up + walk_up + walk_right BattleFrontier_BattleDomeBattleRoom_Movement_24C77B: @ 824C77B - step_right + walk_right step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C77D: @ 824C77D - step_up + walk_up step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C77F: @ 824C77F - step_55 - step_14 - step_up - step_up - step_up - step_right - step_right + set_visible + delay_16 + walk_up + walk_up + walk_up + walk_right + walk_right step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C787: @ 824C787 - step_right + walk_right step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C789: @ 824C789 - step_left + walk_left step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C78B: @ 824C78B - step_01 - step_54 + face_up + set_invisible step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C78E: @ 824C78E - step_55 - step_up - step_up - step_up - step_02 - step_13 - step_12 - step_00 - step_13 - step_12 - step_03 - step_13 - step_12 - step_01 - step_13 - step_12 - step_02 - step_14 - step_16 - step_16 - step_02 - step_13 - step_12 - step_00 - step_13 - step_12 - step_03 - step_13 - step_12 - step_01 - step_13 - step_12 - step_02 - fast_step_left - step_41 - step_01 - step_40 - fast_step_left - fast_step_left - step_41 - step_03 - step_40 - fast_step_left - step_41 - step_00 - step_11 - step_02 - step_13 - step_12 - step_01 - step_13 - step_12 - step_03 - step_13 - step_12 - step_00 - step_13 - step_12 - step_02 - step_12 - step_01 - step_12 - step_03 - step_12 - step_00 - step_12 - step_02 - step_11 - step_01 - step_11 - step_03 - step_11 - step_00 - step_11 - step_02 - step_40 - step_right - slow_step_right - step_right - slow_step_right - step_41 - step_01 - step_14 - step_47 - step_47 - step_14 - step_right - step_right - step_right - step_47 - step_14 - step_right - step_down - step_down - step_02 - step_11 - step_01 - step_11 - step_03 - step_11 - step_00 - step_11 - step_02 - step_12 - step_left - step_left + set_visible + walk_up + walk_up + walk_up + face_left + delay_8 + delay_4 + face_down + delay_8 + delay_4 + face_right + delay_8 + delay_4 + face_up + delay_8 + delay_4 + face_left + delay_16 + walk_fast_up + walk_fast_up + face_left + delay_8 + delay_4 + face_down + delay_8 + delay_4 + face_right + delay_8 + delay_4 + face_up + delay_8 + delay_4 + face_left + jump_2_left + unlock_facing_direction + face_up + lock_facing_direction + jump_2_left + jump_2_left + unlock_facing_direction + face_right + lock_facing_direction + jump_2_left + unlock_facing_direction + face_down + delay_2 + face_left + delay_8 + delay_4 + face_up + delay_8 + delay_4 + face_right + delay_8 + delay_4 + face_down + delay_8 + delay_4 + face_left + delay_4 + face_up + delay_4 + face_right + delay_4 + face_down + delay_4 + face_left + delay_2 + face_up + delay_2 + face_right + delay_2 + face_down + delay_2 + face_left + lock_facing_direction + walk_right + walk_slow_right + walk_right + walk_slow_right + unlock_facing_direction + face_up + delay_16 + jump_in_place_up + jump_in_place_up + delay_16 + walk_right + walk_right + walk_right + jump_in_place_up + delay_16 + walk_right + walk_down + walk_down + face_left + delay_2 + face_up + delay_2 + face_right + delay_2 + face_down + delay_2 + face_left + delay_4 + walk_left + walk_left step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C7F9: @ 824C7F9 - step_14 - step_14 - step_left - step_left - step_28 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_right - step_right - step_25 + delay_16 + delay_16 + walk_left + walk_left + walk_in_place_fastest_right + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_right + walk_right + walk_in_place_fastest_down step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C829: @ 824C829 - step_left + walk_left step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C82B: @ 824C82B - step_left - step_left + walk_left + walk_left step_end BattleFrontier_BattleDomeBattleRoom_EventScript_24C82E:: @ 824C82E @@ -978,50 +978,50 @@ BattleFrontier_BattleDomeBattleRoom_EventScript_24C938:: @ 824C938 return BattleFrontier_BattleDomeBattleRoom_Movement_24C94B: @ 824C94B - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_13 - step_51 - step_46 - step_12 - step_46 - step_50 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + disable_jump_landing_ground_effect + jump_in_place_down + delay_4 + jump_in_place_down + enable_jump_landing_ground_effect step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C95E: @ 824C95E - step_down - step_down - step_right - step_right - step_25 + walk_down + walk_down + walk_right + walk_right + walk_in_place_fastest_down step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C964: @ 824C964 - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C969: @ 824C969 - step_27 + walk_in_place_fastest_left step_end BattleFrontier_BattleDomeBattleRoom_Movement_24C96B: @ 824C96B - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left step_end BattleFrontier_BattleDomeBattleRoom_Text_24C970: @ 824C970 diff --git a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc index ad6204fd5..6a97382d4 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeCorridor.inc @@ -46,107 +46,107 @@ BattleFrontier_BattleDomeCorridor_EventScript_24B18F:: @ 824B18F end BattleFrontier_BattleDomeCorridor_Movement_24B1A1: @ 824B1A1 - step_up - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end BattleFrontier_BattleDomeCorridor_Movement_24B1AE: @ 824B1AE - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleDomeCorridor_Movement_24B1B2: @ 824B1B2 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up step_end BattleFrontier_BattleDomeCorridor_Movement_24B1BE: @ 824B1BE - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleDomeCorridor_Movement_24B1C1: @ 824B1C1 - step_up - 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_26 + walk_up + 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_in_place_fastest_up step_end BattleFrontier_BattleDomeCorridor_Movement_24B1D2: @ 824B1D2 - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleDomeCorridor_Movement_24B1D6: @ 824B1D6 - 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 + 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 step_end BattleFrontier_BattleDomeCorridor_Movement_24B1E6: @ 824B1E6 - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleDomeCorridor_Movement_24B1E9: @ 824B1E9 - step_up - 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_54 + walk_up + 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 + set_invisible step_end diff --git a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc index 35bf3f5a6..b08d0ca89 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomeLobby.inc @@ -390,22 +390,22 @@ BattleFrontier_BattleDomeLobby_EventScript_249D3F:: @ 8249D3F return BattleFrontier_BattleDomeLobby_Movement_249D45: @ 8249D45 - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleDomeLobby_Movement_249D4B: @ 8249D4B - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleDomeLobby_Movement_249D4E: @ 8249D4E - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52 diff --git a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc index f3693e179..d19b4b999 100644 --- a/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc @@ -280,24 +280,24 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B646:: @ 824B646 return BattleFrontier_BattleDomePreBattleRoom_Movement_24B64F: @ 824B64F - step_right - step_02 + walk_right + face_left step_end BattleFrontier_BattleDomePreBattleRoom_Movement_24B652: @ 824B652 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleDomePreBattleRoom_Movement_24B657: @ 824B657 - step_up + walk_up step_end BattleFrontier_BattleDomePreBattleRoom_Movement_24B659: @ 824B659 - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleDomePreBattleRoom_Text_24B65C: @ 824B65C diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc index bd76e111d..cdfd6edd6 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryBattleRoom.inc @@ -261,32 +261,32 @@ BattleFrontier_BattleFactoryBattleRoom_EventScript_25B105:: @ 825B105 end BattleFrontier_BattleFactoryBattleRoom_Movement_25B17B: @ 825B17B - step_up - step_up - step_up - step_up - step_up - step_03 + walk_up + walk_up + walk_up + walk_up + walk_up + face_right step_end BattleFrontier_BattleFactoryBattleRoom_Movement_25B182: @ 825B182 - step_right + walk_right step_end BattleFrontier_BattleFactoryBattleRoom_Movement_25B184: @ 825B184 - step_down - step_down - step_down - step_down - step_down - step_02 + walk_down + walk_down + walk_down + walk_down + walk_down + face_left step_end BattleFrontier_BattleFactoryBattleRoom_Movement_25B18B: @ 825B18B - step_up - step_up - step_up - step_02 + walk_up + walk_up + walk_up + face_left step_end BattleFrontier_BattleFactoryBattleRoom_EventScript_25B190:: @ 825B190 diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc index 640e96b4d..4f2dea343 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc @@ -261,17 +261,17 @@ BattleFrontier_BattleFactoryLobby_EventScript_25879D:: @ 825879D end BattleFrontier_BattleFactoryLobby_Movement_2587A7: @ 82587A7 - step_up - step_up - step_up - step_54 + walk_up + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleFactoryLobby_Movement_2587AC: @ 82587AC - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleFactoryLobby_EventScript_2587B1:: @ 82587B1 diff --git a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc index 93a5f2caf..875a3a220 100644 --- a/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc @@ -457,65 +457,65 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_25A18B:: @ 825A18B return BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A19A: @ 825A19A - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A0: @ 825A1A0 - step_up - step_left - step_left - step_up - step_up + walk_up + walk_left + walk_left + walk_up + walk_up step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1A6: @ 825A1A6 - step_up - step_right - step_right - step_up - step_up + walk_up + walk_right + walk_right + walk_up + walk_up step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1AC: @ 825A1AC - step_up - step_up - step_up - step_up - step_up - step_00 + walk_up + walk_up + walk_up + walk_up + walk_up + face_down step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B3: @ 825A1B3 - step_left - step_left - step_up - step_up - step_54 + walk_left + walk_left + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1B9: @ 825A1B9 - step_right - step_right - step_up - step_up - step_54 + walk_right + walk_right + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1BF: @ 825A1BF - step_left - step_left - step_left + walk_left + walk_left + walk_left step_end BattleFrontier_BattleFactoryPreBattleRoom_Movement_25A1C3: @ 825A1C3 - step_right - step_right - step_right - step_00 + walk_right + walk_right + walk_right + face_down step_end BattleFrontier_BattleFactoryPreBattleRoom_Text_25A1C8: @ 825A1C8 diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc index 5aff5ad81..07ccbe79d 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc @@ -394,68 +394,68 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FE89:: @ 824FE89 return BattleFrontier_BattlePalaceBattleRoom_Movement_24FE90: @ 824FE90 - step_54 + set_invisible step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FE92: @ 824FE92 - step_55 - step_up - step_up - step_up - step_up + set_visible + walk_up + walk_up + walk_up + walk_up BattleFrontier_BattlePalaceBattleRoom_Movement_24FE97: @ 824FE97 - step_03 + face_right step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FE99: @ 824FE99 - step_01 + face_up step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FE9B: @ 824FE9B - step_55 - step_up - step_up - step_up - step_up + set_visible + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA1: @ 824FEA1 - step_down - step_down - step_down - step_down - step_02 + walk_down + walk_down + walk_down + walk_down + face_left step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEA7: @ 824FEA7 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC: @ 824FEAC - step_00 + face_down step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAE: @ 824FEAE - step_55 - slow_step_down - slow_step_down - step_02 + set_visible + walk_slow_down + walk_slow_down + face_left step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB3: @ 824FEB3 - step_55 - slow_step_down + set_visible + walk_slow_down step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEB6: @ 824FEB6 - slow_step_down - slow_step_down - slow_step_down - step_02 + walk_slow_down + walk_slow_down + walk_slow_down + face_left step_end BattleFrontier_BattlePalaceBattleRoom_EventScript_24FEBB:: @ 824FEBB @@ -472,42 +472,42 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24FED5:: @ 824FED5 end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEDF: @ 824FEDF - step_14 - step_14 - step_55 - step_down - step_right - step_down - step_27 + delay_16 + delay_16 + set_visible + walk_down + walk_right + walk_down + walk_in_place_fastest_left step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEE7: @ 824FEE7 - step_55 - step_15 - step_18 - step_15 - step_15 - step_15 - step_15 - step_15 - step_27 - step_14 + set_visible + walk_fast_down + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_in_place_fastest_left + delay_16 step_end BattleFrontier_BattlePalaceBattleRoom_Movement_24FEF2: @ 824FEF2 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_55 - slow_step_down - slow_step_down - slow_step_down - slow_step_down - step_02 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + set_visible + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down + face_left step_end BattleFrontier_BattlePalaceBattleRoom_Text_24FF00: @ 824FF00 diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc index 91fb31ad3..89697ff33 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceCorridor.inc @@ -80,54 +80,54 @@ BattleFrontier_BattlePalaceCorridor_EventScript_24F5AF:: @ 824F5AF return BattleFrontier_BattlePalaceCorridor_Movement_24F5B8: @ 824F5B8 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattlePalaceCorridor_Movement_24F5BD: @ 824F5BD - step_up - step_up - step_left - step_left - step_up - step_up + walk_up + walk_up + walk_left + walk_left + walk_up + walk_up step_end BattleFrontier_BattlePalaceCorridor_Movement_24F5C4: @ 824F5C4 - step_up - step_up - step_up - step_left - step_left - step_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_up step_end BattleFrontier_BattlePalaceCorridor_Movement_24F5CB: @ 824F5CB - step_up - step_right - step_right - step_up - step_up - step_up + walk_up + walk_right + walk_right + walk_up + walk_up + walk_up step_end BattleFrontier_BattlePalaceCorridor_Movement_24F5D2: @ 824F5D2 - step_up - step_up - step_right - step_right - step_up - step_up + walk_up + walk_up + walk_right + walk_right + walk_up + walk_up step_end BattleFrontier_BattlePalaceCorridor_Movement_24F5D9: @ 824F5D9 - step_up + walk_up BattleFrontier_BattlePalaceCorridor_Movement_24F5DA: @ 824F5DA - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattlePalaceCorridor_Text_24F5DD: @ 824F5DD diff --git a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc index 067e18fa2..a5cb11081 100644 --- a/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc @@ -345,18 +345,18 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC41:: @ 824DC41 return BattleFrontier_BattlePalaceLobby_Movement_24DC47: @ 824DC47 - step_up + walk_up step_end BattleFrontier_BattlePalaceLobby_Movement_24DC49: @ 824DC49 - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattlePalaceLobby_Movement_24DC4C: @ 824DC4C - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50 diff --git a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc b/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc index 5293b6cfa..4171da314 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeCorridor.inc @@ -46,21 +46,21 @@ BattleFrontier_BattlePikeCorridor_EventScript_25C801:: @ 825C801 end BattleFrontier_BattlePikeCorridor_Movement_25C80B: @ 825C80B - step_up - step_up + walk_up + walk_up step_end BattleFrontier_BattlePikeCorridor_Movement_25C80E: @ 825C80E - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattlePikeCorridor_Movement_25C812: @ 825C812 - step_up - step_up - step_left - step_00 + walk_up + walk_up + walk_left + face_down step_end BattleFrontier_BattlePikeCorridor_Text_25C817: @ 825C817 diff --git a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc index 0cee28347..74bdb1d78 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeLobby.inc @@ -268,12 +268,12 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA94:: @ 825BA94 return BattleFrontier_BattlePikeLobby_Movement_25BAA6: @ 825BAA6 - step_up + walk_up BattleFrontier_BattlePikeLobby_Movement_25BAA7: @ 825BAA7 - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattlePikeLobby_EventScript_25BAAB:: @ 825BAAB diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc index 3461f8275..fd5fd81e0 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom1.inc @@ -112,7 +112,7 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2BF:: @ 825D2BF BattleFrontier_BattlePikeRandomRoom1_EventScript_25D2FB:: @ 825D2FB msgbox BattleFrontier_BattlePikeRandomRoom1_Text_25E311, 4 closemessage - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0 applymovement 2, BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2 waitmovement 0 @@ -440,141 +440,141 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D77B:: @ 825D77B return BattleFrontier_BattlePikeRandomRoom1_Movement_25D795: @ 825D795 - step_down - step_down + walk_down + walk_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D798: @ 825D798 - step_up - step_up - step_up - step_54 - step_up + walk_up + walk_up + walk_up + set_invisible + walk_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D79E: @ 825D79E - step_up - step_54 - step_up + walk_up + set_invisible + walk_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A2: @ 825D7A2 - step_down + walk_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7A4: @ 825D7A4 - step_down - step_02 - step_14 - step_14 - step_00 + walk_down + face_left + delay_16 + delay_16 + face_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7AA: @ 825D7AA - step_15 - step_18 - step_18 - step_15 - step_17 - step_00 + walk_fast_down + walk_fast_right + walk_fast_right + walk_fast_down + walk_fast_left + face_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B1: @ 825D7B1 - step_01 + face_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B3: @ 825D7B3 - step_left + walk_left BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B4: @ 825D7B4 - step_03 + face_right step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7B6: @ 825D7B6 - step_down - step_down - step_right - step_00 + walk_down + walk_down + walk_right + face_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BB: @ 825D7BB - step_02 + face_left step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BD: @ 825D7BD - step_03 + face_right step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7BF: @ 825D7BF - step_01 + face_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C1: @ 825D7C1 - step_right + walk_right step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C3: @ 825D7C3 - step_left + walk_left step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C5: @ 825D7C5 - step_down - step_down + walk_down + walk_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7C8: @ 825D7C8 - step_03 + face_right step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CA: @ 825D7CA - step_02 + face_left step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7CC: @ 825D7CC - step_up - step_up - step_up - step_right - step_up - step_54 - step_up + walk_up + walk_up + walk_up + walk_right + walk_up + set_invisible + walk_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7D4: @ 825D7D4 - step_up - step_up - step_up - step_left - step_up - step_54 - step_up + walk_up + walk_up + walk_up + walk_left + walk_up + set_invisible + walk_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DC: @ 825D7DC - step_up - step_up + walk_up + walk_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7DF: @ 825D7DF - step_down - step_down + walk_down + walk_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E2: @ 825D7E2 - step_up - step_up - step_up - step_54 + walk_up + walk_up + walk_up + set_invisible step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7E7: @ 825D7E7 - step_55 - step_down + set_visible + walk_down step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D7EA: @ 825D7EA - step_left - step_03 + walk_left + face_right step_end BattleFrontier_BattlePikeRandomRoom1_EventScript_25D7ED:: @ 825D7ED @@ -689,13 +689,13 @@ BattleFrontier_BattlePikeRandomRoom1_EventScript_25D96D:: @ 825D96D return BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B0: @ 825D9B0 - step_up - step_up + walk_up + walk_up step_end BattleFrontier_BattlePikeRandomRoom1_Movement_25D9B3: @ 825D9B3 - step_down - step_down + walk_down + walk_down step_end BattleFrontier_BattlePikeRandomRoom1_Text_25D9B6: @ 825D9B6 diff --git a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc index 14f543284..39045c317 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeRandomRoom2.inc @@ -24,8 +24,8 @@ BattleFrontier_BattlePikeRandomRoom2_EventScript_25E3A7:: @ 825E3A7 end BattleFrontier_BattlePikeRandomRoom2_Movement_25E3DB: @ 825E3DB - step_down - step_down + walk_down + walk_down step_end BattleFrontier_BattlePikeRandomRoom2_MapScript2_25E3DE: @ 825E3DE diff --git a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc index 6952412f2..6bef7ba12 100644 --- a/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc @@ -267,22 +267,22 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25CBC2:: @ 825CBC2 end BattleFrontier_BattlePikeThreePathRoom_Movement_25CBCE: @ 825CBCE - step_left - step_left - step_down - step_down - step_down - step_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down step_end BattleFrontier_BattlePikeThreePathRoom_Movement_25CBD5: @ 825CBD5 - step_up - step_up - step_up - step_up - step_right - step_right - step_00 + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right + face_down step_end BattleFrontier_BattlePikeThreePathRoom_Text_25CBDD: @ 825CBDD diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc index 2862722ce..e92c8d97f 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc @@ -462,34 +462,34 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D9C:: @ 8250D9C return BattleFrontier_BattlePyramidLobby_Movement_250DC4: @ 8250DC4 - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_00 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + face_down step_end BattleFrontier_BattlePyramidLobby_Movement_250DCD: @ 8250DCD - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattlePyramidLobby_Movement_250DD5: @ 8250DD5 - step_right - step_02 + walk_right + face_left step_end BattleFrontier_BattlePyramidLobby_Movement_250DD8: @ 8250DD8 - step_up - step_up + walk_up + walk_up step_end BattleFrontier_BattlePyramidLobby_EventScript_250DDB:: @ 8250DDB diff --git a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc index d071639f8..9d83ab4e0 100644 --- a/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc +++ b/data/scripts/maps/BattleFrontier_BattlePyramidTop.inc @@ -138,7 +138,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255256:: @ 8255256 special sub_81A1780 compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_2552D0 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 msgbox BattleFrontier_BattlePyramidTop_Text_255669, 4 @@ -185,7 +185,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255335:: @ 8255335 special sub_81A1780 compare VAR_RESULT, 0 goto_if 5, BattleFrontier_BattlePyramidTop_EventScript_255388 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, BattleFrontier_BattlePyramidTop_Movement_25540C waitmovement 0 msgbox BattleFrontier_BattlePyramidTop_Text_255951, 4 @@ -235,32 +235,32 @@ BattleFrontier_BattlePyramidTop_EventScript_2553ED:: @ 82553ED return BattleFrontier_BattlePyramidTop_Movement_2553FD: @ 82553FD - step_right - step_27 + walk_right + walk_in_place_fastest_left step_end BattleFrontier_BattlePyramidTop_Movement_255400: @ 8255400 - step_left - step_26 + walk_left + walk_in_place_fastest_up step_end BattleFrontier_BattlePyramidTop_Movement_255403: @ 8255403 - step_up - step_up - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end BattleFrontier_BattlePyramidTop_Movement_25540A: @ 825540A - step_15 + walk_fast_down step_end BattleFrontier_BattlePyramidTop_Movement_25540C: @ 825540C - slow_step_up - slow_step_up - step_14 + walk_slow_up + walk_slow_up + delay_16 step_end BattleFrontier_BattlePyramidTop_Text_255410: @ 8255410 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc index 63306af2a..087752d8f 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom.inc @@ -394,92 +394,92 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_242170:: @ 8242170 return BattleFrontier_BattleTowerBattleRoom_Movement_242179: @ 8242179 - step_up - step_up - step_up - step_03 + walk_up + walk_up + walk_up + face_right step_end BattleFrontier_BattleTowerBattleRoom_Movement_24217E: @ 824217E - step_00 + face_down step_end BattleFrontier_BattleTowerBattleRoom_Movement_242180: @ 8242180 - step_03 + face_right step_end BattleFrontier_BattleTowerBattleRoom_Movement_242182: @ 8242182 - step_down - step_down - step_down - step_down - step_02 + walk_down + walk_down + walk_down + walk_down + face_left step_end BattleFrontier_BattleTowerBattleRoom_Movement_242188: @ 8242188 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleTowerBattleRoom_Movement_24218D: @ 824218D - step_right - step_right - step_right - step_up + walk_right + walk_right + walk_right + walk_up step_end BattleFrontier_BattleTowerBattleRoom_Movement_242192: @ 8242192 - step_down - step_left - step_left - step_left - step_03 + walk_down + walk_left + walk_left + walk_left + face_right step_end BattleFrontier_BattleTowerBattleRoom_Movement_242198: @ 8242198 - step_54 + set_invisible step_end BattleFrontier_BattleTowerBattleRoom_Movement_24219A: @ 824219A - step_55 - step_14 - step_up - step_left - step_left - step_13 + set_visible + delay_16 + walk_up + walk_left + walk_left + delay_8 step_end BattleFrontier_BattleTowerBattleRoom_Movement_2421A1: @ 82421A1 - step_right - step_right - step_down - step_54 + walk_right + walk_right + walk_down + set_invisible step_end BattleFrontier_BattleTowerBattleRoom_Movement_2421A6: @ 82421A6 - step_14 - step_14 - step_14 - step_14 + delay_16 + delay_16 + delay_16 + delay_16 step_end BattleFrontier_BattleTowerBattleRoom_Movement_2421AB: @ 82421AB - step_03 - step_14 - step_14 - step_14 - step_14 - step_20 + face_right + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_right step_end BattleFrontier_BattleTowerBattleRoom_Movement_2421B2: @ 82421B2 - slow_step_down - slow_step_down - slow_step_down - slow_step_down - step_02 + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down + face_left step_end BattleFrontier_BattleTowerBattleRoom2_EventScript_2421B8:: @ 82421B8 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc index f22b0de26..81c2dd563 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc @@ -415,72 +415,72 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249514:: @ 8249514 return BattleFrontier_BattleTowerBattleRoom2_Movement_249518: @ 8249518 - step_up - step_up - step_up - step_up - step_03 + walk_up + walk_up + walk_up + walk_up + face_right step_end BattleFrontier_BattleTowerBattleRoom2_Movement_24951E: @ 824951E - step_left - step_up - step_up - step_up - step_03 + walk_left + walk_up + walk_up + walk_up + face_right step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249524: @ 8249524 - step_02 + face_left step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249526: @ 8249526 - step_28 + walk_in_place_fastest_right step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249528: @ 8249528 - step_down - step_down - step_down - step_down - step_02 + walk_down + walk_down + walk_down + walk_down + face_left step_end BattleFrontier_BattleTowerBattleRoom2_Movement_24952E: @ 824952E - step_right - step_down - step_down - step_down - step_02 + walk_right + walk_down + walk_down + walk_down + face_left step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249534: @ 8249534 - step_up - step_up - step_up - step_54 + walk_up + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249539: @ 8249539 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleTowerBattleRoom2_Movement_24953E: @ 824953E - step_right - step_right + walk_right + walk_right step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249541: @ 8249541 - step_left - step_left - step_28 + walk_left + walk_left + walk_in_place_fastest_right step_end BattleFrontier_BattleTowerBattleRoom2_Movement_249545: @ 8249545 - step_1f + walk_in_place_left step_end BattleFrontier_BattleTowerBattleRoom2_Text_249547: @ 8249547 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc index a1dfa2abc..ef1102175 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor.inc @@ -40,20 +40,20 @@ BattleFrontier_BattleTowerCorridor_EventScript_241B27:: @ 8241B27 end BattleFrontier_BattleTowerCorridor_Movement_241B36: @ 8241B36 - step_right + walk_right BattleFrontier_BattleTowerCorridor_Movement_241B37: @ 8241B37 - step_right - step_right + walk_right + walk_right BattleFrontier_BattleTowerCorridor_Movement_241B39: @ 8241B39 - step_right + walk_right BattleFrontier_BattleTowerCorridor_Movement_241B3A: @ 8241B3A - step_right - step_right - step_right - step_up - step_54 + walk_right + walk_right + walk_right + walk_up + set_invisible step_end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc index af2c67eac..39157609e 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerCorridor2.inc @@ -113,60 +113,60 @@ BattleFrontier_BattleTowerCorridor2_EventScript_248EB2:: @ 8248EB2 return BattleFrontier_BattleTowerCorridor2_Movement_248EBC: @ 8248EBC - step_down - step_right - step_right - step_right - step_right - step_right - step_right + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end BattleFrontier_BattleTowerCorridor2_Movement_248EC4: @ 8248EC4 - step_down - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end BattleFrontier_BattleTowerCorridor2_Movement_248ECC: @ 8248ECC - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_28 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_in_place_fastest_right step_end BattleFrontier_BattleTowerCorridor2_Movement_248ED5: @ 8248ED5 - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_27 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_in_place_fastest_left step_end BattleFrontier_BattleTowerCorridor2_Movement_248EDE: @ 8248EDE - step_14 - step_up - step_up - step_54 + delay_16 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleTowerCorridor2_Movement_248EE3: @ 8248EE3 - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleTowerCorridor2_Movement_248EE6: @ 8248EE6 - step_down + walk_down step_end diff --git a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc index 095e75394..433d8e181 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerElevator.inc @@ -57,27 +57,27 @@ BattleFrontier_BattleTowerElevator_EventScript_241A7C:: @ 8241A7C return BattleFrontier_BattleTowerElevator_Movement_241A86: @ 8241A86 - step_up - step_right - step_00 + walk_up + walk_right + face_down step_end BattleFrontier_BattleTowerElevator_Movement_241A8A: @ 8241A8A - step_up - step_up - step_00 + walk_up + walk_up + face_down step_end BattleFrontier_BattleTowerElevator_Movement_241A8E: @ 8241A8E - step_down - step_down - step_54 + walk_down + walk_down + set_invisible step_end BattleFrontier_BattleTowerElevator_Movement_241A92: @ 8241A92 - step_right - step_down - step_down + walk_right + walk_down + walk_down step_end BattleFrontier_BattleTowerElevator_MapScript2_241A96: @ 8241A96 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc index 9f2099b32..d899b1cbe 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerLobby.inc @@ -781,29 +781,29 @@ BattleFrontier_BattleTowerLobby_EventScript_23F15B:: @ 823F15B return BattleFrontier_BattleTowerLobby_Movement_23F195: @ 823F195 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end BattleFrontier_BattleTowerLobby_Movement_23F199: @ 823F199 - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleTowerLobby_Movement_23F19C: @ 823F19C - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleTowerLobby_Movement_23F1A0: @ 823F1A0 - step_16 - step_16 - step_16 - step_16 - step_16 - step_54 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + set_invisible step_end BattleFrontier_BattleTowerLobby_EventScript_23F1A7:: @ 823F1A7 diff --git a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc index e6c99541d..c1d3534d3 100644 --- a/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc +++ b/data/scripts/maps/BattleFrontier_BattleTowerMultiBattleRoom.inc @@ -74,12 +74,12 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E41:: @ 8243E41 end BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E75: @ 8243E75 - step_down + walk_down step_end BattleFrontier_BattleTowerMultiBattleRoom_Movement_243E77: @ 8243E77 - step_left - step_25 + walk_left + walk_in_place_fastest_down step_end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243E7A:: @ 8243E7A @@ -136,26 +136,26 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F08: @ 8243F08 return BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1A: @ 8243F1A - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F1E: @ 8243F1E - step_right - step_up - step_54 + walk_right + walk_up + set_invisible step_end BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F22: @ 8243F22 - step_left - step_up - step_54 + walk_left + walk_up + set_invisible step_end BattleFrontier_BattleTowerMultiBattleRoom_Movement_243F26: @ 8243F26 - step_up - step_54 + walk_up + set_invisible step_end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29 @@ -223,24 +223,24 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF:: @ 8243FDF return BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FEA: @ 8243FEA - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end BattleFrontier_BattleTowerMultiBattleRoom_Movement_243FF2: @ 8243FF2 - step_17 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FFB:: @ 8243FFB diff --git a/data/scripts/maps/BattleFrontier_OutsideEast.inc b/data/scripts/maps/BattleFrontier_OutsideEast.inc index bf0d3ff16..dff56322a 100644 --- a/data/scripts/maps/BattleFrontier_OutsideEast.inc +++ b/data/scripts/maps/BattleFrontier_OutsideEast.inc @@ -151,21 +151,21 @@ BattleFrontier_OutsideEast_EventScript_242D60:: @ 8242D60 end BattleFrontier_OutsideEast_Movement_242D69: @ 8242D69 - step_03 - step_13 - step_00 - step_13 - step_02 - step_13 - step_00 - step_13 - step_03 - step_13 - step_00 - step_13 - step_02 - step_13 - step_00 + face_right + delay_8 + face_down + delay_8 + face_left + delay_8 + face_down + delay_8 + face_right + delay_8 + face_down + delay_8 + face_left + delay_8 + face_down step_end BattleFrontier_OutsideEast_EventScript_242D79:: @ 8242D79 diff --git a/data/scripts/maps/BattleFrontier_OutsideWest.inc b/data/scripts/maps/BattleFrontier_OutsideWest.inc index f5886bfff..fa2ff7e36 100644 --- a/data/scripts/maps/BattleFrontier_OutsideWest.inc +++ b/data/scripts/maps/BattleFrontier_OutsideWest.inc @@ -202,23 +202,23 @@ BattleFrontier_OutsideWest_EventScript_23D61E:: @ 823D61E return BattleFrontier_OutsideWest_Movement_23D629: @ 823D629 - step_25 - step_25 + walk_in_place_fastest_down + walk_in_place_fastest_down step_end BattleFrontier_OutsideWest_Movement_23D62C: @ 823D62C - step_26 - step_26 + walk_in_place_fastest_up + walk_in_place_fastest_up step_end BattleFrontier_OutsideWest_Movement_23D62F: @ 823D62F - step_28 - step_28 + walk_in_place_fastest_right + walk_in_place_fastest_right step_end BattleFrontier_OutsideWest_Movement_23D632: @ 823D632 - step_27 - step_27 + walk_in_place_fastest_left + walk_in_place_fastest_left step_end BattleFrontier_OutsideWest_EventScript_23D635:: @ 823D635 diff --git a/data/scripts/maps/BattleFrontier_ReceptionGate.inc b/data/scripts/maps/BattleFrontier_ReceptionGate.inc index eca861f85..ec38c3e9d 100644 --- a/data/scripts/maps/BattleFrontier_ReceptionGate.inc +++ b/data/scripts/maps/BattleFrontier_ReceptionGate.inc @@ -63,59 +63,59 @@ BattleFrontier_ReceptionGate_EventScript_266229:: @ 8266229 end BattleFrontier_ReceptionGate_Movement_2662D2: @ 82662D2 - step_up - step_up - step_left - step_left + walk_up + walk_up + walk_left + walk_left step_end BattleFrontier_ReceptionGate_Movement_2662D7: @ 82662D7 - step_14 - step_14 - step_14 - step_13 - step_28 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_right step_end BattleFrontier_ReceptionGate_Movement_2662DD: @ 82662DD - step_down - step_down + walk_down + walk_down step_end BattleFrontier_ReceptionGate_Movement_2662E0: @ 82662E0 - step_down - step_down - step_down - step_down - step_down - step_down - step_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left step_end BattleFrontier_ReceptionGate_Movement_2662E8: @ 82662E8 - step_right - step_up - step_up - step_up - step_up - step_up - step_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end BattleFrontier_ReceptionGate_Movement_2662F0: @ 82662F0 - step_14 - step_14 - step_14 - step_13 - step_28 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_right step_end BattleFrontier_ReceptionGate_Movement_2662F6: @ 82662F6 - step_14 - step_14 - step_14 - step_13 - step_27 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_left step_end BattleFrontier_ReceptionGate_EventScript_2662FC:: @ 82662FC diff --git a/data/scripts/maps/BirthIsland_Exterior.inc b/data/scripts/maps/BirthIsland_Exterior.inc index 6fd637461..b2427e95d 100644 --- a/data/scripts/maps/BirthIsland_Exterior.inc +++ b/data/scripts/maps/BirthIsland_Exterior.inc @@ -114,12 +114,12 @@ BirthIsland_Exterior_EventScript_268049:: @ 8268049 end BirthIsland_Exterior_Movement_268054: @ 8268054 - slow_step_down - slow_step_down - slow_step_down - slow_step_down - slow_step_down - slow_step_down - slow_step_down + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down + walk_slow_down step_end diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index f78d4ea15..1edc1407d 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -197,401 +197,401 @@ DewfordTown_EventScript_1E9799:: @ 81E9799 return DewfordTown_Movement_1E97A2: @ 81E97A2 - 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 + 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 step_end DewfordTown_Movement_1E9865: @ 81E9865 - 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 + 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 step_end DewfordTown_Movement_1E9911: @ 81E9911 - step_right - step_up + walk_right + walk_up step_end DewfordTown_Movement_1E9914: @ 81E9914 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end DewfordTown_Movement_1E9918: @ 81E9918 - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end DewfordTown_Movement_1E991D: @ 81E991D - step_up + walk_up step_end DewfordTown_Movement_1E991F: @ 81E991F - step_up - step_up + walk_up + walk_up step_end DewfordTown_EventScript_1E9922:: @ 81E9922 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 4d4c3732d..37122a640 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -241,11 +241,11 @@ DewfordTown_Hall_EventScript_1FD7C0:: @ 81FD7C0 return DewfordTown_Hall_Movement_1FD7D6: @ 81FD7D6 - step_1f + walk_in_place_left step_end DewfordTown_Hall_Movement_1FD7D8: @ 81FD7D8 - step_20 + walk_in_place_right step_end DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 71410a43f..bed242a2b 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -33,8 +33,8 @@ EverGrandeCity_ChampionsRoom_EventScript_228A1E:: @ 8228A1E end EverGrandeCity_ChampionsRoom_Movement_228A42: @ 8228A42 - step_up - step_up + walk_up + walk_up step_end EverGrandeCity_ChampionsRoom_EventScript_228A45:: @ 8228A45 @@ -163,66 +163,66 @@ EverGrandeCity_ChampionsRoom_EventScript_228C12:: @ 8228C12 return EverGrandeCity_ChampionsRoom_Movement_228C1D: @ 8228C1D - step_up - step_up + walk_up + walk_up step_end EverGrandeCity_ChampionsRoom_Movement_228C20: @ 8228C20 - step_up - step_14 - step_up - step_13 - step_54 + walk_up + delay_16 + walk_up + delay_8 + set_invisible step_end EverGrandeCity_ChampionsRoom_Movement_228C26: @ 8228C26 - step_up - step_up - step_up - step_up - step_up - step_left - step_up - step_28 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_up + walk_in_place_fastest_right step_end EverGrandeCity_ChampionsRoom_Movement_228C2F: @ 8228C2F - step_26 - step_14 - step_28 - step_14 - step_26 - step_13 - step_28 - step_14 + 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 step_end EverGrandeCity_ChampionsRoom_Movement_228C38: @ 8228C38 - step_right - step_up + walk_right + walk_up step_end EverGrandeCity_ChampionsRoom_Movement_228C3B: @ 8228C3B - step_up - step_up - step_25 + walk_up + walk_up + walk_in_place_fastest_down step_end EverGrandeCity_ChampionsRoom_Movement_228C3F: @ 8228C3F - step_up - step_13 - step_54 + walk_up + delay_8 + set_invisible step_end EverGrandeCity_ChampionsRoom_Movement_228C43: @ 8228C43 - step_up - step_up - step_up - step_up - step_up - step_right - step_up - step_27 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_up + walk_in_place_fastest_left step_end EverGrandeCity_ChampionsRoom_Text_228C4C: @ 8228C4C diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index de29dca0f..60f0dd1ad 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -67,20 +67,20 @@ EverGrandeCity_HallOfFame_EventScript_2298F5:: @ 82298F5 end EverGrandeCity_HallOfFame_Movement_229901: @ 8229901 - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end EverGrandeCity_HallOfFame_Movement_229908: @ 8229908 - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end EverGrandeCity_HallOfFame_Text_22990E: @ 822990E diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc index a9e27ec73..ed6e6a497 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc @@ -61,21 +61,21 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229AC1:: @ 8229AC1 return EverGrandeCity_PokemonCenter_1F_Movement_229ACC: @ 8229ACC - step_left - step_down - step_down - step_left - step_down - step_down + walk_left + walk_down + walk_down + walk_left + walk_down + walk_down step_end EverGrandeCity_PokemonCenter_1F_Movement_229AD3: @ 8229AD3 - step_down - step_down - step_left - step_left - step_down - step_down + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down step_end EverGrandeCity_PokemonCenter_1F_Text_229ADA: @ 8229ADA diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc index 4fd73b3bf..f1a6ce17f 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague_1F.inc @@ -103,25 +103,25 @@ EverGrandeCity_PokemonLeague_1F_EventScript_2296BB:: @ 82296BB end EverGrandeCity_PokemonLeague_1F_Movement_2296DA: @ 82296DA - step_down - step_left - step_26 + walk_down + walk_left + walk_in_place_fastest_up step_end EverGrandeCity_PokemonLeague_1F_Movement_2296DE: @ 82296DE - step_down - step_right - step_26 + walk_down + walk_right + walk_in_place_fastest_up step_end EverGrandeCity_PokemonLeague_1F_Movement_2296E2: @ 82296E2 - step_left - step_25 + walk_left + walk_in_place_fastest_down step_end EverGrandeCity_PokemonLeague_1F_Movement_2296E5: @ 82296E5 - step_right - step_25 + walk_right + walk_in_place_fastest_down step_end EverGrandeCity_PokemonLeague_1F_Text_2296E8: @ 82296E8 diff --git a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc index f6750009d..48703897e 100644 --- a/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc @@ -203,56 +203,56 @@ FallarborTown_BattleTentBattleRoom_EventScript_200B73:: @ 8200B73 end FallarborTown_BattleTentBattleRoom_Movement_200B8D: @ 8200B8D - step_up - step_up - step_up - step_28 + walk_up + walk_up + walk_up + walk_in_place_fastest_right step_end FallarborTown_BattleTentBattleRoom_Movement_200B92: @ 8200B92 - step_28 + walk_in_place_fastest_right step_end FallarborTown_BattleTentBattleRoom_Movement_200B94: @ 8200B94 - step_27 + walk_in_place_fastest_left step_end FallarborTown_BattleTentBattleRoom_Movement_200B96: @ 8200B96 - step_down - step_down - step_down - step_down - step_27 + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end FallarborTown_BattleTentBattleRoom_Movement_200B9C: @ 8200B9C - step_left + walk_left step_end FallarborTown_BattleTentBattleRoom_Movement_200B9E: @ 8200B9E - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end FallarborTown_BattleTentBattleRoom_Movement_200BA3: @ 8200BA3 - step_51 - step_46 + disable_jump_landing_ground_effect + jump_in_place_down step_end FallarborTown_BattleTentBattleRoom_Movement_200BA6: @ 8200BA6 - step_down - step_down - step_down - step_28 + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end FallarborTown_BattleTentBattleRoom_Movement_200BAB: @ 8200BAB - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end FallarborTown_BattleTentBattleRoom_MapScript2_200BB0: @ 8200BB0 diff --git a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc b/data/scripts/maps/FallarborTown_BattleTentCorridor.inc index 1325b0332..f1d3024c0 100644 --- a/data/scripts/maps/FallarborTown_BattleTentCorridor.inc +++ b/data/scripts/maps/FallarborTown_BattleTentCorridor.inc @@ -26,18 +26,18 @@ FallarborTown_BattleTentCorridor_EventScript_2006B7:: @ 82006B7 end FallarborTown_BattleTentCorridor_Movement_2006FB: @ 82006FB - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end FallarborTown_BattleTentCorridor_Movement_200700: @ 8200700 - step_up + walk_up FallarborTown_BattleTentCorridor_Movement_200701: @ 8200701 - step_up - step_54 + walk_up + set_invisible step_end FallarborTown_BattleTentCorridor_Text_200704: @ 8200704 diff --git a/data/scripts/maps/FallarborTown_BattleTentLobby.inc b/data/scripts/maps/FallarborTown_BattleTentLobby.inc index 327221120..1bde88e7d 100644 --- a/data/scripts/maps/FallarborTown_BattleTentLobby.inc +++ b/data/scripts/maps/FallarborTown_BattleTentLobby.inc @@ -257,26 +257,26 @@ FallarborTown_BattleTentLobby_EventScript_2001CF:: @ 82001CF return FallarborTown_BattleTentLobby_Movement_2001FE: @ 82001FE - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end FallarborTown_BattleTentLobby_Movement_200202: @ 8200202 - step_up - step_54 + walk_up + set_invisible step_end FallarborTown_BattleTentLobby_Movement_200205: @ 8200205 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end FallarborTown_BattleTentLobby_Movement_200209: @ 8200209 - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end FallarborTown_BattleTentLobby_EventScript_20020D:: @ 820020D diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 1cc3999f7..15f5d2b9e 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -54,31 +54,31 @@ FallarborTown_PokemonCenter_1F_EventScript_200C48:: @ 8200C48 end FallarborTown_PokemonCenter_1F_Movement_200C53: @ 8200C53 - step_right - step_down - step_down - step_left - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_13 + walk_right + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + delay_8 step_end FallarborTown_PokemonCenter_1F_Movement_200C60: @ 8200C60 - step_down - step_down - step_left - step_left - step_left - step_down - step_down - step_down - step_down - step_13 + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + delay_8 step_end FallarborTown_PokemonCenter_1F_Text_200C6B: @ 8200C6B diff --git a/data/scripts/maps/FarawayIsland_Interior.inc b/data/scripts/maps/FarawayIsland_Interior.inc index 42b18983f..e7d67431d 100644 --- a/data/scripts/maps/FarawayIsland_Interior.inc +++ b/data/scripts/maps/FarawayIsland_Interior.inc @@ -72,51 +72,51 @@ FarawayIsland_Interior_EventScript_267DA2:: @ 8267DA2 end FarawayIsland_Interior_Movement_267DCE: @ 8267DCE - step_up - step_up - step_up - step_25 - step_54 + walk_up + walk_up + walk_up + walk_in_place_fastest_down + set_invisible step_end FarawayIsland_Interior_Movement_267DD4: @ 8267DD4 - step_55 + set_visible step_end FarawayIsland_Interior_Movement_267DD6: @ 8267DD6 - step_40 - step_16 - step_16 - step_41 - step_1d - step_1d + lock_facing_direction + walk_fast_up + walk_fast_up + unlock_facing_direction + walk_in_place_down + walk_in_place_down step_end FarawayIsland_Interior_Movement_267DDD: @ 8267DDD - step_40 - step_16 - step_16 - step_41 - step_1e - step_1e + lock_facing_direction + walk_fast_up + walk_fast_up + unlock_facing_direction + walk_in_place_up + walk_in_place_up step_end FarawayIsland_Interior_Movement_267DE4: @ 8267DE4 - step_40 - step_16 - step_16 - step_41 - step_20 - step_20 + lock_facing_direction + walk_fast_up + walk_fast_up + unlock_facing_direction + walk_in_place_right + walk_in_place_right step_end FarawayIsland_Interior_Movement_267DEB: @ 8267DEB - step_40 - step_16 - step_16 - step_41 - step_1f - step_1f + lock_facing_direction + walk_fast_up + walk_fast_up + unlock_facing_direction + walk_in_place_left + walk_in_place_left step_end FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 0b4b71c2b..4a28a180b 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -87,7 +87,7 @@ FortreeCity_EventScript_1E2645:: @ 81E2645 end FortreeCity_Movement_1E2674: @ 81E2674 - step_right + walk_right step_end FortreeCity_Text_1E2676: @ 81E2676 diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index 521e99021..27ead9ec2 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -49,11 +49,11 @@ FortreeCity_House4_EventScript_217D06:: @ 8217D06 end FortreeCity_House4_Movement_217D1A: @ 8217D1A - step_15 - step_15 - step_18 - step_25 - step_13 + walk_fast_down + walk_fast_down + walk_fast_right + walk_in_place_fastest_down + delay_8 step_end FortreeCity_House4_EventScript_217D20:: @ 8217D20 diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 9d61bc1a5..b057a0548 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -58,30 +58,30 @@ GraniteCave_StevensRoom_EventScript_22DD3C:: @ 822DD3C return GraniteCave_StevensRoom_Movement_22DD45: @ 822DD45 - step_up - step_up - step_up - step_up - step_up - step_13 + walk_up + walk_up + walk_up + walk_up + walk_up + delay_8 step_end GraniteCave_StevensRoom_Movement_22DD4C: @ 822DD4C - step_14 - step_14 - step_14 - step_26 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_up step_end GraniteCave_StevensRoom_Movement_22DD51: @ 822DD51 - step_left - step_up - step_up - step_up - step_right - step_up - step_up - step_13 + walk_left + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + delay_8 step_end GraniteCave_StevensRoom_Text_22DD5A: @ 822DD5A diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 0631a5d33..5670d9b6e 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -162,57 +162,57 @@ LavaridgeTown_EventScript_1EA6C9:: @ 81EA6C9 return LavaridgeTown_Movement_1EA6D4: @ 81EA6D4 - step_18 - step_18 - step_18 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + 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 step_end LavaridgeTown_Movement_1EA6DF: @ 81EA6DF - step_14 - step_13 - step_28 + delay_16 + delay_8 + walk_in_place_fastest_right step_end LavaridgeTown_Movement_1EA6E3: @ 81EA6E3 - step_15 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 + 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 step_end LavaridgeTown_Movement_1EA6ED: @ 81EA6ED - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end LavaridgeTown_Movement_1EA6F4: @ 81EA6F4 - step_left - step_left - step_up + walk_left + walk_left + walk_up step_end LavaridgeTown_Movement_1EA6F8: @ 81EA6F8 - step_down + walk_down step_end LavaridgeTown_EventScript_1EA6FA:: @ 81EA6FA - specialvar VAR_RESULT, player_get_direction_lower_nybble + specialvar VAR_RESULT, GetPlayerFacingDirection compare VAR_RESULT, 1 goto_eq LavaridgeTown_EventScript_1EA70B end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 1c4d21970..1f65b88fd 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -160,45 +160,45 @@ LilycoveCity_ContestLobby_EventScript_21A403:: @ 821A403 return LilycoveCity_ContestLobby_Movement_21A407: @ 821A407 - step_down - step_down - step_down - step_right - step_right - step_right - step_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right step_end LilycoveCity_ContestLobby_Movement_21A40F: @ 821A40F - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end LilycoveCity_ContestLobby_Movement_21A418: @ 821A418 - step_27 + walk_in_place_fastest_left step_end LilycoveCity_ContestLobby_Movement_21A41A: @ 821A41A - step_down - step_down - step_down + walk_down + walk_down + walk_down step_end LilycoveCity_ContestLobby_Movement_21A41E: @ 821A41E - step_14 - step_14 - step_14 - step_14 - step_16 - step_16 - step_16 - step_28 + delay_16 + delay_16 + delay_16 + delay_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_in_place_fastest_right step_end LilycoveCity_ContestLobby_EventScript_21A427:: @ 821A427 @@ -275,46 +275,46 @@ LilycoveCity_ContestLobby_EventScript_21A4E4:: @ 821A4E4 return LilycoveCity_ContestLobby_Movement_21A533: @ 821A533 - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left step_end LilycoveCity_ContestLobby_Movement_21A53C: @ 821A53C - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end LilycoveCity_ContestLobby_Movement_21A545: @ 821A545 - step_28 + walk_in_place_fastest_right step_end LilycoveCity_ContestLobby_Movement_21A547: @ 821A547 - step_down - step_down - step_down + walk_down + walk_down + walk_down step_end LilycoveCity_ContestLobby_Movement_21A54B: @ 821A54B - step_14 - step_14 - step_14 - step_14 - step_16 - step_16 - step_16 - step_27 + delay_16 + delay_16 + delay_16 + delay_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_in_place_fastest_left step_end LilycoveCity_ContestLobby_EventScript_21A554:: @ 821A554 @@ -433,47 +433,47 @@ LilycoveCity_ContestLobby_EventScript_21A670:: @ 821A670 return LilycoveCity_ContestLobby_Movement_21A6E8: @ 821A6E8 - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible step_end LilycoveCity_ContestLobby_Movement_21A6F2: @ 821A6F2 - step_27 - step_left + walk_in_place_fastest_left + walk_left step_end LilycoveCity_ContestLobby_Movement_21A6F5: @ 821A6F5 - step_left - step_left - step_25 + walk_left + walk_left + walk_in_place_fastest_down step_end LilycoveCity_ContestLobby_Movement_21A6F9: @ 821A6F9 - step_down - step_down - step_26 + walk_down + walk_down + walk_in_place_fastest_up step_end LilycoveCity_ContestLobby_Movement_21A6FD: @ 821A6FD - step_left - step_left - step_left - step_up - step_up - step_up - step_13 - step_54 + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + delay_8 + set_invisible step_end LilycoveCity_ContestLobby_Movement_21A706: @ 821A706 - step_28 + walk_in_place_fastest_right step_end LilycoveCity_ContestLobby_EventScript_21A708:: @ 821A708 @@ -959,48 +959,48 @@ LilycoveCity_ContestLobby_EventScript_21AC49:: @ 821AC49 return LilycoveCity_ContestLobby_Movement_21ACD0: @ 821ACD0 - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_13 - step_54 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + delay_8 + set_invisible step_end LilycoveCity_ContestLobby_Movement_21ACDB: @ 821ACDB - step_right + walk_right step_end LilycoveCity_ContestLobby_Movement_21ACDD: @ 821ACDD - step_right - step_right - step_25 + walk_right + walk_right + walk_in_place_fastest_down step_end LilycoveCity_ContestLobby_Movement_21ACE1: @ 821ACE1 - step_down - step_down - step_26 + walk_down + walk_down + walk_in_place_fastest_up step_end LilycoveCity_ContestLobby_Movement_21ACE5: @ 821ACE5 - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_13 - step_54 + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + delay_8 + set_invisible step_end LilycoveCity_ContestLobby_Movement_21ACEF: @ 821ACEF - step_27 + walk_in_place_fastest_left step_end LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index 5f2b79a5d..3468299a9 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -59,20 +59,20 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_218211:: @ 8218211 end LilycoveCity_CoveLilyMotel_1F_Movement_218259: @ 8218259 - step_03 - step_40 - step_left - step_41 + face_right + lock_facing_direction + walk_left + unlock_facing_direction step_end LilycoveCity_CoveLilyMotel_1F_Movement_21825E: @ 821825E - step_up + walk_up step_end LilycoveCity_CoveLilyMotel_1F_Movement_218260: @ 8218260 - step_00 - step_down - step_01 + face_down + walk_down + face_up step_end LilycoveCity_CoveLilyMotel_1F_Text_218264: @ 8218264 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index f57ca14b5..6357326c1 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -454,16 +454,16 @@ LilycoveCity_Harbor_EventScript_21E626:: @ 821E626 end LilycoveCity_Harbor_Movement_21E630: @ 821E630 - step_right - step_26 + walk_right + walk_in_place_fastest_up step_end LilycoveCity_Harbor_Movement_21E633: @ 821E633 - step_up + walk_up step_end LilycoveCity_Harbor_Movement_21E635: @ 821E635 - step_up + walk_up step_end LilycoveCity_Harbor_EventScript_21E637:: @ 821E637 @@ -491,16 +491,16 @@ LilycoveCity_Harbor_EventScript_21E661:: @ 821E661 return LilycoveCity_Harbor_Movement_21E66C: @ 821E66C - step_28 - step_40 - step_left - step_41 + walk_in_place_fastest_right + lock_facing_direction + walk_left + unlock_facing_direction step_end LilycoveCity_Harbor_Movement_21E671: @ 821E671 - step_40 - step_down - step_41 + lock_facing_direction + walk_down + unlock_facing_direction step_end LilycoveCity_Harbor_EventScript_21E675:: @ 821E675 @@ -538,43 +538,43 @@ LilycoveCity_Harbor_EventScript_21E6BA:: @ 821E6BA return LilycoveCity_Harbor_Movement_21E6D3: @ 821E6D3 - step_26 - step_13 - step_54 + walk_in_place_fastest_up + delay_8 + set_invisible step_end LilycoveCity_Harbor_Movement_21E6D7: @ 821E6D7 - step_14 - step_up - step_14 - step_54 + delay_16 + walk_up + delay_16 + set_invisible step_end LilycoveCity_Harbor_Movement_21E6DC: @ 821E6DC - step_14 - step_14 - step_14 - step_right - step_26 - step_14 - step_54 + delay_16 + delay_16 + delay_16 + walk_right + walk_in_place_fastest_up + delay_16 + set_invisible step_end LilycoveCity_Harbor_Movement_21E6E4: @ 821E6E4 - step_14 - step_right - step_26 - step_14 - step_54 + delay_16 + walk_right + walk_in_place_fastest_up + delay_16 + set_invisible step_end LilycoveCity_Harbor_Movement_21E6EA: @ 821E6EA - step_14 - step_14 - step_14 - step_up - step_14 - step_54 + delay_16 + delay_16 + delay_16 + walk_up + delay_16 + set_invisible step_end LilycoveCity_Harbor_Text_21E6F1: @ 821E6F1 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 8103a623c..507997416 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -70,22 +70,22 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_218D84:: @ 8218D84 end LilycoveCity_LilycoveMuseum_1F_Movement_218D99: @ 8218D99 - step_up + walk_up step_end LilycoveCity_LilycoveMuseum_1F_Movement_218D9B: @ 8218D9B - step_left - step_up + walk_left + walk_up step_end LilycoveCity_LilycoveMuseum_1F_Movement_218D9E: @ 8218D9E - step_right - step_up + walk_right + walk_up step_end LilycoveCity_LilycoveMuseum_1F_Movement_218DA1: @ 8218DA1 - step_up - step_up + walk_up + walk_up step_end LilycoveCity_LilycoveMuseum_1F_EventScript_218DA4:: @ 8218DA4 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 97dba4704..6b4f0f3da 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -86,12 +86,12 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219808:: @ 8219808 end LilycoveCity_LilycoveMuseum_2F_Movement_219861: @ 8219861 - step_27 + walk_in_place_fastest_left step_end LilycoveCity_LilycoveMuseum_2F_Movement_219863: @ 8219863 - step_01 - step_14 + face_up + delay_16 step_end LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866 diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index cdcef8e9a..74146fc7e 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -29,35 +29,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C79A:: @ 821C79A end LilycoveCity_PokemonTrainerFanClub_Movement_21C7F5: @ 821C7F5 - step_13 - step_25 - step_down - step_down - step_down - step_left - step_left + delay_8 + walk_in_place_fastest_down + walk_down + walk_down + walk_down + walk_left + walk_left step_end LilycoveCity_PokemonTrainerFanClub_Movement_21C7FD: @ 821C7FD - step_17 - step_17 - step_15 - step_15 - step_17 - step_15 + walk_fast_left + walk_fast_left + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_down step_end LilycoveCity_PokemonTrainerFanClub_Movement_21C804: @ 821C804 - step_down - step_28 + walk_down + walk_in_place_fastest_right step_end LilycoveCity_PokemonTrainerFanClub_Movement_21C807: @ 821C807 - step_49 - step_16 - step_16 - step_18 - step_25 + jump_in_place_right + walk_fast_up + walk_fast_up + walk_fast_right + walk_in_place_fastest_down step_end LilycoveCity_PokemonTrainerFanClub_MapScript1_21C80D: @ 821C80D diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 0fcdc46d5..67b1f9381 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -146,42 +146,42 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17 return LittlerootTown_Movement_1E7F98: @ 81E7F98 - step_down + walk_down step_end LittlerootTown_Movement_1E7F9A: @ 81E7F9A - step_down - step_27 + walk_down + walk_in_place_fastest_left step_end LittlerootTown_Movement_1E7F9D: @ 81E7F9D - step_14 - step_13 - step_up + delay_16 + delay_8 + walk_up step_end LittlerootTown_Movement_1E7FA1: @ 81E7FA1 - step_up - step_54 + walk_up + set_invisible step_end LittlerootTown_Movement_1E7FA4: @ 81E7FA4 - step_14 - step_13 - step_right - step_26 + delay_16 + delay_8 + walk_right + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E7FA9: @ 81E7FA9 - step_up - step_up + walk_up + walk_up step_end LittlerootTown_Movement_1E7FAC: @ 81E7FAC - step_45 - step_14 - step_14 - step_14 + jump_right + delay_16 + delay_16 + delay_16 step_end LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1 @@ -287,41 +287,41 @@ LittlerootTown_EventScript_1E80AD:: @ 81E80AD return LittlerootTown_Movement_1E80D1: @ 81E80D1 - 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 + 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 step_end LittlerootTown_Movement_1E80DF: @ 81E80DF - step_down + walk_down step_end LittlerootTown_Movement_1E80E1: @ 81E80E1 - step_right - step_down - step_down - step_left - step_left - step_left - step_left - step_up - step_25 + walk_right + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_up + walk_in_place_fastest_down step_end LittlerootTown_Movement_1E80EB: @ 81E80EB - step_40 - step_down - step_41 + lock_facing_direction + walk_down + unlock_facing_direction step_end LittlerootTown_EventScript_1E80EF:: @ 81E80EF @@ -335,27 +335,27 @@ LittlerootTown_EventScript_1E80EF:: @ 81E80EF end LittlerootTown_Movement_1E810B: @ 81E810B - step_03 - step_13 - step_51 - step_49 - step_13 - step_18 - step_18 - step_18 - step_16 - step_16 - step_18 - step_00 + 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 step_end LittlerootTown_Movement_1E8118: @ 81E8118 - step_left - step_down - step_left - step_left - step_left - step_25 + walk_left + walk_down + walk_left + walk_left + walk_left + walk_in_place_fastest_down step_end LittlerootTown_EventScript_1E811F:: @ 81E811F @@ -739,153 +739,153 @@ LittlerootTown_EventScript_1E85AB:: @ 81E85AB return LittlerootTown_Movement_1E85D1: @ 81E85D1 - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_Movement_1E85D8: @ 81E85D8 - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_Movement_1E85DF: @ 81E85DF - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right step_end LittlerootTown_Movement_1E85E4: @ 81E85E4 - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end LittlerootTown_Movement_1E85EA: @ 81E85EA - step_right - step_right + walk_right + walk_right step_end LittlerootTown_Movement_1E85ED: @ 81E85ED - step_right - step_right - step_right + walk_right + walk_right + walk_right step_end LittlerootTown_Movement_1E85F1: @ 81E85F1 - step_left - step_left - step_left + walk_left + walk_left + walk_left step_end LittlerootTown_Movement_1E85F5: @ 81E85F5 - step_left - step_left + walk_left + walk_left step_end LittlerootTown_Movement_1E85F8: @ 81E85F8 - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end LittlerootTown_Movement_1E85FE: @ 81E85FE - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left step_end LittlerootTown_Movement_1E8603: @ 81E8603 - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end LittlerootTown_Movement_1E8609: @ 81E8609 - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end LittlerootTown_Movement_1E860F: @ 81E860F - step_left - step_left - step_left - step_left - step_26 + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E8615: @ 81E8615 - step_left - step_left - step_left - step_left - step_left - step_26 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E861C: @ 81E861C - step_left - step_left - step_26 + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E8620: @ 81E8620 - step_left - step_left - step_left - step_26 + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E8625: @ 81E8625 - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E862A: @ 81E862A - step_right - step_right - step_26 + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E862E: @ 81E862E - step_right - step_right - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E8635: @ 81E8635 - step_right - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_Movement_1E863B: @ 81E863B - step_up + walk_up step_end LittlerootTown_EventScript_1E863D:: @ 81E863D diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 0f3fa1a0e..53825a84c 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -71,7 +71,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F7814:: @ 81F7814 end LittlerootTown_BrendansHouse_1F_Movement_1F783A: @ 81F783A - step_up + walk_up step_end LittlerootTown_BrendansHouse_1F_EventScript_1F783C:: @ 81F783C @@ -106,12 +106,12 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E end LittlerootTown_BrendansHouse_1F_Movement_1F789C: @ 81F789C - step_down - step_right - step_right - step_right - step_right - step_right + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right step_end LittlerootTown_BrendansHouse_1F_EventScript_1F78A3:: @ 81F78A3 @@ -202,29 +202,29 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F79A2:: @ 81F79A2 return LittlerootTown_BrendansHouse_1F_Movement_1F79AD: @ 81F79AD - step_27 - step_left - step_26 - step_up - step_up - step_up - step_up + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_BrendansHouse_1F_Movement_1F79B5: @ 81F79B5 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end LittlerootTown_BrendansHouse_1F_Movement_1F79B9: @ 81F79B9 - step_28 - step_right - step_26 - step_up - step_up - step_up - step_up + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_BrendansHouse_1F_EventScript_1F79C1:: @ 81F79C1 @@ -246,52 +246,52 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F79E5:: @ 81F79E5 return LittlerootTown_BrendansHouse_1F_Movement_1F79F7: @ 81F79F7 - step_14 - step_13 - step_28 + delay_16 + delay_8 + walk_in_place_fastest_right step_end LittlerootTown_BrendansHouse_1F_Movement_1F79FB: @ 81F79FB - step_14 - step_13 - step_28 - step_14 - step_14 - step_26 + delay_16 + delay_8 + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_up step_end LittlerootTown_BrendansHouse_1F_Movement_1F7A02: @ 81F7A02 - step_14 - step_13 - step_27 + delay_16 + delay_8 + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_1F_Movement_1F7A06: @ 81F7A06 - step_28 - step_right - step_26 - step_up - step_up + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up step_end LittlerootTown_BrendansHouse_1F_Movement_1F7A0C: @ 81F7A0C - step_28 - step_right - step_26 - step_up - step_up - step_27 - step_left - step_26 - step_up + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up step_end LittlerootTown_BrendansHouse_1F_Movement_1F7A16: @ 81F7A16 - step_27 - step_left - step_26 - step_up - step_up + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up + walk_up step_end LittlerootTown_BrendansHouse_1F_Text_1F7A1C: @ 81F7A1C diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index a5223d38a..429c933fc 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -139,110 +139,110 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8594:: @ 81F8594 return LittlerootTown_BrendansHouse_2F_Movement_1F85BC: @ 81F85BC - step_down - step_down - step_27 + walk_down + walk_down + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85C0: @ 81F85C0 - step_left - step_left - step_down - step_down - step_left + walk_left + walk_left + walk_down + walk_down + walk_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85C6: @ 81F85C6 - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_BrendansHouse_2F_Movement_1F85CF: @ 81F85CF - step_14 - step_26 - step_14 - step_14 - step_14 - step_14 - step_27 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85D7: @ 81F85D7 - step_left - step_left - step_left + walk_left + walk_left + walk_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85DB: @ 81F85DB - step_up - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_BrendansHouse_2F_Movement_1F85E2: @ 81F85E2 - step_14 - step_26 - step_14 - step_14 - step_27 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85E8: @ 81F85E8 - step_left - step_left - step_down - step_27 + walk_left + walk_left + walk_down + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85ED: @ 81F85ED - step_up - step_up - step_left - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_BrendansHouse_2F_Movement_1F85F6: @ 81F85F6 - step_13 - step_14 - step_26 - step_14 - step_14 - step_27 + delay_8 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_2F_Movement_1F85FD: @ 81F85FD - step_left - step_left - step_left - step_left - step_left - step_25 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_down step_end LittlerootTown_BrendansHouse_2F_Movement_1F8604: @ 81F8604 - step_up - step_left - step_left - step_26 + walk_up + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_BrendansHouse_2F_Movement_1F8609: @ 81F8609 - step_14 - step_14 - step_27 + delay_16 + delay_16 + walk_in_place_fastest_left step_end gUnknown_081F860D:: @ 81F860D diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index e0229b9ea..9fc2fe53e 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -71,7 +71,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8964:: @ 81F8964 end LittlerootTown_MaysHouse_1F_Movement_1F898A: @ 81F898A - step_up + walk_up step_end LittlerootTown_MaysHouse_1F_EventScript_1F898C:: @ 81F898C @@ -106,12 +106,12 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE end LittlerootTown_MaysHouse_1F_Movement_1F89EC: @ 81F89EC - step_down - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left step_end LittlerootTown_BrendansHouse_1F_EventScript_1F89F3:: @ 81F89F3 @@ -241,29 +241,29 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8B4B:: @ 81F8B4B return LittlerootTown_MaysHouse_1F_Movement_1F8B56: @ 81F8B56 - step_27 - step_left - step_26 - step_up - step_up - step_up - step_up + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_MaysHouse_1F_Movement_1F8B5E: @ 81F8B5E - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end LittlerootTown_MaysHouse_1F_Movement_1F8B62: @ 81F8B62 - step_28 - step_right - step_26 - step_up - step_up - step_up - step_up + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_MaysHouse_1F_EventScript_1F8B6A:: @ 81F8B6A @@ -285,52 +285,52 @@ LittlerootTown_MaysHouse_1F_EventScript_1F8B8E:: @ 81F8B8E return LittlerootTown_MaysHouse_1F_Movement_1F8BA0: @ 81F8BA0 - step_14 - step_13 - step_28 + delay_16 + delay_8 + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_1F_Movement_1F8BA4: @ 81F8BA4 - step_14 - step_13 - step_28 - step_14 - step_14 - step_26 + delay_16 + delay_8 + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_up step_end LittlerootTown_MaysHouse_1F_Movement_1F8BAB: @ 81F8BAB - step_14 - step_13 - step_27 + delay_16 + delay_8 + walk_in_place_fastest_left step_end LittlerootTown_MaysHouse_1F_Movement_1F8BAF: @ 81F8BAF - step_28 - step_right - step_26 - step_up - step_up + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up step_end LittlerootTown_MaysHouse_1F_Movement_1F8BB5: @ 81F8BB5 - step_28 - step_right - step_26 - step_up - step_up - step_27 - step_left - step_26 - step_up + walk_in_place_fastest_right + walk_right + walk_in_place_fastest_up + walk_up + walk_up + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up step_end LittlerootTown_MaysHouse_1F_Movement_1F8BBF: @ 81F8BBF - step_27 - step_left - step_26 - step_up - step_up + walk_in_place_fastest_left + walk_left + walk_in_place_fastest_up + walk_up + walk_up step_end LittlerootTown_BrendansHouse_1F_Text_1F8BC5: @ 81F8BC5 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index f300b5849..5501f5ad5 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -140,111 +140,111 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9440:: @ 81F9440 return LittlerootTown_MaysHouse_2F_Movement_1F946F: @ 81F946F - step_down - step_down - step_28 + walk_down + walk_down + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_2F_Movement_1F9473: @ 81F9473 - step_right - step_right - step_down - step_down - step_right + walk_right + walk_right + walk_down + walk_down + walk_right step_end LittlerootTown_MaysHouse_2F_Movement_1F9479: @ 81F9479 - step_up - step_up - step_up - step_28 - step_right - step_right - step_right - step_right - step_26 + walk_up + walk_up + walk_up + walk_in_place_fastest_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_MaysHouse_2F_Movement_1F9483: @ 81F9483 - step_14 - step_26 - step_14 - step_14 - step_14 - step_14 - step_28 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_2F_Movement_1F948B: @ 81F948B - step_right - step_right - step_right + walk_right + walk_right + walk_right step_end LittlerootTown_MaysHouse_2F_Movement_1F948F: @ 81F948F - step_up - step_28 - step_right - step_right - step_right - step_right - step_26 + walk_up + walk_in_place_fastest_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_MaysHouse_2F_Movement_1F9497: @ 81F9497 - step_14 - step_26 - step_14 - step_14 - step_28 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_2F_Movement_1F949D: @ 81F949D - step_right - step_right - step_right - step_right - step_right - step_25 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_down step_end LittlerootTown_MaysHouse_2F_Movement_1F94A4: @ 81F94A4 - step_up - step_right - step_right - step_26 + walk_up + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_MaysHouse_2F_Movement_1F94A9: @ 81F94A9 - step_14 - step_14 - step_28 + delay_16 + delay_16 + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_2F_Movement_1F94AD: @ 81F94AD - step_right - step_right - step_down - step_28 + walk_right + walk_right + walk_down + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_2F_Movement_1F94B2: @ 81F94B2 - step_up - step_up - step_right - step_right - step_right - step_right - step_right - step_26 + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_MaysHouse_2F_Movement_1F94BB: @ 81F94BB - step_14 - step_26 - step_14 - step_14 - step_28 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_right step_end LittlerootTown_BrendansHouse_2F_EventScript_1F94C1:: @ 81F94C1 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index c7d968d78..75b83b6a1 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -142,13 +142,13 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E67:: @ 81F9E67 end LittlerootTown_ProfessorBirchsLab_Movement_1F9E78: @ 81F9E78 - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 @@ -211,35 +211,35 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F3C:: @ 81F9F3C return LittlerootTown_ProfessorBirchsLab_Movement_1F9F46: @ 81F9F46 - step_left - step_25 - step_14 - step_14 - step_right - step_25 - step_14 - step_14 - step_right - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_26 + walk_left + walk_in_place_fastest_down + delay_16 + delay_16 + walk_right + walk_in_place_fastest_down + delay_16 + delay_16 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end LittlerootTown_ProfessorBirchsLab_Movement_1F9F58: @ 81F9F58 - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_left - step_25 + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_in_place_fastest_down step_end LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62 @@ -252,13 +252,13 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F62:: @ 81F9F62 end LittlerootTown_ProfessorBirchsLab_Movement_1F9F7C: @ 81F9F7C - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84 @@ -591,8 +591,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3D7:: @ 81FA3D7 return LittlerootTown_ProfessorBirchsLab_Movement_1FA3E0: @ 81FA3E0 - step_down - step_27 + walk_down + walk_in_place_fastest_left step_end LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3:: @ 81FA3E3 diff --git a/data/scripts/maps/MagmaHideout_4F.inc b/data/scripts/maps/MagmaHideout_4F.inc index cb0580580..0cc0fea56 100644 --- a/data/scripts/maps/MagmaHideout_4F.inc +++ b/data/scripts/maps/MagmaHideout_4F.inc @@ -77,35 +77,35 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 end MagmaHideout_4F_Movement_23A672: @ 823A672 - step_14 - step_14 - slow_step_down - step_14 - step_14 - step_14 - slow_step_down - step_14 - step_14 - step_14 + delay_16 + delay_16 + walk_slow_down + delay_16 + delay_16 + delay_16 + walk_slow_down + delay_16 + delay_16 + delay_16 step_end MagmaHideout_4F_Movement_23A67D: @ 823A67D - step_32 - step_32 + slide_up + slide_up step_end MagmaHideout_4F_Movement_23A680: @ 823A680 - step_02 - step_14 - step_03 - step_14 - step_02 - step_14 - step_03 - step_14 - step_01 - step_14 - step_14 + face_left + delay_16 + face_right + delay_16 + face_left + delay_16 + face_right + delay_16 + face_up + delay_16 + delay_16 step_end MagmaHideout_4F_EventScript_23A68C:: @ 823A68C diff --git a/data/scripts/maps/MarineCave_End.inc b/data/scripts/maps/MarineCave_End.inc index c8e7c6fad..9c821e14f 100644 --- a/data/scripts/maps/MarineCave_End.inc +++ b/data/scripts/maps/MarineCave_End.inc @@ -66,13 +66,13 @@ MarineCave_End_EventScript_23B092:: @ 823B092 end MarineCave_End_Movement_23B09D: @ 823B09D - step_5e - step_62 - step_14 - step_14 - step_63 - step_14 - step_14 - step_63 + init_affine_anim + walk_down_start_affine + delay_16 + delay_16 + walk_down_affine + delay_16 + delay_16 + walk_down_affine step_end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 40578a907..abb527d7f 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -234,191 +234,191 @@ MauvilleCity_EventScript_1DF690:: @ 81DF690 end MauvilleCity_Movement_1DF6A8: @ 81DF6A8 - step_left - step_left - step_down - step_down - step_left + walk_left + walk_left + walk_down + walk_down + walk_left step_end MauvilleCity_Movement_1DF6AE: @ 81DF6AE - step_down - step_down - step_left - step_left - step_left + walk_down + walk_down + walk_left + walk_left + walk_left step_end MauvilleCity_Movement_1DF6B4: @ 81DF6B4 - step_14 - step_14 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_13 + delay_16 + delay_16 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + delay_8 step_end MauvilleCity_Movement_1DF6C0: @ 81DF6C0 - step_14 - step_14 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_13 + delay_16 + delay_16 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + delay_8 step_end MauvilleCity_Movement_1DF6CC: @ 81DF6CC - step_14 - step_13 - step_27 + delay_16 + delay_8 + walk_in_place_fastest_left step_end MauvilleCity_Movement_1DF6D0: @ 81DF6D0 - step_14 - step_14 - step_14 - step_27 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left step_end MauvilleCity_Movement_1DF6D5: @ 81DF6D5 - step_14 - step_27 + delay_16 + walk_in_place_fastest_left step_end MauvilleCity_Movement_1DF6D8: @ 81DF6D8 - step_14 - step_14 - step_27 + delay_16 + delay_16 + walk_in_place_fastest_left step_end MauvilleCity_Movement_1DF6DC: @ 81DF6DC - step_14 - step_25 + delay_16 + walk_in_place_fastest_down step_end MauvilleCity_Movement_1DF6DF: @ 81DF6DF - step_14 - step_27 + delay_16 + walk_in_place_fastest_left step_end MauvilleCity_Movement_1DF6E2: @ 81DF6E2 - step_left - step_left - step_left - step_down - step_down + walk_left + walk_left + walk_left + walk_down + walk_down step_end MauvilleCity_Movement_1DF6E8: @ 81DF6E8 - step_left - step_down - step_down - step_left - step_left + walk_left + walk_down + walk_down + walk_left + walk_left step_end MauvilleCity_Movement_1DF6EE: @ 81DF6EE - step_14 - step_13 - step_12 - step_25 + delay_16 + delay_8 + delay_4 + walk_in_place_fastest_down step_end MauvilleCity_Movement_1DF6F3: @ 81DF6F3 - step_right - step_right - step_26 + walk_right + walk_right + walk_in_place_fastest_up step_end MauvilleCity_Movement_1DF6F7: @ 81DF6F7 - step_right - step_up + walk_right + walk_up step_end MauvilleCity_Movement_1DF6FA: @ 81DF6FA - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end MauvilleCity_Movement_1DF703: @ 81DF703 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end MauvilleCity_Movement_1DF70D: @ 81DF70D - step_up - step_up - step_up - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end MauvilleCity_Movement_1DF719: @ 81DF719 - step_up - step_up - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_left - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up step_end MauvilleCity_Movement_1DF725: @ 81DF725 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end MauvilleCity_Movement_1DF72F: @ 81DF72F - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end MauvilleCity_EventScript_1DF73A:: @ 81DF73A diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc index 03b7928aa..fb76a5fc7 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ MauvilleCity_PokemonCenter_1F_MapScript1_210E66: @ 8210E66 end MauvilleCity_PokemonCenter_1F_EventScript_210E74:: @ 8210E74 - special ScrSpecial_SetMauvilleOldManMapObjGfx + special ScrSpecial_SetMauvilleOldManEventObjGfx end MauvilleCity_PokemonCenter_1F_EventScript_210E78:: @ 8210E78 diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 50b218f04..b786dc961 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -92,130 +92,130 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F end MeteorFalls_1F_1R_Movement_22BEC0: @ 822BEC0 - step_right - step_right - step_26 + walk_right + walk_right + walk_in_place_fastest_up step_end MeteorFalls_1F_1R_Movement_22BEC4: @ 822BEC4 - step_16 - step_16 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 + 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 step_end MeteorFalls_1F_1R_Movement_22BECE: @ 822BECE - step_16 - step_16 - step_16 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 + 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 step_end MeteorFalls_1F_1R_Movement_22BED9: @ 822BED9 - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MeteorFalls_1F_1R_Movement_22BEE0: @ 822BEE0 - step_14 - step_14 - step_right - step_right - step_right - step_right - step_right + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_right + walk_right step_end MeteorFalls_1F_1R_Movement_22BEE8: @ 822BEE8 - step_14 - step_14 - step_right - step_right - step_right - step_right - step_right + delay_16 + delay_16 + walk_right + walk_right + walk_right + walk_right + walk_right step_end MeteorFalls_1F_1R_Movement_22BEF0: @ 822BEF0 - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MeteorFalls_1F_1R_Movement_22BEF8: @ 822BEF8 - step_right - step_right - step_up - step_up - step_27 + walk_right + walk_right + walk_up + walk_up + walk_in_place_fastest_left step_end MeteorFalls_1F_1R_Movement_22BEFE: @ 822BEFE - step_up - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MeteorFalls_1F_1R_Movement_22BF08: @ 822BF08 - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end MeteorFalls_1F_1R_Movement_22BF0D: @ 822BF0D - step_up - step_up - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MeteorFalls_1F_1R_Movement_22BF18: @ 822BF18 - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D - step_25 - step_12 - step_28 - step_40 - step_left - step_41 - step_03 + walk_in_place_fastest_down + delay_4 + walk_in_place_fastest_right + lock_facing_direction + walk_left + unlock_facing_direction + face_right step_end MeteorFalls_1F_1R_EventScript_22BF25:: @ 822BF25 diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 4e8531a4e..8cce8efeb 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -103,116 +103,116 @@ MossdeepCity_EventScript_1E4B41:: @ 81E4B41 end MossdeepCity_Movement_1E4BAD: @ 81E4BAD - step_14 - step_03 - step_14 - step_14 - step_14 - step_14 - step_02 - step_14 - step_14 + delay_16 + face_right + delay_16 + delay_16 + delay_16 + delay_16 + face_left + delay_16 + delay_16 step_end MossdeepCity_Movement_1E4BB7: @ 81E4BB7 - step_03 - step_14 - step_14 - step_14 + face_right + delay_16 + delay_16 + delay_16 step_end MossdeepCity_Movement_1E4BBC: @ 81E4BBC - step_down - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_down + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MossdeepCity_Movement_1E4BCA: @ 81E4BCA - step_14 - step_13 - step_down - step_down - step_down - step_right - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right + delay_16 + delay_8 + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MossdeepCity_Movement_1E4BDD: @ 81E4BDD - step_14 - step_13 - step_down - step_down - step_right - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right + delay_16 + delay_8 + walk_down + walk_down + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MossdeepCity_Movement_1E4BEF: @ 81E4BEF - step_14 - step_13 - step_down - step_right - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right + delay_16 + delay_8 + walk_down + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MossdeepCity_Movement_1E4C00: @ 81E4C00 - step_14 - step_13 - step_right - step_right - step_right - step_down - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right + delay_16 + delay_8 + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end MossdeepCity_EventScript_1E4C10:: @ 81E4C10 @@ -281,34 +281,34 @@ MossdeepCity_EventScript_1E4CC2:: @ 81E4CC2 return MossdeepCity_Movement_1E4CD4: @ 81E4CD4 - step_14 - step_14 - step_27 + delay_16 + delay_16 + walk_in_place_fastest_left step_end MossdeepCity_Movement_1E4CD8: @ 81E4CD8 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end MossdeepCity_Movement_1E4CE2: @ 81E4CE2 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end MossdeepCity_Text_1E4CED: @ 81E4CED diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 972d5f4e8..bb6bfd9de 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -285,8 +285,8 @@ MossdeepCity_Gym_EventScript_220C26:: @ 8220C26 end MossdeepCity_Gym_Movement_220C30: @ 8220C30 - step_14 - step_14 + delay_16 + delay_16 step_end MossdeepCity_Gym_EventScript_220C33:: @ 8220C33 diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index 7707690fb..c61f74d99 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -38,19 +38,19 @@ MossdeepCity_House2_EventScript_22212F:: @ 822212F return MossdeepCity_House2_Movement_22213A: @ 822213A - step_18 - step_15 - step_15 - step_17 - step_15 - step_13 + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_fast_down + delay_8 step_end MossdeepCity_House2_Movement_222141: @ 8222141 - step_15 - step_15 - step_15 - step_13 + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 step_end MossdeepCity_House2_Text_222146: @ 8222146 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 8fc55295f..2edf6d251 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -271,22 +271,22 @@ MossdeepCity_SpaceCenter_1F_EventScript_223289:: @ 8223289 end MossdeepCity_SpaceCenter_1F_Movement_22329A: @ 822329A - step_40 - step_left - step_41 + lock_facing_direction + walk_left + unlock_facing_direction step_end MossdeepCity_SpaceCenter_1F_Movement_22329E: @ 822329E - step_40 - step_right - step_41 + lock_facing_direction + walk_right + unlock_facing_direction step_end MossdeepCity_SpaceCenter_1F_Movement_2232A2: @ 82232A2 - step_02 - step_40 - step_right - step_41 + face_left + lock_facing_direction + walk_right + unlock_facing_direction step_end MossdeepCity_SpaceCenter_1F_Text_2232A7: @ 82232A7 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc index cee99c4d5..52d01db6c 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc @@ -49,7 +49,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_223DBF:: @ 8223DBF end MossdeepCity_SpaceCenter_2F_Movement_223E07: @ 8223E07 - step_up + walk_up step_end MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 @@ -77,21 +77,21 @@ MossdeepCity_SpaceCenter_2F_EventScript_223E09:: @ 8223E09 end MossdeepCity_SpaceCenter_2F_Movement_223E81: @ 8223E81 - step_40 - step_left - step_41 + lock_facing_direction + walk_left + unlock_facing_direction step_end MossdeepCity_SpaceCenter_2F_Movement_223E85: @ 8223E85 - step_40 - step_down - step_41 + lock_facing_direction + walk_down + unlock_facing_direction step_end MossdeepCity_SpaceCenter_2F_Movement_223E89: @ 8223E89 - step_40 - step_right - step_41 + lock_facing_direction + walk_right + unlock_facing_direction step_end MossdeepCity_SpaceCenter_2F_EventScript_223E8D:: @ 8223E8D @@ -211,27 +211,27 @@ MossdeepCity_SpaceCenter_2F_EventScript_223FBA:: @ 8223FBA end MossdeepCity_SpaceCenter_2F_Movement_223FC6: @ 8223FC6 - step_40 - step_16 - step_16 - step_41 - step_14 - step_14 - slow_step_down - slow_step_down + lock_facing_direction + walk_fast_up + walk_fast_up + unlock_facing_direction + delay_16 + delay_16 + walk_slow_down + walk_slow_down step_end MossdeepCity_SpaceCenter_2F_Movement_223FCF: @ 8223FCF - step_02 - step_40 - step_18 - step_18 - step_41 - step_14 - step_14 - slow_step_left - slow_step_left - step_00 + face_left + lock_facing_direction + walk_fast_right + walk_fast_right + unlock_facing_direction + delay_16 + delay_16 + walk_slow_left + walk_slow_left + face_down step_end MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index fb2665e8b..14d0cd5c7 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -54,21 +54,21 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA end MossdeepCity_StevensHouse_Movement_222833: @ 8222833 - step_left - step_left - step_left - step_left - step_left - step_left - step_25 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_down step_end MossdeepCity_StevensHouse_Movement_22283B: @ 822283B - step_up - step_right - step_right - step_right - step_26 + walk_up + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index b4825579c..28135bb1e 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -153,249 +153,249 @@ MtChimney_EventScript_22EF76:: @ 822EF76 end MtChimney_Movement_22EF83: @ 822EF83 - step_up - step_up - step_up - step_up - step_up - step_up - step_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right step_end MtChimney_Movement_22EF8B: @ 822EF8B - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end MtChimney_Movement_22EF94: @ 822EF94 - step_up - step_up - step_up - step_up - step_up - step_right - step_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_right step_end MtChimney_Movement_22EF9C: @ 822EF9C - step_left - step_left - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_left + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end MtChimney_Movement_22EFA6: @ 822EFA6 - 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 + 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 step_end MtChimney_Movement_22EFB8: @ 822EFB8 - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down step_end MtChimney_Movement_22EFC1: @ 822EFC1 - 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 + 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 step_end MtChimney_Movement_22EFD0: @ 822EFD0 - 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 + 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 step_end MtChimney_Movement_22EFE9: @ 822EFE9 - step_14 - step_14 - step_14 - step_down - step_down - step_down - step_left - step_left - step_left - step_down + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down step_end MtChimney_Movement_22EFF4: @ 822EFF4 - 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 + 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 step_end MtChimney_Movement_22F004: @ 822F004 - 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 + 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 step_end MtChimney_Movement_22F015: @ 822F015 - step_14 - step_down - step_left - step_left - step_left - step_left - step_25 + delay_16 + walk_down + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_down step_end MtChimney_Movement_22F01D: @ 822F01D - 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 + 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 step_end MtChimney_Movement_22F02B: @ 822F02B - step_down + walk_down step_end MtChimney_Movement_22F02D: @ 822F02D - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end MtChimney_Movement_22F035: @ 822F035 - step_14 - step_14 - step_27 - step_14 - step_down - step_down - step_down - step_down - step_down + delay_16 + delay_16 + walk_in_place_fastest_left + delay_16 + walk_down + walk_down + walk_down + walk_down + walk_down step_end MtChimney_Movement_22F03F: @ 822F03F - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_27 - step_14 - step_down - step_down + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left + delay_16 + walk_down + walk_down step_end MtChimney_Movement_22F04A: @ 822F04A - step_40 - step_17 - step_41 - step_03 + lock_facing_direction + walk_fast_left + unlock_facing_direction + face_right step_end MtChimney_Movement_22F04F: @ 822F04F - step_left - step_28 - step_14 + walk_left + walk_in_place_fastest_right + delay_16 step_end MtChimney_EventScript_22F053:: @ 822F053 diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 1dd9c2725..b6c2118db 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -59,31 +59,31 @@ MtChimney_CableCarStation_EventScript_22AC9B:: @ 822AC9B end MtChimney_CableCarStation_Movement_22ACA5: @ 822ACA5 - step_up - step_up - step_left - step_28 + walk_up + walk_up + walk_left + walk_in_place_fastest_right step_end MtChimney_CableCarStation_Movement_22ACAA: @ 822ACAA - step_14 - step_right - step_down - step_down + delay_16 + walk_right + walk_down + walk_down step_end MtChimney_CableCarStation_Movement_22ACAF: @ 822ACAF - step_up - step_up - step_up - step_14 + walk_up + walk_up + walk_up + delay_16 step_end MtChimney_CableCarStation_Movement_22ACB4: @ 822ACB4 - step_down - step_down - step_down - step_14 + walk_down + walk_down + walk_down + delay_16 step_end MtChimney_CableCarStation_Text_22ACB9: @ 822ACB9 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index fed63f0e0..fe39e9d48 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -103,29 +103,29 @@ MtPyre_Summit_EventScript_232117:: @ 8232117 return MtPyre_Summit_Movement_23212C: @ 823212C - step_down - step_down - step_27 + walk_down + walk_down + walk_in_place_fastest_left step_end MtPyre_Summit_Movement_232130: @ 8232130 - step_down + walk_down step_end MtPyre_Summit_Movement_232132: @ 8232132 - step_down - step_down - step_28 + walk_down + walk_down + walk_in_place_fastest_right step_end MtPyre_Summit_Movement_232136: @ 8232136 - step_left - step_25 + walk_left + walk_in_place_fastest_down step_end MtPyre_Summit_Movement_232139: @ 8232139 - step_right - step_25 + walk_right + walk_in_place_fastest_down step_end MtPyre_Summit_EventScript_23213C:: @ 823213C @@ -316,112 +316,112 @@ MtPyre_Summit_EventScript_232392:: @ 8232392 return MtPyre_Summit_Movement_2323AE: @ 82323AE - step_14 - step_14 - step_28 + delay_16 + delay_16 + walk_in_place_fastest_right step_end MtPyre_Summit_Movement_2323B2: @ 82323B2 - step_14 - step_14 - step_27 + delay_16 + delay_16 + walk_in_place_fastest_left step_end MtPyre_Summit_Movement_2323B6: @ 82323B6 - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end MtPyre_Summit_Movement_2323BD: @ 82323BD - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end MtPyre_Summit_Movement_2323C4: @ 82323C4 - step_14 - step_13 - step_left - step_28 - step_14 - step_25 + delay_16 + delay_8 + walk_left + walk_in_place_fastest_right + delay_16 + walk_in_place_fastest_down step_end MtPyre_Summit_Movement_2323CB: @ 82323CB - step_14 - step_13 - step_right - step_27 - step_14 - step_25 + delay_16 + delay_8 + walk_right + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_down step_end MtPyre_Summit_Movement_2323D2: @ 82323D2 - step_14 - step_13 - step_27 - step_14 - step_25 + delay_16 + delay_8 + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_down step_end MtPyre_Summit_Movement_2323D8: @ 82323D8 - step_up - step_up - step_up - step_left + walk_up + walk_up + walk_up + walk_left step_end MtPyre_Summit_Movement_2323DD: @ 82323DD - step_up - step_up - step_up - step_28 + walk_up + walk_up + walk_up + walk_in_place_fastest_right step_end MtPyre_Summit_Movement_2323E2: @ 82323E2 - step_up - step_up - step_up - step_28 + walk_up + walk_up + walk_up + walk_in_place_fastest_right step_end MtPyre_Summit_Movement_2323E7: @ 82323E7 - step_14 - step_26 + delay_16 + walk_in_place_fastest_up step_end MtPyre_Summit_Movement_2323EA: @ 82323EA - step_14 - step_25 + delay_16 + walk_in_place_fastest_down step_end MtPyre_Summit_Movement_2323ED: @ 82323ED - step_down - step_right - step_down - step_down - step_27 + walk_down + walk_right + walk_down + walk_down + walk_in_place_fastest_left step_end MtPyre_Summit_Movement_2323F3: @ 82323F3 - step_down - step_down - step_down - step_27 + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end MtPyre_Summit_Movement_2323F8: @ 82323F8 - step_down - step_down - step_down - step_27 + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end MtPyre_Summit_EventScript_2323FD:: @ 82323FD diff --git a/data/scripts/maps/NavelRock_Top.inc b/data/scripts/maps/NavelRock_Top.inc index 6193a092e..67ddbc373 100644 --- a/data/scripts/maps/NavelRock_Top.inc +++ b/data/scripts/maps/NavelRock_Top.inc @@ -38,7 +38,7 @@ NavelRock_Top_EventScript_26915B:: @ 826915B NavelRock_Top_EventScript_26916F:: @ 826916F lockall setvar VAR_TEMP_1, 1 - special SpawnScriptFieldObject + special SpawnScriptEventObject setvar VAR_0x8004, 3 setvar VAR_0x8005, 35 special sub_813B80C @@ -59,7 +59,7 @@ NavelRock_Top_EventScript_26916F:: @ 826916F applymovement 127, NavelRock_Top_Movement_269234 applymovement 1, NavelRock_Top_Movement_26923A waitmovement 0 - special RemoveScriptFieldObject + special RemoveScriptEventObject setvar VAR_0x8004, 250 setvar VAR_0x8005, 70 setvar VAR_0x8006, 0 @@ -92,36 +92,36 @@ NavelRock_Top_EventScript_269225:: @ 8269225 end NavelRock_Top_Movement_269230: @ 8269230 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end NavelRock_Top_Movement_269234: @ 8269234 - step_14 - step_14 - step_down - step_down - step_down + delay_16 + delay_16 + walk_down + walk_down + walk_down step_end NavelRock_Top_Movement_26923A: @ 826923A - step_down - step_down - step_down - step_down - step_down - step_1d - step_14 - step_14 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_in_place_down + delay_16 + delay_16 step_end NavelRock_Top_Movement_269243: @ 8269243 - step_14 - step_14 - step_1d - step_1d - step_1d - step_1d + delay_16 + delay_16 + walk_in_place_down + walk_in_place_down + walk_in_place_down + walk_in_place_down step_end diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 3c075cad0..32bca3703 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -96,100 +96,100 @@ OldaleTown_EventScript_1E8FC3:: @ 81E8FC3 end OldaleTown_Movement_1E8FCE: @ 81E8FCE - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end OldaleTown_Movement_1E8FD7: @ 81E8FD7 - step_left - step_up - step_up - step_right - step_up - step_up - step_up - step_up - step_up - step_25 + walk_left + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end OldaleTown_Movement_1E8FE2: @ 81E8FE2 - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end OldaleTown_Movement_1E8FEB: @ 81E8FEB - 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 + 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 step_end OldaleTown_Movement_1E8FF9: @ 81E8FF9 - step_right - step_up - step_up - step_up - step_up - step_up - step_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end OldaleTown_Movement_1E9001: @ 81E9001 - step_14 - step_14 - step_14 - step_14 - step_up - step_up - step_up - step_up - step_up + delay_16 + delay_16 + delay_16 + delay_16 + walk_up + walk_up + walk_up + walk_up + walk_up step_end OldaleTown_Movement_1E900B: @ 81E900B - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end OldaleTown_Movement_1E9013: @ 81E9013 - step_left - step_up - step_up - step_right - step_right - step_right - step_right - step_up - step_up - step_up - step_up + walk_left + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up step_end OldaleTown_EventScript_1E901F:: @ 81E901F @@ -305,49 +305,49 @@ OldaleTown_EventScript_1E915E:: @ 81E915E return OldaleTown_Movement_1E9170: @ 81E9170 - step_left - step_left + walk_left + walk_left step_end OldaleTown_Movement_1E9173: @ 81E9173 - step_left + walk_left step_end OldaleTown_Movement_1E9175: @ 81E9175 - step_02 + face_left step_end OldaleTown_Movement_1E9177: @ 81E9177 - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end OldaleTown_Movement_1E917E: @ 81E917E - step_13 - step_12 - step_25 + delay_8 + delay_4 + walk_in_place_fastest_down step_end OldaleTown_Movement_1E9182: @ 81E9182 - step_13 - step_right + delay_8 + walk_right step_end OldaleTown_Movement_1E9185: @ 81E9185 - step_16 - step_27 - step_40 - step_right - step_41 + walk_fast_up + walk_in_place_fastest_left + lock_facing_direction + walk_right + unlock_facing_direction step_end OldaleTown_Movement_1E918B: @ 81E918B - step_down - step_left + walk_down + walk_left step_end OldaleTown_Text_1E918E: @ 81E918E diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index c297d61a7..891b5a25a 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -94,127 +94,127 @@ PetalburgCity_EventScript_1DC3FD:: @ 81DC3FD end PetalburgCity_Movement_1DC406: @ 81DC406 - step_13 - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up + delay_8 + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up step_end PetalburgCity_Movement_1DC418: @ 81DC418 - step_up - step_up + walk_up + walk_up step_end PetalburgCity_Movement_1DC41B: @ 81DC41B - step_13 - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up + delay_8 + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end PetalburgCity_Movement_1DC42D: @ 81DC42D - step_up - step_54 + walk_up + set_invisible step_end PetalburgCity_Movement_1DC430: @ 81DC430 - 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 + 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 step_end PetalburgCity_Movement_1DC451: @ 81DC451 - 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 + 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 step_end PetalburgCity_EventScript_1DC476:: @ 81DC476 @@ -347,159 +347,159 @@ PetalburgCity_EventScript_1DC5FF:: @ 81DC5FF return PetalburgCity_Movement_1DC611:: @ 81DC611 - step_14 - step_14 - step_14 + delay_16 + delay_16 + delay_16 step_end PetalburgCity_Movement_1DC615: @ 81DC615 - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end PetalburgCity_Movement_1DC61A: @ 81DC61A - step_right - step_right + walk_right + walk_right step_end PetalburgCity_Movement_1DC61D: @ 81DC61D - step_right - step_right - step_right - step_25 + walk_right + walk_right + walk_right + walk_in_place_fastest_down step_end PetalburgCity_Movement_1DC622: @ 81DC622 - step_down - step_right - step_right - step_right - step_25 + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_down step_end PetalburgCity_Movement_1DC628: @ 81DC628 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_right - step_26 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_right + walk_in_place_fastest_up step_end PetalburgCity_Movement_1DC633: @ 81DC633 - 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 + 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 step_end PetalburgCity_Movement_1DC641: @ 81DC641 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_right - step_26 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_right + walk_in_place_fastest_up step_end PetalburgCity_Movement_1DC64C: @ 81DC64C - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up - step_right - step_26 + 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 step_end PetalburgCity_Movement_1DC658: @ 81DC658 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC665: @ 81DC665 - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up step_end PetalburgCity_Movement_1DC66F: @ 81DC66F - step_14 - step_14 - step_down - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up + delay_16 + delay_16 + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up step_end PetalburgCity_Movement_1DC67C: @ 81DC67C - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up step_end PetalburgCity_Movement_1DC686: @ 81DC686 - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_up - step_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_up step_end PetalburgCity_EventScript_1DC691:: @ 81DC691 @@ -597,111 +597,111 @@ PetalburgCity_EventScript_1DC7C4:: @ 81DC7C4 return PetalburgCity_Movement_1DC7D6: @ 81DC7D6 - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC7DB: @ 81DC7DB - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC7E0: @ 81DC7E0 - step_down - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC7EE: @ 81DC7EE - step_14 - step_25 - step_14 - step_14 - step_13 - step_27 + delay_16 + walk_in_place_fastest_down + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_left step_end PetalburgCity_Movement_1DC7F5: @ 81DC7F5 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC802: @ 81DC802 - step_14 - step_25 - step_14 - step_13 - step_27 + delay_16 + walk_in_place_fastest_down + delay_16 + delay_8 + walk_in_place_fastest_left step_end PetalburgCity_Movement_1DC808: @ 81DC808 - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC815: @ 81DC815 - step_14 - step_25 - step_14 - step_13 - step_27 + delay_16 + walk_in_place_fastest_down + delay_16 + delay_8 + walk_in_place_fastest_left step_end PetalburgCity_Movement_1DC81B: @ 81DC81B - step_up - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end PetalburgCity_Movement_1DC828: @ 81DC828 - step_14 - step_26 - step_14 - step_13 - step_27 + delay_16 + walk_in_place_fastest_up + delay_16 + delay_8 + walk_in_place_fastest_left step_end PetalburgCity_EventScript_1DC82E:: @ 81DC82E diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 2751e345e..663165611 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -106,10 +106,10 @@ PetalburgCity_Gym_EventScript_2049A4:: @ 82049A4 end PetalburgCity_Gym_Movement_2049EC: @ 82049EC - step_down - step_down - step_down - step_14 + walk_down + walk_down + walk_down + delay_16 step_end PetalburgCity_Gym_EventScript_2049F1:: @ 82049F1 @@ -565,218 +565,218 @@ PetalburgCity_Gym_EventScript_20506C:: @ 820506C return PetalburgCity_Gym_Movement_20507E: @ 820507E - step_down - step_down - step_left - step_left - step_down - step_down - step_26 - step_13 - step_1d - step_54 + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_in_place_fastest_up + delay_8 + walk_in_place_down + set_invisible step_end PetalburgCity_Gym_Movement_205089: @ 8205089 - step_down - step_down - step_left - step_left - step_down - step_down - step_26 - step_13 - step_1d - step_54 + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down + walk_in_place_fastest_up + delay_8 + walk_in_place_down + set_invisible step_end PetalburgCity_Gym_Movement_205094: @ 8205094 - step_down - step_down - step_left - step_left - step_left - step_left - step_down - step_down - step_26 - step_13 - step_1d - step_54 + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down + walk_in_place_fastest_up + delay_8 + walk_in_place_down + set_invisible step_end PetalburgCity_Gym_Movement_2050A1: @ 82050A1 - step_14 - step_down - step_down - step_left - step_left - step_down - step_down + delay_16 + walk_down + walk_down + walk_left + walk_left + walk_down + walk_down step_end PetalburgCity_Gym_Movement_2050A9: @ 82050A9 - step_14 - step_down - step_down - step_left - step_down - step_down - step_down + delay_16 + walk_down + walk_down + walk_left + walk_down + walk_down + walk_down step_end PetalburgCity_Gym_Movement_2050B1: @ 82050B1 - step_14 - step_down - step_down - step_down - step_left - step_left - step_left - step_down - step_down + delay_16 + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + walk_down step_end PetalburgCity_Gym_Movement_2050BB: @ 82050BB - step_up - step_13 - step_28 - step_13 - step_27 - step_14 - step_26 + walk_up + delay_8 + walk_in_place_fastest_right + delay_8 + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_up step_end PetalburgCity_Gym_Movement_2050C3: @ 82050C3 - step_right - step_right - step_up - step_up - step_up - step_28 + walk_right + walk_right + walk_up + walk_up + walk_up + walk_in_place_fastest_right step_end PetalburgCity_Gym_Movement_2050CA: @ 82050CA - step_right - step_right - step_up - step_up - step_up + walk_right + walk_right + walk_up + walk_up + walk_up step_end PetalburgCity_Gym_Movement_2050D0: @ 82050D0 - step_right - step_right - step_up - step_up - step_right - step_right - step_up + walk_right + walk_right + walk_up + walk_up + walk_right + walk_right + walk_up step_end PetalburgCity_Gym_Movement_2050D8: @ 82050D8 - step_26 - step_14 - step_14 - step_14 - step_14 - step_14 - step_13 - step_25 + walk_in_place_fastest_up + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_down step_end PetalburgCity_Gym_Movement_2050E1: @ 82050E1 - step_14 - step_up - step_14 - step_13 - step_up - step_right - step_up - step_up - step_27 + delay_16 + walk_up + delay_16 + delay_8 + walk_up + walk_right + walk_up + walk_up + walk_in_place_fastest_left step_end PetalburgCity_Gym_Movement_2050EB: @ 82050EB - step_14 - step_up - step_14 - step_13 - step_up - step_up + delay_16 + walk_up + delay_16 + delay_8 + walk_up + walk_up step_end PetalburgCity_Gym_Movement_2050F2: @ 82050F2 - step_down - step_down - step_down - step_down - step_26 - step_14 - step_1d + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down step_end PetalburgCity_Gym_Movement_2050FA: @ 82050FA - step_down - step_down - step_right - step_down - step_26 - step_14 - step_1d + walk_down + walk_down + walk_right + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down step_end PetalburgCity_Gym_Movement_205102: @ 8205102 - step_down - step_down - step_down - step_26 - step_14 - step_1d + walk_down + walk_down + walk_down + walk_in_place_fastest_up + delay_16 + walk_in_place_down step_end PetalburgCity_Gym_Movement_205109: @ 8205109 - step_14 - step_14 - step_14 - step_down - step_down - step_down - step_13 + delay_16 + delay_16 + delay_16 + walk_down + walk_down + walk_down + delay_8 step_end PetalburgCity_Gym_Movement_205111: @ 8205111 - step_14 - step_14 - step_right - step_down - step_down - step_down - step_down - step_down - step_13 + delay_16 + delay_16 + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + delay_8 step_end PetalburgCity_Gym_Movement_20511B: @ 820511B - step_14 - step_14 - step_down - step_down - step_down - step_down - step_13 + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_down + delay_8 step_end PetalburgCity_Gym_Movement_205123: @ 8205123 - step_25 - step_14 - step_14 - step_down - step_down - step_down - step_right - step_down - step_13 + walk_in_place_fastest_down + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_right + walk_down + delay_8 step_end PetalburgCity_Gym_EventScript_20512D:: @ 820512D diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 907f07623..7c9a1ae49 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -114,128 +114,128 @@ PetalburgWoods_EventScript_22E1A7:: @ 822E1A7 end PetalburgWoods_Movement_22E1B1: @ 822E1B1 - step_01 - step_14 - step_12 - step_03 - step_14 - step_13 - step_02 - step_14 - step_13 - step_00 - step_14 - step_03 - step_14 - step_13 - step_01 - step_14 + face_up + delay_16 + delay_4 + face_right + delay_16 + delay_8 + face_left + delay_16 + delay_8 + face_down + delay_16 + face_right + delay_16 + delay_8 + face_up + delay_16 step_end PetalburgWoods_Movement_22E1C2: @ 822E1C2 - step_18 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_right + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end PetalburgWoods_Movement_22E1CB: @ 822E1CB - step_14 - step_3e - step_down - step_down + delay_16 + face_player + walk_down + walk_down step_end PetalburgWoods_Movement_22E1D0: @ 822E1D0 - step_14 - step_3e - step_down - step_down - step_down - step_28 + delay_16 + face_player + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end PetalburgWoods_Movement_22E1D7: @ 822E1D7 - step_17 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_left + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end PetalburgWoods_Movement_22E1E0: @ 822E1E0 - step_14 - step_14 - step_26 + delay_16 + delay_16 + walk_in_place_fastest_up step_end PetalburgWoods_Movement_22E1E4: @ 822E1E4 - step_18 - step_15 - step_15 - step_17 - step_26 + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_left + walk_in_place_fastest_up step_end PetalburgWoods_Movement_22E1EA: @ 822E1EA - step_15 - step_18 - step_26 + walk_fast_down + walk_fast_right + walk_in_place_fastest_up step_end PetalburgWoods_Movement_22E1EE: @ 822E1EE - step_25 - step_14 - step_14 - step_14 - step_14 - step_14 - step_01 + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + face_up step_end PetalburgWoods_Movement_22E1F6: @ 822E1F6 - step_15 - step_15 + walk_fast_down + walk_fast_down step_end PetalburgWoods_Movement_22E1F9: @ 822E1F9 - step_40 - step_up - step_41 + lock_facing_direction + walk_up + unlock_facing_direction step_end PetalburgWoods_Movement_22E1FD: @ 822E1FD - step_16 - step_16 - step_16 - step_16 - step_16 - step_14 - step_14 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + delay_16 + delay_16 step_end PetalburgWoods_Movement_22E205: @ 822E205 - step_15 - step_15 - step_15 + walk_fast_down + walk_fast_down + walk_fast_down step_end PetalburgWoods_Movement_22E209: @ 822E209 - step_down - step_down - step_14 - step_14 + walk_down + walk_down + delay_16 + delay_16 step_end PetalburgWoods_Movement_22E20E: @ 822E20E - step_down + walk_down step_end PetalburgWoods_EventScript_22E210:: @ 822E210 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 4d4334aca..c2807d50b 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -69,138 +69,138 @@ Route101_EventScript_1EBD7A:: @ 81EBD7A end Route101_Movement_1EBD90: @ 81EBD90 - step_up + walk_up step_end Route101_Movement_1EBD92: @ 81EBD92 - step_right + walk_right step_end Route101_Movement_1EBD94: @ 81EBD94 - step_down + walk_down step_end Route101_Movement_1EBD96: @ 81EBD96 - 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 + 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 step_end Route101_Movement_1EBDB5: @ 81EBDB5 - step_16 - step_18 - step_18 - step_18 - step_18 - step_16 + walk_fast_up + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up step_end Route101_Movement_1EBDBC: @ 81EBDBC step_end Route101_Movement_1EBDBD: @ 81EBDBD - step_23 - step_23 - step_23 - step_23 + walk_in_place_fast_left + walk_in_place_fast_left + walk_in_place_fast_left + walk_in_place_fast_left step_end Route101_Movement_1EBDC2: @ 81EBDC2 - step_16 - step_16 - step_16 - step_16 - step_27 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_in_place_fastest_left step_end Route101_Movement_1EBDC8: @ 81EBDC8 - 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 + 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 step_end Route101_Movement_1EBDE7: @ 81EBDE7 - step_18 - step_18 - step_18 - step_18 - step_16 - step_16 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_up + walk_fast_up step_end Route101_Movement_1EBDEE: @ 81EBDEE step_end Route101_Movement_1EBDEF: @ 81EBDEF - step_24 - step_24 - step_24 - step_24 + walk_in_place_fast_right + walk_in_place_fast_right + walk_in_place_fast_right + walk_in_place_fast_right step_end Route101_Movement_1EBDF4: @ 81EBDF4 - step_up - step_up + walk_up + walk_up step_end Route101_Movement_1EBDF7: @ 81EBDF7 - step_up - step_left - step_up + walk_up + walk_left + walk_up step_end Route101_EventScript_1EBDFB:: @ 81EBDFB @@ -256,7 +256,7 @@ Route101_EventScript_1EBE89:: @ 81EBE89 return Route101_Movement_1EBE8D: @ 81EBE8D - step_right + walk_right step_end Route101_Text_1EBE8F: @ 81EBE8F diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index d71ec729c..8bf597902 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -152,42 +152,42 @@ Route103_EventScript_1EC5A2:: @ 81EC5A2 end Route103_Movement_1EC5BE: @ 81EC5BE - step_left - step_down + walk_left + walk_down step_end Route103_Movement_1EC5C1: @ 81EC5C1 - fast_step_down - step_14 - step_down - step_down - step_down - step_down + jump_2_down + delay_16 + walk_down + walk_down + walk_down + walk_down step_end Route103_Movement_1EC5C8: @ 81EC5C8 - step_14 - step_12 - step_27 - step_14 - step_25 + delay_16 + delay_4 + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_down step_end Route103_Movement_1EC5CE: @ 81EC5CE - step_down + walk_down step_end Route103_Movement_1EC5D0: @ 81EC5D0 - fast_step_down - step_14 - step_down - step_down - step_down + jump_2_down + delay_16 + walk_down + walk_down + walk_down step_end Route103_Movement_1EC5D6: @ 81EC5D6 - step_14 - step_25 + delay_16 + walk_in_place_fastest_down step_end Route103_EventScript_1EC5D9:: @ 81EC5D9 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 314b47e1d..a432f0d94 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -130,17 +130,17 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B end Route104_Movement_1ECDC8: @ 81ECDC8 - slow_step_left + walk_slow_left step_end Route104_Movement_1ECDCA: @ 81ECDCA - step_down - step_03 + walk_down + face_right step_end Route104_Movement_1ECDCD: @ 81ECDCD - step_12 - step_27 + delay_4 + walk_in_place_fastest_left step_end Route104_EventScript_1ECDD0:: @ 81ECDD0 @@ -262,13 +262,13 @@ Route104_EventScript_1ECF73:: @ 81ECF73 end Route104_Movement_1ECF86: @ 81ECF86 - step_40 - step_down - step_41 + lock_facing_direction + walk_down + unlock_facing_direction step_end Route104_Movement_1ECF8A: @ 81ECF8A - step_down + walk_down step_end Route104_EventScript_1ECF8C:: @ 81ECF8C @@ -448,426 +448,426 @@ Route104_EventScript_1ED1BE:: @ 81ED1BE end Route104_Movement_1ED1C8: @ 81ED1C8 - 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 + 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 step_end Route104_Movement_1ED22A: @ 81ED22A - 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 + 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 step_end Route104_Movement_1ED28C: @ 81ED28C - 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 + 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 step_end Route104_Movement_1ED34F: @ 81ED34F - step_left - step_down - step_down + walk_left + walk_down + walk_down step_end Route104_Movement_1ED353: @ 81ED353 - step_down + walk_down step_end Route104_Movement_1ED355: @ 81ED355 - step_down - step_left - step_28 + walk_down + walk_left + walk_in_place_fastest_right step_end Route104_Movement_1ED359: @ 81ED359 - step_down - step_down + walk_down + walk_down step_end Route104_Movement_1ED35C: @ 81ED35C - step_down - step_27 + walk_down + walk_in_place_fastest_left step_end Route104_EventScript_1ED35F:: @ 81ED35F diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 123f78db1..b1ac87e30 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -63,210 +63,210 @@ Route109_EventScript_1EE7D5:: @ 81EE7D5 end Route109_Movement_1EE84F: @ 81EE84F - 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 + 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 step_end Route109_Movement_1EE8FD: @ 81EE8FD - step_down - step_down + walk_down + walk_down step_end Route109_Movement_1EE900: @ 81EE900 - step_down - step_down - step_left - step_28 + walk_down + walk_down + walk_left + walk_in_place_fastest_right step_end Route109_Movement_1EE905: @ 81EE905 - step_right - step_down + walk_right + walk_down step_end Route109_Movement_1EE908: @ 81EE908 - step_left - step_down + walk_left + walk_down step_end Route109_Movement_1EE90B: @ 81EE90B - step_down + walk_down step_end Route109_Movement_1EE90D: @ 81EE90D - step_down - step_27 + walk_down + walk_in_place_fastest_left step_end Route109_EventScript_1EE910:: @ 81EE910 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 9d00303c9..40d6a2e69 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -557,50 +557,50 @@ Route110_EventScript_1EF9A0:: @ 81EF9A0 return Route110_Movement_1EF9A8: @ 81EF9A8 - step_down - step_left - step_25 + walk_down + walk_left + walk_in_place_fastest_down step_end Route110_Movement_1EF9AC: @ 81EF9AC - step_down + walk_down step_end Route110_Movement_1EF9AE: @ 81EF9AE - step_down - step_right - step_25 + walk_down + walk_right + walk_in_place_fastest_down step_end Route110_Movement_1EF9B2: @ 81EF9B2 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end Route110_Movement_1EF9BA: @ 81EF9BA - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_15 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_down step_end Route110_Movement_1EF9C3: @ 81EF9C3 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up + walk_fast_up step_end Route110_EventScript_1EF9CB:: @ 81EF9CB @@ -717,66 +717,66 @@ Route110_EventScript_1EFB25:: @ 81EFB25 return Route110_Movement_1EFB30: @ 81EFB30 - step_down - step_down - step_down + walk_down + walk_down + walk_down step_end Route110_Movement_1EFB34: @ 81EFB34 - step_down - step_left - step_left - step_down + walk_down + walk_left + walk_left + walk_down step_end Route110_Movement_1EFB39: @ 81EFB39 - step_down - step_left - step_down + walk_down + walk_left + walk_down step_end Route110_Movement_1EFB3D: @ 81EFB3D - step_down - step_down + walk_down + walk_down step_end Route110_Movement_1EFB40: @ 81EFB40 - step_down - step_right - step_down + walk_down + walk_right + walk_down step_end Route110_Movement_1EFB44: @ 81EFB44 - step_up - step_up - step_right - step_up - step_up - step_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up step_end Route110_Movement_1EFB4B: @ 81EFB4B - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Route110_Movement_1EFB51: @ 81EFB51 - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Route110_Movement_1EFB57: @ 81EFB57 - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Route110_Text_1EFB5D: @ 81EFB5D diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc index 5087d304c..9579df56c 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance1.inc @@ -27,7 +27,7 @@ Route110_SeasideCyclingRoadEntrance1_EventScript_26EA9F:: @ 826EA9F end Route110_SeasideCyclingRoadEntrance1_Movement_26EAB4: @ 826EAB4 - step_left + walk_left step_end Route110_SeasideCyclingRoadEntrance1_EventScript_26EAB6:: @ 826EAB6 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc index 97e7452ec..499969d6e 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadEntrance2.inc @@ -45,7 +45,7 @@ Route110_SeasideCyclingRoadEntrance2_EventScript_26EBFC:: @ 826EBFC end Route110_SeasideCyclingRoadEntrance2_Movement_26EC11: @ 826EC11 - step_left + walk_left step_end Route110_SeasideCyclingRoadEntrance2_EventScript_26EC13:: @ 826EC13 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index b8db4697b..a2997a49b 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -253,11 +253,11 @@ Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041 end Route110_TrickHouseEnd_Movement_26B089: @ 826B089 - step_down + walk_down step_end Route110_TrickHouseEnd_Movement_26B08B: @ 826B08B - step_48 + jump_in_place_left step_end Route110_TrickHouseEnd_Text_26B08D: @ 826B08D diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 4bf7eb10a..5e03fa165 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -304,26 +304,26 @@ Route110_TrickHouseEntrance_EventScript_269E2D:: @ 8269E2D Route110_TrickHouseEnd_Movement_269E36: @ 8269E36 Route110_TrickHouseEntrance_Movement_269E36: @ 8269E36 - step_01 - step_12 - step_02 - step_12 - step_00 - step_12 - step_03 - step_12 + face_up + delay_4 + face_left + delay_4 + face_down + delay_4 + face_right + delay_4 step_end Route110_TrickHouseEnd_Movement_269E3F: @ 8269E3F Route110_TrickHouseEntrance_Movement_269E3F: @ 8269E3F - step_01 - step_52 - step_32 - step_32 - step_32 - step_32 - step_32 - step_32 + face_up + disable_anim + slide_up + slide_up + slide_up + slide_up + slide_up + slide_up step_end Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48 @@ -529,7 +529,7 @@ Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126 end Route110_TrickHouseEntrance_Movement_26A1A7: @ 826A1A7 - step_54 + set_invisible step_end Route110_TrickHouseEntrance_EventScript_26A1A9:: @ 826A1A9 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index cd14f0060..3bdf93b12 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -855,113 +855,113 @@ Route110_TrickHousePuzzle5_EventScript_26D5FF:: @ 826D5FF return Route110_TrickHousePuzzle5_Movement_26D60A: @ 826D60A - step_left + walk_left step_end Route110_TrickHousePuzzle5_Movement_26D60C: @ 826D60C - step_left - step_left + walk_left + walk_left step_end Route110_TrickHousePuzzle5_Movement_26D60F: @ 826D60F - step_left - step_left - step_left + walk_left + walk_left + walk_left step_end Route110_TrickHousePuzzle5_Movement_26D613: @ 826D613 - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left step_end Movement_26D618: @ 826D618 - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Route110_TrickHousePuzzle5_Movement_26D61E: @ 826D61E - step_right + walk_right step_end Route110_TrickHousePuzzle5_Movement_26D620: @ 826D620 - step_right - step_right + walk_right + walk_right step_end Route110_TrickHousePuzzle5_Movement_26D623: @ 826D623 - step_right - step_right - step_right + walk_right + walk_right + walk_right step_end Route110_TrickHousePuzzle5_Movement_26D627: @ 826D627 - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right step_end Route110_TrickHousePuzzle5_Movement_26D62C: @ 826D62C - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Route110_TrickHouseEntrance_Movement_26D632: @ 826D632 Route110_TrickHousePuzzle5_Movement_26D632: @ 826D632 - 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 + 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 step_end Route110_TrickHousePuzzle5_Text_26D660: @ 826D660 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 37d77d095..094a52895 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -150,13 +150,13 @@ Route111_EventScript_1F0EA7:: @ 81F0EA7 end Route111_Movement_1F0EB1:: @ 81F0EB1 - step_94 - step_15 - step_15 - step_15 - step_15 - step_15 - step_15 + store_lock_anim + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down step_end Route111_EventScript_1F0EB9:: @ 81F0EB9 @@ -247,19 +247,19 @@ Route111_EventScript_1F0F9D:: @ 81F0F9D return Route111_Movement_1F0FA8: @ 81F0FA8 - step_up + walk_up step_end Route111_Movement_1F0FAA: @ 81F0FAA - step_down + walk_down step_end Route111_Movement_1F0FAC: @ 81F0FAC - step_left + walk_left step_end Route111_Movement_1F0FAE: @ 81F0FAE - step_right + walk_right step_end Route111_EventScript_1F0FB0:: @ 81F0FB0 @@ -366,18 +366,18 @@ Route111_EventScript_1F1143:: @ 81F1143 return Route111_Movement_1F114A: @ 81F114A - step_26 - step_up + walk_in_place_fastest_up + walk_up step_end Route111_Movement_1F114D: @ 81F114D - step_down + walk_down step_end Route111_Movement_1F114F: @ 81F114F - step_14 - step_14 - step_14 + delay_16 + delay_16 + delay_16 step_end Route111_EventScript_1F1153:: @ 81F1153 diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 72c003d99..94e442a48 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -60,31 +60,31 @@ Route112_CableCarStation_EventScript_22AB67:: @ 822AB67 end Route112_CableCarStation_Movement_22AB71: @ 822AB71 - step_up - step_up - step_right - step_27 + walk_up + walk_up + walk_right + walk_in_place_fastest_left step_end Route112_CableCarStation_Movement_22AB76: @ 822AB76 - step_14 - step_left - step_down - step_down + delay_16 + walk_left + walk_down + walk_down step_end Route112_CableCarStation_Movement_22AB7B: @ 822AB7B - step_up - step_up - step_up - step_14 + walk_up + walk_up + walk_up + delay_16 step_end Route112_CableCarStation_Movement_22AB80: @ 822AB80 - step_down - step_down - step_down - step_14 + walk_down + walk_down + walk_down + delay_16 step_end Route112_CableCarStation_Text_22AB85: @ 822AB85 diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index a8d73397c..68a32c3b5 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -102,27 +102,27 @@ Route116_EventScript_1F2D39:: @ 81F2D39 end Route116_Movement_1F2D43: @ 81F2D43 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Route116_Movement_1F2D4C: @ 81F2D4C - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Route116_EventScript_1F2D57:: @ 81F2D57 @@ -223,28 +223,28 @@ Route116_EventScript_1F2E69:: @ 81F2E69 return Route116_Movement_1F2E74: @ 81F2E74 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Route116_Movement_1F2E7E: @ 81F2E7E - step_up - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end Route116_EventScript_1F2E89:: @ 81F2E89 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 27a2539e1..818111b81 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -132,58 +132,58 @@ Route118_EventScript_1F3F4C:: @ 81F3F4C return Route118_Movement_1F3F5E: @ 81F3F5E - step_14 - step_28 + delay_16 + walk_in_place_fastest_right step_end Route118_Movement_1F3F61: @ 81F3F61 - step_left + walk_left step_end Route118_Movement_1F3F63: @ 81F3F63 - step_right + walk_right step_end Route118_Movement_1F3F65: @ 81F3F65 - fast_step_down - step_14 - step_down + jump_2_down + delay_16 + walk_down step_end Route118_Movement_1F3F69: @ 81F3F69 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Route118_Movement_1F3F74: @ 81F3F74 - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Route118_Movement_1F3F7E: @ 81F3F7E - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Route118_EventScript_1F3F87:: @ 81F3F87 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 41e0fbbfe..a4b6a5fb1 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -230,98 +230,98 @@ Route119_EventScript_1F470F:: @ 81F470F return Route119_Movement_1F471E: @ 81F471E - step_14 - step_28 - step_13 - step_26 + delay_16 + walk_in_place_fastest_right + delay_8 + walk_in_place_fastest_up step_end Route119_Movement_1F4723: @ 81F4723 - step_14 - step_27 - step_13 - step_26 + delay_16 + walk_in_place_fastest_left + delay_8 + walk_in_place_fastest_up step_end Route119_Movement_1F4728: @ 81F4728 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_16 + 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 step_end Route119_Movement_1F4732: @ 81F4732 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_18 - step_16 + 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 step_end Route119_Movement_1F473D: @ 81F473D - step_18 - step_16 - step_16 - step_16 - step_18 - step_16 - step_16 - step_16 - step_16 + 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 step_end Route119_Movement_1F4747: @ 81F4747 - step_17 - step_16 - step_16 - step_16 - step_18 - step_18 - step_16 - step_16 - step_16 - step_16 + 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 step_end Route119_Movement_1F4752: @ 81F4752 - step_down - step_down - step_down - step_down - step_left - step_left - step_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_down step_end Route119_Movement_1F475A: @ 81F475A - step_up - step_right - step_right - step_up - step_up - step_up - step_up - step_up + walk_up + walk_right + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up step_end Route119_Movement_1F4763: @ 81F4763 - step_up - step_right - step_up - step_up - step_up - step_up - step_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up step_end Route119_EventScript_1F476B:: @ 81F476B diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 0bd6c12f2..b2341bf3d 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -175,38 +175,38 @@ Route119_WeatherInstitute_2F_EventScript_270166:: @ 8270166 end Route119_WeatherInstitute_2F_Movement_270170: @ 8270170 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 + 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_fast_left + walk_fast_left step_end Route119_WeatherInstitute_2F_Movement_27017C: @ 827017C - step_14 - step_14 - step_14 - step_14 - step_14 - step_2a - step_25 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + ride_water_current_up + walk_in_place_fastest_down step_end Route119_WeatherInstitute_2F_Movement_270184: @ 8270184 - step_31 - step_27 + slide_down + walk_in_place_fastest_left step_end Route119_WeatherInstitute_2F_Movement_270187: @ 8270187 - step_right - step_right - step_right + walk_right + walk_right + walk_right step_end Route119_WeatherInstitute_2F_EventScript_27018B:: @ 827018B diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 461823e47..7d6876aeb 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -274,8 +274,8 @@ Route120_EventScript_1F57AE:: @ 81F57AE return Route120_Movement_1F57B9: @ 81F57B9 - step_down - step_left + walk_down + walk_left step_end Route120_EventScript_1F57BC:: @ 81F57BC diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index d579401b8..f133ffe56 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -33,36 +33,36 @@ Route121_EventScript_1F5E18:: @ 81F5E18 end Route121_Movement_1F5E59: @ 81F5E59 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Route121_Movement_1F5E62: @ 81F5E62 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Route121_Movement_1F5E6B: @ 81F5E6B - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end Route121_EventScript_1F5E74:: @ 81F5E74 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 1369b5721..0e9cf9636 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -15,14 +15,14 @@ Route121_SafariZoneEntrance_EventScript_22BBCB:: @ 822BBCB end Route121_SafariZoneEntrance_Movement_22BBDD: @ 822BBDD - step_up - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_up + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end Route121_SafariZoneEntrance_EventScript_22BBE6:: @ 822BBE6 @@ -122,18 +122,18 @@ Route121_SafariZoneEntrance_EventScript_22BD06:: @ 822BD06 end Route121_SafariZoneEntrance_Movement_22BD16: @ 822BD16 - step_right + walk_right step_end Route121_SafariZoneEntrance_Movement_22BD18: @ 822BD18 - step_left - step_left - step_left - step_left - step_left - step_left - step_down - step_14 + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_down + delay_16 step_end Route121_SafariZoneEntrance_EventScript_22BD21:: @ 822BD21 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index f62f78404..8e2742ff5 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -80,99 +80,99 @@ Route128_EventScript_1F6B57:: @ 81F6B57 end Route128_Movement_1F6C76: @ 81F6C76 - step_17 + walk_fast_left step_end Route128_Movement_1F6C78: @ 81F6C78 - step_left - step_left - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end Route128_Movement_1F6C85: @ 81F6C85 - step_up + walk_up step_end Route128_Movement_1F6C87: @ 81F6C87 - step_17 + walk_fast_left step_end Route128_Movement_1F6C89: @ 81F6C89 - step_15 - step_27 - step_14 - step_28 - step_14 - step_14 - step_25 + walk_fast_down + walk_in_place_fastest_left + delay_16 + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_down step_end Route128_Movement_1F6C91: @ 81F6C91 - step_40 - slow_step_up - step_14 - step_41 + lock_facing_direction + walk_slow_up + delay_16 + unlock_facing_direction step_end Route128_Movement_1F6C96: @ 81F6C96 - step_17 - step_17 - step_17 - step_28 + walk_fast_left + walk_fast_left + walk_fast_left + walk_in_place_fastest_right step_end Route128_Movement_1F6C9B: @ 81F6C9B - step_14 - step_14 - step_16 - step_17 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + 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 step_end Route128_Movement_1F6CA8: @ 81F6CA8 - step_left - step_left - step_13 - step_12 + walk_left + walk_left + delay_8 + delay_4 step_end Route128_Movement_1F6CAD: @ 81F6CAD - step_left - step_25 + walk_left + walk_in_place_fastest_down step_end Route128_Movement_1F6CB0: @ 81F6CB0 - step_17 - step_17 - step_17 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 - step_16 + 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 step_end Route128_Movement_1F6CBB: @ 81F6CBB - step_right - step_25 + walk_right + walk_in_place_fastest_down step_end Route128_EventScript_1F6CBE:: @ 81F6CBE diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index f8426a7eb..5e323211a 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -105,30 +105,30 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD end RustboroCity_Movement_1E084E: @ 81E084E - step_1d + walk_in_place_down step_end RustboroCity_Movement_1E0850: @ 81E0850 - step_down + walk_down step_end RustboroCity_Movement_1E0852: @ 81E0852 - step_down - step_14 + walk_down + delay_16 step_end RustboroCity_Movement_1E0855: @ 81E0855 - step_14 - step_left - step_down - step_down - step_right - step_26 - step_14 + delay_16 + walk_left + walk_down + walk_down + walk_right + walk_in_place_fastest_up + delay_16 step_end RustboroCity_Movement_1E085D: @ 81E085D - step_up + walk_up step_end RustboroCity_EventScript_1E085F:: @ 81E085F @@ -352,100 +352,100 @@ RustboroCity_EventScript_1E0A79:: @ 81E0A79 return RustboroCity_Movement_1E0A8E: @ 81E0A8E - 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 + 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 step_end RustboroCity_Movement_1E0AA0: @ 81E0AA0 - 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 + 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 step_end RustboroCity_Movement_1E0AB1: @ 81E0AB1 - step_right - step_right - step_right - step_right - step_right - step_right - step_26 + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end RustboroCity_Movement_1E0AB9: @ 81E0AB9 - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end RustboroCity_Movement_1E0AC1: @ 81E0AC1 - step_down - step_right - step_right + walk_down + walk_right + walk_right step_end RustboroCity_Movement_1E0AC5: @ 81E0AC5 - step_down - step_down - step_right - step_right + walk_down + walk_down + walk_right + walk_right step_end RustboroCity_Movement_1E0ACA: @ 81E0ACA - step_down - step_down - step_right - step_right + walk_down + walk_down + walk_right + walk_right step_end RustboroCity_Movement_1E0ACF: @ 81E0ACF - step_down - step_down - step_down - step_right - step_right + walk_down + walk_down + walk_down + walk_right + walk_right step_end RustboroCity_Movement_1E0AD5: @ 81E0AD5 - step_down - step_down - step_down - step_right - step_right - step_right - step_25 + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_in_place_fastest_down step_end RustboroCity_EventScript_1E0ADD:: @ 81E0ADD @@ -554,7 +554,7 @@ RustboroCity_EventScript_1E0BF3:: @ 81E0BF3 return RustboroCity_Movement_1E0C29: @ 81E0C29 - step_down + walk_down step_end RustboroCity_EventScript_1E0C2B:: @ 81E0C2B @@ -972,59 +972,59 @@ RustboroCity_EventScript_1E11FB:: @ 81E11FB end RustboroCity_Movement_1E120E: @ 81E120E - step_down - step_left - step_left - step_left - step_left - step_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down step_end RustboroCity_Movement_1E1215: @ 81E1215 - step_down - step_left - step_left - step_left - step_down + walk_down + walk_left + walk_left + walk_left + walk_down step_end RustboroCity_Movement_1E121B: @ 81E121B - step_down - step_left - step_left - step_down + walk_down + walk_left + walk_left + walk_down step_end RustboroCity_Movement_1E1220: @ 81E1220 - step_down - step_left - step_down + walk_down + walk_left + walk_down step_end RustboroCity_Movement_1E1224: @ 81E1224 - step_down - step_down + walk_down + walk_down step_end RustboroCity_Movement_1E1227: @ 81E1227 - step_down - step_right - step_down + walk_down + walk_right + walk_down step_end RustboroCity_Movement_1E122B: @ 81E122B - step_down - step_right - step_right - step_down + walk_down + walk_right + walk_right + walk_down step_end RustboroCity_Movement_1E1230: @ 81E1230 - step_down - step_right - step_right - step_right - step_down + walk_down + walk_right + walk_right + walk_right + walk_down step_end RustboroCity_EventScript_1E1236:: @ 81E1236 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 9547fbd67..ffc2614cb 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -73,78 +73,78 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E end RustboroCity_DevonCorp_3F_Movement_21252F: @ 821252F - step_up - step_up - step_up - step_27 + walk_up + walk_up + walk_up + walk_in_place_fastest_left step_end RustboroCity_DevonCorp_3F_Movement_212534: @ 8212534 - 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 + 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 step_end RustboroCity_DevonCorp_3F_Movement_212543: @ 8212543 - step_14 - step_25 + delay_16 + walk_in_place_fastest_down step_end RustboroCity_DevonCorp_3F_Movement_212546: @ 8212546 - step_right - step_right - step_right - step_down - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_down + walk_right + walk_right + walk_right + walk_right step_end RustboroCity_DevonCorp_3F_Movement_21254F: @ 821254F - step_left - step_left - step_left - step_left - step_up - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_up + walk_left + walk_left + walk_left step_end RustboroCity_DevonCorp_3F_Movement_212558: @ 8212558 - 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 + 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 step_end RustboroCity_DevonCorp_3F_Movement_212566: @ 8212566 - step_14 - step_14 - step_down - step_down - step_28 + delay_16 + delay_16 + walk_down + walk_down + walk_in_place_fastest_right step_end RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 46887b9c6..f5030facd 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -113,55 +113,55 @@ RustboroCity_PokemonSchool_EventScript_213FFB:: @ 8213FFB end RustboroCity_PokemonSchool_Movement_214010: @ 8214010 - 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 + 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 step_end RustboroCity_PokemonSchool_Movement_214027: @ 8214027 - 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 + 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 step_end RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 52dca4c95..5e42be78d 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -150,121 +150,121 @@ RusturfTunnel_EventScript_22CFFF:: @ 822CFFF return RusturfTunnel_Movement_22D017: @ 822D017 - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end RusturfTunnel_Movement_22D023: @ 822D023 - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end RusturfTunnel_Movement_22D02F: @ 822D02F - step_13 - step_26 - step_14 - step_14 - step_28 + delay_8 + walk_in_place_fastest_up + delay_16 + delay_16 + walk_in_place_fastest_right step_end RusturfTunnel_Movement_22D035: @ 822D035 - step_left - step_28 + walk_left + walk_in_place_fastest_right step_end RusturfTunnel_Movement_22D038: @ 822D038 - step_down - step_26 - step_13 - step_28 + walk_down + walk_in_place_fastest_up + delay_8 + walk_in_place_fastest_right step_end RusturfTunnel_Movement_22D03D: @ 822D03D - step_up - step_25 - step_13 - step_28 + walk_up + walk_in_place_fastest_down + delay_8 + walk_in_place_fastest_right step_end RusturfTunnel_Movement_22D042: @ 822D042 - step_left - step_28 + walk_left + walk_in_place_fastest_right step_end RusturfTunnel_Movement_22D045: @ 822D045 - step_right - step_27 + walk_right + walk_in_place_fastest_left step_end RusturfTunnel_Movement_22D048: @ 822D048 - step_up - step_28 + walk_up + walk_in_place_fastest_right step_end RusturfTunnel_Movement_22D04B: @ 822D04B - step_right - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end RusturfTunnel_Movement_22D058: @ 822D058 - step_up - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_down - step_down - step_down - step_down + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down step_end RusturfTunnel_Movement_22D065: @ 822D065 - step_right + walk_right step_end RusturfTunnel_Movement_22D067: @ 822D067 - step_22 - step_22 - step_16 - step_18 + walk_in_place_fast_up + walk_in_place_fast_up + walk_fast_up + walk_fast_right step_end RusturfTunnel_Movement_22D06C: @ 822D06C - step_24 - step_24 - step_18 - step_26 + walk_in_place_fast_right + walk_in_place_fast_right + walk_fast_right + walk_in_place_fastest_up step_end RusturfTunnel_EventScript_22D071:: @ 822D071 @@ -293,9 +293,9 @@ RusturfTunnel_EventScript_22D083:: @ 822D083 end RusturfTunnel_Movement_22D0AB: @ 822D0AB - step_40 - step_right - step_41 + lock_facing_direction + walk_right + unlock_facing_direction step_end RusturfTunnel_EventScript_22D0AF:: @ 822D0AF @@ -353,76 +353,76 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 end RusturfTunnel_Movement_22D178: @ 822D178 - step_00 - step_40 - step_up - step_41 - step_27 + face_down + lock_facing_direction + walk_up + unlock_facing_direction + walk_in_place_fastest_left step_end RusturfTunnel_Movement_22D17E: @ 822D17E - step_down - step_26 + walk_down + walk_in_place_fastest_up step_end RusturfTunnel_Movement_22D181: @ 822D181 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 - step_17 + 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 step_end RusturfTunnel_Movement_22D18B: @ 822D18B - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end RusturfTunnel_Movement_22D193: @ 822D193 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end RusturfTunnel_Movement_22D19F: @ 822D19F - step_14 - step_13 - step_12 - step_27 + delay_16 + delay_8 + delay_4 + walk_in_place_fastest_left step_end RusturfTunnel_Movement_22D1A4: @ 822D1A4 - step_14 - step_right + delay_16 + walk_right step_end RusturfTunnel_Movement_22D1A7: @ 822D1A7 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end RusturfTunnel_EventScript_22D1B1:: @ 822D1B1 diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index ad10e2669..6d83c8841 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -224,47 +224,47 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 end SSTidalCorridor_Movement_23C26D: @ 823C26D - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end SSTidalCorridor_Movement_23C275: @ 823C275 - step_25 - step_14 - step_14 - step_14 - step_14 - step_down - step_left + walk_in_place_fastest_down + delay_16 + delay_16 + delay_16 + delay_16 + walk_down + walk_left step_end SSTidalCorridor_Movement_23C27D: @ 823C27D - step_14 - step_14 - step_14 - step_14 - step_13 - step_25 + delay_16 + delay_16 + delay_16 + delay_16 + delay_8 + walk_in_place_fastest_down step_end SSTidalCorridor_Movement_23C284: @ 823C284 - step_14 - step_right - step_right - step_26 - step_14 - step_27 + delay_16 + walk_right + walk_right + walk_in_place_fastest_up + delay_16 + walk_in_place_fastest_left step_end SSTidalCorridor_Movement_23C28B: @ 823C28B - step_left - step_left - step_26 + walk_left + walk_left + walk_in_place_fastest_up step_end SSTidalCorridor_Text_23C28F: @ 823C28F diff --git a/data/scripts/maps/SafariZone_South.inc b/data/scripts/maps/SafariZone_South.inc index 4be06d00b..239a2efda 100644 --- a/data/scripts/maps/SafariZone_South.inc +++ b/data/scripts/maps/SafariZone_South.inc @@ -28,12 +28,12 @@ SafariZone_South_EventScript_23D2BD:: @ 823D2BD return SafariZone_South_Movement_23D2C5: @ 823D2C5 - step_down + walk_down step_end SafariZone_South_Movement_23D2C7: @ 823D2C7 - step_right - step_25 + walk_right + walk_in_place_fastest_down step_end SafariZone_South_EventScript_23D2CA:: @ 823D2CA @@ -98,22 +98,22 @@ SafariZone_South_EventScript_23D373:: @ 823D373 end SafariZone_South_Movement_23D385: @ 823D385 - step_up + walk_up step_end SafariZone_South_Movement_23D387: @ 823D387 - step_right - step_26 + walk_right + walk_in_place_fastest_up step_end SafariZone_South_Movement_23D38A: @ 823D38A - step_left - step_28 + walk_left + walk_in_place_fastest_right step_end SafariZone_South_Movement_23D38D: @ 823D38D - step_down - step_26 + walk_down + walk_in_place_fastest_up step_end SafariZone_South_EventScript_23D390:: @ 823D390 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index a2247286c..e8f6323c1 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -147,78 +147,78 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 end SeafloorCavern_Room9_Movement_23502A: @ 823502A - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end SeafloorCavern_Room9_Movement_235032: @ 8235032 - step_left - step_left + walk_left + walk_left step_end SeafloorCavern_Room9_Movement_235035: @ 8235035 - step_left - step_14 + walk_left + delay_16 step_end SeafloorCavern_Room9_Movement_235038: @ 8235038 - step_right + walk_right step_end SeafloorCavern_Room9_Movement_23503A: @ 823503A - step_01 - step_40 - step_down - step_41 - step_28 + face_up + lock_facing_direction + walk_down + unlock_facing_direction + walk_in_place_fastest_right step_end SeafloorCavern_Room9_Movement_235040: @ 8235040 - step_14 - step_14 - slow_step_down - step_14 - step_14 - step_14 - slow_step_down - step_14 - step_14 - step_14 + delay_16 + delay_16 + walk_slow_down + delay_16 + delay_16 + delay_16 + walk_slow_down + delay_16 + delay_16 + delay_16 step_end SeafloorCavern_Room9_Movement_23504B: @ 823504B - step_32 - step_32 + slide_up + slide_up step_end SeafloorCavern_Room9_Movement_23504E: @ 823504E - step_18 - step_18 - step_18 - step_18 - step_18 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right step_end SeafloorCavern_Room9_Movement_235054: @ 8235054 - step_right - step_right + walk_right + walk_right step_end SeafloorCavern_Room9_Movement_235057: @ 8235057 - step_18 - step_18 - step_18 - step_18 + walk_fast_right + walk_fast_right + walk_fast_right + walk_fast_right step_end SeafloorCavern_Room9_Movement_23505C: @ 823505C - step_14 - step_14 + delay_16 + delay_16 step_end SeafloorCavern_Room9_Text_23505F: @ 823505F diff --git a/data/scripts/maps/SkyPillar_Outside.inc b/data/scripts/maps/SkyPillar_Outside.inc index cced073aa..e9fbf4ad6 100644 --- a/data/scripts/maps/SkyPillar_Outside.inc +++ b/data/scripts/maps/SkyPillar_Outside.inc @@ -92,46 +92,46 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304 end SkyPillar_Outside_Movement_2393D3: @ 82393D3 - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right step_end SkyPillar_Outside_Movement_2393DE: @ 82393DE - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_right - step_up - step_up - step_up - step_up + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up step_end SkyPillar_Outside_Movement_2393EB: @ 82393EB - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_right - step_up - step_up - step_up + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up step_end SkyPillar_Outside_EventScript_2393F8:: @ 82393F8 diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index a652c7897..334acc8ac 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -98,10 +98,10 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A fadeoutbgm 1 applymovement 255, SkyPillar_Top_Movement_2725B2 waitmovement 0 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SkyPillar_Top_Movement_239858 waitmovement 0 - special RemoveScriptFieldObject + special RemoveScriptEventObject applymovement 1, SkyPillar_Top_Movement_23983A waitmovement 0 waitse @@ -128,10 +128,10 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A closemessage delay 20 fadeinbgm 1 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SkyPillar_Top_Movement_23985C waitmovement 0 - special RemoveScriptFieldObject + special RemoveScriptEventObject setvar VAR_0x405E, 5 setvar VAR_0x40CA, 1 setvar VAR_0x40D7, 1 @@ -139,49 +139,49 @@ SkyPillar_Top_EventScript_23979A:: @ 823979A end SkyPillar_Top_Movement_23983A: @ 823983A - step_14 - step_23 - step_14 - step_14 - step_14 - step_14 - step_14 - step_1f - step_14 - step_20 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 + delay_16 + walk_in_place_fast_left + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_left + delay_16 + walk_in_place_right + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 step_end SkyPillar_Top_Movement_23984B: @ 823984B - step_14 - step_1d - step_13 - step_20 - step_13 - step_2e - step_32 - step_32 - step_32 - step_32 - step_32 - step_32 + delay_16 + walk_in_place_down + delay_8 + walk_in_place_right + delay_8 + walk_fastest_up + slide_up + slide_up + slide_up + slide_up + slide_up + slide_up step_end SkyPillar_Top_Movement_239858: @ 8239858 - slow_step_up - slow_step_up - slow_step_up + walk_slow_up + walk_slow_up + walk_slow_up step_end SkyPillar_Top_Movement_23985C: @ 823985C - slow_step_down - slow_step_down - slow_step_down + walk_slow_down + walk_slow_down + walk_slow_down step_end SkyPillar_Top_Text_239860: @ 8239860 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index fe7cfc0fd..d860e6e7c 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -90,30 +90,30 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C end SlateportCity_Movement_1DCDA8: @ 81DCDA8 - step_14 - step_13 - step_27 + delay_16 + delay_8 + walk_in_place_fastest_left step_end SlateportCity_Movement_1DCDAC: @ 81DCDAC - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end SlateportCity_Movement_1DCDB4: @ 81DCDB4 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end SlateportCity_EventScript_1DCDBD:: @ 81DCDBD @@ -473,8 +473,8 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1 end SlateportCity_Movement_1DD147: @ 81DD147 - step_14 - step_14 + delay_16 + delay_16 step_end SlateportCity_EventScript_1DD14A:: @ 81DD14A @@ -622,95 +622,95 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8 end SlateportCity_Movement_1DD309: @ 81DD309 - step_14 - step_14 - step_57 - step_28 - step_14 - step_14 - step_27 + delay_16 + delay_16 + emote_question_mark + walk_in_place_fastest_right + delay_16 + delay_16 + walk_in_place_fastest_left step_end SlateportCity_Movement_1DD311: @ 81DD311 - step_57 - step_26 - step_14 - step_25 - step_14 - step_14 - step_27 + emote_question_mark + walk_in_place_fastest_up + delay_16 + walk_in_place_fastest_down + delay_16 + delay_16 + walk_in_place_fastest_left step_end SlateportCity_Movement_1DD319: @ 81DD319 - step_14 - step_left - step_left - step_down - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left + delay_16 + walk_left + walk_left + walk_down + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left step_end SlateportCity_Movement_1DD326: @ 81DD326 - 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 + 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 step_end SlateportCity_Movement_1DD334: @ 81DD334 - step_down - step_26 + walk_down + walk_in_place_fastest_up step_end SlateportCity_Movement_1DD337: @ 81DD337 - step_right - step_up - step_up - step_54 + walk_right + walk_up + walk_up + set_invisible step_end SlateportCity_Movement_1DD33C: @ 81DD33C - step_14 - step_14 - step_14 - step_14 - step_14 - step_down - step_left + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_down + walk_left step_end SlateportCity_Movement_1DD344: @ 81DD344 - step_28 - step_14 - step_14 - step_right - step_up + walk_in_place_fastest_right + delay_16 + delay_16 + walk_right + walk_up step_end SlateportCity_Movement_1DD34A: @ 81DD34A - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_25 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_down step_end SlateportCity_EventScript_1DD353:: @ 81DD353 @@ -914,30 +914,30 @@ SlateportCity_EventScript_1DD5DC:: @ 81DD5DC end SlateportCity_Movement_1DD630: @ 81DD630 - step_40 - step_down - step_41 + lock_facing_direction + walk_down + unlock_facing_direction step_end SlateportCity_Movement_1DD634: @ 81DD634 - step_14 - step_28 + delay_16 + walk_in_place_fastest_right step_end SlateportCity_Movement_1DD637: @ 81DD637 - step_13 - step_down + delay_8 + walk_down step_end SlateportCity_Movement_1DD63A: @ 81DD63A - step_right - step_right - step_right - step_right - step_right - step_right - step_right - step_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right + walk_right step_end SlateportCity_EventScript_1DD643:: @ 81DD643 diff --git a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc index 4c5aa0371..d79849a6c 100644 --- a/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc +++ b/data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc @@ -99,17 +99,17 @@ SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B @ forced stop SlateportCity_BattleTentBattleRoom_Movement_209A99: @ 8209A99 - step_up - step_up - step_up - step_28 + walk_up + walk_up + walk_up + walk_in_place_fastest_right step_end SlateportCity_BattleTentBattleRoom_Movement_209A9E: @ 8209A9E - step_down - step_down - step_down - step_down - step_27 + walk_down + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end diff --git a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc index 47ca641ce..7446c1002 100644 --- a/data/scripts/maps/SlateportCity_BattleTentCorridor.inc +++ b/data/scripts/maps/SlateportCity_BattleTentCorridor.inc @@ -147,29 +147,29 @@ SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044 goto SlateportCity_BattleTentCorridor_EventScript_208F0D SlateportCity_BattleTentCorridor_Movement_209059: @ 8209059 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end SlateportCity_BattleTentCorridor_Movement_20905E: @ 820905E - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end SlateportCity_BattleTentCorridor_Movement_209062: @ 8209062 - step_up - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end SlateportCity_BattleTentCorridor_Movement_209068: @ 8209068 - step_up - step_54 + walk_up + set_invisible step_end SlateportCity_BattleTentCorridor_Text_20906B: @ 820906B diff --git a/data/scripts/maps/SlateportCity_BattleTentLobby.inc b/data/scripts/maps/SlateportCity_BattleTentLobby.inc index 6353856e3..187ed0751 100644 --- a/data/scripts/maps/SlateportCity_BattleTentLobby.inc +++ b/data/scripts/maps/SlateportCity_BattleTentLobby.inc @@ -194,26 +194,26 @@ SlateportCity_BattleTentLobby_EventScript_2089C9:: @ 82089C9 return SlateportCity_BattleTentLobby_Movement_2089F8: @ 82089F8 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end SlateportCity_BattleTentLobby_Movement_2089FC: @ 82089FC - step_up - step_54 + walk_up + set_invisible step_end SlateportCity_BattleTentLobby_Movement_2089FF: @ 82089FF - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end SlateportCity_BattleTentLobby_Movement_208A03: @ 8208A03 - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end SlateportCity_BattleTentLobby_EventScript_208A07:: @ 8208A07 @@ -236,10 +236,10 @@ SlateportCity_BattleTentLobby_EventScript_208A2E:: @ 8208A2E end SlateportCity_BattleTentLobby_Movement_208A38:: @ 8208A38 - step_up - step_up - step_up - step_54 + walk_up + walk_up + walk_up + set_invisible step_end SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index a66e0e6d9..ca6ab50b5 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -105,58 +105,58 @@ SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3 return SlateportCity_Harbor_Movement_20CAC8: @ 820CAC8 - step_14 - step_14 - step_43 - step_54 + delay_16 + delay_16 + jump_up + set_invisible step_end SlateportCity_Harbor_Movement_20CACD: @ 820CACD - step_14 - step_14 - step_43 - step_54 + delay_16 + delay_16 + jump_up + set_invisible step_end SlateportCity_Harbor_Movement_20CAD2: @ 820CAD2 - 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 + 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 step_end SlateportCity_Harbor_Movement_20CAE0: @ 820CAE0 - step_left - step_left - step_left - step_left - step_up + walk_left + walk_left + walk_left + walk_left + walk_up step_end SlateportCity_Harbor_Movement_20CAE6: @ 820CAE6 - step_left - step_left - step_up - step_left + walk_left + walk_left + walk_up + walk_left step_end SlateportCity_Harbor_Movement_20CAEB: @ 820CAEB - step_left - step_left - step_left + walk_left + walk_left + walk_left step_end SlateportCity_Harbor_Movement_20CAEF: @ 820CAEF - step_up + walk_up step_end SlateportCity_Harbor_EventScript_20CAF1:: @ 820CAF1 @@ -259,12 +259,12 @@ SlateportCity_Harbor_EventScript_20CC42:: @ 820CC42 return SlateportCity_Harbor_Movement_20CC4D: @ 820CC4D - step_right - step_26 + walk_right + walk_in_place_fastest_up step_end SlateportCity_Harbor_Movement_20CC50: @ 820CC50 - step_up + walk_up step_end SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index ba8575c66..4464ee582 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -72,7 +72,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39 end SlateportCity_OceanicMuseum_1F_Movement_20AE4B: @ 820AE4B - step_down + walk_down step_end SlateportCity_OceanicMuseum_1F_EventScript_20AE4D:: @ 820AE4D @@ -210,33 +210,33 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AFB5:: @ 820AFB5 end SlateportCity_OceanicMuseum_1F_Movement_20AFBF: @ 820AFBF - step_14 - step_13 - step_12 - step_25 + delay_16 + delay_8 + delay_4 + walk_in_place_fastest_down step_end SlateportCity_OceanicMuseum_1F_Movement_20AFC4: @ 820AFC4 - step_14 - step_25 + delay_16 + walk_in_place_fastest_down step_end SlateportCity_OceanicMuseum_1F_Movement_20AFC7: @ 820AFC7 - step_00 - step_15 - step_15 - step_15 - step_15 - step_13 + face_down + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 step_end SlateportCity_OceanicMuseum_1F_Movement_20AFCE: @ 820AFCE - step_18 - step_15 - step_15 - step_15 - step_15 - step_13 + walk_fast_right + walk_fast_down + walk_fast_down + walk_fast_down + walk_fast_down + delay_8 step_end SlateportCity_OceanicMuseum_1F_Text_20AFD5: @ 820AFD5 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index a7a24757f..4172c47ef 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -116,103 +116,103 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BCB3:: @ 820BCB3 return SlateportCity_OceanicMuseum_2F_Movement_20BCBE: @ 820BCBE - step_left - step_down - step_27 + walk_left + walk_down + walk_in_place_fastest_left step_end SlateportCity_OceanicMuseum_2F_Movement_20BCC2: @ 820BCC2 - step_up - step_left - step_left - step_down - step_27 + walk_up + walk_left + walk_left + walk_down + walk_in_place_fastest_left step_end SlateportCity_OceanicMuseum_2F_Movement_20BCC8: @ 820BCC8 - 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 + 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 step_end SlateportCity_OceanicMuseum_2F_Movement_20BCD6: @ 820BCD6 - step_right + walk_right step_end SlateportCity_OceanicMuseum_2F_Movement_20BCD8: @ 820BCD8 - step_down - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right + walk_down + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right step_end SlateportCity_OceanicMuseum_2F_Movement_20BCE2: @ 820BCE2 - step_right + walk_right step_end SlateportCity_OceanicMuseum_2F_Movement_20BCE4: @ 820BCE4 - step_down - step_right - step_25 + walk_down + walk_right + walk_in_place_fastest_down step_end SlateportCity_OceanicMuseum_2F_Movement_20BCE8: @ 820BCE8 - step_down - step_down - step_down - step_right - step_right - step_right + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right step_end SlateportCity_OceanicMuseum_2F_Movement_20BCEF: @ 820BCEF - step_40 - step_left - step_41 + lock_facing_direction + walk_left + unlock_facing_direction step_end SlateportCity_OceanicMuseum_2F_Movement_20BCF3: @ 820BCF3 - step_down + walk_down step_end SlateportCity_OceanicMuseum_2F_Movement_20BCF5: @ 820BCF5 - step_down - step_down - step_down - step_down - step_right - step_right - step_right - step_right + walk_down + walk_down + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right step_end SlateportCity_OceanicMuseum_2F_Movement_20BCFE: @ 820BCFE - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_13 - step_15 - step_26 + 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 step_end SlateportCity_OceanicMuseum_2F_EventScript_20BD0A:: @ 820BD0A diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 793b6f4fd..6a26ee0ff 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -212,10 +212,10 @@ SootopolisCity_EventScript_1E5926:: @ 81E5926 SootopolisCity_EventScript_1E5946:: @ 81E5946 delay 60 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SootopolisCity_Movement_1E5A68 waitmovement 0 - special RemoveScriptFieldObject + special RemoveScriptEventObject delay 60 fadescreenspeed 1, 8 setweather 15 @@ -269,53 +269,53 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946 applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 9, SootopolisCity_Movement_1E5BF0 waitmovement 0 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 10, SootopolisCity_Movement_1E5BD6 applymovement 9, SootopolisCity_Movement_1E5BF7 applymovement 127, SootopolisCity_Movement_1E5A75 waitmovement 0 - special RemoveScriptFieldObject + special RemoveScriptEventObject setvar VAR_0x405E, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 releaseall end SootopolisCity_Movement_1E5A68: @ 81E5A68 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 - step_92 + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest + walk_slow_diag_southwest step_end SootopolisCity_Movement_1E5A75: @ 81E5A75 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast step_end SootopolisCity_EventScript_1E5A82:: @ 81E5A82 delay 60 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SootopolisCity_Movement_1E5BA4 waitmovement 0 - special RemoveScriptFieldObject + special RemoveScriptEventObject delay 60 fadescreenspeed 1, 8 setweather 15 @@ -369,125 +369,125 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82 applymovement 10, SootopolisCity_Movement_1E5BCF applymovement 9, SootopolisCity_Movement_1E5BF0 waitmovement 0 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 10, SootopolisCity_Movement_1E5BD6 applymovement 9, SootopolisCity_Movement_1E5BF7 applymovement 127, SootopolisCity_Movement_1E5BAE waitmovement 0 - special RemoveScriptFieldObject + special RemoveScriptEventObject setvar VAR_0x405E, 2 clearflag FLAG_SPECIAL_FLAG_0x4000 releaseall end SootopolisCity_Movement_1E5BA4: @ 81E5BA4 - step_91 - step_91 - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end SootopolisCity_Movement_1E5BAE: @ 81E5BAE - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_92 - step_92 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_slow_diag_southwest + walk_slow_diag_southwest step_end SootopolisCity_Movement_1E5BB8: @ 81E5BB8 - step_1b - step_1b - step_1b - step_14 - step_14 - step_14 - step_5e - step_96 - step_5f + walk_in_place_slow_left + walk_in_place_slow_left + walk_in_place_slow_left + delay_16 + delay_16 + delay_16 + init_affine_anim + walk_left_affine + clear_affine_anim step_end SootopolisCity_Movement_1E5BC2: @ 81E5BC2 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_5e - step_96 - step_5f + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + init_affine_anim + walk_left_affine + clear_affine_anim step_end SootopolisCity_Movement_1E5BCF: @ 81E5BCF - step_40 - step_right - step_14 - step_14 - step_14 - step_41 + lock_facing_direction + walk_right + delay_16 + delay_16 + delay_16 + unlock_facing_direction step_end SootopolisCity_Movement_1E5BD6: @ 81E5BD6 - step_1b - step_1b - step_1b - step_1b - step_1b - step_1b + walk_in_place_slow_left + walk_in_place_slow_left + walk_in_place_slow_left + walk_in_place_slow_left + walk_in_place_slow_left + walk_in_place_slow_left step_end SootopolisCity_Movement_1E5BDD: @ 81E5BDD - step_1c - step_1c - step_1c - step_14 - step_14 - step_14 - step_18 + walk_in_place_slow_right + walk_in_place_slow_right + walk_in_place_slow_right + delay_16 + delay_16 + delay_16 + walk_fast_right step_end SootopolisCity_Movement_1E5BE5: @ 81E5BE5 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_18 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + delay_16 + walk_fast_right step_end SootopolisCity_Movement_1E5BF0: @ 81E5BF0 - step_40 - step_left - step_14 - step_14 - step_14 - step_41 + lock_facing_direction + walk_left + delay_16 + delay_16 + delay_16 + unlock_facing_direction step_end SootopolisCity_Movement_1E5BF7: @ 81E5BF7 - step_1c - step_1c - step_1c - step_1c - step_1c - step_1c + walk_in_place_slow_right + walk_in_place_slow_right + walk_in_place_slow_right + walk_in_place_slow_right + walk_in_place_slow_right + walk_in_place_slow_right step_end SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE @@ -502,10 +502,10 @@ SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E delay 60 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SootopolisCity_Movement_1E5A68 waitmovement 0 - special RemoveScriptFieldObject + special RemoveScriptEventObject delay 60 fadescreenspeed 1, 8 call SootopolisCity_EventScript_1E5D82 @@ -516,7 +516,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E special sub_813B7D8 waitstate playse SE_T_KAMI - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SootopolisCity_Movement_1E5E63 waitmovement 0 waitse @@ -555,10 +555,10 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE delay 60 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SootopolisCity_Movement_1E5BA4 waitmovement 0 - special RemoveScriptFieldObject + special RemoveScriptEventObject delay 60 fadescreenspeed 1, 8 call SootopolisCity_EventScript_1E5D82 @@ -568,7 +568,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE setvar VAR_0x8004, 1 special sub_813B7D8 waitstate - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SootopolisCity_Movement_1E5E63 applymovement 255, SootopolisCity_Movement_1E5E68 waitmovement 0 @@ -634,65 +634,65 @@ SootopolisCity_EventScript_1E5D82:: @ 81E5D82 return SootopolisCity_Movement_1E5E5B: @ 81E5E5B - step_16 - step_2e - step_2e - step_2e - step_2e - step_2e - step_2e + walk_fast_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up + walk_fastest_up step_end SootopolisCity_Movement_1E5E63: @ 81E5E63 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end SootopolisCity_Movement_1E5E68: @ 81E5E68 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end SootopolisCity_Movement_1E5E6D: @ 81E5E6D - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down step_end SootopolisCity_Movement_1E5E72: @ 81E5E72 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_91 - step_right - step_right - step_right - step_right + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_slow_diag_northeast + walk_right + walk_right + walk_right + walk_right step_end SootopolisCity_Movement_1E5E7F: @ 81E5E7F - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_down - step_92 - step_92 + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_slow_diag_southwest + walk_slow_diag_southwest step_end SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D @@ -1004,267 +1004,267 @@ SootopolisCity_EventScript_1E6255:: @ 81E6255 return SootopolisCity_Movement_1E6267: @ 81E6267 - step_up - step_up - step_up - step_right - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_left - step_up - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_25 + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_in_place_fastest_down step_end SootopolisCity_Movement_1E628C: @ 81E628C - step_left - step_up - step_up - step_up - step_right - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_left - step_up - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_left + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end SootopolisCity_Movement_1E62B0: @ 81E62B0 - step_up - step_up - step_up - step_up - step_right - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_left - step_up - step_up - step_up - step_up - step_left - step_left - step_left - step_left - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up + walk_right + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_left + walk_up + walk_up + walk_up + walk_up + walk_left + walk_left + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up + walk_up step_end SootopolisCity_Movement_1E62D4: @ 81E62D4 - step_up - step_up - step_right - step_right - step_right - step_right - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_up - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_right - 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_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_12 - step_27 - step_14 - step_14 - step_right - step_up - step_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + 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 + 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 + delay_4 + walk_in_place_fastest_left + delay_16 + delay_16 + walk_right + walk_up + walk_up step_end SootopolisCity_Movement_1E630E: @ 81E630E - step_up - step_up - step_up - step_right - step_right - step_right - step_right - step_down - step_down - step_right - step_right - step_right - step_right - step_right - step_up - step_right - step_right - step_right - step_right - step_down - step_down - step_down - step_right - 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_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 + walk_up + walk_up + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_right + walk_right + walk_right + walk_right + walk_right + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_down + walk_down + walk_right + 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 + 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 step_end SootopolisCity_Movement_1E6341: @ 81E6341 - slow_step_left - step_28 + walk_slow_left + walk_in_place_fastest_right step_end SootopolisCity_Movement_1E6344: @ 81E6344 - step_down - step_down - step_left - step_13 - step_right - step_up - step_up - step_up - step_right - step_27 + walk_down + walk_down + walk_left + delay_8 + walk_right + walk_up + walk_up + walk_up + walk_right + walk_in_place_fastest_left step_end SootopolisCity_Movement_1E634F: @ 81E634F - step_14 - step_14 - step_14 - step_13 - step_right - step_right - step_up - step_up - step_up - step_28 + delay_16 + delay_16 + delay_16 + delay_8 + walk_right + walk_right + walk_up + walk_up + walk_up + walk_in_place_fastest_right step_end SootopolisCity_Movement_1E635A: @ 81E635A - step_up - step_up + walk_up + walk_up step_end SootopolisCity_EventScript_1E635D:: @ 81E635D @@ -1398,13 +1398,13 @@ SootopolisCity_EventScript_1E64E2:: @ 81E64E2 end SootopolisCity_Movement_1E64EC: @ 81E64EC - step_right - step_25 + walk_right + walk_in_place_fastest_down step_end SootopolisCity_Movement_1E64EF: @ 81E64EF - step_left - step_25 + walk_left + walk_in_place_fastest_down step_end SootopolisCity_EventScript_1E64F2:: @ 81E64F2 @@ -1454,11 +1454,11 @@ SootopolisCity_EventScript_1E654C:: @ 81E654C end SootopolisCity_Movement_1E656B:: @ 81E656B - step_98 + levitate step_end SootopolisCity_Movement_1E656D:: @ 81E656D - step_9A + destroy_extra_task step_end SootopolisCity_Text_1E656F: @ 81E656F diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 6a53dc57c..02ac01f2b 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -82,7 +82,7 @@ SootopolisCity_Gym_1F_EventScript_224F29:: @ 8224F29 end SootopolisCity_Gym_1F_Movement_224F42: @ 8224F42 - step_54 + set_invisible step_end SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc index 54ade5181..8d6b4631f 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc @@ -63,12 +63,12 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16:: @ 8227A16 return SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F: @ 8227A1F - step_down + walk_down step_end SootopolisCity_MysteryEventsHouse_1F_Movement_227A21: @ 8227A21 - step_right - step_25 + walk_right + walk_in_place_fastest_down step_end SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24 @@ -152,31 +152,31 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22:: @ 8227B22 return SootopolisCity_MysteryEventsHouse_1F_Movement_227B34: @ 8227B34 - step_14 - step_up - step_up + delay_16 + walk_up + walk_up step_end SootopolisCity_MysteryEventsHouse_1F_Movement_227B38: @ 8227B38 - step_14 - step_right - step_up + delay_16 + walk_right + walk_up step_end SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C: @ 8227B3C - step_14 - step_left - step_up + delay_16 + walk_left + walk_up step_end SootopolisCity_MysteryEventsHouse_1F_Movement_227B40: @ 8227B40 - step_left - step_28 + walk_left + walk_in_place_fastest_right step_end SootopolisCity_MysteryEventsHouse_1F_Movement_227B43: @ 8227B43 - step_right - step_27 + walk_right + walk_in_place_fastest_left step_end SootopolisCity_MysteryEventsHouse_1F_Text_227B46: @ 8227B46 diff --git a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc index 5a4a09735..142a8e70e 100644 --- a/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc +++ b/data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc @@ -59,20 +59,20 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8 return SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3: @ 8227EF3 - step_down - step_down - step_down - step_right - step_right + walk_down + walk_down + walk_down + walk_right + walk_right step_end SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9: @ 8227EF9 - step_left - step_left - step_up - step_up - step_up - step_up - step_13 + walk_left + walk_left + walk_up + walk_up + walk_up + walk_up + delay_8 step_end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 8784a6424..bf57aa9ce 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -41,12 +41,12 @@ BattleFrontier_OutsideWest_EventScript_242A2C:: @ 8242A2C return BattleFrontier_OutsideWest_Movement_242A37: @ 8242A37 - step_down + walk_down step_end BattleFrontier_OutsideWest_Movement_242A39: @ 8242A39 - step_left - step_25 + walk_left + walk_in_place_fastest_down step_end SouthernIsland_Exterior_EventScript_242A3C:: @ 8242A3C diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index b7d4e101c..432667cc9 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -66,7 +66,7 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 goto_if 0, SouthernIsland_Interior_EventScript_242B9A setflag FLAG_0x0CE setflag FLAG_0x002 - special SpawnScriptFieldObject + special SpawnScriptEventObject applymovement 127, SouthernIsland_Interior_Movement_242BCA waitmovement 0 delay 50 @@ -80,7 +80,7 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 applymovement 2, SouthernIsland_Interior_Movement_242BDA waitmovement 0 delay 50 - special RemoveScriptFieldObject + special RemoveScriptEventObject setvar VAR_LAST_TALKED, 2 compare VAR_0x40D5, 0 call_if 1, SouthernIsland_Interior_EventScript_242BA4 @@ -132,36 +132,36 @@ SouthernIsland_Interior_EventScript_242BB7:: @ 8242BB7 return SouthernIsland_Interior_Movement_242BCA: @ 8242BCA - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end SouthernIsland_Interior_Movement_242BCE: @ 8242BCE - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_14 - step_down - step_down - step_down - step_26 + 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 step_end SouthernIsland_Interior_Movement_242BDA: @ 8242BDA - step_down - step_down - step_down - step_down - step_down - step_14 - step_14 - step_down - step_down - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + delay_16 + delay_16 + walk_down + walk_down + walk_down + walk_down step_end diff --git a/data/scripts/maps/TerraCave_End.inc b/data/scripts/maps/TerraCave_End.inc index be532733d..5152f85cf 100644 --- a/data/scripts/maps/TerraCave_End.inc +++ b/data/scripts/maps/TerraCave_End.inc @@ -66,13 +66,13 @@ TerraCave_End_EventScript_23B163:: @ 823B163 end TerraCave_End_Movement_23B16E: @ 823B16E - step_5e - step_62 - step_14 - step_14 - step_63 - step_14 - step_14 - step_63 + init_affine_anim + walk_down_start_affine + delay_16 + delay_16 + walk_down_affine + delay_16 + delay_16 + walk_down_affine step_end diff --git a/data/scripts/maps/TrainerHill_Elevator.inc b/data/scripts/maps/TrainerHill_Elevator.inc index 7886f91b8..155c31877 100644 --- a/data/scripts/maps/TrainerHill_Elevator.inc +++ b/data/scripts/maps/TrainerHill_Elevator.inc @@ -55,33 +55,33 @@ TrainerHill_Elevator_EventScript_2693D9:: @ 82693D9 return TrainerHill_Elevator_Movement_2693DF: @ 82693DF - step_up - step_up - step_right - step_00 + walk_up + walk_up + walk_right + face_down step_end TrainerHill_Elevator_Movement_2693E4: @ 82693E4 - step_14 - step_left + delay_16 + walk_left step_end TrainerHill_Elevator_Movement_2693E7: @ 82693E7 - step_14 - step_down - step_down + delay_16 + walk_down + walk_down step_end TrainerHill_Elevator_Movement_2693EB: @ 82693EB - step_00 - step_14 + face_down + delay_16 step_end TrainerHill_Elevator_Movement_2693EE: @ 82693EE - step_03 + face_right step_end TrainerHill_Elevator_Movement_2693F0: @ 82693F0 - step_00 + face_down step_end diff --git a/data/scripts/maps/TrainerHill_Entrance.inc b/data/scripts/maps/TrainerHill_Entrance.inc index 6dc934f3c..84543ff2b 100644 --- a/data/scripts/maps/TrainerHill_Entrance.inc +++ b/data/scripts/maps/TrainerHill_Entrance.inc @@ -217,20 +217,20 @@ TrainerHill_Entrance_EventScript_26836A:: @ 826836A end TrainerHill_Entrance_Movement_26837F: @ 826837F - step_03 + face_right step_end TrainerHill_Entrance_Movement_268381: @ 8268381 - step_down + walk_down step_end TrainerHill_Entrance_Movement_268383: @ 8268383 - step_01 + face_up step_end TrainerHill_Entrance_Movement_268385: @ 8268385 - step_down - step_down + walk_down + walk_down step_end TrainerHill_Entrance_EventScript_268388:: @ 8268388 diff --git a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc index 24c319337..d7233a3aa 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc @@ -172,29 +172,29 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_20256C:: @ 820256C return VerdanturfTown_BattleTentBattleRoom_Movement_202573: @ 8202573 - step_54 + set_invisible step_end VerdanturfTown_BattleTentBattleRoom_Movement_202575: @ 8202575 - step_55 - step_up - step_up - step_up - step_03 + set_visible + walk_up + walk_up + walk_up + face_right step_end VerdanturfTown_BattleTentBattleRoom_Movement_20257B: @ 820257B - step_down - step_down - step_down - step_down - step_02 + walk_down + walk_down + walk_down + walk_down + face_left step_end VerdanturfTown_BattleTentBattleRoom_Movement_202581: @ 8202581 - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end diff --git a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc b/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc index 0d0470fc1..96bd1f114 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentCorridor.inc @@ -26,18 +26,18 @@ VerdanturfTown_BattleTentCorridor_EventScript_20209A:: @ 820209A end VerdanturfTown_BattleTentCorridor_Movement_2020DE: @ 82020DE - step_up - step_up - step_up - step_up + walk_up + walk_up + walk_up + walk_up step_end VerdanturfTown_BattleTentCorridor_Movement_2020E3: @ 82020E3 - step_up + walk_up VerdanturfTown_BattleTentCorridor_Movement_2020E4: @ 82020E4 - step_up - step_54 + walk_up + set_invisible step_end VerdanturfTown_BattleTentCorridor_Text_2020E7: @ 82020E7 diff --git a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc index 85c5f33c7..468a34991 100644 --- a/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc +++ b/data/scripts/maps/VerdanturfTown_BattleTentLobby.inc @@ -258,20 +258,20 @@ VerdanturfTown_BattleTentLobby_EventScript_201A41:: @ 8201A41 return VerdanturfTown_BattleTentLobby_Movement_201A70: @ 8201A70 - step_up - step_up - step_up + walk_up + walk_up + walk_up step_end VerdanturfTown_BattleTentLobby_Movement_201A74: @ 8201A74 - step_up - step_54 + walk_up + set_invisible step_end VerdanturfTown_BattleTentLobby_Movement_201A77: @ 8201A77 - step_up - step_up - step_54 + walk_up + walk_up + set_invisible step_end VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 4dd00035a..2ed1c6baf 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -51,30 +51,30 @@ VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 end VictoryRoad_1F_Movement_235E15: @ 8235E15 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up step_end VictoryRoad_1F_Movement_235E21: @ 8235E21 - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_left - step_up + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_left + walk_up step_end VictoryRoad_1F_EventScript_235E2C:: @ 8235E2C diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 8f8d493f8..734831f7f 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -32,7 +32,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758 return LittlerootTown_BrendansHouse_1F_Movement_292763: @ 8292763 - step_up + walk_up step_end LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765 @@ -119,33 +119,33 @@ LittlerootTown_BrendansHouse_2F_EventScript_292849:: @ 8292849 return LittlerootTown_BrendansHouse_2F_Movement_292850: @ 8292850 - step_13 - step_down - step_27 - step_14 - step_13 - step_left + delay_8 + walk_down + walk_in_place_fastest_left + delay_16 + delay_8 + walk_left step_end LittlerootTown_BrendansHouse_2F_Movement_292857: @ 8292857 - step_right - step_up - step_13 + walk_right + walk_up + delay_8 step_end LittlerootTown_BrendansHouse_2F_Movement_29285B: @ 829285B - step_13 - step_down - step_28 - step_14 - step_13 - step_right + delay_8 + walk_down + walk_in_place_fastest_right + delay_16 + delay_8 + walk_right step_end LittlerootTown_BrendansHouse_2F_Movement_292862: @ 8292862 - step_left - step_up - step_13 + walk_left + walk_up + delay_8 step_end LittlerootTown_BrendansHouse_1F_EventScript_292866:: @ 8292866 @@ -227,87 +227,87 @@ LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C return LittlerootTown_BrendansHouse_1F_Movement_292989: @ 8292989 - step_up - step_right - step_right - step_right - step_right - step_down - step_28 + walk_up + walk_right + walk_right + walk_right + walk_right + walk_down + walk_in_place_fastest_right step_end LittlerootTown_BrendansHouse_1F_Movement_292991: @ 8292991 - step_up - step_left - step_left - step_left - step_left - step_down - step_27 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_down + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_1F_Movement_292999: @ 8292999 - step_right + walk_right step_end LittlerootTown_BrendansHouse_1F_Movement_29299B: @ 829299B - step_left + walk_left step_end LittlerootTown_BrendansHouse_1F_Movement_29299D: @ 829299D - step_27 - step_14 - step_14 - step_14 - step_14 - step_28 - step_14 - step_14 + walk_in_place_fastest_left + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_right + delay_16 + delay_16 step_end LittlerootTown_BrendansHouse_1F_Movement_2929A6: @ 82929A6 - step_28 - step_14 - step_14 - step_14 - step_14 - step_27 - step_14 - step_14 + walk_in_place_fastest_right + delay_16 + delay_16 + delay_16 + delay_16 + walk_in_place_fastest_left + delay_16 + delay_16 step_end LittlerootTown_BrendansHouse_1F_Movement_2929AF: @ 82929AF - step_up - step_left - step_left + walk_up + walk_left + walk_left step_end LittlerootTown_BrendansHouse_1F_Movement_2929B3: @ 82929B3 - step_up - step_right - step_right + walk_up + walk_right + walk_right step_end LittlerootTown_BrendansHouse_1F_Movement_2929B7: @ 82929B7 - step_left - step_28 + walk_left + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_1F_Movement_2929BA: @ 82929BA - step_right - step_27 + walk_right + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_1F_Movement_2929BD: @ 82929BD - step_left - step_down - step_28 + walk_left + walk_down + walk_in_place_fastest_right step_end LittlerootTown_MaysHouse_1F_Movement_2929C1: @ 82929C1 - step_right - step_down - step_27 + walk_right + walk_down + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_1F_EventScript_2929C5:: @ 82929C5 @@ -413,31 +413,31 @@ LittlerootTown_MaysHouse_1F_EventScript_292ACD:: @ 8292ACD end LittlerootTown_BrendansHouse_1F_Movement_292AE0: @ 8292AE0 - step_down - step_down - step_left - step_left - step_left + walk_down + walk_down + walk_left + walk_left + walk_left step_end LittlerootTown_BrendansHouse_1F_Movement_292AE6: @ 8292AE6 - step_left + walk_left step_end LittlerootTown_MaysHouse_1F_Movement_292AE8: @ 8292AE8 - step_down - step_down - step_right - step_right - step_right + walk_down + walk_down + walk_right + walk_right + walk_right step_end LittlerootTown_MaysHouse_1F_Movement_292AEE: @ 8292AEE - step_right + walk_right step_end LittlerootTown_BrendansHouse_1F_Movement_292AF0: @ 8292AF0 - step_up + walk_up step_end LittlerootTown_BrendansHouse_1F_EventScript_292AF2:: @ 8292AF2 @@ -641,74 +641,74 @@ LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D return LittlerootTown_BrendansHouse_1F_Movement_292DB2: @ 8292DB2 - step_right - step_right + walk_right + walk_right step_end LittlerootTown_BrendansHouse_1F_Movement_292DB5: @ 8292DB5 - step_left - step_left + walk_left + walk_left step_end LittlerootTown_BrendansHouse_1F_Movement_292DB8: @ 8292DB8 - step_02 + face_left step_end LittlerootTown_BrendansHouse_1F_Movement_292DBA: @ 8292DBA - step_03 + face_right step_end LittlerootTown_BrendansHouse_1F_Movement_292DBC: @ 8292DBC - step_down - step_right - step_down - step_13 + walk_down + walk_right + walk_down + delay_8 step_end LittlerootTown_BrendansHouse_1F_Movement_292DC1: @ 8292DC1 - step_down - step_left - step_down - step_13 + walk_down + walk_left + walk_down + delay_8 step_end LittlerootTown_BrendansHouse_1F_Movement_292DC6: @ 8292DC6 - step_14 - step_down - step_down - step_down - step_27 + delay_16 + walk_down + walk_down + walk_down + walk_in_place_fastest_left step_end LittlerootTown_BrendansHouse_1F_Movement_292DCC: @ 8292DCC - step_13 - step_14 - step_14 - step_25 + delay_8 + delay_16 + delay_16 + walk_in_place_fastest_down step_end LittlerootTown_BrendansHouse_1F_Movement_292DD1: @ 8292DD1 - step_14 - step_down - step_down - step_down - step_28 + delay_16 + walk_down + walk_down + walk_down + walk_in_place_fastest_right step_end LittlerootTown_BrendansHouse_1F_Movement_292DD7: @ 8292DD7 - step_up - step_left - step_left - step_left - step_left - step_26 + walk_up + walk_left + walk_left + walk_left + walk_left + walk_in_place_fastest_up step_end LittlerootTown_BrendansHouse_1F_Movement_292DDE: @ 8292DDE - step_up - step_right - step_right - step_right - step_right - step_26 + walk_up + walk_right + walk_right + walk_right + walk_right + walk_in_place_fastest_up step_end diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 39cca8244..9c4b46ae2 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -559,7 +559,7 @@ LilycoveCity_ContestLobby_EventScript_294032:: @ 8294032 end LilycoveCity_ContestLobby_Movement_294053: @ 8294053 - step_28 + walk_in_place_fastest_right step_end LilycoveCity_ContestLobby_EventScript_294055:: @ 8294055 @@ -683,7 +683,7 @@ LilycoveCity_ContestLobby_EventScript_2941AA:: @ 82941AA specialvar VAR_RESULT, GetLinkPartnerNames copyvar VAR_0x8008, VAR_RESULT copyvar VAR_0x8004, VAR_0x8008 - special SpawnLinkPartnerFieldObject + special SpawnLinkPartnerEventObject goto LilycoveCity_ContestLobby_EventScript_2941C4 end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index c75fb9b48..76a4ee8f1 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -77,31 +77,31 @@ Route111_EventScript_276680:: @ 8276680 end Route111_Movement_27668A: @ 827668A - step_down - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_left - step_down - step_down + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_left + walk_down + walk_down step_end Route111_Movement_276696: @ 8276696 - step_left - step_down - step_down - step_down - step_down - step_down - step_left - step_left - step_left - step_down - step_down + walk_left + walk_down + walk_down + walk_down + walk_down + walk_down + walk_left + walk_left + walk_left + walk_down + walk_down step_end EventScript_2766A2:: @ 82766A2 diff --git a/data/specials.inc b/data/specials.inc index 1fa17b908..dfbac56fa 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -47,19 +47,19 @@ gSpecials:: @ 81DBA64 def_special sub_80B3254 def_special sub_80B2FD8 def_special GetLinkPartnerNames - def_special SpawnLinkPartnerFieldObject + def_special SpawnLinkPartnerEventObject def_special SavePlayerParty def_special LoadPlayerParty def_special sub_80F9438 def_special sp02A_crash_sound - def_special FieldObjectInteractionGetBerryTreeData - def_special FieldObjectInteractionGetBerryName - def_special FieldObjectInteractionGetBerryCountString + def_special EventObjectInteractionGetBerryTreeData + def_special EventObjectInteractionGetBerryName + def_special EventObjectInteractionGetBerryCountString def_special Bag_ChooseBerry - 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 GetTrainerBattleMode @@ -115,7 +115,7 @@ gSpecials:: @ 81DBA64 def_special ScrSpecial_SetHipsterSpokenFlag def_special ScrSpecial_HipsterTeachWord def_special ScrSpecial_PlayBardSong - def_special ScrSpecial_SetMauvilleOldManMapObjGfx + def_special ScrSpecial_SetMauvilleOldManEventObjGfx def_special ScrSpecial_GenerateGiddyLine def_special ScrSpecial_GiddyShouldTellAnotherTale def_special ScrSpecial_StorytellerGetFreeStorySlot @@ -190,7 +190,7 @@ gSpecials:: @ 81DBA64 def_special IsTVShowInSearchOfTrainersAiring def_special GabbyAndTyGetLastQuote def_special GabbyAndTyGetLastBattleTrivia - def_special GabbyAndTySetScriptVarsToFieldObjectLocalIds + def_special GabbyAndTySetScriptVarsToEventObjectLocalIds def_special sub_8138B80 def_special GetDaycareMonNicknames def_special GetDaycareState @@ -286,8 +286,8 @@ gSpecials:: @ 81DBA64 def_special GameClear def_special sub_8139A78 def_special nullsub_55 - def_special SpawnScriptFieldObject - def_special RemoveScriptFieldObject + def_special SpawnScriptEventObject + def_special RemoveScriptEventObject def_special GetPokeblockNameByMonNature def_special GetSecretBaseNearbyMapName def_special CheckRelicanthWailord @@ -297,7 +297,7 @@ gSpecials:: @ 81DBA64 def_special WaitWeather def_special sub_8139238 def_special sub_8139248 - def_special player_get_direction_lower_nybble + def_special GetPlayerFacingDirection def_special sub_81392AC def_special sub_81392D4 def_special sub_81392F8 |