diff options
| author | garak <garakmon@gmail.com> | 2018-11-27 11:35:19 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-11-27 11:35:19 -0500 |
| commit | 73cce797533c5985406b7b5696834b0976039c4f (patch) | |
| tree | bcf7766a7a7ae0ad42bbfacd9566c219fe1d0fd3 /asm/rom_8011DC0.s | |
| parent | 091b5194e7bfc6049931202d9712541083fd61cd (diff) | |
| parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) | |
Merge remote-tracking branch 'upstream/master' into frontier-data
Diffstat (limited to 'asm/rom_8011DC0.s')
| -rw-r--r-- | asm/rom_8011DC0.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index 6103785da..a52c2bc88 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -10149,7 +10149,7 @@ sub_801AAD4: @ 801AAD4 ldr r6, =gPlayerParty ldr r5, =gEnemyParty _0801AAE4: - ldr r0, =gUnknown_0203CEF8 + ldr r0, =gSelectedOrderFromParty adds r0, r4, r0 ldrb r0, [r0] subs r0, 0x1 @@ -10504,7 +10504,7 @@ _0801AE54: movs r1, 0 movs r2, 0x20 bl memset - ldr r0, =gUnknown_0203CEF8 + ldr r0, =gSelectedOrderFromParty ldrb r1, [r0] ldrb r0, [r0, 0x1] cmn r1, r0 |