diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 20:20:56 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 20:20:56 -0600 |
| commit | 18839a4872057fde33be45c5d2c4ecf4274bcc8d (patch) | |
| tree | 5f48809915af5d02c2f75efc790bd598ed9f3975 /asm/party_menu.s | |
| parent | 054a015c950ca9869ce28245a2f13c3f72cddb37 (diff) | |
| parent | 93ff71fcfdf8b71a7b4899f271a5214503bcd510 (diff) | |
Merge remote-tracking branch 'pret/master' into script_menu
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 cb66565e5..231cb72d7 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -6178,7 +6178,7 @@ sub_81B3300: @ 81B3300 movs r1, 0x1 orrs r0, r1 strb r0, [r2] - bl GetPlayerTextSpeed + bl GetPlayerTextSpeedDelay adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 @@ -15615,7 +15615,7 @@ _081B8618: bl GetMonData lsls r0, 16 lsrs r4, r0, 16 - ldr r3, =gUnknown_08611C9A + ldr r3, =gFrontierBannedSpecies lsls r1, r6, 1 adds r0, r1, r3 ldrh r0, [r0] |