summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/macros/event.inc2
-rw-r--r--data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc2
-rw-r--r--data/maps/MauvilleCity_GameCorner/scripts.inc10
-rw-r--r--data/maps/MtChimney/scripts.inc8
-rw-r--r--data/maps/Route109_SeashoreHouse/scripts.inc8
-rw-r--r--data/maps/Route121_SafariZoneEntrance/scripts.inc4
-rw-r--r--data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc8
7 files changed, 2 insertions, 40 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index 40430fe53..de98d6fa3 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -1083,6 +1083,8 @@
@ Hides the secondary box spawned by showmoney.
.macro hidemoneybox
.byte 0x94
+ nop
+ nop
.endm
@ Updates the secondary box spawned by showmoney. Consumes but does not use arguments.
diff --git a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
index 0cb3e79fe..906286bc7 100644
--- a/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
+++ b/data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
@@ -196,8 +196,6 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink:: @ 8220450
LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine:: @ 822045E
hidemoneybox
- nop
- nop
releaseall
end
diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc
index 2a77c010f..2bafd056e 100644
--- a/data/maps/MauvilleCity_GameCorner/scripts.inc
+++ b/data/maps/MauvilleCity_GameCorner/scripts.inc
@@ -56,8 +56,6 @@ MauvilleCity_GameCorner_EventScript_Buy50Coins:: @ 820FC33
playse SE_REGI
msgbox MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins, MSGBOX_DEFAULT
hidemoneybox
- nop
- nop
hidecoinsbox 0, 5
release
end
@@ -76,8 +74,6 @@ MauvilleCity_GameCorner_EventScript_Buy500Coins:: @ 820FC75
playse SE_REGI
msgbox MauvilleCity_GameCorner_Text_ThankYouHereAreYourCoins, MSGBOX_DEFAULT
hidemoneybox
- nop
- nop
hidecoinsbox 0, 5
release
end
@@ -90,8 +86,6 @@ MauvilleCity_GameCorner_EventScript_NeedCoinCase:: @ 820FCB7
MauvilleCity_GameCorner_EventScript_NotEnoughMoney:: @ 820FCC1
msgbox MauvilleCity_GameCorner_Text_DontHaveEnoughMoney, MSGBOX_DEFAULT
hidemoneybox
- nop
- nop
hidecoinsbox 0, 5
release
end
@@ -99,8 +93,6 @@ MauvilleCity_GameCorner_EventScript_NotEnoughMoney:: @ 820FCC1
MauvilleCity_GameCorner_EventScript_CancelBuyCoins:: @ 820FCD1
msgbox MauvilleCity_GameCorner_Text_DontNeedCoinsThen, MSGBOX_DEFAULT
hidemoneybox
- nop
- nop
hidecoinsbox 0, 5
release
end
@@ -108,8 +100,6 @@ MauvilleCity_GameCorner_EventScript_CancelBuyCoins:: @ 820FCD1
MauvilleCity_GameCorner_EventScript_NoRoomForCoins:: @ 820FCE1
msgbox MauvilleCity_GameCorner_Text_CoinCaseIsFull, MSGBOX_DEFAULT
hidemoneybox
- nop
- nop
hidecoinsbox 0, 5
release
end
diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc
index c7283ef0f..a70d7e3ae 100644
--- a/data/maps/MtChimney/scripts.inc
+++ b/data/maps/MtChimney/scripts.inc
@@ -115,16 +115,12 @@ MtChimney_EventScript_LavaCookieLady:: @ 822EEF3
compare VAR_RESULT, FALSE
goto_if_eq MtChimney_EventScript_BagIsFull
hidemoneybox
- nop
- nop
release
end
MtChimney_EventScript_BagIsFull:: @ 822EF51
msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
hidemoneybox
- nop
- nop
release
end
@@ -136,16 +132,12 @@ MtChimney_EventScript_TakeMoney:: @ 822EF5E
MtChimney_EventScript_DeclineLavaCookie:: @ 822EF69
msgbox MtChimney_Text_OhFineThen, MSGBOX_DEFAULT
hidemoneybox
- nop
- nop
release
end
MtChimney_EventScript_NotEnoughMoney:: @ 822EF76
msgbox MtChimney_Text_YouveNotGotTheMoney, MSGBOX_DEFAULT
hidemoneybox
- nop
- nop
release
end
diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc
index bc018c2f0..dc54ab491 100644
--- a/data/maps/Route109_SeashoreHouse/scripts.inc
+++ b/data/maps/Route109_SeashoreHouse/scripts.inc
@@ -43,8 +43,6 @@ Route109_SeashoreHouse_EventScript_AlreadyReceivedSodaPop:: @ 8269460
goto_if_eq Route109_SeashoreHouse_EventScript_BuySodaPop
msgbox Route109_SeashoreHouse_Text_ThatsTooBad, MSGBOX_DEFAULT
hidemoneybox
- nop
- nop
release
end
@@ -60,24 +58,18 @@ Route109_SeashoreHouse_EventScript_BuySodaPop:: @ 8269484
updatemoneybox 0, 0
giveitem_std ITEM_SODA_POP
hidemoneybox
- nop
- nop
release
end
Route109_SeashoreHouse_EventScript_NotEnoughMoney:: @ 82694C8
msgbox Route109_SeashoreHouse_Text_NotEnoughMoney, MSGBOX_DEFAULT
hidemoneybox
- nop
- nop
release
end
Route109_SeashoreHouse_EventScript_NotEnoughSpace:: @ 82694D5
msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
hidemoneybox
- nop
- nop
release
end
diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc
index 5f64957cb..6da6396be 100644
--- a/data/maps/Route121_SafariZoneEntrance/scripts.inc
+++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc
@@ -75,8 +75,6 @@ Route121_SafariZoneEntrance_EventScript_TryEnterSafariZone:: @ 822BC48
msgbox Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT
closemessage
hidemoneybox
- nop
- nop
applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_EnterSafariZone
waitmovement 0
special EnterSafariMode
@@ -113,8 +111,6 @@ Route121_SafariZoneEntrance_EventScript_NotEnoughMoney:: @ 822BCF8
Route121_SafariZoneEntrance_EventScript_MovePlayerBackFromCounter:: @ 822BD06
closemessage
hidemoneybox
- nop
- nop
applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_BackAwayFromCounter
waitmovement 0
releaseall
diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
index dcf92fe2d..a6e6541da 100644
--- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
+++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
@@ -26,8 +26,6 @@ SlateportCity_OceanicMuseum_1F_EventScript_PayEntranceFee:: @ 820ADC1
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee
closemessage
hidemoneybox
- nop
- nop
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter
waitmovement 0
releaseall
@@ -43,8 +41,6 @@ SlateportCity_OceanicMuseum_1F_EventScript_CheckMoneyForFee:: @ 820ADE8
msgbox SlateportCity_OceanicMuseum_1F_Text_PleaseEnjoyYourself, MSGBOX_DEFAULT
setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
hidemoneybox
- nop
- nop
releaseall
end
@@ -53,8 +49,6 @@ SlateportCity_OceanicMuseum_1F_EventScript_NotEnoughMoney:: @ 820AE18
msgbox SlateportCity_OceanicMuseum_1F_Text_NotEnoughMoney, MSGBOX_DEFAULT
closemessage
hidemoneybox
- nop
- nop
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_PushPlayerBackFromCounter
waitmovement 0
releaseall
@@ -64,8 +58,6 @@ SlateportCity_OceanicMuseum_1F_EventScript_AllowEntranceAnyway:: @ 820AE39
msgbox SlateportCity_OceanicMuseum_1F_Text_CatchUpWithYourGroup, MSGBOX_DEFAULT
setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
hidemoneybox
- nop
- nop
releaseall
end
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 14:45:34 +0000