diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-04-15 13:59:00 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-15 13:59:00 -0400 |
commit | 5bf1c29cee223cba17a1ec93af0196e380e8cbf1 (patch) | |
tree | 15e666997001cf39d482f2636953c654d255af3e /asm/link.s | |
parent | 0cb1417de441af6e688fc4784da498bb677cc888 (diff) | |
parent | 0f569270391f68ef10a703a9e37f1a4e298a0cee (diff) |
Merge pull request #49 from PikalaxALT/tm_case
Tm case
Diffstat (limited to 'asm/link.s')
-rw-r--r-- | asm/link.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/link.s b/asm/link.s index 13305edde..7130ce69d 100644 --- a/asm/link.s +++ b/asm/link.s @@ -3308,7 +3308,7 @@ _0800AD30: lsls r1, 8 movs r0, 0 bl ClearGpuRegBits - ldr r0, _0800AE08 @ =gUnknown_841F408 + ldr r0, _0800AE08 @ =gTMCaseMainWindowPalette movs r1, 0xF0 movs r2, 0x20 bl LoadPalette @@ -3343,7 +3343,7 @@ _0800ADF8: .4byte sub_800978C _0800ADFC: .4byte gUnknown_82345E8 _0800AE00: .4byte gUnknown_2022860 _0800AE04: .4byte gUnknown_82345F0 -_0800AE08: .4byte gUnknown_841F408 +_0800AE08: .4byte gTMCaseMainWindowPalette _0800AE0C: .4byte gSoftResetDisabled _0800AE10: .4byte sub_80094D4 _0800AE14: .4byte gMain |