diff options
| author | huderlem <huderlem@gmail.com> | 2019-10-31 21:36:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-31 21:36:56 -0500 |
| commit | 6eaac9ea9d221e37d801064c73ce61dc3467b643 (patch) | |
| tree | c724683997ab8ab5729e02c0232bdd3d171dd120 /src/union_room.c | |
| parent | 218fcd99b395777e99b3b6b9478a3d97c7a7fc87 (diff) | |
| parent | 27169f634b27a8985945e8b592f3f4ce0a38c53e (diff) | |
Merge pull request #863 from GriffinRichards/doc-partymenu
Document party menu
Diffstat (limited to 'src/union_room.c')
| -rw-r--r-- | src/union_room.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/union_room.c b/src/union_room.c index f259a38f0..5952b03eb 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -47,6 +47,7 @@ #include "constants/cable_club.h" #include "constants/game_stat.h" #include "constants/maps.h" +#include "constants/party_menu.h" #include "constants/rgb.h" #include "constants/songs.h" #include "constants/species.h" @@ -2308,7 +2309,9 @@ void sub_80156E0(u8 taskId) data->state = 3; break; case 3: - if ((sub_81B1360() == 8 || sub_81B1360() == 9) && sUnionRoomTrade.field_0 != 0) + if ((GetPartyMenuType() == PARTY_MENU_TYPE_UNION_ROOM_REGISTER + || GetPartyMenuType() == PARTY_MENU_TYPE_UNION_ROOM_TRADE) + && sUnionRoomTrade.field_0 != 0) { id = GetCursorSelectionMonId(); switch (sUnionRoomTrade.field_0) @@ -2876,7 +2879,7 @@ void sub_80156E0(u8 taskId) { sUnionRoomTrade.field_0 = 1; gFieldCallback = sub_80AF128; - sub_81B8904(8, CB2_ReturnToField); + ChooseMonForTradingBoard(PARTY_MENU_TYPE_UNION_ROOM_REGISTER, CB2_ReturnToField); } break; case 52: @@ -2988,7 +2991,7 @@ void sub_80156E0(u8 taskId) gUnionRoomRequestedMonType = data->field_0->arr[taskData[1]].unk.field_0.type; gUnionRoomOfferedSpecies = data->field_0->arr[taskData[1]].unk.field_0.species; gFieldCallback = sub_80AF128; - sub_81B8904(9, CB2_ReturnToField); + ChooseMonForTradingBoard(PARTY_MENU_TYPE_UNION_ROOM_TRADE, CB2_ReturnToField); sub_80156B0(data); sUnionRoomTrade.field_8 = taskData[1]; } |