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

Rename IsLoneOutlaw

Browse Source
This commit is contained in:
AnonymousRandomPerson 2025-10-26 20:46:17 -04:00
parent 8b5b6f84c8
commit 6f48242b8c
17 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/include/overlay_29_022F7768.inc
View File

@ -29,7 +29,7 @@
.public GetTileSafe
.public IQ_SKILLS
.public IsLevelResetDungeon
.public IsLoneOutlaw
.public IsBehaviorLoneOutlaw
.public IsMonsterIdInNormalRange
.public IsOutlawOrChallengeRequestFloor
.public IsRecruitingAllowed

2
asm/include/overlay_29_022FC9C0.inc
View File

@ -48,7 +48,7 @@
.public IsDestinationFloorWithHiddenOutlaw
.public IsDestinationFloorWithMonster
.public IsInvalidSpawnTile
.public IsLoneOutlaw
.public IsBehaviorLoneOutlaw
.public IsOutlawMonsterHouseFloor
.public IsSecretBazaarNpcBehavior
.public IsSpecialStoryAllyOrClient

2
asm/include/overlay_29_02301FBC.inc
View File

@ -8,6 +8,6 @@
.public GetPerformanceFlagWithChecks
.public GetSpeciesIqSkill
.public IqSkillFlagTest
.public IsLoneOutlawVeneer
.public IsMonsterLoneOutlaw
.public MIN_IQ_EXCLUSIVE_MOVE_USER
.public MIN_IQ_ITEM_MASTER

2
asm/include/overlay_29_02308FE0.inc
View File

@ -31,7 +31,7 @@
.public IsBlinded
.public IsCurrentMissionType
.public IsExperienceLocked
.public IsLoneOutlawVeneer
.public IsMonsterLoneOutlaw
.public IsMonsterIdInNormalRangeVeneer
.public IsSecretBazaarNpcBehavior
.public IsSpecialStoryAlly

2
asm/include/overlay_29_0232C524.inc
View File

@ -55,7 +55,7 @@
.public IsChargingTwoTurnMove
.public IsCurrentFixedRoomBossFight
.public IsFullFloorFixedRoom
.public IsLoneOutlawVeneer
.public IsMonsterLoneOutlaw
.public IsSecretBazaarNpc
.public LAST_RESORT_DAMAGE_MULT_TABLE
.public LogMessageByIdWithPopupCheckUser

2
asm/include/overlay_29_0233861C.inc
View File

@ -32,7 +32,7 @@
.public IsExperienceLocked
.public IsGoldenChamber
.public IsHiddenStairsFloor
.public IsLoneOutlaw
.public IsBehaviorLoneOutlaw
.public IsOutlawMonsterHouseFloor
.public IsSecretBazaar
.public LoadFixedRoomData

2
asm/overlay_29_022F7768.s
View File

@ -1115,7 +1115,7 @@ _022F83B4:
cmpne sb, r0
beq _022F83F4
ldrb r0, [r7, #0xbc]
bl IsLoneOutlaw
bl IsBehaviorLoneOutlaw
cmp r0, #0
beq _022F83F4
mov r0, #1

4
asm/overlay_29_022FC9C0.s
View File

@ -553,7 +553,7 @@ SpawnMonster: ; 0x022FD084
strh r1, [r5, #0xe]
bl ov29_023021F0
ldrb r0, [r7, #2]
bl IsLoneOutlaw
bl IsBehaviorLoneOutlaw
cmp r0, #0
beq _022FD154
mov r0, #9
@ -616,7 +616,7 @@ _022FD1E8:
strb r0, [r5, #8]
_022FD1F0:
ldrb r0, [r7, #2]
bl IsLoneOutlaw
bl IsBehaviorLoneOutlaw
cmp r0, #0
beq _022FD224
ldr r0, _022FD30C ; =ov10_022C45A4

2
asm/overlay_29_02301FBC.s
View File

@ -54,7 +54,7 @@ _02302034:
bl DisableIqSkill
_02302068:
mov r0, r4
bl IsLoneOutlawVeneer
bl IsMonsterLoneOutlaw
cmp r0, #0
bne _0230208C
ldr r0, _023021EC ; =MIN_IQ_ITEM_MASTER

4
asm/overlay_29_02308FE0.s
View File

@ -2679,7 +2679,7 @@ _0230B04C:
cmp r0, #0
beq _0230B0B4
mov r0, r7
bl IsLoneOutlawVeneer
bl IsMonsterLoneOutlaw
cmp r0, #0
beq _0230B0B4
ldrb r0, [r7, #0x62]
@ -3283,7 +3283,7 @@ _0230A5E0:
cmp r0, #0
beq _0230A648
mov r0, r4
bl IsLoneOutlawVeneer
bl IsMonsterLoneOutlaw
cmp r0, #0
beq _0230A648
ldrb r0, [r4, #0x62]

2
asm/overlay_29_0232C524.s
View File

@ -326,7 +326,7 @@ _0232C8E4:
cmp r0, #0
beq _0232C96C
mov r0, r7
bl IsLoneOutlawVeneer
bl IsMonsterLoneOutlaw
cmp r0, #0
bne _0232C96C
ldrb r0, [r7, #6]

2
asm/overlay_29_0233861C.s
View File

@ -1185,7 +1185,7 @@ _023393DC:
cmp r0, #2
moveq r0, r5
beq _02339410
bl IsLoneOutlaw
bl IsBehaviorLoneOutlaw
_02339410:
cmp r0, #0
movne r5, #0xc

2
include/dungeon_logic_6.h
View File

@ -4,7 +4,7 @@
#include "dungeon_mode.h"
#include "util.h"
bool8 IsLoneOutlaw(enum monster_behavior behavior);
bool8 IsBehaviorLoneOutlaw(enum monster_behavior behavior);
// Checks if a behavior ID corresponds to one of the Secret Bazaar NPCs.
bool8 IsSecretBazaarNpcBehavior(enum monster_behavior behavior);

2
include/dungeon_logic_7.h
View File

@ -4,7 +4,7 @@
#include "dungeon_mode.h"
#include "util.h"
bool8 IsLoneOutlawVeneer(struct monster* monster_info);
bool8 IsMonsterLoneOutlaw(struct monster* monster_info);
bool8 IsSecretBazaarNpc(struct entity *entity);
#endif //PMDSKY_DUNGEON_LOGIC_7_H

2
src/dungeon_logic_6.c
View File

@ -3,7 +3,7 @@
#include "dungeon_mode.h"
#include "util.h"
bool8 IsLoneOutlaw(enum monster_behavior behavior)
bool8 IsBehaviorLoneOutlaw(enum monster_behavior behavior)
{
bool8 result;

4
src/dungeon_logic_7.c
View File

@ -4,9 +4,9 @@
#include "dungeon_util_static.h"
#include "util.h"
bool8 IsLoneOutlawVeneer(struct monster* monster_info)
bool8 IsMonsterLoneOutlaw(struct monster* monster_info)
{
return IsLoneOutlaw(monster_info->monster_behavior);
return IsBehaviorLoneOutlaw(monster_info->monster_behavior);
}
bool8 IsSecretBazaarNpc(struct entity *entity)

2
src/dungeon_recruitment.c
View File

@ -121,7 +121,7 @@ bool8 RecruitCheck(struct entity* leader, struct entity* target)
return FALSE;
}
if (IsLoneOutlawVeneer(target_monster_info))
if (IsMonsterLoneOutlaw(target_monster_info))
return FALSE;
if (!SpecificRecruitCheck(target_monster_info->id))