diff --git a/include/EA_Standard_Library/Code_Ailases.h b/include/EA_Standard_Library/Code_Ailases.h deleted file mode 100644 index 4bfc81b44..000000000 --- a/include/EA_Standard_Library/Code_Ailases.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#define SLOTS_SETFROMQUEUE SDEQUEUE -#define SAVETOQUEUE SENQUEUE1 -#define STQFROMSLOT SENQUEUE1 diff --git a/include/EA_Standard_Library/Code_Aliases.h b/include/EA_Standard_Library/Code_Aliases.h new file mode 100644 index 000000000..227f2c062 --- /dev/null +++ b/include/EA_Standard_Library/Code_Aliases.h @@ -0,0 +1,11 @@ +#pragma once + +// Backwards compatibility with Event Assembler standard library raws + +#define SLOTS_SETFROMQUEUE SDEQUEUE +#define SAVETOQUEUE SENQUEUE1 +#define STQFROMSLOT SENQUEUE1 + +#define GIVEITEMTO GIVE_ITEM +#define GIVEITEMTOMAIN GIVE_MONEY +#define GIVETOSLOT3 TAKE_MONEY diff --git a/include/EA_Standard_Library/Main_Code_Helpers.h b/include/EA_Standard_Library/Main_Code_Helpers.h index 36020a452..1e7bbc3a4 100644 --- a/include/EA_Standard_Library/Main_Code_Helpers.h +++ b/include/EA_Standard_Library/Main_Code_Helpers.h @@ -50,3 +50,11 @@ MUNO \ NoFade \ ENDA + +#define GiveItemTo(pid, itemId) \ + SVAL(EVT_SLOT_3, itemId) \ + GIVE_ITEM(pid) + +#define GiveMoney(amt) \ + SVAL(EVT_SLOT_3, amt) \ + GIVE_MONEY(CHAR_EVT_PLAYER_LEADER) diff --git a/include/EAstdlib.h b/include/EAstdlib.h index 06215554e..f9ec21af6 100644 --- a/include/EAstdlib.h +++ b/include/EAstdlib.h @@ -154,9 +154,9 @@ #define SPAWN_CUTSCENE_ALLY(pid, x, y) EvtLoadSingleUnit(EVSUBCMD_SPAWN_CUTSCENE_ALLY, pid, x, y) #define DISA EvtRemoveUnit #define CHECK_INAREA EvtCheckInArea -#define GIVEITEMTO EvtGiveItemAtSlot3 -#define GIVEITEMTOMAIN EvtGiveMoneymAtSlot3 /* what */ -#define GIVETOSLOT3 EvtGiveMoneymAtSlot3NoPopup /* tf */ +#define GIVE_ITEM EvtGiveItemAtSlot3 +#define GIVE_MONEY EvtGiveMoneyAtSlot3 +#define TAKE_MONEY EvtTakeMoneyAtSlot3 #define SET_ACTIVE EvtSetActiveUnit #define CHAI EvtChangeAI #define CHAI_AT EvtChangeAIat @@ -298,7 +298,7 @@ #include "EA_Standard_Library/Main_Code_Helpers.h" #include "EA_Standard_Library/Unit_Helpers.h" #include "EA_Standard_Library/Convo_Helpers.h" -#include "EA_Standard_Library/Code_Ailases.h" +#include "EA_Standard_Library/Code_Aliases.h" #include "EA_Standard_Library/End_Of_Chapter_Helpers.h" #include "EA_Standard_Library/Conditional_Helpers.h" #include "EA_Standard_Library/AI_Helpers.h" diff --git a/include/eventscript.h b/include/eventscript.h index 345e353e4..00363c7c1 100644 --- a/include/eventscript.h +++ b/include/eventscript.h @@ -514,9 +514,9 @@ enum event_sub_cmd_idx { /* EV_CMD_CHECKINAREA */ /* EV_CMD_GIVEITEM */ - EVSUBCMD_GIVEITEMTO = 0, - EVSUBCMD_GIVEITEMTOMAIN = 1, - EVSUBCMD_GIVETOSLOT3 = 2, + EVSUBCMD_GIVE_ITEM = 0, + EVSUBCMD_GIVE_MONEY = 1, + EVSUBCMD_TAKE_MONEY = 2, /* EV_CMD_CHANGEAI */ EVTSUBCMD_CHAI = 0, @@ -722,9 +722,9 @@ enum event_sub_cmd_idx { #define EvtLoadSingleUnit(faction, pid, x, y) _EvtArg0(EV_CMD_LOADSINGLEUNIT, 4, (faction), (pid)), _EvtParams4((x), (y), 0, 0), #define EvtRemoveUnit(pid) _EvtArg0(EV_CMD_CHANGESTATE, 2, EVSUBCMD_DISA, (pid)), #define EvtCheckInArea(pid, x, y, w, h) _EvtArg0(EV_CMD_CHECKINAREA, 4, 0, (pid)), _EvtParams4(x, y, w, h), -#define EvtGiveItemAtSlot3(pid) _EvtArg0(EV_CMD_GIVEITEM, 2, EVSUBCMD_GIVEITEMTO, (pid)), -#define EvtGiveMoneymAtSlot3(pid) _EvtArg0(EV_CMD_GIVEITEM, 2, EVSUBCMD_GIVEITEMTOMAIN, (pid)), -#define EvtGiveMoneymAtSlot3NoPopup(pid) _EvtArg0(EV_CMD_GIVEITEM, 2, EVSUBCMD_GIVETOSLOT3, (pid)), +#define EvtGiveItemAtSlot3(pid) _EvtArg0(EV_CMD_GIVEITEM, 2, EVSUBCMD_GIVE_ITEM, (pid)), +#define EvtGiveMoneyAtSlot3(pid) _EvtArg0(EV_CMD_GIVEITEM, 2, EVSUBCMD_GIVE_MONEY, (pid)), +#define EvtTakeMoneyAtSlot3(pid) _EvtArg0(EV_CMD_GIVEITEM, 2, EVSUBCMD_TAKE_MONEY, (pid)), #define EvtSetActiveUnit(pid) _EvtArg0(EV_CMD_CHANGEACTIVEUNIT, 2, 0, (pid)), #define EvtChangeAI(pid) _EvtArg0(EV_CMD_CHANGEAI, 2, EVTSUBCMD_CHAI, (pid)), #define EvtChangeAIat(x, y) _EvtArg0(EV_CMD_CHANGEAI, 2, EVTSUBCMD_CHAI_AT, _EvtSubParam16u8((x), (y))), diff --git a/scripts/dump_events.py b/scripts/dump_events.py index a0930be1a..9df3847e5 100755 --- a/scripts/dump_events.py +++ b/scripts/dump_events.py @@ -694,11 +694,11 @@ def parse_event(rom_data, off): match sub_cmd: case 0: - print(f"\tGIVEITEMTO({pid_idx})") + print(f"\tGIVE_ITEM({pid_idx})") case 1: - print(f"\tGIVEITEMTOMAIN({pid_idx})") + print(f"\tGIVE_MONEY({pid_idx})") case 2: - print(f"\tGIVETOSLOT3({pid_idx})") + print(f"\tTAKE_MONEY({pid_idx})") case _: parse_event_err(rom_data, off) diff --git a/src/events/ch10b-eventscript.h b/src/events/ch10b-eventscript.h index 8ee0871a3..f5aea6066 100644 --- a/src/events/ch10b-eventscript.h +++ b/src/events/ch10b-eventscript.h @@ -276,8 +276,7 @@ LABEL(0x2) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x65) - GIVEITEMTO(CHARACTER_DUESSEL) + GiveItemTo(CHARACTER_DUESSEL, ITEM_KNIGHTCREST) LABEL(0x3) REMA MUSCMID(SONG_SILENT) @@ -380,8 +379,7 @@ CONST_DATA EventListScr EventScr_089FAF54[] = { Text_BG(BG_NORMAL_VILLAGE, 0xaca) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x56) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GiveItemTo(CHAR_EVT_ACTIVE_UNIT, ITEM_STAFF_TORCH) EVBIT_T(7) ENDA }; @@ -391,8 +389,7 @@ CONST_DATA EventListScr EventScr_089FAF90[] = { Text_BG(BG_NORMAL_VILLAGE, 0xacb) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x64) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GiveItemTo(CHAR_EVT_ACTIVE_UNIT, ITEM_HEROCREST) EVBIT_T(7) ENDA }; diff --git a/src/events/ch12a-eventscript.h b/src/events/ch12a-eventscript.h index 364844cf2..82778ac88 100644 --- a/src/events/ch12a-eventscript.h +++ b/src/events/ch12a-eventscript.h @@ -200,8 +200,7 @@ CONST_DATA EventListScr EventScr_089F536C[] = { Text_BG(BG_CAER_PELYN, 0xa63) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x59) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GiveItemTo(CHAR_EVT_ACTIVE_UNIT, ITEM_STAFF_BARRIER) TILECHANGE(0x2) EVBIT_T(7) ENDA diff --git a/src/events/ch13a-eventscript.h b/src/events/ch13a-eventscript.h index f3bdf2256..78b77cd8c 100644 --- a/src/events/ch13a-eventscript.h +++ b/src/events/ch13a-eventscript.h @@ -160,8 +160,7 @@ LABEL(0x1) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x1388) - GIVEITEMTOMAIN(CHAR_EVT_PLAYER_LEADER) + GiveMoney(5000) TEXTSHOW(0xa7a) TEXTEND MUSCMID(SONG_SILENT) @@ -176,8 +175,7 @@ LABEL(0xa) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x1388) - GIVEITEMTOMAIN(CHAR_EVT_PLAYER_LEADER) + GiveMoney(5000) TEXTSHOW(0xa7c) TEXTEND MUSCMID(SONG_SILENT) diff --git a/src/events/ch13b-eventscript.h b/src/events/ch13b-eventscript.h index 7262ae05c..c2c0e4df5 100644 --- a/src/events/ch13b-eventscript.h +++ b/src/events/ch13b-eventscript.h @@ -210,8 +210,7 @@ CONST_DATA EventListScr EventScr_089FBD90[] = { Text_BG(BG_NORMAL_VILLAGE, 0xaf8) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x59) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GiveItemTo(CHAR_EVT_ACTIVE_UNIT, ITEM_STAFF_BARRIER) EVBIT_T(7) ENDA }; @@ -221,8 +220,7 @@ CONST_DATA EventListScr EventScr_089FBDCC[] = { Text_BG(BG_NORMAL_VILLAGE, 0xaf9) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x61) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GiveItemTo(CHAR_EVT_ACTIVE_UNIT, ITEM_BOOSTER_RES) EVBIT_T(7) ENDA }; diff --git a/src/events/ch14a-eventscript.h b/src/events/ch14a-eventscript.h index 005d70b17..bc491d532 100644 --- a/src/events/ch14a-eventscript.h +++ b/src/events/ch14a-eventscript.h @@ -234,11 +234,9 @@ CONST_DATA EventListScr EventScr_Ch14a_EndingScene[] = { TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x91) - GIVEITEMTO(CHARACTER_JOSHUA) + GiveItemTo(CHARACTER_JOSHUA, ITEM_SWORD_AUDHULMA) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x3e) - GIVEITEMTO(CHARACTER_JOSHUA) + GiveItemTo(CHARACTER_JOSHUA, ITEM_ANIMA_EXCALIBUR) GOTO(0x1) LABEL(0x0) TEXTSHOW(0xa94) @@ -248,11 +246,9 @@ LABEL(0x0) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x91) - GIVEITEMTO(CHARACTER_EIRIKA) + GiveItemTo(CHARACTER_EIRIKA, ITEM_SWORD_AUDHULMA) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x3e) - GIVEITEMTO(CHARACTER_EIRIKA) + GiveItemTo(CHARACTER_EIRIKA, ITEM_ANIMA_EXCALIBUR) LABEL(0x1) MUSCSLOW(SONG_SILENT) FADI(16) diff --git a/src/events/ch14b-eventscript.h b/src/events/ch14b-eventscript.h index 46c1e606d..523586e30 100644 --- a/src/events/ch14b-eventscript.h +++ b/src/events/ch14b-eventscript.h @@ -305,11 +305,9 @@ CONST_DATA EventListScr EventScr_Ch14b_EndingScene[] = { TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x4a) - GIVEITEMTO(CHARACTER_EPHRAIM) + GiveItemTo(CHARACTER_EPHRAIM, ITEM_DARK_GLEIPNIR) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x93) - GIVEITEMTO(CHARACTER_EPHRAIM) + GiveItemTo(CHARACTER_EPHRAIM, ITEM_AXE_GARM) FADI(16) CLEA CLEE diff --git a/src/events/ch15a-eventscript.h b/src/events/ch15a-eventscript.h index 0eb826dd4..4acb69bcd 100644 --- a/src/events/ch15a-eventscript.h +++ b/src/events/ch15a-eventscript.h @@ -75,22 +75,18 @@ CONST_DATA EventListScr EventScr_089F6484[] = { TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x4a) - GIVEITEMTO(CHARACTER_EIRIKA) + GiveItemTo(CHARACTER_EIRIKA, ITEM_DARK_GLEIPNIR) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x93) - GIVEITEMTO(CHARACTER_EIRIKA) + GiveItemTo(CHARACTER_EIRIKA, ITEM_AXE_GARM) GOTO(0x1) LABEL(0x0) TEXTSHOW(0xb28) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x91) - GIVEITEMTO(CHARACTER_EPHRAIM) + GiveItemTo(CHARACTER_EPHRAIM, ITEM_SWORD_AUDHULMA) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x3e) - GIVEITEMTO(CHARACTER_EPHRAIM) + GiveItemTo(CHARACTER_EPHRAIM, ITEM_ANIMA_EXCALIBUR) LABEL(0x1) FADI(16) CLEA @@ -134,8 +130,7 @@ CONST_DATA EventListScr EventScr_089F65C8[] = { Text_BG(BG_HOUSE, 0xb36) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x88) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GiveItemTo(CHAR_EVT_ACTIVE_UNIT, ITEM_MASTERSEAL) EVBIT_T(7) ENDA }; @@ -276,7 +271,7 @@ CONST_DATA EventListScr EventScr_089F67D0[] = { CALL(EventScr_UnTriggerIfNotFaction) CHECK_LUCK(CHAR_EVT_ACTIVE_UNIT) SADD(EVT_SLOT_2, EVT_SLOT_C, EVT_SLOT_0) - SVAL(EVT_SLOT_3, 0xf) + SVAL(EVT_SLOT_3, ITEM_SWORD_WYRMSLAYER) CALL(EventScr_GiveTreasureToLuckyDog) BNE(0x81b5, EVT_SLOT_C, EVT_SLOT_0) CALL(EventScr_EndAndResetTriggEvent) @@ -290,7 +285,7 @@ CONST_DATA EventListScr EventScr_089F6814[] = { CALL(EventScr_UnTriggerIfNotFaction) CHECK_LUCK(CHAR_EVT_ACTIVE_UNIT) SADD(EVT_SLOT_2, EVT_SLOT_C, EVT_SLOT_0) - SVAL(EVT_SLOT_3, 0x62) + SVAL(EVT_SLOT_3, ITEM_BOOSTER_MOV) CALL(EventScr_GiveTreasureToLuckyDog) BNE(0x81c5, EVT_SLOT_C, EVT_SLOT_0) CALL(EventScr_EndAndResetTriggEvent) @@ -304,7 +299,7 @@ CONST_DATA EventListScr EventScr_089F6858[] = { CALL(EventScr_UnTriggerIfNotFaction) CHECK_LUCK(CHAR_EVT_ACTIVE_UNIT) SADD(EVT_SLOT_2, EVT_SLOT_C, EVT_SLOT_0) - SVAL(EVT_SLOT_3, 0x89) + SVAL(EVT_SLOT_3, ITEM_METISSTOME) CALL(EventScr_GiveTreasureToLuckyDog) BNE(0x81d5, EVT_SLOT_C, EVT_SLOT_0) CALL(EventScr_EndAndResetTriggEvent) @@ -318,7 +313,7 @@ CONST_DATA EventListScr EventScr_089F689C[] = { CALL(EventScr_UnTriggerIfNotFaction) CHECK_LUCK(CHAR_EVT_ACTIVE_UNIT) SADD(EVT_SLOT_2, EVT_SLOT_C, EVT_SLOT_0) - SVAL(EVT_SLOT_3, 0x54) + SVAL(EVT_SLOT_3, ITEM_STAFF_WARP) CALL(EventScr_GiveTreasureToLuckyDog) BNE(0x81e5, EVT_SLOT_C, EVT_SLOT_0) CALL(EventScr_EndAndResetTriggEvent) @@ -332,7 +327,7 @@ CONST_DATA EventListScr EventScr_089F68E0[] = { CALL(EventScr_UnTriggerIfNotFaction) CHECK_LUCK(CHAR_EVT_ACTIVE_UNIT) SADD(EVT_SLOT_2, EVT_SLOT_C, EVT_SLOT_0) - SVAL(EVT_SLOT_3, 0x48) + SVAL(EVT_SLOT_3, ITEM_DARK_ECLIPSE) CALL(EventScr_GiveTreasureToLuckyDog) BNE(0x81f5, EVT_SLOT_C, EVT_SLOT_0) CALL(EventScr_EndAndResetTriggEvent) @@ -346,7 +341,7 @@ CONST_DATA EventListScr EventScr_089F6924[] = { CALL(EventScr_UnTriggerIfNotFaction) CHECK_LUCK(CHAR_EVT_ACTIVE_UNIT) SADD(EVT_SLOT_2, EVT_SLOT_C, EVT_SLOT_0) - SVAL(EVT_SLOT_3, 0x63) + SVAL(EVT_SLOT_3, ITEM_BOOSTER_CON) CALL(EventScr_GiveTreasureToLuckyDog) BNE(0x8205, EVT_SLOT_C, EVT_SLOT_0) CALL(EventScr_EndAndResetTriggEvent) @@ -360,7 +355,7 @@ CONST_DATA EventListScr EventScr_089F6968[] = { CALL(EventScr_UnTriggerIfNotFaction) CHECK_LUCK(CHAR_EVT_ACTIVE_UNIT) SADD(EVT_SLOT_2, EVT_SLOT_C, EVT_SLOT_0) - SVAL(EVT_SLOT_3, 0x73) + SVAL(EVT_SLOT_3, ITEM_SILVERCARD) CALL(EventScr_GiveTreasureToLuckyDog) BNE(0x8215, EVT_SLOT_C, EVT_SLOT_0) CALL(EventScr_EndAndResetTriggEvent) @@ -374,7 +369,7 @@ CONST_DATA EventListScr EventScr_089F69AC[] = { CALL(EventScr_UnTriggerIfNotFaction) CHECK_LUCK(CHAR_EVT_ACTIVE_UNIT) SADD(EVT_SLOT_2, EVT_SLOT_C, EVT_SLOT_0) - SVAL(EVT_SLOT_3, 0x31) + SVAL(EVT_SLOT_3, ITEM_BOW_KILLER) CALL(EventScr_GiveTreasureToLuckyDog) BNE(0x8225, EVT_SLOT_C, EVT_SLOT_0) CALL(EventScr_EndAndResetTriggEvent) @@ -388,7 +383,7 @@ CONST_DATA EventListScr EventScr_089F69F0[] = { CALL(EventScr_UnTriggerIfNotFaction) CHECK_LUCK(CHAR_EVT_ACTIVE_UNIT) SADD(EVT_SLOT_2, EVT_SLOT_C, EVT_SLOT_0) - SVAL(EVT_SLOT_3, 0x51) + SVAL(EVT_SLOT_3, ITEM_STAFF_SILENCE) CALL(EventScr_GiveTreasureToLuckyDog) BNE(0x8235, EVT_SLOT_C, EVT_SLOT_0) CALL(EventScr_EndAndResetTriggEvent) diff --git a/src/events/ch15b-eventscript.h b/src/events/ch15b-eventscript.h index 3059b884b..f7a820622 100644 --- a/src/events/ch15b-eventscript.h +++ b/src/events/ch15b-eventscript.h @@ -88,8 +88,7 @@ CONST_DATA EventListScr EventScr_089FC904[] = { Text_BG(BG_HOUSE, 0xb36) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x88) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GiveItemTo(CHAR_EVT_ACTIVE_UNIT, ITEM_MASTERSEAL) EVBIT_T(7) ENDA }; diff --git a/src/events/ch16a-eventscript.h b/src/events/ch16a-eventscript.h index aeb35fb36..395a275c8 100644 --- a/src/events/ch16a-eventscript.h +++ b/src/events/ch16a-eventscript.h @@ -373,14 +373,12 @@ CONST_DATA EventListScr EventScr_089F6E50[] = { TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x92) - GIVEITEMTO(CHARACTER_EPHRAIM) + GiveItemTo(CHARACTER_EPHRAIM, ITEM_LANCE_SIEGMUND) TEXTSHOW(0xb56) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x85) - GIVEITEMTO(CHARACTER_EIRIKA) + GiveItemTo(CHARACTER_EIRIKA, ITEM_SWORD_SIEGLINDE) CHECK_MODE SVAL(EVT_SLOT_1, 0x2) BNE(0x0, EVT_SLOT_C, EVT_SLOT_1) @@ -529,8 +527,7 @@ LABEL(0x1) CONST_DATA EventListScr EventScr_089F74F0[] = { CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x98) - GIVEITEMTO(CHARACTER_EIRIKA) + GiveItemTo(CHARACTER_EIRIKA, ITEM_LUNARBRACE) EVBIT_MODIFY(0x4) TUTORIALTEXTBOXSTART SVAL(EVT_SLOT_B, 0xffffffff) @@ -542,8 +539,7 @@ CONST_DATA EventListScr EventScr_089F74F0[] = { CONST_DATA EventListScr EventScr_089F7524[] = { CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x99) - GIVEITEMTO(CHARACTER_EPHRAIM) + GiveItemTo(CHARACTER_EPHRAIM, ITEM_SOLARBRACE) EVBIT_MODIFY(0x4) TUTORIALTEXTBOXSTART SVAL(EVT_SLOT_B, 0xffffffff) diff --git a/src/events/ch17a-eventscript.h b/src/events/ch17a-eventscript.h index 63417b1a9..f528272ef 100644 --- a/src/events/ch17a-eventscript.h +++ b/src/events/ch17a-eventscript.h @@ -296,11 +296,9 @@ LABEL(0x1f) REMA MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x94) - GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) + GiveItemTo(CHAR_EVT_PLAYER_LEADER, ITEM_BOW_NIDHOGG) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x8e) - GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) + GiveItemTo(CHAR_EVT_PLAYER_LEADER, ITEM_LANCE_VIDOFNIR) BEQ(0x34, EVT_SLOT_7, EVT_SLOT_0) MUSC(SONG_RAID) STAL(50) @@ -319,8 +317,7 @@ LABEL(0x33) REMA MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x55) - GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) + GiveItemTo(CHAR_EVT_PLAYER_LEADER, ITEM_STAFF_RESCUE) LABEL(0x34) ENDA }; diff --git a/src/events/ch19a-eventscript.h b/src/events/ch19a-eventscript.h index 2a59e5731..46a89a1e4 100644 --- a/src/events/ch19a-eventscript.h +++ b/src/events/ch19a-eventscript.h @@ -297,14 +297,11 @@ LABEL(0x15) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x87) - GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) + GiveItemTo(CHAR_EVT_PLAYER_LEADER, ITEM_LIGHT_IVALDI) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x8c) - GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) + GiveItemTo(CHAR_EVT_PLAYER_LEADER, ITEM_STAFF_LATONA) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x2710) - GIVEITEMTOMAIN(CHAR_EVT_PLAYER_LEADER) + GiveMoney(10000) CHECK_MODE SVAL(EVT_SLOT_1, 0x2) BNE(0x1e, EVT_SLOT_C, EVT_SLOT_1) @@ -331,8 +328,7 @@ LABEL(0x28) LABEL(0x29) REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x10) - GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) + GiveItemTo(CHAR_EVT_PLAYER_LEADER, ITEM_SWORD_LIGHTBRAND) LABEL(0x2a) ENDA }; diff --git a/src/events/ch2-eventscript.h b/src/events/ch2-eventscript.h index 7f086236c..54f7012ba 100644 --- a/src/events/ch2-eventscript.h +++ b/src/events/ch2-eventscript.h @@ -239,8 +239,7 @@ LABEL(0x0) MUNO LABEL(0x1) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x76) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GiveItemTo(CHAR_EVT_ACTIVE_UNIT, ITEM_REDGEM) EVBIT_T(7) ENDA }; @@ -250,8 +249,7 @@ CONST_DATA EventListScr EventScr_Ch2_Village2[] = { Text_BG(BG_NORMAL_VILLAGE, 0x96b) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x6d) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GiveItemTo(CHAR_EVT_ACTIVE_UNIT, ITEM_ELIXIR) EVBIT_T(7) ENDA }; @@ -261,8 +259,7 @@ CONST_DATA EventListScr EventScr_Ch2_Village3[] = { Text_BG(BG_NORMAL_VILLAGE, 0x96c) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x6e) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GiveItemTo(CHAR_EVT_ACTIVE_UNIT, ITEM_PUREWATER) EVBIT_T(7) ENDA }; diff --git a/src/events/ch4-eventscript.h b/src/events/ch4-eventscript.h index a8fcf1eda..b44b12b73 100644 --- a/src/events/ch4-eventscript.h +++ b/src/events/ch4-eventscript.h @@ -224,8 +224,7 @@ CONST_DATA EventListScr EventScr_089F1BD8[] = { Text_BG(BG_NORMAL_VILLAGE, 0x9b5) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x1f) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GiveItemTo(CHAR_EVT_ACTIVE_UNIT, ITEM_AXE_IRON) EVBIT_T(7) ENDA }; diff --git a/src/events/ch5-eventscript.h b/src/events/ch5-eventscript.h index 0f9de77b4..feac02152 100644 --- a/src/events/ch5-eventscript.h +++ b/src/events/ch5-eventscript.h @@ -204,8 +204,7 @@ LABEL(0x1) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x68) - GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) + GiveItemTo(CHAR_EVT_PLAYER_LEADER, ITEM_GUIDINGRING) LABEL(0x2) ENUT(219) ENUT(189) @@ -224,8 +223,7 @@ CONST_DATA EventListScr EventScr_089F2170[] = { Text_BG(BG_HOUSE, 0x9cd) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0xe) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GiveItemTo(CHAR_EVT_ACTIVE_UNIT, ITEM_SWORD_ARMORSLAYER) SVAL(EVT_SLOT_2, EventScr_089F2340) CALL(EventScr_CallOnTutorialMode) EVBIT_T(7) @@ -237,8 +235,7 @@ CONST_DATA EventListScr EventScr_089F21BC[] = { Text_BG(BG_HOUSE, 0x9ce) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x60) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GiveItemTo(CHAR_EVT_ACTIVE_UNIT, ITEM_BOOSTER_DEF) EVBIT_T(7) ENDA }; @@ -248,8 +245,7 @@ CONST_DATA EventListScr EventScr_089F21F8[] = { Text_BG(BG_HOUSE, 0x9cf) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x5d) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GiveItemTo(CHAR_EVT_ACTIVE_UNIT, ITEM_BOOSTER_SKL) EVBIT_T(7) ENDA }; @@ -258,8 +254,7 @@ CONST_DATA EventListScr EventScr_089F2234[] = { MUSI Text_BG(BG_HOUSE, 0x9d0) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x70) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GiveItemTo(CHAR_EVT_ACTIVE_UNIT, ITEM_TORCH) MUNO EVBIT_T(7) ENDA diff --git a/src/events/ch6-eventscript.h b/src/events/ch6-eventscript.h index 76fa1ac8a..ae7e55d01 100644 --- a/src/events/ch6-eventscript.h +++ b/src/events/ch6-eventscript.h @@ -146,8 +146,7 @@ CONST_DATA EventListScr EventScr_Ch6_EndingScene[] = { REMA MUSCMID(SONG_SILENT) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x66) - GIVEITEMTO(CHARACTER_EIRIKA) + GiveItemTo(CHARACTER_EIRIKA, ITEM_ORIONSBOLT) LABEL(0x0) REMA MUSC(SONG_LEGACY) @@ -170,8 +169,7 @@ CONST_DATA EventListScr EventScr_089F2A98[] = { Text_BG(BG_HOUSE, 0x9f3) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x6f) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GiveItemTo(CHAR_EVT_ACTIVE_UNIT, ITEM_ANTITOXIN) SVAL(EVT_SLOT_2, EventScr_089F2B54) CALL(EventScr_CallOnTutorialMode) EVBIT_T(7) diff --git a/src/events/ch8-eventscript.h b/src/events/ch8-eventscript.h index d55fa8e8d..15fb8b64f 100644 --- a/src/events/ch8-eventscript.h +++ b/src/events/ch8-eventscript.h @@ -316,8 +316,7 @@ CONST_DATA EventListScr EventScr_SplitMenu[] = { REMA MUSCSLOW(SONG_SILENT) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x2710) - GIVEITEMTOMAIN(CHAR_EVT_PLAYER_LEADER) + GiveMoney(10000) SetBackground(BG_CASTLE_INTERIOR) MUSC(SONG_SORROW) TEXTSHOW(0xc0f) diff --git a/src/events/ch9a-eventscript.h b/src/events/ch9a-eventscript.h index f58678299..96ba11bb7 100644 --- a/src/events/ch9a-eventscript.h +++ b/src/events/ch9a-eventscript.h @@ -279,8 +279,8 @@ CONST_DATA EventListScr EventScr_Ch9a_EndingScene[] = { TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x5b) - GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) + SVAL(EVT_SLOT_3, ITEM_BOOSTER_HP) + GIVE_ITEM(CHAR_EVT_PLAYER_LEADER) LABEL(0x0) ENUT(113) MNCH(0xb) @@ -319,8 +319,8 @@ CONST_DATA EventListScr EventScr_089F3F9C[] = { Text_BG(BG_HOUSE, 0xa29) MURE(0x2) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x60) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + SVAL(EVT_SLOT_3, ITEM_BOOSTER_DEF) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA }; @@ -330,8 +330,8 @@ CONST_DATA EventListScr EventScr_089F3FDC[] = { Text_BG(BG_HOUSE, 0xa2a) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x9) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + SVAL(EVT_SLOT_3, ITEM_SWORD_RAPIER) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA }; diff --git a/src/events/common-events.h b/src/events/common-events.h index da3d66014..5d8f89ee1 100644 --- a/src/events/common-events.h +++ b/src/events/common-events.h @@ -69,7 +69,7 @@ CONST_DATA EventListScr EventScr_9EEB00[] = { SADD(EVT_SLOT_2, EVT_SLOT_3, EVT_SLOT_0) CUSA(CHAR_EVT_SLOT2) SADD(EVT_SLOT_3, EVT_SLOT_4, EVT_SLOT_0) - GIVETOSLOT3(CHAR_EVT_PLAYER_LEADER) + TAKE_MONEY(CHAR_EVT_PLAYER_LEADER) MURE(0x2) GOTO(0x2) LABEL(0x0) diff --git a/src/events/lordsplit-eventscript.h b/src/events/lordsplit-eventscript.h index d85dc77b4..a359e4ea8 100644 --- a/src/events/lordsplit-eventscript.h +++ b/src/events/lordsplit-eventscript.h @@ -30,8 +30,7 @@ LABEL(0x0) LABEL(0x1) REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x1388) - GIVEITEMTOMAIN(CHAR_EVT_PLAYER_LEADER) + GiveMoney(5000) FADI(4) REMOVEPORTRAITS BACG(BG_CASTLE_BRIGHT) diff --git a/src/events/prologue-eventscript.h b/src/events/prologue-eventscript.h index e3388649d..a69c35383 100644 --- a/src/events/prologue-eventscript.h +++ b/src/events/prologue-eventscript.h @@ -213,8 +213,7 @@ CONST_DATA EventListScr EventScr_Prologue_GiveRapier[] = { CALL(EventScr_RemoveBGIfNeeded) /* Give item via slot3 */ - SVAL(EVT_SLOT_3, ITEM_SWORD_RAPIER) - GIVEITEMTO(CHARACTER_EIRIKA) + GiveItemTo(CHARACTER_EIRIKA, ITEM_SWORD_RAPIER) SVAL(EVT_SLOT_2, EventScr_Prologue_9EF828) CALL(EventScr_CallOnTutorialMode) diff --git a/src/events_script_utils.c b/src/events_script_utils.c index 7bf3cdc08..4d7ad0922 100644 --- a/src/events_script_utils.c +++ b/src/events_script_utils.c @@ -493,7 +493,7 @@ LABEL(0x2) ENDA }; -/* I think used in dessert */ +/* I think used in desert */ CONST_DATA EventListScr EventScr_GiveTreasureToLuckyDog[] = { CHECK_CLASS(CHAR_EVT_ACTIVE_UNIT) @@ -509,7 +509,7 @@ CONST_DATA EventListScr EventScr_GiveTreasureToLuckyDog[] = { LABEL(0x0) CALL(EventScr_RemoveBGIfNeeded) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) SVAL(EVT_SLOT_C, true) GOTO(0x2) diff --git a/src/eventscr.c b/src/eventscr.c index acfdd769e..5ddaae0a6 100644 --- a/src/eventscr.c +++ b/src/eventscr.c @@ -3562,17 +3562,17 @@ u8 Event37_GiveItem(struct EventEngineProc * proc) return EVC_ERROR; switch (subcmd) { - case EVSUBCMD_GIVEITEMTO: + case EVSUBCMD_GIVE_ITEM: NewPopup_ItemGot(proc, target, gEventSlots[3]); break; - case EVSUBCMD_GIVEITEMTOMAIN: + case EVSUBCMD_GIVE_MONEY: NewPopup_GoldGot(proc, target, gEventSlots[3]); break; - case EVSUBCMD_GIVETOSLOT3: + case EVSUBCMD_TAKE_MONEY: gold = GetPartyGoldAmount() - gEventSlots[3]; if (gold < 0) gold = 0; @@ -4272,10 +4272,10 @@ CONST_DATA EventListScr EventScr_OpenChest[] = { TILECHANGE(0xfffd) SVAL(EVT_SLOT_7, 0xff) BGT(0x0, EVT_SLOT_3, EVT_SLOT_7) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) GOTO(0x1) LABEL(0x0) - GIVEITEMTOMAIN(CHAR_EVT_ACTIVE_UNIT) + GIVE_MONEY(CHAR_EVT_ACTIVE_UNIT) LABEL(0x1) ENDA };