diff options
author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-09 15:47:59 +0100 |
---|---|---|
committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-09 15:47:59 +0100 |
commit | ee39862392cc263c3f3073c125cffcb449131643 (patch) | |
tree | 7687814cc368ea6a832eea9398307084bc94ceae /src/unknown_task.c | |
parent | dcecc8aebfd2480d6e79f3c1f54b737ecbb319f8 (diff) | |
parent | 85174ad6193d3d58b92deaaedf8c510440ed85ee (diff) |
Merge branch 'master' into battle_anim
Diffstat (limited to 'src/unknown_task.c')
-rw-r--r-- | src/unknown_task.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/unknown_task.c b/src/unknown_task.c index 62245502a..2c71bfb08 100644 --- a/src/unknown_task.c +++ b/src/unknown_task.c @@ -12,8 +12,8 @@ extern u16 gBattle_BG1_Y; extern u16 gUnknown_030041B8; extern u16 gBattle_BG2_Y; extern u16 gBattle_BG2_X; -extern u16 gUnknown_030042A0; -extern u16 gUnknown_030042A4; +extern u16 gBattle_BG0_Y; +extern u16 gBattle_BG0_X; extern u16 gBattle_BG1_X; extern u8 gUnknown_0202FFA4; @@ -120,10 +120,10 @@ static void task00_for_dp12(u8 taskId) switch (gTasks[taskId].data[6]) { case 0x0: - value = gUnknown_030042A4; + value = gBattle_BG0_X; break; case 0x2: - value = gUnknown_030042A0; + value = gBattle_BG0_Y; break; case 0x4: value = gBattle_BG1_X; |