diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-03-12 16:16:57 -0600 |
|---|---|---|
| committer | Seth Barberee <seth.barberee@gmail.com> | 2021-03-12 16:16:57 -0600 |
| commit | 6bcf9e64b1eee878fe29f6f1226efd25e179400e (patch) | |
| tree | 1dfdffe949d36b2a2f6e0a4e767cea9358c5c44c /src/mystery_gift_menu.c | |
| parent | 4d1e07451444d2645fdd9b1f7ee711b318ff5a45 (diff) | |
backport 2 nonmatching fixes from emerald
Diffstat (limited to 'src/mystery_gift_menu.c')
| -rw-r--r-- | src/mystery_gift_menu.c | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/src/mystery_gift_menu.c b/src/mystery_gift_menu.c index 39de542d7..33f31515d 100644 --- a/src/mystery_gift_menu.c +++ b/src/mystery_gift_menu.c @@ -1220,18 +1220,10 @@ void task00_mystery_gift(u8 taskId) } break; case 5: - { - #ifndef NONMATCHING - register u8 eos asm("r1"); - gStringVar1[0] = (eos = EOS); - gStringVar2[0] = eos; - gStringVar3[0] = eos; - #else - gStringVar1[0] = EOS; - gStringVar2[0] = EOS; - gStringVar3[0] = EOS; - #endif - } + *gStringVar1 = EOS; + *gStringVar2 = EOS; + *gStringVar3 = EOS; + switch (data->IsCardOrNews) { case 0: @@ -1622,18 +1614,9 @@ void task00_mystery_gift(u8 taskId) } break; case 31: - { - #ifndef NONMATCHING - register u8 eos asm("r1"); - gStringVar1[0] = (eos = EOS); - gStringVar2[0] = eos; - gStringVar3[0] = eos; - #else - gStringVar1[0] = EOS; - gStringVar2[0] = EOS; - gStringVar3[0] = EOS; - #endif - } + *gStringVar1 = EOS; + *gStringVar2 = EOS; + *gStringVar3 = EOS; if (data->IsCardOrNews == 0) { AddTextPrinterToWindow1(gText_SendingWonderCard); |