dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1546 from AsparagusEduardo/pret_sandstorm

Browse Source 
Using WEATHER_SANDSTORM in battle_setup
This commit is contained in:
GriffinR
2021-11-06 14:21:11 -04:00
committed by GitHub
parent f9e8c88eb5 b282bbc270
commit 737a5cba55
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_setup.c
+2 -1
View File
@@ -46,6 +46,7 @@
#include "constants/maps.h" #include "constants/maps.h"
#include "constants/trainers.h" #include "constants/trainers.h"
#include "constants/trainer_hill.h" #include "constants/trainer_hill.h"
#include "constants/weather.h"
enum { enum {
TRANSITION_TYPE_NORMAL, TRANSITION_TYPE_NORMAL,
@@ -686,7 +687,7 @@ u8 BattleSetup_GetTerrainId(void)
} }
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE113) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE113)) if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE113) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE113))
return BATTLE_TERRAIN_SAND; return BATTLE_TERRAIN_SAND;
if (GetSav1Weather() == 8) if (GetSav1Weather() == WEATHER_SANDSTORM)
return BATTLE_TERRAIN_SAND; return BATTLE_TERRAIN_SAND;
return BATTLE_TERRAIN_PLAIN; return BATTLE_TERRAIN_PLAIN;