diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:08:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-16 01:08:55 +0100 |
| commit | 44abbae60b6a39e2a1432426005e1860be196abb (patch) | |
| tree | f2405db72863761afcdcda57a88cf6ab0346e4fd /src/battle_setup.c | |
| parent | 039c9f4bd8ee6bfb299d4422372804c569eddebd (diff) | |
| parent | 224fdbf026cfb0ff88aac519875a39fb038e4bb1 (diff) | |
nerge with master, fix conflicts
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index bcb883ca1..774aba9b2 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -7,20 +7,20 @@ #include "pokemon_3.h" #include "safari_zone.h" #include "script.h" -#include "game_stat.h" +#include "constants/game_stat.h" #include "event_data.h" -#include "species.h" +#include "constants/species.h" #include "songs.h" #include "metatile_behavior.h" -#include "map_constants.h" +#include "constants/maps.h" #include "field_player_avatar.h" #include "fieldmap.h" #include "trainer_classes.h" #include "trainer_ids.h" -#include "rng.h" +#include "random.h" #include "starter_choose.h" #include "script_pokemon_80F8.h" -#include "items.h" +#include "constants/items.h" #include "palette.h" #include "window.h" #include "field_map_obj.h" @@ -84,6 +84,8 @@ extern void sub_81D61E8(void); extern void sub_80982B8(void); extern void sub_81A9EDC(u16 a0); extern void sub_81D572C(u8 a0, u16 arg1); +extern void IncrementGameStat(u8 statId); +extern u32 GetGameStat(u8 statId); extern u32 gBattleTypeFlags; extern u8 gBattleOutcome; @@ -685,7 +687,7 @@ u8 BattleSetup_GetTerrainId(void) if (MetatileBehavior_IsBridge(tileBehavior) == TRUE) return BATTLE_TERRAIN_WATER; } - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP_ROUTE113 && gSaveBlock1Ptr->location.mapNum == MAP_ID_ROUTE113) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE113) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE113)) return BATTLE_TERRAIN_SAND; if (GetSav1Weather() == 8) return BATTLE_TERRAIN_SAND; @@ -916,7 +918,7 @@ static void CB2_GiveStarter(void) { u16 starterMon; - *GetVarPointer(VAR_STARTER_ID) = gSpecialVar_Result; + *GetVarPointer(VAR_FIRST_POKE) = gSpecialVar_Result; starterMon = GetStarterPokemon(gSpecialVar_Result); ScriptGiveMon(starterMon, 5, 0, 0, 0, 0); ResetTasks(); @@ -1575,7 +1577,7 @@ static bool32 sub_80B1D94(s32 rematchTableId) if (rematchTableId >= REMATCH_ELITE_FOUR_ENTRIES) return TRUE; else if (rematchTableId == REMATCH_WALLY_ENTRY) - return (FlagGet(FLAG_7E) == FALSE); + return (FlagGet(FLAG_0x07E) == FALSE); else return FALSE; } |