diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-10 12:21:05 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-10 12:21:05 -0800 |
| commit | 9ed1584bab5d2c0676261d6419834cd9d4f7dc3c (patch) | |
| tree | b451de240205ca20b9ce52bccb33d0d67adef3d8 /src/battle/battle_controller_player.c | |
| parent | 8832b766facd48c85c1b99ac6dad555f1e2aa1c7 (diff) | |
| parent | 0343a1bcd728d813a38fc3486535e962e681c094 (diff) | |
Merge pull request #454 from ProjectRevoTPP/ewram
ewram refactor
Diffstat (limited to 'src/battle/battle_controller_player.c')
| -rw-r--r-- | src/battle/battle_controller_player.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c index 136c31841..1aa73e90c 100644 --- a/src/battle/battle_controller_player.c +++ b/src/battle/battle_controller_player.c @@ -19,6 +19,7 @@ #include "task.h" #include "text.h" #include "util.h" +#include "ewram.h" //Possibly PokemonSubstruct1 struct UnknownStruct3 @@ -2644,9 +2645,9 @@ void PlayerHandlecmd22(void) gUnknown_0300434C[gActiveBank] = CreateTask(TaskDummy, 0xFF); gTasks[gUnknown_0300434C[gActiveBank]].data[0] = gBattleBufferA[gActiveBank][1] & 0xF; - ewram[0x16054] = gBattleBufferA[gActiveBank][1] >> 4; - ewram[0x1609D] = gBattleBufferA[gActiveBank][2]; - ewram[0x160C0] = gBattleBufferA[gActiveBank][3]; + ewram16054 = gBattleBufferA[gActiveBank][1] >> 4; + EWRAM_1609D = gBattleBufferA[gActiveBank][2]; + ewram160C0 = gBattleBufferA[gActiveBank][3]; for (i = 0; i < 3; i++) gUnknown_02038470[i] = gBattleBufferA[gActiveBank][4 + i]; BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, 0); |