diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-07 00:55:50 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-07 00:55:50 -0500 |
| commit | c28d691ff2821adcf43600a308d523fd609e12e2 (patch) | |
| tree | 5cfe618a442bb4a67b4aaef0c7f2c27d4bd3eedb /src/rom6.c | |
| parent | 19b0a0f3e05c73b84e5afaffb83080474774e918 (diff) | |
| parent | 6eaadfc62e89a25c2de674aebf69f077c491580f (diff) | |
Merge branch 'master' into fix_nonmatching
Diffstat (limited to 'src/rom6.c')
| -rw-r--r-- | src/rom6.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/rom6.c b/src/rom6.c index 62fbc987c..06e84cc0f 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -1,4 +1,6 @@ #include "global.h" +#include "constants/map_objects.h" +#include "constants/songs.h" #include "rom6.h" #include "braille_puzzles.h" #include "field_effect.h" @@ -8,7 +10,6 @@ #include "pokemon_menu.h" #include "overworld.h" #include "script.h" -#include "constants/songs.h" #include "sound.h" #include "sprite.h" #include "task.h" @@ -116,6 +117,21 @@ static void sub_810B4CC(u8 taskId) DestroyTask(taskId); } +#if DEBUG +void debug_sub_8120968(void) +{ + if (npc_before_player_of_type(MAP_OBJ_GFX_BREAKABLE_ROCK) == TRUE) + { + gLastFieldPokeMenuOpened = 0; + sub_810B53C(); + } + else + { + ScriptContext2_Disable(); + } +} +#endif + bool8 SetUpFieldMove_RockSmash(void) { if (npc_before_player_of_type(0x56) == TRUE) |