diff --git a/libpokemegb b/libpokemegb index 7ac7c29..99e495d 160000 --- a/libpokemegb +++ b/libpokemegb @@ -1 +1 @@ -Subproject commit 7ac7c29f3e8b6477ecbf7df50e68d553daa25e0d +Subproject commit 99e495dad99bc63cbb078862de3549d8c69890f1 diff --git a/src/menu/MenuEntries.cpp b/src/menu/MenuEntries.cpp index 710a19a..3d3dbd6 100755 --- a/src/menu/MenuEntries.cpp +++ b/src/menu/MenuEntries.cpp @@ -43,7 +43,7 @@ MenuItemData gen2CrystalMenuEntries[] = { .onConfirmAction = goToGen2PCNYDistributionPokemonMenu, }, { - .title = "Receive GS Ball", + .title = "Unlock GS Ball", .onConfirmAction = gen2ReceiveGSBall } }; diff --git a/src/menu/MenuFunctions.cpp b/src/menu/MenuFunctions.cpp index 2d92794..ac99295 100755 --- a/src/menu/MenuFunctions.cpp +++ b/src/menu/MenuFunctions.cpp @@ -346,9 +346,10 @@ void gen2ReceiveGSBall(void* context, const void* param) } else { - keyItemPocket.add(POKEMON_CRYSTAL_ITEM_ID_GS_BALL, 1); + gameReader.unlockGsBallEvent(); gameReader.finishSave(); - setDialogDataText(*messageData, "%s obtained a GS Ball!", trainerName); + tpakManager.finishWrites(); + setDialogDataText(*messageData, "GS Ball event unlocked! Please go to the Golden Rod Pokémon Center and try to leave!", trainerName); } scene->showDialog(messageData); } \ No newline at end of file