diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-04 19:49:38 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-04 19:49:38 -0700 |
| commit | 8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (patch) | |
| tree | 8f4bded9d721a993674a4e5d9eeb57ad86580d39 /src/field/battle_tower.c | |
| parent | 1698e882b4760bcfe8cf91073cf7e46541ae6392 (diff) | |
| parent | b4c6e0560a7b1310cc08b93ea04935d4fbb7c3de (diff) | |
Merge pull request #450 from ProjectRevoTPP/fix_setmondata
various fixes
Diffstat (limited to 'src/field/battle_tower.c')
| -rw-r--r-- | src/field/battle_tower.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/field/battle_tower.c b/src/field/battle_tower.c index 06d692eae..1b5759f49 100644 --- a/src/field/battle_tower.c +++ b/src/field/battle_tower.c @@ -1370,7 +1370,7 @@ void FillBattleTowerTrainerParty(void) } SetMonData(&gEnemyParty[partyIndex], MON_DATA_FRIENDSHIP, &friendship); - SetMonData(&gEnemyParty[partyIndex], MON_DATA_HELD_ITEM, (u8 *)&sBattleTowerHeldItems[battleTowerMons[battleMonIndex].heldItem]); + SetMonData(&gEnemyParty[partyIndex], MON_DATA_HELD_ITEM, &sBattleTowerHeldItems[battleTowerMons[battleMonIndex].heldItem]); // The pokemon was successfully added to the trainer's party, so it's safe to move on to // the next party slot. @@ -1589,7 +1589,7 @@ void sub_81354CC(void) for (i = 0; i < PARTY_SIZE; i++) { heldItem = GetMonData(&gSaveBlock1.playerParty[i], MON_DATA_HELD_ITEM); - SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, (u8 *)&heldItem); + SetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM, &heldItem); } break; case 2: @@ -1633,7 +1633,7 @@ void sub_813556C(void) for (i = 0; i < PARTY_SIZE; i++) { heldItem = GetMonData(&gPlayerParty[i], MON_DATA_HELD_ITEM); - SetMonData(&gSaveBlock1.playerParty[i], MON_DATA_HELD_ITEM, (u8 *)&heldItem); + SetMonData(&gSaveBlock1.playerParty[i], MON_DATA_HELD_ITEM, &heldItem); } CreateTask(sub_8135534, 1); @@ -2185,7 +2185,7 @@ void AwardBattleTowerRibbons(void) if (!GetMonData(pokemon, ribbonType)) { gScriptResult = 1; - SetMonData(pokemon, ribbonType, (u8 *)&gScriptResult); + SetMonData(pokemon, ribbonType, &gScriptResult); } } } |