diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-31 02:34:42 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-31 02:34:42 -0600 |
| commit | 935a098843b1176db8e4b4f8f82f70086a0ed92f (patch) | |
| tree | 2c20338324f10a553e78e731d999dd58669266c3 /src/battle_anim_effects_3.c | |
| parent | 58f130d007b97623dd5c7a3b373800c138f75c5e (diff) | |
| parent | d004ce065c9cc6425df6f567dff39eb831f84875 (diff) | |
Merge pull request #456 from Diegoisawesome/trade
trade.c
Diffstat (limited to 'src/battle_anim_effects_3.c')
| -rwxr-xr-x | src/battle_anim_effects_3.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index dfaba3d92..018cc48e4 100755 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -2383,8 +2383,8 @@ void sub_815BB84(u8 taskId) gBattle_BG1_Y = 0; } - sub_80A6CC0(unknownStruct.bgId, &gUnknown_08C2A634, unknownStruct.tilesOffset); - LoadCompressedPalette(&gUnknown_08C2A6D4, unknownStruct.unk8 << 4, 32); + sub_80A6CC0(unknownStruct.bgId, gUnknown_08C2A634, unknownStruct.tilesOffset); + LoadCompressedPalette(gUnknown_08C2A6D4, unknownStruct.unk8 << 4, 32); gTasks[taskId].data[10] = gBattle_BG1_X; gTasks[taskId].data[11] = gBattle_BG1_Y; @@ -2589,8 +2589,8 @@ void sub_815C0A4(u8 taskId) gBattle_BG1_Y = 0; } - sub_80A6CC0(unknownStruct.bgId, &gUnknown_08C2A634, unknownStruct.tilesOffset); - LoadCompressedPalette(&gUnknown_08C2A6D4, unknownStruct.unk8 << 4, 32); + sub_80A6CC0(unknownStruct.bgId, gUnknown_08C2A634, unknownStruct.tilesOffset); + LoadCompressedPalette(gUnknown_08C2A6D4, unknownStruct.unk8 << 4, 32); gTasks[taskId].data[10] = gBattle_BG1_X; gTasks[taskId].data[11] = gBattle_BG1_Y; gTasks[taskId].data[0]++; |