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

Rename Duplicate_IncrementTrainerScore to IncrementTrainerScore2

Browse Source
This commit is contained in:
Metallicity 2025-08-12 19:18:02 -07:00
parent 7264e383a2
commit daf91bd0f0
14 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/macros/scrcmd.inc
View File

@ -3462,7 +3462,7 @@
.short 607
.endm
.macro Duplicate_IncrementTrainerScore scoreID
.macro IncrementTrainerScore2 scoreID
.short 608
.short \scoreID
.endm

2
res/field/scripts/scripts_canalave_city_gym.s
View File

@ -30,7 +30,7 @@ _0016:
PlaySound SEQ_BADGE
WaitSound
GiveBadge BADGE_ID_MINE
Duplicate_IncrementTrainerScore TRAINER_SCORE_EVENT_BADGE_EARNED
IncrementTrainerScore2 TRAINER_SCORE_EVENT_BADGE_EARNED
SetTrainerFlag TRAINER_BLACK_BELT_DAVID
SetTrainerFlag TRAINER_WORKER_JACKSON
SetTrainerFlag TRAINER_WORKER_GARY

2
res/field/scripts/scripts_common.s
View File

@ -498,7 +498,7 @@ _06BB:
_06D5:
RemoveItem ITEM_HONEY, 1, VAR_RESULT
Duplicate_IncrementTrainerScore TRAINER_SCORE_EVENT_HONEY_USED
IncrementTrainerScore2 TRAINER_SCORE_EVENT_HONEY_USED
SlatherHoneyTree
WaitTime 10, VAR_RESULT
Message 51

2
res/field/scripts/scripts_eterna_city_gym.s
View File

@ -76,7 +76,7 @@ _0094:
PlaySound SEQ_BADGE
WaitSound
GiveBadge BADGE_ID_FOREST
Duplicate_IncrementTrainerScore TRAINER_SCORE_EVENT_BADGE_EARNED
IncrementTrainerScore2 TRAINER_SCORE_EVENT_BADGE_EARNED
SetTrainerFlag TRAINER_AROMA_LADY_JENNA
SetTrainerFlag TRAINER_AROMA_LADY_ANGELA
SetTrainerFlag TRAINER_LASS_CAROLINE

4
res/field/scripts/scripts_grand_lake_valor_lakefront_west_house.s
View File

@ -66,11 +66,11 @@ _00D3:
End
_00DE:
Duplicate_IncrementTrainerScore TRAINER_SCORE_EVENT_LOCAL_DEX_DIPLOMA_RECEIVED
IncrementTrainerScore2 TRAINER_SCORE_EVENT_LOCAL_DEX_DIPLOMA_RECEIVED
Return
_00E4:
Duplicate_IncrementTrainerScore TRAINER_SCORE_EVENT_NATIONAL_DEX_DIPLOMA_RECEIVED
IncrementTrainerScore2 TRAINER_SCORE_EVENT_NATIONAL_DEX_DIPLOMA_RECEIVED
Return
.balign 4, 0

2
res/field/scripts/scripts_hearthome_city_dp_gym_leader_room.s
View File

@ -54,7 +54,7 @@ _0096:
PlaySound SEQ_BADGE
WaitSound
GiveBadge BADGE_ID_RELIC
Duplicate_IncrementTrainerScore TRAINER_SCORE_EVENT_BADGE_EARNED
IncrementTrainerScore2 TRAINER_SCORE_EVENT_BADGE_EARNED
SetTrainerFlag TRAINER_CAMPER_DREW
SetTrainerFlag TRAINER_ACE_TRAINER_ALLEN
SetTrainerFlag TRAINER_ACE_TRAINER_CATHERINE

2
res/field/scripts/scripts_hearthome_city_gym_leader_room.s
View File

