From 303ce2061e80afbc9fdfd96ff5c80dc4ce347a49 Mon Sep 17 00:00:00 2001 From: Metallicity Date: Mon, 28 Jul 2025 03:16:18 -0700 Subject: [PATCH] Rename ScrCmd_191 to SelectMoveTutorPokemon --- asm/macros/scrcmd.inc | 2 +- res/field/scripts/scripts_battle_tower.s | 2 +- res/field/scripts/scripts_canalave_city_east_house.s | 2 +- res/field/scripts/scripts_eterna_city_condominiums_1f.s | 2 +- res/field/scripts/scripts_jubilife_tv_2f_gallery.s | 2 +- res/field/scripts/scripts_pastoria_city_east_house.s | 2 +- res/field/scripts/scripts_rotoms_room.s | 4 ++-- res/field/scripts/scripts_route_210_grandma_wilma_house.s | 2 +- res/field/scripts/scripts_route_212_house.s | 2 +- res/field/scripts/scripts_route_222_east_house.s | 2 +- res/field/scripts/scripts_route_228_north_house.s | 2 +- res/field/scripts/scripts_snowpoint_city_east_house.s | 2 +- res/field/scripts/scripts_survival_area_north_house.s | 2 +- res/field/scripts/scripts_veilstone_city_prize_exchange.s | 2 +- res/field/scripts/scripts_veilstone_city_southwest_house.s | 2 +- src/scrcmd.c | 6 +++--- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc index f53d692e22..ebe3076d82 100644 --- a/asm/macros/scrcmd.inc +++ b/asm/macros/scrcmd.inc @@ -2232,7 +2232,7 @@ .short \frames .endm - .macro ScrCmd_191 + .macro SelectMoveTutorPokemon .short 401 .endm diff --git a/res/field/scripts/scripts_battle_tower.s b/res/field/scripts/scripts_battle_tower.s index bc586bc549..5fa2898cb3 100644 --- a/res/field/scripts/scripts_battle_tower.s +++ b/res/field/scripts/scripts_battle_tower.s @@ -1271,7 +1271,7 @@ _140A: FadeScreen 6, 1, 0, 0 WaitFadeScreen CloseMessage - ScrCmd_191 + SelectMoveTutorPokemon GetSelectedPartySlot VAR_RESULT ReturnToField SetVar VAR_0x8000, VAR_RESULT diff --git a/res/field/scripts/scripts_canalave_city_east_house.s b/res/field/scripts/scripts_canalave_city_east_house.s index f122d40de3..8cff36e0d7 100644 --- a/res/field/scripts/scripts_canalave_city_east_house.s +++ b/res/field/scripts/scripts_canalave_city_east_house.s @@ -30,7 +30,7 @@ _0049: _0054: FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_191 + SelectMoveTutorPokemon GetSelectedPartySlot VAR_0x8002 ReturnToField FadeScreen 6, 1, 1, 0 diff --git a/res/field/scripts/scripts_eterna_city_condominiums_1f.s b/res/field/scripts/scripts_eterna_city_condominiums_1f.s index cdb656037b..ed20ba04bf 100644 --- a/res/field/scripts/scripts_eterna_city_condominiums_1f.s +++ b/res/field/scripts/scripts_eterna_city_condominiums_1f.s @@ -23,7 +23,7 @@ _0032: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_191 + SelectMoveTutorPokemon GetSelectedPartySlot VAR_RESULT ReturnToField FadeScreen 6, 1, 1, 0 diff --git a/res/field/scripts/scripts_jubilife_tv_2f_gallery.s b/res/field/scripts/scripts_jubilife_tv_2f_gallery.s index 36876c80b5..b04841b5ad 100644 --- a/res/field/scripts/scripts_jubilife_tv_2f_gallery.s +++ b/res/field/scripts/scripts_jubilife_tv_2f_gallery.s @@ -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 diff --git a/res/field/scripts/scripts_pastoria_city_east_house.s b/res/field/scripts/scripts_pastoria_city_east_house.s index 2a5d73487f..b81e3bb619 100644 --- a/res/field/scripts/scripts_pastoria_city_east_house.s +++ b/res/field/scripts/scripts_pastoria_city_east_house.s @@ -36,7 +36,7 @@ _006A: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_191 + SelectMoveTutorPokemon GetSelectedPartySlot VAR_0x8005 ReturnToField FadeScreen 6, 1, 1, 0 diff --git a/res/field/scripts/scripts_rotoms_room.s b/res/field/scripts/scripts_rotoms_room.s index fcc79f82fc..43de3d0ccd 100644 --- a/res/field/scripts/scripts_rotoms_room.s +++ b/res/field/scripts/scripts_rotoms_room.s @@ -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 diff --git a/res/field/scripts/scripts_route_210_grandma_wilma_house.s b/res/field/scripts/scripts_route_210_grandma_wilma_house.s index eaf65f5c36..927bc41f59 100644 --- a/res/field/scripts/scripts_route_210_grandma_wilma_house.s +++ b/res/field/scripts/scripts_route_210_grandma_wilma_house.s @@ -93,7 +93,7 @@ _010F: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_191 + SelectMoveTutorPokemon GetSelectedPartySlot VAR_0x8000 ReturnToField FadeScreen 6, 1, 1, 0 diff --git a/res/field/scripts/scripts_route_212_house.s b/res/field/scripts/scripts_route_212_house.s index 2ef2706018..a97c9d499d 100644 --- a/res/field/scripts/scripts_route_212_house.s +++ b/res/field/scripts/scripts_route_212_house.s @@ -58,7 +58,7 @@ _007E: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_191 + SelectMoveTutorPokemon GetSelectedPartySlot VAR_0x8000 ReturnToField FadeScreen 6, 1, 1, 0 diff --git a/res/field/scripts/scripts_route_222_east_house.s b/res/field/scripts/scripts_route_222_east_house.s index f0809f47d8..b8e276a17a 100644 --- a/res/field/scripts/scripts_route_222_east_house.s +++ b/res/field/scripts/scripts_route_222_east_house.s @@ -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 diff --git a/res/field/scripts/scripts_route_228_north_house.s b/res/field/scripts/scripts_route_228_north_house.s index a60a4ad630..c0ddfcf17e 100644 --- a/res/field/scripts/scripts_route_228_north_house.s +++ b/res/field/scripts/scripts_route_228_north_house.s @@ -28,7 +28,7 @@ _0055: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_191 + SelectMoveTutorPokemon GetSelectedPartySlot VAR_0x8000 ReturnToField FadeScreen 6, 1, 1, 0 diff --git a/res/field/scripts/scripts_snowpoint_city_east_house.s b/res/field/scripts/scripts_snowpoint_city_east_house.s index 0a0b0eedc4..2d68ea08af 100644 --- a/res/field/scripts/scripts_snowpoint_city_east_house.s +++ b/res/field/scripts/scripts_snowpoint_city_east_house.s @@ -62,7 +62,7 @@ _00B0: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_191 + SelectMoveTutorPokemon GetSelectedPartySlot VAR_0x8000 ReturnToField FadeScreen 6, 1, 1, 0 diff --git a/res/field/scripts/scripts_survival_area_north_house.s b/res/field/scripts/scripts_survival_area_north_house.s index aac6b9486d..b789a05204 100644 --- a/res/field/scripts/scripts_survival_area_north_house.s +++ b/res/field/scripts/scripts_survival_area_north_house.s @@ -33,7 +33,7 @@ _004C: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_191 + SelectMoveTutorPokemon GetSelectedPartySlot VAR_0x8000 ReturnToField FadeScreen 6, 1, 1, 0 diff --git a/res/field/scripts/scripts_veilstone_city_prize_exchange.s b/res/field/scripts/scripts_veilstone_city_prize_exchange.s index 2951c01186..ca01851117 100644 --- a/res/field/scripts/scripts_veilstone_city_prize_exchange.s +++ b/res/field/scripts/scripts_veilstone_city_prize_exchange.s @@ -116,7 +116,7 @@ _01CB: CloseMessage FadeScreen 6, 1, 0, 0 WaitFadeScreen - ScrCmd_191 + SelectMoveTutorPokemon GetSelectedPartySlot VAR_0x8000 ReturnToField FadeScreen 6, 1, 1, 0 diff --git a/res/field/scripts/scripts_veilstone_city_southwest_house.s b/res/field/scripts/scripts_veilstone_city_southwest_house.s index 21b4fedcc5..a9d1774025 100644 --- a/res/field/scripts/scripts_veilstone_city_southwest_house.s +++ b/res/field/scripts/scripts_veilstone_city_southwest_house.s @@ -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 diff --git a/src/scrcmd.c b/src/scrcmd.c index c1d93d30f9..0cdb60a470 100644 --- a/src/scrcmd.c +++ b/src/scrcmd.c @@ -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);