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

Review fixes

Browse Source
This commit is contained in:
Tustin2121 2019-08-17 23:26:46 -04:00
parent d63a8ba817
commit 18dee14170
7 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/macros/event.inc
View File

@ -1083,8 +1083,6 @@
@ Hides the secondary box spawned by showmoney.
.macro hidemoneybox
.byte 0x94
.byte 0 @ leftovers from ruby/sapphire. x, y params not used
.byte 0
.endm
@ Updates the secondary box spawned by showmoney. Consumes but does not use arguments.

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

@ -143,7 +143,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_22032F:: @ 822032F
call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220321
compare VAR_TEMP_1, 2
call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_220328
updatemoneybox 0,0
updatemoneybox 0, 0
bufferitemname 0, VAR_TEMP_0
playse SE_JIHANKI
msgbox LilycoveCity_DepartmentStoreRooftop_Text_2205A1, MSGBOX_DEFAULT
@ -196,6 +196,8 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_220450:: @ 8220450
LilycoveCity_DepartmentStoreRooftop_EventScript_22045E:: @ 822045E
hidemoneybox
nop
nop
releaseall
end

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

@ -39,11 +39,13 @@ MauvilleCity_GameCorner_EventScript_20FC33:: @ 820FC33
goto_if_eq MauvilleCity_GameCorner_EventScript_20FCC1
givecoins 50
takemoney 0x3e8, 0
updatemoneybox 0,0
updatemoneybox 0, 0
updatecoinsbox 1, 6
playse SE_REGI
msgbox MauvilleCity_GameCorner_Text_210529, MSGBOX_DEFAULT
hidemoneybox
nop
nop
hidecoinsbox 0, 5
release
end
@ -57,11 +59,13 @@ MauvilleCity_GameCorner_EventScript_20FC75:: @ 820FC75
goto_if_eq MauvilleCity_GameCorner_EventScript_20FCC1
givecoins 500
takemoney 0x2710, 0
updatemoneybox 0,0
updatemoneybox 0, 0
updatecoinsbox 1, 6
playse SE_REGI
msgbox MauvilleCity_GameCorner_Text_210529, MSGBOX_DEFAULT
hidemoneybox
nop
nop
hidecoinsbox 0, 5
release
end
@ -74,6 +78,8 @@ MauvilleCity_GameCorner_EventScript_20FCB7:: @ 820FCB7
MauvilleCity_GameCorner_EventScript_20FCC1:: @ 820FCC1
msgbox MauvilleCity_GameCorner_Text_210553, MSGBOX_DEFAULT
hidemoneybox
nop
nop
hidecoinsbox 0, 5
release
end
@ -81,6 +87,8 @@ MauvilleCity_GameCorner_EventScript_20FCC1:: @ 820FCC1
MauvilleCity_GameCorner_EventScript_20FCD1:: @ 820FCD1
msgbox MauvilleCity_GameCorner_Text_21059A, MSGBOX_DEFAULT
hidemoneybox
nop
nop
hidecoinsbox 0, 5
release
end
@ -88,6 +96,8 @@ MauvilleCity_GameCorner_EventScript_20FCD1:: @ 820FCD1
MauvilleCity_GameCorner_EventScript_20FCE1:: @ 820FCE1
msgbox MauvilleCity_GameCorner_Text_21057E, MSGBOX_DEFAULT
hidemoneybox
nop
nop
hidecoinsbox 0, 5
release
end

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

@ -115,29 +115,37 @@ MtChimney_EventScript_22EEF3:: @ 822EEF3
compare VAR_RESULT, 0
goto_if_eq MtChimney_EventScript_22EF51
hidemoneybox
nop
nop
release
end
MtChimney_EventScript_22EF51:: @ 822EF51
msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
hidemoneybox
nop
nop
release
end
MtChimney_EventScript_22EF5E:: @ 822EF5E
takemoney 0xc8, 0
updatemoneybox 0,0
updatemoneybox 0, 0
return
MtChimney_EventScript_22EF69:: @ 822EF69
msgbox MtChimney_Text_22FE9B, MSGBOX_DEFAULT
hidemoneybox
nop
nop
release
end
MtChimney_EventScript_22EF76:: @ 822EF76
msgbox MtChimney_Text_22FE5E, MSGBOX_DEFAULT
hidemoneybox
nop
nop
release
end

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

@ -43,6 +43,8 @@ Route109_SeashoreHouse_EventScript_269460:: @ 8269460
goto_if_eq Route109_SeashoreHouse_EventScript_269484
msgbox Route109_SeashoreHouse_Text_2697EF, MSGBOX_DEFAULT
hidemoneybox
nop
nop
release
end
@ -55,21 +57,27 @@ Route109_SeashoreHouse_EventScript_269484:: @ 8269484
goto_if_eq Route109_SeashoreHouse_EventScript_2694D5
msgbox Route109_SeashoreHouse_Text_2697C8, MSGBOX_DEFAULT
takemoney 0x12c, 0
updatemoneybox 0,0
updatemoneybox 0, 0
giveitem_std ITEM_SODA_POP
hidemoneybox
nop
nop
release
end
Route109_SeashoreHouse_EventScript_2694C8:: @ 82694C8
msgbox Route109_SeashoreHouse_Text_2697D5, MSGBOX_DEFAULT
hidemoneybox
nop
nop
release
end
Route109_SeashoreHouse_EventScript_2694D5:: @ 82694D5
msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
hidemoneybox
nop
nop
release
end

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

@ -67,7 +67,7 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48
playse SE_REGI
msgbox Route121_SafariZoneEntrance_Text_2A501B, MSGBOX_DEFAULT
takemoney 0x1f4, 0
updatemoneybox 0,0
updatemoneybox 0, 0
msgbox Route121_SafariZoneEntrance_Text_2A5036, MSGBOX_DEFAULT
playfanfare MUS_FANFA4
message Route121_SafariZoneEntrance_Text_2A5052
@ -75,6 +75,8 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48
msgbox Route121_SafariZoneEntrance_Text_2A506F, MSGBOX_DEFAULT
closemessage
hidemoneybox
nop
nop
applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BD18
waitmovement 0
special EnterSafariMode
@ -111,6 +113,8 @@ Route121_SafariZoneEntrance_EventScript_22BCF8:: @ 822BCF8
Route121_SafariZoneEntrance_EventScript_22BD06:: @ 822BD06
closemessage
hidemoneybox
nop
nop
applymovement EVENT_OBJ_ID_PLAYER, Route121_SafariZoneEntrance_Movement_22BD16
waitmovement 0
releaseall

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

@ -26,6 +26,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADC1:: @ 820ADC1
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20ADE8
closemessage
hidemoneybox
nop
nop
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AE4B
waitmovement 0
releaseall
@ -37,10 +39,12 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AE18
playse SE_REGI
takemoney 0x32, 0
updatemoneybox 0,0
updatemoneybox 0, 0
msgbox SlateportCity_OceanicMuseum_1F_Text_20B026, MSGBOX_DEFAULT
setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
hidemoneybox
nop
nop
releaseall
end
@ -49,6 +53,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18
msgbox SlateportCity_OceanicMuseum_1F_Text_20B03D, MSGBOX_DEFAULT
closemessage
hidemoneybox
nop
nop
applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_OceanicMuseum_1F_Movement_20AE4B
waitmovement 0
releaseall
@ -58,6 +64,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AE39:: @ 820AE39
msgbox SlateportCity_OceanicMuseum_1F_Text_20B075, MSGBOX_DEFAULT
setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1
hidemoneybox
nop
nop
releaseall
end