diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-09 02:39:57 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-09 02:39:57 +0100 |
| commit | c17a46823e55c5b60592963d7edb9425255aea8d (patch) | |
| tree | 158b2ee43ebbac1150ea36203310752813c3a6ad /src/debug/matsuda_debug_menu.c | |
| parent | 353a083d97be81cbc612ecb8de46b62a0e523362 (diff) | |
| parent | c4c885504729b56c00aa245aea6e284a1b6a1719 (diff) | |
Merge branch 'master' into some_battle_sound_stuff
Diffstat (limited to 'src/debug/matsuda_debug_menu.c')
| -rw-r--r-- | src/debug/matsuda_debug_menu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/debug/matsuda_debug_menu.c b/src/debug/matsuda_debug_menu.c index bb80de6fe..49fe6864b 100644 --- a/src/debug/matsuda_debug_menu.c +++ b/src/debug/matsuda_debug_menu.c @@ -29,8 +29,8 @@ extern u8 gContestPlayerMonIndex; extern u16 gSpecialVar_ContestCategory; extern u16 gSpecialVar_ContestRank; -extern u16 gUnknown_030042A4; -extern u16 gUnknown_030042A0; +extern u16 gBattle_BG0_X; +extern u16 gBattle_BG0_Y; extern u16 gBattle_BG1_X; extern u16 gBattle_BG1_Y; extern u16 gBattle_BG2_X; @@ -457,8 +457,8 @@ static void sub_80A9F50(void) REG_BLDY = 0; REG_BG0HOFS = 0; REG_BG0VOFS = 0; - gUnknown_030042A4 = 0; - gUnknown_030042A0 = 0; + gBattle_BG0_X = 0; + gBattle_BG0_Y = 0; gBattle_BG1_X = 0; gBattle_BG1_Y = 0; gBattle_BG2_X = 0; @@ -505,8 +505,8 @@ static void sub_80AA064(void) static void sub_80AA090(void) { - REG_BG0HOFS = gUnknown_030042A4; - REG_BG0VOFS = gUnknown_030042A0; + REG_BG0HOFS = gBattle_BG0_X; + REG_BG0VOFS = gBattle_BG0_Y; REG_BG1HOFS = gBattle_BG1_X; REG_BG1VOFS = gBattle_BG1_Y; REG_BG2HOFS = gBattle_BG2_X; |