Introduce macros for common message script structures (#975)

Author: Viperio19

asm/macros/scrcmd.inc

@@ -5175,6 +5175,58 @@
     GoToIfEq \destVarID, FALSE, \offset
     .endm
 
+    .macro NPCMessage messageID
+    PlayFanfare SEQ_SE_CONFIRM
+    LockAll
+    FacePlayer
+    Message \messageID
+    WaitABXPadPress
+    CloseMessage
+    ReleaseAll
+    .endm
+
+    .macro EventMessage messageID
+    PlayFanfare SEQ_SE_CONFIRM
+    LockAll
+    Message \messageID
+    WaitABXPadPress
+    CloseMessage
+    ReleaseAll
+    .endm
+
+    .macro PokemonCryAndMessage species, messageID, unused=0
+    PlayFanfare SEQ_SE_CONFIRM
+    LockAll
+    FacePlayer
+    WaitFanfare SEQ_SE_CONFIRM
+    PlayCry \species, \unused
+    Message \messageID
+    WaitCry
+    WaitABXPadPress
+    CloseMessage
+    ReleaseAll
+    .endm 
+
+    .macro PokeMartCommonWithGreeting unused=1
+    PlayFanfare SEQ_SE_CONFIRM
+    LockAll
+    FacePlayer
+    Common_VendorGreeting
+    CloseMessageWithoutErasing
+    PokeMartCommon \unused
+    ReleaseAll
+    .endm
+
+    .macro PokeMartSpecialtiesWithGreeting martID
+    PlayFanfare SEQ_SE_CONFIRM
+    LockAll
+    FacePlayer
+    Common_VendorGreeting
+    CloseMessageWithoutErasing
+    PokeMartSpecialties \martID
+    ReleaseAll
+    .endm
+
     /* CallCommonScript aliases below */
 
     .macro Common_HandleSignpostInput

res/field/scripts/scripts_amity_square.s

@@ -610,92 +610,35 @@ _08D0:
     EndMovement
 
 AmitySquare_DrifloonMan:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message AmitySquare_Text_TheseRuinsAreFromALongLongTimeAgo
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage AmitySquare_Text_TheseRuinsAreFromALongLongTimeAgo
     End
 
 AmitySquare_Drifloon:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_DRIFLOON
-    Message AmitySquare_Text_DrifloonFoon
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_DRIFLOON, AmitySquare_Text_DrifloonFoon
     End
 
 AmitySquare_HappinyWoman:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message AmitySquare_Text_IComeHereWithMyHappinyEverySingleDay
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage AmitySquare_Text_IComeHereWithMyHappinyEverySingleDay
     End
 
 AmitySquare_Happiny:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message AmitySquare_Text_HappinyAppearsToBeDrowsy
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage AmitySquare_Text_HappinyAppearsToBeDrowsy
     End
 
 AmitySquare_PikachuMan:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message AmitySquare_Text_OohIJustCantBelieveIt
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage AmitySquare_Text_OohIJustCantBelieveIt
     End
 
 AmitySquare_Pikachu:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_PIKACHU
-    Message AmitySquare_Text_PikachuPikkaPika
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_PIKACHU, AmitySquare_Text_PikachuPikkaPika
     End
 
 AmitySquare_ClefairyGirl:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message AmitySquare_Text_YouShouldTalkToYourPokemon
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage AmitySquare_Text_YouShouldTalkToYourPokemon
     End
 
 AmitySquare_Clefairy:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_CLEFAIRY
-    Message AmitySquare_Text_ThereIsSomethingShinyInClefairysHands
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_CLEFAIRY, AmitySquare_Text_ThereIsSomethingShinyInClefairysHands
     End
 
 AmitySquare_CheckPartyHasSpecies:

res/field/scripts/scripts_battle_arcade.s

@@ -515,101 +515,43 @@ BattleArcade_UnusedMovement2:
     EndMovement
 
 _079C:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 46
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 46
     End
 
 _07AF:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 47
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 47
     End
 
 _07C2:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 48
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 48
     End
 
 _07D5:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 49
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 49
     End
 
 _07E8:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 50
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 50
     End
 
 _07FB:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 51
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 51
     End
 
 _080E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 52
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 52
     End
 
 _0821:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 53
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 53
     End
 
 _0834:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 54
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 54
     End
 
 _0845:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 55
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 55
     End
 
     .balign 4, 0

res/field/scripts/scripts_battle_castle.s

@@ -510,73 +510,31 @@ BattleCastle_UnusedMovement2:
     EndMovement
 
 _0788:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 46
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 46
     End
 
 _079B:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 47
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 47
     End
 
 _07AE:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 48
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 48
     End
 
 _07C1:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 49
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 49
     End
 
 _07D4:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 50
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 50
     End
 
 _07E7:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 51
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 51
     End
 
 _07FA:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 52
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 52
     End
 
     .balign 4, 0