Introduce macros for common message script structures (#975)

2026-03-21 17:55:13 -05:00 · 2026-03-04 03:20:51 +01:00 · 2026-03-04 03:20:51 +01:00 · 3c0d1255a4
commit 3c0d1255a4
parent 34c0566c09
277 changed files with 916 additions and 6079 deletions
--- a/asm/macros/scrcmd.inc
+++ b/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
--- a/res/field/scripts/scripts_amity_square.s
+++ b/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:
--- a/res/field/scripts/scripts_battle_arcade.s
+++ b/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
--- a/res/field/scripts/scripts_battle_castle.s
+++ b/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
--- a/res/field/scripts/scripts_battle_factory.s
+++ b/res/field/scripts/scripts_battle_factory.s
@ -468,73 +468,31 @@ BattleFactory_UnusedMovement2:
    EndMovement

 _0698:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 27
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 27
    End

 _06AB:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 28
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 28
    End

 _06BE:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 29
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 29
    End

 _06D1:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 30
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 30
    End

 _06E4:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 31
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 31
    End

 _06F7:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 32
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 32
    End

 _070A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 33
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 33
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_battle_frontier.s
+++ b/res/field/scripts/scripts_battle_frontier.s
@ -58,213 +58,87 @@ _00D5:
    End

 _00DB:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _00EE:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _0101:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 2
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 2
    End

 _0114:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 3
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 3
    End

 _0127:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 4
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 4
    End

 _013A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 5
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 5
    End

 _014D:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 6
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 6
    End

 _0160:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 7
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 7
    End

 _0173:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 8
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 8
    End

 _0186:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 9
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 9
    End

 _0199:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 10
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 10
    End

 _01AC:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 11
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 11
    End

 _01BF:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 12
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 12
    End

 _01D2:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 13
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 13
    End

 _01E5:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 14
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 14
    End

 _01F8:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 15
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 15
    End

 _020B:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 16
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 16
    End

 _021E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 17
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 17
    End

 _0231:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 18
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 18
    End

 _0244:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 19
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 19
    End

 _0257:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 20
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 20
    End

 _026A:
@ -321,30 +195,15 @@ _0316:
    End

 _032D:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 29
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 29
    End

 _033E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 30
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 30
    End

 _034F:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 31
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 31
    End

 _0360:
--- a/res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s
+++ b/res/field/scripts/scripts_battle_frontier_gate_to_fight_area.s
@ -279,41 +279,17 @@ _034C:
    EndMovement

 _0358:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 32
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 32
    End

 _036B:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 33
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 33
    End

 _037E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 34
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 34
    End

 _0391:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 35
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 35
    End
--- a/res/field/scripts/scripts_battle_hall.s
+++ b/res/field/scripts/scripts_battle_hall.s
@ -639,96 +639,39 @@ BattleHall_UnusedMovement2:
    EndMovement

 BattleHall_Hiker:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message BattleHall_Text_StartWithHardMatchups
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage BattleHall_Text_StartWithHardMatchups
    End

 BattleHall_SnowpointNPC:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message BattleHall_Text_TryForARecord
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage BattleHall_Text_TryForARecord
    End

 BattleHall_Twin:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message BattleHall_Text_PachirisusACutie
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage BattleHall_Text_PachirisusACutie
    End

 BattleHall_Pachirisu:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_PACHIRISU
-    Message BattleHall_Text_Pachirisu
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_PACHIRISU, BattleHall_Text_Pachirisu
    End

 BattleHall_ExpertM:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message BattleHall_Text_TryDifferentPokemon
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage BattleHall_Text_TryDifferentPokemon
    End

 BattleHall_Idol:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message BattleHall_Text_TrySameSpeciesDifferentMoves
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage BattleHall_Text_TrySameSpeciesDifferentMoves
    End

 BattleHall_PokefanF:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message BattleHall_Text_CroagunkHasTwoTypes
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage BattleHall_Text_CroagunkHasTwoTypes
    End

 BattleHall_Maid:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message BattleHall_Text_MysteriousMaid
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage BattleHall_Text_MysteriousMaid
    End

 BattleHall_BugCatcher:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message BattleHall_Text_CompeteWithAFriend
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage BattleHall_Text_CompeteWithAFriend
    End

 BattleHall_RecordKeeper:
--- a/res/field/scripts/scripts_battle_park.s
+++ b/res/field/scripts/scripts_battle_park.s
@ -210,90 +210,39 @@ _02FC:
    EndMovement

 _0308:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 6
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 6
    End

 _031B:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 9
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 9
    End

 _032C:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 10
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 10
    End

 _033D:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 11
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 11
    End

 _0350:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 12
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 12
    End

 _0361:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 13
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 13
    End

 _0374:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 14
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 14
    End

 _0387:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 15
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 15
    End

 _039A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 16
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 16
    End

 _03AD:
--- a/res/field/scripts/scripts_battle_park_exchange_service_corner.s
+++ b/res/field/scripts/scripts_battle_park_exchange_service_corner.s
@ -109,53 +109,23 @@ BattleParkExchangeServiceCorner_Unused9:
    Return

 _0192:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 8
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 8
    End

 _01A5:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 9
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 9
    End

 _01B8:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 10
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 10
    End

 _01CB:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 13
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 13
    End

 _01DE:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 14
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 14
    End

 _01F1:
--- a/res/field/scripts/scripts_battle_tower.s
+++ b/res/field/scripts/scripts_battle_tower.s
@ -1168,89 +1168,38 @@ _1304:
    Return

 BattleTower_ParasolLady:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message BattleTower_Text_UsedToLiveInHoenn
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage BattleTower_Text_UsedToLiveInHoenn
    End

 BattleTower_Jogger:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message BattleTower_Text_WiFiBattleRoomsAreFullOfSurprises
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage BattleTower_Text_WiFiBattleRoomsAreFullOfSurprises
    End

 BattleTower_Idol:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message BattleTower_Text_TheyProfileYouOnTV
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage BattleTower_Text_TheyProfileYouOnTV
    End

 BattleTower_RichBoy:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message BattleTower_Text_ITrainedMyLittleGuy
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage BattleTower_Text_ITrainedMyLittleGuy
    End

 BattleTower_Pikachu1:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message BattleTower_Text_PikachuDotDotDot
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage BattleTower_Text_PikachuDotDotDot
    End

 BattleTower_Artist:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message BattleTower_Text_YouLookPowerful
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage BattleTower_Text_YouLookPowerful
    End

 BattleTower_SchoolKid:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message BattleTower_Text_ThereAreManyToughTrainers
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage BattleTower_Text_ThereAreManyToughTrainers
    End

 _13AD:
    End

 BattleTower_Pikachu2:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_PIKACHU
-    Message BattleTower_Text_PikachuPichuu
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_PIKACHU, BattleTower_Text_PikachuPichuu
    End

 _13CE:
--- a/res/field/scripts/scripts_bg_events.s
+++ b/res/field/scripts/scripts_bg_events.s
@ -14,75 +14,35 @@
    ScriptEntryEnd

 _0026:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 0
    End

 _0037:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 1
    End

 _0048:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 2
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 2
    End

 _0059:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 3
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 3
    End

 _006A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 4
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 4
    End

 _007B:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 5
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 5
    End

 _008C:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 6
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 6
    End

 _009D:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 7
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 7
    End

 _00AE:
--- a/res/field/scripts/scripts_cafe.s
+++ b/res/field/scripts/scripts_cafe.s
@ -13,13 +13,7 @@ _0012:
    End

 _0018:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _002B:
--- a/res/field/scripts/scripts_canalave_city.s
+++ b/res/field/scripts/scripts_canalave_city.s
@ -212,13 +212,7 @@ _035C:
    EndMovement

 _0364:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _0377:
@ -344,13 +338,7 @@ _04C8:
    EndMovement

 _04D4:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 13
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 13
    End

 _04E7:
@ -499,12 +487,7 @@ _06E2:
    End

 _06F7:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 43
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 43
    End

 _0708:
--- a/res/field/scripts/scripts_canalave_city_mart.s
+++ b/res/field/scripts/scripts_canalave_city_mart.s
@ -10,23 +10,11 @@
    ScriptEntryEnd

 CanalaveCityMart_CommonVendor:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Common_VendorGreeting
-    CloseMessageWithoutErasing
-    PokeMartCommon
-    ReleaseAll
+    PokeMartCommonWithGreeting
    End

 CanalaveCityMart_SpecialtyVendor:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Common_VendorGreeting
-    CloseMessageWithoutErasing
-    PokeMartSpecialties MART_SPECIALTIES_ID_CANALAVE
-    ReleaseAll
+    PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_CANALAVE
    End

 CanalaveCityMart_Lady:
--- a/res/field/scripts/scripts_canalave_city_pokecenter_1f.s
+++ b/res/field/scripts/scripts_canalave_city_pokecenter_1f.s
@ -14,43 +14,19 @@ _0016:
    End

 _0022:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0035:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _0048:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 2
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 2
    End

 _005B:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 3
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 3
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s
+++ b/res/field/scripts/scripts_canalave_city_sailor_eldritch_house.s
@ -45,56 +45,26 @@ _00A5:
    GoToIfEq VAR_0x8008, 1, _00E5
    GoToIfEq VAR_0x8008, 2, _00E5
    GoToIfEq VAR_0x8008, 3, _00F8
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 8
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 8
    End

 _00E5:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 9
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 9
    End

 _00F8:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 10
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 10
    End

 _010B:
    GoToIfEq VAR_UNK_0x4106, 1, _0158
    GoToIfEq VAR_UNK_0x4106, 2, _0158
    GoToIfEq VAR_UNK_0x4106, 3, _0145
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0145:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 4
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 4
    End

 _0158:
@ -126,12 +96,7 @@ _0158:
    End

 _01D9:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 1
    End

 _01EA:
--- a/res/field/scripts/scripts_canalave_city_southeast_house.s
+++ b/res/field/scripts/scripts_canalave_city_southeast_house.s
@ -34,13 +34,7 @@ _005C:
    End

 _0066:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 2
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 2
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_canalave_library_1f.s
+++ b/res/field/scripts/scripts_canalave_library_1f.s
@ -54,21 +54,11 @@ _0078:
    EndMovement

 _0080:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 5
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 5
    End

 _0091:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 6
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 6
    End

 _00A2:
--- a/res/field/scripts/scripts_canalave_library_2f.s
+++ b/res/field/scripts/scripts_canalave_library_2f.s
@ -58,21 +58,11 @@ _0082:
    End

 _0090:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 3
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 3
    End

 _00A1:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 4
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 4
    End

 _00B2:
--- a/res/field/scripts/scripts_canalave_library_3f.s
+++ b/res/field/scripts/scripts_canalave_library_3f.s
@ -571,12 +571,7 @@ _0694:
    End

 _06A2:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 58
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 58
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_celestic_town.s
+++ b/res/field/scripts/scripts_celestic_town.s
@ -263,43 +263,19 @@ _02FC:
    EndMovement

 _0304:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 11
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 11
    End

 _0317:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 12
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 12
    End

 _032A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 14
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 14
    End

 _033D:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 13
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 13
    End

 _0350:
@ -307,21 +283,11 @@ _0350:
    End

 _0367:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 16
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 16
    End

 _0378:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 17
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 17
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_celestic_town_cave.s
+++ b/res/field/scripts/scripts_celestic_town_cave.s
@ -435,12 +435,7 @@ _057A:
    End

 _0585:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 12
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 12
    End

 _0596:
--- a/res/field/scripts/scripts_celestic_town_north_house.s
+++ b/res/field/scripts/scripts_celestic_town_north_house.s
@ -63,33 +63,16 @@ _0099:
    End

 _00A1:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 9
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 9
    End

 _00B4:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 10
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 10
    End

 _00C5:
    BufferPlayerName 0
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 11
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 11
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_celestic_town_northeast_house.s
+++ b/res/field/scripts/scripts_celestic_town_northeast_house.s
@ -7,21 +7,9 @@
    ScriptEntryEnd

 _000A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _001D:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End
--- a/res/field/scripts/scripts_celestic_town_northwest_house.s
+++ b/res/field/scripts/scripts_celestic_town_northwest_house.s
@ -20,23 +20,11 @@ _0012:
    End

 _002B:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Common_VendorGreeting
-    CloseMessageWithoutErasing
-    PokeMartCommon
-    ReleaseAll
+    PokeMartCommonWithGreeting
    End

 _0041:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Common_VendorGreeting
-    CloseMessageWithoutErasing
-    PokeMartSpecialties MART_SPECIALTIES_ID_CELESTIC
-    ReleaseAll
+    PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_CELESTIC
    End

 _0057:
--- a/res/field/scripts/scripts_celestic_town_pokecenter_1f.s
+++ b/res/field/scripts/scripts_celestic_town_pokecenter_1f.s
@ -13,23 +13,11 @@ _0012:
    End

 _001E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0031:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _0044:
--- a/res/field/scripts/scripts_celestic_town_southwest_house.s
+++ b/res/field/scripts/scripts_celestic_town_southwest_house.s
@ -28,14 +28,5 @@ _003A:
    End

 _0045:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_HAPPINY
-    Message 2
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_HAPPINY, 2
    End
--- a/res/field/scripts/scripts_common.s
+++ b/res/field/scripts/scripts_common.s
@ -1364,33 +1364,15 @@ _12A8:
    End

 CommonScript_Vent:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message CommonStrings_Text_ItsAnAirVentThatExchangesTheUndergroundTunnelsAir
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage CommonStrings_Text_ItsAnAirVentThatExchangesTheUndergroundTunnelsAir
    End

 _12CD:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message pl_msg_00000213_00070
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage pl_msg_00000213_00070
    End

 _12E0:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message pl_msg_00000213_00071
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage pl_msg_00000213_00071
    End

 _12F3:
@ -1457,13 +1439,7 @@ _139D:
    End

 _13AB:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message pl_msg_00000213_00082
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage pl_msg_00000213_00082
    End

 CommonScript_PrintPlateObtainedMessage:
--- a/res/field/scripts/scripts_communication_club.s
+++ b/res/field/scripts/scripts_communication_club.s
@ -8,13 +8,7 @@
    ScriptEntryEnd

 _000E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0021:
--- a/res/field/scripts/scripts_contest_hall_lobby.s
+++ b/res/field/scripts/scripts_contest_hall_lobby.s
@ -252,33 +252,15 @@ _031D:
    End

 _0328:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 21
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 21
    End

 _033B:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 22
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 22
    End

 _034E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 23
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 23
    End

 _0361:
--- a/res/field/scripts/scripts_contest_hall_stage_no_contest.s
+++ b/res/field/scripts/scripts_contest_hall_stage_no_contest.s
@ -9,43 +9,19 @@
    ScriptEntryEnd

 _0012:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0025:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _0038:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 2
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 2
    End

 _004B:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 3
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 3
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_contest_registration.s
+++ b/res/field/scripts/scripts_contest_registration.s
@ -164,13 +164,7 @@ _01E3:
    Return

 _01E9:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _01FC:
--- a/res/field/scripts/scripts_cycle_shop.s
+++ b/res/field/scripts/scripts_cycle_shop.s
@ -32,16 +32,7 @@ _0052:
    End

 _005D:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_CLEFAIRY
-    Message 2
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_CLEFAIRY, 2
    End

 _007C:
@ -63,21 +54,11 @@ _009A:
    End

 _00A5:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 5
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 5
    End

 _00B6:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 6
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 6
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_distortion_world_1f.s
+++ b/res/field/scripts/scripts_distortion_world_1f.s
@ -88,13 +88,7 @@ _011D:
    End

 _012A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 6
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 6
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_distortion_world_b6f.s
+++ b/res/field/scripts/scripts_distortion_world_b6f.s
@ -19,13 +19,7 @@ _0022:
 _0026:
    GoToIfEq VAR_DISTORTION_WORLD_PROGRESS, 7, _0080
    GoToIfSet FLAG_DISTORTION_WORLD_PUZZLE_FINISHED, _0051
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 3
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 3
    End

 _0051:
@ -44,13 +38,7 @@ _0051:
    End

 _0080:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 5
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 5
    End

 _0093:
@ -90,12 +78,7 @@ _00D5:
    End

 _00F6:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 6
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 6
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_distortion_world_giratina_room.s
+++ b/res/field/scripts/scripts_distortion_world_giratina_room.s
@ -141,13 +141,7 @@ _0204:
    End

 _020A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 12
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 12
    End

 _021D:
--- a/res/field/scripts/scripts_eterna_city.s
+++ b/res/field/scripts/scripts_eterna_city.s
@ -53,23 +53,11 @@ _00B5:
    Return

 _00BF:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 25
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 25
    End

 _00D2:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 26
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 26
    End

 _00E5:
@ -370,93 +358,40 @@ _04F0:
    EndMovement

 _04FC:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 18
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 18
    End

 _050F:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 19
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 19
    End

 _0522:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 20
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 20
    End

 _0535:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 27
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 27
    End

 _0548:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 28
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 28
    End

 _055B:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 29
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 29
    End

 _056E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 42
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 42
    End

 _057F:
    GoToIfSet FLAG_EXPLORER_KIT_RECEIVED, _059D
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 31
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 31
    End

 _059D:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 32
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 32
    End

 _05B0:
--- a/res/field/scripts/scripts_eterna_city_condominiums_2f.s
+++ b/res/field/scripts/scripts_eterna_city_condominiums_2f.s
@ -36,23 +36,11 @@ _005D:
    End

 _0068:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 2
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 2
    End

 _007B:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 3
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 3
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_eterna_city_condominiums_3f.s
+++ b/res/field/scripts/scripts_eterna_city_condominiums_3f.s
@ -9,43 +9,19 @@
    ScriptEntryEnd

 _0012:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0025:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _0038:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 2
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 2
    End

 _004B:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 3
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 3
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_eterna_city_east_house.s
+++ b/res/field/scripts/scripts_eterna_city_east_house.s
@ -8,23 +8,11 @@
    ScriptEntryEnd

 _000E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0021:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _0034:
--- a/res/field/scripts/scripts_eterna_city_herb_shop.s
+++ b/res/field/scripts/scripts_eterna_city_herb_shop.s
@ -18,23 +18,11 @@ EternaCityHerbShop_Vendor:
    End

 EternaCityHerbShop_ExpertF:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message EternaCityHerbShop_Text_YourPokemonWontLikeThem
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage EternaCityHerbShop_Text_YourPokemonWontLikeThem
    End

 EternaCityHerbShop_ExpertM:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message EternaCityHerbShop_Text_NonBitterWouldBeMedicalBreakthrough
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage EternaCityHerbShop_Text_NonBitterWouldBeMedicalBreakthrough
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_eterna_city_mart.s
+++ b/res/field/scripts/scripts_eterna_city_mart.s
@ -10,45 +10,21 @@
    ScriptEntryEnd

 EternaCityMart_CommonVendor:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Common_VendorGreeting
-    CloseMessageWithoutErasing
-    PokeMartCommon
-    ReleaseAll
+    PokeMartCommonWithGreeting
    End

 EternaCityMart_SpecialtyVendor:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Common_VendorGreeting
-    CloseMessageWithoutErasing
-    PokeMartSpecialties MART_SPECIALTIES_ID_ETERNA_MART
-    ReleaseAll
+    PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_ETERNA_MART
    End

 EternaCityMart_Guitarist:
    BufferItemName 0, ITEM_SUPER_POTION //Unused?
    BufferItemName 1, ITEM_TM03         //Unused?
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message EternaCityMart_Text_GardeniaIsTooMuch
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage EternaCityMart_Text_GardeniaIsTooMuch
    End

 EternaCityMart_Hiker:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message EternaCityMart_Text_EscapeRopeIsIndispensable
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage EternaCityMart_Text_EscapeRopeIsIndispensable
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_eterna_city_pokecenter_1f.s
+++ b/res/field/scripts/scripts_eterna_city_pokecenter_1f.s
@ -14,13 +14,7 @@ _0016:
    End

 _0022:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0035:
@ -42,16 +36,7 @@ _0053:
    End

 _005E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_BUNEARY
-    Message 3
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_BUNEARY, 3
    End

 _007D:
--- a/res/field/scripts/scripts_eterna_city_pokecenter_2f.s
+++ b/res/field/scripts/scripts_eterna_city_pokecenter_2f.s
@ -6,13 +6,7 @@
    ScriptEntryEnd

 _0006:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_eterna_city_underground_man_house.s
+++ b/res/field/scripts/scripts_eterna_city_underground_man_house.s
@ -439,13 +439,7 @@ _0620:
    EndMovement

 _0634:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 36
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 36
    End

 _0647:
@ -468,12 +462,7 @@ _0669:
    End

 _0674:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 40
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 40
    End

 _0685:
@ -533,13 +522,7 @@ _0741:
    End

 _0747:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 37
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 37
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_eterna_forest.s
+++ b/res/field/scripts/scripts_eterna_forest.s
@ -334,13 +334,7 @@ _03F5:
    End

 _03FE:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 9
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 9
    End

 _0411:
@ -418,12 +412,7 @@ _04F7:
    End

 _050C:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 10
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 10
    End

 _051D:
--- a/res/field/scripts/scripts_fight_area.s
+++ b/res/field/scripts/scripts_fight_area.s
@ -391,73 +391,31 @@ FightArea_UnusedMovement5:
    EndMovement

 _049C:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 31
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 31
    End

 _04AF:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 33
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 33
    End

 _04C2:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 34
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 34
    End

 _04D5:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 35
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 35
    End

 _04E8:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 36
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 36
    End

 _04FB:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 37
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 37
    End

 _050E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 41
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 41
    End

 _0521:
@ -671,23 +629,11 @@ _07D0:
    EndMovement

 _07DC:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 29
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 29
    End

 _07EF:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 30
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 30
    End

 _0802:
@ -732,53 +678,23 @@ _085C:
    EndMovement

 _0864:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 24
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 24
    End

 _0877:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 25
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 25
    End

 _088A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 26
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 26
    End

 _089D:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 27
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 27
    End

 _08B0:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 28
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 28
    End

    .balign 0
--- a/res/field/scripts/scripts_fight_area_mart.s
+++ b/res/field/scripts/scripts_fight_area_mart.s
@ -9,13 +9,7 @@
    ScriptEntryEnd

 _0012:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Common_VendorGreeting
-    CloseMessageWithoutErasing
-    PokeMartCommon
-    ReleaseAll
+    PokeMartCommonWithGreeting
    End

 _0028:
@ -49,13 +43,7 @@ _007C:
    End

 _0086:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 2
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 2
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_fight_area_middle_house.s
+++ b/res/field/scripts/scripts_fight_area_middle_house.s
@ -8,33 +8,15 @@
    ScriptEntryEnd

 _000E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0021:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _0034:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 2
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 2
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_fight_area_pokecenter_1f.s
+++ b/res/field/scripts/scripts_fight_area_pokecenter_1f.s
@ -13,33 +13,15 @@ _0012:
    End

 _001E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0031:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _0044:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 2
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 2
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_fight_area_south_house.s
+++ b/res/field/scripts/scripts_fight_area_south_house.s
@ -9,36 +9,15 @@
    ScriptEntryEnd

 _0012:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0025:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _0038:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_TORCHIC
-    Message 2
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_TORCHIC, 2
    End

 _0057:
--- a/res/field/scripts/scripts_floaroma_meadow_house.s
+++ b/res/field/scripts/scripts_floaroma_meadow_house.s
@ -7,21 +7,9 @@
    ScriptEntryEnd

 _000A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _001D:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End
--- a/res/field/scripts/scripts_floaroma_town.s
+++ b/res/field/scripts/scripts_floaroma_town.s
@ -71,43 +71,19 @@ _00A4:
    EndMovement

 _00B0:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 5
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 5
    End

 _00C3:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 6
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 6
    End

 _00D6:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 7
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 7
    End

 _00E9:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 8
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 8
    End

 _00FC:
--- a/res/field/scripts/scripts_floaroma_town_mart.s
+++ b/res/field/scripts/scripts_floaroma_town_mart.s
@ -9,41 +9,17 @@
    ScriptEntryEnd

 FloaromaTownMart_CommonVendor:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Common_VendorGreeting
-    CloseMessageWithoutErasing
-    PokeMartCommon
-    ReleaseAll
+    PokeMartCommonWithGreeting
    End

 FloaromaTownMart_SpecialtyVendor:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Common_VendorGreeting
-    CloseMessageWithoutErasing
-    PokeMartSpecialties MART_SPECIALTIES_ID_FLOAROMA
-    ReleaseAll
+    PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_FLOAROMA
    End

 FloaromaTownMart_Beauty:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message FloaromaTownMart_Text_DressUpPokemonWithAccessories
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage FloaromaTownMart_Text_DressUpPokemonWithAccessories
    End

 FloaromaTownMart_SchoolGirl:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message FloaromaTownMart_Text_CantBuyBerriesAtMarts
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage FloaromaTownMart_Text_CantBuyBerriesAtMarts
    End
--- a/res/field/scripts/scripts_floaroma_town_middle_house.s
+++ b/res/field/scripts/scripts_floaroma_town_middle_house.s
@ -8,13 +8,7 @@
    ScriptEntryEnd

 _000E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0021:
@ -60,14 +54,5 @@ _009F:
    End

 _00A9:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_CLEFAIRY
-    Message 5
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_CLEFAIRY, 5
    End
--- a/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s
+++ b/res/field/scripts/scripts_floaroma_town_pokecenter_1f.s
@ -13,23 +13,11 @@ _0012:
    End

 _001E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0031:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _0044:
--- a/res/field/scripts/scripts_floaroma_town_southeast_house.s
+++ b/res/field/scripts/scripts_floaroma_town_southeast_house.s
@ -7,21 +7,9 @@
    ScriptEntryEnd

 _000A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _001D:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End
--- a/res/field/scripts/scripts_foreign_building.s
+++ b/res/field/scripts/scripts_foreign_building.s
@ -14,93 +14,39 @@
    ScriptEntryEnd

 _0026:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0039:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _004C:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 2
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 2
    End

 _005F:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 3
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 3
    End

 _0072:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 4
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 4
    End

 _0085:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 5
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 5
    End

 _0098:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 6
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 6
    End

 _00AB:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 7
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 7
    End

 _00BE:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 8
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 8
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_galactic_hq_1f.s
+++ b/res/field/scripts/scripts_galactic_hq_1f.s
@ -89,13 +89,7 @@ _00C1:
    End

 _00CC:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 8
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 8
    End

 _00DF:
@ -149,12 +143,7 @@ _016C:
    EndMovement

 _0174:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 12
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 12
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_galactic_hq_2f.s
+++ b/res/field/scripts/scripts_galactic_hq_2f.s
@ -43,48 +43,23 @@ _0074:
    End

 _007A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 7
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 7
    End

 _008B:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 8
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 8
    End

 _009C:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 9
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 9
    End

 _00AD:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 10
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 10
    End

 _00BE:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 11
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 11
    End

 _00CF:
--- a/res/field/scripts/scripts_galactic_hq_3f.s
+++ b/res/field/scripts/scripts_galactic_hq_3f.s
@ -8,13 +8,7 @@
    ScriptEntryEnd

 _000E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0021:
@ -68,12 +62,7 @@ _00B0:
    EndMovement

 _00B8:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 4
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 4
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_galactic_hq_4f.s
+++ b/res/field/scripts/scripts_galactic_hq_4f.s
@ -150,12 +150,7 @@ _01BC:
    EndMovement

 _01C4:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 8
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 8
    End

 _01D5:
--- a/res/field/scripts/scripts_galactic_hq_b1f.s
+++ b/res/field/scripts/scripts_galactic_hq_b1f.s
@ -6,13 +6,7 @@
    ScriptEntryEnd

 _0006:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_galactic_hq_b2f.s
+++ b/res/field/scripts/scripts_galactic_hq_b2f.s
@ -8,23 +8,11 @@
    ScriptEntryEnd

 _000E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0021:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _0034:
--- a/res/field/scripts/scripts_galactic_hq_control_room.s
+++ b/res/field/scripts/scripts_galactic_hq_control_room.s
@ -325,33 +325,15 @@ _03BC:
    EndMovement

 _03C4:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 13
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 13
    End

 _03D7:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 14
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 14
    End

 _03EA:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 15
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 15
    End

 _03FD:
--- a/res/field/scripts/scripts_galactic_hq_laboratory.s
+++ b/res/field/scripts/scripts_galactic_hq_laboratory.s
@ -8,32 +8,15 @@
    ScriptEntryEnd

 _000E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0021:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _0034:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 2
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 2
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_game_corner.s
+++ b/res/field/scripts/scripts_game_corner.s
@ -226,13 +226,7 @@ GameCorner_CoinsClerk_SaveTM64:
    End

 GameCorner_LadyExplainSlotMachines:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message GameCorner_Text_IllEplainHowTheSlotMachinesWorkAtThisGameCorner
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage GameCorner_Text_IllEplainHowTheSlotMachinesWorkAtThisGameCorner
    End

 GameCorner_OldMan20Coins:
@ -302,64 +296,30 @@ GameCorner_Farmer_CannotAddCoins:
    End

 GameCorner_Worker:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message GameCorner_Text_IWantCoinsOfCourse
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage GameCorner_Text_IWantCoinsOfCourse
    End

 GameCorner_LadyPokeBalls:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message GameCorner_Text_WhenAPokeBallAppears
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage GameCorner_Text_WhenAPokeBallAppears
    End

 GameCorner_Guitarist:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message GameCorner_Text_AFriendInMyGroupScoredATonOfCoinsHere
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage GameCorner_Text_AFriendInMyGroupScoredATonOfCoinsHere
    End

 GameCorner_MaylenesDad:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message GameCorner_Text_SighNothingGoingMyWayToday
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage GameCorner_Text_SighNothingGoingMyWayToday
    End

 GameCorner_SignBonusRounds:
    GoToIfGt VAR_CONSECUTIVE_BONUS_ROUND_WINS, 999, GameCorner_SignBonusRounds_GreaterThan999
    BufferNumber 0, VAR_CONSECUTIVE_BONUS_ROUND_WINS
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message GameCorner_Text_ShootFor10
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage GameCorner_Text_ShootFor10
    End

 GameCorner_SignBonusRounds_GreaterThan999:
    BufferNumber 0, 999
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message GameCorner_Text_ShootFor10
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage GameCorner_Text_ShootFor10
    End

 GameCorner_Looker:
--- a/res/field/scripts/scripts_global_terminal_1f.s
+++ b/res/field/scripts/scripts_global_terminal_1f.s
@ -264,83 +264,35 @@ GlobalTerminal1f_GTS_Exit_BadEgg:
    End

 _0374:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message pl_msg_00000046_00010
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage pl_msg_00000046_00010
    End

 _0387:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message pl_msg_00000046_00011
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage pl_msg_00000046_00011
    End

 _039A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message pl_msg_00000046_00012
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage pl_msg_00000046_00012
    End

 _03AD:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message pl_msg_00000046_00013
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage pl_msg_00000046_00013
    End

 _03C0:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message pl_msg_00000046_00014
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage pl_msg_00000046_00014
    End

 _03D3:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message pl_msg_00000046_00015
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage pl_msg_00000046_00015
    End

 _03E6:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message pl_msg_00000046_00016
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage pl_msg_00000046_00016
    End

 _03F9:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message pl_msg_00000046_00017
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage pl_msg_00000046_00017
    End

 _040C:
@ -424,23 +376,11 @@ _0515:
    End

 _0520:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message pl_msg_00000046_00032
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage pl_msg_00000046_00032
    End

 _0533:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message pl_msg_00000046_00033
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage pl_msg_00000046_00033
    End

 _0546:
@ -590,12 +530,7 @@ _074A:
    Return

 _074C:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message pl_msg_00000046_00041
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage pl_msg_00000046_00041
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_global_terminal_2f.s
+++ b/res/field/scripts/scripts_global_terminal_2f.s
@ -19,111 +19,47 @@
    ScriptEntryEnd

 _003A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _004D:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _0060:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 2
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 2
    End

 _0073:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 3
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 3
    End

 _0086:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 4
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 4
    End

 _0099:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 5
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 5
    End

 _00AC:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 6
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 6
    End

 _00BF:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 7
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 7
    End

 _00D2:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 8
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 8
    End

 _00E5:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 9
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 9
    End

 _00F6:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 10
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 10
    End

 _0107:
--- a/res/field/scripts/scripts_global_terminal_3f.s
+++ b/res/field/scripts/scripts_global_terminal_3f.s
@ -18,111 +18,47 @@
    ScriptEntryEnd

 _0036:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0049:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _005C:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 2
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 2
    End

 _006F:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 3
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 3
    End

 _0082:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 4
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 4
    End

 _0095:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 5
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 5
    End

 _00A8:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 6
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 6
    End

 _00BB:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 7
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 7
    End

 _00CE:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 8
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 8
    End

 _00E1:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 9
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 9
    End

 _00F2:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 10
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 10
    End

 _0103:
--- a/res/field/scripts/scripts_grand_lake_route_213_lobby.s
+++ b/res/field/scripts/scripts_grand_lake_route_213_lobby.s
@ -31,13 +31,7 @@ _0014:
    End

 _004C:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 2
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 2
    End

 _005F:
--- a/res/field/scripts/scripts_grand_lake_route_213_northwest_house.s
+++ b/res/field/scripts/scripts_grand_lake_route_213_northwest_house.s
@ -88,13 +88,7 @@ _012F:
    End

 _013A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 8
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 8
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_great_marsh_1.s
+++ b/res/field/scripts/scripts_great_marsh_1.s
@ -7,13 +7,7 @@
    ScriptEntryEnd

 _000A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _001D:
--- a/res/field/scripts/scripts_great_marsh_2.s
+++ b/res/field/scripts/scripts_great_marsh_2.s
@ -7,13 +7,7 @@
    ScriptEntryEnd

 _000A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _001D:
--- a/res/field/scripts/scripts_great_marsh_3.s
+++ b/res/field/scripts/scripts_great_marsh_3.s
@ -7,13 +7,7 @@
    ScriptEntryEnd

 _000A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _001D:
--- a/res/field/scripts/scripts_great_marsh_4.s
+++ b/res/field/scripts/scripts_great_marsh_4.s
@ -7,13 +7,7 @@
    ScriptEntryEnd

 _000A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _001D:
--- a/res/field/scripts/scripts_great_marsh_5.s
+++ b/res/field/scripts/scripts_great_marsh_5.s
@ -7,13 +7,7 @@
    ScriptEntryEnd

 _000A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _001D:
--- a/res/field/scripts/scripts_hearthome_city.s
+++ b/res/field/scripts/scripts_hearthome_city.s
@ -41,96 +41,39 @@ _0082:
    End

 _0084:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 6
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 6
    End

 _0097:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 7
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 7
    End

 _00AA:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 23
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 23
    End

 _00BD:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 8
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 8
    End

 _00D0:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 9
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 9
    End

 _00E3:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 11
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 11
    End

 _00F6:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 13
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 13
    End

 _0109:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 21
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 21
    End

 _011C:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_PACHIRISU
-    Message 22
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_PACHIRISU, 22
    End

 _013B:
@ -266,32 +209,15 @@ _02C4:
    EndMovement

 _02E4:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 19
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 19
    End

 _02F7:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 12
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 12
    End

 _030A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 20
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 20
    End

 _031B:
@ -498,42 +424,19 @@ _06FE:
    End

 _0709:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 47
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 47
    End

 _071C:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 48
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 48
    End

 _072D:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 49
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 49
    End

 _0740:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 50
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 50
    End

 _0753:
@ -664,33 +567,15 @@ _095A:
    End

 _0971:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 3
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 3
    End

 _0984:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 10
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 10
    End

 _0997:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 51
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 51
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_hearthome_city_east_gate_to_amity_square.s
+++ b/res/field/scripts/scripts_hearthome_city_east_gate_to_amity_square.s
@ -18,23 +18,11 @@ _0027:
    End

 _002D:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0040:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_hearthome_city_mart.s
+++ b/res/field/scripts/scripts_hearthome_city_mart.s
@ -9,41 +9,17 @@
    ScriptEntryEnd

 HearthomeCityMart_CommonVendor:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Common_VendorGreeting
-    CloseMessageWithoutErasing
-    PokeMartCommon
-    ReleaseAll
+    PokeMartCommonWithGreeting
    End

 HearthomeCityMart_SpecialtyVendor:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Common_VendorGreeting
-    CloseMessageWithoutErasing
-    PokeMartSpecialties MART_SPECIALTIES_ID_HEARTHOME
-    ReleaseAll
+    PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_HEARTHOME
    End

 HearthomeCityMart_Hiker:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message HearthomeCityMart_Text_CantBuyRevivesWithTwoBadges
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage HearthomeCityMart_Text_CantBuyRevivesWithTwoBadges
    End

 HearthomeCityMart_Beauty:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message HearthomeCityMart_Text_FindAccessoriesInAmitySquare
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage HearthomeCityMart_Text_FindAccessoriesInAmitySquare
    End
--- a/res/field/scripts/scripts_hearthome_city_northeast_house_1f.s
+++ b/res/field/scripts/scripts_hearthome_city_northeast_house_1f.s
@ -14,95 +14,39 @@
    ScriptEntryEnd

 _0026:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0039:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    EventMessage 1
    End

 _004A:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 2
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 2
    End

 _005D:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 3
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 3
    End

 _0070:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 4
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 4
    End

 _0083:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 5
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 5
    End

 _0096:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 6
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 6
    End

 _00A9:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 7
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 7
    End

 _00BC:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_PIKACHU
-    Message 8
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_PIKACHU, 8
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_hearthome_city_northeast_house_2f.s
+++ b/res/field/scripts/scripts_hearthome_city_northeast_house_2f.s
@ -9,43 +9,19 @@
    ScriptEntryEnd

 _0012:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0025:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _0038:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 2
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 2
    End

 _004B:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 3
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 3
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_hearthome_city_pokecenter_1f.s
+++ b/res/field/scripts/scripts_hearthome_city_pokecenter_1f.s
@ -13,33 +13,15 @@ _0012:
    End

 _001E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0031:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _0044:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 3
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 3
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_hearthome_city_pokemon_fan_club.s
+++ b/res/field/scripts/scripts_hearthome_city_pokemon_fan_club.s
@ -117,42 +117,15 @@ _014A:
    End

 _0155:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_PSYDUCK
-    Message 11
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_PSYDUCK, 11
    End

 _0174:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_BUNEARY
-    Message 12
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_BUNEARY, 12
    End

 _0193:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_CLEFAIRY
-    Message 13
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_CLEFAIRY, 13
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_hearthome_city_southeast_house_1f.s
+++ b/res/field/scripts/scripts_hearthome_city_southeast_house_1f.s
@ -9,46 +9,19 @@
    ScriptEntryEnd

 _0012:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0025:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _0038:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 2
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 2
    End

 _004B:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_SHROOMISH
-    Message 3
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_SHROOMISH, 3
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_hearthome_city_southeast_house_2f.s
+++ b/res/field/scripts/scripts_hearthome_city_southeast_house_2f.s
@ -37,16 +37,7 @@ _0064:
    End

 _006E:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_CLEFAIRY
-    Message 2
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_CLEFAIRY, 2
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_hearthome_city_west_gate_to_amity_square.s
+++ b/res/field/scripts/scripts_hearthome_city_west_gate_to_amity_square.s
@ -19,36 +19,15 @@ _002B:
    End

 _0031:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

 _0044:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 1
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 1
    End

 _0057:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_PIKACHU
-    Message 2
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_PIKACHU, 2
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_jubilife_city.s
+++ b/res/field/scripts/scripts_jubilife_city.s
@ -457,13 +457,7 @@ JubilifeCity_HaveYouPaidAVisitToTheTVStation:
    End

 JubilifeCity_AceTrainerM3:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCity_Text_PastHereIsTheGlobalTerminal
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCity_Text_PastHereIsTheGlobalTerminal
    End

 JubilifeCity_TriggerGTSGreeterBlockPlayer:
@ -1254,33 +1248,15 @@ JubilifeCity_APersonThatLikesTheWaterTypeMustBeSomewhatCool:
    End

 JubilifeCity_Twin:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCity_Text_DidYouSeeMeOnTV
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCity_Text_DidYouSeeMeOnTV
    End

 JubilifeCity_AceTrainerM1:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCity_Text_HiyaWheredYouComeFrom
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCity_Text_HiyaWheredYouComeFrom
    End

 JubilifeCity_AceTrainerF:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCity_Text_WhenYouWalkWithYourPokemonTheyGraduallyGrowFriendlier
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCity_Text_WhenYouWalkWithYourPokemonTheyGraduallyGrowFriendlier
    End

 JubilifeCity_ExpertM1:
@ -1308,13 +1284,7 @@ JubilifeCity_OhYoureNotKnowledgeable:
    End

 JubilifeCity_SchoolKidM2:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCity_Text_AtMostYouCanHaveSixPokemonWithYou
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCity_Text_AtMostYouCanHaveSixPokemonWithYou
    End

 JubilifeCity_MapSign:
@ -1650,23 +1620,11 @@ JubilifeCity_YouShouldStickAround:
    End

 JubilifeCity_KidWithNDS1:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCity_Text_ImTradingPokemonWithMyBuddy
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCity_Text_ImTradingPokemonWithMyBuddy
    End

 JubilifeCity_KidWithNDS2:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCity_TextIMadeMyPokemonHoldAnItemBeforeTradingIt
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCity_TextIMadeMyPokemonHoldAnItemBeforeTradingIt
    End

 JubilifeCity_TriggerLookerPalPad:
--- a/res/field/scripts/scripts_jubilife_city_condominiums_1f.s
+++ b/res/field/scripts/scripts_jubilife_city_condominiums_1f.s
@ -9,39 +9,15 @@
    ScriptEntryEnd

 JubilifeCityCondominiums1F_ExpertF:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCityCondominiums1F_Text_IsntMyPoketchQuiteFetching
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCityCondominiums1F_Text_IsntMyPoketchQuiteFetching
    End

 JubilifeCityCondominiums1F_Pikachu:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_PIKACHU
-    Message JubilifeCityCondominiums1F_Text_PiikaPi
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_PIKACHU, JubilifeCityCondominiums1F_Text_PiikaPi
    End

 JubilifeCityCondominiums1F_Pachirisu:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_PACHIRISU
-    Message JubilifeCityCondominiums1F_Text_Pachipachii
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_PACHIRISU, JubilifeCityCondominiums1F_Text_Pachipachii
    End

 JubilifeCityCondominiums1F_Beauty:
--- a/res/field/scripts/scripts_jubilife_city_condominiums_2f.s
+++ b/res/field/scripts/scripts_jubilife_city_condominiums_2f.s
@ -7,21 +7,9 @@
    ScriptEntryEnd

 JubilifeCityCondominiums2F_BugCatcher:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCityCondominiums2F_Text_ILikeHowPokemonCanUseAttacks
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCityCondominiums2F_Text_ILikeHowPokemonCanUseAttacks
    End

 JubilifeCityCondominiums2F_PokemonBreederM:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCityCondominiums2F_Text_DidYouBuySomeHealBallsAtThePokeMart
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCityCondominiums2F_Text_DidYouBuySomeHealBallsAtThePokeMart
    End
--- a/res/field/scripts/scripts_jubilife_city_condominiums_3f.s
+++ b/res/field/scripts/scripts_jubilife_city_condominiums_3f.s
@ -7,21 +7,9 @@
    ScriptEntryEnd

 JubilifeCityCondominiums3F_Collector:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCityCondominiums3F_Text_ICanTradePokemonAroundTheWorldUsingNintendoWFC
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCityCondominiums3F_Text_ICanTradePokemonAroundTheWorldUsingNintendoWFC
    End

 JubilifeCityCondominiums3F_Lass:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCityCondominiums3F_Text_TheWorldYouCanReachWithNintendoWFC
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCityCondominiums3F_Text_TheWorldYouCanReachWithNintendoWFC
    End
--- a/res/field/scripts/scripts_jubilife_city_mart.s
+++ b/res/field/scripts/scripts_jubilife_city_mart.s
@ -10,53 +10,23 @@
    ScriptEntryEnd

 JubilifeCityMart_CommonVendor:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Common_VendorGreeting
-    CloseMessageWithoutErasing
-    PokeMartCommon
-    ReleaseAll
+    PokeMartCommonWithGreeting
    End

 JubilifeCityMart_SpecialtyVendor:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Common_VendorGreeting
-    CloseMessageWithoutErasing
-    PokeMartSpecialties MART_SPECIALTIES_ID_JUBILIFE
-    ReleaseAll
+    PokeMartSpecialtiesWithGreeting MART_SPECIALTIES_ID_JUBILIFE
    End

 JubilifeCityMart_Guitarist:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCityMart_Text_WastedMoneyOnPokeBalls
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCityMart_Text_WastedMoneyOnPokeBalls
    End

 JubilifeCityMart_Pokefan:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCityMart_Text_PackSomePotions
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCityMart_Text_PackSomePotions
    End

 JubilifeCityMart_Beauty:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCityMart_Text_JustUseARepel
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCityMart_Text_JustUseARepel
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s
+++ b/res/field/scripts/scripts_jubilife_city_pokecenter_1f.s
@ -14,33 +14,15 @@ JubilifeCityPokecenter1F_Nurse:
    End

 JubilifeCityPokecenter1F_Twin:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCityPokecenter1F_Text_AllTypesHaveStrengthsAndWeaknesses
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCityPokecenter1F_Text_AllTypesHaveStrengthsAndWeaknesses
    End

 JubilifeCityPokecenter1F_SchoolKidM:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCityPokecenter1F_Text_InTheUnionRoomUpstairsYouCanChatAndTradeWithOtherPeople
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCityPokecenter1F_Text_InTheUnionRoomUpstairsYouCanChatAndTradeWithOtherPeople
    End

 JubilifeCityPokecenter1F_TrainerF:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCityPokecenter1F_Text_YouCanStillCatchAPokemonIfYouAlreadyHaveSixTravelingWithYou
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCityPokecenter1F_Text_YouCanStillCatchAPokemonIfYouAlreadyHaveSixTravelingWithYou
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_jubilife_city_south_house_1f.s
+++ b/res/field/scripts/scripts_jubilife_city_south_house_1f.s
@ -8,36 +8,15 @@
    ScriptEntryEnd

 JubilifeCitySouthHouse1F_AceTrainerM:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCitySouthHouse1F_PokemonAreWonderfulDeeplyMysteriousCreatures
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCitySouthHouse1F_PokemonAreWonderfulDeeplyMysteriousCreatures
    End

 JubilifeCitySouthHouse1F_Lass:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCitySouthHouse1F_TalkToEveryoneYouSee
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCitySouthHouse1F_TalkToEveryoneYouSee
    End

 JubilifeCitySouthHouse1F_Pachirisu:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_PACHIRISU
-    Message JubilifeCitySouthHouse1F_PachirisuKukkuuh
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_PACHIRISU, JubilifeCitySouthHouse1F_PachirisuKukkuuh
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_jubilife_city_south_house_2f.s
+++ b/res/field/scripts/scripts_jubilife_city_south_house_2f.s
@ -8,33 +8,15 @@
    ScriptEntryEnd

 JubilifeCitySouthHouse2F_Youngster:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCitySouthHouse2F_SomeKindsOfPokemonEvolveWhenTheyGetStrongerFromBattling
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCitySouthHouse2F_SomeKindsOfPokemonEvolveWhenTheyGetStrongerFromBattling
    End

 JubilifeCitySouthHouse2F_PokefanF:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCitySouthHouse2F_EvolutionMakesPokemonJustThatMuchMoreFascinating
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCitySouthHouse2F_EvolutionMakesPokemonJustThatMuchMoreFascinating
    End

 JubilifeCitySouthHouse2F_PokemonBreederF:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCitySouthHouse2F_DidntProfRowanConductResearchWithProfOak
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCitySouthHouse2F_DidntProfRowanConductResearchWithProfOak
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_jubilife_city_south_house_3f.s
+++ b/res/field/scripts/scripts_jubilife_city_south_house_3f.s
@ -6,13 +6,7 @@
    ScriptEntryEnd

 JubilifeCitySouthHouse3F_PokefanM:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCitySouthHouse3F_WhenIGiveMyPokemonNicknamesItsLikeTheyreMyVeryOwn
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCitySouthHouse3F_WhenIGiveMyPokemonNicknamesItsLikeTheyreMyVeryOwn
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_jubilife_city_southwest_house_1f.s
+++ b/res/field/scripts/scripts_jubilife_city_southwest_house_1f.s
@ -8,36 +8,15 @@
    ScriptEntryEnd

 JubilifeCitySouthwestHouse1F_Youngster:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCitySouthwestHouse1F_Text_IGotMyPikachuThroughATradeFromSomeone
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCitySouthwestHouse1F_Text_IGotMyPikachuThroughATradeFromSomeone
    End

 JubilifeCitySouthwestHouse1F_Pikachu:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    WaitFanfare SEQ_SE_CONFIRM
-    PlayCry SPECIES_PIKACHU
-    Message JubilifeCitySouthwestHouse1F_Text_PikachuPikapikapikaaah
-    WaitCry
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    PokemonCryAndMessage SPECIES_PIKACHU, JubilifeCitySouthwestHouse1F_Text_PikachuPikapikapikaaah
    End

 JubilifeCitySouthwestHouse1F_MiddleAgedMan:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCitySouthwestHouse1F_Text_IfEveryoneAroundTheWorldHadPokemon
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCitySouthwestHouse1F_Text_IfEveryoneAroundTheWorldHadPokemon
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_jubilife_city_southwest_house_2f.s
+++ b/res/field/scripts/scripts_jubilife_city_southwest_house_2f.s
@ -9,43 +9,19 @@
    ScriptEntryEnd

 JubilifeCitySouthwestHouse2F_AceTrainerM:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCitySouthwestHouse2F_Text_WeComeFromFarawayLand
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCitySouthwestHouse2F_Text_WeComeFromFarawayLand
    End

 JubilifeCitySouthwestHouse2F_Beauty:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCitySouthwestHouse2F_Text_ILikeLookAtPokemonIGetFromFriendInTrade
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCitySouthwestHouse2F_Text_ILikeLookAtPokemonIGetFromFriendInTrade
    End

 JubilifeCitySouthwestHouse2F_Collector:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCitySouthwestHouse2F_Text_YouCanTradePokemonWithPeopleAroundTheWorldOnNintendoWFC
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCitySouthwestHouse2F_Text_YouCanTradePokemonWithPeopleAroundTheWorldOnNintendoWFC
    End

 JubilifeCitySouthwestHouse2F_Lass:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message JubilifeCitySouthwestHouse2F_Text_WhenYouConnectWithPeopleOnNintendoWFCItsHardToBe
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage JubilifeCitySouthwestHouse2F_Text_WhenYouConnectWithPeopleOnNintendoWFCItsHardToBe
    End

    .balign 4, 0
--- a/res/field/scripts/scripts_jubilife_city_unknown_house_1.s
+++ b/res/field/scripts/scripts_jubilife_city_unknown_house_1.s
@ -6,13 +6,7 @@
    ScriptEntryEnd

 _0006:
-    PlayFanfare SEQ_SE_CONFIRM
-    LockAll
-    FacePlayer
-    Message 0
-    WaitABXPadPress
-    CloseMessage
-    ReleaseAll
+    NPCMessage 0
    End

    .balign 4, 0
--- a/Show More
+++ b/Show More