diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-07 00:40:22 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-07 00:40:22 -0500 |
| commit | dcd35c895cb1c5680f92360cb084e6924ed3b76f (patch) | |
| tree | e3b12bfd9f67e1237832602f03fe5bfd7380ab0b /src/field/fldeff_strength.c | |
| parent | eff6795887cc27f2c5139df9a6da70f4f02338b4 (diff) | |
| parent | c79d259508d47a8b5bde5b9060b8fe8c6989bd44 (diff) | |
Merge branch 'master' into unk_text_8095904
Diffstat (limited to 'src/field/fldeff_strength.c')
| -rw-r--r-- | src/field/fldeff_strength.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/src/field/fldeff_strength.c b/src/field/fldeff_strength.c index 565ac1651..9f9cd4013 100644 --- a/src/field/fldeff_strength.c +++ b/src/field/fldeff_strength.c @@ -1,4 +1,5 @@ #include "global.h" +#include "constants/map_objects.h" #include "braille_puzzles.h" #include "field_effect.h" #include "party_menu.h" @@ -20,6 +21,28 @@ extern void (*gUnknown_03005CE4)(void); extern u8 S_UseStrength[]; +#if DEBUG +void debug_sub_8130318(void) +{ + if (ShouldDoBrailleStrengthEffect()) + { + gLastFieldPokeMenuOpened = 0; + gSpecialVar_Result = 0; + sub_811AA38(); + } + else if (npc_before_player_of_type(MAP_OBJ_GFX_PUSHABLE_BOULDER) == TRUE) + { + gLastFieldPokeMenuOpened = 0; + gSpecialVar_Result = 0; + sub_811AA18(); + } + else + { + ScriptContext2_Disable(); + } +} +#endif + bool8 SetUpFieldMove_Strength(void) { if (ShouldDoBrailleStrengthEffect()) |