diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-30 23:50:49 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-30 23:50:49 -0600 |
| commit | 153ddde3b90c893b47d5c844b2a58c707038e6b4 (patch) | |
| tree | 8e3e5ab774b89399bf91e9ca110f270fa9bfffde /src/unknown_task.c | |
| parent | 86a36767dba19e84297047addf1d1d776e2efdec (diff) | |
| parent | c21bde059812ed521952512e4d800038e0e1deb7 (diff) | |
Merge pull request #502 from huderlem/misc_ports
Misc ports from pokeemerald
Diffstat (limited to 'src/unknown_task.c')
| -rw-r--r-- | src/unknown_task.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/unknown_task.c b/src/unknown_task.c index 0cc59fc66..c9ba95d42 100644 --- a/src/unknown_task.c +++ b/src/unknown_task.c @@ -8,13 +8,13 @@ static void sub_80896F4(void); static void sub_8089714(void); extern u16 gUnknown_030041B0; -extern u16 gUnknown_030041B4; +extern u16 gBattle_BG1_Y; extern u16 gUnknown_030041B8; -extern u16 gUnknown_03004280; -extern u16 gUnknown_03004288; +extern u16 gBattle_BG2_Y; +extern u16 gBattle_BG2_X; extern u16 gUnknown_030042A0; extern u16 gUnknown_030042A4; -extern u16 gUnknown_030042C0; +extern u16 gBattle_BG1_X; extern u8 gUnknown_0202FFA4; @@ -125,16 +125,16 @@ static void task00_for_dp12(u8 taskId) value = gUnknown_030042A0; break; case 0x4: - value = gUnknown_030042C0; + value = gBattle_BG1_X; break; case 0x6: - value = gUnknown_030041B4; + value = gBattle_BG1_Y; break; case 0x8: - value = gUnknown_03004288; + value = gBattle_BG2_X; break; case 0xA: - value = gUnknown_03004280; + value = gBattle_BG2_Y; break; case 0xC: value = gUnknown_030041B0; |