From 953f8d2e7a04846e5ce7a63c06b06476b6c5610e Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Sat, 16 Jan 2021 14:20:28 -0600 Subject: Rename move_wram_npc to move_challenge_hall_npc --- src/macros/scripts.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/macros/scripts.asm') diff --git a/src/macros/scripts.asm b/src/macros/scripts.asm index 25c2ae1..828d5d4 100644 --- a/src/macros/scripts.asm +++ b/src/macros/scripts.asm @@ -52,7 +52,7 @@ ENDM const ScriptCommand_LoadActiveNPCNameIntoTxRamSlot_index ; $2c const ScriptCommand_StartChallengeHallDuel_index ; $2d const ScriptCommand_PrintTextForChallengeCup_index ; $2e - const ScriptCommand_MoveWramNPC_index ; $2f + const ScriptCommand_MoveChallengeHallNPC_index ; $2f const ScriptCommand_UnloadChallengeHallNPC_index ; $30 const ScriptCommand_SetChallengeHallNPCCoords_index ; $31 const ScriptCommand_PickChallengeHallOpponent_index ; $32 @@ -421,9 +421,9 @@ print_text_for_challenge_cup: MACRO tx \3 ; Text Pointer for Challenge Cup #3 ENDM -; Moves the NPC in wTempNPC using an NPCMovement -move_wram_npc: MACRO - run_command ScriptCommand_MoveWramNPC +; Moves the Challenge Hall opponent NPC using an NPCMovement +move_challenge_hall_npc: MACRO + run_command ScriptCommand_MoveChallengeHallNPC dw \1 ; NPCMovement (ex NPCMovement_d880) ENDM -- cgit v1.2.3