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

change label names

Browse Source
This commit is contained in:
DizzyEggg 2025-11-14 09:16:04 +01:00
parent 8a442d9ad4
commit 57594cd6ec
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/include/overlay_29_02313CE4.inc
View File

@ -16,8 +16,8 @@
.public ItemIsActive__02311BF8
.public LogMessageByIdWithPopupCheckUserTarget
.public MultiplyByFixedPoint
.public gCringeTurnRange
.public gParalysisTurnRange
.public CRINGE_TURN_RANGE
.public PARALYSIS_TURN_RANGE
.public PlayParalysisEffect
.public ov29_022E4338
.public PlayOffensiveStatMultiplierUpEffect

2
asm/include/overlay_29_02314810.inc
View File

@ -15,7 +15,7 @@
.public LowerSpeed
.public LogMessageByIdWithPopupCheckUserTarget
.public ov10_022C4618
.public gSpeedLowerTurnRange
.public SPEED_LOWER_TURN_RANGE
.public ov10_022C4890
.public ov29_022E41CC
.public PlaySpeedUpEffect

12
asm/overlay_10_rodata_022C464C.s
View File

@ -428,20 +428,20 @@ ov10_022C487C:
.global ov10_022C4880
ov10_022C4880:
.byte 0x7F, 0x00, 0x7F, 0x00
.global gCringeTurnRange
gCringeTurnRange:
.global CRINGE_TURN_RANGE
CRINGE_TURN_RANGE:
.byte 0x01, 0x00, 0x01, 0x00
.global SPEED_BOOST_TURN_RANGE
SPEED_BOOST_TURN_RANGE:
.byte 0x08, 0x00, 0x0A, 0x00
.global gSpeedLowerTurnRange
gSpeedLowerTurnRange:
.global SPEED_LOWER_TURN_RANGE
SPEED_LOWER_TURN_RANGE:
.byte 0x06, 0x00, 0x08, 0x00
.global ov10_022C4890
ov10_022C4890:
.byte 0x06, 0x00, 0x0C, 0x00
.global gParalysisTurnRange
gParalysisTurnRange:
.global PARALYSIS_TURN_RANGE
PARALYSIS_TURN_RANGE:
.byte 0x01, 0x00, 0x02, 0x00
.global ov10_022C4898
ov10_022C4898:

12
src/move_orb_effects_1.c
View File

@ -44,9 +44,9 @@ extern void PrepareItemForPrinting__02345728(u8, struct item*);
extern int CalcSpeedStageWrapper(struct entity* entity);
extern int CalcSpeedStage(struct entity *, int);
extern const s16 gCringeTurnRange[];
extern const s16 gParalysisTurnRange[];
extern const s16 gSpeedLowerTurnRange[];
extern const s16 CRINGE_TURN_RANGE[];
extern const s16 PARALYSIS_TURN_RANGE[];
extern const s16 SPEED_LOWER_TURN_RANGE[];
extern const s16 SPEED_BOOST_TURN_RANGE[];
extern const u16 ov29_02353318[];
@ -591,7 +591,7 @@ bool8 TryInflictCringeStatus(struct entity *user ,struct entity *target, bool8 d
SubstitutePlaceholderStringTags(0,target,0);
if (entityInfo->cringe_class_status.cringe != STATUS_CRINGE_CRINGE) {
entityInfo->cringe_class_status.cringe = STATUS_CRINGE_CRINGE;
entityInfo->cringe_class_status.cringe_turns = CalcStatusDuration(target, gCringeTurnRange, TRUE) + 1;
entityInfo->cringe_class_status.cringe_turns = CalcStatusDuration(target, CRINGE_TURN_RANGE, TRUE) + 1;
PlayCringeExclamationPointEffect(target);
LogMessageByIdWithPopupCheckUserTarget(user,target,0xd02 + JPN_MSG_OFFSET);
TryActivateSteadfast(user, target);
@ -649,7 +649,7 @@ bool8 TryInflictParalysisStatus(struct entity *user, struct entity *target, bool
SubstitutePlaceholderStringTags(0,target,0);
if (entityInfo->burn_class_status.burn != STATUS_BURN_PARALYSIS) {
entityInfo->burn_class_status.burn = STATUS_BURN_PARALYSIS;
entityInfo->burn_class_status.burn_turns = CalcStatusDuration(target,gParalysisTurnRange,TRUE) + 1;
entityInfo->burn_class_status.burn_turns = CalcStatusDuration(target,PARALYSIS_TURN_RANGE,TRUE) + 1;
entityInfo->burn_class_status.burn_damage_countdown = 0;
entityInfo->burn_class_status.badly_poisoned_damage_count = 0;
alreadyParalyzed = FALSE;
@ -771,7 +771,7 @@ void LowerSpeed(struct entity *user, struct entity *target, s32 nStages, bool8 d
for (counter = 0; counter < nStages; counter++) {
for (i = 0; i < NUM_SPEED_COUNTERS; i++) {
if (entityInfo->speed_down_counters[i] == 0) {
entityInfo->speed_down_counters[i] = CalcStatusDuration(target,gSpeedLowerTurnRange,TRUE) + 1;
entityInfo->speed_down_counters[i] = CalcStatusDuration(target,SPEED_LOWER_TURN_RANGE,TRUE) + 1;
break;
}
}