diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-12-20 23:44:56 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-20 23:44:56 -0800 |
| commit | 026e1108b26f4ce5cea362997135bd8efc7cb28a (patch) | |
| tree | 4f99fb34ab0abd51d8f0a4f958ec5b0001f5fed9 /src/union_room.c | |
| parent | d42ea06dc5ade2209fb84ffedafd33de3fbc9cd1 (diff) | |
| parent | d1cf9006fb4b29e63302c69c912e431a873626c0 (diff) | |
Merge pull request #935 from GriffinRichards/doc-warp
Document some warp/field screen effect
Diffstat (limited to 'src/union_room.c')
| -rw-r--r-- | src/union_room.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/union_room.c b/src/union_room.c index 1655b78da..4eea421ba 100644 --- a/src/union_room.c +++ b/src/union_room.c @@ -1424,7 +1424,7 @@ void sub_8014384(void) break; case 1: if (!FuncIsActiveTask(sub_80140E0)) - SetMainCallback2(sub_8086074); + SetMainCallback2(CB2_ReturnToFieldCableClub); break; } @@ -2880,7 +2880,7 @@ void sub_80156E0(u8 taskId) if (!gPaletteFade.active) { sUnionRoomTrade.field_0 = 1; - gFieldCallback = sub_80AF128; + gFieldCallback = FieldCB_ContinueScriptUnionRoom; ChooseMonForTradingBoard(PARTY_MENU_TYPE_UNION_ROOM_REGISTER, CB2_ReturnToField); } break; @@ -2992,7 +2992,7 @@ void sub_80156E0(u8 taskId) memcpy(&gUnknown_02022C38, &data->field_0->arr[taskData[1]].unk.field_0.unk_00, sizeof(gUnknown_02022C38)); 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; + gFieldCallback = FieldCB_ContinueScriptUnionRoom; ChooseMonForTradingBoard(PARTY_MENU_TYPE_UNION_ROOM_TRADE, CB2_ReturnToField); sub_80156B0(data); sUnionRoomTrade.field_8 = taskData[1]; |