Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-03-21 17:55:13 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename ScrCmd_191 to SelectMoveTutorPokemon

Browse Source
This commit is contained in:
Metallicity 2025-07-28 03:16:18 -07:00
parent 4a3b9d2acd
commit 303ce2061e
16 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/macros/scrcmd.inc
View File

@ -2232,7 +2232,7 @@
.short \frames
.endm
.macro ScrCmd_191
.macro SelectMoveTutorPokemon
.short 401
.endm

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

@ -1271,7 +1271,7 @@ _140A:
FadeScreen 6, 1, 0, 0
WaitFadeScreen
CloseMessage
ScrCmd_191
SelectMoveTutorPokemon
GetSelectedPartySlot VAR_RESULT
ReturnToField
SetVar VAR_0x8000, VAR_RESULT

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

@ -30,7 +30,7 @@ _0049:
_0054:
FadeScreen 6, 1, 0, 0
WaitFadeScreen
ScrCmd_191
SelectMoveTutorPokemon
GetSelectedPartySlot VAR_0x8002
ReturnToField
FadeScreen 6, 1, 1, 0

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

@ -23,7 +23,7 @@ _0032:
CloseMessage
FadeScreen 6, 1, 0, 0
WaitFadeScreen
ScrCmd_191
SelectMoveTutorPokemon
GetSelectedPartySlot VAR_RESULT
ReturnToField
FadeScreen 6, 1, 1, 0

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

@ -78,7 +78,7 @@ _0121:
CloseMessage
FadeScreen 6, 1, 0, 0
WaitFadeScreen
ScrCmd_191
SelectMoveTutorPokemon
GetSelectedPartySlot VAR_MAP_LOCAL_2
ReturnToField
FadeScreen 6, 1, 1, 0

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

@ -36,7 +36,7 @@ _006A:
CloseMessage
FadeScreen 6, 1, 0, 0
WaitFadeScreen
ScrCmd_191
SelectMoveTutorPokemon
GetSelectedPartySlot VAR_0x8005
ReturnToField
FadeScreen 6, 1, 1, 0

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

@ -207,7 +207,7 @@ RotomsRoom_ChooseARotom:
FadeScreen 6, 1, 0, 0
WaitFadeScreen
CloseMessage
ScrCmd_191
SelectMoveTutorPokemon
GetSelectedPartySlot LOCALID_PARTY_SLOT
ReturnToField
FadeScreen 6, 1, 1, 0
@ -239,7 +239,7 @@ _0403:
FadeScreen 6, 1, 0, 0
WaitFadeScreen
CloseMessage
ScrCmd_191
SelectMoveTutorPokemon
GetSelectedPartySlot LOCALID_PARTY_SLOT
ReturnToField
FadeScreen 6, 1, 1, 0

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

@ -93,7 +93,7 @@ _010F:
CloseMessage
FadeScreen 6, 1, 0, 0
WaitFadeScreen
ScrCmd_191
SelectMoveTutorPokemon
GetSelectedPartySlot VAR_0x8000
ReturnToField
FadeScreen 6, 1, 1, 0

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

@ -58,7 +58,7 @@ _007E:
CloseMessage
FadeScreen 6, 1, 0, 0
WaitFadeScreen
ScrCmd_191
SelectMoveTutorPokemon
GetSelectedPartySlot VAR_0x8000
ReturnToField
FadeScreen 6, 1, 1, 0

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

@ -21,7 +21,7 @@ Route222EastHouse_Fisherman:
CloseMessage
FadeScreen 6, 1, 0, 0
WaitFadeScreen
ScrCmd_191
SelectMoveTutorPokemon
GetSelectedPartySlot VAR_0x8002
ReturnToField
FadeScreen 6, 1, 1, 0

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

@ -28,7 +28,7 @@ _0055:
CloseMessage
FadeScreen 6, 1, 0, 0
WaitFadeScreen
ScrCmd_191
SelectMoveTutorPokemon
GetSelectedPartySlot VAR_0x8000
ReturnToField
FadeScreen 6, 1, 1, 0

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

@ -62,7 +62,7 @@ _00B0:
CloseMessage
FadeScreen 6, 1, 0, 0
WaitFadeScreen
ScrCmd_191
SelectMoveTutorPokemon
GetSelectedPartySlot VAR_0x8000
ReturnToField
FadeScreen 6, 1, 1, 0

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

@ -33,7 +33,7 @@ _004C:
CloseMessage
FadeScreen 6, 1, 0, 0
WaitFadeScreen
ScrCmd_191
SelectMoveTutorPokemon
GetSelectedPartySlot VAR_0x8000
ReturnToField
FadeScreen 6, 1, 1, 0

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

@ -116,7 +116,7 @@ _01CB:
CloseMessage
FadeScreen 6, 1, 0, 0
WaitFadeScreen
ScrCmd_191
SelectMoveTutorPokemon
GetSelectedPartySlot VAR_0x8000
ReturnToField
FadeScreen 6, 1, 1, 0

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

@ -19,7 +19,7 @@ _000E:
CloseMessage
FadeScreen 6, 1, 0, 0
WaitFadeScreen
ScrCmd_191
SelectMoveTutorPokemon
GetSelectedPartySlot VAR_MAP_LOCAL_0
ReturnToField
FadeScreen 6, 1, 1, 0

6
src/scrcmd.c
View File

@ -531,7 +531,7 @@ static BOOL ScrCmd_18D(ScriptContext *ctx);
static BOOL ScrCmd_18E(ScriptContext *ctx);
static BOOL ScrCmd_WaitABPressTime(ScriptContext *ctx);
static BOOL ScriptContext_DecrementABPressTimer(ScriptContext *ctx);
static BOOL ScrCmd_191(ScriptContext *ctx);
static BOOL ScrCmd_SelectMoveTutorPokemon(ScriptContext *ctx);
static BOOL ScrCmd_GetSelectedPartySlot(ScriptContext *ctx);
static BOOL ScrCmd_2D0(ScriptContext *ctx);
static BOOL ScrCmd_2D4(ScriptContext *ctx);
@ -1171,7 +1171,7 @@ const ScrCmdFunc Unk_020EAC58[] = {
ScrCmd_18E,
ScrCmd_18F,
ScrCmd_WaitABPressTime,
ScrCmd_191,
ScrCmd_SelectMoveTutorPokemon,
ScrCmd_192,
ScrCmd_GetSelectedPartySlot,
ScrCmd_194,
@ -3427,7 +3427,7 @@ static BOOL ScrCmd_GetPartyMonForm(ScriptContext *ctx)
return FALSE;
}
static BOOL ScrCmd_191(ScriptContext *ctx)
static BOOL ScrCmd_SelectMoveTutorPokemon(ScriptContext *ctx)
{
void **v0 = FieldSystem_GetScriptMemberPtr(ctx->fieldSystem, SCRIPT_MANAGER_PARTY_MANAGEMENT_DATA);
*v0 = sub_0203D3C0(32, ctx->fieldSystem);