From b54c5cef55827e6522bfa719e12eb05e5d9485de Mon Sep 17 00:00:00 2001 From: Viperio19 Date: Wed, 19 Feb 2025 10:17:17 +0100 Subject: [PATCH] Rename `SetAssistantPartnerTeam` to `SetPlayerCounterpartPartnerTeam` --- res/field/scripts/scripts_jubilife_city.s | 4 ++-- res/field/scripts/scripts_veilstone_city.s | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/field/scripts/scripts_jubilife_city.s b/res/field/scripts/scripts_jubilife_city.s index cece749059..579f585674 100644 --- a/res/field/scripts/scripts_jubilife_city.s +++ b/res/field/scripts/scripts_jubilife_city.s @@ -878,7 +878,7 @@ _0AFE: ApplyMovement 7, _0E4C ApplyMovement 0xFF, _0F30 WaitMovement - Call JubilifeCity_SetAssistantPartnerTeam + Call JubilifeCity_SetPlayerCounterpartPartnerTeam StartTagBattle 0x8004, TRAINER_GALACTIC_GRUNT_JUBILIFE_CITY_1, TRAINER_GALACTIC_GRUNT_JUBILIFE_CITY_2 CheckWonBattle 0x800C GoToIfEq 0x800C, FALSE, _0DB7 @@ -904,7 +904,7 @@ _0AFE: GoToIfEq 0x800C, GENDER_FEMALE, _0C41 End -JubilifeCity_SetAssistantPartnerTeam: +JubilifeCity_SetPlayerCounterpartPartnerTeam: GetPlayerGender 0x800C GoToIfEq 0x800C, GENDER_MALE, JubilifeCity_SetDawnPartnerTeam GoToIfEq 0x800C, GENDER_FEMALE, JubilifeCity_SetLucasPartnerTeam diff --git a/res/field/scripts/scripts_veilstone_city.s b/res/field/scripts/scripts_veilstone_city.s index eec547f27d..d6115bbe7c 100644 --- a/res/field/scripts/scripts_veilstone_city.s +++ b/res/field/scripts/scripts_veilstone_city.s @@ -507,7 +507,7 @@ _0656: CallIfEq 0x800C, 3, _099F CallIfEq 0x800C, 1, _09B3 CallIfEq 0x800C, 0, _09C7 - Call VeilstoneCity_SetAssistantPartnerTeam + Call VeilstoneCity_SetPlayerCounterpartPartnerTeam StartTagBattle 0x8004, TRAINER_GALACTIC_GRUNT_VEILSTONE_CITY_1, TRAINER_GALACTIC_GRUNT_VEILSTONE_CITY_2 CheckWonBattle 0x800C GoToIfEq 0x800C, FALSE, _0A73 @@ -640,7 +640,7 @@ _08DD: WaitFadeScreen End -VeilstoneCity_SetAssistantPartnerTeam: +VeilstoneCity_SetPlayerCounterpartPartnerTeam: GetPlayerGender 0x800C GoToIfEq 0x800C, GENDER_MALE, VeilstoneCity_SetDawnPartnerTeam GoToIfEq 0x800C, GENDER_FEMALE, VeilstoneCity_SetLucasPartnerTeam