Leahnaya/pmd-sky
1
0
Fork 0
mirror of https://github.com/pret/pmd-sky.git synced 2026-04-25 07:24:42 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Renamed some AI symbols

Browse Source
This commit is contained in:
AnonymousRandomPerson 2025-06-11 00:02:33 -04:00
parent d8acdf3418
commit 02be2f1718
16 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/include/itcm.inc
View File

@ -12,13 +12,13 @@
.public _022B99D0
.public AbilityIsActiveVeneer
.public abs
.public AI_CONFUSED_ATTACK_CHANCE
.public AI_CONFUSED_NO_ATTACK_CHANCE
.public AI_REGULAR_ATTACK_WEIGHTS
.public AiConsiderMove
.public AreMovesEnabled
.public CanAiMonsterMoveInDirection
.public CanAiUseMove
.public CannotAttack
.public MonsterCannotAttack
.public CanSeeTarget
.public CanTargetEntity
.public CanTargetPosition

2
asm/include/overlay_29_022FE4BC.inc
View File

@ -3,7 +3,7 @@
.public AdvanceFrame
.public AnimationDelayOrSomething
.public CanMonsterMoveInDirection
.public CannotAttack
.public MonsterCannotAttack
.public CannotStandOnTile
.public DIRECTIONS_XY
.public DisplayActions

2
asm/include/overlay_29_022FEDBC.inc
View File

@ -1,7 +1,7 @@
#pragma once
.public ActivateFlashFire
.public CanMonsterUseMove
.public CannotAttack
.public MonsterCannotAttack
.public DUNGEON_PTR
.public DungeonRandInt
.public EntityIsValid__022FED98

2
asm/include/overlay_29_0230F9A4.inc
View File

@ -7,7 +7,7 @@
.public BoostSpeedOneStage
.public BURN_DAMAGE
.public BURN_DAMAGE_COOLDOWN
.public CannotAttack
.public MonsterCannotAttack
.public CeilFixedPoint
.public CheckVariousStatuses
.public CheckVariousStatuses2

2
asm/include/overlay_29_0232145C.inc
View File

@ -9,7 +9,7 @@
.public BuildMoveTargetList
.public CalcStatusDuration
.public CanMonsterUseMove
.public CannotAttack
.public MonsterCannotAttack
.public DungeonRandInt
.public EndFrozenClassStatus
.public EndLeechSeedClassStatus

2
asm/include/overlay_29_0232E864.inc
View File

@ -9,7 +9,7 @@
.public CalcDamage
.public CanAttackInDirection
.public CanBeSnatched
.public CannotAttack
.public MonsterCannotAttack
.public CanSeeTarget
.public CeilFixedPoint
.public Conversion2IsActive

6
asm/itcm.s
View File

