diff options
Diffstat (limited to 'data')
860 files changed, 5047 insertions, 5063 deletions
diff --git a/data/battle_anim_813F0F4.s b/data/battle_anim_813F0F4.s index fd24d95b6..b043929c3 100644 --- a/data/battle_anim_813F0F4.s +++ b/data/battle_anim_813F0F4.s @@ -4,7 +4,7 @@ .section .rodata .align 2 -gUnknown_0840B258:: @ 840B258 +gBallOpenParticleSpritesheets:: @ 840B258 obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55020 obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55021 obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55022 @@ -19,7 +19,7 @@ gUnknown_0840B258:: @ 840B258 obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55031 .align 2 -gUnknown_0840B2B8:: @ 840B2B8 +gBallOpenParticlePalettes:: @ 840B2B8 obj_pal gBattleAnimSpritePalette_136, 55020 obj_pal gBattleAnimSpritePalette_136, 55021 obj_pal gBattleAnimSpritePalette_136, 55022 @@ -78,70 +78,48 @@ gSpriteAnimTable_840B360:: @ 840B360 .4byte gSpriteAnim_840B34C .4byte gSpriteAnim_840B358 -gUnknown_0840B378:: @ 840B378 - .byte 0, 0, 0, 5, 1, 2, 2, 3, 5, 5, 4, 4 - - .align 2 -gUnknown_0840B384:: @ 840B384 - .4byte sub_8140930 - .4byte sub_8140DC4 - .4byte sub_8140C14 - .4byte sub_8140CE8 - .4byte sub_8141058 - .4byte sub_8140C14 - .4byte sub_8140B3C - .4byte sub_8140CE8 - .4byte sub_8140F24 - .4byte sub_8140A64 - .4byte sub_8140DC4 - .4byte sub_8141164 - - .align 2 -gSpriteTemplate_840B3B4:: @ 840B3B4 +gBallOpenParticleAnimNums:: @ 840B378 + .byte 0 + .byte 0 + .byte 0 + .byte 5 + .byte 1 + .byte 2 + .byte 2 + .byte 3 + .byte 5 + .byte 5 + .byte 4 + .byte 4 + + .align 2 +gBallOpenParticleAnimationFuncs:: @ 840B384 + .4byte PokeBallOpenParticleAnimation + .4byte GreatBallOpenParticleAnimation + .4byte SafariBallOpenParticleAnimation + .4byte UltraBallOpenParticleAnimation + .4byte MasterBallOpenParticleAnimation + .4byte SafariBallOpenParticleAnimation + .4byte DiveBallOpenParticleAnimation + .4byte UltraBallOpenParticleAnimation + .4byte RepeatBallOpenParticleAnimation + .4byte TimerBallOpenParticleAnimation + .4byte GreatBallOpenParticleAnimation + .4byte PremierBallOpenParticleAnimation + + .align 2 +gSpriteTemplates_840B3B4:: @ 840B3B4 spr_template 55020, 55020, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B3CC:: @ 840B3CC spr_template 55021, 55021, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B3E4:: @ 840B3E4 spr_template 55022, 55022, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B3FC:: @ 840B3FC spr_template 55023, 55023, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B414:: @ 840B414 spr_template 55024, 55024, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B42C:: @ 840B42C spr_template 55025, 55025, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B444:: @ 840B444 spr_template 55026, 55026, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B45C:: @ 840B45C spr_template 55027, 55027, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B474:: @ 840B474 spr_template 55028, 55028, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B48C:: @ 840B48C spr_template 55029, 55029, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B4A4:: @ 840B4A4 spr_template 55030, 55030, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy - - .align 2 -gSpriteTemplate_840B4BC:: @ 840B4BC spr_template 55031, 55031, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy .align 1 diff --git a/data/event_scripts.s b/data/event_scripts.s index 1f514321c..eef08bb79 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -10,6 +10,7 @@ #include "constants/songs.h" #include "constants/species.h" #include "constants/weather.h" +#include "constants/heal_locations.h" #include "constants/vars.h" .include "include/macros.inc" .include "include/macros/event.inc" @@ -1935,66 +1936,66 @@ SootopolisCity_Gym_1F_EventScript_1A01C0:: @ 81A01C0 end DewfordTown_Gym_EventScript_1A021E:: @ 81A021E - settrainerflag OPPONENT_JOSH - settrainerflag OPPONENT_TOMMY + settrainerflag TRAINER_JOSH + settrainerflag TRAINER_TOMMY return DewfordTown_Gym_EventScript_1A0225:: @ 81A0225 - settrainerflag OPPONENT_HIDEKI - settrainerflag OPPONENT_TESSA - settrainerflag OPPONENT_LAURA + settrainerflag TRAINER_HIDEKI + settrainerflag TRAINER_TESSA + settrainerflag TRAINER_LAURA return DewfordTown_Gym_EventScript_1A022F:: @ 81A022F - settrainerflag OPPONENT_KIRK - settrainerflag OPPONENT_SHAWN - settrainerflag OPPONENT_BEN - settrainerflag OPPONENT_VIVIAN + settrainerflag TRAINER_KIRK + settrainerflag TRAINER_SHAWN + settrainerflag TRAINER_BEN + settrainerflag TRAINER_VIVIAN return DewfordTown_Gym_EventScript_1A023C:: @ 81A023C - settrainerflag OPPONENT_COLE - settrainerflag OPPONENT_AXLE - settrainerflag OPPONENT_ANDY - settrainerflag OPPONENT_ZANE - settrainerflag OPPONENT_SADIE + settrainerflag TRAINER_COLE + settrainerflag TRAINER_AXLE + settrainerflag TRAINER_ANDY + settrainerflag TRAINER_ZANE + settrainerflag TRAINER_SADIE return DewfordTown_Gym_EventScript_1A024C:: @ 81A024C - settrainerflag OPPONENT_RANDALL - settrainerflag OPPONENT_PARKER - settrainerflag OPPONENT_GEORGE - settrainerflag OPPONENT_BERKE - settrainerflag OPPONENT_MARY - settrainerflag OPPONENT_LORI - settrainerflag OPPONENT_JODY + settrainerflag TRAINER_RANDALL + settrainerflag TRAINER_PARKER + settrainerflag TRAINER_GEORGE + settrainerflag TRAINER_BERKE + settrainerflag TRAINER_MARY + settrainerflag TRAINER_LORI + settrainerflag TRAINER_JODY return DewfordTown_Gym_EventScript_1A0262:: @ 81A0262 - settrainerflag OPPONENT_JARED - settrainerflag OPPONENT_TERRELL - settrainerflag OPPONENT_KYLEE - settrainerflag OPPONENT_WILL + settrainerflag TRAINER_JARED + settrainerflag TRAINER_TERRELL + settrainerflag TRAINER_KYLEE + settrainerflag TRAINER_WILL return DewfordTown_Gym_EventScript_1A026F:: @ 81A026F - settrainerflag OPPONENT_PRESTON - settrainerflag OPPONENT_VIRGIL - settrainerflag OPPONENT_FRITZ - settrainerflag OPPONENT_HANNAH - settrainerflag OPPONENT_SAMANTHA - settrainerflag OPPONENT_MAURA + settrainerflag TRAINER_PRESTON + settrainerflag TRAINER_VIRGIL + settrainerflag TRAINER_FRITZ + settrainerflag TRAINER_HANNAH + settrainerflag TRAINER_SAMANTHA + settrainerflag TRAINER_MAURA return DewfordTown_Gym_EventScript_1A0282:: @ 81A0282 - settrainerflag OPPONENT_ANDREA - settrainerflag OPPONENT_CRISSY - settrainerflag OPPONENT_BRIANNA_2 - settrainerflag OPPONENT_CONNIE - settrainerflag OPPONENT_BRIDGET - settrainerflag OPPONENT_OLIVIA - settrainerflag OPPONENT_TIFFANY - settrainerflag OPPONENT_MARISSA + settrainerflag TRAINER_ANDREA + settrainerflag TRAINER_CRISSY + settrainerflag TRAINER_BRIANNA_2 + settrainerflag TRAINER_CONNIE + settrainerflag TRAINER_BRIDGET + settrainerflag TRAINER_OLIVIA + settrainerflag TRAINER_TIFFANY + settrainerflag TRAINER_MARISSA return DewfordTown_Gym_EventScript_1A029B:: @ 81A029B diff --git a/data/graphics.s b/data/graphics.s index 7970dc904..587be6df0 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -3225,8 +3225,8 @@ gBagScreenMale_Pal:: @ 8E76F94 gBagScreenFemale_Pal:: @ 8E76FCC .incbin "graphics/interface/bag_screen_female.gbapal.lz" -gUnknown_08E77004:: @ 8E77004 - .incbin "graphics/unknown/unknown_E77004.bin" +gBagScreen_Tilemap:: @ 8E77004 + .incbin "graphics/interface/bag_screen.bin" .align 2 gBuyMenuFrame_Gfx:: @ 8E77804 @@ -4039,8 +4039,8 @@ gUnknown_08E96D2C:: @ 8E96D2C .incbin "graphics/unknown/unknown_E96D2C.bin.lz" .align 2 -gUnknown_08E96EC8:: @ 8E96EC8 - .incbin "graphics/unknown/unknown_E96EC8.bin" +gBagScreenLabels_Tilemap:: @ 8E96EC8 + .incbin "graphics/interface/bag_screen_labels.bin" .align 2 gSlotMachineSpritePalette0:: @ 8E976C8 diff --git a/data/map_events.s b/data/map_events.s index e6fe363f8..27ff67eb5 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -1,5 +1,7 @@ #include "constants/flags.h" #include "constants/items.h" +#include "constants/bg_event_constants.h" +#include "constants/event_object_movement_constants.h" #include "constants/event_objects.h" #include "constants/maps.h" #include "constants/secret_bases.h" diff --git a/data/maps.s b/data/maps.s index f8be7f31f..883e44f5d 100644 --- a/data/maps.s +++ b/data/maps.s @@ -1,5 +1,8 @@ +#include "constants/map_types.h" #include "constants/maps.h" +#include "constants/region_map_sections.h" #include "constants/songs.h" +#include "constants/weather.h" .include "include/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/AbandonedShip_CaptainsOffice/events.inc b/data/maps/AbandonedShip_CaptainsOffice/events.inc index 791ab9754..47db14d42 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/events.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/events.inc @@ -1,6 +1,6 @@ AbandonedShip_CaptainsOffice_EventObjects:: @ 838E45C - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, 8, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_15EAF5, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, 1, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AbandonedShip_CaptainsOffice_EventScript_15EAF5, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_CaptainsOffice_EventScript_1B18BE, FLAG_ITEM_ABANDONED_SHIP_CAPTAINS_OFFICE_1 AbandonedShip_CaptainsOffice_MapWarps:: @ 838E48C warp_def 7, 6, 3, 4, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/AbandonedShip_CaptainsOffice/header.inc b/data/maps/AbandonedShip_CaptainsOffice/header.inc index 67112ba78..178d527b2 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/header.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/header.inc @@ -5,10 +5,10 @@ AbandonedShip_CaptainsOffice:: @ 8307454 .4byte 0x0 .2byte MUS_DAN02 .2byte 196 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 - .byte 4 + .byte WEATHER_SHADE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Corridors_1F/events.inc b/data/maps/AbandonedShip_Corridors_1F/events.inc index 82af88bce..a9d46dcb6 100644 --- a/data/maps/AbandonedShip_Corridors_1F/events.inc +++ b/data/maps/AbandonedShip_Corridors_1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Corridors_1F_EventObjects:: @ 838E120 - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_15E965, 0 - object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, 45, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_15E96E, 0 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 17, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_1F_EventScript_15E965, 0 + object_event 2, EVENT_OBJ_GFX_TUBER_M, 0, 5, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 7, 1, 3, AbandonedShip_Corridors_1F_EventScript_15E96E, 0 AbandonedShip_Corridors_1F_MapWarps:: @ 838E150 warp_def 9, 11, 3, 2, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/AbandonedShip_Corridors_1F/header.inc b/data/maps/AbandonedShip_Corridors_1F/header.inc index c228ebc29..6e437485a 100644 --- a/data/maps/AbandonedShip_Corridors_1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_1F/header.inc @@ -5,10 +5,10 @@ AbandonedShip_Corridors_1F:: @ 8307374 .4byte 0x0 .2byte MUS_DAN02 .2byte 188 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 - .byte 4 + .byte WEATHER_SHADE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Corridors_1F/scripts.inc b/data/maps/AbandonedShip_Corridors_1F/scripts.inc index 0c7278f3b..f2636fd31 100644 --- a/data/maps/AbandonedShip_Corridors_1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_1F/scripts.inc @@ -6,6 +6,6 @@ AbandonedShip_Corridors_1F_EventScript_15E965:: @ 815E965 end AbandonedShip_Corridors_1F_EventScript_15E96E:: @ 815E96E - trainerbattle 0, OPPONENT_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_19843D, AbandonedShip_Corridors_1F_Text_198479 + trainerbattle 0, TRAINER_CHARLIE, 0, AbandonedShip_Corridors_1F_Text_19843D, AbandonedShip_Corridors_1F_Text_198479 msgbox AbandonedShip_Corridors_1F_Text_198493, 6 end diff --git a/data/maps/AbandonedShip_Corridors_B1F/events.inc b/data/maps/AbandonedShip_Corridors_B1F/events.inc index 35dc34437..cd8c266b1 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/events.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Corridors_B1F_EventObjects:: @ 838E238 - object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, 2, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9CA, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, 14, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_15EA1E, 0 + object_event 1, EVENT_OBJ_GFX_TUBER_M, 0, 2, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9CA, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 4, AbandonedShip_Corridors_B1F_EventScript_15EA1E, 0 AbandonedShip_Corridors_B1F_MapWarps:: @ 838E268 warp_def 6, 4, 3, 2, MAP_ABANDONED_SHIP_ROOMS2_B1F @@ -13,7 +13,7 @@ AbandonedShip_Corridors_B1F_MapWarps:: @ 838E268 warp_def 8, 2, 3, 9, MAP_ABANDONED_SHIP_CORRIDORS_1F AbandonedShip_Corridors_B1F_MapBGEvents:: @ 838E2A8 - bg_event 11, 4, 3, 0, 0, AbandonedShip_Corridors_B1F_EventScript_15E9D3 + bg_event 11, 4, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_Corridors_B1F_EventScript_15E9D3 AbandonedShip_Corridors_B1F_MapEvents:: @ 838E2B4 map_events AbandonedShip_Corridors_B1F_EventObjects, AbandonedShip_Corridors_B1F_MapWarps, 0x0, AbandonedShip_Corridors_B1F_MapBGEvents diff --git a/data/maps/AbandonedShip_Corridors_B1F/header.inc b/data/maps/AbandonedShip_Corridors_B1F/header.inc index bbca3eaba..884c1cc0d 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/header.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/header.inc @@ -5,10 +5,10 @@ AbandonedShip_Corridors_B1F:: @ 83073AC .4byte 0x0 .2byte MUS_DAN02 .2byte 190 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 - .byte 4 + .byte WEATHER_SHADE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index c34f2c28b..f1b7240db 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -50,6 +50,6 @@ AbandonedShip_Corridors_B1F_EventScript_15EA14:: @ 815EA14 end AbandonedShip_Corridors_B1F_EventScript_15EA1E:: @ 815EA1E - trainerbattle 0, OPPONENT_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_19856F, AbandonedShip_Corridors_B1F_Text_1985C5 + trainerbattle 0, TRAINER_DUNCAN, 0, AbandonedShip_Corridors_B1F_Text_19856F, AbandonedShip_Corridors_B1F_Text_1985C5 msgbox AbandonedShip_Corridors_B1F_Text_1985D7, 6 end diff --git a/data/maps/AbandonedShip_Deck/header.inc b/data/maps/AbandonedShip_Deck/header.inc index 84b45db3a..3454cac63 100644 --- a/data/maps/AbandonedShip_Deck/header.inc +++ b/data/maps/AbandonedShip_Deck/header.inc @@ -5,10 +5,10 @@ AbandonedShip_Deck:: @ 8307358 .4byte 0x0 .2byte MUS_DAN02 .2byte 187 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc index 97bdf37c5..b227d8813 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/events.inc @@ -7,10 +7,10 @@ AbandonedShip_HiddenFloorCorridors_MapWarps:: @ 838E4CC warp_def 9, 3, 3, 8, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS AbandonedShip_HiddenFloorCorridors_MapBGEvents:: @ 838E4FC - bg_event 3, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3 - bg_event 6, 8, 3, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A - bg_event 3, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EC61 - bg_event 9, 4, 0, 0, 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EC98 + bg_event 3, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3 + bg_event 6, 8, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A + bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_15EC61 + bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorCorridors_EventScript_15EC98 AbandonedShip_HiddenFloorCorridors_MapEvents:: @ 838E52C map_events 0x0, AbandonedShip_HiddenFloorCorridors_MapWarps, 0x0, AbandonedShip_HiddenFloorCorridors_MapBGEvents diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc index 99b22902b..9894918c6 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/header.inc @@ -5,10 +5,10 @@ AbandonedShip_HiddenFloorCorridors:: @ 830748C .4byte 0x0 .2byte MUS_DAN02 .2byte 290 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 - .byte 4 + .byte WEATHER_SHADE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc index 7c8135e89..c6c094edd 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/events.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/events.inc @@ -1,8 +1,8 @@ AbandonedShip_HiddenFloorRooms_EventObjects:: @ 838E540 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18CB, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18D8, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18F2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, 1, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 41, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18CB, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_1 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18D8, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18F2, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_4 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_1B18E5, FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_3 AbandonedShip_HiddenFloorRooms_MapWarps:: @ 838E5A0 warp_def 6, 14, 3, 0, MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS @@ -20,12 +20,12 @@ AbandonedShip_HiddenFloorRooms_MapBGEvents:: @ 838E5E8 bg_hidden_item_event 20, 5, 3, ITEM_ROOM_2_KEY, FLAG_HIDDEN_ITEM_20 bg_hidden_item_event 1, 12, 3, ITEM_ROOM_4_KEY, FLAG_HIDDEN_ITEM_21 bg_hidden_item_event 1, 2, 0, ITEM_ROOM_6_KEY, FLAG_HIDDEN_ITEM_22 - bg_event 8, 5, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 11, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 10, 10, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 16, 3, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 25, 2, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB - bg_event 24, 6, 3, 0, 0, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 8, 5, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 11, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 10, 10, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 16, 3, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 25, 2, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB + bg_event 24, 6, 3, BG_EVENT_PLAYER_FACING_ANY, AbandonedShip_HiddenFloorRooms_EventScript_15EEAB AbandonedShip_HiddenFloorRooms_MapEvents:: @ 838E660 map_events AbandonedShip_HiddenFloorRooms_EventObjects, AbandonedShip_HiddenFloorRooms_MapWarps, 0x0, AbandonedShip_HiddenFloorRooms_MapBGEvents diff --git a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc index 8f5d464a2..d1b89c313 100644 --- a/data/maps/AbandonedShip_HiddenFloorRooms/header.inc +++ b/data/maps/AbandonedShip_HiddenFloorRooms/header.inc @@ -5,10 +5,10 @@ AbandonedShip_HiddenFloorRooms:: @ 83074A8 .4byte 0x0 .2byte MUS_DAN02 .2byte 311 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 - .byte 4 + .byte WEATHER_SHADE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Room_B1F/events.inc b/data/maps/AbandonedShip_Room_B1F/events.inc index e828890a5..17cb2e417 100644 --- a/data/maps/AbandonedShip_Room_B1F/events.inc +++ b/data/maps/AbandonedShip_Room_B1F/events.inc @@ -1,5 +1,5 @@ AbandonedShip_Room_B1F_EventObjects:: @ 838E3AC - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Room_B1F_EventScript_1B18A4, FLAG_ITEM_ABANDONED_SHIP_ROOM_B1F_1 AbandonedShip_Room_B1F_MapWarps:: @ 838E3C4 warp_def 4, 7, 3, 5, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/AbandonedShip_Room_B1F/header.inc b/data/maps/AbandonedShip_Room_B1F/header.inc index 335c10f7a..fcfc746c1 100644 --- a/data/maps/AbandonedShip_Room_B1F/header.inc +++ b/data/maps/AbandonedShip_Room_B1F/header.inc @@ -5,10 +5,10 @@ AbandonedShip_Room_B1F:: @ 830741C .4byte 0x0 .2byte MUS_DAN02 .2byte 194 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 - .byte 4 + .byte WEATHER_SHADE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms2_1F/events.inc b/data/maps/AbandonedShip_Rooms2_1F/events.inc index e29bd3b42..9ce7d09d7 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/events.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/events.inc @@ -1,7 +1,7 @@ AbandonedShip_Rooms2_1F_EventObjects:: @ 838E3E8 - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, 8, 0, 0, 1, 0, AbandonedShip_Rooms2_1F_EventScript_15EA68, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, 8, 0, 0, 1, 0, AbandonedShip_Rooms2_1F_EventScript_15EAAE, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, AbandonedShip_Rooms2_1F_EventScript_15EA68, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, AbandonedShip_Rooms2_1F_EventScript_15EAAE, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_1F_EventScript_1B18B1, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_1F_1 AbandonedShip_Rooms2_1F_MapWarps:: @ 838E430 warp_def 4, 16, 3, 8, MAP_ABANDONED_SHIP_CORRIDORS_1F diff --git a/data/maps/AbandonedShip_Rooms2_1F/header.inc b/data/maps/AbandonedShip_Rooms2_1F/header.inc index bb6b7be08..e76a52fd7 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/header.inc @@ -5,10 +5,10 @@ AbandonedShip_Rooms2_1F:: @ 8307438 .4byte 0x0 .2byte MUS_DAN02 .2byte 195 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 - .byte 4 + .byte WEATHER_SHADE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc index e1e903cc0..cd7c8fd9f 100644 --- a/data/maps/AbandonedShip_Rooms2_1F/scripts.inc +++ b/data/maps/AbandonedShip_Rooms2_1F/scripts.inc @@ -2,7 +2,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67 .byte 0 AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 - trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F + trainerbattle 4, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 @@ -10,12 +10,12 @@ AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 end AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93 - trainerbattle 7, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1989DF, AbandonedShip_Rooms2_1F_Text_198A53, AbandonedShip_Rooms2_1F_Text_198AEE + trainerbattle 7, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1989DF, AbandonedShip_Rooms2_1F_Text_198A53, AbandonedShip_Rooms2_1F_Text_198AEE msgbox AbandonedShip_Rooms2_1F_Text_198A70, 6 end AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE - trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A + trainerbattle 4, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 @@ -23,6 +23,6 @@ AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE end AbandonedShip_Rooms2_1F_EventScript_15EAD9:: @ 815EAD9 - trainerbattle 7, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40 + trainerbattle 7, TRAINER_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_198B3B, AbandonedShip_Rooms2_1F_Text_198BCF, AbandonedShip_Rooms2_1F_Text_198C40 msgbox AbandonedShip_Rooms2_1F_Text_198BEA, 6 end diff --git a/data/maps/AbandonedShip_Rooms2_B1F/events.inc b/data/maps/AbandonedShip_Rooms2_B1F/events.inc index aa6eb759a..8b306ca47 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/events.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms2_B1F_EventObjects:: @ 838E324 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_15EA4E, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_15EA4E, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms2_B1F_EventScript_1B1897, FLAG_ITEM_ABANDONED_SHIP_ROOMS_2_B1F_1 AbandonedShip_Rooms2_B1F_MapWarps:: @ 838E354 warp_def 4, 7, 3, 1, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/AbandonedShip_Rooms2_B1F/header.inc b/data/maps/AbandonedShip_Rooms2_B1F/header.inc index 538209d37..042b61164 100644 --- a/data/maps/AbandonedShip_Rooms2_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms2_B1F/header.inc @@ -5,10 +5,10 @@ AbandonedShip_Rooms2_B1F:: @ 83073E4 .4byte 0x0 .2byte MUS_DAN02 .2byte 192 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 - .byte 4 + .byte WEATHER_SHADE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms_1F/events.inc b/data/maps/AbandonedShip_Rooms_1F/events.inc index 6ffe06615..427d653fd 100644 --- a/data/maps/AbandonedShip_Rooms_1F/events.inc +++ b/data/maps/AbandonedShip_Rooms_1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms_1F_EventObjects:: @ 838E1C4 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 6, 3, 2, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_15E986, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_15E986, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_1F_EventScript_1B187D, FLAG_ITEM_ABANDONED_SHIP_ROOMS_1F_1 AbandonedShip_Rooms_1F_MapWarps:: @ 838E1F4 warp_def 4, 16, 3, 4, MAP_ABANDONED_SHIP_CORRIDORS_1F diff --git a/data/maps/AbandonedShip_Rooms_1F/header.inc b/data/maps/AbandonedShip_Rooms_1F/header.inc index 39866961f..c660f4a33 100644 --- a/data/maps/AbandonedShip_Rooms_1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_1F/header.inc @@ -5,10 +5,10 @@ AbandonedShip_Rooms_1F:: @ 8307390 .4byte 0x0 .2byte MUS_DAN02 .2byte 189 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 - .byte 4 + .byte WEATHER_SHADE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Rooms_B1F/events.inc b/data/maps/AbandonedShip_Rooms_B1F/events.inc index 405506b44..bf71689e8 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/events.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/events.inc @@ -1,6 +1,6 @@ AbandonedShip_Rooms_B1F_EventObjects:: @ 838E2C8 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, 9, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_15EA44, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, 1, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 25, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AbandonedShip_Rooms_B1F_EventScript_15EA44, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AbandonedShip_Rooms_B1F_EventScript_1B188A, FLAG_ITEM_ABANDONED_SHIP_ROOMS_B1F_1 AbandonedShip_Rooms_B1F_MapWarps:: @ 838E2F8 warp_def 4, 1, 3, 2, MAP_ABANDONED_SHIP_CORRIDORS_B1F diff --git a/data/maps/AbandonedShip_Rooms_B1F/header.inc b/data/maps/AbandonedShip_Rooms_B1F/header.inc index ac27a4798..360864803 100644 --- a/data/maps/AbandonedShip_Rooms_B1F/header.inc +++ b/data/maps/AbandonedShip_Rooms_B1F/header.inc @@ -5,10 +5,10 @@ AbandonedShip_Rooms_B1F:: @ 83073C8 .4byte 0x0 .2byte MUS_DAN02 .2byte 191 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 11 - .byte 4 + .byte WEATHER_SHADE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Underwater1/header.inc b/data/maps/AbandonedShip_Underwater1/header.inc index bf4004eb2..12f2c380b 100644 --- a/data/maps/AbandonedShip_Underwater1/header.inc +++ b/data/maps/AbandonedShip_Underwater1/header.inc @@ -5,10 +5,10 @@ AbandonedShip_Underwater1:: @ 8307400 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 193 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 14 - .byte 5 + .byte WEATHER_BUBBLES + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AbandonedShip_Underwater2/header.inc b/data/maps/AbandonedShip_Underwater2/header.inc index ad7380354..435ee67a3 100644 --- a/data/maps/AbandonedShip_Underwater2/header.inc +++ b/data/maps/AbandonedShip_Underwater2/header.inc @@ -5,10 +5,10 @@ AbandonedShip_Underwater2:: @ 8307470 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 197 - .byte 61 + .byte MAPSEC_ABANDONED_SHIP .byte 0 - .byte 14 - .byte 5 + .byte WEATHER_BUBBLES + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AncientTomb/events.inc b/data/maps/AncientTomb/events.inc index 2699b9036..7e3d33c70 100644 --- a/data/maps/AncientTomb/events.inc +++ b/data/maps/AncientTomb/events.inc @@ -1,5 +1,5 @@ AncientTomb_EventObjects:: @ 838E6DC - object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, 8, 0, 0, 0, 0, AncientTomb_EventScript_15F050, FLAG_HIDE_REGISTEEL + object_event 1, EVENT_OBJ_GFX_REGISTEEL, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AncientTomb_EventScript_15F050, FLAG_HIDE_REGISTEEL AncientTomb_MapWarps:: @ 838E6F4 warp_def 8, 29, 3, 0, MAP_ROUTE120 @@ -7,9 +7,9 @@ AncientTomb_MapWarps:: @ 838E6F4 warp_def 8, 11, 3, 1, MAP_ANCIENT_TOMB AncientTomb_MapBGEvents:: @ 838E70C - bg_event 8, 20, 0, 0, 0, AncientTomb_EventScript_15F021 - bg_event 7, 20, 0, 0, 0, AncientTomb_EventScript_15F042 - bg_event 9, 20, 0, 0, 0, AncientTomb_EventScript_15F042 + bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_15F021 + bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_15F042 + bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, AncientTomb_EventScript_15F042 AncientTomb_MapEvents:: @ 838E730 map_events AncientTomb_EventObjects, AncientTomb_MapWarps, 0x0, AncientTomb_MapBGEvents diff --git a/data/maps/AncientTomb/header.inc b/data/maps/AncientTomb/header.inc index f559acdd4..30487ab6b 100644 --- a/data/maps/AncientTomb/header.inc +++ b/data/maps/AncientTomb/header.inc @@ -5,10 +5,10 @@ AncientTomb:: @ 83074E0 .4byte 0x0 .2byte MUS_MABOROSI .2byte 282 - .byte 83 + .byte MAPSEC_ANCIENT_TOMB .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/AquaHideout_1F/events.inc b/data/maps/AquaHideout_1F/events.inc index 3c87be0d7..89bd9cdae 100644 --- a/data/maps/AquaHideout_1F/events.inc +++ b/data/maps/AquaHideout_1F/events.inc @@ -1,7 +1,7 @@ AquaHideout_1F_EventObjects:: @ 838CD0C - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 13, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 14, 11, 3, 8, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 20, 4, 3, 50, 13, 5, 1, 3, AquaHideout_1F_EventScript_15D80C, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, AquaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 20, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 13, 5, 1, 3, AquaHideout_1F_EventScript_15D80C, FLAG_HIDE_GRUNTS_HIDEOUTS AquaHideout_1F_MapWarps:: @ 838CD54 warp_def 13, 27, 1, 6, MAP_LILYCOVE_CITY diff --git a/data/maps/AquaHideout_1F/header.inc b/data/maps/AquaHideout_1F/header.inc index 7fc84658d..68c4b3a67 100644 --- a/data/maps/AquaHideout_1F/header.inc +++ b/data/maps/AquaHideout_1F/header.inc @@ -5,10 +5,10 @@ AquaHideout_1F:: @ 8306FF4 .4byte 0x0 .2byte MUS_AJITO .2byte 144 - .byte 66 + .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 3 + .byte MAP_BATTLE_SCENE_AQUA diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc index ee49ba695..e92e83cc8 100644 --- a/data/maps/AquaHideout_1F/scripts.inc +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -36,7 +36,7 @@ AquaHideout_1F_EventScript_15D802:: @ 815D802 AquaHideout_1F_EventScript_15D80C:: @ 815D80C MagmaHideout_1F_EventScript_15D80C:: @ 815D80C - trainerbattle 2, OPPONENT_HIDEOUT_1F_GRUNT, 0, AquaHideout_1F_Text_196E01, AquaHideout_1F_Text_196E28, AquaHideout_1F_EventScript_15D827 + trainerbattle 2, TRAINER_HIDEOUT_1F_GRUNT, 0, AquaHideout_1F_Text_196E01, AquaHideout_1F_Text_196E28, AquaHideout_1F_EventScript_15D827 msgbox AquaHideout_1F_Text_196E3D, 6 end diff --git a/data/maps/AquaHideout_B1F/events.inc b/data/maps/AquaHideout_B1F/events.inc index 0a53d4cf9..b1ef6b598 100644 --- a/data/maps/AquaHideout_B1F/events.inc +++ b/data/maps/AquaHideout_B1F/events.inc @@ -1,12 +1,12 @@ AquaHideout_B1F_EventObjects:: @ 838CD80 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 27, 18, 3, 24, 0, 0, 1, 3, AquaHideout_B1F_EventScript_15D850, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 6, 6, 3, 9, 0, 0, 1, 5, AquaHideout_B1F_EventScript_15D875, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, 1, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, FLAG_ITEM_AQUA_HIDEOUT_B1F_1 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 20, 18, 3, 27, 4, 0, 1, 4, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1B198E, FLAG_ITEM_AQUA_HIDEOUT_B1F_2 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1B199B, FLAG_ITEM_AQUA_HIDEOUT_B1F_3 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, 1, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 27, 18, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, AquaHideout_B1F_EventScript_15D850, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, AquaHideout_B1F_EventScript_15D875, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B1F_EventScript_1B19A8, FLAG_ITEM_AQUA_HIDEOUT_B1F_1 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 20, 18, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 4, 0, 1, 4, AquaHideout_B1F_EventScript_15D89A, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1B198E, FLAG_ITEM_AQUA_HIDEOUT_B1F_2 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1B199B, FLAG_ITEM_AQUA_HIDEOUT_B1F_3 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, AquaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT AquaHideout_B1F_MapWarps:: @ 838CE40 warp_def 29, 1, 3, 2, MAP_AQUA_HIDEOUT_1F diff --git a/data/maps/AquaHideout_B1F/header.inc b/data/maps/AquaHideout_B1F/header.inc index 94abd0406..d7ed443d2 100644 --- a/data/maps/AquaHideout_B1F/header.inc +++ b/data/maps/AquaHideout_B1F/header.inc @@ -5,10 +5,10 @@ AquaHideout_B1F:: @ 8307010 .4byte 0x0 .2byte MUS_AJITO .2byte 145 - .byte 66 + .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 3 + .byte MAP_BATTLE_SCENE_AQUA diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 3be8d487d..3b4c04273 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -17,7 +17,7 @@ AquaHideout_B1F_MapScript1_15D84A:: @ 815D84A AquaHideout_B1F_EventScript_15D850:: @ 815D850 MagmaHideout_B1F_EventScript_15D850:: @ 815D850 - trainerbattle 2, OPPONENT_HIDEOUT_B1F_GRUNT_1, 0, AquaHideout_B1F_Text_196E6F, AquaHideout_B1F_Text_196EB6, AquaHideout_B1F_EventScript_15D86B + trainerbattle 2, TRAINER_HIDEOUT_B1F_GRUNT_1, 0, AquaHideout_B1F_Text_196E6F, AquaHideout_B1F_Text_196EB6, AquaHideout_B1F_EventScript_15D86B msgbox AquaHideout_B1F_Text_196ECC, 6 end @@ -28,7 +28,7 @@ AquaHideout_B1F_EventScript_15D86B:: @ 815D86B AquaHideout_B1F_EventScript_15D875:: @ 815D875 MagmaHideout_B1F_EventScript_15D875:: @ 815D875 - trainerbattle 2, OPPONENT_HIDEOUT_B1F_GRUNT_2, 0, AquaHideout_B1F_Text_196F39, AquaHideout_B1F_Text_196F9B, AquaHideout_B1F_EventScript_15D890 + trainerbattle 2, TRAINER_HIDEOUT_B1F_GRUNT_2, 0, AquaHideout_B1F_Text_196F39, AquaHideout_B1F_Text_196F9B, AquaHideout_B1F_EventScript_15D890 msgbox AquaHideout_B1F_Text_196FB5, 6 end @@ -39,6 +39,6 @@ AquaHideout_B1F_EventScript_15D890:: @ 815D890 AquaHideout_B1F_EventScript_15D89A:: @ 815D89A MagmaHideout_B1F_EventScript_15D89A:: @ 815D89A - trainerbattle 0, OPPONENT_HIDEOUT_B1F_GRUNT_3, 0, AquaHideout_B1F_Text_196FFD, AquaHideout_B1F_Text_197040 + trainerbattle 0, TRAINER_HIDEOUT_B1F_GRUNT_3, 0, AquaHideout_B1F_Text_196FFD, AquaHideout_B1F_Text_197040 msgbox AquaHideout_B1F_Text_197056, 6 end diff --git a/data/maps/AquaHideout_B2F/events.inc b/data/maps/AquaHideout_B2F/events.inc index 6eee30658..ac44e95b8 100644 --- a/data/maps/AquaHideout_B2F/events.inc +++ b/data/maps/AquaHideout_B2F/events.inc @@ -1,9 +1,9 @@ AquaHideout_B2F_EventObjects:: @ 838CF1C - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 23, 19, 3, 9, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 23, 10, 3, 45, 4, 3, 1, 3, AquaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, 1, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, FLAG_ITEM_AQUA_HIDEOUT_B2F_1 - object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT - object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 10, 6, 3, 7, 1, 1, 1, 4, AquaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 23, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, AquaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 23, 10, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 3, 1, 3, AquaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, AquaHideout_B2F_EventScript_1B19B5, FLAG_ITEM_AQUA_HIDEOUT_B2F_1 + object_event 4, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 19, 20, 1, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT + object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, AquaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS AquaHideout_B2F_MapWarps:: @ 838CF94 warp_def 18, 1, 3, 1, MAP_AQUA_HIDEOUT_B1F @@ -18,8 +18,8 @@ AquaHideout_B2F_MapWarps:: @ 838CF94 warp_def 32, 20, 3, 4, MAP_AQUA_HIDEOUT_B1F AquaHideout_B2F_MapCoordEvents:: @ 838CFE4 - coord_event 28, 17, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD - coord_event 28, 16, 3, 0, VAR_TEMP_1, 0, 0, AquaHideout_B2F_EventScript_15D8BD + coord_event 28, 17, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_15D8BD + coord_event 28, 16, 3, VAR_TEMP_1, 0, AquaHideout_B2F_EventScript_15D8BD AquaHideout_B2F_MapEvents:: @ 838D004 map_events AquaHideout_B2F_EventObjects, AquaHideout_B2F_MapWarps, AquaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/AquaHideout_B2F/header.inc b/data/maps/AquaHideout_B2F/header.inc index c700ac8dd..22e30f598 100644 --- a/data/maps/AquaHideout_B2F/header.inc +++ b/data/maps/AquaHideout_B2F/header.inc @@ -5,10 +5,10 @@ AquaHideout_B2F:: @ 830702C .4byte 0x0 .2byte MUS_AJITO .2byte 146 - .byte 66 + .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 3 + .byte MAP_BATTLE_SCENE_AQUA diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index 37830a00e..103de2313 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -25,7 +25,7 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD AquaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 - trainerbattle 2, OPPONENT_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD + trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_1, 0, AquaHideout_B2F_Text_197093, AquaHideout_B2F_Text_197145, AquaHideout_B2F_EventScript_15D8FD msgbox AquaHideout_B2F_Text_1971AE, 4 release end @@ -85,7 +85,7 @@ AquaHideout_B2F_Movement_15D95D:: @ 815D95D AquaHideout_B2F_EventScript_15D962:: @ 815D962 MagmaHideout_B2F_EventScript_15D962:: @ 815D962 - trainerbattle 2, OPPONENT_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D + trainerbattle 2, TRAINER_HIDEOUT_B2F_GRUNT_2, 0, AquaHideout_B2F_Text_197270, AquaHideout_B2F_Text_1972AC, AquaHideout_B2F_EventScript_15D97D msgbox AquaHideout_B2F_Text_1972D2, 6 end @@ -96,6 +96,6 @@ AquaHideout_B2F_EventScript_15D97D:: @ 815D97D AquaHideout_B2F_EventScript_15D987:: @ 815D987 MagmaHideout_B2F_EventScript_15D987:: @ 815D987 - trainerbattle 0, OPPONENT_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390 + trainerbattle 0, TRAINER_HIDEOUT_B2F_GRUNT_3, 0, AquaHideout_B2F_Text_1972EF, AquaHideout_B2F_Text_197390 msgbox AquaHideout_B2F_Text_1973C0, 6 end diff --git a/data/maps/BattleTower_BattleRoom/events.inc b/data/maps/BattleTower_BattleRoom/events.inc index a4bbe9849..6b7cb0c6d 100644 --- a/data/maps/BattleTower_BattleRoom/events.inc +++ b/data/maps/BattleTower_BattleRoom/events.inc @@ -1,6 +1,6 @@ BattleTower_BattleRoom_EventObjects:: @ 8391DAC - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_BATTLE_TOWER_OPPONENT + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 BattleTower_BattleRoom_MapWarps:: @ 8391DDC warp_def 5, 8, 0, 2, MAP_BATTLE_TOWER_LOBBY diff --git a/data/maps/BattleTower_BattleRoom/header.inc b/data/maps/BattleTower_BattleRoom/header.inc index 9712d2535..f21ded0e5 100644 --- a/data/maps/BattleTower_BattleRoom/header.inc +++ b/data/maps/BattleTower_BattleRoom/header.inc @@ -5,10 +5,10 @@ BattleTower_BattleRoom:: @ 8307C88 .4byte 0x0 .2byte MUS_B_TOWER .2byte 269 - .byte 58 + .byte MAPSEC_BATTLE_TOWER .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/BattleTower_BattleRoom/scripts.inc b/data/maps/BattleTower_BattleRoom/scripts.inc index 22529962a..ea80ae58b 100644 --- a/data/maps/BattleTower_BattleRoom/scripts.inc +++ b/data/maps/BattleTower_BattleRoom/scripts.inc @@ -12,7 +12,7 @@ BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB waitmovement 0 BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA - special sub_81347F8 + special ChooseNextBattleTowerTrainer addobject 1 applymovement 1, BattleTower_BattleRoom_Movement_160AC0 waitmovement 0 diff --git a/data/maps/BattleTower_Corridor/events.inc b/data/maps/BattleTower_Corridor/events.inc index 1233ff32c..fa312b4df 100644 --- a/data/maps/BattleTower_Corridor/events.inc +++ b/data/maps/BattleTower_Corridor/events.inc @@ -1,5 +1,5 @@ BattleTower_Corridor_EventObjects:: @ 8391D80 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, 9, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 BattleTower_Corridor_MapEvents:: @ 8391D98 map_events BattleTower_Corridor_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleTower_Corridor/header.inc b/data/maps/BattleTower_Corridor/header.inc index 33ab24b7c..8d5b0719f 100644 --- a/data/maps/BattleTower_Corridor/header.inc +++ b/data/maps/BattleTower_Corridor/header.inc @@ -5,10 +5,10 @@ BattleTower_Corridor:: @ 8307C6C .4byte 0x0 .2byte MUS_B_TOWER .2byte 268 - .byte 58 + .byte MAPSEC_BATTLE_TOWER .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleTower_Elevator/events.inc b/data/maps/BattleTower_Elevator/events.inc index 57434d3ac..8c9012067 100644 --- a/data/maps/BattleTower_Elevator/events.inc +++ b/data/maps/BattleTower_Elevator/events.inc @@ -1,5 +1,5 @@ BattleTower_Elevator_EventObjects:: @ 8391D54 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 BattleTower_Elevator_MapEvents:: @ 8391D6C map_events BattleTower_Elevator_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/BattleTower_Elevator/header.inc b/data/maps/BattleTower_Elevator/header.inc index 0718e7924..05cb41342 100644 --- a/data/maps/BattleTower_Elevator/header.inc +++ b/data/maps/BattleTower_Elevator/header.inc @@ -5,10 +5,10 @@ BattleTower_Elevator:: @ 8307C50 .4byte 0x0 .2byte MUS_B_TOWER .2byte 267 - .byte 58 + .byte MAPSEC_BATTLE_TOWER .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleTower_Lobby/events.inc b/data/maps/BattleTower_Lobby/events.inc index ca33bdf95..a07d608ed 100644 --- a/data/maps/BattleTower_Lobby/events.inc +++ b/data/maps/BattleTower_Lobby/events.inc @@ -1,10 +1,10 @@ BattleTower_Lobby_EventObjects:: @ 8391C8C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, 8, 0, 0, 0, 0, BattleTower_Lobby_EventScript_16049E, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 12, 3, 3, 8, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1606A5, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 8, 3, 2, 1, 1, 0, 0, BattleTower_Lobby_EventScript_160715, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 1, 2, 3, 2, 1, 1, 0, 0, BattleTower_Lobby_EventScript_16071E, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 4, 7, 3, 1, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1AE1FF, FLAG_HIDE_REPORTER_BATTLE_TOWER - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 6, 3, 9, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, FLAG_HIDE_AWARD_MAN_BATTLE_TOWER + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleTower_Lobby_EventScript_16049E, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 12, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1606A5, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleTower_Lobby_EventScript_160715, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 1, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleTower_Lobby_EventScript_16071E, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, BattleTower_Lobby_EventScript_1AE1FF, FLAG_HIDE_REPORTER_BATTLE_TOWER + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, BattleTower_Lobby_EventScript_160733, FLAG_HIDE_AWARD_MAN_BATTLE_TOWER BattleTower_Lobby_MapWarps:: @ 8391D1C warp_def 6, 8, 0, 0, MAP_BATTLE_TOWER_OUTSIDE @@ -12,7 +12,7 @@ BattleTower_Lobby_MapWarps:: @ 8391D1C warp_def 6, 1, 0, 0, MAP_BATTLE_TOWER_BATTLE_ROOM BattleTower_Lobby_MapBGEvents:: @ 8391D34 - bg_event 3, 5, 3, 1, 0, BattleTower_Lobby_EventScript_160727 + bg_event 3, 5, 3, BG_EVENT_PLAYER_FACING_NORTH, BattleTower_Lobby_EventScript_160727 BattleTower_Lobby_MapEvents:: @ 8391D40 map_events BattleTower_Lobby_EventObjects, BattleTower_Lobby_MapWarps, 0x0, BattleTower_Lobby_MapBGEvents diff --git a/data/maps/BattleTower_Lobby/header.inc b/data/maps/BattleTower_Lobby/header.inc index ae2eaaa14..2a4caadcb 100644 --- a/data/maps/BattleTower_Lobby/header.inc +++ b/data/maps/BattleTower_Lobby/header.inc @@ -5,10 +5,10 @@ BattleTower_Lobby:: @ 8307C34 .4byte 0x0 .2byte MUS_B_TOWER .2byte 265 - .byte 58 + .byte MAPSEC_BATTLE_TOWER .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/BattleTower_Outside/events.inc b/data/maps/BattleTower_Outside/events.inc index 2e02fcc1c..f7eaa89f9 100644 --- a/data/maps/BattleTower_Outside/events.inc +++ b/data/maps/BattleTower_Outside/events.inc @@ -1,15 +1,15 @@ BattleTower_Outside_EventObjects:: @ 8391BEC - object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 18, 11, 3, 2, 1, 1, 0, 0, BattleTower_Outside_EventScript_160263, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 14, 3, 2, 1, 1, 0, 0, BattleTower_Outside_EventScript_16026C, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 10, 11, 3, 2, 1, 1, 0, 0, BattleTower_Outside_EventScript_160275, 0 - object_event 4, EVENT_OBJ_GFX_SS_TIDAL, 0, 19, 26, 1, 10, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 19, 24, 3, 7, 1, 1, 0, 0, BattleTower_Outside_EventScript_160168, 0 + object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 18, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleTower_Outside_EventScript_160263, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 11, 14, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleTower_Outside_EventScript_16026C, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 10, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, BattleTower_Outside_EventScript_160275, 0 + object_event 4, EVENT_OBJ_GFX_SS_TIDAL, 0, 19, 26, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 19, 24, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, BattleTower_Outside_EventScript_160168, 0 BattleTower_Outside_MapWarps:: @ 8391C64 warp_def 14, 8, 0, 0, MAP_BATTLE_TOWER_LOBBY BattleTower_Outside_MapBGEvents:: @ 8391C6C - bg_event 16, 13, 0, 0, 0, BattleTower_Outside_EventScript_16025A + bg_event 16, 13, 0, BG_EVENT_PLAYER_FACING_ANY, BattleTower_Outside_EventScript_16025A BattleTower_Outside_MapEvents:: @ 8391C78 map_events BattleTower_Outside_EventObjects, BattleTower_Outside_MapWarps, 0x0, BattleTower_Outside_MapBGEvents diff --git a/data/maps/BattleTower_Outside/header.inc b/data/maps/BattleTower_Outside/header.inc index 28035f749..ed95d9358 100644 --- a/data/maps/BattleTower_Outside/header.inc +++ b/data/maps/BattleTower_Outside/header.inc @@ -5,10 +5,10 @@ BattleTower_Outside:: @ 8307C18 .4byte 0x0 .2byte MUS_B_TOWER .2byte 266 - .byte 58 + .byte MAPSEC_BATTLE_TOWER .byte 0 - .byte 0 - .byte 3 + .byte WEATHER_NONE + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_1F/events.inc b/data/maps/CaveOfOrigin_1F/events.inc index b0d77795c..5fe7e2c39 100644 --- a/data/maps/CaveOfOrigin_1F/events.inc +++ b/data/maps/CaveOfOrigin_1F/events.inc @@ -3,9 +3,9 @@ CaveOfOrigin_1F_MapWarps:: @ 838D718 warp_def 14, 5, 3, 0, MAP_CAVE_OF_ORIGIN_B1F CaveOfOrigin_1F_MapCoordEvents:: @ 838D728 - coord_event 7, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF - coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF - coord_event 5, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_1F_EventScript_1A04AF + coord_event 7, 11, 3, VAR_TEMP_1, 0, CaveOfOrigin_1F_EventScript_1A04AF + coord_event 6, 11, 3, VAR_TEMP_1, 0, CaveOfOrigin_1F_EventScript_1A04AF + coord_event 5, 11, 3, VAR_TEMP_1, 0, CaveOfOrigin_1F_EventScript_1A04AF CaveOfOrigin_1F_MapEvents:: @ 838D758 map_events 0x0, CaveOfOrigin_1F_MapWarps, CaveOfOrigin_1F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_1F/header.inc b/data/maps/CaveOfOrigin_1F/header.inc index 1797ed327..20c0aa739 100644 --- a/data/maps/CaveOfOrigin_1F/header.inc +++ b/data/maps/CaveOfOrigin_1F/header.inc @@ -5,10 +5,10 @@ CaveOfOrigin_1F:: @ 8307198 .4byte 0x0 .2byte MUS_DAN03 .2byte 159 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_B1F/events.inc b/data/maps/CaveOfOrigin_B1F/events.inc index a91ee50e4..4f9864804 100644 --- a/data/maps/CaveOfOrigin_B1F/events.inc +++ b/data/maps/CaveOfOrigin_B1F/events.inc @@ -3,9 +3,9 @@ CaveOfOrigin_B1F_MapWarps:: @ 838D76C warp_def 5, 11, 3, 0, MAP_CAVE_OF_ORIGIN_B2F CaveOfOrigin_B1F_MapCoordEvents:: @ 838D77C - coord_event 12, 15, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF - coord_event 12, 16, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF - coord_event 12, 17, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B1F_EventScript_1A04AF + coord_event 12, 15, 3, VAR_TEMP_1, 0, CaveOfOrigin_B1F_EventScript_1A04AF + coord_event 12, 16, 3, VAR_TEMP_1, 0, CaveOfOrigin_B1F_EventScript_1A04AF + coord_event 12, 17, 3, VAR_TEMP_1, 0, CaveOfOrigin_B1F_EventScript_1A04AF CaveOfOrigin_B1F_MapEvents:: @ 838D7AC map_events 0x0, CaveOfOrigin_B1F_MapWarps, CaveOfOrigin_B1F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_B1F/header.inc b/data/maps/CaveOfOrigin_B1F/header.inc index d9b38b628..45300c02d 100644 --- a/data/maps/CaveOfOrigin_B1F/header.inc +++ b/data/maps/CaveOfOrigin_B1F/header.inc @@ -5,10 +5,10 @@ CaveOfOrigin_B1F:: @ 83071B4 .4byte 0x0 .2byte MUS_DAN03 .2byte 160 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_B2F/events.inc b/data/maps/CaveOfOrigin_B2F/events.inc index 5d03aaaa2..03889799e 100644 --- a/data/maps/CaveOfOrigin_B2F/events.inc +++ b/data/maps/CaveOfOrigin_B2F/events.inc @@ -3,9 +3,9 @@ CaveOfOrigin_B2F_MapWarps:: @ 838D7C0 warp_def 8, 14, 3, 0, MAP_CAVE_OF_ORIGIN_B3F CaveOfOrigin_B2F_MapCoordEvents:: @ 838D7D0 - coord_event 10, 6, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF - coord_event 10, 5, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B2F_EventScript_1A04AF - coord_event 14, 13, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B2F_EventScript_1A04BB + coord_event 10, 6, 3, VAR_TEMP_1, 0, CaveOfOrigin_B2F_EventScript_1A04AF + coord_event 10, 5, 3, VAR_TEMP_1, 0, CaveOfOrigin_B2F_EventScript_1A04AF + coord_event 14, 13, 3, VAR_TEMP_2, 0, CaveOfOrigin_B2F_EventScript_1A04BB CaveOfOrigin_B2F_MapEvents:: @ 838D800 map_events 0x0, CaveOfOrigin_B2F_MapWarps, CaveOfOrigin_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_B2F/header.inc b/data/maps/CaveOfOrigin_B2F/header.inc index 1b3bf2902..fb1bf9e45 100644 --- a/data/maps/CaveOfOrigin_B2F/header.inc +++ b/data/maps/CaveOfOrigin_B2F/header.inc @@ -5,10 +5,10 @@ CaveOfOrigin_B2F:: @ 83071D0 .4byte 0x0 .2byte MUS_DAN03 .2byte 161 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 - .byte 6 - .byte 4 + .byte WEATHER_FOG_1 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_B3F/events.inc b/data/maps/CaveOfOrigin_B3F/events.inc index dcf831a76..fb8737421 100644 --- a/data/maps/CaveOfOrigin_B3F/events.inc +++ b/data/maps/CaveOfOrigin_B3F/events.inc @@ -1,14 +1,14 @@ CaveOfOrigin_B3F_EventObjects:: @ 838D814 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 3, 1, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, FLAG_ITEM_CAVE_OF_ORIGIN_B3F_1 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, CaveOfOrigin_B3F_EventScript_1B1A44, FLAG_ITEM_CAVE_OF_ORIGIN_B3F_1 CaveOfOrigin_B3F_MapWarps:: @ 838D82C warp_def 7, 14, 3, 1, MAP_CAVE_OF_ORIGIN_B2F warp_def 12, 6, 3, 0, MAP_CAVE_OF_ORIGIN_B4F CaveOfOrigin_B3F_MapCoordEvents:: @ 838D83C - coord_event 5, 11, 3, 0, VAR_TEMP_1, 0, 0, CaveOfOrigin_B3F_EventScript_1A04AF - coord_event 8, 6, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB - coord_event 8, 5, 3, 0, VAR_TEMP_2, 0, 0, CaveOfOrigin_B3F_EventScript_1A04BB + coord_event 5, 11, 3, VAR_TEMP_1, 0, CaveOfOrigin_B3F_EventScript_1A04AF + coord_event 8, 6, 3, VAR_TEMP_2, 0, CaveOfOrigin_B3F_EventScript_1A04BB + coord_event 8, 5, 3, VAR_TEMP_2, 0, CaveOfOrigin_B3F_EventScript_1A04BB CaveOfOrigin_B3F_MapEvents:: @ 838D86C map_events CaveOfOrigin_B3F_EventObjects, CaveOfOrigin_B3F_MapWarps, CaveOfOrigin_B3F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_B3F/header.inc b/data/maps/CaveOfOrigin_B3F/header.inc index cc196d0c8..5e6359852 100644 --- a/data/maps/CaveOfOrigin_B3F/header.inc +++ b/data/maps/CaveOfOrigin_B3F/header.inc @@ -5,10 +5,10 @@ CaveOfOrigin_B3F:: @ 83071EC .4byte 0x0 .2byte MUS_DAN03 .2byte 162 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 1 - .byte 6 - .byte 4 + .byte WEATHER_FOG_1 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_B4F/events.inc b/data/maps/CaveOfOrigin_B4F/events.inc index faa146570..4679edb0e 100644 --- a/data/maps/CaveOfOrigin_B4F/events.inc +++ b/data/maps/CaveOfOrigin_B4F/events.inc @@ -1,13 +1,13 @@ CaveOfOrigin_B4F_EventObjects:: @ 838D880 - object_event 1, EVENT_OBJ_GFX_VAR_8, 0, 9, 10, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN + object_event 1, EVENT_OBJ_GFX_VAR_8, 0, 9, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEGEND_MON_CAVE_OF_ORIGIN CaveOfOrigin_B4F_MapWarps:: @ 838D898 warp_def 12, 5, 3, 1, MAP_CAVE_OF_ORIGIN_B3F CaveOfOrigin_B4F_MapCoordEvents:: @ 838D8A0 - coord_event 9, 13, 3, 0, VAR_CAVE_OF_ORIGIN_B4F_STATE, 0, 0, CaveOfOrigin_B4F_EventScript_15DDD7 - coord_event 13, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 - coord_event 5, 9, 3, 0, VAR_TEMP_5, 0, 0, CaveOfOrigin_B4F_EventScript_1A04A0 + coord_event 9, 13, 3, VAR_CAVE_OF_ORIGIN_B4F_STATE, 0, CaveOfOrigin_B4F_EventScript_15DDD7 + coord_event 13, 9, 3, VAR_TEMP_5, 0, CaveOfOrigin_B4F_EventScript_1A04A0 + coord_event 5, 9, 3, VAR_TEMP_5, 0, CaveOfOrigin_B4F_EventScript_1A04A0 CaveOfOrigin_B4F_MapEvents:: @ 838D8D0 map_events CaveOfOrigin_B4F_EventObjects, CaveOfOrigin_B4F_MapWarps, CaveOfOrigin_B4F_MapCoordEvents, 0x0 diff --git a/data/maps/CaveOfOrigin_B4F/header.inc b/data/maps/CaveOfOrigin_B4F/header.inc index 97a58ddd6..00e51495e 100644 --- a/data/maps/CaveOfOrigin_B4F/header.inc +++ b/data/maps/CaveOfOrigin_B4F/header.inc @@ -5,10 +5,10 @@ CaveOfOrigin_B4F:: @ 8307208 .4byte 0x0 .2byte SE_STOP .2byte 163 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 - .byte 6 - .byte 4 + .byte WEATHER_FOG_1 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/CaveOfOrigin_Entrance/header.inc b/data/maps/CaveOfOrigin_Entrance/header.inc index 70ad445c4..29c356a24 100644 --- a/data/maps/CaveOfOrigin_Entrance/header.inc +++ b/data/maps/CaveOfOrigin_Entrance/header.inc @@ -5,10 +5,10 @@ CaveOfOrigin_Entrance:: @ 830717C .4byte 0x0 .2byte MUS_DAN03 .2byte 158 - .byte 72 + .byte MAPSEC_CAVE_OF_ORIGIN .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DesertRuins/events.inc b/data/maps/DesertRuins/events.inc index b1d8690c1..b3070e794 100644 --- a/data/maps/DesertRuins/events.inc +++ b/data/maps/DesertRuins/events.inc @@ -1,5 +1,5 @@ DesertRuins_EventObjects:: @ 838BEBC - object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, 8, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, FLAG_HIDE_REGIROCK + object_event 1, EVENT_OBJ_GFX_REGIROCK, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DesertRuins_EventScript_15CB85, FLAG_HIDE_REGIROCK DesertRuins_MapWarps:: @ 838BED4 warp_def 8, 29, 3, 1, MAP_ROUTE111 @@ -7,9 +7,9 @@ DesertRuins_MapWarps:: @ 838BED4 warp_def 8, 11, 3, 1, MAP_DESERT_RUINS DesertRuins_MapBGEvents:: @ 838BEEC - bg_event 8, 20, 0, 0, 0, DesertRuins_EventScript_15CB56 - bg_event 7, 20, 0, 0, 0, DesertRuins_EventScript_15CB77 - bg_event 9, 20, 0, 0, 0, DesertRuins_EventScript_15CB77 + bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_15CB56 + bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_15CB77 + bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, DesertRuins_EventScript_15CB77 DesertRuins_MapEvents:: @ 838BF10 map_events DesertRuins_EventObjects, DesertRuins_MapWarps, 0x0, DesertRuins_MapBGEvents diff --git a/data/maps/DesertRuins/header.inc b/data/maps/DesertRuins/header.inc index 4a9ceab39..5e42b6c1a 100644 --- a/data/maps/DesertRuins/header.inc +++ b/data/maps/DesertRuins/header.inc @@ -5,10 +5,10 @@ DesertRuins:: @ 8306E18 .4byte 0x0 .2byte MUS_MABOROSI .2byte 132 - .byte 82 + .byte MAPSEC_DESERT_RUINS .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown/events.inc b/data/maps/DewfordTown/events.inc index 5cfb552ee..c034ab5ab 100644 --- a/data/maps/DewfordTown/events.inc +++ b/data/maps/DewfordTown/events.inc @@ -1,9 +1,9 @@ DewfordTown_EventObjects:: @ 8380B88 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_14E0A2, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 9, 3, 9, 0, 1, 0, 3, DewfordTown_EventScript_14E002, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, 5, 1, 0, 0, 0, DewfordTown_EventScript_14E0C6, 0 - object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, 1, 0, 0, 0, 0, DewfordTown_EventScript_14E413, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_14E0A2, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 1, 0, 3, DewfordTown_EventScript_14E002, FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 12, 14, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_EventScript_14E0C6, 0 + object_event 4, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 8, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_EventScript_14E413, 0 DewfordTown_MapWarps:: @ 8380C00 warp_def 3, 3, 0, 0, MAP_DEWFORD_TOWN_HALL @@ -13,11 +13,11 @@ DewfordTown_MapWarps:: @ 8380C00 warp_def 8, 8, 0, 0, MAP_DEWFORD_TOWN_HOUSE2 DewfordTown_MapBGEvents:: @ 8380C28 - bg_event 10, 10, 0, 0, 0, DewfordTown_EventScript_14E0AB - bg_event 11, 16, 0, 0, 0, DewfordTown_EventScript_14E0B4 - bg_event 4, 10, 0, 1, 0, DewfordTown_EventScript_1A00EA - bg_event 3, 10, 0, 1, 0, DewfordTown_EventScript_1A00EA - bg_event 2, 4, 0, 0, 0, DewfordTown_EventScript_14E0BD + bg_event 10, 10, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_14E0AB + bg_event 11, 16, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_14E0B4 + bg_event 4, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_1A00EA + bg_event 3, 10, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_EventScript_1A00EA + bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_EventScript_14E0BD DewfordTown_MapEvents:: @ 8380C64 map_events DewfordTown_EventObjects, DewfordTown_MapWarps, 0x0, DewfordTown_MapBGEvents diff --git a/data/maps/DewfordTown/header.inc b/data/maps/DewfordTown/header.inc index 0bd56d96d..f66ffc56b 100644 --- a/data/maps/DewfordTown/header.inc +++ b/data/maps/DewfordTown/header.inc @@ -5,10 +5,10 @@ DewfordTown:: @ 830557C .4byte DewfordTown_MapConnections .2byte MUS_HIGHTOWN .2byte 12 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 2 - .byte 1 + .byte WEATHER_SUNNY + .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_Gym/events.inc b/data/maps/DewfordTown_Gym/events.inc index 237748602..ce6cc9c37 100644 --- a/data/maps/DewfordTown_Gym/events.inc +++ b/data/maps/DewfordTown_Gym/events.inc @@ -1,19 +1,19 @@ DewfordTown_Gym_EventObjects:: @ 8385FBC - object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 14, 4, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_153152, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 17, 3, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1531D9, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 10, 3, 7, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1531FB, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 24, 3, 7, 0, 0, 1, 2, DewfordTown_Gym_EventScript_15321D, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, 8, 0, 0, 0, 0, DewfordTown_Gym_EventScript_15323F, 0 + object_event 1, EVENT_OBJ_GFX_BRAWLY, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_153152, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 17, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1531D9, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 1, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, DewfordTown_Gym_EventScript_1531FB, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 12, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, DewfordTown_Gym_EventScript_15321D, 0 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 5, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_Gym_EventScript_15323F, 0 DewfordTown_Gym_MapWarps:: @ 8386034 warp_def 5, 27, 0, 2, MAP_DEWFORD_TOWN warp_def 6, 27, 0, 2, MAP_DEWFORD_TOWN DewfordTown_Gym_MapBGEvents:: @ 8386044 - bg_event 7, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15325E - bg_event 10, 21, 0, 1, 0, DewfordTown_Gym_EventScript_15326E - bg_event 4, 24, 0, 1, 0, DewfordTown_Gym_EventScript_15325E - bg_event 7, 24, 0, 1, 0, DewfordTown_Gym_EventScript_15326E + bg_event 7, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_15325E + bg_event 10, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_15326E + bg_event 4, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_15325E + bg_event 7, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, DewfordTown_Gym_EventScript_15326E DewfordTown_Gym_MapEvents:: @ 8386074 map_events DewfordTown_Gym_EventObjects, DewfordTown_Gym_MapWarps, 0x0, DewfordTown_Gym_MapBGEvents diff --git a/data/maps/DewfordTown_Gym/header.inc b/data/maps/DewfordTown_Gym/header.inc index c5c9540e5..cbc2c1504 100644 --- a/data/maps/DewfordTown_Gym/header.inc +++ b/data/maps/DewfordTown_Gym/header.inc @@ -5,10 +5,10 @@ DewfordTown_Gym:: @ 8305B9C .4byte 0x0 .2byte MUS_GIM .2byte 65 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 596f2c77f..3e57e0fec 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -7,7 +7,7 @@ DewfordTown_Gym_MapScript1_15306B:: @ 815306B end DewfordTown_Gym_EventScript_153071:: @ 8153071 - goto_if_trainer_defeated OPPONENT_BRAWLY, DewfordTown_Gym_EventScript_1530AA + goto_if_trainer_defeated TRAINER_BRAWLY, DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 compare VAR_SPECIAL_0, 0 @@ -80,22 +80,22 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 DewfordTown_Gym_EventScript_153122:: @ 8153122 setvar VAR_SPECIAL_0, 0 - goto_if_trainer_not_defeated OPPONENT_HIDEKI, DewfordTown_Gym_EventScript_153135 + goto_if_trainer_not_defeated TRAINER_HIDEKI, DewfordTown_Gym_EventScript_153135 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 - goto_if_trainer_not_defeated OPPONENT_TESSA, DewfordTown_Gym_EventScript_153143 + goto_if_trainer_not_defeated TRAINER_TESSA, DewfordTown_Gym_EventScript_153143 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 - goto_if_trainer_not_defeated OPPONENT_LAURA, DewfordTown_Gym_EventScript_153151 + goto_if_trainer_not_defeated TRAINER_LAURA, DewfordTown_Gym_EventScript_153151 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 return DewfordTown_Gym_EventScript_153152:: @ 8153152 - trainerbattle 1, OPPONENT_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 + trainerbattle 1, TRAINER_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1531B5 msgbox DewfordTown_Gym_Text_175412, 4 release @@ -127,7 +127,7 @@ DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 end DewfordTown_Gym_EventScript_1531D9:: @ 81531D9 - trainerbattle 2, OPPONENT_HIDEKI, 0, DewfordTown_Gym_Text_174F61, DewfordTown_Gym_Text_174F7A, DewfordTown_Gym_EventScript_1531F4 + trainerbattle 2, TRAINER_HIDEKI, 0, DewfordTown_Gym_Text_174F61, DewfordTown_Gym_Text_174F7A, DewfordTown_Gym_EventScript_1531F4 msgbox DewfordTown_Gym_Text_174F8E, 6 end @@ -137,7 +137,7 @@ DewfordTown_Gym_EventScript_1531F4:: @ 81531F4 end DewfordTown_Gym_EventScript_1531FB:: @ 81531FB - trainerbattle 2, OPPONENT_TESSA, 0, DewfordTown_Gym_Text_174FCE, DewfordTown_Gym_Text_175009, DewfordTown_Gym_EventScript_153216 + trainerbattle 2, TRAINER_TESSA, 0, DewfordTown_Gym_Text_174FCE, DewfordTown_Gym_Text_175009, DewfordTown_Gym_EventScript_153216 msgbox DewfordTown_Gym_Text_175031, 6 end @@ -147,7 +147,7 @@ DewfordTown_Gym_EventScript_153216:: @ 8153216 end DewfordTown_Gym_EventScript_15321D:: @ 815321D - trainerbattle 2, OPPONENT_LAURA, 0, DewfordTown_Gym_Text_1750C9, DewfordTown_Gym_Text_175104, DewfordTown_Gym_EventScript_153238 + trainerbattle 2, TRAINER_LAURA, 0, DewfordTown_Gym_Text_1750C9, DewfordTown_Gym_Text_175104, DewfordTown_Gym_EventScript_153238 msgbox DewfordTown_Gym_Text_175117, 6 end diff --git a/data/maps/DewfordTown_Hall/events.inc b/data/maps/DewfordTown_Hall/events.inc index 3eb9818fe..d0753ecff 100644 --- a/data/maps/DewfordTown_Hall/events.inc +++ b/data/maps/DewfordTown_Hall/events.inc @@ -1,21 +1,21 @@ DewfordTown_Hall_EventObjects:: @ 8386088 - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153293, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 1, 5, 0, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532BC, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532CD, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 0, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15330A, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 2, 3, 7, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153326, 0 - object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 14, 7, 0, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_153342, 0 - object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, 10, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533F2, 0 - object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, 9, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533FE, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, 5, 1, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 4, 6, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153293, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 1, 5, 0, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532BC, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1532CD, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_15330A, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, DewfordTown_Hall_EventScript_153326, 0 + object_event 6, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 14, 7, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_153342, 0 + object_event 7, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533F2, 0 + object_event 8, EVENT_OBJ_GFX_PSYCHIC_M, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_Hall_EventScript_1533FE, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, DewfordTown_Hall_EventScript_15359D, FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL DewfordTown_Hall_MapWarps:: @ 8386160 warp_def 5, 8, 0, 0, MAP_DEWFORD_TOWN warp_def 6, 8, 0, 0, MAP_DEWFORD_TOWN DewfordTown_Hall_MapBGEvents:: @ 8386170 - bg_event 0, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153353 - bg_event 7, 1, 3, 0, 0, DewfordTown_Hall_EventScript_153363 + bg_event 0, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_153353 + bg_event 7, 1, 3, BG_EVENT_PLAYER_FACING_ANY, DewfordTown_Hall_EventScript_153363 DewfordTown_Hall_MapEvents:: @ 8386188 map_events DewfordTown_Hall_EventObjects, DewfordTown_Hall_MapWarps, 0x0, DewfordTown_Hall_MapBGEvents diff --git a/data/maps/DewfordTown_Hall/header.inc b/data/maps/DewfordTown_Hall/header.inc index 38b662f4d..540fc602c 100644 --- a/data/maps/DewfordTown_Hall/header.inc +++ b/data/maps/DewfordTown_Hall/header.inc @@ -5,10 +5,10 @@ DewfordTown_Hall:: @ 8305BB8 .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 66 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_House1/events.inc b/data/maps/DewfordTown_House1/events.inc index 69fd54d9c..834b717fa 100644 --- a/data/maps/DewfordTown_House1/events.inc +++ b/data/maps/DewfordTown_House1/events.inc @@ -1,7 +1,7 @@ DewfordTown_House1_EventObjects:: @ 8385E58 - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 3, 3, 9, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FF8, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, 10, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FEF, 0 - object_event 3, EVENT_OBJ_GFX_ZIGZAGOON, 0, 4, 2, 3, 8, 3, 1, 0, 0, DewfordTown_House1_EventScript_153001, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FF8, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House1_EventScript_152FEF, 0 + object_event 3, EVENT_OBJ_GFX_ZIGZAGOON, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 1, 0, 0, DewfordTown_House1_EventScript_153001, 0 DewfordTown_House1_MapWarps:: @ 8385EA0 warp_def 3, 7, 0, 3, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_House1/header.inc b/data/maps/DewfordTown_House1/header.inc index 9f56cdf5d..067ac76f4 100644 --- a/data/maps/DewfordTown_House1/header.inc +++ b/data/maps/DewfordTown_House1/header.inc @@ -5,10 +5,10 @@ DewfordTown_House1:: @ 8305B48 .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 64 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_House2/events.inc b/data/maps/DewfordTown_House2/events.inc index f6858b846..45193e757 100644 --- a/data/maps/DewfordTown_House2/events.inc +++ b/data/maps/DewfordTown_House2/events.inc @@ -1,6 +1,6 @@ DewfordTown_House2_EventObjects:: @ 838619C - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 5, 3, 10, 0, 0, 0, 0, DewfordTown_House2_EventScript_1535DC, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, 1, 0, 0, 0, 0, DewfordTown_House2_EventScript_15361F, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_House2_EventScript_1535DC, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, DewfordTown_House2_EventScript_15361F, 0 DewfordTown_House2_MapWarps:: @ 83861CC warp_def 3, 8, 0, 4, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_House2/header.inc b/data/maps/DewfordTown_House2/header.inc index 35fd959eb..75af834ff 100644 --- a/data/maps/DewfordTown_House2/header.inc +++ b/data/maps/DewfordTown_House2/header.inc @@ -5,10 +5,10 @@ DewfordTown_House2:: @ 8305BD4 .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 67 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_PokemonCenter_1F/events.inc b/data/maps/DewfordTown_PokemonCenter_1F/events.inc index 97b0e761a..296b3374b 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/events.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ DewfordTown_PokemonCenter_1F_EventObjects:: @ 8385EC4 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153023, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 6, 3, 10, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153031, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 0, 5, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_15303A, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153023, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_153031, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 0, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, DewfordTown_PokemonCenter_1F_EventScript_15303A, 0 DewfordTown_PokemonCenter_1F_MapWarps:: @ 8385F0C warp_def 7, 8, 3, 1, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_PokemonCenter_1F/header.inc b/data/maps/DewfordTown_PokemonCenter_1F/header.inc index b7630e6c3..84cf5a83e 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/header.inc @@ -5,10 +5,10 @@ DewfordTown_PokemonCenter_1F:: @ 8305B64 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc index 33d14e770..38f242eab 100644 --- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 8153014 .byte 0 DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A - setrespawn 15 + setrespawn HEAL_LOCATION_DEWFORD_TOWN call DewfordTown_PokemonCenter_1F_EventScript_19FD1B end diff --git a/data/maps/DewfordTown_PokemonCenter_2F/events.inc b/data/maps/DewfordTown_PokemonCenter_2F/events.inc index 333823536..d26fc4351 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/events.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ DewfordTown_PokemonCenter_2F_EventObjects:: @ 8385F38 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153053, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153059, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_15305F, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153053, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_153059, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, DewfordTown_PokemonCenter_2F_EventScript_15305F, 0 DewfordTown_PokemonCenter_2F_MapWarps:: @ 8385F80 warp_def 1, 5, 4, 2, MAP_DEWFORD_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/DewfordTown_PokemonCenter_2F/header.inc b/data/maps/DewfordTown_PokemonCenter_2F/header.inc index 5d0babd91..90ccaa9d1 100644 --- a/data/maps/DewfordTown_PokemonCenter_2F/header.inc +++ b/data/maps/DewfordTown_PokemonCenter_2F/header.inc @@ -5,10 +5,10 @@ DewfordTown_PokemonCenter_2F:: @ 8305B80 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 2 + .byte MAPSEC_DEWFORD_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/DoubleBattleColosseum/events.inc b/data/maps/DoubleBattleColosseum/events.inc index a04c7a3a9..1c6f9e983 100644 --- a/data/maps/DoubleBattleColosseum/events.inc +++ b/data/maps/DoubleBattleColosseum/events.inc @@ -5,10 +5,10 @@ DoubleBattleColosseum_MapWarps:: @ 8391428 warp_def 8, 8, 3, 127, MAP_NONE DoubleBattleColosseum_MapCoordEvents:: @ 8391448 - coord_event 3, 4, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A4383 - coord_event 3, 6, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A43B9 - coord_event 10, 4, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A439E - coord_event 10, 6, 3, 0, VAR_TEMP_0, 0, 0, DoubleBattleColosseum_EventScript_1A43D4 + coord_event 3, 4, 3, VAR_TEMP_0, 0, DoubleBattleColosseum_EventScript_1A4383 + coord_event 3, 6, 3, VAR_TEMP_0, 0, DoubleBattleColosseum_EventScript_1A43B9 + coord_event 10, 4, 3, VAR_TEMP_0, 0, DoubleBattleColosseum_EventScript_1A439E + coord_event 10, 6, 3, VAR_TEMP_0, 0, DoubleBattleColosseum_EventScript_1A43D4 DoubleBattleColosseum_MapEvents:: @ 8391488 map_events 0x0, DoubleBattleColosseum_MapWarps, DoubleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/DoubleBattleColosseum/header.inc b/data/maps/DoubleBattleColosseum/header.inc index bf41ae872..d9bc47e23 100644 --- a/data/maps/DoubleBattleColosseum/header.inc +++ b/data/maps/DoubleBattleColosseum/header.inc @@ -5,10 +5,10 @@ DoubleBattleColosseum:: @ 83079CC .4byte 0x0 .2byte MUS_RAINBOW .2byte 225 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/EverGrandeCity/events.inc b/data/maps/EverGrandeCity/events.inc index 0a619b93d..757f33b6c 100644 --- a/data/maps/EverGrandeCity/events.inc +++ b/data/maps/EverGrandeCity/events.inc @@ -5,24 +5,24 @@ EverGrandeCity_MapWarps:: @ 83807DC warp_def 18, 27, 0, 1, MAP_VICTORY_ROAD_1F EverGrandeCity_MapCoordEvents:: @ 83807FC - coord_event 17, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 16, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 18, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 19, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 20, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 21, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 22, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 23, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 24, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 25, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 - coord_event 26, 58, 1, 0, VAR_TEMP_1, 0, 0, EverGrandeCity_EventScript_14D500 + coord_event 17, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 16, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 18, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 19, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 20, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 21, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 22, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 23, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 24, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 25, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 + coord_event 26, 58, 1, VAR_TEMP_1, 0, EverGrandeCity_EventScript_14D500 EverGrandeCity_MapBGEvents:: @ 83808AC - bg_event 19, 43, 5, 0, 0, EverGrandeCity_EventScript_14D4E5 - bg_event 29, 48, 0, 1, 0, EverGrandeCity_EventScript_1A00EA - bg_event 18, 52, 5, 0, 0, EverGrandeCity_EventScript_14D4EE - bg_event 23, 15, 0, 0, 0, EverGrandeCity_EventScript_14D4F7 - bg_event 28, 48, 0, 1, 0, EverGrandeCity_EventScript_1A00EA + bg_event 19, 43, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_14D4E5 + bg_event 29, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_1A00EA + bg_event 18, 52, 5, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_14D4EE + bg_event 23, 15, 0, BG_EVENT_PLAYER_FACING_ANY, EverGrandeCity_EventScript_14D4F7 + bg_event 28, 48, 0, BG_EVENT_PLAYER_FACING_NORTH, EverGrandeCity_EventScript_1A00EA EverGrandeCity_MapEvents:: @ 83808E8 map_events 0x0, EverGrandeCity_MapWarps, EverGrandeCity_MapCoordEvents, EverGrandeCity_MapBGEvents diff --git a/data/maps/EverGrandeCity/header.inc b/data/maps/EverGrandeCity/header.inc index 89386b78c..b80385735 100644 --- a/data/maps/EverGrandeCity/header.inc +++ b/data/maps/EverGrandeCity/header.inc @@ -5,10 +5,10 @@ EverGrandeCity:: @ 8305528 .4byte EverGrandeCity_MapConnections .2byte MUS_RAINBOW .2byte 9 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 2 - .byte 2 + .byte WEATHER_SUNNY + .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_ChampionsRoom/events.inc b/data/maps/EverGrandeCity_ChampionsRoom/events.inc index 832ddf206..ae5518f5e 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/events.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/events.inc @@ -1,7 +1,7 @@ EverGrandeCity_ChampionsRoom_EventObjects:: @ 838B334 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 6, 5, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM - object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_CHAMPIONS_ROOM + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_CHAMPIONS_ROOM + object_event 3, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_CHAMPIONS_ROOM EverGrandeCity_ChampionsRoom_MapWarps:: @ 838B37C warp_def 6, 12, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR4 diff --git a/data/maps/EverGrandeCity_ChampionsRoom/header.inc b/data/maps/EverGrandeCity_ChampionsRoom/header.inc index 85afeb078..74fc87562 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/header.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/header.inc @@ -5,10 +5,10 @@ EverGrandeCity_ChampionsRoom:: @ 8306B08 .4byte 0x0 .2byte MUS_C_ROAD .2byte 116 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc index 7e1f6e6cb..01b2cc970 100644 --- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc +++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc @@ -40,7 +40,7 @@ EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 playbgm MUS_DAIGO, FALSE msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4 - trainerbattle 3, OPPONENT_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 + trainerbattle 3, TRAINER_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 goto EverGrandeCity_ChampionsRoom_EventScript_15B821 end diff --git a/data/maps/EverGrandeCity_Corridor1/header.inc b/data/maps/EverGrandeCity_Corridor1/header.inc index c15955ae1..abb715579 100644 --- a/data/maps/EverGrandeCity_Corridor1/header.inc +++ b/data/maps/EverGrandeCity_Corridor1/header.inc @@ -5,10 +5,10 @@ EverGrandeCity_Corridor1:: @ 8306B24 .4byte 0x0 .2byte MUS_C_ROAD .2byte 117 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Corridor2/header.inc b/data/maps/EverGrandeCity_Corridor2/header.inc index 774dd8bf9..84e681fd7 100644 --- a/data/maps/EverGrandeCity_Corridor2/header.inc +++ b/data/maps/EverGrandeCity_Corridor2/header.inc @@ -5,10 +5,10 @@ EverGrandeCity_Corridor2:: @ 8306B40 .4byte 0x0 .2byte MUS_C_ROAD .2byte 117 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Corridor3/header.inc b/data/maps/EverGrandeCity_Corridor3/header.inc index 2799a2256..240d65727 100644 --- a/data/maps/EverGrandeCity_Corridor3/header.inc +++ b/data/maps/EverGrandeCity_Corridor3/header.inc @@ -5,10 +5,10 @@ EverGrandeCity_Corridor3:: @ 8306B5C .4byte 0x0 .2byte MUS_C_ROAD .2byte 117 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Corridor4/header.inc b/data/maps/EverGrandeCity_Corridor4/header.inc index 254553ab4..3fad2e361 100644 --- a/data/maps/EverGrandeCity_Corridor4/header.inc +++ b/data/maps/EverGrandeCity_Corridor4/header.inc @@ -5,10 +5,10 @@ EverGrandeCity_Corridor4:: @ 8306B78 .4byte 0x0 .2byte MUS_C_ROAD .2byte 316 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_Corridor5/header.inc b/data/maps/EverGrandeCity_Corridor5/header.inc index 176d27e1e..3496c95be 100644 --- a/data/maps/EverGrandeCity_Corridor5/header.inc +++ b/data/maps/EverGrandeCity_Corridor5/header.inc @@ -5,10 +5,10 @@ EverGrandeCity_Corridor5:: @ 8306B94 .4byte 0x0 .2byte MUS_C_ROAD .2byte 117 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_DrakesRoom/events.inc b/data/maps/EverGrandeCity_DrakesRoom/events.inc index 6b69d45da..9ff011c34 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/events.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_DrakesRoom_EventObjects:: @ 838B2F8 - object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_15B764, 0 + object_event 1, EVENT_OBJ_GFX_DRAKE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_DrakesRoom_EventScript_15B764, 0 EverGrandeCity_DrakesRoom_MapWarps:: @ 838B310 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR3 diff --git a/data/maps/EverGrandeCity_DrakesRoom/header.inc b/data/maps/EverGrandeCity_DrakesRoom/header.inc index 4f5cb96b6..265aac21d 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/header.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/header.inc @@ -5,10 +5,10 @@ EverGrandeCity_DrakesRoom:: @ 8306AEC .4byte 0x0 .2byte MUS_C_ROAD .2byte 115 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 7 + .byte MAP_BATTLE_SCENE_DRAKE diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 4dad28923..f00a809bd 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -43,7 +43,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 - trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 + trainerbattle 3, TRAINER_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 goto EverGrandeCity_DrakesRoom_EventScript_15B795 end diff --git a/data/maps/EverGrandeCity_GlaciasRoom/events.inc b/data/maps/EverGrandeCity_GlaciasRoom/events.inc index 8dba287fe..55eb82464 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/events.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_GlaciasRoom_EventObjects:: @ 838B2BC - object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_15B6CA, 0 + object_event 1, EVENT_OBJ_GFX_GLACIA, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_GlaciasRoom_EventScript_15B6CA, 0 EverGrandeCity_GlaciasRoom_MapWarps:: @ 838B2D4 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR2 diff --git a/data/maps/EverGrandeCity_GlaciasRoom/header.inc b/data/maps/EverGrandeCity_GlaciasRoom/header.inc index f0ba099ac..6338d9c79 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/header.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/header.inc @@ -5,10 +5,10 @@ EverGrandeCity_GlaciasRoom:: @ 8306AD0 .4byte 0x0 .2byte MUS_C_ROAD .2byte 114 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 6 + .byte MAP_BATTLE_SCENE_GLACIA diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 17555f2f6..ede08e504 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -43,7 +43,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1 playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 - trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 + trainerbattle 3, TRAINER_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB end diff --git a/data/maps/EverGrandeCity_HallOfFame/events.inc b/data/maps/EverGrandeCity_HallOfFame/events.inc index f5a3f9137..d8547fbda 100644 --- a/data/maps/EverGrandeCity_HallOfFame/events.inc +++ b/data/maps/EverGrandeCity_HallOfFame/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_HallOfFame_EventObjects:: @ 838B528 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 6, 16, 3, 7, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 EverGrandeCity_HallOfFame_MapWarps:: @ 838B540 warp_def 7, 11, 3, 1, MAP_EVER_GRANDE_CITY_CHAMPIONS_ROOM diff --git a/data/maps/EverGrandeCity_HallOfFame/header.inc b/data/maps/EverGrandeCity_HallOfFame/header.inc index 3a8c1a263..7c960229e 100644 --- a/data/maps/EverGrandeCity_HallOfFame/header.inc +++ b/data/maps/EverGrandeCity_HallOfFame/header.inc @@ -5,10 +5,10 @@ EverGrandeCity_HallOfFame:: @ 8306BCC .4byte 0x0 .2byte MUS_EIKOU_R .2byte 299 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc index 6cfc5ae27..4b54204d3 100644 --- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc +++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc @@ -51,7 +51,7 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 end EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41 - setrespawn 1 + setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F fadescreenspeed 1, 24 special GameClear waitstate @@ -59,7 +59,7 @@ EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41 end EverGrandeCity_HallOfFame_EventScript_15BC4D:: @ 815BC4D - setrespawn 2 + setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F fadescreenspeed 1, 24 special GameClear waitstate diff --git a/data/maps/EverGrandeCity_PhoebesRoom/events.inc b/data/maps/EverGrandeCity_PhoebesRoom/events.inc index aa67e5912..714de97b8 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/events.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_PhoebesRoom_EventObjects:: @ 838B280 - object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_15B630, 0 + object_event 1, EVENT_OBJ_GFX_PHOEBE, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PhoebesRoom_EventScript_15B630, 0 EverGrandeCity_PhoebesRoom_MapWarps:: @ 838B298 warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR1 diff --git a/data/maps/EverGrandeCity_PhoebesRoom/header.inc b/data/maps/EverGrandeCity_PhoebesRoom/header.inc index 8d34dd0ba..754757686 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/header.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/header.inc @@ -5,10 +5,10 @@ EverGrandeCity_PhoebesRoom:: @ 8306AB4 .4byte 0x0 .2byte MUS_C_ROAD .2byte 113 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 5 + .byte MAP_BATTLE_SCENE_PHOEBE diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 5575b99b3..db30bcfa7 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -43,7 +43,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657 playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 - trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C + trainerbattle 3, TRAINER_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C goto EverGrandeCity_PhoebesRoom_EventScript_15B661 end diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc index ea1045d22..bf4e1db93 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ EverGrandeCity_PokemonCenter_1F_EventObjects:: @ 838B55C - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC70, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC7E, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 7, 3, 10, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC87, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC70, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC7E, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_1F_EventScript_15BC87, 0 EverGrandeCity_PokemonCenter_1F_MapWarps:: @ 838B5A4 warp_def 7, 8, 3, 1, MAP_EVER_GRANDE_CITY diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc index 489b5bd52..f52bbdaaf 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/header.inc @@ -5,10 +5,10 @@ EverGrandeCity_PokemonCenter_1F:: @ 8306BE8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index 374ef9472..3c0ad3732 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 815BC66 .byte 0 EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C - setrespawn 11 + setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1 end EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc index 36dfa01f7..cdbcd9f32 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ EverGrandeCity_PokemonCenter_2F_EventObjects:: @ 838B5D0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA6, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCAC, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCA6, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonCenter_2F_EventScript_15BCAC, 0 EverGrandeCity_PokemonCenter_2F_MapWarps:: @ 838B618 warp_def 1, 5, 4, 2, MAP_EVER_GRANDE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc index 35167d6c1..18f3152a6 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_2F/header.inc @@ -5,10 +5,10 @@ EverGrandeCity_PokemonCenter_2F:: @ 8306C04 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PokemonLeague/events.inc b/data/maps/EverGrandeCity_PokemonLeague/events.inc index 89c6973a5..711978a5a 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/events.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/events.inc @@ -1,8 +1,8 @@ EverGrandeCity_PokemonLeague_EventObjects:: @ 838B494 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BA9A, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, 8, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAA8, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, 8, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BA9A, 0 + object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAA8, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, EverGrandeCity_PokemonLeague_EventScript_15BAD2, 0 EverGrandeCity_PokemonLeague_MapWarps:: @ 838B4F4 warp_def 9, 11, 3, 0, MAP_EVER_GRANDE_CITY diff --git a/data/maps/EverGrandeCity_PokemonLeague/header.inc b/data/maps/EverGrandeCity_PokemonLeague/header.inc index 56bb00438..03d3fe2c8 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/header.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/header.inc @@ -5,10 +5,10 @@ EverGrandeCity_PokemonLeague:: @ 8306BB0 .4byte 0x0 .2byte MUS_POKECEN .2byte 271 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc index a48cf278e..6da717d06 100644 --- a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc @@ -3,7 +3,7 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 .byte 0 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B - setrespawn 20 + setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2 setflag FLAG_SYS_POKEMON_LEAGUE_FLY call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BA8B end diff --git a/data/maps/EverGrandeCity_SidneysRoom/events.inc b/data/maps/EverGrandeCity_SidneysRoom/events.inc index 552981282..d64e1f6df 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/events.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/events.inc @@ -1,5 +1,5 @@ EverGrandeCity_SidneysRoom_EventObjects:: @ 838B244 - object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, 8, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_15B596, 0 + object_event 1, EVENT_OBJ_GFX_SIDNEY, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, EverGrandeCity_SidneysRoom_EventScript_15B596, 0 EverGrandeCity_SidneysRoom_MapWarps:: @ 838B25C warp_def 6, 13, 3, 1, MAP_EVER_GRANDE_CITY_CORRIDOR5 diff --git a/data/maps/EverGrandeCity_SidneysRoom/header.inc b/data/maps/EverGrandeCity_SidneysRoom/header.inc index 41ea61fd8..271b85dc2 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/header.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/header.inc @@ -5,10 +5,10 @@ EverGrandeCity_SidneysRoom:: @ 8306A98 .4byte 0x0 .2byte MUS_C_ROAD .2byte 112 - .byte 15 + .byte MAPSEC_EVER_GRANDE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 4 + .byte MAP_BATTLE_SCENE_SIDNEY diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 2b6cc0571..b2b731004 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -44,7 +44,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD playbgm MUS_SITENNOU, FALSE msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 - trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 + trainerbattle 3, TRAINER_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 end diff --git a/data/maps/FallarborTown/events.inc b/data/maps/FallarborTown/events.inc index 37308b07c..dec80a540 100644 --- a/data/maps/FallarborTown/events.inc +++ b/data/maps/FallarborTown/events.inc @@ -1,8 +1,8 @@ FallarborTown_EventObjects:: @ 8380E04 - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, 8, 0, 1, 0, 0, FallarborTown_EventScript_14E814, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, 5, 1, 0, 0, 0, FallarborTown_EventScript_14E7F5, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, 3, 1, 1, 0, 0, FallarborTown_EventScript_14E81D, 0 - object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, 1, 1, 0, 0, 0, FallarborTown_EventScript_14E826, FLAG_HIDE_AZURILL_FALLARBOR + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 8, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, FallarborTown_EventScript_14E814, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_EventScript_14E7F5, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 15, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, FallarborTown_EventScript_14E81D, 0 + object_event 4, EVENT_OBJ_GFX_AZURILL, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, FallarborTown_EventScript_14E826, FLAG_HIDE_AZURILL_FALLARBOR FallarborTown_MapWarps:: @ 8380E64 warp_def 15, 15, 0, 0, MAP_FALLARBOR_TOWN_MART @@ -12,13 +12,13 @@ FallarborTown_MapWarps:: @ 8380E64 warp_def 1, 6, 0, 0, MAP_FALLARBOR_TOWN_HOUSE2 FallarborTown_MapBGEvents:: @ 8380E8C - bg_event 16, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1 - bg_event 15, 7, 0, 1, 0, FallarborTown_EventScript_1A00EA - bg_event 6, 8, 0, 0, 0, FallarborTown_EventScript_14E839 - bg_event 16, 7, 0, 1, 0, FallarborTown_EventScript_1A00EA - bg_event 10, 11, 0, 0, 0, FallarborTown_EventScript_14E842 - bg_event 17, 15, 0, 1, 0, FallarborTown_EventScript_1A00E1 - bg_event 3, 7, 0, 0, 0, FallarborTown_EventScript_14E84B + bg_event 16, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_1A00E1 + bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_1A00EA + bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_14E839 + bg_event 16, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_1A00EA + bg_event 10, 11, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_14E842 + bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, FallarborTown_EventScript_1A00E1 + bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_EventScript_14E84B bg_hidden_item_event 2, 15, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1C FallarborTown_MapEvents:: @ 8380EEC diff --git a/data/maps/FallarborTown/header.inc b/data/maps/FallarborTown/header.inc index e6e0041b6..3d825ccb9 100644 --- a/data/maps/FallarborTown/header.inc +++ b/data/maps/FallarborTown/header.inc @@ -5,10 +5,10 @@ FallarborTown:: @ 83055B4 .4byte FallarborTown_MapConnections .2byte MUS_TONEKUSA .2byte 14 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 2 - .byte 1 + .byte WEATHER_SUNNY + .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_ContestHall/events.inc b/data/maps/FallarborTown_ContestHall/events.inc index 9479c8db1..d8c4eee55 100644 --- a/data/maps/FallarborTown_ContestHall/events.inc +++ b/data/maps/FallarborTown_ContestHall/events.inc @@ -1,15 +1,15 @@ FallarborTown_ContestHall_EventObjects:: @ 83867DC - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 19, 8, 0, 2, 2, 2, 0, 0, FallarborTown_ContestHall_EventScript_153ACF, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 7, 0, 2, 2, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AD8, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 15, 0, 2, 3, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AE1, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 19, 8, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, FallarborTown_ContestHall_EventScript_153ACF, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 7, 0, MOVEMENT_TYPE_WANDER_AROUND, 2, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AD8, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 0, 15, 0, MOVEMENT_TYPE_WANDER_AROUND, 3, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AE1, 0 FallarborTown_ContestHall_MapWarps:: @ 8386824 warp_def 10, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY warp_def 11, 17, 0, 2, MAP_FALLARBOR_TOWN_CONTEST_LOBBY FallarborTown_ContestHall_MapBGEvents:: @ 8386834 - bg_event 12, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA - bg_event 8, 14, 3, 0, 0, FallarborTown_ContestHall_EventScript_153AEA + bg_event 12, 14, 3, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_ContestHall_EventScript_153AEA + bg_event 8, 14, 3, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_ContestHall_EventScript_153AEA FallarborTown_ContestHall_MapEvents:: @ 838684C map_events FallarborTown_ContestHall_EventObjects, FallarborTown_ContestHall_MapWarps, 0x0, FallarborTown_ContestHall_MapBGEvents diff --git a/data/maps/FallarborTown_ContestHall/header.inc b/data/maps/FallarborTown_ContestHall/header.inc index 38f414c10..d7e0889e3 100644 --- a/data/maps/FallarborTown_ContestHall/header.inc +++ b/data/maps/FallarborTown_ContestHall/header.inc @@ -5,10 +5,10 @@ FallarborTown_ContestHall:: @ 8305CEC .4byte 0x0 .2byte MUS_CONLOBBY .2byte 73 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_ContestLobby/events.inc b/data/maps/FallarborTown_ContestLobby/events.inc index 47144a554..0c5d3ca23 100644 --- a/data/maps/FallarborTown_ContestLobby/events.inc +++ b/data/maps/FallarborTown_ContestLobby/events.inc @@ -1,10 +1,10 @@ FallarborTown_ContestLobby_EventObjects:: @ 83866F0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1539CD, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 2, 6, 3, 5, 1, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A8E, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 4, 3, 8, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AB2, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, 10, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B778A, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, 9, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_FALLARBOR - object_event 6, EVENT_OBJ_GFX_ARTIST, 0, 12, 2, 3, 8, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A97, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1539CD, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 2, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A8E, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AB2, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B778A, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_FALLARBOR + object_event 6, EVENT_OBJ_GFX_ARTIST, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153A97, 0 FallarborTown_ContestLobby_MapWarps:: @ 8386780 warp_def 5, 6, 0, 1, MAP_FALLARBOR_TOWN @@ -12,10 +12,10 @@ FallarborTown_ContestLobby_MapWarps:: @ 8386780 warp_def 1, 1, 0, 0, MAP_FALLARBOR_TOWN_CONTEST_HALL FallarborTown_ContestLobby_MapBGEvents:: @ 8386798 - bg_event 10, 3, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7823 - bg_event 12, 5, 0, 0, 0, FallarborTown_ContestLobby_EventScript_1B7604 - bg_event 11, 1, 3, 0, 0, FallarborTown_ContestLobby_EventScript_153ABB - bg_event 13, 1, 0, 0, 0, FallarborTown_ContestLobby_EventScript_153AC2 + bg_event 10, 3, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_ContestLobby_EventScript_1B7823 + bg_event 12, 5, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_ContestLobby_EventScript_1B7604 + bg_event 11, 1, 3, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_ContestLobby_EventScript_153ABB + bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, FallarborTown_ContestLobby_EventScript_153AC2 FallarborTown_ContestLobby_MapEvents:: @ 83867C8 map_events FallarborTown_ContestLobby_EventObjects, FallarborTown_ContestLobby_MapWarps, 0x0, FallarborTown_ContestLobby_MapBGEvents diff --git a/data/maps/FallarborTown_ContestLobby/header.inc b/data/maps/FallarborTown_ContestLobby/header.inc index 2b8d9a18b..b96b373c3 100644 --- a/data/maps/FallarborTown_ContestLobby/header.inc +++ b/data/maps/FallarborTown_ContestLobby/header.inc @@ -5,10 +5,10 @@ FallarborTown_ContestLobby:: @ 8305CD0 .4byte 0x0 .2byte MUS_CONLOBBY .2byte 72 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_House1/events.inc b/data/maps/FallarborTown_House1/events.inc index fefaadc51..e0342279e 100644 --- a/data/maps/FallarborTown_House1/events.inc +++ b/data/maps/FallarborTown_House1/events.inc @@ -1,6 +1,6 @@ FallarborTown_House1_EventObjects:: @ 8386970 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, 2, 1, 1, 0, 0, FallarborTown_House1_EventScript_153BB5, FLAG_HIDE_PROF_COSMO_FALLARBOR - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, 5, 1, 0, 0, 0, FallarborTown_House1_EventScript_153C5E, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_House1_EventScript_153BB5, FLAG_HIDE_PROF_COSMO_FALLARBOR + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FallarborTown_House1_EventScript_153C5E, 0 FallarborTown_House1_MapWarps:: @ 83869A0 warp_def 3, 8, 0, 3, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_House1/header.inc b/data/maps/FallarborTown_House1/header.inc index e6eacc77c..8e1881474 100644 --- a/data/maps/FallarborTown_House1/header.inc +++ b/data/maps/FallarborTown_House1/header.inc @@ -5,10 +5,10 @@ FallarborTown_House1:: @ 8305D40 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 59 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_House2/events.inc b/data/maps/FallarborTown_House2/events.inc index b873f95c8..216afb0df 100644 --- a/data/maps/FallarborTown_House2/events.inc +++ b/data/maps/FallarborTown_House2/events.inc @@ -1,5 +1,5 @@ FallarborTown_House2_EventObjects:: @ 83869C4 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, 8, 0, 0, 0, 0, FallarborTown_House2_EventScript_153C91, 0 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_House2_EventScript_153C91, 0 FallarborTown_House2_MapWarps:: @ 83869DC warp_def 3, 7, 0, 4, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_House2/header.inc b/data/maps/FallarborTown_House2/header.inc index 246bc12db..7bc6cfb20 100644 --- a/data/maps/FallarborTown_House2/header.inc +++ b/data/maps/FallarborTown_House2/header.inc @@ -5,10 +5,10 @@ FallarborTown_House2:: @ 8305D5C .4byte 0x0 .2byte MUS_TONEKUSA .2byte 60 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_Mart/events.inc b/data/maps/FallarborTown_Mart/events.inc index bf3195eea..9fbea3ed8 100644 --- a/data/maps/FallarborTown_Mart/events.inc +++ b/data/maps/FallarborTown_Mart/events.inc @@ -1,8 +1,8 @@ FallarborTown_Mart_EventObjects:: @ 838666C - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, FallarborTown_Mart_EventScript_153967, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, 2, 1, 1, 0, 0, FallarborTown_Mart_EventScript_15399C, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 8, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1539A5, 0 - object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, 1, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1539AE, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_Mart_EventScript_153967, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_15399C, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_Mart_EventScript_1539A5, 0 + object_event 4, EVENT_OBJ_GFX_SKITTY, 0, 2, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FallarborTown_Mart_EventScript_1539AE, 0 FallarborTown_Mart_MapWarps:: @ 83866CC warp_def 3, 7, 0, 0, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_Mart/header.inc b/data/maps/FallarborTown_Mart/header.inc index de16583f4..6403e78e3 100644 --- a/data/maps/FallarborTown_Mart/header.inc +++ b/data/maps/FallarborTown_Mart/header.inc @@ -5,10 +5,10 @@ FallarborTown_Mart:: @ 8305CB4 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_PokemonCenter_1F/events.inc b/data/maps/FallarborTown_PokemonCenter_1F/events.inc index 06f8068c6..50f768c2c 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/events.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ FallarborTown_PokemonCenter_1F_EventObjects:: @ 8386860 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B02, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B10, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B19, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, 7, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, FLAG_HIDE_LANETTE_FALLARBOR + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B02, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B10, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B19, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FallarborTown_PokemonCenter_1F_EventScript_153B22, FLAG_HIDE_LANETTE_FALLARBOR FallarborTown_PokemonCenter_1F_MapWarps:: @ 83868C0 warp_def 7, 8, 3, 2, MAP_FALLARBOR_TOWN diff --git a/data/maps/FallarborTown_PokemonCenter_1F/header.inc b/data/maps/FallarborTown_PokemonCenter_1F/header.inc index e51dea9cc..25a18fc1a 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/header.inc @@ -5,10 +5,10 @@ FallarborTown_PokemonCenter_1F:: @ 8305D08 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc index 6ae897ec8..801f704e3 100644 --- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8153AF3 .byte 0 FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 - setrespawn 17 + setrespawn HEAL_LOCATION_FALLARBOR_TOWN call FallarborTown_PokemonCenter_1F_EventScript_19FD1B end diff --git a/data/maps/FallarborTown_PokemonCenter_2F/events.inc b/data/maps/FallarborTown_PokemonCenter_2F/events.inc index 381051d01..df52f9505 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/events.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ FallarborTown_PokemonCenter_2F_EventObjects:: @ 83868EC - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA8, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153B9C, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA2, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA8, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153B9C, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FallarborTown_PokemonCenter_2F_EventScript_153BA2, 0 FallarborTown_PokemonCenter_2F_MapWarps:: @ 8386934 warp_def 1, 5, 4, 2, MAP_FALLARBOR_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/FallarborTown_PokemonCenter_2F/header.inc b/data/maps/FallarborTown_PokemonCenter_2F/header.inc index 91613d680..14c591d65 100644 --- a/data/maps/FallarborTown_PokemonCenter_2F/header.inc +++ b/data/maps/FallarborTown_PokemonCenter_2F/header.inc @@ -5,10 +5,10 @@ FallarborTown_PokemonCenter_2F:: @ 8305D24 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 4 + .byte MAPSEC_FALLARBOR_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FieryPath/events.inc b/data/maps/FieryPath/events.inc index faf6d5011..52756fda8 100644 --- a/data/maps/FieryPath/events.inc +++ b/data/maps/FieryPath/events.inc @@ -1,12 +1,12 @@ FieryPath_EventObjects:: @ 838C718 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_1B17EE, FLAG_ITEM_FIERY_PATH_1 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, 1, 1, 1, 0, 0, FieryPath_EventScript_1B17E1, FLAG_ITEM_FIERY_PATH_2 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_1B17EE, FLAG_ITEM_FIERY_PATH_1 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 10, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 17, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FieryPath_EventScript_1B17E1, FLAG_ITEM_FIERY_PATH_2 FieryPath_MapWarps:: @ 838C7D8 warp_def 26, 36, 3, 4, MAP_ROUTE112 diff --git a/data/maps/FieryPath/header.inc b/data/maps/FieryPath/header.inc index dcc4d55ea..2411a9b19 100644 --- a/data/maps/FieryPath/header.inc +++ b/data/maps/FieryPath/header.inc @@ -5,10 +5,10 @@ FieryPath:: @ 8306EF8 .4byte 0x0 .2byte MUS_DAN01 .2byte 294 - .byte 74 + .byte MAPSEC_FIERY_PATH .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity/events.inc b/data/maps/FortreeCity/events.inc index 485fd836f..e289f7a88 100644 --- a/data/maps/FortreeCity/events.inc +++ b/data/maps/FortreeCity/events.inc @@ -1,11 +1,11 @@ FortreeCity_EventObjects:: @ 8380020 - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_14C955, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, 2, 1, 1, 0, 0, FortreeCity_EventScript_14C97D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 32, 10, 3, 3, 0, 1, 0, 0, FortreeCity_EventScript_14C95E, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, 1, 0, 0, 0, 0, FortreeCity_EventScript_14C98F, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 8, 10, 3, 1, 0, 0, 0, 0, FortreeCity_EventScript_14C986, 0 - object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 9, 16, 3, 8, 0, 0, 0, 0, FortreeCity_EventScript_14C998, 0 - object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, 76, 1, 1, 0, 0, FortreeCity_EventScript_14C9B3, FLAG_HIDE_KECLEON_FORTREE + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 31, 3, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_14C955, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 32, 16, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_EventScript_14C97D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 32, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, FortreeCity_EventScript_14C95E, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 11, 14, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_14C98F, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_EventScript_14C986, 0 + object_event 6, EVENT_OBJ_GFX_BOY_5, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_EventScript_14C998, 0 + object_event 7, EVENT_OBJ_GFX_KECLEON_1, 0, 25, 8, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, FortreeCity_EventScript_14C9B3, FLAG_HIDE_KECLEON_FORTREE FortreeCity_MapWarps:: @ 83800C8 warp_def 5, 6, 0, 0, MAP_FORTREE_CITY_POKEMON_CENTER_1F @@ -19,12 +19,12 @@ FortreeCity_MapWarps:: @ 83800C8 warp_def 37, 13, 0, 0, MAP_FORTREE_CITY_DECORATION_SHOP FortreeCity_MapBGEvents:: @ 8380110 - bg_event 6, 9, 0, 0, 0, FortreeCity_EventScript_14C9A1 - bg_event 7, 6, 0, 1, 0, FortreeCity_EventScript_1A00EA - bg_event 5, 14, 0, 1, 0, FortreeCity_EventScript_1A00E1 - bg_event 26, 10, 0, 0, 0, FortreeCity_EventScript_14C9AA - bg_event 6, 6, 0, 1, 0, FortreeCity_EventScript_1A00EA - bg_event 6, 14, 0, 1, 0, FortreeCity_EventScript_1A00E1 + bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_14C9A1 + bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_1A00EA + bg_event 5, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_1A00E1 + bg_event 26, 10, 0, BG_EVENT_PLAYER_FACING_ANY, FortreeCity_EventScript_14C9AA + bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_1A00EA + bg_event 6, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_EventScript_1A00E1 FortreeCity_MapEvents:: @ 8380158 map_events FortreeCity_EventObjects, FortreeCity_MapWarps, 0x0, FortreeCity_MapBGEvents diff --git a/data/maps/FortreeCity/header.inc b/data/maps/FortreeCity/header.inc index eb04f8bcb..9a4c6b64c 100644 --- a/data/maps/FortreeCity/header.inc +++ b/data/maps/FortreeCity/header.inc @@ -5,10 +5,10 @@ FortreeCity:: @ 83054B8 .4byte FortreeCity_MapConnections .2byte MUS_MACHI_S3 .2byte 5 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 2 - .byte 2 + .byte WEATHER_SUNNY + .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_DecorationShop/events.inc b/data/maps/FortreeCity_DecorationShop/events.inc index 47e635fa8..307e0b520 100644 --- a/data/maps/FortreeCity_DecorationShop/events.inc +++ b/data/maps/FortreeCity_DecorationShop/events.inc @@ -1,8 +1,8 @@ FortreeCity_DecorationShop_EventObjects:: @ 83893E0 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 1, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_158258, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, 9, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158261, 0 - object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_15826A, 0 - object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, 8, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158298, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_DecorationShop_EventScript_158258, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158261, 0 + object_event 3, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_15826A, 0 + object_event 4, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_DecorationShop_EventScript_158298, 0 FortreeCity_DecorationShop_MapWarps:: @ 8389440 warp_def 3, 5, 0, 8, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_DecorationShop/header.inc b/data/maps/FortreeCity_DecorationShop/header.inc index 78b54e060..0f965f12f 100644 --- a/data/maps/FortreeCity_DecorationShop/header.inc +++ b/data/maps/FortreeCity_DecorationShop/header.inc @@ -5,10 +5,10 @@ FortreeCity_DecorationShop:: @ 8306504 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 256 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_Gym/events.inc b/data/maps/FortreeCity_Gym/events.inc index 9ff31951b..d6728885d 100644 --- a/data/maps/FortreeCity_Gym/events.inc +++ b/data/maps/FortreeCity_Gym/events.inc @@ -1,18 +1,18 @@ FortreeCity_Gym_EventObjects:: @ 8389018 - object_event 1, EVENT_OBJ_GFX_WINONA, 0, 4, 1, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157EF0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 12, 22, 3, 7, 0, 0, 1, 3, FortreeCity_Gym_EventScript_157F62, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 9, 9, 3, 8, 0, 0, 1, 3, FortreeCity_Gym_EventScript_157F90, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 18, 19, 3, 9, 0, 0, 1, 4, FortreeCity_Gym_EventScript_157FA7, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 18, 1, 3, 8, 0, 0, 1, 1, FortreeCity_Gym_EventScript_157F79, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 2, 19, 3, 8, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157FBE, 0 + object_event 1, EVENT_OBJ_GFX_WINONA, 0, 4, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157EF0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 12, 22, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, FortreeCity_Gym_EventScript_157F62, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 9, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, FortreeCity_Gym_EventScript_157F90, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 18, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, FortreeCity_Gym_EventScript_157FA7, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 18, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, FortreeCity_Gym_EventScript_157F79, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 2, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_Gym_EventScript_157FBE, 0 FortreeCity_Gym_MapWarps:: @ 83890A8 warp_def 2, 24, 0, 2, MAP_FORTREE_CITY warp_def 3, 24, 0, 2, MAP_FORTREE_CITY FortreeCity_Gym_MapBGEvents:: @ 83890B8 - bg_event 1, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FDD - bg_event 4, 21, 0, 1, 0, FortreeCity_Gym_EventScript_157FED + bg_event 1, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_157FDD + bg_event 4, 21, 0, BG_EVENT_PLAYER_FACING_NORTH, FortreeCity_Gym_EventScript_157FED FortreeCity_Gym_MapEvents:: @ 83890D0 map_events FortreeCity_Gym_EventObjects, FortreeCity_Gym_MapWarps, 0x0, FortreeCity_Gym_MapBGEvents diff --git a/data/maps/FortreeCity_Gym/header.inc b/data/maps/FortreeCity_Gym/header.inc index 9ecaef8b4..58fd694ba 100644 --- a/data/maps/FortreeCity_Gym/header.inc +++ b/data/maps/FortreeCity_Gym/header.inc @@ -5,10 +5,10 @@ FortreeCity_Gym:: @ 8306424 .4byte 0x0 .2byte MUS_GIM .2byte 100 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index c0de6bfee..3a814a4b7 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -16,7 +16,7 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC end FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 - trainerbattle 1, OPPONENT_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 + trainerbattle 1, TRAINER_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_157F3E msgbox FortreeCity_Gym_Text_185F98, 4 release @@ -44,22 +44,22 @@ FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E end FortreeCity_Gym_EventScript_157F62:: @ 8157F62 - trainerbattle 0, OPPONENT_JARED, 0, FortreeCity_Gym_Text_1859B9, FortreeCity_Gym_Text_1859EA + trainerbattle 0, TRAINER_JARED, 0, FortreeCity_Gym_Text_1859B9, FortreeCity_Gym_Text_1859EA msgbox FortreeCity_Gym_Text_185A02, 6 end FortreeCity_Gym_EventScript_157F79:: @ 8157F79 - trainerbattle 0, OPPONENT_WILL, 0, FortreeCity_Gym_Text_185A7F, FortreeCity_Gym_Text_185AEC + trainerbattle 0, TRAINER_WILL, 0, FortreeCity_Gym_Text_185A7F, FortreeCity_Gym_Text_185AEC msgbox FortreeCity_Gym_Text_185B18, 6 end FortreeCity_Gym_EventScript_157F90:: @ 8157F90 - trainerbattle 0, OPPONENT_TERRELL, 0, FortreeCity_Gym_Text_185B8D, FortreeCity_Gym_Text_185BEB + trainerbattle 0, TRAINER_TERRELL, 0, FortreeCity_Gym_Text_185B8D, FortreeCity_Gym_Text_185BEB msgbox FortreeCity_Gym_Text_185C00, 6 end FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7 - trainerbattle 0, OPPONENT_KYLEE, 0, FortreeCity_Gym_Text_185C45, FortreeCity_Gym_Text_185C7C + trainerbattle 0, TRAINER_KYLEE, 0, FortreeCity_Gym_Text_185C45, FortreeCity_Gym_Text_185C7C msgbox FortreeCity_Gym_Text_185C8C, 6 end diff --git a/data/maps/FortreeCity_House1/events.inc b/data/maps/FortreeCity_House1/events.inc index 5e91f873e..96384694f 100644 --- a/data/maps/FortreeCity_House1/events.inc +++ b/data/maps/FortreeCity_House1/events.inc @@ -1,7 +1,7 @@ FortreeCity_House1_EventObjects:: @ 8388FAC - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House1_EventScript_157E13, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 2, 3, 3, 9, 0, 0, 0, 0, FortreeCity_House1_EventScript_157EC0, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 4, 3, 1, 1, 1, 0, 0, FortreeCity_House1_EventScript_157EB7, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House1_EventScript_157E13, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, FortreeCity_House1_EventScript_157EC0, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, FortreeCity_House1_EventScript_157EB7, 0 FortreeCity_House1_MapWarps:: @ 8388FF4 warp_def 3, 5, 0, 1, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House1/header.inc b/data/maps/FortreeCity_House1/header.inc index 79d0466d7..7c2adaebb 100644 --- a/data/maps/FortreeCity_House1/header.inc +++ b/data/maps/FortreeCity_House1/header.inc @@ -5,10 +5,10 @@ FortreeCity_House1:: @ 8306408 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 99 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House2/events.inc b/data/maps/FortreeCity_House2/events.inc index 41d8962fe..e4e46df46 100644 --- a/data/maps/FortreeCity_House2/events.inc +++ b/data/maps/FortreeCity_House2/events.inc @@ -1,5 +1,5 @@ FortreeCity_House2_EventObjects:: @ 8389278 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 3, 3, 5, 1, 0, 0, 0, FortreeCity_House2_EventScript_1580B4, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, FortreeCity_House2_EventScript_1580B4, 0 FortreeCity_House2_MapWarps:: @ 8389290 warp_def 3, 5, 0, 4, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House2/header.inc b/data/maps/FortreeCity_House2/header.inc index 44447c390..df45e02e2 100644 --- a/data/maps/FortreeCity_House2/header.inc +++ b/data/maps/FortreeCity_House2/header.inc @@ -5,10 +5,10 @@ FortreeCity_House2:: @ 8306494 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 101 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House3/events.inc b/data/maps/FortreeCity_House3/events.inc index e02749d0e..d153b4bf8 100644 --- a/data/maps/FortreeCity_House3/events.inc +++ b/data/maps/FortreeCity_House3/events.inc @@ -1,6 +1,6 @@ FortreeCity_House3_EventObjects:: @ 83892B4 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, 10, 0, 0, 0, 0, FortreeCity_House3_EventScript_15816C, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, 2, 1, 1, 0, 0, FortreeCity_House3_EventScript_158175, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House3_EventScript_15816C, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House3_EventScript_158175, 0 FortreeCity_House3_MapWarps:: @ 83892E4 warp_def 3, 5, 0, 5, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House3/header.inc b/data/maps/FortreeCity_House3/header.inc index aa77bbf4e..c41ac93ef 100644 --- a/data/maps/FortreeCity_House3/header.inc +++ b/data/maps/FortreeCity_House3/header.inc @@ -5,10 +5,10 @@ FortreeCity_House3:: @ 83064B0 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 99 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House4/events.inc b/data/maps/FortreeCity_House4/events.inc index 58285c7f4..c66397c83 100644 --- a/data/maps/FortreeCity_House4/events.inc +++ b/data/maps/FortreeCity_House4/events.inc @@ -1,7 +1,7 @@ FortreeCity_House4_EventObjects:: @ 8389308 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 2, 1, 1, 0, 0, FortreeCity_House4_EventScript_15817F, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_158188, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, FLAG_HIDE_WINGULL_FORTREE_HOUSE + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_House4_EventScript_15817F, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_158188, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House4_EventScript_15821E, FLAG_HIDE_WINGULL_FORTREE_HOUSE FortreeCity_House4_MapWarps:: @ 8389350 warp_def 3, 5, 0, 6, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House4/header.inc b/data/maps/FortreeCity_House4/header.inc index dcd41d274..7277a3a50 100644 --- a/data/maps/FortreeCity_House4/header.inc +++ b/data/maps/FortreeCity_House4/header.inc @@ -5,10 +5,10 @@ FortreeCity_House4:: @ 83064CC .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 101 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_House5/events.inc b/data/maps/FortreeCity_House5/events.inc index 93447f739..109cdc162 100644 --- a/data/maps/FortreeCity_House5/events.inc +++ b/data/maps/FortreeCity_House5/events.inc @@ -1,7 +1,7 @@ FortreeCity_House5_EventObjects:: @ 8389374 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, 20, 0, 0, 0, 0, FortreeCity_House5_EventScript_158232, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 6, 3, 3, 8, 0, 0, 0, 0, FortreeCity_House5_EventScript_158244, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, 0, FortreeCity_House5_EventScript_15823B, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_158232, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_House5_EventScript_158244, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_House5_EventScript_15823B, 0 FortreeCity_House5_MapWarps:: @ 83893BC warp_def 3, 5, 0, 7, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_House5/header.inc b/data/maps/FortreeCity_House5/header.inc index 98faa0aee..aaebd16f8 100644 --- a/data/maps/FortreeCity_House5/header.inc +++ b/data/maps/FortreeCity_House5/header.inc @@ -5,10 +5,10 @@ FortreeCity_House5:: @ 83064E8 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 99 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_Mart/events.inc b/data/maps/FortreeCity_Mart/events.inc index a9c48da93..344b70969 100644 --- a/data/maps/FortreeCity_Mart/events.inc +++ b/data/maps/FortreeCity_Mart/events.inc @@ -1,8 +1,8 @@ FortreeCity_Mart_EventObjects:: @ 83891F4 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158067, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 3, 3, 7, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158098, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, 2, 1, 1, 0, 0, FortreeCity_Mart_EventScript_1580A1, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, 10, 1, 1, 0, 0, FortreeCity_Mart_EventScript_1580AA, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158067, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, FortreeCity_Mart_EventScript_158098, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, FortreeCity_Mart_EventScript_1580A1, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, FortreeCity_Mart_EventScript_1580AA, 0 FortreeCity_Mart_MapWarps:: @ 8389254 warp_def 3, 7, 0, 3, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_Mart/header.inc b/data/maps/FortreeCity_Mart/header.inc index a43cd9466..844355731 100644 --- a/data/maps/FortreeCity_Mart/header.inc +++ b/data/maps/FortreeCity_Mart/header.inc @@ -5,10 +5,10 @@ FortreeCity_Mart:: @ 8306478 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_PokemonCenter_1F/events.inc b/data/maps/FortreeCity_PokemonCenter_1F/events.inc index dcf0e088a..b9aa0b6d2 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/events.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ FortreeCity_PokemonCenter_1F_EventObjects:: @ 83890E4 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15801B, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158029, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 3, 1, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158032, 0 - object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, 8, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15803B, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15801B, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158029, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 8, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_158032, 0 + object_event 4, EVENT_OBJ_GFX_BOY_3, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, FortreeCity_PokemonCenter_1F_EventScript_15803B, 0 FortreeCity_PokemonCenter_1F_MapWarps:: @ 8389144 warp_def 7, 8, 3, 0, MAP_FORTREE_CITY diff --git a/data/maps/FortreeCity_PokemonCenter_1F/header.inc b/data/maps/FortreeCity_PokemonCenter_1F/header.inc index 97c8403b2..35b871240 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/header.inc @@ -5,10 +5,10 @@ FortreeCity_PokemonCenter_1F:: @ 8306440 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc index 6d847d7cc..999541b31 100644 --- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 8158011 .byte 0 FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 - setrespawn 7 + setrespawn HEAL_LOCATION_FORTREE_CITY end FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B diff --git a/data/maps/FortreeCity_PokemonCenter_2F/events.inc b/data/maps/FortreeCity_PokemonCenter_2F/events.inc index 2e410c319..450a9fd27 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/events.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ FortreeCity_PokemonCenter_2F_EventObjects:: @ 8389170 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158054, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_15805A, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158060, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158054, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_15805A, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, FortreeCity_PokemonCenter_2F_EventScript_158060, 0 FortreeCity_PokemonCenter_2F_MapWarps:: @ 83891B8 warp_def 1, 5, 4, 2, MAP_FORTREE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/FortreeCity_PokemonCenter_2F/header.inc b/data/maps/FortreeCity_PokemonCenter_2F/header.inc index 57e8510b8..4b7a601ed 100644 --- a/data/maps/FortreeCity_PokemonCenter_2F/header.inc +++ b/data/maps/FortreeCity_PokemonCenter_2F/header.inc @@ -5,10 +5,10 @@ FortreeCity_PokemonCenter_2F:: @ 830645C .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 11 + .byte MAPSEC_FORTREE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_1F/events.inc b/data/maps/GraniteCave_1F/events.inc index 20ea8d4d5..67cdbae15 100644 --- a/data/maps/GraniteCave_1F/events.inc +++ b/data/maps/GraniteCave_1F/events.inc @@ -1,6 +1,6 @@ GraniteCave_1F_EventObjects:: @ 838BF24 - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, 1, 0, 0, 0, 0, GraniteCave_1F_EventScript_15CBA7, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, 8, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, FLAG_ITEM_GRANITE_CAVE_1F_1 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 36, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_1F_EventScript_15CBA7, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, GraniteCave_1F_EventScript_1B17A0, FLAG_ITEM_GRANITE_CAVE_1F_1 GraniteCave_1F_MapWarps:: @ 838BF54 warp_def 37, 12, 3, 0, MAP_ROUTE106 diff --git a/data/maps/GraniteCave_1F/header.inc b/data/maps/GraniteCave_1F/header.inc index b3682961a..b94051123 100644 --- a/data/maps/GraniteCave_1F/header.inc +++ b/data/maps/GraniteCave_1F/header.inc @@ -5,10 +5,10 @@ GraniteCave_1F:: @ 8306E34 .4byte 0x0 .2byte MUS_DAN01 .2byte 133 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_B1F/events.inc b/data/maps/GraniteCave_B1F/events.inc index 3d148a922..7516f579e 100644 --- a/data/maps/GraniteCave_B1F/events.inc +++ b/data/maps/GraniteCave_B1F/events.inc @@ -1,5 +1,5 @@ GraniteCave_B1F_EventObjects:: @ 838BF88 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, 1, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, FLAG_ITEM_GRANITE_CAVE_B1F_1 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 15, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B1F_EventScript_1B17AD, FLAG_ITEM_GRANITE_CAVE_B1F_1 GraniteCave_B1F_MapWarps:: @ 838BFA0 warp_def 25, 13, 3, 1, MAP_GRANITE_CAVE_1F diff --git a/data/maps/GraniteCave_B1F/header.inc b/data/maps/GraniteCave_B1F/header.inc index 80af713ad..5673b1fdc 100644 --- a/data/maps/GraniteCave_B1F/header.inc +++ b/data/maps/GraniteCave_B1F/header.inc @@ -5,10 +5,10 @@ GraniteCave_B1F:: @ 8306E50 .4byte 0x0 .2byte MUS_DAN01 .2byte 134 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 1 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_B2F/events.inc b/data/maps/GraniteCave_B2F/events.inc index e5c7b1768..7f85264a3 100644 --- a/data/maps/GraniteCave_B2F/events.inc +++ b/data/maps/GraniteCave_B2F/events.inc @@ -1,13 +1,13 @@ GraniteCave_B2F_EventObjects:: @ 838BFEC - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, FLAG_ITEM_GRANITE_CAVE_B2F_1 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, 1, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, FLAG_ITEM_GRANITE_CAVE_B2F_2 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_17 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17BA, FLAG_ITEM_GRANITE_CAVE_B2F_1 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_B2F_EventScript_1B17C7, FLAG_ITEM_GRANITE_CAVE_B2F_2 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 6, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_17 GraniteCave_B2F_MapWarps:: @ 838C0C4 warp_def 29, 13, 3, 2, MAP_GRANITE_CAVE_B1F diff --git a/data/maps/GraniteCave_B2F/header.inc b/data/maps/GraniteCave_B2F/header.inc index 9b3dc1610..240ff2dc0 100644 --- a/data/maps/GraniteCave_B2F/header.inc +++ b/data/maps/GraniteCave_B2F/header.inc @@ -5,10 +5,10 @@ GraniteCave_B2F:: @ 8306E6C .4byte 0x0 .2byte MUS_DAN01 .2byte 135 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 1 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/GraniteCave_StevensRoom/events.inc b/data/maps/GraniteCave_StevensRoom/events.inc index 9d8f4b2ba..06ea7e6fd 100644 --- a/data/maps/GraniteCave_StevensRoom/events.inc +++ b/data/maps/GraniteCave_StevensRoom/events.inc @@ -1,5 +1,5 @@ GraniteCave_StevensRoom_EventObjects:: @ 838C118 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, 1, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, FLAG_HIDE_STEVEN_GRANITE_CAVE + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 7, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, GraniteCave_StevensRoom_EventScript_15CBFA, FLAG_HIDE_STEVEN_GRANITE_CAVE GraniteCave_StevensRoom_MapWarps:: @ 838C130 warp_def 7, 3, 3, 3, MAP_GRANITE_CAVE_1F diff --git a/data/maps/GraniteCave_StevensRoom/header.inc b/data/maps/GraniteCave_StevensRoom/header.inc index da9664943..66fcf26af 100644 --- a/data/maps/GraniteCave_StevensRoom/header.inc +++ b/data/maps/GraniteCave_StevensRoom/header.inc @@ -5,10 +5,10 @@ GraniteCave_StevensRoom:: @ 8306E88 .4byte 0x0 .2byte MUS_DAN01 .2byte 289 - .byte 55 + .byte MAPSEC_GRANITE_CAVE .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/InsideOfTruck/events.inc b/data/maps/InsideOfTruck/events.inc index 3aa3036de..7000e2927 100644 --- a/data/maps/InsideOfTruck/events.inc +++ b/data/maps/InsideOfTruck/events.inc @@ -1,7 +1,7 @@ InsideOfTruck_EventObjects:: @ 8391618 - object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0 - object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0 - object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, 8, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0 + object_event 1, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 0, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0 + object_event 2, EVENT_OBJ_GFX_MOVING_BOX, 0, 0, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0 + object_event 3, EVENT_OBJ_GFX_MOVING_BOX, 0, 2, 3, 8, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B, 0 InsideOfTruck_MapWarps:: @ 8391660 warp_def 4, 1, 0, 127, MAP_NONE @@ -9,16 +9,16 @@ InsideOfTruck_MapWarps:: @ 8391660 warp_def 4, 3, 0, 127, MAP_NONE InsideOfTruck_MapCoordEvents:: @ 8391678 - coord_event 3, 1, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 - coord_event 3, 2, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 - coord_event 3, 3, 3, 0, VAR_LITTLEROOT_INTRO_STATE, 0, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 1, 3, VAR_LITTLEROOT_INTRO_STATE, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 2, 3, VAR_LITTLEROOT_INTRO_STATE, 0, InsideOfTruck_EventScript_15FC29 + coord_event 3, 3, 3, VAR_LITTLEROOT_INTRO_STATE, 0, InsideOfTruck_EventScript_15FC29 InsideOfTruck_MapBGEvents:: @ 83916A8 - bg_event 1, 0, 0, 0, 0, InsideOfTruck_EventScript_15FC8B - bg_event 3, 4, 0, 0, 0, InsideOfTruck_EventScript_15FC8B - bg_event 2, 3, 0, 0, 0, InsideOfTruck_EventScript_15FC8B - bg_event 0, 1, 0, 0, 0, InsideOfTruck_EventScript_15FC8B - bg_event 0, 2, 0, 0, 0, InsideOfTruck_EventScript_15FC8B + bg_event 1, 0, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_15FC8B + bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_15FC8B + bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_15FC8B + bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_15FC8B + bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, InsideOfTruck_EventScript_15FC8B InsideOfTruck_MapEvents:: @ 83916E4 map_events InsideOfTruck_EventObjects, InsideOfTruck_MapWarps, InsideOfTruck_MapCoordEvents, InsideOfTruck_MapBGEvents diff --git a/data/maps/InsideOfTruck/header.inc b/data/maps/InsideOfTruck/header.inc index b406937ca..2c2135be5 100644 --- a/data/maps/InsideOfTruck/header.inc +++ b/data/maps/InsideOfTruck/header.inc @@ -5,10 +5,10 @@ InsideOfTruck:: @ 8307B38 .4byte 0x0 .2byte SE_STOP .2byte 238 - .byte 84 + .byte MAPSEC_INSIDE_OF_TRUCK .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc index 37fa85041..b2617c8f7 100644 --- a/data/maps/InsideOfTruck/scripts.inc +++ b/data/maps/InsideOfTruck/scripts.inc @@ -24,7 +24,7 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 end InsideOfTruck_EventScript_15FC45:: @ 815FC45 - setrespawn 1 + setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F setvar VAR_LITTLEROOT_INTRO_STATE, 1 setflag FLAG_HIDE_MAY_MOM_DOWNSTAIRS setflag FLAG_HIDE_MOVING_TRUCK_MAY @@ -36,7 +36,7 @@ InsideOfTruck_EventScript_15FC45:: @ 815FC45 end InsideOfTruck_EventScript_15FC68:: @ 815FC68 - setrespawn 2 + setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F setvar VAR_LITTLEROOT_INTRO_STATE, 2 setflag FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN diff --git a/data/maps/IslandCave/events.inc b/data/maps/IslandCave/events.inc index 8c279596d..6ef74d72d 100644 --- a/data/maps/IslandCave/events.inc +++ b/data/maps/IslandCave/events.inc @@ -1,5 +1,5 @@ IslandCave_EventObjects:: @ 838E674 - object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, 8, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, FLAG_HIDE_REGICE + object_event 1, EVENT_OBJ_GFX_REGICE, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, IslandCave_EventScript_15EF9D, FLAG_HIDE_REGICE IslandCave_MapWarps:: @ 838E68C warp_def 8, 29, 3, 0, MAP_ROUTE105 @@ -7,9 +7,9 @@ IslandCave_MapWarps:: @ 838E68C warp_def 8, 11, 3, 1, MAP_ISLAND_CAVE IslandCave_MapBGEvents:: @ 838E6A4 - bg_event 8, 20, 0, 0, 0, IslandCave_EventScript_15EF59 - bg_event 7, 20, 0, 0, 0, IslandCave_EventScript_15EF7C - bg_event 9, 20, 0, 0, 0, IslandCave_EventScript_15EF7C + bg_event 8, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_15EF59 + bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_15EF7C + bg_event 9, 20, 0, BG_EVENT_PLAYER_FACING_ANY, IslandCave_EventScript_15EF7C IslandCave_MapEvents:: @ 838E6C8 map_events IslandCave_EventObjects, IslandCave_MapWarps, 0x0, IslandCave_MapBGEvents diff --git a/data/maps/IslandCave/header.inc b/data/maps/IslandCave/header.inc index 70b8a62c6..4630a79aa 100644 --- a/data/maps/IslandCave/header.inc +++ b/data/maps/IslandCave/header.inc @@ -5,10 +5,10 @@ IslandCave:: @ 83074C4 .4byte 0x0 .2byte MUS_MABOROSI .2byte 281 - .byte 81 + .byte MAPSEC_ISLAND_CAVE .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/JaggedPass/events.inc b/data/maps/JaggedPass/events.inc index 4b656e76e..f4c2fa515 100644 --- a/data/maps/JaggedPass/events.inc +++ b/data/maps/JaggedPass/events.inc @@ -1,8 +1,8 @@ JaggedPass_EventObjects:: @ 838C61C - object_event 1, EVENT_OBJ_GFX_HIKER, 0, 8, 18, 3, 8, 0, 0, 1, 3, JaggedPass_EventScript_15D285, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 22, 3, 14, 0, 0, 1, 2, JaggedPass_EventScript_15D2DA, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, 1, 0, 0, 0, 0, JaggedPass_EventScript_1B17D4, FLAG_ITEM_JAGGED_PASS_1 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 35, 3, 15, 1, 1, 1, 3, JaggedPass_EventScript_15D29C, 0 + object_event 1, EVENT_OBJ_GFX_HIKER, 0, 8, 18, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, JaggedPass_EventScript_15D285, 0 + object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 16, 22, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, JaggedPass_EventScript_15D2DA, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 24, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, JaggedPass_EventScript_1B17D4, FLAG_ITEM_JAGGED_PASS_1 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 13, 35, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, JaggedPass_EventScript_15D29C, 0 JaggedPass_MapWarps:: @ 838C67C warp_def 14, 40, 3, 2, MAP_ROUTE112 diff --git a/data/maps/JaggedPass/header.inc b/data/maps/JaggedPass/header.inc index cb9b61bb3..8f4d866ce 100644 --- a/data/maps/JaggedPass/header.inc +++ b/data/maps/JaggedPass/header.inc @@ -5,10 +5,10 @@ JaggedPass:: @ 8306EDC .4byte 0x0 .2byte MUS_DAN01 .2byte 293 - .byte 76 + .byte MAPSEC_JAGGED_PASS .byte 0 - .byte 0 - .byte 3 + .byte WEATHER_NONE + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index d75420e88..96ad4a0aa 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -18,12 +18,12 @@ JaggedPass_EventScript_15D280:: @ 815D280 return JaggedPass_EventScript_15D285:: @ 815D285 - trainerbattle 0, OPPONENT_ERIC, 0, JaggedPass_Text_195DAC, JaggedPass_Text_195E27 + trainerbattle 0, TRAINER_ERIC, 0, JaggedPass_Text_195DAC, JaggedPass_Text_195E27 msgbox JaggedPass_Text_195E3E, 6 end JaggedPass_EventScript_15D29C:: @ 815D29C - trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF + trainerbattle 0, TRAINER_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D2C3 @@ -31,12 +31,12 @@ JaggedPass_EventScript_15D29C:: @ 815D29C end JaggedPass_EventScript_15D2C3:: @ 815D2C3 - trainerbattle 5, OPPONENT_DIANA_1, 0, JaggedPass_Text_195F58, JaggedPass_Text_195F8C + trainerbattle 5, TRAINER_DIANA_1, 0, JaggedPass_Text_195F58, JaggedPass_Text_195F8C msgbox JaggedPass_Text_195FB9, 6 end JaggedPass_EventScript_15D2DA:: @ 815D2DA - trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 + trainerbattle 0, TRAINER_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D301 @@ -44,6 +44,6 @@ JaggedPass_EventScript_15D2DA:: @ 815D2DA end JaggedPass_EventScript_15D301:: @ 815D301 - trainerbattle 5, OPPONENT_ETHAN_1, 0, JaggedPass_Text_1960AA, JaggedPass_Text_1960E2 + trainerbattle 5, TRAINER_ETHAN_1, 0, JaggedPass_Text_1960AA, JaggedPass_Text_1960E2 msgbox JaggedPass_Text_196118, 6 end diff --git a/data/maps/LavaridgeTown/events.inc b/data/maps/LavaridgeTown/events.inc index 895c792f4..90dfa5417 100644 --- a/data/maps/LavaridgeTown/events.inc +++ b/data/maps/LavaridgeTown/events.inc @@ -1,13 +1,13 @@ LavaridgeTown_EventObjects:: @ 8380C78 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 7, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E751, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 1, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E724, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 8, 3, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E72D, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 13, 3, 3, 0, 2, 0, 0, LavaridgeTown_EventScript_14E736, 0 - object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, 18, 0, 0, 0, 0, LavaridgeTown_EventScript_14E73F, 0 - object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, 17, 0, 0, 0, 0, LavaridgeTown_EventScript_14E748, 0 - object_event 7, EVENT_OBJ_GFX_VAR_3, 0, 6, 16, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_LAVARIDGE_2 - object_event 8, EVENT_OBJ_GFX_VAR_0, 0, 12, 15, 0, 8, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, FLAG_HIDE_RIVAL_LAVARIDGE_1 - object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 7, 3, 8, 1, 1, 0, 0, LavaridgeTown_EventScript_14E75A, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_14E751, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_14E724, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_14E72D, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 10, 13, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, LavaridgeTown_EventScript_14E736, 0 + object_event 5, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, LavaridgeTown_EventScript_14E73F, 0 + object_event 6, EVENT_OBJ_GFX_HOT_SPRINGS_OLD_WOMAN, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 0, 0, LavaridgeTown_EventScript_14E748, 0 + object_event 7, EVENT_OBJ_GFX_VAR_3, 0, 6, 16, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_LAVARIDGE_2 + object_event 8, EVENT_OBJ_GFX_VAR_0, 0, 12, 15, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_EventScript_14E575, FLAG_HIDE_RIVAL_LAVARIDGE_1 + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LavaridgeTown_EventScript_14E75A, 0 LavaridgeTown_MapWarps:: @ 8380D50 warp_def 12, 15, 0, 0, MAP_LAVARIDGE_TOWN_HERB_SHOP @@ -18,16 +18,16 @@ LavaridgeTown_MapWarps:: @ 8380D50 warp_def 9, 2, 3, 3, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F LavaridgeTown_MapCoordEvents:: @ 8380D80 - coord_event 6, 3, 3, 0, 0, 0, 0, LavaridgeTown_EventScript_14E710 + coord_event 6, 3, 3, 0, 0, LavaridgeTown_EventScript_14E710 LavaridgeTown_MapBGEvents:: @ 8380D90 - bg_event 14, 16, 0, 0, 0, LavaridgeTown_EventScript_14E7D7 - bg_event 7, 15, 0, 0, 0, LavaridgeTown_EventScript_14E7C5 - bg_event 17, 5, 0, 1, 0, LavaridgeTown_EventScript_1A00E1 - bg_event 13, 8, 0, 0, 0, LavaridgeTown_EventScript_14E7BC - bg_event 10, 6, 0, 1, 0, LavaridgeTown_EventScript_1A00EA - bg_event 16, 5, 0, 1, 0, LavaridgeTown_EventScript_1A00E1 - bg_event 11, 6, 0, 1, 0, LavaridgeTown_EventScript_1A00EA + bg_event 14, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_14E7D7 + bg_event 7, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_14E7C5 + bg_event 17, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_1A00E1 + bg_event 13, 8, 0, BG_EVENT_PLAYER_FACING_ANY, LavaridgeTown_EventScript_14E7BC + bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_1A00EA + bg_event 16, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_1A00E1 + bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_EventScript_1A00EA bg_hidden_item_event 4, 5, 3, ITEM_ICE_HEAL, FLAG_HIDDEN_ITEM_0 LavaridgeTown_MapEvents:: @ 8380DF0 diff --git a/data/maps/LavaridgeTown/header.inc b/data/maps/LavaridgeTown/header.inc index 8e8eaaee6..4b798b26f 100644 --- a/data/maps/LavaridgeTown/header.inc +++ b/data/maps/LavaridgeTown/header.inc @@ -5,10 +5,10 @@ LavaridgeTown:: @ 8305598 .4byte LavaridgeTown_MapConnections .2byte MUS_MACHI_S4 .2byte 13 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 2 - .byte 1 + .byte WEATHER_SUNNY + .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_Gym_1F/events.inc b/data/maps/LavaridgeTown_Gym_1F/events.inc index ed3cc738f..697fae482 100644 --- a/data/maps/LavaridgeTown_Gym_1F/events.inc +++ b/data/maps/LavaridgeTown_Gym_1F/events.inc @@ -1,11 +1,11 @@ LavaridgeTown_Gym_1F_EventObjects:: @ 838625C - object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 8, 10, 3, 8, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153741, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 10, 19, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1537CB, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 17, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_15383E, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 4, 12, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1537ED, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 0, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_153823, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 6, 23, 3, 10, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153859, 0 - object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 6, 2, 3, 8, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_153808, 0 + object_event 1, EVENT_OBJ_GFX_FLANNERY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153741, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 10, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1537CB, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_15383E, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_1537ED, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_3, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_153823, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 6, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Gym_1F_EventScript_153859, 0 + object_event 7, EVENT_OBJ_GFX_MAN_6, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 3, 1, LavaridgeTown_Gym_1F_EventScript_153808, 0 LavaridgeTown_Gym_1F_MapWarps:: @ 8386304 warp_def 8, 23, 3, 1, MAP_LAVARIDGE_TOWN @@ -32,8 +32,8 @@ LavaridgeTown_Gym_1F_MapWarps:: @ 8386304 warp_def 10, 6, 3, 19, MAP_LAVARIDGE_TOWN_GYM_B1F LavaridgeTown_Gym_1F_MapBGEvents:: @ 83863B4 - bg_event 6, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153878 - bg_event 10, 17, 0, 1, 0, LavaridgeTown_Gym_1F_EventScript_153888 + bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_153878 + bg_event 10, 17, 0, BG_EVENT_PLAYER_FACING_NORTH, LavaridgeTown_Gym_1F_EventScript_153888 LavaridgeTown_Gym_1F_MapEvents:: @ 83863CC map_events LavaridgeTown_Gym_1F_EventObjects, LavaridgeTown_Gym_1F_MapWarps, 0x0, LavaridgeTown_Gym_1F_MapBGEvents diff --git a/data/maps/LavaridgeTown_Gym_1F/header.inc b/data/maps/LavaridgeTown_Gym_1F/header.inc index 05c0b2dbc..609808f0f 100644 --- a/data/maps/LavaridgeTown_Gym_1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_1F/header.inc @@ -5,10 +5,10 @@ LavaridgeTown_Gym_1F:: @ 8305C0C .4byte 0x0 .2byte MUS_GIM .2byte 69 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 6 - .byte 8 + .byte WEATHER_FOG_1 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index 27655127a..3f5f9a285 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -13,53 +13,53 @@ LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F setvar VAR_TEMP_D, 0 setvar VAR_TEMP_E, 0 setvar VAR_TEMP_F, 0 - goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6 + goto_if_trainer_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6 setvar VAR_TEMP_B, 1 LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6 - goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4 + goto_if_trainer_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4 setvar VAR_TEMP_C, 1 LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4 - goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2 + goto_if_trainer_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2 setvar VAR_TEMP_D, 1 LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2 - goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0 + goto_if_trainer_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0 setvar VAR_TEMP_E, 1 LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0 - goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE + goto_if_trainer_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE setvar VAR_TEMP_F, 1 LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE return LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF - goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_15370C + goto_if_trainer_defeated TRAINER_COLE, LavaridgeTown_Gym_1F_EventScript_15370C setobjectmovementtype 2, 63 LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C - goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_153719 + goto_if_trainer_defeated TRAINER_ZANE, LavaridgeTown_Gym_1F_EventScript_153719 setobjectmovementtype 3, 63 LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719 - goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_153726 + goto_if_trainer_defeated TRAINER_AXLE, LavaridgeTown_Gym_1F_EventScript_153726 setobjectmovementtype 4, 63 LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726 - goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_153733 + goto_if_trainer_defeated TRAINER_SADIE, LavaridgeTown_Gym_1F_EventScript_153733 setobjectmovementtype 5, 63 LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733 - goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_153740 + goto_if_trainer_defeated TRAINER_ANDY, LavaridgeTown_Gym_1F_EventScript_153740 setobjectmovementtype 7, 63 LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 return LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 - trainerbattle 1, OPPONENT_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 + trainerbattle 1, TRAINER_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_1537A7 msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4 release @@ -92,7 +92,7 @@ LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 end LavaridgeTown_Gym_1F_EventScript_1537CB:: @ 81537CB - trainerbattle 2, OPPONENT_COLE, 2, LavaridgeTown_Gym_1F_Text_176432, LavaridgeTown_Gym_1F_Text_17644F, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_COLE, 2, LavaridgeTown_Gym_1F_Text_176432, LavaridgeTown_Gym_1F_Text_17644F, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_176472, 6 end @@ -102,22 +102,22 @@ LavaridgeTown_Gym_1F_EventScript_1537E6:: @ 81537E6 end LavaridgeTown_Gym_1F_EventScript_1537ED:: @ 81537ED - trainerbattle 2, OPPONENT_AXLE, 4, LavaridgeTown_Gym_1F_Text_1764D1, LavaridgeTown_Gym_1F_Text_176516, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_AXLE, 4, LavaridgeTown_Gym_1F_Text_1764D1, LavaridgeTown_Gym_1F_Text_176516, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_176537, 6 end LavaridgeTown_Gym_1F_EventScript_153808:: @ 8153808 - trainerbattle 2, OPPONENT_ANDY, 7, LavaridgeTown_Gym_1F_Text_17658D, LavaridgeTown_Gym_1F_Text_17663F, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_ANDY, 7, LavaridgeTown_Gym_1F_Text_17658D, LavaridgeTown_Gym_1F_Text_17663F, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_176660, 6 end LavaridgeTown_Gym_1F_EventScript_153823:: @ 8153823 - trainerbattle 2, OPPONENT_SADIE, 5, LavaridgeTown_Gym_1F_Text_176784, LavaridgeTown_Gym_1F_Text_1767A6, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_SADIE, 5, LavaridgeTown_Gym_1F_Text_176784, LavaridgeTown_Gym_1F_Text_1767A6, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_1767C1, 6 end LavaridgeTown_Gym_1F_EventScript_15383E:: @ 815383E - trainerbattle 2, OPPONENT_ZANE, 3, LavaridgeTown_Gym_1F_Text_1766D2, LavaridgeTown_Gym_1F_Text_1766FE, LavaridgeTown_Gym_1F_EventScript_1537E6 + trainerbattle 2, TRAINER_ZANE, 3, LavaridgeTown_Gym_1F_Text_1766D2, LavaridgeTown_Gym_1F_Text_1766FE, LavaridgeTown_Gym_1F_EventScript_1537E6 msgbox LavaridgeTown_Gym_1F_Text_17671D, 6 end diff --git a/data/maps/LavaridgeTown_Gym_B1F/header.inc b/data/maps/LavaridgeTown_Gym_B1F/header.inc index 0ae5a8634..df8d98e11 100644 --- a/data/maps/LavaridgeTown_Gym_B1F/header.inc +++ b/data/maps/LavaridgeTown_Gym_B1F/header.inc @@ -5,10 +5,10 @@ LavaridgeTown_Gym_B1F:: @ 8305C28 .4byte 0x0 .2byte MUS_GIM .2byte 70 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 6 - .byte 8 + .byte WEATHER_FOG_1 + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/LavaridgeTown_HerbShop/events.inc b/data/maps/LavaridgeTown_HerbShop/events.inc index 0e2c546b6..30aa9a965 100644 --- a/data/maps/LavaridgeTown_HerbShop/events.inc +++ b/data/maps/LavaridgeTown_HerbShop/events.inc @@ -1,7 +1,7 @@ LavaridgeTown_HerbShop_EventObjects:: @ 83861F0 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_153629, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 7, 5, 3, 1, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_153655, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 3, 5, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_15364C, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_HerbShop_EventScript_153629, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_153655, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, LavaridgeTown_HerbShop_EventScript_15364C, 0 LavaridgeTown_HerbShop_MapWarps:: @ 8386238 warp_def 3, 7, 0, 0, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_HerbShop/header.inc b/data/maps/LavaridgeTown_HerbShop/header.inc index 8ab9e4807..a65cc4358 100644 --- a/data/maps/LavaridgeTown_HerbShop/header.inc +++ b/data/maps/LavaridgeTown_HerbShop/header.inc @@ -5,10 +5,10 @@ LavaridgeTown_HerbShop:: @ 8305BF0 .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 68 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_House/events.inc b/data/maps/LavaridgeTown_House/events.inc index 90e33480c..d3d4fe6ac 100644 --- a/data/maps/LavaridgeTown_House/events.inc +++ b/data/maps/LavaridgeTown_House/events.inc @@ -1,6 +1,6 @@ LavaridgeTown_House_EventObjects:: @ 8386494 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 2, 3, 3, 1, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1538AE, 0 - object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 6, 6, 3, 1, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1538B7, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1538AE, 0 + object_event 2, EVENT_OBJ_GFX_ZIGZAGOON, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LavaridgeTown_House_EventScript_1538B7, 0 LavaridgeTown_House_MapWarps:: @ 83864C4 warp_def 3, 7, 0, 4, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_House/header.inc b/data/maps/LavaridgeTown_House/header.inc index 5b85bcbac..15dd76303 100644 --- a/data/maps/LavaridgeTown_House/header.inc +++ b/data/maps/LavaridgeTown_House/header.inc @@ -5,10 +5,10 @@ LavaridgeTown_House:: @ 8305C44 .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 64 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_Mart/events.inc b/data/maps/LavaridgeTown_Mart/events.inc index 2d365da54..e0ea1e4a9 100644 --- a/data/maps/LavaridgeTown_Mart/events.inc +++ b/data/maps/LavaridgeTown_Mart/events.inc @@ -1,7 +1,7 @@ LavaridgeTown_Mart_EventObjects:: @ 83864E8 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538CB, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538FA, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 9, 5, 3, 10, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_153903, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538CB, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_1538FA, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_Mart_EventScript_153903, 0 LavaridgeTown_Mart_MapWarps:: @ 8386530 warp_def 3, 7, 0, 2, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_Mart/header.inc b/data/maps/LavaridgeTown_Mart/header.inc index 97c192d21..fa7d4c92a 100644 --- a/data/maps/LavaridgeTown_Mart/header.inc +++ b/data/maps/LavaridgeTown_Mart/header.inc @@ -5,10 +5,10 @@ LavaridgeTown_Mart:: @ 8305C60 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc index 98f670755..b76fc0b6b 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ LavaridgeTown_PokemonCenter_1F_EventObjects:: @ 8386554 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15391B, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, 7, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153929, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 0, 9, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153932, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, 10, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15393B, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15391B, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153929, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_153932, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_1F_EventScript_15393B, 0 LavaridgeTown_PokemonCenter_1F_MapWarps:: @ 83865B4 warp_def 7, 8, 3, 3, MAP_LAVARIDGE_TOWN diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc index 27bdfe3f2..921a7d90a 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/header.inc @@ -5,10 +5,10 @@ LavaridgeTown_PokemonCenter_1F:: @ 8305C7C .4byte 0x0 .2byte MUS_POKECEN .2byte 71 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc index 4e9c51380..611ced28f 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 815390C .byte 0 LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912 - setrespawn 16 + setrespawn HEAL_LOCATION_LAVARIDGE_TOWN call LavaridgeTown_PokemonCenter_1F_EventScript_19FD1B end diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc index 370feb889..2c1d4678a 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ LavaridgeTown_PokemonCenter_2F_EventObjects:: @ 83865E8 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153960, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153954, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_15395A, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153960, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_153954, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LavaridgeTown_PokemonCenter_2F_EventScript_15395A, 0 LavaridgeTown_PokemonCenter_2F_MapWarps:: @ 8386630 warp_def 1, 5, 4, 2, MAP_LAVARIDGE_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc index 096759809..34bfd1a08 100644 --- a/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc +++ b/data/maps/LavaridgeTown_PokemonCenter_2F/header.inc @@ -5,10 +5,10 @@ LavaridgeTown_PokemonCenter_2F:: @ 8305C98 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 3 + .byte MAPSEC_LAVARIDGE_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity/events.inc b/data/maps/LilycoveCity/events.inc index e2aa43d2d..fe3bd0516 100644 --- a/data/maps/LilycoveCity/events.inc +++ b/data/maps/LilycoveCity/events.inc @@ -1,21 +1,21 @@ LilycoveCity_EventObjects:: @ 838016C - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, 3, 0, 1, 0, 0, LilycoveCity_EventScript_14CBEF, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CBC7, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_14CBBE, 0 - object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 21, 15, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CBE6, 0 - object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, 5, 1, 0, 0, 0, LilycoveCity_EventScript_14CC2D, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 35, 27, 3, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CC0E, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 35, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_14CC36, 0 - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 34, 37, 5, 8, 0, 0, 0, 0, LilycoveCity_EventScript_14CC3F, 0 - object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 57, 17, 3, 1, 0, 0, 0, 0, LilycoveCity_EventScript_14CC48, 0 - object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 73, 15, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, 1, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, FLAG_ITEM_LILYCOVE_1 - object_event 12, EVENT_OBJ_GFX_VAR_1, 0, 43, 18, 3, 5, 1, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE - object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 46, 12, 3, 9, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE - object_event 14, EVENT_OBJ_GFX_VAR_1, 0, 45, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE - object_event 15, EVENT_OBJ_GFX_VAR_1, 0, 38, 9, 5, 9, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE - object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, 2, 1, 1, 0, 0, LilycoveCity_EventScript_14CB74, 0 - object_event 17, EVENT_OBJ_GFX_VAR_0, 0, 27, 7, 5, 8, 1, 1, 0, 0, LilycoveCity_EventScript_14CD46, FLAG_HIDE_RIVAL_LILYCOVE_MART + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 32, 20, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_EventScript_14CBEF, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_1, 0, 15, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_14CBC7, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 28, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_14CBBE, 0 + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 21, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_14CBE6, 0 + object_event 5, EVENT_OBJ_GFX_MAN_2, 0, 16, 9, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_14CC2D, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 35, 27, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_14CC0E, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 35, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_14CC36, 0 + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 34, 37, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_EventScript_14CC3F, 0 + object_event 9, EVENT_OBJ_GFX_OLD_MAN_1, 0, 57, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_14CC48, 0 + object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 73, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_14CCE5, FLAG_HIDE_GRUNTS_LILYCOVE + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 61, 36, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, LilycoveCity_EventScript_1B1738, FLAG_ITEM_LILYCOVE_1 + object_event 12, EVENT_OBJ_GFX_VAR_1, 0, 43, 18, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_EventScript_14CD3D, FLAG_HIDE_GRUNTS_LILYCOVE + object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 46, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_14CD22, FLAG_HIDE_GRUNTS_LILYCOVE + object_event 14, EVENT_OBJ_GFX_VAR_1, 0, 45, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_EventScript_14CD2B, FLAG_HIDE_GRUNTS_LILYCOVE + object_event 15, EVENT_OBJ_GFX_VAR_1, 0, 38, 9, 5, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_EventScript_14CD34, FLAG_HIDE_GRUNTS_LILYCOVE + object_event 16, EVENT_OBJ_GFX_GENTLEMAN, 0, 50, 7, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_EventScript_14CB74, 0 + object_event 17, EVENT_OBJ_GFX_VAR_0, 0, 27, 7, 5, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_EventScript_14CD46, FLAG_HIDE_RIVAL_LILYCOVE_MART LilycoveCity_MapWarps:: @ 8380304 warp_def 27, 6, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F @@ -35,16 +35,16 @@ LilycoveCity_MapWarps:: @ 8380304 warp_def 71, 5, 1, 0, MAP_MAGMA_HIDEOUT_1F LilycoveCity_MapBGEvents:: @ 838037C - bg_event 19, 7, 0, 0, 0, LilycoveCity_EventScript_14CC82 - bg_event 25, 14, 0, 1, 0, LilycoveCity_EventScript_1A00EA - bg_event 29, 7, 0, 0, 0, LilycoveCity_EventScript_14CCD3 - bg_event 26, 14, 0, 1, 0, LilycoveCity_EventScript_1A00EA - bg_event 6, 15, 0, 0, 0, LilycoveCity_EventScript_14CC67 - bg_event 29, 24, 0, 0, 0, LilycoveCity_EventScript_14CC70 - bg_event 35, 24, 0, 0, 0, LilycoveCity_EventScript_14CC79 - bg_event 6, 30, 3, 0, 0, LilycoveCity_EventScript_14CCAC - bg_event 36, 14, 0, 0, 0, LilycoveCity_EventScript_14CCCA - bg_event 34, 6, 0, 0, 0, LilycoveCity_EventScript_14CCDC + bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CC82 + bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_1A00EA + bg_event 29, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CCD3 + bg_event 26, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_EventScript_1A00EA + bg_event 6, 15, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CC67 + bg_event 29, 24, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CC70 + bg_event 35, 24, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CC79 + bg_event 6, 30, 3, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CCAC + bg_event 36, 14, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CCCA + bg_event 34, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_EventScript_14CCDC bg_hidden_item_event 36, 31, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_1B bg_hidden_item_event 61, 7, 0, ITEM_PP_UP, FLAG_HIDDEN_ITEM_2B bg_hidden_item_event 64, 31, 0, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_4B diff --git a/data/maps/LilycoveCity/header.inc b/data/maps/LilycoveCity/header.inc index 2c067668e..3eca23cdf 100644 --- a/data/maps/LilycoveCity/header.inc +++ b/data/maps/LilycoveCity/header.inc @@ -5,10 +5,10 @@ LilycoveCity:: @ 83054D4 .4byte LilycoveCity_MapConnections .2byte MUS_MINAMO .2byte 6 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 2 - .byte 2 + .byte WEATHER_SUNNY + .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 081914bda..e32582b24 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -303,32 +303,32 @@ LilycoveCity_EventScript_14CE35:: @ 814CE35 end LilycoveCity_EventScript_14CE46:: @ 814CE46 - trainerbattle 3, OPPONENT_MAY_11, 0, LilycoveCity_Text_167BD5 + trainerbattle 3, TRAINER_MAY_11, 0, LilycoveCity_Text_167BD5 goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE56:: @ 814CE56 - trainerbattle 3, OPPONENT_MAY_12, 0, LilycoveCity_Text_167BD5 + trainerbattle 3, TRAINER_MAY_12, 0, LilycoveCity_Text_167BD5 goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE66:: @ 814CE66 - trainerbattle 3, OPPONENT_MAY_10, 0, LilycoveCity_Text_167BD5 + trainerbattle 3, TRAINER_MAY_10, 0, LilycoveCity_Text_167BD5 goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE76:: @ 814CE76 - trainerbattle 3, OPPONENT_BRENDAN_11, 0, LilycoveCity_Text_1680E4 + trainerbattle 3, TRAINER_BRENDAN_11, 0, LilycoveCity_Text_1680E4 goto LilycoveCity_EventScript_14CF12 end LilycoveCity_EventScript_14CE86:: @ 814CE86 - trainerbattle 3, OPPONENT_BRENDAN_12, 0, LilycoveCity_Text_1680E4 + trainerbattle 3, TRAINER_BRENDAN_12, 0, LilycoveCity_Text_1680E4 goto LilycoveCity_EventScript_14CF12 end LilycoveCity_EventScript_14CE96:: @ 814CE96 - trainerbattle 3, OPPONENT_BRENDAN_10, 0, LilycoveCity_Text_1680E4 + trainerbattle 3, TRAINER_BRENDAN_10, 0, LilycoveCity_Text_1680E4 goto LilycoveCity_EventScript_14CF12 end diff --git a/data/maps/LilycoveCity_ContestHall/events.inc b/data/maps/LilycoveCity_ContestHall/events.inc index bc4331484..a7c58d274 100644 --- a/data/maps/LilycoveCity_ContestHall/events.inc +++ b/data/maps/LilycoveCity_ContestHall/events.inc @@ -1,36 +1,36 @@ LilycoveCity_ContestHall_EventObjects:: @ 8389A18 - object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, 2, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_15909B, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, 2, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_1590A4, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, 2, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_1590AD, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 12, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590BF, 0 - object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590D4, 0 - object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590E9, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590FE, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159113, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 16, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159128, 0 - object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 24, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15913D, 0 - object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159170, 0 - object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159146, 0 - object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 24, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159185, 0 - object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15919A, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591AF, 0 - object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591C4, 0 - object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591D9, 0 - object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 28, 13, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591EE, 0 - object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159203, 0 - object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15922D, 0 - object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159218, 0 - object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15915B, 0 - object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 36, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159242, 0 - object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159257, 0 - object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15926C, 0 - object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159281, 0 - object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159296, 0 - object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 40, 25, 3, 7, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592AB, 0 - object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 32, 23, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592C0, 0 - object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592F7, 0 - object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 24, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592E2, 0 - object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_1590B6, 0 + object_event 1, EVENT_OBJ_GFX_BOY_1, 0, 30, 30, 3, MOVEMENT_TYPE_WANDER_AROUND, 4, 4, 0, 0, LilycoveCity_ContestHall_EventScript_15909B, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 11, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 3, 0, 0, LilycoveCity_ContestHall_EventScript_1590A4, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 40, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestHall_EventScript_1590AD, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 12, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590BF, 0 + object_event 5, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 15, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590D4, 0 + object_event 6, EVENT_OBJ_GFX_BLACK_BELT, 0, 10, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590E9, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1590FE, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 14, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159113, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_6, 0, 16, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159128, 0 + object_event 10, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 24, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15913D, 0 + object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159170, 0 + object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159146, 0 + object_event 13, EVENT_OBJ_GFX_WOMAN_4, 0, 24, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159185, 0 + object_event 14, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 27, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15919A, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_5, 0, 22, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591AF, 0 + object_event 16, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 24, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591C4, 0 + object_event 17, EVENT_OBJ_GFX_PSYCHIC_M, 0, 26, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591D9, 0 + object_event 18, EVENT_OBJ_GFX_WOMAN_2, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1591EE, 0 + object_event 19, EVENT_OBJ_GFX_WOMAN_3, 0, 20, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159203, 0 + object_event 20, EVENT_OBJ_GFX_WOMAN_1, 0, 30, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15922D, 0 + object_event 21, EVENT_OBJ_GFX_MAN_1, 0, 26, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159218, 0 + object_event 22, EVENT_OBJ_GFX_CAMPER, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15915B, 0 + object_event 23, EVENT_OBJ_GFX_WOMAN_4, 0, 36, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159242, 0 + object_event 24, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 39, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159257, 0 + object_event 25, EVENT_OBJ_GFX_BOY_2, 0, 34, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15926C, 0 + object_event 26, EVENT_OBJ_GFX_GIRL_2, 0, 36, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159281, 0 + object_event 27, EVENT_OBJ_GFX_BOY_3, 0, 38, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159296, 0 + object_event 28, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 40, 25, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592AB, 0 + object_event 29, EVENT_OBJ_GFX_WOMAN_3, 0, 32, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592C0, 0 + object_event 30, EVENT_OBJ_GFX_MAN_1, 0, 37, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592F7, 0 + object_event 31, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 42, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestHall_EventScript_1592E2, 0 + object_event 32, EVENT_OBJ_GFX_SAILOR, 0, 23, 26, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestHall_EventScript_1590B6, 0 LilycoveCity_ContestHall_MapWarps:: @ 8389D18 warp_def 19, 32, 0, 2, MAP_LILYCOVE_CITY_CONTEST_LOBBY @@ -39,12 +39,12 @@ LilycoveCity_ContestHall_MapWarps:: @ 8389D18 warp_def 31, 32, 0, 3, MAP_LILYCOVE_CITY_CONTEST_LOBBY LilycoveCity_ContestHall_MapBGEvents:: @ 8389D38 - bg_event 27, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C - bg_event 39, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159315 - bg_event 11, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15931E - bg_event 15, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15931E - bg_event 23, 16, 0, 0, 0, LilycoveCity_ContestHall_EventScript_15930C - bg_event 35, 28, 0, 0, 0, LilycoveCity_ContestHall_EventScript_159315 + bg_event 27, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_15930C + bg_event 39, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_159315 + bg_event 11, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_15931E + bg_event 15, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_15931E + bg_event 23, 16, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_15930C + bg_event 35, 28, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestHall_EventScript_159315 LilycoveCity_ContestHall_MapEvents:: @ 8389D80 map_events LilycoveCity_ContestHall_EventObjects, LilycoveCity_ContestHall_MapWarps, 0x0, LilycoveCity_ContestHall_MapBGEvents diff --git a/data/maps/LilycoveCity_ContestHall/header.inc b/data/maps/LilycoveCity_ContestHall/header.inc index 9e690f9a7..ade66a18f 100644 --- a/data/maps/LilycoveCity_ContestHall/header.inc +++ b/data/maps/LilycoveCity_ContestHall/header.inc @@ -5,10 +5,10 @@ LilycoveCity_ContestHall:: @ 83065AC .4byte 0x0 .2byte MUS_CONLOBBY .2byte 106 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_ContestLobby/events.inc b/data/maps/LilycoveCity_ContestLobby/events.inc index b44590d65..5e0bc7c7d 100644 --- a/data/maps/LilycoveCity_ContestLobby/events.inc +++ b/data/maps/LilycoveCity_ContestLobby/events.inc @@ -1,18 +1,18 @@ LilycoveCity_ContestLobby_EventObjects:: @ 838984C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_158EB0, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_158B85, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 17, 9, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B77AB, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 14, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_15901E, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 3, 10, 3, 2, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_159027, 0 - object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 20, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_159042, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_LILYCOVE - object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 18, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15907B, 0 - object_event 10, EVENT_OBJ_GFX_GIRL_1, 0, 19, 9, 3, 9, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159084, 0 - object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 13, 1, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_ARTIST_LILCOVE_CONTEST - object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 10, 3, 2, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_159054, 0 - object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 3, 10, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15904B, 0 - object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 7, 3, 3, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_15905D, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_158EB0, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_158B85, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 17, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B77AB, 0 + object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 1, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_LILYCOVE_CONTEST_ATTENDENT_1 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_15901E, 0 + object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 3, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_ContestLobby_EventScript_159027, 0 + object_event 7, EVENT_OBJ_GFX_ARTIST, 0, 20, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_159042, 0 + object_event 8, EVENT_OBJ_GFX_REPORTER_M, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_LILYCOVE + object_event 9, EVENT_OBJ_GFX_BOY_1, 0, 18, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15907B, 0 + object_event 10, EVENT_OBJ_GFX_GIRL_1, 0, 19, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159084, 0 + object_event 11, EVENT_OBJ_GFX_ARTIST, 0, 13, 1, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_ARTIST_LILCOVE_CONTEST + object_event 12, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_159054, 0 + object_event 13, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15904B, 0 + object_event 14, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, LilycoveCity_ContestLobby_EventScript_15905D, 0 LilycoveCity_ContestLobby_MapWarps:: @ 838999C warp_def 6, 11, 0, 4, MAP_LILYCOVE_CITY @@ -21,12 +21,12 @@ LilycoveCity_ContestLobby_MapWarps:: @ 838999C warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_CONTEST_HALL LilycoveCity_ContestLobby_MapBGEvents:: @ 83899BC - bg_event 18, 5, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7835 - bg_event 18, 9, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_1B7659 - bg_event 15, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159066 - bg_event 17, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15906D - bg_event 19, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_159074 - bg_event 22, 1, 0, 0, 0, LilycoveCity_ContestLobby_EventScript_15908D + bg_event 18, 5, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_1B7835 + bg_event 18, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_1B7659 + bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_159066 + bg_event 17, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_15906D + bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_159074 + bg_event 22, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_ContestLobby_EventScript_15908D LilycoveCity_ContestLobby_MapEvents:: @ 8389A04 map_events LilycoveCity_ContestLobby_EventObjects, LilycoveCity_ContestLobby_MapWarps, 0x0, LilycoveCity_ContestLobby_MapBGEvents diff --git a/data/maps/LilycoveCity_ContestLobby/header.inc b/data/maps/LilycoveCity_ContestLobby/header.inc index 37415383b..62507b9a0 100644 --- a/data/maps/LilycoveCity_ContestLobby/header.inc +++ b/data/maps/LilycoveCity_ContestLobby/header.inc @@ -5,10 +5,10 @@ LilycoveCity_ContestLobby:: @ 8306590 .4byte 0x0 .2byte MUS_CONLOBBY .2byte 105 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc index eee09c890..d823696f2 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/events.inc @@ -1,5 +1,5 @@ LilycoveCity_CoveLilyMotel_1F_EventObjects:: @ 8389464 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5, 0 LilycoveCity_CoveLilyMotel_1F_MapWarps:: @ 838947C warp_def 5, 8, 0, 1, MAP_LILYCOVE_CITY @@ -7,7 +7,7 @@ LilycoveCity_CoveLilyMotel_1F_MapWarps:: @ 838947C warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_2F LilycoveCity_CoveLilyMotel_1F_MapCoordEvents:: @ 8389494 - coord_event 10, 2, 3, 0, VAR_TEMP_1, 0, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D + coord_event 10, 2, 3, VAR_TEMP_1, 0, LilycoveCity_CoveLilyMotel_1F_EventScript_15834D LilycoveCity_CoveLilyMotel_1F_MapEvents:: @ 83894A4 map_events LilycoveCity_CoveLilyMotel_1F_EventObjects, LilycoveCity_CoveLilyMotel_1F_MapWarps, LilycoveCity_CoveLilyMotel_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc index 15a8aa7d0..e60b3ce64 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_1F/header.inc @@ -5,10 +5,10 @@ LilycoveCity_CoveLilyMotel_1F:: @ 8306520 .4byte 0x0 .2byte MUS_MINAMO .2byte 300 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc index 4469cddb0..fcda95632 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/events.inc @@ -1,10 +1,10 @@ LilycoveCity_CoveLilyMotel_2F_EventObjects:: @ 83894B8 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 4, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158400, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 3, 3, 9, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE - object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158412, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE - object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 3, 9, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583F7, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158400, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 10, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583EE, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158412, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE + object_event 6, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_CoveLilyMotel_2F_EventScript_158409, FLAG_HIDE_LILYCOVE_MOTEL_PEOPLE LilycoveCity_CoveLilyMotel_2F_MapWarps:: @ 8389548 warp_def 2, 1, 0, 2, MAP_LILYCOVE_CITY_COVE_LILY_MOTEL_1F diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc index a39f3acf0..47e8960d4 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/header.inc @@ -5,10 +5,10 @@ LilycoveCity_CoveLilyMotel_2F:: @ 830653C .4byte 0x0 .2byte MUS_MINAMO .2byte 301 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc index eca98b599..7e88550d7 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/events.inc @@ -1,5 +1,5 @@ LilycoveCity_DepartmentStoreElevator_EventObjects:: @ 838A624 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A39C, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A39C, 0 LilycoveCity_DepartmentStoreElevator_MapWarps:: @ 838A63C warp_def 1, 5, 3, 127, MAP_NONE diff --git a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc index 65b573d92..8571ea102 100644 --- a/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreElevator/header.inc @@ -5,10 +5,10 @@ LilycoveCity_DepartmentStoreElevator:: @ 83067A4 .4byte 0x0 .2byte MUS_MINAMO .2byte 274 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc index 71d34fa68..fbe7205e2 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/events.inc @@ -1,14 +1,14 @@ LilycoveCity_DepartmentStoreRooftop_EventObjects:: @ 838A5A8 - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 7, 5, 3, 5, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4, 0 - object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, 8, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4, 0 + object_event 3, EVENT_OBJ_GFX_ROOFTOP_SALE_WOMAN, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A167, FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART LilycoveCity_DepartmentStoreRooftop_MapWarps:: @ 838A5F0 warp_def 13, 3, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F LilycoveCity_DepartmentStoreRooftop_MapBGEvents:: @ 838A5F8 - bg_event 9, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD - bg_event 10, 1, 0, 0, 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD + bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD + bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD LilycoveCity_DepartmentStoreRooftop_MapEvents:: @ 838A610 map_events LilycoveCity_DepartmentStoreRooftop_EventObjects, LilycoveCity_DepartmentStoreRooftop_MapWarps, 0x0, LilycoveCity_DepartmentStoreRooftop_MapBGEvents diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc index 0131ea7f1..f42e93df8 100644 --- a/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc +++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/header.inc @@ -5,10 +5,10 @@ LilycoveCity_DepartmentStoreRooftop:: @ 8306788 .4byte 0x0 .2byte MUS_MINAMO .2byte 263 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc index d5170d4c1..a7bb9a356 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/events.inc @@ -1,10 +1,10 @@ LilycoveCity_DepartmentStore_1F_EventObjects:: @ 838A218 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D55, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D5E, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159ED7, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE0, 0 - object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE9, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, 1, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EF2, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D55, 0 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159D5E, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159ED7, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE0, 0 + object_event 5, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EE9, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_1F_EventScript_159EF2, 0 LilycoveCity_DepartmentStore_1F_MapWarps:: @ 838A2A8 warp_def 8, 7, 0, 0, MAP_LILYCOVE_CITY @@ -13,7 +13,7 @@ LilycoveCity_DepartmentStore_1F_MapWarps:: @ 838A2A8 warp_def 2, 1, 0, 0, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR LilycoveCity_DepartmentStore_1F_MapBGEvents:: @ 838A2C8 - bg_event 0, 8, 0, 1, 0, LilycoveCity_DepartmentStore_1F_EventScript_159F05 + bg_event 0, 8, 0, BG_EVENT_PLAYER_FACING_NORTH, LilycoveCity_DepartmentStore_1F_EventScript_159F05 LilycoveCity_DepartmentStore_1F_MapEvents:: @ 838A2D4 map_events LilycoveCity_DepartmentStore_1F_EventObjects, LilycoveCity_DepartmentStore_1F_MapWarps, 0x0, LilycoveCity_DepartmentStore_1F_MapBGEvents diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc index 6f5da636f..93799798b 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/header.inc @@ -5,10 +5,10 @@ LilycoveCity_DepartmentStore_1F:: @ 83066FC .4byte 0x0 .2byte MUS_MINAMO .2byte 258 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc index 65c22a60f..762a98c1d 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/events.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_2F_EventObjects:: @ 838A2E8 - object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F0F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F18, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F21, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F5E, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F2A, 0 + object_event 1, EVENT_OBJ_GFX_COOK, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F0F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F18, 0 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F21, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F5E, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_2F_EventScript_159F2A, 0 LilycoveCity_DepartmentStore_2F_MapWarps:: @ 838A360 warp_def 16, 1, 0, 2, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F diff --git a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc index 7bc576b3f..1ebab31dc 100644 --- a/data/maps/LilycoveCity_DepartmentStore_2F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_2F/header.inc @@ -5,10 +5,10 @@ LilycoveCity_DepartmentStore_2F:: @ 8306718 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 259 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc index 212d44971..fcf7a410e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/events.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_3F_EventObjects:: @ 838A38C - object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FE2, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 7, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FEB, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 13, 5, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FF4, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159F91, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 2, 3, 8, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FB8, 0 + object_event 1, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 0, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FE2, 0 + object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 7, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FEB, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 13, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FF4, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159F91, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_DepartmentStore_3F_EventScript_159FB8, 0 LilycoveCity_DepartmentStore_3F_MapWarps:: @ 838A404 warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F diff --git a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc index 402d1a137..50d1e9585 100644 --- a/data/maps/LilycoveCity_DepartmentStore_3F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_3F/header.inc @@ -5,10 +5,10 @@ LilycoveCity_DepartmentStore_3F:: @ 8306734 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 260 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc index 40b8eab37..e3b47e523 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/events.inc @@ -1,9 +1,9 @@ LilycoveCity_DepartmentStore_4F_EventObjects:: @ 838A430 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_159FFE, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A007, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A010, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A019, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A03C, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 0, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_159FFE, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A007, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A010, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A019, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_4F_EventScript_15A03C, 0 LilycoveCity_DepartmentStore_4F_MapWarps:: @ 838A4A8 warp_def 16, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F diff --git a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc index 57bea5077..025b9c83e 100644 --- a/data/maps/LilycoveCity_DepartmentStore_4F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_4F/header.inc @@ -5,10 +5,10 @@ LilycoveCity_DepartmentStore_4F:: @ 8306750 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 261 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc index 2883d167b..73e9e6733 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/events.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/events.inc @@ -1,11 +1,11 @@ LilycoveCity_DepartmentStore_5F_EventObjects:: @ 838A4D4 - object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A136, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 7, 3, 17, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A124, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A061, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A094, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 6, 3, 9, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0C2, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 17, 6, 3, 7, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0F2, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 5, 3, 10, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A12D, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A136, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A124, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A061, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A094, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_4, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0C2, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_4, 0, 17, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A0F2, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, LilycoveCity_DepartmentStore_5F_EventScript_15A12D, 0 LilycoveCity_DepartmentStore_5F_MapWarps:: @ 838A57C warp_def 13, 1, 0, 1, MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F diff --git a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc index 1159ddeaf..7cc9e86f8 100644 --- a/data/maps/LilycoveCity_DepartmentStore_5F/header.inc +++ b/data/maps/LilycoveCity_DepartmentStore_5F/header.inc @@ -5,10 +5,10 @@ LilycoveCity_DepartmentStore_5F:: @ 830676C .4byte 0x0 .2byte MUS_FRIENDLY .2byte 262 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_EmptyMap/header.inc b/data/maps/LilycoveCity_EmptyMap/header.inc index 469b52893..e5c3db22e 100644 --- a/data/maps/LilycoveCity_EmptyMap/header.inc +++ b/data/maps/LilycoveCity_EmptyMap/header.inc @@ -5,10 +5,10 @@ LilycoveCity_EmptyMap:: @ 8306654 .4byte 0x0 .2byte MUS_MINAMO .2byte 108 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_Harbor/events.inc b/data/maps/LilycoveCity_Harbor/events.inc index 35a34928f..49f63e89a 100644 --- a/data/maps/LilycoveCity_Harbor/events.inc +++ b/data/maps/LilycoveCity_Harbor/events.inc @@ -1,8 +1,8 @@ LilycoveCity_Harbor_EventObjects:: @ 8389F94 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, 2, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_159A8D, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_FERRY_SAILOR_LILYCOVE + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_Harbor_EventScript_1598A2, FLAG_HIDE_FERRY_ATTENDANT_LILYCOVE + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_LILYCOVE_HARBOR + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 3, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_Harbor_EventScript_159A8D, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_FERRY_SAILOR_LILYCOVE LilycoveCity_Harbor_MapWarps:: @ 8389FF4 warp_def 11, 14, 0, 12, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_Harbor/header.inc b/data/maps/LilycoveCity_Harbor/header.inc index 75b924e8f..5d0508895 100644 --- a/data/maps/LilycoveCity_Harbor/header.inc +++ b/data/maps/LilycoveCity_Harbor/header.inc @@ -5,10 +5,10 @@ LilycoveCity_Harbor:: @ 8306638 .4byte 0x0 .2byte MUS_MINAMO .2byte 88 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House1/events.inc b/data/maps/LilycoveCity_House1/events.inc index 482ebf0b6..54fb68433 100644 --- a/data/maps/LilycoveCity_House1/events.inc +++ b/data/maps/LilycoveCity_House1/events.inc @@ -1,6 +1,6 @@ LilycoveCity_House1_EventObjects:: @ 838A080 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 5, 3, 9, 1, 1, 0, 0, LilycoveCity_House1_EventScript_159B86, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House1_EventScript_159B8F, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House1_EventScript_159B86, 0 + object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House1_EventScript_159B8F, 0 LilycoveCity_House1_MapWarps:: @ 838A0B0 warp_def 3, 8, 0, 8, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_House1/header.inc b/data/maps/LilycoveCity_House1/header.inc index 20675582b..a4cede932 100644 --- a/data/maps/LilycoveCity_House1/header.inc +++ b/data/maps/LilycoveCity_House1/header.inc @@ -5,10 +5,10 @@ LilycoveCity_House1:: @ 830668C .4byte 0x0 .2byte MUS_MINAMO .2byte 59 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House2/events.inc b/data/maps/LilycoveCity_House2/events.inc index d557cd75a..7362a4d53 100644 --- a/data/maps/LilycoveCity_House2/events.inc +++ b/data/maps/LilycoveCity_House2/events.inc @@ -1,5 +1,5 @@ LilycoveCity_House2_EventObjects:: @ 838A0D4 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_House2_EventScript_159BA3, 0 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_House2_EventScript_159BA3, 0 LilycoveCity_House2_MapWarps:: @ 838A0EC warp_def 2, 7, 0, 9, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_House2/header.inc b/data/maps/LilycoveCity_House2/header.inc index 1948d4470..eb9b120e3 100644 --- a/data/maps/LilycoveCity_House2/header.inc +++ b/data/maps/LilycoveCity_House2/header.inc @@ -5,10 +5,10 @@ LilycoveCity_House2:: @ 83066A8 .4byte 0x0 .2byte MUS_MINAMO .2byte 74 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House3/events.inc b/data/maps/LilycoveCity_House3/events.inc index 2186eb0d2..c6922695e 100644 --- a/data/maps/LilycoveCity_House3/events.inc +++ b/data/maps/LilycoveCity_House3/events.inc @@ -1,10 +1,10 @@ LilycoveCity_House3_EventObjects:: @ 838A110 - object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 3, 4, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159CE5, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159BF3, 0 - object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 1, 4, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C7D, 0 - object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 2, 5, 3, 7, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159CB1, 0 - object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 2, 3, 3, 8, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C49, 0 - object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, 9, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C32, 0 + object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159CE5, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_House3_EventScript_159BF3, 0 + object_event 3, EVENT_OBJ_GFX_BOY_5, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C7D, 0 + object_event 4, EVENT_OBJ_GFX_BOY_5, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159CB1, 0 + object_event 5, EVENT_OBJ_GFX_BOY_5, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C49, 0 + object_event 6, EVENT_OBJ_GFX_MAN_1, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, LilycoveCity_House3_EventScript_159C32, 0 LilycoveCity_House3_MapWarps:: @ 838A1A0 warp_def 3, 7, 0, 10, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_House3/header.inc b/data/maps/LilycoveCity_House3/header.inc index df0d576b4..4bd0a4509 100644 --- a/data/maps/LilycoveCity_House3/header.inc +++ b/data/maps/LilycoveCity_House3/header.inc @@ -5,10 +5,10 @@ LilycoveCity_House3:: @ 83066C4 .4byte 0x0 .2byte MUS_MINAMO .2byte 60 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_House4/events.inc b/data/maps/LilycoveCity_House4/events.inc index d5ebda9f2..82117837c 100644 --- a/data/maps/LilycoveCity_House4/events.inc +++ b/data/maps/LilycoveCity_House4/events.inc @@ -1,6 +1,6 @@ LilycoveCity_House4_EventObjects:: @ 838A1C4 - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 1, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_House4_EventScript_159D42, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, 2, 1, 1, 0, 0, LilycoveCity_House4_EventScript_159D4B, 0 + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_159D42, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_House4_EventScript_159D4B, 0 LilycoveCity_House4_MapWarps:: @ 838A1F4 warp_def 3, 8, 0, 11, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_House4/header.inc b/data/maps/LilycoveCity_House4/header.inc index a8d4d1bcc..c85aa04aa 100644 --- a/data/maps/LilycoveCity_House4/header.inc +++ b/data/maps/LilycoveCity_House4/header.inc @@ -5,10 +5,10 @@ LilycoveCity_House4:: @ 83066E0 .4byte 0x0 .2byte MUS_MINAMO .2byte 59 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc index a081a6523..f9fc9231e 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/events.inc @@ -1,14 +1,14 @@ LilycoveCity_LilycoveMuseum_1F_EventObjects:: @ 8389564 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15841C, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158558, 0 - object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, 5, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158561, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15856A, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 3, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158573, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 3, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY - object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER - object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, 2, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS - object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 5, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15841C, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158425, FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR + object_event 3, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158558, 0 + object_event 4, EVENT_OBJ_GFX_ARTIST, 0, 13, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158561, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15856A, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_5, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158573, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 11, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15857C, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY + object_event 8, EVENT_OBJ_GFX_ARTIST, 0, 19, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15858E, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER + object_event 9, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_1585A3, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS + object_event 10, EVENT_OBJ_GFX_PSYCHIC_M, 0, 6, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158585, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN LilycoveCity_LilycoveMuseum_1F_MapWarps:: @ 8389654 warp_def 9, 13, 0, 3, MAP_LILYCOVE_CITY @@ -16,22 +16,22 @@ LilycoveCity_LilycoveMuseum_1F_MapWarps:: @ 8389654 warp_def 16, 1, 0, 0, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F LilycoveCity_LilycoveMuseum_1F_MapBGEvents:: @ 838966C - bg_event 1, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 - bg_event 2, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 - bg_event 5, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158534 - bg_event 6, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158534 - bg_event 9, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158507 - bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158519 - bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158519 - bg_event 15, 12, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15853D - bg_event 11, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158507 - bg_event 6, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15852B - bg_event 17, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F - bg_event 19, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158522 - bg_event 20, 1, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158522 - bg_event 18, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F - bg_event 18, 11, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_158546 - bg_event 16, 9, 0, 0, 0, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F + bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 + bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158510 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158534 + bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158534 + bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158507 + bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158519 + bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158519 + bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_15853D + bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158507 + bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_15852B + bg_event 17, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F + bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158522 + bg_event 20, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158522 + bg_event 18, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F + bg_event 18, 11, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_158546 + bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_1F_EventScript_15854F LilycoveCity_LilycoveMuseum_1F_MapEvents:: @ 838972C map_events LilycoveCity_LilycoveMuseum_1F_EventObjects, LilycoveCity_LilycoveMuseum_1F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_1F_MapBGEvents diff --git a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc index 3af5b4c90..696e823b3 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_1F/header.inc @@ -5,10 +5,10 @@ LilycoveCity_LilycoveMuseum_1F:: @ 8306558 .4byte 0x0 .2byte MUS_BIJYUTU .2byte 103 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc index 4e2ffe49f..ae0a59a89 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/events.inc @@ -1,25 +1,25 @@ LilycoveCity_LilycoveMuseum_2F_EventObjects:: @ 8389740 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 3, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS - object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 6, 3, 2, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 19, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158805, FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15880E, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS + object_event 4, EVENT_OBJ_GFX_BOY_4, 0, 14, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_158817, FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS LilycoveCity_LilycoveMuseum_2F_MapWarps:: @ 83897A0 warp_def 13, 1, 0, 2, MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_1F LilycoveCity_LilycoveMuseum_2F_MapBGEvents:: @ 83897A8 - bg_event 14, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D - bg_event 15, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D - bg_event 3, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0 - bg_event 2, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0 - bg_event 10, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3 - bg_event 11, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3 - bg_event 19, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6 - bg_event 18, 6, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6 - bg_event 6, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9 - bg_event 7, 10, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9 - bg_event 11, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D - bg_event 15, 2, 0, 0, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D + bg_event 14, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D + bg_event 15, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_15879D + bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0 + bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0 + bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3 + bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3 + bg_event 19, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6 + bg_event 18, 6, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6 + bg_event 6, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9 + bg_event 7, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9 + bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D + bg_event 15, 2, 0, BG_EVENT_PLAYER_FACING_ANY, LilycoveCity_LilycoveMuseum_2F_EventScript_15853D LilycoveCity_LilycoveMuseum_2F_MapEvents:: @ 8389838 map_events LilycoveCity_LilycoveMuseum_2F_EventObjects, LilycoveCity_LilycoveMuseum_2F_MapWarps, 0x0, LilycoveCity_LilycoveMuseum_2F_MapBGEvents diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc index 3ceabddcb..8fe60bc17 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/header.inc @@ -5,10 +5,10 @@ LilycoveCity_LilycoveMuseum_2F:: @ 8306574 .4byte 0x0 .2byte MUS_BIJYUTU .2byte 104 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc index d28c4631c..46bf5506a 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/events.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/events.inc @@ -1,5 +1,5 @@ LilycoveCity_MoveDeletersHouse_EventObjects:: @ 838A044 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_159AAE, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_MoveDeletersHouse_EventScript_159AAE, 0 LilycoveCity_MoveDeletersHouse_MapWarps:: @ 838A05C warp_def 3, 7, 0, 7, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc index a2216160d..d2483b4e5 100644 --- a/data/maps/LilycoveCity_MoveDeletersHouse/header.inc +++ b/data/maps/LilycoveCity_MoveDeletersHouse/header.inc @@ -5,10 +5,10 @@ LilycoveCity_MoveDeletersHouse:: @ 8306670 .4byte 0x0 .2byte MUS_MINAMO .2byte 60 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc index 2505adbc3..41bc25d85 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/events.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ LilycoveCity_PokemonCenter_1F_EventObjects:: @ 8389D94 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159331, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_15933F, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159348, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159331, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_15933F, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonCenter_1F_EventScript_159348, 0 LilycoveCity_PokemonCenter_1F_MapWarps:: @ 8389DDC warp_def 7, 8, 3, 2, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc index c94501f23..ec56cfc5d 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/header.inc @@ -5,10 +5,10 @@ LilycoveCity_PokemonCenter_1F:: @ 83065C8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc index cff88caf0..508f5fab8 100644 --- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 8159327 .byte 0 LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D - setrespawn 8 + setrespawn HEAL_LOCATION_LILYCOVE_CITY end LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331 diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc index b8fd09d02..406266099 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/events.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ LilycoveCity_PokemonCenter_2F_EventObjects:: @ 8389E08 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159377, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_15937D, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159383, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159377, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_15937D, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonCenter_2F_EventScript_159383, 0 LilycoveCity_PokemonCenter_2F_MapWarps:: @ 8389E50 warp_def 1, 5, 4, 2, MAP_LILYCOVE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc index 78816dbe9..a46e9e291 100644 --- a/data/maps/LilycoveCity_PokemonCenter_2F/header.inc +++ b/data/maps/LilycoveCity_PokemonCenter_2F/header.inc @@ -5,10 +5,10 @@ LilycoveCity_PokemonCenter_2F:: @ 83065E4 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc index 4f1d4ff4d..e5b68f635 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/events.inc @@ -1,12 +1,12 @@ LilycoveCity_PokemonTrainerFanClub_EventObjects:: @ 8389EB0 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 8, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15952F, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 6, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15961D, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 8, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159694, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 11, 3, 7, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, FLAG_HIDE_FANCLUB_LITTLE_BOY - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, 8, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, FLAG_HIDE_FANCLUB_BOY - object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 10, 3, 10, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, FLAG_HIDE_FANCLUB_LADY - object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 10, 3, 9, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, FLAG_HIDE_FANCLUB_OLD_LADY + object_event 1, EVENT_OBJ_GFX_LASS, 0, 3, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15952F, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 6, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15961D, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159694, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15970B, FLAG_HIDE_FANCLUB_LITTLE_BOY + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 1, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_15976D, FLAG_HIDE_FANCLUB_BOY + object_event 7, EVENT_OBJ_GFX_WOMAN_4, 0, 3, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF, FLAG_HIDE_FANCLUB_LADY + object_event 8, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 10, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LilycoveCity_PokemonTrainerFanClub_EventScript_159831, FLAG_HIDE_FANCLUB_OLD_LADY LilycoveCity_PokemonTrainerFanClub_MapWarps:: @ 8389F70 warp_def 6, 13, 0, 5, MAP_LILYCOVE_CITY diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc index 4445ed0df..e5eb0eaa7 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/header.inc @@ -5,10 +5,10 @@ LilycoveCity_PokemonTrainerFanClub:: @ 830661C .4byte 0x0 .2byte MUS_MINAMO .2byte 107 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LilycoveCity_UnusedMart/header.inc b/data/maps/LilycoveCity_UnusedMart/header.inc index fb20ddc79..78e14b53b 100644 --- a/data/maps/LilycoveCity_UnusedMart/header.inc +++ b/data/maps/LilycoveCity_UnusedMart/header.inc @@ -5,10 +5,10 @@ LilycoveCity_UnusedMart:: @ 8306600 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 12 + .byte MAPSEC_LILYCOVE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom1/events.inc b/data/maps/LinkContestRoom1/events.inc index 9bcf27a90..13470e4f5 100644 --- a/data/maps/LinkContestRoom1/events.inc +++ b/data/maps/LinkContestRoom1/events.inc @@ -1,18 +1,18 @@ LinkContestRoom1_EventObjects:: @ 839149C - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 4, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 8, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 2, 6, 3, 10, 0, 0, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 4, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_VAR_7, 0, 5, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 9, EVENT_OBJ_GFX_VAR_8, 0, 9, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 10, EVENT_OBJ_GFX_VAR_9, 0, 10, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 - object_event 11, EVENT_OBJ_GFX_VAR_A, 0, 12, 5, 3, 9, 0, 0, 0, 0, 0x0, 0 - object_event 12, EVENT_OBJ_GFX_VAR_5, 0, 2, 5, 3, 10, 0, 0, 0, 0, 0x0, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_ROOM_POKEBALL - object_event 14, EVENT_OBJ_GFX_VAR_3, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, 9, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_VAR_2, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_VAR_7, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 9, EVENT_OBJ_GFX_VAR_8, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 10, EVENT_OBJ_GFX_VAR_9, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 + object_event 11, EVENT_OBJ_GFX_VAR_A, 0, 12, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 + object_event 12, EVENT_OBJ_GFX_VAR_5, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_LINK_CONTEST_ROOM_POKEBALL + object_event 14, EVENT_OBJ_GFX_VAR_3, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 15, EVENT_OBJ_GFX_ARTIST, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 LinkContestRoom1_MapEvents:: @ 8391604 diff --git a/data/maps/LinkContestRoom1/header.inc b/data/maps/LinkContestRoom1/header.inc index 7aea3de5f..3ca7d6ed9 100644 --- a/data/maps/LinkContestRoom1/header.inc +++ b/data/maps/LinkContestRoom1/header.inc @@ -5,10 +5,10 @@ LinkContestRoom1:: @ 83079E8 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 226 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom2/header.inc b/data/maps/LinkContestRoom2/header.inc index a3d60c4f8..e368f56a2 100644 --- a/data/maps/LinkContestRoom2/header.inc +++ b/data/maps/LinkContestRoom2/header.inc @@ -5,10 +5,10 @@ LinkContestRoom2:: @ 8307AAC .4byte 0x0 .2byte MUS_CONTEST0 .2byte 233 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom3/header.inc b/data/maps/LinkContestRoom3/header.inc index 4ee1f0e7d..368f7a8c5 100644 --- a/data/maps/LinkContestRoom3/header.inc +++ b/data/maps/LinkContestRoom3/header.inc @@ -5,10 +5,10 @@ LinkContestRoom3:: @ 8307AC8 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 234 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom4/header.inc b/data/maps/LinkContestRoom4/header.inc index 56ee5906c..caf0848a4 100644 --- a/data/maps/LinkContestRoom4/header.inc +++ b/data/maps/LinkContestRoom4/header.inc @@ -5,10 +5,10 @@ LinkContestRoom4:: @ 8307AE4 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 235 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom5/header.inc b/data/maps/LinkContestRoom5/header.inc index fb2a66640..5ea615ef4 100644 --- a/data/maps/LinkContestRoom5/header.inc +++ b/data/maps/LinkContestRoom5/header.inc @@ -5,10 +5,10 @@ LinkContestRoom5:: @ 8307B00 .4byte 0x0 .2byte MUS_CONTEST0 .2byte 236 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LinkContestRoom6/header.inc b/data/maps/LinkContestRoom6/header.inc index db9343180..7edebef67 100644 --- a/data/maps/LinkContestRoom6/header.inc +++ b/data/maps/LinkContestRoom6/header.inc @@ -5,10 +5,10 @@ LinkContestRoom6:: @ 8307B1C .4byte 0x0 .2byte MUS_CONTEST0 .2byte 237 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown/events.inc b/data/maps/LittlerootTown/events.inc index b50dbc7e1..a12324334 100644 --- a/data/maps/LittlerootTown/events.inc +++ b/data/maps/LittlerootTown/events.inc @@ -1,10 +1,10 @@ LittlerootTown_EventObjects:: @ 83808FC - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_3, 0, 16, 10, 3, 2, 1, 2, 0, 0, LittlerootTown_EventScript_14D6DF, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, 2, 2, 1, 0, 0, LittlerootTown_EventScript_14D6CD, FLAG_HIDE_FAT_MAN_LITTLEROOT - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, 2, 2, 1, 0, 0, LittlerootTown_EventScript_14D6D6, 0 - object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, 7, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, FLAG_HIDE_MOM_LITTLEROOT - object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_BRENDAN - object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_MAY + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_3, 0, 16, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, LittlerootTown_EventScript_14D6DF, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 12, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_14D6CD, FLAG_HIDE_FAT_MAN_LITTLEROOT + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 14, 17, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, LittlerootTown_EventScript_14D6D6, 0 + object_event 4, EVENT_OBJ_GFX_MOM, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, LittlerootTown_EventScript_14DCE2, FLAG_HIDE_MOM_LITTLEROOT + object_event 5, EVENT_OBJ_GFX_TRUCK, 0, 2, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_BRENDAN + object_event 6, EVENT_OBJ_GFX_TRUCK, 0, 11, 10, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_MOVING_TRUCK_MAY LittlerootTown_MapWarps:: @ 838098C warp_def 14, 8, 0, 1, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F @@ -12,21 +12,21 @@ LittlerootTown_MapWarps:: @ 838098C warp_def 7, 16, 0, 0, MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB LittlerootTown_MapCoordEvents:: @ 83809A4 - coord_event 10, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D739 - coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 0, 0, LittlerootTown_EventScript_14D797 - coord_event 11, 1, 3, 0, VAR_LITTLEROOT_STATE, 1, 0, LittlerootTown_EventScript_14D7C7 - coord_event 8, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D89E - coord_event 9, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D8AA - coord_event 10, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D886 - coord_event 11, 9, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D892 - coord_event 10, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D860 - coord_event 11, 2, 3, 0, VAR_LITTLEROOT_STATE, 3, 0, LittlerootTown_EventScript_14D873 + coord_event 10, 1, 3, VAR_LITTLEROOT_STATE, 0, LittlerootTown_EventScript_14D739 + coord_event 11, 1, 3, VAR_LITTLEROOT_STATE, 0, LittlerootTown_EventScript_14D797 + coord_event 11, 1, 3, VAR_LITTLEROOT_STATE, 1, LittlerootTown_EventScript_14D7C7 + coord_event 8, 9, 3, VAR_LITTLEROOT_STATE, 3, LittlerootTown_EventScript_14D89E + coord_event 9, 9, 3, VAR_LITTLEROOT_STATE, 3, LittlerootTown_EventScript_14D8AA + coord_event 10, 9, 3, VAR_LITTLEROOT_STATE, 3, LittlerootTown_EventScript_14D886 + coord_event 11, 9, 3, VAR_LITTLEROOT_STATE, 3, LittlerootTown_EventScript_14D892 + coord_event 10, 2, 3, VAR_LITTLEROOT_STATE, 3, LittlerootTown_EventScript_14D860 + coord_event 11, 2, 3, VAR_LITTLEROOT_STATE, 3, LittlerootTown_EventScript_14D873 LittlerootTown_MapBGEvents:: @ 8380A34 - bg_event 15, 13, 0, 0, 0, LittlerootTown_EventScript_14D7F6 - bg_event 6, 17, 0, 0, 0, LittlerootTown_EventScript_14D7FF - bg_event 7, 8, 3, 0, 0, LittlerootTown_EventScript_14D808 - bg_event 12, 8, 3, 0, 0, LittlerootTown_EventScript_14D834 + bg_event 15, 13, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_14D7F6 + bg_event 6, 17, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_14D7FF + bg_event 7, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_14D808 + bg_event 12, 8, 3, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_EventScript_14D834 LittlerootTown_MapEvents:: @ 8380A64 map_events LittlerootTown_EventObjects, LittlerootTown_MapWarps, LittlerootTown_MapCoordEvents, LittlerootTown_MapBGEvents diff --git a/data/maps/LittlerootTown/header.inc b/data/maps/LittlerootTown/header.inc index 88f6763e3..216583a90 100644 --- a/data/maps/LittlerootTown/header.inc +++ b/data/maps/LittlerootTown/header.inc @@ -5,10 +5,10 @@ LittlerootTown:: @ 8305544 .4byte LittlerootTown_MapConnections .2byte MUS_MISHIRO .2byte 10 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 - .byte 2 - .byte 1 + .byte WEATHER_SUNNY + .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc index 4ac7d4b3c..00ebc746f 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/events.inc @@ -1,9 +1,9 @@ LittlerootTown_BrendansHouse_1F_EventObjects:: @ 8385674 - object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS - object_event 2, EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 3, 3, 28, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2 - object_event 3, EVENT_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 7, 3, 10, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, FLAG_HIDE_BRENDAN_MOM - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 9, 1, 1, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT + object_event 1, EVENT_OBJ_GFX_MOM, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6BE9, FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS + object_event 2, EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 1, 3, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 3, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2 + object_event 3, EVENT_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 4, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, LittlerootTown_BrendansHouse_1F_EventScript_1529EB, FLAG_HIDE_BRENDAN_MOM + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC warp_def 9, 8, 0, 1, MAP_LITTLEROOT_TOWN @@ -11,7 +11,7 @@ LittlerootTown_BrendansHouse_1F_MapWarps:: @ 83856EC warp_def 8, 2, 0, 0, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F LittlerootTown_BrendansHouse_1F_MapCoordEvents:: @ 8385704 - coord_event 8, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_BrendansHouse_1F_EventScript_152789 + coord_event 8, 8, 0, VAR_LITTLEROOT_INTRO_STATE, 4, LittlerootTown_BrendansHouse_1F_EventScript_152789 LittlerootTown_BrendansHouse_1F_MapEvents:: @ 8385714 map_events LittlerootTown_BrendansHouse_1F_EventObjects, LittlerootTown_BrendansHouse_1F_MapWarps, LittlerootTown_BrendansHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc index eebc7b989..e9e62d25a 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/header.inc @@ -5,10 +5,10 @@ LittlerootTown_BrendansHouse_1F:: @ 8305A30 .4byte 0x0 .2byte MUS_MISHIRO .2byte 54 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc index 2e4c4b6ae..82215977c 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/events.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/events.inc @@ -1,27 +1,27 @@ LittlerootTown_BrendansHouse_2F_EventObjects:: @ 8385728 - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 3, 7, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, FLAG_HIDE_BRENDAN_UPSTAIRS - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 4, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 1, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 2, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 3, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 4, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 5, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, 8, 1, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152A9D, FLAG_HIDE_BRENDAN_UPSTAIRS + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 1, 0, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 1, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 5, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 7, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS LittlerootTown_BrendansHouse_2F_MapWarps:: @ 8385878 warp_def 7, 1, 0, 2, MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F LittlerootTown_BrendansHouse_2F_MapBGEvents:: @ 8385880 - bg_event 0, 1, 0, 1, 0, LittlerootTown_BrendansHouse_2F_EventScript_15281E - bg_event 1, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152867 - bg_event 5, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_1B69D3 - bg_event 3, 1, 0, 0, 0, LittlerootTown_BrendansHouse_2F_EventScript_152870 + bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_BrendansHouse_2F_EventScript_15281E + bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_152867 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_1B69D3 + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_BrendansHouse_2F_EventScript_152870 LittlerootTown_BrendansHouse_2F_MapEvents:: @ 83858B0 map_events LittlerootTown_BrendansHouse_2F_EventObjects, LittlerootTown_BrendansHouse_2F_MapWarps, 0x0, LittlerootTown_BrendansHouse_2F_MapBGEvents diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc index 660c1e08e..504504c57 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/header.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/header.inc @@ -5,10 +5,10 @@ LittlerootTown_BrendansHouse_2F:: @ 8305A4C .4byte 0x0 .2byte MUS_MISHIRO .2byte 55 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_MaysHouse_1F/events.inc b/data/maps/LittlerootTown_MaysHouse_1F/events.inc index 353dc00a8..e31790eb9 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/events.inc @@ -1,9 +1,9 @@ LittlerootTown_MaysHouse_1F_EventObjects:: @ 83858C4 - object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, FLAG_HIDE_MAY_MOM_DOWNSTAIRS - object_event 2, EVENT_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 5, 3, 65, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1 - object_event 3, EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 3, 3, 27, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 7, 3, 9, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, FLAG_HIDE_MAY_MOM - object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, 10, 1, 1, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT + object_event 1, EVENT_OBJ_GFX_MOM, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6BE9, FLAG_HIDE_MAY_MOM_DOWNSTAIRS + object_event 2, EVENT_OBJ_GFX_MACHOKE_FACING_AWAY, 0, 6, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CA6, FLAG_HIDE_MACHOKE_MOVER_1 + object_event 3, EVENT_OBJ_GFX_MACHOKE_CARRYING_BOX, 0, 9, 3, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 3, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1B6CB9, FLAG_HIDE_MACHOKE_MOVER_2 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, LittlerootTown_MaysHouse_1F_EventScript_1529EB, FLAG_HIDE_MAY_MOM + object_event 5, EVENT_OBJ_GFX_NORMAN, 0, 5, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_NORMAN_LITTLEROOT LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C warp_def 1, 8, 0, 0, MAP_LITTLEROOT_TOWN @@ -11,7 +11,7 @@ LittlerootTown_MaysHouse_1F_MapWarps:: @ 838593C warp_def 2, 2, 0, 0, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F LittlerootTown_MaysHouse_1F_MapCoordEvents:: @ 8385954 - coord_event 2, 8, 0, 0, VAR_LITTLEROOT_INTRO_STATE, 4, 0, LittlerootTown_MaysHouse_1F_EventScript_152A35 + coord_event 2, 8, 0, VAR_LITTLEROOT_INTRO_STATE, 4, LittlerootTown_MaysHouse_1F_EventScript_152A35 LittlerootTown_MaysHouse_1F_MapEvents:: @ 8385964 map_events LittlerootTown_MaysHouse_1F_EventObjects, LittlerootTown_MaysHouse_1F_MapWarps, LittlerootTown_MaysHouse_1F_MapCoordEvents, 0x0 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/header.inc b/data/maps/LittlerootTown_MaysHouse_1F/header.inc index 329380b39..cbf0cc22b 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/header.inc @@ -5,10 +5,10 @@ LittlerootTown_MaysHouse_1F:: @ 8305A68 .4byte 0x0 .2byte MUS_MISHIRO .2byte 56 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_MaysHouse_2F/events.inc b/data/maps/LittlerootTown_MaysHouse_2F/events.inc index 98a144305..b0c88e6b7 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/events.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/events.inc @@ -1,28 +1,28 @@ LittlerootTown_MaysHouse_2F_EventObjects:: @ 8385978 - object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 2, 3, 7, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, FLAG_HIDE_MAY_UPSTAIRS - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 6, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 1, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 2, 6, 0, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 3, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 4, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 5, 6, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 2, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 3, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 4, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 5, 7, 3, 1, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, 8, 1, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS - object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAY_PICHU_DOLL + object_event 1, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152A9D, FLAG_HIDE_MAY_UPSTAIRS + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 1, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 2, 6, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 4, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 5, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 2, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 3, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_MOM, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_MOM_UPSTAIRS + object_event 15, EVENT_OBJ_GFX_PICHU_DOLL, 0, 3, 4, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_MAY_PICHU_DOLL LittlerootTown_MaysHouse_2F_MapWarps:: @ 8385AE0 warp_def 1, 1, 0, 2, MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F LittlerootTown_MaysHouse_2F_MapBGEvents:: @ 8385AE8 - bg_event 5, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152870 - bg_event 7, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152867 - bg_event 3, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_1B69DF - bg_event 8, 1, 0, 0, 0, LittlerootTown_MaysHouse_2F_EventScript_152C39 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_152870 + bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_152867 + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_1B69DF + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_MaysHouse_2F_EventScript_152C39 LittlerootTown_MaysHouse_2F_MapEvents:: @ 8385B18 map_events LittlerootTown_MaysHouse_2F_EventObjects, LittlerootTown_MaysHouse_2F_MapWarps, 0x0, LittlerootTown_MaysHouse_2F_MapBGEvents diff --git a/data/maps/LittlerootTown_MaysHouse_2F/header.inc b/data/maps/LittlerootTown_MaysHouse_2F/header.inc index cfb150c46..c67985a20 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/header.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/header.inc @@ -5,10 +5,10 @@ LittlerootTown_MaysHouse_2F:: @ 8305A84 .4byte 0x0 .2byte MUS_MISHIRO .2byte 57 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc index bca8009b5..e7cdfad32 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/events.inc @@ -1,28 +1,28 @@ LittlerootTown_ProfessorBirchsLab_EventObjects:: @ 8385B2C - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, 2, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D63, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, FLAG_HIDE_BIRCH_IN_LAB - object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 3, 8, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, FLAG_HIDE_RIVAL_BIRCH_LAB + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 9, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D63, 0 + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152D9A, FLAG_HIDE_BIRCH_IN_LAB + object_event 3, EVENT_OBJ_GFX_VAR_0, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EA3, FLAG_HIDE_RIVAL_BIRCH_LAB LittlerootTown_ProfessorBirchsLab_MapWarps:: @ 8385B74 warp_def 6, 12, 0, 2, MAP_LITTLEROOT_TOWN warp_def 7, 12, 0, 2, MAP_LITTLEROOT_TOWN LittlerootTown_ProfessorBirchsLab_MapBGEvents:: @ 8385B84 - bg_event 10, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A - bg_event 11, 7, 0, 1, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A - bg_event 7, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2 - bg_event 8, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2 - bg_event 1, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 0, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 1, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 2, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 3, 7, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 - bg_event 4, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 3, 1, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 1, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 1, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 11, 10, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 - bg_event 11, 9, 0, 0, 0, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 10, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A + bg_event 11, 7, 0, BG_EVENT_PLAYER_FACING_NORTH, LittlerootTown_ProfessorBirchsLab_EventScript_152E9A + bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2 + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152EE2 + bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 0, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 1, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED9 + bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 1, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 1, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 11, 10, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, LittlerootTown_ProfessorBirchsLab_EventScript_152ED0 LittlerootTown_ProfessorBirchsLab_MapEvents:: @ 8385C38 map_events LittlerootTown_ProfessorBirchsLab_EventObjects, LittlerootTown_ProfessorBirchsLab_MapWarps, 0x0, LittlerootTown_ProfessorBirchsLab_MapBGEvents diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc index 1961431b9..d07616c83 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/header.inc @@ -5,10 +5,10 @@ LittlerootTown_ProfessorBirchsLab:: @ 8305AA0 .4byte 0x0 .2byte MUS_ODAMAKI .2byte 58 + .byte MAPSEC_LITTLEROOT_TOWN .byte 0 - .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MagmaHideout_1F/events.inc b/data/maps/MagmaHideout_1F/events.inc index 362d9b719..b9ae7e567 100644 --- a/data/maps/MagmaHideout_1F/events.inc +++ b/data/maps/MagmaHideout_1F/events.inc @@ -1,7 +1,7 @@ MagmaHideout_1F_EventObjects:: @ 838E9BC - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 13, 19, 3, 8, 1, 1, 0, 0, MagmaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 14, 19, 3, 8, 1, 1, 0, 0, MagmaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 20, 3, 3, 50, 14, 6, 1, 3, MagmaHideout_1F_EventScript_15D80C, 0 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 13, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MagmaHideout_1F_EventScript_15D7CE, FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 14, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MagmaHideout_1F_EventScript_15D7ED, FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 20, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 14, 6, 1, 3, MagmaHideout_1F_EventScript_15D80C, 0 MagmaHideout_1F_MapWarps:: @ 838EA04 warp_def 13, 27, 1, 14, MAP_LILYCOVE_CITY diff --git a/data/maps/MagmaHideout_1F/header.inc b/data/maps/MagmaHideout_1F/header.inc index c236bdae1..b2235e2e5 100644 --- a/data/maps/MagmaHideout_1F/header.inc +++ b/data/maps/MagmaHideout_1F/header.inc @@ -5,10 +5,10 @@ MagmaHideout_1F:: @ 8307588 .4byte 0x0 .2byte MUS_AJITO .2byte 317 - .byte 66 + .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 2 + .byte MAP_BATTLE_SCENE_MAGMA diff --git a/data/maps/MagmaHideout_B1F/events.inc b/data/maps/MagmaHideout_B1F/events.inc index 5e4c3a078..1301f69f4 100644 --- a/data/maps/MagmaHideout_B1F/events.inc +++ b/data/maps/MagmaHideout_B1F/events.inc @@ -1,12 +1,12 @@ MagmaHideout_B1F_EventObjects:: @ 838EA28 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 33, 3, 3, 9, 1, 1, 1, 5, MagmaHideout_B1F_EventScript_15D850, 0 - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 41, 17, 3, 23, 1, 1, 1, 3, MagmaHideout_B1F_EventScript_15D875, 0 - object_event 3, EVENT_OBJ_GFX_VAR_2, 0, 33, 19, 3, 27, 4, 1, 1, 3, MagmaHideout_B1F_EventScript_15D89A, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 10, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, FLAG_ITEM_MAGMA_HIDEOUT_B1F_1 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 18, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, FLAG_ITEM_MAGMA_HIDEOUT_B1F_2 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 10, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 11, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, FLAG_ITEM_MAGMA_HIDEOUT_B1F_3 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 11, 3, 1, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 33, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 5, MagmaHideout_B1F_EventScript_15D850, 0 + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 41, 17, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 3, MagmaHideout_B1F_EventScript_15D875, 0 + object_event 3, EVENT_OBJ_GFX_VAR_2, 0, 33, 19, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 4, 1, 1, 3, MagmaHideout_B1F_EventScript_15D89A, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19C2, FLAG_ITEM_MAGMA_HIDEOUT_B1F_1 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19DC, FLAG_ITEM_MAGMA_HIDEOUT_B1F_2 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1A04FD, FLAG_HIDE_ELECTRODE_1_HIDEOUT + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1B19CF, FLAG_ITEM_MAGMA_HIDEOUT_B1F_3 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MagmaHideout_B1F_EventScript_1A051B, FLAG_HIDE_ELECTRODE_2_HIDEOUT MagmaHideout_B1F_MapWarps:: @ 838EAE8 warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_1F diff --git a/data/maps/MagmaHideout_B1F/header.inc b/data/maps/MagmaHideout_B1F/header.inc index 18a1bd49c..2a64f4324 100644 --- a/data/maps/MagmaHideout_B1F/header.inc +++ b/data/maps/MagmaHideout_B1F/header.inc @@ -5,10 +5,10 @@ MagmaHideout_B1F:: @ 83075A4 .4byte 0x0 .2byte MUS_AJITO .2byte 318 - .byte 66 + .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 2 + .byte MAP_BATTLE_SCENE_MAGMA diff --git a/data/maps/MagmaHideout_B2F/events.inc b/data/maps/MagmaHideout_B2F/events.inc index 111b97e42..f4d2b459e 100644 --- a/data/maps/MagmaHideout_B2F/events.inc +++ b/data/maps/MagmaHideout_B2F/events.inc @@ -1,9 +1,9 @@ MagmaHideout_B2F_EventObjects:: @ 838EBE4 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 8, 19, 3, 10, 1, 1, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 31, 11, 3, 51, 7, 4, 1, 3, MagmaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 3, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 20, 1, 10, 1, 1, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 13, 3, 3, 9, 1, 1, 1, 4, MagmaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 20, 3, 8, 1, 1, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, FLAG_ITEM_MAGMA_HIDEOUT_B2F_1 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 8, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MagmaHideout_B2F_EventScript_15D8E1, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 31, 11, 3, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 7, 4, 1, 3, MagmaHideout_B2F_EventScript_15D962, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 3, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 12, 20, 1, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_HIDEOUT + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 13, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, MagmaHideout_B2F_EventScript_15D987, FLAG_HIDE_GRUNTS_HIDEOUTS + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MagmaHideout_B2F_EventScript_1B19E9, FLAG_ITEM_MAGMA_HIDEOUT_B2F_1 MagmaHideout_B2F_MapWarps:: @ 838EC5C warp_def 3, 3, 3, 1, MAP_MAGMA_HIDEOUT_B1F @@ -16,10 +16,10 @@ MagmaHideout_B2F_MapWarps:: @ 838EC5C warp_def 31, 16, 3, 6, MAP_MAGMA_HIDEOUT_B2F MagmaHideout_B2F_MapCoordEvents:: @ 838EC9C - coord_event 7, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD - coord_event 6, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD - coord_event 5, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD - coord_event 4, 16, 3, 0, VAR_TEMP_1, 0, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 7, 16, 3, VAR_TEMP_1, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 6, 16, 3, VAR_TEMP_1, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 5, 16, 3, VAR_TEMP_1, 0, MagmaHideout_B2F_EventScript_15D8BD + coord_event 4, 16, 3, VAR_TEMP_1, 0, MagmaHideout_B2F_EventScript_15D8BD MagmaHideout_B2F_MapEvents:: @ 838ECDC map_events MagmaHideout_B2F_EventObjects, MagmaHideout_B2F_MapWarps, MagmaHideout_B2F_MapCoordEvents, 0x0 diff --git a/data/maps/MagmaHideout_B2F/header.inc b/data/maps/MagmaHideout_B2F/header.inc index 6cb9a6a47..adfd83008 100644 --- a/data/maps/MagmaHideout_B2F/header.inc +++ b/data/maps/MagmaHideout_B2F/header.inc @@ -5,10 +5,10 @@ MagmaHideout_B2F:: @ 83075C0 .4byte 0x0 .2byte MUS_AJITO .2byte 319 - .byte 66 + .byte MAPSEC_EVIL_TEAM_HIDEOUT .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 2 + .byte MAP_BATTLE_SCENE_MAGMA diff --git a/data/maps/MauvilleCity/events.inc b/data/maps/MauvilleCity/events.inc index 6b26c7973..cd0d99bbf 100644 --- a/data/maps/MauvilleCity/events.inc +++ b/data/maps/MauvilleCity/events.inc @@ -1,13 +1,13 @@ MauvilleCity_EventObjects:: @ 837FB90 - object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, 5, 1, 1, 0, 0, MauvilleCity_EventScript_14C05A, 0 - object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 24, 10, 3, 5, 1, 0, 0, 0, MauvilleCity_EventScript_14C075, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, 10, 0, 0, 0, 0, MauvilleCity_EventScript_14C063, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_14C06C, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, 8, 0, 0, 0, 0, MauvilleCity_EventScript_14C0A2, 0 - object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, 7, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, FLAG_HIDE_WALLY_MAUVILLE - object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, 9, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, FLAG_HIDE_WALLY_FATHER_MAUVILLE - object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, 1, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, FLAG_HIDE_WATTSON_MAUVILLE - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, 1, 1, 1, 0, 0, MauvilleCity_EventScript_1B171E, FLAG_ITEM_MAUVILLE_1 + object_event 1, EVENT_OBJ_GFX_BOY_3, 0, 29, 16, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, MauvilleCity_EventScript_14C05A, 0 + object_event 2, EVENT_OBJ_GFX_BOY_4, 0, 24, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MauvilleCity_EventScript_14C075, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_EventScript_14C063, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_14C06C, 0 + object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 17, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_EventScript_14C0A2, 0 + object_event 6, EVENT_OBJ_GFX_WALLY, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MauvilleCity_EventScript_14C0F9, FLAG_HIDE_WALLY_MAUVILLE + object_event 7, EVENT_OBJ_GFX_MAN_3, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_EventScript_14C0C4, FLAG_HIDE_WALLY_FATHER_MAUVILLE + object_event 8, EVENT_OBJ_GFX_WATTSON, 0, 29, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_EventScript_14C2F2, FLAG_HIDE_WATTSON_MAUVILLE + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_EventScript_1B171E, FLAG_ITEM_MAUVILLE_1 MauvilleCity_MapWarps:: @ 837FC68 warp_def 8, 5, 0, 0, MAP_MAUVILLE_CITY_GYM @@ -19,14 +19,14 @@ MauvilleCity_MapWarps:: @ 837FC68 warp_def 19, 14, 0, 0, MAP_MAUVILLE_CITY_HOUSE2 MauvilleCity_MapBGEvents:: @ 837FCA0 - bg_event 23, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA - bg_event 11, 6, 3, 0, 0, MauvilleCity_EventScript_14C087 - bg_event 24, 14, 0, 1, 0, MauvilleCity_EventScript_1A00E1 - bg_event 25, 14, 0, 1, 0, MauvilleCity_EventScript_1A00E1 - bg_event 24, 5, 0, 1, 0, MauvilleCity_EventScript_1A00EA - bg_event 19, 7, 0, 0, 0, MauvilleCity_EventScript_14C07E - bg_event 33, 6, 0, 0, 0, MauvilleCity_EventScript_14C090 - bg_event 11, 15, 0, 0, 0, MauvilleCity_EventScript_14C099 + bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_1A00EA + bg_event 11, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_14C087 + bg_event 24, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_1A00E1 + bg_event 25, 14, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_1A00E1 + bg_event 24, 5, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_EventScript_1A00EA + bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_14C07E + bg_event 33, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_14C090 + bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_EventScript_14C099 MauvilleCity_MapEvents:: @ 837FD00 map_events MauvilleCity_EventObjects, MauvilleCity_MapWarps, 0x0, MauvilleCity_MapBGEvents diff --git a/data/maps/MauvilleCity/header.inc b/data/maps/MauvilleCity/header.inc index 9ea461f4c..73d8c1330 100644 --- a/data/maps/MauvilleCity/header.inc +++ b/data/maps/MauvilleCity/header.inc @@ -5,10 +5,10 @@ MauvilleCity:: @ 8305480 .4byte MauvilleCity_MapConnections .2byte MUS_GOTOWN .2byte 3 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 2 - .byte 2 + .byte WEATHER_SUNNY + .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index bd4f8ab3d..f5eb064e5 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -160,7 +160,7 @@ MauvilleCity_EventScript_14C22B:: @ 814C22B MauvilleCity_EventScript_14C23C:: @ 814C23C msgbox MauvilleCity_Text_165F0D, 4 - trainerbattle 3, OPPONENT_WALLY_2, 0, MauvilleCity_Text_165F38 + trainerbattle 3, TRAINER_WALLY_2, 0, MauvilleCity_Text_165F38 applymovement 6, MauvilleCity_Movement_1A0843 waitmovement 0 msgbox MauvilleCity_Text_165F85, 4 diff --git a/data/maps/MauvilleCity_BikeShop/events.inc b/data/maps/MauvilleCity_BikeShop/events.inc index 83b5f66d8..242db7632 100644 --- a/data/maps/MauvilleCity_BikeShop/events.inc +++ b/data/maps/MauvilleCity_BikeShop/events.inc @@ -1,14 +1,14 @@ MauvilleCity_BikeShop_EventObjects:: @ 8388318 - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156796, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 6, 3, 2, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_15690B, 0 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156796, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 7, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MauvilleCity_BikeShop_EventScript_15690B, 0 MauvilleCity_BikeShop_MapWarps:: @ 8388348 warp_def 3, 8, 0, 2, MAP_MAUVILLE_CITY warp_def 4, 8, 0, 2, MAP_MAUVILLE_CITY MauvilleCity_BikeShop_MapBGEvents:: @ 8388358 - bg_event 8, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156914 - bg_event 11, 1, 0, 0, 0, MauvilleCity_BikeShop_EventScript_156988 + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_156914 + bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_BikeShop_EventScript_156988 MauvilleCity_BikeShop_MapEvents:: @ 8388370 map_events MauvilleCity_BikeShop_EventObjects, MauvilleCity_BikeShop_MapWarps, 0x0, MauvilleCity_BikeShop_MapBGEvents diff --git a/data/maps/MauvilleCity_BikeShop/header.inc b/data/maps/MauvilleCity_BikeShop/header.inc index a1e3e56bc..5d27cb8e7 100644 --- a/data/maps/MauvilleCity_BikeShop/header.inc +++ b/data/maps/MauvilleCity_BikeShop/header.inc @@ -5,10 +5,10 @@ MauvilleCity_BikeShop:: @ 8306168 .4byte 0x0 .2byte MUS_GOTOWN .2byte 90 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_GameCorner/events.inc b/data/maps/MauvilleCity_GameCorner/events.inc index 7b789a34e..521074d8e 100644 --- a/data/maps/MauvilleCity_GameCorner/events.inc +++ b/data/maps/MauvilleCity_GameCorner/events.inc @@ -1,46 +1,46 @@ MauvilleCity_GameCorner_EventObjects:: @ 83883C0 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F84, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F8D, 0 - object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156A34, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156B6C, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F96, 0 - object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 19, 4, 3, 8, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_15707C, 0 - object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 20, 8, 3, 9, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570D8, 0 - object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, 10, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570E8, 0 - object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, 8, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_156D1A, 0 - object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, 10, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_1570F8, 0 - object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, 9, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_157115, 0 - object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 6, 3, 9, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_157125, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F84, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 16, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F8D, 0 + object_event 3, EVENT_OBJ_GFX_BEAUTY, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156A34, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156B6C, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_2, 0, 7, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_156F96, 0 + object_event 6, EVENT_OBJ_GFX_MAN_3, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_15707C, 0 + object_event 7, EVENT_OBJ_GFX_OLD_MAN_2, 0, 20, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570D8, 0 + object_event 8, EVENT_OBJ_GFX_COOK, 0, 6, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1570E8, 0 + object_event 9, EVENT_OBJ_GFX_BEAUTY, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_156D1A, 0 + object_event 10, EVENT_OBJ_GFX_MAN_4, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_1570F8, 0 + object_event 11, EVENT_OBJ_GFX_MANIAC, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_157115, 0 + object_event 12, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MauvilleCity_GameCorner_EventScript_157125, 0 MauvilleCity_GameCorner_MapWarps:: @ 83884E0 warp_def 11, 10, 3, 5, MAP_MAUVILLE_CITY warp_def 12, 10, 3, 5, MAP_MAUVILLE_CITY MauvilleCity_GameCorner_MapBGEvents:: @ 83884F0 - bg_event 2, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157135 - bg_event 2, 8, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157155 - bg_event 2, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157175 - bg_event 3, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157195 - bg_event 3, 8, 0, 4, 0, MauvilleCity_GameCorner_EventScript_1571B5 - bg_event 3, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_1571D5 - bg_event 7, 6, 0, 3, 0, MauvilleCity_GameCorner_EventScript_1571F5 - bg_event 7, 7, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157215 - bg_event 7, 9, 0, 3, 0, MauvilleCity_GameCorner_EventScript_157235 - bg_event 8, 6, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157255 - bg_event 8, 7, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157275 - bg_event 8, 9, 0, 4, 0, MauvilleCity_GameCorner_EventScript_157295 - bg_event 14, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 15, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 14, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 15, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 14, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 15, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C407E - bg_event 18, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 19, 6, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 18, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 19, 7, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 18, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC - bg_event 19, 8, 0, 0, 0, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 2, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_157135 + bg_event 2, 8, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_157155 + bg_event 2, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_157175 + bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_157195 + bg_event 3, 8, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_1571B5 + bg_event 3, 9, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_1571D5 + bg_event 7, 6, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_1571F5 + bg_event 7, 7, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_157215 + bg_event 7, 9, 0, BG_EVENT_PLAYER_FACING_EAST, MauvilleCity_GameCorner_EventScript_157235 + bg_event 8, 6, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_157255 + bg_event 8, 7, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_157275 + bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_WEST, MauvilleCity_GameCorner_EventScript_157295 + bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 14, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 15, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 15, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C407E + bg_event 18, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 19, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 19, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 18, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C40AC + bg_event 19, 8, 0, BG_EVENT_PLAYER_FACING_ANY, MauvilleCity_GameCorner_EventScript_1C40AC MauvilleCity_GameCorner_MapEvents:: @ 8388610 map_events MauvilleCity_GameCorner_EventObjects, MauvilleCity_GameCorner_MapWarps, 0x0, MauvilleCity_GameCorner_MapBGEvents diff --git a/data/maps/MauvilleCity_GameCorner/header.inc b/data/maps/MauvilleCity_GameCorner/header.inc index 7e9bb00fa..436a96c9c 100644 --- a/data/maps/MauvilleCity_GameCorner/header.inc +++ b/data/maps/MauvilleCity_GameCorner/header.inc @@ -5,10 +5,10 @@ MauvilleCity_GameCorner:: @ 83061A0 .4byte 0x0 .2byte MUS_CASINO .2byte 91 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_Gym/events.inc b/data/maps/MauvilleCity_Gym/events.inc index cfcbbc4c6..0d0104cf6 100644 --- a/data/maps/MauvilleCity_Gym/events.inc +++ b/data/maps/MauvilleCity_Gym/events.inc @@ -1,23 +1,23 @@ MauvilleCity_Gym_EventObjects:: @ 838821C - object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 4, 3, 3, 8, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_1565AB, FLAG_HIDE_WATTSON_MAUVILLE_GYM - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 6, 9, 3, 9, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_1566FD, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 7, 11, 3, 8, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_15672B, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 1, 13, 3, 10, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_156714, 0 - object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 2, 15, 3, 8, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_1566E6, 0 - object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 3, 9, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_156742, 0 + object_event 1, EVENT_OBJ_GFX_WATTSON, 0, 4, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_1565AB, FLAG_HIDE_WATTSON_MAUVILLE_GYM + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 6, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_1566FD, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_15672B, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 1, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, MauvilleCity_Gym_EventScript_156714, 0 + object_event 5, EVENT_OBJ_GFX_MAN_6, 0, 2, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, MauvilleCity_Gym_EventScript_1566E6, 0 + object_event 6, EVENT_OBJ_GFX_MAN_2, 0, 7, 20, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_Gym_EventScript_156742, 0 MauvilleCity_Gym_MapWarps:: @ 83882AC warp_def 4, 20, 0, 0, MAP_MAUVILLE_CITY warp_def 5, 20, 0, 0, MAP_MAUVILLE_CITY MauvilleCity_Gym_MapCoordEvents:: @ 83882BC - coord_event 0, 9, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_15664B - coord_event 8, 11, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_156670 - coord_event 4, 15, 3, 0, VAR_TEMP_0, 0, 0, MauvilleCity_Gym_EventScript_156695 + coord_event 0, 9, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_15664B + coord_event 8, 11, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_156670 + coord_event 4, 15, 3, VAR_TEMP_0, 0, MauvilleCity_Gym_EventScript_156695 MauvilleCity_Gym_MapBGEvents:: @ 83882EC - bg_event 3, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_156761 - bg_event 6, 18, 0, 1, 0, MauvilleCity_Gym_EventScript_156771 + bg_event 3, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_156761 + bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MauvilleCity_Gym_EventScript_156771 MauvilleCity_Gym_MapEvents:: @ 8388304 map_events MauvilleCity_Gym_EventObjects, MauvilleCity_Gym_MapWarps, MauvilleCity_Gym_MapCoordEvents, MauvilleCity_Gym_MapBGEvents diff --git a/data/maps/MauvilleCity_Gym/header.inc b/data/maps/MauvilleCity_Gym/header.inc index a52423319..3dca4129a 100644 --- a/data/maps/MauvilleCity_Gym/header.inc +++ b/data/maps/MauvilleCity_Gym/header.inc @@ -5,10 +5,10 @@ MauvilleCity_Gym:: @ 830614C .4byte 0x0 .2byte MUS_GIM .2byte 89 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index d9b8aced7..ae10eadfd 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -66,7 +66,7 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 end MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB - trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB + trainerbattle 1, TRAINER_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_15661D compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 @@ -161,22 +161,22 @@ MauvilleCity_Gym_EventScript_1566E1:: @ 81566E1 end MauvilleCity_Gym_EventScript_1566E6:: @ 81566E6 - trainerbattle 0, OPPONENT_KIRK, 0, MauvilleCity_Gym_Text_180956, MauvilleCity_Gym_Text_180997 + trainerbattle 0, TRAINER_KIRK, 0, MauvilleCity_Gym_Text_180956, MauvilleCity_Gym_Text_180997 msgbox MauvilleCity_Gym_Text_1809D1, 6 end MauvilleCity_Gym_EventScript_1566FD:: @ 81566FD - trainerbattle 0, OPPONENT_SHAWN, 0, MauvilleCity_Gym_Text_180A05, MauvilleCity_Gym_Text_180A42 + trainerbattle 0, TRAINER_SHAWN, 0, MauvilleCity_Gym_Text_180A05, MauvilleCity_Gym_Text_180A42 msgbox MauvilleCity_Gym_Text_180A5E, 6 end MauvilleCity_Gym_EventScript_156714:: @ 8156714 - trainerbattle 0, OPPONENT_BEN, 0, MauvilleCity_Gym_Text_180AE0, MauvilleCity_Gym_Text_180B06 + trainerbattle 0, TRAINER_BEN, 0, MauvilleCity_Gym_Text_180AE0, MauvilleCity_Gym_Text_180B06 msgbox MauvilleCity_Gym_Text_180B1D, 6 end MauvilleCity_Gym_EventScript_15672B:: @ 815672B - trainerbattle 0, OPPONENT_VIVIAN, 0, MauvilleCity_Gym_Text_180B5A, MauvilleCity_Gym_Text_180B93 + trainerbattle 0, TRAINER_VIVIAN, 0, MauvilleCity_Gym_Text_180B5A, MauvilleCity_Gym_Text_180B93 msgbox MauvilleCity_Gym_Text_180BAE, 6 end diff --git a/data/maps/MauvilleCity_House1/events.inc b/data/maps/MauvilleCity_House1/events.inc index 07044121d..1555f7069 100644 --- a/data/maps/MauvilleCity_House1/events.inc +++ b/data/maps/MauvilleCity_House1/events.inc @@ -1,5 +1,5 @@ MauvilleCity_House1_EventObjects:: @ 8388384 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_House1_EventScript_1569FD, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_House1_EventScript_1569FD, 0 MauvilleCity_House1_MapWarps:: @ 838839C warp_def 3, 7, 0, 4, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_House1/header.inc b/data/maps/MauvilleCity_House1/header.inc index 0d464b6c0..d9e54375d 100644 --- a/data/maps/MauvilleCity_House1/header.inc +++ b/data/maps/MauvilleCity_House1/header.inc @@ -5,10 +5,10 @@ MauvilleCity_House1:: @ 8306184 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_House2/events.inc b/data/maps/MauvilleCity_House2/events.inc index 58d8d5a24..8b44f4f1a 100644 --- a/data/maps/MauvilleCity_House2/events.inc +++ b/data/maps/MauvilleCity_House2/events.inc @@ -1,5 +1,5 @@ MauvilleCity_House2_EventObjects:: @ 8388624 - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 5, 3, 9, 0, 0, 0, 0, MauvilleCity_House2_EventScript_1572C0, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MauvilleCity_House2_EventScript_1572C0, 0 MauvilleCity_House2_MapWarps:: @ 838863C warp_def 3, 8, 0, 6, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_House2/header.inc b/data/maps/MauvilleCity_House2/header.inc index 7a8c72f6e..395e22561 100644 --- a/data/maps/MauvilleCity_House2/header.inc +++ b/data/maps/MauvilleCity_House2/header.inc @@ -5,10 +5,10 @@ MauvilleCity_House2:: @ 83061BC .4byte 0x0 .2byte MUS_GOTOWN .2byte 59 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_Mart/events.inc b/data/maps/MauvilleCity_Mart/events.inc index cb8397726..15ad6437c 100644 --- a/data/maps/MauvilleCity_Mart/events.inc +++ b/data/maps/MauvilleCity_Mart/events.inc @@ -1,7 +1,7 @@ MauvilleCity_Mart_EventObjects:: @ 83887A0 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573BE, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573F4, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 10, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573FD, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573BE, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573F4, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MauvilleCity_Mart_EventScript_1573FD, 0 MauvilleCity_Mart_MapWarps:: @ 83887E8 warp_def 3, 7, 0, 3, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_Mart/header.inc b/data/maps/MauvilleCity_Mart/header.inc index 169089f69..3f81ded38 100644 --- a/data/maps/MauvilleCity_Mart/header.inc +++ b/data/maps/MauvilleCity_Mart/header.inc @@ -5,10 +5,10 @@ MauvilleCity_Mart:: @ 8306210 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc index 30f702a6f..966cc2b8a 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/events.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/events.inc @@ -1,9 +1,9 @@ MauvilleCity_PokemonCenter_1F_EventObjects:: @ 8388660 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157369, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 3, 3, 9, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE744, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, 1, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157377, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 4, 3, 3, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157380, 0 - object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, 1, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157389, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157369, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_1AE744, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157377, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157380, 0 + object_event 5, EVENT_OBJ_GFX_YOUNGSTER, 0, 2, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MauvilleCity_PokemonCenter_1F_EventScript_157389, 0 MauvilleCity_PokemonCenter_1F_MapWarps:: @ 83886D8 warp_def 7, 8, 3, 1, MAP_MAUVILLE_CITY diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc index 74cc8bfe2..3e3c3f730 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/header.inc @@ -5,10 +5,10 @@ MauvilleCity_PokemonCenter_1F:: @ 83061D8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc index 85590f9c2..817679cec 100644 --- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8157351 .byte 0 MauvilleCity_PokemonCenter_1F_MapScript1_157357:: @ 8157357 - setrespawn 5 + setrespawn HEAL_LOCATION_MAUVILLE_CITY call MauvilleCity_PokemonCenter_1F_EventScript_19FD1B goto MauvilleCity_PokemonCenter_1F_EventScript_157365 end diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc index aef1d63ed..77bf817c7 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/events.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ MauvilleCity_PokemonCenter_2F_EventObjects:: @ 8388704 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A2, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A8, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573AE, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 6, 7, 3, 5, 1, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573B4, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A2, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573A8, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573AE, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 6, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MauvilleCity_PokemonCenter_2F_EventScript_1573B4, 0 MauvilleCity_PokemonCenter_2F_MapWarps:: @ 8388764 warp_def 1, 5, 4, 2, MAP_MAUVILLE_CITY_POKEMON_CENTER_1F diff --git a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc index fd7bf6a2d..48659f5c8 100644 --- a/data/maps/MauvilleCity_PokemonCenter_2F/header.inc +++ b/data/maps/MauvilleCity_PokemonCenter_2F/header.inc @@ -5,10 +5,10 @@ MauvilleCity_PokemonCenter_2F:: @ 83061F4 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 9 + .byte MAPSEC_MAUVILLE_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_1F_1R/events.inc b/data/maps/MeteorFalls_1F_1R/events.inc index 0b85c4e98..b3f3db1b0 100644 --- a/data/maps/MeteorFalls_1F_1R/events.inc +++ b/data/maps/MeteorFalls_1F_1R/events.inc @@ -1,14 +1,14 @@ MeteorFalls_1F_1R_EventObjects:: @ 838BACC - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B17FB, FLAG_ITEM_METEOR_FALLS_1F_1R_1 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, FLAG_ITEM_METEOR_FALLS_1F_1R_3 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, FLAG_ITEM_METEOR_FALLS_1F_1R_2 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, 1, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, FLAG_ITEM_METEOR_FALLS_1F_1R_4 - object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 12, 20, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F - object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 21, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F - object_event 7, EVENT_OBJ_GFX_VAR_7, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F - object_event 8, EVENT_OBJ_GFX_VAR_4, 0, 6, 20, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F - object_event 9, EVENT_OBJ_GFX_VAR_4, 0, 6, 21, 3, 1, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F - object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, 21, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, FLAG_HIDE_PROF_COSMO_METEOR_FALLS + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B17FB, FLAG_ITEM_METEOR_FALLS_1F_1R_1 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1815, FLAG_ITEM_METEOR_FALLS_1F_1R_3 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1808, FLAG_ITEM_METEOR_FALLS_1F_1R_2 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_1B1822, FLAG_ITEM_METEOR_FALLS_1F_1R_4 + object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 12, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_METEOR_FALLS_1F + object_event 7, EVENT_OBJ_GFX_VAR_7, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F + object_event 8, EVENT_OBJ_GFX_VAR_4, 0, 6, 20, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F + object_event 9, EVENT_OBJ_GFX_VAR_4, 0, 6, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_METEOR_FALLS_1F + object_event 10, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 0, 0, MeteorFalls_1F_1R_EventScript_15C656, FLAG_HIDE_PROF_COSMO_METEOR_FALLS MeteorFalls_1F_1R_MapWarps:: @ 838BBBC warp_def 27, 18, 4, 0, MAP_ROUTE114 @@ -18,11 +18,11 @@ MeteorFalls_1F_1R_MapWarps:: @ 838BBBC warp_def 26, 28, 3, 5, MAP_METEOR_FALLS_B1F_1R MeteorFalls_1F_1R_MapCoordEvents:: @ 838BBE4 - coord_event 14, 18, 4, 0, VAR_METEOR_FALLS_STATE, 0, 0, MeteorFalls_1F_1R_EventScript_15C49C + coord_event 14, 18, 4, VAR_METEOR_FALLS_STATE, 0, MeteorFalls_1F_1R_EventScript_15C49C MeteorFalls_1F_1R_MapBGEvents:: @ 838BBF4 - bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_1R_EventScript_14E842 - bg_event 9, 58, 0, 0, 0, 0x0 + bg_event 38, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, MeteorFalls_1F_1R_EventScript_14E842 + bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 MeteorFalls_1F_1R_MapEvents:: @ 838BC0C map_events MeteorFalls_1F_1R_EventObjects, MeteorFalls_1F_1R_MapWarps, MeteorFalls_1F_1R_MapCoordEvents, MeteorFalls_1F_1R_MapBGEvents diff --git a/data/maps/MeteorFalls_1F_1R/header.inc b/data/maps/MeteorFalls_1F_1R/header.inc index 506463120..d86635764 100644 --- a/data/maps/MeteorFalls_1F_1R/header.inc +++ b/data/maps/MeteorFalls_1F_1R/header.inc @@ -5,10 +5,10 @@ MeteorFalls_1F_1R:: @ 8306D70 .4byte 0x0 .2byte MUS_DAN03 .2byte 126 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_1F_2R/events.inc b/data/maps/MeteorFalls_1F_2R/events.inc index 5264fcb5e..b65223677 100644 --- a/data/maps/MeteorFalls_1F_2R/events.inc +++ b/data/maps/MeteorFalls_1F_2R/events.inc @@ -1,7 +1,7 @@ MeteorFalls_1F_2R_EventObjects:: @ 838BC20 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 13, 2, 3, 8, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_15C679, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 12, 3, 8, 1, 1, 1, 0, MeteorFalls_1F_2R_EventScript_15C6B7, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 12, 3, 8, 1, 1, 1, 0, MeteorFalls_1F_2R_EventScript_15C6FD, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MeteorFalls_1F_2R_EventScript_15C679, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 6, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MeteorFalls_1F_2R_EventScript_15C6B7, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MeteorFalls_1F_2R_EventScript_15C6FD, 0 MeteorFalls_1F_2R_MapWarps:: @ 838BC68 warp_def 10, 29, 3, 2, MAP_METEOR_FALLS_1F_1R @@ -10,8 +10,8 @@ MeteorFalls_1F_2R_MapWarps:: @ 838BC68 warp_def 21, 23, 3, 2, MAP_METEOR_FALLS_B1F_1R MeteorFalls_1F_2R_MapBGEvents:: @ 838BC88 - bg_event 38, 9, 0, 1, 0, MeteorFalls_1F_2R_EventScript_14E842 - bg_event 9, 58, 0, 0, 0, 0x0 + bg_event 38, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, MeteorFalls_1F_2R_EventScript_14E842 + bg_event 9, 58, 0, BG_EVENT_PLAYER_FACING_ANY, 0x0 MeteorFalls_1F_2R_MapEvents:: @ 838BCA0 map_events MeteorFalls_1F_2R_EventObjects, MeteorFalls_1F_2R_MapWarps, 0x0, MeteorFalls_1F_2R_MapBGEvents diff --git a/data/maps/MeteorFalls_1F_2R/header.inc b/data/maps/MeteorFalls_1F_2R/header.inc index f46645b7e..959c46b25 100644 --- a/data/maps/MeteorFalls_1F_2R/header.inc +++ b/data/maps/MeteorFalls_1F_2R/header.inc @@ -5,10 +5,10 @@ MeteorFalls_1F_2R:: @ 8306D8C .4byte 0x0 .2byte MUS_DAN03 .2byte 127 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_1F_2R/scripts.inc b/data/maps/MeteorFalls_1F_2R/scripts.inc index 49d629294..92b9f4661 100644 --- a/data/maps/MeteorFalls_1F_2R/scripts.inc +++ b/data/maps/MeteorFalls_1F_2R/scripts.inc @@ -2,7 +2,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 815C678 .byte 0 MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 - trainerbattle 0, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 + trainerbattle 0, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0 @@ -10,12 +10,12 @@ MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 end MeteorFalls_1F_2R_EventScript_15C6A0:: @ 815C6A0 - trainerbattle 5, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_193AB3, MeteorFalls_1F_2R_Text_193B21 + trainerbattle 5, TRAINER_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_193AB3, MeteorFalls_1F_2R_Text_193B21 msgbox MeteorFalls_1F_2R_Text_193B4C, 6 end MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 - trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F + trainerbattle 4, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2 @@ -23,12 +23,12 @@ MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 end MeteorFalls_1F_2R_EventScript_15C6E2:: @ 815C6E2 - trainerbattle 7, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193E75, MeteorFalls_1F_2R_Text_193ECE, MeteorFalls_1F_2R_Text_193F59 + trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193E75, MeteorFalls_1F_2R_Text_193ECE, MeteorFalls_1F_2R_Text_193F59 msgbox MeteorFalls_1F_2R_Text_193EF3, 6 end MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD - trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB + trainerbattle 4, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 @@ -36,6 +36,6 @@ MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD end MeteorFalls_1F_2R_EventScript_15C728:: @ 815C728 - trainerbattle 7, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193FCA, MeteorFalls_1F_2R_Text_19403A, MeteorFalls_1F_2R_Text_1940DF + trainerbattle 7, TRAINER_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193FCA, MeteorFalls_1F_2R_Text_19403A, MeteorFalls_1F_2R_Text_1940DF msgbox MeteorFalls_1F_2R_Text_194066, 6 end diff --git a/data/maps/MeteorFalls_B1F_1R/header.inc b/data/maps/MeteorFalls_B1F_1R/header.inc index 6e34052ce..aeeb6dcfa 100644 --- a/data/maps/MeteorFalls_B1F_1R/header.inc +++ b/data/maps/MeteorFalls_B1F_1R/header.inc @@ -5,10 +5,10 @@ MeteorFalls_B1F_1R:: @ 8306DA8 .4byte 0x0 .2byte MUS_DAN03 .2byte 128 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MeteorFalls_B1F_2R/events.inc b/data/maps/MeteorFalls_B1F_2R/events.inc index 964a6c447..5058ca6bd 100644 --- a/data/maps/MeteorFalls_B1F_2R/events.inc +++ b/data/maps/MeteorFalls_B1F_2R/events.inc @@ -1,5 +1,5 @@ MeteorFalls_B1F_2R_EventObjects:: @ 838BCF8 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, 1, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, FLAG_ITEM_METEOR_FALLS_B1F_2R_1 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MeteorFalls_B1F_2R_EventScript_1B182F, FLAG_ITEM_METEOR_FALLS_B1F_2R_1 MeteorFalls_B1F_2R_MapWarps:: @ 838BD10 warp_def 5, 15, 3, 3, MAP_METEOR_FALLS_B1F_1R diff --git a/data/maps/MeteorFalls_B1F_2R/header.inc b/data/maps/MeteorFalls_B1F_2R/header.inc index 487cf19e9..878187bcd 100644 --- a/data/maps/MeteorFalls_B1F_2R/header.inc +++ b/data/maps/MeteorFalls_B1F_2R/header.inc @@ -5,10 +5,10 @@ MeteorFalls_B1F_2R:: @ 8306DC4 .4byte 0x0 .2byte MUS_DAN03 .2byte 129 - .byte 63 + .byte MAPSEC_METEOR_FALLS .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity/events.inc b/data/maps/MossdeepCity/events.inc index 4803f9347..9880bbf87 100644 --- a/data/maps/MossdeepCity/events.inc +++ b/data/maps/MossdeepCity/events.inc @@ -1,13 +1,13 @@ MossdeepCity_EventObjects:: @ 838042C - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 42, 24, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_14CFB7, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 34, 5, 5, 1, 0, 0, 0, MossdeepCity_EventScript_14CFC9, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_14CFAE, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 21, 5, 3, 0, 1, 0, 0, MossdeepCity_EventScript_14CFC0, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, 9, 0, 0, 0, 0, MossdeepCity_EventScript_14CFD2, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, 1, 0, 0, 0, 0, MossdeepCity_EventScript_1B1745, FLAG_ITEM_MOSSDEEP_1 - object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 53, 5, 7, 7, 0, 0, 0, 0, MossdeepCity_EventScript_14D011, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 56, 21, 7, 10, 1, 1, 0, 0, MossdeepCity_EventScript_14CFDB, 0 - object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, 2, 1, 1, 0, 0, MossdeepCity_EventScript_14D027, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 42, 24, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_14CFB7, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 50, 34, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_EventScript_14CFC9, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 32, 12, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_14CFAE, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 26, 21, 5, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_EventScript_14CFC0, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 45, 18, 7, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_EventScript_14CFD2, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 62, 35, 5, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_EventScript_1B1745, FLAG_ITEM_MOSSDEEP_1 + object_event 7, EVENT_OBJ_GFX_MAN_1, 0, 53, 5, 7, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_EventScript_14D011, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 56, 21, 7, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MossdeepCity_EventScript_14CFDB, 0 + object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 23, 13, 5, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_EventScript_14D027, 0 MossdeepCity_MapWarps:: @ 8380504 warp_def 28, 9, 0, 0, MAP_MOSSDEEP_CITY_HOUSE1 @@ -22,20 +22,20 @@ MossdeepCity_MapWarps:: @ 8380504 warp_def 36, 24, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_1F MossdeepCity_MapCoordEvents:: @ 8380554 - coord_event 25, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 - coord_event 26, 25, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 - coord_event 32, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 - coord_event 33, 27, 0, 0, VAR_TEMP_1, 0, 0, MossdeepCity_EventScript_14D008 + coord_event 25, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_14D008 + coord_event 26, 25, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_14D008 + coord_event 32, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_14D008 + coord_event 33, 27, 0, VAR_TEMP_1, 0, MossdeepCity_EventScript_14D008 MossdeepCity_MapBGEvents:: @ 8380594 - bg_event 25, 16, 0, 0, 0, MossdeepCity_EventScript_14CFF6 - bg_event 34, 9, 0, 0, 0, MossdeepCity_EventScript_14CFED - bg_event 29, 16, 0, 1, 0, MossdeepCity_EventScript_1A00EA - bg_event 38, 18, 0, 1, 0, MossdeepCity_EventScript_1A00E1 - bg_event 66, 14, 0, 0, 0, MossdeepCity_EventScript_14CFFF - bg_event 30, 16, 0, 1, 0, MossdeepCity_EventScript_1A00EA - bg_event 39, 18, 0, 1, 0, MossdeepCity_EventScript_1A00E1 - bg_event 57, 21, 7, 0, 0, MossdeepCity_EventScript_14CFE4 + bg_event 25, 16, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_14CFF6 + bg_event 34, 9, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_14CFED + bg_event 29, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_1A00EA + bg_event 38, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_1A00E1 + bg_event 66, 14, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_14CFFF + bg_event 30, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_1A00EA + bg_event 39, 18, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_EventScript_1A00E1 + bg_event 57, 21, 7, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_EventScript_14CFE4 MossdeepCity_MapEvents:: @ 83805F4 map_events MossdeepCity_EventObjects, MossdeepCity_MapWarps, MossdeepCity_MapCoordEvents, MossdeepCity_MapBGEvents diff --git a/data/maps/MossdeepCity/header.inc b/data/maps/MossdeepCity/header.inc index 93aeb648a..36615e936 100644 --- a/data/maps/MossdeepCity/header.inc +++ b/data/maps/MossdeepCity/header.inc @@ -5,10 +5,10 @@ MossdeepCity:: @ 83054F0 .4byte MossdeepCity_MapConnections .2byte MUS_GOTOWN .2byte 7 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 2 - .byte 2 + .byte WEATHER_SUNNY + .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_GameCorner_1F/events.inc b/data/maps/MossdeepCity_GameCorner_1F/events.inc index 2d10740b1..9aa705e0e 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/events.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/events.inc @@ -1,5 +1,5 @@ MossdeepCity_GameCorner_1F_EventObjects:: @ 838AC6C - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AD42, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AD42, 0 MossdeepCity_GameCorner_1F_MapWarps:: @ 838AC84 warp_def 3, 7, 0, 9, MAP_MOSSDEEP_CITY @@ -7,7 +7,7 @@ MossdeepCity_GameCorner_1F_MapWarps:: @ 838AC84 warp_def 3, 1, 0, 0, MAP_MOSSDEEP_CITY_GAME_CORNER_B1F MossdeepCity_GameCorner_1F_MapBGEvents:: @ 838AC9C - bg_event 3, 1, 0, 0, 0, MossdeepCity_GameCorner_1F_EventScript_15AE4C + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_GameCorner_1F_EventScript_15AE4C MossdeepCity_GameCorner_1F_MapEvents:: @ 838ACA8 map_events MossdeepCity_GameCorner_1F_EventObjects, MossdeepCity_GameCorner_1F_MapWarps, 0x0, MossdeepCity_GameCorner_1F_MapBGEvents diff --git a/data/maps/MossdeepCity_GameCorner_1F/header.inc b/data/maps/MossdeepCity_GameCorner_1F/header.inc index dc11469e0..fd57180d1 100644 --- a/data/maps/MossdeepCity_GameCorner_1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_1F/header.inc @@ -5,10 +5,10 @@ MossdeepCity_GameCorner_1F:: @ 83068F4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 306 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_GameCorner_B1F/events.inc b/data/maps/MossdeepCity_GameCorner_B1F/events.inc index da6316421..e74b89a16 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/events.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/events.inc @@ -1,5 +1,5 @@ MossdeepCity_GameCorner_B1F_EventObjects:: @ 838ACBC - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 3, 9, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, 0 MossdeepCity_GameCorner_B1F_MapWarps:: @ 838ACD4 warp_def 3, 1, 0, 2, MAP_MOSSDEEP_CITY_GAME_CORNER_1F diff --git a/data/maps/MossdeepCity_GameCorner_B1F/header.inc b/data/maps/MossdeepCity_GameCorner_B1F/header.inc index fd8e210cc..f6436c975 100644 --- a/data/maps/MossdeepCity_GameCorner_B1F/header.inc +++ b/data/maps/MossdeepCity_GameCorner_B1F/header.inc @@ -5,10 +5,10 @@ MossdeepCity_GameCorner_B1F:: @ 8306910 .4byte 0x0 .2byte MUS_GOTOWN .2byte 307 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_Gym/events.inc b/data/maps/MossdeepCity_Gym/events.inc index 7c7a25777..96ff7b032 100644 --- a/data/maps/MossdeepCity_Gym/events.inc +++ b/data/maps/MossdeepCity_Gym/events.inc @@ -1,28 +1,28 @@ MossdeepCity_Gym_EventObjects:: @ 838A660 - object_event 1, EVENT_OBJ_GFX_TATE, 0, 8, 3, 3, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 2, 24, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A74E, 0 - object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 17, 18, 3, 7, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A77C, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 9, 17, 3, 9, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A7C1, 0 - object_event 5, EVENT_OBJ_GFX_LASS, 0, 11, 10, 3, 8, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A7AA, 0 - object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 7, 3, 10, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A765, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 3, 3, 8, 0, 0, 1, 2, MossdeepCity_Gym_EventScript_15A793, 0 - object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 8, 29, 3, 10, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A7D8, 0 - object_event 9, EVENT_OBJ_GFX_LIZA, 0, 9, 3, 3, 8, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0 + object_event 1, EVENT_OBJ_GFX_TATE, 0, 8, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0 + object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 2, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A74E, 0 + object_event 3, EVENT_OBJ_GFX_PSYCHIC_M, 0, 17, 18, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A77C, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 9, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A7C1, 0 + object_event 5, EVENT_OBJ_GFX_LASS, 0, 11, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A7AA, 0 + object_event 6, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, MossdeepCity_Gym_EventScript_15A765, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 4, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, MossdeepCity_Gym_EventScript_15A793, 0 + object_event 8, EVENT_OBJ_GFX_MAN_2, 0, 8, 29, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A7D8, 0 + object_event 9, EVENT_OBJ_GFX_LIZA, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_Gym_EventScript_15A56B, 0 MossdeepCity_Gym_MapWarps:: @ 838A738 warp_def 9, 29, 0, 1, MAP_MOSSDEEP_CITY warp_def 10, 29, 0, 1, MAP_MOSSDEEP_CITY MossdeepCity_Gym_MapCoordEvents:: @ 838A748 - coord_event 12, 3, 3, 0, VAR_TEMP_1, 0, 0, MossdeepCity_Gym_EventScript_15A742 + coord_event 12, 3, 3, VAR_TEMP_1, 0, MossdeepCity_Gym_EventScript_15A742 MossdeepCity_Gym_MapBGEvents:: @ 838A758 - bg_event 2, 7, 0, 0, 0, MossdeepCity_Gym_EventScript_15A5EA - bg_event 8, 10, 0, 0, 0, MossdeepCity_Gym_EventScript_15A646 - bg_event 17, 15, 0, 0, 0, MossdeepCity_Gym_EventScript_15A69A - bg_event 5, 24, 0, 0, 0, MossdeepCity_Gym_EventScript_15A6EE - bg_event 7, 27, 0, 1, 0, MossdeepCity_Gym_EventScript_15A7FA - bg_event 11, 27, 0, 1, 0, MossdeepCity_Gym_EventScript_15A80A + bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_Gym_EventScript_15A5EA + bg_event 8, 10, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_Gym_EventScript_15A646 + bg_event 17, 15, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_Gym_EventScript_15A69A + bg_event 5, 24, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_Gym_EventScript_15A6EE + bg_event 7, 27, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_15A7FA + bg_event 11, 27, 0, BG_EVENT_PLAYER_FACING_NORTH, MossdeepCity_Gym_EventScript_15A80A MossdeepCity_Gym_MapEvents:: @ 838A7A0 map_events MossdeepCity_Gym_EventObjects, MossdeepCity_Gym_MapWarps, MossdeepCity_Gym_MapCoordEvents, MossdeepCity_Gym_MapBGEvents diff --git a/data/maps/MossdeepCity_Gym/header.inc b/data/maps/MossdeepCity_Gym/header.inc index cabaf610a..1070a37cd 100644 --- a/data/maps/MossdeepCity_Gym/header.inc +++ b/data/maps/MossdeepCity_Gym/header.inc @@ -5,10 +5,10 @@ MossdeepCity_Gym:: @ 83067C0 .4byte 0x0 .2byte MUS_GIM .2byte 109 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index a17d09e10..0fa79a6ec 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -45,7 +45,7 @@ MossdeepCity_Gym_EventScript_15A558:: @ 815A558 end MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B - trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 + trainerbattle 8, TRAINER_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_15A5C6 msgbox MossdeepCity_Gym_Text_18D273, 4 release @@ -169,32 +169,32 @@ MossdeepCity_Gym_EventScript_15A742:: @ 815A742 end MossdeepCity_Gym_EventScript_15A74E:: @ 815A74E - trainerbattle 0, OPPONENT_PRESTON, 0, MossdeepCity_Gym_Text_18C96A, MossdeepCity_Gym_Text_18C9BA + trainerbattle 0, TRAINER_PRESTON, 0, MossdeepCity_Gym_Text_18C96A, MossdeepCity_Gym_Text_18C9BA msgbox MossdeepCity_Gym_Text_18C9E1, 6 end MossdeepCity_Gym_EventScript_15A765:: @ 815A765 - trainerbattle 0, OPPONENT_VIRGIL, 0, MossdeepCity_Gym_Text_18CA10, MossdeepCity_Gym_Text_18CA28 + trainerbattle 0, TRAINER_VIRGIL, 0, MossdeepCity_Gym_Text_18CA10, MossdeepCity_Gym_Text_18CA28 msgbox MossdeepCity_Gym_Text_18CA48, 6 end MossdeepCity_Gym_EventScript_15A77C:: @ 815A77C - trainerbattle 0, OPPONENT_FRITZ, 0, MossdeepCity_Gym_Text_18CAC0, MossdeepCity_Gym_Text_18CB46 + trainerbattle 0, TRAINER_FRITZ, 0, MossdeepCity_Gym_Text_18CAC0, MossdeepCity_Gym_Text_18CB46 msgbox MossdeepCity_Gym_Text_18CB77, 6 end MossdeepCity_Gym_EventScript_15A793:: @ 815A793 - trainerbattle 0, OPPONENT_HANNAH, 0, MossdeepCity_Gym_Text_18CC1E, MossdeepCity_Gym_Text_18CC83 + trainerbattle 0, TRAINER_HANNAH, 0, MossdeepCity_Gym_Text_18CC1E, MossdeepCity_Gym_Text_18CC83 msgbox MossdeepCity_Gym_Text_18CC9B, 6 end MossdeepCity_Gym_EventScript_15A7AA:: @ 815A7AA - trainerbattle 0, OPPONENT_SAMANTHA, 0, MossdeepCity_Gym_Text_18CD14, MossdeepCity_Gym_Text_18CD66 + trainerbattle 0, TRAINER_SAMANTHA, 0, MossdeepCity_Gym_Text_18CD14, MossdeepCity_Gym_Text_18CD66 msgbox MossdeepCity_Gym_Text_18CD73, 6 end MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1 - trainerbattle 0, OPPONENT_MAURA, 0, MossdeepCity_Gym_Text_18CDE0, MossdeepCity_Gym_Text_18CE47 + trainerbattle 0, TRAINER_MAURA, 0, MossdeepCity_Gym_Text_18CDE0, MossdeepCity_Gym_Text_18CE47 msgbox MossdeepCity_Gym_Text_18CE6C, 6 end diff --git a/data/maps/MossdeepCity_House1/events.inc b/data/maps/MossdeepCity_House1/events.inc index 2fe9e0373..0929cb305 100644 --- a/data/maps/MossdeepCity_House1/events.inc +++ b/data/maps/MossdeepCity_House1/events.inc @@ -1,6 +1,6 @@ MossdeepCity_House1_EventObjects:: @ 838A7B4 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, 3, 1, 1, 0, 0, MossdeepCity_House1_EventScript_15A82F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House1_EventScript_15A85F, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 3, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_House1_EventScript_15A82F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House1_EventScript_15A85F, 0 MossdeepCity_House1_MapWarps:: @ 838A7E4 warp_def 3, 7, 0, 0, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_House1/header.inc b/data/maps/MossdeepCity_House1/header.inc index f6815842d..4c7c76534 100644 --- a/data/maps/MossdeepCity_House1/header.inc +++ b/data/maps/MossdeepCity_House1/header.inc @@ -5,10 +5,10 @@ MossdeepCity_House1:: @ 83067DC .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_House2/events.inc b/data/maps/MossdeepCity_House2/events.inc index 743350683..cfd30ea15 100644 --- a/data/maps/MossdeepCity_House2/events.inc +++ b/data/maps/MossdeepCity_House2/events.inc @@ -1,7 +1,7 @@ MossdeepCity_House2_EventObjects:: @ 838A808 - object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A869, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A872, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE + object_event 1, EVENT_OBJ_GFX_MAN_5, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A869, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A872, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_House2_EventScript_15A87B, FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE MossdeepCity_House2_MapWarps:: @ 838A850 warp_def 3, 8, 0, 3, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_House2/header.inc b/data/maps/MossdeepCity_House2/header.inc index 36964f8ee..a5107efe1 100644 --- a/data/maps/MossdeepCity_House2/header.inc +++ b/data/maps/MossdeepCity_House2/header.inc @@ -5,10 +5,10 @@ MossdeepCity_House2:: @ 83067F8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 59 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_House3/events.inc b/data/maps/MossdeepCity_House3/events.inc index f601038e6..8560b6e1a 100644 --- a/data/maps/MossdeepCity_House3/events.inc +++ b/data/maps/MossdeepCity_House3/events.inc @@ -1,5 +1,5 @@ MossdeepCity_House3_EventObjects:: @ 838AA08 - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, 10, 0, 0, 0, 0, MossdeepCity_House3_EventScript_15A972, 0 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_House3_EventScript_15A972, 0 MossdeepCity_House3_MapWarps:: @ 838AA20 warp_def 3, 7, 0, 5, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_House3/header.inc b/data/maps/MossdeepCity_House3/header.inc index e395c29f6..a77e48e40 100644 --- a/data/maps/MossdeepCity_House3/header.inc +++ b/data/maps/MossdeepCity_House3/header.inc @@ -5,10 +5,10 @@ MossdeepCity_House3:: @ 8306868 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_House4/events.inc b/data/maps/MossdeepCity_House4/events.inc index cfde3a35e..5df0f4f4f 100644 --- a/data/maps/MossdeepCity_House4/events.inc +++ b/data/maps/MossdeepCity_House4/events.inc @@ -1,7 +1,7 @@ MossdeepCity_House4_EventObjects:: @ 838AAF8 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 9, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB31, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 6, 3, 5, 1, 0, 0, 0, MossdeepCity_House4_EventScript_15AB50, 0 - object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, 1, 1, 1, 0, 0, MossdeepCity_House4_EventScript_15AB77, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_House4_EventScript_15AB31, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, MossdeepCity_House4_EventScript_15AB50, 0 + object_event 3, EVENT_OBJ_GFX_SKITTY, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_House4_EventScript_15AB77, 0 MossdeepCity_House4_MapWarps:: @ 838AB40 warp_def 4, 7, 0, 7, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_House4/header.inc b/data/maps/MossdeepCity_House4/header.inc index fe346cb0a..91ef8305c 100644 --- a/data/maps/MossdeepCity_House4/header.inc +++ b/data/maps/MossdeepCity_House4/header.inc @@ -5,10 +5,10 @@ MossdeepCity_House4:: @ 83068A0 .4byte 0x0 .2byte MUS_GOTOWN .2byte 80 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_Mart/events.inc b/data/maps/MossdeepCity_Mart/events.inc index 92f4a8cbd..b0cb8e67e 100644 --- a/data/maps/MossdeepCity_Mart/events.inc +++ b/data/maps/MossdeepCity_Mart/events.inc @@ -1,8 +1,8 @@ MossdeepCity_Mart_EventObjects:: @ 838A984 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A926, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 1, 5, 3, 7, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A956, 0 - object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, 3, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_15A95F, 0 - object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, 2, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_15A968, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A926, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_Mart_EventScript_15A956, 0 + object_event 3, EVENT_OBJ_GFX_BOY_2, 0, 8, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, MossdeepCity_Mart_EventScript_15A95F, 0 + object_event 4, EVENT_OBJ_GFX_SAILOR, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_Mart_EventScript_15A968, 0 MossdeepCity_Mart_MapWarps:: @ 838A9E4 warp_def 3, 7, 0, 4, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_Mart/header.inc b/data/maps/MossdeepCity_Mart/header.inc index 6c8b09d32..dc9f8832a 100644 --- a/data/maps/MossdeepCity_Mart/header.inc +++ b/data/maps/MossdeepCity_Mart/header.inc @@ -5,10 +5,10 @@ MossdeepCity_Mart:: @ 830684C .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc index da310c9f7..6f193ba1f 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/events.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ MossdeepCity_PokemonCenter_1F_EventObjects:: @ 838A874 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8DA, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 4, 3, 7, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8E8, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, 1, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8F1, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8DA, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_3, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8E8, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 3, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MossdeepCity_PokemonCenter_1F_EventScript_15A8F1, 0 MossdeepCity_PokemonCenter_1F_MapWarps:: @ 838A8BC warp_def 7, 8, 3, 2, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc index ef51b2588..1f9a18c11 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/header.inc @@ -5,10 +5,10 @@ MossdeepCity_PokemonCenter_1F:: @ 8306814 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc index a722e666b..906cf8e83 100644 --- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 815A8D0 .byte 0 MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6 - setrespawn 9 + setrespawn HEAL_LOCATION_MOSSDEEP_CITY end MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc index 4af09479f..cad002147 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/events.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/events.inc @@ -1,8 +1,8 @@ MossdeepCity_PokemonCenter_2F_EventObjects:: @ 838A8E8 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A913, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A919, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A91F, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 6, 3, 5, 2, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A90A, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A913, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A919, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A91F, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, MossdeepCity_PokemonCenter_2F_EventScript_15A90A, 0 MossdeepCity_PokemonCenter_2F_MapWarps:: @ 838A948 warp_def 1, 5, 4, 2, MAP_MOSSDEEP_CITY_POKEMON_CENTER_1F diff --git a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc index db24bf9e5..d3ac47ccb 100644 --- a/data/maps/MossdeepCity_PokemonCenter_2F/header.inc +++ b/data/maps/MossdeepCity_PokemonCenter_2F/header.inc @@ -5,10 +5,10 @@ MossdeepCity_PokemonCenter_2F:: @ 8306830 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc index 85e716a93..f640b9cff 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/events.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/events.inc @@ -1,9 +1,9 @@ MossdeepCity_SpaceCenter_1F_EventObjects:: @ 838AB64 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AB8B, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABCC, 0 - object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, 9, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABD5, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC1F, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 7, 3, 3, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC16, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AB8B, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABCC, 0 + object_event 3, EVENT_OBJ_GFX_SAILOR, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15ABD5, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC1F, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 14, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, MossdeepCity_SpaceCenter_1F_EventScript_15AC16, 0 MossdeepCity_SpaceCenter_1F_MapWarps:: @ 838ABDC warp_def 7, 9, 0, 8, MAP_MOSSDEEP_CITY diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc index bc2152a58..3092932b8 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/header.inc @@ -5,10 +5,10 @@ MossdeepCity_SpaceCenter_1F:: @ 83068BC .4byte 0x0 .2byte MUS_GOTOWN .2byte 276 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc index faf5d89fa..c275eac21 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/events.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/events.inc @@ -1,7 +1,7 @@ MossdeepCity_SpaceCenter_2F_EventObjects:: @ 838AC08 - object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 6, 2, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC49, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, 7, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC40, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, 2, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC37, 0 + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC49, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 11, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC40, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 5, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, MossdeepCity_SpaceCenter_2F_EventScript_15AC37, 0 MossdeepCity_SpaceCenter_2F_MapWarps:: @ 838AC50 warp_def 13, 1, 0, 2, MAP_MOSSDEEP_CITY_SPACE_CENTER_1F diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc index 46c44758d..00aebba1b 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/header.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/header.inc @@ -5,10 +5,10 @@ MossdeepCity_SpaceCenter_2F:: @ 83068D8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 277 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MossdeepCity_StevensHouse/events.inc b/data/maps/MossdeepCity_StevensHouse/events.inc index 7a8fee393..c08546238 100644 --- a/data/maps/MossdeepCity_StevensHouse/events.inc +++ b/data/maps/MossdeepCity_StevensHouse/events.inc @@ -1,18 +1,18 @@ MossdeepCity_StevensHouse_EventObjects:: @ 838AA44 - object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, 10, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, FLAG_HIDE_STEVEN_STEVENS_HOUSE - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, 1, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, 1, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1 - object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, 76, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, FLAG_HIDE_STEVENS_LETTER + object_event 1, EVENT_OBJ_GFX_STEVEN, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF9, FLAG_HIDE_STEVEN_STEVENS_HOUSE + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AA7C, FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB20, FLAG_ITEM_MOSSDEEP_STEVENS_HOUSE_1 + object_event 4, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, MossdeepCity_StevensHouse_EventScript_15AB02, FLAG_HIDE_STEVENS_LETTER MossdeepCity_StevensHouse_MapWarps:: @ 838AAA4 warp_def 3, 7, 0, 6, MAP_MOSSDEEP_CITY warp_def 4, 7, 0, 6, MAP_MOSSDEEP_CITY MossdeepCity_StevensHouse_MapBGEvents:: @ 838AAB4 - bg_event 0, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 - bg_event 1, 1, 0, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 - bg_event 10, 4, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 - bg_event 10, 6, 3, 0, 0, MossdeepCity_StevensHouse_EventScript_15AAF0 + bg_event 0, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_15AAF0 + bg_event 1, 1, 0, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_15AAF0 + bg_event 10, 4, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_15AAF0 + bg_event 10, 6, 3, BG_EVENT_PLAYER_FACING_ANY, MossdeepCity_StevensHouse_EventScript_15AAF0 MossdeepCity_StevensHouse_MapEvents:: @ 838AAE4 map_events MossdeepCity_StevensHouse_EventObjects, MossdeepCity_StevensHouse_MapWarps, 0x0, MossdeepCity_StevensHouse_MapBGEvents diff --git a/data/maps/MossdeepCity_StevensHouse/header.inc b/data/maps/MossdeepCity_StevensHouse/header.inc index abbe4b98b..5988c50b4 100644 --- a/data/maps/MossdeepCity_StevensHouse/header.inc +++ b/data/maps/MossdeepCity_StevensHouse/header.inc @@ -5,10 +5,10 @@ MossdeepCity_StevensHouse:: @ 8306884 .4byte 0x0 .2byte MUS_GOTOWN .2byte 328 - .byte 13 + .byte MAPSEC_MOSSDEEP_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtChimney/events.inc b/data/maps/MtChimney/events.inc index f011502f2..bc071c7b1 100644 --- a/data/maps/MtChimney/events.inc +++ b/data/maps/MtChimney/events.inc @@ -1,32 +1,32 @@ MtChimney_EventObjects:: @ 838C330 - object_event 1, EVENT_OBJ_GFX_VAR_7, 0, 24, 19, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 13, 6, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 12, 11, 3, 9, 0, 0, 1, 2, MtChimney_EventScript_15D110, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 32, 5, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 28, 12, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D159, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 19, 39, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 7, EVENT_OBJ_GFX_VAR_4, 0, 29, 5, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 8, EVENT_OBJ_GFX_VAR_4, 0, 31, 12, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_15D107, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 16, 37, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_15CF95, FLAG_HIDE_MT_CHIMNEY_PEOPLE - object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 22, 39, 3, 9, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, 74, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, 64, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 23, 17, 3, 8, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, 65, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 16, EVENT_OBJ_GFX_VAR_1, 0, 23, 21, 3, 7, 0, 0, 0, 0, MtChimney_EventScript_15D150, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 17, EVENT_OBJ_GFX_VAR_1, 0, 21, 19, 3, 10, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 22, EVENT_OBJ_GFX_VAR_1, 0, 9, 15, 3, 10, 0, 0, 1, 3, MtChimney_EventScript_15D127, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, 67, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY - object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, 66, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY - object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 18, 3, 13, 0, 0, 1, 3, MtChimney_EventScript_15D1E3, FLAG_HIDE_MT_CHIMNEY_PEOPLE - object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, 70, 0, 0, 1, 4, MtChimney_EventScript_15D221, FLAG_HIDE_MT_CHIMNEY_PEOPLE - object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, 17, 1, 1, 1, 3, MtChimney_EventScript_15D238, FLAG_HIDE_MT_CHIMNEY_PEOPLE - object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, 16, 1, 1, 1, 3, MtChimney_EventScript_15D24F, FLAG_HIDE_MT_CHIMNEY_PEOPLE + object_event 1, EVENT_OBJ_GFX_VAR_7, 0, 24, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_1B2C95, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_1B2CCB, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 12, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, MtChimney_EventScript_15D110, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 32, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 28, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_15D159, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 19, 39, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_15D0FE, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 7, EVENT_OBJ_GFX_VAR_4, 0, 29, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_15D0F5, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 8, EVENT_OBJ_GFX_VAR_4, 0, 31, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_15D107, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 9, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 16, 37, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_15CF95, FLAG_HIDE_MT_CHIMNEY_PEOPLE + object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 22, 39, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_15D162, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 11, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 19, 3, MOVEMENT_TYPE_RUN_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 12, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 18, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 23, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 14, EVENT_OBJ_GFX_POOCHYENA, 0, 23, 20, 3, MOVEMENT_TYPE_WALK_IN_PLACE_UP, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 15, EVENT_OBJ_GFX_POOCHYENA, 0, 22, 19, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 16, EVENT_OBJ_GFX_VAR_1, 0, 23, 21, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, MtChimney_EventScript_15D150, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 17, EVENT_OBJ_GFX_VAR_1, 0, 21, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_15D13E, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 18, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 19, EVENT_OBJ_GFX_POOCHYENA, 0, 29, 12, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 20, EVENT_OBJ_GFX_POOCHYENA, 0, 30, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 21, EVENT_OBJ_GFX_POOCHYENA, 0, 31, 5, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 22, EVENT_OBJ_GFX_VAR_1, 0, 9, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtChimney_EventScript_15D127, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 23, EVENT_OBJ_GFX_POOCHYENA, 0, 20, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_RIGHT, 0, 0, 0, 0, MtChimney_EventScript_15D174, FLAG_HIDE_OTEHR_TEAM_MT_CHIMNEY + object_event 24, EVENT_OBJ_GFX_POOCHYENA, 0, 21, 39, 3, MOVEMENT_TYPE_WALK_IN_PLACE_LEFT, 0, 0, 0, 0, MtChimney_EventScript_15D16B, FLAG_HIDE_EVIL_TEAM_MT_CHIMNEY + object_event 25, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 16, 18, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, MtChimney_EventScript_15D1E3, FLAG_HIDE_MT_CHIMNEY_PEOPLE + object_event 26, EVENT_OBJ_GFX_BEAUTY, 0, 14, 7, 3, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 1, 4, MtChimney_EventScript_15D221, FLAG_HIDE_MT_CHIMNEY_PEOPLE + object_event 27, EVENT_OBJ_GFX_BEAUTY, 0, 29, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MtChimney_EventScript_15D238, FLAG_HIDE_MT_CHIMNEY_PEOPLE + object_event 28, EVENT_OBJ_GFX_BEAUTY, 0, 27, 17, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, MtChimney_EventScript_15D24F, FLAG_HIDE_MT_CHIMNEY_PEOPLE MtChimney_MapWarps:: @ 838C5D0 warp_def 17, 36, 0, 0, MAP_MT_CHIMNEY_CABLE_CAR_STATION @@ -35,8 +35,8 @@ MtChimney_MapWarps:: @ 838C5D0 warp_def 21, 41, 3, 3, MAP_JAGGED_PASS MtChimney_MapBGEvents:: @ 838C5F0 - bg_event 14, 6, 0, 0, 0, MtChimney_EventScript_15D17D - bg_event 24, 37, 3, 0, 0, MtChimney_EventScript_15D1DA + bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_15D17D + bg_event 24, 37, 3, BG_EVENT_PLAYER_FACING_ANY, MtChimney_EventScript_15D1DA MtChimney_MapEvents:: @ 838C608 map_events MtChimney_EventObjects, MtChimney_MapWarps, 0x0, MtChimney_MapBGEvents diff --git a/data/maps/MtChimney/header.inc b/data/maps/MtChimney/header.inc index 690312635..2312d9c92 100644 --- a/data/maps/MtChimney/header.inc +++ b/data/maps/MtChimney/header.inc @@ -5,10 +5,10 @@ MtChimney:: @ 8306EC0 .4byte 0x0 .2byte MUS_TOZAN .2byte 137 - .byte 56 + .byte MAPSEC_MT_CHIMNEY .byte 0 - .byte 7 - .byte 3 + .byte WEATHER_ASH + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index f13850570..a3906af8c 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -330,20 +330,20 @@ MtChimney_EventScript_15D107:: @ 815D107 MtChimney_EventScript_15D110:: @ 815D110 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3168, MtChimney_Text_1B31EA + trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3168, MtChimney_Text_1B31EA msgbox MtChimney_Text_1B3239, 6 .else - trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8 + trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_1, 0, MtChimney_Text_1B3B36, MtChimney_Text_1B3BB8 msgbox MtChimney_Text_1B3C07, 6 .endif end MtChimney_EventScript_15D127:: @ 815D127 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B32C8, MtChimney_Text_1B336E + trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B32C8, MtChimney_Text_1B336E msgbox MtChimney_Text_1B338D, 6 .else - trainerbattle 0, OPPONENT_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E + trainerbattle 0, TRAINER_MT_CHIMNEY_GRUNT_2, 0, MtChimney_Text_1B3C96, MtChimney_Text_1B3D1E msgbox MtChimney_Text_1B3D3D, 6 .endif end @@ -437,7 +437,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA end MtChimney_EventScript_15D1E3:: @ 815D1E3 - trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 + trainerbattle 0, TRAINER_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MtChimney_EventScript_15D20A @@ -445,21 +445,21 @@ MtChimney_EventScript_15D1E3:: @ 815D1E3 end MtChimney_EventScript_15D20A:: @ 815D20A - trainerbattle 5, OPPONENT_SHELBY_1, 0, MtChimney_Text_195A45, MtChimney_Text_195AAD + trainerbattle 5, TRAINER_SHELBY_1, 0, MtChimney_Text_195A45, MtChimney_Text_195AAD msgbox MtChimney_Text_195AD9, 6 end MtChimney_EventScript_15D221:: @ 815D221 - trainerbattle 0, OPPONENT_MELISSA, 0, MtChimney_Text_195B1C, MtChimney_Text_195B5F + trainerbattle 0, TRAINER_MELISSA, 0, MtChimney_Text_195B1C, MtChimney_Text_195B5F msgbox MtChimney_Text_195B84, 6 end MtChimney_EventScript_15D238:: @ 815D238 - trainerbattle 0, OPPONENT_SHEILA, 0, MtChimney_Text_195BB2, MtChimney_Text_195BF9 + trainerbattle 0, TRAINER_SHEILA, 0, MtChimney_Text_195BB2, MtChimney_Text_195BF9 msgbox MtChimney_Text_195C31, 6 end MtChimney_EventScript_15D24F:: @ 815D24F - trainerbattle 0, OPPONENT_SHIRLEY, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F + trainerbattle 0, TRAINER_SHIRLEY, 0, MtChimney_Text_195CD8, MtChimney_Text_195D2F msgbox MtChimney_Text_195D5C, 6 end diff --git a/data/maps/MtChimney_CableCarStation/events.inc b/data/maps/MtChimney_CableCarStation/events.inc index e5d69ee75..ca437c92d 100644 --- a/data/maps/MtChimney_CableCarStation/events.inc +++ b/data/maps/MtChimney_CableCarStation/events.inc @@ -1,6 +1,6 @@ MtChimney_CableCarStation_EventObjects:: @ 838B828 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_15C14B, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtChimney_CableCarStation_EventScript_15C14B, 0 + object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 MtChimney_CableCarStation_MapWarps:: @ 838B858 warp_def 6, 11, 0, 0, MAP_MT_CHIMNEY diff --git a/data/maps/MtChimney_CableCarStation/header.inc b/data/maps/MtChimney_CableCarStation/header.inc index 9584ed7a2..15d59a97f 100644 --- a/data/maps/MtChimney_CableCarStation/header.inc +++ b/data/maps/MtChimney_CableCarStation/header.inc @@ -5,10 +5,10 @@ MtChimney_CableCarStation:: @ 8306CAC .4byte 0x0 .2byte MUS_DOORO_X1 .2byte 119 - .byte 56 + .byte MAPSEC_MT_CHIMNEY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_1F/events.inc b/data/maps/MtPyre_1F/events.inc index f547a9a98..01b4052a6 100644 --- a/data/maps/MtPyre_1F/events.inc +++ b/data/maps/MtPyre_1F/events.inc @@ -1,7 +1,7 @@ MtPyre_1F_EventObjects:: @ 838C7FC - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, 8, 1, 1, 0, 0, MtPyre_1F_EventScript_15D323, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, 7, 1, 1, 0, 0, MtPyre_1F_EventScript_15D35C, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, 9, 1, 1, 0, 0, MtPyre_1F_EventScript_15D365, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 21, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_1F_EventScript_15D323, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 17, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, MtPyre_1F_EventScript_15D35C, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, MtPyre_1F_EventScript_15D365, 0 MtPyre_1F_MapWarps:: @ 838C844 warp_def 17, 18, 3, 0, MAP_ROUTE122 diff --git a/data/maps/MtPyre_1F/header.inc b/data/maps/MtPyre_1F/header.inc index a75471d53..bbd8c0370 100644 --- a/data/maps/MtPyre_1F/header.inc +++ b/data/maps/MtPyre_1F/header.inc @@ -5,10 +5,10 @@ MtPyre_1F:: @ 8306F14 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 138 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_2F/events.inc b/data/maps/MtPyre_2F/events.inc index 9f8041366..d6f401581 100644 --- a/data/maps/MtPyre_2F/events.inc +++ b/data/maps/MtPyre_2F/events.inc @@ -1,10 +1,10 @@ MtPyre_2F_EventObjects:: @ 838C888 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 6, 6, 3, 17, 1, 1, 1, 2, MtPyre_2F_EventScript_15D39B, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, 1, 1, 1, 0, 0, MtPyre_2F_EventScript_1B1933, FLAG_ITEM_MT_PYRE_2F_1 - object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 5, 3, 3, 10, 1, 1, 0, 0, MtPyre_2F_EventScript_15D389, 0 - object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 7, 11, 3, 8, 1, 1, 0, 0, MtPyre_2F_EventScript_15D392, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 8, 3, 8, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3CD, 0 - object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 8, 3, 8, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3B2, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_2F_EventScript_15D39B, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_2F_EventScript_1B1933, FLAG_ITEM_MT_PYRE_2F_1 + object_event 3, EVENT_OBJ_GFX_WOMAN_1, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, MtPyre_2F_EventScript_15D389, 0 + object_event 4, EVENT_OBJ_GFX_MAN_3, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, MtPyre_2F_EventScript_15D392, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3CD, 0 + object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, MtPyre_2F_EventScript_15D3B2, 0 MtPyre_2F_MapWarps:: @ 838C918 warp_def 2, 1, 3, 4, MAP_MT_PYRE_1F diff --git a/data/maps/MtPyre_2F/header.inc b/data/maps/MtPyre_2F/header.inc index 081adb3e9..c123d076a 100644 --- a/data/maps/MtPyre_2F/header.inc +++ b/data/maps/MtPyre_2F/header.inc @@ -5,10 +5,10 @@ MtPyre_2F:: @ 8306F30 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 139 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_2F/scripts.inc b/data/maps/MtPyre_2F/scripts.inc index 1d2368597..d2ef2894e 100644 --- a/data/maps/MtPyre_2F/scripts.inc +++ b/data/maps/MtPyre_2F/scripts.inc @@ -18,16 +18,16 @@ MtPyre_2F_EventScript_15D392:: @ 815D392 end MtPyre_2F_EventScript_15D39B:: @ 815D39B - trainerbattle 0, OPPONENT_MARK, 0, MtPyre_2F_Text_196674, MtPyre_2F_Text_1966BE + trainerbattle 0, TRAINER_MARK, 0, MtPyre_2F_Text_196674, MtPyre_2F_Text_1966BE msgbox MtPyre_2F_Text_1966E7, 6 end MtPyre_2F_EventScript_15D3B2:: @ 815D3B2 - trainerbattle 4, OPPONENT_DEZ_AND_LUKE, 0, MtPyre_2F_Text_1962C6, MtPyre_2F_Text_196358, MtPyre_2F_Text_1963CB + trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_1962C6, MtPyre_2F_Text_196358, MtPyre_2F_Text_1963CB msgbox MtPyre_2F_Text_196368, 6 end MtPyre_2F_EventScript_15D3CD:: @ 815D3CD - trainerbattle 4, OPPONENT_DEZ_AND_LUKE, 0, MtPyre_2F_Text_196449, MtPyre_2F_Text_1964EB, MtPyre_2F_Text_196539 + trainerbattle 4, TRAINER_DEZ_AND_LUKE, 0, MtPyre_2F_Text_196449, MtPyre_2F_Text_1964EB, MtPyre_2F_Text_196539 msgbox MtPyre_2F_Text_196504, 6 end diff --git a/data/maps/MtPyre_3F/events.inc b/data/maps/MtPyre_3F/events.inc index fbaf6fa4b..4a5263be5 100644 --- a/data/maps/MtPyre_3F/events.inc +++ b/data/maps/MtPyre_3F/events.inc @@ -1,7 +1,7 @@ MtPyre_3F_EventObjects:: @ 838C954 - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, 18, 1, 1, 1, 3, MtPyre_3F_EventScript_15D3E9, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 12, 7, 3, 17, 1, 1, 1, 3, MtPyre_3F_EventScript_15D400, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, 1, 1, 1, 0, 0, MtPyre_3F_EventScript_1B1940, FLAG_ITEM_MT_PYRE_3F_1 + object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 1, 1, 1, 3, MtPyre_3F_EventScript_15D3E9, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 3, MtPyre_3F_EventScript_15D400, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_3F_EventScript_1B1940, FLAG_ITEM_MT_PYRE_3F_1 MtPyre_3F_MapWarps:: @ 838C99C warp_def 10, 1, 3, 1, MAP_MT_PYRE_2F diff --git a/data/maps/MtPyre_3F/header.inc b/data/maps/MtPyre_3F/header.inc index 253facf61..c201e9377 100644 --- a/data/maps/MtPyre_3F/header.inc +++ b/data/maps/MtPyre_3F/header.inc @@ -5,10 +5,10 @@ MtPyre_3F:: @ 8306F4C .4byte 0x0 .2byte MUS_M_DUNGON .2byte 140 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_3F/scripts.inc b/data/maps/MtPyre_3F/scripts.inc index ea8bda7b5..69a57df19 100644 --- a/data/maps/MtPyre_3F/scripts.inc +++ b/data/maps/MtPyre_3F/scripts.inc @@ -2,11 +2,11 @@ MtPyre_3F_MapScripts:: @ 815D3E8 .byte 0 MtPyre_3F_EventScript_15D3E9:: @ 815D3E9 - trainerbattle 0, OPPONENT_WILLIAM, 0, MtPyre_3F_Text_19672B, MtPyre_3F_Text_19679D + trainerbattle 0, TRAINER_WILLIAM, 0, MtPyre_3F_Text_19672B, MtPyre_3F_Text_19679D msgbox MtPyre_3F_Text_1967B5, 6 end MtPyre_3F_EventScript_15D400:: @ 815D400 - trainerbattle 0, OPPONENT_KAYLA, 0, MtPyre_3F_Text_1967EF, MtPyre_3F_Text_19682B + trainerbattle 0, TRAINER_KAYLA, 0, MtPyre_3F_Text_1967EF, MtPyre_3F_Text_19682B msgbox MtPyre_3F_Text_196842, 6 end diff --git a/data/maps/MtPyre_4F/events.inc b/data/maps/MtPyre_4F/events.inc index 9de527f2d..633f5a45b 100644 --- a/data/maps/MtPyre_4F/events.inc +++ b/data/maps/MtPyre_4F/events.inc @@ -1,6 +1,6 @@ MtPyre_4F_EventObjects:: @ 838C9E0 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 7, 3, 24, 1, 1, 1, 2, MtPyre_4F_EventScript_15D418, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, 1, 1, 1, 0, 0, MtPyre_4F_EventScript_1B194D, FLAG_ITEM_MT_PYRE_4F_1 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 7, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, MtPyre_4F_EventScript_15D418, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_4F_EventScript_1B194D, FLAG_ITEM_MT_PYRE_4F_1 MtPyre_4F_MapWarps:: @ 838CA10 warp_def 10, 1, 3, 1, MAP_MT_PYRE_5F diff --git a/data/maps/MtPyre_4F/header.inc b/data/maps/MtPyre_4F/header.inc index 720ff831e..24f3f7d9f 100644 --- a/data/maps/MtPyre_4F/header.inc +++ b/data/maps/MtPyre_4F/header.inc @@ -5,10 +5,10 @@ MtPyre_4F:: @ 8306F68 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 141 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_4F/scripts.inc b/data/maps/MtPyre_4F/scripts.inc index e1ebac7c1..3910d6f45 100644 --- a/data/maps/MtPyre_4F/scripts.inc +++ b/data/maps/MtPyre_4F/scripts.inc @@ -2,6 +2,6 @@ MtPyre_4F_MapScripts:: @ 815D417 .byte 0 MtPyre_4F_EventScript_15D418:: @ 815D418 - trainerbattle 0, OPPONENT_ATSUSHI, 0, MtPyre_4F_Text_1968A6, MtPyre_4F_Text_1968D0 + trainerbattle 0, TRAINER_ATSUSHI, 0, MtPyre_4F_Text_1968A6, MtPyre_4F_Text_1968D0 msgbox MtPyre_4F_Text_1968EE, 6 end diff --git a/data/maps/MtPyre_5F/events.inc b/data/maps/MtPyre_5F/events.inc index cbf1b64b4..21ffd9e1a 100644 --- a/data/maps/MtPyre_5F/events.inc +++ b/data/maps/MtPyre_5F/events.inc @@ -1,6 +1,6 @@ MtPyre_5F_EventObjects:: @ 838CA54 - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 3, 7, 3, 17, 1, 1, 1, 2, MtPyre_5F_EventScript_15D430, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, MtPyre_5F_EventScript_1B195A, FLAG_ITEM_MT_PYRE_5F_1 + object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, MtPyre_5F_EventScript_15D430, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_5F_EventScript_1B195A, FLAG_ITEM_MT_PYRE_5F_1 MtPyre_5F_MapWarps:: @ 838CA84 warp_def 2, 1, 3, 0, MAP_MT_PYRE_6F diff --git a/data/maps/MtPyre_5F/header.inc b/data/maps/MtPyre_5F/header.inc index dc8d93e29..75fae8c1a 100644 --- a/data/maps/MtPyre_5F/header.inc +++ b/data/maps/MtPyre_5F/header.inc @@ -5,10 +5,10 @@ MtPyre_5F:: @ 8306F84 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 142 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_5F/scripts.inc b/data/maps/MtPyre_5F/scripts.inc index 9adb249f0..8cec3a32f 100644 --- a/data/maps/MtPyre_5F/scripts.inc +++ b/data/maps/MtPyre_5F/scripts.inc @@ -2,6 +2,6 @@ MtPyre_5F_MapScripts:: @ 815D42F .byte 0 MtPyre_5F_EventScript_15D430:: @ 815D430 - trainerbattle 0, OPPONENT_TASHA, 0, MtPyre_5F_Text_196939, MtPyre_5F_Text_196997 + trainerbattle 0, TRAINER_TASHA, 0, MtPyre_5F_Text_196939, MtPyre_5F_Text_196997 msgbox MtPyre_5F_Text_1969AC, 6 end diff --git a/data/maps/MtPyre_6F/events.inc b/data/maps/MtPyre_6F/events.inc index d65a3a8c6..804b6be27 100644 --- a/data/maps/MtPyre_6F/events.inc +++ b/data/maps/MtPyre_6F/events.inc @@ -1,6 +1,6 @@ MtPyre_6F_EventObjects:: @ 838CAC0 - object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, 23, 1, 1, 1, 2, MtPyre_6F_EventScript_15D448, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, 1, 1, 1, 0, 0, MtPyre_6F_EventScript_1B1967, FLAG_ITEM_MT_PYRE_6F_1 + object_event 1, EVENT_OBJ_GFX_HEX_MANIAC, 0, 6, 3, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 2, MtPyre_6F_EventScript_15D448, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, MtPyre_6F_EventScript_1B1967, FLAG_ITEM_MT_PYRE_6F_1 MtPyre_6F_MapWarps:: @ 838CAF0 warp_def 2, 1, 3, 0, MAP_MT_PYRE_5F diff --git a/data/maps/MtPyre_6F/header.inc b/data/maps/MtPyre_6F/header.inc index 986c3b538..7156e17a2 100644 --- a/data/maps/MtPyre_6F/header.inc +++ b/data/maps/MtPyre_6F/header.inc @@ -5,10 +5,10 @@ MtPyre_6F:: @ 8306FA0 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 143 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_6F/scripts.inc b/data/maps/MtPyre_6F/scripts.inc index ae09300a3..92086949f 100644 --- a/data/maps/MtPyre_6F/scripts.inc +++ b/data/maps/MtPyre_6F/scripts.inc @@ -2,7 +2,7 @@ MtPyre_6F_MapScripts:: @ 815D447 .byte 0 MtPyre_6F_EventScript_15D448:: @ 815D448 - trainerbattle 0, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 + trainerbattle 0, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MtPyre_6F_EventScript_15D46F @@ -10,6 +10,6 @@ MtPyre_6F_EventScript_15D448:: @ 815D448 end MtPyre_6F_EventScript_15D46F:: @ 815D46F - trainerbattle 5, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_196A95, MtPyre_6F_Text_196AB1 + trainerbattle 5, TRAINER_VALERIE_1, 0, MtPyre_6F_Text_196A95, MtPyre_6F_Text_196AB1 msgbox MtPyre_6F_Text_196AC9, 6 end diff --git a/data/maps/MtPyre_Exterior/events.inc b/data/maps/MtPyre_Exterior/events.inc index 48593481e..9eb337714 100644 --- a/data/maps/MtPyre_Exterior/events.inc +++ b/data/maps/MtPyre_Exterior/events.inc @@ -1,6 +1,6 @@ MtPyre_Exterior_EventObjects:: @ 838CB14 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1974, FLAG_ITEM_MT_PYRE_EXTERIOR_1 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, 1, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, FLAG_ITEM_MT_PYRE_EXTERIOR_2 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1974, FLAG_ITEM_MT_PYRE_EXTERIOR_1 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 40, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, MtPyre_Exterior_EventScript_1B1981, FLAG_ITEM_MT_PYRE_EXTERIOR_2 MtPyre_Exterior_MapWarps:: @ 838CB44 warp_def 10, 42, 3, 1, MAP_MT_PYRE_1F @@ -8,11 +8,11 @@ MtPyre_Exterior_MapWarps:: @ 838CB44 warp_def 20, 10, 3, 1, MAP_MT_PYRE_SUMMIT MtPyre_Exterior_MapCoordEvents:: @ 838CB5C - coord_event 24, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 - coord_event 25, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 - coord_event 22, 27, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4AC - coord_event 23, 28, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4AC - coord_event 26, 21, 3, 0, 0, 0, 0, MtPyre_Exterior_EventScript_15D4A7 + coord_event 24, 21, 3, 0, 0, MtPyre_Exterior_EventScript_15D4A7 + coord_event 25, 21, 3, 0, 0, MtPyre_Exterior_EventScript_15D4A7 + coord_event 22, 27, 3, 0, 0, MtPyre_Exterior_EventScript_15D4AC + coord_event 23, 28, 3, 0, 0, MtPyre_Exterior_EventScript_15D4AC + coord_event 26, 21, 3, 0, 0, MtPyre_Exterior_EventScript_15D4A7 MtPyre_Exterior_MapBGEvents:: @ 838CBAC bg_hidden_item_event 9, 8, 0, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_1D diff --git a/data/maps/MtPyre_Exterior/header.inc b/data/maps/MtPyre_Exterior/header.inc index 0c115cd95..5aacc218a 100644 --- a/data/maps/MtPyre_Exterior/header.inc +++ b/data/maps/MtPyre_Exterior/header.inc @@ -5,10 +5,10 @@ MtPyre_Exterior:: @ 8306FBC .4byte 0x0 .2byte MUS_MACHUPI .2byte 303 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 - .byte 0 - .byte 3 + .byte WEATHER_NONE + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/MtPyre_Summit/events.inc b/data/maps/MtPyre_Summit/events.inc index 3ddc6f36b..9b7a08e62 100644 --- a/data/maps/MtPyre_Summit/events.inc +++ b/data/maps/MtPyre_Summit/events.inc @@ -1,10 +1,10 @@ MtPyre_Summit_EventObjects:: @ 838CBD8 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 22, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D5EF, 0 - object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 23, 6, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEADER_MT_PYRE_SUMMIT - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 23, 5, 3, 8, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D623, 0 - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 21, 18, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DA9, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT - object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 25, 15, 3, 9, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DC0, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT - object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 21, 11, 3, 10, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DD7, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D5EF, 0 + object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 23, 6, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_LEADER_MT_PYRE_SUMMIT + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, MtPyre_Summit_EventScript_15D623, 0 + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 21, 18, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DA9, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT + object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DC0, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, MtPyre_Summit_EventScript_1B2DD7, FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT MtPyre_Summit_MapWarps:: @ 838CC68 warp_def 22, 31, 3, 1, MAP_MT_PYRE_EXTERIOR @@ -12,12 +12,12 @@ MtPyre_Summit_MapWarps:: @ 838CC68 warp_def 24, 31, 3, 1, MAP_MT_PYRE_EXTERIOR MtPyre_Summit_MapCoordEvents:: @ 838CC80 - coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4BD - coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4C9 - coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 0, 0, MtPyre_Summit_EventScript_15D4D5 - coord_event 22, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6CE - coord_event 23, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6DA - coord_event 24, 7, 3, 0, VAR_MT_PYRE_STATE, 2, 0, MtPyre_Summit_EventScript_15D6E6 + coord_event 22, 7, 3, VAR_MT_PYRE_STATE, 0, MtPyre_Summit_EventScript_15D4BD + coord_event 23, 7, 3, VAR_MT_PYRE_STATE, 0, MtPyre_Summit_EventScript_15D4C9 + coord_event 24, 7, 3, VAR_MT_PYRE_STATE, 0, MtPyre_Summit_EventScript_15D4D5 + coord_event 22, 7, 3, VAR_MT_PYRE_STATE, 2, MtPyre_Summit_EventScript_15D6CE + coord_event 23, 7, 3, VAR_MT_PYRE_STATE, 2, MtPyre_Summit_EventScript_15D6DA + coord_event 24, 7, 3, VAR_MT_PYRE_STATE, 2, MtPyre_Summit_EventScript_15D6E6 MtPyre_Summit_MapBGEvents:: @ 838CCE0 bg_hidden_item_event 9, 25, 0, ITEM_ZINC, FLAG_HIDDEN_ITEM_4F diff --git a/data/maps/MtPyre_Summit/header.inc b/data/maps/MtPyre_Summit/header.inc index fc8a0a82e..fbefd9aff 100644 --- a/data/maps/MtPyre_Summit/header.inc +++ b/data/maps/MtPyre_Summit/header.inc @@ -5,10 +5,10 @@ MtPyre_Summit:: @ 8306FD8 .4byte 0x0 .2byte MUS_MACHUPI .2byte 304 - .byte 65 + .byte MAPSEC_MT_PYRE .byte 0 - .byte 6 - .byte 3 + .byte WEATHER_FOG_1 + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NewMauville_Entrance/events.inc b/data/maps/NewMauville_Entrance/events.inc index 8967a1df0..71628459c 100644 --- a/data/maps/NewMauville_Entrance/events.inc +++ b/data/maps/NewMauville_Entrance/events.inc @@ -3,7 +3,7 @@ NewMauville_Entrance_MapWarps:: @ 838DED4 warp_def 4, 1, 3, 0, MAP_NEW_MAUVILLE_INSIDE NewMauville_Entrance_MapCoordEvents:: @ 838DEE4 - coord_event 4, 2, 3, 0, VAR_NEW_MAUVILLE_STATE, 0, 0, NewMauville_Entrance_EventScript_15E4DC + coord_event 4, 2, 3, VAR_NEW_MAUVILLE_STATE, 0, NewMauville_Entrance_EventScript_15E4DC NewMauville_Entrance_MapEvents:: @ 838DEF4 map_events 0x0, NewMauville_Entrance_MapWarps, NewMauville_Entrance_MapCoordEvents, 0x0 diff --git a/data/maps/NewMauville_Entrance/header.inc b/data/maps/NewMauville_Entrance/header.inc index 7ca1c1b96..26c9096ee 100644 --- a/data/maps/NewMauville_Entrance/header.inc +++ b/data/maps/NewMauville_Entrance/header.inc @@ -5,10 +5,10 @@ NewMauville_Entrance:: @ 8307320 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 185 - .byte 62 + .byte MAPSEC_NEW_MAUVILLE .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/NewMauville_Inside/events.inc b/data/maps/NewMauville_Inside/events.inc index be85150e3..bd1e79656 100644 --- a/data/maps/NewMauville_Inside/events.inc +++ b/data/maps/NewMauville_Inside/events.inc @@ -1,37 +1,37 @@ NewMauville_Inside_EventObjects:: @ 838DF08 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B183C, FLAG_ITEM_NEW_MAUVILLE_INSIDE_1 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, 1, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1849, FLAG_ITEM_NEW_MAUVILLE_INSIDE_2 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1856, FLAG_ITEM_NEW_MAUVILLE_INSIDE_3 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1863, FLAG_ITEM_NEW_MAUVILLE_INSIDE_4 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1870, FLAG_ITEM_NEW_MAUVILLE_INSIDE_5 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E900, FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E91E, FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, 1, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E93C, FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B183C, FLAG_ITEM_NEW_MAUVILLE_INSIDE_1 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, NewMauville_Inside_EventScript_1B1849, FLAG_ITEM_NEW_MAUVILLE_INSIDE_2 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1856, FLAG_ITEM_NEW_MAUVILLE_INSIDE_3 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 17, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1863, FLAG_ITEM_NEW_MAUVILLE_INSIDE_4 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_1B1870, FLAG_ITEM_NEW_MAUVILLE_INSIDE_5 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E900, FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 6, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E91E, FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, NewMauville_Inside_EventScript_15E93C, FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE NewMauville_Inside_MapWarps:: @ 838DFC8 warp_def 32, 33, 3, 1, MAP_NEW_MAUVILLE_ENTRANCE NewMauville_Inside_MapCoordEvents:: @ 838DFD0 - coord_event 30, 38, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 18, 36, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 4, 26, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 16, 22, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 25, 18, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 2, 11, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 6, 11, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 13, 10, 3, 0, VAR_TEMP_1, 0, 0, NewMauville_Inside_EventScript_15E5AA - coord_event 17, 10, 3, 0, VAR_TEMP_2, 0, 0, NewMauville_Inside_EventScript_15E5C2 - coord_event 33, 6, 3, 0, VAR_NEW_MAUVILLE_STATE, 1, 0, NewMauville_Inside_EventScript_15E876 + coord_event 30, 38, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 18, 36, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 4, 26, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 16, 22, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 25, 18, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 2, 11, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 6, 11, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 13, 10, 3, VAR_TEMP_1, 0, NewMauville_Inside_EventScript_15E5AA + coord_event 17, 10, 3, VAR_TEMP_2, 0, NewMauville_Inside_EventScript_15E5C2 + coord_event 33, 6, 3, VAR_NEW_MAUVILLE_STATE, 1, NewMauville_Inside_EventScript_15E876 NewMauville_Inside_MapBGEvents:: @ 838E070 - bg_event 32, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 32, 3, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 32, 2, 0, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 33, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 34, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 35, 4, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 35, 3, 3, 0, 0, NewMauville_Inside_EventScript_15E8E0 - bg_event 35, 2, 0, 0, 0, NewMauville_Inside_EventScript_15E8E0 + bg_event 32, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 32, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 32, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 33, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 34, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 35, 4, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 35, 3, 3, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 + bg_event 35, 2, 0, BG_EVENT_PLAYER_FACING_ANY, NewMauville_Inside_EventScript_15E8E0 NewMauville_Inside_MapEvents:: @ 838E0D0 map_events NewMauville_Inside_EventObjects, NewMauville_Inside_MapWarps, NewMauville_Inside_MapCoordEvents, NewMauville_Inside_MapBGEvents diff --git a/data/maps/NewMauville_Inside/header.inc b/data/maps/NewMauville_Inside/header.inc index 44a3d1895..4e9878630 100644 --- a/data/maps/NewMauville_Inside/header.inc +++ b/data/maps/NewMauville_Inside/header.inc @@ -5,10 +5,10 @@ NewMauville_Inside:: @ 830733C .4byte 0x0 .2byte MUS_M_DUNGON .2byte 186 - .byte 62 + .byte MAPSEC_NEW_MAUVILLE .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown/events.inc b/data/maps/OldaleTown/events.inc index ac50e1197..dd1833d00 100644 --- a/data/maps/OldaleTown/events.inc +++ b/data/maps/OldaleTown/events.inc @@ -1,8 +1,8 @@ OldaleTown_EventObjects:: @ 8380A78 - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, 9, 0, 0, 0, 0, OldaleTown_EventScript_14DDB3, 0 - object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, 8, 0, 0, 0, 0, OldaleTown_EventScript_14DDBC, 0 - object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, 10, 0, 0, 0, 0, OldaleTown_EventScript_14DEDF, 0 - object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 11, 19, 3, 7, 1, 1, 0, 0, OldaleTown_EventScript_14DF30, FLAG_HIDE_RIVAL_OLDALE_TOWN + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 16, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_EventScript_14DDB3, 0 + object_event 2, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_EventScript_14DDBC, 0 + object_event 3, EVENT_OBJ_GFX_MANIAC, 0, 8, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_EventScript_14DEDF, 0 + object_event 4, EVENT_OBJ_GFX_VAR_0, 0, 11, 19, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, OldaleTown_EventScript_14DF30, FLAG_HIDE_RIVAL_OLDALE_TOWN OldaleTown_MapWarps:: @ 8380AD8 warp_def 5, 7, 0, 0, MAP_OLDALE_TOWN_HOUSE1 @@ -11,17 +11,17 @@ OldaleTown_MapWarps:: @ 8380AD8 warp_def 14, 6, 0, 0, MAP_OLDALE_TOWN_MART OldaleTown_MapCoordEvents:: @ 8380AF8 - coord_event 0, 10, 3, 0, VAR_ROUTE102_ACCESSIBLE, 0, 0, OldaleTown_EventScript_14DEFF - coord_event 8, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF41 - coord_event 9, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF5C - coord_event 10, 19, 3, 0, VAR_OLDALE_STATE, 1, 0, OldaleTown_EventScript_14DF77 + coord_event 0, 10, 3, VAR_ROUTE102_ACCESSIBLE, 0, OldaleTown_EventScript_14DEFF + coord_event 8, 19, 3, VAR_OLDALE_STATE, 1, OldaleTown_EventScript_14DF41 + coord_event 9, 19, 3, VAR_OLDALE_STATE, 1, OldaleTown_EventScript_14DF5C + coord_event 10, 19, 3, VAR_OLDALE_STATE, 1, OldaleTown_EventScript_14DF77 OldaleTown_MapBGEvents:: @ 8380B38 - bg_event 11, 9, 0, 0, 0, OldaleTown_EventScript_14DDAA - bg_event 7, 16, 0, 1, 0, OldaleTown_EventScript_1A00EA - bg_event 15, 6, 0, 1, 0, OldaleTown_EventScript_1A00E1 - bg_event 8, 16, 0, 1, 0, OldaleTown_EventScript_1A00EA - bg_event 16, 6, 0, 1, 0, OldaleTown_EventScript_1A00E1 + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, OldaleTown_EventScript_14DDAA + bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_1A00EA + bg_event 15, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_1A00E1 + bg_event 8, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_1A00EA + bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_NORTH, OldaleTown_EventScript_1A00E1 OldaleTown_MapEvents:: @ 8380B74 map_events OldaleTown_EventObjects, OldaleTown_MapWarps, OldaleTown_MapCoordEvents, OldaleTown_MapBGEvents diff --git a/data/maps/OldaleTown/header.inc b/data/maps/OldaleTown/header.inc index 7f89ef759..6e54fe9f2 100644 --- a/data/maps/OldaleTown/header.inc +++ b/data/maps/OldaleTown/header.inc @@ -5,10 +5,10 @@ OldaleTown:: @ 8305560 .4byte OldaleTown_MapConnections .2byte MUS_MACHI_S4 .2byte 11 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 2 - .byte 1 + .byte WEATHER_SUNNY + .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_House1/events.inc b/data/maps/OldaleTown_House1/events.inc index e037e3b0e..5120c3cfb 100644 --- a/data/maps/OldaleTown_House1/events.inc +++ b/data/maps/OldaleTown_House1/events.inc @@ -1,5 +1,5 @@ OldaleTown_House1_EventObjects:: @ 8385C4C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, 2, 1, 1, 0, 0, OldaleTown_House1_EventScript_152EEC, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, OldaleTown_House1_EventScript_152EEC, 0 OldaleTown_House1_MapWarps:: @ 8385C64 warp_def 3, 8, 0, 0, MAP_OLDALE_TOWN diff --git a/data/maps/OldaleTown_House1/header.inc b/data/maps/OldaleTown_House1/header.inc index b2b31cb73..bc402caf7 100644 --- a/data/maps/OldaleTown_House1/header.inc +++ b/data/maps/OldaleTown_House1/header.inc @@ -5,10 +5,10 @@ OldaleTown_House1:: @ 8305ABC .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 59 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_House2/events.inc b/data/maps/OldaleTown_House2/events.inc index 0968fda57..daca96055 100644 --- a/data/maps/OldaleTown_House2/events.inc +++ b/data/maps/OldaleTown_House2/events.inc @@ -1,6 +1,6 @@ OldaleTown_House2_EventObjects:: @ 8385C88 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 10, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EF6, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, 9, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EFF, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EF6, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, OldaleTown_House2_EventScript_152EFF, 0 OldaleTown_House2_MapWarps:: @ 8385CB8 warp_def 3, 7, 0, 1, MAP_OLDALE_TOWN diff --git a/data/maps/OldaleTown_House2/header.inc b/data/maps/OldaleTown_House2/header.inc index 33ad6fcd7..0e4c8dea7 100644 --- a/data/maps/OldaleTown_House2/header.inc +++ b/data/maps/OldaleTown_House2/header.inc @@ -5,10 +5,10 @@ OldaleTown_House2:: @ 8305AD8 .4byte 0x0 .2byte MUS_MACHI_S4 .2byte 60 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_Mart/events.inc b/data/maps/OldaleTown_Mart/events.inc index 9d0b70937..3ef2a0036 100644 --- a/data/maps/OldaleTown_Mart/events.inc +++ b/data/maps/OldaleTown_Mart/events.inc @@ -1,7 +1,7 @@ OldaleTown_Mart_EventObjects:: @ 8385DEC - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152F79, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, 10, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152FC6, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, 3, 0, 1, 0, 0, OldaleTown_Mart_EventScript_152FE5, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152F79, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_Mart_EventScript_152FC6, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 9, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, OldaleTown_Mart_EventScript_152FE5, 0 OldaleTown_Mart_MapWarps:: @ 8385E34 warp_def 3, 7, 0, 3, MAP_OLDALE_TOWN diff --git a/data/maps/OldaleTown_Mart/header.inc b/data/maps/OldaleTown_Mart/header.inc index d74999efb..ab067341e 100644 --- a/data/maps/OldaleTown_Mart/header.inc +++ b/data/maps/OldaleTown_Mart/header.inc @@ -5,10 +5,10 @@ OldaleTown_Mart:: @ 8305B2C .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_PokemonCenter_1F/events.inc b/data/maps/OldaleTown_PokemonCenter_1F/events.inc index 89ad23d8f..55b3efeaf 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/events.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ OldaleTown_PokemonCenter_1F_EventObjects:: @ 8385CDC - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F17, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F25, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, 10, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F2E, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, 10, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F37, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F17, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F25, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F2E, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, OldaleTown_PokemonCenter_1F_EventScript_152F37, 0 OldaleTown_PokemonCenter_1F_MapWarps:: @ 8385D3C warp_def 7, 8, 3, 2, MAP_OLDALE_TOWN diff --git a/data/maps/OldaleTown_PokemonCenter_1F/header.inc b/data/maps/OldaleTown_PokemonCenter_1F/header.inc index a3bfaff18..791353439 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/header.inc @@ -5,10 +5,10 @@ OldaleTown_PokemonCenter_1F:: @ 8305AF4 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc index c993807c6..16e11d6a2 100644 --- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 8152F08 .byte 0 OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E - setrespawn 14 + setrespawn HEAL_LOCATION_OLDALE_TOWN call OldaleTown_PokemonCenter_1F_EventScript_19FD1B end diff --git a/data/maps/OldaleTown_PokemonCenter_2F/events.inc b/data/maps/OldaleTown_PokemonCenter_2F/events.inc index 9af6ec676..0eef80a2d 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/events.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ OldaleTown_PokemonCenter_2F_EventObjects:: @ 8385D68 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F66, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F6C, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F72, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F66, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F6C, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, OldaleTown_PokemonCenter_2F_EventScript_152F72, 0 OldaleTown_PokemonCenter_2F_MapWarps:: @ 8385DB0 warp_def 1, 5, 4, 2, MAP_OLDALE_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/OldaleTown_PokemonCenter_2F/header.inc b/data/maps/OldaleTown_PokemonCenter_2F/header.inc index 73c9d23d4..7f2eae09e 100644 --- a/data/maps/OldaleTown_PokemonCenter_2F/header.inc +++ b/data/maps/OldaleTown_PokemonCenter_2F/header.inc @@ -5,10 +5,10 @@ OldaleTown_PokemonCenter_2F:: @ 8305B10 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 1 + .byte MAPSEC_OLDALE_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown/events.inc b/data/maps/PacifidlogTown/events.inc index f8db75501..b96b701c1 100644 --- a/data/maps/PacifidlogTown/events.inc +++ b/data/maps/PacifidlogTown/events.inc @@ -1,7 +1,7 @@ PacifidlogTown_EventObjects:: @ 838100C - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, 9, 0, 0, 0, 0, PacifidlogTown_EventScript_14E909, 0 - object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, 10, 0, 0, 0, 0, PacifidlogTown_EventScript_14E912, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 16, 3, 8, 0, 0, 0, 0, PacifidlogTown_EventScript_14E900, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 10, 23, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_EventScript_14E909, 0 + object_event 2, EVENT_OBJ_GFX_FISHERMAN, 0, 11, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_EventScript_14E912, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_EventScript_14E900, 0 PacifidlogTown_MapWarps:: @ 8381054 warp_def 8, 15, 0, 0, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F @@ -12,9 +12,9 @@ PacifidlogTown_MapWarps:: @ 8381054 warp_def 17, 21, 0, 0, MAP_PACIFIDLOG_TOWN_HOUSE5 PacifidlogTown_MapBGEvents:: @ 8381084 - bg_event 9, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA - bg_event 7, 16, 0, 0, 0, PacifidlogTown_EventScript_14E91B - bg_event 10, 15, 0, 1, 0, PacifidlogTown_EventScript_1A00EA + bg_event 9, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_1A00EA + bg_event 7, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PacifidlogTown_EventScript_14E91B + bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_NORTH, PacifidlogTown_EventScript_1A00EA PacifidlogTown_MapEvents:: @ 83810A8 map_events PacifidlogTown_EventObjects, PacifidlogTown_MapWarps, 0x0, PacifidlogTown_MapBGEvents diff --git a/data/maps/PacifidlogTown/header.inc b/data/maps/PacifidlogTown/header.inc index dd589e122..ddc0e85ef 100644 --- a/data/maps/PacifidlogTown/header.inc +++ b/data/maps/PacifidlogTown/header.inc @@ -5,10 +5,10 @@ PacifidlogTown:: @ 83055EC .4byte PacifidlogTown_MapConnections .2byte MUS_MINAMO .2byte 16 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 2 - .byte 1 + .byte WEATHER_SUNNY + .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House1/events.inc b/data/maps/PacifidlogTown_House1/events.inc index 95d0009d9..1319b260f 100644 --- a/data/maps/PacifidlogTown_House1/events.inc +++ b/data/maps/PacifidlogTown_House1/events.inc @@ -1,6 +1,6 @@ PacifidlogTown_House1_EventObjects:: @ 8386F40 - object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 3, 5, 3, 8, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_154155, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, 9, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_15415E, 0 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_154155, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_House1_EventScript_15415E, 0 PacifidlogTown_House1_MapWarps:: @ 8386F70 warp_def 4, 8, 0, 1, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_House1/header.inc b/data/maps/PacifidlogTown_House1/header.inc index dcf7d338d..fc1c7d068 100644 --- a/data/maps/PacifidlogTown_House1/header.inc +++ b/data/maps/PacifidlogTown_House1/header.inc @@ -5,10 +5,10 @@ PacifidlogTown_House1:: @ 8305E90 .4byte 0x0 .2byte MUS_MINAMO .2byte 77 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House2/events.inc b/data/maps/PacifidlogTown_House2/events.inc index 00493650a..6d4575739 100644 --- a/data/maps/PacifidlogTown_House2/events.inc +++ b/data/maps/PacifidlogTown_House2/events.inc @@ -1,7 +1,7 @@ PacifidlogTown_House2_EventObjects:: @ 8386F94 - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, 8, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154168, 0 - object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, 1, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154267, 0 - object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, 1, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154282, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154168, 0 + object_event 2, EVENT_OBJ_GFX_AZURILL, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154267, 0 + object_event 3, EVENT_OBJ_GFX_AZURILL, 0, 1, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_House2_EventScript_154282, 0 PacifidlogTown_House2_MapWarps:: @ 8386FDC warp_def 4, 8, 0, 2, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_House2/header.inc b/data/maps/PacifidlogTown_House2/header.inc index 758c10751..686f43654 100644 --- a/data/maps/PacifidlogTown_House2/header.inc +++ b/data/maps/PacifidlogTown_House2/header.inc @@ -5,10 +5,10 @@ PacifidlogTown_House2:: @ 8305EAC .4byte 0x0 .2byte MUS_MINAMO .2byte 78 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House3/events.inc b/data/maps/PacifidlogTown_House3/events.inc index 0f7bb798b..0202b381d 100644 --- a/data/maps/PacifidlogTown_House3/events.inc +++ b/data/maps/PacifidlogTown_House3/events.inc @@ -1,6 +1,6 @@ PacifidlogTown_House3_EventObjects:: @ 8387000 - object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, 18, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_154342, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 2, 3, 10, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_15429E, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 0, 0, PacifidlogTown_House3_EventScript_154342, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, PacifidlogTown_House3_EventScript_15429E, 0 PacifidlogTown_House3_MapWarps:: @ 8387030 warp_def 4, 8, 0, 3, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_House3/header.inc b/data/maps/PacifidlogTown_House3/header.inc index 55427804f..42c167037 100644 --- a/data/maps/PacifidlogTown_House3/header.inc +++ b/data/maps/PacifidlogTown_House3/header.inc @@ -5,10 +5,10 @@ PacifidlogTown_House3:: @ 8305EC8 .4byte 0x0 .2byte MUS_MINAMO .2byte 77 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House4/events.inc b/data/maps/PacifidlogTown_House4/events.inc index e41a86e44..af0f50a5f 100644 --- a/data/maps/PacifidlogTown_House4/events.inc +++ b/data/maps/PacifidlogTown_House4/events.inc @@ -1,7 +1,7 @@ PacifidlogTown_House4_EventObjects:: @ 8387054 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_154355, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 5, 3, 2, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_15434C, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, 2, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_15435E, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_House4_EventScript_154355, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 7, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_15434C, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PacifidlogTown_House4_EventScript_15435E, 0 PacifidlogTown_House4_MapWarps:: @ 838709C warp_def 4, 8, 0, 4, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_House4/header.inc b/data/maps/PacifidlogTown_House4/header.inc index fbadb5440..292dee756 100644 --- a/data/maps/PacifidlogTown_House4/header.inc +++ b/data/maps/PacifidlogTown_House4/header.inc @@ -5,10 +5,10 @@ PacifidlogTown_House4:: @ 8305EE4 .4byte 0x0 .2byte MUS_MINAMO .2byte 78 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_House5/events.inc b/data/maps/PacifidlogTown_House5/events.inc index bac0ca3e1..87d4434af 100644 --- a/data/maps/PacifidlogTown_House5/events.inc +++ b/data/maps/PacifidlogTown_House5/events.inc @@ -1,6 +1,6 @@ PacifidlogTown_House5_EventObjects:: @ 83870C0 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_154394, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, 10, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_1543BA, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_154394, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PacifidlogTown_House5_EventScript_1543BA, 0 PacifidlogTown_House5_MapWarps:: @ 83870F0 warp_def 4, 8, 0, 5, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_House5/header.inc b/data/maps/PacifidlogTown_House5/header.inc index c8d5bcf3c..c23aae265 100644 --- a/data/maps/PacifidlogTown_House5/header.inc +++ b/data/maps/PacifidlogTown_House5/header.inc @@ -5,10 +5,10 @@ PacifidlogTown_House5:: @ 8305F00 .4byte 0x0 .2byte MUS_MINAMO .2byte 77 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc index 05f1e9698..c59b1979a 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ PacifidlogTown_PokemonCenter_1F_EventObjects:: @ 8386E30 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_153F18, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 6, 3, 9, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154129, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, 7, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154117, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, 1, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154120, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_153F18, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_2, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154129, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_2, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154117, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PacifidlogTown_PokemonCenter_1F_EventScript_154120, 0 PacifidlogTown_PokemonCenter_1F_MapWarps:: @ 8386E90 warp_def 7, 8, 3, 0, MAP_PACIFIDLOG_TOWN diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc index 706a9d8b2..d14920f48 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/header.inc @@ -5,10 +5,10 @@ PacifidlogTown_PokemonCenter_1F:: @ 8305E58 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc index 557b6497e..ea7a8e056 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 81540FF .byte 0 PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 - setrespawn 19 + setrespawn HEAL_LOCATION_PACIFIDLOG_TOWN end @ 8154109 diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc index 8bc70f400..7e31a4ef3 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ PacifidlogTown_PokemonCenter_2F_EventObjects:: @ 8386EBC - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F48, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F4E, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_15414E, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F48, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_153F4E, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PacifidlogTown_PokemonCenter_2F_EventScript_15414E, 0 PacifidlogTown_PokemonCenter_2F_MapWarps:: @ 8386F04 warp_def 1, 5, 4, 2, MAP_PACIFIDLOG_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc index 9408e8611..31a7ad30b 100644 --- a/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc +++ b/data/maps/PacifidlogTown_PokemonCenter_2F/header.inc @@ -5,10 +5,10 @@ PacifidlogTown_PokemonCenter_2F:: @ 8305E74 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 6 + .byte MAPSEC_PACIFIDLOG_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity/events.inc b/data/maps/PetalburgCity/events.inc index 43216cdc9..bb1df04d7 100644 --- a/data/maps/PetalburgCity/events.inc +++ b/data/maps/PetalburgCity/events.inc @@ -1,13 +1,13 @@ PetalburgCity_EventObjects:: @ 837F5F0 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 18, 3, 2, 1, 1, 0, 0, PetalburgCity_EventScript_14B7C3, FLAG_HIDE_WALLY_MOM_PETALBURG_1 - object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, 8, 0, 0, 0, 0, PetalburgCity_EventScript_14B7AC, 0 - object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, 3, 0, 1, 0, 0, PetalburgCity_EventScript_14B824, 0 - object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 15, 11, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_FATHER_PETALBURG - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 11, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_MOTHER_PETALBURG - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, FLAG_ITEM_PETALBURG_1 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, FLAG_ITEM_PETALBURG_2 - object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, 1, 0, 0, 0, 0, PetalburgCity_EventScript_14BA2D, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 16, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_EventScript_14B7C3, FLAG_HIDE_WALLY_MOM_PETALBURG_1 + object_event 2, EVENT_OBJ_GFX_WALLY, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 8, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_EventScript_14B7AC, 0 + object_event 4, EVENT_OBJ_GFX_GENTLEMAN, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, PetalburgCity_EventScript_14B824, 0 + object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 15, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_FATHER_PETALBURG + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 14, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_MOTHER_PETALBURG + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_1B1704, FLAG_ITEM_PETALBURG_1 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 28, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_1B1711, FLAG_ITEM_PETALBURG_2 + object_event 9, EVENT_OBJ_GFX_BOY_2, 0, 12, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgCity_EventScript_14BA2D, 0 PetalburgCity_MapWarps:: @ 837F6C8 warp_def 10, 19, 0, 0, MAP_PETALBURG_CITY_HOUSE1 @@ -18,19 +18,19 @@ PetalburgCity_MapWarps:: @ 837F6C8 warp_def 25, 12, 0, 0, MAP_PETALBURG_CITY_MART PetalburgCity_MapCoordEvents:: @ 837F6F8 - coord_event 8, 10, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B836 - coord_event 8, 11, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B842 - coord_event 8, 12, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B84E - coord_event 8, 13, 3, 0, VAR_PETALBURG_STATE, 0, 0, PetalburgCity_EventScript_14B85A + coord_event 8, 10, 3, VAR_PETALBURG_STATE, 0, PetalburgCity_EventScript_14B836 + coord_event 8, 11, 3, VAR_PETALBURG_STATE, 0, PetalburgCity_EventScript_14B842 + coord_event 8, 12, 3, VAR_PETALBURG_STATE, 0, PetalburgCity_EventScript_14B84E + coord_event 8, 13, 3, VAR_PETALBURG_STATE, 0, PetalburgCity_EventScript_14B85A PetalburgCity_MapBGEvents:: @ 837F738 - bg_event 17, 10, 0, 0, 0, PetalburgCity_EventScript_14B812 - bg_event 26, 12, 0, 1, 0, PetalburgCity_EventScript_1A00E1 - bg_event 21, 16, 0, 1, 0, PetalburgCity_EventScript_1A00EA - bg_event 17, 16, 0, 0, 0, PetalburgCity_EventScript_14B81B - bg_event 22, 16, 0, 1, 0, PetalburgCity_EventScript_1A00EA - bg_event 27, 12, 0, 1, 0, PetalburgCity_EventScript_1A00E1 - bg_event 8, 9, 0, 0, 0, PetalburgCity_EventScript_14B82D + bg_event 17, 10, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_14B812 + bg_event 26, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_1A00E1 + bg_event 21, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_1A00EA + bg_event 17, 16, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_14B81B + bg_event 22, 16, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_1A00EA + bg_event 27, 12, 0, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_EventScript_1A00E1 + bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_EventScript_14B82D bg_hidden_item_event 11, 29, 3, ITEM_RARE_CANDY, FLAG_HIDDEN_ITEM_5F PetalburgCity_MapEvents:: @ 837F798 diff --git a/data/maps/PetalburgCity/header.inc b/data/maps/PetalburgCity/header.inc index ddda0a3b0..04dad7375 100644 --- a/data/maps/PetalburgCity/header.inc +++ b/data/maps/PetalburgCity/header.inc @@ -5,10 +5,10 @@ PetalburgCity:: @ 8305448 .4byte PetalburgCity_MapConnections .2byte MUS_MACHI_S2 .2byte 1 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 2 - .byte 2 + .byte WEATHER_SUNNY + .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_Gym/events.inc b/data/maps/PetalburgCity_Gym/events.inc index b5dd1f57b..002eb56ad 100644 --- a/data/maps/PetalburgCity_Gym/events.inc +++ b/data/maps/PetalburgCity_Gym/events.inc @@ -1,14 +1,14 @@ PetalburgCity_Gym_EventObjects:: @ 8387168 - object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, FLAG_HIDE_NORMAN_PETALBURG_GYM - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 94, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154EE6, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 81, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154DF6, 0 - object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 4, 42, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154E32, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 55, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154F22, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 4, 68, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154E6E, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 16, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154F5E, 0 - object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 4, 29, 3, 8, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154EAA, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, 8, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, FLAG_HIDE_PETALBURG_GYM_GUIDE - object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG_GYM + object_event 1, EVENT_OBJ_GFX_NORMAN, 0, 4, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_1545B9, FLAG_HIDE_NORMAN_PETALBURG_GYM + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 94, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154EE6, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 4, 81, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154DF6, 0 + object_event 4, EVENT_OBJ_GFX_MAN_4, 0, 4, 42, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154E32, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 55, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154F22, 0 + object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 4, 68, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154E6E, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154F5E, 0 + object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 4, 29, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, PetalburgCity_Gym_EventScript_154EAA, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 3, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Gym_EventScript_15518B, FLAG_HIDE_PETALBURG_GYM_GUIDE + object_event 10, EVENT_OBJ_GFX_WALLY, 0, 4, 111, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_WALLY_PETALBURG_GYM PetalburgCity_Gym_MapWarps:: @ 8387258 warp_def 4, 111, 3, 2, MAP_PETALBURG_CITY @@ -51,20 +51,20 @@ PetalburgCity_Gym_MapWarps:: @ 8387258 warp_def 6, 7, 3, 33, MAP_PETALBURG_CITY_GYM PetalburgCity_Gym_MapBGEvents:: @ 8387388 - bg_event 1, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154B73 - bg_event 7, 105, 3, 0, 0, PetalburgCity_Gym_EventScript_154BC3 - bg_event 1, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_154BF8 - bg_event 7, 79, 3, 0, 0, PetalburgCity_Gym_EventScript_154C2B - bg_event 1, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_154C5E - bg_event 7, 92, 3, 0, 0, PetalburgCity_Gym_EventScript_154C91 - bg_event 7, 40, 3, 0, 0, PetalburgCity_Gym_EventScript_154CC4 - bg_event 1, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_154CF7 - bg_event 7, 53, 3, 0, 0, PetalburgCity_Gym_EventScript_154D2A - bg_event 1, 66, 3, 0, 0, PetalburgCity_Gym_EventScript_154D5D - bg_event 7, 14, 3, 0, 0, PetalburgCity_Gym_EventScript_154D90 - bg_event 1, 27, 3, 0, 0, PetalburgCity_Gym_EventScript_154DC3 - bg_event 1, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_1551AA - bg_event 7, 110, 3, 1, 0, PetalburgCity_Gym_EventScript_1551BA + bg_event 1, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154B73 + bg_event 7, 105, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154BC3 + bg_event 1, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154BF8 + bg_event 7, 79, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154C2B + bg_event 1, 92, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154C5E + bg_event 7, 92, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154C91 + bg_event 7, 40, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154CC4 + bg_event 1, 53, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154CF7 + bg_event 7, 53, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154D2A + bg_event 1, 66, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154D5D + bg_event 7, 14, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154D90 + bg_event 1, 27, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgCity_Gym_EventScript_154DC3 + bg_event 1, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_1551AA + bg_event 7, 110, 3, BG_EVENT_PLAYER_FACING_NORTH, PetalburgCity_Gym_EventScript_1551BA PetalburgCity_Gym_MapEvents:: @ 8387430 map_events PetalburgCity_Gym_EventObjects, PetalburgCity_Gym_MapWarps, 0x0, PetalburgCity_Gym_MapBGEvents diff --git a/data/maps/PetalburgCity_Gym/header.inc b/data/maps/PetalburgCity_Gym/header.inc index 6c519b07e..ecd2919c2 100644 --- a/data/maps/PetalburgCity_Gym/header.inc +++ b/data/maps/PetalburgCity_Gym/header.inc @@ -5,10 +5,10 @@ PetalburgCity_Gym:: @ 8305F38 .4byte 0x0 .2byte MUS_GIM .2byte 79 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index a3fb5c494..44398e6d5 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -15,13 +15,13 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 setvar VAR_SPECIAL_5, 1 call PetalburgCity_Gym_EventScript_154F9A - call_if_trainer_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154FBB - call_if_trainer_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154FDC - call_if_trainer_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154FFD - call_if_trainer_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_15501E - call_if_trainer_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_15503F - call_if_trainer_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_155060 - call_if_trainer_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_155081 + call_if_trainer_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154FBB + call_if_trainer_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154FDC + call_if_trainer_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154FFD + call_if_trainer_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_15501E + call_if_trainer_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_15503F + call_if_trainer_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_155060 + call_if_trainer_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_155081 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED @@ -382,7 +382,7 @@ PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 msgbox PetalburgCity_Gym_Text_17A653, 4 - trainerbattle 3, OPPONENT_NORMAN, 0, PetalburgCity_Gym_Text_17A77A + trainerbattle 3, TRAINER_NORMAN, 0, PetalburgCity_Gym_Text_17A77A message PetalburgCity_Gym_Text_17A7DD waitmessage call PetalburgCity_Gym_EventScript_1A02C5 @@ -625,7 +625,7 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall - goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 46 msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO @@ -637,7 +637,7 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall - goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_RANDALL, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -649,7 +649,7 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall - goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -661,7 +661,7 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall - goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_MARY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 72 msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO @@ -673,7 +673,7 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall - goto_if_trainer_not_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_PARKER, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -685,7 +685,7 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall - goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -697,7 +697,7 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall - goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_LORI, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -709,7 +709,7 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall - goto_if_trainer_not_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_GEORGE, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -721,7 +721,7 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall - goto_if_trainer_not_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_JODY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -733,7 +733,7 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall - goto_if_trainer_not_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated TRAINER_BERKE, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -744,7 +744,7 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 end PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 - trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A + trainerbattle 2, TRAINER_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E29 msgbox PetalburgCity_Gym_Text_17AE30, 6 end @@ -761,7 +761,7 @@ PetalburgCity_Gym_EventScript_154E29:: @ 8154E29 end PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 - trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 + trainerbattle 2, TRAINER_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E65 msgbox PetalburgCity_Gym_Text_17AFD3, 6 end @@ -778,7 +778,7 @@ PetalburgCity_Gym_EventScript_154E65:: @ 8154E65 end PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E - trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 + trainerbattle 2, TRAINER_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EA1 msgbox PetalburgCity_Gym_Text_17B12C, 6 end @@ -795,7 +795,7 @@ PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1 end PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA - trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE + trainerbattle 2, TRAINER_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EDD msgbox PetalburgCity_Gym_Text_17B2E4, 6 end @@ -812,7 +812,7 @@ PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD end PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 - trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A + trainerbattle 2, TRAINER_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F19 msgbox PetalburgCity_Gym_Text_17B46F, 6 end @@ -829,7 +829,7 @@ PetalburgCity_Gym_EventScript_154F19:: @ 8154F19 end PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 - trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 + trainerbattle 2, TRAINER_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F55 msgbox PetalburgCity_Gym_Text_17B5EA, 6 end @@ -846,7 +846,7 @@ PetalburgCity_Gym_EventScript_154F55:: @ 8154F55 end PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E - trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 + trainerbattle 2, TRAINER_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F91 msgbox PetalburgCity_Gym_Text_17B749, 6 end diff --git a/data/maps/PetalburgCity_House1/events.inc b/data/maps/PetalburgCity_House1/events.inc index df1970bd4..7ab13826e 100644 --- a/data/maps/PetalburgCity_House1/events.inc +++ b/data/maps/PetalburgCity_House1/events.inc @@ -1,6 +1,6 @@ PetalburgCity_House1_EventObjects:: @ 8387444 - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, 2, 2, 2, 0, 0, PetalburgCity_House1_EventScript_1551E8, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, PetalburgCity_House1_EventScript_1551DF, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 7, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, PetalburgCity_House1_EventScript_1551E8, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House1_EventScript_1551DF, 0 PetalburgCity_House1_MapWarps:: @ 8387474 warp_def 3, 8, 0, 0, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_House1/header.inc b/data/maps/PetalburgCity_House1/header.inc index 1aaa3ee6d..660d6955e 100644 --- a/data/maps/PetalburgCity_House1/header.inc +++ b/data/maps/PetalburgCity_House1/header.inc @@ -5,10 +5,10 @@ PetalburgCity_House1:: @ 8305F54 .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 59 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_House2/events.inc b/data/maps/PetalburgCity_House2/events.inc index b26cc139f..1999ba316 100644 --- a/data/maps/PetalburgCity_House2/events.inc +++ b/data/maps/PetalburgCity_House2/events.inc @@ -1,6 +1,6 @@ PetalburgCity_House2_EventObjects:: @ 8387498 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 3, 2, 1, 1, 0, 0, PetalburgCity_House2_EventScript_1551F2, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, 8, 0, 0, 0, 0, PetalburgCity_House2_EventScript_1551FB, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_House2_EventScript_1551F2, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_House2_EventScript_1551FB, 0 PetalburgCity_House2_MapWarps:: @ 83874C8 warp_def 3, 7, 0, 4, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_House2/header.inc b/data/maps/PetalburgCity_House2/header.inc index 1f115285c..5271d69b0 100644 --- a/data/maps/PetalburgCity_House2/header.inc +++ b/data/maps/PetalburgCity_House2/header.inc @@ -5,10 +5,10 @@ PetalburgCity_House2:: @ 8305F70 .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 80 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_Mart/events.inc b/data/maps/PetalburgCity_Mart/events.inc index 3171dca99..9b34bc9fc 100644 --- a/data/maps/PetalburgCity_Mart/events.inc +++ b/data/maps/PetalburgCity_Mart/events.inc @@ -1,8 +1,8 @@ PetalburgCity_Mart_EventObjects:: @ 8387614 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_1552B0, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15532C, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_155323, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 10, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15531A, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_1552B0, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15532C, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_155323, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_Mart_EventScript_15531A, 0 PetalburgCity_Mart_MapWarps:: @ 8387674 warp_def 3, 7, 0, 5, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_Mart/header.inc b/data/maps/PetalburgCity_Mart/header.inc index 21a487898..eb8f29262 100644 --- a/data/maps/PetalburgCity_Mart/header.inc +++ b/data/maps/PetalburgCity_Mart/header.inc @@ -5,10 +5,10 @@ PetalburgCity_Mart:: @ 8305FC4 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc index d4dc0c63e..ded0fd6d5 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/events.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/events.inc @@ -1,9 +1,9 @@ PetalburgCity_PokemonCenter_1F_EventObjects:: @ 83874EC - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155213, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1B14, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155221, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, 2, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_15522A, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 4, 3, 1, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155233, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155213, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1B14, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155221, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 9, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_15522A, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgCity_PokemonCenter_1F_EventScript_155233, 0 PetalburgCity_PokemonCenter_1F_MapWarps:: @ 8387564 warp_def 7, 8, 3, 3, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc index 0c87b4934..42ad35b9d 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/header.inc @@ -5,10 +5,10 @@ PetalburgCity_PokemonCenter_1F:: @ 8305F8C .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc index 136cc11c5..6753865e0 100644 --- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 8155204 .byte 0 PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A - setrespawn 3 + setrespawn HEAL_LOCATION_PETALBURG_CITY call PetalburgCity_PokemonCenter_1F_EventScript_19FD1B end diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc index 365e3a258..e90059281 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/events.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ PetalburgCity_PokemonCenter_2F_EventObjects:: @ 8387590 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_15529D, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A3, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A9, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_15529D, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A3, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgCity_PokemonCenter_2F_EventScript_1552A9, 0 PetalburgCity_PokemonCenter_2F_MapWarps:: @ 83875D8 warp_def 1, 5, 4, 2, MAP_PETALBURG_CITY_POKEMON_CENTER_1F diff --git a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc index 7646fd56e..49c74824b 100644 --- a/data/maps/PetalburgCity_PokemonCenter_2F/header.inc +++ b/data/maps/PetalburgCity_PokemonCenter_2F/header.inc @@ -5,10 +5,10 @@ PetalburgCity_PokemonCenter_2F:: @ 8305FA8 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgCity_WallysHouse/events.inc b/data/maps/PetalburgCity_WallysHouse/events.inc index bc33ab969..b96ee85c8 100644 --- a/data/maps/PetalburgCity_WallysHouse/events.inc +++ b/data/maps/PetalburgCity_WallysHouse/events.inc @@ -1,6 +1,6 @@ PetalburgCity_WallysHouse_EventObjects:: @ 8387114 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 3, 10, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_1543C4, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 5, 3, 9, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_154445, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_1543C4, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, PetalburgCity_WallysHouse_EventScript_154445, 0 PetalburgCity_WallysHouse_MapWarps:: @ 8387144 warp_def 3, 7, 0, 1, MAP_PETALBURG_CITY diff --git a/data/maps/PetalburgCity_WallysHouse/header.inc b/data/maps/PetalburgCity_WallysHouse/header.inc index 297065253..d733ffbf8 100644 --- a/data/maps/PetalburgCity_WallysHouse/header.inc +++ b/data/maps/PetalburgCity_WallysHouse/header.inc @@ -5,10 +5,10 @@ PetalburgCity_WallysHouse:: @ 8305F1C .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 60 - .byte 7 + .byte MAPSEC_PETALBURG_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgWoods/events.inc b/data/maps/PetalburgWoods/events.inc index d624d94dc..95e4a00ef 100644 --- a/data/maps/PetalburgWoods/events.inc +++ b/data/maps/PetalburgWoods/events.inc @@ -1,17 +1,17 @@ PetalburgWoods_EventObjects:: @ 838C14C - object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 26, 17, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, 1, 0, 0, 0, 0, 0x0, FLAG_HIDE_DEVON_PETALBURG_WOODS - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, FLAG_ITEM_PETALBURG_WOODS_2 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, 8, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, FLAG_ITEM_PETALBURG_WOODS_1 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, 1, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, FLAG_ITEM_PETALBURG_WOODS_3 - object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, 3, 1, 2, 0, 0, PetalburgWoods_EventScript_15CECA, 0 - object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, 22, 0, 0, 1, 3, PetalburgWoods_EventScript_15CF27, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, 20, 0, 0, 1, 3, PetalburgWoods_EventScript_15CF3E, 0 - object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, 2, 2, 1, 0, 0, PetalburgWoods_EventScript_15CED3, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, 1, 1, 1, 0, 0, PetalburgWoods_EventScript_1B1779, FLAG_ITEM_PETALBURG_WOODS_4 - object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, 1, 1, 1, 0, 0, PetalburgWoods_EventScript_15CEDC, 0 + object_event 1, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 19, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 26, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_PETALBURG_WOODS + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 26, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, FLAG_HIDE_DEVON_PETALBURG_WOODS + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 45, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_1B175F, FLAG_ITEM_PETALBURG_WOODS_2 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 35, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, PetalburgWoods_EventScript_1B1752, FLAG_ITEM_PETALBURG_WOODS_1 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, PetalburgWoods_EventScript_1B176C, FLAG_ITEM_PETALBURG_WOODS_3 + object_event 8, EVENT_OBJ_GFX_BOY_2, 0, 15, 19, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 2, 0, 0, PetalburgWoods_EventScript_15CECA, 0 + object_event 9, EVENT_OBJ_GFX_BUG_CATCHER, 0, 7, 32, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_15CF27, 0 + object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 4, 14, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 1, 3, PetalburgWoods_EventScript_15CF3E, 0 + object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 30, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, PetalburgWoods_EventScript_15CED3, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_1B1779, FLAG_ITEM_PETALBURG_WOODS_4 + object_event 13, EVENT_OBJ_GFX_GIRL_2, 0, 33, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, PetalburgWoods_EventScript_15CEDC, 0 PetalburgWoods_MapWarps:: @ 838C284 warp_def 14, 5, 0, 2, MAP_ROUTE104 @@ -22,16 +22,16 @@ PetalburgWoods_MapWarps:: @ 838C284 warp_def 37, 38, 0, 7, MAP_ROUTE104 PetalburgWoods_MapCoordEvents:: @ 838C2B4 - coord_event 26, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CCA8 - coord_event 27, 23, 3, 0, VAR_PETALBURG_WOODS_STATE, 0, 0, PetalburgWoods_EventScript_15CD42 + coord_event 26, 23, 3, VAR_PETALBURG_WOODS_STATE, 0, PetalburgWoods_EventScript_15CCA8 + coord_event 27, 23, 3, VAR_PETALBURG_WOODS_STATE, 0, PetalburgWoods_EventScript_15CD42 PetalburgWoods_MapBGEvents:: @ 838C2D4 - bg_event 14, 32, 3, 0, 0, PetalburgWoods_EventScript_15CF15 + bg_event 14, 32, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_15CF15 bg_hidden_item_event 39, 35, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_3A bg_hidden_item_event 26, 6, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_3B bg_hidden_item_event 40, 29, 3, ITEM_TINY_MUSHROOM, FLAG_HIDDEN_ITEM_3C bg_hidden_item_event 4, 19, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3D - bg_event 11, 8, 3, 0, 0, PetalburgWoods_EventScript_15CF1E + bg_event 11, 8, 3, BG_EVENT_PLAYER_FACING_ANY, PetalburgWoods_EventScript_15CF1E PetalburgWoods_MapEvents:: @ 838C31C map_events PetalburgWoods_EventObjects, PetalburgWoods_MapWarps, PetalburgWoods_MapCoordEvents, PetalburgWoods_MapBGEvents diff --git a/data/maps/PetalburgWoods/header.inc b/data/maps/PetalburgWoods/header.inc index d473ea6ed..3c0014255 100644 --- a/data/maps/PetalburgWoods/header.inc +++ b/data/maps/PetalburgWoods/header.inc @@ -5,10 +5,10 @@ PetalburgWoods:: @ 8306EA4 .4byte 0x0 .2byte MUS_DAN01 .2byte 136 - .byte 59 + .byte MAPSEC_PETALBURG_WOODS .byte 0 - .byte 11 - .byte 3 + .byte WEATHER_SHADE + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 69b85d743..8d1651d3a 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -30,7 +30,7 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 applymovement 3, PetalburgWoods_Movement_15CEC8 waitmovement 0 msgbox PetalburgWoods_Text_194EE8, 4 - trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 + trainerbattle 3, TRAINER_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 applymovement 3, PetalburgWoods_Movement_15CEB3 waitmovement 0 call PetalburgWoods_EventScript_15CDFA @@ -65,7 +65,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 applymovement 255, PetalburgWoods_Movement_1A0841 waitmovement 0 msgbox PetalburgWoods_Text_194EE8, 4 - trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 + trainerbattle 3, TRAINER_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 applymovement 3, PetalburgWoods_Movement_15CEB3 waitmovement 0 call PetalburgWoods_EventScript_15CDFA @@ -264,12 +264,12 @@ PetalburgWoods_EventScript_15CF1E:: @ 815CF1E end PetalburgWoods_EventScript_15CF27:: @ 815CF27 - trainerbattle 0, OPPONENT_LYLE, 0, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202 + trainerbattle 0, TRAINER_LYLE, 0, PetalburgWoods_Text_1951BE, PetalburgWoods_Text_195202 msgbox PetalburgWoods_Text_195232, 6 end PetalburgWoods_EventScript_15CF3E:: @ 815CF3E - trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE + trainerbattle 0, TRAINER_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq PetalburgWoods_EventScript_15CF65 @@ -277,6 +277,6 @@ PetalburgWoods_EventScript_15CF3E:: @ 815CF3E end PetalburgWoods_EventScript_15CF65:: @ 815CF65 - trainerbattle 5, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338 + trainerbattle 5, TRAINER_JAMES_1, 0, PetalburgWoods_Text_195306, PetalburgWoods_Text_195338 msgbox PetalburgWoods_Text_195356, 6 end diff --git a/data/maps/RecordCorner/events.inc b/data/maps/RecordCorner/events.inc index e8c27a9c9..6d6b02339 100644 --- a/data/maps/RecordCorner/events.inc +++ b/data/maps/RecordCorner/events.inc @@ -1,5 +1,5 @@ RecordCorner_EventObjects:: @ 839139C - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, 8, 0, 0, 0, 0, RecordCorner_EventScript_1A44BC, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RecordCorner_EventScript_1A44BC, 0 RecordCorner_MapWarps:: @ 83913B4 warp_def 8, 9, 3, 127, MAP_NONE @@ -8,10 +8,10 @@ RecordCorner_MapWarps:: @ 83913B4 warp_def 10, 9, 3, 127, MAP_NONE RecordCorner_MapCoordEvents:: @ 83913D4 - coord_event 6, 4, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4418 - coord_event 6, 6, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4442 - coord_event 13, 4, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A442D - coord_event 13, 6, 3, 0, VAR_TEMP_0, 0, 0, RecordCorner_EventScript_1A4457 + coord_event 6, 4, 3, VAR_TEMP_0, 0, RecordCorner_EventScript_1A4418 + coord_event 6, 6, 3, VAR_TEMP_0, 0, RecordCorner_EventScript_1A4442 + coord_event 13, 4, 3, VAR_TEMP_0, 0, RecordCorner_EventScript_1A442D + coord_event 13, 6, 3, VAR_TEMP_0, 0, RecordCorner_EventScript_1A4457 RecordCorner_MapEvents:: @ 8391414 map_events RecordCorner_EventObjects, RecordCorner_MapWarps, RecordCorner_MapCoordEvents, 0x0 diff --git a/data/maps/RecordCorner/header.inc b/data/maps/RecordCorner/header.inc index ee1142c85..c5cf670ec 100644 --- a/data/maps/RecordCorner/header.inc +++ b/data/maps/RecordCorner/header.inc @@ -5,10 +5,10 @@ RecordCorner:: @ 83079B0 .4byte 0x0 .2byte MUS_RAINBOW .2byte 224 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route101/events.inc b/data/maps/Route101/events.inc index 933509835..9299c484a 100644 --- a/data/maps/Route101/events.inc +++ b/data/maps/Route101/events.inc @@ -1,24 +1,24 @@ Route101_EventObjects:: @ 83810BC - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, 1, 0, 0, 0, 0, Route101_EventScript_14EA64, 0 - object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, 71, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_BATTLE_POOCHYENA - object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, 1, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG - object_event 4, EVENT_OBJ_GFX_POOCHYENA, 0, 10, 13, 0, 70, 0, 0, 0, 0, 0x0, FLAG_HIDE_POOCHYENA_ROUTE101 - object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, 1, 0, 0, 0, 0, Route101_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE101 - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, 5, 1, 1, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 16, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_14EA64, 0 + object_event 2, EVENT_OBJ_GFX_PROF_BIRCH, 0, 9, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_BIRCH_BATTLE_POOCHYENA + object_event 3, EVENT_OBJ_GFX_BIRCHS_BAG, 0, 7, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_14EA7F, FLAG_HIDE_BIRCH_STARTERS_BAG + object_event 4, EVENT_OBJ_GFX_POOCHYENA, 0, 10, 13, 0, MOVEMENT_TYPE_JOG_IN_PLACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_POOCHYENA_ROUTE101 + object_event 5, EVENT_OBJ_GFX_PROF_BIRCH, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route101_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE101 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 2, 13, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 1, 0, 0, Route101_EventScript_14EA6D, FLAG_HIDE_BOY_ROUTE101 Route101_MapCoordEvents:: @ 838114C - coord_event 10, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948 - coord_event 11, 19, 3, 0, VAR_ROUTE101_STATE, 1, 0, Route101_EventScript_14E948 - coord_event 10, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8 - coord_event 11, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9B8 - coord_event 6, 16, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE - coord_event 6, 15, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE - coord_event 6, 17, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE - coord_event 6, 18, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9CE - coord_event 7, 13, 3, 0, VAR_ROUTE101_STATE, 2, 0, Route101_EventScript_14E9E4 + coord_event 10, 19, 3, VAR_ROUTE101_STATE, 1, Route101_EventScript_14E948 + coord_event 11, 19, 3, VAR_ROUTE101_STATE, 1, Route101_EventScript_14E948 + coord_event 10, 18, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9B8 + coord_event 11, 18, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9B8 + coord_event 6, 16, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9CE + coord_event 6, 15, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9CE + coord_event 6, 17, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9CE + coord_event 6, 18, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9CE + coord_event 7, 13, 3, VAR_ROUTE101_STATE, 2, Route101_EventScript_14E9E4 Route101_MapBGEvents:: @ 83811DC - bg_event 5, 9, 0, 0, 0, Route101_EventScript_14EA76 + bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route101_EventScript_14EA76 Route101_MapEvents:: @ 83811E8 map_events Route101_EventObjects, 0x0, Route101_MapCoordEvents, Route101_MapBGEvents diff --git a/data/maps/Route101/header.inc b/data/maps/Route101/header.inc index c3d5606d5..3817bb9ac 100644 --- a/data/maps/Route101/header.inc +++ b/data/maps/Route101/header.inc @@ -5,10 +5,10 @@ Route101:: @ 8305608 .4byte Route101_MapConnections .2byte MUS_DOORO1 .2byte 17 - .byte 16 + .byte MAPSEC_ROUTE_101 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route102/events.inc b/data/maps/Route102/events.inc index 4de0e95d2..9ba4b1ecd 100644 --- a/data/maps/Route102/events.inc +++ b/data/maps/Route102/events.inc @@ -1,17 +1,17 @@ Route102_EventObjects:: @ 83811FC - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 11, 3, 1, 0, 0, 0, 0, Route102_EventScript_14EADA, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, 8, 0, 0, 1, 3, Route102_EventScript_14EAFE, 0 - object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, 7, 0, 0, 1, 2, Route102_EventScript_14EB3C, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, 18, 0, 0, 1, 3, Route102_EventScript_14EB53, 0 - object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, 2, 1, 1, 0, 0, Route102_EventScript_14EAF5, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, 8, 0, 0, 0, 0, Route102_EventScript_1B1439, FLAG_ITEM_ROUTE102_1 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, 12, 0, 0, 0, 2, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, 12, 0, 0, 0, 1, S_BerryTree, 0 - object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, 8, 1, 1, 1, 3, Route102_EventScript_14EB6A, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 18, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route102_EventScript_14EADA, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route102_EventScript_14EAFE, 0 + object_event 3, EVENT_OBJ_GFX_BUG_CATCHER, 0, 25, 15, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 2, Route102_EventScript_14EB3C, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route102_EventScript_14EB53, 0 + object_event 5, EVENT_OBJ_GFX_BOY_1, 0, 37, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route102_EventScript_14EAF5, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route102_EventScript_1B1439, FLAG_ITEM_ROUTE102_1 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 2, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 1, S_BerryTree, 0 + object_event 9, EVENT_OBJ_GFX_YOUNGSTER, 0, 19, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, Route102_EventScript_14EB6A, 0 Route102_MapBGEvents:: @ 83812D4 - bg_event 17, 2, 0, 0, 0, Route102_EventScript_14EAEC - bg_event 40, 9, 0, 0, 0, Route102_EventScript_14EAE3 + bg_event 17, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_14EAEC + bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route102_EventScript_14EAE3 Route102_MapEvents:: @ 83812EC map_events Route102_EventObjects, 0x0, 0x0, Route102_MapBGEvents diff --git a/data/maps/Route102/header.inc b/data/maps/Route102/header.inc index a84770fae..008c88849 100644 --- a/data/maps/Route102/header.inc +++ b/data/maps/Route102/header.inc @@ -5,10 +5,10 @@ Route102:: @ 8305624 .4byte Route102_MapConnections .2byte MUS_DOORO1 .2byte 18 - .byte 17 + .byte MAPSEC_ROUTE_102 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route102/scripts.inc b/data/maps/Route102/scripts.inc index ad1571caa..758d05d45 100644 --- a/data/maps/Route102/scripts.inc +++ b/data/maps/Route102/scripts.inc @@ -18,7 +18,7 @@ Route102_EventScript_14EAF5:: @ 814EAF5 end Route102_EventScript_14EAFE:: @ 814EAFE - trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C + trainerbattle 0, TRAINER_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route102_EventScript_14EB25 @@ -26,21 +26,21 @@ Route102_EventScript_14EAFE:: @ 814EAFE end Route102_EventScript_14EB25:: @ 814EB25 - trainerbattle 5, OPPONENT_CALVIN_1, 0, Route102_Text_1B7A9F, Route102_Text_1B7AFD + trainerbattle 5, TRAINER_CALVIN_1, 0, Route102_Text_1B7A9F, Route102_Text_1B7AFD msgbox Route102_Text_1B7B2F, 6 end Route102_EventScript_14EB3C:: @ 814EB3C - trainerbattle 0, OPPONENT_RICK, 0, Route102_Text_1B7C05, Route102_Text_1B7C40 + trainerbattle 0, TRAINER_RICK, 0, Route102_Text_1B7C05, Route102_Text_1B7C40 msgbox Route102_Text_1B7C52, 6 end Route102_EventScript_14EB53:: @ 814EB53 - trainerbattle 0, OPPONENT_TIANA, 0, Route102_Text_1B7C97, Route102_Text_1B7CEC + trainerbattle 0, TRAINER_TIANA, 0, Route102_Text_1B7C97, Route102_Text_1B7CEC msgbox Route102_Text_1B7D11, 6 end Route102_EventScript_14EB6A:: @ 814EB6A - trainerbattle 0, OPPONENT_ALLEN, 0, Route102_Text_1B7B68, Route102_Text_1B7B9D + trainerbattle 0, TRAINER_ALLEN, 0, Route102_Text_1B7B68, Route102_Text_1B7B9D msgbox Route102_Text_1B7BD0, 6 end diff --git a/data/maps/Route103/events.inc b/data/maps/Route103/events.inc index f131106da..1c180dcdc 100644 --- a/data/maps/Route103/events.inc +++ b/data/maps/Route103/events.inc @@ -1,22 +1,22 @@ Route103_EventObjects:: @ 8381300 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 12, 3, 9, 0, 0, 0, 0, Route103_EventScript_14ED82, 0 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 10, 2, 3, 7, 0, 0, 0, 0, Route103_EventScript_14EB92, FLAG_HIDE_RIVAL_ROUTE103 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 10, 3, 18, 0, 0, 1, 3, Route103_EventScript_14ED94, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 11, 3, 8, 0, 0, 1, 0, Route103_EventScript_14EDF1, 0 - object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 11, 3, 8, 0, 0, 1, 0, Route103_EventScript_14EDAB, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, 26, 0, 1, 1, 3, Route103_EventScript_14EE37, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, 12, 0, 0, 0, 5, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, 12, 0, 0, 0, 6, S_BerryTree, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, 12, 0, 0, 0, 7, S_BerryTree, 0 - object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, 2, 1, 2, 0, 0, Route103_EventScript_14ED79, 0 - object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, 2, 1, 1, 0, 0, Route103_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE103 - object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 12, 3, 10, 0, 0, 1, 5, Route103_EventScript_14EE4E, 0 - object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 63, 8, 3, 1, 1, 1, 0, 0, Route103_EventScript_1B1446, FLAG_ITEM_ROUTE103_1 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 69, 7, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_13 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 49, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route103_EventScript_14ED82, 0 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route103_EventScript_14EB92, FLAG_HIDE_RIVAL_ROUTE103 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 71, 10, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route103_EventScript_14ED94, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 65, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route103_EventScript_14EDF1, 0 + object_event 5, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 64, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route103_EventScript_14EDAB, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 50, 8, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 1, 1, 3, Route103_EventScript_14EE37, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 58, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 5, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 59, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 6, S_BerryTree, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 60, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 7, S_BerryTree, 0 + object_event 10, EVENT_OBJ_GFX_BOY_1, 0, 20, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, Route103_EventScript_14ED79, 0 + object_event 11, EVENT_OBJ_GFX_PROF_BIRCH, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route103_EventScript_1A037F, FLAG_HIDE_BIRCH_ROUTE103 + object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 56, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route103_EventScript_14EE4E, 0 + object_event 13, EVENT_OBJ_GFX_ITEM_BALL, 0, 63, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route103_EventScript_1B1446, FLAG_ITEM_ROUTE103_1 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 67, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_13 Route103_MapBGEvents:: @ 8381468 - bg_event 11, 9, 0, 0, 0, Route103_EventScript_14ED8B + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route103_EventScript_14ED8B Route103_MapEvents:: @ 8381474 map_events Route103_EventObjects, 0x0, 0x0, Route103_MapBGEvents diff --git a/data/maps/Route103/header.inc b/data/maps/Route103/header.inc index f0423adeb..7cf973ccf 100644 --- a/data/maps/Route103/header.inc +++ b/data/maps/Route103/header.inc @@ -5,10 +5,10 @@ Route103:: @ 8305640 .4byte Route103_MapConnections .2byte MUS_DOORO1 .2byte 19 - .byte 18 + .byte MAPSEC_ROUTE_103 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 361dc78c3..625fc5271 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -49,32 +49,32 @@ Route103_EventScript_14EC04:: @ 814EC04 end Route103_EventScript_14EC5D:: @ 814EC5D - trainerbattle 3, OPPONENT_MAY_4, 0, Route103_Text_16D65B + trainerbattle 3, TRAINER_MAY_4, 0, Route103_Text_16D65B goto Route103_EventScript_14ECBD end Route103_EventScript_14EC6D:: @ 814EC6D - trainerbattle 3, OPPONENT_MAY_7, 0, Route103_Text_16D65B + trainerbattle 3, TRAINER_MAY_7, 0, Route103_Text_16D65B goto Route103_EventScript_14ECBD end Route103_EventScript_14EC7D:: @ 814EC7D - trainerbattle 3, OPPONENT_MAY_1, 0, Route103_Text_16D65B + trainerbattle 3, TRAINER_MAY_1, 0, Route103_Text_16D65B goto Route103_EventScript_14ECBD end Route103_EventScript_14EC8D:: @ 814EC8D - trainerbattle 3, OPPONENT_BRENDAN_4, 0, Route103_Text_16D836 + trainerbattle 3, TRAINER_BRENDAN_4, 0, Route103_Text_16D836 goto Route103_EventScript_14ECCB end Route103_EventScript_14EC9D:: @ 814EC9D - trainerbattle 3, OPPONENT_BRENDAN_7, 0, Route103_Text_16D836 + trainerbattle 3, TRAINER_BRENDAN_7, 0, Route103_Text_16D836 goto Route103_EventScript_14ECCB end Route103_EventScript_14ECAD:: @ 814ECAD - trainerbattle 3, OPPONENT_BRENDAN_1, 0, Route103_Text_16D836 + trainerbattle 3, TRAINER_BRENDAN_1, 0, Route103_Text_16D836 goto Route103_EventScript_14ECCB end @@ -167,12 +167,12 @@ Route103_EventScript_14ED8B:: @ 814ED8B end Route103_EventScript_14ED94:: @ 814ED94 - trainerbattle 0, OPPONENT_DAISY, 0, Route103_Text_1B7D55, Route103_Text_1B7D8B + trainerbattle 0, TRAINER_DAISY, 0, Route103_Text_1B7D55, Route103_Text_1B7D8B msgbox Route103_Text_1B7DB2, 6 end Route103_EventScript_14EDAB:: @ 814EDAB - trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC + trainerbattle 4, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EDD6 @@ -180,12 +180,12 @@ Route103_EventScript_14EDAB:: @ 814EDAB end Route103_EventScript_14EDD6:: @ 814EDD6 - trainerbattle 7, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF + trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7FE7, Route103_Text_1B802B, Route103_Text_1B80AF msgbox Route103_Text_1B8053, 6 end Route103_EventScript_14EDF1:: @ 814EDF1 - trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E + trainerbattle 4, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EE1C @@ -193,17 +193,17 @@ Route103_EventScript_14EDF1:: @ 814EDF1 end Route103_EventScript_14EE1C:: @ 814EE1C - trainerbattle 7, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1 + trainerbattle 7, TRAINER_AMY_AND_LIV_1, 0, Route103_Text_1B80FE, Route103_Text_1B8123, Route103_Text_1B81A1 msgbox Route103_Text_1B814D, 6 end Route103_EventScript_14EE37:: @ 814EE37 - trainerbattle 0, OPPONENT_ANDREW, 0, Route103_Text_1B81FA, Route103_Text_1B8258 + trainerbattle 0, TRAINER_ANDREW, 0, Route103_Text_1B81FA, Route103_Text_1B8258 msgbox Route103_Text_1B8281, 6 end Route103_EventScript_14EE4E:: @ 814EE4E - trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC + trainerbattle 0, TRAINER_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EE75 @@ -211,6 +211,6 @@ Route103_EventScript_14EE4E:: @ 814EE4E end Route103_EventScript_14EE75:: @ 814EE75 - trainerbattle 5, OPPONENT_MIGUEL_1, 0, Route103_Text_1B8349, Route103_Text_1B838C + trainerbattle 5, TRAINER_MIGUEL_1, 0, Route103_Text_1B8349, Route103_Text_1B838C msgbox Route103_Text_1B83A4, 6 end diff --git a/data/maps/Route104/events.inc b/data/maps/Route104/events.inc index 61934c590..221fe7536 100644 --- a/data/maps/Route104/events.inc +++ b/data/maps/Route104/events.inc @@ -1,36 +1,36 @@ Route104_EventObjects:: @ 8381488 - object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, 9, 0, 0, 0, 0, Route104_EventScript_14EF4B, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, 2, 1, 1, 0, 0, Route104_EventScript_14EF42, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, 9, 0, 0, 1, 7, Route104_EventScript_14F1A0, 0 - object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, 3, 0, 1, 0, 0, Route104_EventScript_14EF81, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 30, 50, 3, 2, 1, 1, 0, 0, Route104_EventScript_14EF8A, 0 - object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, 7, 0, 0, 0, 0, Route104_EventScript_14EFCC, 0 - object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 - object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 51, 4, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_ROUTE104 - object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, 8, 0, 0, 1, 0, Route104_EventScript_14F172, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, 12, 0, 0, 0, 8, S_BerryTree, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, 12, 0, 0, 0, 9, S_BerryTree, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, 12, 0, 0, 0, 10, S_BerryTree, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, 12, 0, 0, 0, 11, S_BerryTree, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, 12, 0, 0, 0, 12, S_BerryTree, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, 12, 0, 0, 0, 13, S_BerryTree, 0 - object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 37, 8, 3, 9, 1, 1, 0, 0, Route104_EventScript_14EEC8, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, 12, 0, 0, 0, 3, S_BerryTree, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, 12, 0, 0, 0, 4, S_BerryTree, 0 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, 12, 0, 0, 0, 75, S_BerryTree, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, 12, 0, 0, 0, 76, S_BerryTree, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, 1, 0, 0, 0, 0, Route104_EventScript_1B1453, FLAG_ITEM_ROUTE104_1 - object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 19, 3, 5, 1, 0, 0, 0, Route104_EventScript_14EF09, FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE - object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 15, 3, 8, 0, 0, 1, 0, Route104_EventScript_14F25A, 0 - object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 15, 3, 8, 0, 0, 1, 0, Route104_EventScript_14F279, 0 - object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 11, 44, 3, 16, 0, 0, 1, 3, Route104_EventScript_14F1DE, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 25, 3, 23, 0, 0, 1, 3, Route104_EventScript_14F21C, 0 - object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 1, 1, 0, 0, Route104_EventScript_1B1460, FLAG_ITEM_ROUTE104_2 - object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, 46, 5, 6, 1, 2, Route104_EventScript_14F189, 0 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, 1, 1, 1, 0, 0, Route104_EventScript_1B146D, FLAG_ITEM_ROUTE104_3 - object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, 1, 1, 1, 0, 0, Route104_EventScript_1B147A, FLAG_ITEM_ROUTE104_4 - object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, 1, 1, 1, 0, 0, Route104_EventScript_14EF93, 0 + object_event 1, EVENT_OBJ_GFX_BUG_CATCHER, 0, 15, 60, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route104_EventScript_14EF4B, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 25, 49, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_14EF42, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 31, 24, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route104_EventScript_14F1A0, 0 + object_event 4, EVENT_OBJ_GFX_BOY_1, 0, 27, 63, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route104_EventScript_14EF81, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 30, 50, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_EventScript_14EF8A, 0 + object_event 6, EVENT_OBJ_GFX_GIRL_3, 0, 28, 74, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route104_EventScript_14EFCC, 0 + object_event 7, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 12, 54, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + object_event 8, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 51, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_ROUTE104 + object_event 9, EVENT_OBJ_GFX_FISHERMAN, 0, 29, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_EventScript_14F172, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 8, S_BerryTree, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 9, S_BerryTree, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 10, S_BerryTree, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 11, S_BerryTree, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 12, S_BerryTree, 0 + object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 41, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 13, S_BerryTree, 0 + object_event 16, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 37, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route104_EventScript_14EEC8, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 22, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 3, S_BerryTree, 0 + object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 4, S_BerryTree, 0 + object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 75, S_BerryTree, 0 + object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 3, 25, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 76, S_BerryTree, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route104_EventScript_1B1453, FLAG_ITEM_ROUTE104_1 + object_event 22, EVENT_OBJ_GFX_WOMAN_7, 0, 8, 19, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_EventScript_14EF09, FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE + object_event 23, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_EventScript_14F25A, 0 + object_event 24, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 28, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_EventScript_14F279, 0 + object_event 25, EVENT_OBJ_GFX_BOY_4, 0, 11, 44, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route104_EventScript_14F1DE, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 25, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route104_EventScript_14F21C, 0 + object_event 27, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1B1460, FLAG_ITEM_ROUTE104_2 + object_event 28, EVENT_OBJ_GFX_YOUNGSTER, 0, 18, 67, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 5, 6, 1, 2, Route104_EventScript_14F189, 0 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1B146D, FLAG_ITEM_ROUTE104_3 + object_event 30, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 22, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 31, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_1B147A, FLAG_ITEM_ROUTE104_4 + object_event 32, EVENT_OBJ_GFX_BOY_2, 0, 5, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route104_EventScript_14EF93, 0 Route104_MapWarps:: @ 8381788 warp_def 17, 50, 0, 0, MAP_ROUTE104_MR_BRINEYS_HOUSE @@ -43,11 +43,11 @@ Route104_MapWarps:: @ 8381788 warp_def 33, 42, 3, 5, MAP_PETALBURG_WOODS Route104_MapBGEvents:: @ 83817C8 - bg_event 20, 50, 0, 0, 0, Route104_EventScript_14EF54 - bg_event 27, 66, 0, 0, 0, Route104_EventScript_14EF5D - bg_event 23, 5, 0, 0, 0, Route104_EventScript_14EF66 - bg_event 7, 20, 0, 0, 0, Route104_EventScript_14EF6F - bg_event 17, 23, 3, 0, 0, Route104_EventScript_14EF78 + bg_event 20, 50, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_14EF54 + bg_event 27, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_14EF5D + bg_event 23, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_14EF66 + bg_event 7, 20, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_14EF6F + bg_event 17, 23, 3, BG_EVENT_PLAYER_FACING_ANY, Route104_EventScript_14EF78 bg_hidden_item_event 7, 6, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2C bg_hidden_item_event 3, 9, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3E bg_hidden_item_event 14, 55, 3, ITEM_POTION, FLAG_HIDDEN_ITEM_25 diff --git a/data/maps/Route104/header.inc b/data/maps/Route104/header.inc index da47dab56..a31075c83 100644 --- a/data/maps/Route104/header.inc +++ b/data/maps/Route104/header.inc @@ -5,10 +5,10 @@ Route104:: @ 830565C .4byte Route104_MapConnections .2byte MUS_NEXTROAD .2byte 20 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 8fda04ea5..9b055f134 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -391,17 +391,17 @@ Route104_Movement_14F16F:: @ 814F16F end_movement Route104_EventScript_14F172:: @ 814F172 - trainerbattle 0, OPPONENT_IVAN, 0, Route104_Text_1B85EB, Route104_Text_1B8637 + trainerbattle 0, TRAINER_IVAN, 0, Route104_Text_1B85EB, Route104_Text_1B8637 msgbox Route104_Text_1B8680, 6 end Route104_EventScript_14F189:: @ 814F189 - trainerbattle 0, OPPONENT_BILLY, 0, Route104_Text_1B86BE, Route104_Text_1B86E8 + trainerbattle 0, TRAINER_BILLY, 0, Route104_Text_1B86BE, Route104_Text_1B86E8 msgbox Route104_Text_1B871C, 6 end Route104_EventScript_14F1A0:: @ 814F1A0 - trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 + trainerbattle 0, TRAINER_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 @@ -409,12 +409,12 @@ Route104_EventScript_14F1A0:: @ 814F1A0 end Route104_EventScript_14F1C7:: @ 814F1C7 - trainerbattle 5, OPPONENT_HALEY_1, 0, Route104_Text_1B8839, Route104_Text_1B8852 + trainerbattle 5, TRAINER_HALEY_1, 0, Route104_Text_1B8839, Route104_Text_1B8852 msgbox Route104_Text_1B8872, 6 end Route104_EventScript_14F1DE:: @ 814F1DE - trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 + trainerbattle 0, TRAINER_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F205 @@ -422,12 +422,12 @@ Route104_EventScript_14F1DE:: @ 814F1DE end Route104_EventScript_14F205:: @ 814F205 - trainerbattle 5, OPPONENT_WINSTON_1, 0, Route104_Text_1B895E, Route104_Text_1B899E + trainerbattle 5, TRAINER_WINSTON_1, 0, Route104_Text_1B895E, Route104_Text_1B899E msgbox Route104_Text_1B89C0, 6 end Route104_EventScript_14F21C:: @ 814F21C - trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 + trainerbattle 0, TRAINER_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F243 @@ -435,19 +435,19 @@ Route104_EventScript_14F21C:: @ 814F21C end Route104_EventScript_14F243:: @ 814F243 - trainerbattle 5, OPPONENT_CINDY_1, 0, Route104_Text_1B8AA7, Route104_Text_1B8AD9 + trainerbattle 5, TRAINER_CINDY_1, 0, Route104_Text_1B8AA7, Route104_Text_1B8AD9 msgbox Route104_Text_1B8B02, 6 end Route104_EventScript_14F25A:: @ 814F25A - trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C + trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_1B83E9, Route104_Text_1B8414, Route104_Text_1B845C special GetPlayerBigGuyGirlString msgbox Route104_Text_1B842C, 4 release end Route104_EventScript_14F279:: @ 814F279 - trainerbattle 4, OPPONENT_GINA_AND_MIA_1, 0, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577 + trainerbattle 4, TRAINER_GINA_AND_MIA_1, 0, Route104_Text_1B84DB, Route104_Text_1B850D, Route104_Text_1B8577 special GetPlayerBigGuyGirlString msgbox Route104_Text_1B853B, 4 release diff --git a/data/maps/Route104_MrBrineysHouse/events.inc b/data/maps/Route104_MrBrineysHouse/events.inc index 9ae66cabb..bff32a029 100644 --- a/data/maps/Route104_MrBrineysHouse/events.inc +++ b/data/maps/Route104_MrBrineysHouse/events.inc @@ -1,6 +1,6 @@ Route104_MrBrineysHouse_EventObjects:: @ 838B654 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 3, 3, 50, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, 8, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, FLAG_HIDE_PEEKO_BRINEY_HOUSE + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 3, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_15BCEB, FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 3, 3, 0, 0, Route104_MrBrineysHouse_EventScript_15BDD1, FLAG_HIDE_PEEKO_BRINEY_HOUSE Route104_MrBrineysHouse_MapWarps:: @ 838B684 warp_def 5, 8, 0, 0, MAP_ROUTE104 diff --git a/data/maps/Route104_MrBrineysHouse/header.inc b/data/maps/Route104_MrBrineysHouse/header.inc index e5a626a43..96dd9dc25 100644 --- a/data/maps/Route104_MrBrineysHouse/header.inc +++ b/data/maps/Route104_MrBrineysHouse/header.inc @@ -5,10 +5,10 @@ Route104_MrBrineysHouse:: @ 8306C20 .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 102 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_PrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrettyPetalFlowerShop/events.inc index edf18089d..2af3c6c04 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/events.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/events.inc @@ -1,7 +1,7 @@ Route104_PrettyPetalFlowerShop_EventObjects:: @ 838B6A8 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 3, 10, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BE0B, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, 5, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEA4, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, 2, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEDA, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BE0B, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEA4, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 11, 6, 4, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route104_PrettyPetalFlowerShop_EventScript_15BEDA, 0 Route104_PrettyPetalFlowerShop_MapWarps:: @ 838B6F0 warp_def 2, 8, 0, 1, MAP_ROUTE104 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrettyPetalFlowerShop/header.inc index 30e6625d8..ffcb35f23 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/header.inc @@ -5,10 +5,10 @@ Route104_PrettyPetalFlowerShop:: @ 8306C3C .4byte 0x0 .2byte MUS_MACHI_S2 .2byte 118 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_Prototype/events.inc b/data/maps/Route104_Prototype/events.inc index 2d7c90dc1..ba5b77572 100644 --- a/data/maps/Route104_Prototype/events.inc +++ b/data/maps/Route104_Prototype/events.inc @@ -1,23 +1,23 @@ Route104_Prototype_EventObjects:: @ 8391F2C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 27, 9, 3, 23, 0, 0, 1, 1, Route104_Prototype_EventScript_160D2E, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 9, 3, 10, 0, 0, 1, 0, Route104_Prototype_EventScript_160D60, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 10, 3, 10, 0, 0, 1, 0, Route104_Prototype_EventScript_160D60, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 25, 21, 3, 8, 0, 0, 1, 1, Route104_Prototype_EventScript_160D7B, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 16, 30, 3, 24, 0, 0, 1, 1, Route104_Prototype_EventScript_160D92, 0 - object_event 6, EVENT_OBJ_GFX_HIKER, 0, 34, 2, 3, 8, 0, 0, 1, 3, Route104_Prototype_EventScript_160DA9, 0 - object_event 7, EVENT_OBJ_GFX_BOY_1, 0, 15, 4, 3, 8, 0, 0, 0, 0, Route104_Prototype_EventScript_160C4B, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 14, 4, 3, 8, 0, 0, 0, 0, Route104_Prototype_EventScript_160CA3, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 29, 3, 8, 0, 0, 1, 0, Route104_Prototype_EventScript_160D45, 0 - object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 26, 29, 3, 8, 0, 0, 1, 0, Route104_Prototype_EventScript_160D45, 0 - object_event 11, EVENT_OBJ_GFX_BOY_1, 0, 17, 37, 3, 7, 0, 0, 0, 0, Route104_Prototype_EventScript_160D13, 0 - object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 11, 28, 3, 2, 1, 1, 0, 0, Route104_Prototype_EventScript_160D0A, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 27, 9, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 1, Route104_Prototype_EventScript_160D2E, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route104_Prototype_EventScript_160D60, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 13, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route104_Prototype_EventScript_160D60, 0 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 25, 21, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route104_Prototype_EventScript_160D7B, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 16, 30, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 1, Route104_Prototype_EventScript_160D92, 0 + object_event 6, EVENT_OBJ_GFX_HIKER, 0, 34, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route104_Prototype_EventScript_160DA9, 0 + object_event 7, EVENT_OBJ_GFX_BOY_1, 0, 15, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route104_Prototype_EventScript_160C4B, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route104_Prototype_EventScript_160CA3, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 27, 29, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_Prototype_EventScript_160D45, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 26, 29, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route104_Prototype_EventScript_160D45, 0 + object_event 11, EVENT_OBJ_GFX_BOY_1, 0, 17, 37, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route104_Prototype_EventScript_160D13, 0 + object_event 12, EVENT_OBJ_GFX_MAN_3, 0, 11, 28, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route104_Prototype_EventScript_160D0A, 0 Route104_Prototype_MapWarps:: @ 839204C warp_def 5, 24, 0, 0, MAP_ROUTE104_PROTOTYPE_PRETTY_PETAL_FLOWER_SHOP Route104_Prototype_MapBGEvents:: @ 8392054 - bg_event 7, 26, 0, 0, 0, Route104_Prototype_EventScript_160D1C - bg_event 18, 8, 0, 0, 0, Route104_Prototype_EventScript_160D25 + bg_event 7, 26, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_Prototype_EventScript_160D1C + bg_event 18, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route104_Prototype_EventScript_160D25 Route104_Prototype_MapEvents:: @ 839206C map_events Route104_Prototype_EventObjects, Route104_Prototype_MapWarps, 0x0, Route104_Prototype_MapBGEvents diff --git a/data/maps/Route104_Prototype/header.inc b/data/maps/Route104_Prototype/header.inc index 3fbbdad95..66dbd5222 100644 --- a/data/maps/Route104_Prototype/header.inc +++ b/data/maps/Route104_Prototype/header.inc @@ -5,10 +5,10 @@ Route104_Prototype:: @ 8307CF8 .4byte 0x0 .2byte MUS_NEXTROAD .2byte 288 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route104_Prototype/scripts.inc b/data/maps/Route104_Prototype/scripts.inc index e0aba01c9..1b8458e62 100644 --- a/data/maps/Route104_Prototype/scripts.inc +++ b/data/maps/Route104_Prototype/scripts.inc @@ -4,12 +4,12 @@ Route104_Prototype_MapScripts:: @ 8160C4A Route104_Prototype_EventScript_160C4B:: @ 8160C4B lock faceplayer - goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160C99 - goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_BRIANNA_1, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_CINDY_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_LUCAS_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated TRAINER_MIKE_1, Route104_Prototype_EventScript_160C99 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 msgbox Route104_Prototype_Text_19B267, 4 goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_2, Route104_Prototype_EventScript_160CFB @@ -24,12 +24,12 @@ Route104_Prototype_EventScript_160C99:: @ 8160C99 Route104_Prototype_EventScript_160CA3:: @ 8160CA3 lock faceplayer - goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160CF1 - goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_BRIANNA_1, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_CINDY_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_LUCAS_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated TRAINER_MIKE_1, Route104_Prototype_EventScript_160CF1 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 msgbox Route104_Prototype_Text_19B2E9, 4 goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_1, Route104_Prototype_EventScript_160CFB @@ -68,31 +68,31 @@ Route104_Prototype_EventScript_160D25:: @ 8160D25 end Route104_Prototype_EventScript_160D2E:: @ 8160D2E - trainerbattle 0, OPPONENT_CINDY_2, 0, Route104_Prototype_Text_19AD9B, Route104_Prototype_Text_19ADDA + trainerbattle 0, TRAINER_CINDY_2, 0, Route104_Prototype_Text_19AD9B, Route104_Prototype_Text_19ADDA msgbox Route104_Prototype_Text_19ADF7, 6 end Route104_Prototype_EventScript_160D45:: @ 8160D45 - trainerbattle 4, OPPONENT_AMY_AND_LIV_3, 0, Route104_Prototype_Text_19AE3E, Route104_Prototype_Text_19AE53, Route104_Prototype_Text_19AEA9 + trainerbattle 4, TRAINER_AMY_AND_LIV_3, 0, Route104_Prototype_Text_19AE3E, Route104_Prototype_Text_19AE53, Route104_Prototype_Text_19AEA9 msgbox Route104_Prototype_Text_19AE6A, 6 end Route104_Prototype_EventScript_160D60:: @ 8160D60 - trainerbattle 4, OPPONENT_GINA_AND_MIA_2, 0, Route104_Prototype_Text_19B148, Route104_Prototype_Text_19B17D, Route104_Prototype_Text_19B1DD + trainerbattle 4, TRAINER_GINA_AND_MIA_2, 0, Route104_Prototype_Text_19B148, Route104_Prototype_Text_19B17D, Route104_Prototype_Text_19B1DD msgbox Route104_Prototype_Text_19B18D, 6 end Route104_Prototype_EventScript_160D7B:: @ 8160D7B - trainerbattle 0, OPPONENT_MIKE_1, 0, Route104_Prototype_Text_19AEFB, Route104_Prototype_Text_19AF3E + trainerbattle 0, TRAINER_MIKE_1, 0, Route104_Prototype_Text_19AEFB, Route104_Prototype_Text_19AF3E msgbox Route104_Prototype_Text_19AF56, 6 end Route104_Prototype_EventScript_160D92:: @ 8160D92 - trainerbattle 0, OPPONENT_BRIANNA_1, 0, Route104_Prototype_Text_19AF8A, Route104_Prototype_Text_19AFDB + trainerbattle 0, TRAINER_BRIANNA_1, 0, Route104_Prototype_Text_19AF8A, Route104_Prototype_Text_19AFDB msgbox Route104_Prototype_Text_19B00D, 6 end Route104_Prototype_EventScript_160DA9:: @ 8160DA9 - trainerbattle 0, OPPONENT_LUCAS_2, 0, Route104_Prototype_Text_19B066, Route104_Prototype_Text_19B0D7 + trainerbattle 0, TRAINER_LUCAS_2, 0, Route104_Prototype_Text_19B066, Route104_Prototype_Text_19B0D7 msgbox Route104_Prototype_Text_19B0EF, 6 end diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc index 89ceb8270..be85c689b 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/events.inc @@ -1,5 +1,5 @@ Route104_PrototypePrettyPetalFlowerShop_EventObjects:: @ 8392080 - object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route104_PrototypePrettyPetalFlowerShop_EventScript_160DC1, 0 + object_event 1, EVENT_OBJ_GFX_GIRL_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route104_PrototypePrettyPetalFlowerShop_EventScript_160DC1, 0 Route104_PrototypePrettyPetalFlowerShop_MapWarps:: @ 8392098 warp_def 2, 8, 0, 0, MAP_ROUTE104_PROTOTYPE diff --git a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc index f7b4982aa..8542522bc 100644 --- a/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc +++ b/data/maps/Route104_PrototypePrettyPetalFlowerShop/header.inc @@ -5,10 +5,10 @@ Route104_PrototypePrettyPetalFlowerShop:: @ 8307D14 .4byte 0x0 .2byte MUS_NEXTROAD .2byte 118 - .byte 19 + .byte MAPSEC_ROUTE_104 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route105/events.inc b/data/maps/Route105/events.inc index 999966093..720991748 100644 --- a/data/maps/Route105/events.inc +++ b/data/maps/Route105/events.inc @@ -1,10 +1,10 @@ Route105_EventObjects:: @ 8381854 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 60, 1, 10, 0, 0, 1, 6, Route105_EventScript_14F2D2, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 10, 44, 1, 27, 7, 0, 1, 3, Route105_EventScript_14F2E9, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 26, 36, 1, 25, 0, 7, 1, 3, Route105_EventScript_14F300, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, 24, 0, 5, 1, 3, Route105_EventScript_14F317, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, 1, 0, 0, 0, 0, Route105_EventScript_1B1487, FLAG_ITEM_ROUTE105_1 - object_event 6, EVENT_OBJ_GFX_HIKER, 0, 12, 51, 3, 13, 0, 0, 1, 3, Route105_EventScript_14F2BB, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 60, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route105_EventScript_14F2D2, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 10, 44, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 7, 0, 1, 3, Route105_EventScript_14F2E9, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 26, 36, 1, MOVEMENT_TYPE_WALK_UP_AND_DOWN, 0, 7, 1, 3, Route105_EventScript_14F300, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 19, 9, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 5, 1, 3, Route105_EventScript_14F317, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 73, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route105_EventScript_1B1487, FLAG_ITEM_ROUTE105_1 + object_event 6, EVENT_OBJ_GFX_HIKER, 0, 12, 51, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route105_EventScript_14F2BB, 0 Route105_MapWarps:: @ 83818E4 warp_def 9, 20, 0, 0, MAP_ISLAND_CAVE diff --git a/data/maps/Route105/header.inc b/data/maps/Route105/header.inc index 79fedb244..61177480e 100644 --- a/data/maps/Route105/header.inc +++ b/data/maps/Route105/header.inc @@ -5,10 +5,10 @@ Route105:: @ 8305678 .4byte Route105_MapConnections .2byte MUS_NEXTROAD .2byte 21 - .byte 20 + .byte MAPSEC_ROUTE_105 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index 305a2e9af..e628c4761 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -12,26 +12,26 @@ Route105_EventScript_14F2A8:: @ 814F2A8 return Route105_EventScript_14F2BB:: @ 814F2BB - trainerbattle 0, OPPONENT_FOSTER, 0, Route105_Text_1B8B40, Route105_Text_1B8B93 + trainerbattle 0, TRAINER_FOSTER, 0, Route105_Text_1B8B40, Route105_Text_1B8B93 msgbox Route105_Text_1B8BDE, 6 end Route105_EventScript_14F2D2:: @ 814F2D2 - trainerbattle 0, OPPONENT_LUIS, 0, Route105_Text_1B8C28, Route105_Text_1B8C99 + trainerbattle 0, TRAINER_LUIS, 0, Route105_Text_1B8C28, Route105_Text_1B8C99 msgbox Route105_Text_1B8CA9, 6 end Route105_EventScript_14F2E9:: @ 814F2E9 - trainerbattle 0, OPPONENT_AUSTIN, 0, Route105_Text_1B8CEE, Route105_Text_1B8D23 + trainerbattle 0, TRAINER_AUSTIN, 0, Route105_Text_1B8CEE, Route105_Text_1B8D23 msgbox Route105_Text_1B8D45, 6 end Route105_EventScript_14F300:: @ 814F300 - trainerbattle 0, OPPONENT_BEVERLY, 0, Route105_Text_1B8D99, Route105_Text_1B8DDD + trainerbattle 0, TRAINER_BEVERLY, 0, Route105_Text_1B8D99, Route105_Text_1B8DDD msgbox Route105_Text_1B8DED, 6 end Route105_EventScript_14F317:: @ 814F317 - trainerbattle 0, OPPONENT_DAWN, 0, Route105_Text_1B8E66, Route105_Text_1B8EA0 + trainerbattle 0, TRAINER_DAWN, 0, Route105_Text_1B8E66, Route105_Text_1B8EA0 msgbox Route105_Text_1B8EBD, 6 end diff --git a/data/maps/Route106/events.inc b/data/maps/Route106/events.inc index 55f395ded..bac423c22 100644 --- a/data/maps/Route106/events.inc +++ b/data/maps/Route106/events.inc @@ -1,9 +1,9 @@ Route106_EventObjects:: @ 838190C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 29, 11, 1, 27, 4, 0, 1, 3, Route106_EventScript_14F338, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 5, 3, 1, 0, 0, 1, 3, Route106_EventScript_14F34F, 0 - object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, 10, 0, 0, 1, 4, Route106_EventScript_14F366, 0 - object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, 1, 0, 0, 1, 3, Route106_EventScript_14F3A4, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, 1, 0, 0, 0, 0, Route106_EventScript_1B1494, FLAG_ITEM_ROUTE106_1 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 29, 11, 1, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 4, 0, 1, 3, Route106_EventScript_14F338, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_14F34F, 0 + object_event 3, EVENT_OBJ_GFX_FISHERMAN, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route106_EventScript_14F366, 0 + object_event 4, EVENT_OBJ_GFX_FISHERMAN, 0, 65, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route106_EventScript_14F3A4, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route106_EventScript_1B1494, FLAG_ITEM_ROUTE106_1 Route106_MapWarps:: @ 8381984 warp_def 48, 16, 0, 0, MAP_GRANITE_CAVE_1F @@ -12,7 +12,7 @@ Route106_MapBGEvents:: @ 838198C bg_hidden_item_event 41, 11, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_3F bg_hidden_item_event 53, 12, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_2E bg_hidden_item_event 68, 15, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_2F - bg_event 59, 13, 3, 0, 0, Route106_EventScript_14F32F + bg_event 59, 13, 3, BG_EVENT_PLAYER_FACING_ANY, Route106_EventScript_14F32F Route106_MapEvents:: @ 83819BC map_events Route106_EventObjects, Route106_MapWarps, 0x0, Route106_MapBGEvents diff --git a/data/maps/Route106/header.inc b/data/maps/Route106/header.inc index bf8dd9626..1d787957b 100644 --- a/data/maps/Route106/header.inc +++ b/data/maps/Route106/header.inc @@ -5,10 +5,10 @@ Route106:: @ 8305694 .4byte Route106_MapConnections .2byte MUS_NEXTROAD .2byte 22 - .byte 21 + .byte MAPSEC_ROUTE_106 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route106/scripts.inc b/data/maps/Route106/scripts.inc index ae65c7013..16132e530 100644 --- a/data/maps/Route106/scripts.inc +++ b/data/maps/Route106/scripts.inc @@ -6,17 +6,17 @@ Route106_EventScript_14F32F:: @ 814F32F end Route106_EventScript_14F338:: @ 814F338 - trainerbattle 0, OPPONENT_DOUGLAS, 0, Route106_Text_1B913D, Route106_Text_1B917F + trainerbattle 0, TRAINER_DOUGLAS, 0, Route106_Text_1B913D, Route106_Text_1B917F msgbox Route106_Text_1B918A, 6 end Route106_EventScript_14F34F:: @ 814F34F - trainerbattle 0, OPPONENT_NICOLE, 0, Route106_Text_1B91AC, Route106_Text_1B91F8 + trainerbattle 0, TRAINER_NICOLE, 0, Route106_Text_1B91AC, Route106_Text_1B91F8 msgbox Route106_Text_1B9222, 6 end Route106_EventScript_14F366:: @ 814F366 - trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 + trainerbattle 0, TRAINER_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route106_EventScript_14F38D @@ -24,11 +24,11 @@ Route106_EventScript_14F366:: @ 814F366 end Route106_EventScript_14F38D:: @ 814F38D - trainerbattle 5, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8FAC, Route106_Text_1B8FF5 + trainerbattle 5, TRAINER_ELLIOT_1, 0, Route106_Text_1B8FAC, Route106_Text_1B8FF5 msgbox Route106_Text_1B9011, 6 end Route106_EventScript_14F3A4:: @ 814F3A4 - trainerbattle 0, OPPONENT_NED, 0, Route106_Text_1B9052, Route106_Text_1B90D3 + trainerbattle 0, TRAINER_NED, 0, Route106_Text_1B9052, Route106_Text_1B90D3 msgbox Route106_Text_1B910A, 6 end diff --git a/data/maps/Route107/events.inc b/data/maps/Route107/events.inc index 9bdeaf3b0..9f98360d4 100644 --- a/data/maps/Route107/events.inc +++ b/data/maps/Route107/events.inc @@ -1,10 +1,10 @@ Route107_EventObjects:: @ 83819D0 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 10, 1, 24, 1, 1, 1, 3, Route107_EventScript_14F3BC, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 38, 11, 1, 52, 6, 2, 1, 2, Route107_EventScript_14F3D3, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 6, 1, 14, 0, 0, 1, 3, Route107_EventScript_14F411, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 11, 1, 7, 0, 0, 1, 4, Route107_EventScript_14F428, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, 8, 1, 1, 1, 0, Route107_EventScript_14F43F, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, 8, 1, 1, 1, 0, Route107_EventScript_14F45A, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 27, 10, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 3, Route107_EventScript_14F3BC, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 38, 11, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 6, 2, 1, 2, Route107_EventScript_14F3D3, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 50, 6, 1, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route107_EventScript_14F411, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 16, 11, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route107_EventScript_14F428, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route107_EventScript_14F43F, 0 + object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 32, 4, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route107_EventScript_14F45A, 0 Route107_MapEvents:: @ 8381A60 map_events Route107_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route107/header.inc b/data/maps/Route107/header.inc index 19ba4ebd6..ed5263877 100644 --- a/data/maps/Route107/header.inc +++ b/data/maps/Route107/header.inc @@ -5,10 +5,10 @@ Route107:: @ 83056B0 .4byte Route107_MapConnections .2byte MUS_NEXTROAD .2byte 23 - .byte 22 + .byte MAPSEC_ROUTE_107 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route107/scripts.inc b/data/maps/Route107/scripts.inc index ad2d293fc..3f8d2dc0f 100644 --- a/data/maps/Route107/scripts.inc +++ b/data/maps/Route107/scripts.inc @@ -2,12 +2,12 @@ Route107_MapScripts:: @ 814F3BB .byte 0 Route107_EventScript_14F3BC:: @ 814F3BC - trainerbattle 0, OPPONENT_DARRIN, 0, Route107_Text_1B926B, Route107_Text_1B92B7 + trainerbattle 0, TRAINER_DARRIN, 0, Route107_Text_1B926B, Route107_Text_1B92B7 msgbox Route107_Text_1B92E7, 6 end Route107_EventScript_14F3D3:: @ 814F3D3 - trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 + trainerbattle 0, TRAINER_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route107_EventScript_14F3FA @@ -15,26 +15,26 @@ Route107_EventScript_14F3D3:: @ 814F3D3 end Route107_EventScript_14F3FA:: @ 814F3FA - trainerbattle 5, OPPONENT_TONY_1, 0, Route107_Text_1B93EB, Route107_Text_1B9429 + trainerbattle 5, TRAINER_TONY_1, 0, Route107_Text_1B93EB, Route107_Text_1B9429 msgbox Route107_Text_1B9477, 6 end Route107_EventScript_14F411:: @ 814F411 - trainerbattle 0, OPPONENT_DENISE, 0, Route107_Text_1B94C8, Route107_Text_1B94F2 + trainerbattle 0, TRAINER_DENISE, 0, Route107_Text_1B94C8, Route107_Text_1B94F2 msgbox Route107_Text_1B94FF, 6 end Route107_EventScript_14F428:: @ 814F428 - trainerbattle 0, OPPONENT_BETH, 0, Route107_Text_1B9538, Route107_Text_1B956B + trainerbattle 0, TRAINER_BETH, 0, Route107_Text_1B9538, Route107_Text_1B956B msgbox Route107_Text_1B9589, 6 end Route107_EventScript_14F43F:: @ 814F43F - trainerbattle 4, OPPONENT_LISA_AND_RAY, 0, Route107_Text_1B95CB, Route107_Text_1B95FB, Route107_Text_1B9672 + trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_1B95CB, Route107_Text_1B95FB, Route107_Text_1B9672 msgbox Route107_Text_1B9630, 6 end Route107_EventScript_14F45A:: @ 814F45A - trainerbattle 4, OPPONENT_LISA_AND_RAY, 0, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788 + trainerbattle 4, TRAINER_LISA_AND_RAY, 0, Route107_Text_1B96AB, Route107_Text_1B9707, Route107_Text_1B9788 msgbox Route107_Text_1B9735, 6 end diff --git a/data/maps/Route108/events.inc b/data/maps/Route108/events.inc index 997fb5ce2..2d6ba0b35 100644 --- a/data/maps/Route108/events.inc +++ b/data/maps/Route108/events.inc @@ -1,8 +1,8 @@ Route108_EventObjects:: @ 8381A74 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 17, 13, 1, 45, 3, 3, 1, 3, Route108_EventScript_14F476, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 6, 1, 13, 1, 1, 1, 3, Route108_EventScript_14F4A4, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 10, 1, 24, 0, 0, 1, 3, Route108_EventScript_14F48D, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 12, 1, 51, 6, 3, 1, 3, Route108_EventScript_14F4BB, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 17, 13, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 3, 3, 1, 3, Route108_EventScript_14F476, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 8, 6, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 1, 1, 1, 3, Route108_EventScript_14F4A4, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 50, 10, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route108_EventScript_14F48D, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 36, 12, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 6, 3, 1, 3, Route108_EventScript_14F4BB, 0 Route108_MapWarps:: @ 8381AD4 warp_def 29, 6, 3, 0, MAP_ABANDONED_SHIP_DECK diff --git a/data/maps/Route108/header.inc b/data/maps/Route108/header.inc index 0169859e0..6df68bcc5 100644 --- a/data/maps/Route108/header.inc +++ b/data/maps/Route108/header.inc @@ -5,10 +5,10 @@ Route108:: @ 83056CC .4byte Route108_MapConnections .2byte MUS_NEXTROAD .2byte 24 - .byte 23 + .byte MAPSEC_ROUTE_108 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route108/scripts.inc b/data/maps/Route108/scripts.inc index 2e40c882d..498a52a51 100644 --- a/data/maps/Route108/scripts.inc +++ b/data/maps/Route108/scripts.inc @@ -2,21 +2,21 @@ Route108_MapScripts:: @ 814F475 .byte 0 Route108_EventScript_14F476:: @ 814F476 - trainerbattle 0, OPPONENT_JEROME, 0, Route108_Text_1B97C3, Route108_Text_1B97EF + trainerbattle 0, TRAINER_JEROME, 0, Route108_Text_1B97C3, Route108_Text_1B97EF msgbox Route108_Text_1B9823, 6 end Route108_EventScript_14F48D:: @ 814F48D - trainerbattle 0, OPPONENT_MATTHEW, 0, Route108_Text_1B9864, Route108_Text_1B989F + trainerbattle 0, TRAINER_MATTHEW, 0, Route108_Text_1B9864, Route108_Text_1B989F msgbox Route108_Text_1B98BC, 6 end Route108_EventScript_14F4A4:: @ 814F4A4 - trainerbattle 0, OPPONENT_TARA, 0, Route108_Text_1B98EC, Route108_Text_1B992C + trainerbattle 0, TRAINER_TARA, 0, Route108_Text_1B98EC, Route108_Text_1B992C msgbox Route108_Text_1B9935, 6 end Route108_EventScript_14F4BB:: @ 814F4BB - trainerbattle 0, OPPONENT_MISSY, 0, Route108_Text_1B9986, Route108_Text_1B99BB + trainerbattle 0, TRAINER_MISSY, 0, Route108_Text_1B9986, Route108_Text_1B99BB msgbox Route108_Text_1B99E9, 6 end diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc index 7376fd4bf..8bc876f7f 100644 --- a/data/maps/Route109/events.inc +++ b/data/maps/Route109/events.inc @@ -1,31 +1,31 @@ Route109_EventObjects:: @ 8381AFC - object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 24, 3, 7, 0, 0, 0, 0, Route109_EventScript_14F680, FLAG_HIDE_MR_BRINEY_ROUTE109 - object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, 10, 0, 0, 1, 5, Route109_EventScript_14F7AD, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 42, 3, 15, 0, 0, 1, 5, Route109_EventScript_14F7C4, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 19, 19, 3, 10, 0, 0, 1, 4, Route109_EventScript_14F7DB, 0 - object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 14, 11, 4, 8, 0, 0, 1, 1, Route109_EventScript_14F7F2, 0 - object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 21, 11, 3, 23, 0, 0, 1, 3, Route109_EventScript_14F809, 0 - object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 28, 8, 3, 10, 0, 0, 1, 4, Route109_EventScript_14F847, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 6, 3, 8, 0, 0, 0, 0, Route109_EventScript_14F705, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 48, 3, 1, 0, 0, 0, 0, Route109_EventScript_1B14A1, FLAG_ITEM_ROUTE109_1 - object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, 13, 0, 0, 1, 3, Route109_EventScript_14F89C, 0 - object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, 17, 0, 0, 1, 3, Route109_EventScript_14F885, 0 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 52, 3, 10, 0, 0, 1, 0, Route109_EventScript_14F8B3, 0 - object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 17, 3, 10, 1, 1, 0, 0, Route109_EventScript_14F70E, 0 - object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 17, 3, 9, 1, 1, 0, 0, Route109_EventScript_14F725, 0 - object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 32, 3, 8, 1, 1, 0, 0, Route109_EventScript_14F776, 0 - object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 41, 3, 8, 1, 1, 1, 0, Route109_EventScript_14F8E5, 0 - object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 9, 41, 3, 8, 1, 1, 1, 0, Route109_EventScript_14F8CA, 0 - object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 33, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_14F77F, 0 - object_event 20, EVENT_OBJ_GFX_ZIGZAGOON, 0, 32, 6, 3, 1, 1, 1, 0, 0, Route109_EventScript_14F788, 0 + object_event 1, EVENT_OBJ_GFX_MR_BRINEYS_BOAT, 0, 21, 26, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 21, 24, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route109_EventScript_14F680, FLAG_HIDE_MR_BRINEY_ROUTE109 + object_event 3, EVENT_OBJ_GFX_SWIMMER_M, 0, 12, 36, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, Route109_EventScript_14F7AD, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 25, 42, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 5, Route109_EventScript_14F7C4, 0 + object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 19, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route109_EventScript_14F7DB, 0 + object_event 6, EVENT_OBJ_GFX_SAILOR, 0, 14, 11, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route109_EventScript_14F7F2, 0 + object_event 7, EVENT_OBJ_GFX_TUBER_M, 0, 21, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route109_EventScript_14F809, 0 + object_event 8, EVENT_OBJ_GFX_TUBER_F, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route109_EventScript_14F847, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 11, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_EventScript_14F705, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 48, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route109_EventScript_1B14A1, FLAG_ITEM_ROUTE109_1 + object_event 11, EVENT_OBJ_GFX_TUBER_F, 0, 29, 32, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route109_EventScript_14F89C, 0 + object_event 12, EVENT_OBJ_GFX_TUBER_F, 0, 28, 31, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route109_EventScript_14F885, 0 + object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 15, 52, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route109_EventScript_14F8B3, 0 + object_event 14, EVENT_OBJ_GFX_TUBER_M, 0, 24, 17, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route109_EventScript_14F70E, 0 + object_event 15, EVENT_OBJ_GFX_TUBER_F, 0, 25, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, Route109_EventScript_14F725, 0 + object_event 16, EVENT_OBJ_GFX_WOMAN_2, 0, 30, 32, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route109_EventScript_14F776, 0 + object_event 17, EVENT_OBJ_GFX_WOMAN_5, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route109_EventScript_14F8E5, 0 + object_event 18, EVENT_OBJ_GFX_MAN_5, 0, 9, 41, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route109_EventScript_14F8CA, 0 + object_event 19, EVENT_OBJ_GFX_OLD_MAN_2, 0, 33, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_14F77F, 0 + object_event 20, EVENT_OBJ_GFX_ZIGZAGOON, 0, 32, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_14F788, 0 Route109_MapWarps:: @ 8381CDC warp_def 12, 5, 0, 0, MAP_ROUTE109_SEASHORE_HOUSE Route109_MapBGEvents:: @ 8381CE4 - bg_event 15, 5, 0, 0, 0, Route109_EventScript_14F79B - bg_event 29, 10, 3, 0, 0, Route109_EventScript_14F7A4 + bg_event 15, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_14F79B + bg_event 29, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route109_EventScript_14F7A4 bg_hidden_item_event 16, 23, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_32 bg_hidden_item_event 33, 5, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_34 bg_hidden_item_event 9, 10, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_33 diff --git a/data/maps/Route109/header.inc b/data/maps/Route109/header.inc index 95c3cfaeb..9a18273b6 100644 --- a/data/maps/Route109/header.inc +++ b/data/maps/Route109/header.inc @@ -5,10 +5,10 @@ Route109:: @ 83056E8 .4byte Route109_MapConnections .2byte MUS_NEXTROAD .2byte 25 - .byte 24 + .byte MAPSEC_ROUTE_109 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 6f24b2142..899952d1a 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -373,27 +373,27 @@ Route109_EventScript_14F7A4:: @ 814F7A4 end Route109_EventScript_14F7AD:: @ 814F7AD - trainerbattle 0, OPPONENT_DAVID, 0, Route109_Text_1B9A1C, Route109_Text_1B9A59 + trainerbattle 0, TRAINER_DAVID, 0, Route109_Text_1B9A1C, Route109_Text_1B9A59 msgbox Route109_Text_1B9A6D, 6 end Route109_EventScript_14F7C4:: @ 814F7C4 - trainerbattle 0, OPPONENT_ALICE, 0, Route109_Text_1B9AAD, Route109_Text_1B9AD9 + trainerbattle 0, TRAINER_ALICE, 0, Route109_Text_1B9AAD, Route109_Text_1B9AD9 msgbox Route109_Text_1B9AEB, 6 end Route109_EventScript_14F7DB:: @ 814F7DB - trainerbattle 0, OPPONENT_HUEY, 0, Route109_Text_1B9B11, Route109_Text_1B9B57 + trainerbattle 0, TRAINER_HUEY, 0, Route109_Text_1B9B11, Route109_Text_1B9B57 msgbox Route109_Text_1B9B68, 6 end Route109_EventScript_14F7F2:: @ 814F7F2 - trainerbattle 0, OPPONENT_EDMOND, 0, Route109_Text_1B9B91, Route109_Text_1B9BAE + trainerbattle 0, TRAINER_EDMOND, 0, Route109_Text_1B9B91, Route109_Text_1B9BAE msgbox Route109_Text_1B9BD3, 6 end Route109_EventScript_14F809:: @ 814F809 - trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 + trainerbattle 0, TRAINER_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route109_EventScript_14F830 @@ -401,12 +401,12 @@ Route109_EventScript_14F809:: @ 814F809 end Route109_EventScript_14F830:: @ 814F830 - trainerbattle 5, OPPONENT_RICKY_1, 0, Route109_Text_1B9CB3, Route109_Text_1B9CEB + trainerbattle 5, TRAINER_RICKY_1, 0, Route109_Text_1B9CB3, Route109_Text_1B9CEB msgbox Route109_Text_1B9D10, 6 end Route109_EventScript_14F847:: @ 814F847 - trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 + trainerbattle 0, TRAINER_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route109_EventScript_14F86E @@ -414,31 +414,31 @@ Route109_EventScript_14F847:: @ 814F847 end Route109_EventScript_14F86E:: @ 814F86E - trainerbattle 5, OPPONENT_LOLA_1, 0, Route109_Text_1B9DD8, Route109_Text_1B9E16 + trainerbattle 5, TRAINER_LOLA_1, 0, Route109_Text_1B9DD8, Route109_Text_1B9E16 msgbox Route109_Text_1B9E1D, 6 end Route109_EventScript_14F885:: @ 814F885 - trainerbattle 0, OPPONENT_CARMEN, 0, Route109_Text_1B9E60, Route109_Text_1B9EA1 + trainerbattle 0, TRAINER_CARMEN, 0, Route109_Text_1B9E60, Route109_Text_1B9EA1 msgbox Route109_Text_1B9ECA, 6 end Route109_EventScript_14F89C:: @ 814F89C - trainerbattle 0, OPPONENT_GWEN, 0, Route109_Text_1B9F07, Route109_Text_1B9F31 + trainerbattle 0, TRAINER_GWEN, 0, Route109_Text_1B9F07, Route109_Text_1B9F31 msgbox Route109_Text_1B9F44, 6 end Route109_EventScript_14F8B3:: @ 814F8B3 - trainerbattle 0, OPPONENT_CARTER, 0, Route109_Text_1B9F65, Route109_Text_1B9F9C + trainerbattle 0, TRAINER_CARTER, 0, Route109_Text_1B9F65, Route109_Text_1B9F9C msgbox Route109_Text_1B9FB7, 6 end Route109_EventScript_14F8CA:: @ 814F8CA - trainerbattle 4, OPPONENT_MEL_AND_PAUL, 0, Route109_Text_1B9FF6, Route109_Text_1BA052, Route109_Text_1BA0BF + trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_1B9FF6, Route109_Text_1BA052, Route109_Text_1BA0BF msgbox Route109_Text_1BA069, 6 end Route109_EventScript_14F8E5:: @ 814F8E5 - trainerbattle 4, OPPONENT_MEL_AND_PAUL, 0, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0 + trainerbattle 4, TRAINER_MEL_AND_PAUL, 0, Route109_Text_1BA114, Route109_Text_1BA15F, Route109_Text_1BA1D0 msgbox Route109_Text_1BA193, 6 end diff --git a/data/maps/Route109_SeashoreHouse/events.inc b/data/maps/Route109_SeashoreHouse/events.inc index f82513f08..b62a1b372 100644 --- a/data/maps/Route109_SeashoreHouse/events.inc +++ b/data/maps/Route109_SeashoreHouse/events.inc @@ -1,8 +1,8 @@ Route109_SeashoreHouse_EventObjects:: @ 83920BC - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 2, 3, 8, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_160DD4, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160EB8, 0 - object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, 9, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160EEE, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, 14, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160ED3, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route109_SeashoreHouse_EventScript_160DD4, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160EB8, 0 + object_event 3, EVENT_OBJ_GFX_TUBER_M, 0, 14, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160EEE, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route109_SeashoreHouse_EventScript_160ED3, 0 Route109_SeashoreHouse_MapWarps:: @ 839211C warp_def 6, 9, 0, 0, MAP_ROUTE109 diff --git a/data/maps/Route109_SeashoreHouse/header.inc b/data/maps/Route109_SeashoreHouse/header.inc index 6677181f7..0f199bb4c 100644 --- a/data/maps/Route109_SeashoreHouse/header.inc +++ b/data/maps/Route109_SeashoreHouse/header.inc @@ -5,10 +5,10 @@ Route109_SeashoreHouse:: @ 8307D30 .4byte 0x0 .2byte MUS_HIGHTOWN .2byte 244 - .byte 24 + .byte MAPSEC_ROUTE_109 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index 13d37e7bd..1506e18f9 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -76,24 +76,24 @@ Route109_SeashoreHouse_EventScript_160EAB:: @ 8160EAB end Route109_SeashoreHouse_EventScript_160EB8:: @ 8160EB8 - trainerbattle 2, OPPONENT_DWAYNE, 0, Route109_SeashoreHouse_Text_19B809, Route109_SeashoreHouse_Text_19B869, Route109_SeashoreHouse_EventScript_160F09 + trainerbattle 2, TRAINER_DWAYNE, 0, Route109_SeashoreHouse_Text_19B809, Route109_SeashoreHouse_Text_19B869, Route109_SeashoreHouse_EventScript_160F09 msgbox Route109_SeashoreHouse_Text_19B89F, 6 end Route109_SeashoreHouse_EventScript_160ED3:: @ 8160ED3 - trainerbattle 2, OPPONENT_JOHANNA, 0, Route109_SeashoreHouse_Text_19B8E5, Route109_SeashoreHouse_Text_19B949, Route109_SeashoreHouse_EventScript_160F09 + trainerbattle 2, TRAINER_JOHANNA, 0, Route109_SeashoreHouse_Text_19B8E5, Route109_SeashoreHouse_Text_19B949, Route109_SeashoreHouse_EventScript_160F09 msgbox Route109_SeashoreHouse_Text_19B955, 6 end Route109_SeashoreHouse_EventScript_160EEE:: @ 8160EEE - trainerbattle 2, OPPONENT_SIMON, 0, Route109_SeashoreHouse_Text_19B988, Route109_SeashoreHouse_Text_19B9C7, Route109_SeashoreHouse_EventScript_160F09 + trainerbattle 2, TRAINER_SIMON, 0, Route109_SeashoreHouse_Text_19B988, Route109_SeashoreHouse_Text_19B9C7, Route109_SeashoreHouse_EventScript_160F09 msgbox Route109_SeashoreHouse_Text_19B9E5, 6 end Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 - goto_if_trainer_not_defeated OPPONENT_DWAYNE, Route109_SeashoreHouse_EventScript_160F29 - goto_if_trainer_not_defeated OPPONENT_JOHANNA, Route109_SeashoreHouse_EventScript_160F29 - goto_if_trainer_not_defeated OPPONENT_SIMON, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated TRAINER_DWAYNE, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated TRAINER_JOHANNA, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated TRAINER_SIMON, Route109_SeashoreHouse_EventScript_160F29 setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS release end diff --git a/data/maps/Route110/events.inc b/data/maps/Route110/events.inc index eb032e0cc..f164df80b 100644 --- a/data/maps/Route110/events.inc +++ b/data/maps/Route110/events.inc @@ -1,35 +1,35 @@ Route110_EventObjects:: @ 8381D58 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, 8, 0, 0, 0, 0, Route110_EventScript_14F9D4, 0 - object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, 8, 0, 0, 0, 0, Route110_EventScript_14F9CB, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 14, 69, 3, 3, 0, 1, 0, 0, Route110_EventScript_14F9C2, 0 - object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, 2, 1, 1, 0, 0, Route110_EventScript_14F9B0, 0 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 11, 3, 2, 1, 1, 0, 0, Route110_EventScript_14F9B9, 0 - object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, 2, 1, 3, 0, 0, Route110_EventScript_14F9A7, 0 - object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, 2, 1, 1, 0, 0, Route110_EventScript_14F99E, 0 - object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, 49, 2, 14, 1, 3, Route110_EventScript_14FB7D, 0 - object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, 51, 10, 1, 1, 3, Route110_EventScript_14FB28, 0 - object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, 9, 1, 1, 1, 4, Route110_EventScript_14FB94, 0 - object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, 45, 4, 4, 1, 3, Route110_EventScript_14FB3F, 0 - object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 39, 3, 23, 0, 0, 1, 3, Route110_EventScript_14FA8E, 0 - object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, 9, 0, 0, 1, 1, Route110_EventScript_14FAA5, 0 - object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 23, 40, 3, 20, 0, 0, 1, 3, Route110_EventScript_14FABC, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, 8, 0, 0, 1, 1, Route110_EventScript_14FAFA, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, 12, 0, 0, 0, 16, S_BerryTree, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, 12, 0, 0, 0, 17, S_BerryTree, 0 - object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, 12, 0, 0, 0, 18, S_BerryTree, 0 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, 1, 0, 0, 0, 0, Route110_EventScript_1B14BB, FLAG_ITEM_ROUTE110_2 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, 1, 0, 0, 0, 0, Route110_EventScript_1B14AE, FLAG_ITEM_ROUTE110_1 - object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, 8, 0, 0, 0, 0, Route110_EventScript_14FA53, 0 - object_event 22, EVENT_OBJ_GFX_VAR_1, 0, 7, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110 - object_event 23, EVENT_OBJ_GFX_VAR_1, 0, 8, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110 - object_event 24, EVENT_OBJ_GFX_VAR_1, 0, 9, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F972, FLAG_HIDE_EVIL_TEAM_ROUTE110 - object_event 25, EVENT_OBJ_GFX_VAR_1, 0, 10, 83, 3, 7, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110 - object_event 26, EVENT_OBJ_GFX_VAR_1, 0, 8, 82, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110 - object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, 51, 7, 1, 1, 2, Route110_EventScript_14FB11, 0 - object_event 28, EVENT_OBJ_GFX_VAR_0, 0, 34, 54, 3, 14, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE110 - object_event 29, EVENT_OBJ_GFX_VAR_3, 0, 34, 54, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110 - object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, 14, 0, 0, 1, 3, Route110_EventScript_14FC10, 0 - object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 73, 3, 9, 0, 0, 1, 4, Route110_EventScript_14FBD2, 0 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 17, 90, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_14F9D4, 0 + object_event 2, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 29, 79, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_14F9CB, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 14, 69, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route110_EventScript_14F9C2, 0 + object_event 4, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 9, 57, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_14F9B0, 0 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 10, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_14F9B9, 0 + object_event 6, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 27, 24, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route110_EventScript_14F9A7, 0 + object_event 7, EVENT_OBJ_GFX_BOY_3, 0, 15, 7, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route110_EventScript_14F99E, 0 + object_event 8, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 16, 73, 4, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 2, 14, 1, 3, Route110_EventScript_14FB7D, 0 + object_event 9, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 31, 4, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 1, 1, 3, Route110_EventScript_14FB28, 0 + object_event 10, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_F, 0, 30, 31, 4, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 4, Route110_EventScript_14FB94, 0 + object_event 11, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 16, 55, 4, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_DOWN_RIGHT, 4, 4, 1, 3, Route110_EventScript_14FB3F, 0 + object_event 12, EVENT_OBJ_GFX_PSYCHIC_M, 0, 5, 39, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route110_EventScript_14FA8E, 0 + object_event 13, EVENT_OBJ_GFX_LASS, 0, 33, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_EventScript_14FAA5, 0 + object_event 14, EVENT_OBJ_GFX_MANIAC, 0, 23, 40, 3, MOVEMENT_TYPE_FACE_DOWN_UP_AND_RIGHT, 0, 0, 1, 3, Route110_EventScript_14FABC, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 10, 19, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_EventScript_14FAFA, 0 + object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 16, S_BerryTree, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 17, S_BerryTree, 0 + object_event 18, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 11, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 18, S_BerryTree, 0 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 69, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_1B14BB, FLAG_ITEM_ROUTE110_2 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 47, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_EventScript_1B14AE, FLAG_ITEM_ROUTE110_1 + object_event 21, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 27, 92, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_EventScript_14FA53, 0 + object_event 22, EVENT_OBJ_GFX_VAR_1, 0, 7, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_14F946, FLAG_HIDE_EVIL_TEAM_ROUTE110 + object_event 23, EVENT_OBJ_GFX_VAR_1, 0, 8, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_14F95C, FLAG_HIDE_EVIL_TEAM_ROUTE110 + object_event 24, EVENT_OBJ_GFX_VAR_1, 0, 9, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_14F972, FLAG_HIDE_EVIL_TEAM_ROUTE110 + object_event 25, EVENT_OBJ_GFX_VAR_1, 0, 10, 83, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, Route110_EventScript_14F988, FLAG_HIDE_EVIL_TEAM_ROUTE110 + object_event 26, EVENT_OBJ_GFX_VAR_1, 0, 8, 82, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_ROUTE110 + object_event 27, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 21, 78, 4, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 7, 1, 1, 2, Route110_EventScript_14FB11, 0 + object_event 28, EVENT_OBJ_GFX_VAR_0, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE110 + object_event 29, EVENT_OBJ_GFX_VAR_3, 0, 34, 54, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ON_BIKE_ROUTE110 + object_event 30, EVENT_OBJ_GFX_YOUNGSTER, 0, 33, 69, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route110_EventScript_14FC10, 0 + object_event 31, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 73, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route110_EventScript_14FBD2, 0 Route110_MapWarps:: @ 8382040 warp_def 35, 24, 3, 0, MAP_NEW_MAUVILLE_ENTRANCE @@ -40,30 +40,30 @@ Route110_MapWarps:: @ 8382040 warp_def 19, 88, 0, 2, MAP_ROUTE110_SEASIDE_CYCLING_ROAD_SOUTH_ENTRANCE Route110_MapCoordEvents:: @ 8382070 - coord_event 28, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27 - coord_event 29, 92, 3, 0, VAR_CYCLING_CHALLENGE_STATE, 2, 0, Route110_EventScript_14FC27 - coord_event 33, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD13 - coord_event 34, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD1E - coord_event 35, 56, 3, 0, VAR_ROUTE110_STATE, 0, 0, Route110_EventScript_14FD29 + coord_event 28, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_14FC27 + coord_event 29, 92, 3, VAR_CYCLING_CHALLENGE_STATE, 2, Route110_EventScript_14FC27 + coord_event 33, 56, 3, VAR_ROUTE110_STATE, 0, Route110_EventScript_14FD13 + coord_event 34, 56, 3, VAR_ROUTE110_STATE, 0, Route110_EventScript_14FD1E + coord_event 35, 56, 3, VAR_ROUTE110_STATE, 0, Route110_EventScript_14FD29 Route110_MapBGEvents:: @ 83820C0 - bg_event 15, 25, 0, 0, 0, Route110_EventScript_14F9EF - bg_event 9, 51, 0, 0, 0, Route110_EventScript_14FA01 - bg_event 14, 88, 0, 0, 0, Route110_EventScript_14F9E6 - bg_event 20, 94, 0, 0, 0, Route110_EventScript_14F9DD - bg_event 7, 75, 0, 0, 0, Route110_EventScript_14F9F8 - bg_event 3, 17, 0, 0, 0, Route110_EventScript_14FA0A + bg_event 15, 25, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14F9EF + bg_event 9, 51, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14FA01 + bg_event 14, 88, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14F9E6 + bg_event 20, 94, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14F9DD + bg_event 7, 75, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14F9F8 + bg_event 3, 17, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14FA0A bg_secret_base_event 16, 25, 0, SECRET_BASE_TREE3_1 bg_secret_base_event 17, 25, 0, SECRET_BASE_TREE4_1 - bg_event 35, 39, 3, 0, 0, Route110_EventScript_14FA13 - bg_event 37, 70, 3, 0, 0, Route110_EventScript_14FA1C - bg_event 8, 67, 0, 0, 0, Route110_EventScript_14FA25 - bg_event 32, 93, 0, 0, 0, Route110_EventScript_14FA2E + bg_event 35, 39, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14FA13 + bg_event 37, 70, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14FA1C + bg_event 8, 67, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14FA25 + bg_event 32, 93, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14FA2E bg_hidden_item_event 26, 40, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_36 bg_hidden_item_event 34, 42, 3, ITEM_GREAT_BALL, FLAG_HIDDEN_ITEM_35 bg_hidden_item_event 4, 35, 3, ITEM_POKE_BALL, FLAG_HIDDEN_ITEM_41 bg_hidden_item_event 37, 67, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_37 - bg_event 13, 16, 0, 0, 0, Route110_EventScript_14F9E6 + bg_event 13, 16, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_EventScript_14F9E6 Route110_MapEvents:: @ 838218C map_events Route110_EventObjects, Route110_MapWarps, Route110_MapCoordEvents, Route110_MapBGEvents diff --git a/data/maps/Route110/header.inc b/data/maps/Route110/header.inc index 952233450..112b177ff 100644 --- a/data/maps/Route110/header.inc +++ b/data/maps/Route110/header.inc @@ -5,10 +5,10 @@ Route110:: @ 8305704 .4byte Route110_MapConnections .2byte MUS_DOORO_X1 .2byte 26 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index 36e5cd7a2..93333ce56 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -166,17 +166,17 @@ Route110_EventScript_14FA84:: @ 814FA84 end Route110_EventScript_14FA8E:: @ 814FA8E - trainerbattle 0, OPPONENT_EDWARD, 0, Route110_Text_1BA699, Route110_Text_1BA6D2 + trainerbattle 0, TRAINER_EDWARD, 0, Route110_Text_1BA699, Route110_Text_1BA6D2 msgbox Route110_Text_1BA6F8, 6 end Route110_EventScript_14FAA5:: @ 814FAA5 - trainerbattle 0, OPPONENT_JACLYN, 0, Route110_Text_1BA72D, Route110_Text_1BA759 + trainerbattle 0, TRAINER_JACLYN, 0, Route110_Text_1BA72D, Route110_Text_1BA759 msgbox Route110_Text_1BA76C, 6 end Route110_EventScript_14FABC:: @ 814FABC - trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 + trainerbattle 0, TRAINER_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FAE3 @@ -184,27 +184,27 @@ Route110_EventScript_14FABC:: @ 814FABC end Route110_EventScript_14FAE3:: @ 814FAE3 - trainerbattle 5, OPPONENT_EDWIN_1, 0, Route110_Text_1BA877, Route110_Text_1BA8CD + trainerbattle 5, TRAINER_EDWIN_1, 0, Route110_Text_1BA877, Route110_Text_1BA8CD msgbox Route110_Text_1BA8E9, 6 end Route110_EventScript_14FAFA:: @ 814FAFA - trainerbattle 0, OPPONENT_DALE, 0, Route110_Text_1BA913, Route110_Text_1BA93C + trainerbattle 0, TRAINER_DALE, 0, Route110_Text_1BA913, Route110_Text_1BA93C msgbox Route110_Text_1BA94A, 6 end Route110_EventScript_14FB11:: @ 814FB11 - trainerbattle 0, OPPONENT_JACOB, 0, Route110_Text_1BA22C, Route110_Text_1BA264 + trainerbattle 0, TRAINER_JACOB, 0, Route110_Text_1BA22C, Route110_Text_1BA264 msgbox Route110_Text_1BA27C, 6 end Route110_EventScript_14FB28:: @ 814FB28 - trainerbattle 0, OPPONENT_ANTHONY, 0, Route110_Text_1BA2D4, Route110_Text_1BA2FC + trainerbattle 0, TRAINER_ANTHONY, 0, Route110_Text_1BA2D4, Route110_Text_1BA2FC msgbox Route110_Text_1BA30C, 6 end Route110_EventScript_14FB3F:: @ 814FB3F - trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 + trainerbattle 0, TRAINER_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FB66 @@ -212,17 +212,17 @@ Route110_EventScript_14FB3F:: @ 814FB3F end Route110_EventScript_14FB66:: @ 814FB66 - trainerbattle 5, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA3EF, Route110_Text_1BA432 + trainerbattle 5, TRAINER_BENJAMIN_1, 0, Route110_Text_1BA3EF, Route110_Text_1BA432 msgbox Route110_Text_1BA456, 6 end Route110_EventScript_14FB7D:: @ 814FB7D - trainerbattle 0, OPPONENT_JASMINE, 0, Route110_Text_1BA5FF, Route110_Text_1BA63C + trainerbattle 0, TRAINER_JASMINE, 0, Route110_Text_1BA5FF, Route110_Text_1BA63C msgbox Route110_Text_1BA65F, 6 end Route110_EventScript_14FB94:: @ 814FB94 - trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F + trainerbattle 0, TRAINER_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FBBB @@ -230,12 +230,12 @@ Route110_EventScript_14FB94:: @ 814FB94 end Route110_EventScript_14FBBB:: @ 814FBBB - trainerbattle 5, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA573, Route110_Text_1BA5A1 + trainerbattle 5, TRAINER_ABIGAIL_1, 0, Route110_Text_1BA573, Route110_Text_1BA5A1 msgbox Route110_Text_1BA5C4, 6 end Route110_EventScript_14FBD2:: @ 814FBD2 - trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 + trainerbattle 0, TRAINER_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FBF9 @@ -243,12 +243,12 @@ Route110_EventScript_14FBD2:: @ 814FBD2 end Route110_EventScript_14FBF9:: @ 814FBF9 - trainerbattle 5, OPPONENT_ISABEL_1, 0, Route110_Text_1BAA2D, Route110_Text_1BAA76 + trainerbattle 5, TRAINER_ISABEL_1, 0, Route110_Text_1BAA2D, Route110_Text_1BAA76 msgbox Route110_Text_1BAA8F, 6 end Route110_EventScript_14FC10:: @ 814FC10 - trainerbattle 0, OPPONENT_TIMMY, 0, Route110_Text_1BAAC3, Route110_Text_1BAAF7 + trainerbattle 0, TRAINER_TIMMY, 0, Route110_Text_1BAAC3, Route110_Text_1BAAF7 msgbox Route110_Text_1BAB19, 6 end @@ -368,17 +368,17 @@ Route110_EventScript_14FDB1:: @ 814FDB1 end Route110_EventScript_14FDE0:: @ 814FDE0 - trainerbattle 3, OPPONENT_MAY_5, 0, Route110_Text_16E826 + trainerbattle 3, TRAINER_MAY_5, 0, Route110_Text_16E826 goto Route110_EventScript_14FE10 end Route110_EventScript_14FDF0:: @ 814FDF0 - trainerbattle 3, OPPONENT_MAY_8, 0, Route110_Text_16E826 + trainerbattle 3, TRAINER_MAY_8, 0, Route110_Text_16E826 goto Route110_EventScript_14FE10 end Route110_EventScript_14FE00:: @ 814FE00 - trainerbattle 3, OPPONENT_MAY_2, 0, Route110_Text_16E826 + trainerbattle 3, TRAINER_MAY_2, 0, Route110_Text_16E826 goto Route110_EventScript_14FE10 end @@ -398,17 +398,17 @@ Route110_EventScript_14FE2B:: @ 814FE2B end Route110_EventScript_14FE5A:: @ 814FE5A - trainerbattle 3, OPPONENT_BRENDAN_5, 0, Route110_Text_16EA0F + trainerbattle 3, TRAINER_BRENDAN_5, 0, Route110_Text_16EA0F goto Route110_EventScript_14FE8A end Route110_EventScript_14FE6A:: @ 814FE6A - trainerbattle 3, OPPONENT_BRENDAN_8, 0, Route110_Text_16EA0F + trainerbattle 3, TRAINER_BRENDAN_8, 0, Route110_Text_16EA0F goto Route110_EventScript_14FE8A end Route110_EventScript_14FE7A:: @ 814FE7A - trainerbattle 3, OPPONENT_BRENDAN_2, 0, Route110_Text_16EA0F + trainerbattle 3, TRAINER_BRENDAN_2, 0, Route110_Text_16EA0F goto Route110_EventScript_14FE8A end diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc index 0474772cb..1eb0e9c40 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/events.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadNorthEntrance_EventObjects:: @ 8392CAC - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB, 0 Route110_SeasideCyclingRoadNorthEntrance_MapWarps:: @ 8392CC4 warp_def 1, 5, 0, 2, MAP_ROUTE110 @@ -8,8 +8,8 @@ Route110_SeasideCyclingRoadNorthEntrance_MapWarps:: @ 8392CC4 warp_def 13, 5, 0, 3, MAP_ROUTE110 Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents:: @ 8392CE4 - coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7 - coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A + coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7 + coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A Route110_SeasideCyclingRoadNorthEntrance_MapEvents:: @ 8392D04 map_events Route110_SeasideCyclingRoadNorthEntrance_EventObjects, Route110_SeasideCyclingRoadNorthEntrance_MapWarps, Route110_SeasideCyclingRoadNorthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc index 1fb9928b3..c8093ca03 100644 --- a/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadNorthEntrance/header.inc @@ -5,10 +5,10 @@ Route110_SeasideCyclingRoadNorthEntrance:: @ 8307E9C .4byte 0x0 .2byte MUS_FINECITY .2byte 257 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc index 996562b61..998927469 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/events.inc @@ -1,5 +1,5 @@ Route110_SeasideCyclingRoadSouthEntrance_EventObjects:: @ 8392C40 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F, 0 Route110_SeasideCyclingRoadSouthEntrance_MapWarps:: @ 8392C58 warp_def 1, 5, 0, 4, MAP_ROUTE110 @@ -8,8 +8,8 @@ Route110_SeasideCyclingRoadSouthEntrance_MapWarps:: @ 8392C58 warp_def 13, 5, 0, 5, MAP_ROUTE110 Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents:: @ 8392C78 - coord_event 7, 4, 3, 0, VAR_TEMP_1, 0, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B - coord_event 5, 4, 3, 0, VAR_TEMP_1, 1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD + coord_event 7, 4, 3, VAR_TEMP_1, 0, Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B + coord_event 5, 4, 3, VAR_TEMP_1, 1, Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD Route110_SeasideCyclingRoadSouthEntrance_MapEvents:: @ 8392C98 map_events Route110_SeasideCyclingRoadSouthEntrance_EventObjects, Route110_SeasideCyclingRoadSouthEntrance_MapWarps, Route110_SeasideCyclingRoadSouthEntrance_MapCoordEvents, 0x0 diff --git a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc index a4da7397c..3c7464315 100644 --- a/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc +++ b/data/maps/Route110_SeasideCyclingRoadSouthEntrance/header.inc @@ -5,10 +5,10 @@ Route110_SeasideCyclingRoadSouthEntrance:: @ 8307E80 .4byte 0x0 .2byte MUS_FINECITY .2byte 257 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHouseCorridor/header.inc b/data/maps/Route110_TrickHouseCorridor/header.inc index 14997e663..da8c48b0b 100644 --- a/data/maps/Route110_TrickHouseCorridor/header.inc +++ b/data/maps/Route110_TrickHouseCorridor/header.inc @@ -5,10 +5,10 @@ Route110_TrickHouseCorridor:: @ 8307D84 .4byte 0x0 .2byte MUS_KARAKURI .2byte 247 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHouseEnd/events.inc b/data/maps/Route110_TrickHouseEnd/events.inc index 732c6c705..21e894a34 100644 --- a/data/maps/Route110_TrickHouseEnd/events.inc +++ b/data/maps/Route110_TrickHouseEnd/events.inc @@ -1,12 +1,12 @@ Route110_TrickHouseEnd_EventObjects:: @ 83921D0 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, FLAG_HIDE_TRICKMASTER_END + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHouseEnd_EventScript_16199E, FLAG_HIDE_TRICKMASTER_END Route110_TrickHouseEnd_MapWarps:: @ 83921E8 warp_def 10, 1, 3, 2, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 warp_def 2, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_CORRIDOR Route110_TrickHouseEnd_MapCoordEvents:: @ 83921F8 - coord_event 2, 2, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHouseEnd_EventScript_161CA0 + coord_event 2, 2, 3, VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_161CA0 Route110_TrickHouseEnd_MapBGEvents:: @ 8392208 bg_hidden_item_event 4, 5, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_1 diff --git a/data/maps/Route110_TrickHouseEnd/header.inc b/data/maps/Route110_TrickHouseEnd/header.inc index 58ca3e71d..933182d35 100644 --- a/data/maps/Route110_TrickHouseEnd/header.inc +++ b/data/maps/Route110_TrickHouseEnd/header.inc @@ -5,10 +5,10 @@ Route110_TrickHouseEnd:: @ 8307D68 .4byte 0x0 .2byte MUS_KARAKURI .2byte 246 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHouseEntrance/events.inc b/data/maps/Route110_TrickHouseEntrance/events.inc index 07c5a6555..64679678f 100644 --- a/data/maps/Route110_TrickHouseEntrance/events.inc +++ b/data/maps/Route110_TrickHouseEntrance/events.inc @@ -1,5 +1,5 @@ Route110_TrickHouseEntrance_EventObjects:: @ 8392140 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, 9, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, FLAG_HIDE_TRICKMASTER_ENTRANCE + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 6, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHouseEntrance_EventScript_16121A, FLAG_HIDE_TRICKMASTER_ENTRANCE Route110_TrickHouseEntrance_MapWarps:: @ 8392158 warp_def 5, 7, 3, 1, MAP_ROUTE110 @@ -7,13 +7,13 @@ Route110_TrickHouseEntrance_MapWarps:: @ 8392158 warp_def 5, 2, 3, 0, MAP_ROUTE110_TRICK_HOUSE_PUZZLE1 Route110_TrickHouseEntrance_MapCoordEvents:: @ 8392170 - coord_event 4, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - coord_event 5, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - coord_event 6, 6, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 - coord_event 7, 7, 3, 0, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 4, 7, 3, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 5, 6, 3, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 6, 6, 3, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, Route110_TrickHouseEntrance_EventScript_1618B0 + coord_event 7, 7, 3, VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, Route110_TrickHouseEntrance_EventScript_1618B0 Route110_TrickHouseEntrance_MapBGEvents:: @ 83921B0 - bg_event 5, 1, 0, 1, 0, Route110_TrickHouseEntrance_EventScript_16158A + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_NORTH, Route110_TrickHouseEntrance_EventScript_16158A Route110_TrickHouseEntrance_MapEvents:: @ 83921BC map_events Route110_TrickHouseEntrance_EventObjects, Route110_TrickHouseEntrance_MapWarps, Route110_TrickHouseEntrance_MapCoordEvents, Route110_TrickHouseEntrance_MapBGEvents diff --git a/data/maps/Route110_TrickHouseEntrance/header.inc b/data/maps/Route110_TrickHouseEntrance/header.inc index 8146c2fa0..01cbcc037 100644 --- a/data/maps/Route110_TrickHouseEntrance/header.inc +++ b/data/maps/Route110_TrickHouseEntrance/header.inc @@ -5,10 +5,10 @@ Route110_TrickHouseEntrance:: @ 8307D4C .4byte 0x0 .2byte MUS_KARAKURI .2byte 245 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle1/events.inc b/data/maps/Route110_TrickHousePuzzle1/events.inc index ef5b7732f..c7e93f221 100644 --- a/data/maps/Route110_TrickHousePuzzle1/events.inc +++ b/data/maps/Route110_TrickHousePuzzle1/events.inc @@ -1,23 +1,23 @@ Route110_TrickHousePuzzle1_EventObjects:: @ 839225C - object_event 1, EVENT_OBJ_GFX_LASS, 0, 13, 21, 3, 9, 0, 0, 1, 5, Route110_TrickHousePuzzle1_EventScript_161D31, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 7, 3, 8, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_161D48, 0 - object_event 3, EVENT_OBJ_GFX_LASS, 0, 3, 8, 3, 9, 0, 0, 1, 3, Route110_TrickHousePuzzle1_EventScript_161D5F, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 3, 18, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 7, 21, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 12, 18, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 10, 16, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14 - object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 12, 12, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_17 - object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 3, 12, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_16 - object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 14, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_15 - object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 6, 10, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_19 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 10, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_18 - object_event 13, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 9, 8, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1A - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1C - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1B - object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 6, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1D - object_event 17, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1E - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 12, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1 - object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1F + object_event 1, EVENT_OBJ_GFX_LASS, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 5, Route110_TrickHousePuzzle1_EventScript_161D31, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 13, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route110_TrickHousePuzzle1_EventScript_161D48, 0 + object_event 3, EVENT_OBJ_GFX_LASS, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route110_TrickHousePuzzle1_EventScript_161D5F, 0 + object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 3, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 7, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 6, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 12, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 7, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 10, 16, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14 + object_event 8, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 12, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_17 + object_event 9, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 3, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_16 + object_event 10, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_15 + object_event 11, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 6, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_19 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_18 + object_event 13, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 9, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1A + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 2, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1C + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 0, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1B + object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 6, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1D + object_event 17, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 11, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1E + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_1B1A51, FLAG_ITEM_TRICK_HOUSE_PUZZLE_1_1 + object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 14, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_1F Route110_TrickHousePuzzle1_MapWarps:: @ 8392424 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE @@ -25,7 +25,7 @@ Route110_TrickHousePuzzle1_MapWarps:: @ 8392424 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle1_MapBGEvents:: @ 839243C - bg_event 14, 8, 0, 0, 0, Route110_TrickHousePuzzle1_EventScript_161D14 + bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle1_EventScript_161D14 Route110_TrickHousePuzzle1_MapEvents:: @ 8392448 map_events Route110_TrickHousePuzzle1_EventObjects, Route110_TrickHousePuzzle1_MapWarps, 0x0, Route110_TrickHousePuzzle1_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle1/header.inc b/data/maps/Route110_TrickHousePuzzle1/header.inc index 18d772089..74738ea44 100644 --- a/data/maps/Route110_TrickHousePuzzle1/header.inc +++ b/data/maps/Route110_TrickHousePuzzle1/header.inc @@ -5,10 +5,10 @@ Route110_TrickHousePuzzle1:: @ 8307DA0 .4byte 0x0 .2byte MUS_KARAKURI .2byte 248 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc index df0484baf..547160a92 100644 --- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc @@ -24,16 +24,16 @@ Route110_TrickHousePuzzle1_EventScript_161D26:: @ 8161D26 end Route110_TrickHousePuzzle1_EventScript_161D31:: @ 8161D31 - trainerbattle 0, OPPONENT_SALLY, 0, Route110_TrickHousePuzzle1_Text_19CB4F, Route110_TrickHousePuzzle1_Text_19CB93 + trainerbattle 0, TRAINER_SALLY, 0, Route110_TrickHousePuzzle1_Text_19CB4F, Route110_TrickHousePuzzle1_Text_19CB93 msgbox Route110_TrickHousePuzzle1_Text_19CBAB, 6 end Route110_TrickHousePuzzle1_EventScript_161D48:: @ 8161D48 - trainerbattle 0, OPPONENT_EDDIE, 0, Route110_TrickHousePuzzle1_Text_19CBD6, Route110_TrickHousePuzzle1_Text_19CC06 + trainerbattle 0, TRAINER_EDDIE, 0, Route110_TrickHousePuzzle1_Text_19CBD6, Route110_TrickHousePuzzle1_Text_19CC06 msgbox Route110_TrickHousePuzzle1_Text_19CC1B, 6 end Route110_TrickHousePuzzle1_EventScript_161D5F:: @ 8161D5F - trainerbattle 0, OPPONENT_ROBIN, 0, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86 + trainerbattle 0, TRAINER_ROBIN, 0, Route110_TrickHousePuzzle1_Text_19CC68, Route110_TrickHousePuzzle1_Text_19CC86 msgbox Route110_TrickHousePuzzle1_Text_19CCAA, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle2/events.inc b/data/maps/Route110_TrickHousePuzzle2/events.inc index c815a1624..7fecac70a 100644 --- a/data/maps/Route110_TrickHousePuzzle2/events.inc +++ b/data/maps/Route110_TrickHousePuzzle2/events.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle2_EventObjects:: @ 839245C - object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 16, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_161E78, 0 - object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 10, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_161E8F, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 9, 7, 3, 9, 0, 0, 1, 3, Route110_TrickHousePuzzle2_EventScript_161EA6, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 19, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A6B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1 + object_event 1, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 13, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle2_EventScript_161E78, 0 + object_event 2, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 0, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle2_EventScript_161E8F, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_3, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route110_TrickHousePuzzle2_EventScript_161EA6, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 5, 19, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A6B, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_2 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_1B1A5E, FLAG_ITEM_TRICK_HOUSE_PUZZLE_2_1 Route110_TrickHousePuzzle2_MapWarps:: @ 83924D4 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE @@ -11,13 +11,13 @@ Route110_TrickHousePuzzle2_MapWarps:: @ 83924D4 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle2_MapCoordEvents:: @ 83924EC - coord_event 14, 21, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DE0 - coord_event 8, 17, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DF3 - coord_event 4, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E06 - coord_event 5, 2, 0, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle2_EventScript_161E19 + coord_event 14, 21, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle2_EventScript_161DE0 + coord_event 8, 17, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle2_EventScript_161DF3 + coord_event 4, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle2_EventScript_161E06 + coord_event 5, 2, 0, VAR_TEMP_4, 0, Route110_TrickHousePuzzle2_EventScript_161E19 Route110_TrickHousePuzzle2_MapBGEvents:: @ 839252C - bg_event 14, 5, 0, 0, 0, Route110_TrickHousePuzzle2_EventScript_161DC3 + bg_event 14, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle2_EventScript_161DC3 Route110_TrickHousePuzzle2_MapEvents:: @ 8392538 map_events Route110_TrickHousePuzzle2_EventObjects, Route110_TrickHousePuzzle2_MapWarps, Route110_TrickHousePuzzle2_MapCoordEvents, Route110_TrickHousePuzzle2_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle2/header.inc b/data/maps/Route110_TrickHousePuzzle2/header.inc index 489d213d9..eebb3bb25 100644 --- a/data/maps/Route110_TrickHousePuzzle2/header.inc +++ b/data/maps/Route110_TrickHousePuzzle2/header.inc @@ -5,10 +5,10 @@ Route110_TrickHousePuzzle2:: @ 8307DBC .4byte 0x0 .2byte MUS_KARAKURI .2byte 249 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc index cdde15d1a..b8e00f385 100644 --- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc @@ -90,16 +90,16 @@ Route110_TrickHousePuzzle2_EventScript_161E65:: @ 8161E65 return Route110_TrickHousePuzzle2_EventScript_161E78:: @ 8161E78 - trainerbattle 0, OPPONENT_TED, 0, Route110_TrickHousePuzzle2_Text_19CD46, Route110_TrickHousePuzzle2_Text_19CD66 + trainerbattle 0, TRAINER_TED, 0, Route110_TrickHousePuzzle2_Text_19CD46, Route110_TrickHousePuzzle2_Text_19CD66 msgbox Route110_TrickHousePuzzle2_Text_19CD91, 6 end Route110_TrickHousePuzzle2_EventScript_161E8F:: @ 8161E8F - trainerbattle 0, OPPONENT_PAUL, 0, Route110_TrickHousePuzzle2_Text_19CDBF, Route110_TrickHousePuzzle2_Text_19CDF0 + trainerbattle 0, TRAINER_PAUL, 0, Route110_TrickHousePuzzle2_Text_19CDBF, Route110_TrickHousePuzzle2_Text_19CDF0 msgbox Route110_TrickHousePuzzle2_Text_19CE0D, 6 end Route110_TrickHousePuzzle2_EventScript_161EA6:: @ 8161EA6 - trainerbattle 0, OPPONENT_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98 + trainerbattle 0, TRAINER_GEORGIA, 0, Route110_TrickHousePuzzle2_Text_19CE52, Route110_TrickHousePuzzle2_Text_19CE98 msgbox Route110_TrickHousePuzzle2_Text_19CEB8, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle3/events.inc b/data/maps/Route110_TrickHousePuzzle3/events.inc index e45f2d33b..54b8bc708 100644 --- a/data/maps/Route110_TrickHousePuzzle3/events.inc +++ b/data/maps/Route110_TrickHousePuzzle3/events.inc @@ -1,15 +1,15 @@ Route110_TrickHousePuzzle3_EventObjects:: @ 839254C - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 10, 16, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_162708, 0 - object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 1, 13, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_16271F, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 11, 4, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_162736, 0 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 12, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 3, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 10, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 7, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1 - object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 10, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_162708, 0 + object_event 2, EVENT_OBJ_GFX_PICNICKER, 0, 1, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_16271F, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle3_EventScript_162736, 0 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 4, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_14 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A85, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_2 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle3_EventScript_1B1A78, FLAG_ITEM_TRICK_HOUSE_PUZZLE_3_1 + object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 1, 20, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 2, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16 Route110_TrickHousePuzzle3_MapWarps:: @ 8392654 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE @@ -17,16 +17,16 @@ Route110_TrickHousePuzzle3_MapWarps:: @ 8392654 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle3_MapCoordEvents:: @ 839266C - coord_event 5, 20, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625AB - coord_event 4, 12, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625B7 - coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625C3 - coord_event 3, 8, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625CF - coord_event 13, 7, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625DB - coord_event 1, 3, 3, 0, VAR_TEMP_6, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625E7 - coord_event 10, 2, 3, 0, VAR_TEMP_7, 0, 0, Route110_TrickHousePuzzle3_EventScript_1625F3 + coord_event 5, 20, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle3_EventScript_1625AB + coord_event 4, 12, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle3_EventScript_1625B7 + coord_event 11, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle3_EventScript_1625C3 + coord_event 3, 8, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle3_EventScript_1625CF + coord_event 13, 7, 3, VAR_TEMP_5, 0, Route110_TrickHousePuzzle3_EventScript_1625DB + coord_event 1, 3, 3, VAR_TEMP_6, 0, Route110_TrickHousePuzzle3_EventScript_1625E7 + coord_event 10, 2, 3, VAR_TEMP_7, 0, Route110_TrickHousePuzzle3_EventScript_1625F3 Route110_TrickHousePuzzle3_MapBGEvents:: @ 83926DC - bg_event 0, 8, 3, 0, 0, Route110_TrickHousePuzzle3_EventScript_1626EB + bg_event 0, 8, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle3_EventScript_1626EB Route110_TrickHousePuzzle3_MapEvents:: @ 83926E8 map_events Route110_TrickHousePuzzle3_EventObjects, Route110_TrickHousePuzzle3_MapWarps, Route110_TrickHousePuzzle3_MapCoordEvents, Route110_TrickHousePuzzle3_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle3/header.inc b/data/maps/Route110_TrickHousePuzzle3/header.inc index c8b2da4a3..83ebe469c 100644 --- a/data/maps/Route110_TrickHousePuzzle3/header.inc +++ b/data/maps/Route110_TrickHousePuzzle3/header.inc @@ -5,10 +5,10 @@ Route110_TrickHousePuzzle3:: @ 8307DD8 .4byte 0x0 .2byte MUS_KARAKURI .2byte 250 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc index 14a021e8d..0bb582c5d 100644 --- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc @@ -381,16 +381,16 @@ Route110_TrickHousePuzzle3_EventScript_1626FD:: @ 81626FD end Route110_TrickHousePuzzle3_EventScript_162708:: @ 8162708 - trainerbattle 0, OPPONENT_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_19CF76, Route110_TrickHousePuzzle3_Text_19CF9D + trainerbattle 0, TRAINER_JUSTIN, 0, Route110_TrickHousePuzzle3_Text_19CF76, Route110_TrickHousePuzzle3_Text_19CF9D msgbox Route110_TrickHousePuzzle3_Text_19CFE6, 6 end Route110_TrickHousePuzzle3_EventScript_16271F:: @ 816271F - trainerbattle 0, OPPONENT_MARTHA, 0, Route110_TrickHousePuzzle3_Text_19D026, Route110_TrickHousePuzzle3_Text_19D065 + trainerbattle 0, TRAINER_MARTHA, 0, Route110_TrickHousePuzzle3_Text_19D026, Route110_TrickHousePuzzle3_Text_19D065 msgbox Route110_TrickHousePuzzle3_Text_19D07A, 6 end Route110_TrickHousePuzzle3_EventScript_162736:: @ 8162736 - trainerbattle 0, OPPONENT_ALAN, 0, Route110_TrickHousePuzzle3_Text_19D0AE, Route110_TrickHousePuzzle3_Text_19D0F0 + trainerbattle 0, TRAINER_ALAN, 0, Route110_TrickHousePuzzle3_Text_19D0AE, Route110_TrickHousePuzzle3_Text_19D0F0 msgbox Route110_TrickHousePuzzle3_Text_19D110, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle4/events.inc b/data/maps/Route110_TrickHousePuzzle4/events.inc index 4d7189920..1b4fa2e1a 100644 --- a/data/maps/Route110_TrickHousePuzzle4/events.inc +++ b/data/maps/Route110_TrickHousePuzzle4/events.inc @@ -1,19 +1,19 @@ Route110_TrickHousePuzzle4_EventObjects:: @ 83926FC - object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 12, 8, 3, 9, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_16276B, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 4, 3, 10, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_162799, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_162782, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 0, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 12, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 8, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 13, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18 - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19 - object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A - object_event 15, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B + object_event 1, EVENT_OBJ_GFX_GIRL_3, 0, 12, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_16276B, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 10, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route110_TrickHousePuzzle4_EventScript_162799, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle4_EventScript_162782, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 4, 0, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle4_EventScript_1B1A92, FLAG_ITEM_TRICK_HOUSE_PUZZLE_4_1 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 13, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 2, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18 + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19 + object_event 14, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A + object_event 15, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 14, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B Route110_TrickHousePuzzle4_MapWarps:: @ 8392864 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE @@ -21,7 +21,7 @@ Route110_TrickHousePuzzle4_MapWarps:: @ 8392864 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle4_MapBGEvents:: @ 839287C - bg_event 0, 5, 3, 0, 0, Route110_TrickHousePuzzle4_EventScript_16274E + bg_event 0, 5, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle4_EventScript_16274E Route110_TrickHousePuzzle4_MapEvents:: @ 8392888 map_events Route110_TrickHousePuzzle4_EventObjects, Route110_TrickHousePuzzle4_MapWarps, 0x0, Route110_TrickHousePuzzle4_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle4/header.inc b/data/maps/Route110_TrickHousePuzzle4/header.inc index b06a1404f..d96d89745 100644 --- a/data/maps/Route110_TrickHousePuzzle4/header.inc +++ b/data/maps/Route110_TrickHousePuzzle4/header.inc @@ -5,10 +5,10 @@ Route110_TrickHousePuzzle4:: @ 8307DF4 .4byte 0x0 .2byte MUS_KARAKURI .2byte 251 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc index 3808f1f2d..606697070 100644 --- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc @@ -14,16 +14,16 @@ Route110_TrickHousePuzzle4_EventScript_162760:: @ 8162760 end Route110_TrickHousePuzzle4_EventScript_16276B:: @ 816276B - trainerbattle 0, OPPONENT_CORA, 0, Route110_TrickHousePuzzle4_Text_19D1DE, Route110_TrickHousePuzzle4_Text_19D21F + trainerbattle 0, TRAINER_CORA, 0, Route110_TrickHousePuzzle4_Text_19D1DE, Route110_TrickHousePuzzle4_Text_19D21F msgbox Route110_TrickHousePuzzle4_Text_19D253, 6 end Route110_TrickHousePuzzle4_EventScript_162782:: @ 8162782 - trainerbattle 0, OPPONENT_YUJI, 0, Route110_TrickHousePuzzle4_Text_19D295, Route110_TrickHousePuzzle4_Text_19D2D1 + trainerbattle 0, TRAINER_YUJI, 0, Route110_TrickHousePuzzle4_Text_19D295, Route110_TrickHousePuzzle4_Text_19D2D1 msgbox Route110_TrickHousePuzzle4_Text_19D306, 6 end Route110_TrickHousePuzzle4_EventScript_162799:: @ 8162799 - trainerbattle 0, OPPONENT_JILL, 0, Route110_TrickHousePuzzle4_Text_19D351, Route110_TrickHousePuzzle4_Text_19D380 + trainerbattle 0, TRAINER_JILL, 0, Route110_TrickHousePuzzle4_Text_19D351, Route110_TrickHousePuzzle4_Text_19D380 msgbox Route110_TrickHousePuzzle4_Text_19D386, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle5/events.inc b/data/maps/Route110_TrickHousePuzzle5/events.inc index 66884fc3d..5a553d8b3 100644 --- a/data/maps/Route110_TrickHousePuzzle5/events.inc +++ b/data/maps/Route110_TrickHousePuzzle5/events.inc @@ -1,9 +1,9 @@ Route110_TrickHousePuzzle5_EventObjects:: @ 839289C - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 9, 19, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627F2, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 5, 14, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162813, 0 - object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 12, 10, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162834, 0 - object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 12, 5, 3, 9, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162855, 0 - object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 1, 6, 3, 10, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162876, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 9, 19, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627F2, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 5, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162813, 0 + object_event 3, EVENT_OBJ_GFX_MAN_1, 0, 12, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162834, 0 + object_event 4, EVENT_OBJ_GFX_MAN_1, 0, 12, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162855, 0 + object_event 5, EVENT_OBJ_GFX_MAN_1, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_162876, 0 Route110_TrickHousePuzzle5_MapWarps:: @ 8392914 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE @@ -11,23 +11,23 @@ Route110_TrickHousePuzzle5_MapWarps:: @ 8392914 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle5_MapCoordEvents:: @ 839292C - coord_event 8, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_162897 - coord_event 7, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628A3 - coord_event 6, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628AF - coord_event 5, 19, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628BB - coord_event 6, 14, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628C7 - coord_event 7, 14, 3, 0, VAR_TEMP_2, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628D3 - coord_event 11, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628DF - coord_event 10, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628EB - coord_event 9, 10, 3, 0, VAR_TEMP_3, 0, 0, Route110_TrickHousePuzzle5_EventScript_1628F7 - coord_event 11, 5, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_162903 - coord_event 10, 5, 3, 0, VAR_TEMP_4, 0, 0, Route110_TrickHousePuzzle5_EventScript_16290F - coord_event 2, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_16291B - coord_event 3, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_162927 - coord_event 4, 6, 3, 0, VAR_TEMP_5, 0, 0, Route110_TrickHousePuzzle5_EventScript_162933 + coord_event 8, 19, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_162897 + coord_event 7, 19, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_1628A3 + coord_event 6, 19, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_1628AF + coord_event 5, 19, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle5_EventScript_1628BB + coord_event 6, 14, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_1628C7 + coord_event 7, 14, 3, VAR_TEMP_2, 0, Route110_TrickHousePuzzle5_EventScript_1628D3 + coord_event 11, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_1628DF + coord_event 10, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_1628EB + coord_event 9, 10, 3, VAR_TEMP_3, 0, Route110_TrickHousePuzzle5_EventScript_1628F7 + coord_event 11, 5, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_162903 + coord_event 10, 5, 3, VAR_TEMP_4, 0, Route110_TrickHousePuzzle5_EventScript_16290F + coord_event 2, 6, 3, VAR_TEMP_5, 0, Route110_TrickHousePuzzle5_EventScript_16291B + coord_event 3, 6, 3, VAR_TEMP_5, 0, Route110_TrickHousePuzzle5_EventScript_162927 + coord_event 4, 6, 3, VAR_TEMP_5, 0, Route110_TrickHousePuzzle5_EventScript_162933 Route110_TrickHousePuzzle5_MapBGEvents:: @ 8392A0C - bg_event 2, 9, 0, 0, 0, Route110_TrickHousePuzzle5_EventScript_1627D5 + bg_event 2, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle5_EventScript_1627D5 Route110_TrickHousePuzzle5_MapEvents:: @ 8392A18 map_events Route110_TrickHousePuzzle5_EventObjects, Route110_TrickHousePuzzle5_MapWarps, Route110_TrickHousePuzzle5_MapCoordEvents, Route110_TrickHousePuzzle5_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle5/header.inc b/data/maps/Route110_TrickHousePuzzle5/header.inc index dc42453f4..b6cc187b6 100644 --- a/data/maps/Route110_TrickHousePuzzle5/header.inc +++ b/data/maps/Route110_TrickHousePuzzle5/header.inc @@ -5,10 +5,10 @@ Route110_TrickHousePuzzle5:: @ 8307E10 .4byte 0x0 .2byte MUS_KARAKURI .2byte 252 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle6/events.inc b/data/maps/Route110_TrickHousePuzzle6/events.inc index 6ac299c5f..065a18579 100644 --- a/data/maps/Route110_TrickHousePuzzle6/events.inc +++ b/data/maps/Route110_TrickHousePuzzle6/events.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle6_EventObjects:: @ 8392A2C - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 10, 9, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle6_EventScript_163107, 0 - object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 14, 12, 3, 9, 0, 0, 1, 2, Route110_TrickHousePuzzle6_EventScript_16311E, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 3, 3, 10, 0, 0, 1, 4, Route110_TrickHousePuzzle6_EventScript_163135, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 2, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1 + object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle6_EventScript_163107, 0 + object_event 2, EVENT_OBJ_GFX_MAN_6, 0, 14, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route110_TrickHousePuzzle6_EventScript_16311E, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route110_TrickHousePuzzle6_EventScript_163135, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle6_EventScript_1B1A9F, FLAG_ITEM_TRICK_HOUSE_PUZZLE_6_1 Route110_TrickHousePuzzle6_MapWarps:: @ 8392A8C warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE @@ -10,7 +10,7 @@ Route110_TrickHousePuzzle6_MapWarps:: @ 8392A8C warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle6_MapBGEvents:: @ 8392AA4 - bg_event 13, 9, 3, 0, 0, Route110_TrickHousePuzzle6_EventScript_1630EA + bg_event 13, 9, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle6_EventScript_1630EA Route110_TrickHousePuzzle6_MapEvents:: @ 8392AB0 map_events Route110_TrickHousePuzzle6_EventObjects, Route110_TrickHousePuzzle6_MapWarps, 0x0, Route110_TrickHousePuzzle6_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle6/header.inc b/data/maps/Route110_TrickHousePuzzle6/header.inc index 3377987da..436cc1d1b 100644 --- a/data/maps/Route110_TrickHousePuzzle6/header.inc +++ b/data/maps/Route110_TrickHousePuzzle6/header.inc @@ -5,10 +5,10 @@ Route110_TrickHousePuzzle6:: @ 8307E2C .4byte 0x0 .2byte MUS_KARAKURI .2byte 253 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc index 971d2a275..3378dc50b 100644 --- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc @@ -28,16 +28,16 @@ Route110_TrickHousePuzzle6_EventScript_1630FC:: @ 81630FC end Route110_TrickHousePuzzle6_EventScript_163107:: @ 8163107 - trainerbattle 0, OPPONENT_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_19DC87, Route110_TrickHousePuzzle6_Text_19DCC6 + trainerbattle 0, TRAINER_SOPHIA, 0, Route110_TrickHousePuzzle6_Text_19DC87, Route110_TrickHousePuzzle6_Text_19DCC6 msgbox Route110_TrickHousePuzzle6_Text_19DCE7, 6 end Route110_TrickHousePuzzle6_EventScript_16311E:: @ 816311E - trainerbattle 0, OPPONENT_BENNY, 0, Route110_TrickHousePuzzle6_Text_19DD49, Route110_TrickHousePuzzle6_Text_19DD83 + trainerbattle 0, TRAINER_BENNY, 0, Route110_TrickHousePuzzle6_Text_19DD49, Route110_TrickHousePuzzle6_Text_19DD83 msgbox Route110_TrickHousePuzzle6_Text_19DD96, 6 end Route110_TrickHousePuzzle6_EventScript_163135:: @ 8163135 - trainerbattle 0, OPPONENT_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE + trainerbattle 0, TRAINER_SEBASTIAN, 0, Route110_TrickHousePuzzle6_Text_19DDCF, Route110_TrickHousePuzzle6_Text_19DDFE msgbox Route110_TrickHousePuzzle6_Text_19DE44, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle7/events.inc b/data/maps/Route110_TrickHousePuzzle7/events.inc index d57546ce1..38823faa4 100644 --- a/data/maps/Route110_TrickHousePuzzle7/events.inc +++ b/data/maps/Route110_TrickHousePuzzle7/events.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle7_EventObjects:: @ 8392AC4 - object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 3, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle7_EventScript_1633D6, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 14, 3, 3, 7, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_163404, 0 - object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 9, 10, 3, 23, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_1633ED, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 10, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1 + object_event 1, EVENT_OBJ_GFX_PSYCHIC_M, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle7_EventScript_1633D6, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 14, 3, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_163404, 0 + object_event 3, EVENT_OBJ_GFX_HEX_MANIAC, 0, 9, 10, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 1, Route110_TrickHousePuzzle7_EventScript_1633ED, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle7_EventScript_1B1AAC, FLAG_ITEM_TRICK_HOUSE_PUZZLE_7_1 Route110_TrickHousePuzzle7_MapWarps:: @ 8392B24 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE @@ -10,15 +10,15 @@ Route110_TrickHousePuzzle7_MapWarps:: @ 8392B24 warp_def 13, 1, 3, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle7_MapCoordEvents:: @ 8392B3C - coord_event 9, 2, 3, 0, VAR_TEMP_1, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632A8 + coord_event 9, 2, 3, VAR_TEMP_1, 0, Route110_TrickHousePuzzle7_EventScript_1632A8 Route110_TrickHousePuzzle7_MapBGEvents:: @ 8392B4C - bg_event 7, 2, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_16328B - bg_event 12, 16, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632B9 - bg_event 5, 10, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163317 - bg_event 12, 11, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_1632E8 - bg_event 4, 4, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163346 - bg_event 7, 5, 3, 0, 0, Route110_TrickHousePuzzle7_EventScript_163375 + bg_event 7, 2, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_16328B + bg_event 12, 16, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_1632B9 + bg_event 5, 10, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_163317 + bg_event 12, 11, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_1632E8 + bg_event 4, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_163346 + bg_event 7, 5, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle7_EventScript_163375 Route110_TrickHousePuzzle7_MapEvents:: @ 8392B94 map_events Route110_TrickHousePuzzle7_EventObjects, Route110_TrickHousePuzzle7_MapWarps, Route110_TrickHousePuzzle7_MapCoordEvents, Route110_TrickHousePuzzle7_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle7/header.inc b/data/maps/Route110_TrickHousePuzzle7/header.inc index 84014fdb5..32e0f1676 100644 --- a/data/maps/Route110_TrickHousePuzzle7/header.inc +++ b/data/maps/Route110_TrickHousePuzzle7/header.inc @@ -5,10 +5,10 @@ Route110_TrickHousePuzzle7:: @ 8307E48 .4byte 0x0 .2byte MUS_KARAKURI .2byte 254 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 1ee608166..43bce5ceb 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -219,16 +219,16 @@ Route110_TrickHousePuzzle7_EventScript_1633D1:: @ 81633D1 end Route110_TrickHousePuzzle7_EventScript_1633D6:: @ 81633D6 - trainerbattle 0, OPPONENT_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_19DF0B, Route110_TrickHousePuzzle7_Text_19DF4B + trainerbattle 0, TRAINER_JOSHUA, 0, Route110_TrickHousePuzzle7_Text_19DF0B, Route110_TrickHousePuzzle7_Text_19DF4B msgbox Route110_TrickHousePuzzle7_Text_19DF7E, 6 end Route110_TrickHousePuzzle7_EventScript_1633ED:: @ 81633ED - trainerbattle 0, OPPONENT_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_19DFBB, Route110_TrickHousePuzzle7_Text_19DFF2 + trainerbattle 0, TRAINER_PATRICIA, 0, Route110_TrickHousePuzzle7_Text_19DFBB, Route110_TrickHousePuzzle7_Text_19DFF2 msgbox Route110_TrickHousePuzzle7_Text_19E00F, 6 end Route110_TrickHousePuzzle7_EventScript_163404:: @ 8163404 - trainerbattle 0, OPPONENT_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_19E054, Route110_TrickHousePuzzle7_Text_19E098 + trainerbattle 0, TRAINER_ALEXIS, 0, Route110_TrickHousePuzzle7_Text_19E054, Route110_TrickHousePuzzle7_Text_19E098 msgbox Route110_TrickHousePuzzle7_Text_19E0B2, 6 end diff --git a/data/maps/Route110_TrickHousePuzzle8/events.inc b/data/maps/Route110_TrickHousePuzzle8/events.inc index 481b2d926..b7cdab48f 100644 --- a/data/maps/Route110_TrickHousePuzzle8/events.inc +++ b/data/maps/Route110_TrickHousePuzzle8/events.inc @@ -1,8 +1,8 @@ Route110_TrickHousePuzzle8_EventObjects:: @ 8392BA8 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 12, 21, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle8_EventScript_163439, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 12, 11, 3, 10, 0, 0, 1, 2, Route110_TrickHousePuzzle8_EventScript_163467, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 11, 3, 8, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_163450, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, 1, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 12, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle8_EventScript_163439, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 12, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 2, Route110_TrickHousePuzzle8_EventScript_163467, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route110_TrickHousePuzzle8_EventScript_163450, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route110_TrickHousePuzzle8_EventScript_1B1AB9, FLAG_ITEM_TRICK_HOUSE_PUZZLE_8_1 Route110_TrickHousePuzzle8_MapWarps:: @ 8392C08 warp_def 0, 21, 3, 2, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE @@ -10,7 +10,7 @@ Route110_TrickHousePuzzle8_MapWarps:: @ 8392C08 warp_def 13, 1, 0, 0, MAP_ROUTE110_TRICK_HOUSE_END Route110_TrickHousePuzzle8_MapBGEvents:: @ 8392C20 - bg_event 7, 11, 3, 0, 0, Route110_TrickHousePuzzle8_EventScript_16341C + bg_event 7, 11, 3, BG_EVENT_PLAYER_FACING_ANY, Route110_TrickHousePuzzle8_EventScript_16341C Route110_TrickHousePuzzle8_MapEvents:: @ 8392C2C map_events Route110_TrickHousePuzzle8_EventObjects, Route110_TrickHousePuzzle8_MapWarps, 0x0, Route110_TrickHousePuzzle8_MapBGEvents diff --git a/data/maps/Route110_TrickHousePuzzle8/header.inc b/data/maps/Route110_TrickHousePuzzle8/header.inc index ede90bbe4..8aef9307f 100644 --- a/data/maps/Route110_TrickHousePuzzle8/header.inc +++ b/data/maps/Route110_TrickHousePuzzle8/header.inc @@ -5,10 +5,10 @@ Route110_TrickHousePuzzle8:: @ 8307E64 .4byte 0x0 .2byte MUS_KARAKURI .2byte 255 - .byte 25 + .byte MAPSEC_ROUTE_110 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc index 2c55aae4c..182f3d68a 100644 --- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc @@ -14,16 +14,16 @@ Route110_TrickHousePuzzle8_EventScript_16342E:: @ 816342E end Route110_TrickHousePuzzle8_EventScript_163439:: @ 8163439 - trainerbattle 0, OPPONENT_VINCENT, 0, Route110_TrickHousePuzzle8_Text_19E178, Route110_TrickHousePuzzle8_Text_19E1A1 + trainerbattle 0, TRAINER_VINCENT, 0, Route110_TrickHousePuzzle8_Text_19E178, Route110_TrickHousePuzzle8_Text_19E1A1 msgbox Route110_TrickHousePuzzle8_Text_19E1C5, 6 end Route110_TrickHousePuzzle8_EventScript_163450:: @ 8163450 - trainerbattle 0, OPPONENT_ELAINE, 0, Route110_TrickHousePuzzle8_Text_19E201, Route110_TrickHousePuzzle8_Text_19E22C + trainerbattle 0, TRAINER_ELAINE, 0, Route110_TrickHousePuzzle8_Text_19E201, Route110_TrickHousePuzzle8_Text_19E22C msgbox Route110_TrickHousePuzzle8_Text_19E24C, 6 end Route110_TrickHousePuzzle8_EventScript_163467:: @ 8163467 - trainerbattle 0, OPPONENT_LEROY, 0, Route110_TrickHousePuzzle8_Text_19E284, Route110_TrickHousePuzzle8_Text_19E2C1 + trainerbattle 0, TRAINER_LEROY, 0, Route110_TrickHousePuzzle8_Text_19E284, Route110_TrickHousePuzzle8_Text_19E2C1 msgbox Route110_TrickHousePuzzle8_Text_19E2EE, 6 end diff --git a/data/maps/Route111/events.inc b/data/maps/Route111/events.inc index 837c17c39..e79548b9c 100644 --- a/data/maps/Route111/events.inc +++ b/data/maps/Route111/events.inc @@ -1,40 +1,40 @@ Route111_EventObjects:: @ 83821A0 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, 8, 0, 0, 0, 0, Route111_EventScript_1501D1, FLAG_HIDE_VICTOR_WINSTRATE - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICTORIA_WINSTRATE - object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, 8, 1, 0, 0, 0, 0x0, FLAG_HIDE_VIVI_WINSTRATE - object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 113, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICKI_WINSTRATE - object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, 17, 0, 0, 1, 3, Route111_EventScript_1503BE, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, 12, 0, 0, 0, 19, S_BerryTree, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, 12, 0, 0, 0, 20, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 8, 91, 3, 2, 1, 1, 0, 0, Route111_EventScript_150395, 0 - object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 24, 60, 3, 21, 0, 0, 1, 3, Route111_EventScript_1503A7, 0 - object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, 50, 2, 2, 1, 2, Route111_EventScript_150403, 0 - object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, 9, 0, 0, 1, 4, Route111_EventScript_1503D5, 0 - object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 72, 3, 24, 0, 0, 1, 3, Route111_EventScript_1503EC, 0 - object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE442, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 - object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE422, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12 - object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, 5, 1, 0, 0, 0, Route111_EventScript_1500C5, 0 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 105, 3, 1, 0, 0, 0, 0, Route111_EventScript_1B14C8, FLAG_ITEM_ROUTE111_1 - object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 80, S_BerryTree, 0 - object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, 12, 0, 0, 0, 81, S_BerryTree, 0 - object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE4E2, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 - object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE502, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 - object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3 - object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, 8, 0, 0, 0, 0, Route111_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3 - object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, 1, 0, 0, 0, 0, Route111_EventScript_1B14D5, FLAG_ITEM_ROUTE111_2 - object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, 1, 0, 0, 0, 0, Route111_EventScript_1B14E2, FLAG_ITEM_ROUTE111_3 - object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 - object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, 14, 0, 0, 1, 2, Route111_EventScript_150458, 0 - object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, 22, 0, 0, 1, 3, Route111_EventScript_150441, 0 - object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, 28, 1, 0, 1, 2, Route111_EventScript_15046F, 0 - object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 12, 3, 7, 4, 0, 1, 4, Route111_EventScript_1504C4, 0 - object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 9, 27, 3, 17, 0, 0, 1, 3, Route111_EventScript_150486, 0 - object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, 7, 1, 1, 0, 0, Route111_EventScript_1A3858, FLAG_HIDE_SECRET_POWER_MAN - object_event 34, EVENT_OBJ_GFX_FOSSIL, 0, 32, 38, 3, 1, 1, 1, 0, 0, Route111_EventScript_150023, FLAG_HIDE_ROOT_FOSSIL - object_event 35, EVENT_OBJ_GFX_FOSSIL, 0, 33, 38, 3, 1, 1, 1, 0, 0, Route111_EventScript_150069, FLAG_HIDE_CLAW_FOSSIL - object_event 36, EVENT_OBJ_GFX_MAN_5, 0, 20, 114, 3, 2, 1, 1, 0, 0, Route111_EventScript_15039E, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 13, 114, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1501D1, FLAG_HIDE_VICTOR_WINSTRATE + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICTORIA_WINSTRATE + object_event 3, EVENT_OBJ_GFX_LASS, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 0, 0, 0, 0x0, FLAG_HIDE_VIVI_WINSTRATE + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 13, 113, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_VICKI_WINSTRATE + object_event 5, EVENT_OBJ_GFX_PICNICKER, 0, 28, 51, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_1503BE, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 22, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 19, S_BerryTree, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 23, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 20, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_MAN_4, 0, 8, 91, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_150395, 0 + object_event 9, EVENT_OBJ_GFX_CAMPER, 0, 24, 60, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 3, Route111_EventScript_1503A7, 0 + object_event 10, EVENT_OBJ_GFX_HIKER, 0, 27, 69, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 2, 2, 1, 2, Route111_EventScript_150403, 0 + object_event 11, EVENT_OBJ_GFX_CAMPER, 0, 21, 47, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route111_EventScript_1503D5, 0 + object_event 12, EVENT_OBJ_GFX_PICNICKER, 0, 32, 72, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route111_EventScript_1503EC, 0 + object_event 13, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1AE442, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 + object_event 14, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1AE422, FLAG_HIDE_GABBY_AND_TY_ROUTE111_1 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 101, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11 + object_event 16, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 100, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_12 + object_event 17, EVENT_OBJ_GFX_GIRL_1, 0, 23, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route111_EventScript_1500C5, 0 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 105, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_1B14C8, FLAG_ITEM_ROUTE111_1 + object_event 19, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 80, S_BerryTree, 0 + object_event 20, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 81, S_BerryTree, 0 + object_event 21, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1AE4E2, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 + object_event 22, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1AE502, FLAG_HIDE_GABBY_AND_TY_ROUTE111_2 + object_event 23, EVENT_OBJ_GFX_REPORTER_F, 0, 13, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3 + object_event 24, EVENT_OBJ_GFX_CAMERAMAN, 0, 14, 86, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route111_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE111_3 + object_event 25, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 54, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_1B14D5, FLAG_ITEM_ROUTE111_2 + object_event 26, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 114, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route111_EventScript_1B14E2, FLAG_ITEM_ROUTE111_3 + object_event 27, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 22, 21, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 + object_event 28, EVENT_OBJ_GFX_PICNICKER, 0, 10, 82, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route111_EventScript_150458, 0 + object_event 29, EVENT_OBJ_GFX_CAMPER, 0, 11, 71, 3, MOVEMENT_TYPE_FACE_DOWN_LEFT_AND_RIGHT, 0, 0, 1, 3, Route111_EventScript_150441, 0 + object_event 30, EVENT_OBJ_GFX_BLACK_BELT, 0, 32, 29, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 1, 0, 1, 2, Route111_EventScript_15046F, 0 + object_event 31, EVENT_OBJ_GFX_WOMAN_7, 0, 11, 12, 3, MOVEMENT_TYPE_FACE_UP, 4, 0, 1, 4, Route111_EventScript_1504C4, 0 + object_event 32, EVENT_OBJ_GFX_MAN_4, 0, 9, 27, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route111_EventScript_150486, 0 + object_event 33, EVENT_OBJ_GFX_BOY_1, 0, 13, 20, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route111_EventScript_1A3858, FLAG_HIDE_SECRET_POWER_MAN + object_event 34, EVENT_OBJ_GFX_FOSSIL, 0, 32, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route111_EventScript_150023, FLAG_HIDE_ROOT_FOSSIL + object_event 35, EVENT_OBJ_GFX_FOSSIL, 0, 33, 38, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route111_EventScript_150069, FLAG_HIDE_CLAW_FOSSIL + object_event 36, EVENT_OBJ_GFX_MAN_5, 0, 20, 114, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route111_EventScript_15039E, 0 Route111_MapWarps:: @ 8382500 warp_def 13, 113, 0, 0, MAP_ROUTE111_WINSTRATE_FAMILYS_HOUSE @@ -42,55 +42,55 @@ Route111_MapWarps:: @ 8382500 warp_def 26, 18, 0, 0, MAP_ROUTE111_OLD_LADYS_REST_STOP Route111_MapCoordEvents:: @ 8382518 - coord_event 12, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 11, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 - coord_event 12, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 - coord_event 13, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 - coord_event 7, 63, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 12, 44, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 - coord_event 13, 43, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 - coord_event 14, 42, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 - coord_event 16, 40, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 - coord_event 14, 61, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150116 - coord_event 18, 32, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 17, 31, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 9, 37, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 10, 36, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 17, 39, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 - coord_event 18, 38, 3, 0, VAR_TEMP_3, 0, 0, Route111_EventScript_150122 - coord_event 8, 64, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 9, 65, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 10, 65, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 11, 66, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 12, 67, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 13, 68, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 14, 69, 3, 0, 0, 0, 0, Route111_EventScript_1501BC - coord_event 10, 61, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 11, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 13, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 14, 62, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 17, 38, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 16, 39, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 15, 40, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 14, 41, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 13, 42, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 12, 43, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 - coord_event 11, 44, 3, 0, 0, 0, 0, Route111_EventScript_1501C9 + coord_event 12, 62, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 11, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_150116 + coord_event 12, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_150116 + coord_event 13, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_150116 + coord_event 7, 63, 3, 0, 0, Route111_EventScript_1501BC + coord_event 12, 44, 3, VAR_TEMP_3, 0, Route111_EventScript_150122 + coord_event 13, 43, 3, VAR_TEMP_3, 0, Route111_EventScript_150122 + coord_event 14, 42, 3, VAR_TEMP_3, 0, Route111_EventScript_150122 + coord_event 16, 40, 3, VAR_TEMP_3, 0, Route111_EventScript_150122 + coord_event 14, 61, 3, VAR_TEMP_3, 0, Route111_EventScript_150116 + coord_event 18, 32, 3, 0, 0, Route111_EventScript_1501BC + coord_event 17, 31, 3, 0, 0, Route111_EventScript_1501BC + coord_event 9, 37, 3, 0, 0, Route111_EventScript_1501BC + coord_event 10, 36, 3, 0, 0, Route111_EventScript_1501BC + coord_event 17, 39, 3, VAR_TEMP_3, 0, Route111_EventScript_150122 + coord_event 18, 38, 3, VAR_TEMP_3, 0, Route111_EventScript_150122 + coord_event 8, 64, 3, 0, 0, Route111_EventScript_1501BC + coord_event 9, 65, 3, 0, 0, Route111_EventScript_1501BC + coord_event 10, 65, 3, 0, 0, Route111_EventScript_1501BC + coord_event 11, 66, 3, 0, 0, Route111_EventScript_1501BC + coord_event 12, 67, 3, 0, 0, Route111_EventScript_1501BC + coord_event 13, 68, 3, 0, 0, Route111_EventScript_1501BC + coord_event 14, 69, 3, 0, 0, Route111_EventScript_1501BC + coord_event 10, 61, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 11, 62, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 13, 62, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 14, 62, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 17, 38, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 16, 39, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 15, 40, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 14, 41, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 13, 42, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 12, 43, 3, 0, 0, Route111_EventScript_1501C9 + coord_event 11, 44, 3, 0, 0, Route111_EventScript_1501C9 Route111_MapBGEvents:: @ 8382738 - bg_event 16, 114, 0, 0, 0, Route111_EventScript_150368 - bg_event 24, 126, 0, 0, 0, Route111_EventScript_15035F - bg_event 7, 66, 0, 0, 0, Route111_EventScript_150371 - bg_event 13, 6, 0, 0, 0, Route111_EventScript_15037A + bg_event 16, 114, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_150368 + bg_event 24, 126, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_15035F + bg_event 7, 66, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_150371 + bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_15037A bg_secret_base_event 24, 36, 0, SECRET_BASE_YELLOW_CAVE2_1 bg_secret_base_event 34, 50, 0, SECRET_BASE_YELLOW_CAVE3_1 bg_secret_base_event 33, 34, 0, SECRET_BASE_YELLOW_CAVE1_1 - bg_event 25, 19, 0, 0, 0, Route111_EventScript_150383 + bg_event 25, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_150383 bg_secret_base_event 35, 1, 0, SECRET_BASE_RED_CAVE2_3 bg_secret_base_event 35, 31, 0, SECRET_BASE_YELLOW_CAVE4_3 bg_hidden_item_event 26, 70, 0, ITEM_STARDUST, FLAG_HIDDEN_ITEM_2 bg_secret_base_event 27, 27, 3, SECRET_BASE_RED_CAVE4_3 - bg_event 7, 84, 3, 0, 0, Route111_EventScript_15038C + bg_event 7, 84, 3, BG_EVENT_PLAYER_FACING_ANY, Route111_EventScript_15038C bg_secret_base_event 14, 19, 0, SECRET_BASE_TREE1_4 bg_secret_base_event 13, 19, 0, SECRET_BASE_TREE1_1 bg_hidden_item_event 19, 55, 0, ITEM_PROTEIN, FLAG_HIDDEN_ITEM_38 diff --git a/data/maps/Route111/header.inc b/data/maps/Route111/header.inc index 3dd09e33b..106adf413 100644 --- a/data/maps/Route111/header.inc +++ b/data/maps/Route111/header.inc @@ -5,10 +5,10 @@ Route111:: @ 8305720 .4byte Route111_MapConnections .2byte MUS_DOORO_X1 .2byte 27 - .byte 26 + .byte MAPSEC_ROUTE_111 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index e554de5f4..9aa8894f4 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -15,7 +15,7 @@ Route111_EventScript_14FFA6:: @ 814FFA6 Route111_MapScript1_14FFB9:: @ 814FFB9 call Route111_EventScript_14FFCD call Route111_EventScript_1AE313 - goto_if_trainer_not_defeated OPPONENT_VICKY, Route111_EventScript_15000D + goto_if_trainer_not_defeated TRAINER_VICKY, Route111_EventScript_15000D end Route111_EventScript_14FFCD:: @ 814FFCD @@ -42,9 +42,9 @@ Route111_EventScript_15000D:: @ 815000D setflag FLAG_HIDE_VICTORIA_WINSTRATE setflag FLAG_HIDE_VIVI_WINSTRATE setflag FLAG_HIDE_VICKI_WINSTRATE - cleartrainerflag OPPONENT_VICTOR - cleartrainerflag OPPONENT_VICTORIA - cleartrainerflag OPPONENT_VIVI + cleartrainerflag TRAINER_VICTOR + cleartrainerflag TRAINER_VICTORIA + cleartrainerflag TRAINER_VIVI end Route111_EventScript_150023:: @ 8150023 @@ -243,7 +243,7 @@ Route111_EventScript_1501D1:: @ 81501D1 Route111_EventScript_1501F3:: @ 81501F3 msgbox Route111_Text_16F7B3, 4 - trainerbattle 3, OPPONENT_VICTOR, 0, Route111_Text_16F7D2 + trainerbattle 3, TRAINER_VICTOR, 0, Route111_Text_16F7D2 applymovement 1, Route111_Movement_1A0841 waitmovement 0 call Route111_EventScript_150348 @@ -261,7 +261,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F82D, 4 - trainerbattle 3, OPPONENT_VICTORIA, 0, Route111_Text_16F8A6 + trainerbattle 3, TRAINER_VICTORIA, 0, Route111_Text_16F8A6 applymovement 2, Route111_Movement_1A0841 waitmovement 0 call Route111_EventScript_150348 @@ -279,7 +279,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F90E, 4 - trainerbattle 3, OPPONENT_VIVI, 0, Route111_Text_16F956 + trainerbattle 3, TRAINER_VIVI, 0, Route111_Text_16F956 applymovement 3, Route111_Movement_1A0841 waitmovement 0 call Route111_EventScript_150348 @@ -297,7 +297,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F991, 4 - trainerbattle 3, OPPONENT_VICKY, 0, Route111_Text_16F9EC + trainerbattle 3, TRAINER_VICKY, 0, Route111_Text_16F9EC msgbox Route111_Text_16FA22, 4 closemessage applymovement 4, Route111_Movement_1A0841 @@ -368,27 +368,27 @@ Route111_EventScript_15039E:: @ 815039E end Route111_EventScript_1503A7:: @ 81503A7 - trainerbattle 0, OPPONENT_DREW, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7 + trainerbattle 0, TRAINER_DREW, 0, Route111_Text_1BAB4B, Route111_Text_1BABC7 msgbox Route111_Text_1BAC10, 6 end Route111_EventScript_1503BE:: @ 81503BE - trainerbattle 0, OPPONENT_HEIDI, 0, Route111_Text_1BAC60, Route111_Text_1BACC5 + trainerbattle 0, TRAINER_HEIDI, 0, Route111_Text_1BAC60, Route111_Text_1BACC5 msgbox Route111_Text_1BACD8, 6 end Route111_EventScript_1503D5:: @ 81503D5 - trainerbattle 0, OPPONENT_CLIFF, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3 + trainerbattle 0, TRAINER_CLIFF, 0, Route111_Text_1BAD4B, Route111_Text_1BADA3 msgbox Route111_Text_1BADC2, 6 end Route111_EventScript_1503EC:: @ 81503EC - trainerbattle 0, OPPONENT_BECKY, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E + trainerbattle 0, TRAINER_BECKY, 0, Route111_Text_1BAE24, Route111_Text_1BAE6E msgbox Route111_Text_1BAE81, 6 end Route111_EventScript_150403:: @ 8150403 - trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 + trainerbattle 0, TRAINER_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_15042A @@ -396,27 +396,27 @@ Route111_EventScript_150403:: @ 8150403 end Route111_EventScript_15042A:: @ 815042A - trainerbattle 5, OPPONENT_DUSTY_1, 0, Route111_Text_1BAFC1, Route111_Text_1BB034 + trainerbattle 5, TRAINER_DUSTY_1, 0, Route111_Text_1BAFC1, Route111_Text_1BB034 msgbox Route111_Text_1BB070, 6 end Route111_EventScript_150441:: @ 8150441 - trainerbattle 0, OPPONENT_TRAVIS, 0, Route111_Text_1BB111, Route111_Text_1BB140 + trainerbattle 0, TRAINER_TRAVIS, 0, Route111_Text_1BB111, Route111_Text_1BB140 msgbox Route111_Text_1BB15B, 6 end Route111_EventScript_150458:: @ 8150458 - trainerbattle 0, OPPONENT_IRENE, 0, Route111_Text_1BB199, Route111_Text_1BB1D8 + trainerbattle 0, TRAINER_IRENE, 0, Route111_Text_1BB199, Route111_Text_1BB1D8 msgbox Route111_Text_1BB1F6, 6 end Route111_EventScript_15046F:: @ 815046F - trainerbattle 0, OPPONENT_DAISUKE, 0, Route111_Text_1BB250, Route111_Text_1BB27E + trainerbattle 0, TRAINER_DAISUKE, 0, Route111_Text_1BB250, Route111_Text_1BB27E msgbox Route111_Text_1BB290, 6 end Route111_EventScript_150486:: @ 8150486 - trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 + trainerbattle 0, TRAINER_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_1504AD @@ -424,12 +424,12 @@ Route111_EventScript_150486:: @ 8150486 end Route111_EventScript_1504AD:: @ 81504AD - trainerbattle 5, OPPONENT_WILTON_1, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA + trainerbattle 5, TRAINER_WILTON_1, 0, Route111_Text_1BB3A7, Route111_Text_1BB3FA msgbox Route111_Text_1BB40E, 6 end Route111_EventScript_1504C4:: @ 81504C4 - trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F + trainerbattle 0, TRAINER_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_1504EB @@ -437,6 +437,6 @@ Route111_EventScript_1504C4:: @ 81504C4 end Route111_EventScript_1504EB:: @ 81504EB - trainerbattle 5, OPPONENT_BROOKE_1, 0, Route111_Text_1BB529, Route111_Text_1BB5A2 + trainerbattle 5, TRAINER_BROOKE_1, 0, Route111_Text_1BB529, Route111_Text_1BB5A2 msgbox Route111_Text_1BB5C1, 6 end diff --git a/data/maps/Route111_OldLadysRestStop/events.inc b/data/maps/Route111_OldLadysRestStop/events.inc index da7f2f605..3a7c3802e 100644 --- a/data/maps/Route111_OldLadysRestStop/events.inc +++ b/data/maps/Route111_OldLadysRestStop/events.inc @@ -1,5 +1,5 @@ Route111_OldLadysRestStop_EventObjects:: @ 838B798 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 3, 3, 9, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_15BFDB, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_OldLadysRestStop_EventScript_15BFDB, 0 Route111_OldLadysRestStop_MapWarps:: @ 838B7B0 warp_def 3, 7, 0, 2, MAP_ROUTE111 diff --git a/data/maps/Route111_OldLadysRestStop/header.inc b/data/maps/Route111_OldLadysRestStop/header.inc index 8536613b9..ed8da2358 100644 --- a/data/maps/Route111_OldLadysRestStop/header.inc +++ b/data/maps/Route111_OldLadysRestStop/header.inc @@ -5,10 +5,10 @@ Route111_OldLadysRestStop:: @ 8306C74 .4byte 0x0 .2byte MUS_GOTOWN .2byte 64 - .byte 26 + .byte MAPSEC_ROUTE_111 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route111_WinstrateFamilysHouse/events.inc b/data/maps/Route111_WinstrateFamilysHouse/events.inc index 70d00eabc..623df9b73 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/events.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/events.inc @@ -1,8 +1,8 @@ Route111_WinstrateFamilysHouse_EventObjects:: @ 838B714 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, 9, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF80, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF25, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, 9, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF3A, 0 - object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 4, 3, 10, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF95, 0 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF80, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF25, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF3A, 0 + object_event 4, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route111_WinstrateFamilysHouse_EventScript_15BF95, 0 Route111_WinstrateFamilysHouse_MapWarps:: @ 838B774 warp_def 3, 7, 0, 0, MAP_ROUTE111 diff --git a/data/maps/Route111_WinstrateFamilysHouse/header.inc b/data/maps/Route111_WinstrateFamilysHouse/header.inc index 7cac82463..5e68c7992 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/header.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/header.inc @@ -5,10 +5,10 @@ Route111_WinstrateFamilysHouse:: @ 8306C58 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 26 + .byte MAPSEC_ROUTE_111 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route112/events.inc b/data/maps/Route112/events.inc index e1673dc69..ef6d227b8 100644 --- a/data/maps/Route112/events.inc +++ b/data/maps/Route112/events.inc @@ -1,16 +1,16 @@ Route112_EventObjects:: @ 8382818 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 26, 30, 3, 8, 1, 1, 0, 0, Route112_EventScript_150513, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, 14, 0, 0, 1, 2, Route112_EventScript_150549, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, 8, 0, 0, 1, 3, Route112_EventScript_15059E, 0 - object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, 23, 0, 0, 1, 3, Route112_EventScript_1505B5, 0 - object_event 5, EVENT_OBJ_GFX_HIKER, 0, 17, 40, 3, 16, 0, 0, 1, 4, Route112_EventScript_150560, 0 - object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 27, 30, 3, 8, 0, 0, 0, 0, Route112_EventScript_15051C, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, 12, 0, 0, 0, 24, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, 12, 0, 0, 0, 23, S_BerryTree, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, 12, 0, 0, 0, 22, S_BerryTree, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, 12, 0, 0, 0, 21, S_BerryTree, 0 - object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, 26, 0, 3, 0, 0, Route112_EventScript_150540, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, 1, 0, 0, 0, 0, Route112_EventScript_1B14EF, FLAG_ITEM_ROUTE112_1 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 26, 30, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route112_EventScript_150513, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 24, 34, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route112_EventScript_150549, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 29, 49, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route112_EventScript_15059E, 0 + object_event 4, EVENT_OBJ_GFX_PICNICKER, 0, 22, 46, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route112_EventScript_1505B5, 0 + object_event 5, EVENT_OBJ_GFX_HIKER, 0, 17, 40, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 4, Route112_EventScript_150560, 0 + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 27, 30, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route112_EventScript_15051C, FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 27, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 24, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 28, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 23, S_BerryTree, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 6, 0, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 22, S_BerryTree, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 6, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 21, S_BerryTree, 0 + object_event 11, EVENT_OBJ_GFX_HIKER, 0, 8, 50, 3, MOVEMENT_TYPE_WALK_DOWN_AND_UP, 0, 3, 0, 0, Route112_EventScript_150540, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 43, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route112_EventScript_1B14EF, FLAG_ITEM_ROUTE112_1 Route112_MapWarps:: @ 8382938 warp_def 28, 27, 0, 0, MAP_ROUTE112_CABLE_CAR_STATION @@ -21,9 +21,9 @@ Route112_MapWarps:: @ 8382938 warp_def 22, 10, 0, 1, MAP_FIERY_PATH Route112_MapBGEvents:: @ 8382968 - bg_event 19, 44, 3, 0, 0, Route112_EventScript_15052E - bg_event 22, 37, 0, 0, 0, Route112_EventScript_150525 - bg_event 4, 49, 0, 0, 0, Route112_EventScript_150537 + bg_event 19, 44, 3, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_15052E + bg_event 22, 37, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_150525 + bg_event 4, 49, 0, BG_EVENT_PLAYER_FACING_ANY, Route112_EventScript_150537 Route112_MapEvents:: @ 838298C map_events Route112_EventObjects, Route112_MapWarps, 0x0, Route112_MapBGEvents diff --git a/data/maps/Route112/header.inc b/data/maps/Route112/header.inc index dc9a96bd6..f5e3f3133 100644 --- a/data/maps/Route112/header.inc +++ b/data/maps/Route112/header.inc @@ -5,10 +5,10 @@ Route112:: @ 830573C .4byte Route112_MapConnections .2byte MUS_DOORO_X1 .2byte 28 - .byte 27 + .byte MAPSEC_ROUTE_112 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route112/scripts.inc b/data/maps/Route112/scripts.inc index 83d93f222..8e3f73fc0 100644 --- a/data/maps/Route112/scripts.inc +++ b/data/maps/Route112/scripts.inc @@ -32,12 +32,12 @@ Route112_EventScript_150540:: @ 8150540 end Route112_EventScript_150549:: @ 8150549 - trainerbattle 0, OPPONENT_BRICE, 0, Route112_Text_1BB619, Route112_Text_1BB655 + trainerbattle 0, TRAINER_BRICE, 0, Route112_Text_1BB619, Route112_Text_1BB655 msgbox Route112_Text_1BB667, 6 end Route112_EventScript_150560:: @ 8150560 - trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 + trainerbattle 0, TRAINER_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route112_EventScript_150587 @@ -45,16 +45,16 @@ Route112_EventScript_150560:: @ 8150560 end Route112_EventScript_150587:: @ 8150587 - trainerbattle 5, OPPONENT_TRENT_1, 0, Route112_Text_1BB7C7, Route112_Text_1BB801 + trainerbattle 5, TRAINER_TRENT_1, 0, Route112_Text_1BB7C7, Route112_Text_1BB801 msgbox Route112_Text_1BB819, 6 end Route112_EventScript_15059E:: @ 815059E - trainerbattle 0, OPPONENT_LARRY, 0, Route112_Text_1BB893, Route112_Text_1BB8B6 + trainerbattle 0, TRAINER_LARRY, 0, Route112_Text_1BB893, Route112_Text_1BB8B6 msgbox Route112_Text_1BB8BE, 6 end Route112_EventScript_1505B5:: @ 81505B5 - trainerbattle 0, OPPONENT_CAROL, 0, Route112_Text_1BB8F0, Route112_Text_1BB942 + trainerbattle 0, TRAINER_CAROL, 0, Route112_Text_1BB8F0, Route112_Text_1BB942 msgbox Route112_Text_1BB958, 6 end diff --git a/data/maps/Route112_CableCarStation/events.inc b/data/maps/Route112_CableCarStation/events.inc index a2c93ca9d..22d25f3df 100644 --- a/data/maps/Route112_CableCarStation/events.inc +++ b/data/maps/Route112_CableCarStation/events.inc @@ -1,6 +1,6 @@ Route112_CableCarStation_EventObjects:: @ 838B7D4 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, 8, 0, 0, 0, 0, Route112_CableCarStation_EventScript_15C08C, 0 - object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, 1, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 6, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route112_CableCarStation_EventScript_15C08C, 0 + object_event 2, EVENT_OBJ_GFX_CABLE_CAR, 0, 6, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 Route112_CableCarStation_MapWarps:: @ 838B804 warp_def 6, 11, 0, 0, MAP_ROUTE112 diff --git a/data/maps/Route112_CableCarStation/header.inc b/data/maps/Route112_CableCarStation/header.inc index 881f4591d..0a657b920 100644 --- a/data/maps/Route112_CableCarStation/header.inc +++ b/data/maps/Route112_CableCarStation/header.inc @@ -5,10 +5,10 @@ Route112_CableCarStation:: @ 8306C90 .4byte 0x0 .2byte MUS_DOORO_X1 .2byte 119 - .byte 27 + .byte MAPSEC_ROUTE_112 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route113/events.inc b/data/maps/Route113/events.inc index 3fd5ea281..81f0c48c9 100644 --- a/data/maps/Route113/events.inc +++ b/data/maps/Route113/events.inc @@ -1,15 +1,15 @@ Route113_EventObjects:: @ 83829A0 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 12, 3, 5, 1, 0, 0, 0, Route113_EventScript_15060E, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, 3, 0, 1, 0, 0, Route113_EventScript_150605, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, 8, 0, 0, 1, 3, Route113_EventScript_15063B, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, 17, 0, 0, 1, 3, Route113_EventScript_150652, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 51, 11, 3, 23, 0, 0, 1, 2, Route113_EventScript_150669, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, 1, 0, 0, 0, 0, Route113_EventScript_1B14FC, FLAG_ITEM_ROUTE113_1 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 78, 5, 3, 1, 0, 0, 0, 0, Route113_EventScript_1B1509, FLAG_ITEM_ROUTE113_2 - object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 3, 3, 63, 0, 0, 3, 1, Route113_EventScript_1506A7, 0 - object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 63, 0, 0, 3, 1, Route113_EventScript_1506E5, 0 - object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 6, 3, 8, 1, 1, 1, 0, Route113_EventScript_1506FC, 0 - object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 6, 3, 8, 1, 1, 1, 0, Route113_EventScript_150717, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 12, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route113_EventScript_15060E, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 36, 10, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route113_EventScript_150605, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 62, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route113_EventScript_15063B, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 21, 11, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route113_EventScript_150652, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_7, 0, 51, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route113_EventScript_150669, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 53, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_1B14FC, FLAG_ITEM_ROUTE113_1 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 78, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route113_EventScript_1B1509, FLAG_ITEM_ROUTE113_2 + object_event 8, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 66, 3, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1506A7, 0 + object_event 9, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, MOVEMENT_TYPE_HIDDEN, 0, 0, 3, 1, Route113_EventScript_1506E5, 0 + object_event 10, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 45, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route113_EventScript_1506FC, 0 + object_event 11, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 46, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route113_EventScript_150717, 0 Route113_MapWarps:: @ 8382AA8 warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP @@ -36,10 +36,10 @@ Route113_MapCoordEvents:: @ 8382AB0 coord_weather_event 88, 7, 3, COORD_EVENT_WEATHER_ASH Route113_MapBGEvents:: @ 8382BE0 - bg_event 85, 6, 0, 0, 0, Route113_EventScript_150617 - bg_event 11, 9, 0, 0, 0, Route113_EventScript_150620 - bg_event 58, 4, 3, 0, 0, Route113_EventScript_150632 - bg_event 31, 5, 0, 0, 0, Route113_EventScript_150629 + bg_event 85, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_150617 + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_150620 + bg_event 58, 4, 3, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_150632 + bg_event 31, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route113_EventScript_150629 bg_secret_base_event 49, 8, 0, SECRET_BASE_RED_CAVE1_3 bg_hidden_item_event 72, 4, 3, ITEM_ETHER, FLAG_HIDDEN_ITEM_3 bg_hidden_item_event 22, 5, 3, ITEM_TM32_DOUBLE_TEAM, FLAG_HIDDEN_ITEM_1E diff --git a/data/maps/Route113/header.inc b/data/maps/Route113/header.inc index 9097be2f9..9208e03a1 100644 --- a/data/maps/Route113/header.inc +++ b/data/maps/Route113/header.inc @@ -5,10 +5,10 @@ Route113:: @ 8305758 .4byte Route113_MapConnections .2byte MUS_KAZANBAI .2byte 29 - .byte 28 + .byte MAPSEC_ROUTE_113 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route113/scripts.inc b/data/maps/Route113/scripts.inc index 41b289db0..5b44f2442 100644 --- a/data/maps/Route113/scripts.inc +++ b/data/maps/Route113/scripts.inc @@ -49,17 +49,17 @@ Route113_EventScript_150632:: @ 8150632 end Route113_EventScript_15063B:: @ 815063B - trainerbattle 0, OPPONENT_NEAL, 0, Route113_Text_1BB9BA, Route113_Text_1BB9E6 + trainerbattle 0, TRAINER_NEAL, 0, Route113_Text_1BB9BA, Route113_Text_1BB9E6 msgbox Route113_Text_1BB9FB, 6 end Route113_EventScript_150652:: @ 8150652 - trainerbattle 0, OPPONENT_DILLON, 0, Route113_Text_1BBA62, Route113_Text_1BBA9B + trainerbattle 0, TRAINER_DILLON, 0, Route113_Text_1BBA62, Route113_Text_1BBA9B msgbox Route113_Text_1BBAB7, 6 end Route113_EventScript_150669:: @ 8150669 - trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A + trainerbattle 0, TRAINER_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route113_EventScript_150690 @@ -67,12 +67,12 @@ Route113_EventScript_150669:: @ 8150669 end Route113_EventScript_150690:: @ 8150690 - trainerbattle 5, OPPONENT_MADELINE_1, 0, Route113_Text_1BBBCE, Route113_Text_1BBC0D + trainerbattle 5, TRAINER_MADELINE_1, 0, Route113_Text_1BBBCE, Route113_Text_1BBC0D msgbox Route113_Text_1BBC1C, 6 end Route113_EventScript_1506A7:: @ 81506A7 - trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 + trainerbattle 0, TRAINER_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route113_EventScript_1506CE @@ -80,21 +80,21 @@ Route113_EventScript_1506A7:: @ 81506A7 end Route113_EventScript_1506CE:: @ 81506CE - trainerbattle 5, OPPONENT_LAO_1, 0, Route113_Text_1BBCE6, Route113_Text_1BBD1D + trainerbattle 5, TRAINER_LAO_1, 0, Route113_Text_1BBCE6, Route113_Text_1BBD1D msgbox Route113_Text_1BBD38, 6 end Route113_EventScript_1506E5:: @ 81506E5 - trainerbattle 0, OPPONENT_LUNG, 0, Route113_Text_1BBD92, Route113_Text_1BBDC6 + trainerbattle 0, TRAINER_LUNG, 0, Route113_Text_1BBD92, Route113_Text_1BBDC6 msgbox Route113_Text_1BBE1D, 6 end Route113_EventScript_1506FC:: @ 81506FC - trainerbattle 4, OPPONENT_TORI_AND_TIA, 0, Route113_Text_1BBE65, Route113_Text_1BBEA1, Route113_Text_1BBF25 + trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_1BBE65, Route113_Text_1BBEA1, Route113_Text_1BBF25 msgbox Route113_Text_1BBEE4, 6 end Route113_EventScript_150717:: @ 8150717 - trainerbattle 4, OPPONENT_TORI_AND_TIA, 0, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021 + trainerbattle 4, TRAINER_TORI_AND_TIA, 0, Route113_Text_1BBF62, Route113_Text_1BBF9D, Route113_Text_1BC021 msgbox Route113_Text_1BBFE2, 6 end diff --git a/data/maps/Route113_GlassWorkshop/events.inc b/data/maps/Route113_GlassWorkshop/events.inc index 24b90b2d7..15aa74311 100644 --- a/data/maps/Route113_GlassWorkshop/events.inc +++ b/data/maps/Route113_GlassWorkshop/events.inc @@ -1,6 +1,6 @@ Route113_GlassWorkshop_EventObjects:: @ 8392D18 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_163565, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 5, 4, 3, 2, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_1639D6, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route113_GlassWorkshop_EventScript_163565, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 5, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route113_GlassWorkshop_EventScript_1639D6, 0 Route113_GlassWorkshop_MapWarps:: @ 8392D48 warp_def 3, 8, 0, 0, MAP_ROUTE113 diff --git a/data/maps/Route113_GlassWorkshop/header.inc b/data/maps/Route113_GlassWorkshop/header.inc index e63be2dee..eb75ddfb6 100644 --- a/data/maps/Route113_GlassWorkshop/header.inc +++ b/data/maps/Route113_GlassWorkshop/header.inc @@ -5,10 +5,10 @@ Route113_GlassWorkshop:: @ 8307EB8 .4byte 0x0 .2byte MUS_GOTOWN .2byte 67 - .byte 28 + .byte MAPSEC_ROUTE_113 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114/events.inc b/data/maps/Route114/events.inc index eb05dd1ce..a4edc3489 100644 --- a/data/maps/Route114/events.inc +++ b/data/maps/Route114/events.inc @@ -1,27 +1,27 @@ Route114_EventObjects:: @ 8382C48 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, 12, 0, 0, 0, 77, S_BerryTree, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, 12, 0, 0, 0, 78, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, 10, 0, 0, 1, 6, Route114_EventScript_1507F1, 0 - object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, 15, 0, 0, 1, 4, Route114_EventScript_150808, 0 - object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, 10, 0, 0, 1, 3, Route114_EventScript_15081F, 0 - object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, 1, 0, 0, 1, 3, Route114_EventScript_150836, 0 - object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, 7, 0, 0, 1, 3, Route114_EventScript_15084D, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, 12, 0, 0, 0, 68, S_BerryTree, 0 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 0, 0, 0, 0, Route114_EventScript_1B1516, FLAG_ITEM_ROUTE114_1 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, 1, 0, 0, 0, 0, Route114_EventScript_1B1523, FLAG_ITEM_ROUTE114_2 - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11 - object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, 10, 0, 0, 0, 0, Route114_EventScript_150782, 0 - object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, 10, 0, 0, 0, 0, Route114_EventScript_1507C3, 0 - object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 27, 42, 3, 3, 0, 1, 0, 0, Route114_EventScript_150733, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 23, 20, 3, 8, 0, 0, 1, 0, Route114_EventScript_1508E0, 0 - object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, 9, 0, 0, 1, 0, Route114_EventScript_1508C9, 0 - object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 30, 58, 5, 23, 0, 0, 1, 3, Route114_EventScript_15088B, 0 - object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12 - object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13 - object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14 - object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 - object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, 8, 1, 1, 1, 0, Route114_EventScript_150912, 0 - object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, 8, 1, 1, 1, 0, Route114_EventScript_1508F7, 0 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 43, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 77, S_BerryTree, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 44, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 78, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_HIKER, 0, 15, 65, 7, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route114_EventScript_1507F1, 0 + object_event 4, EVENT_OBJ_GFX_HIKER, 0, 30, 72, 5, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 4, Route114_EventScript_150808, 0 + object_event 5, EVENT_OBJ_GFX_CAMPER, 0, 22, 50, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route114_EventScript_15081F, 0 + object_event 6, EVENT_OBJ_GFX_PICNICKER, 0, 19, 35, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route114_EventScript_150836, 0 + object_event 7, EVENT_OBJ_GFX_MANIAC, 0, 20, 56, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route114_EventScript_15084D, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 45, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 68, S_BerryTree, 0 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_1B1516, FLAG_ITEM_ROUTE114_1 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 11, 37, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_EventScript_1B1523, FLAG_ITEM_ROUTE114_2 + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 12, 43, 4, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_11 + object_event 12, EVENT_OBJ_GFX_GENTLEMAN, 0, 19, 11, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_150782, 0 + object_event 13, EVENT_OBJ_GFX_POOCHYENA, 0, 19, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route114_EventScript_1507C3, 0 + object_event 14, EVENT_OBJ_GFX_MAN_5, 0, 27, 42, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, Route114_EventScript_150733, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 23, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route114_EventScript_1508E0, 0 + object_event 16, EVENT_OBJ_GFX_FISHERMAN, 0, 19, 26, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, Route114_EventScript_1508C9, 0 + object_event 17, EVENT_OBJ_GFX_MAN_6, 0, 30, 58, 5, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route114_EventScript_15088B, 0 + object_event 18, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 53, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12 + object_event 19, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 30, 54, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13 + object_event 20, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 22, 69, 7, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14 + object_event 21, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 64, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 + object_event 22, EVENT_OBJ_GFX_LASS, 0, 24, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route114_EventScript_150912, 0 + object_event 23, EVENT_OBJ_GFX_LASS, 0, 23, 44, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route114_EventScript_1508F7, 0 Route114_MapWarps:: @ 8382E70 warp_def 8, 63, 0, 0, MAP_METEOR_FALLS_1F_1R @@ -29,15 +29,15 @@ Route114_MapWarps:: @ 8382E70 warp_def 27, 36, 0, 0, MAP_ROUTE114_LANETTES_HOUSE Route114_MapBGEvents:: @ 8382E88 - bg_event 7, 64, 0, 0, 0, Route114_EventScript_1507D6 - bg_event 31, 7, 0, 0, 0, Route114_EventScript_1507DF + bg_event 7, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1507D6 + bg_event 31, 7, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1507DF bg_secret_base_event 9, 47, 0, SECRET_BASE_BROWN_CAVE1_1 bg_secret_base_event 30, 51, 0, SECRET_BASE_BROWN_CAVE2_1 bg_secret_base_event 11, 62, 0, SECRET_BASE_BROWN_CAVE3_1 bg_secret_base_event 19, 70, 0, SECRET_BASE_BROWN_CAVE4_1 bg_secret_base_event 11, 27, 0, SECRET_BASE_TREE3_2 bg_secret_base_event 12, 27, 0, SECRET_BASE_TREE4_2 - bg_event 25, 38, 3, 0, 0, Route114_EventScript_1507E8 + bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route114_EventScript_1507E8 bg_hidden_item_event 20, 57, 3, ITEM_CARBOS, FLAG_HIDDEN_ITEM_4 bg_secret_base_event 32, 57, 0, SECRET_BASE_BROWN_CAVE4_3 bg_hidden_item_event 7, 30, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_2A diff --git a/data/maps/Route114/header.inc b/data/maps/Route114/header.inc index afeb34813..fc57d86aa 100644 --- a/data/maps/Route114/header.inc +++ b/data/maps/Route114/header.inc @@ -5,10 +5,10 @@ Route114:: @ 8305774 .4byte Route114_MapConnections .2byte MUS_DOORO_X1 .2byte 30 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index 54a4ee59a..dd5ec1695 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -64,27 +64,27 @@ Route114_EventScript_1507E8:: @ 81507E8 end Route114_EventScript_1507F1:: @ 81507F1 - trainerbattle 0, OPPONENT_LENNY, 0, Route114_Text_1BC05B, Route114_Text_1BC0B5 + trainerbattle 0, TRAINER_LENNY, 0, Route114_Text_1BC05B, Route114_Text_1BC0B5 msgbox Route114_Text_1BC0C3, 6 end Route114_EventScript_150808:: @ 8150808 - trainerbattle 0, OPPONENT_LUCAS_1, 0, Route114_Text_1BC125, Route114_Text_1BC163 + trainerbattle 0, TRAINER_LUCAS_1, 0, Route114_Text_1BC125, Route114_Text_1BC163 msgbox Route114_Text_1BC184, 6 end Route114_EventScript_15081F:: @ 815081F - trainerbattle 0, OPPONENT_SHANE, 0, Route114_Text_1BC1C8, Route114_Text_1BC23F + trainerbattle 0, TRAINER_SHANE, 0, Route114_Text_1BC1C8, Route114_Text_1BC23F msgbox Route114_Text_1BC24F, 6 end Route114_EventScript_150836:: @ 8150836 - trainerbattle 0, OPPONENT_NANCY, 0, Route114_Text_1BC289, Route114_Text_1BC2BE + trainerbattle 0, TRAINER_NANCY, 0, Route114_Text_1BC289, Route114_Text_1BC2BE msgbox Route114_Text_1BC2C6, 6 end Route114_EventScript_15084D:: @ 815084D - trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 + trainerbattle 0, TRAINER_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_150874 @@ -92,12 +92,12 @@ Route114_EventScript_15084D:: @ 815084D end Route114_EventScript_150874:: @ 8150874 - trainerbattle 5, OPPONENT_STEVE_1, 0, Route114_Text_1BC3B3, Route114_Text_1BC3E0 + trainerbattle 5, TRAINER_STEVE_1, 0, Route114_Text_1BC3B3, Route114_Text_1BC3E0 msgbox Route114_Text_1BC40F, 6 end Route114_EventScript_15088B:: @ 815088B - trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 + trainerbattle 0, TRAINER_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_1508B2 @@ -105,26 +105,26 @@ Route114_EventScript_15088B:: @ 815088B end Route114_EventScript_1508B2:: @ 81508B2 - trainerbattle 5, OPPONENT_BERNIE_1, 0, Route114_Text_1BC525, Route114_Text_1BC559 + trainerbattle 5, TRAINER_BERNIE_1, 0, Route114_Text_1BC525, Route114_Text_1BC559 msgbox Route114_Text_1BC58C, 6 end Route114_EventScript_1508C9:: @ 81508C9 - trainerbattle 0, OPPONENT_CLAUDE, 0, Route114_Text_1BC5FC, Route114_Text_1BC653 + trainerbattle 0, TRAINER_CLAUDE, 0, Route114_Text_1BC5FC, Route114_Text_1BC653 msgbox Route114_Text_1BC679, 6 end Route114_EventScript_1508E0:: @ 81508E0 - trainerbattle 0, OPPONENT_NOLAN, 0, Route114_Text_1BC6EC, Route114_Text_1BC750 + trainerbattle 0, TRAINER_NOLAN, 0, Route114_Text_1BC6EC, Route114_Text_1BC750 msgbox Route114_Text_1BC78A, 6 end Route114_EventScript_1508F7:: @ 81508F7 - trainerbattle 4, OPPONENT_TYRA_AND_IVY, 0, Route114_Text_1BC7E3, Route114_Text_1BC834, Route114_Text_1BC88A + trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_1BC7E3, Route114_Text_1BC834, Route114_Text_1BC88A msgbox Route114_Text_1BC858, 6 end Route114_EventScript_150912:: @ 8150912 - trainerbattle 4, OPPONENT_TYRA_AND_IVY, 0, Route114_Text_1BC8D8, Route114_Text_1BC8FB, Route114_Text_1BC96A + trainerbattle 4, TRAINER_TYRA_AND_IVY, 0, Route114_Text_1BC8D8, Route114_Text_1BC8FB, Route114_Text_1BC96A msgbox Route114_Text_1BC91E, 6 end diff --git a/data/maps/Route114_FossilManiacsHouse/events.inc b/data/maps/Route114_FossilManiacsHouse/events.inc index 1f41db668..1396fe276 100644 --- a/data/maps/Route114_FossilManiacsHouse/events.inc +++ b/data/maps/Route114_FossilManiacsHouse/events.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsHouse_EventObjects:: @ 838B87C - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 3, 2, 3, 8, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_15C1C3, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route114_FossilManiacsHouse_EventScript_15C1C3, 0 Route114_FossilManiacsHouse_MapWarps:: @ 838B894 warp_def 4, 7, 0, 1, MAP_ROUTE114 @@ -7,10 +7,10 @@ Route114_FossilManiacsHouse_MapWarps:: @ 838B894 warp_def 4, 1, 0, 0, MAP_ROUTE114_FOSSIL_MANIACS_TUNNEL Route114_FossilManiacsHouse_MapBGEvents:: @ 838B8AC - bg_event 5, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC - bg_event 6, 3, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C1FC - bg_event 7, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C205 - bg_event 8, 2, 0, 1, 0, Route114_FossilManiacsHouse_EventScript_15C205 + bg_event 5, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_15C1FC + bg_event 6, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_15C1FC + bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_15C205 + bg_event 8, 2, 0, BG_EVENT_PLAYER_FACING_NORTH, Route114_FossilManiacsHouse_EventScript_15C205 Route114_FossilManiacsHouse_MapEvents:: @ 838B8DC map_events Route114_FossilManiacsHouse_EventObjects, Route114_FossilManiacsHouse_MapWarps, 0x0, Route114_FossilManiacsHouse_MapBGEvents diff --git a/data/maps/Route114_FossilManiacsHouse/header.inc b/data/maps/Route114_FossilManiacsHouse/header.inc index cd580f692..658bb33d9 100644 --- a/data/maps/Route114_FossilManiacsHouse/header.inc +++ b/data/maps/Route114_FossilManiacsHouse/header.inc @@ -5,10 +5,10 @@ Route114_FossilManiacsHouse:: @ 8306CC8 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 120 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114_FossilManiacsTunnel/events.inc b/data/maps/Route114_FossilManiacsTunnel/events.inc index 13db6a8ca..c647ebbcc 100644 --- a/data/maps/Route114_FossilManiacsTunnel/events.inc +++ b/data/maps/Route114_FossilManiacsTunnel/events.inc @@ -1,5 +1,5 @@ Route114_FossilManiacsTunnel_EventObjects:: @ 838B8F0 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, 7, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_15C20F, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, Route114_FossilManiacsTunnel_EventScript_15C20F, 0 Route114_FossilManiacsTunnel_MapWarps:: @ 838B908 warp_def 6, 25, 3, 2, MAP_ROUTE114_FOSSIL_MANIACS_HOUSE diff --git a/data/maps/Route114_FossilManiacsTunnel/header.inc b/data/maps/Route114_FossilManiacsTunnel/header.inc index 7cd10eb1a..c8fa950f4 100644 --- a/data/maps/Route114_FossilManiacsTunnel/header.inc +++ b/data/maps/Route114_FossilManiacsTunnel/header.inc @@ -5,10 +5,10 @@ Route114_FossilManiacsTunnel:: @ 8306CE4 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 121 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route114_LanettesHouse/events.inc b/data/maps/Route114_LanettesHouse/events.inc index 86ebf06de..f79c9be44 100644 --- a/data/maps/Route114_LanettesHouse/events.inc +++ b/data/maps/Route114_LanettesHouse/events.inc @@ -1,14 +1,14 @@ Route114_LanettesHouse_EventObjects:: @ 838B92C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 4, 3, 1, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, FLAG_HIDE_LANETTE + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route114_LanettesHouse_EventScript_15C262, FLAG_HIDE_LANETTE Route114_LanettesHouse_MapWarps:: @ 838B944 warp_def 5, 7, 0, 2, MAP_ROUTE114 warp_def 6, 7, 0, 2, MAP_ROUTE114 Route114_LanettesHouse_MapBGEvents:: @ 838B954 - bg_event 5, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C299 - bg_event 8, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C2D5 - bg_event 7, 1, 0, 0, 0, Route114_LanettesHouse_EventScript_15C2D5 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_15C299 + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_15C2D5 + bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route114_LanettesHouse_EventScript_15C2D5 Route114_LanettesHouse_MapEvents:: @ 838B978 map_events Route114_LanettesHouse_EventObjects, Route114_LanettesHouse_MapWarps, 0x0, Route114_LanettesHouse_MapBGEvents diff --git a/data/maps/Route114_LanettesHouse/header.inc b/data/maps/Route114_LanettesHouse/header.inc index d37f4a323..3b49ab59a 100644 --- a/data/maps/Route114_LanettesHouse/header.inc +++ b/data/maps/Route114_LanettesHouse/header.inc @@ -5,10 +5,10 @@ Route114_LanettesHouse:: @ 8306D00 .4byte 0x0 .2byte MUS_TONEKUSA .2byte 122 - .byte 29 + .byte MAPSEC_ROUTE_114 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route115/events.inc b/data/maps/Route115/events.inc index e03d62fb4..0888896ac 100644 --- a/data/maps/Route115/events.inc +++ b/data/maps/Route115/events.inc @@ -1,20 +1,20 @@ Route115_EventObjects:: @ 8382F2C - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 68, 3, 2, 1, 1, 0, 0, Route115_EventScript_15092E, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 15, 3, 10, 0, 0, 1, 6, Route115_EventScript_150949, 0 - object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, 15, 1, 1, 1, 4, Route115_EventScript_15099E, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, 12, 0, 0, 0, 69, S_BerryTree, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 70, S_BerryTree, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, 12, 0, 0, 0, 71, S_BerryTree, 0 - object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, 64, 0, 0, 1, 3, Route115_EventScript_1509DC, 0 - object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 17, 3, 50, 3, 3, 1, 2, Route115_EventScript_150987, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 25, 61, 3, 14, 0, 0, 1, 3, Route115_EventScript_150A1A, 0 - object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, 1, 0, 0, 0, 0, Route115_EventScript_1B1530, FLAG_ITEM_ROUTE115_1 - object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 3, 1, 0, 0, 0, 0, Route115_EventScript_1B153D, FLAG_ITEM_ROUTE115_2 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, 1, 0, 0, 0, 0, Route115_EventScript_1B154A, FLAG_ITEM_ROUTE115_3 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, 12, 0, 0, 0, 55, S_BerryTree, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, 12, 0, 0, 0, 56, S_BerryTree, 0 - object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, 1, 1, 1, 0, 0, Route115_EventScript_1B1557, FLAG_ITEM_ROUTE115_4 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 18, 68, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route115_EventScript_15092E, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 15, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 6, Route115_EventScript_150949, 0 + object_event 3, EVENT_OBJ_GFX_BLACK_BELT, 0, 27, 53, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 4, Route115_EventScript_15099E, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 69, S_BerryTree, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 70, S_BerryTree, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 13, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 71, S_BerryTree, 0 + object_event 7, EVENT_OBJ_GFX_GIRL_3, 0, 15, 50, 3, MOVEMENT_TYPE_WALK_IN_PLACE_DOWN, 0, 0, 1, 3, Route115_EventScript_1509DC, 0 + object_event 8, EVENT_OBJ_GFX_BLACK_BELT, 0, 17, 17, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 3, 1, 2, Route115_EventScript_150987, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 25, 61, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route115_EventScript_150A1A, 0 + object_event 10, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 60, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_1B1530, FLAG_ITEM_ROUTE115_1 + object_event 11, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_1B153D, FLAG_ITEM_ROUTE115_2 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route115_EventScript_1B154A, FLAG_ITEM_ROUTE115_3 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 64, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 55, S_BerryTree, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 31, 65, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 56, S_BerryTree, 0 + object_event 15, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 29, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route115_EventScript_1B1557, FLAG_ITEM_ROUTE115_4 Route115_MapWarps:: @ 83830AC warp_def 27, 37, 0, 1, MAP_METEOR_FALLS_1F_1R @@ -22,8 +22,8 @@ Route115_MapWarps:: @ 83830AC Route115_MapBGEvents:: @ 83830B4 bg_secret_base_event 32, 6, 0, SECRET_BASE_BROWN_CAVE4_2 bg_secret_base_event 21, 18, 0, SECRET_BASE_BROWN_CAVE3_2 - bg_event 16, 64, 0, 0, 0, Route115_EventScript_150937 - bg_event 25, 38, 3, 0, 0, Route115_EventScript_150940 + bg_event 16, 64, 0, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_150937 + bg_event 25, 38, 3, BG_EVENT_PLAYER_FACING_ANY, Route115_EventScript_150940 bg_secret_base_event 8, 30, 0, SECRET_BASE_YELLOW_CAVE2_3 bg_secret_base_event 32, 39, 0, SECRET_BASE_BROWN_CAVE1_2 bg_secret_base_event 26, 15, 0, SECRET_BASE_BROWN_CAVE2_2 diff --git a/data/maps/Route115/header.inc b/data/maps/Route115/header.inc index 208c24a76..9967224a8 100644 --- a/data/maps/Route115/header.inc +++ b/data/maps/Route115/header.inc @@ -5,10 +5,10 @@ Route115:: @ 8305790 .4byte Route115_MapConnections .2byte MUS_NEXTROAD .2byte 31 - .byte 30 + .byte MAPSEC_ROUTE_115 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route115/scripts.inc b/data/maps/Route115/scripts.inc index f16c2088a..9cb3652f1 100644 --- a/data/maps/Route115/scripts.inc +++ b/data/maps/Route115/scripts.inc @@ -14,7 +14,7 @@ Route115_EventScript_150940:: @ 8150940 end Route115_EventScript_150949:: @ 8150949 - trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 + trainerbattle 0, TRAINER_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_150970 @@ -22,17 +22,17 @@ Route115_EventScript_150949:: @ 8150949 end Route115_EventScript_150970:: @ 8150970 - trainerbattle 5, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BCA6B, Route115_Text_1BCAB3 + trainerbattle 5, TRAINER_TIMOTHY_1, 0, Route115_Text_1BCA6B, Route115_Text_1BCAB3 msgbox Route115_Text_1BCAC6, 6 end Route115_EventScript_150987:: @ 8150987 - trainerbattle 0, OPPONENT_KOICHI, 0, Route115_Text_1BCB0D, Route115_Text_1BCB2E + trainerbattle 0, TRAINER_KOICHI, 0, Route115_Text_1BCB0D, Route115_Text_1BCB2E msgbox Route115_Text_1BCB40, 6 end Route115_EventScript_15099E:: @ 815099E - trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 + trainerbattle 0, TRAINER_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_1509C5 @@ -40,12 +40,12 @@ Route115_EventScript_15099E:: @ 815099E end Route115_EventScript_1509C5:: @ 81509C5 - trainerbattle 5, OPPONENT_NOB_1, 0, Route115_Text_1BCC4C, Route115_Text_1BCCA2 + trainerbattle 5, TRAINER_NOB_1, 0, Route115_Text_1BCC4C, Route115_Text_1BCCA2 msgbox Route115_Text_1BCCBA, 6 end Route115_EventScript_1509DC:: @ 81509DC - trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 + trainerbattle 0, TRAINER_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_150A03 @@ -53,16 +53,16 @@ Route115_EventScript_1509DC:: @ 81509DC end Route115_EventScript_150A03:: @ 8150A03 - trainerbattle 5, OPPONENT_CYNDY_1, 0, Route115_Text_1BCDB0, Route115_Text_1BCDD0 + trainerbattle 5, TRAINER_CYNDY_1, 0, Route115_Text_1BCDB0, Route115_Text_1BCDD0 msgbox Route115_Text_1BCDEF, 6 end Route115_EventScript_150A1A:: @ 8150A1A .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_514, 0, UnknownString_81BCE47, UnknownString_81BCE7D + trainerbattle 0, TRAINER_514, 0, UnknownString_81BCE47, UnknownString_81BCE7D msgbox UnknownString_81BCEA4, 6 .else - trainerbattle 0, OPPONENT_514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16 + trainerbattle 0, TRAINER_514, 0, Route115_Text_1BCEE0, Route115_Text_1BCF16 msgbox Route115_Text_1BCF3D, 6 .endc end diff --git a/data/maps/Route116/events.inc b/data/maps/Route116/events.inc index fd1b98f0a..b6f6b3be9 100644 --- a/data/maps/Route116/events.inc +++ b/data/maps/Route116/events.inc @@ -1,26 +1,26 @@ Route116_EventObjects:: @ 8383170 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, 12, 0, 0, 0, 25, S_BerryTree, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, 12, 0, 0, 0, 26, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, 16, 0, 0, 1, 3, Route116_EventScript_150C62, 0 - object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 33, 8, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, 24, 0, 0, 1, 2, Route116_EventScript_150C79, 0 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, 1, 0, 0, 0, 0, Route116_EventScript_1B1571, FLAG_ITEM_ROUTE116_2 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, 1, 0, 0, 0, 0, Route116_EventScript_1B157E, FLAG_ITEM_ROUTE116_3 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, 12, 0, 0, 0, 66, S_BerryTree, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, 12, 0, 0, 0, 67, S_BerryTree, 0 - object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 46, 9, 3, 1, 0, 0, 0, 0, Route116_EventScript_150B5D, FLAG_HIDE_BRINEY_ROUTE116 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 6, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 - object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 15, 3, 13, 0, 0, 1, 2, Route116_EventScript_150CCE, 0 - object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14 - object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, 1, 0, 0, 0, 0, Route116_EventScript_1B158B, FLAG_ITEM_ROUTE116_4 - object_event 16, EVENT_OBJ_GFX_LASS, 0, 22, 16, 3, 13, 0, 0, 1, 3, Route116_EventScript_150CE5, 0 - object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 25, 4, 3, 8, 0, 0, 1, 2, Route116_EventScript_150CFC, 0 - object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 31, 9, 3, 9, 0, 0, 1, 2, Route116_EventScript_150C90, 0 - object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, 1, 1, 1, 0, 0, Route116_EventScript_150A7B, FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 56, 12, 4, 1, 1, 1, 0, 0, Route116_EventScript_1B1564, FLAG_ITEM_ROUTE116_1 - object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, 10, 1, 1, 0, 0, Route116_EventScript_150A49, FLAG_HIDE_TUNNER_DIGGER_ROUTE116 - object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, 1, 1, 1, 0, 0, Route116_EventScript_150B8F, FLAG_HIDE_LOST_GLASSES_MAN + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 25, S_BerryTree, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 19, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 26, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route116_EventScript_150C62, 0 + object_event 4, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 21, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 5, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 33, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 6, EVENT_OBJ_GFX_BUG_CATCHER, 0, 13, 17, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 2, Route116_EventScript_150C79, 0 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 19, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1B1571, FLAG_ITEM_ROUTE116_2 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 17, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1B157E, FLAG_ITEM_ROUTE116_3 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 20, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 66, S_BerryTree, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 21, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 67, S_BerryTree, 0 + object_event 11, EVENT_OBJ_GFX_OLD_MAN_1, 0, 46, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_150B5D, FLAG_HIDE_BRINEY_ROUTE116 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 30, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 + object_event 13, EVENT_OBJ_GFX_HIKER, 0, 36, 15, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route116_EventScript_150CCE, 0 + object_event 14, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 24, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_14 + object_event 15, EVENT_OBJ_GFX_ITEM_BALL, 0, 80, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route116_EventScript_1B158B, FLAG_ITEM_ROUTE116_4 + object_event 16, EVENT_OBJ_GFX_LASS, 0, 22, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 3, Route116_EventScript_150CE5, 0 + object_event 17, EVENT_OBJ_GFX_GIRL_3, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route116_EventScript_150CFC, 0 + object_event 18, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 31, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route116_EventScript_150C90, 0 + object_event 19, EVENT_OBJ_GFX_MAN_2, 0, 46, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_150A7B, FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 56, 12, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_1B1564, FLAG_ITEM_ROUTE116_1 + object_event 21, EVENT_OBJ_GFX_BLACK_BELT, 0, 38, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route116_EventScript_150A49, FLAG_HIDE_TUNNER_DIGGER_ROUTE116 + object_event 22, EVENT_OBJ_GFX_MANIAC, 0, 74, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_EventScript_150B8F, FLAG_HIDE_LOST_GLASSES_MAN Route116_MapWarps:: @ 8383380 warp_def 47, 8, 0, 0, MAP_RUSTURF_TUNNEL @@ -28,16 +28,16 @@ Route116_MapWarps:: @ 8383380 warp_def 65, 10, 0, 2, MAP_RUSTURF_TUNNEL Route116_MapCoordEvents:: @ 8383398 - coord_event 47, 9, 3, 0, VAR_ROUTE116_STATE, 1, 0, Route116_EventScript_150B6E + coord_event 47, 9, 3, VAR_ROUTE116_STATE, 1, Route116_EventScript_150B6E Route116_MapBGEvents:: @ 83833A8 - bg_event 5, 10, 0, 0, 0, Route116_EventScript_150B30 - bg_event 48, 9, 0, 0, 0, Route116_EventScript_150B39 - bg_event 40, 9, 0, 0, 0, Route116_EventScript_150B42 + bg_event 5, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_150B30 + bg_event 48, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_150B39 + bg_event 40, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_150B42 bg_secret_base_event 71, 4, 0, SECRET_BASE_BLUE_CAVE1_1 bg_secret_base_event 79, 11, 0, SECRET_BASE_BLUE_CAVE2_1 - bg_event 16, 12, 0, 0, 0, Route116_EventScript_150B4B - bg_event 29, 10, 0, 0, 0, Route116_EventScript_150B54 + bg_event 16, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_150B4B + bg_event 29, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route116_EventScript_150B54 bg_secret_base_event 56, 6, 0, SECRET_BASE_BLUE_CAVE3_2 bg_secret_base_event 55, 15, 0, SECRET_BASE_BLUE_CAVE4_2 bg_hidden_item_event 22, 9, 3, ITEM_SUPER_POTION, FLAG_HIDDEN_ITEM_2D diff --git a/data/maps/Route116/header.inc b/data/maps/Route116/header.inc index 27d26658f..0351d0cf7 100644 --- a/data/maps/Route116/header.inc +++ b/data/maps/Route116/header.inc @@ -5,10 +5,10 @@ Route116:: @ 83057AC .4byte Route116_MapConnections .2byte MUS_NEXTROAD .2byte 32 - .byte 31 + .byte MAPSEC_ROUTE_116 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 77fbf57a4..284ce3363 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -225,17 +225,17 @@ Route116_Movement_150C57:: @ 8150C57 end_movement Route116_EventScript_150C62:: @ 8150C62 - trainerbattle 0, OPPONENT_JOEY, 0, Route116_Text_1BD02B, Route116_Text_1BD04C + trainerbattle 0, TRAINER_JOEY, 0, Route116_Text_1BD02B, Route116_Text_1BD04C msgbox Route116_Text_1BD078, 6 end Route116_EventScript_150C79:: @ 8150C79 - trainerbattle 0, OPPONENT_JOSE, 0, Route116_Text_1BD0AF, Route116_Text_1BD0D7 + trainerbattle 0, TRAINER_JOSE, 0, Route116_Text_1BD0AF, Route116_Text_1BD0D7 msgbox Route116_Text_1BD0F4, 6 end Route116_EventScript_150C90:: @ 8150C90 - trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A + trainerbattle 0, TRAINER_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route116_EventScript_150CB7 @@ -243,22 +243,22 @@ Route116_EventScript_150C90:: @ 8150C90 end Route116_EventScript_150CB7:: @ 8150CB7 - trainerbattle 5, OPPONENT_JERRY_1, 0, Route116_Text_1BD2A5, Route116_Text_1BD2FE + trainerbattle 5, TRAINER_JERRY_1, 0, Route116_Text_1BD2A5, Route116_Text_1BD2FE msgbox Route116_Text_1BD31A, 6 end Route116_EventScript_150CCE:: @ 8150CCE - trainerbattle 0, OPPONENT_CLARK, 0, Route116_Text_1BCF79, Route116_Text_1BCFBB + trainerbattle 0, TRAINER_CLARK, 0, Route116_Text_1BCF79, Route116_Text_1BCFBB msgbox Route116_Text_1BCFE3, 6 end Route116_EventScript_150CE5:: @ 8150CE5 - trainerbattle 0, OPPONENT_JANICE, 0, Route116_Text_1BD131, Route116_Text_1BD165 + trainerbattle 0, TRAINER_JANICE, 0, Route116_Text_1BD131, Route116_Text_1BD165 msgbox Route116_Text_1BD180, 6 end Route116_EventScript_150CFC:: @ 8150CFC - trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC + trainerbattle 0, TRAINER_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route116_EventScript_150D23 @@ -266,6 +266,6 @@ Route116_EventScript_150CFC:: @ 8150CFC end Route116_EventScript_150D23:: @ 8150D23 - trainerbattle 5, OPPONENT_KAREN_1, 0, Route116_Text_1BD405, Route116_Text_1BD44A + trainerbattle 5, TRAINER_KAREN_1, 0, Route116_Text_1BD405, Route116_Text_1BD44A msgbox Route116_Text_1BD466, 6 end diff --git a/data/maps/Route116_TunnelersRestHouse/events.inc b/data/maps/Route116_TunnelersRestHouse/events.inc index 454f184e3..6fa894ff7 100644 --- a/data/maps/Route116_TunnelersRestHouse/events.inc +++ b/data/maps/Route116_TunnelersRestHouse/events.inc @@ -1,7 +1,7 @@ Route116_TunnelersRestHouse_EventObjects:: @ 838B98C - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, 10, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2E8, 0 - object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, 1, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2FA, 0 - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 7, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2F1, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2E8, 0 + object_event 2, EVENT_OBJ_GFX_MAN_3, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2FA, 0 + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 0, 0, 0, Route116_TunnelersRestHouse_EventScript_15C2F1, 0 Route116_TunnelersRestHouse_MapWarps:: @ 838B9D4 warp_def 4, 8, 0, 1, MAP_ROUTE116 diff --git a/data/maps/Route116_TunnelersRestHouse/header.inc b/data/maps/Route116_TunnelersRestHouse/header.inc index a446833da..d17ce63b5 100644 --- a/data/maps/Route116_TunnelersRestHouse/header.inc +++ b/data/maps/Route116_TunnelersRestHouse/header.inc @@ -5,10 +5,10 @@ Route116_TunnelersRestHouse:: @ 8306D1C .4byte 0x0 .2byte MUS_GOTOWN .2byte 123 - .byte 31 + .byte MAPSEC_ROUTE_116 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route117/events.inc b/data/maps/Route117/events.inc index a668f4b32..555ca1c08 100644 --- a/data/maps/Route117/events.inc +++ b/data/maps/Route117/events.inc @@ -1,33 +1,33 @@ Route117_EventObjects:: @ 8383440 - object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, 8, 0, 0, 0, 0, Route117_EventScript_150D57, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 26, 13, 3, 33, 2, 2, 0, 0, Route117_EventScript_150D60, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 47, 4, 3, 8, 0, 0, 0, 0, Route117_EventScript_1B222D, 0 - object_event 4, EVENT_OBJ_GFX_ZIGZAGOON, 0, 33, 3, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, 1, 0, 0, 0, 0, 0x0, 0 - object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, 1, 1, 1, 0, 0, 0x0, 0 - object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, 1, 0, 0, 0, 0, 0x0, 0 - object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 35, 7, 3, 28, 7, 0, 1, 4, Route117_EventScript_150E09, 0 - object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 31, 11, 3, 23, 0, 0, 1, 3, Route117_EventScript_150DCB, 0 - object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 10, 9, 3, 18, 0, 0, 1, 3, Route117_EventScript_150D8D, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, 12, 0, 0, 0, 29, S_BerryTree, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, 12, 0, 0, 0, 28, S_BerryTree, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, 12, 0, 0, 0, 27, S_BerryTree, 0 - object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, 1, 0, 0, 0, 0, Route117_EventScript_1B1598, FLAG_ITEM_ROUTE117_1 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, 1, 0, 0, 0, 0, Route117_EventScript_1B15A5, FLAG_ITEM_ROUTE117_2 - object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 1, 3, 40, 4, 4, 1, 3, Route117_EventScript_150E47, 0 - object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, 7, 1, 1, 1, 4, Route117_EventScript_150E85, 0 - object_event 19, EVENT_OBJ_GFX_LASS, 0, 46, 15, 3, 8, 0, 0, 1, 0, Route117_EventScript_150EE2, 0 - object_event 20, EVENT_OBJ_GFX_LASS, 0, 45, 15, 3, 8, 0, 0, 1, 0, Route117_EventScript_150E9C, 0 - object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, 2, 1, 1, 0, 0, Route117_EventScript_150D69, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_1, 0, 13, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_150D57, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 26, 13, 3, MOVEMENT_TYPE_WALK_SEQUENCE_UP_LEFT_RIGHT_DOWN, 2, 2, 0, 0, Route117_EventScript_150D60, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_2, 0, 47, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_EventScript_1B222D, 0 + object_event 4, EVENT_OBJ_GFX_ZIGZAGOON, 0, 33, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 5, EVENT_OBJ_GFX_KECLEON_1, 0, 39, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 + object_event 6, EVENT_OBJ_GFX_AZUMARILL, 0, 42, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, 0x0, 0 + object_event 7, EVENT_OBJ_GFX_PIKACHU, 0, 49, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, 0x0, 0 + object_event 8, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_M, 0, 35, 7, 3, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 7, 0, 1, 4, Route117_EventScript_150E09, 0 + object_event 9, EVENT_OBJ_GFX_WOMAN_3, 0, 31, 11, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 3, Route117_EventScript_150DCB, 0 + object_event 10, EVENT_OBJ_GFX_MAN_5, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route117_EventScript_150D8D, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 41, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 29, S_BerryTree, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 42, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 28, S_BerryTree, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 43, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 27, S_BerryTree, 0 + object_event 14, EVENT_OBJ_GFX_ITEM_BALL, 0, 16, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_1B1598, FLAG_ITEM_ROUTE117_1 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 9, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route117_EventScript_1B15A5, FLAG_ITEM_ROUTE117_2 + object_event 17, EVENT_OBJ_GFX_RUNNING_TRIATHLETE_F, 0, 21, 1, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_LEFT_UP, 4, 4, 1, 3, Route117_EventScript_150E47, 0 + object_event 18, EVENT_OBJ_GFX_MANIAC, 0, 17, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, Route117_EventScript_150E85, 0 + object_event 19, EVENT_OBJ_GFX_LASS, 0, 46, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route117_EventScript_150EE2, 0 + object_event 20, EVENT_OBJ_GFX_LASS, 0, 45, 15, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route117_EventScript_150E9C, 0 + object_event 21, EVENT_OBJ_GFX_GIRL_2, 0, 48, 10, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route117_EventScript_150D69, 0 Route117_MapWarps:: @ 8383638 warp_def 51, 5, 0, 0, MAP_ROUTE117_POKEMON_DAY_CARE Route117_MapBGEvents:: @ 8383640 - bg_event 16, 6, 0, 0, 0, Route117_EventScript_150D72 - bg_event 49, 12, 0, 0, 0, Route117_EventScript_150D7B - bg_event 49, 5, 0, 0, 0, Route117_EventScript_150D84 + bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_150D72 + bg_event 49, 12, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_150D7B + bg_event 49, 5, 0, BG_EVENT_PLAYER_FACING_ANY, Route117_EventScript_150D84 bg_hidden_item_event 3, 18, 3, ITEM_REPEL, FLAG_HIDDEN_ITEM_48 Route117_MapEvents:: @ 8383670 diff --git a/data/maps/Route117/header.inc b/data/maps/Route117/header.inc index 11df4b60f..8ef982ca4 100644 --- a/data/maps/Route117/header.inc +++ b/data/maps/Route117/header.inc @@ -5,10 +5,10 @@ Route117:: @ 83057C8 .4byte Route117_MapConnections .2byte MUS_DOORO_X1 .2byte 33 - .byte 32 + .byte MAPSEC_ROUTE_117 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route117/scripts.inc b/data/maps/Route117/scripts.inc index 9f42412ab..3c5bc8a66 100644 --- a/data/maps/Route117/scripts.inc +++ b/data/maps/Route117/scripts.inc @@ -38,7 +38,7 @@ Route117_EventScript_150D84:: @ 8150D84 end Route117_EventScript_150D8D:: @ 8150D8D - trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 + trainerbattle 0, TRAINER_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150DB4 @@ -46,12 +46,12 @@ Route117_EventScript_150D8D:: @ 8150D8D end Route117_EventScript_150DB4:: @ 8150DB4 - trainerbattle 5, OPPONENT_ISAAC_1, 0, Route117_Text_1BD569, Route117_Text_1BD5AB + trainerbattle 5, TRAINER_ISAAC_1, 0, Route117_Text_1BD569, Route117_Text_1BD5AB msgbox Route117_Text_1BD5F2, 6 end Route117_EventScript_150DCB:: @ 8150DCB - trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B + trainerbattle 0, TRAINER_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150DF2 @@ -59,12 +59,12 @@ Route117_EventScript_150DCB:: @ 8150DCB end Route117_EventScript_150DF2:: @ 8150DF2 - trainerbattle 5, OPPONENT_LYDIA_1, 0, Route117_Text_1BD6F2, Route117_Text_1BD733 + trainerbattle 5, TRAINER_LYDIA_1, 0, Route117_Text_1BD6F2, Route117_Text_1BD733 msgbox Route117_Text_1BD74F, 6 end Route117_EventScript_150E09:: @ 8150E09 - trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 + trainerbattle 0, TRAINER_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150E30 @@ -72,12 +72,12 @@ Route117_EventScript_150E09:: @ 8150E09 end Route117_EventScript_150E30:: @ 8150E30 - trainerbattle 5, OPPONENT_DYLAN_1, 0, Route117_Text_1BD83F, Route117_Text_1BD8A2 + trainerbattle 5, TRAINER_DYLAN_1, 0, Route117_Text_1BD83F, Route117_Text_1BD8A2 msgbox Route117_Text_1BD8BD, 6 end Route117_EventScript_150E47:: @ 8150E47 - trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 + trainerbattle 0, TRAINER_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150E6E @@ -85,17 +85,17 @@ Route117_EventScript_150E47:: @ 8150E47 end Route117_EventScript_150E6E:: @ 8150E6E - trainerbattle 5, OPPONENT_MARIA_1, 0, Route117_Text_1BD9F1, Route117_Text_1BDA41 + trainerbattle 5, TRAINER_MARIA_1, 0, Route117_Text_1BD9F1, Route117_Text_1BDA41 msgbox Route117_Text_1BDA6B, 6 end Route117_EventScript_150E85:: @ 8150E85 - trainerbattle 0, OPPONENT_DEREK, 0, Route117_Text_1BDAA7, Route117_Text_1BDAFC + trainerbattle 0, TRAINER_DEREK, 0, Route117_Text_1BDAA7, Route117_Text_1BDAFC msgbox Route117_Text_1BDB24, 6 end Route117_EventScript_150E9C:: @ 8150E9C - trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 + trainerbattle 4, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150EC7 @@ -103,12 +103,12 @@ Route117_EventScript_150E9C:: @ 8150E9C end Route117_EventScript_150EC7:: @ 8150EC7 - trainerbattle 7, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDDEF, Route117_Text_1BDE2F, Route117_Text_1BDEA7 + trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDDEF, Route117_Text_1BDE2F, Route117_Text_1BDEA7 msgbox Route117_Text_1BDE55, 6 end Route117_EventScript_150EE2:: @ 8150EE2 - trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B + trainerbattle 4, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150F0D @@ -116,6 +116,6 @@ Route117_EventScript_150EE2:: @ 8150EE2 end Route117_EventScript_150F0D:: @ 8150F0D - trainerbattle 7, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDEE3, Route117_Text_1BDF26, Route117_Text_1BDF90 + trainerbattle 7, TRAINER_ANNA_AND_MEG_1, 0, Route117_Text_1BDEE3, Route117_Text_1BDF26, Route117_Text_1BDF90 msgbox Route117_Text_1BDF37, 6 end diff --git a/data/maps/Route117_PokemonDayCare/events.inc b/data/maps/Route117_PokemonDayCare/events.inc index 3f2c3be51..cbdf9475b 100644 --- a/data/maps/Route117_PokemonDayCare/events.inc +++ b/data/maps/Route117_PokemonDayCare/events.inc @@ -1,5 +1,5 @@ Route117_PokemonDayCare_EventObjects:: @ 838B9F8 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 2, 2, 3, 8, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_1B2327, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 2, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route117_PokemonDayCare_EventScript_1B2327, 0 Route117_PokemonDayCare_MapWarps:: @ 838BA10 warp_def 2, 8, 0, 0, MAP_ROUTE117 diff --git a/data/maps/Route117_PokemonDayCare/header.inc b/data/maps/Route117_PokemonDayCare/header.inc index 0a4f59499..ac75acc8a 100644 --- a/data/maps/Route117_PokemonDayCare/header.inc +++ b/data/maps/Route117_PokemonDayCare/header.inc @@ -5,10 +5,10 @@ Route117_PokemonDayCare:: @ 8306D38 .4byte 0x0 .2byte MUS_GOTOWN .2byte 124 - .byte 32 + .byte MAPSEC_ROUTE_117 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route118/events.inc b/data/maps/Route118/events.inc index c12e77bd9..96b52a7eb 100644 --- a/data/maps/Route118/events.inc +++ b/data/maps/Route118/events.inc @@ -1,34 +1,34 @@ Route118_EventObjects:: @ 8383684 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, 12, 0, 0, 0, 31, S_BerryTree, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, 12, 0, 0, 0, 32, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, 12, 0, 0, 0, 33, S_BerryTree, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 64, 10, 3, 8, 0, 0, 1, 3, Route118_EventScript_151139, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE462, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 - object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE482, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 - object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 8, 3, 2, 1, 1, 0, 0, Route118_EventScript_150F93, 0 - object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE522, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE542, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3 - object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, 8, 0, 0, 0, 0, Route118_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3 - object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, 9, 0, 0, 0, 0, Route118_EventScript_150F34, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 10, 3, 24, 0, 0, 1, 4, Route118_EventScript_15108F, 0 - object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, 8, 0, 0, 1, 0, Route118_EventScript_1510E4, 0 - object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 56, 7, 3, 16, 0, 0, 1, 3, Route118_EventScript_151150, 0 - object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, 1, 0, 0, 1, 2, Route118_EventScript_1510CD, 0 - object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 17, 11, 3, 15, 1, 1, 1, 3, Route118_EventScript_1510FB, 0 - object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE118 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, 1, 1, 1, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 31, S_BerryTree, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 32, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 37, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 33, S_BerryTree, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 64, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route118_EventScript_151139, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_1AE462, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 + object_event 6, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_1AE482, FLAG_HIDE_GABBY_AND_TY_ROUTE118_1 + object_event 7, EVENT_OBJ_GFX_GIRL_2, 0, 12, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route118_EventScript_150F93, 0 + object_event 8, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_1AE522, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_1AE542, FLAG_HIDE_GABBY_AND_TY_ROUTE118_2 + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 33, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3 + object_event 11, EVENT_OBJ_GFX_CAMERAMAN, 0, 34, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route118_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE118_3 + object_event 12, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 38, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 13, EVENT_OBJ_GFX_FISHERMAN, 0, 28, 8, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route118_EventScript_150F34, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_3, 0, 7, 10, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 4, Route118_EventScript_15108F, 0 + object_event 15, EVENT_OBJ_GFX_FISHERMAN, 0, 14, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route118_EventScript_1510E4, 0 + object_event 16, EVENT_OBJ_GFX_MAN_6, 0, 56, 7, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 0, 0, 1, 3, Route118_EventScript_151150, 0 + object_event 17, EVENT_OBJ_GFX_FISHERMAN, 0, 39, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 2, Route118_EventScript_1510CD, 0 + object_event 18, EVENT_OBJ_GFX_MAN_6, 0, 17, 11, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 1, 1, 1, 3, Route118_EventScript_1510FB, 0 + object_event 19, EVENT_OBJ_GFX_STEVEN, 0, 44, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE118 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 69, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route118_EventScript_1B15B2, FLAG_ITEM_ROUTE118_1 Route118_MapCoordEvents:: @ 8383864 - coord_event 43, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FAE - coord_event 44, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FCE - coord_event 45, 11, 3, 0, VAR_ROUTE118_STATE, 0, 0, Route118_EventScript_150FE4 + coord_event 43, 11, 3, VAR_ROUTE118_STATE, 0, Route118_EventScript_150FAE + coord_event 44, 11, 3, VAR_ROUTE118_STATE, 0, Route118_EventScript_150FCE + coord_event 45, 11, 3, VAR_ROUTE118_STATE, 0, Route118_EventScript_150FE4 Route118_MapBGEvents:: @ 8383894 bg_secret_base_event 47, 14, 0, SECRET_BASE_RED_CAVE1_1 - bg_event 13, 6, 0, 0, 0, Route118_EventScript_150F9C - bg_event 56, 8, 0, 0, 0, Route118_EventScript_150FA5 + bg_event 13, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_150F9C + bg_event 56, 8, 0, BG_EVENT_PLAYER_FACING_ANY, Route118_EventScript_150FA5 bg_secret_base_event 67, 6, 0, SECRET_BASE_RED_CAVE2_1 bg_secret_base_event 29, 5, 0, SECRET_BASE_YELLOW_CAVE1_2 bg_secret_base_event 47, 5, 0, SECRET_BASE_TREE1_3 diff --git a/data/maps/Route118/header.inc b/data/maps/Route118/header.inc index 930a9d860..8daad3bc8 100644 --- a/data/maps/Route118/header.inc +++ b/data/maps/Route118/header.inc @@ -5,10 +5,10 @@ Route118:: @ 83057E4 .4byte Route118_MapConnections .2byte MUS_ROUTE_118 .2byte 34 - .byte 33 + .byte MAPSEC_ROUTE_118 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index b938d0cc2..850d9138d 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -159,7 +159,7 @@ Route118_Movement_151086:: @ 8151086 end_movement Route118_EventScript_15108F:: @ 815108F - trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C + trainerbattle 0, TRAINER_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route118_EventScript_1510B6 @@ -167,22 +167,22 @@ Route118_EventScript_15108F:: @ 815108F end Route118_EventScript_1510B6:: @ 81510B6 - trainerbattle 5, OPPONENT_ROSE_1, 0, Route118_Text_1BE0AB, Route118_Text_1BE0D3 + trainerbattle 5, TRAINER_ROSE_1, 0, Route118_Text_1BE0AB, Route118_Text_1BE0D3 msgbox Route118_Text_1BE104, 6 end Route118_EventScript_1510CD:: @ 81510CD - trainerbattle 0, OPPONENT_BARNY, 0, Route118_Text_1BE24A, Route118_Text_1BE291 + trainerbattle 0, TRAINER_BARNY, 0, Route118_Text_1BE24A, Route118_Text_1BE291 msgbox Route118_Text_1BE2BE, 6 end Route118_EventScript_1510E4:: @ 81510E4 - trainerbattle 0, OPPONENT_WADE, 0, Route118_Text_1BE318, Route118_Text_1BE385 + trainerbattle 0, TRAINER_WADE, 0, Route118_Text_1BE318, Route118_Text_1BE385 msgbox Route118_Text_1BE39C, 6 end Route118_EventScript_1510FB:: @ 81510FB - trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 + trainerbattle 0, TRAINER_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route118_EventScript_151122 @@ -190,16 +190,16 @@ Route118_EventScript_1510FB:: @ 81510FB end Route118_EventScript_151122:: @ 8151122 - trainerbattle 5, OPPONENT_DALTON_1, 0, Route118_Text_1BE489, Route118_Text_1BE4CC + trainerbattle 5, TRAINER_DALTON_1, 0, Route118_Text_1BE489, Route118_Text_1BE4CC msgbox Route118_Text_1BE4D9, 6 end Route118_EventScript_151139:: @ 8151139 - trainerbattle 0, OPPONENT_PERRY, 0, Route118_Text_1BE148, Route118_Text_1BE188 + trainerbattle 0, TRAINER_PERRY, 0, Route118_Text_1BE148, Route118_Text_1BE188 msgbox Route118_Text_1BE19D, 6 end Route118_EventScript_151150:: @ 8151150 - trainerbattle 0, OPPONENT_CHESTER, 0, Route118_Text_1BE1D7, Route118_Text_1BE1F5 + trainerbattle 0, TRAINER_CHESTER, 0, Route118_Text_1BE1D7, Route118_Text_1BE1F5 msgbox Route118_Text_1BE20D, 6 end diff --git a/data/maps/Route119/events.inc b/data/maps/Route119/events.inc index 49677e8e5..0ced918ab 100644 --- a/data/maps/Route119/events.inc +++ b/data/maps/Route119/events.inc @@ -1,49 +1,49 @@ Route119_EventObjects:: @ 8383914 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, 12, 0, 0, 0, 34, S_BerryTree, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, 12, 0, 0, 0, 35, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, 12, 0, 0, 0, 36, S_BerryTree, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, 59, 0, 0, 1, 1, Route119_EventScript_151491, 0 - object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, 60, 0, 0, 1, 1, Route119_EventScript_151463, 0 - object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, 62, 0, 0, 1, 1, Route119_EventScript_15144C, 0 - object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, 18, 0, 0, 1, 3, Route119_EventScript_1514BF, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, 60, 0, 0, 1, 1, Route119_EventScript_151435, 0 - object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, 8, 0, 0, 1, 2, Route119_EventScript_1514FD, 0 - object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, 61, 0, 0, 1, 1, Route119_EventScript_15147A, 0 - object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, 61, 0, 0, 1, 1, Route119_EventScript_1514A8, 0 - object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 28, 16, 3, 57, 0, 0, 1, 2, Route119_EventScript_151569, 0 - object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 49, 3, 58, 0, 0, 1, 3, Route119_EventScript_151580, 0 - object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 10, 50, 4, 10, 0, 0, 1, 3, Route119_EventScript_15153B, 0 - object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 8, 62, 3, 8, 0, 0, 1, 3, Route119_EventScript_151552, 0 - object_event 16, EVENT_OBJ_GFX_VAR_0, 0, 25, 32, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119 - object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15BF, FLAG_ITEM_ROUTE119_1 - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15CC, FLAG_ITEM_ROUTE119_2 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15D9, FLAG_ITEM_ROUTE119_3 - object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15E6, FLAG_ITEM_ROUTE119_4 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B15F3, FLAG_ITEM_ROUTE119_5 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, 1, 0, 0, 0, 0, Route119_EventScript_1B1600, FLAG_ITEM_ROUTE119_6 - object_event 23, EVENT_OBJ_GFX_VAR_1, 0, 13, 33, 4, 10, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 24, EVENT_OBJ_GFX_VAR_1, 0, 13, 34, 4, 10, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 25, EVENT_OBJ_GFX_VAR_3, 0, 17, 33, 4, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE - object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, 8, 1, 1, 0, 0, Route119_EventScript_1515F3, 0 - object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, 12, 0, 0, 0, 83, S_BerryTree, 0 - object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, 12, 0, 0, 0, 84, S_BerryTree, 0 - object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, 12, 0, 0, 0, 85, S_BerryTree, 0 - object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, 12, 0, 0, 0, 86, S_BerryTree, 0 - object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, 5, 2, 1, 0, 0, Route119_EventScript_15141A, 0 - object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, 1, 1, 1, 0, 0, Route119_EventScript_1B160D, FLAG_ITEM_ROUTE119_7 - object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, 2, 1, 1, 0, 0, Route119_EventScript_1515FC, 0 - object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, 57, 1, 1, 1, 3, Route119_EventScript_151597, 0 - object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, 76, 1, 1, 0, 0, Route119_EventScript_1A057A, FLAG_HIDE_KECLEON_ROUTE119_1 - object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 13, 4, 76, 1, 1, 0, 0, Route119_EventScript_1A0587, FLAG_HIDE_KECLEON_ROUTE119_2 - object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, 10, 1, 1, 1, 0, Route119_EventScript_1515AE, 0 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 24, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 34, S_BerryTree, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 25, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 35, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 26, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 36, S_BerryTree, 0 + object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 12, 123, 3, MOVEMENT_TYPE_COPY_PLAYER_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_151491, 0 + object_event 5, EVENT_OBJ_GFX_MANIAC, 0, 26, 123, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_151463, 0 + object_event 6, EVENT_OBJ_GFX_MANIAC, 0, 5, 125, 3, MOVEMENT_TYPE_COPY_PLAYER_CLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_15144C, 0 + object_event 7, EVENT_OBJ_GFX_CAMPER, 0, 7, 74, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, Route119_EventScript_1514BF, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 116, 3, MOVEMENT_TYPE_COPY_PLAYER_OPPOSITE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_151435, 0 + object_event 9, EVENT_OBJ_GFX_PICNICKER, 0, 35, 83, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_EventScript_1514FD, 0 + object_event 10, EVENT_OBJ_GFX_BUG_CATCHER, 0, 34, 122, 3, MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_15147A, 0 + object_event 11, EVENT_OBJ_GFX_BUG_CATCHER, 0, 17, 128, 3, MOVEMENT_TYPE_COPY_PLAYER_COUNTERCLOCKWISE_IN_GRASS, 0, 0, 1, 1, Route119_EventScript_1514A8, 0 + object_event 12, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 28, 16, 3, MOVEMENT_TYPE_TREE_DISGUISE, 0, 0, 1, 2, Route119_EventScript_151569, 0 + object_event 13, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 49, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 0, 0, 1, 3, Route119_EventScript_151580, 0 + object_event 14, EVENT_OBJ_GFX_MAN_6, 0, 10, 50, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route119_EventScript_15153B, 0 + object_event 15, EVENT_OBJ_GFX_MAN_6, 0, 8, 62, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route119_EventScript_151552, 0 + object_event 16, EVENT_OBJ_GFX_VAR_0, 0, 25, 32, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119 + object_event 17, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 121, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_1B15BF, FLAG_ITEM_ROUTE119_1 + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 4, 96, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_1B15CC, FLAG_ITEM_ROUTE119_2 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 29, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_1B15D9, FLAG_ITEM_ROUTE119_3 + object_event 20, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 76, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_1B15E6, FLAG_ITEM_ROUTE119_4 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_1B15F3, FLAG_ITEM_ROUTE119_5 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 117, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route119_EventScript_1B1600, FLAG_ITEM_ROUTE119_6 + object_event 23, EVENT_OBJ_GFX_VAR_1, 0, 13, 33, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1515C5, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 24, EVENT_OBJ_GFX_VAR_1, 0, 13, 34, 4, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, Route119_EventScript_1515DC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 25, EVENT_OBJ_GFX_VAR_3, 0, 17, 33, 4, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_RIVAL_ROUTE119_ON_BIKE + object_event 26, EVENT_OBJ_GFX_BOY_3, 0, 31, 109, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route119_EventScript_1515F3, 0 + object_event 27, EVENT_OBJ_GFX_BERRY_TREE, 0, 8, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 83, S_BerryTree, 0 + object_event 28, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 23, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 84, S_BerryTree, 0 + object_event 29, EVENT_OBJ_GFX_BERRY_TREE, 0, 29, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 85, S_BerryTree, 0 + object_event 30, EVENT_OBJ_GFX_BERRY_TREE, 0, 30, 90, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 86, S_BerryTree, 0 + object_event 31, EVENT_OBJ_GFX_CYCLING_TRIATHLETE_M, 0, 19, 133, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 1, 0, 0, Route119_EventScript_15141A, 0 + object_event 32, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 56, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route119_EventScript_1B160D, FLAG_ITEM_ROUTE119_7 + object_event 33, EVENT_OBJ_GFX_BOY_2, 0, 35, 93, 4, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_EventScript_1515FC, 0 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 29, 6, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route119_EventScript_151597, 0 + object_event 35, EVENT_OBJ_GFX_KECLEON_1, 0, 31, 6, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_1A057A, FLAG_HIDE_KECLEON_ROUTE119_1 + object_event 36, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 13, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route119_EventScript_1A0587, FLAG_HIDE_KECLEON_ROUTE119_2 + object_event 37, EVENT_OBJ_GFX_FISHERMAN, 0, 13, 104, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route119_EventScript_1515AE, 0 Route119_MapWarps:: @ 8383C8C warp_def 6, 32, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_1F warp_def 33, 109, 0, 0, MAP_ROUTE119_HOUSE Route119_MapCoordEvents:: @ 8383C9C - coord_event 25, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511C5 - coord_event 26, 31, 0, 0, VAR_ROUTE119_STATE, 0, 0, Route119_EventScript_1511D0 + coord_event 25, 31, 0, VAR_ROUTE119_STATE, 0, Route119_EventScript_1511C5 + coord_event 26, 31, 0, VAR_ROUTE119_STATE, 0, Route119_EventScript_1511D0 coord_weather_event 28, 13, 0, COORD_EVENT_WEATHER_ROUTE119_CYCLE coord_weather_event 29, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE coord_weather_event 30, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE @@ -69,8 +69,8 @@ Route119_MapCoordEvents:: @ 8383C9C coord_weather_event 20, 137, 3, COORD_EVENT_WEATHER_SUNNY Route119_MapBGEvents:: @ 8383E2C - bg_event 9, 33, 0, 0, 0, Route119_EventScript_15142C - bg_event 27, 19, 0, 0, 0, Route119_EventScript_151423 + bg_event 9, 33, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_15142C + bg_event 27, 19, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_151423 bg_secret_base_event 5, 2, 0, SECRET_BASE_SHRUB1_1 bg_secret_base_event 4, 89, 0, SECRET_BASE_SHRUB1_2 bg_secret_base_event 5, 15, 0, SECRET_BASE_SHRUB2_1 @@ -88,7 +88,7 @@ Route119_MapBGEvents:: @ 8383E2C bg_secret_base_event 6, 2, 0, SECRET_BASE_SHRUB4_3 bg_hidden_item_event 26, 120, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_44 bg_hidden_item_event 20, 29, 3, ITEM_MAX_ETHER, FLAG_HIDDEN_ITEM_57 - bg_event 28, 9, 0, 0, 0, Route119_EventScript_151605 + bg_event 28, 9, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_EventScript_151605 Route119_MapEvents:: @ 8383F1C map_events Route119_EventObjects, Route119_MapWarps, Route119_MapCoordEvents, Route119_MapBGEvents diff --git a/data/maps/Route119/header.inc b/data/maps/Route119/header.inc index 98d0ea5f6..9a0a12f87 100644 --- a/data/maps/Route119/header.inc +++ b/data/maps/Route119/header.inc @@ -5,10 +5,10 @@ Route119:: @ 8305800 .4byte Route119_MapConnections .2byte MUS_GRANROAD .2byte 35 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index fe1ef4e45..9874d3098 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -95,17 +95,17 @@ Route119_EventScript_15125E:: @ 815125E end Route119_EventScript_15128D:: @ 815128D - trainerbattle 3, OPPONENT_MAY_6, 0, Route119_Text_171156 + trainerbattle 3, TRAINER_MAY_6, 0, Route119_Text_171156 goto Route119_EventScript_1512BD end Route119_EventScript_15129D:: @ 815129D - trainerbattle 3, OPPONENT_MAY_9, 0, Route119_Text_171156 + trainerbattle 3, TRAINER_MAY_9, 0, Route119_Text_171156 goto Route119_EventScript_1512BD end Route119_EventScript_1512AD:: @ 81512AD - trainerbattle 3, OPPONENT_MAY_3, 0, Route119_Text_171156 + trainerbattle 3, TRAINER_MAY_3, 0, Route119_Text_171156 goto Route119_EventScript_1512BD end @@ -125,17 +125,17 @@ Route119_EventScript_1512D8:: @ 81512D8 end Route119_EventScript_151307:: @ 8151307 - trainerbattle 3, OPPONENT_BRENDAN_6, 0, Route119_Text_1713E2 + trainerbattle 3, TRAINER_BRENDAN_6, 0, Route119_Text_1713E2 goto Route119_EventScript_151337 end Route119_EventScript_151317:: @ 8151317 - trainerbattle 3, OPPONENT_BRENDAN_9, 0, Route119_Text_1713E2 + trainerbattle 3, TRAINER_BRENDAN_9, 0, Route119_Text_1713E2 goto Route119_EventScript_151337 end Route119_EventScript_151327:: @ 8151327 - trainerbattle 3, OPPONENT_BRENDAN_3, 0, Route119_Text_1713E2 + trainerbattle 3, TRAINER_BRENDAN_3, 0, Route119_Text_1713E2 goto Route119_EventScript_151337 end @@ -264,37 +264,37 @@ Route119_EventScript_15142C:: @ 815142C end Route119_EventScript_151435:: @ 8151435 - trainerbattle 0, OPPONENT_BRENT, 0, Route119_Text_1BE521, Route119_Text_1BE54F + trainerbattle 0, TRAINER_BRENT, 0, Route119_Text_1BE521, Route119_Text_1BE54F msgbox Route119_Text_1BE561, 6 end Route119_EventScript_15144C:: @ 815144C - trainerbattle 0, OPPONENT_DONALD, 0, Route119_Text_1BE5A4, Route119_Text_1BE5DF + trainerbattle 0, TRAINER_DONALD, 0, Route119_Text_1BE5A4, Route119_Text_1BE5DF msgbox Route119_Text_1BE5F8, 6 end Route119_EventScript_151463:: @ 8151463 - trainerbattle 0, OPPONENT_TAYLOR, 0, Route119_Text_1BE632, Route119_Text_1BE67B + trainerbattle 0, TRAINER_TAYLOR, 0, Route119_Text_1BE632, Route119_Text_1BE67B msgbox Route119_Text_1BE695, 6 end Route119_EventScript_15147A:: @ 815147A - trainerbattle 0, OPPONENT_DOUG, 0, Route119_Text_1BE6EA, Route119_Text_1BE729 + trainerbattle 0, TRAINER_DOUG, 0, Route119_Text_1BE6EA, Route119_Text_1BE729 msgbox Route119_Text_1BE748, 6 end Route119_EventScript_151491:: @ 8151491 - trainerbattle 0, OPPONENT_GREG, 0, Route119_Text_1BE784, Route119_Text_1BE7D3 + trainerbattle 0, TRAINER_GREG, 0, Route119_Text_1BE784, Route119_Text_1BE7D3 msgbox Route119_Text_1BE7E9, 6 end Route119_EventScript_1514A8:: @ 81514A8 - trainerbattle 0, OPPONENT_KENT, 0, Route119_Text_1BE82F, Route119_Text_1BE88D + trainerbattle 0, TRAINER_KENT, 0, Route119_Text_1BE82F, Route119_Text_1BE88D msgbox Route119_Text_1BE89A, 6 end Route119_EventScript_1514BF:: @ 81514BF - trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E + trainerbattle 0, TRAINER_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route119_EventScript_1514E6 @@ -302,12 +302,12 @@ Route119_EventScript_1514BF:: @ 81514BF end Route119_EventScript_1514E6:: @ 81514E6 - trainerbattle 5, OPPONENT_JACKSON_1, 0, Route119_Text_1BE98D, Route119_Text_1BE9D0 + trainerbattle 5, TRAINER_JACKSON_1, 0, Route119_Text_1BE98D, Route119_Text_1BE9D0 msgbox Route119_Text_1BE9E8, 6 end Route119_EventScript_1514FD:: @ 81514FD - trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 + trainerbattle 0, TRAINER_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route119_EventScript_151524 @@ -315,37 +315,37 @@ Route119_EventScript_1514FD:: @ 81514FD end Route119_EventScript_151524:: @ 8151524 - trainerbattle 5, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEB22, Route119_Text_1BEB49 + trainerbattle 5, TRAINER_CATHERINE_1, 0, Route119_Text_1BEB22, Route119_Text_1BEB49 msgbox Route119_Text_1BEB68, 6 end Route119_EventScript_15153B:: @ 815153B - trainerbattle 0, OPPONENT_HUGH, 0, Route119_Text_1BEBC0, Route119_Text_1BEC1C + trainerbattle 0, TRAINER_HUGH, 0, Route119_Text_1BEBC0, Route119_Text_1BEC1C msgbox Route119_Text_1BEC2A, 6 end Route119_EventScript_151552:: @ 8151552 - trainerbattle 0, OPPONENT_PHIL, 0, Route119_Text_1BEC5E, Route119_Text_1BEC9A + trainerbattle 0, TRAINER_PHIL, 0, Route119_Text_1BEC5E, Route119_Text_1BEC9A msgbox Route119_Text_1BECB1, 6 end Route119_EventScript_151569:: @ 8151569 - trainerbattle 0, OPPONENT_YASU, 0, Route119_Text_1BECF1, Route119_Text_1BED4C + trainerbattle 0, TRAINER_YASU, 0, Route119_Text_1BECF1, Route119_Text_1BED4C msgbox Route119_Text_1BED5C, 6 end Route119_EventScript_151580:: @ 8151580 - trainerbattle 0, OPPONENT_TAKASHI, 0, Route119_Text_1BEDB6, Route119_Text_1BEDEC + trainerbattle 0, TRAINER_TAKASHI, 0, Route119_Text_1BEDB6, Route119_Text_1BEDEC msgbox Route119_Text_1BEE06, 6 end Route119_EventScript_151597:: @ 8151597 - trainerbattle 0, OPPONENT_HIDEO_2, 0, Route119_Text_1BEE2D, Route119_Text_1BEE4B + trainerbattle 0, TRAINER_HIDEO_2, 0, Route119_Text_1BEE2D, Route119_Text_1BEE4B msgbox Route119_Text_1BEE66, 6 end Route119_EventScript_1515AE:: @ 81515AE - trainerbattle 0, OPPONENT_EUGENE, 0, Route119_Text_1BEED0, Route119_Text_1BEF37 + trainerbattle 0, TRAINER_EUGENE, 0, Route119_Text_1BEED0, Route119_Text_1BEF37 msgbox Route119_Text_1BEF67, 6 end diff --git a/data/maps/Route119_House/events.inc b/data/maps/Route119_House/events.inc index 0b7bc6b70..f8b334714 100644 --- a/data/maps/Route119_House/events.inc +++ b/data/maps/Route119_House/events.inc @@ -1,11 +1,11 @@ Route119_House_EventObjects:: @ 8392F40 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 2, 3, 8, 0, 0, 0, 0, Route119_House_EventScript_163DDE, 0 - object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_163DE7, 0 - object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, 2, 3, 1, 0, 0, Route119_House_EventScript_163DE7, 0 - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, 2, 1, 1, 0, 0, Route119_House_EventScript_163DE7, 0 - object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, 2, 3, 2, 0, 0, Route119_House_EventScript_163DE7, 0 - object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, 2, 2, 2, 0, 0, Route119_House_EventScript_163DE7, 0 - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, 2, 1, 3, 0, 0, Route119_House_EventScript_163DE7, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_House_EventScript_163DDE, 0 + object_event 2, EVENT_OBJ_GFX_WINGULL, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_163DE7, 0 + object_event 3, EVENT_OBJ_GFX_WINGULL, 0, 0, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 1, 0, 0, Route119_House_EventScript_163DE7, 0 + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 2, 2, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_House_EventScript_163DE7, 0 + object_event 5, EVENT_OBJ_GFX_WINGULL, 0, 8, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 2, 0, 0, Route119_House_EventScript_163DE7, 0 + object_event 6, EVENT_OBJ_GFX_WINGULL, 0, 6, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, Route119_House_EventScript_163DE7, 0 + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 5, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, Route119_House_EventScript_163DE7, 0 Route119_House_MapWarps:: @ 8392FE8 warp_def 3, 8, 0, 1, MAP_ROUTE119 diff --git a/data/maps/Route119_House/header.inc b/data/maps/Route119_House/header.inc index 3a7cdcbbd..e4d1c2d0a 100644 --- a/data/maps/Route119_House/header.inc +++ b/data/maps/Route119_House/header.inc @@ -5,10 +5,10 @@ Route119_House:: @ 8307F28 .4byte 0x0 .2byte MUS_GOTOWN .2byte 59 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119_WeatherInstitute_1F/events.inc b/data/maps/Route119_WeatherInstitute_1F/events.inc index 0107020cd..91d0568dc 100644 --- a/data/maps/Route119_WeatherInstitute_1F/events.inc +++ b/data/maps/Route119_WeatherInstitute_1F/events.inc @@ -1,9 +1,9 @@ Route119_WeatherInstitute_1F_EventObjects:: @ 8392DC0 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 15, 3, 3, 9, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_163C94, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 2, EVENT_OBJ_GFX_VAR_2, 0, 10, 5, 3, 8, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_163CAB, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 3, 8, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 11, 3, 1, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F - object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 14, 11, 3, 2, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C4D, 0 + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 15, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, Route119_WeatherInstitute_1F_EventScript_163C94, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 2, EVENT_OBJ_GFX_VAR_2, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, Route119_WeatherInstitute_1F_EventScript_163CAB, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C7A, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 2, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C71, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F + object_event 5, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 14, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C4D, 0 Route119_WeatherInstitute_1F_MapWarps:: @ 8392E38 warp_def 9, 12, 0, 0, MAP_ROUTE119 @@ -11,10 +11,10 @@ Route119_WeatherInstitute_1F_MapWarps:: @ 8392E38 warp_def 17, 1, 0, 0, MAP_ROUTE119_WEATHER_INSTITUTE_2F Route119_WeatherInstitute_1F_MapBGEvents:: @ 8392E50 - bg_event 1, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 - bg_event 1, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 - bg_event 0, 2, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 - bg_event 0, 3, 0, 0, 0, Route119_WeatherInstitute_1F_EventScript_163C83 + bg_event 1, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_163C83 + bg_event 1, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_163C83 + bg_event 0, 2, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_163C83 + bg_event 0, 3, 0, BG_EVENT_PLAYER_FACING_ANY, Route119_WeatherInstitute_1F_EventScript_163C83 Route119_WeatherInstitute_1F_MapEvents:: @ 8392E80 map_events Route119_WeatherInstitute_1F_EventObjects, Route119_WeatherInstitute_1F_MapWarps, 0x0, Route119_WeatherInstitute_1F_MapBGEvents diff --git a/data/maps/Route119_WeatherInstitute_1F/header.inc b/data/maps/Route119_WeatherInstitute_1F/header.inc index b35d3cccf..85db67fad 100644 --- a/data/maps/Route119_WeatherInstitute_1F/header.inc +++ b/data/maps/Route119_WeatherInstitute_1F/header.inc @@ -5,10 +5,10 @@ Route119_WeatherInstitute_1F:: @ 8307EF0 .4byte 0x0 .2byte MUS_GOTOWN .2byte 272 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index e5ca6550b..547241940 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -45,11 +45,11 @@ Route119_WeatherInstitute_1F_EventScript_163C83:: @ 8163C83 end Route119_WeatherInstitute_1F_EventScript_163C94:: @ 8163C94 - trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_1, 0, Route119_WeatherInstitute_1F_Text_19EB8A, Route119_WeatherInstitute_1F_Text_19EBEE + trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_1, 0, Route119_WeatherInstitute_1F_Text_19EB8A, Route119_WeatherInstitute_1F_Text_19EBEE msgbox Route119_WeatherInstitute_1F_Text_19EC0E, 6 end Route119_WeatherInstitute_1F_EventScript_163CAB:: @ 8163CAB - trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_2, 0, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89 + trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_2, 0, Route119_WeatherInstitute_1F_Text_19EC6B, Route119_WeatherInstitute_1F_Text_19EC89 msgbox Route119_WeatherInstitute_1F_Text_19EC97, 6 end diff --git a/data/maps/Route119_WeatherInstitute_2F/events.inc b/data/maps/Route119_WeatherInstitute_2F/events.inc index 62cb0391f..e6356b47f 100644 --- a/data/maps/Route119_WeatherInstitute_2F/events.inc +++ b/data/maps/Route119_WeatherInstitute_2F/events.inc @@ -1,10 +1,10 @@ Route119_WeatherInstitute_2F_EventObjects:: @ 8392E94 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 15, 6, 3, 10, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_163CFC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 10, 8, 3, 13, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_163D13, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 3, EVENT_OBJ_GFX_VAR_2, 0, 4, 6, 3, 10, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, 1, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_163DCC, 0 - object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 1, 7, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route119_WeatherInstitute_2F_EventScript_163CFC, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 0, 0, 1, 2, Route119_WeatherInstitute_2F_EventScript_163D13, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 3, EVENT_OBJ_GFX_VAR_2, 0, 4, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, Route119_WeatherInstitute_2F_EventScript_163D2A, FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 2, 1, 0, 0, Route119_WeatherInstitute_2F_EventScript_163DCC, 0 + object_event 6, EVENT_OBJ_GFX_MAN_5, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F Route119_WeatherInstitute_2F_MapWarps:: @ 8392F24 warp_def 17, 1, 0, 2, MAP_ROUTE119_WEATHER_INSTITUTE_1F diff --git a/data/maps/Route119_WeatherInstitute_2F/header.inc b/data/maps/Route119_WeatherInstitute_2F/header.inc index b93deba00..ffda37907 100644 --- a/data/maps/Route119_WeatherInstitute_2F/header.inc +++ b/data/maps/Route119_WeatherInstitute_2F/header.inc @@ -5,10 +5,10 @@ Route119_WeatherInstitute_2F:: @ 8307F0C .4byte 0x0 .2byte MUS_GOTOWN .2byte 273 - .byte 34 + .byte MAPSEC_ROUTE_119 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 0a1a51562..8a8737dad 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -21,17 +21,17 @@ Route119_WeatherInstitute_2F_EventScript_163CF0:: @ 8163CF0 return Route119_WeatherInstitute_2F_EventScript_163CFC:: @ 8163CFC - trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_3, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B + trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_3, 0, Route119_WeatherInstitute_2F_Text_19EEAF, Route119_WeatherInstitute_2F_Text_19EF1B msgbox Route119_WeatherInstitute_2F_Text_19EF3E, 6 end Route119_WeatherInstitute_2F_EventScript_163D13:: @ 8163D13 - trainerbattle 0, OPPONENT_WEATHER_INSTITUTE_GRUNT_4, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD + trainerbattle 0, TRAINER_WEATHER_INSTITUTE_GRUNT_4, 0, Route119_WeatherInstitute_2F_Text_19EFA3, Route119_WeatherInstitute_2F_Text_19EFDD msgbox Route119_WeatherInstitute_2F_Text_19EFE9, 6 end Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A - trainerbattle 2, OPPONENT_WEATHER_INSTITUTE_GRUNT_5, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45 + trainerbattle 2, TRAINER_WEATHER_INSTITUTE_GRUNT_5, 0, Route119_WeatherInstitute_2F_Text_19F042, Route119_WeatherInstitute_2F_Text_19F0F4, Route119_WeatherInstitute_2F_EventScript_163D45 msgbox Route119_WeatherInstitute_2F_Text_19F11B, 6 end diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc index 1c0444b22..e4372712e 100644 --- a/data/maps/Route120/events.inc +++ b/data/maps/Route120/events.inc @@ -1,45 +1,45 @@ Route120_EventObjects:: @ 8383F30 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, 12, 0, 0, 0, 46, S_BerryTree, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, 12, 0, 0, 0, 45, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, 12, 0, 0, 0, 44, S_BerryTree, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, 12, 0, 0, 0, 43, S_BerryTree, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, 12, 0, 0, 0, 37, S_BerryTree, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, 12, 0, 0, 0, 38, S_BerryTree, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, 12, 0, 0, 0, 39, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, 12, 0, 0, 0, 40, S_BerryTree, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, 12, 0, 0, 0, 41, S_BerryTree, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, 12, 0, 0, 0, 42, S_BerryTree, 0 - object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 22, 3, 14, 0, 0, 1, 3, Route120_EventScript_1519B3, 0 - object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 14, 3, 10, 0, 0, 1, 3, Route120_EventScript_1519CA, 0 - object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, 9, 0, 0, 1, 7, Route120_EventScript_151A08, 0 - object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, 9, 0, 0, 1, 2, Route120_EventScript_151A1F, 0 - object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, 15, 0, 0, 1, 3, Route120_EventScript_151A36, 0 - object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, 1, 0, 0, 0, 0, Route120_EventScript_1B161A, FLAG_ITEM_ROUTE120_1 - object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE4C2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1 - object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE4A2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1 - object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 - object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, 8, 0, 0, 0, 0, Route120_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 - object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, 1, 0, 0, 0, 0, Route120_EventScript_1B1627, FLAG_ITEM_ROUTE120_2 - object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, 5, 1, 0, 0, 0, Route120_EventScript_151739, 0 - object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 28, 35, 3, 15, 0, 0, 1, 4, Route120_EventScript_151A74, 0 - object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, 21, 0, 0, 1, 4, Route120_EventScript_151A8B, 0 - object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 6, 3, 23, 0, 0, 1, 4, Route120_EventScript_151AA2, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 34, 3, 17, 0, 0, 1, 3, Route120_EventScript_151AB9, 0 - object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, 1, 1, 1, 0, 0, Route120_EventScript_1B1641, FLAG_ITEM_ROUTE120_4 - object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, 1, 1, 1, 0, 0, Route120_EventScript_1B1634, FLAG_ITEM_ROUTE120_3 - object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, 76, 1, 1, 0, 0, Route120_EventScript_151998, FLAG_HIDE_KECLEON_ROUTE120_1 - object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, 8, 1, 1, 0, 0, Route120_EventScript_151853, FLAG_HIDE_STEVEN_ROUTE120 - object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_14 - object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, 58, 1, 1, 1, 3, Route120_EventScript_151AD0, 0 - object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 28, 3, 57, 1, 1, 1, 3, Route120_EventScript_151AE7, 0 - object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_KECLEON_ROUTE120_2 - object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0539, FLAG_HIDE_KECLEON_ROUTE120_3 - object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0546, FLAG_HIDE_KECLEON_ROUTE120_4 - object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0553, FLAG_HIDE_KECLEON_ROUTE120_5 - object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A056D, FLAG_HIDE_KECLEON_ROUTE120_7 - object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, 76, 1, 1, 0, 0, Route120_EventScript_1A0560, FLAG_HIDE_KECLEON_ROUTE120_6 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 4, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 46, S_BerryTree, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 5, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 45, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 6, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 44, S_BerryTree, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 7, 79, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 43, S_BerryTree, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 34, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 37, S_BerryTree, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 35, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 38, S_BerryTree, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 36, 24, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 39, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 9, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 40, S_BerryTree, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 10, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 41, S_BerryTree, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 92, 5, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 42, S_BerryTree, 0 + object_event 11, EVENT_OBJ_GFX_MAN_6, 0, 5, 22, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 3, Route120_EventScript_1519B3, 0 + object_event 12, EVENT_OBJ_GFX_MAN_6, 0, 32, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, Route120_EventScript_1519CA, 0 + object_event 13, EVENT_OBJ_GFX_CAMPER, 0, 27, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 7, Route120_EventScript_151A08, 0 + object_event 14, EVENT_OBJ_GFX_PICNICKER, 0, 36, 45, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, Route120_EventScript_151A1F, 0 + object_event 15, EVENT_OBJ_GFX_MANIAC, 0, 19, 80, 5, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 3, Route120_EventScript_151A36, 0 + object_event 16, EVENT_OBJ_GFX_ITEM_BALL, 0, 20, 55, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_1B161A, FLAG_ITEM_ROUTE120_1 + object_event 17, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_1AE4C2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1 + object_event 18, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_1AE4A2, FLAG_HIDE_GABBY_AND_TY_ROUTE120_1 + object_event 19, EVENT_OBJ_GFX_REPORTER_F, 0, 36, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_1AE562, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 + object_event 20, EVENT_OBJ_GFX_CAMERAMAN, 0, 37, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route120_EventScript_1AE582, FLAG_HIDE_GABBY_AND_TY_ROUTE120_2 + object_event 21, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 35, 32, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 89, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route120_EventScript_1B1627, FLAG_ITEM_ROUTE120_2 + object_event 23, EVENT_OBJ_GFX_BEAUTY, 0, 14, 92, 5, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, Route120_EventScript_151739, 0 + object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 28, 35, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 4, Route120_EventScript_151A74, 0 + object_event 25, EVENT_OBJ_GFX_HIKER, 0, 9, 60, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route120_EventScript_151A8B, 0 + object_event 26, EVENT_OBJ_GFX_WOMAN_7, 0, 16, 6, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 4, Route120_EventScript_151AA2, 0 + object_event 27, EVENT_OBJ_GFX_WOMAN_7, 0, 18, 34, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route120_EventScript_151AB9, 0 + object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_1B1641, FLAG_ITEM_ROUTE120_4 + object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_1B1634, FLAG_ITEM_ROUTE120_3 + object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_151998, FLAG_HIDE_KECLEON_ROUTE120_1 + object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_151853, FLAG_HIDE_STEVEN_ROUTE120 + object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_14 + object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 34, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 10, 72, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 1, 1, 1, 3, Route120_EventScript_151AD0, 0 + object_event 35, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 19, 28, 3, MOVEMENT_TYPE_TREE_DISGUISE, 1, 1, 1, 3, Route120_EventScript_151AE7, 0 + object_event 36, EVENT_OBJ_GFX_KECLEON_2, 0, 12, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_KECLEON_ROUTE120_2 + object_event 37, EVENT_OBJ_GFX_KECLEON_1, 0, 20, 11, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1A0539, FLAG_HIDE_KECLEON_ROUTE120_3 + object_event 38, EVENT_OBJ_GFX_KECLEON_1, 0, 27, 2, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1A0546, FLAG_HIDE_KECLEON_ROUTE120_4 + object_event 39, EVENT_OBJ_GFX_KECLEON_1, 0, 4, 77, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1A0553, FLAG_HIDE_KECLEON_ROUTE120_5 + object_event 40, EVENT_OBJ_GFX_KECLEON_1, 0, 7, 51, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1A056D, FLAG_HIDE_KECLEON_ROUTE120_7 + object_event 41, EVENT_OBJ_GFX_KECLEON_1, 0, 19, 48, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1A0560, FLAG_HIDE_KECLEON_ROUTE120_6 Route120_MapWarps:: @ 8384308 warp_def 7, 55, 0, 0, MAP_ANCIENT_TOMB @@ -67,8 +67,8 @@ Route120_MapCoordEvents:: @ 8384318 coord_weather_event 13, 75, 3, COORD_EVENT_WEATHER_CLOUDS Route120_MapBGEvents:: @ 8384448 - bg_event 27, 3, 3, 0, 0, Route120_EventScript_1519A1 - bg_event 38, 88, 3, 0, 0, Route120_EventScript_1519AA + bg_event 27, 3, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1519A1 + bg_event 38, 88, 3, BG_EVENT_PLAYER_FACING_ANY, Route120_EventScript_1519AA bg_secret_base_event 28, 62, 0, SECRET_BASE_BLUE_CAVE3_1 bg_secret_base_event 30, 62, 0, SECRET_BASE_BLUE_CAVE4_1 bg_secret_base_event 26, 10, 0, SECRET_BASE_SHRUB3_2 diff --git a/data/maps/Route120/header.inc b/data/maps/Route120/header.inc index 10f7725b7..921c3fde4 100644 --- a/data/maps/Route120/header.inc +++ b/data/maps/Route120/header.inc @@ -5,10 +5,10 @@ Route120:: @ 830581C .4byte Route120_MapConnections .2byte MUS_DOORO_X3 .2byte 36 - .byte 35 + .byte MAPSEC_ROUTE_120 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index 6f561391f..f3081fc8c 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -280,12 +280,12 @@ Route120_EventScript_1519AA:: @ 81519AA end Route120_EventScript_1519B3:: @ 81519B3 - trainerbattle 0, OPPONENT_COLIN, 0, Route120_Text_1BEFC8, Route120_Text_1BF000 + trainerbattle 0, TRAINER_COLIN, 0, Route120_Text_1BEFC8, Route120_Text_1BF000 msgbox Route120_Text_1BF015, 6 end Route120_EventScript_1519CA:: @ 81519CA - trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 + trainerbattle 0, TRAINER_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route120_EventScript_1519F1 @@ -293,22 +293,22 @@ Route120_EventScript_1519CA:: @ 81519CA end Route120_EventScript_1519F1:: @ 81519F1 - trainerbattle 5, OPPONENT_ROBERT_1, 0, Route120_Text_1BF0FA, Route120_Text_1BF131 + trainerbattle 5, TRAINER_ROBERT_1, 0, Route120_Text_1BF0FA, Route120_Text_1BF131 msgbox Route120_Text_1BF154, 6 end Route120_EventScript_151A08:: @ 8151A08 - trainerbattle 0, OPPONENT_CARLOS, 0, Route120_Text_1BF193, Route120_Text_1BF1D4 + trainerbattle 0, TRAINER_CARLOS, 0, Route120_Text_1BF193, Route120_Text_1BF1D4 msgbox Route120_Text_1BF215, 6 end Route120_EventScript_151A1F:: @ 8151A1F - trainerbattle 0, OPPONENT_JENNA, 0, Route120_Text_1BF26E, Route120_Text_1BF2D2 + trainerbattle 0, TRAINER_JENNA, 0, Route120_Text_1BF26E, Route120_Text_1BF2D2 msgbox Route120_Text_1BF2EA, 6 end Route120_EventScript_151A36:: @ 8151A36 - trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B + trainerbattle 0, TRAINER_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route120_EventScript_151A5D @@ -316,36 +316,36 @@ Route120_EventScript_151A36:: @ 8151A36 end Route120_EventScript_151A5D:: @ 8151A5D - trainerbattle 5, OPPONENT_BRANDON_1, 0, Route120_Text_1BF3D0, Route120_Text_1BF416 + trainerbattle 5, TRAINER_BRANDON_1, 0, Route120_Text_1BF3D0, Route120_Text_1BF416 msgbox Route120_Text_1BF43E, 6 end Route120_EventScript_151A74:: @ 8151A74 - trainerbattle 0, OPPONENT_JENNIFER, 0, Route120_Text_1BF4A0, Route120_Text_1BF504 + trainerbattle 0, TRAINER_JENNIFER, 0, Route120_Text_1BF4A0, Route120_Text_1BF504 msgbox Route120_Text_1BF51F, 6 end Route120_EventScript_151A8B:: @ 8151A8B - trainerbattle 0, OPPONENT_CHIP, 0, Route120_Text_1BF560, Route120_Text_1BF5D6 + trainerbattle 0, TRAINER_CHIP, 0, Route120_Text_1BF560, Route120_Text_1BF5D6 msgbox Route120_Text_1BF5F4, 6 end Route120_EventScript_151AA2:: @ 8151AA2 - trainerbattle 0, OPPONENT_CLARISSA, 0, Route120_Text_1BF65B, Route120_Text_1BF6A4 + trainerbattle 0, TRAINER_CLARISSA, 0, Route120_Text_1BF65B, Route120_Text_1BF6A4 msgbox Route120_Text_1BF6D0, 6 end Route120_EventScript_151AB9:: @ 8151AB9 - trainerbattle 0, OPPONENT_ANGELICA, 0, Route120_Text_1BF728, Route120_Text_1BF78C + trainerbattle 0, TRAINER_ANGELICA, 0, Route120_Text_1BF728, Route120_Text_1BF78C msgbox Route120_Text_1BF7B2, 6 end Route120_EventScript_151AD0:: @ 8151AD0 - trainerbattle 0, OPPONENT_KEIGO, 0, Route120_Text_1BF80B, Route120_Text_1BF852 + trainerbattle 0, TRAINER_KEIGO, 0, Route120_Text_1BF80B, Route120_Text_1BF852 msgbox Route120_Text_1BF891, 6 end Route120_EventScript_151AE7:: @ 8151AE7 - trainerbattle 0, OPPONENT_TSUNAO, 0, Route120_Text_1BF8C5, Route120_Text_1BF920 + trainerbattle 0, TRAINER_TSUNAO, 0, Route120_Text_1BF8C5, Route120_Text_1BF920 msgbox Route120_Text_1BF946, 6 end diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index 7405af540..e4fbbb8ca 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -1,43 +1,43 @@ Route121_EventObjects:: @ 8384504 - object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 29, 14, 3, 10, 1, 1, 0, 0, Route121_EventScript_151B0A, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, 12, 0, 0, 0, 47, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, 12, 0, 0, 0, 48, S_BerryTree, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, 12, 0, 0, 0, 49, S_BerryTree, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, 12, 0, 0, 0, 50, S_BerryTree, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, 12, 0, 0, 0, 51, S_BerryTree, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, 12, 0, 0, 0, 52, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, 12, 0, 0, 0, 53, S_BerryTree, 0 - object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, 12, 0, 0, 0, 54, S_BerryTree, 0 - object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, 8, 0, 0, 1, 0, Route121_EventScript_151BDE, 0 - object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, 8, 0, 0, 1, 0, Route121_EventScript_151BF9, 0 - object_event 12, EVENT_OBJ_GFX_VAR_1, 0, 30, 8, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121 - object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 30, 7, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121 - object_event 14, EVENT_OBJ_GFX_VAR_1, 0, 31, 7, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121 - object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 5, 3, 9, 0, 0, 1, 4, Route121_EventScript_151B72, 0 - object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, 17, 0, 0, 1, 3, Route121_EventScript_151B89, 0 - object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 10, 3, 15, 0, 0, 1, 4, Route121_EventScript_151BC7, 0 - object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, 17, 0, 0, 1, 4, Route121_EventScript_151C14, 0 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, 1, 1, 1, 0, 0, Route121_EventScript_1B164E, FLAG_ITEM_ROUTE121_1 - object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, 1, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_13 + object_event 1, EVENT_OBJ_GFX_WOMAN_4, 0, 29, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, Route121_EventScript_151B0A, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 47, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 48, S_BerryTree, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 16, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 49, S_BerryTree, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 2, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 50, S_BerryTree, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 64, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 51, S_BerryTree, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 65, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 52, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_BERRY_TREE, 0, 66, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 53, S_BerryTree, 0 + object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 54, S_BerryTree, 0 + object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route121_EventScript_151BDE, 0 + object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route121_EventScript_151BF9, 0 + object_event 12, EVENT_OBJ_GFX_VAR_1, 0, 30, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121 + object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121 + object_event 14, EVENT_OBJ_GFX_VAR_1, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNTS_ROUTE121 + object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 17, EVENT_OBJ_GFX_WOMAN_2, 0, 63, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route121_EventScript_151B72, 0 + object_event 18, EVENT_OBJ_GFX_GENTLEMAN, 0, 55, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 3, Route121_EventScript_151B89, 0 + object_event 19, EVENT_OBJ_GFX_HEX_MANIAC, 0, 11, 10, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 1, 4, Route121_EventScript_151BC7, 0 + object_event 20, EVENT_OBJ_GFX_BEAUTY, 0, 22, 5, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 4, Route121_EventScript_151C14, 0 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 55, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route121_EventScript_1B164E, FLAG_ITEM_ROUTE121_1 + object_event 22, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 26, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_CuttableTree, FLAG_TEMP_13 Route121_MapWarps:: @ 8384714 warp_def 37, 5, 0, 2, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE Route121_MapCoordEvents:: @ 838471C - coord_event 25, 5, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 - coord_event 25, 6, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 - coord_event 25, 7, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 - coord_event 25, 8, 3, 0, VAR_ROUTE121_STATE, 0, 0, Route121_EventScript_151B25 + coord_event 25, 5, 3, VAR_ROUTE121_STATE, 0, Route121_EventScript_151B25 + coord_event 25, 6, 3, VAR_ROUTE121_STATE, 0, Route121_EventScript_151B25 + coord_event 25, 7, 3, VAR_ROUTE121_STATE, 0, Route121_EventScript_151B25 + coord_event 25, 8, 3, VAR_ROUTE121_STATE, 0, Route121_EventScript_151B25 Route121_MapBGEvents:: @ 838475C - bg_event 32, 14, 0, 0, 0, Route121_EventScript_151B13 + bg_event 32, 14, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_151B13 bg_secret_base_event 40, 11, 0, SECRET_BASE_RED_CAVE2_2 bg_secret_base_event 18, 13, 0, SECRET_BASE_RED_CAVE3_2 bg_secret_base_event 43, 7, 0, SECRET_BASE_TREE1_2 bg_secret_base_event 42, 7, 0, SECRET_BASE_TREE2_2 - bg_event 39, 6, 0, 0, 0, Route121_EventScript_151B1C + bg_event 39, 6, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_EventScript_151B1C bg_hidden_item_event 23, 10, 3, ITEM_HP_UP, FLAG_HIDDEN_ITEM_27 bg_hidden_item_event 58, 3, 3, ITEM_NUGGET, FLAG_HIDDEN_ITEM_28 bg_hidden_item_event 72, 5, 3, ITEM_FULL_HEAL, FLAG_HIDDEN_ITEM_49 diff --git a/data/maps/Route121/header.inc b/data/maps/Route121/header.inc index 918fe47f6..e75d8d21f 100644 --- a/data/maps/Route121/header.inc +++ b/data/maps/Route121/header.inc @@ -5,10 +5,10 @@ Route121:: @ 8305838 .4byte Route121_MapConnections .2byte MUS_DOORO_X3 .2byte 37 - .byte 36 + .byte MAPSEC_ROUTE_121 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route121/scripts.inc b/data/maps/Route121/scripts.inc index 5fe7f6330..d154d3f6b 100644 --- a/data/maps/Route121/scripts.inc +++ b/data/maps/Route121/scripts.inc @@ -67,12 +67,12 @@ Route121_Movement_151B69:: @ 8151B69 end_movement Route121_EventScript_151B72:: @ 8151B72 - trainerbattle 0, OPPONENT_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1 + trainerbattle 0, TRAINER_VANESSA, 0, Route121_Text_1BF96E, Route121_Text_1BF9A1 msgbox Route121_Text_1BF9BA, 6 end Route121_EventScript_151B89:: @ 8151B89 - trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C + trainerbattle 0, TRAINER_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route121_EventScript_151BB0 @@ -80,27 +80,27 @@ Route121_EventScript_151B89:: @ 8151B89 end Route121_EventScript_151BB0:: @ 8151BB0 - trainerbattle 5, OPPONENT_WALTER_1, 0, Route121_Text_1BFADA, Route121_Text_1BFB4B + trainerbattle 5, TRAINER_WALTER_1, 0, Route121_Text_1BFADA, Route121_Text_1BFB4B msgbox Route121_Text_1BFB5C, 6 end Route121_EventScript_151BC7:: @ 8151BC7 - trainerbattle 0, OPPONENT_TAMMY, 0, Route121_Text_1BFBB4, Route121_Text_1BFBEE + trainerbattle 0, TRAINER_TAMMY, 0, Route121_Text_1BFBB4, Route121_Text_1BFBEE msgbox Route121_Text_1BFBFD, 6 end Route121_EventScript_151BDE:: @ 8151BDE - trainerbattle 4, OPPONENT_KATE_AND_JOY, 0, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08 + trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_1BFC36, Route121_Text_1BFC7A, Route121_Text_1BFD08 msgbox Route121_Text_1BFCB3, 6 end Route121_EventScript_151BF9:: @ 8151BF9 - trainerbattle 4, OPPONENT_KATE_AND_JOY, 0, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D + trainerbattle 4, TRAINER_KATE_AND_JOY, 0, Route121_Text_1BFD60, Route121_Text_1BFDA3, Route121_Text_1BFE0D msgbox Route121_Text_1BFDC1, 6 end Route121_EventScript_151C14:: @ 8151C14 - trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 + trainerbattle 0, TRAINER_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route121_EventScript_151C3B @@ -108,6 +108,6 @@ Route121_EventScript_151C14:: @ 8151C14 end Route121_EventScript_151C3B:: @ 8151C3B - trainerbattle 5, OPPONENT_JESSICA_1, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A + trainerbattle 5, TRAINER_JESSICA_1, 0, Route121_Text_1BFEDE, Route121_Text_1BFF0A msgbox Route121_Text_1BFF3A, 6 end diff --git a/data/maps/Route121_SafariZoneEntrance/events.inc b/data/maps/Route121_SafariZoneEntrance/events.inc index 6ed6613ec..8d1f350c0 100644 --- a/data/maps/Route121_SafariZoneEntrance/events.inc +++ b/data/maps/Route121_SafariZoneEntrance/events.inc @@ -1,7 +1,7 @@ Route121_SafariZoneEntrance_EventObjects:: @ 838BA34 - object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, 9, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C351, 0 - object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, 8, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C35A, 0 - object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, 8, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_PICNICKER, 0, 17, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C351, 0 + object_event 2, EVENT_OBJ_GFX_CAMPER, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C35A, 0 + object_event 3, EVENT_OBJ_GFX_CAMPER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, 0 Route121_SafariZoneEntrance_MapWarps:: @ 838BA7C warp_def 2, 5, 0, 0, MAP_SAFARI_ZONE_SOUTHEAST @@ -10,10 +10,10 @@ Route121_SafariZoneEntrance_MapWarps:: @ 838BA7C warp_def 15, 13, 0, 0, MAP_ROUTE121 Route121_SafariZoneEntrance_MapCoordEvents:: @ 838BA9C - coord_event 8, 4, 3, 0, VAR_TEMP_1, 0, 0, Route121_SafariZoneEntrance_EventScript_15C383 + coord_event 8, 4, 3, VAR_TEMP_1, 0, Route121_SafariZoneEntrance_EventScript_15C383 Route121_SafariZoneEntrance_MapBGEvents:: @ 838BAAC - bg_event 15, 1, 0, 0, 0, Route121_SafariZoneEntrance_EventScript_15C487 + bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route121_SafariZoneEntrance_EventScript_15C487 Route121_SafariZoneEntrance_MapEvents:: @ 838BAB8 map_events Route121_SafariZoneEntrance_EventObjects, Route121_SafariZoneEntrance_MapWarps, Route121_SafariZoneEntrance_MapCoordEvents, Route121_SafariZoneEntrance_MapBGEvents diff --git a/data/maps/Route121_SafariZoneEntrance/header.inc b/data/maps/Route121_SafariZoneEntrance/header.inc index 0d97afab4..5dc27e7fe 100644 --- a/data/maps/Route121_SafariZoneEntrance/header.inc +++ b/data/maps/Route121_SafariZoneEntrance/header.inc @@ -5,10 +5,10 @@ Route121_SafariZoneEntrance:: @ 8306D54 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 125 - .byte 36 + .byte MAPSEC_ROUTE_121 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route122/header.inc b/data/maps/Route122/header.inc index c6a2d4e4d..44cc87aa9 100644 --- a/data/maps/Route122/header.inc +++ b/data/maps/Route122/header.inc @@ -5,10 +5,10 @@ Route122:: @ 8305854 .4byte Route122_MapConnections .2byte MUS_DOORO_X4 .2byte 38 - .byte 37 + .byte MAPSEC_ROUTE_122 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route123/events.inc b/data/maps/Route123/events.inc index b25ec5c64..8485020e3 100644 --- a/data/maps/Route123/events.inc +++ b/data/maps/Route123/events.inc @@ -1,38 +1,38 @@ Route123_EventObjects:: @ 83847F8 - object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, 12, 0, 0, 0, 58, S_BerryTree, 0 - object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, 12, 0, 0, 0, 59, S_BerryTree, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, 12, 0, 0, 0, 60, S_BerryTree, 0 - object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, 12, 0, 0, 0, 61, S_BerryTree, 0 - object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, 12, 0, 0, 0, 62, S_BerryTree, 0 - object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, 12, 0, 0, 0, 63, S_BerryTree, 0 - object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, 12, 0, 0, 0, 64, S_BerryTree, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 12, 3, 24, 0, 0, 1, 1, Route123_EventScript_151CD1, 0 - object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 7, 3, 17, 0, 0, 1, 2, Route123_EventScript_151CE8, 0 - object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, 12, 0, 0, 0, 65, S_BerryTree, 0 - object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, 12, 0, 0, 0, 72, S_BerryTree, 0 - object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, 12, 0, 0, 0, 73, S_BerryTree, 0 - object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, 12, 0, 0, 0, 74, S_BerryTree, 0 - object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, 12, 0, 0, 0, 79, S_BerryTree, 0 - object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, 12, 0, 0, 0, 14, S_BerryTree, 0 - object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, 12, 0, 0, 0, 15, S_BerryTree, 0 - object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, 12, 0, 0, 0, 30, S_BerryTree, 0 - object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 - object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 - object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, 1, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 - object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, 1, 0, 0, 0, 0, Route123_EventScript_1B165B, FLAG_ITEM_ROUTE123_1 - object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 139, 18, 3, 1, 0, 0, 0, 0, Route123_EventScript_1B1668, FLAG_ITEM_ROUTE123_2 - object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, 15, 0, 0, 0, 0, Route123_EventScript_151C5D, 0 - object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, 12, 0, 0, 0, 87, S_BerryTree, 0 - object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, 12, 0, 0, 0, 88, S_BerryTree, 0 - object_event 26, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, 12, 0, 0, 0, 89, S_BerryTree, 0 - object_event 27, EVENT_OBJ_GFX_WOMAN_3, 0, 16, 9, 3, 23, 0, 0, 1, 2, Route123_EventScript_151CFF, 0 - object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, 8, 0, 0, 1, 0, Route123_EventScript_151DAD, 0 - object_event 29, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 13, 3, 8, 0, 0, 1, 0, Route123_EventScript_151D92, 0 - object_event 30, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, 9, 0, 0, 1, 6, Route123_EventScript_151D16, 0 - object_event 31, EVENT_OBJ_GFX_LASS, 0, 50, 16, 3, 8, 0, 0, 1, 1, Route123_EventScript_151D54, 0 - object_event 32, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 14, 3, 1, 0, 0, 1, 3, Route123_EventScript_151DC8, 0 - object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, 1, 1, 1, 0, 0, Route123_EventScript_1B1675, FLAG_ITEM_ROUTE123_3 - object_event 34, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, 1, 1, 1, 0, 0, Route123_EventScript_1B1682, FLAG_ITEM_ROUTE123_4 + object_event 1, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 58, S_BerryTree, 0 + object_event 2, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 59, S_BerryTree, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 60, S_BerryTree, 0 + object_event 4, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 61, S_BerryTree, 0 + object_event 5, EVENT_OBJ_GFX_BERRY_TREE, 0, 81, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 62, S_BerryTree, 0 + object_event 6, EVENT_OBJ_GFX_BERRY_TREE, 0, 82, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 63, S_BerryTree, 0 + object_event 7, EVENT_OBJ_GFX_BERRY_TREE, 0, 83, 1, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 64, S_BerryTree, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 70, 12, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 1, Route123_EventScript_151CD1, 0 + object_event 9, EVENT_OBJ_GFX_MAN_4, 0, 58, 7, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 0, 0, 1, 2, Route123_EventScript_151CE8, 0 + object_event 10, EVENT_OBJ_GFX_BERRY_TREE, 0, 14, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 65, S_BerryTree, 0 + object_event 11, EVENT_OBJ_GFX_BERRY_TREE, 0, 15, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 72, S_BerryTree, 0 + object_event 12, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 73, S_BerryTree, 0 + object_event 13, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 74, S_BerryTree, 0 + object_event 14, EVENT_OBJ_GFX_BERRY_TREE, 0, 17, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 79, S_BerryTree, 0 + object_event 15, EVENT_OBJ_GFX_BERRY_TREE, 0, 18, 3, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 14, S_BerryTree, 0 + object_event 16, EVENT_OBJ_GFX_BERRY_TREE, 0, 11, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 15, S_BerryTree, 0 + object_event 17, EVENT_OBJ_GFX_BERRY_TREE, 0, 12, 5, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 30, S_BerryTree, 0 + object_event 18, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 101, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_11 + object_event 19, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 129, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_12 + object_event 20, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 92, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_CuttableTree, FLAG_TEMP_13 + object_event 21, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_1B165B, FLAG_ITEM_ROUTE123_1 + object_event 22, EVENT_OBJ_GFX_ITEM_BALL, 0, 139, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route123_EventScript_1B1668, FLAG_ITEM_ROUTE123_2 + object_event 23, EVENT_OBJ_GFX_GIRL_3, 0, 108, 13, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, Route123_EventScript_151C5D, 0 + object_event 24, EVENT_OBJ_GFX_BERRY_TREE, 0, 109, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 87, S_BerryTree, 0 + object_event 25, EVENT_OBJ_GFX_BERRY_TREE, 0, 110, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 88, S_BerryTree, 0 + object_event 26, EVENT_OBJ_GFX_BERRY_TREE, 0, 111, 13, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 89, S_BerryTree, 0 + object_event 27, EVENT_OBJ_GFX_WOMAN_3, 0, 16, 9, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route123_EventScript_151CFF, 0 + object_event 28, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 38, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route123_EventScript_151DAD, 0 + object_event 29, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 37, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, Route123_EventScript_151D92, 0 + object_event 30, EVENT_OBJ_GFX_PSYCHIC_M, 0, 138, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 6, Route123_EventScript_151D16, 0 + object_event 31, EVENT_OBJ_GFX_LASS, 0, 50, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route123_EventScript_151D54, 0 + object_event 32, EVENT_OBJ_GFX_HEX_MANIAC, 0, 87, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route123_EventScript_151DC8, 0 + object_event 33, EVENT_OBJ_GFX_ITEM_BALL, 0, 27, 18, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_1B1675, FLAG_ITEM_ROUTE123_3 + object_event 34, EVENT_OBJ_GFX_ITEM_BALL, 0, 75, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route123_EventScript_1B1682, FLAG_ITEM_ROUTE123_4 Route123_MapWarps:: @ 8384B28 warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE @@ -62,12 +62,12 @@ Route123_MapCoordEvents:: @ 8384B30 coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE Route123_MapBGEvents:: @ 8384C90 - bg_event 117, 10, 0, 0, 0, Route123_EventScript_151CBF + bg_event 117, 10, 0, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_151CBF bg_secret_base_event 47, 3, 0, SECRET_BASE_BLUE_CAVE1_2 bg_secret_base_event 49, 3, 0, SECRET_BASE_BLUE_CAVE2_2 - bg_event 10, 12, 3, 0, 0, Route123_EventScript_151CB6 + bg_event 10, 12, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_151CB6 bg_hidden_item_event 75, 1, 3, ITEM_SUPER_REPEL, FLAG_HIDDEN_ITEM_7 - bg_event 20, 7, 3, 0, 0, Route123_EventScript_151CC8 + bg_event 20, 7, 3, BG_EVENT_PLAYER_FACING_ANY, Route123_EventScript_151CC8 bg_secret_base_event 57, 5, 0, SECRET_BASE_BLUE_CAVE1_3 bg_hidden_item_event 12, 1, 3, ITEM_REVIVE, FLAG_HIDDEN_ITEM_29 bg_hidden_item_event 91, 15, 3, ITEM_HYPER_POTION, FLAG_HIDDEN_ITEM_4A diff --git a/data/maps/Route123/header.inc b/data/maps/Route123/header.inc index 87c3ed8a6..49e6631a9 100644 --- a/data/maps/Route123/header.inc +++ b/data/maps/Route123/header.inc @@ -5,10 +5,10 @@ Route123:: @ 8305870 .4byte Route123_MapConnections .2byte MUS_DOORO_X4 .2byte 39 - .byte 38 + .byte MAPSEC_ROUTE_123 .byte 0 - .byte 2 - .byte 3 + .byte WEATHER_SUNNY + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index d954bec1a..4dda69997 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -45,22 +45,22 @@ Route123_EventScript_151CC8:: @ 8151CC8 end Route123_EventScript_151CD1:: @ 8151CD1 - trainerbattle 0, OPPONENT_WENDY, 0, Route123_Text_1BFF6A, Route123_Text_1BFFA2 + trainerbattle 0, TRAINER_WENDY, 0, Route123_Text_1BFF6A, Route123_Text_1BFFA2 msgbox Route123_Text_1BFFC1, 6 end Route123_EventScript_151CE8:: @ 8151CE8 - trainerbattle 0, OPPONENT_CLYDE, 0, Route123_Text_1BFFF0, Route123_Text_1C0057 + trainerbattle 0, TRAINER_CLYDE, 0, Route123_Text_1BFFF0, Route123_Text_1C0057 msgbox Route123_Text_1C0075, 6 end Route123_EventScript_151CFF:: @ 8151CFF - trainerbattle 0, OPPONENT_VIOLET, 0, Route123_Text_1C009E, Route123_Text_1C00D4 + trainerbattle 0, TRAINER_VIOLET, 0, Route123_Text_1C009E, Route123_Text_1C00D4 msgbox Route123_Text_1C0100, 6 end Route123_EventScript_151D16:: @ 8151D16 - trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 + trainerbattle 0, TRAINER_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route123_EventScript_151D3D @@ -68,12 +68,12 @@ Route123_EventScript_151D16:: @ 8151D16 end Route123_EventScript_151D3D:: @ 8151D3D - trainerbattle 5, OPPONENT_CAMERON_1, 0, Route123_Text_1C01F9, Route123_Text_1C0240 + trainerbattle 5, TRAINER_CAMERON_1, 0, Route123_Text_1C01F9, Route123_Text_1C0240 msgbox Route123_Text_1C024E, 6 end Route123_EventScript_151D54:: @ 8151D54 - trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 + trainerbattle 0, TRAINER_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route123_EventScript_151D7B @@ -81,21 +81,21 @@ Route123_EventScript_151D54:: @ 8151D54 end Route123_EventScript_151D7B:: @ 8151D7B - trainerbattle 5, OPPONENT_JACKI_1, 0, Route123_Text_1C0351, Route123_Text_1C0380 + trainerbattle 5, TRAINER_JACKI_1, 0, Route123_Text_1C0351, Route123_Text_1C0380 msgbox Route123_Text_1C038C, 6 end Route123_EventScript_151D92:: @ 8151D92 - trainerbattle 4, OPPONENT_MIU_AND_YUKI, 0, Route123_Text_1C03CB, Route123_Text_1C040E, Route123_Text_1C0462 + trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_1C03CB, Route123_Text_1C040E, Route123_Text_1C0462 msgbox Route123_Text_1C0423, 6 end Route123_EventScript_151DAD:: @ 8151DAD - trainerbattle 4, OPPONENT_MIU_AND_YUKI, 0, Route123_Text_1C049C, Route123_Text_1C04CD, Route123_Text_1C0519 + trainerbattle 4, TRAINER_MIU_AND_YUKI, 0, Route123_Text_1C049C, Route123_Text_1C04CD, Route123_Text_1C0519 msgbox Route123_Text_1C04E3, 6 end Route123_EventScript_151DC8:: @ 8151DC8 - trainerbattle 0, OPPONENT_KINDRA, 0, Route123_Text_1C0554, Route123_Text_1C059F + trainerbattle 0, TRAINER_KINDRA, 0, Route123_Text_1C0554, Route123_Text_1C059F msgbox Route123_Text_1C05BC, 6 end diff --git a/data/maps/Route123_BerryMastersHouse/events.inc b/data/maps/Route123_BerryMastersHouse/events.inc index ff950e5cb..75a0dcb3b 100644 --- a/data/maps/Route123_BerryMastersHouse/events.inc +++ b/data/maps/Route123_BerryMastersHouse/events.inc @@ -1,6 +1,6 @@ Route123_BerryMastersHouse_EventObjects:: @ 8392D6C - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_1639E9, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 4, 3, 8, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_163A64, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_1639E9, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, Route123_BerryMastersHouse_EventScript_163A64, 0 Route123_BerryMastersHouse_MapWarps:: @ 8392D9C warp_def 3, 7, 0, 0, MAP_ROUTE123 diff --git a/data/maps/Route123_BerryMastersHouse/header.inc b/data/maps/Route123_BerryMastersHouse/header.inc index 427ef4720..ec4a4aab1 100644 --- a/data/maps/Route123_BerryMastersHouse/header.inc +++ b/data/maps/Route123_BerryMastersHouse/header.inc @@ -5,10 +5,10 @@ Route123_BerryMastersHouse:: @ 8307ED4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 60 - .byte 38 + .byte MAPSEC_ROUTE_123 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route124/events.inc b/data/maps/Route124/events.inc index 694718fb6..4106bf390 100644 --- a/data/maps/Route124/events.inc +++ b/data/maps/Route124/events.inc @@ -1,20 +1,20 @@ Route124_EventObjects:: @ 8384D10 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 59, 1, 1, 5, 0, 1, 3, Route124_EventScript_151DF8, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 33, 25, 1, 52, 5, 3, 1, 3, Route124_EventScript_151E0F, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 14, 27, 1, 24, 0, 0, 1, 3, Route124_EventScript_151E26, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, 24, 6, 8, 1, 3, Route124_EventScript_151E64, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 60, 74, 1, 28, 7, 0, 1, 2, Route124_EventScript_151E7B, 0 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, 1, 1, 1, 0, 0, Route124_EventScript_1B168F, FLAG_ITEM_ROUTE124_2 - object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, 1, 1, 1, 0, 0, Route124_EventScript_1B169C, FLAG_ITEM_ROUTE124_3 - object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, 1, 1, 1, 0, 0, Route124_EventScript_1B16A9, FLAG_ITEM_ROUTE124_1 - object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, 8, 1, 1, 1, 0, Route124_EventScript_151E92, 0 - object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, 8, 1, 1, 1, 0, Route124_EventScript_151ED8, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 58, 59, 1, MOVEMENT_TYPE_LOOK_AROUND, 5, 0, 1, 3, Route124_EventScript_151DF8, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 33, 25, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 5, 3, 1, 3, Route124_EventScript_151E0F, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 14, 27, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route124_EventScript_151E26, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 49, 45, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 6, 8, 1, 3, Route124_EventScript_151E64, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_M, 0, 60, 74, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 7, 0, 1, 2, Route124_EventScript_151E7B, 0 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 28, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_1B168F, FLAG_ITEM_ROUTE124_2 + object_event 7, EVENT_OBJ_GFX_ITEM_BALL, 0, 31, 53, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_1B169C, FLAG_ITEM_ROUTE124_3 + object_event 8, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route124_EventScript_1B16A9, FLAG_ITEM_ROUTE124_1 + object_event 9, EVENT_OBJ_GFX_SWIMMER_F, 0, 18, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route124_EventScript_151E92, 0 + object_event 10, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 17, 44, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route124_EventScript_151ED8, 0 Route124_MapWarps:: @ 8384E00 warp_def 70, 48, 3, 0, MAP_ROUTE124_DIVING_TREASURE_HUNTERS_HOUSE Route124_MapBGEvents:: @ 8384E08 - bg_event 73, 48, 3, 0, 0, Route124_EventScript_151DEF + bg_event 73, 48, 3, BG_EVENT_PLAYER_FACING_ANY, Route124_EventScript_151DEF Route124_MapEvents:: @ 8384E14 map_events Route124_EventObjects, Route124_MapWarps, 0x0, Route124_MapBGEvents diff --git a/data/maps/Route124/header.inc b/data/maps/Route124/header.inc index c2c5cd41d..fccd2efee 100644 --- a/data/maps/Route124/header.inc +++ b/data/maps/Route124/header.inc @@ -5,10 +5,10 @@ Route124:: @ 830588C .4byte Route124_MapConnections .2byte MUS_DOORO_X3 .2byte 40 - .byte 39 + .byte MAPSEC_ROUTE_124 .byte 0 - .byte 2 - .byte 6 + .byte WEATHER_SUNNY + .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route124/scripts.inc b/data/maps/Route124/scripts.inc index 3f02fc6e3..cb42e1944 100644 --- a/data/maps/Route124/scripts.inc +++ b/data/maps/Route124/scripts.inc @@ -11,17 +11,17 @@ Route124_EventScript_151DEF:: @ 8151DEF end Route124_EventScript_151DF8:: @ 8151DF8 - trainerbattle 0, OPPONENT_SPENCER, 0, Route124_Text_1C0624, Route124_Text_1C0675 + trainerbattle 0, TRAINER_SPENCER, 0, Route124_Text_1C0624, Route124_Text_1C0675 msgbox Route124_Text_1C0693, 6 end Route124_EventScript_151E0F:: @ 8151E0F - trainerbattle 0, OPPONENT_ROLAND, 0, Route124_Text_1C06F7, Route124_Text_1C0741 + trainerbattle 0, TRAINER_ROLAND, 0, Route124_Text_1C06F7, Route124_Text_1C0741 msgbox Route124_Text_1C0750, 6 end Route124_EventScript_151E26:: @ 8151E26 - trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 + trainerbattle 0, TRAINER_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151E4D @@ -29,22 +29,22 @@ Route124_EventScript_151E26:: @ 8151E26 end Route124_EventScript_151E4D:: @ 8151E4D - trainerbattle 5, OPPONENT_JENNY_1, 0, Route124_Text_1C0888, Route124_Text_1C08C8 + trainerbattle 5, TRAINER_JENNY_1, 0, Route124_Text_1C0888, Route124_Text_1C08C8 msgbox Route124_Text_1C08EA, 6 end Route124_EventScript_151E64:: @ 8151E64 - trainerbattle 0, OPPONENT_GRACE, 0, Route124_Text_1C0936, Route124_Text_1C096B + trainerbattle 0, TRAINER_GRACE, 0, Route124_Text_1C0936, Route124_Text_1C096B msgbox Route124_Text_1C0994, 6 end Route124_EventScript_151E7B:: @ 8151E7B - trainerbattle 0, OPPONENT_CHAD, 0, Route124_Text_1C09CE, Route124_Text_1C0A2F + trainerbattle 0, TRAINER_CHAD, 0, Route124_Text_1C09CE, Route124_Text_1C0A2F msgbox Route124_Text_1C0A52, 6 end Route124_EventScript_151E92:: @ 8151E92 - trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 + trainerbattle 4, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151EBD @@ -52,12 +52,12 @@ Route124_EventScript_151E92:: @ 8151E92 end Route124_EventScript_151EBD:: @ 8151EBD - trainerbattle 7, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0D1F, Route124_Text_1C0DB5, Route124_Text_1C0E5C + trainerbattle 7, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0D1F, Route124_Text_1C0DB5, Route124_Text_1C0E5C msgbox Route124_Text_1C0E06, 6 end Route124_EventScript_151ED8:: @ 8151ED8 - trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 + trainerbattle 4, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151F03 @@ -65,6 +65,6 @@ Route124_EventScript_151ED8:: @ 8151ED8 end Route124_EventScript_151F03:: @ 8151F03 - trainerbattle 7, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90 + trainerbattle 7, TRAINER_RITA_AND_SAM_1, 0, Route124_Text_1C0EA2, Route124_Text_1C0EE5, Route124_Text_1C0F90 msgbox Route124_Text_1C0F19, 6 end diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc index e165c9da8..2fa178b70 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/events.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/events.inc @@ -1,12 +1,12 @@ Route124_DivingTreasureHuntersHouse_EventObjects:: @ 839300C - object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 4, 0, 9, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0 + object_event 1, EVENT_OBJ_GFX_MAN_6, 0, 5, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_163E04, 0 Route124_DivingTreasureHuntersHouse_MapWarps:: @ 8393024 warp_def 3, 8, 0, 0, MAP_ROUTE124 warp_def 4, 8, 0, 0, MAP_ROUTE124 Route124_DivingTreasureHuntersHouse_MapBGEvents:: @ 8393034 - bg_event 7, 1, 0, 0, 0, Route124_DivingTreasureHuntersHouse_EventScript_164335 + bg_event 7, 1, 0, BG_EVENT_PLAYER_FACING_ANY, Route124_DivingTreasureHuntersHouse_EventScript_164335 Route124_DivingTreasureHuntersHouse_MapEvents:: @ 8393040 map_events Route124_DivingTreasureHuntersHouse_EventObjects, Route124_DivingTreasureHuntersHouse_MapWarps, 0x0, Route124_DivingTreasureHuntersHouse_MapBGEvents diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc index 259e378de..34bd5e673 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/header.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/header.inc @@ -5,10 +5,10 @@ Route124_DivingTreasureHuntersHouse:: @ 8307F44 .4byte 0x0 .2byte MUS_MINAMO .2byte 302 - .byte 39 + .byte MAPSEC_ROUTE_124 .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route125/events.inc b/data/maps/Route125/events.inc index 8ad4ce22a..8e816c833 100644 --- a/data/maps/Route125/events.inc +++ b/data/maps/Route125/events.inc @@ -1,11 +1,11 @@ Route125_EventObjects:: @ 8384E28 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 46, 9, 1, 23, 0, 0, 1, 2, Route125_EventScript_151F2E, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 9, 32, 1, 10, 2, 5, 1, 2, Route125_EventScript_151F45, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 33, 1, 28, 6, 0, 1, 3, Route125_EventScript_151F5C, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 39, 20, 1, 52, 9, 9, 1, 3, Route125_EventScript_151F73, 0 - object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 23, 28, 3, 14, 0, 0, 1, 2, Route125_EventScript_151F8A, 0 - object_event 6, EVENT_OBJ_GFX_LASS, 0, 20, 21, 3, 8, 1, 1, 1, 0, Route125_EventScript_151FC8, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 21, 21, 3, 8, 1, 1, 1, 0, Route125_EventScript_151FE3, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 46, 9, 1, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 0, 0, 1, 2, Route125_EventScript_151F2E, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 9, 32, 1, MOVEMENT_TYPE_FACE_RIGHT, 2, 5, 1, 2, Route125_EventScript_151F45, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 31, 33, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 6, 0, 1, 3, Route125_EventScript_151F5C, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 39, 20, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 9, 9, 1, 3, Route125_EventScript_151F73, 0 + object_event 5, EVENT_OBJ_GFX_SAILOR, 0, 23, 28, 3, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route125_EventScript_151F8A, 0 + object_event 6, EVENT_OBJ_GFX_LASS, 0, 20, 21, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route125_EventScript_151FC8, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 21, 21, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route125_EventScript_151FE3, 0 Route125_MapWarps:: @ 8384ED0 warp_def 22, 19, 0, 0, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM diff --git a/data/maps/Route125/header.inc b/data/maps/Route125/header.inc index cb315cc66..b24645c3d 100644 --- a/data/maps/Route125/header.inc +++ b/data/maps/Route125/header.inc @@ -5,10 +5,10 @@ Route125:: @ 83058A8 .4byte Route125_MapConnections .2byte MUS_DOORO_X3 .2byte 41 - .byte 40 + .byte MAPSEC_ROUTE_125 .byte 0 - .byte 2 - .byte 6 + .byte WEATHER_SUNNY + .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route125/scripts.inc b/data/maps/Route125/scripts.inc index a1495ac83..4ff30f363 100644 --- a/data/maps/Route125/scripts.inc +++ b/data/maps/Route125/scripts.inc @@ -7,27 +7,27 @@ Route125_MapScript1_151F24:: @ 8151F24 end Route125_EventScript_151F2E:: @ 8151F2E - trainerbattle 0, OPPONENT_CODY, 0, Route125_Text_1C0FCF, Route125_Text_1C1002 + trainerbattle 0, TRAINER_CODY, 0, Route125_Text_1C0FCF, Route125_Text_1C1002 msgbox Route125_Text_1C1013, 6 end Route125_EventScript_151F45:: @ 8151F45 - trainerbattle 0, OPPONENT_STAN, 0, Route125_Text_1C104B, Route125_Text_1C1073 + trainerbattle 0, TRAINER_STAN, 0, Route125_Text_1C104B, Route125_Text_1C1073 msgbox Route125_Text_1C1083, 6 end Route125_EventScript_151F5C:: @ 8151F5C - trainerbattle 0, OPPONENT_TANYA, 0, Route125_Text_1C10C3, Route125_Text_1C10FB + trainerbattle 0, TRAINER_TANYA, 0, Route125_Text_1C10C3, Route125_Text_1C10FB msgbox Route125_Text_1C110C, 6 end Route125_EventScript_151F73:: @ 8151F73 - trainerbattle 0, OPPONENT_SHARON, 0, Route125_Text_1C1136, Route125_Text_1C1175 + trainerbattle 0, TRAINER_SHARON, 0, Route125_Text_1C1136, Route125_Text_1C1175 msgbox Route125_Text_1C117F, 6 end Route125_EventScript_151F8A:: @ 8151F8A - trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED + trainerbattle 0, TRAINER_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route125_EventScript_151FB1 @@ -35,16 +35,16 @@ Route125_EventScript_151F8A:: @ 8151F8A end Route125_EventScript_151FB1:: @ 8151FB1 - trainerbattle 5, OPPONENT_ERNEST_1, 0, Route125_Text_1C1282, Route125_Text_1C12C5 + trainerbattle 5, TRAINER_ERNEST_1, 0, Route125_Text_1C1282, Route125_Text_1C12C5 msgbox Route125_Text_1C12EE, 6 end Route125_EventScript_151FC8:: @ 8151FC8 - trainerbattle 4, OPPONENT_KIM_AND_IRIS, 0, Route125_Text_1C13A1, Route125_Text_1C13FF, Route125_Text_1C146E + trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_1C13A1, Route125_Text_1C13FF, Route125_Text_1C146E msgbox Route125_Text_1C141C, 6 end Route125_EventScript_151FE3:: @ 8151FE3 - trainerbattle 4, OPPONENT_KIM_AND_IRIS, 0, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F + trainerbattle 4, TRAINER_KIM_AND_IRIS, 0, Route125_Text_1C14AB, Route125_Text_1C14E7, Route125_Text_1C154F msgbox Route125_Text_1C1508, 6 end diff --git a/data/maps/Route126/events.inc b/data/maps/Route126/events.inc index f90152ea4..ddd532202 100644 --- a/data/maps/Route126/events.inc +++ b/data/maps/Route126/events.inc @@ -1,9 +1,9 @@ Route126_EventObjects:: @ 8384F1C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 55, 22, 1, 51, 10, 3, 1, 3, Route126_EventScript_15200E, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 33, 63, 1, 28, 9, 0, 1, 3, Route126_EventScript_152025, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 49, 1, 7, 0, 0, 1, 3, Route126_EventScript_15203C, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 44, 1, 24, 0, 0, 1, 3, Route126_EventScript_152053, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, 1, 1, 1, 0, 0, Route126_EventScript_1B16B6, FLAG_ITEM_ROUTE126_1 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 55, 22, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_UP_RIGHT_DOWN, 10, 3, 1, 3, Route126_EventScript_15200E, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 33, 63, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 9, 0, 1, 3, Route126_EventScript_152025, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 49, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 3, Route126_EventScript_15203C, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 64, 44, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 0, 0, 1, 3, Route126_EventScript_152053, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route126_EventScript_1B16B6, FLAG_ITEM_ROUTE126_1 Route126_MapEvents:: @ 8384F94 map_events Route126_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route126/header.inc b/data/maps/Route126/header.inc index 0539f9007..81af74622 100644 --- a/data/maps/Route126/header.inc +++ b/data/maps/Route126/header.inc @@ -5,10 +5,10 @@ Route126:: @ 83058C4 .4byte Route126_MapConnections .2byte MUS_DOORO_X3 .2byte 42 - .byte 41 + .byte MAPSEC_ROUTE_126 .byte 0 - .byte 2 - .byte 6 + .byte WEATHER_SUNNY + .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route126/scripts.inc b/data/maps/Route126/scripts.inc index 4a28abfb7..3eb68a1d1 100644 --- a/data/maps/Route126/scripts.inc +++ b/data/maps/Route126/scripts.inc @@ -7,21 +7,21 @@ Route126_MapScript1_152004:: @ 8152004 end Route126_EventScript_15200E:: @ 815200E - trainerbattle 0, OPPONENT_BARRY, 0, Route126_Text_1C1590, Route126_Text_1C15C3 + trainerbattle 0, TRAINER_BARRY, 0, Route126_Text_1C1590, Route126_Text_1C15C3 msgbox Route126_Text_1C15D8, 6 end Route126_EventScript_152025:: @ 8152025 - trainerbattle 0, OPPONENT_DEAN, 0, Route126_Text_1C1627, Route126_Text_1C1660 + trainerbattle 0, TRAINER_DEAN, 0, Route126_Text_1C1627, Route126_Text_1C1660 msgbox Route126_Text_1C166F, 6 end Route126_EventScript_15203C:: @ 815203C - trainerbattle 0, OPPONENT_NIKKI, 0, Route126_Text_1C16AB, Route126_Text_1C16C5 + trainerbattle 0, TRAINER_NIKKI, 0, Route126_Text_1C16AB, Route126_Text_1C16C5 msgbox Route126_Text_1C1702, 6 end Route126_EventScript_152053:: @ 8152053 - trainerbattle 0, OPPONENT_BRENDA, 0, Route126_Text_1C1741, Route126_Text_1C1766 + trainerbattle 0, TRAINER_BRENDA, 0, Route126_Text_1C1741, Route126_Text_1C1766 msgbox Route126_Text_1C1773, 6 end diff --git a/data/maps/Route127/events.inc b/data/maps/Route127/events.inc index 66078b122..946a390b9 100644 --- a/data/maps/Route127/events.inc +++ b/data/maps/Route127/events.inc @@ -1,13 +1,13 @@ Route127_EventObjects:: @ 8384FA8 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 68, 1, 14, 0, 0, 1, 2, Route127_EventScript_15207A, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 44, 1, 21, 0, 0, 1, 4, Route127_EventScript_152091, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 7, 3, 1, 0, 0, 0, 0, Route127_EventScript_1B16C3, FLAG_ITEM_ROUTE127_1 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, 1, 0, 0, 0, 0, Route127_EventScript_1B16D0, FLAG_ITEM_ROUTE127_2 - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 53, 13, 3, 7, 1, 1, 1, 0, Route127_EventScript_1520A8, 0 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 52, 25, 3, 8, 1, 1, 1, 0, Route127_EventScript_1520D6, 0 - object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, 10, 1, 1, 1, 0, Route127_EventScript_1520BF, 0 - object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 12, 18, 3, 24, 1, 1, 1, 2, Route127_EventScript_152104, 0 - object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, 1, 1, 1, 1, 3, Route127_EventScript_1520ED, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 18, 68, 1, MOVEMENT_TYPE_FACE_LEFT_AND_RIGHT, 0, 0, 1, 2, Route127_EventScript_15207A, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 44, 1, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 0, 0, 1, 4, Route127_EventScript_152091, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_1B16C3, FLAG_ITEM_ROUTE127_1 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 64, 39, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route127_EventScript_1B16D0, FLAG_ITEM_ROUTE127_2 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 53, 13, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route127_EventScript_1520A8, 0 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 52, 25, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route127_EventScript_1520D6, 0 + object_event 7, EVENT_OBJ_GFX_FISHERMAN, 0, 64, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 0, Route127_EventScript_1520BF, 0 + object_event 8, EVENT_OBJ_GFX_MAN_6, 0, 12, 18, 3, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, Route127_EventScript_152104, 0 + object_event 9, EVENT_OBJ_GFX_BLACK_BELT, 0, 63, 63, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 3, Route127_EventScript_1520ED, 0 Route127_MapBGEvents:: @ 8385080 bg_secret_base_event 59, 67, 0, SECRET_BASE_RED_CAVE4_1 diff --git a/data/maps/Route127/header.inc b/data/maps/Route127/header.inc index abd4154cc..ca05331d0 100644 --- a/data/maps/Route127/header.inc +++ b/data/maps/Route127/header.inc @@ -5,10 +5,10 @@ Route127:: @ 83058E0 .4byte Route127_MapConnections .2byte MUS_DOORO_X3 .2byte 43 - .byte 42 + .byte MAPSEC_ROUTE_127 .byte 0 - .byte 2 - .byte 6 + .byte WEATHER_SUNNY + .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route127/scripts.inc b/data/maps/Route127/scripts.inc index 7552f7c5d..51ff52501 100644 --- a/data/maps/Route127/scripts.inc +++ b/data/maps/Route127/scripts.inc @@ -7,36 +7,36 @@ Route127_MapScript1_152070:: @ 8152070 end Route127_EventScript_15207A:: @ 815207A - trainerbattle 0, OPPONENT_CALEB, 0, Route127_Text_1C17A8, Route127_Text_1C17DD + trainerbattle 0, TRAINER_CALEB, 0, Route127_Text_1C17A8, Route127_Text_1C17DD msgbox Route127_Text_1C17EC, 6 end Route127_EventScript_152091:: @ 8152091 - trainerbattle 0, OPPONENT_CONNOR, 0, Route127_Text_1C1828, Route127_Text_1C1860 + trainerbattle 0, TRAINER_CONNOR, 0, Route127_Text_1C1828, Route127_Text_1C1860 msgbox Route127_Text_1C1877, 6 end Route127_EventScript_1520A8:: @ 81520A8 - trainerbattle 0, OPPONENT_JONAH, 0, Route127_Text_1C18CC, Route127_Text_1C1930 + trainerbattle 0, TRAINER_JONAH, 0, Route127_Text_1C18CC, Route127_Text_1C1930 msgbox Route127_Text_1C195D, 6 end Route127_EventScript_1520BF:: @ 81520BF - trainerbattle 0, OPPONENT_HENRY, 0, Route127_Text_1C19A3, Route127_Text_1C19D6 + trainerbattle 0, TRAINER_HENRY, 0, Route127_Text_1C19A3, Route127_Text_1C19D6 msgbox Route127_Text_1C19E7, 6 end Route127_EventScript_1520D6:: @ 81520D6 - trainerbattle 0, OPPONENT_ROGER, 0, Route127_Text_1C1A2E, Route127_Text_1C1A73 + trainerbattle 0, TRAINER_ROGER, 0, Route127_Text_1C1A2E, Route127_Text_1C1A73 msgbox Route127_Text_1C1AA0, 6 end Route127_EventScript_1520ED:: @ 81520ED - trainerbattle 0, OPPONENT_KOJI, 0, Route127_Text_1C1AE2, Route127_Text_1C1B2A + trainerbattle 0, TRAINER_KOJI, 0, Route127_Text_1C1AE2, Route127_Text_1C1B2A msgbox Route127_Text_1C1B39, 6 end Route127_EventScript_152104:: @ 8152104 - trainerbattle 0, OPPONENT_BYRON, 0, Route127_Text_1C1B92, Route127_Text_1C1BD9 + trainerbattle 0, TRAINER_BYRON, 0, Route127_Text_1C1B92, Route127_Text_1C1BD9 msgbox Route127_Text_1C1BEC, 6 end diff --git a/data/maps/Route128/events.inc b/data/maps/Route128/events.inc index 9ea71c52e..c9f86f02f 100644 --- a/data/maps/Route128/events.inc +++ b/data/maps/Route128/events.inc @@ -1,12 +1,12 @@ Route128_EventObjects:: @ 83850D0 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 77, 24, 1, 48, 5, 5, 1, 3, Route128_EventScript_1522A4, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 34, 1, 28, 5, 0, 1, 7, Route128_EventScript_1522E2, 0 - object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE128 - object_event 4, EVENT_OBJ_GFX_VAR_6, 0, 37, 22, 3, 9, 1, 1, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_ROUTE128 - object_event 5, EVENT_OBJ_GFX_VAR_7, 0, 38, 21, 3, 7, 1, 1, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_ROUTE128 - object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, 7, 1, 1, 1, 0, Route128_EventScript_15234E, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 24, 8, 3, 17, 1, 1, 1, 2, Route128_EventScript_152337, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 47, 9, 3, 10, 1, 1, 1, 3, Route128_EventScript_152320, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 77, 24, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_UP_LEFT_DOWN, 5, 5, 1, 3, Route128_EventScript_1522A4, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 34, 1, MOVEMENT_TYPE_WALK_RIGHT_AND_LEFT, 5, 0, 1, 7, Route128_EventScript_1522E2, 0 + object_event 3, EVENT_OBJ_GFX_STEVEN, 0, 40, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_STEVEN_ROUTE128 + object_event 4, EVENT_OBJ_GFX_VAR_6, 0, 37, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_ROUTE128 + object_event 5, EVENT_OBJ_GFX_VAR_7, 0, 38, 21, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_ROUTE128 + object_event 6, EVENT_OBJ_GFX_FISHERMAN, 0, 63, 28, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 0, Route128_EventScript_15234E, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 24, 8, 3, MOVEMENT_TYPE_FACE_DOWN_AND_LEFT, 1, 1, 1, 2, Route128_EventScript_152337, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_7, 0, 47, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 1, 3, Route128_EventScript_152320, 0 Route128_MapBGEvents:: @ 8385190 bg_hidden_item_event 49, 9, 3, ITEM_HEART_SCALE, FLAG_HIDDEN_ITEM_5C diff --git a/data/maps/Route128/header.inc b/data/maps/Route128/header.inc index df2b21a6e..135d86d79 100644 --- a/data/maps/Route128/header.inc +++ b/data/maps/Route128/header.inc @@ -5,10 +5,10 @@ Route128:: @ 83058FC .4byte Route128_MapConnections .2byte MUS_DOORO_X3 .2byte 44 - .byte 43 + .byte MAPSEC_ROUTE_128 .byte 0 - .byte 2 - .byte 6 + .byte WEATHER_SUNNY + .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route128/scripts.inc b/data/maps/Route128/scripts.inc index ec4fb954e..12d9bace5 100644 --- a/data/maps/Route128/scripts.inc +++ b/data/maps/Route128/scripts.inc @@ -180,7 +180,7 @@ Route128_Movement_1522A1:: @ 81522A1 end_movement Route128_EventScript_1522A4:: @ 81522A4 - trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 + trainerbattle 0, TRAINER_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route128_EventScript_1522CB @@ -188,12 +188,12 @@ Route128_EventScript_1522A4:: @ 81522A4 end Route128_EventScript_1522CB:: @ 81522CB - trainerbattle 5, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1D02, Route128_Text_1C1D45 + trainerbattle 5, TRAINER_ISAIAH_1, 0, Route128_Text_1C1D02, Route128_Text_1C1D45 msgbox Route128_Text_1C1D6B, 6 end Route128_EventScript_1522E2:: @ 81522E2 - trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 + trainerbattle 0, TRAINER_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route128_EventScript_152309 @@ -201,21 +201,21 @@ Route128_EventScript_1522E2:: @ 81522E2 end Route128_EventScript_152309:: @ 8152309 - trainerbattle 5, OPPONENT_KATELYN_1, 0, Route128_Text_1C1E90, Route128_Text_1C1EFA + trainerbattle 5, TRAINER_KATELYN_1, 0, Route128_Text_1C1E90, Route128_Text_1C1EFA msgbox Route128_Text_1C1F2E, 6 end Route128_EventScript_152320:: @ 8152320 - trainerbattle 0, OPPONENT_ALEXA, 0, Route128_Text_1C1F6D, Route128_Text_1C1FCC + trainerbattle 0, TRAINER_ALEXA, 0, Route128_Text_1C1F6D, Route128_Text_1C1FCC msgbox Route128_Text_1C1FE8, 6 end Route128_EventScript_152337:: @ 8152337 - trainerbattle 0, OPPONENT_RUBEN, 0, Route128_Text_1C202C, Route128_Text_1C2051 + trainerbattle 0, TRAINER_RUBEN, 0, Route128_Text_1C202C, Route128_Text_1C2051 msgbox Route128_Text_1C2060, 6 end Route128_EventScript_15234E:: @ 815234E - trainerbattle 0, OPPONENT_WAYNE, 0, Route128_Text_1C2090, Route128_Text_1C20FC + trainerbattle 0, TRAINER_WAYNE, 0, Route128_Text_1C2090, Route128_Text_1C20FC msgbox Route128_Text_1C210D, 6 end diff --git a/data/maps/Route129/events.inc b/data/maps/Route129/events.inc index e86dd6ce0..fc458f93b 100644 --- a/data/maps/Route129/events.inc +++ b/data/maps/Route129/events.inc @@ -1,8 +1,8 @@ Route129_EventObjects:: @ 83851C8 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 15, 23, 1, 50, 3, 4, 1, 3, Route129_EventScript_152366, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 9, 1, 52, 5, 2, 1, 2, Route129_EventScript_15237D, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 14, 1, 1, 1, 1, 1, 2, Route129_EventScript_1523AB, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, 24, 1, 1, 1, 2, Route129_EventScript_152394, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 15, 23, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 3, 4, 1, 3, Route129_EventScript_152366, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 35, 9, 1, MOVEMENT_TYPE_WALK_SEQUENCE_RIGHT_DOWN_LEFT_UP, 5, 2, 1, 2, Route129_EventScript_15237D, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 14, 1, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 2, Route129_EventScript_1523AB, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_M, 0, 28, 16, 1, MOVEMENT_TYPE_ROTATE_CLOCKWISE, 1, 1, 1, 2, Route129_EventScript_152394, 0 Route129_MapEvents:: @ 8385228 map_events Route129_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route129/header.inc b/data/maps/Route129/header.inc index a1285fe08..fe0ca1652 100644 --- a/data/maps/Route129/header.inc +++ b/data/maps/Route129/header.inc @@ -5,10 +5,10 @@ Route129:: @ 8305918 .4byte Route129_MapConnections .2byte MUS_GRANROAD .2byte 45 - .byte 44 + .byte MAPSEC_ROUTE_129 .byte 0 - .byte 2 - .byte 6 + .byte WEATHER_SUNNY + .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route129/scripts.inc b/data/maps/Route129/scripts.inc index ea43c5eab..360c67e02 100644 --- a/data/maps/Route129/scripts.inc +++ b/data/maps/Route129/scripts.inc @@ -2,21 +2,21 @@ Route129_MapScripts:: @ 8152365 .byte 0 Route129_EventScript_152366:: @ 8152366 - trainerbattle 0, OPPONENT_CHASE, 0, Route129_Text_1C2161, Route129_Text_1C2198 + trainerbattle 0, TRAINER_CHASE, 0, Route129_Text_1C2161, Route129_Text_1C2198 msgbox Route129_Text_1C21B4, 6 end Route129_EventScript_15237D:: @ 815237D - trainerbattle 0, OPPONENT_ALLISON, 0, Route129_Text_1C21ED, Route129_Text_1C222F + trainerbattle 0, TRAINER_ALLISON, 0, Route129_Text_1C21ED, Route129_Text_1C222F msgbox Route129_Text_1C2243, 6 end Route129_EventScript_152394:: @ 8152394 - trainerbattle 0, OPPONENT_REED, 0, Route129_Text_1C22C8, Route129_Text_1C22EC + trainerbattle 0, TRAINER_REED, 0, Route129_Text_1C22C8, Route129_Text_1C22EC msgbox Route129_Text_1C230F, 6 end Route129_EventScript_1523AB:: @ 81523AB - trainerbattle 0, OPPONENT_TISHA, 0, Route129_Text_1C2349, Route129_Text_1C2378 + trainerbattle 0, TRAINER_TISHA, 0, Route129_Text_1C2349, Route129_Text_1C2378 msgbox Route129_Text_1C23A3, 6 end diff --git a/data/maps/Route130/events.inc b/data/maps/Route130/events.inc index f6770fa34..958352568 100644 --- a/data/maps/Route130/events.inc +++ b/data/maps/Route130/events.inc @@ -1,7 +1,7 @@ Route130_EventObjects:: @ 838523C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 26, 1, 29, 3, 6, 1, 3, Route130_EventScript_152410, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 22, 1, 13, 1, 1, 1, 3, Route130_EventScript_152427, 0 - object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, 12, 0, 0, 0, 82, S_BerryTree, FLAG_TEMP_11 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 26, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, 3, 6, 1, 3, Route130_EventScript_152410, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 22, 1, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 1, 1, 1, 3, Route130_EventScript_152427, 0 + object_event 3, EVENT_OBJ_GFX_BERRY_TREE, 0, 52, 9, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 82, S_BerryTree, FLAG_TEMP_11 Route130_MapEvents:: @ 8385284 map_events Route130_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route130/header.inc b/data/maps/Route130/header.inc index f286a2b81..e3f7e75a3 100644 --- a/data/maps/Route130/header.inc +++ b/data/maps/Route130/header.inc @@ -5,10 +5,10 @@ Route130:: @ 8305934 .4byte Route130_MapConnections .2byte MUS_GRANROAD .2byte 264 - .byte 45 + .byte MAPSEC_ROUTE_130 .byte 0 - .byte 2 - .byte 6 + .byte WEATHER_SUNNY + .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index b0381969d..70eace112 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -30,11 +30,11 @@ Route130_EventScript_15240C:: @ 815240C end Route130_EventScript_152410:: @ 8152410 - trainerbattle 0, OPPONENT_RODNEY, 0, Route130_Text_1C2401, Route130_Text_1C245D + trainerbattle 0, TRAINER_RODNEY, 0, Route130_Text_1C2401, Route130_Text_1C245D msgbox Route130_Text_1C2479, 6 end Route130_EventScript_152427:: @ 8152427 - trainerbattle 0, OPPONENT_KATIE, 0, Route130_Text_1C24DC, Route130_Text_1C2525 + trainerbattle 0, TRAINER_KATIE, 0, Route130_Text_1C24DC, Route130_Text_1C2525 msgbox Route130_Text_1C256E, 6 end diff --git a/data/maps/Route131/events.inc b/data/maps/Route131/events.inc index 0d61e6f95..badc6d45c 100644 --- a/data/maps/Route131/events.inc +++ b/data/maps/Route131/events.inc @@ -1,10 +1,10 @@ Route131_EventObjects:: @ 8385298 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 17, 25, 1, 29, 5, 7, 1, 3, Route131_EventScript_152452, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 26, 1, 8, 0, 0, 1, 3, Route131_EventScript_152469, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 28, 1, 7, 0, 0, 1, 4, Route131_EventScript_152480, 0 - object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 23, 1, 47, 1, 4, 1, 3, Route131_EventScript_152497, 0 - object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, 8, 1, 1, 1, 0, Route131_EventScript_1524AE, 0 - object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, 8, 1, 1, 1, 0, Route131_EventScript_1524C9, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 17, 25, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_LEFT_DOWN, 5, 7, 1, 3, Route131_EventScript_152452, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_M, 0, 36, 26, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route131_EventScript_152469, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 33, 28, 1, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, Route131_EventScript_152480, 0 + object_event 4, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 23, 1, MOVEMENT_TYPE_WALK_SEQUENCE_LEFT_DOWN_RIGHT_UP, 1, 4, 1, 3, Route131_EventScript_152497, 0 + object_event 5, EVENT_OBJ_GFX_SWIMMER_F, 0, 9, 16, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route131_EventScript_1524AE, 0 + object_event 6, EVENT_OBJ_GFX_TUBER_M_SWIMMING, 0, 8, 16, 1, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 0, Route131_EventScript_1524C9, 0 Route131_MapWarps:: @ 8385328 warp_def 36, 6, 3, 0, MAP_SKY_PILLAR_ENTRANCE diff --git a/data/maps/Route131/header.inc b/data/maps/Route131/header.inc index 51b4d9e4f..92538ee6e 100644 --- a/data/maps/Route131/header.inc +++ b/data/maps/Route131/header.inc @@ -5,10 +5,10 @@ Route131:: @ 8305950 .4byte Route131_MapConnections .2byte MUS_GRANROAD .2byte 47 - .byte 46 + .byte MAPSEC_ROUTE_131 .byte 0 - .byte 2 - .byte 6 + .byte WEATHER_SUNNY + .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index ffd204bb9..6aa6868f3 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -11,31 +11,31 @@ Route131_EventScript_15244E:: @ 815244E return Route131_EventScript_152452:: @ 8152452 - trainerbattle 0, OPPONENT_RICHARD, 0, Route131_Text_1C25B3, Route131_Text_1C25F8 + trainerbattle 0, TRAINER_RICHARD, 0, Route131_Text_1C25B3, Route131_Text_1C25F8 msgbox Route131_Text_1C262A, 6 end Route131_EventScript_152469:: @ 8152469 - trainerbattle 0, OPPONENT_HERMAN, 0, Route131_Text_1C26B9, Route131_Text_1C271F + trainerbattle 0, TRAINER_HERMAN, 0, Route131_Text_1C26B9, Route131_Text_1C271F msgbox Route131_Text_1C2726, 6 end Route131_EventScript_152480:: @ 8152480 - trainerbattle 0, OPPONENT_SUSIE, 0, Route131_Text_1C2774, Route131_Text_1C27A4 + trainerbattle 0, TRAINER_SUSIE, 0, Route131_Text_1C2774, Route131_Text_1C27A4 msgbox Route131_Text_1C27CF, 6 end Route131_EventScript_152497:: @ 8152497 - trainerbattle 0, OPPONENT_KARA, 0, Route131_Text_1C284A, Route131_Text_1C2883 + trainerbattle 0, TRAINER_KARA, 0, Route131_Text_1C284A, Route131_Text_1C2883 msgbox Route131_Text_1C2898, 6 end Route131_EventScript_1524AE:: @ 81524AE - trainerbattle 4, OPPONENT_RELI_AND_IAN, 0, Route131_Text_1C28E2, Route131_Text_1C2918, Route131_Text_1C29B2 + trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_1C28E2, Route131_Text_1C2918, Route131_Text_1C29B2 msgbox Route131_Text_1C2950, 6 end Route131_EventScript_1524C9:: @ 81524C9 - trainerbattle 4, OPPONENT_RELI_AND_IAN, 0, Route131_Text_1C29F3, Route131_Text_1C2A20, Route131_Text_1C2ACA + trainerbattle 4, TRAINER_RELI_AND_IAN, 0, Route131_Text_1C29F3, Route131_Text_1C2A20, Route131_Text_1C2ACA msgbox Route131_Text_1C2A5D, 6 end diff --git a/data/maps/Route132/events.inc b/data/maps/Route132/events.inc index 167fbfd4b..1ee13237c 100644 --- a/data/maps/Route132/events.inc +++ b/data/maps/Route132/events.inc @@ -1,9 +1,9 @@ Route132_EventObjects:: @ 8385344 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 3, 1, 46, 3, 3, 1, 2, Route132_EventScript_1524E5, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 41, 16, 1, 49, 4, 4, 1, 2, Route132_EventScript_1524FC, 0 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, 1, 0, 0, 0, 0, Route132_EventScript_1B16DD, FLAG_ITEM_ROUTE132_1 - object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 46, 28, 3, 10, 0, 0, 1, 4, Route132_EventScript_15252A, 0 - object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 9, 16, 3, 8, 0, 0, 1, 1, Route132_EventScript_152513, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 7, 3, 1, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 3, 3, 1, 2, Route132_EventScript_1524E5, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 41, 16, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 4, 4, 1, 2, Route132_EventScript_1524FC, 0 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 10, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route132_EventScript_1B16DD, FLAG_ITEM_ROUTE132_1 + object_event 4, EVENT_OBJ_GFX_BLACK_BELT, 0, 46, 28, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route132_EventScript_15252A, 0 + object_event 5, EVENT_OBJ_GFX_FISHERMAN, 0, 9, 16, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route132_EventScript_152513, 0 Route132_MapEvents:: @ 83853BC map_events Route132_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route132/header.inc b/data/maps/Route132/header.inc index 4f2e2d47f..7f73ebbc7 100644 --- a/data/maps/Route132/header.inc +++ b/data/maps/Route132/header.inc @@ -5,10 +5,10 @@ Route132:: @ 830596C .4byte Route132_MapConnections .2byte MUS_GRANROAD .2byte 48 - .byte 47 + .byte MAPSEC_ROUTE_132 .byte 0 - .byte 2 - .byte 6 + .byte WEATHER_SUNNY + .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route132/scripts.inc b/data/maps/Route132/scripts.inc index 642330fd4..6d964aacf 100644 --- a/data/maps/Route132/scripts.inc +++ b/data/maps/Route132/scripts.inc @@ -2,21 +2,21 @@ Route132_MapScripts:: @ 81524E4 .byte 0 Route132_EventScript_1524E5:: @ 81524E5 - trainerbattle 0, OPPONENT_GILBERT, 0, Route132_Text_1C2AFB, Route132_Text_1C2B5B + trainerbattle 0, TRAINER_GILBERT, 0, Route132_Text_1C2AFB, Route132_Text_1C2B5B msgbox Route132_Text_1C2B71, 6 end Route132_EventScript_1524FC:: @ 81524FC - trainerbattle 0, OPPONENT_DANA, 0, Route132_Text_1C2BB5, Route132_Text_1C2BEA + trainerbattle 0, TRAINER_DANA, 0, Route132_Text_1C2BB5, Route132_Text_1C2BEA msgbox Route132_Text_1C2BFA, 6 end Route132_EventScript_152513:: @ 8152513 - trainerbattle 0, OPPONENT_RONALD, 0, Route132_Text_1C2C32, Route132_Text_1C2C60 + trainerbattle 0, TRAINER_RONALD, 0, Route132_Text_1C2C32, Route132_Text_1C2C60 msgbox Route132_Text_1C2C78, 6 end Route132_EventScript_15252A:: @ 815252A - trainerbattle 0, OPPONENT_KIYO, 0, Route132_Text_1C2CD9, Route132_Text_1C2D1F + trainerbattle 0, TRAINER_KIYO, 0, Route132_Text_1C2CD9, Route132_Text_1C2D1F msgbox Route132_Text_1C2D3E, 6 end diff --git a/data/maps/Route133/events.inc b/data/maps/Route133/events.inc index d71755575..22fd8807b 100644 --- a/data/maps/Route133/events.inc +++ b/data/maps/Route133/events.inc @@ -1,11 +1,11 @@ Route133_EventObjects:: @ 83853D0 - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 6, 4, 1, 1, 0, 0, 1, 3, Route133_EventScript_152542, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 24, 1, 8, 0, 0, 1, 3, Route133_EventScript_152570, 0 - object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 24, 1, 8, 0, 0, 1, 3, Route133_EventScript_152559, 0 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 15, 3, 1, 0, 0, 0, 0, Route133_EventScript_1B16EA, FLAG_ITEM_ROUTE133_1 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, 1, 0, 0, 0, 0, Route133_EventScript_1B16F7, FLAG_ITEM_ROUTE133_2 - object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 37, 16, 3, 13, 1, 1, 1, 1, Route133_EventScript_15259E, 0 - object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 7, 14, 3, 10, 0, 0, 1, 4, Route133_EventScript_152587, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 6, 4, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route133_EventScript_152542, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 68, 24, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route133_EventScript_152570, 0 + object_event 3, EVENT_OBJ_GFX_SWIMMER_F, 0, 69, 24, 1, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, Route133_EventScript_152559, 0 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 58, 15, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_1B16EA, FLAG_ITEM_ROUTE133_1 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route133_EventScript_1B16F7, FLAG_ITEM_ROUTE133_2 + object_event 6, EVENT_OBJ_GFX_MAN_6, 0, 37, 16, 3, MOVEMENT_TYPE_FACE_DOWN_AND_UP, 1, 1, 1, 1, Route133_EventScript_15259E, 0 + object_event 7, EVENT_OBJ_GFX_MAN_4, 0, 7, 14, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, Route133_EventScript_152587, 0 Route133_MapEvents:: @ 8385478 map_events Route133_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route133/header.inc b/data/maps/Route133/header.inc index 3cd851068..87aa3c84b 100644 --- a/data/maps/Route133/header.inc +++ b/data/maps/Route133/header.inc @@ -5,10 +5,10 @@ Route133:: @ 8305988 .4byte Route133_MapConnections .2byte MUS_GRANROAD .2byte 49 - .byte 48 + .byte MAPSEC_ROUTE_133 .byte 0 - .byte 2 - .byte 6 + .byte WEATHER_SUNNY + .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route133/scripts.inc b/data/maps/Route133/scripts.inc index 78bec4141..213be5562 100644 --- a/data/maps/Route133/scripts.inc +++ b/data/maps/Route133/scripts.inc @@ -2,26 +2,26 @@ Route133_MapScripts:: @ 8152541 .byte 0 Route133_EventScript_152542:: @ 8152542 - trainerbattle 0, OPPONENT_FRANKLIN, 0, Route133_Text_1C2DA5, Route133_Text_1C2DF4 + trainerbattle 0, TRAINER_FRANKLIN, 0, Route133_Text_1C2DA5, Route133_Text_1C2DF4 msgbox Route133_Text_1C2E09, 6 end Route133_EventScript_152559:: @ 8152559 - trainerbattle 0, OPPONENT_DEBRA, 0, Route133_Text_1C2E61, Route133_Text_1C2EBD + trainerbattle 0, TRAINER_DEBRA, 0, Route133_Text_1C2E61, Route133_Text_1C2EBD msgbox Route133_Text_1C2ECD, 6 end Route133_EventScript_152570:: @ 8152570 - trainerbattle 0, OPPONENT_LINDA, 0, Route133_Text_1C2EF7, Route133_Text_1C2F19 + trainerbattle 0, TRAINER_LINDA, 0, Route133_Text_1C2EF7, Route133_Text_1C2F19 msgbox Route133_Text_1C2F25, 6 end Route133_EventScript_152587:: @ 8152587 - trainerbattle 0, OPPONENT_WARREN, 0, Route133_Text_1C2F53, Route133_Text_1C2FA3 + trainerbattle 0, TRAINER_WARREN, 0, Route133_Text_1C2F53, Route133_Text_1C2FA3 msgbox Route133_Text_1C2FC7, 6 end Route133_EventScript_15259E:: @ 815259E - trainerbattle 0, OPPONENT_BECK, 0, Route133_Text_1C302D, Route133_Text_1C305F + trainerbattle 0, TRAINER_BECK, 0, Route133_Text_1C302D, Route133_Text_1C305F msgbox Route133_Text_1C307E, 6 end diff --git a/data/maps/Route134/events.inc b/data/maps/Route134/events.inc index b167d48b1..5e203e526 100644 --- a/data/maps/Route134/events.inc +++ b/data/maps/Route134/events.inc @@ -1,9 +1,9 @@ Route134_EventObjects:: @ 838548C - object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 9, 1, 49, 3, 5, 1, 2, Route134_EventScript_1525C4, 0 - object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 5, 1, 1, 0, 0, 1, 3, Route134_EventScript_1525DB, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, 10, 0, 0, 1, 1, Route134_EventScript_152609, 0 - object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 65, 14, 3, 18, 0, 0, 1, 2, Route134_EventScript_1525F2, 0 - object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 56, 16, 3, 27, 10, 0, 1, 3, Route134_EventScript_152620, 0 + object_event 1, EVENT_OBJ_GFX_SWIMMER_M, 0, 52, 9, 1, MOVEMENT_TYPE_WALK_SEQUENCE_UP_RIGHT_DOWN_LEFT, 3, 5, 1, 2, Route134_EventScript_1525C4, 0 + object_event 2, EVENT_OBJ_GFX_SWIMMER_F, 0, 45, 5, 1, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 1, 3, Route134_EventScript_1525DB, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 41, 23, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, Route134_EventScript_152609, 0 + object_event 4, EVENT_OBJ_GFX_MAN_6, 0, 65, 14, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 2, Route134_EventScript_1525F2, 0 + object_event 5, EVENT_OBJ_GFX_BLACK_BELT, 0, 56, 16, 3, MOVEMENT_TYPE_WALK_LEFT_AND_RIGHT, 10, 0, 1, 3, Route134_EventScript_152620, 0 Route134_MapEvents:: @ 8385504 map_events Route134_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/Route134/header.inc b/data/maps/Route134/header.inc index 15fe8168e..f7f6e64fd 100644 --- a/data/maps/Route134/header.inc +++ b/data/maps/Route134/header.inc @@ -5,10 +5,10 @@ Route134:: @ 83059A4 .4byte Route134_MapConnections .2byte MUS_GRANROAD .2byte 50 - .byte 49 + .byte MAPSEC_ROUTE_134 .byte 0 - .byte 2 - .byte 6 + .byte WEATHER_SUNNY + .byte MAP_TYPE_6 .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Route134/scripts.inc b/data/maps/Route134/scripts.inc index 06b53ce31..e5c106899 100644 --- a/data/maps/Route134/scripts.inc +++ b/data/maps/Route134/scripts.inc @@ -7,26 +7,26 @@ Route134_MapScript1_1525BB:: @ 81525BB end Route134_EventScript_1525C4:: @ 81525C4 - trainerbattle 0, OPPONENT_JACK, 0, Route134_Text_1C30C6, Route134_Text_1C3110 + trainerbattle 0, TRAINER_JACK, 0, Route134_Text_1C30C6, Route134_Text_1C3110 msgbox Route134_Text_1C311A, 6 end Route134_EventScript_1525DB:: @ 81525DB - trainerbattle 0, OPPONENT_LAUREL, 0, Route134_Text_1C315E, Route134_Text_1C3198 + trainerbattle 0, TRAINER_LAUREL, 0, Route134_Text_1C315E, Route134_Text_1C3198 msgbox Route134_Text_1C31A0, 6 end Route134_EventScript_1525F2:: @ 81525F2 - trainerbattle 0, OPPONENT_ALEX, 0, Route134_Text_1C31D7, Route134_Text_1C3213 + trainerbattle 0, TRAINER_ALEX, 0, Route134_Text_1C31D7, Route134_Text_1C3213 msgbox Route134_Text_1C3229, 6 end Route134_EventScript_152609:: @ 8152609 - trainerbattle 0, OPPONENT_AARON, 0, Route134_Text_1C3319, Route134_Text_1C335C + trainerbattle 0, TRAINER_AARON, 0, Route134_Text_1C3319, Route134_Text_1C335C msgbox Route134_Text_1C336E, 6 end Route134_EventScript_152620:: @ 8152620 - trainerbattle 0, OPPONENT_HITOSHI, 0, Route134_Text_1C3262, Route134_Text_1C329E + trainerbattle 0, TRAINER_HITOSHI, 0, Route134_Text_1C3262, Route134_Text_1C329E msgbox Route134_Text_1C32D6, 6 end diff --git a/data/maps/RustboroCity/events.inc b/data/maps/RustboroCity/events.inc index bfc6cff77..f8d2fa1ef 100644 --- a/data/maps/RustboroCity/events.inc +++ b/data/maps/RustboroCity/events.inc @@ -1,18 +1,18 @@ RustboroCity_EventObjects:: @ 837FD14 - object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 22, 34, 3, 3, 0, 1, 0, 0, RustboroCity_EventScript_14C3B1, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_14C386, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 25, 37, 3, 7, 0, 0, 0, 0, RustboroCity_EventScript_14C401, 0 - object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 46, 3, 3, 0, 1, 0, 0, RustboroCity_EventScript_14C3F8, 0 - object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_14C3D9, 0 - object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 26, 23, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_14C3BA, 0 - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 24, 51, 3, 10, 0, 0, 0, 0, RustboroCity_EventScript_14C449, 0 - object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 51, 3, 9, 0, 0, 0, 0, RustboroCity_EventScript_14C45F, 0 - object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, 10, 1, 1, 0, 0, RustboroCity_EventScript_14C5FF, FLAG_HIDE_DEVON_RUSTBORO - object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 13, 21, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO - object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 13, 34, 3, 2, 1, 1, 0, 0, RustboroCity_EventScript_14C3A5, 0 - object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, 1, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, FLAG_ITEM_RUSTBORO_1 - object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 19, 27, 3, 8, 0, 1, 0, 0, RustboroCity_EventScript_14C475, 0 - object_event 14, EVENT_OBJ_GFX_VAR_0, 0, 16, 50, 3, 1, 1, 1, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO + object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 22, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_14C3B1, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_14C386, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 25, 37, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_EventScript_14C401, 0 + object_event 4, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 21, 46, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_14C3F8, 0 + object_event 5, EVENT_OBJ_GFX_BOY_2, 0, 12, 45, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_14C3D9, 0 + object_event 6, EVENT_OBJ_GFX_MAN_4, 0, 26, 23, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_14C3BA, 0 + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_2, 0, 24, 51, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_EventScript_14C449, 0 + object_event 8, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 25, 51, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_EventScript_14C45F, 0 + object_event 9, EVENT_OBJ_GFX_MAN_2, 0, 30, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, RustboroCity_EventScript_14C5FF, FLAG_HIDE_DEVON_RUSTBORO + object_event 10, EVENT_OBJ_GFX_VAR_1, 0, 13, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_RUSTBORO + object_event 11, EVENT_OBJ_GFX_MAN_7, 0, 13, 34, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_14C3A5, 0 + object_event 12, EVENT_OBJ_GFX_ITEM_BALL, 0, 36, 51, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RustboroCity_EventScript_1B172B, FLAG_ITEM_RUSTBORO_1 + object_event 13, EVENT_OBJ_GFX_MAN_5, 0, 19, 27, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 1, 0, 0, RustboroCity_EventScript_14C475, 0 + object_event 14, EVENT_OBJ_GFX_VAR_0, 0, 16, 50, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, RustboroCity_EventScript_14C8DA, FLAG_HIDE_RIVAL_RUSTBORO RustboroCity_MapWarps:: @ 837FE64 warp_def 27, 19, 0, 0, MAP_RUSTBORO_CITY_GYM @@ -29,31 +29,31 @@ RustboroCity_MapWarps:: @ 837FE64 warp_def 26, 46, 0, 0, MAP_RUSTBORO_CITY_HOUSE3 RustboroCity_MapCoordEvents:: @ 837FEC4 - coord_event 23, 20, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C481 - coord_event 23, 21, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C498 - coord_event 23, 22, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4AF - coord_event 23, 23, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4C6 - coord_event 23, 24, 3, 0, VAR_RUSTBORO_STATE, 1, 0, RustboroCity_EventScript_14C4DD - coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C620 - coord_event 29, 10, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C62C - coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C638 - coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 2, 0, RustboroCity_EventScript_14C644 - coord_event 30, 9, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C74D - coord_event 31, 10, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C759 - coord_event 30, 11, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C765 - coord_event 30, 12, 3, 0, VAR_RUSTBORO_STATE, 4, 0, RustboroCity_EventScript_14C771 + coord_event 23, 20, 3, VAR_RUSTBORO_STATE, 1, RustboroCity_EventScript_14C481 + coord_event 23, 21, 3, VAR_RUSTBORO_STATE, 1, RustboroCity_EventScript_14C498 + coord_event 23, 22, 3, VAR_RUSTBORO_STATE, 1, RustboroCity_EventScript_14C4AF + coord_event 23, 23, 3, VAR_RUSTBORO_STATE, 1, RustboroCity_EventScript_14C4C6 + coord_event 23, 24, 3, VAR_RUSTBORO_STATE, 1, RustboroCity_EventScript_14C4DD + coord_event 30, 9, 3, VAR_RUSTBORO_STATE, 2, RustboroCity_EventScript_14C620 + coord_event 29, 10, 3, VAR_RUSTBORO_STATE, 2, RustboroCity_EventScript_14C62C + coord_event 30, 11, 3, VAR_RUSTBORO_STATE, 2, RustboroCity_EventScript_14C638 + coord_event 30, 12, 3, VAR_RUSTBORO_STATE, 2, RustboroCity_EventScript_14C644 + coord_event 30, 9, 3, VAR_RUSTBORO_STATE, 4, RustboroCity_EventScript_14C74D + coord_event 31, 10, 3, VAR_RUSTBORO_STATE, 4, RustboroCity_EventScript_14C759 + coord_event 30, 11, 3, VAR_RUSTBORO_STATE, 4, RustboroCity_EventScript_14C765 + coord_event 30, 12, 3, VAR_RUSTBORO_STATE, 4, RustboroCity_EventScript_14C771 RustboroCity_MapBGEvents:: @ 837FF94 - bg_event 23, 19, 0, 0, 0, RustboroCity_EventScript_14C41C - bg_event 25, 35, 0, 0, 0, RustboroCity_EventScript_14C437 - bg_event 17, 45, 0, 1, 0, RustboroCity_EventScript_1A00E1 - bg_event 18, 38, 0, 1, 0, RustboroCity_EventScript_1A00EA - bg_event 19, 49, 0, 0, 0, RustboroCity_EventScript_14C42E - bg_event 18, 45, 0, 1, 0, RustboroCity_EventScript_1A00E1 - bg_event 17, 38, 0, 1, 0, RustboroCity_EventScript_1A00EA - bg_event 17, 20, 0, 0, 0, RustboroCity_EventScript_14C413 - bg_event 30, 8, 0, 0, 0, RustboroCity_EventScript_14C40A - bg_event 12, 38, 3, 0, 0, RustboroCity_EventScript_14C440 + bg_event 23, 19, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C41C + bg_event 25, 35, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C437 + bg_event 17, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_1A00E1 + bg_event 18, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_1A00EA + bg_event 19, 49, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C42E + bg_event 18, 45, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_1A00E1 + bg_event 17, 38, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_EventScript_1A00EA + bg_event 17, 20, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C413 + bg_event 30, 8, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C40A + bg_event 12, 38, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_EventScript_14C440 RustboroCity_MapEvents:: @ 838000C map_events RustboroCity_EventObjects, RustboroCity_MapWarps, RustboroCity_MapCoordEvents, RustboroCity_MapBGEvents diff --git a/data/maps/RustboroCity/header.inc b/data/maps/RustboroCity/header.inc index 73af7f1fc..7b63f0119 100644 --- a/data/maps/RustboroCity/header.inc +++ b/data/maps/RustboroCity/header.inc @@ -5,10 +5,10 @@ RustboroCity:: @ 830549C .4byte RustboroCity_MapConnections .2byte MUS_GOTOWN .2byte 4 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 2 - .byte 2 + .byte WEATHER_SUNNY + .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_CuttersHouse/events.inc b/data/maps/RustboroCity_CuttersHouse/events.inc index 6a96e223c..8426e6f66 100644 --- a/data/maps/RustboroCity_CuttersHouse/events.inc +++ b/data/maps/RustboroCity_CuttersHouse/events.inc @@ -1,6 +1,6 @@ RustboroCity_CuttersHouse_EventObjects:: @ 8388D9C - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, 10, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D27, 0 - object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, 5, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D5D, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D27, 0 + object_event 2, EVENT_OBJ_GFX_LASS, 0, 9, 2, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, RustboroCity_CuttersHouse_EventScript_157D5D, 0 RustboroCity_CuttersHouse_MapWarps:: @ 8388DCC warp_def 5, 8, 0, 8, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_CuttersHouse/header.inc b/data/maps/RustboroCity_CuttersHouse/header.inc index c1aa1fc37..0dce55062 100644 --- a/data/maps/RustboroCity_CuttersHouse/header.inc +++ b/data/maps/RustboroCity_CuttersHouse/header.inc @@ -5,10 +5,10 @@ RustboroCity_CuttersHouse:: @ 8306360 .4byte 0x0 .2byte MUS_GOTOWN .2byte 98 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_DevonCorp_1F/events.inc b/data/maps/RustboroCity_DevonCorp_1F/events.inc index 5cfbd5134..4908cbd00 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/events.inc @@ -1,7 +1,7 @@ RustboroCity_DevonCorp_1F_EventObjects:: @ 838880C - object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 2, 6, 3, 2, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157422, 0 - object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 15, 5, 3, 2, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157454, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 3, 3, 8, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_15748F, 0 + object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 2, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157422, 0 + object_event 2, EVENT_OBJ_GFX_MAN_7, 0, 15, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 1, 0, 0, RustboroCity_DevonCorp_1F_EventScript_157454, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_DevonCorp_1F_EventScript_15748F, 0 RustboroCity_DevonCorp_1F_MapWarps:: @ 8388854 warp_def 5, 8, 0, 5, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_DevonCorp_1F/header.inc b/data/maps/RustboroCity_DevonCorp_1F/header.inc index e0148dea7..b32d57093 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/header.inc @@ -5,10 +5,10 @@ RustboroCity_DevonCorp_1F:: @ 830622C .4byte 0x0 .2byte MUS_GOTOWN .2byte 92 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_DevonCorp_2F/events.inc b/data/maps/RustboroCity_DevonCorp_2F/events.inc index 1babeffd7..956b7d89d 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/events.inc @@ -1,9 +1,9 @@ RustboroCity_DevonCorp_2F_EventObjects:: @ 8388880 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, 7, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574E2, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574F9, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, 15, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157523, 0 - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, 7, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_15754D, 0 - object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, 7, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157564, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574E2, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_1574F9, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 2, 6, 3, MOVEMENT_TYPE_FACE_UP_AND_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157523, 0 + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 10, 0, 0, RustboroCity_DevonCorp_2F_EventScript_15754D, 0 + object_event 5, EVENT_OBJ_GFX_SCIENTIST_1, 0, 14, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_DevonCorp_2F_EventScript_157564, 0 RustboroCity_DevonCorp_2F_MapWarps:: @ 83888F8 warp_def 14, 1, 0, 2, MAP_RUSTBORO_CITY_DEVON_CORP_1F diff --git a/data/maps/RustboroCity_DevonCorp_2F/header.inc b/data/maps/RustboroCity_DevonCorp_2F/header.inc index dbed45197..a6c8da14f 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/header.inc @@ -5,10 +5,10 @@ RustboroCity_DevonCorp_2F:: @ 8306248 .4byte 0x0 .2byte MUS_GOTOWN .2byte 93 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_DevonCorp_3F/events.inc b/data/maps/RustboroCity_DevonCorp_3F/events.inc index b77f343af..f8f3033ba 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/events.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/events.inc @@ -1,14 +1,14 @@ RustboroCity_DevonCorp_3F_EventObjects:: @ 838891C - object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, 9, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0 - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, 10, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578B0, FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, 76, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0 + object_event 1, EVENT_OBJ_GFX_GENTLEMAN, 0, 17, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0 + object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 3, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578B0, FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 15, 5, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, RustboroCity_DevonCorp_3F_EventScript_15783B, 0 RustboroCity_DevonCorp_3F_MapWarps:: @ 8388964 warp_def 2, 1, 0, 1, MAP_RUSTBORO_CITY_DEVON_CORP_2F RustboroCity_DevonCorp_3F_MapBGEvents:: @ 838896C - bg_event 1, 5, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF - bg_event 1, 7, 3, 0, 0, RustboroCity_DevonCorp_3F_EventScript_1578CF + bg_event 1, 5, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_1578CF + bg_event 1, 7, 3, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_DevonCorp_3F_EventScript_1578CF RustboroCity_DevonCorp_3F_MapEvents:: @ 8388984 map_events RustboroCity_DevonCorp_3F_EventObjects, RustboroCity_DevonCorp_3F_MapWarps, 0x0, RustboroCity_DevonCorp_3F_MapBGEvents diff --git a/data/maps/RustboroCity_DevonCorp_3F/header.inc b/data/maps/RustboroCity_DevonCorp_3F/header.inc index b8cadbed2..c38db5048 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/header.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/header.inc @@ -5,10 +5,10 @@ RustboroCity_DevonCorp_3F:: @ 8306264 .4byte 0x0 .2byte MUS_GOTOWN .2byte 270 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat1_1F/events.inc b/data/maps/RustboroCity_Flat1_1F/events.inc index 22a262f47..9dd65fd69 100644 --- a/data/maps/RustboroCity_Flat1_1F/events.inc +++ b/data/maps/RustboroCity_Flat1_1F/events.inc @@ -1,6 +1,6 @@ RustboroCity_Flat1_1F_EventObjects:: @ 8388CB8 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 9, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C60, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C69, 0 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C60, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 12, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat1_1F_EventScript_157C69, 0 RustboroCity_Flat1_1F_MapWarps:: @ 8388CE8 warp_def 6, 7, 0, 1, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_Flat1_1F/header.inc b/data/maps/RustboroCity_Flat1_1F/header.inc index 3d1739875..1565c7d46 100644 --- a/data/maps/RustboroCity_Flat1_1F/header.inc +++ b/data/maps/RustboroCity_Flat1_1F/header.inc @@ -5,10 +5,10 @@ RustboroCity_Flat1_1F:: @ 830630C .4byte 0x0 .2byte MUS_GOTOWN .2byte 314 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat1_2F/events.inc b/data/maps/RustboroCity_Flat1_2F/events.inc index e906fe011..1caaa105e 100644 --- a/data/maps/RustboroCity_Flat1_2F/events.inc +++ b/data/maps/RustboroCity_Flat1_2F/events.inc @@ -1,5 +1,5 @@ RustboroCity_Flat1_2F_EventObjects:: @ 8388D14 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 6, 3, 5, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_157C73, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 6, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 3, 1, 0, 0, RustboroCity_Flat1_2F_EventScript_157C73, 0 RustboroCity_Flat1_2F_MapWarps:: @ 8388D2C warp_def 2, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT1_1F diff --git a/data/maps/RustboroCity_Flat1_2F/header.inc b/data/maps/RustboroCity_Flat1_2F/header.inc index 0ae9dd797..61c97d1ae 100644 --- a/data/maps/RustboroCity_Flat1_2F/header.inc +++ b/data/maps/RustboroCity_Flat1_2F/header.inc @@ -5,10 +5,10 @@ RustboroCity_Flat1_2F:: @ 8306328 .4byte 0x0 .2byte MUS_GOTOWN .2byte 315 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat2_1F/events.inc b/data/maps/RustboroCity_Flat2_1F/events.inc index 76ed3f04e..55a840cc0 100644 --- a/data/maps/RustboroCity_Flat2_1F/events.inc +++ b/data/maps/RustboroCity_Flat2_1F/events.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_1F_EventObjects:: @ 8388E44 - object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, 9, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D83, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 8, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D7A, 0 + object_event 1, EVENT_OBJ_GFX_SKITTY, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D83, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_1F_EventScript_157D7A, 0 RustboroCity_Flat2_1F_MapWarps:: @ 8388E74 warp_def 2, 8, 0, 10, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_Flat2_1F/header.inc b/data/maps/RustboroCity_Flat2_1F/header.inc index 3a9ee86c3..9a8a1f848 100644 --- a/data/maps/RustboroCity_Flat2_1F/header.inc +++ b/data/maps/RustboroCity_Flat2_1F/header.inc @@ -5,10 +5,10 @@ RustboroCity_Flat2_1F:: @ 8306398 .4byte 0x0 .2byte MUS_GOTOWN .2byte 295 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat2_2F/events.inc b/data/maps/RustboroCity_Flat2_2F/events.inc index 3f56e718c..190bb838b 100644 --- a/data/maps/RustboroCity_Flat2_2F/events.inc +++ b/data/maps/RustboroCity_Flat2_2F/events.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_2F_EventObjects:: @ 8388EA0 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 4, 3, 10, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157D97, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157DA0, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 11, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157D97, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_2F_EventScript_157DA0, 0 RustboroCity_Flat2_2F_MapWarps:: @ 8388ED0 warp_def 3, 1, 0, 2, MAP_RUSTBORO_CITY_FLAT2_1F diff --git a/data/maps/RustboroCity_Flat2_2F/header.inc b/data/maps/RustboroCity_Flat2_2F/header.inc index da3544023..e39257bfe 100644 --- a/data/maps/RustboroCity_Flat2_2F/header.inc +++ b/data/maps/RustboroCity_Flat2_2F/header.inc @@ -5,10 +5,10 @@ RustboroCity_Flat2_2F:: @ 83063B4 .4byte 0x0 .2byte MUS_GOTOWN .2byte 296 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Flat2_3F/events.inc b/data/maps/RustboroCity_Flat2_3F/events.inc index ed3ef80e7..d6b3ecd48 100644 --- a/data/maps/RustboroCity_Flat2_3F/events.inc +++ b/data/maps/RustboroCity_Flat2_3F/events.inc @@ -1,6 +1,6 @@ RustboroCity_Flat2_3F_EventObjects:: @ 8388EF4 - object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 7, 3, 3, 5, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DDA, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DE3, 0 + object_event 1, EVENT_OBJ_GFX_MAN_7, 0, 7, 3, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 2, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DDA, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Flat2_3F_EventScript_157DE3, 0 RustboroCity_Flat2_3F_MapWarps:: @ 8388F24 warp_def 1, 1, 0, 1, MAP_RUSTBORO_CITY_FLAT2_2F diff --git a/data/maps/RustboroCity_Flat2_3F/header.inc b/data/maps/RustboroCity_Flat2_3F/header.inc index 9d5235d93..2e0d442c7 100644 --- a/data/maps/RustboroCity_Flat2_3F/header.inc +++ b/data/maps/RustboroCity_Flat2_3F/header.inc @@ -5,10 +5,10 @@ RustboroCity_Flat2_3F:: @ 83063D0 .4byte 0x0 .2byte MUS_GOTOWN .2byte 297 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Gym/events.inc b/data/maps/RustboroCity_Gym/events.inc index 97b5a6627..c78fb9799 100644 --- a/data/maps/RustboroCity_Gym/events.inc +++ b/data/maps/RustboroCity_Gym/events.inc @@ -1,16 +1,16 @@ RustboroCity_Gym_EventObjects:: @ 8388998 - object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_1578D9, 0 - object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 12, 3, 9, 0, 0, 1, 3, RustboroCity_Gym_EventScript_157960, 0 - object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 7, 3, 10, 0, 0, 1, 3, RustboroCity_Gym_EventScript_157977, 0 - object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 17, 3, 8, 0, 0, 0, 0, RustboroCity_Gym_EventScript_15798E, 0 + object_event 1, EVENT_OBJ_GFX_ROXANNE, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_1578D9, 0 + object_event 2, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, RustboroCity_Gym_EventScript_157960, 0 + object_event 3, EVENT_OBJ_GFX_YOUNGSTER, 0, 3, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 3, RustboroCity_Gym_EventScript_157977, 0 + object_event 4, EVENT_OBJ_GFX_MAN_2, 0, 3, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_Gym_EventScript_15798E, 0 RustboroCity_Gym_MapWarps:: @ 83889F8 warp_def 5, 18, 0, 0, MAP_RUSTBORO_CITY warp_def 6, 18, 0, 0, MAP_RUSTBORO_CITY RustboroCity_Gym_MapBGEvents:: @ 8388A08 - bg_event 2, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579AD - bg_event 8, 17, 0, 1, 0, RustboroCity_Gym_EventScript_1579BD + bg_event 2, 17, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_1579AD + bg_event 8, 17, 0, BG_EVENT_PLAYER_FACING_NORTH, RustboroCity_Gym_EventScript_1579BD RustboroCity_Gym_MapEvents:: @ 8388A20 map_events RustboroCity_Gym_EventObjects, RustboroCity_Gym_MapWarps, 0x0, RustboroCity_Gym_MapBGEvents diff --git a/data/maps/RustboroCity_Gym/header.inc b/data/maps/RustboroCity_Gym/header.inc index d98b04da8..bc214630b 100644 --- a/data/maps/RustboroCity_Gym/header.inc +++ b/data/maps/RustboroCity_Gym/header.inc @@ -5,10 +5,10 @@ RustboroCity_Gym:: @ 8306280 .4byte 0x0 .2byte MUS_GIM .2byte 94 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 307617e50..9c379107f 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -2,7 +2,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8 .byte 0 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 - trainerbattle 1, OPPONENT_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE + trainerbattle 1, TRAINER_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_15793C msgbox RustboroCity_Gym_Text_184252, 4 release @@ -34,12 +34,12 @@ RustboroCity_Gym_EventScript_15793C:: @ 815793C end RustboroCity_Gym_EventScript_157960:: @ 8157960 - trainerbattle 0, OPPONENT_JOSH, 0, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD + trainerbattle 0, TRAINER_JOSH, 0, RustboroCity_Gym_Text_183D99, RustboroCity_Gym_Text_183DDD msgbox RustboroCity_Gym_Text_183DF9, 6 end RustboroCity_Gym_EventScript_157977:: @ 8157977 - trainerbattle 0, OPPONENT_TOMMY, 0, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78 + trainerbattle 0, TRAINER_TOMMY, 0, RustboroCity_Gym_Text_183E38, RustboroCity_Gym_Text_183E78 msgbox RustboroCity_Gym_Text_183E98, 6 end diff --git a/data/maps/RustboroCity_House1/events.inc b/data/maps/RustboroCity_House1/events.inc index 5a8023d2f..3d083ca20 100644 --- a/data/maps/RustboroCity_House1/events.inc +++ b/data/maps/RustboroCity_House1/events.inc @@ -1,6 +1,6 @@ RustboroCity_House1_EventObjects:: @ 8388D48 - object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, 9, 0, 0, 0, 0, RustboroCity_House1_EventScript_157C7D, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, 8, 0, 0, 0, 0, RustboroCity_House1_EventScript_157D1D, 0 + object_event 1, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 6, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House1_EventScript_157C7D, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House1_EventScript_157D1D, 0 RustboroCity_House1_MapWarps:: @ 8388D78 warp_def 5, 7, 0, 7, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_House1/header.inc b/data/maps/RustboroCity_House1/header.inc index 34d733c02..af3a17a46 100644 --- a/data/maps/RustboroCity_House1/header.inc +++ b/data/maps/RustboroCity_House1/header.inc @@ -5,10 +5,10 @@ RustboroCity_House1:: @ 8306344 .4byte 0x0 .2byte MUS_GOTOWN .2byte 97 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_House2/events.inc b/data/maps/RustboroCity_House2/events.inc index 4a7a60f12..e4a749d56 100644 --- a/data/maps/RustboroCity_House2/events.inc +++ b/data/maps/RustboroCity_House2/events.inc @@ -1,6 +1,6 @@ RustboroCity_House2_EventObjects:: @ 8388DF0 - object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D67, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 5, 3, 7, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D70, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_2, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D67, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_House2_EventScript_157D70, 0 RustboroCity_House2_MapWarps:: @ 8388E20 warp_def 5, 8, 0, 9, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_House2/header.inc b/data/maps/RustboroCity_House2/header.inc index be12d46f8..66e194304 100644 --- a/data/maps/RustboroCity_House2/header.inc +++ b/data/maps/RustboroCity_House2/header.inc @@ -5,10 +5,10 @@ RustboroCity_House2:: @ 830637C .4byte 0x0 .2byte MUS_GOTOWN .2byte 96 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_House3/events.inc b/data/maps/RustboroCity_House3/events.inc index bdd17333c..9cb1c5194 100644 --- a/data/maps/RustboroCity_House3/events.inc +++ b/data/maps/RustboroCity_House3/events.inc @@ -1,7 +1,7 @@ RustboroCity_House3_EventObjects:: @ 8388F40 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 4, 5, 3, 10, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DED, 0 - object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 5, 3, 9, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DF6, 0 - object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DFF, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DED, 0 + object_event 2, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DF6, 0 + object_event 3, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_House3_EventScript_157DFF, 0 RustboroCity_House3_MapWarps:: @ 8388F88 warp_def 5, 8, 0, 11, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_House3/header.inc b/data/maps/RustboroCity_House3/header.inc index 7c23668ca..d5398d3a0 100644 --- a/data/maps/RustboroCity_House3/header.inc +++ b/data/maps/RustboroCity_House3/header.inc @@ -5,10 +5,10 @@ RustboroCity_House3:: @ 83063EC .4byte 0x0 .2byte MUS_GOTOWN .2byte 96 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_Mart/events.inc b/data/maps/RustboroCity_Mart/events.inc index b39aec815..fa34e3192 100644 --- a/data/maps/RustboroCity_Mart/events.inc +++ b/data/maps/RustboroCity_Mart/events.inc @@ -1,8 +1,8 @@ RustboroCity_Mart_EventObjects:: @ 8388C34 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157BD4, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, 7, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C4D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, 3, 0, 1, 0, 0, RustboroCity_Mart_EventScript_157C44, 0 - object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, 7, 1, 1, 0, 0, RustboroCity_Mart_EventScript_157C56, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157BD4, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_Mart_EventScript_157C4D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_2, 0, 8, 4, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, RustboroCity_Mart_EventScript_157C44, 0 + object_event 4, EVENT_OBJ_GFX_BUG_CATCHER, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, RustboroCity_Mart_EventScript_157C56, 0 RustboroCity_Mart_MapWarps:: @ 8388C94 warp_def 3, 7, 0, 2, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_Mart/header.inc b/data/maps/RustboroCity_Mart/header.inc index 88af62f92..f2d69e238 100644 --- a/data/maps/RustboroCity_Mart/header.inc +++ b/data/maps/RustboroCity_Mart/header.inc @@ -5,10 +5,10 @@ RustboroCity_Mart:: @ 83062F0 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_PokemonCenter_1F/events.inc b/data/maps/RustboroCity_PokemonCenter_1F/events.inc index 7173fb49c..08413fc93 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/events.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/events.inc @@ -1,8 +1,8 @@ RustboroCity_PokemonCenter_1F_EventObjects:: @ 8388B24 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B88, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B96, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, 2, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B9F, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157BA8, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B88, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B96, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 3, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157B9F, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_3, 0, 10, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonCenter_1F_EventScript_157BA8, 0 RustboroCity_PokemonCenter_1F_MapWarps:: @ 8388B84 warp_def 7, 8, 3, 3, MAP_RUSTBORO_CITY diff --git a/data/maps/RustboroCity_PokemonCenter_1F/header.inc b/data/maps/RustboroCity_PokemonCenter_1F/header.inc index 9b98aff0c..dd1d976fe 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/header.inc @@ -5,10 +5,10 @@ RustboroCity_PokemonCenter_1F:: @ 83062B8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc index 653cceb25..c0bb5c2dd 100644 --- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8157B79 .byte 0 RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F - setrespawn 6 + setrespawn HEAL_LOCATION_RUSTBORO_CITY call RustboroCity_PokemonCenter_1F_EventScript_19FD1B end diff --git a/data/maps/RustboroCity_PokemonCenter_2F/events.inc b/data/maps/RustboroCity_PokemonCenter_2F/events.inc index bf5737d14..86d2e6929 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/events.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ RustboroCity_PokemonCenter_2F_EventObjects:: @ 8388BB0 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC1, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC7, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BCD, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC1, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BC7, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonCenter_2F_EventScript_157BCD, 0 RustboroCity_PokemonCenter_2F_MapWarps:: @ 8388BF8 warp_def 1, 5, 4, 2, MAP_RUSTBORO_CITY_POKEMON_CENTER_1F diff --git a/data/maps/RustboroCity_PokemonCenter_2F/header.inc b/data/maps/RustboroCity_PokemonCenter_2F/header.inc index ff85dfc1d..c34cd3dd7 100644 --- a/data/maps/RustboroCity_PokemonCenter_2F/header.inc +++ b/data/maps/RustboroCity_PokemonCenter_2F/header.inc @@ -5,10 +5,10 @@ RustboroCity_PokemonCenter_2F:: @ 83062D4 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RustboroCity_PokemonSchool/events.inc b/data/maps/RustboroCity_PokemonSchool/events.inc index fc3f934fa..6c4485f9a 100644 --- a/data/maps/RustboroCity_PokemonSchool/events.inc +++ b/data/maps/RustboroCity_PokemonSchool/events.inc @@ -1,21 +1,21 @@ RustboroCity_PokemonSchool_EventObjects:: @ 8388A34 - object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 8, 6, 3, 10, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157A98, 0 - object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 9, 6, 3, 9, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AA1, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 3, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AAA, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, 7, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AB3, 0 - object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, 8, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157ABC, 0 - object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, 8, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_157ACE, 0 + object_event 1, EVENT_OBJ_GFX_BOY_5, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157A98, 0 + object_event 2, EVENT_OBJ_GFX_BOY_5, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AA1, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 3, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AAA, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 10, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AB3, 0 + object_event 5, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 3, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157ABC, 0 + object_event 6, EVENT_OBJ_GFX_GENTLEMAN, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, RustboroCity_PokemonSchool_EventScript_157ACE, 0 RustboroCity_PokemonSchool_MapWarps:: @ 8388AC4 warp_def 5, 10, 0, 4, MAP_RUSTBORO_CITY warp_def 6, 10, 0, 4, MAP_RUSTBORO_CITY RustboroCity_PokemonSchool_MapBGEvents:: @ 8388AD4 - bg_event 5, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 - bg_event 4, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 - bg_event 6, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 - bg_event 7, 2, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_1579E2 - bg_event 3, 5, 0, 0, 0, RustboroCity_PokemonSchool_EventScript_157AC5 + bg_event 5, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 4, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 6, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 7, 2, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_1579E2 + bg_event 3, 5, 0, BG_EVENT_PLAYER_FACING_ANY, RustboroCity_PokemonSchool_EventScript_157AC5 RustboroCity_PokemonSchool_MapEvents:: @ 8388B10 map_events RustboroCity_PokemonSchool_EventObjects, RustboroCity_PokemonSchool_MapWarps, 0x0, RustboroCity_PokemonSchool_MapBGEvents diff --git a/data/maps/RustboroCity_PokemonSchool/header.inc b/data/maps/RustboroCity_PokemonSchool/header.inc index 98f0e1b1d..af4dc670a 100644 --- a/data/maps/RustboroCity_PokemonSchool/header.inc +++ b/data/maps/RustboroCity_PokemonSchool/header.inc @@ -5,10 +5,10 @@ RustboroCity_PokemonSchool:: @ 830629C .4byte 0x0 .2byte MUS_P_SCHOOL .2byte 95 - .byte 10 + .byte MAPSEC_RUSTBORO_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RusturfTunnel/events.inc b/data/maps/RusturfTunnel/events.inc index 9dda724af..71aeb5943 100644 --- a/data/maps/RusturfTunnel/events.inc +++ b/data/maps/RusturfTunnel/events.inc @@ -1,14 +1,14 @@ RusturfTunnel_EventObjects:: @ 838BD2C - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, 10, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL - object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 - object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, FLAG_ITEM_RUSTURF_TUNNEL_1 - object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, 1, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, FLAG_ITEM_RUSTURF_TUNNEL_2 - object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL - object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 5, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL - object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, 9, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, 8, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 - object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, 9, 1, 1, 1, 3, RusturfTunnel_EventScript_15CACD, 0 - object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 25, 4, 3, 9, 1, 1, 0, 0, RusturfTunnel_EventScript_15C782, FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 23, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, RusturfTunnel_EventScript_15C799, FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL + object_event 2, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 + object_event 3, EVENT_OBJ_GFX_ITEM_BALL, 0, 3, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1786, FLAG_ITEM_RUSTURF_TUNNEL_1 + object_event 4, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, RusturfTunnel_EventScript_1B1793, FLAG_ITEM_RUSTURF_TUNNEL_2 + object_event 5, EVENT_OBJ_GFX_OLD_MAN_1, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_BRINEY_RUSTURF_TUNNEL + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9EA, FLAG_HIDE_GRUNT_RUSTURF_TUNNEL + object_event 7, EVENT_OBJ_GFX_WINGULL, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9D7, FLAG_HIDE_PEEKO_RUSTURF_TUNNEL + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 24, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, S_BreakableRock, FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 + object_event 9, EVENT_OBJ_GFX_HIKER, 0, 32, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 3, RusturfTunnel_EventScript_15CACD, 0 + object_event 10, EVENT_OBJ_GFX_WOMAN_3, 0, 25, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, RusturfTunnel_EventScript_15C782, FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL RusturfTunnel_MapWarps:: @ 838BE1C warp_def 4, 10, 3, 0, MAP_ROUTE116 @@ -16,11 +16,11 @@ RusturfTunnel_MapWarps:: @ 838BE1C warp_def 18, 20, 3, 2, MAP_ROUTE116 RusturfTunnel_MapCoordEvents:: @ 838BE34 - coord_event 23, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C999 - coord_event 9, 4, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB - coord_event 9, 5, 3, 0, VAR_RUSTURF_TUNNEL_STATE, 2, 0, RusturfTunnel_EventScript_15C9AB - coord_event 25, 4, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C99F - coord_event 25, 5, 3, 0, 0, 0, 0, RusturfTunnel_EventScript_15C9A5 + coord_event 23, 4, 3, 0, 0, RusturfTunnel_EventScript_15C999 + coord_event 9, 4, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_15C9AB + coord_event 9, 5, 3, VAR_RUSTURF_TUNNEL_STATE, 2, RusturfTunnel_EventScript_15C9AB + coord_event 25, 4, 3, 0, 0, RusturfTunnel_EventScript_15C99F + coord_event 25, 5, 3, 0, 0, RusturfTunnel_EventScript_15C9A5 RusturfTunnel_MapEvents:: @ 838BE84 map_events RusturfTunnel_EventObjects, RusturfTunnel_MapWarps, RusturfTunnel_MapCoordEvents, 0x0 diff --git a/data/maps/RusturfTunnel/header.inc b/data/maps/RusturfTunnel/header.inc index a3d4108ce..b2a9be922 100644 --- a/data/maps/RusturfTunnel/header.inc +++ b/data/maps/RusturfTunnel/header.inc @@ -5,10 +5,10 @@ RusturfTunnel:: @ 8306DE0 .4byte 0x0 .2byte MUS_DAN01 .2byte 130 - .byte 60 + .byte MAPSEC_RUSTURF_TUNNEL .byte 0 - .byte 6 - .byte 4 + .byte WEATHER_FOG_1 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 13fb80043..6c3f759cc 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -310,7 +310,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA faceplayer playbgm MUS_EVIL_TEAM, FALSE msgbox RusturfTunnel_Text_19419B, 4 - trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 + trainerbattle 3, TRAINER_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 giveitem_std ITEM_DEVON_GOODS closemessage @@ -415,6 +415,6 @@ RusturfTunnel_Movement_15CAC3:: @ 815CAC3 end_movement RusturfTunnel_EventScript_15CACD:: @ 815CACD - trainerbattle 0, OPPONENT_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 + trainerbattle 0, TRAINER_MIKE_2, 0, RusturfTunnel_Text_194814, RusturfTunnel_Text_1948A2 msgbox RusturfTunnel_Text_1948C4, 6 end diff --git a/data/maps/SSTidalCorridor/events.inc b/data/maps/SSTidalCorridor/events.inc index 0e034da5c..ba5a350d6 100644 --- a/data/maps/SSTidalCorridor/events.inc +++ b/data/maps/SSTidalCorridor/events.inc @@ -1,8 +1,8 @@ SSTidalCorridor_EventObjects:: @ 83916F8 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, 7, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FDD6, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, 3, 0, 2, 0, 0, SSTidalCorridor_EventScript_15FE60, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 2, 3, 8, 1, 1, 0, 0, SSTidalCorridor_EventScript_15FD96, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL - object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, 1, 1, 1, 0, 0, SSTidalCorridor_EventScript_15FD9F, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 1, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SSTidalCorridor_EventScript_15FDD6, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 16, 7, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 2, 0, 0, SSTidalCorridor_EventScript_15FE60, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SSTidalCorridor_EventScript_15FD96, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL + object_event 4, EVENT_OBJ_GFX_WINGULL, 0, 7, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SSTidalCorridor_EventScript_15FD9F, FLAG_HIDE_BRINEY_AND_PEEKO_SS_TIDAL SSTidalCorridor_MapWarps:: @ 8391758 warp_def 4, 9, 3, 0, MAP_SS_TIDAL_ROOMS @@ -16,18 +16,18 @@ SSTidalCorridor_MapWarps:: @ 8391758 warp_def 16, 2, 3, 0, MAP_SS_TIDAL_LOWER_DECK SSTidalCorridor_MapBGEvents:: @ 83917A0 - bg_event 2, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 4, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 6, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 8, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 10, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 12, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 14, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 16, 1, 0, 0, 0, SSTidalCorridor_EventScript_15FE3A - bg_event 5, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDB2 - bg_event 8, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDBB - bg_event 11, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDC4 - bg_event 14, 9, 0, 1, 0, SSTidalCorridor_EventScript_15FDCD + bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 4, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 6, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 14, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalCorridor_EventScript_15FE3A + bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_15FDB2 + bg_event 8, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_15FDBB + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_15FDC4 + bg_event 14, 9, 0, BG_EVENT_PLAYER_FACING_NORTH, SSTidalCorridor_EventScript_15FDCD SSTidalCorridor_MapEvents:: @ 8391830 map_events SSTidalCorridor_EventObjects, SSTidalCorridor_MapWarps, 0x0, SSTidalCorridor_MapBGEvents diff --git a/data/maps/SSTidalCorridor/header.inc b/data/maps/SSTidalCorridor/header.inc index 4f55319d8..50648d5d8 100644 --- a/data/maps/SSTidalCorridor/header.inc +++ b/data/maps/SSTidalCorridor/header.inc @@ -5,10 +5,10 @@ SSTidalCorridor:: @ 8307B54 .4byte 0x0 .2byte MUS_M_BOAT .2byte 278 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 7bc5a7fdd..0f2028476 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -122,7 +122,7 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 end SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 - setrespawn 8 + setrespawn HEAL_LOCATION_LILYCOVE_CITY msgbox SSTidalCorridor_Text_1991F4, 4 call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36 warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 @@ -131,7 +131,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 end SSTidalCorridor_EventScript_15FE17:: @ 815FE17 - setrespawn 4 + setrespawn HEAL_LOCATION_SLATEPORT_CITY msgbox SSTidalCorridor_Text_1991F4, 4 call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36 warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 @@ -173,14 +173,14 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A end SSTidalCorridor_EventScript_15FE84:: @ 815FE84 - goto_if_trainer_not_defeated OPPONENT_PHILLIP, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_LEONARD, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_COLTON, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_TUCKER, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_THOMAS, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_GARRET, SSTidalCorridor_EventScript_15FED5 - goto_if_trainer_not_defeated OPPONENT_ANETTE, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_PHILLIP, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_LEONARD, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_COLTON, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_TUCKER, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_THOMAS, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_GARRET, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated TRAINER_ANETTE, SSTidalCorridor_EventScript_15FED5 setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_15FE7A return diff --git a/data/maps/SSTidalLowerDeck/events.inc b/data/maps/SSTidalLowerDeck/events.inc index c9cbf6715..4660e56b5 100644 --- a/data/maps/SSTidalLowerDeck/events.inc +++ b/data/maps/SSTidalLowerDeck/events.inc @@ -1,6 +1,6 @@ SSTidalLowerDeck_EventObjects:: @ 8391844 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, 46, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_15FED7, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, 50, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_15FEEE, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 10, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_RIGHT_UP_LEFT, 4, 4, 1, 3, SSTidalLowerDeck_EventScript_15FED7, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 7, 4, 3, MOVEMENT_TYPE_WALK_SEQUENCE_DOWN_LEFT_UP_RIGHT, 7, 4, 1, 3, SSTidalLowerDeck_EventScript_15FEEE, 0 SSTidalLowerDeck_MapWarps:: @ 8391874 warp_def 15, 2, 3, 8, MAP_SS_TIDAL_CORRIDOR diff --git a/data/maps/SSTidalLowerDeck/header.inc b/data/maps/SSTidalLowerDeck/header.inc index c52690612..6d099c8bb 100644 --- a/data/maps/SSTidalLowerDeck/header.inc +++ b/data/maps/SSTidalLowerDeck/header.inc @@ -5,10 +5,10 @@ SSTidalLowerDeck:: @ 8307B70 .4byte 0x0 .2byte MUS_M_BOAT .2byte 279 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc index e91c20625..9b19a2f3a 100644 --- a/data/maps/SSTidalLowerDeck/scripts.inc +++ b/data/maps/SSTidalLowerDeck/scripts.inc @@ -2,11 +2,11 @@ SSTidalLowerDeck_MapScripts:: @ 815FED6 .byte 0 SSTidalLowerDeck_EventScript_15FED7:: @ 815FED7 - trainerbattle 0, OPPONENT_PHILLIP, 0, SSTidalLowerDeck_Text_1993C1, SSTidalLowerDeck_Text_19941A + trainerbattle 0, TRAINER_PHILLIP, 0, SSTidalLowerDeck_Text_1993C1, SSTidalLowerDeck_Text_19941A msgbox SSTidalLowerDeck_Text_19942E, 6 end SSTidalLowerDeck_EventScript_15FEEE:: @ 815FEEE - trainerbattle 0, OPPONENT_LEONARD, 0, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7 + trainerbattle 0, TRAINER_LEONARD, 0, SSTidalLowerDeck_Text_199491, SSTidalLowerDeck_Text_1994F7 msgbox SSTidalLowerDeck_Text_199508, 6 end diff --git a/data/maps/SSTidalRooms/events.inc b/data/maps/SSTidalRooms/events.inc index e86c60ed6..5de9aa019 100644 --- a/data/maps/SSTidalRooms/events.inc +++ b/data/maps/SSTidalRooms/events.inc @@ -1,12 +1,12 @@ SSTidalRooms_EventObjects:: @ 839189C - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 7, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_15FF5D, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, 9, 0, 0, 1, 3, SSTidalRooms_EventScript_15FF74, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, 10, 0, 0, 1, 0, SSTidalRooms_EventScript_15FF8B, 0 - object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, 8, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFA2, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, 8, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFBD, 0 - object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 22, 11, 3, 8, 1, 1, 1, 3, SSTidalRooms_EventScript_15FFD8, 0 - object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, 9, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFEF, 0 - object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, 7, 1, 1, 0, 0, SSTidalRooms_EventScript_15FF06, FLAG_HIDE_TM_49_GIVER_SS_TIDAL + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_15FF5D, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 34, 11, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, SSTidalRooms_EventScript_15FF74, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 21, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 0, SSTidalRooms_EventScript_15FF8B, 0 + object_event 4, EVENT_OBJ_GFX_MAN_5, 0, 7, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFA2, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFBD, 0 + object_event 6, EVENT_OBJ_GFX_BOY_4, 0, 22, 11, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, SSTidalRooms_EventScript_15FFD8, 0 + object_event 7, EVENT_OBJ_GFX_WOMAN_3, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 0, SSTidalRooms_EventScript_15FFEF, 0 + object_event 8, EVENT_OBJ_GFX_MANIAC, 0, 28, 5, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SSTidalRooms_EventScript_15FF06, FLAG_HIDE_TM_49_GIVER_SS_TIDAL SSTidalRooms_MapWarps:: @ 839195C warp_def 4, 16, 0, 0, MAP_SS_TIDAL_CORRIDOR @@ -23,8 +23,8 @@ SSTidalRooms_MapWarps:: @ 839195C warp_def 31, 1, 0, 7, MAP_SS_TIDAL_CORRIDOR SSTidalRooms_MapBGEvents:: @ 83919BC - bg_event 15, 11, 0, 0, 0, SSTidalRooms_EventScript_15FF47 - bg_event 15, 12, 0, 0, 0, SSTidalRooms_EventScript_15FF47 + bg_event 15, 11, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_15FF47 + bg_event 15, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SSTidalRooms_EventScript_15FF47 SSTidalRooms_MapEvents:: @ 83919D4 map_events SSTidalRooms_EventObjects, SSTidalRooms_MapWarps, 0x0, SSTidalRooms_MapBGEvents diff --git a/data/maps/SSTidalRooms/header.inc b/data/maps/SSTidalRooms/header.inc index 09fb99472..ccf887a67 100644 --- a/data/maps/SSTidalRooms/header.inc +++ b/data/maps/SSTidalRooms/header.inc @@ -5,10 +5,10 @@ SSTidalRooms:: @ 8307B8C .4byte 0x0 .2byte MUS_M_BOAT .2byte 280 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index 89372bd84..52927d54e 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -29,36 +29,36 @@ SSTidalRooms_EventScript_15FF47:: @ 815FF47 end SSTidalRooms_EventScript_15FF5D:: @ 815FF5D - trainerbattle 0, OPPONENT_COLTON, 0, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613 + trainerbattle 0, TRAINER_COLTON, 0, SSTidalRooms_Text_19958A, SSTidalRooms_Text_199613 msgbox SSTidalRooms_Text_199630, 6 end SSTidalRooms_EventScript_15FF74:: @ 815FF74 - trainerbattle 0, OPPONENT_TUCKER, 0, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF + trainerbattle 0, TRAINER_TUCKER, 0, SSTidalRooms_Text_1996A6, SSTidalRooms_Text_1996BF msgbox SSTidalRooms_Text_1996E1, 6 end SSTidalRooms_EventScript_15FF8B:: @ 815FF8B - trainerbattle 0, OPPONENT_THOMAS, 0, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747 + trainerbattle 0, TRAINER_THOMAS, 0, SSTidalRooms_Text_199723, SSTidalRooms_Text_199747 msgbox SSTidalRooms_Text_199778, 6 end SSTidalRooms_EventScript_15FFA2:: @ 815FFA2 - trainerbattle 4, OPPONENT_LEA_AND_JED, 0, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887 + trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_1997C1, SSTidalRooms_Text_199813, SSTidalRooms_Text_199887 msgbox SSTidalRooms_Text_199820, 6 end SSTidalRooms_EventScript_15FFBD:: @ 815FFBD - trainerbattle 4, OPPONENT_LEA_AND_JED, 0, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975 + trainerbattle 4, TRAINER_LEA_AND_JED, 0, SSTidalRooms_Text_1998C5, SSTidalRooms_Text_19990E, SSTidalRooms_Text_199975 msgbox SSTidalRooms_Text_19991C, 6 end SSTidalRooms_EventScript_15FFD8:: @ 815FFD8 - trainerbattle 0, OPPONENT_GARRET, 0, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF + trainerbattle 0, TRAINER_GARRET, 0, SSTidalRooms_Text_1999B7, SSTidalRooms_Text_1999FF msgbox SSTidalRooms_Text_199A10, 6 end SSTidalRooms_EventScript_15FFEF:: @ 815FFEF - trainerbattle 0, OPPONENT_ANETTE, 0, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF + trainerbattle 0, TRAINER_ANETTE, 0, SSTidalRooms_Text_199A62, SSTidalRooms_Text_199ABF msgbox SSTidalRooms_Text_199ADE, 6 end diff --git a/data/maps/SafariZone_Northeast/events.inc b/data/maps/SafariZone_Northeast/events.inc index ed750532f..8e4aa6378 100644 --- a/data/maps/SafariZone_Northeast/events.inc +++ b/data/maps/SafariZone_Northeast/events.inc @@ -1,13 +1,13 @@ SafariZone_Northeast_EventObjects:: @ 8391A2C - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, 2, 1, 1, 0, 0, SafariZone_Northeast_EventScript_160011, 0 - object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 6, 29, 3, 2, 1, 1, 0, 0, SafariZone_Northeast_EventScript_16001A, 0 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13 - object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16 - object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, 1, 1, 1, 0, 0, SafariZone_Northeast_EventScript_1B1919, FLAG_ITEM_SAFARI_ZONE_NORTHEAST_1 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 22, 9, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_160011, 0 + object_event 2, EVENT_OBJ_GFX_MAN_5, 0, 6, 29, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_16001A, 0 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_11 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 25, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_12 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 28, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_13 + object_event 6, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 23, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_14 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_15 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 27, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_TEMP_16 + object_event 9, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northeast_EventScript_1B1919, FLAG_ITEM_SAFARI_ZONE_NORTHEAST_1 SafariZone_Northeast_MapEvents:: @ 8391B04 map_events SafariZone_Northeast_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SafariZone_Northeast/header.inc b/data/maps/SafariZone_Northeast/header.inc index b4939c053..11d8af01a 100644 --- a/data/maps/SafariZone_Northeast/header.inc +++ b/data/maps/SafariZone_Northeast/header.inc @@ -5,10 +5,10 @@ SafariZone_Northeast:: @ 8307BC4 .4byte SafariZone_Northeast_MapConnections .2byte MUS_SAFARI .2byte 240 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 - .byte 3 + .byte WEATHER_NONE + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Northwest/events.inc b/data/maps/SafariZone_Northwest/events.inc index 18a6db38e..b1808d57c 100644 --- a/data/maps/SafariZone_Northwest/events.inc +++ b/data/maps/SafariZone_Northwest/events.inc @@ -1,6 +1,6 @@ SafariZone_Northwest_EventObjects:: @ 83919E8 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, 8, 0, 0, 0, 0, SafariZone_Northwest_EventScript_160007, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, 1, 1, 1, 0, 0, SafariZone_Northwest_EventScript_1B190C, FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 8, 8, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Northwest_EventScript_160007, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 33, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Northwest_EventScript_1B190C, FLAG_ITEM_SAFARI_ZONE_NORTHWEST_1 SafariZone_Northwest_MapEvents:: @ 8391A18 map_events SafariZone_Northwest_EventObjects, 0x0, 0x0, 0x0 diff --git a/data/maps/SafariZone_Northwest/header.inc b/data/maps/SafariZone_Northwest/header.inc index 533f797a5..f1d3ba373 100644 --- a/data/maps/SafariZone_Northwest/header.inc +++ b/data/maps/SafariZone_Northwest/header.inc @@ -5,10 +5,10 @@ SafariZone_Northwest:: @ 8307BA8 .4byte SafariZone_Northwest_MapConnections .2byte MUS_SAFARI .2byte 239 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 - .byte 3 + .byte WEATHER_NONE + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_RestHouse/events.inc b/data/maps/SafariZone_RestHouse/events.inc index 8ed841ff1..db69b02ba 100644 --- a/data/maps/SafariZone_RestHouse/events.inc +++ b/data/maps/SafariZone_RestHouse/events.inc @@ -1,7 +1,7 @@ SafariZone_RestHouse_EventObjects:: @ 8391EC0 - object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, 10, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C2F, 0 - object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, 9, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C38, 0 - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, 10, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C41, 0 + object_event 1, EVENT_OBJ_GFX_YOUNGSTER, 0, 7, 4, 0, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C2F, 0 + object_event 2, EVENT_OBJ_GFX_PSYCHIC_M, 0, 8, 4, 0, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C38, 0 + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 2, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SafariZone_RestHouse_EventScript_160C41, 0 SafariZone_RestHouse_MapWarps:: @ 8391F08 warp_def 3, 8, 0, 0, MAP_SAFARI_ZONE_SOUTHWEST diff --git a/data/maps/SafariZone_RestHouse/header.inc b/data/maps/SafariZone_RestHouse/header.inc index f13ab4f49..0c02110fd 100644 --- a/data/maps/SafariZone_RestHouse/header.inc +++ b/data/maps/SafariZone_RestHouse/header.inc @@ -5,10 +5,10 @@ SafariZone_RestHouse:: @ 8307CDC .4byte 0x0 .2byte MUS_SAFARI .2byte 330 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Southeast/events.inc b/data/maps/SafariZone_Southeast/events.inc index a18b2b394..25453c883 100644 --- a/data/maps/SafariZone_Southeast/events.inc +++ b/data/maps/SafariZone_Southeast/events.inc @@ -1,8 +1,8 @@ SafariZone_Southeast_EventObjects:: @ 8391B70 - object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, 8, 0, 0, 0, 0, SafariZone_Southeast_EventScript_1600A7, 0 - object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, 2, 1, 1, 0, 0, SafariZone_Southeast_EventScript_16008C, 0 - object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 16, 6, 5, 8, 0, 0, 0, 0, SafariZone_Southeast_EventScript_160095, 0 - object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, 2, 1, 1, 0, 0, SafariZone_Southeast_EventScript_16009E, 0 + object_event 1, EVENT_OBJ_GFX_CAMPER, 0, 32, 34, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southeast_EventScript_1600A7, 0 + object_event 2, EVENT_OBJ_GFX_BOY_1, 0, 26, 28, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_16008C, 0 + object_event 3, EVENT_OBJ_GFX_MAN_5, 0, 16, 6, 5, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southeast_EventScript_160095, 0 + object_event 4, EVENT_OBJ_GFX_YOUNGSTER, 0, 15, 31, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SafariZone_Southeast_EventScript_16009E, 0 SafariZone_Southeast_MapWarps:: @ 8391BD0 warp_def 32, 33, 0, 0, MAP_ROUTE121_SAFARI_ZONE_ENTRANCE diff --git a/data/maps/SafariZone_Southeast/header.inc b/data/maps/SafariZone_Southeast/header.inc index f60a67472..9248fb679 100644 --- a/data/maps/SafariZone_Southeast/header.inc +++ b/data/maps/SafariZone_Southeast/header.inc @@ -5,10 +5,10 @@ SafariZone_Southeast:: @ 8307BFC .4byte SafariZone_Southeast_MapConnections .2byte MUS_SAFARI .2byte 242 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 - .byte 3 + .byte WEATHER_NONE + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SafariZone_Southwest/events.inc b/data/maps/SafariZone_Southwest/events.inc index 909997d64..7ac33182f 100644 --- a/data/maps/SafariZone_Southwest/events.inc +++ b/data/maps/SafariZone_Southwest/events.inc @@ -1,12 +1,12 @@ SafariZone_Southwest_EventObjects:: @ 8391B18 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 9, 3, 8, 0, 0, 0, 0, SafariZone_Southwest_EventScript_160024, 0 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, 1, 1, 1, 0, 0, SafariZone_Southwest_EventScript_1B1926, FLAG_ITEM_SAFARI_ZONE_SOUTHWEST + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 22, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SafariZone_Southwest_EventScript_160024, 0 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 0, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SafariZone_Southwest_EventScript_1B1926, FLAG_ITEM_SAFARI_ZONE_SOUTHWEST SafariZone_Southwest_MapWarps:: @ 8391B48 warp_def 29, 7, 3, 0, MAP_SAFARI_ZONE_REST_HOUSE SafariZone_Southwest_MapBGEvents:: @ 8391B50 - bg_event 32, 7, 3, 0, 0, SafariZone_Southwest_EventScript_16002D + bg_event 32, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SafariZone_Southwest_EventScript_16002D SafariZone_Southwest_MapEvents:: @ 8391B5C map_events SafariZone_Southwest_EventObjects, SafariZone_Southwest_MapWarps, 0x0, SafariZone_Southwest_MapBGEvents diff --git a/data/maps/SafariZone_Southwest/header.inc b/data/maps/SafariZone_Southwest/header.inc index 9a472f3ec..0af533fe7 100644 --- a/data/maps/SafariZone_Southwest/header.inc +++ b/data/maps/SafariZone_Southwest/header.inc @@ -5,10 +5,10 @@ SafariZone_Southwest:: @ 8307BE0 .4byte SafariZone_Southwest_MapConnections .2byte MUS_SAFARI .2byte 241 - .byte 57 + .byte MAPSEC_SAFARI_ZONE .byte 0 - .byte 0 - .byte 3 + .byte WEATHER_NONE + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ScorchedSlab/events.inc b/data/maps/ScorchedSlab/events.inc index a90403222..7643dcc1c 100644 --- a/data/maps/ScorchedSlab/events.inc +++ b/data/maps/ScorchedSlab/events.inc @@ -1,5 +1,5 @@ ScorchedSlab_EventObjects:: @ 838E988 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, 1, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, FLAG_ITEM_SCORCHED_SLAB_1 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 7, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, ScorchedSlab_EventScript_1B18FF, FLAG_ITEM_SCORCHED_SLAB_1 ScorchedSlab_MapWarps:: @ 838E9A0 warp_def 7, 16, 1, 1, MAP_ROUTE120 diff --git a/data/maps/ScorchedSlab/header.inc b/data/maps/ScorchedSlab/header.inc index 43b6b24b5..bf9ae56b0 100644 --- a/data/maps/ScorchedSlab/header.inc +++ b/data/maps/ScorchedSlab/header.inc @@ -5,10 +5,10 @@ ScorchedSlab:: @ 830756C .4byte 0x0 .2byte MUS_DAN01 .2byte 312 - .byte 80 + .byte MAPSEC_SCORCHED_SLAB .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Entrance/header.inc b/data/maps/SeafloorCavern_Entrance/header.inc index 4f48878a8..d1546c99f 100644 --- a/data/maps/SeafloorCavern_Entrance/header.inc +++ b/data/maps/SeafloorCavern_Entrance/header.inc @@ -5,10 +5,10 @@ SeafloorCavern_Entrance:: @ 8307064 .4byte 0x0 .2byte MUS_TOZAN .2byte 148 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room1/events.inc b/data/maps/SeafloorCavern_Room1/events.inc index cb6442135..f4ff3eb05 100644 --- a/data/maps/SeafloorCavern_Room1/events.inc +++ b/data/maps/SeafloorCavern_Room1/events.inc @@ -1,9 +1,9 @@ SeafloorCavern_Room1_EventObjects:: @ 838D0B8 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 8, 6, 3, 1, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_15DA6D, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN - object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 15, 10, 3, 16, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_15DA84, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 5, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_13 + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 8, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 1, 2, SeafloorCavern_Room1_EventScript_15DA6D, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN + object_event 5, EVENT_OBJ_GFX_VAR_1, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_UP_AND_RIGHT, 1, 1, 1, 3, SeafloorCavern_Room1_EventScript_15DA84, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN SeafloorCavern_Room1_MapWarps:: @ 838D130 warp_def 5, 18, 3, 1, MAP_SEAFLOOR_CAVERN_ENTRANCE diff --git a/data/maps/SeafloorCavern_Room1/header.inc b/data/maps/SeafloorCavern_Room1/header.inc index 411e65b1b..d7ded7e26 100644 --- a/data/maps/SeafloorCavern_Room1/header.inc +++ b/data/maps/SeafloorCavern_Room1/header.inc @@ -5,10 +5,10 @@ SeafloorCavern_Room1:: @ 8307080 .4byte 0x0 .2byte MUS_TOZAN .2byte 149 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room1/scripts.inc b/data/maps/SeafloorCavern_Room1/scripts.inc index 6478efac1..cd1513ec1 100644 --- a/data/maps/SeafloorCavern_Room1/scripts.inc +++ b/data/maps/SeafloorCavern_Room1/scripts.inc @@ -7,11 +7,11 @@ SeafloorCavern_Room1_MapScript1_15DA67:: @ 815DA67 end SeafloorCavern_Room1_EventScript_15DA6D:: @ 815DA6D - trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_1, 0, SeafloorCavern_Room1_Text_1974BA, SeafloorCavern_Room1_Text_1974EA + trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_1, 0, SeafloorCavern_Room1_Text_1974BA, SeafloorCavern_Room1_Text_1974EA msgbox SeafloorCavern_Room1_Text_1974FF, 6 end SeafloorCavern_Room1_EventScript_15DA84:: @ 815DA84 - trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_2, 0, SeafloorCavern_Room1_Text_19753C, SeafloorCavern_Room1_Text_197573 + trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_2, 0, SeafloorCavern_Room1_Text_19753C, SeafloorCavern_Room1_Text_197573 msgbox SeafloorCavern_Room1_Text_197589, 6 end diff --git a/data/maps/SeafloorCavern_Room2/events.inc b/data/maps/SeafloorCavern_Room2/events.inc index eefcffd2e..02edc38e3 100644 --- a/data/maps/SeafloorCavern_Room2/events.inc +++ b/data/maps/SeafloorCavern_Room2/events.inc @@ -1,13 +1,13 @@ SeafloorCavern_Room2_EventObjects:: @ 838D15C - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 14, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 - object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 9, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_18 - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 6, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 14, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 + object_event 7, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 11, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_18 + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 15, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 SeafloorCavern_Room2_MapWarps:: @ 838D234 warp_def 12, 19, 3, 2, MAP_SEAFLOOR_CAVERN_ROOM1 diff --git a/data/maps/SeafloorCavern_Room2/header.inc b/data/maps/SeafloorCavern_Room2/header.inc index a8e6ce80e..9ca4ef096 100644 --- a/data/maps/SeafloorCavern_Room2/header.inc +++ b/data/maps/SeafloorCavern_Room2/header.inc @@ -5,10 +5,10 @@ SeafloorCavern_Room2:: @ 830709C .4byte 0x0 .2byte MUS_TOZAN .2byte 150 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room3/events.inc b/data/maps/SeafloorCavern_Room3/events.inc index 5f8f769d3..7ee486f74 100644 --- a/data/maps/SeafloorCavern_Room3/events.inc +++ b/data/maps/SeafloorCavern_Room3/events.inc @@ -1,14 +1,14 @@ SeafloorCavern_Room3_EventObjects:: @ 838D268 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 13, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 12, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 9, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19 - object_event 10, EVENT_OBJ_GFX_VAR_2, 0, 10, 5, 3, 8, 1, 1, 1, 3, SeafloorCavern_Room3_EventScript_15DAA8, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 8, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19 + object_event 10, EVENT_OBJ_GFX_VAR_2, 0, 10, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 3, SeafloorCavern_Room3_EventScript_15DAA8, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN SeafloorCavern_Room3_MapWarps:: @ 838D358 warp_def 8, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM8 diff --git a/data/maps/SeafloorCavern_Room3/header.inc b/data/maps/SeafloorCavern_Room3/header.inc index b062079b7..b17c3014d 100644 --- a/data/maps/SeafloorCavern_Room3/header.inc +++ b/data/maps/SeafloorCavern_Room3/header.inc @@ -5,10 +5,10 @@ SeafloorCavern_Room3:: @ 83070B8 .4byte 0x0 .2byte MUS_TOZAN .2byte 151 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room3/scripts.inc b/data/maps/SeafloorCavern_Room3/scripts.inc index 2ff8c4b26..57f2bc20a 100644 --- a/data/maps/SeafloorCavern_Room3/scripts.inc +++ b/data/maps/SeafloorCavern_Room3/scripts.inc @@ -7,6 +7,6 @@ SeafloorCavern_Room3_MapScript1_15DAA2:: @ 815DAA2 end SeafloorCavern_Room3_EventScript_15DAA8:: @ 815DAA8 - trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_3, 0, SeafloorCavern_Room3_Text_1975DC, SeafloorCavern_Room3_Text_1976F3 + trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_3, 0, SeafloorCavern_Room3_Text_1975DC, SeafloorCavern_Room3_Text_1976F3 msgbox SeafloorCavern_Room3_Text_197704, 6 end diff --git a/data/maps/SeafloorCavern_Room4/events.inc b/data/maps/SeafloorCavern_Room4/events.inc index a31f0f5d8..a1e3f8326 100644 --- a/data/maps/SeafloorCavern_Room4/events.inc +++ b/data/maps/SeafloorCavern_Room4/events.inc @@ -1,5 +1,5 @@ SeafloorCavern_Room4_EventObjects:: @ 838D384 - object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, 23, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_15DACB, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN + object_event 1, EVENT_OBJ_GFX_VAR_1, 0, 4, 8, 3, MOVEMENT_TYPE_ROTATE_COUNTERCLOCKWISE, 1, 1, 1, 3, SeafloorCavern_Room4_EventScript_15DACB, FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN SeafloorCavern_Room4_MapWarps:: @ 838D39C warp_def 13, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM2 diff --git a/data/maps/SeafloorCavern_Room4/header.inc b/data/maps/SeafloorCavern_Room4/header.inc index bee900fed..6c74fd3cc 100644 --- a/data/maps/SeafloorCavern_Room4/header.inc +++ b/data/maps/SeafloorCavern_Room4/header.inc @@ -5,10 +5,10 @@ SeafloorCavern_Room4:: @ 83070D4 .4byte 0x0 .2byte MUS_TOZAN .2byte 152 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room4/scripts.inc b/data/maps/SeafloorCavern_Room4/scripts.inc index cbed797c0..8f53d948c 100644 --- a/data/maps/SeafloorCavern_Room4/scripts.inc +++ b/data/maps/SeafloorCavern_Room4/scripts.inc @@ -7,6 +7,6 @@ SeafloorCavern_Room4_MapScript1_15DAC5:: @ 815DAC5 end SeafloorCavern_Room4_EventScript_15DACB:: @ 815DACB - trainerbattle 0, OPPONENT_SEAFLOOR_CAVERN_GRUNT_4, 0, SeafloorCavern_Room4_Text_1977B9, SeafloorCavern_Room4_Text_1977E2 + trainerbattle 0, TRAINER_SEAFLOOR_CAVERN_GRUNT_4, 0, SeafloorCavern_Room4_Text_1977B9, SeafloorCavern_Room4_Text_1977E2 msgbox SeafloorCavern_Room4_Text_1977ED, 6 end diff --git a/data/maps/SeafloorCavern_Room5/events.inc b/data/maps/SeafloorCavern_Room5/events.inc index 767fa6dc1..b14c5cdf4 100644 --- a/data/maps/SeafloorCavern_Room5/events.inc +++ b/data/maps/SeafloorCavern_Room5/events.inc @@ -1,10 +1,10 @@ SeafloorCavern_Room5_EventObjects:: @ 838D3D0 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15 - object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 11, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 11, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 4, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 3, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_15 + object_event 5, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_16 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 SeafloorCavern_Room5_MapWarps:: @ 838D460 warp_def 4, 1, 3, 1, MAP_SEAFLOOR_CAVERN_ROOM1 diff --git a/data/maps/SeafloorCavern_Room5/header.inc b/data/maps/SeafloorCavern_Room5/header.inc index 9e7560fe2..9fd274f4f 100644 --- a/data/maps/SeafloorCavern_Room5/header.inc +++ b/data/maps/SeafloorCavern_Room5/header.inc @@ -5,10 +5,10 @@ SeafloorCavern_Room5:: @ 83070F0 .4byte 0x0 .2byte MUS_TOZAN .2byte 153 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room6/header.inc b/data/maps/SeafloorCavern_Room6/header.inc index 0b9fdb9d1..e44ba4e24 100644 --- a/data/maps/SeafloorCavern_Room6/header.inc +++ b/data/maps/SeafloorCavern_Room6/header.inc @@ -5,10 +5,10 @@ SeafloorCavern_Room6:: @ 830710C .4byte 0x0 .2byte MUS_TOZAN .2byte 154 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room7/header.inc b/data/maps/SeafloorCavern_Room7/header.inc index ee640a183..dbf39c935 100644 --- a/data/maps/SeafloorCavern_Room7/header.inc +++ b/data/maps/SeafloorCavern_Room7/header.inc @@ -5,10 +5,10 @@ SeafloorCavern_Room7:: @ 8307128 .4byte 0x0 .2byte MUS_TOZAN .2byte 155 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room8/events.inc b/data/maps/SeafloorCavern_Room8/events.inc index 450eb894a..080e6c8f5 100644 --- a/data/maps/SeafloorCavern_Room8/events.inc +++ b/data/maps/SeafloorCavern_Room8/events.inc @@ -1,16 +1,16 @@ SeafloorCavern_Room8_EventObjects:: @ 838D4DC - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 - object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18 - object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19 - object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A - object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B - object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1C + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_15 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 + object_event 8, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_18 + object_event 9, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 3, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_19 + object_event 10, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1A + object_event 11, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 6, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1B + object_event 12, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1C SeafloorCavern_Room8_MapWarps:: @ 838D5FC warp_def 5, 2, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM9 diff --git a/data/maps/SeafloorCavern_Room8/header.inc b/data/maps/SeafloorCavern_Room8/header.inc index 43ff7baa4..6ffb91ee2 100644 --- a/data/maps/SeafloorCavern_Room8/header.inc +++ b/data/maps/SeafloorCavern_Room8/header.inc @@ -5,10 +5,10 @@ SeafloorCavern_Room8:: @ 8307144 .4byte 0x0 .2byte MUS_TOZAN .2byte 156 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room9/events.inc b/data/maps/SeafloorCavern_Room9/events.inc index f4efdbcc0..b68acc7da 100644 --- a/data/maps/SeafloorCavern_Room9/events.inc +++ b/data/maps/SeafloorCavern_Room9/events.inc @@ -1,17 +1,17 @@ SeafloorCavern_Room9_EventObjects:: @ 838D620 - object_event 1, EVENT_OBJ_GFX_VAR_8, 0, 17, 38, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN - object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN - object_event 3, EVENT_OBJ_GFX_VAR_7, 0, 9, 42, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN - object_event 4, EVENT_OBJ_GFX_VAR_4, 0, 8, 41, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN - object_event 5, EVENT_OBJ_GFX_VAR_5, 0, 8, 42, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, 1, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1 - object_event 7, EVENT_OBJ_GFX_VAR_9, 0, 17, 38, 3, 8, 1, 1, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN + object_event 1, EVENT_OBJ_GFX_VAR_8, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN + object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN + object_event 3, EVENT_OBJ_GFX_VAR_7, 0, 9, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN + object_event 4, EVENT_OBJ_GFX_VAR_4, 0, 8, 41, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN + object_event 5, EVENT_OBJ_GFX_VAR_5, 0, 8, 42, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 14, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SeafloorCavern_Room9_EventScript_1B1A37, FLAG_ITEM_SEAFLOOR_CAVERN_ROOM_9_1 + object_event 7, EVENT_OBJ_GFX_VAR_9, 0, 17, 38, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_SLEEPING_MON_SEAFLOOR_CAVERN SeafloorCavern_Room9_MapWarps:: @ 838D6C8 warp_def 5, 4, 3, 0, MAP_SEAFLOOR_CAVERN_ROOM8 SeafloorCavern_Room9_MapCoordEvents:: @ 838D6D0 - coord_event 17, 42, 3, 0, VAR_SEAFLOOR_CAVERN_STATE, 0, 0, SeafloorCavern_Room9_EventScript_15DAFA + coord_event 17, 42, 3, VAR_SEAFLOOR_CAVERN_STATE, 0, SeafloorCavern_Room9_EventScript_15DAFA SeafloorCavern_Room9_MapEvents:: @ 838D6E0 map_events SeafloorCavern_Room9_EventObjects, SeafloorCavern_Room9_MapWarps, SeafloorCavern_Room9_MapCoordEvents, 0x0 diff --git a/data/maps/SeafloorCavern_Room9/header.inc b/data/maps/SeafloorCavern_Room9/header.inc index c45181c89..1ff4e0783 100644 --- a/data/maps/SeafloorCavern_Room9/header.inc +++ b/data/maps/SeafloorCavern_Room9/header.inc @@ -5,10 +5,10 @@ SeafloorCavern_Room9:: @ 8307160 .4byte 0x0 .2byte MUS_TOZAN .2byte 157 - .byte 68 + .byte MAPSEC_SEAFLOOR_CAVERN .byte 0 - .byte 6 - .byte 4 + .byte WEATHER_FOG_1 + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 74d624141..d50a591f7 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -53,9 +53,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B491F, 4 .endif .ifdef SAPPHIRE - trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, UnknownString_81B4319 + trainerbattle 3, TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 0, UnknownString_81B4319 .else - trainerbattle 3, OPPONENT_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE + trainerbattle 3, TRAINER_SEAFLOOR_CAVERN_GRUNT_5, 0, SeafloorCavern_Room9_Text_1B49AE .endif .ifdef SAPPHIRE msgbox UnknownString_81B432C, 4 diff --git a/data/maps/SealedChamber_InnerRoom/events.inc b/data/maps/SealedChamber_InnerRoom/events.inc index a457a4e03..e84f52269 100644 --- a/data/maps/SealedChamber_InnerRoom/events.inc +++ b/data/maps/SealedChamber_InnerRoom/events.inc @@ -2,15 +2,15 @@ SealedChamber_InnerRoom_MapWarps:: @ 838E900 warp_def 10, 19, 3, 0, MAP_SEALED_CHAMBER_OUTER_ROOM SealedChamber_InnerRoom_MapBGEvents:: @ 838E908 - bg_event 10, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 - bg_event 6, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F249 - bg_event 14, 8, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F257 - bg_event 4, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F265 - bg_event 16, 13, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F273 - bg_event 6, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F281 - bg_event 14, 18, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F28F - bg_event 9, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 - bg_event 11, 4, 0, 0, 0, SealedChamber_InnerRoom_EventScript_15F1E8 + bg_event 10, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F1E8 + bg_event 6, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F249 + bg_event 14, 8, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F257 + bg_event 4, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F265 + bg_event 16, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F273 + bg_event 6, 18, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F281 + bg_event 14, 18, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F28F + bg_event 9, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F1E8 + bg_event 11, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_InnerRoom_EventScript_15F1E8 SealedChamber_InnerRoom_MapEvents:: @ 838E974 map_events 0x0, SealedChamber_InnerRoom_MapWarps, 0x0, SealedChamber_InnerRoom_MapBGEvents diff --git a/data/maps/SealedChamber_InnerRoom/header.inc b/data/maps/SealedChamber_InnerRoom/header.inc index d919de498..b54bec825 100644 --- a/data/maps/SealedChamber_InnerRoom/header.inc +++ b/data/maps/SealedChamber_InnerRoom/header.inc @@ -5,10 +5,10 @@ SealedChamber_InnerRoom:: @ 8307550 .4byte 0x0 .2byte MUS_MABOROSI .2byte 305 - .byte 78 + .byte MAPSEC_SEALED_CHAMBER .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SealedChamber_OuterRoom/events.inc b/data/maps/SealedChamber_OuterRoom/events.inc index 634f41f60..c102f86d8 100644 --- a/data/maps/SealedChamber_OuterRoom/events.inc +++ b/data/maps/SealedChamber_OuterRoom/events.inc @@ -2,35 +2,35 @@ SealedChamber_OuterRoom_MapWarps:: @ 838E788 warp_def 10, 2, 3, 0, MAP_SEALED_CHAMBER_INNER_ROOM SealedChamber_OuterRoom_MapBGEvents:: @ 838E790 - bg_event 5, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C - bg_event 5, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F13A - bg_event 5, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F148 - bg_event 5, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F156 - bg_event 11, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F164 - bg_event 11, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F172 - bg_event 11, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F180 - bg_event 11, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F19C - bg_event 16, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F18E - bg_event 16, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1AA - bg_event 10, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1B8 - bg_event 6, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C - bg_event 4, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F12C - bg_event 4, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F13A - bg_event 6, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F13A - bg_event 4, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F148 - bg_event 6, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F148 - bg_event 4, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F156 - bg_event 6, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F156 - bg_event 10, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F164 - bg_event 12, 6, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F164 - bg_event 10, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F172 - bg_event 12, 9, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F172 - bg_event 10, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F180 - bg_event 12, 12, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F180 - bg_event 10, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F19C - bg_event 12, 15, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F19C - bg_event 9, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1D9 - bg_event 11, 2, 0, 0, 0, SealedChamber_OuterRoom_EventScript_15F1D9 + bg_event 5, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F12C + bg_event 5, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F13A + bg_event 5, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F148 + bg_event 5, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F156 + bg_event 11, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F164 + bg_event 11, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F172 + bg_event 11, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F180 + bg_event 11, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F19C + bg_event 16, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F18E + bg_event 16, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F1AA + bg_event 10, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F1B8 + bg_event 6, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F12C + bg_event 4, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F12C + bg_event 4, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F13A + bg_event 6, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F13A + bg_event 4, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F148 + bg_event 6, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F148 + bg_event 4, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F156 + bg_event 6, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F156 + bg_event 10, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F164 + bg_event 12, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F164 + bg_event 10, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F172 + bg_event 12, 9, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F172 + bg_event 10, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F180 + bg_event 12, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F180 + bg_event 10, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F19C + bg_event 12, 15, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F19C + bg_event 9, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F1D9 + bg_event 11, 2, 0, BG_EVENT_PLAYER_FACING_ANY, SealedChamber_OuterRoom_EventScript_15F1D9 SealedChamber_OuterRoom_MapEvents:: @ 838E8EC map_events 0x0, SealedChamber_OuterRoom_MapWarps, 0x0, SealedChamber_OuterRoom_MapBGEvents diff --git a/data/maps/SealedChamber_OuterRoom/header.inc b/data/maps/SealedChamber_OuterRoom/header.inc index f40159b44..61c2a0da6 100644 --- a/data/maps/SealedChamber_OuterRoom/header.inc +++ b/data/maps/SealedChamber_OuterRoom/header.inc @@ -5,10 +5,10 @@ SealedChamber_OuterRoom:: @ 8307534 .4byte 0x0 .2byte MUS_MABOROSI .2byte 285 - .byte 78 + .byte MAPSEC_SEALED_CHAMBER .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SecretBase_BlueCave1/events.inc b/data/maps/SecretBase_BlueCave1/events.inc index 7f883e7e9..945c13138 100644 --- a/data/maps/SecretBase_BlueCave1/events.inc +++ b/data/maps/SecretBase_BlueCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave1_EventObjects:: @ 838F18C - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 4, 2, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave1_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_BlueCave1_MapWarps:: @ 838F2F4 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BlueCave1/header.inc b/data/maps/SecretBase_BlueCave1/header.inc index 08ab9ab97..f71c4beb5 100644 --- a/data/maps/SecretBase_BlueCave1/header.inc +++ b/data/maps/SecretBase_BlueCave1/header.inc @@ -5,10 +5,10 @@ SecretBase_BlueCave1:: @ 8307710 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 200 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BlueCave2/events.inc b/data/maps/SecretBase_BlueCave2/events.inc index 93e7b67f8..91cfeb26f 100644 --- a/data/maps/SecretBase_BlueCave2/events.inc +++ b/data/maps/SecretBase_BlueCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave2_EventObjects:: @ 838FAA4 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_BlueCave2_MapWarps:: @ 838FC0C warp_def 7, 5, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BlueCave2/header.inc b/data/maps/SecretBase_BlueCave2/header.inc index 89546ddaf..158567787 100644 --- a/data/maps/SecretBase_BlueCave2/header.inc +++ b/data/maps/SecretBase_BlueCave2/header.inc @@ -5,10 +5,10 @@ SecretBase_BlueCave2:: @ 83077B8 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 206 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BlueCave3/events.inc b/data/maps/SecretBase_BlueCave3/events.inc index bb761d2e8..51df3d661 100644 --- a/data/maps/SecretBase_BlueCave3/events.inc +++ b/data/maps/SecretBase_BlueCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave3_EventObjects:: @ 83903BC - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave3_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_BlueCave3_MapWarps:: @ 8390524 warp_def 4, 15, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BlueCave3/header.inc b/data/maps/SecretBase_BlueCave3/header.inc index 67df8c009..5b7b644f4 100644 --- a/data/maps/SecretBase_BlueCave3/header.inc +++ b/data/maps/SecretBase_BlueCave3/header.inc @@ -5,10 +5,10 @@ SecretBase_BlueCave3:: @ 8307860 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 212 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BlueCave4/events.inc b/data/maps/SecretBase_BlueCave4/events.inc index 082600bec..6adf080fe 100644 --- a/data/maps/SecretBase_BlueCave4/events.inc +++ b/data/maps/SecretBase_BlueCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_BlueCave4_EventObjects:: @ 8390CD4 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 13, 3, 8, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 13, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BlueCave4_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_BlueCave4_MapWarps:: @ 8390E3C warp_def 4, 15, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BlueCave4/header.inc b/data/maps/SecretBase_BlueCave4/header.inc index 7cf1ed137..eb49d9372 100644 --- a/data/maps/SecretBase_BlueCave4/header.inc +++ b/data/maps/SecretBase_BlueCave4/header.inc @@ -5,10 +5,10 @@ SecretBase_BlueCave4:: @ 8307908 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 218 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BrownCave1/events.inc b/data/maps/SecretBase_BrownCave1/events.inc index c3219bf43..ad4d84b85 100644 --- a/data/maps/SecretBase_BrownCave1/events.inc +++ b/data/maps/SecretBase_BrownCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave1_EventObjects:: @ 838F008 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave1_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_BrownCave1_MapWarps:: @ 838F170 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave1/header.inc b/data/maps/SecretBase_BrownCave1/header.inc index b6d298eb9..44a2a8f2a 100644 --- a/data/maps/SecretBase_BrownCave1/header.inc +++ b/data/maps/SecretBase_BrownCave1/header.inc @@ -5,10 +5,10 @@ SecretBase_BrownCave1:: @ 83076F4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 199 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BrownCave2/events.inc b/data/maps/SecretBase_BrownCave2/events.inc index e57348a00..88616c152 100644 --- a/data/maps/SecretBase_BrownCave2/events.inc +++ b/data/maps/SecretBase_BrownCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave2_EventObjects:: @ 838F920 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 11, 2, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 11, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_BrownCave2_MapWarps:: @ 838FA88 warp_def 1, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave2/header.inc b/data/maps/SecretBase_BrownCave2/header.inc index 3a50de1fa..5f9c5285e 100644 --- a/data/maps/SecretBase_BrownCave2/header.inc +++ b/data/maps/SecretBase_BrownCave2/header.inc @@ -5,10 +5,10 @@ SecretBase_BrownCave2:: @ 830779C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 205 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BrownCave3/events.inc b/data/maps/SecretBase_BrownCave3/events.inc index c1003816a..109aa9183 100644 --- a/data/maps/SecretBase_BrownCave3/events.inc +++ b/data/maps/SecretBase_BrownCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave3_EventObjects:: @ 8390238 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 7, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave3_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_BrownCave3_MapWarps:: @ 83903A0 warp_def 11, 9, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave3/header.inc b/data/maps/SecretBase_BrownCave3/header.inc index 4da609d11..f46cac8fb 100644 --- a/data/maps/SecretBase_BrownCave3/header.inc +++ b/data/maps/SecretBase_BrownCave3/header.inc @@ -5,10 +5,10 @@ SecretBase_BrownCave3:: @ 8307844 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 211 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_BrownCave4/events.inc b/data/maps/SecretBase_BrownCave4/events.inc index 02afc20c4..b88734f71 100644 --- a/data/maps/SecretBase_BrownCave4/events.inc +++ b/data/maps/SecretBase_BrownCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_BrownCave4_EventObjects:: @ 8390B50 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, 8, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 2, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_BrownCave4_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_BrownCave4_MapWarps:: @ 8390CB8 warp_def 2, 8, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_BrownCave4/header.inc b/data/maps/SecretBase_BrownCave4/header.inc index 471b29596..5fafbccbc 100644 --- a/data/maps/SecretBase_BrownCave4/header.inc +++ b/data/maps/SecretBase_BrownCave4/header.inc @@ -5,10 +5,10 @@ SecretBase_BrownCave4:: @ 83078EC .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 217 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_RedCave1/events.inc b/data/maps/SecretBase_RedCave1/events.inc index 18fea4c40..8dee80036 100644 --- a/data/maps/SecretBase_RedCave1/events.inc +++ b/data/maps/SecretBase_RedCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave1_EventObjects:: @ 838EE84 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 4, 3, 8, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave1_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_RedCave1_MapWarps:: @ 838EFEC warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave1/header.inc b/data/maps/SecretBase_RedCave1/header.inc index 6508fe62a..3fc42eea8 100644 --- a/data/maps/SecretBase_RedCave1/header.inc +++ b/data/maps/SecretBase_RedCave1/header.inc @@ -5,10 +5,10 @@ SecretBase_RedCave1:: @ 83076D8 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 198 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_RedCave2/events.inc b/data/maps/SecretBase_RedCave2/events.inc index 1d9bdde09..f13e0ee48 100644 --- a/data/maps/SecretBase_RedCave2/events.inc +++ b/data/maps/SecretBase_RedCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave2_EventObjects:: @ 838F79C - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_RedCave2_MapWarps:: @ 838F904 warp_def 3, 14, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave2/header.inc b/data/maps/SecretBase_RedCave2/header.inc index f4c61d108..ed8addd52 100644 --- a/data/maps/SecretBase_RedCave2/header.inc +++ b/data/maps/SecretBase_RedCave2/header.inc @@ -5,10 +5,10 @@ SecretBase_RedCave2:: @ 8307780 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 204 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_RedCave3/events.inc b/data/maps/SecretBase_RedCave3/events.inc index 923616945..d3701ae77 100644 --- a/data/maps/SecretBase_RedCave3/events.inc +++ b/data/maps/SecretBase_RedCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave3_EventObjects:: @ 83900B4 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 12, 1, 3, 8, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 12, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave3_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_RedCave3_MapWarps:: @ 839021C warp_def 3, 6, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave3/header.inc b/data/maps/SecretBase_RedCave3/header.inc index 681f4c403..027067c47 100644 --- a/data/maps/SecretBase_RedCave3/header.inc +++ b/data/maps/SecretBase_RedCave3/header.inc @@ -5,10 +5,10 @@ SecretBase_RedCave3:: @ 8307828 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 210 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_RedCave4/events.inc b/data/maps/SecretBase_RedCave4/events.inc index 25a0f2ec6..438e6606f 100644 --- a/data/maps/SecretBase_RedCave4/events.inc +++ b/data/maps/SecretBase_RedCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_RedCave4_EventObjects:: @ 83909CC - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 8, 3, 8, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_RedCave4_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_RedCave4_MapWarps:: @ 8390B34 warp_def 2, 12, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_RedCave4/header.inc b/data/maps/SecretBase_RedCave4/header.inc index 77b6e06a7..b44756fba 100644 --- a/data/maps/SecretBase_RedCave4/header.inc +++ b/data/maps/SecretBase_RedCave4/header.inc @@ -5,10 +5,10 @@ SecretBase_RedCave4:: @ 83078D0 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 216 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Shrub1/events.inc b/data/maps/SecretBase_Shrub1/events.inc index e1583e86d..07deae47f 100644 --- a/data/maps/SecretBase_Shrub1/events.inc +++ b/data/maps/SecretBase_Shrub1/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub1_EventObjects:: @ 838F618 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub1_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_Shrub1_MapWarps:: @ 838F780 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub1/header.inc b/data/maps/SecretBase_Shrub1/header.inc index cc85dea9e..e882abdf5 100644 --- a/data/maps/SecretBase_Shrub1/header.inc +++ b/data/maps/SecretBase_Shrub1/header.inc @@ -5,10 +5,10 @@ SecretBase_Shrub1:: @ 8307764 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 203 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Shrub2/events.inc b/data/maps/SecretBase_Shrub2/events.inc index 72bdcc380..f1317d44f 100644 --- a/data/maps/SecretBase_Shrub2/events.inc +++ b/data/maps/SecretBase_Shrub2/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub2_EventObjects:: @ 838FF30 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 13, 2, 3, 8, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 13, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_Shrub2_MapWarps:: @ 8390098 warp_def 7, 5, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub2/header.inc b/data/maps/SecretBase_Shrub2/header.inc index 932fcaca5..4f456a00e 100644 --- a/data/maps/SecretBase_Shrub2/header.inc +++ b/data/maps/SecretBase_Shrub2/header.inc @@ -5,10 +5,10 @@ SecretBase_Shrub2:: @ 830780C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 209 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Shrub3/events.inc b/data/maps/SecretBase_Shrub3/events.inc index b09c206e7..da09c9853 100644 --- a/data/maps/SecretBase_Shrub3/events.inc +++ b/data/maps/SecretBase_Shrub3/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub3_EventObjects:: @ 8390848 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub3_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_Shrub3_MapWarps:: @ 83909B0 warp_def 6, 9, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub3/header.inc b/data/maps/SecretBase_Shrub3/header.inc index a3a660338..042dfcd24 100644 --- a/data/maps/SecretBase_Shrub3/header.inc +++ b/data/maps/SecretBase_Shrub3/header.inc @@ -5,10 +5,10 @@ SecretBase_Shrub3:: @ 83078B4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 215 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Shrub4/events.inc b/data/maps/SecretBase_Shrub4/events.inc index a9f636e54..d64c9a37e 100644 --- a/data/maps/SecretBase_Shrub4/events.inc +++ b/data/maps/SecretBase_Shrub4/events.inc @@ -1,19 +1,19 @@ SecretBase_Shrub4_EventObjects:: @ 8391160 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 7, 3, 8, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Shrub4_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_Shrub4_MapWarps:: @ 83912C8 warp_def 11, 8, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Shrub4/header.inc b/data/maps/SecretBase_Shrub4/header.inc index 0966db367..9c3759686 100644 --- a/data/maps/SecretBase_Shrub4/header.inc +++ b/data/maps/SecretBase_Shrub4/header.inc @@ -5,10 +5,10 @@ SecretBase_Shrub4:: @ 830795C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 221 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Tree1/events.inc b/data/maps/SecretBase_Tree1/events.inc index 467789f32..fdc9dae5a 100644 --- a/data/maps/SecretBase_Tree1/events.inc +++ b/data/maps/SecretBase_Tree1/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree1_EventObjects:: @ 838F494 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 5, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree1_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_Tree1_MapWarps:: @ 838F5FC warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree1/header.inc b/data/maps/SecretBase_Tree1/header.inc index 1d0ce9509..48feee2e2 100644 --- a/data/maps/SecretBase_Tree1/header.inc +++ b/data/maps/SecretBase_Tree1/header.inc @@ -5,10 +5,10 @@ SecretBase_Tree1:: @ 8307748 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 202 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Tree2/events.inc b/data/maps/SecretBase_Tree2/events.inc index ef2280e01..0f4bfa258 100644 --- a/data/maps/SecretBase_Tree2/events.inc +++ b/data/maps/SecretBase_Tree2/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree2_EventObjects:: @ 838FDAC - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_Tree2_MapWarps:: @ 838FF14 warp_def 3, 14, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree2/header.inc b/data/maps/SecretBase_Tree2/header.inc index 7138440cd..6ba123707 100644 --- a/data/maps/SecretBase_Tree2/header.inc +++ b/data/maps/SecretBase_Tree2/header.inc @@ -5,10 +5,10 @@ SecretBase_Tree2:: @ 83077F0 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 208 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Tree3/events.inc b/data/maps/SecretBase_Tree3/events.inc index 25bc95466..4c85b7f94 100644 --- a/data/maps/SecretBase_Tree3/events.inc +++ b/data/maps/SecretBase_Tree3/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree3_EventObjects:: @ 83906C4 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 2, 3, 8, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree3_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_Tree3_MapWarps:: @ 839082C warp_def 8, 6, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree3/header.inc b/data/maps/SecretBase_Tree3/header.inc index d3f49d3e0..a3d1c4adc 100644 --- a/data/maps/SecretBase_Tree3/header.inc +++ b/data/maps/SecretBase_Tree3/header.inc @@ -5,10 +5,10 @@ SecretBase_Tree3:: @ 8307898 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 214 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_Tree4/events.inc b/data/maps/SecretBase_Tree4/events.inc index 6f0e5b3b5..ae56d68e7 100644 --- a/data/maps/SecretBase_Tree4/events.inc +++ b/data/maps/SecretBase_Tree4/events.inc @@ -1,19 +1,19 @@ SecretBase_Tree4_EventObjects:: @ 8390FDC - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 10, 9, 3, 8, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 10, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_Tree4_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_Tree4_MapWarps:: @ 8391144 warp_def 7, 12, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_Tree4/header.inc b/data/maps/SecretBase_Tree4/header.inc index 53a723432..b592d8f7c 100644 --- a/data/maps/SecretBase_Tree4/header.inc +++ b/data/maps/SecretBase_Tree4/header.inc @@ -5,10 +5,10 @@ SecretBase_Tree4:: @ 8307940 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 220 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_YellowCave1/events.inc b/data/maps/SecretBase_YellowCave1/events.inc index 930cbc21d..795377ecc 100644 --- a/data/maps/SecretBase_YellowCave1/events.inc +++ b/data/maps/SecretBase_YellowCave1/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave1_EventObjects:: @ 838F310 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 3, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave1_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_YellowCave1_MapWarps:: @ 838F478 warp_def 5, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave1/header.inc b/data/maps/SecretBase_YellowCave1/header.inc index ecf3d4ea2..ea7d42c54 100644 --- a/data/maps/SecretBase_YellowCave1/header.inc +++ b/data/maps/SecretBase_YellowCave1/header.inc @@ -5,10 +5,10 @@ SecretBase_YellowCave1:: @ 830772C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 201 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_YellowCave2/events.inc b/data/maps/SecretBase_YellowCave2/events.inc index fd3e265e5..894e7e89a 100644 --- a/data/maps/SecretBase_YellowCave2/events.inc +++ b/data/maps/SecretBase_YellowCave2/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave2_EventObjects:: @ 838FC28 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave2_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_YellowCave2_MapWarps:: @ 838FD90 warp_def 12, 7, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave2/header.inc b/data/maps/SecretBase_YellowCave2/header.inc index cbee83030..9171e74d2 100644 --- a/data/maps/SecretBase_YellowCave2/header.inc +++ b/data/maps/SecretBase_YellowCave2/header.inc @@ -5,10 +5,10 @@ SecretBase_YellowCave2:: @ 83077D4 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 207 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_YellowCave3/events.inc b/data/maps/SecretBase_YellowCave3/events.inc index 99f0ae8b4..939cd3a17 100644 --- a/data/maps/SecretBase_YellowCave3/events.inc +++ b/data/maps/SecretBase_YellowCave3/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave3_EventObjects:: @ 8390540 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 5, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave3_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_YellowCave3_MapWarps:: @ 83906A8 warp_def 5, 9, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave3/header.inc b/data/maps/SecretBase_YellowCave3/header.inc index cea1c9175..a688172b5 100644 --- a/data/maps/SecretBase_YellowCave3/header.inc +++ b/data/maps/SecretBase_YellowCave3/header.inc @@ -5,10 +5,10 @@ SecretBase_YellowCave3:: @ 830787C .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 213 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SecretBase_YellowCave4/events.inc b/data/maps/SecretBase_YellowCave4/events.inc index af59e0067..369205b90 100644 --- a/data/maps/SecretBase_YellowCave4/events.inc +++ b/data/maps/SecretBase_YellowCave4/events.inc @@ -1,19 +1,19 @@ SecretBase_YellowCave4_EventObjects:: @ 8390E58 - object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 8, 3, 8, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, FLAG_DECORATION_1 - object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 - object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 - object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 - object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 - object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 - object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 - object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 - object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 - object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 - object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 - object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 - object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 - object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, 8, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 + object_event 1, EVENT_OBJ_GFX_VAR_F, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SecretBase_YellowCave4_EventScript_1A2FC0, FLAG_DECORATION_1 + object_event 2, EVENT_OBJ_GFX_VAR_0, 0, 0, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_2 + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 0, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_3 + object_event 4, EVENT_OBJ_GFX_VAR_2, 0, 0, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_4 + object_event 5, EVENT_OBJ_GFX_VAR_3, 0, 0, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_5 + object_event 6, EVENT_OBJ_GFX_VAR_4, 0, 0, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_6 + object_event 7, EVENT_OBJ_GFX_VAR_5, 0, 0, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_7 + object_event 8, EVENT_OBJ_GFX_VAR_6, 0, 0, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_8 + object_event 9, EVENT_OBJ_GFX_VAR_7, 0, 1, 0, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_9 + object_event 10, EVENT_OBJ_GFX_VAR_8, 0, 1, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_10 + object_event 11, EVENT_OBJ_GFX_VAR_9, 0, 1, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_11 + object_event 12, EVENT_OBJ_GFX_VAR_A, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_12 + object_event 13, EVENT_OBJ_GFX_VAR_B, 0, 1, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_13 + object_event 14, EVENT_OBJ_GFX_VAR_C, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_14 + object_event 15, EVENT_OBJ_GFX_VAR_D, 0, 1, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_DECORATION_15 SecretBase_YellowCave4_MapWarps:: @ 8390FC0 warp_def 6, 12, 0, 126, MAP_NONE diff --git a/data/maps/SecretBase_YellowCave4/header.inc b/data/maps/SecretBase_YellowCave4/header.inc index e744080bd..0d10b3062 100644 --- a/data/maps/SecretBase_YellowCave4/header.inc +++ b/data/maps/SecretBase_YellowCave4/header.inc @@ -5,10 +5,10 @@ SecretBase_YellowCave4:: @ 8307924 .4byte 0x0 .2byte MUS_MACHI_S3 .2byte 219 - .byte 86 + .byte MAPSEC_SECRET_BASE .byte 0 - .byte 0 - .byte 9 + .byte WEATHER_NONE + .byte MAP_TYPE_SECRET_BASE .2byte 0 .byte 1 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc index 16287338d..975453341 100644 --- a/data/maps/ShoalCave_HighTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_HighTideEntranceRoom/header.inc @@ -5,10 +5,10 @@ ShoalCave_HighTideEntranceRoom:: @ 83072E8 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 169 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_HighTideInnerRoom/header.inc b/data/maps/ShoalCave_HighTideInnerRoom/header.inc index 63bb3f47e..56e5d229f 100644 --- a/data/maps/ShoalCave_HighTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_HighTideInnerRoom/header.inc @@ -5,10 +5,10 @@ ShoalCave_HighTideInnerRoom:: @ 8307304 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 170 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc index fe4a2eae9..a043bbe68 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/events.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/events.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideEntranceRoom_EventObjects:: @ 838DCDC - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_1B19F6, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 18, 15, 3, 9, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_15E076, 0 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 30, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_1B19F6, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ENTRANCE_1 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 18, 15, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, ShoalCave_LowTideEntranceRoom_EventScript_15E076, 0 ShoalCave_LowTideEntranceRoom_MapWarps:: @ 838DD0C warp_def 20, 30, 3, 0, MAP_ROUTE125 diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc index 05cac9619..f95032396 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/header.inc @@ -5,10 +5,10 @@ ShoalCave_LowTideEntranceRoom:: @ 8307278 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 165 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideIceRoom/events.inc b/data/maps/ShoalCave_LowTideIceRoom/events.inc index 87d291c40..d6d8cbdb0 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/events.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/events.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideIceRoom_EventObjects:: @ 838EDE0 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A1D, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1 - object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, 1, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_2 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A1D, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_1 + object_event 2, EVENT_OBJ_GFX_ITEM_BALL, 0, 12, 21, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideIceRoom_EventScript_1B1A2A, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_ICE_ROOM_2 ShoalCave_LowTideIceRoom_MapWarps:: @ 838EE10 warp_def 17, 10, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_LOWER_ROOM diff --git a/data/maps/ShoalCave_LowTideIceRoom/header.inc b/data/maps/ShoalCave_LowTideIceRoom/header.inc index 3cc9967fb..eaa49b671 100644 --- a/data/maps/ShoalCave_LowTideIceRoom/header.inc +++ b/data/maps/ShoalCave_LowTideIceRoom/header.inc @@ -5,10 +5,10 @@ ShoalCave_LowTideIceRoom:: @ 8307684 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 329 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideInnerRoom/events.inc b/data/maps/ShoalCave_LowTideInnerRoom/events.inc index 746f36cdc..07d6e60dc 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/events.inc @@ -1,5 +1,5 @@ ShoalCave_LowTideInnerRoom_EventObjects:: @ 838DD40 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, 1, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_INNER_ROOM_1 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 26, 14, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_1B1A03, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_INNER_ROOM_1 ShoalCave_LowTideInnerRoom_MapWarps:: @ 838DD58 warp_def 34, 29, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM @@ -12,12 +12,12 @@ ShoalCave_LowTideInnerRoom_MapWarps:: @ 838DD58 warp_def 40, 33, 5, 3, MAP_SHOAL_CAVE_LOW_TIDE_ENTRANCE_ROOM ShoalCave_LowTideInnerRoom_MapBGEvents:: @ 838DD98 - bg_event 31, 8, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E329 - bg_event 14, 26, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E365 - bg_event 41, 20, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E257 - bg_event 41, 10, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E293 - bg_event 6, 9, 3, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E2C5 - bg_event 16, 13, 5, 0, 0, ShoalCave_LowTideInnerRoom_EventScript_15E2F7 + bg_event 31, 8, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_15E329 + bg_event 14, 26, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_15E365 + bg_event 41, 20, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_15E257 + bg_event 41, 10, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_15E293 + bg_event 6, 9, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_15E2C5 + bg_event 16, 13, 5, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideInnerRoom_EventScript_15E2F7 ShoalCave_LowTideInnerRoom_MapEvents:: @ 838DDE0 map_events ShoalCave_LowTideInnerRoom_EventObjects, ShoalCave_LowTideInnerRoom_MapWarps, 0x0, ShoalCave_LowTideInnerRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideInnerRoom/header.inc b/data/maps/ShoalCave_LowTideInnerRoom/header.inc index be5fb9413..a7c0c4209 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/header.inc @@ -5,10 +5,10 @@ ShoalCave_LowTideInnerRoom:: @ 8307294 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 166 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideLowerRoom/events.inc b/data/maps/ShoalCave_LowTideLowerRoom/events.inc index 6ff9a44b3..9159098e6 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/events.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/events.inc @@ -1,6 +1,6 @@ ShoalCave_LowTideLowerRoom_EventObjects:: @ 838DE3C - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, 2, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 25, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 11, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E44F, 0 ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C warp_def 7, 2, 3, 3, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM @@ -9,7 +9,7 @@ ShoalCave_LowTideLowerRoom_MapWarps:: @ 838DE6C warp_def 28, 11, 3, 0, MAP_SHOAL_CAVE_LOW_TIDE_ICE_ROOM ShoalCave_LowTideLowerRoom_MapBGEvents:: @ 838DE8C - bg_event 18, 2, 3, 0, 0, ShoalCave_LowTideLowerRoom_EventScript_15E413 + bg_event 18, 2, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideLowerRoom_EventScript_15E413 ShoalCave_LowTideLowerRoom_MapEvents:: @ 838DE98 map_events ShoalCave_LowTideLowerRoom_EventObjects, ShoalCave_LowTideLowerRoom_MapWarps, 0x0, ShoalCave_LowTideLowerRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideLowerRoom/header.inc b/data/maps/ShoalCave_LowTideLowerRoom/header.inc index 5d82ba865..90cbc8ac0 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/header.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/header.inc @@ -5,10 +5,10 @@ ShoalCave_LowTideLowerRoom:: @ 83072CC .4byte 0x0 .2byte MUS_M_DUNGON .2byte 168 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/ShoalCave_LowTideStairsRoom/events.inc b/data/maps/ShoalCave_LowTideStairsRoom/events.inc index 65570d256..63b0f279c 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/events.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/events.inc @@ -1,12 +1,12 @@ ShoalCave_LowTideStairsRoom_EventObjects:: @ 838DDF4 - object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, 1, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM_1 + object_event 1, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_1B1A10, FLAG_ITEM_SHOAL_CAVE_LOW_TIDE_STAIRS_ROOM_1 ShoalCave_LowTideStairsRoom_MapWarps:: @ 838DE0C warp_def 3, 12, 3, 1, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM warp_def 7, 4, 3, 2, MAP_SHOAL_CAVE_LOW_TIDE_INNER_ROOM ShoalCave_LowTideStairsRoom_MapBGEvents:: @ 838DE1C - bg_event 11, 11, 3, 0, 0, ShoalCave_LowTideStairsRoom_EventScript_15E3B7 + bg_event 11, 11, 3, BG_EVENT_PLAYER_FACING_ANY, ShoalCave_LowTideStairsRoom_EventScript_15E3B7 ShoalCave_LowTideStairsRoom_MapEvents:: @ 838DE28 map_events ShoalCave_LowTideStairsRoom_EventObjects, ShoalCave_LowTideStairsRoom_MapWarps, 0x0, ShoalCave_LowTideStairsRoom_MapBGEvents diff --git a/data/maps/ShoalCave_LowTideStairsRoom/header.inc b/data/maps/ShoalCave_LowTideStairsRoom/header.inc index 976bc6ad9..7c1c7f433 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/header.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/header.inc @@ -5,10 +5,10 @@ ShoalCave_LowTideStairsRoom:: @ 83072B0 .4byte 0x0 .2byte MUS_M_DUNGON .2byte 167 - .byte 67 + .byte MAPSEC_SHOAL_CAVE .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SingleBattleColosseum/events.inc b/data/maps/SingleBattleColosseum/events.inc index e6da2e027..6984485ea 100644 --- a/data/maps/SingleBattleColosseum/events.inc +++ b/data/maps/SingleBattleColosseum/events.inc @@ -1,13 +1,13 @@ SingleBattleColosseum_EventObjects:: @ 83912E4 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, 9, 0, 0, 0, 0, SingleBattleColosseum_EventScript_1A449E, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SingleBattleColosseum_EventScript_1A449E, 0 SingleBattleColosseum_MapWarps:: @ 83912FC warp_def 6, 8, 3, 127, MAP_NONE warp_def 7, 8, 3, 127, MAP_NONE SingleBattleColosseum_MapCoordEvents:: @ 839130C - coord_event 3, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A436F - coord_event 10, 5, 3, 0, VAR_TEMP_0, 0, 0, SingleBattleColosseum_EventScript_1A4379 + coord_event 3, 5, 3, VAR_TEMP_0, 0, SingleBattleColosseum_EventScript_1A436F + coord_event 10, 5, 3, VAR_TEMP_0, 0, SingleBattleColosseum_EventScript_1A4379 SingleBattleColosseum_MapEvents:: @ 839132C map_events SingleBattleColosseum_EventObjects, SingleBattleColosseum_MapWarps, SingleBattleColosseum_MapCoordEvents, 0x0 diff --git a/data/maps/SingleBattleColosseum/header.inc b/data/maps/SingleBattleColosseum/header.inc index 99e0b090b..ded368bb5 100644 --- a/data/maps/SingleBattleColosseum/header.inc +++ b/data/maps/SingleBattleColosseum/header.inc @@ -5,10 +5,10 @@ SingleBattleColosseum:: @ 8307978 .4byte 0x0 .2byte MUS_RAINBOW .2byte 222 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 8 + .byte MAP_BATTLE_SCENE_BATTLE_TOWER diff --git a/data/maps/SkyPillar_1F/header.inc b/data/maps/SkyPillar_1F/header.inc index c530fde86..36c0099bf 100644 --- a/data/maps/SkyPillar_1F/header.inc +++ b/data/maps/SkyPillar_1F/header.inc @@ -5,10 +5,10 @@ SkyPillar_1F:: @ 8307614 .4byte 0x0 .2byte MUS_TOZAN .2byte 323 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_2F/header.inc b/data/maps/SkyPillar_2F/header.inc index ce61cf5b8..3c72b0fd4 100644 --- a/data/maps/SkyPillar_2F/header.inc +++ b/data/maps/SkyPillar_2F/header.inc @@ -5,10 +5,10 @@ SkyPillar_2F:: @ 8307630 .4byte 0x0 .2byte MUS_TOZAN .2byte 324 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_3F/header.inc b/data/maps/SkyPillar_3F/header.inc index eaed10d93..4b6b828f9 100644 --- a/data/maps/SkyPillar_3F/header.inc +++ b/data/maps/SkyPillar_3F/header.inc @@ -5,10 +5,10 @@ SkyPillar_3F:: @ 830764C .4byte 0x0 .2byte MUS_TOZAN .2byte 325 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_4F/header.inc b/data/maps/SkyPillar_4F/header.inc index f14e016c8..634ab68b4 100644 --- a/data/maps/SkyPillar_4F/header.inc +++ b/data/maps/SkyPillar_4F/header.inc @@ -5,10 +5,10 @@ SkyPillar_4F:: @ 8307668 .4byte 0x0 .2byte MUS_TOZAN .2byte 326 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_5F/header.inc b/data/maps/SkyPillar_5F/header.inc index e4ff00b1a..949dac2a6 100644 --- a/data/maps/SkyPillar_5F/header.inc +++ b/data/maps/SkyPillar_5F/header.inc @@ -5,10 +5,10 @@ SkyPillar_5F:: @ 83076A0 .4byte 0x0 .2byte MUS_TOZAN .2byte 331 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_Entrance/header.inc b/data/maps/SkyPillar_Entrance/header.inc index 84dfe9b5c..8b1f7bede 100644 --- a/data/maps/SkyPillar_Entrance/header.inc +++ b/data/maps/SkyPillar_Entrance/header.inc @@ -5,10 +5,10 @@ SkyPillar_Entrance:: @ 83075DC .4byte 0x0 .2byte MUS_TOZAN .2byte 321 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_Outside/header.inc b/data/maps/SkyPillar_Outside/header.inc index 71aa1ad84..2e2695489 100644 --- a/data/maps/SkyPillar_Outside/header.inc +++ b/data/maps/SkyPillar_Outside/header.inc @@ -5,10 +5,10 @@ SkyPillar_Outside:: @ 83075F8 .4byte 0x0 .2byte MUS_TOZAN .2byte 322 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 - .byte 3 + .byte WEATHER_NONE + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SkyPillar_Top/events.inc b/data/maps/SkyPillar_Top/events.inc index 9fc989c78..e497f5db2 100644 --- a/data/maps/SkyPillar_Top/events.inc +++ b/data/maps/SkyPillar_Top/events.inc @@ -1,5 +1,5 @@ SkyPillar_Top_EventObjects:: @ 838EE50 - object_event 1, EVENT_OBJ_GFX_RAYQUAZA, 0, 14, 6, 3, 8, 1, 1, 0, 0, SkyPillar_Top_EventScript_15F316, FLAG_HIDE_RAYQUAZA + object_event 1, EVENT_OBJ_GFX_RAYQUAZA, 0, 14, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SkyPillar_Top_EventScript_15F316, FLAG_HIDE_RAYQUAZA SkyPillar_Top_MapWarps:: @ 838EE68 warp_def 16, 14, 3, 1, MAP_SKY_PILLAR_5F diff --git a/data/maps/SkyPillar_Top/header.inc b/data/maps/SkyPillar_Top/header.inc index aaaf40fc4..01e4c49b8 100644 --- a/data/maps/SkyPillar_Top/header.inc +++ b/data/maps/SkyPillar_Top/header.inc @@ -5,10 +5,10 @@ SkyPillar_Top:: @ 83076BC .4byte 0x0 .2byte MUS_TOZAN .2byte 332 - .byte 85 + .byte MAPSEC_SKY_PILLAR .byte 0 - .byte 0 - .byte 3 + .byte WEATHER_NONE + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity/events.inc b/data/maps/SlateportCity/events.inc index 685bc7359..af197d461 100644 --- a/data/maps/SlateportCity/events.inc +++ b/data/maps/SlateportCity/events.inc @@ -1,35 +1,35 @@ SlateportCity_EventObjects:: @ 837F7AC - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BBD6, 0 - object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 35, 27, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_14BBF3, 0 - object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 15, 13, 3, 2, 1, 2, 0, 0, SlateportCity_EventScript_14BBB5, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 29, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_14BC14, 0 - object_event 5, EVENT_OBJ_GFX_VAR_0, 0, 31, 27, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14BB3F, 0 - object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 20, 37, 3, 1, 1, 1, 0, 0, SlateportCity_EventScript_14BB60, 0 - object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BB81, 0 - object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, 9, 0, 0, 0, 0, SlateportCity_EventScript_14C017, FLAG_HIDE_GABBY_AND_TY_SLATEPORT - object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, 7, 0, 0, 0, 0, SlateportCity_EventScript_14C020, FLAG_HIDE_GABBY_AND_TY_SLATEPORT - object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, FLAG_HIDE_STERN_SLATEPORT - object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 35, 36, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BCE2, 0 - object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, 5, 1, 0, 0, 0, SlateportCity_EventScript_14BCEB, 0 - object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 50, 3, 3, 0, 1, 0, 0, SlateportCity_EventScript_14BCF4, 0 - object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 16, 46, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BCFD, 0 - object_event 16, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 18, 3, 2, 1, 1, 0, 0, SlateportCity_EventScript_14BD06, 0 - object_event 17, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, 3, 0, 1, 0, 0, SlateportCity_EventScript_14BCB8, 0 - object_event 18, EVENT_OBJ_GFX_WOMAN_7, 0, 15, 31, 3, 1, 0, 0, 0, 0, SlateportCity_EventScript_14BCD9, 0 - object_event 19, EVENT_OBJ_GFX_VAR_1, 0, 30, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 20, EVENT_OBJ_GFX_VAR_1, 0, 29, 27, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, 10, 0, 0, 0, 0, SlateportCity_EventScript_14BE20, 0 - object_event 22, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14BDF2, 0 - object_event 23, EVENT_OBJ_GFX_MAN_6, 0, 34, 51, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14C029, 0 - object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 47, 3, 8, 0, 0, 0, 0, SlateportCity_EventScript_14BAE0, 0 - object_event 25, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, 8, 1, 1, 0, 0, SlateportCity_EventScript_14BE9A, FLAG_HIDE_TM_SALESMAN_SLATEPORT - object_event 26, EVENT_OBJ_GFX_MAN_3, 0, 5, 47, 3, 8, 1, 1, 0, 0, SlateportCity_EventScript_14BAB6, 0 - object_event 27, EVENT_OBJ_GFX_VAR_1, 0, 22, 27, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 28, EVENT_OBJ_GFX_VAR_1, 0, 23, 27, 3, 7, 1, 1, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 29, EVENT_OBJ_GFX_VAR_1, 0, 24, 27, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BDAD, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 30, EVENT_OBJ_GFX_VAR_1, 0, 21, 26, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BDC4, FLAG_HIDE_EVIL_TEAM_SLATEPORT - object_event 31, EVENT_OBJ_GFX_VAR_1, 0, 20, 26, 3, 10, 1, 1, 0, 0, SlateportCity_EventScript_14BDDB, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 21, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_14BBD6, 0 + object_event 2, EVENT_OBJ_GFX_MAN_1, 0, 35, 27, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_14BBF3, 0 + object_event 3, EVENT_OBJ_GFX_BOY_4, 0, 15, 13, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_EventScript_14BBB5, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 26, 29, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_14BC14, 0 + object_event 5, EVENT_OBJ_GFX_VAR_0, 0, 31, 27, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_14BD3A, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 6, EVENT_OBJ_GFX_COOK, 0, 5, 43, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_14BB3F, 0 + object_event 7, EVENT_OBJ_GFX_OLD_WOMAN_2, 0, 20, 37, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_14BB60, 0 + object_event 8, EVENT_OBJ_GFX_GIRL_1, 0, 8, 42, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_14BB81, 0 + object_event 9, EVENT_OBJ_GFX_CAMERAMAN, 0, 29, 13, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_EventScript_14C017, FLAG_HIDE_GABBY_AND_TY_SLATEPORT + object_event 10, EVENT_OBJ_GFX_REPORTER_F, 0, 28, 14, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_EventScript_14C020, FLAG_HIDE_GABBY_AND_TY_SLATEPORT + object_event 11, EVENT_OBJ_GFX_SCIENTIST_1, 0, 28, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_14BEBC, FLAG_HIDE_STERN_SLATEPORT + object_event 12, EVENT_OBJ_GFX_SAILOR, 0, 35, 36, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_14BCE2, 0 + object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 28, 46, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_EventScript_14BCEB, 0 + object_event 14, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 50, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_14BCF4, 0 + object_event 15, EVENT_OBJ_GFX_MAN_4, 0, 16, 46, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_14BCFD, 0 + object_event 16, EVENT_OBJ_GFX_SCHOOL_KID_M, 0, 12, 18, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_EventScript_14BD06, 0 + object_event 17, EVENT_OBJ_GFX_MANIAC, 0, 8, 24, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_EventScript_14BCB8, 0 + object_event 18, EVENT_OBJ_GFX_WOMAN_7, 0, 15, 31, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_EventScript_14BCD9, 0 + object_event 19, EVENT_OBJ_GFX_VAR_1, 0, 30, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_14BD51, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 20, EVENT_OBJ_GFX_VAR_1, 0, 29, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_14BD68, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 21, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 6, 38, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_EventScript_14BE20, 0 + object_event 22, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 5, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_14BDF2, 0 + object_event 23, EVENT_OBJ_GFX_MAN_6, 0, 34, 51, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_14C029, 0 + object_event 24, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_EventScript_14BAE0, 0 + object_event 25, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 11, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_14BE9A, FLAG_HIDE_TM_SALESMAN_SLATEPORT + object_event 26, EVENT_OBJ_GFX_MAN_3, 0, 5, 47, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, SlateportCity_EventScript_14BAB6, 0 + object_event 27, EVENT_OBJ_GFX_VAR_1, 0, 22, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_14BD7F, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 28, EVENT_OBJ_GFX_VAR_1, 0, 23, 27, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_EventScript_14BD96, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 29, EVENT_OBJ_GFX_VAR_1, 0, 24, 27, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_14BDAD, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 30, EVENT_OBJ_GFX_VAR_1, 0, 21, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_14BDC4, FLAG_HIDE_EVIL_TEAM_SLATEPORT + object_event 31, EVENT_OBJ_GFX_VAR_1, 0, 20, 26, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_EventScript_14BDDB, FLAG_HIDE_EVIL_TEAM_SLATEPORT SlateportCity_MapWarps:: @ 837FA94 warp_def 19, 19, 0, 0, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F @@ -45,18 +45,18 @@ SlateportCity_MapWarps:: @ 837FA94 warp_def 21, 44, 0, 0, MAP_SLATEPORT_CITY_HOUSE2 SlateportCity_MapBGEvents:: @ 837FAEC - bg_event 8, 19, 0, 0, 0, SlateportCity_EventScript_14BCAF - bg_event 20, 19, 0, 1, 0, SlateportCity_EventScript_1A00EA - bg_event 21, 19, 0, 1, 0, SlateportCity_EventScript_1A00EA - bg_event 14, 26, 0, 1, 0, SlateportCity_EventScript_1A00E1 - bg_event 24, 12, 0, 0, 0, SlateportCity_EventScript_14BC91 - bg_event 15, 26, 0, 1, 0, SlateportCity_EventScript_1A00E1 - bg_event 14, 51, 0, 0, 0, SlateportCity_EventScript_14BC88 - bg_event 26, 26, 0, 0, 0, SlateportCity_EventScript_14BC76 - bg_event 16, 22, 0, 0, 0, SlateportCity_EventScript_14BC7F - bg_event 8, 26, 0, 0, 0, SlateportCity_EventScript_14BC6D - bg_event 7, 13, 0, 0, 0, SlateportCity_EventScript_14BC33 - bg_event 23, 38, 0, 0, 0, SlateportCity_EventScript_14BC3C + bg_event 8, 19, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BCAF + bg_event 20, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1A00EA + bg_event 21, 19, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1A00EA + bg_event 14, 26, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1A00E1 + bg_event 24, 12, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC91 + bg_event 15, 26, 0, BG_EVENT_PLAYER_FACING_NORTH, SlateportCity_EventScript_1A00E1 + bg_event 14, 51, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC88 + bg_event 26, 26, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC76 + bg_event 16, 22, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC7F + bg_event 8, 26, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC6D + bg_event 7, 13, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC33 + bg_event 23, 38, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_EventScript_14BC3C SlateportCity_MapEvents:: @ 837FB7C map_events SlateportCity_EventObjects, SlateportCity_MapWarps, 0x0, SlateportCity_MapBGEvents diff --git a/data/maps/SlateportCity/header.inc b/data/maps/SlateportCity/header.inc index 738a383e7..0407148bb 100644 --- a/data/maps/SlateportCity/header.inc +++ b/data/maps/SlateportCity/header.inc @@ -5,10 +5,10 @@ SlateportCity:: @ 8305464 .4byte SlateportCity_MapConnections .2byte MUS_FINECITY .2byte 2 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 2 - .byte 2 + .byte WEATHER_SUNNY + .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_ContestHall/events.inc b/data/maps/SlateportCity_ContestHall/events.inc index b2a57ccc9..1dfff2ffd 100644 --- a/data/maps/SlateportCity_ContestHall/events.inc +++ b/data/maps/SlateportCity_ContestHall/events.inc @@ -1,25 +1,25 @@ SlateportCity_ContestHall_EventObjects:: @ 83878A4 - object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 15, 3, 2, 2, 2, 0, 0, SlateportCity_ContestHall_EventScript_15554C, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 4, 3, 2, 3, 3, 0, 0, SlateportCity_ContestHall_EventScript_155555, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 8, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15559F, 0 - object_event 4, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 12, 8, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555B4, 0 - object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 7, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555C9, 0 - object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 9, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555DE, 0 - object_event 7, EVENT_OBJ_GFX_BOY_1, 0, 11, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555F3, 0 - object_event 8, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 11, 3, 7, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155608, 0 - object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15561D, 0 - object_event 10, EVENT_OBJ_GFX_HIKER, 0, 12, 6, 3, 8, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155632, 0 - object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 5, 10, 3, 10, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15565C, 0 - object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 15, 10, 3, 9, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155647, 0 - object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 0, 17, 3, 2, 1, 4, 0, 0, SlateportCity_ContestHall_EventScript_15555E, 0 + object_event 1, EVENT_OBJ_GFX_FAT_MAN, 0, 19, 15, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, SlateportCity_ContestHall_EventScript_15554C, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 3, 3, 0, 0, SlateportCity_ContestHall_EventScript_155555, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_4, 0, 9, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15559F, 0 + object_event 4, EVENT_OBJ_GFX_CONTEST_JUDGE, 0, 12, 8, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555B4, 0 + object_event 5, EVENT_OBJ_GFX_GIRL_1, 0, 7, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555C9, 0 + object_event 6, EVENT_OBJ_GFX_BOY_2, 0, 9, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555DE, 0 + object_event 7, EVENT_OBJ_GFX_BOY_1, 0, 11, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_1555F3, 0 + object_event 8, EVENT_OBJ_GFX_FAT_MAN, 0, 13, 11, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155608, 0 + object_event 9, EVENT_OBJ_GFX_MANIAC, 0, 8, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15561D, 0 + object_event 10, EVENT_OBJ_GFX_HIKER, 0, 12, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155632, 0 + object_event 11, EVENT_OBJ_GFX_BOY_3, 0, 5, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_15565C, 0 + object_event 12, EVENT_OBJ_GFX_BOY_1, 0, 15, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_ContestHall_EventScript_155647, 0 + object_event 13, EVENT_OBJ_GFX_SAILOR, 0, 0, 17, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 4, 0, 0, SlateportCity_ContestHall_EventScript_15555E, 0 SlateportCity_ContestHall_MapWarps:: @ 83879DC warp_def 10, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY warp_def 11, 17, 0, 2, MAP_SLATEPORT_CITY_CONTEST_LOBBY SlateportCity_ContestHall_MapBGEvents:: @ 83879EC - bg_event 12, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671 - bg_event 8, 14, 3, 0, 0, SlateportCity_ContestHall_EventScript_155671 + bg_event 12, 14, 3, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_ContestHall_EventScript_155671 + bg_event 8, 14, 3, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_ContestHall_EventScript_155671 SlateportCity_ContestHall_MapEvents:: @ 8387A04 map_events SlateportCity_ContestHall_EventObjects, SlateportCity_ContestHall_MapWarps, 0x0, SlateportCity_ContestHall_MapBGEvents diff --git a/data/maps/SlateportCity_ContestHall/header.inc b/data/maps/SlateportCity_ContestHall/header.inc index d327e87c7..751ce5ca6 100644 --- a/data/maps/SlateportCity_ContestHall/header.inc +++ b/data/maps/SlateportCity_ContestHall/header.inc @@ -5,10 +5,10 @@ SlateportCity_ContestHall:: @ 8306034 .4byte 0x0 .2byte MUS_CONLOBBY .2byte 73 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_ContestLobby/events.inc b/data/maps/SlateportCity_ContestLobby/events.inc index 8981bf455..cb437b8d9 100644 --- a/data/maps/SlateportCity_ContestLobby/events.inc +++ b/data/maps/SlateportCity_ContestLobby/events.inc @@ -1,12 +1,12 @@ SlateportCity_ContestLobby_EventObjects:: @ 8387788 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 0, 3, 0, 0, SlateportCity_ContestLobby_EventScript_15541D, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, 10, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7795, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 3, 3, 3, 0, 1, 0, 0, SlateportCity_ContestLobby_EventScript_1554DE, 0 - object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 9, 6, 3, 2, 1, 1, 0, 0, SlateportCity_ContestLobby_EventScript_1554E7, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, 9, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_SLATEPORT - object_event 6, EVENT_OBJ_GFX_BOY_1, 0, 13, 5, 3, 9, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_155536, 0 - object_event 7, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 5, 3, 8, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F9, 0 - object_event 8, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 2, 3, 8, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F0, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 3, 0, 0, SlateportCity_ContestLobby_EventScript_15541D, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7795, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 0, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_ContestLobby_EventScript_1554DE, 0 + object_event 4, EVENT_OBJ_GFX_GIRL_1, 0, 9, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SlateportCity_ContestLobby_EventScript_1554E7, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_SLATEPORT + object_event 6, EVENT_OBJ_GFX_BOY_1, 0, 13, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_155536, 0 + object_event 7, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 1, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F9, 0 + object_event 8, EVENT_OBJ_GFX_WOMAN_3, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1554F0, 0 SlateportCity_ContestLobby_MapWarps:: @ 8387848 warp_def 5, 6, 0, 3, MAP_SLATEPORT_CITY @@ -14,10 +14,10 @@ SlateportCity_ContestLobby_MapWarps:: @ 8387848 warp_def 1, 1, 0, 0, MAP_SLATEPORT_CITY_CONTEST_HALL SlateportCity_ContestLobby_MapBGEvents:: @ 8387860 - bg_event 10, 3, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B7829 - bg_event 12, 5, 0, 0, 0, SlateportCity_ContestLobby_EventScript_1B761E - bg_event 11, 1, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15552F - bg_event 13, 1, 0, 0, 0, SlateportCity_ContestLobby_EventScript_15908D + bg_event 10, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_ContestLobby_EventScript_1B7829 + bg_event 12, 5, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_ContestLobby_EventScript_1B761E + bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_ContestLobby_EventScript_15552F + bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_ContestLobby_EventScript_15908D SlateportCity_ContestLobby_MapEvents:: @ 8387890 map_events SlateportCity_ContestLobby_EventObjects, SlateportCity_ContestLobby_MapWarps, 0x0, SlateportCity_ContestLobby_MapBGEvents diff --git a/data/maps/SlateportCity_ContestLobby/header.inc b/data/maps/SlateportCity_ContestLobby/header.inc index 0531ef226..35cc213e9 100644 --- a/data/maps/SlateportCity_ContestLobby/header.inc +++ b/data/maps/SlateportCity_ContestLobby/header.inc @@ -5,10 +5,10 @@ SlateportCity_ContestLobby:: @ 8306018 .4byte 0x0 .2byte MUS_CONLOBBY .2byte 72 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_Harbor/events.inc b/data/maps/SlateportCity_Harbor/events.inc index a7581ab2a..1f5cb2936 100644 --- a/data/maps/SlateportCity_Harbor/events.inc +++ b/data/maps/SlateportCity_Harbor/events.inc @@ -1,12 +1,12 @@ SlateportCity_Harbor_EventObjects:: @ 8387F30 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, 8, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, 9, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR - object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, 10, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR - object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, 1, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, FLAG_HIDE_STERN_SLATEPORT_HARBOR - object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR - object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 7, 10, 3, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR - object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 8, 10, 3, 9, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR - object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, 10, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1560C4, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 4, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_1561FF, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR + object_event 3, EVENT_OBJ_GFX_FAT_MAN, 0, 1, 12, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156208, FLAG_HIDE_WORKERS_SLATEPORT_HARBOR + object_event 4, EVENT_OBJ_GFX_SCIENTIST_1, 0, 6, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Harbor_EventScript_156211, FLAG_HIDE_STERN_SLATEPORT_HARBOR + object_event 5, EVENT_OBJ_GFX_SS_TIDAL, 0, 8, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 7, 10, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR + object_event 7, EVENT_OBJ_GFX_VAR_6, 0, 8, 10, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR + object_event 8, EVENT_OBJ_GFX_SUBMARINE_SHADOW, 0, 7, 9, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR SlateportCity_Harbor_MapWarps:: @ 8387FF0 warp_def 11, 14, 0, 8, MAP_SLATEPORT_CITY @@ -15,10 +15,10 @@ SlateportCity_Harbor_MapWarps:: @ 8387FF0 warp_def 20, 15, 0, 9, MAP_SLATEPORT_CITY SlateportCity_Harbor_MapCoordEvents:: @ 8388010 - coord_event 8, 11, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155F9B - coord_event 8, 12, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FA7 - coord_event 8, 13, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FB3 - coord_event 8, 14, 3, 0, VAR_SLATEPORT_HARBOR_STATE, 1, 0, SlateportCity_Harbor_EventScript_155FBF + coord_event 8, 11, 3, VAR_SLATEPORT_HARBOR_STATE, 1, SlateportCity_Harbor_EventScript_155F9B + coord_event 8, 12, 3, VAR_SLATEPORT_HARBOR_STATE, 1, SlateportCity_Harbor_EventScript_155FA7 + coord_event 8, 13, 3, VAR_SLATEPORT_HARBOR_STATE, 1, SlateportCity_Harbor_EventScript_155FB3 + coord_event 8, 14, 3, VAR_SLATEPORT_HARBOR_STATE, 1, SlateportCity_Harbor_EventScript_155FBF SlateportCity_Harbor_MapEvents:: @ 8388050 map_events SlateportCity_Harbor_EventObjects, SlateportCity_Harbor_MapWarps, SlateportCity_Harbor_MapCoordEvents, 0x0 diff --git a/data/maps/SlateportCity_Harbor/header.inc b/data/maps/SlateportCity_Harbor/header.inc index 5de5d2e5f..166638e38 100644 --- a/data/maps/SlateportCity_Harbor/header.inc +++ b/data/maps/SlateportCity_Harbor/header.inc @@ -5,10 +5,10 @@ SlateportCity_Harbor:: @ 83060C0 .4byte 0x0 .2byte MUS_FINECITY .2byte 88 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_House1/events.inc b/data/maps/SlateportCity_House1/events.inc index bc83e91ce..bb9fb2875 100644 --- a/data/maps/SlateportCity_House1/events.inc +++ b/data/maps/SlateportCity_House1/events.inc @@ -1,5 +1,5 @@ SlateportCity_House1_EventObjects:: @ 8387A18 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 5, 3, 8, 0, 0, 0, 0, SlateportCity_House1_EventScript_15567B, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_1, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_House1_EventScript_15567B, 0 SlateportCity_House1_MapWarps:: @ 8387A30 warp_def 3, 7, 0, 6, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_House1/header.inc b/data/maps/SlateportCity_House1/header.inc index 548424b49..61e6c3437 100644 --- a/data/maps/SlateportCity_House1/header.inc +++ b/data/maps/SlateportCity_House1/header.inc @@ -5,10 +5,10 @@ SlateportCity_House1:: @ 8306050 .4byte 0x0 .2byte MUS_FINECITY .2byte 80 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_House2/events.inc b/data/maps/SlateportCity_House2/events.inc index d115e8225..6c89b9e73 100644 --- a/data/maps/SlateportCity_House2/events.inc +++ b/data/maps/SlateportCity_House2/events.inc @@ -1,6 +1,6 @@ SlateportCity_House2_EventObjects:: @ 8388064 - object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 4, 3, 10, 0, 0, 0, 0, SlateportCity_House2_EventScript_156390, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, 9, 0, 0, 0, 0, SlateportCity_House2_EventScript_156399, 0 + object_event 1, EVENT_OBJ_GFX_MAN_3, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_House2_EventScript_156390, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 7, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_House2_EventScript_156399, 0 SlateportCity_House2_MapWarps:: @ 8388094 warp_def 3, 7, 0, 10, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_House2/header.inc b/data/maps/SlateportCity_House2/header.inc index d731c0542..a9a2a6c51 100644 --- a/data/maps/SlateportCity_House2/header.inc +++ b/data/maps/SlateportCity_House2/header.inc @@ -5,10 +5,10 @@ SlateportCity_House2:: @ 83060DC .4byte 0x0 .2byte MUS_FINECITY .2byte 60 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_Mart/events.inc b/data/maps/SlateportCity_Mart/events.inc index abf6ebdce..03efeb9bb 100644 --- a/data/maps/SlateportCity_Mart/events.inc +++ b/data/maps/SlateportCity_Mart/events.inc @@ -1,7 +1,7 @@ SlateportCity_Mart_EventObjects:: @ 83881B0 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156411, 0 - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, 7, 0, 0, 0, 0, SlateportCity_Mart_EventScript_15643E, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, 1, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156447, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156411, 0 + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_Mart_EventScript_15643E, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 5, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_Mart_EventScript_156447, 0 SlateportCity_Mart_MapWarps:: @ 83881F8 warp_def 3, 7, 0, 1, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_Mart/header.inc b/data/maps/SlateportCity_Mart/header.inc index d66d2452e..6855a45ed 100644 --- a/data/maps/SlateportCity_Mart/header.inc +++ b/data/maps/SlateportCity_Mart/header.inc @@ -5,10 +5,10 @@ SlateportCity_Mart:: @ 8306130 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc index 825c589de..2b65dc440 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/events.inc @@ -1,18 +1,18 @@ SlateportCity_OceanicMuseum_1F_EventObjects:: @ 8387B38 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0 - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 18, 5, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 12, 2, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 2, 8, 3, 7, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - object_event 5, EVENT_OBJ_GFX_VAR_0, 0, 3, 4, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 4, 3, 10, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, 9, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0 - object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 8, 3, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM - object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 2, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, 7, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 7, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 8, 3, 7, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 9, 4, 3, 21, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM - object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 7, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0 + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 18, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BA1, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BAA, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 2, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B98, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + object_event 5, EVENT_OBJ_GFX_VAR_0, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155B8F, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + object_event 6, EVENT_OBJ_GFX_VAR_1, 0, 14, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BB3, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + object_event 7, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155ADB, 0 + object_event 8, EVENT_OBJ_GFX_VAR_1, 0, 8, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BBC, FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM + object_event 9, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C16, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 10, EVENT_OBJ_GFX_MANIAC, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C1F, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 11, EVENT_OBJ_GFX_MAN_3, 0, 17, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C28, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 12, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 18, 8, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C31, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 13, EVENT_OBJ_GFX_VAR_1, 0, 9, 4, 3, MOVEMENT_TYPE_FACE_UP_LEFT_AND_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C3A, FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM + object_event 14, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88 warp_def 9, 8, 0, 5, MAP_SLATEPORT_CITY @@ -20,23 +20,23 @@ SlateportCity_OceanicMuseum_1F_MapWarps:: @ 8387C88 warp_def 6, 1, 0, 0, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F SlateportCity_OceanicMuseum_1F_MapCoordEvents:: @ 8387CA0 - coord_event 9, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4 - coord_event 10, 7, 3, 0, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5 + coord_event 9, 7, 3, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AE4 + coord_event 10, 7, 3, VAR_SLATEPORT_MUSEUM_1F_STATE, 0, SlateportCity_OceanicMuseum_1F_EventScript_155AF5 SlateportCity_OceanicMuseum_1F_MapBGEvents:: @ 8387CC0 - bg_event 2, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BC5 - bg_event 2, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BCE - bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BD7 - bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE0 - bg_event 10, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BD7 - bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE0 - bg_event 15, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BE9 - bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BF2 - bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155BFB - bg_event 2, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C04 - bg_event 3, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C04 - bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C0D - bg_event 17, 1, 0, 0, 0, SlateportCity_OceanicMuseum_1F_EventScript_155C0D + bg_event 2, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BC5 + bg_event 2, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BCE + bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BD7 + bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BE0 + bg_event 10, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BD7 + bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BE0 + bg_event 15, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BE9 + bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BF2 + bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155BFB + bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155C04 + bg_event 3, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155C04 + bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155C0D + bg_event 17, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_1F_EventScript_155C0D SlateportCity_OceanicMuseum_1F_MapEvents:: @ 8387D5C map_events SlateportCity_OceanicMuseum_1F_EventObjects, SlateportCity_OceanicMuseum_1F_MapWarps, SlateportCity_OceanicMuseum_1F_MapCoordEvents, SlateportCity_OceanicMuseum_1F_MapBGEvents diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc index 60fe69e70..348013adf 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/header.inc @@ -5,10 +5,10 @@ SlateportCity_OceanicMuseum_1F:: @ 8306088 .4byte 0x0 .2byte MUS_FUNE_KAN .2byte 86 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc index bb52f2403..cb3945e7a 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/events.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/events.inc @@ -1,37 +1,37 @@ SlateportCity_OceanicMuseum_2F_EventObjects:: @ 8387D70 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, 8, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F - object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F - object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F - object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 1, 3, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F - object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 7, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 6, 3, 1, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, 10, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 13, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155CE6, FLAG_HIDE_STERN_OCEANIC_MUSEUM_2F + object_event 2, EVENT_OBJ_GFX_VAR_6, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_EVIL_TEAM_LEADER_OCEANIC_MUSEUM_2F + object_event 3, EVENT_OBJ_GFX_VAR_1, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_1_OCEANIC_MUSEUM_2F + object_event 4, EVENT_OBJ_GFX_VAR_1, 0, 6, 1, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_GRUNT_2_OCEANIC_MUSEUM_2F + object_event 5, EVENT_OBJ_GFX_OLD_MAN_2, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F34, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 9, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F3D, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F46, FLAG_HIDE_OCEANIC_MUSEUM_VISITORS SlateportCity_OceanicMuseum_2F_MapWarps:: @ 8387E18 warp_def 6, 1, 0, 2, MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F SlateportCity_OceanicMuseum_2F_MapBGEvents:: @ 8387E20 - bg_event 18, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EDA - bg_event 18, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EE3 - bg_event 4, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F22 - bg_event 4, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F22 - bg_event 3, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19 - bg_event 2, 3, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19 - bg_event 3, 4, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F19 - bg_event 3, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 - bg_event 4, 6, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 - bg_event 13, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F2B - bg_event 14, 7, 3, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F2B - bg_event 18, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F07 - bg_event 19, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F07 - bg_event 15, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EFE - bg_event 16, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EFE - bg_event 8, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EF5 - bg_event 9, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EF5 - bg_event 12, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EEC - bg_event 13, 1, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155EEC - bg_event 3, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 - bg_event 4, 7, 0, 0, 0, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + bg_event 18, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EDA + bg_event 18, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EE3 + bg_event 4, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F22 + bg_event 4, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F22 + bg_event 3, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F19 + bg_event 2, 3, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F19 + bg_event 3, 4, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F19 + bg_event 3, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + bg_event 4, 6, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + bg_event 13, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F2B + bg_event 14, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F2B + bg_event 18, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F07 + bg_event 19, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F07 + bg_event 15, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EFE + bg_event 16, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EFE + bg_event 8, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EF5 + bg_event 9, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EF5 + bg_event 12, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EEC + bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155EEC + bg_event 3, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F10 + bg_event 4, 7, 0, BG_EVENT_PLAYER_FACING_ANY, SlateportCity_OceanicMuseum_2F_EventScript_155F10 SlateportCity_OceanicMuseum_2F_MapEvents:: @ 8387F1C map_events SlateportCity_OceanicMuseum_2F_EventObjects, SlateportCity_OceanicMuseum_2F_MapWarps, 0x0, SlateportCity_OceanicMuseum_2F_MapBGEvents diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc index 8baa101fa..95c73ffcc 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/header.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/header.inc @@ -5,10 +5,10 @@ SlateportCity_OceanicMuseum_2F:: @ 83060A4 .4byte 0x0 .2byte MUS_FUNE_KAN .2byte 87 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index ce0bc855f..58e4ba240 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -37,7 +37,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E78 compare FACING, 3 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E83 - trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E + trainerbattle 3, TRAINER_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF @@ -46,7 +46,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEA5, 4 savebgm 0 - trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6 + trainerbattle 3, TRAINER_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF waitmovement 0 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_1A0845 diff --git a/data/maps/SlateportCity_PokemonCenter_1F/events.inc b/data/maps/SlateportCity_PokemonCenter_1F/events.inc index d4d9ab405..69319b4b4 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/events.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ SlateportCity_PokemonCenter_1F_EventObjects:: @ 83880B8 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563CE, 0 - object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563DC, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 7, 3, 10, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563E5, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563CE, 0 + object_event 2, EVENT_OBJ_GFX_SAILOR, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563DC, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_PokemonCenter_1F_EventScript_1563E5, 0 SlateportCity_PokemonCenter_1F_MapWarps:: @ 8388100 warp_def 7, 8, 3, 0, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_PokemonCenter_1F/header.inc b/data/maps/SlateportCity_PokemonCenter_1F/header.inc index 35d90cdc2..815b484cd 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/header.inc @@ -5,10 +5,10 @@ SlateportCity_PokemonCenter_1F:: @ 83060F8 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc index 37b2b95ab..1164e96d6 100644 --- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 81563BF .byte 0 SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5 - setrespawn 4 + setrespawn HEAL_LOCATION_SLATEPORT_CITY call SlateportCity_PokemonCenter_1F_EventScript_19FD1B end diff --git a/data/maps/SlateportCity_PokemonCenter_2F/events.inc b/data/maps/SlateportCity_PokemonCenter_2F/events.inc index df2da68bb..4ff0809c5 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/events.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ SlateportCity_PokemonCenter_2F_EventObjects:: @ 838812C - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_1563FE, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_156404, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_15640A, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_1563FE, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_156404, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonCenter_2F_EventScript_15640A, 0 SlateportCity_PokemonCenter_2F_MapWarps:: @ 8388174 warp_def 1, 5, 4, 2, MAP_SLATEPORT_CITY_POKEMON_CENTER_1F diff --git a/data/maps/SlateportCity_PokemonCenter_2F/header.inc b/data/maps/SlateportCity_PokemonCenter_2F/header.inc index 738074ba1..e14479e1c 100644 --- a/data/maps/SlateportCity_PokemonCenter_2F/header.inc +++ b/data/maps/SlateportCity_PokemonCenter_2F/header.inc @@ -5,10 +5,10 @@ SlateportCity_PokemonCenter_2F:: @ 8306114 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_PokemonFanClub/events.inc b/data/maps/SlateportCity_PokemonFanClub/events.inc index 55b0a693d..4201af00e 100644 --- a/data/maps/SlateportCity_PokemonFanClub/events.inc +++ b/data/maps/SlateportCity_PokemonFanClub/events.inc @@ -1,12 +1,12 @@ SlateportCity_PokemonFanClub_EventObjects:: @ 8387A54 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A7F, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 5, 0, 3, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A88, 0 - object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, 7, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_1ADFA0, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 2, 3, 1, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A15, 0 - object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, 8, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_15576B, 0 - object_event 6, EVENT_OBJ_GFX_ZIGZAGOON, 0, 3, 9, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AA4, 0 - object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A91, 0 - object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, 1, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AB7, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 11, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A7F, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 1, 5, 0, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A88, 0 + object_event 3, EVENT_OBJ_GFX_REPORTER_F, 0, 11, 5, 0, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_1ADFA0, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 6, 2, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A15, 0 + object_event 5, EVENT_OBJ_GFX_GENTLEMAN, 0, 6, 5, 4, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_PokemonFanClub_EventScript_15576B, 0 + object_event 6, EVENT_OBJ_GFX_ZIGZAGOON, 0, 3, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AA4, 0 + object_event 7, EVENT_OBJ_GFX_SKITTY, 0, 8, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155A91, 0 + object_event 8, EVENT_OBJ_GFX_AZUMARILL, 0, 10, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SlateportCity_PokemonFanClub_EventScript_155AB7, 0 SlateportCity_PokemonFanClub_MapWarps:: @ 8387B14 warp_def 6, 10, 0, 4, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_PokemonFanClub/header.inc b/data/maps/SlateportCity_PokemonFanClub/header.inc index 8094f192f..253355674 100644 --- a/data/maps/SlateportCity_PokemonFanClub/header.inc +++ b/data/maps/SlateportCity_PokemonFanClub/header.inc @@ -5,10 +5,10 @@ SlateportCity_PokemonFanClub:: @ 830606C .4byte 0x0 .2byte MUS_FINECITY .2byte 85 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_SternsShipyard_1F/events.inc b/data/maps/SlateportCity_SternsShipyard_1F/events.inc index cd5c7c25b..b729cad75 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/events.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/events.inc @@ -1,8 +1,8 @@ SlateportCity_SternsShipyard_1F_EventObjects:: @ 8387698 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, 8, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_155336, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553E3, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, 5, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553EC, 0 - object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 11, 3, 2, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_155336, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553E3, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 18, 8, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553EC, 0 + object_event 4, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 11, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 2, 0, 0, SlateportCity_SternsShipyard_1F_EventScript_1553F5, FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD SlateportCity_SternsShipyard_1F_MapWarps:: @ 83876F8 warp_def 2, 14, 0, 2, MAP_SLATEPORT_CITY diff --git a/data/maps/SlateportCity_SternsShipyard_1F/header.inc b/data/maps/SlateportCity_SternsShipyard_1F/header.inc index 2d98ef5b8..b38bd8fa5 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/header.inc @@ -5,10 +5,10 @@ SlateportCity_SternsShipyard_1F:: @ 8305FE0 .4byte 0x0 .2byte MUS_FINECITY .2byte 81 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SlateportCity_SternsShipyard_2F/events.inc b/data/maps/SlateportCity_SternsShipyard_2F/events.inc index aa5c02e40..09a319dfd 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/events.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/events.inc @@ -1,7 +1,7 @@ SlateportCity_SternsShipyard_2F_EventObjects:: @ 8387724 - object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, 7, 0, 0, 0, 0, 0x0, 0 - object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, 10, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_1553FF, 0 - object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, 7, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_155408, 0 + object_event 1, EVENT_OBJ_GFX_SCIENTIST_1, 0, 10, 7, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, 0 + object_event 2, EVENT_OBJ_GFX_SCIENTIST_1, 0, 8, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_1553FF, 0 + object_event 3, EVENT_OBJ_GFX_SCIENTIST_1, 0, 0, 9, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SlateportCity_SternsShipyard_2F_EventScript_155408, 0 SlateportCity_SternsShipyard_2F_MapWarps:: @ 838776C warp_def 3, 1, 0, 2, MAP_SLATEPORT_CITY_STERNS_SHIPYARD_1F diff --git a/data/maps/SlateportCity_SternsShipyard_2F/header.inc b/data/maps/SlateportCity_SternsShipyard_2F/header.inc index e7f1b74b8..9c12526ce 100644 --- a/data/maps/SlateportCity_SternsShipyard_2F/header.inc +++ b/data/maps/SlateportCity_SternsShipyard_2F/header.inc @@ -5,10 +5,10 @@ SlateportCity_SternsShipyard_2F:: @ 8305FFC .4byte 0x0 .2byte MUS_FINECITY .2byte 82 - .byte 8 + .byte MAPSEC_SLATEPORT_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity/events.inc b/data/maps/SootopolisCity/events.inc index cb793ea47..4d3ae2462 100644 --- a/data/maps/SootopolisCity/events.inc +++ b/data/maps/SootopolisCity/events.inc @@ -1,15 +1,15 @@ SootopolisCity_EventObjects:: @ 8380608 - object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 29, 20, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 33, 20, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 36, 21, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 42, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - object_event 5, EVENT_OBJ_GFX_WALLACE, 0, 32, 21, 3, 9, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, FLAG_HIDE_WALLACE_SOOTOPOLIS - object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_14D19F, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 51, 14, 3, 8, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - object_event 8, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, 1, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - object_event 9, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, 5, 1, 0, 0, 0, SootopolisCity_EventScript_14D287, FLAG_HIDE_SOOTOPOLIS_RESIDENTS - object_event 10, EVENT_OBJ_GFX_STEVEN, 0, 30, 21, 3, 10, 1, 1, 0, 0, SootopolisCity_EventScript_14D498, FLAG_HIDE_STEVEN_SOOTOPOLIS - object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 49, 34, 3, 3, 1, 1, 0, 0, SootopolisCity_EventScript_14D2A6, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 1, EVENT_OBJ_GFX_BEAUTY, 0, 29, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_14D18D, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 33, 20, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_14D196, FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 36, 21, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_14D16E, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 4, EVENT_OBJ_GFX_WOMAN_5, 0, 47, 42, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_14D268, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 5, EVENT_OBJ_GFX_WALLACE, 0, 32, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_EventScript_14D48F, FLAG_HIDE_WALLACE_SOOTOPOLIS + object_event 6, EVENT_OBJ_GFX_GIRL_2, 0, 9, 43, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_14D19F, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 7, EVENT_OBJ_GFX_LITTLE_BOY_1, 0, 51, 14, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_EventScript_14D2C5, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 8, EVENT_OBJ_GFX_BOY_1, 0, 43, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, SootopolisCity_EventScript_14D2E4, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 9, EVENT_OBJ_GFX_MAN_1, 0, 26, 4, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_EventScript_14D287, FLAG_HIDE_SOOTOPOLIS_RESIDENTS + object_event 10, EVENT_OBJ_GFX_STEVEN, 0, 30, 21, 3, MOVEMENT_TYPE_FACE_RIGHT, 1, 1, 0, 0, SootopolisCity_EventScript_14D498, FLAG_HIDE_STEVEN_SOOTOPOLIS + object_event 11, EVENT_OBJ_GFX_WOMAN_7, 0, 49, 34, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 1, 1, 0, 0, SootopolisCity_EventScript_14D2A6, FLAG_HIDE_SOOTOPOLIS_RESIDENTS SootopolisCity_MapWarps:: @ 8380710 warp_def 43, 31, 0, 0, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F @@ -26,15 +26,15 @@ SootopolisCity_MapWarps:: @ 8380710 warp_def 48, 25, 0, 0, MAP_SOOTOPOLIS_CITY_HOUSE8 SootopolisCity_MapCoordEvents:: @ 8380770 - coord_event 25, 6, 3, 0, VAR_SOOTOPOLIS_STATE, 1, 0, SootopolisCity_EventScript_14D308 + coord_event 25, 6, 3, VAR_SOOTOPOLIS_STATE, 1, SootopolisCity_EventScript_14D308 SootopolisCity_MapBGEvents:: @ 8380780 - bg_event 32, 34, 0, 0, 0, SootopolisCity_EventScript_14D2ED - bg_event 19, 29, 0, 1, 0, SootopolisCity_EventScript_1A00E1 - bg_event 44, 31, 0, 1, 0, SootopolisCity_EventScript_1A00EA - bg_event 45, 31, 0, 1, 0, SootopolisCity_EventScript_1A00EA - bg_event 18, 29, 0, 1, 0, SootopolisCity_EventScript_1A00E1 - bg_event 41, 37, 0, 0, 0, SootopolisCity_EventScript_14D2F6 + bg_event 32, 34, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_14D2ED + bg_event 19, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_1A00E1 + bg_event 44, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_1A00EA + bg_event 45, 31, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_1A00EA + bg_event 18, 29, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_EventScript_1A00E1 + bg_event 41, 37, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_EventScript_14D2F6 SootopolisCity_MapEvents:: @ 83807C8 map_events SootopolisCity_EventObjects, SootopolisCity_MapWarps, SootopolisCity_MapCoordEvents, SootopolisCity_MapBGEvents diff --git a/data/maps/SootopolisCity/header.inc b/data/maps/SootopolisCity/header.inc index bd41a5c2b..b87323ffc 100644 --- a/data/maps/SootopolisCity/header.inc +++ b/data/maps/SootopolisCity/header.inc @@ -5,10 +5,10 @@ SootopolisCity:: @ 830550C .4byte 0x0 .2byte MUS_RUNECITY .2byte 8 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 2 - .byte 2 + .byte WEATHER_SUNNY + .byte MAP_TYPE_CITY .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_Gym_1F/events.inc b/data/maps/SootopolisCity_Gym_1F/events.inc index 43cd0fe75..8922b5920 100644 --- a/data/maps/SootopolisCity_Gym_1F/events.inc +++ b/data/maps/SootopolisCity_Gym_1F/events.inc @@ -1,6 +1,6 @@ SootopolisCity_Gym_1F_EventObjects:: @ 838ACF0 - object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 8, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM - object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, 8, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B084, 0 + object_event 1, EVENT_OBJ_GFX_WALLACE, 0, 8, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15AFFF, FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM + object_event 2, EVENT_OBJ_GFX_MAN_2, 0, 7, 24, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B084, 0 SootopolisCity_Gym_1F_MapWarps:: @ 838AD20 warp_def 8, 25, 0, 2, MAP_SOOTOPOLIS_CITY @@ -8,8 +8,8 @@ SootopolisCity_Gym_1F_MapWarps:: @ 838AD20 warp_def 11, 22, 3, 0, MAP_SOOTOPOLIS_CITY_GYM_B1F SootopolisCity_Gym_1F_MapBGEvents:: @ 838AD38 - bg_event 6, 24, 0, 0, 0, SootopolisCity_Gym_1F_EventScript_15B0A3 - bg_event 10, 24, 0, 1, 0, SootopolisCity_Gym_1F_EventScript_15B0B3 + bg_event 6, 24, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_Gym_1F_EventScript_15B0A3 + bg_event 10, 24, 0, BG_EVENT_PLAYER_FACING_NORTH, SootopolisCity_Gym_1F_EventScript_15B0B3 SootopolisCity_Gym_1F_MapEvents:: @ 838AD50 map_events SootopolisCity_Gym_1F_EventObjects, SootopolisCity_Gym_1F_MapWarps, 0x0, SootopolisCity_Gym_1F_MapBGEvents diff --git a/data/maps/SootopolisCity_Gym_1F/header.inc b/data/maps/SootopolisCity_Gym_1F/header.inc index 0583679dc..df1b1d17f 100644 --- a/data/maps/SootopolisCity_Gym_1F/header.inc +++ b/data/maps/SootopolisCity_Gym_1F/header.inc @@ -5,10 +5,10 @@ SootopolisCity_Gym_1F:: @ 830692C .4byte 0x0 .2byte MUS_GIM .2byte 110 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index a404013e0..a918c0568 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -86,7 +86,7 @@ SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD end_movement SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF - trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D + trainerbattle 1, TRAINER_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_15B056 goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_15B07A msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4 diff --git a/data/maps/SootopolisCity_Gym_B1F/events.inc b/data/maps/SootopolisCity_Gym_B1F/events.inc index 9ccf07ef6..542326bfe 100644 --- a/data/maps/SootopolisCity_Gym_B1F/events.inc +++ b/data/maps/SootopolisCity_Gym_B1F/events.inc @@ -1,12 +1,12 @@ SootopolisCity_Gym_B1F_EventObjects:: @ 838AD64 - object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 19, 3, 10, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B0D8, 0 - object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 17, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B11D, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 14, 3, 9, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B106, 0 - object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 6, 13, 3, 10, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_15B134, 0 - object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 3, 9, 3, 10, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_15B162, 0 - object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 9, 3, 9, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_15B179, 0 - object_event 7, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, 8, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_15B0EF, 0 - object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, 9, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_15B14B, 0 + object_event 1, EVENT_OBJ_GFX_LASS, 0, 7, 19, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B0D8, 0 + object_event 2, EVENT_OBJ_GFX_BEAUTY, 0, 9, 17, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B11D, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_3, 0, 9, 14, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 1, SootopolisCity_Gym_B1F_EventScript_15B106, 0 + object_event 4, EVENT_OBJ_GFX_BEAUTY, 0, 6, 13, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 5, SootopolisCity_Gym_B1F_EventScript_15B134, 0 + object_event 5, EVENT_OBJ_GFX_BEAUTY, 0, 3, 9, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 1, 4, SootopolisCity_Gym_B1F_EventScript_15B162, 0 + object_event 6, EVENT_OBJ_GFX_WOMAN_2, 0, 11, 9, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_15B179, 0 + object_event 7, EVENT_OBJ_GFX_LASS, 0, 8, 7, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 2, SootopolisCity_Gym_B1F_EventScript_15B0EF, 0 + object_event 8, EVENT_OBJ_GFX_BEAUTY, 0, 12, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, SootopolisCity_Gym_B1F_EventScript_15B14B, 0 SootopolisCity_Gym_B1F_MapWarps:: @ 838AE24 warp_def 11, 22, 3, 2, MAP_SOOTOPOLIS_CITY_GYM_1F diff --git a/data/maps/SootopolisCity_Gym_B1F/header.inc b/data/maps/SootopolisCity_Gym_B1F/header.inc index ea131c587..54ac62ce1 100644 --- a/data/maps/SootopolisCity_Gym_B1F/header.inc +++ b/data/maps/SootopolisCity_Gym_B1F/header.inc @@ -5,10 +5,10 @@ SootopolisCity_Gym_B1F:: @ 8306948 .4byte 0x0 .2byte MUS_GIM .2byte 111 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 1 + .byte MAP_BATTLE_SCENE_GYM diff --git a/data/maps/SootopolisCity_Gym_B1F/scripts.inc b/data/maps/SootopolisCity_Gym_B1F/scripts.inc index e54970701..06c7d33a3 100644 --- a/data/maps/SootopolisCity_Gym_B1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_B1F/scripts.inc @@ -2,41 +2,41 @@ SootopolisCity_Gym_B1F_MapScripts:: @ 815B0D7 .byte 0 SootopolisCity_Gym_B1F_EventScript_15B0D8:: @ 815B0D8 - trainerbattle 0, OPPONENT_ANDREA, 0, SootopolisCity_Gym_B1F_Text_18EA87, SootopolisCity_Gym_B1F_Text_18EACF + trainerbattle 0, TRAINER_ANDREA, 0, SootopolisCity_Gym_B1F_Text_18EA87, SootopolisCity_Gym_B1F_Text_18EACF msgbox SootopolisCity_Gym_B1F_Text_18EAED, 6 end SootopolisCity_Gym_B1F_EventScript_15B0EF:: @ 815B0EF - trainerbattle 0, OPPONENT_CRISSY, 0, SootopolisCity_Gym_B1F_Text_18EB22, SootopolisCity_Gym_B1F_Text_18EB81 + trainerbattle 0, TRAINER_CRISSY, 0, SootopolisCity_Gym_B1F_Text_18EB22, SootopolisCity_Gym_B1F_Text_18EB81 msgbox SootopolisCity_Gym_B1F_Text_18EBB1, 6 end SootopolisCity_Gym_B1F_EventScript_15B106:: @ 815B106 - trainerbattle 0, OPPONENT_BRIANNA_2, 0, SootopolisCity_Gym_B1F_Text_18EBFA, SootopolisCity_Gym_B1F_Text_18EC5E + trainerbattle 0, TRAINER_BRIANNA_2, 0, SootopolisCity_Gym_B1F_Text_18EBFA, SootopolisCity_Gym_B1F_Text_18EC5E msgbox SootopolisCity_Gym_B1F_Text_18EC92, 6 end SootopolisCity_Gym_B1F_EventScript_15B11D:: @ 815B11D - trainerbattle 0, OPPONENT_CONNIE, 0, SootopolisCity_Gym_B1F_Text_18ECEB, SootopolisCity_Gym_B1F_Text_18ED18 + trainerbattle 0, TRAINER_CONNIE, 0, SootopolisCity_Gym_B1F_Text_18ECEB, SootopolisCity_Gym_B1F_Text_18ED18 msgbox SootopolisCity_Gym_B1F_Text_18ED2B, 6 end SootopolisCity_Gym_B1F_EventScript_15B134:: @ 815B134 - trainerbattle 0, OPPONENT_BRIDGET, 0, SootopolisCity_Gym_B1F_Text_18ED91, SootopolisCity_Gym_B1F_Text_18EDE8 + trainerbattle 0, TRAINER_BRIDGET, 0, SootopolisCity_Gym_B1F_Text_18ED91, SootopolisCity_Gym_B1F_Text_18EDE8 msgbox SootopolisCity_Gym_B1F_Text_18EE03, 6 end SootopolisCity_Gym_B1F_EventScript_15B14B:: @ 815B14B - trainerbattle 0, OPPONENT_OLIVIA, 0, SootopolisCity_Gym_B1F_Text_18EE96, SootopolisCity_Gym_B1F_Text_18EEDC + trainerbattle 0, TRAINER_OLIVIA, 0, SootopolisCity_Gym_B1F_Text_18EE96, SootopolisCity_Gym_B1F_Text_18EEDC msgbox SootopolisCity_Gym_B1F_Text_18EEF7, 6 end SootopolisCity_Gym_B1F_EventScript_15B162:: @ 815B162 - trainerbattle 0, OPPONENT_TIFFANY, 0, SootopolisCity_Gym_B1F_Text_18EF39, SootopolisCity_Gym_B1F_Text_18EFB8 + trainerbattle 0, TRAINER_TIFFANY, 0, SootopolisCity_Gym_B1F_Text_18EF39, SootopolisCity_Gym_B1F_Text_18EFB8 msgbox SootopolisCity_Gym_B1F_Text_18EFCA, 6 end SootopolisCity_Gym_B1F_EventScript_15B179:: @ 815B179 - trainerbattle 0, OPPONENT_MARISSA, 0, SootopolisCity_Gym_B1F_Text_18F037, SootopolisCity_Gym_B1F_Text_18F07F + trainerbattle 0, TRAINER_MARISSA, 0, SootopolisCity_Gym_B1F_Text_18F037, SootopolisCity_Gym_B1F_Text_18F07F msgbox SootopolisCity_Gym_B1F_Text_18F085, 6 end diff --git a/data/maps/SootopolisCity_House1/events.inc b/data/maps/SootopolisCity_House1/events.inc index a4b4c7932..fb7a318d2 100644 --- a/data/maps/SootopolisCity_House1/events.inc +++ b/data/maps/SootopolisCity_House1/events.inc @@ -1,6 +1,6 @@ SootopolisCity_House1_EventObjects:: @ 838AFA4 - object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B29B, 0 - object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, 8, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B2D1, 0 + object_event 1, EVENT_OBJ_GFX_BLACK_BELT, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B29B, 0 + object_event 2, EVENT_OBJ_GFX_KECLEON_1, 0, 2, 3, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House1_EventScript_15B2D1, 0 SootopolisCity_House1_MapWarps:: @ 838AFD4 warp_def 3, 6, 0, 4, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House1/header.inc b/data/maps/SootopolisCity_House1/header.inc index 924b6a382..261895970 100644 --- a/data/maps/SootopolisCity_House1/header.inc +++ b/data/maps/SootopolisCity_House1/header.inc @@ -5,10 +5,10 @@ SootopolisCity_House1:: @ 83069B8 .4byte 0x0 .2byte MUS_RUNECITY .2byte 308 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House2/events.inc b/data/maps/SootopolisCity_House2/events.inc index 146a1d871..241961795 100644 --- a/data/maps/SootopolisCity_House2/events.inc +++ b/data/maps/SootopolisCity_House2/events.inc @@ -1,5 +1,5 @@ SootopolisCity_House2_EventObjects:: @ 838AFF8 - object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House2_EventScript_15B2E5, 0 + object_event 1, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House2_EventScript_15B2E5, 0 SootopolisCity_House2_MapWarps:: @ 838B010 warp_def 3, 6, 0, 5, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House2/header.inc b/data/maps/SootopolisCity_House2/header.inc index 6360bcf03..7e49a0333 100644 --- a/data/maps/SootopolisCity_House2/header.inc +++ b/data/maps/SootopolisCity_House2/header.inc @@ -5,10 +5,10 @@ SootopolisCity_House2:: @ 83069D4 .4byte 0x0 .2byte MUS_RUNECITY .2byte 309 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House3/events.inc b/data/maps/SootopolisCity_House3/events.inc index d813189e8..987aa7a30 100644 --- a/data/maps/SootopolisCity_House3/events.inc +++ b/data/maps/SootopolisCity_House3/events.inc @@ -1,6 +1,6 @@ SootopolisCity_House3_EventObjects:: @ 838B034 - object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 4, 3, 8, 0, 0, 0, 0, SootopolisCity_House3_EventScript_15B31A, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_House3_EventScript_15B343, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_5, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_House3_EventScript_15B31A, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_2, 0, 6, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House3_EventScript_15B343, 0 SootopolisCity_House3_MapWarps:: @ 838B064 warp_def 3, 6, 0, 6, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House3/header.inc b/data/maps/SootopolisCity_House3/header.inc index f7d724e5f..19d25ea53 100644 --- a/data/maps/SootopolisCity_House3/header.inc +++ b/data/maps/SootopolisCity_House3/header.inc @@ -5,10 +5,10 @@ SootopolisCity_House3:: @ 83069F0 .4byte 0x0 .2byte MUS_RUNECITY .2byte 310 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House4/events.inc b/data/maps/SootopolisCity_House4/events.inc index 128d0ff99..6f4eeb127 100644 --- a/data/maps/SootopolisCity_House4/events.inc +++ b/data/maps/SootopolisCity_House4/events.inc @@ -1,7 +1,7 @@ SootopolisCity_House4_EventObjects:: @ 838B088 - object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B34D, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 2, 3, 7, 1, 2, 0, 0, SootopolisCity_House4_EventScript_15B356, 0 - object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, 1, 1, 1, 0, 0, SootopolisCity_House4_EventScript_15B35F, 0 + object_event 1, EVENT_OBJ_GFX_MAN_1, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House4_EventScript_15B34D, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_5, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_UP, 1, 2, 0, 0, SootopolisCity_House4_EventScript_15B356, 0 + object_event 3, EVENT_OBJ_GFX_AZUMARILL, 0, 2, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, SootopolisCity_House4_EventScript_15B35F, 0 SootopolisCity_House4_MapWarps:: @ 838B0D0 warp_def 3, 6, 0, 7, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House4/header.inc b/data/maps/SootopolisCity_House4/header.inc index d18dc2edc..89f13124f 100644 --- a/data/maps/SootopolisCity_House4/header.inc +++ b/data/maps/SootopolisCity_House4/header.inc @@ -5,10 +5,10 @@ SootopolisCity_House4:: @ 8306A0C .4byte 0x0 .2byte MUS_RUNECITY .2byte 308 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House5/events.inc b/data/maps/SootopolisCity_House5/events.inc index 2217f3e0f..f256463bb 100644 --- a/data/maps/SootopolisCity_House5/events.inc +++ b/data/maps/SootopolisCity_House5/events.inc @@ -1,6 +1,6 @@ SootopolisCity_House5_EventObjects:: @ 838B0F4 - object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B373, 0 - object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B37C, 0 + object_event 1, EVENT_OBJ_GFX_MANIAC, 0, 3, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B373, 0 + object_event 2, EVENT_OBJ_GFX_GIRL_3, 0, 6, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House5_EventScript_15B37C, 0 SootopolisCity_House5_MapWarps:: @ 838B124 warp_def 3, 6, 0, 8, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House5/header.inc b/data/maps/SootopolisCity_House5/header.inc index f34f45f53..cfe70c9da 100644 --- a/data/maps/SootopolisCity_House5/header.inc +++ b/data/maps/SootopolisCity_House5/header.inc @@ -5,10 +5,10 @@ SootopolisCity_House5:: @ 8306A28 .4byte 0x0 .2byte MUS_RUNECITY .2byte 309 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House6/events.inc b/data/maps/SootopolisCity_House6/events.inc index a189b98ba..24534b199 100644 --- a/data/maps/SootopolisCity_House6/events.inc +++ b/data/maps/SootopolisCity_House6/events.inc @@ -1,5 +1,5 @@ SootopolisCity_House6_EventObjects:: @ 838B148 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 3, 3, 2, 1, 1, 0, 0, SootopolisCity_House6_EventScript_15B386, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 4, 3, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House6_EventScript_15B386, 0 SootopolisCity_House6_MapWarps:: @ 838B160 warp_def 3, 6, 0, 9, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House6/header.inc b/data/maps/SootopolisCity_House6/header.inc index 639ea99ba..6b3dbce40 100644 --- a/data/maps/SootopolisCity_House6/header.inc +++ b/data/maps/SootopolisCity_House6/header.inc @@ -5,10 +5,10 @@ SootopolisCity_House6:: @ 8306A44 .4byte 0x0 .2byte MUS_RUNECITY .2byte 310 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House7/events.inc b/data/maps/SootopolisCity_House7/events.inc index 39bc71e79..291e041cb 100644 --- a/data/maps/SootopolisCity_House7/events.inc +++ b/data/maps/SootopolisCity_House7/events.inc @@ -1,6 +1,6 @@ SootopolisCity_House7_EventObjects:: @ 838B184 - object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 3, 3, 9, 0, 0, 0, 0, SootopolisCity_House7_EventScript_15B3EE, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_House7_EventScript_15B3F7, 0 + object_event 1, EVENT_OBJ_GFX_OLD_MAN_2, 0, 5, 3, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House7_EventScript_15B3EE, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_2, 0, 1, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_House7_EventScript_15B3F7, 0 SootopolisCity_House7_MapWarps:: @ 838B1B4 warp_def 3, 6, 0, 10, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_House7/header.inc b/data/maps/SootopolisCity_House7/header.inc index 1d785ec47..378c638ae 100644 --- a/data/maps/SootopolisCity_House7/header.inc +++ b/data/maps/SootopolisCity_House7/header.inc @@ -5,10 +5,10 @@ SootopolisCity_House7:: @ 8306A60 .4byte 0x0 .2byte MUS_RUNECITY .2byte 308 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_House8/events.inc b/data/maps/SootopolisCity_House8/events.inc index d6b139f34..8cf607f25 100644 --- a/data/maps/SootopolisCity_House8/events.inc +++ b/data/maps/SootopolisCity_House8/events.inc @@ -1,14 +1,14 @@ SootopolisCity_House8_EventObjects:: @ 838B1D8 - object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, 10, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B492, 0 - object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, 9, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B401, 0 + object_event 1, EVENT_OBJ_GFX_FISHERMAN, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B492, 0 + object_event 2, EVENT_OBJ_GFX_HIKER, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, SootopolisCity_House8_EventScript_15B401, 0 SootopolisCity_House8_MapWarps:: @ 838B208 warp_def 3, 6, 0, 11, MAP_SOOTOPOLIS_CITY warp_def 4, 6, 0, 11, MAP_SOOTOPOLIS_CITY SootopolisCity_House8_MapBGEvents:: @ 838B218 - bg_event 5, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B523 - bg_event 2, 1, 0, 0, 0, SootopolisCity_House8_EventScript_15B531 + bg_event 5, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_House8_EventScript_15B523 + bg_event 2, 1, 0, BG_EVENT_PLAYER_FACING_ANY, SootopolisCity_House8_EventScript_15B531 SootopolisCity_House8_MapEvents:: @ 838B230 map_events SootopolisCity_House8_EventObjects, SootopolisCity_House8_MapWarps, 0x0, SootopolisCity_House8_MapBGEvents diff --git a/data/maps/SootopolisCity_House8/header.inc b/data/maps/SootopolisCity_House8/header.inc index 58432de80..80734140d 100644 --- a/data/maps/SootopolisCity_House8/header.inc +++ b/data/maps/SootopolisCity_House8/header.inc @@ -5,10 +5,10 @@ SootopolisCity_House8:: @ 8306A7C .4byte 0x0 .2byte MUS_RUNECITY .2byte 298 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_Mart/events.inc b/data/maps/SootopolisCity_Mart/events.inc index 38d3f30f0..ba99aa4de 100644 --- a/data/maps/SootopolisCity_Mart/events.inc +++ b/data/maps/SootopolisCity_Mart/events.inc @@ -1,7 +1,7 @@ SootopolisCity_Mart_EventObjects:: @ 838AF38 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B21B, 0 - object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B24A, 0 - object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, 10, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B272, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B21B, 0 + object_event 2, EVENT_OBJ_GFX_FAT_MAN, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B24A, 0 + object_event 3, EVENT_OBJ_GFX_GENTLEMAN, 0, 9, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, SootopolisCity_Mart_EventScript_15B272, 0 SootopolisCity_Mart_MapWarps:: @ 838AF80 warp_def 3, 7, 0, 1, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_Mart/header.inc b/data/maps/SootopolisCity_Mart/header.inc index ecf6040c4..bb13d1016 100644 --- a/data/maps/SootopolisCity_Mart/header.inc +++ b/data/maps/SootopolisCity_Mart/header.inc @@ -5,10 +5,10 @@ SootopolisCity_Mart:: @ 830699C .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc index 8852ba87c..f2c8fb7d1 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/events.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ SootopolisCity_PokemonCenter_1F_EventObjects:: @ 838AE40 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15BC70, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, 2, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1A8, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 7, 3, 5, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1D0, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15BC70, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 12, 4, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1A8, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 7, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1D0, 0 SootopolisCity_PokemonCenter_1F_MapWarps:: @ 838AE88 warp_def 7, 8, 3, 0, MAP_SOOTOPOLIS_CITY diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc index 496a40444..8739812a2 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/header.inc @@ -5,10 +5,10 @@ SootopolisCity_PokemonCenter_1F:: @ 8306964 .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index 820dd4858..ebfaf4e23 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 815B190 .byte 0 SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 - setrespawn 10 + setrespawn HEAL_LOCATION_SOOTOPOLIS_CITY end @ 815B19A diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc index 2b6b7a022..4117f8e0f 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/events.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ SootopolisCity_PokemonCenter_2F_EventObjects:: @ 838AEB4 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B208, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B20E, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B214, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B208, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B20E, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, SootopolisCity_PokemonCenter_2F_EventScript_15B214, 0 SootopolisCity_PokemonCenter_2F_MapWarps:: @ 838AEFC warp_def 1, 5, 4, 2, MAP_SOOTOPOLIS_CITY_POKEMON_CENTER_1F diff --git a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc index 78a1a486d..fb3f2f8c4 100644 --- a/data/maps/SootopolisCity_PokemonCenter_2F/header.inc +++ b/data/maps/SootopolisCity_PokemonCenter_2F/header.inc @@ -5,10 +5,10 @@ SootopolisCity_PokemonCenter_2F:: @ 8306980 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 14 + .byte MAPSEC_SOOTOPOLIS_CITY .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SouthernIsland_Exterior/events.inc b/data/maps/SouthernIsland_Exterior/events.inc index 38ff07de5..42b61bdd8 100644 --- a/data/maps/SouthernIsland_Exterior/events.inc +++ b/data/maps/SouthernIsland_Exterior/events.inc @@ -1,13 +1,13 @@ SouthernIsland_Exterior_EventObjects:: @ 8391E00 - object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, 7, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_160AE0, 0 - object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, 10, 0, 0, 0, 0, 0x0, 0 + object_event 1, EVENT_OBJ_GFX_SAILOR, 0, 13, 23, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, SouthernIsland_Exterior_EventScript_160AE0, 0 + object_event 2, EVENT_OBJ_GFX_SS_TIDAL, 0, 13, 25, 1, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, 0 SouthernIsland_Exterior_MapWarps:: @ 8391E30 warp_def 14, 5, 3, 0, MAP_SOUTHERN_ISLAND_INTERIOR warp_def 15, 5, 3, 1, MAP_SOUTHERN_ISLAND_INTERIOR SouthernIsland_Exterior_MapBGEvents:: @ 8391E40 - bg_event 16, 7, 3, 0, 0, SouthernIsland_Exterior_EventScript_160B4A + bg_event 16, 7, 3, BG_EVENT_PLAYER_FACING_ANY, SouthernIsland_Exterior_EventScript_160B4A SouthernIsland_Exterior_MapEvents:: @ 8391E4C map_events SouthernIsland_Exterior_EventObjects, SouthernIsland_Exterior_MapWarps, 0x0, SouthernIsland_Exterior_MapBGEvents diff --git a/data/maps/SouthernIsland_Exterior/header.inc b/data/maps/SouthernIsland_Exterior/header.inc index e70d1a97a..a35ed72a7 100644 --- a/data/maps/SouthernIsland_Exterior/header.inc +++ b/data/maps/SouthernIsland_Exterior/header.inc @@ -5,10 +5,10 @@ SouthernIsland_Exterior:: @ 8307CA4 .4byte 0x0 .2byte MUS_DAN02 .2byte 291 - .byte 73 + .byte MAPSEC_SOUTHERN_ISLAND .byte 0 - .byte 0 - .byte 3 + .byte WEATHER_NONE + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/SouthernIsland_Interior/events.inc b/data/maps/SouthernIsland_Interior/events.inc index cba468ef7..6ad29dd5f 100644 --- a/data/maps/SouthernIsland_Interior/events.inc +++ b/data/maps/SouthernIsland_Interior/events.inc @@ -1,13 +1,13 @@ SouthernIsland_Interior_EventObjects:: @ 8391E60 - object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 13, 12, 3, 7, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_FLYING - object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 13, 2, 0, 8, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY + object_event 1, EVENT_OBJ_GFX_VAR_0, 0, 13, 12, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_FLYING + object_event 2, EVENT_OBJ_GFX_VAR_1, 0, 13, 2, 0, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, 0x0, FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY SouthernIsland_Interior_MapWarps:: @ 8391E90 warp_def 13, 18, 3, 0, MAP_SOUTHERN_ISLAND_EXTERIOR warp_def 14, 18, 3, 1, MAP_SOUTHERN_ISLAND_EXTERIOR SouthernIsland_Interior_MapBGEvents:: @ 8391EA0 - bg_event 13, 11, 3, 1, 0, SouthernIsland_Interior_EventScript_160B9B + bg_event 13, 11, 3, BG_EVENT_PLAYER_FACING_NORTH, SouthernIsland_Interior_EventScript_160B9B SouthernIsland_Interior_MapEvents:: @ 8391EAC map_events SouthernIsland_Interior_EventObjects, SouthernIsland_Interior_MapWarps, 0x0, SouthernIsland_Interior_MapBGEvents diff --git a/data/maps/SouthernIsland_Interior/header.inc b/data/maps/SouthernIsland_Interior/header.inc index 2dbee0b85..5bef25e13 100644 --- a/data/maps/SouthernIsland_Interior/header.inc +++ b/data/maps/SouthernIsland_Interior/header.inc @@ -5,10 +5,10 @@ SouthernIsland_Interior:: @ 8307CC0 .4byte 0x0 .2byte MUS_DAN02 .2byte 292 - .byte 73 + .byte MAPSEC_SOUTHERN_ISLAND .byte 0 - .byte 11 - .byte 3 + .byte WEATHER_SHADE + .byte MAP_TYPE_ROUTE .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/TradeCenter/events.inc b/data/maps/TradeCenter/events.inc index bb69d402e..dbeb2c20b 100644 --- a/data/maps/TradeCenter/events.inc +++ b/data/maps/TradeCenter/events.inc @@ -1,13 +1,13 @@ TradeCenter_EventObjects:: @ 8391340 - object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, 9, 0, 0, 0, 0, TradeCenter_EventScript_1A44AD, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_6, 0, 9, 6, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, TradeCenter_EventScript_1A44AD, 0 TradeCenter_MapWarps:: @ 8391358 warp_def 5, 8, 3, 127, MAP_NONE warp_def 6, 8, 3, 127, MAP_NONE TradeCenter_MapCoordEvents:: @ 8391368 - coord_event 4, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43F0 - coord_event 7, 5, 3, 0, VAR_TEMP_0, 0, 0, TradeCenter_EventScript_1A43FA + coord_event 4, 5, 3, VAR_TEMP_0, 0, TradeCenter_EventScript_1A43F0 + coord_event 7, 5, 3, VAR_TEMP_0, 0, TradeCenter_EventScript_1A43FA TradeCenter_MapEvents:: @ 8391388 map_events TradeCenter_EventObjects, TradeCenter_MapWarps, TradeCenter_MapCoordEvents, 0x0 diff --git a/data/maps/TradeCenter/header.inc b/data/maps/TradeCenter/header.inc index dc60b2dd1..d7bdaaac4 100644 --- a/data/maps/TradeCenter/header.inc +++ b/data/maps/TradeCenter/header.inc @@ -5,10 +5,10 @@ TradeCenter:: @ 8307994 .4byte 0x0 .2byte MUS_RAINBOW .2byte 223 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater1/header.inc b/data/maps/Underwater1/header.inc index 87e3260c9..52c15d1b0 100644 --- a/data/maps/Underwater1/header.inc +++ b/data/maps/Underwater1/header.inc @@ -5,10 +5,10 @@ Underwater1:: @ 83059C0 .4byte Underwater1_MapConnections .2byte MUS_DEEPDEEP .2byte 275 - .byte 50 + .byte MAPSEC_UNDERWATER_124 .byte 0 - .byte 14 - .byte 5 + .byte WEATHER_BUBBLES + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater2/header.inc b/data/maps/Underwater2/header.inc index 244cab761..f0e15d9c3 100644 --- a/data/maps/Underwater2/header.inc +++ b/data/maps/Underwater2/header.inc @@ -5,10 +5,10 @@ Underwater2:: @ 83059DC .4byte Underwater2_MapConnections .2byte MUS_DEEPDEEP .2byte 51 - .byte 51 + .byte MAPSEC_UNDERWATER_125 .byte 0 - .byte 14 - .byte 5 + .byte WEATHER_BUBBLES + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater3/header.inc b/data/maps/Underwater3/header.inc index 965109718..46244962f 100644 --- a/data/maps/Underwater3/header.inc +++ b/data/maps/Underwater3/header.inc @@ -5,10 +5,10 @@ Underwater3:: @ 83059F8 .4byte Underwater3_MapConnections .2byte MUS_DEEPDEEP .2byte 52 - .byte 52 + .byte MAPSEC_UNDERWATER_126 .byte 0 - .byte 14 - .byte 5 + .byte WEATHER_BUBBLES + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater4/header.inc b/data/maps/Underwater4/header.inc index 6433cde8e..060ff9b3a 100644 --- a/data/maps/Underwater4/header.inc +++ b/data/maps/Underwater4/header.inc @@ -5,10 +5,10 @@ Underwater4:: @ 8305A14 .4byte Underwater4_MapConnections .2byte MUS_DEEPDEEP .2byte 53 - .byte 53 + .byte MAPSEC_UNDERWATER_127 .byte 0 - .byte 14 - .byte 5 + .byte WEATHER_BUBBLES + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_Route134/header.inc b/data/maps/Underwater_Route134/header.inc index 94328b851..dc0bfd8e1 100644 --- a/data/maps/Underwater_Route134/header.inc +++ b/data/maps/Underwater_Route134/header.inc @@ -5,10 +5,10 @@ Underwater_Route134:: @ 83074FC .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 283 - .byte 79 + .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 - .byte 14 - .byte 5 + .byte WEATHER_BUBBLES + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_SeafloorCavern/events.inc b/data/maps/Underwater_SeafloorCavern/events.inc index 3b1798716..db16aaab4 100644 --- a/data/maps/Underwater_SeafloorCavern/events.inc +++ b/data/maps/Underwater_SeafloorCavern/events.inc @@ -1,8 +1,8 @@ Underwater_SeafloorCavern_EventObjects:: @ 838D018 - object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION - object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION - object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION - object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, 76, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION + object_event 1, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 5, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION + object_event 2, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 6, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION + object_event 3, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 7, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION + object_event 4, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL, 0, 8, 4, 3, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Underwater_SeafloorCavern_EventScript_15DA3F, FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION Underwater_SeafloorCavern_MapWarps:: @ 838D078 warp_def 6, 7, 0, 0, MAP_UNDERWATER4 diff --git a/data/maps/Underwater_SeafloorCavern/header.inc b/data/maps/Underwater_SeafloorCavern/header.inc index e4a84f835..604f1acba 100644 --- a/data/maps/Underwater_SeafloorCavern/header.inc +++ b/data/maps/Underwater_SeafloorCavern/header.inc @@ -5,10 +5,10 @@ Underwater_SeafloorCavern:: @ 8307048 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 147 - .byte 69 + .byte MAPSEC_UNDERWATER_128 .byte 0 - .byte 14 - .byte 5 + .byte WEATHER_BUBBLES + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_SealedChamber/events.inc b/data/maps/Underwater_SealedChamber/events.inc index ede501142..b7794a9ce 100644 --- a/data/maps/Underwater_SealedChamber/events.inc +++ b/data/maps/Underwater_SealedChamber/events.inc @@ -2,7 +2,7 @@ Underwater_SealedChamber_MapWarps:: @ 838E760 warp_def 7, 1, 0, 0, MAP_UNDERWATER_ROUTE134 Underwater_SealedChamber_MapBGEvents:: @ 838E768 - bg_event 12, 43, 0, 0, 0, Underwater_SealedChamber_EventScript_15F0B8 + bg_event 12, 43, 0, BG_EVENT_PLAYER_FACING_ANY, Underwater_SealedChamber_EventScript_15F0B8 Underwater_SealedChamber_MapEvents:: @ 838E774 map_events 0x0, Underwater_SealedChamber_MapWarps, 0x0, Underwater_SealedChamber_MapBGEvents diff --git a/data/maps/Underwater_SealedChamber/header.inc b/data/maps/Underwater_SealedChamber/header.inc index f11030bd8..dd1c92d47 100644 --- a/data/maps/Underwater_SealedChamber/header.inc +++ b/data/maps/Underwater_SealedChamber/header.inc @@ -5,10 +5,10 @@ Underwater_SealedChamber:: @ 8307518 .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 284 - .byte 79 + .byte MAPSEC_UNDERWATER_SEALED_CHAMBER .byte 0 - .byte 14 - .byte 5 + .byte WEATHER_BUBBLES + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/Underwater_SootopolisCity/header.inc b/data/maps/Underwater_SootopolisCity/header.inc index f7626d966..7e1228388 100644 --- a/data/maps/Underwater_SootopolisCity/header.inc +++ b/data/maps/Underwater_SootopolisCity/header.inc @@ -5,10 +5,10 @@ Underwater_SootopolisCity:: @ 8306DFC .4byte 0x0 .2byte MUS_DEEPDEEP .2byte 131 - .byte 54 + .byte MAPSEC_UNDERWATER_SOOTOPOLIS .byte 0 - .byte 14 - .byte 5 + .byte WEATHER_BUBBLES + .byte MAP_TYPE_UNDERWATER .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_29/header.inc b/data/maps/UnknownMap_25_29/header.inc index 0a2845319..8db6a3794 100644 --- a/data/maps/UnknownMap_25_29/header.inc +++ b/data/maps/UnknownMap_25_29/header.inc @@ -5,10 +5,10 @@ UnknownMap_25_29:: @ 8307A04 .4byte 0x0 .2byte MUS_NIBI .2byte 227 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_30/header.inc b/data/maps/UnknownMap_25_30/header.inc index 699998409..5db313070 100644 --- a/data/maps/UnknownMap_25_30/header.inc +++ b/data/maps/UnknownMap_25_30/header.inc @@ -5,10 +5,10 @@ UnknownMap_25_30:: @ 8307A20 .4byte 0x0 .2byte MUS_NIBI .2byte 228 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_31/header.inc b/data/maps/UnknownMap_25_31/header.inc index 704562ea1..917a5acea 100644 --- a/data/maps/UnknownMap_25_31/header.inc +++ b/data/maps/UnknownMap_25_31/header.inc @@ -5,10 +5,10 @@ UnknownMap_25_31:: @ 8307A3C .4byte 0x0 .2byte MUS_NIBI .2byte 229 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_32/header.inc b/data/maps/UnknownMap_25_32/header.inc index ef1d675de..db6f36bf1 100644 --- a/data/maps/UnknownMap_25_32/header.inc +++ b/data/maps/UnknownMap_25_32/header.inc @@ -5,10 +5,10 @@ UnknownMap_25_32:: @ 8307A58 .4byte 0x0 .2byte MUS_NIBI .2byte 230 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_33/header.inc b/data/maps/UnknownMap_25_33/header.inc index ba13111f1..d1dd75a38 100644 --- a/data/maps/UnknownMap_25_33/header.inc +++ b/data/maps/UnknownMap_25_33/header.inc @@ -5,10 +5,10 @@ UnknownMap_25_33:: @ 8307A74 .4byte 0x0 .2byte MUS_NIBI .2byte 231 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/UnknownMap_25_34/header.inc b/data/maps/UnknownMap_25_34/header.inc index f082e3c09..e2b15dc37 100644 --- a/data/maps/UnknownMap_25_34/header.inc +++ b/data/maps/UnknownMap_25_34/header.inc @@ -5,10 +5,10 @@ UnknownMap_25_34:: @ 8307A90 .4byte 0x0 .2byte MUS_NIBI .2byte 232 - .byte 87 + .byte MAPSEC_DYNAMIC .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown/events.inc b/data/maps/VerdanturfTown/events.inc index 920703b72..8438ff430 100644 --- a/data/maps/VerdanturfTown/events.inc +++ b/data/maps/VerdanturfTown/events.inc @@ -1,8 +1,8 @@ VerdanturfTown_EventObjects:: @ 8380F00 - object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_14E899, 0 - object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 2, 3, 9, 1, 0, 0, 0, VerdanturfTown_EventScript_14E866, 0 - object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 11, 9, 3, 3, 0, 1, 0, 0, VerdanturfTown_EventScript_14E8AB, 0 - object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 6, 10, 3, 5, 1, 0, 0, 0, VerdanturfTown_EventScript_14E8A2, 0 + object_event 1, EVENT_OBJ_GFX_MAN_2, 0, 4, 17, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_14E899, 0 + object_event 2, EVENT_OBJ_GFX_LITTLE_GIRL_1, 0, 9, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 0, 0, 0, VerdanturfTown_EventScript_14E866, 0 + object_event 3, EVENT_OBJ_GFX_BOY_1, 0, 11, 9, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, VerdanturfTown_EventScript_14E8AB, 0 + object_event 4, EVENT_OBJ_GFX_CAMPER, 0, 6, 10, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_EventScript_14E8A2, 0 VerdanturfTown_MapWarps:: @ 8380F60 warp_def 4, 7, 0, 0, MAP_VERDANTURF_TOWN_CONTEST_LOBBY @@ -14,14 +14,14 @@ VerdanturfTown_MapWarps:: @ 8380F60 warp_def 17, 15, 0, 0, MAP_VERDANTURF_TOWN_HOUSE VerdanturfTown_MapBGEvents:: @ 8380F98 - bg_event 14, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1 - bg_event 14, 6, 0, 0, 0, VerdanturfTown_EventScript_14E8CA - bg_event 17, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00EA - bg_event 7, 14, 0, 0, 0, VerdanturfTown_EventScript_14E8D3 - bg_event 13, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00E1 - bg_event 18, 3, 0, 1, 0, VerdanturfTown_EventScript_1A00EA - bg_event 3, 8, 0, 0, 0, VerdanturfTown_EventScript_14E8DC - bg_event 7, 3, 0, 0, 0, VerdanturfTown_EventScript_14E8E5 + bg_event 14, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_1A00E1 + bg_event 14, 6, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_14E8CA + bg_event 17, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_1A00EA + bg_event 7, 14, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_14E8D3 + bg_event 13, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_1A00E1 + bg_event 18, 3, 0, BG_EVENT_PLAYER_FACING_NORTH, VerdanturfTown_EventScript_1A00EA + bg_event 3, 8, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_14E8DC + bg_event 7, 3, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_EventScript_14E8E5 VerdanturfTown_MapEvents:: @ 8380FF8 map_events VerdanturfTown_EventObjects, VerdanturfTown_MapWarps, 0x0, VerdanturfTown_MapBGEvents diff --git a/data/maps/VerdanturfTown/header.inc b/data/maps/VerdanturfTown/header.inc index cbba95897..6c012f392 100644 --- a/data/maps/VerdanturfTown/header.inc +++ b/data/maps/VerdanturfTown/header.inc @@ -5,10 +5,10 @@ VerdanturfTown:: @ 83055D0 .4byte VerdanturfTown_MapConnections .2byte MUS_GOMACHI0 .2byte 15 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 2 - .byte 1 + .byte WEATHER_SUNNY + .byte MAP_TYPE_TOWN .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_ContestHall/events.inc b/data/maps/VerdanturfTown_ContestHall/events.inc index 78224364f..50a0fcf27 100644 --- a/data/maps/VerdanturfTown_ContestHall/events.inc +++ b/data/maps/VerdanturfTown_ContestHall/events.inc @@ -1,15 +1,15 @@ VerdanturfTown_ContestHall_EventObjects:: @ 8386AEC - object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 7, 0, 2, 1, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA9, 0 - object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 20, 15, 0, 2, 1, 1, 0, 0, VerdanturfTown_ContestHall_EventScript_153E97, 0 - object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 8, 3, 2, 2, 2, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA0, 0 + object_event 1, EVENT_OBJ_GFX_BOY_4, 0, 0, 7, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA9, 0 + object_event 2, EVENT_OBJ_GFX_BOY_3, 0, 20, 15, 0, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_ContestHall_EventScript_153E97, 0 + object_event 3, EVENT_OBJ_GFX_LITTLE_GIRL_2, 0, 9, 8, 3, MOVEMENT_TYPE_WANDER_AROUND, 2, 2, 0, 0, VerdanturfTown_ContestHall_EventScript_153EA0, 0 VerdanturfTown_ContestHall_MapWarps:: @ 8386B34 warp_def 11, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY warp_def 10, 17, 0, 2, MAP_VERDANTURF_TOWN_CONTEST_LOBBY VerdanturfTown_ContestHall_MapBGEvents:: @ 8386B44 - bg_event 12, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2 - bg_event 8, 14, 3, 0, 0, VerdanturfTown_ContestHall_EventScript_153EB2 + bg_event 12, 14, 3, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_ContestHall_EventScript_153EB2 + bg_event 8, 14, 3, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_ContestHall_EventScript_153EB2 VerdanturfTown_ContestHall_MapEvents:: @ 8386B5C map_events VerdanturfTown_ContestHall_EventObjects, VerdanturfTown_ContestHall_MapWarps, 0x0, VerdanturfTown_ContestHall_MapBGEvents diff --git a/data/maps/VerdanturfTown_ContestHall/header.inc b/data/maps/VerdanturfTown_ContestHall/header.inc index de3e6848e..cacdf5f20 100644 --- a/data/maps/VerdanturfTown_ContestHall/header.inc +++ b/data/maps/VerdanturfTown_ContestHall/header.inc @@ -5,10 +5,10 @@ VerdanturfTown_ContestHall:: @ 8305D94 .4byte 0x0 .2byte MUS_CONLOBBY .2byte 73 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_ContestLobby/events.inc b/data/maps/VerdanturfTown_ContestLobby/events.inc index 3ab316792..bcb7d9328 100644 --- a/data/maps/VerdanturfTown_ContestLobby/events.inc +++ b/data/maps/VerdanturfTown_ContestLobby/events.inc @@ -1,10 +1,10 @@ VerdanturfTown_ContestLobby_EventObjects:: @ 8386A00 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, 8, 0, 3, 0, 0, VerdanturfTown_ContestLobby_EventScript_153D76, 0 - object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, 10, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B77A0, 0 - object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 14, 2, 3, 9, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E47, 0 - object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 6, 3, 2, 1, 1, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E3E, 0 - object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_VERDANTURF - object_event 6, EVENT_OBJ_GFX_BOY_3, 0, 0, 3, 3, 3, 0, 1, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E80, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 5, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 3, 0, 0, VerdanturfTown_ContestLobby_EventScript_153D76, 0 + object_event 2, EVENT_OBJ_GFX_OLD_MAN_1, 0, 11, 5, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B77A0, 0 + object_event 3, EVENT_OBJ_GFX_GIRL_1, 0, 14, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E47, 0 + object_event 4, EVENT_OBJ_GFX_BOY_2, 0, 1, 6, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E3E, 0 + object_event 5, EVENT_OBJ_GFX_REPORTER_M, 0, 7, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1AE0B6, FLAG_HIDE_CONTEST_REPORTER_VERDANTURF + object_event 6, EVENT_OBJ_GFX_BOY_3, 0, 0, 3, 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN, 0, 1, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E80, 0 VerdanturfTown_ContestLobby_MapWarps:: @ 8386A90 warp_def 5, 6, 0, 0, MAP_VERDANTURF_TOWN @@ -12,10 +12,10 @@ VerdanturfTown_ContestLobby_MapWarps:: @ 8386A90 warp_def 1, 1, 0, 1, MAP_VERDANTURF_TOWN_CONTEST_HALL VerdanturfTown_ContestLobby_MapBGEvents:: @ 8386AA8 - bg_event 10, 3, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B782F - bg_event 12, 5, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_1B763F - bg_event 11, 1, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E37 - bg_event 13, 1, 0, 0, 0, VerdanturfTown_ContestLobby_EventScript_153E89 + bg_event 10, 3, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_ContestLobby_EventScript_1B782F + bg_event 12, 5, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_ContestLobby_EventScript_1B763F + bg_event 11, 1, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_ContestLobby_EventScript_153E37 + bg_event 13, 1, 0, BG_EVENT_PLAYER_FACING_ANY, VerdanturfTown_ContestLobby_EventScript_153E89 VerdanturfTown_ContestLobby_MapEvents:: @ 8386AD8 map_events VerdanturfTown_ContestLobby_EventObjects, VerdanturfTown_ContestLobby_MapWarps, 0x0, VerdanturfTown_ContestLobby_MapBGEvents diff --git a/data/maps/VerdanturfTown_ContestLobby/header.inc b/data/maps/VerdanturfTown_ContestLobby/header.inc index 60849fb0a..d8ec51ef3 100644 --- a/data/maps/VerdanturfTown_ContestLobby/header.inc +++ b/data/maps/VerdanturfTown_ContestLobby/header.inc @@ -5,10 +5,10 @@ VerdanturfTown_ContestLobby:: @ 8305D78 .4byte 0x0 .2byte MUS_CONLOBBY .2byte 72 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc index c03706d90..81b2a84de 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/events.inc @@ -1,6 +1,6 @@ VerdanturfTown_FriendshipRatersHouse_EventObjects:: @ 8386D88 - object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154030, 0 - object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_3, 0, 3, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154030, 0 + object_event 2, EVENT_OBJ_GFX_PIKACHU, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9, 0 VerdanturfTown_FriendshipRatersHouse_MapWarps:: @ 8386DB8 warp_def 3, 7, 0, 5, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc index 4152aef1b..fd47e6b5b 100644 --- a/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc +++ b/data/maps/VerdanturfTown_FriendshipRatersHouse/header.inc @@ -5,10 +5,10 @@ VerdanturfTown_FriendshipRatersHouse:: @ 8305E20 .4byte 0x0 .2byte MUS_GOMACHI0 .2byte 60 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_House/events.inc b/data/maps/VerdanturfTown_House/events.inc index ca7d2a4dd..b0856c090 100644 --- a/data/maps/VerdanturfTown_House/events.inc +++ b/data/maps/VerdanturfTown_House/events.inc @@ -1,6 +1,6 @@ VerdanturfTown_House_EventObjects:: @ 8386DDC - object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 5, 3, 7, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540ED, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540F6, 0 + object_event 1, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 5, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540ED, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 4, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_House_EventScript_1540F6, 0 VerdanturfTown_House_MapWarps:: @ 8386E0C warp_def 3, 8, 0, 6, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_House/header.inc b/data/maps/VerdanturfTown_House/header.inc index 838905374..b99ebf511 100644 --- a/data/maps/VerdanturfTown_House/header.inc +++ b/data/maps/VerdanturfTown_House/header.inc @@ -5,10 +5,10 @@ VerdanturfTown_House:: @ 8305E3C .4byte 0x0 .2byte MUS_GOMACHI0 .2byte 59 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_Mart/events.inc b/data/maps/VerdanturfTown_Mart/events.inc index f4ca8b8f3..0565d10b4 100644 --- a/data/maps/VerdanturfTown_Mart/events.inc +++ b/data/maps/VerdanturfTown_Mart/events.inc @@ -1,8 +1,8 @@ VerdanturfTown_Mart_EventObjects:: @ 8386B70 - object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EBC, 0 - object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EEE, 0 - object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EF7, 0 - object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, 9, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_153F00, 0 + object_event 1, EVENT_OBJ_GFX_MART_EMPLOYEE, 0, 1, 3, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EBC, 0 + object_event 2, EVENT_OBJ_GFX_BOY_2, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EEE, 0 + object_event 3, EVENT_OBJ_GFX_OLD_WOMAN_1, 0, 8, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_Mart_EventScript_153EF7, 0 + object_event 4, EVENT_OBJ_GFX_LASS, 0, 3, 2, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 0, 0, VerdanturfTown_Mart_EventScript_153F00, 0 VerdanturfTown_Mart_MapWarps:: @ 8386BD0 warp_def 3, 7, 0, 1, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_Mart/header.inc b/data/maps/VerdanturfTown_Mart/header.inc index 7d34f77a7..d5d47fc72 100644 --- a/data/maps/VerdanturfTown_Mart/header.inc +++ b/data/maps/VerdanturfTown_Mart/header.inc @@ -5,10 +5,10 @@ VerdanturfTown_Mart:: @ 8305DB0 .4byte 0x0 .2byte MUS_FRIENDLY .2byte 63 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc index 8cf8b1dab..b5d3c658a 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/events.inc @@ -1,7 +1,7 @@ VerdanturfTown_PokemonCenter_1F_EventObjects:: @ 8386BF4 - object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F18, 0 - object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, 5, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F26, 0 - object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 2, 3, 7, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F2F, 0 + object_event 1, EVENT_OBJ_GFX_NURSE, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F18, 0 + object_event 2, EVENT_OBJ_GFX_GENTLEMAN, 0, 4, 5, 3, MOVEMENT_TYPE_WANDER_LEFT_AND_RIGHT, 1, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F26, 0 + object_event 3, EVENT_OBJ_GFX_OLD_MAN_1, 0, 12, 2, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_1F_EventScript_153F2F, 0 VerdanturfTown_PokemonCenter_1F_MapWarps:: @ 8386C3C warp_def 7, 8, 3, 2, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc index 7e1269720..2238e0e72 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/header.inc @@ -5,10 +5,10 @@ VerdanturfTown_PokemonCenter_1F:: @ 8305DCC .4byte 0x0 .2byte MUS_POKECEN .2byte 61 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc index 956a28ac5..de2f770d6 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc @@ -3,7 +3,7 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8153F09 .byte 0 VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F - setrespawn 18 + setrespawn HEAL_LOCATION_VERDANTURF_TOWN call VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B end diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc index 51fe22275..1e99a098d 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/events.inc @@ -1,7 +1,7 @@ VerdanturfTown_PokemonCenter_2F_EventObjects:: @ 8386C68 - object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F48, 0 - object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F4E, 0 - object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F54, 0 + object_event 1, EVENT_OBJ_GFX_TEALA, 0, 4, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F48, 0 + object_event 2, EVENT_OBJ_GFX_TEALA, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F4E, 0 + object_event 3, EVENT_OBJ_GFX_TEALA, 0, 10, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_PokemonCenter_2F_EventScript_153F54, 0 VerdanturfTown_PokemonCenter_2F_MapWarps:: @ 8386CB0 warp_def 1, 5, 4, 2, MAP_VERDANTURF_TOWN_POKEMON_CENTER_1F diff --git a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc index c29f42e15..bd6369091 100644 --- a/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc +++ b/data/maps/VerdanturfTown_PokemonCenter_2F/header.inc @@ -5,10 +5,10 @@ VerdanturfTown_PokemonCenter_2F:: @ 8305DE8 .4byte 0x0 .2byte MUS_POKECEN .2byte 62 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VerdanturfTown_WandasHouse/events.inc b/data/maps/VerdanturfTown_WandasHouse/events.inc index 709c5aeb6..462b93b73 100644 --- a/data/maps/VerdanturfTown_WandasHouse/events.inc +++ b/data/maps/VerdanturfTown_WandasHouse/events.inc @@ -1,9 +1,9 @@ VerdanturfTown_WandasHouse_EventObjects:: @ 8386CEC - object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, 2, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, FLAG_HIDE_WALLY_WANDAS_HOUSE - object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE - object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, 8, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE - object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 4, 3, 10, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FEA, 0 - object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, 9, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE + object_event 1, EVENT_OBJ_GFX_WALLY, 0, 14, 5, 3, MOVEMENT_TYPE_WANDER_AROUND, 1, 1, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F5B, FLAG_HIDE_WALLY_WANDAS_HOUSE + object_event 2, EVENT_OBJ_GFX_BLACK_BELT, 0, 5, 4, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FAF, FLAG_HIDE_BOYFRIEND_WANDAS_HOUSE + object_event 3, EVENT_OBJ_GFX_MAN_3, 0, 7, 2, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153F7D, FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE + object_event 4, EVENT_OBJ_GFX_WOMAN_2, 0, 2, 4, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FEA, 0 + object_event 5, EVENT_OBJ_GFX_WOMAN_3, 0, 5, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, VerdanturfTown_WandasHouse_EventScript_153FB8, FLAG_HIDE_GIRLFRIEND_WANDAS_HOUSE VerdanturfTown_WandasHouse_MapWarps:: @ 8386D64 warp_def 7, 7, 0, 3, MAP_VERDANTURF_TOWN diff --git a/data/maps/VerdanturfTown_WandasHouse/header.inc b/data/maps/VerdanturfTown_WandasHouse/header.inc index 57e835308..01bfcbde5 100644 --- a/data/maps/VerdanturfTown_WandasHouse/header.inc +++ b/data/maps/VerdanturfTown_WandasHouse/header.inc @@ -5,10 +5,10 @@ VerdanturfTown_WandasHouse:: @ 8305E04 .4byte 0x0 .2byte MUS_GOMACHI0 .2byte 76 - .byte 5 + .byte MAPSEC_VERDANTURF_TOWN .byte 0 - .byte 0 - .byte 8 + .byte WEATHER_NONE + .byte MAP_TYPE_INDOOR .2byte 0 .byte 0 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_1F/events.inc b/data/maps/VictoryRoad_1F/events.inc index 916e9bfc2..54bed846b 100644 --- a/data/maps/VictoryRoad_1F/events.inc +++ b/data/maps/VictoryRoad_1F/events.inc @@ -1,11 +1,11 @@ VictoryRoad_1F_EventObjects:: @ 838D8E4 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 33, 22, 3, 8, 0, 0, 1, 3, VictoryRoad_1F_EventScript_15DF6F, 0 - object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 6, 15, 4, 9, 0, 0, 1, 4, VictoryRoad_1F_EventScript_15DF9D, 0 - object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 27, 34, 3, 18, 0, 0, 1, 3, VictoryRoad_1F_EventScript_15DF86, 0 - object_event 4, EVENT_OBJ_GFX_WALLY, 0, 31, 12, 3, 7, 1, 1, 0, 0, VictoryRoad_1F_EventScript_15DF28, FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, FLAG_ITEM_VICTORY_ROAD_1F_1 - object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, FLAG_ITEM_VICTORY_ROAD_1F_2 - object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, 1, 1, 1, 0, 0, VictoryRoad_1F_EventScript_15DF31, FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 33, 22, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 3, VictoryRoad_1F_EventScript_15DF6F, 0 + object_event 2, EVENT_OBJ_GFX_WOMAN_7, 0, 6, 15, 4, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, VictoryRoad_1F_EventScript_15DF9D, 0 + object_event 3, EVENT_OBJ_GFX_MAN_4, 0, 27, 34, 3, MOVEMENT_TYPE_FACE_DOWN_AND_RIGHT, 0, 0, 1, 3, VictoryRoad_1F_EventScript_15DF86, 0 + object_event 4, EVENT_OBJ_GFX_WALLY, 0, 31, 12, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 0, 0, VictoryRoad_1F_EventScript_15DF28, FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 40, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_1B1AC6, FLAG_ITEM_VICTORY_ROAD_1F_1 + object_event 6, EVENT_OBJ_GFX_ITEM_BALL, 0, 37, 39, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_1B1AD3, FLAG_ITEM_VICTORY_ROAD_1F_2 + object_event 7, EVENT_OBJ_GFX_WALLY, 0, 31, 9, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_1F_EventScript_15DF31, FLAG_HIDE_WALLY_DEFEATED_VICTORY_ROAD VictoryRoad_1F_MapWarps:: @ 838D98C warp_def 15, 40, 3, 2, MAP_EVER_GRANDE_CITY @@ -15,9 +15,9 @@ VictoryRoad_1F_MapWarps:: @ 838D98C warp_def 9, 14, 4, 4, MAP_VICTORY_ROAD_B1F VictoryRoad_1F_MapCoordEvents:: @ 838D9B4 - coord_event 34, 3, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DE97 - coord_event 34, 4, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEAB - coord_event 34, 5, 3, 0, VAR_VICTORY_ROAD_1F_STATE, 0, 0, VictoryRoad_1F_EventScript_15DEBF + coord_event 34, 3, 3, VAR_VICTORY_ROAD_1F_STATE, 0, VictoryRoad_1F_EventScript_15DE97 + coord_event 34, 4, 3, VAR_VICTORY_ROAD_1F_STATE, 0, VictoryRoad_1F_EventScript_15DEAB + coord_event 34, 5, 3, VAR_VICTORY_ROAD_1F_STATE, 0, VictoryRoad_1F_EventScript_15DEBF VictoryRoad_1F_MapBGEvents:: @ 838D9E4 bg_hidden_item_event 30, 39, 4, ITEM_ULTRA_BALL, FLAG_HIDDEN_ITEM_51 diff --git a/data/maps/VictoryRoad_1F/header.inc b/data/maps/VictoryRoad_1F/header.inc index 61c47f001..0a9f56e9b 100644 --- a/data/maps/VictoryRoad_1F/header.inc +++ b/data/maps/VictoryRoad_1F/header.inc @@ -5,10 +5,10 @@ VictoryRoad_1F:: @ 8307224 .4byte 0x0 .2byte MUS_C_ROAD .2byte 164 - .byte 70 + .byte MAPSEC_VICTORY_ROAD .byte 0 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index 045189759..b4931325a 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -38,7 +38,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 applymovement 255, VictoryRoad_1F_Movement_1A083F waitmovement 0 msgbox VictoryRoad_1F_Text_19782B, 4 - trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943 + trainerbattle 3, TRAINER_WALLY_1, 0, VictoryRoad_1F_Text_197943 msgbox VictoryRoad_1F_Text_197967, 4 clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD moveobjectoffscreen 4 @@ -91,7 +91,7 @@ VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 end VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 - trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 + trainerbattle 0, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq VictoryRoad_1F_EventScript_15DF58 @@ -99,21 +99,21 @@ VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 end VictoryRoad_1F_EventScript_15DF58:: @ 815DF58 - trainerbattle 5, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 + trainerbattle 5, TRAINER_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 msgbox VictoryRoad_1F_Text_197A47, 6 end VictoryRoad_1F_EventScript_15DF6F:: @ 815DF6F - trainerbattle 0, OPPONENT_EDGAR, 0, VictoryRoad_1F_Text_197AD1, VictoryRoad_1F_Text_197B1A + trainerbattle 0, TRAINER_EDGAR, 0, VictoryRoad_1F_Text_197AD1, VictoryRoad_1F_Text_197B1A msgbox VictoryRoad_1F_Text_197B36, 6 end VictoryRoad_1F_EventScript_15DF86:: @ 815DF86 - trainerbattle 0, OPPONENT_ALBERT, 0, VictoryRoad_1F_Text_197B99, VictoryRoad_1F_Text_197BE1 + trainerbattle 0, TRAINER_ALBERT, 0, VictoryRoad_1F_Text_197B99, VictoryRoad_1F_Text_197BE1 msgbox VictoryRoad_1F_Text_197BF7, 6 end VictoryRoad_1F_EventScript_15DF9D:: @ 815DF9D - trainerbattle 0, OPPONENT_HOPE, 0, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D + trainerbattle 0, TRAINER_HOPE, 0, VictoryRoad_1F_Text_197C45, VictoryRoad_1F_Text_197C8D msgbox VictoryRoad_1F_Text_197CAF, 6 end diff --git a/data/maps/VictoryRoad_B1F/events.inc b/data/maps/VictoryRoad_B1F/events.inc index af5c86254..94e995b66 100644 --- a/data/maps/VictoryRoad_B1F/events.inc +++ b/data/maps/VictoryRoad_B1F/events.inc @@ -1,23 +1,23 @@ VictoryRoad_B1F_EventObjects:: @ 838DA04 - object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 - object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 - object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 - object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 - object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 - object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 - object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1E - object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19 - object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1A - object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1B - object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1C - object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, 1, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1D - object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, 1, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1F - object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 37, 12, 3, 9, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_15DFB5, 0 - object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 26, 16, 3, 7, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_15DFCC, 0 - object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 21, 3, 9, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_15DFE3, 0 - object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, 1, 1, 1, 0, 0, S_BreakableRock, FLAG_VICTORY_ROAD_ROCK - object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, FLAG_ITEM_VICTORY_ROAD_B1F_1 - object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, 1, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, FLAG_ITEM_VICTORY_ROAD_B1F_2 + object_event 1, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_13 + object_event 2, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_14 + object_event 3, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 4, 7, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_11 + object_event 4, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 9, 10, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_12 + object_event 5, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 20, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_17 + object_event 6, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 21, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_16 + object_event 7, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 35, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1E + object_event 8, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 19, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_19 + object_event 9, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1A + object_event 10, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 18, 12, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1B + object_event 11, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 20, 25, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1C + object_event 12, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 21, 26, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_BreakableRock, FLAG_TEMP_1D + object_event 13, EVENT_OBJ_GFX_PUSHABLE_BOULDER, 0, 34, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, S_PushableBoulder, FLAG_TEMP_1F + object_event 14, EVENT_OBJ_GFX_MAN_4, 0, 37, 12, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 3, VictoryRoad_B1F_EventScript_15DFB5, 0 + object_event 15, EVENT_OBJ_GFX_WOMAN_7, 0, 26, 16, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 1, 4, VictoryRoad_B1F_EventScript_15DFCC, 0 + object_event 16, EVENT_OBJ_GFX_WOMAN_7, 0, 5, 21, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 2, VictoryRoad_B1F_EventScript_15DFE3, 0 + object_event 17, EVENT_OBJ_GFX_BREAKABLE_ROCK, 0, 34, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, S_BreakableRock, FLAG_VICTORY_ROAD_ROCK + object_event 18, EVENT_OBJ_GFX_ITEM_BALL, 0, 42, 8, 4, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_1B1AE0, FLAG_ITEM_VICTORY_ROAD_B1F_1 + object_event 19, EVENT_OBJ_GFX_ITEM_BALL, 0, 32, 3, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B1F_EventScript_1B1AED, FLAG_ITEM_VICTORY_ROAD_B1F_2 VictoryRoad_B1F_MapWarps:: @ 838DBCC warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B2F diff --git a/data/maps/VictoryRoad_B1F/header.inc b/data/maps/VictoryRoad_B1F/header.inc index b705dc527..b7a3455ca 100644 --- a/data/maps/VictoryRoad_B1F/header.inc +++ b/data/maps/VictoryRoad_B1F/header.inc @@ -5,10 +5,10 @@ VictoryRoad_B1F:: @ 8307240 .4byte 0x0 .2byte MUS_C_ROAD .2byte 286 - .byte 70 + .byte MAPSEC_VICTORY_ROAD .byte 1 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_B1F/scripts.inc b/data/maps/VictoryRoad_B1F/scripts.inc index e07cd4286..5667866d7 100644 --- a/data/maps/VictoryRoad_B1F/scripts.inc +++ b/data/maps/VictoryRoad_B1F/scripts.inc @@ -2,16 +2,16 @@ VictoryRoad_B1F_MapScripts:: @ 815DFB4 .byte 0 VictoryRoad_B1F_EventScript_15DFB5:: @ 815DFB5 - trainerbattle 0, OPPONENT_SAMUEL, 0, VictoryRoad_B1F_Text_197CE9, VictoryRoad_B1F_Text_197D42 + trainerbattle 0, TRAINER_SAMUEL, 0, VictoryRoad_B1F_Text_197CE9, VictoryRoad_B1F_Text_197D42 msgbox VictoryRoad_B1F_Text_197D5B, 6 end VictoryRoad_B1F_EventScript_15DFCC:: @ 815DFCC - trainerbattle 0, OPPONENT_SHANNON, 0, VictoryRoad_B1F_Text_197D98, VictoryRoad_B1F_Text_197DE8 + trainerbattle 0, TRAINER_SHANNON, 0, VictoryRoad_B1F_Text_197D98, VictoryRoad_B1F_Text_197DE8 msgbox VictoryRoad_B1F_Text_197E13, 6 end VictoryRoad_B1F_EventScript_15DFE3:: @ 815DFE3 - trainerbattle 0, OPPONENT_MICHELLE, 0, VictoryRoad_B1F_Text_197E5D, VictoryRoad_B1F_Text_197EA6 + trainerbattle 0, TRAINER_MICHELLE, 0, VictoryRoad_B1F_Text_197E5D, VictoryRoad_B1F_Text_197EA6 msgbox VictoryRoad_B1F_Text_197EB6, 6 end diff --git a/data/maps/VictoryRoad_B2F/events.inc b/data/maps/VictoryRoad_B2F/events.inc index b482e6f04..c58ff33f3 100644 --- a/data/maps/VictoryRoad_B2F/events.inc +++ b/data/maps/VictoryRoad_B2F/events.inc @@ -1,9 +1,9 @@ VictoryRoad_B2F_EventObjects:: @ 838DC18 - object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 15, 6, 3, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15DFFB, 0 - object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 43, 14, 3, 7, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_15E012, 0 - object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 17, 3, 8, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15E029, 0 - object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 35, 22, 3, 9, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15E040, 0 - object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, 1, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, FLAG_ITEM_VICTORY_ROAD_B2F_1 + object_event 1, EVENT_OBJ_GFX_MAN_4, 0, 15, 6, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15DFFB, 0 + object_event 2, EVENT_OBJ_GFX_MAN_4, 0, 43, 14, 3, MOVEMENT_TYPE_FACE_UP, 1, 1, 1, 4, VictoryRoad_B2F_EventScript_15E012, 0 + object_event 3, EVENT_OBJ_GFX_WOMAN_7, 0, 2, 17, 3, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15E029, 0 + object_event 4, EVENT_OBJ_GFX_WOMAN_7, 0, 35, 22, 3, MOVEMENT_TYPE_FACE_LEFT, 1, 1, 1, 2, VictoryRoad_B2F_EventScript_15E040, 0 + object_event 5, EVENT_OBJ_GFX_ITEM_BALL, 0, 13, 8, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, VictoryRoad_B2F_EventScript_1B1AFA, FLAG_ITEM_VICTORY_ROAD_B2F_1 VictoryRoad_B2F_MapWarps:: @ 838DC90 warp_def 30, 25, 3, 0, MAP_VICTORY_ROAD_B1F diff --git a/data/maps/VictoryRoad_B2F/header.inc b/data/maps/VictoryRoad_B2F/header.inc index 7eb649cfb..2cad4acec 100644 --- a/data/maps/VictoryRoad_B2F/header.inc +++ b/data/maps/VictoryRoad_B2F/header.inc @@ -5,10 +5,10 @@ VictoryRoad_B2F:: @ 830725C .4byte 0x0 .2byte MUS_C_ROAD .2byte 287 - .byte 70 + .byte MAPSEC_VICTORY_ROAD .byte 1 - .byte 0 - .byte 4 + .byte WEATHER_NONE + .byte MAP_TYPE_UNDERGROUND .2byte 0 .byte 1 - .byte 0 + .byte MAP_BATTLE_SCENE_NORMAL diff --git a/data/maps/VictoryRoad_B2F/scripts.inc b/data/maps/VictoryRoad_B2F/scripts.inc index 6b8fe2569..929af39e8 100644 --- a/data/maps/VictoryRoad_B2F/scripts.inc +++ b/data/maps/VictoryRoad_B2F/scripts.inc @@ -2,21 +2,21 @@ VictoryRoad_B2F_MapScripts:: @ 815DFFA .byte 0 VictoryRoad_B2F_EventScript_15DFFB:: @ 815DFFB - trainerbattle 0, OPPONENT_VITO, 0, VictoryRoad_B2F_Text_197EF2, VictoryRoad_B2F_Text_197F46 + trainerbattle 0, TRAINER_VITO, 0, VictoryRoad_B2F_Text_197EF2, VictoryRoad_B2F_Text_197F46 msgbox VictoryRoad_B2F_Text_197F71, 6 end VictoryRoad_B2F_EventScript_15E012:: @ 815E012 - trainerbattle 0, OPPONENT_OWEN, 0, VictoryRoad_B2F_Text_197FE5, VictoryRoad_B2F_Text_19802B + trainerbattle 0, TRAINER_OWEN, 0, VictoryRoad_B2F_Text_197FE5, VictoryRoad_B2F_Text_19802B msgbox VictoryRoad_B2F_Text_198047, 6 end VictoryRoad_B2F_EventScript_15E029:: @ 815E029 - trainerbattle 0, OPPONENT_CAROLINE, 0, VictoryRoad_B2F_Text_198089, VictoryRoad_B2F_Text_1980AD + trainerbattle 0, TRAINER_CAROLINE, 0, VictoryRoad_B2F_Text_198089, VictoryRoad_B2F_Text_1980AD msgbox VictoryRoad_B2F_Text_1980C8, 6 end VictoryRoad_B2F_EventScript_15E040:: @ 815E040 - trainerbattle 0, OPPONENT_JULIE, 0, VictoryRoad_B2F_Text_198121, VictoryRoad_B2F_Text_1981A3 + trainerbattle 0, TRAINER_JULIE, 0, VictoryRoad_B2F_Text_198121, VictoryRoad_B2F_Text_1981A3 msgbox VictoryRoad_B2F_Text_1981BA, 6 end diff --git a/data/pokenav.s b/data/pokenav.s index cb0e98472..485568157 100644 --- a/data/pokenav.s +++ b/data/pokenav.s @@ -700,7 +700,7 @@ gUnknown_083E4678:: @ 83E4678 .incbin "graphics/pokenav/83E4678.gbapal" .align 2 -gUnknown_083E4698:: @ 83E4698 +gPokenavRibbonsIconGfx:: @ 83E4698 .2byte 0, 0 .2byte 1, 0 .2byte 2, 0 diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 56ed0d9ab..34ba18f08 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -47,7 +47,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 end Route117_EventScript_1B22CD:: @ 81B22CD - specialvar RESULT, sub_8042B4C + specialvar RESULT, DaycareMonReceivedMail compare RESULT, 1 call_if_eq Route117_EventScript_1B22DE return diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc index 957d56609..b1c47fa62 100644 --- a/data/scripts/gabby_and_ty.inc +++ b/data/scripts/gabby_and_ty.inc @@ -1,7 +1,7 @@ Route111_EventScript_1AE313:: @ 81AE313 Route118_EventScript_1AE313:: @ 81AE313 Route120_EventScript_1AE313:: @ 81AE313 - cleartrainerflag OPPONENT_GABBY_AND_TY_6 + cleartrainerflag TRAINER_GABBY_AND_TY_6 specialvar RESULT, GabbyAndTyGetBattleNum switch RESULT case 0, Route111_EventScript_1AE384 @@ -124,61 +124,61 @@ Route111_EventScript_1AE41E:: @ 81AE41E return Route111_EventScript_1AE422:: @ 81AE422 - trainerbattle 6, OPPONENT_GABBY_AND_TY_1, 0, Route111_Text_1ABED8, Route111_Text_1ABFD3, Route111_Text_1AC5CA, Route111_EventScript_1AE5A2 + trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_1ABED8, Route111_Text_1ABFD3, Route111_Text_1AC5CA, Route111_EventScript_1AE5A2 msgbox Route111_Text_1AC59E, 4 release end Route111_EventScript_1AE442:: @ 81AE442 - trainerbattle 6, OPPONENT_GABBY_AND_TY_1, 0, Route111_Text_1AC73B, Route111_Text_1AC892, Route111_Text_1AC820, Route111_EventScript_1AE5A2 + trainerbattle 6, TRAINER_GABBY_AND_TY_1, 0, Route111_Text_1AC73B, Route111_Text_1AC892, Route111_Text_1AC820, Route111_EventScript_1AE5A2 msgbox Route111_Text_1AC7E4, 4 release end Route118_EventScript_1AE462:: @ 81AE462 - trainerbattle 6, OPPONENT_GABBY_AND_TY_2, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F msgbox Route118_Text_1AC59E, 4 release end Route118_EventScript_1AE482:: @ 81AE482 - trainerbattle 6, OPPONENT_GABBY_AND_TY_2, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_2, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F msgbox Route118_Text_1AC7E4, 4 release end Route120_EventScript_1AE4A2:: @ 81AE4A2 - trainerbattle 6, OPPONENT_GABBY_AND_TY_3, 0, Route120_Text_1ABF50, Route120_Text_1AC6F8, Route120_Text_1AC5CA, Route120_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_1ABF50, Route120_Text_1AC6F8, Route120_Text_1AC5CA, Route120_EventScript_1AE60F msgbox Route120_Text_1AC59E, 4 release end Route120_EventScript_1AE4C2:: @ 81AE4C2 - trainerbattle 6, OPPONENT_GABBY_AND_TY_3, 0, Route120_Text_1AC790, Route120_Text_1AC8D7, Route120_Text_1AC820, Route120_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_3, 0, Route120_Text_1AC790, Route120_Text_1AC8D7, Route120_Text_1AC820, Route120_EventScript_1AE60F msgbox Route120_Text_1AC7E4, 4 release end Route111_EventScript_1AE4E2:: @ 81AE4E2 - trainerbattle 6, OPPONENT_GABBY_AND_TY_4, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F msgbox Route111_Text_1AC59E, 4 release end Route111_EventScript_1AE502:: @ 81AE502 - trainerbattle 6, OPPONENT_GABBY_AND_TY_4, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_4, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F msgbox Route111_Text_1AC7E4, 4 release end Route118_EventScript_1AE522:: @ 81AE522 - trainerbattle 6, OPPONENT_GABBY_AND_TY_5, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_1ABF50, Route118_Text_1AC6F8, Route118_Text_1AC5CA, Route118_EventScript_1AE60F msgbox Route118_Text_1AC59E, 4 release end Route118_EventScript_1AE542:: @ 81AE542 - trainerbattle 6, OPPONENT_GABBY_AND_TY_5, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_5, 0, Route118_Text_1AC790, Route118_Text_1AC8D7, Route118_Text_1AC820, Route118_EventScript_1AE60F msgbox Route118_Text_1AC7E4, 4 release end @@ -186,7 +186,7 @@ Route118_EventScript_1AE542:: @ 81AE542 Route111_EventScript_1AE562:: @ 81AE562 Route118_EventScript_1AE562:: @ 81AE562 Route120_EventScript_1AE562:: @ 81AE562 - trainerbattle 6, OPPONENT_GABBY_AND_TY_6, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_1ABF50, Route111_Text_1AC6F8, Route111_Text_1AC5CA, Route111_EventScript_1AE60F msgbox Route111_Text_1AC59E, 4 release end @@ -194,7 +194,7 @@ Route120_EventScript_1AE562:: @ 81AE562 Route111_EventScript_1AE582:: @ 81AE582 Route118_EventScript_1AE582:: @ 81AE582 Route120_EventScript_1AE582:: @ 81AE582 - trainerbattle 6, OPPONENT_GABBY_AND_TY_6, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F + trainerbattle 6, TRAINER_GABBY_AND_TY_6, 0, Route111_Text_1AC790, Route111_Text_1AC8D7, Route111_Text_1AC820, Route111_EventScript_1AE60F msgbox Route111_Text_1AC7E4, 4 release end diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index ed81e6628..daa8c96db 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -46,9 +46,9 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB msgbox MtChimney_Text_1B38B3, 4 .endif .ifdef SAPPHIRE - trainerbattle 3, OPPONENT_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099 + trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3099 .else - trainerbattle 3, OPPONENT_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68 + trainerbattle 3, TRAINER_MT_CHIMNEY_GRUNT_3, 0, MtChimney_Text_1B3A68 .endif .ifdef SAPPHIRE msgbox MtChimney_Text_1B30C2, 4 diff --git a/data/scripts/magma_summit.inc b/data/scripts/magma_summit.inc index ac71b038f..0992a62c0 100644 --- a/data/scripts/magma_summit.inc +++ b/data/scripts/magma_summit.inc @@ -1,29 +1,29 @@ MtPyre_Summit_EventScript_1B2DA9:: @ 81B2DA9 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, UnknownString_81B50C3, UnknownString_81B50F5 msgbox UnknownString_81B5131, 6 .else - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_1, 0, MtPyre_Summit_Text_1B5CFD, MtPyre_Summit_Text_1B5D30 msgbox MtPyre_Summit_Text_1B5D6D, 6 .endif end MtPyre_Summit_EventScript_1B2DC0:: @ 81B2DC0 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, UnknownString_81B5166, UnknownString_81B519F msgbox UnknownString_81B51B5, 6 .else - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_2, 0, MtPyre_Summit_Text_1B5DA2, MtPyre_Summit_Text_1B5DDB msgbox MtPyre_Summit_Text_1B5DF1, 6 .endif end MtPyre_Summit_EventScript_1B2DD7:: @ 81B2DD7 .ifdef SAPPHIRE - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, UnknownString_81B51EB, UnknownString_81B5224 msgbox UnknownString_81B5248, 6 .else - trainerbattle 0, OPPONENT_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60 + trainerbattle 0, TRAINER_MT_PYRE_SUMMIT_GRUNT_3, 0, MtPyre_Summit_Text_1B5E27, MtPyre_Summit_Text_1B5E60 msgbox MtPyre_Summit_Text_1B5E84, 6 .endif end diff --git a/data/specials.inc b/data/specials.inc index 7983c71af..db77f74a9 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -203,7 +203,7 @@ gSpecials:: def_special TakePokemonFromDaycare def_special ScriptHatchMon def_special EggHatch - def_special sub_8042B4C + def_special DaycareMonReceivedMail def_special ShowLinkBattleRecords def_special HasEnoughMoneyFor def_special PayMoneyFor @@ -240,7 +240,7 @@ gSpecials:: def_special UpdateCyclingRoadState def_special GetLeadMonFriendshipScore def_special sub_8134548 - def_special sub_81347F8 + def_special ChooseNextBattleTowerTrainer def_special CheckPartyBattleTowerBanlist def_special PrintBattleTowerTrainerGreeting def_special PrintEReaderTrainerGreeting |