diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-06 20:24:04 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-06 20:24:04 -0600 |
| commit | 1507a290d51760c9b36b4b8bc828cfe5b973c7d7 (patch) | |
| tree | 5f48809915af5d02c2f75efc790bd598ed9f3975 /asm/rom_8011DC0.s | |
| parent | 93ff71fcfdf8b71a7b4899f271a5214503bcd510 (diff) | |
| parent | 18839a4872057fde33be45c5d2c4ecf4274bcc8d (diff) | |
Merge pull request #378 from Diegoisawesome/script_menu
[WIP] Decompile/port script_menu
Diffstat (limited to 'asm/rom_8011DC0.s')
| -rw-r--r-- | asm/rom_8011DC0.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index b45639c13..6103785da 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -2905,7 +2905,7 @@ _080170CA: negs r0, r0 b _08017110 _080170D4: - bl sub_8197930 + bl DisplayYesNoMenu ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -2920,7 +2920,7 @@ _080170E0: negs r0, r0 b _08017110 _080170F2: - bl Menu_ProcessInputNoWrap_ + bl Menu_ProcessInputNoWrapClearOnChoose lsls r0, 24 asrs r1, r0, 24 movs r2, 0x80 @@ -6278,7 +6278,7 @@ _08018BD6: b _08018C3E .pool _08018BE4: - bl Menu_ProcessInputNoWrap_ + bl Menu_ProcessInputNoWrapClearOnChoose lsls r0, 24 asrs r6, r0, 24 movs r1, 0x80 @@ -16904,7 +16904,7 @@ _0801E16A: b _0801E23A .pool _0801E17C: - bl ProcessMenuInput + bl Menu_ProcessInput lsls r0, 24 asrs r0, 8 lsrs r6, r0, 16 @@ -20614,7 +20614,7 @@ _0801FEFE: thumb_func_start sub_801FF08 sub_801FF08: @ 801FF08 push {lr} - bl ProcessMenuInput + bl Menu_ProcessInput lsls r0, 24 asrs r0, 24 pop {r1} @@ -28887,10 +28887,10 @@ _08024246: strb r0, [r5, 0xC] b _080242D8 _0802426A: - bl sub_8197930 + bl DisplayYesNoMenu b _080242D0 _08024270: - bl Menu_ProcessInputNoWrap_ + bl Menu_ProcessInputNoWrapClearOnChoose lsls r0, 24 asrs r4, r0, 24 movs r0, 0x2 @@ -47811,7 +47811,7 @@ _0802DA84: thumb_func_start sub_802DA8C sub_802DA8C: @ 802DA8C push {lr} - bl Menu_ProcessInputNoWrap_ + bl Menu_ProcessInputNoWrapClearOnChoose lsls r0, 24 asrs r0, 24 pop {r1} |