diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_ai_scripts.s | 36 | ||||
| -rw-r--r-- | data/map_events.s | 1 | ||||
| -rw-r--r-- | data/maps/events/JaggedPass.inc | 10 | ||||
| -rw-r--r-- | data/maps/events/Route113.inc | 38 | ||||
| -rw-r--r-- | data/maps/events/Route119.inc | 46 | ||||
| -rw-r--r-- | data/maps/events/Route120.inc | 38 | ||||
| -rw-r--r-- | data/maps/events/Route123.inc | 44 |
7 files changed, 107 insertions, 106 deletions
diff --git a/data/battle_ai_scripts.s b/data/battle_ai_scripts.s index 7c58160f6..270386359 100644 --- a/data/battle_ai_scripts.s +++ b/data/battle_ai_scripts.s @@ -439,7 +439,7 @@ AI_CBM_PerishSong: @ 81DA6BB AI_CBM_Sandstorm: @ 81DA6C6 get_weather - if_equal WEATHER_SANDSTORM, Score_Down8 + if_equal BATTLE_WEATHER_SANDSTORM, Score_Down8 end AI_CBM_Attract: @ 81DA6CE @@ -479,12 +479,12 @@ AI_CBM_BatonPass: @ 81DA729 AI_CBM_RainDance: @ 81DA732 get_weather - if_equal WEATHER_RAIN, Score_Down8 + if_equal BATTLE_WEATHER_RAIN, Score_Down8 end AI_CBM_SunnyDay: @ 81DA73A get_weather - if_equal WEATHER_SUN, Score_Down8 + if_equal BATTLE_WEATHER_SUN, Score_Down8 end AI_CBM_FutureSight: @ 81DA742 @@ -509,7 +509,7 @@ AI_CBM_SpitUpAndSwallow: @ 81DA75F AI_CBM_Hail: @ 81DA76E get_weather - if_equal WEATHER_HAIL, Score_Down8 + if_equal BATTLE_WEATHER_HAIL, Score_Down8 end AI_CBM_Torment: @ 81DA776 @@ -1361,9 +1361,9 @@ AI_CV_Conversion_End: @ 81DB190 AI_CV_HealWeather: @ 81DB191 get_weather - if_equal WEATHER_HAIL, AI_CV_HealWeather_ScoreDown2 - if_equal WEATHER_RAIN, AI_CV_HealWeather_ScoreDown2 - if_equal WEATHER_SANDSTORM, AI_CV_HealWeather_ScoreDown2 + if_equal BATTLE_WEATHER_HAIL, AI_CV_HealWeather_ScoreDown2 + if_equal BATTLE_WEATHER_RAIN, AI_CV_HealWeather_ScoreDown2 + if_equal BATTLE_WEATHER_SANDSTORM, AI_CV_HealWeather_ScoreDown2 jump AI_CV_Heal AI_CV_HealWeather_ScoreDown2: @ 81DB1A9 @@ -2107,9 +2107,9 @@ AI_CV_RainDance: @ 81DB8E9 AI_CV_RainDance2: @ 81DB8F7 if_hp_less_than USER, 40, AI_CV_RainDance_ScoreDown1 get_weather - if_equal WEATHER_HAIL, AI_CV_RainDance3 - if_equal WEATHER_SUN, AI_CV_RainDance3 - if_equal WEATHER_SANDSTORM, AI_CV_RainDance3 + if_equal BATTLE_WEATHER_HAIL, AI_CV_RainDance3 + if_equal BATTLE_WEATHER_SUN, AI_CV_RainDance3 + if_equal BATTLE_WEATHER_SANDSTORM, AI_CV_RainDance3 get_ability USER if_equal ABILITY_RAIN_DISH, AI_CV_RainDance3 jump AI_CV_RainDance_End @@ -2127,9 +2127,9 @@ AI_CV_RainDance_End: @ 81DB927 AI_CV_SunnyDay: @ 81DB928 if_hp_less_than USER, 40, AI_CV_SunnyDay_ScoreDown1 get_weather - if_equal WEATHER_HAIL, AI_CV_SunnyDay2 - if_equal WEATHER_RAIN, AI_CV_SunnyDay2 - if_equal WEATHER_SANDSTORM, AI_CV_SunnyDay2 + if_equal BATTLE_WEATHER_HAIL, AI_CV_SunnyDay2 + if_equal BATTLE_WEATHER_RAIN, AI_CV_SunnyDay2 + if_equal BATTLE_WEATHER_SANDSTORM, AI_CV_SunnyDay2 jump AI_CV_SunnyDay_End AI_CV_SunnyDay2: @ 81DB947 @@ -2264,8 +2264,8 @@ AI_CV_Fly2: @ 81DBA9F if_status2 TARGET, S_CURSED, AI_CV_Fly6 if_status3 TARGET, S_LEECH_SEED, AI_CV_Fly6 get_weather - if_equal WEATHER_HAIL, AI_CV_Fly3 - if_equal WEATHER_SANDSTORM, AI_CV_Fly4 + if_equal BATTLE_WEATHER_HAIL, AI_CV_Fly3 + if_equal BATTLE_WEATHER_SANDSTORM, AI_CV_Fly4 jump AI_CV_Fly5 AI_CV_Fly3: @ 81DBACF @@ -2317,9 +2317,9 @@ AI_CV_SpitUp_End: @ 81DBB2E AI_CV_Hail: @ 81DBB2F if_hp_less_than USER, 40, AI_CV_Hail_ScoreDown1 get_weather - if_equal WEATHER_SUN, AI_CV_Hail2 - if_equal WEATHER_RAIN, AI_CV_Hail2 - if_equal WEATHER_SANDSTORM, AI_CV_Hail2 + if_equal BATTLE_WEATHER_SUN, AI_CV_Hail2 + if_equal BATTLE_WEATHER_RAIN, AI_CV_Hail2 + if_equal BATTLE_WEATHER_SANDSTORM, AI_CV_Hail2 jump AI_CV_Hail_End AI_CV_Hail2: @ 81DBB4E diff --git a/data/map_events.s b/data/map_events.s index 0a2a25fb0..6bfcc0292 100644 --- a/data/map_events.s +++ b/data/map_events.s @@ -3,6 +3,7 @@ #include "constants/map_objects.h" #include "constants/maps.h" #include "constants/vars.h" +#include "constants/weather.h" .include "asm/macros.inc" .include "constants/constants.inc" diff --git a/data/maps/events/JaggedPass.inc b/data/maps/events/JaggedPass.inc index 654cbb9ae..a41d8ac7d 100644 --- a/data/maps/events/JaggedPass.inc +++ b/data/maps/events/JaggedPass.inc @@ -11,11 +11,11 @@ JaggedPass_MapWarps:: @ 838C67C warp_def 14, 5, 3, 3, MAP_MT_CHIMNEY JaggedPass_MapCoordEvents:: @ 838C69C - coord_event 13, 15, 3, 0, 2, 0, 0, 0x0 - coord_event 21, 12, 3, 0, 8, 0, 0, 0x0 - coord_event 14, 15, 3, 0, 2, 0, 0, 0x0 - coord_event 18, 17, 3, 0, 2, 0, 0, 0x0 - coord_event 22, 19, 3, 0, 2, 0, 0, 0x0 + coord_weather_event 13, 15, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 21, 12, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 14, 15, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 18, 17, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 22, 19, 3, COORD_EVENT_WEATHER_SUNNY JaggedPass_MapBGEvents:: @ 838C6EC bg_event 8, 10, 3, 7, 0, ITEM_FULL_HEAL, 77, 0 diff --git a/data/maps/events/Route113.inc b/data/maps/events/Route113.inc index dec48e2e1..7a39850fd 100644 --- a/data/maps/events/Route113.inc +++ b/data/maps/events/Route113.inc @@ -15,25 +15,25 @@ Route113_MapWarps:: @ 8382AA8 warp_def 33, 5, 0, 0, MAP_ROUTE113_GLASS_WORKSHOP Route113_MapCoordEvents:: @ 8382AB0 - coord_event 19, 11, 3, 0, 8, 0, 0, 0x0 - coord_event 19, 10, 3, 0, 8, 0, 0, 0x0 - coord_event 19, 12, 3, 0, 8, 0, 0, 0x0 - coord_event 19, 13, 3, 0, 8, 0, 0, 0x0 - coord_event 87, 9, 3, 0, 8, 0, 0, 0x0 - coord_event 86, 10, 3, 0, 8, 0, 0, 0x0 - coord_event 86, 11, 3, 0, 8, 0, 0, 0x0 - coord_event 14, 10, 3, 0, 2, 0, 0, 0x0 - coord_event 14, 11, 3, 0, 2, 0, 0, 0x0 - coord_event 14, 12, 3, 0, 2, 0, 0, 0x0 - coord_event 14, 13, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 8, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 9, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 10, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 11, 0, 0, 2, 0, 0, 0x0 - coord_event 19, 14, 3, 0, 8, 0, 0, 0x0 - coord_event 88, 8, 3, 0, 8, 0, 0, 0x0 - coord_event 88, 6, 3, 0, 8, 0, 0, 0x0 - coord_event 88, 7, 3, 0, 8, 0, 0, 0x0 + coord_weather_event 19, 11, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 19, 10, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 87, 9, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 86, 10, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 86, 11, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 14, 10, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 14, 11, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 14, 12, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 14, 13, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 94, 8, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 94, 9, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 94, 11, 0, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 88, 8, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 88, 6, 3, COORD_EVENT_WEATHER_ASH + coord_weather_event 88, 7, 3, COORD_EVENT_WEATHER_ASH Route113_MapBGEvents:: @ 8382BE0 bg_event 85, 6, 0, 0, 0, Route113_EventScript_150617 diff --git a/data/maps/events/Route119.inc b/data/maps/events/Route119.inc index ae3cdce20..889f1b000 100644 --- a/data/maps/events/Route119.inc +++ b/data/maps/events/Route119.inc @@ -44,29 +44,29 @@ Route119_MapWarps:: @ 8383C8C 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 28, 13, 0, 0, 20, 0, 0, 0x0 - coord_event 29, 13, 3, 0, 20, 0, 0, 0x0 - coord_event 30, 13, 3, 0, 20, 0, 0, 0x0 - coord_event 31, 13, 3, 0, 20, 0, 0, 0x0 - coord_event 32, 13, 3, 0, 20, 0, 0, 0x0 - coord_event 33, 13, 3, 0, 20, 0, 0, 0x0 - coord_event 15, 133, 3, 0, 20, 0, 0, 0x0 - coord_event 16, 132, 3, 0, 20, 0, 0, 0x0 - coord_event 17, 131, 3, 0, 20, 0, 0, 0x0 - coord_event 18, 130, 3, 0, 20, 0, 0, 0x0 - coord_event 19, 131, 3, 0, 20, 0, 0, 0x0 - coord_event 20, 132, 3, 0, 20, 0, 0, 0x0 - coord_event 21, 133, 3, 0, 20, 0, 0, 0x0 - coord_event 36, 6, 3, 0, 2, 0, 0, 0x0 - coord_event 36, 7, 3, 0, 2, 0, 0, 0x0 - coord_event 35, 8, 3, 0, 2, 0, 0, 0x0 - coord_event 35, 9, 3, 0, 2, 0, 0, 0x0 - coord_event 34, 10, 3, 0, 2, 0, 0, 0x0 - coord_event 16, 137, 3, 0, 2, 0, 0, 0x0 - coord_event 17, 137, 3, 0, 2, 0, 0, 0x0 - coord_event 18, 137, 3, 0, 2, 0, 0, 0x0 - coord_event 19, 137, 3, 0, 2, 0, 0, 0x0 - coord_event 20, 137, 3, 0, 2, 0, 0, 0x0 + 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 + coord_weather_event 31, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 32, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 33, 13, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 15, 133, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 16, 132, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 17, 131, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 18, 130, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 19, 131, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 20, 132, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 21, 133, 3, COORD_EVENT_WEATHER_ROUTE119_CYCLE + coord_weather_event 36, 6, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 36, 7, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 35, 8, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 35, 9, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 34, 10, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 16, 137, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 17, 137, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 18, 137, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 19, 137, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 20, 137, 3, COORD_EVENT_WEATHER_SUNNY Route119_MapBGEvents:: @ 8383E2C bg_event 9, 33, 0, 0, 0, Route119_EventScript_15142C diff --git a/data/maps/events/Route120.inc b/data/maps/events/Route120.inc index 4ddfe4978..65fa580b3 100644 --- a/data/maps/events/Route120.inc +++ b/data/maps/events/Route120.inc @@ -46,25 +46,25 @@ Route120_MapWarps:: @ 8384308 warp_def 19, 23, 1, 0, MAP_SCORCHED_SLAB Route120_MapCoordEvents:: @ 8384318 - coord_event 7, 15, 0, 0, 3, 0, 0, 0x0 - coord_event 7, 16, 0, 0, 3, 0, 0, 0x0 - coord_event 22, 61, 3, 0, 3, 0, 0, 0x0 - coord_event 12, 64, 3, 0, 3, 0, 0, 0x0 - coord_event 35, 63, 3, 0, 1, 0, 0, 0x0 - coord_event 36, 63, 3, 0, 1, 0, 0, 0x0 - coord_event 37, 63, 3, 0, 1, 0, 0, 0x0 - coord_event 38, 63, 3, 0, 1, 0, 0, 0x0 - coord_event 32, 88, 5, 0, 1, 0, 0, 0x0 - coord_event 28, 15, 0, 0, 2, 0, 0, 0x0 - coord_event 28, 16, 0, 0, 2, 0, 0, 0x0 - coord_event 28, 17, 3, 0, 2, 0, 0, 0x0 - coord_event 32, 89, 5, 0, 1, 0, 0, 0x0 - coord_event 32, 90, 5, 0, 1, 0, 0, 0x0 - coord_event 32, 91, 5, 0, 1, 0, 0, 0x0 - coord_event 10, 75, 3, 0, 1, 0, 0, 0x0 - coord_event 11, 75, 3, 0, 1, 0, 0, 0x0 - coord_event 12, 75, 3, 0, 1, 0, 0, 0x0 - coord_event 13, 75, 3, 0, 1, 0, 0, 0x0 + coord_weather_event 7, 15, 0, COORD_EVENT_WEATHER_RAIN_LIGHT + coord_weather_event 7, 16, 0, COORD_EVENT_WEATHER_RAIN_LIGHT + coord_weather_event 22, 61, 3, COORD_EVENT_WEATHER_RAIN_LIGHT + coord_weather_event 12, 64, 3, COORD_EVENT_WEATHER_RAIN_LIGHT + coord_weather_event 35, 63, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 36, 63, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 37, 63, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 38, 63, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 32, 88, 5, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 28, 15, 0, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 28, 16, 0, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 28, 17, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 32, 89, 5, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 32, 90, 5, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 32, 91, 5, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 10, 75, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 11, 75, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 12, 75, 3, COORD_EVENT_WEATHER_CLOUDS + coord_weather_event 13, 75, 3, COORD_EVENT_WEATHER_CLOUDS Route120_MapBGEvents:: @ 8384448 bg_event 27, 3, 3, 0, 0, Route120_EventScript_1519A1 diff --git a/data/maps/events/Route123.inc b/data/maps/events/Route123.inc index ff4f066b8..a861aa4fc 100644 --- a/data/maps/events/Route123.inc +++ b/data/maps/events/Route123.inc @@ -38,28 +38,28 @@ Route123_MapWarps:: @ 8384B28 warp_def 22, 6, 0, 0, MAP_ROUTE123_BERRY_MASTERS_HOUSE Route123_MapCoordEvents:: @ 8384B30 - coord_event 90, 16, 3, 0, 21, 0, 0, 0x0 - coord_event 92, 9, 3, 0, 21, 0, 0, 0x0 - coord_event 93, 12, 3, 0, 21, 0, 0, 0x0 - coord_event 92, 13, 3, 0, 21, 0, 0, 0x0 - coord_event 91, 14, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 13, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 12, 3, 0, 21, 0, 0, 0x0 - coord_event 34, 13, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 14, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 15, 3, 0, 21, 0, 0, 0x0 - coord_event 19, 16, 3, 0, 21, 0, 0, 0x0 - coord_event 108, 14, 3, 0, 2, 0, 0, 0x0 - coord_event 109, 15, 3, 0, 2, 0, 0, 0x0 - coord_event 110, 16, 3, 0, 2, 0, 0, 0x0 - coord_event 111, 17, 3, 0, 2, 0, 0, 0x0 - coord_event 112, 18, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 12, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 13, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 14, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 15, 3, 0, 2, 0, 0, 0x0 - coord_event 9, 16, 3, 0, 2, 0, 0, 0x0 - coord_event 94, 10, 3, 0, 21, 0, 0, 0x0 + coord_weather_event 90, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 92, 9, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 93, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 92, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 91, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 19, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 19, 12, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 34, 13, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 19, 14, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 19, 15, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 19, 16, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE + coord_weather_event 108, 14, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 109, 15, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 110, 16, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 111, 17, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 112, 18, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 9, 12, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 9, 13, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 9, 14, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 9, 15, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 9, 16, 3, COORD_EVENT_WEATHER_SUNNY + coord_weather_event 94, 10, 3, COORD_EVENT_WEATHER_ROUTE123_CYCLE Route123_MapBGEvents:: @ 8384C90 bg_event 117, 10, 0, 0, 0, Route123_EventScript_151CBF |