ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fold nops into hidemoneybox

Browse Source
This commit is contained in:
GriffinR 2019-11-07 10:37:15 -05:00
parent 0b5c2c2721
commit d5685db19a
7 changed files with 2 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/macros/event.inc
View File

@ -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.

2
data/maps/LilycoveCity_DepartmentStoreRooftop/scripts.inc
View File

@ -196,8 +196,6 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_NoRoomForDrink:: @ 8220450
LilycoveCity_DepartmentStoreRooftop_EventScript_ExitVendingMachine:: @ 822045E
hidemoneybox
nop
nop
releaseall
end

10
data/maps/MauvilleCity_GameCorner/scripts.inc
View File

@ -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

8
data/maps/MtChimney/scripts.inc
View File

@ -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

8
data/maps/Route109_SeashoreHouse/scripts.inc
View File

@ -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

4
data/maps/Route121_SafariZoneEntrance/scripts.inc
View File

@ -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

8
data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc
View File

@ -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