@ -69,7 +69,7 @@ _00BB:
PlaySound SEQ_BADGE
WaitSound
GiveBadge BADGE_ID_RELIC
Duplicate_IncrementTrainerScore TRAINER_SCORE_EVENT_BADGE_EARNED
IncrementTrainerScore2 TRAINER_SCORE_EVENT_BADGE_EARNED
SetTrainerFlag TRAINER_CAMPER_DREW
SetTrainerFlag TRAINER_ACE_TRAINER_ALLEN
SetTrainerFlag TRAINER_ACE_TRAINER_CATHERINE

2
res/field/scripts/scripts_oreburgh_city_gym.s
View File

@ -27,7 +27,7 @@ _000E:
SetTrainerFlag TRAINER_YOUNGSTER_JONATHON
SetTrainerFlag TRAINER_YOUNGSTER_DARIUS
GiveBadge BADGE_ID_COAL
Duplicate_IncrementTrainerScore TRAINER_SCORE_EVENT_BADGE_EARNED
IncrementTrainerScore2 TRAINER_SCORE_EVENT_BADGE_EARNED
SetTrainerFlag TRAINER_YOUNGSTER_JONATHON
SetTrainerFlag TRAINER_YOUNGSTER_DARIUS
SetFlag FLAG_UNK_0x023F

2
res/field/scripts/scripts_pastoria_city_gym.s
View File

@ -57,7 +57,7 @@ _0076:
PlaySound SEQ_BADGE
WaitSound
GiveBadge BADGE_ID_FEN
Duplicate_IncrementTrainerScore TRAINER_SCORE_EVENT_BADGE_EARNED
IncrementTrainerScore2 TRAINER_SCORE_EVENT_BADGE_EARNED
SetTrainerFlag TRAINER_FISHERMAN_ERICK
SetTrainerFlag TRAINER_SAILOR_DAMIAN
SetTrainerFlag TRAINER_FISHERMAN_WALTER

2
res/field/scripts/scripts_pokemon_league_hall_of_fame.s
View File

@ -51,7 +51,7 @@ _008C:
ScrCmd_25A VAR_RESULT
FadeScreen 6, 3, 0, 0
WaitFadeScreen
Duplicate_IncrementTrainerScore TRAINER_SCORE_EVENT_HALL_OF_FAME_ENTRY
IncrementTrainerScore2 TRAINER_SCORE_EVENT_HALL_OF_FAME_ENTRY
Call _0174
ScrCmd_0B0
ReturnToField

2
res/field/scripts/scripts_snowpoint_city_gym.s
View File

@ -34,7 +34,7 @@ _0025:
PlaySound SEQ_BADGE
WaitSound
GiveBadge BADGE_ID_ICICLE
Duplicate_IncrementTrainerScore TRAINER_SCORE_EVENT_BADGE_EARNED
IncrementTrainerScore2 TRAINER_SCORE_EVENT_BADGE_EARNED
SetTrainerFlag TRAINER_ACE_TRAINER_SERGIO
SetTrainerFlag TRAINER_ACE_TRAINER_ISAIAH
SetTrainerFlag TRAINER_ACE_TRAINER_ANTON

2
res/field/scripts/scripts_sunyshore_city_gym_room_3.s
View File

@ -39,7 +39,7 @@ _0027:
PlaySound SEQ_BADGE
WaitSound
GiveBadge BADGE_ID_BEACON
Duplicate_IncrementTrainerScore TRAINER_SCORE_EVENT_BADGE_EARNED
IncrementTrainerScore2 TRAINER_SCORE_EVENT_BADGE_EARNED
SetTrainerFlag TRAINER_ACE_TRAINER_ZACHERY
SetTrainerFlag TRAINER_ACE_TRAINER_DESTINY
SetTrainerFlag TRAINER_GUITARIST_JERRY

2
res/field/scripts/scripts_veilstone_city_gym.s
View File

