Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Incorporated upstream fixes

Browse Source
This commit is contained in:
Eduardo Quezada 2023-10-02 17:20:17 -03:00
parent a6940c9e03
commit 4febd2cf55
5 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/apprentice.c
View File

@ -624,7 +624,7 @@ static void CreateApprenticeMenu(u8 menu)
left = 0; left = 0;
top = 0; top = 0;
#ifdef UBFIX #ifdef UBFIX
//return; TodoFix return;
#endif #endif
break; break;
} }

2
src/battle_anim_utility_funcs.c
View File

@ -70,7 +70,7 @@ void AnimTask_BlendBattleAnimPalExclude(u8 taskId)
// fall through // fall through
case ANIM_ATTACKER: case ANIM_ATTACKER:
#ifdef UBFIX #ifdef UBFIX
//default: TodoFix default:
#endif #endif
animBattlers[0] = gBattleAnimAttacker; animBattlers[0] = gBattleAnimAttacker;
break; break;

5
src/battle_tower.c
View File

@ -1843,11 +1843,8 @@ static void FillFactoryFrontierTrainerParty(u16 trainerId, u8 firstMonId)
{ {
// By mistake Battle Tower's Level 50 challenge number is used to determine the IVs for Battle Factory. // By mistake Battle Tower's Level 50 challenge number is used to determine the IVs for Battle Factory.
#ifdef BUGFIX #ifdef BUGFIX
//TodoFix u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u8 UNUSED lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE); u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
//u8 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
//u8 battleMode = VarGet(VAR_FRONTIER_BATTLE_MODE);
u8 challengeNum = gSaveBlock2Ptr->frontier.factoryWinStreaks[battleMode][lvlMode] / FRONTIER_STAGES_PER_CHALLENGE; u8 challengeNum = gSaveBlock2Ptr->frontier.factoryWinStreaks[battleMode][lvlMode] / FRONTIER_STAGES_PER_CHALLENGE;
#else #else
u8 UNUSED lvlMode = gSaveBlock2Ptr->frontier.lvlMode; u8 UNUSED lvlMode = gSaveBlock2Ptr->frontier.lvlMode;

2
src/berry_blender.c
View File

@ -3864,7 +3864,7 @@ static void Blender_AddTextPrinter(u8 windowId, const u8 *string, u8 x, u8 y, s3
case 0: case 0:
case 3: case 3:
#ifdef UBFIX #ifdef UBFIX
//default: TodoFix default:
#endif #endif
txtColor[0] = TEXT_COLOR_WHITE; txtColor[0] = TEXT_COLOR_WHITE;
txtColor[1] = TEXT_COLOR_DARK_GRAY; txtColor[1] = TEXT_COLOR_DARK_GRAY;

10
src/librfu_rfu.c
View File

@ -1401,8 +1401,7 @@ static u16 rfu_STC_setSendData_org(u8 ni_or_uni, u8 bmSendSlot, u8 subFrameSize,
u8 bm_slot_id, sendSlotFlag; u8 bm_slot_id, sendSlotFlag;
u8 frameSize; u8 frameSize;
#ifdef UBFIX #ifdef UBFIX
u8 *llFrameSize_p; u8 *llFrameSize_p = NULL;
//u8 *llFrameSize_p = NULL; TodoFix
#else #else
u8 *llFrameSize_p; u8 *llFrameSize_p;
#endif #endif
@ -1432,8 +1431,7 @@ static u16 rfu_STC_setSendData_org(u8 ni_or_uni, u8 bmSendSlot, u8 subFrameSize,
llFrameSize_p = &gRfuLinkStatus->remainLLFrameSizeChild[bm_slot_id]; llFrameSize_p = &gRfuLinkStatus->remainLLFrameSizeChild[bm_slot_id];
frameSize = llsf_struct[gRfuLinkStatus->parentChild].frameSize; frameSize = llsf_struct[gRfuLinkStatus->parentChild].frameSize;
#ifdef UBFIX #ifdef UBFIX
if (subFrameSize > *llFrameSize_p || subFrameSize <= frameSize) if ((llFrameSize_p && subFrameSize > *llFrameSize_p) || subFrameSize <= frameSize)
//if ((llFrameSize_p && subFrameSize > *llFrameSize_p) || subFrameSize <= frameSize) TodoFix
#else #else
if (subFrameSize > *llFrameSize_p || subFrameSize <= frameSize) if (subFrameSize > *llFrameSize_p || subFrameSize <= frameSize)
#endif #endif
@ -1475,7 +1473,7 @@ static u16 rfu_STC_setSendData_org(u8 ni_or_uni, u8 bmSendSlot, u8 subFrameSize,
} }
gRfuLinkStatus->sendSlotNIFlag |= bmSendSlot; gRfuLinkStatus->sendSlotNIFlag |= bmSendSlot;
#ifdef UBFIX #ifdef UBFIX
//if (llFrameSize_p) TodoFix if (llFrameSize_p)
#endif #endif
*llFrameSize_p -= subFrameSize; *llFrameSize_p -= subFrameSize;
slotStatus_NI->send.state = SLOT_STATE_SEND_START; slotStatus_NI->send.state = SLOT_STATE_SEND_START;
@ -1487,7 +1485,7 @@ static u16 rfu_STC_setSendData_org(u8 ni_or_uni, u8 bmSendSlot, u8 subFrameSize,
slotStatus_UNI->send.src = src; slotStatus_UNI->send.src = src;
slotStatus_UNI->send.payloadSize = subFrameSize - frameSize; slotStatus_UNI->send.payloadSize = subFrameSize - frameSize;
#ifdef UBFIX #ifdef UBFIX
//if (llFrameSize_p) TodoFix if (llFrameSize_p)
#endif #endif
*llFrameSize_p -= subFrameSize; *llFrameSize_p -= subFrameSize;
slotStatus_UNI->send.state = SLOT_STATE_SEND_UNI; slotStatus_UNI->send.state = SLOT_STATE_SEND_UNI;