diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-14 11:36:28 +0200 |
| commit | 455202eca00fd1b51e9ba8b75434d97ae5c750a8 (patch) | |
| tree | 153b1b85ae6864fec7bf880d9dd90fe6ef9a55c6 /asm/battle_frontier_1.s | |
| parent | 14e41d6c508e5c425dff8f2c4933ae4c8b7ab762 (diff) | |
| parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) | |
Merge branch 'master' into decompile_rom3
Diffstat (limited to 'asm/battle_frontier_1.s')
| -rwxr-xr-x | asm/battle_frontier_1.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/battle_frontier_1.s b/asm/battle_frontier_1.s index 4c44855f9..7ac60f1be 100755 --- a/asm/battle_frontier_1.s +++ b/asm/battle_frontier_1.s @@ -14296,7 +14296,7 @@ sub_81963F0: @ 81963F0 adds r0, r1 bl FieldObjectClearAnimIfSpecialAnimFinished bl sub_80D338C - bl sub_809757C + bl UnfreezeMapObjects bl ScriptContext2_Disable _08196446: movs r0, 0x1 @@ -14680,7 +14680,7 @@ sub_8196748: @ 8196748 ldr r4, =gUnknown_085500A4 _08196750: ldrh r0, [r4] - bl trainer_flag_check + bl HasTrainerAlreadyBeenFought lsls r0, 24 cmp r0, 0 beq _0819675E @@ -14706,7 +14706,7 @@ sub_8196774: @ 8196774 ldr r5, =gUnknown_085500A4 _0819677E: ldrh r0, [r5] - bl trainer_flag_check + bl HasTrainerAlreadyBeenFought lsls r0, 24 cmp r0, 0 beq _0819679A |