diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-01-03 03:30:20 -0500 |
|---|---|---|
| committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-03 00:30:20 -0800 |
| commit | bdb3dea2b751e65a349ec2d637b461f39cc5ef74 (patch) | |
| tree | b9d31ad793e0f693b70b8b6749ae7d1ca2a64ff7 /asm | |
| parent | 929148fb7de2eda9fee1f4611834d4dfb73c9f91 (diff) | |
more labels in battle_ai.c and intro.c and misc places (#151)
* make ROM match again
* clean up item_use.c labels and clarify functions.
* label and clarify some functions in decompress.c
* label and clarify berry.c
* rename 20239F8 to gBattleTypeFlags
* formatting
* label intro.c a bit
* label battle_ai.c and document some stuff
* formatting
* more labeling and clarification.
* more label stuff
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/rom3.s | 2 | ||||
| -rw-r--r-- | asm/rom_800D42C.s | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/asm/rom3.s b/asm/rom3.s index ad1a0ff46..94862459b 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -69,7 +69,7 @@ _0800B8A0: str r5, [r0] bl sub_8075624 bl sub_8040710 - bl sub_81070D4 + bl BattleAI_HandleItemUseBeforeAISetup ldr r0, _0800B940 @ =gBattleTypeFlags ldrh r1, [r0] movs r0, 0x10 diff --git a/asm/rom_800D42C.s b/asm/rom_800D42C.s index 62b466d6b..7a04ff5e9 100644 --- a/asm/rom_800D42C.s +++ b/asm/rom_800D42C.s @@ -78714,8 +78714,8 @@ sub_8035428: @ 8035428 ands r0, r1 cmp r0, 0 beq _080354F8 - bl sub_810715C - bl sub_81072A8 + bl BattleAI_SetupAIData + bl BattleAI_GetAIActionToUse lsls r0, 24 lsrs r4, r0, 24 cmp r4, 0x4 |