diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-19 17:00:39 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-19 17:00:39 -0500 |
commit | 84c198ac76902385170fd0df90117411b930abe1 (patch) | |
tree | c1abca97b3f985433b4521c800a595c247a281fd /src/battle_controller_oak_old_man.c | |
parent | 7012834477885b974200e06b9598bab1c9f4f0e9 (diff) | |
parent | 407c49820e1e64ff6deb4480b6ff9aceb0a3b085 (diff) |
Merge branch 'master' into doc-cinnabar
Diffstat (limited to 'src/battle_controller_oak_old_man.c')
-rw-r--r-- | src/battle_controller_oak_old_man.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_controller_oak_old_man.c b/src/battle_controller_oak_old_man.c index 6ae50d058..0807018a2 100644 --- a/src/battle_controller_oak_old_man.c +++ b/src/battle_controller_oak_old_man.c @@ -379,9 +379,9 @@ static void OpenBagAndChooseItem(void) nullsub_44(); FreeAllWindowBuffers(); if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE) - sub_8107ECC(); + CB2_BagMenuFromBattle(); else - sub_810AF74(); + InitOldManBag(); } } |