diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-04-04 18:27:50 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-04-04 18:27:50 -0700 |
| commit | 3a7f68151e0f0fa71ddb35bd96439c25ffd61576 (patch) | |
| tree | c8297d41af868eac80642c1f811bc009fa142099 /src/rom6.c | |
| parent | 2c4d7844e48864d962573eb66fe4b9e68b9631f0 (diff) | |
| parent | ce75a3895c73f25d6dc7b019ed06e4193965ab35 (diff) | |
Merge remote-tracking branch 'upstream/master' into battle-1
Diffstat (limited to 'src/rom6.c')
| -rw-r--r-- | src/rom6.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/rom6.c b/src/rom6.c index 62fbc987c..ffd01fdb9 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -1,14 +1,15 @@ #include "global.h" +#include "constants/map_objects.h" +#include "constants/songs.h" #include "rom6.h" #include "braille_puzzles.h" #include "field_effect.h" -#include "field_map_obj.h" +#include "event_object_movement.h" #include "field_player_avatar.h" #include "item_use.h" #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) |