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_tower.s | |
| parent | 14e41d6c508e5c425dff8f2c4933ae4c8b7ab762 (diff) | |
| parent | 0d38d443b561f9baaae12324712503dfccaf01ea (diff) | |
Merge branch 'master' into decompile_rom3
Diffstat (limited to 'asm/battle_tower.s')
| -rwxr-xr-x | asm/battle_tower.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/asm/battle_tower.s b/asm/battle_tower.s index 4d86e8d28..74c84e34c 100755 --- a/asm/battle_tower.s +++ b/asm/battle_tower.s @@ -3548,11 +3548,11 @@ _08163E2C: movs r0, 0 strb r0, [r4] ldr r0, =gUnknown_08224158 - bl TrainerBattleConfigure + bl BattleSetup_ConfigureTrainerBattle movs r0, 0x1 strb r0, [r4] ldr r0, =gUnknown_08224167 - bl TrainerBattleConfigure + bl BattleSetup_ConfigureTrainerBattle ldr r0, =gPartnerTrainerId strh r5, [r0] ldr r0, =sub_8163A8C @@ -4364,7 +4364,7 @@ _081644E0: strb r0, [r1, 0x1] movs r0, 0xD8 lsls r0, 2 - bl FlagReset + bl FlagClear ldr r0, [r6] adds r0, r5 ldrh r0, [r0] @@ -4525,7 +4525,7 @@ _08164660: adds r1, 0xC0 strb r0, [r1, 0x1] ldr r0, =0x00000361 - bl FlagReset + bl FlagClear ldr r0, [r6] adds r0, r5 ldrh r0, [r0] @@ -6056,7 +6056,7 @@ _081653E0: bne _081653F8 bl sub_80F01B8 movs r0, 0x77 - bl FlagReset + bl FlagClear _081653F8: pop {r0} bx r0 |