dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

thru PokedudeHandleSetRawMonData

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-11-01 05:28:17 +08:00
parent 71eb0fc9d8
commit a937f72283
4 changed files with 1130 additions and 3887 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/battle_controller_pokedude.s
-3884
View File
File diff suppressed because it is too large Load Diff
include/party_menu.h
+1
View File
@@ -88,5 +88,6 @@ void CB2_PartyMenuFromStartMenu(void);
void sub_8128198(void); void sub_8128198(void);
void sub_8127FF4(u8 slot, u8 slot2); void sub_8127FF4(u8 slot, u8 slot2);
void LoadHeldItemIcons(void); void LoadHeldItemIcons(void);
void sub_8127968(void);
#endif // GUARD_PARTY_MENU_H #endif // GUARD_PARTY_MENU_H
src/battle_controller_oak_old_man.c
+3 -3
View File
@@ -181,7 +181,7 @@ static void OakOldManBufferRunCommand(void)
{ {
if (gBattleControllerExecFlags & gBitTable[gActiveBattler]) if (gBattleControllerExecFlags & gBitTable[gActiveBattler])
{ {
if (gBattleBufferA[gActiveBattler][0] < ARRAY_COUNT(sOakOldManBufferCommands)) if (gBattleBufferA[gActiveBattler][0] < NELEMS(sOakOldManBufferCommands))
sOakOldManBufferCommands[gBattleBufferA[gActiveBattler][0]](); sOakOldManBufferCommands[gBattleBufferA[gActiveBattler][0]]();
else else
OakOldManBufferExecCompleted(); OakOldManBufferExecCompleted();
@@ -463,7 +463,7 @@ static void sub_80E7CD8(void)
static void Task_GiveExpToMon(u8 taskId) static void Task_GiveExpToMon(u8 taskId)
{ {
u32 monId = (u8)(gTasks[taskId].tExpTask_monId); u32 monId = (u8)gTasks[taskId].tExpTask_monId;
u8 battlerId = gTasks[taskId].tExpTask_battler; u8 battlerId = gTasks[taskId].tExpTask_battler;
s16 gainedExp = gTasks[taskId].tExpTask_gainedExp; s16 gainedExp = gTasks[taskId].tExpTask_gainedExp;
@@ -487,7 +487,7 @@ static void Task_GiveExpToMon(u8 taskId)
BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELED_UP, gainedExp); BtlController_EmitTwoReturnValues(1, RET_VALUE_LEVELED_UP, gainedExp);
gActiveBattler = savedActiveBattler; gActiveBattler = savedActiveBattler;
if (IsDoubleBattle() == TRUE if (IsDoubleBattle() == TRUE
&& ((u16)(monId) == gBattlerPartyIndexes[battlerId] || (u16)(monId) == gBattlerPartyIndexes[battlerId ^ BIT_FLANK])) && ((u16)monId == gBattlerPartyIndexes[battlerId] || (u16)monId == gBattlerPartyIndexes[battlerId ^ BIT_FLANK]))
gTasks[taskId].func = Task_LaunchLvlUpAnim; gTasks[taskId].func = Task_LaunchLvlUpAnim;
else else
gTasks[taskId].func = DestroyExpTaskAndCompleteOnInactiveTextPrinter; gTasks[taskId].func = DestroyExpTaskAndCompleteOnInactiveTextPrinter;
src/battle_controller_pokedude.c
+1126
View File
File diff suppressed because it is too large Load Diff