diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-21 08:11:17 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-08-21 08:11:17 -0400 |
| commit | f78d404d3212f2148af5ca9974e4db6daec66e89 (patch) | |
| tree | 51d0fb4bfea6d1471c3f71313284df1dd0b38e5c /arm9/src/game_init.c | |
| parent | 684cde0b321e955fdec5b86e125d9993ebb318c6 (diff) | |
Merge ioreg_GX into registers; fix indentation
Diffstat (limited to 'arm9/src/game_init.c')
| -rw-r--r-- | arm9/src/game_init.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/arm9/src/game_init.c b/arm9/src/game_init.c index 8fdeb44b..327c66c6 100644 --- a/arm9/src/game_init.c +++ b/arm9/src/game_init.c @@ -9,7 +9,7 @@ #include "tp.h" #include "unk_0201B4E8.h" #include "game_init.h" -#include "ioreg_GX.h" +#include "registers.h" #pragma thumb on @@ -462,19 +462,19 @@ void FUN_02016568(void) gMain.unk4C |= PAD_BUTTON_X; break; case 2: // Swap X and Y; unused in the retail game - { - u32 r1 = 0; - if (gMain.unk48 & PAD_BUTTON_X) - { - r1 |= PAD_BUTTON_Y; - } - if (gMain.unk48 & PAD_BUTTON_Y) { - r1 |= PAD_BUTTON_X; + u32 r1 = 0; + if (gMain.unk48 & PAD_BUTTON_X) + { + r1 |= PAD_BUTTON_Y; + } + if (gMain.unk48 & PAD_BUTTON_Y) + { + r1 |= PAD_BUTTON_X; + } + gMain.unk48 &= 0xF3FF; + gMain.unk48 |= r1; } - gMain.unk48 &= 0xF3FF; - gMain.unk48 |= r1; - } { u32 r1 = 0; if (gMain.unk44 & PAD_BUTTON_X) |