Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6
This commit is contained in:
commit
929bc8b990
276 files changed
+11759
-11089
No files matched your search
+1
-1
@@ -3125,7 +3125,7 @@ static void Task_RunUnionRoom(u8 taskId)
|
||||
break;
|
||||
case UR_STATE_REGISTER_COMPLETE:
|
||||
SetTradeBoardRegisteredMonInfo(sUnionRoomTrade.type, sUnionRoomTrade.playerSpecies, sUnionRoomTrade.playerLevel);
|
||||
ScheduleFieldMessageAndExit(sText_RegistraionCompleted);
|
||||
ScheduleFieldMessageAndExit(sText_RegistrationCompleted);
|
||||
break;
|
||||
case UR_STATE_CANCEL_REGISTRATION_PROMPT:
|
||||
switch (UnionRoomHandleYesNo(&uroom->textState, FALSE))
|
||||
|
||||
Reference in new issue
Block a user