summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/macros/event.inc12
-rw-r--r--data-de/event_scripts.s6
-rw-r--r--data/event_scripts.s6
-rw-r--r--data/script_cmd_table.inc12
-rw-r--r--data/scripts/maps/DewfordTown_Gym.inc10
-rw-r--r--data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc16
-rw-r--r--data/scripts/maps/MauvilleCity_GameCorner.inc20
-rw-r--r--data/scripts/maps/MtChimney.inc14
-rw-r--r--data/scripts/maps/Route109_SeashoreHouse.inc14
-rw-r--r--data/scripts/maps/Route121_SafariZoneEntrance.inc10
-rw-r--r--data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc14
-rw-r--r--src/field/scrcmd.c12
12 files changed, 73 insertions, 73 deletions
diff --git a/asm/macros/event.inc b/asm/macros/event.inc
index bad196e93..c313bf44f 100644
--- a/asm/macros/event.inc
+++ b/asm/macros/event.inc
@@ -989,7 +989,7 @@
.endm
@ If check is 0x00, this command subtracts value from the player's money.
- .macro paymoney value, check
+ .macro takemoney value, check
.byte 0x91
.4byte \value
.byte \check
@@ -1003,28 +1003,28 @@
.endm
@ Spawns a secondary box showing how much money the player has.
- .macro showmoney X, Y
+ .macro showmoneybox X, Y
.byte 0x93
.byte \X
.byte \Y
.endm
@ Hides the secondary box spawned by showmoney.
- .macro hidemoney X, Y
+ .macro hidemoneybox X, Y
.byte 0x94
.byte \X
.byte \Y
.endm
@ Updates the secondary box spawned by showmoney. (What does it do with its arguments?)
- .macro updatemoney X, Y
+ .macro updatemoneybox X, Y
.byte 0x95
.byte \X
.byte \Y
.endm
@ In FireRed, this command is a nop.
- .macro event_96 word
+ .macro getpricereduction word
.byte 0x96
.2byte \word
.endm
@@ -1041,7 +1041,7 @@
.byte \byte2
.endm
- .macro darken word
+ .macro setdarklevel word
.byte 0x99
.2byte \word
.endm
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s
index 3ceecaa84..d7045722f 100644
--- a/data-de/event_scripts.s
+++ b/data-de/event_scripts.s
@@ -4796,7 +4796,7 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F
gUnknown_081B694A:: @ 81B694A
lighten 1
- darken 1
+ setdarklevel 1
end
.include "data/scripts/players_house.inc"
@@ -4825,7 +4825,7 @@ MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
setvar 0x8004, 0
- event_96 2
+ getpricereduction 2
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA
addvar 0x8004, 128
@@ -4837,7 +4837,7 @@ MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
setvar 0x8004, 1
- event_96 2
+ getpricereduction 2
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA
addvar 0x8004, 128
diff --git a/data/event_scripts.s b/data/event_scripts.s
index fddae04a9..1ceb9a7c0 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -4764,7 +4764,7 @@ BattleTower_Lobby_EventScript_1AE30F:: @ 81AE30F
gUnknown_081B694A:: @ 81B694A
lighten 1
- darken 1
+ setdarklevel 1
end
.include "data/scripts/players_house.inc"
@@ -4793,7 +4793,7 @@ MauvilleCity_GameCorner_EventScript_1C407E:: @ 81C407E
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
setvar 0x8004, 0
- event_96 2
+ getpricereduction 2
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA
addvar 0x8004, 128
@@ -4805,7 +4805,7 @@ MauvilleCity_GameCorner_EventScript_1C40AC:: @ 81C40AC
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5
setvar 0x8004, 1
- event_96 2
+ getpricereduction 2
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_1C40DA
addvar 0x8004, 128
diff --git a/data/script_cmd_table.inc b/data/script_cmd_table.inc
index 38a4a8f3f..414c2df52 100644
--- a/data/script_cmd_table.inc
+++ b/data/script_cmd_table.inc
@@ -145,15 +145,15 @@ gScriptCmdTable:: @ 814AE30
.4byte ScrCmd_contestlinktransfer @ 0x8E
.4byte ScrCmd_random @ 0x8F
.4byte ScrCmd_givemoney @ 0x90
- .4byte ScrCmd_paymoney @ 0x91
+ .4byte ScrCmd_takemoney @ 0x91
.4byte ScrCmd_checkmoney @ 0x92
- .4byte ScrCmd_showmoney @ 0x93
- .4byte ScrCmd_hidemoney @ 0x94
- .4byte ScrCmd_updatemoney @ 0x95
- .4byte ScrCmd_event_96 @ 0x96
+ .4byte ScrCmd_showmoneybox @ 0x93
+ .4byte ScrCmd_hidemoneybox @ 0x94
+ .4byte ScrCmd_updatemoneybox @ 0x95
+ .4byte ScrCmd_getpricereduction @ 0x96
.4byte ScrCmd_fadescreen @ 0x97
.4byte ScrCmd_fadescreendelay @ 0x98
- .4byte ScrCmd_darken @ 0x99
+ .4byte ScrCmd_setdarklevel @ 0x99
.4byte ScrCmd_lighten @ 0x9A
.4byte ScrCmd_message2 @ 0x9B
.4byte ScrCmd_doanimation @ 0x9C
diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc
index 296d2ed2d..65556c739 100644
--- a/data/scripts/maps/DewfordTown_Gym.inc
+++ b/data/scripts/maps/DewfordTown_Gym.inc
@@ -20,23 +20,23 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071
goto DewfordTown_Gym_EventScript_1530AE
DewfordTown_Gym_EventScript_1530AA:: @ 81530AA
- darken 0
+ setdarklevel 0
return
DewfordTown_Gym_EventScript_1530AE:: @ 81530AE
- darken 1
+ setdarklevel 1
return
DewfordTown_Gym_EventScript_1530B2:: @ 81530B2
- darken 2
+ setdarklevel 2
return
DewfordTown_Gym_EventScript_1530B6:: @ 81530B6
- darken 3
+ setdarklevel 3
return
DewfordTown_Gym_EventScript_1530BA:: @ 81530BA
- darken 4
+ setdarklevel 4
return
DewfordTown_Gym_EventScript_1530BE:: @ 81530BE
diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
index 03d64bbd1..29914a9b5 100644
--- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
+++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc
@@ -3,7 +3,7 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F
.byte 0
LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145
- event_96 3
+ getpricereduction 3
compare RESULT, 1
call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F
compare RESULT, 0
@@ -51,7 +51,7 @@ LilycoveCity_DepartmentStoreRooftop_Decorations:: @ 815A180
LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0:: @ 815A1A0
lock
faceplayer
- event_96 3
+ getpricereduction 3
compare RESULT, 1
call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA
msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, 4
@@ -71,7 +71,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD:: @ 815A1CD
lockall
message LilycoveCity_DepartmentStoreRooftop_Text_18C72B
waitmessage
- showmoney 0, 0
+ showmoneybox 0, 0
nop
goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE
end
@@ -115,15 +115,15 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B:: @ 815A24B
return
LilycoveCity_DepartmentStoreRooftop_EventScript_15A252:: @ 815A252
- paymoney 0xc8, 0
+ takemoney 0xc8, 0
return
LilycoveCity_DepartmentStoreRooftop_EventScript_15A259:: @ 815A259
- paymoney 0x12c, 0
+ takemoney 0x12c, 0
return
LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260
- paymoney 0x15e, 0
+ takemoney 0x15e, 0
return
LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267
@@ -144,7 +144,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267
call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259
compare 0x4001, 2
call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260
- updatemoney 0, 0
+ updatemoneybox 0, 0
nop
getitemname 0, 0x4000
playse 106
@@ -197,6 +197,6 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A388:: @ 815A388
end
LilycoveCity_DepartmentStoreRooftop_EventScript_15A396:: @ 815A396
- hidemoney 0, 0
+ hidemoneybox 0, 0
releaseall
end
diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc
index 0a853b2fc..8d98f03a8 100644
--- a/data/scripts/maps/MauvilleCity_GameCorner.inc
+++ b/data/scripts/maps/MauvilleCity_GameCorner.inc
@@ -10,7 +10,7 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34
goto_if_eq MauvilleCity_GameCorner_EventScript_156B32
message MauvilleCity_GameCorner_Text_181CB4
waitmessage
- showmoney 0, 0
+ showmoneybox 0, 0
nop
showcoins 0, 5
goto MauvilleCity_GameCorner_EventScript_156A60
@@ -39,13 +39,13 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C
givecoins 50
- paymoney 0x3e8, 0
- updatemoney 0, 0
+ takemoney 0x3e8, 0
+ updatemoneybox 0, 0
nop
updatecoins 0, 5
playse 95
msgbox MauvilleCity_GameCorner_Text_181CFE, 4
- hidemoney 0, 0
+ hidemoneybox 0, 0
hidecoins 0, 5
release
end
@@ -58,13 +58,13 @@ MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0
compare RESULT, 0
goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C
givecoins 500
- paymoney 0x2710, 0
- updatemoney 0, 0
+ takemoney 0x2710, 0
+ updatemoneybox 0, 0
nop
updatecoins 0, 5
playse 95
msgbox MauvilleCity_GameCorner_Text_181CFE, 4
- hidemoney 0, 0
+ hidemoneybox 0, 0
hidecoins 0, 5
release
end
@@ -76,21 +76,21 @@ MauvilleCity_GameCorner_EventScript_156B32:: @ 8156B32
MauvilleCity_GameCorner_EventScript_156B3C:: @ 8156B3C
msgbox MauvilleCity_GameCorner_Text_181D28, 4
- hidemoney 0, 0
+ hidemoneybox 0, 0
hidecoins 0, 5
release
end
MauvilleCity_GameCorner_EventScript_156B4C:: @ 8156B4C
msgbox MauvilleCity_GameCorner_Text_181D73, 4
- hidemoney 0, 0
+ hidemoneybox 0, 0
hidecoins 0, 5
release
end
MauvilleCity_GameCorner_EventScript_156B5C:: @ 8156B5C
msgbox MauvilleCity_GameCorner_Text_181D57, 4
- hidemoney 0, 0
+ hidemoneybox 0, 0
hidecoins 0, 5
release
end
diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc
index d206f927e..a8eec9a32 100644
--- a/data/scripts/maps/MtChimney.inc
+++ b/data/scripts/maps/MtChimney.inc
@@ -15,7 +15,7 @@ MtChimney_MapScript1_15CF92:: @ 815CF92
MtChimney_EventScript_15CF95:: @ 815CF95
lock
faceplayer
- showmoney 0, 0
+ showmoneybox 0, 0
nop
msgbox MtChimney_Text_195760, 5
compare RESULT, 0
@@ -30,31 +30,31 @@ MtChimney_EventScript_15CF95:: @ 815CF95
giveitem ITEM_LAVA_COOKIE
compare RESULT, 0
goto_if_eq MtChimney_EventScript_15CFF3
- hidemoney 0, 0
+ hidemoneybox 0, 0
release
end
MtChimney_EventScript_15CFF3:: @ 815CFF3
msgbox MtChimney_Text_1A0CC2, 4
- hidemoney 0, 0
+ hidemoneybox 0, 0
release
end
MtChimney_EventScript_15D000:: @ 815D000
- paymoney 0xc8, 0
- updatemoney 0, 0
+ takemoney 0xc8, 0
+ updatemoneybox 0, 0
nop
return
MtChimney_EventScript_15D00B:: @ 815D00B
msgbox MtChimney_Text_1957F7, 4
- hidemoney 0, 0
+ hidemoneybox 0, 0
release
end
MtChimney_EventScript_15D018:: @ 815D018
msgbox MtChimney_Text_1957BA, 4
- hidemoney 0, 0
+ hidemoneybox 0, 0
release
end
diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc
index 789ee3e56..4d8d363aa 100644
--- a/data/scripts/maps/Route109_SeashoreHouse.inc
+++ b/data/scripts/maps/Route109_SeashoreHouse.inc
@@ -40,13 +40,13 @@ Route109_SeashoreHouse_EventScript_160E2C:: @ 8160E2C
end
Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36
- showmoney 0, 0
+ showmoneybox 0, 0
nop
msgbox Route109_SeashoreHouse_Text_19B702, 5
compare RESULT, 1
goto_if_eq Route109_SeashoreHouse_EventScript_160E5A
msgbox Route109_SeashoreHouse_Text_19B773, 4
- hidemoney 0, 0
+ hidemoneybox 0, 0
release
end
@@ -58,23 +58,23 @@ Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A
compare RESULT, 0
goto_if_eq Route109_SeashoreHouse_EventScript_160EAB
msgbox Route109_SeashoreHouse_Text_19B74C, 4
- paymoney 0x12c, 0
- updatemoney 0, 0
+ takemoney 0x12c, 0
+ updatemoneybox 0, 0
nop
giveitem ITEM_SODA_POP
- hidemoney 0, 0
+ hidemoneybox 0, 0
release
end
Route109_SeashoreHouse_EventScript_160E9E:: @ 8160E9E
msgbox Route109_SeashoreHouse_Text_19B759, 4
- hidemoney 0, 0
+ hidemoneybox 0, 0
release
end
Route109_SeashoreHouse_EventScript_160EAB:: @ 8160EAB
msgbox Route109_SeashoreHouse_Text_1A0CC2, 4
- hidemoney 0, 0
+ hidemoneybox 0, 0
release
end
diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc
index c9439ee5f..9649271f4 100644
--- a/data/scripts/maps/Route121_SafariZoneEntrance.inc
+++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc
@@ -49,7 +49,7 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383
lockall
applymovement 255, Route121_SafariZoneEntrance_Movement_1A0841
waitmovement 0
- showmoney 0, 0
+ showmoneybox 0, 0
nop
msgbox Route121_SafariZoneEntrance_Text_1C3832, 5
compare RESULT, 1
@@ -67,8 +67,8 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3
compare RESULT, 0
goto_if_eq Route121_SafariZoneEntrance_EventScript_15C45E
msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4
- paymoney 0x1f4, 0
- updatemoney 0, 0
+ takemoney 0x1f4, 0
+ updatemoneybox 0, 0
nop
msgbox Route121_SafariZoneEntrance_Text_1C38F4, 4
playfanfare 370
@@ -77,7 +77,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3
waitmessage
msgbox Route121_SafariZoneEntrance_Text_1C392D, 4
closemessage
- hidemoney 0, 0
+ hidemoneybox 0, 0
applymovement 255, Route121_SafariZoneEntrance_Movement_15C47E
waitmovement 0
special EnterSafariMode
@@ -112,7 +112,7 @@ Route121_SafariZoneEntrance_EventScript_15C45E:: @ 815C45E
Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C
closemessage
- hidemoney 0, 0
+ hidemoneybox 0, 0
applymovement 255, Route121_SafariZoneEntrance_Movement_15C47C
waitmovement 0
releaseall
diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
index f1da0c5a3..1ee8ff39b 100644
--- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
+++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc
@@ -31,13 +31,13 @@ SlateportCity_OceanicMuseum_1F_EventScript_155AF5:: @ 8155AF5
end
SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06
- showmoney 0, 0
+ showmoneybox 0, 0
nop
msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, 5
compare RESULT, 1
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D
closemessage
- hidemoney 0, 0
+ hidemoneybox 0, 0
applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D
waitmovement 0
releaseall
@@ -47,12 +47,12 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D
checkmoney 0x32, 0
compare RESULT, 0
goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B5A
- paymoney 0x32, 0
- updatemoney 0, 0
+ takemoney 0x32, 0
+ updatemoneybox 0, 0
nop
msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, 4
setvar 0x40aa, 1
- hidemoney 0, 0
+ hidemoneybox 0, 0
releaseall
end
@@ -61,7 +61,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A
goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B
msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4
closemessage
- hidemoney 0, 0
+ hidemoneybox 0, 0
applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D
waitmovement 0
releaseall
@@ -70,7 +70,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A
SlateportCity_OceanicMuseum_1F_EventScript_155B7B:: @ 8155B7B
msgbox SlateportCity_OceanicMuseum_1F_Text_17E22D, 4
setvar 0x40aa, 1
- hidemoney 0, 0
+ hidemoneybox 0, 0
releaseall
end
diff --git a/src/field/scrcmd.c b/src/field/scrcmd.c
index 219dab818..5bb4e31c7 100644
--- a/src/field/scrcmd.c
+++ b/src/field/scrcmd.c
@@ -608,7 +608,7 @@ bool8 ScrCmd_lighten(struct ScriptContext *ctx)
return TRUE;
}
-bool8 ScrCmd_darken(struct ScriptContext *ctx)
+bool8 ScrCmd_setdarklevel(struct ScriptContext *ctx)
{
u16 flashLevel = VarGet(ScriptReadHalfword(ctx));
@@ -1608,7 +1608,7 @@ bool8 ScrCmd_givemoney(struct ScriptContext *ctx)
return FALSE;
}
-bool8 ScrCmd_paymoney(struct ScriptContext *ctx)
+bool8 ScrCmd_takemoney(struct ScriptContext *ctx)
{
u32 amount = ScriptReadWord(ctx);
u8 ignore = ScriptReadByte(ctx);
@@ -1628,7 +1628,7 @@ bool8 ScrCmd_checkmoney(struct ScriptContext *ctx)
return FALSE;
}
-bool8 ScrCmd_showmoney(struct ScriptContext *ctx)
+bool8 ScrCmd_showmoneybox(struct ScriptContext *ctx)
{
u8 x = ScriptReadByte(ctx);
u8 y = ScriptReadByte(ctx);
@@ -1639,7 +1639,7 @@ bool8 ScrCmd_showmoney(struct ScriptContext *ctx)
return FALSE;
}
-bool8 ScrCmd_hidemoney(struct ScriptContext *ctx)
+bool8 ScrCmd_hidemoneybox(struct ScriptContext *ctx)
{
u8 x = ScriptReadByte(ctx);
u8 y = ScriptReadByte(ctx);
@@ -1648,7 +1648,7 @@ bool8 ScrCmd_hidemoney(struct ScriptContext *ctx)
return FALSE;
}
-bool8 ScrCmd_updatemoney(struct ScriptContext *ctx)
+bool8 ScrCmd_updatemoneybox(struct ScriptContext *ctx)
{
u8 x = ScriptReadByte(ctx);
u8 y = ScriptReadByte(ctx);
@@ -1800,7 +1800,7 @@ bool8 ScrCmd_plantberrytree(struct ScriptContext *ctx)
return FALSE;
}
-bool8 ScrCmd_event_96(struct ScriptContext *ctx)
+bool8 ScrCmd_getpricereduction(struct ScriptContext *ctx)
{
u16 value = VarGet(ScriptReadHalfword(ctx));
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-19 11:59:59 +0000