mirror of https://github.com/pret/pokeemerald.git
FLY two times in party menu fix
parent
0d9087e652
commit
50ce8e8198
|
@ -318,7 +318,7 @@ index eef081849..920f672a8 100755
|
||||||
{
|
{
|
||||||
- AppendToList(sPartyMenuInternal->actions, &sPartyMenuInternal->numActions, j + MENU_FIELD_MOVES);
|
- AppendToList(sPartyMenuInternal->actions, &sPartyMenuInternal->numActions, j + MENU_FIELD_MOVES);
|
||||||
+ // If Mon already knows FLY and the HM is in the bag, prevent it from being added to action list
|
+ // If Mon already knows FLY and the HM is in the bag, prevent it from being added to action list
|
||||||
+ if (sFieldMoves[j] != MOVE_FLASH || !CheckBagHasItem(ITEM_HM05_FLASH, 1)){
|
+ if (sFieldMoves[j] != MOVE_FLY || !CheckBagHasItem(ITEM_HM02_FLY, 1)){
|
||||||
+ // If Mon already knows FLASH and the HM is in the bag, prevent it from being added to action list
|
+ // If Mon already knows FLASH and the HM is in the bag, prevent it from being added to action list
|
||||||
+ if (sFieldMoves[j] != MOVE_FLASH || !CheckBagHasItem(ITEM_HM05_FLASH, 1)){
|
+ if (sFieldMoves[j] != MOVE_FLASH || !CheckBagHasItem(ITEM_HM05_FLASH, 1)){
|
||||||
+ AppendToList(sPartyMenuInternal->actions, &sPartyMenuInternal->numActions, j + MENU_FIELD_MOVES);
|
+ AppendToList(sPartyMenuInternal->actions, &sPartyMenuInternal->numActions, j + MENU_FIELD_MOVES);
|
||||||
|
|
Loading…
Reference in New Issue