@ -33,7 +33,7 @@ _0022:
PlaySound SEQ_BADGE
WaitSound
GiveBadge BADGE_ID_COBBLE
Duplicate_IncrementTrainerScore TRAINER_SCORE_EVENT_BADGE_EARNED
IncrementTrainerScore2 TRAINER_SCORE_EVENT_BADGE_EARNED
SetTrainerFlag TRAINER_BLACK_BELT_COLBY
SetTrainerFlag TRAINER_BLACK_BELT_DARREN
SetTrainerFlag TRAINER_BLACK_BELT_RAFAEL

12
src/scrcmd.c
View File

@ -641,7 +641,7 @@ static BOOL ScrCmd_TriggerPlatformLift(ScriptContext *ctx);
static BOOL ScrCmd_CheckPlatformLiftNotUsedWhenEnteredMap(ScriptContext *ctx);
static BOOL ScrCmd_25E(ScriptContext *ctx);
static BOOL ScrCmd_25F(ScriptContext *ctx);
static BOOL ScrCmd_Duplicate_IncrementTrainerScore(ScriptContext *ctx);
static BOOL ScrCmd_IncrementTrainerScore2(ScriptContext *ctx);
static BOOL ScrCmd_CheckPartyHasSpecies2(ScriptContext *ctx);
static BOOL ScrCmd_ChangeDeoxysForm(ScriptContext *ctx);
static BOOL ScrCmd_CheckPartyCombeeGenderCount(ScriptContext *ctx);
@ -1378,7 +1378,7 @@ const ScrCmdFunc Unk_020EAC58[] = {
ScrCmd_CheckPlatformLiftNotUsedWhenEnteredMap,
ScrCmd_25E,
ScrCmd_25F,
ScrCmd_Duplicate_IncrementTrainerScore,
ScrCmd_IncrementTrainerScore2,
ScrCmd_BufferAccessoryName,
ScrCmd_CheckPartyHasSpecies2,
ScrCmd_ChangeDeoxysForm,
@ -1959,7 +1959,7 @@ static BOOL ScrCmd_CheckFlagFromVar(ScriptContext *ctx)
u16 *flagID = ScriptContext_GetVarPointer(ctx);
u16 *destVar = ScriptContext_GetVarPointer(ctx);
*destVar = FieldSystem_CheckFlag(fieldSystem, (*flagID));
*destVar = FieldSystem_CheckFlag(fieldSystem, *flagID);
return FALSE;
}
@ -4569,10 +4569,10 @@ static BOOL ScrCmd_SetPlayerBike(ScriptContext *ctx)
if (rideBike == TRUE) {
Sound_SetSpecialBGM(ctx->fieldSystem, SEQ_BICYCLE);
Sound_TryFadeOutToBGM(ctx->fieldSystem, SEQ_BICYCLE, 1);
PlayerAvatar_SetRequestStateBit(ctx->fieldSystem->playerAvatar, (1 << 1));
PlayerAvatar_SetRequestStateBit(ctx->fieldSystem->playerAvatar, 1 << 1);
PlayerAvatar_RequestChangeState(ctx->fieldSystem->playerAvatar);
} else {
PlayerAvatar_SetRequestStateBit(ctx->fieldSystem->playerAvatar, (1 << 0));
PlayerAvatar_SetRequestStateBit(ctx->fieldSystem->playerAvatar, 1 << 0);
PlayerAvatar_RequestChangeState(ctx->fieldSystem->playerAvatar);
Sound_SetSpecialBGM(ctx->fieldSystem, SEQ_NONE);
Sound_TryFadeOutToBGM(ctx->fieldSystem, Sound_GetOverrideBGM(ctx->fieldSystem, ctx->fieldSystem->location->mapId), 1);
@ -6584,7 +6584,7 @@ static BOOL ScrCmd_25F(ScriptContext *ctx)
return TRUE;
}
static BOOL ScrCmd_Duplicate_IncrementTrainerScore(ScriptContext *ctx)
static BOOL ScrCmd_IncrementTrainerScore2(ScriptContext *ctx)
{
u16 scoreID = ScriptContext_ReadHalfWord(ctx);