diff options
| author | Paul Sander <nintendo6496@googlemail.com> | 2018-11-30 22:16:04 +0100 |
|---|---|---|
| committer | Paul Sander <nintendo6496@googlemail.com> | 2018-11-30 22:16:04 +0100 |
| commit | fc1fd9c983b0ea35414f699ab6c4b4fdd617e8d0 (patch) | |
| tree | d1972ab6d6b1ad9ab93bf5bde673a722a3a9f2c7 /asm/party_menu.s | |
| parent | 308e60da31388973ac8885127b12db300e21100a (diff) | |
| parent | 63c205e7d0094756ea851e0aed0852671329905c (diff) | |
merge upstream
Diffstat (limited to 'asm/party_menu.s')
| -rw-r--r-- | asm/party_menu.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/party_menu.s b/asm/party_menu.s index 82718c6e0..bdde69c24 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -5118,7 +5118,7 @@ _08121194: ands r0, r1 cmp r0, 0xA beq _081211F0 - ldr r4, _081211E8 @ =gUnknown_84161C1 + ldr r4, _081211E8 @ =gFameCheckerText_Cancel movs r0, 0 adds r1, r4, 0 movs r2, 0 @@ -5146,7 +5146,7 @@ _08121194: .align 2, 0 _081211E0: .4byte gUnknown_845A108 _081211E4: .4byte gUnknown_203B0A0 -_081211E8: .4byte gUnknown_84161C1 +_081211E8: .4byte gFameCheckerText_Cancel _081211EC: .4byte gUnknown_8459FFC _081211F0: ldr r4, _08121240 @ =gUnknown_84161C8 |