@ -4164,7 +4164,7 @@ ChooseAiMove: ; 0x01FFB658
beq _01FFBD0C
mov r0, sl
mov r1, #0
bl CannotAttack
bl MonsterCannotAttack
cmp r0, #0
bne _01FFBD0C
mov r0, sl
@ -4189,7 +4189,7 @@ _01FFB6CC:
ldrb r0, [r7, #0xd0]
cmp r0, #2
bne _01FFB700
ldr r0, _01FFBD18 ; =AI_CONFUSED_ATTACK_CHANCE
ldr r0, _01FFBD18 ; =AI_CONFUSED_NO_ATTACK_CHANCE
ldrsh r0, [r0]
bl DungeonRandOutcome__022EAB20
cmp r0, #0
@ -4632,7 +4632,7 @@ _01FFBD0C:
ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
.align 2, 0
_01FFBD14: .word DUNGEON_PTR
_01FFBD18: .word AI_CONFUSED_ATTACK_CHANCE
_01FFBD18: .word AI_CONFUSED_NO_ATTACK_CHANCE
_01FFBD1C: .word AI_REGULAR_ATTACK_WEIGHTS
arm_func_end ChooseAiMove
#endif

4
asm/overlay_29_022FE4BC.s
View File

@ -49,7 +49,7 @@ _022FEF54:
_022FEF64:
mov r0, r6
mov r1, #0
bl CannotAttack
bl MonsterCannotAttack
cmp r0, #0
beq _022FEF94
mov r0, r6
@ -684,7 +684,7 @@ _022FE528:
_022FE538:
mov r0, sb
mov r1, #0
bl CannotAttack
bl MonsterCannotAttack
cmp r0, #0
beq _022FE568
mov r0, sb

4
asm/overlay_29_022FEDBC.s
View File

@ -33,7 +33,7 @@ _022FEDC8:
beq _022FEFA4
mov r0, r7
mov r1, #1
bl CannotAttack
bl MonsterCannotAttack
cmp r0, #0
movne r0, #0xff
strneb r0, [r8, #0x177 + OV29_022FEDBC_OFFSET]
@ -193,7 +193,7 @@ _022FEFD4:
beq _022FF14C
mov r0, r8
mov r1, #1
bl CannotAttack
bl MonsterCannotAttack
cmp r0, #0
movne r0, #0xff
strneb r0, [sl, #0x178 + OV29_022FEFC8_OFFSET]

6
asm/overlay_29_02300D00.s
View File

@ -67,8 +67,8 @@ ov29_02300DC0: ; 0x02300DC0
_02300DC8: .word ov29_02300D50
arm_func_end ov29_02300DC0
arm_func_start CannotAttack
CannotAttack: ; 0x02300DCC
arm_func_start MonsterCannotAttack
MonsterCannotAttack: ; 0x02300DCC
stmdb sp!, {r3, lr}
cmp r1, #0
ldr r2, [r0, #0xb4]
@ -113,4 +113,4 @@ _02300DF4:
moveq r0, #0
and r0, r0, #0xff
ldmia sp!, {r3, pc}
arm_func_end CannotAttack
arm_func_end MonsterCannotAttack

2
asm/overlay_29_0230F9A4.s
View File

@ -1469,7 +1469,7 @@ _02310E9C:
bne _02310F70
mov r0, r5
mov r1, #0
bl CannotAttack
bl MonsterCannotAttack
cmp r0, #0
bne _02310F70
mov r0, r5

8
asm/overlay_29_0232145C.s
View File

@ -129,13 +129,13 @@ _023215D8:
bne _02321620
mov r0, sl
mov r1, #1
bl CannotAttack
bl MonsterCannotAttack
cmp r0, #0
bne _02321888
b _02321620
_02321610:
mov r1, #0
bl CannotAttack
bl MonsterCannotAttack
cmp r0, #0
bne _02321888
_02321620:
@ -1479,14 +1479,14 @@ _02322824:
bne _02322860
mov r0, r6
mov r1, #1
bl CannotAttack
bl MonsterCannotAttack
cmp r0, #0
bne _02322C98
b _02322860
_0232284C:
mov r0, r6
mov r1, #0
bl CannotAttack
bl MonsterCannotAttack
cmp r0, #0
bne _02322C98
_02322860:

2
asm/overlay_29_0232E864.s
View File

@ -191,7 +191,7 @@ _0232EAD0:
_0232EAEC:
mov r0, r4
mov r1, #0
bl CannotAttack
bl MonsterCannotAttack
cmp r0, #0
bne _0232ED9C
mov r0, sb

2
include/dungeon_parameters.h
View File

@ -1,6 +1,6 @@
#ifndef PMDSKY_DUNGEON_PARAMETERS_H
#define PMDSKY_DUNGEON_PARAMETERS_H
extern const s16 AI_CONFUSED_ATTACK_CHANCE;
extern const s16 AI_CONFUSED_NO_ATTACK_CHANCE;
#endif //PMDSKY_DUNGEON_PARAMETERS_H

6
src/dungeon_ai_itcm.c
View File

@ -14,7 +14,7 @@ const s16 AI_REGULAR_ATTACK_WEIGHTS[5] = { 100, 20, 30, 40, 50 };
extern struct dungeon *DUNGEON_PTR[];
extern bool8 AreMovesEnabled(enum fixed_room_id fixed_room_id);
extern bool8 CannotAttack(struct entity *pokemon, bool8 skip_sleep);
extern bool8 MonsterCannotAttack(struct entity *pokemon, bool8 skip_sleep);
extern u32 ShouldMonsterRunAwayVariation(struct entity *monster, u32 param_2);
extern bool8 IsMonsterCornered(struct entity *monster);
extern bool8 IsChargingTwoTurnMove(struct entity *user, struct move *move);
@ -37,11 +37,11 @@ void ChooseAiMove(struct entity *monster)
struct monster *pokemon_info = GetEntInfo(monster);
if (!AreMovesEnabled(DUNGEON_PTR[0]->gen_info.fixed_room_id) ||
CannotAttack(monster, FALSE) ||
MonsterCannotAttack(monster, FALSE) ||
ShouldMonsterRunAwayVariation(monster, TRUE) ||
GetEntInfo(monster)->monster_behavior == BEHAVIOR_FLEEING_OUTLAW && IsMonsterCornered(monster) ||
IsTacticSet(monster, TACTIC_KEEP_YOUR_DISTANCE) ||
(pokemon_info->cringe_class_status.cringe == STATUS_CRINGE_CONFUSED && DungeonRandOutcome__022EAB20(AI_CONFUSED_ATTACK_CHANCE)))
(pokemon_info->cringe_class_status.cringe == STATUS_CRINGE_CONFUSED && DungeonRandOutcome__022EAB20(AI_CONFUSED_NO_ATTACK_CHANCE)))
return;
int i;

2
src/dungeon_parameters.c
View File

@ -1,3 +1,3 @@
#include "dungeon_parameters.h"
const s16 AI_CONFUSED_ATTACK_CHANCE = 70;
const s16 AI_CONFUSED_NO_ATTACK_CHANCE = 70;