diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_frontier_1.s | 2 | ||||
| -rw-r--r-- | asm/battle_frontier_2.s | 4 | ||||
| -rw-r--r-- | asm/party_menu.s | 2 | ||||
| -rw-r--r-- | asm/rom_8011DC0.s | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s index 7ebc2f256..bdfc3e1e6 100644 --- a/asm/battle_frontier_1.s +++ b/asm/battle_frontier_1.s @@ -2163,7 +2163,7 @@ sub_8196D74: @ 8196D74 ldr r0, =gSaveBlock2Ptr ldr r0, [r0] adds r0, 0xA - bl ReadUnalignedWord + bl GetTrainerId adds r6, r0, 0 ldr r0, =0x0000ffff ands r6, r0 diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index 646443d46..291ea90c4 100644 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -3664,7 +3664,7 @@ _081A7108: b _081A70D6 _081A710E: movs r0, 0x5 - bl sub_81A5030 + bl SetFrontierBrainEventObjGfx _081A7114: movs r7, 0x1C movs r4, 0 @@ -6227,7 +6227,7 @@ sub_81A8590: @ 81A8590 lsls r0, 16 lsrs r4, r0, 16 movs r0, 0x5 - bl sub_81A3B30 + bl GetPlayerSymbolCountForFacility lsls r0, 24 lsrs r2, r0, 24 cmp r2, 0 diff --git a/asm/party_menu.s b/asm/party_menu.s index 53a66378c..8ee815968 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -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] diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index 1c02f93cd..b45639c13 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -11490,7 +11490,7 @@ _0801B628: ldr r1, [r0] adds r1, 0xA adds r0, r4, 0 - bl CopyUnalignedWord + bl CopyTrainerId mov r2, r8 ldr r1, [r2] adds r0, r6, 0 |