diff options
author | golem galvanize <golemgalvanize@github.com> | 2018-02-15 18:20:53 -0500 |
---|---|---|
committer | golem galvanize <golemgalvanize@github.com> | 2018-02-15 18:20:53 -0500 |
commit | 6cbea9af6dba53cf5b74a37d0161188f7eb3b3ac (patch) | |
tree | a2c5ca082bf9359ab056743afe4811f8c378be8a /src/battle_script_commands.c | |
parent | 4a71a61e58507281252eb0406fea966d6fb7ebd4 (diff) | |
parent | cfec30413c36f3a571d80162796c11a030f42767 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex
Diffstat (limited to 'src/battle_script_commands.c')
-rw-r--r-- | src/battle_script_commands.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 75f05e86f..2da48de49 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -76,7 +76,7 @@ extern bool8 sub_81B1250(void); // ? extern bool8 InBattlePike(void); extern bool8 InBattlePyramid(void); extern u16 GetBattlePyramidPickupItemId(void); -extern u8 sav1_map_get_light_level(void); +extern u8 Overworld_GetMapTypeOfSaveblockLocation(void); extern u8 sub_813B21C(void); extern u16 get_unknown_box_id(void); @@ -10578,7 +10578,7 @@ static void atkEF_handleballthrow(void) ballMultiplier = 10; break; case ITEM_DIVE_BALL: - if (sav1_map_get_light_level() == 5) + if (Overworld_GetMapTypeOfSaveblockLocation() == 5) ballMultiplier = 35; else ballMultiplier = 10; |