From 7d1cd4d2a2e6b8f439ba18bb3e39844b1a4e03e9 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Sat, 3 Sep 2022 18:26:42 +0000 Subject: [PATCH] Merge pull request #543 from Jaizu/common_movement_naming --- pokefirered.sym | 34 +++++++++++++++++----------------- pokefirered_rev1.sym | 34 +++++++++++++++++----------------- pokeleafgreen.sym | 34 +++++++++++++++++----------------- pokeleafgreen_rev1.sym | 34 +++++++++++++++++----------------- 4 files changed, 68 insertions(+), 68 deletions(-) diff --git a/pokefirered.sym b/pokefirered.sym index cb8c0e3a6..b4c345bde 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -20253,23 +20253,23 @@ 081a759c g 00000000 PokemonLeague_EventScript_CloseEntry 081a75d3 g 00000000 PokemonLeague_Movement_ForcePlayerIn 081a75d5 g 00000000 PokemonLeague_EventScript_DoLightingEffect -081a75d9 g 00000000 Movement_QuestionMark -081a75db g 00000000 Movement_ExclamationMark -081a75dd g 00000000 Movement_Delay48 -081a75e1 g 00000000 Movement_FacePlayer -081a75e3 g 00000000 Movement_FaceAwayPlayer -081a75e5 g 00000000 Movement_FaceOriginalDirection -081a75e7 g 00000000 Movement_WalkInPlaceFasterLeft -081a75e9 g 00000000 Movement_WalkInPlaceFasterUp -081a75eb g 00000000 Movement_WalkInPlaceFasterRight -081a75ed g 00000000 Movement_WalkInPlaceFasterDown -081a75ef g 00000000 Movement_FaceRight -081a75f1 g 00000000 Movement_FaceDown -081a75f3 g 00000000 Movement_WalkUp5 -081a75f9 g 00000000 Movement_WalkUp4 -081a75fe g 00000000 Movement_Delay32 -081a7601 g 00000000 Movement_WalkUp -081a7603 g 00000000 Movement_WalkUp2 +081a75d9 g 00000000 Common_Movement_QuestionMark +081a75db g 00000000 Common_Movement_ExclamationMark +081a75dd g 00000000 Common_Movement_Delay48 +081a75e1 g 00000000 Common_Movement_FacePlayer +081a75e3 g 00000000 Common_Movement_FaceAwayPlayer +081a75e5 g 00000000 Common_Movement_FaceOriginalDirection +081a75e7 g 00000000 Common_Movement_WalkInPlaceFasterLeft +081a75e9 g 00000000 Common_Movement_WalkInPlaceFasterUp +081a75eb g 00000000 Common_Movement_WalkInPlaceFasterRight +081a75ed g 00000000 Common_Movement_WalkInPlaceFasterDown +081a75ef g 00000000 Common_Movement_FaceRight +081a75f1 g 00000000 Common_Movement_FaceDown +081a75f3 g 00000000 Common_Movement_WalkUp5 +081a75f9 g 00000000 Common_Movement_WalkUp4 +081a75fe g 00000000 Common_Movement_Delay32 +081a7601 g 00000000 Common_Movement_WalkUp +081a7603 g 00000000 Common_Movement_WalkUp2 081a7606 g 00000000 EventScript_Bookshelf 081a760f g 00000000 EventScript_PokeMartShelf 081a7618 g 00000000 EventScript_Food diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index a00b2852b..75635ee59 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -20254,23 +20254,23 @@ 081a7614 g 00000000 PokemonLeague_EventScript_CloseEntry 081a764b g 00000000 PokemonLeague_Movement_ForcePlayerIn 081a764d g 00000000 PokemonLeague_EventScript_DoLightingEffect -081a7651 g 00000000 Movement_QuestionMark -081a7653 g 00000000 Movement_ExclamationMark -081a7655 g 00000000 Movement_Delay48 -081a7659 g 00000000 Movement_FacePlayer -081a765b g 00000000 Movement_FaceAwayPlayer -081a765d g 00000000 Movement_FaceOriginalDirection -081a765f g 00000000 Movement_WalkInPlaceFasterLeft -081a7661 g 00000000 Movement_WalkInPlaceFasterUp -081a7663 g 00000000 Movement_WalkInPlaceFasterRight -081a7665 g 00000000 Movement_WalkInPlaceFasterDown -081a7667 g 00000000 Movement_FaceRight -081a7669 g 00000000 Movement_FaceDown -081a766b g 00000000 Movement_WalkUp5 -081a7671 g 00000000 Movement_WalkUp4 -081a7676 g 00000000 Movement_Delay32 -081a7679 g 00000000 Movement_WalkUp -081a767b g 00000000 Movement_WalkUp2 +081a7651 g 00000000 Common_Movement_QuestionMark +081a7653 g 00000000 Common_Movement_ExclamationMark +081a7655 g 00000000 Common_Movement_Delay48 +081a7659 g 00000000 Common_Movement_FacePlayer +081a765b g 00000000 Common_Movement_FaceAwayPlayer +081a765d g 00000000 Common_Movement_FaceOriginalDirection +081a765f g 00000000 Common_Movement_WalkInPlaceFasterLeft +081a7661 g 00000000 Common_Movement_WalkInPlaceFasterUp +081a7663 g 00000000 Common_Movement_WalkInPlaceFasterRight +081a7665 g 00000000 Common_Movement_WalkInPlaceFasterDown +081a7667 g 00000000 Common_Movement_FaceRight +081a7669 g 00000000 Common_Movement_FaceDown +081a766b g 00000000 Common_Movement_WalkUp5 +081a7671 g 00000000 Common_Movement_WalkUp4 +081a7676 g 00000000 Common_Movement_Delay32 +081a7679 g 00000000 Common_Movement_WalkUp +081a767b g 00000000 Common_Movement_WalkUp2 081a767e g 00000000 EventScript_Bookshelf 081a7687 g 00000000 EventScript_PokeMartShelf 081a7690 g 00000000 EventScript_Food diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index 5cf3a4c78..3b5b08bd7 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -20255,23 +20255,23 @@ 081a7578 g 00000000 PokemonLeague_EventScript_CloseEntry 081a75af g 00000000 PokemonLeague_Movement_ForcePlayerIn 081a75b1 g 00000000 PokemonLeague_EventScript_DoLightingEffect -081a75b5 g 00000000 Movement_QuestionMark -081a75b7 g 00000000 Movement_ExclamationMark -081a75b9 g 00000000 Movement_Delay48 -081a75bd g 00000000 Movement_FacePlayer -081a75bf g 00000000 Movement_FaceAwayPlayer -081a75c1 g 00000000 Movement_FaceOriginalDirection -081a75c3 g 00000000 Movement_WalkInPlaceFasterLeft -081a75c5 g 00000000 Movement_WalkInPlaceFasterUp -081a75c7 g 00000000 Movement_WalkInPlaceFasterRight -081a75c9 g 00000000 Movement_WalkInPlaceFasterDown -081a75cb g 00000000 Movement_FaceRight -081a75cd g 00000000 Movement_FaceDown -081a75cf g 00000000 Movement_WalkUp5 -081a75d5 g 00000000 Movement_WalkUp4 -081a75da g 00000000 Movement_Delay32 -081a75dd g 00000000 Movement_WalkUp -081a75df g 00000000 Movement_WalkUp2 +081a75b5 g 00000000 Common_Movement_QuestionMark +081a75b7 g 00000000 Common_Movement_ExclamationMark +081a75b9 g 00000000 Common_Movement_Delay48 +081a75bd g 00000000 Common_Movement_FacePlayer +081a75bf g 00000000 Common_Movement_FaceAwayPlayer +081a75c1 g 00000000 Common_Movement_FaceOriginalDirection +081a75c3 g 00000000 Common_Movement_WalkInPlaceFasterLeft +081a75c5 g 00000000 Common_Movement_WalkInPlaceFasterUp +081a75c7 g 00000000 Common_Movement_WalkInPlaceFasterRight +081a75c9 g 00000000 Common_Movement_WalkInPlaceFasterDown +081a75cb g 00000000 Common_Movement_FaceRight +081a75cd g 00000000 Common_Movement_FaceDown +081a75cf g 00000000 Common_Movement_WalkUp5 +081a75d5 g 00000000 Common_Movement_WalkUp4 +081a75da g 00000000 Common_Movement_Delay32 +081a75dd g 00000000 Common_Movement_WalkUp +081a75df g 00000000 Common_Movement_WalkUp2 081a75e2 g 00000000 EventScript_Bookshelf 081a75eb g 00000000 EventScript_PokeMartShelf 081a75f4 g 00000000 EventScript_Food diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index 162e04c79..81ce6731d 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -20256,23 +20256,23 @@ 081a75f0 g 00000000 PokemonLeague_EventScript_CloseEntry 081a7627 g 00000000 PokemonLeague_Movement_ForcePlayerIn 081a7629 g 00000000 PokemonLeague_EventScript_DoLightingEffect -081a762d g 00000000 Movement_QuestionMark -081a762f g 00000000 Movement_ExclamationMark -081a7631 g 00000000 Movement_Delay48 -081a7635 g 00000000 Movement_FacePlayer -081a7637 g 00000000 Movement_FaceAwayPlayer -081a7639 g 00000000 Movement_FaceOriginalDirection -081a763b g 00000000 Movement_WalkInPlaceFasterLeft -081a763d g 00000000 Movement_WalkInPlaceFasterUp -081a763f g 00000000 Movement_WalkInPlaceFasterRight -081a7641 g 00000000 Movement_WalkInPlaceFasterDown -081a7643 g 00000000 Movement_FaceRight -081a7645 g 00000000 Movement_FaceDown -081a7647 g 00000000 Movement_WalkUp5 -081a764d g 00000000 Movement_WalkUp4 -081a7652 g 00000000 Movement_Delay32 -081a7655 g 00000000 Movement_WalkUp -081a7657 g 00000000 Movement_WalkUp2 +081a762d g 00000000 Common_Movement_QuestionMark +081a762f g 00000000 Common_Movement_ExclamationMark +081a7631 g 00000000 Common_Movement_Delay48 +081a7635 g 00000000 Common_Movement_FacePlayer +081a7637 g 00000000 Common_Movement_FaceAwayPlayer +081a7639 g 00000000 Common_Movement_FaceOriginalDirection +081a763b g 00000000 Common_Movement_WalkInPlaceFasterLeft +081a763d g 00000000 Common_Movement_WalkInPlaceFasterUp +081a763f g 00000000 Common_Movement_WalkInPlaceFasterRight +081a7641 g 00000000 Common_Movement_WalkInPlaceFasterDown +081a7643 g 00000000 Common_Movement_FaceRight +081a7645 g 00000000 Common_Movement_FaceDown +081a7647 g 00000000 Common_Movement_WalkUp5 +081a764d g 00000000 Common_Movement_WalkUp4 +081a7652 g 00000000 Common_Movement_Delay32 +081a7655 g 00000000 Common_Movement_WalkUp +081a7657 g 00000000 Common_Movement_WalkUp2 081a765a g 00000000 EventScript_Bookshelf 081a7663 g 00000000 EventScript_PokeMartShelf 081a766c g 00000000 EventScript_Food