diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-08-30 14:40:22 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-30 14:40:22 -0500 |
| commit | 1895383352da3bd5a4f4990fab045ae3610937fc (patch) | |
| tree | eb1794c8da8a8b51caa4abc0de8b797c49ead358 /src/battle_dome.c | |
| parent | 765e03846b471b26d986e9f64e41fd7b9ab5561e (diff) | |
| parent | 96f2b995dc67d1278bd65b3661426da95503cb5d (diff) | |
Merge pull request #308 from DizzyEggg/pyramid_bag
Decompile pyramid bag
Diffstat (limited to 'src/battle_dome.c')
| -rw-r--r-- | src/battle_dome.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/battle_dome.c b/src/battle_dome.c index 0183811cd..9f400bc7a 100644 --- a/src/battle_dome.c +++ b/src/battle_dome.c @@ -2810,23 +2810,16 @@ static void CalcDomeMonStats(u16 species, s32 level, s32 ivs, u8 evBits, u8 natu CALC_STAT(baseSpDefense, STAT_SPDEF); } -#define SWAP_16(x, y) \ -{ \ - temp = x; \ - x = y; \ - y = temp; \ -} - static void SwapDomeTrainers(s32 id1, s32 id2, u16 *statsArray) { s32 i; u16 temp; - SWAP_16(statsArray[id1], statsArray[id2]); - SWAP_16(gSaveBlock2Ptr->frontier.domeTrainers[id1].trainerId, gSaveBlock2Ptr->frontier.domeTrainers[id2].trainerId); + SWAP(statsArray[id1], statsArray[id2], temp); + SWAP(gSaveBlock2Ptr->frontier.domeTrainers[id1].trainerId, gSaveBlock2Ptr->frontier.domeTrainers[id2].trainerId, temp); for (i = 0; i < 3; i++) - SWAP_16(gSaveBlock2Ptr->frontier.domeMonId[id1][i], gSaveBlock2Ptr->frontier.domeMonId[id2][i]); + SWAP(gSaveBlock2Ptr->frontier.domeMonId[id1][i], gSaveBlock2Ptr->frontier.domeMonId[id2][i], temp); } static void sub_818F9B0(void) |