From 9abf840ce3e972c2875b9b12c226bb68bf128560 Mon Sep 17 00:00:00 2001 From: Eebit Date: Sun, 4 May 2025 17:33:44 -0400 Subject: [PATCH 1/4] Use enum values for event items --- src/events/ch10b-eventscript.h | 6 +++--- src/events/ch12a-eventscript.h | 2 +- src/events/ch13a-eventscript.h | 4 ++-- src/events/ch13b-eventscript.h | 4 ++-- src/events/ch14a-eventscript.h | 8 ++++---- src/events/ch14b-eventscript.h | 4 ++-- src/events/ch15a-eventscript.h | 28 ++++++++++++++-------------- src/events/ch15b-eventscript.h | 2 +- src/events/ch16a-eventscript.h | 8 ++++---- src/events/ch17a-eventscript.h | 6 +++--- src/events/ch19a-eventscript.h | 8 ++++---- src/events/ch2-eventscript.h | 6 +++--- src/events/ch4-eventscript.h | 2 +- src/events/ch5-eventscript.h | 10 +++++----- src/events/ch6-eventscript.h | 4 ++-- src/events/ch8-eventscript.h | 2 +- src/events/ch9a-eventscript.h | 6 +++--- src/events/lordsplit-eventscript.h | 2 +- src/events_script_utils.c | 2 +- 19 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/events/ch10b-eventscript.h b/src/events/ch10b-eventscript.h index 8ee0871a3..b9bdf40f3 100644 --- a/src/events/ch10b-eventscript.h +++ b/src/events/ch10b-eventscript.h @@ -276,7 +276,7 @@ LABEL(0x2) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x65) + SVAL(EVT_SLOT_3, ITEM_KNIGHTCREST) GIVEITEMTO(CHARACTER_DUESSEL) LABEL(0x3) REMA @@ -380,7 +380,7 @@ CONST_DATA EventListScr EventScr_089FAF54[] = { Text_BG(BG_NORMAL_VILLAGE, 0xaca) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x56) + SVAL(EVT_SLOT_3, ITEM_STAFF_TORCH) GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA @@ -391,7 +391,7 @@ CONST_DATA EventListScr EventScr_089FAF90[] = { Text_BG(BG_NORMAL_VILLAGE, 0xacb) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x64) + SVAL(EVT_SLOT_3, ITEM_HEROCREST) GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA diff --git a/src/events/ch12a-eventscript.h b/src/events/ch12a-eventscript.h index 364844cf2..af3bcaec8 100644 --- a/src/events/ch12a-eventscript.h +++ b/src/events/ch12a-eventscript.h @@ -200,7 +200,7 @@ CONST_DATA EventListScr EventScr_089F536C[] = { Text_BG(BG_CAER_PELYN, 0xa63) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x59) + SVAL(EVT_SLOT_3, ITEM_STAFF_BARRIER) GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) TILECHANGE(0x2) EVBIT_T(7) diff --git a/src/events/ch13a-eventscript.h b/src/events/ch13a-eventscript.h index f3bdf2256..3483926c7 100644 --- a/src/events/ch13a-eventscript.h +++ b/src/events/ch13a-eventscript.h @@ -160,7 +160,7 @@ LABEL(0x1) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x1388) + SVAL(EVT_SLOT_3, 5000) GIVEITEMTOMAIN(CHAR_EVT_PLAYER_LEADER) TEXTSHOW(0xa7a) TEXTEND @@ -176,7 +176,7 @@ LABEL(0xa) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x1388) + SVAL(EVT_SLOT_3, 5000) GIVEITEMTOMAIN(CHAR_EVT_PLAYER_LEADER) TEXTSHOW(0xa7c) TEXTEND diff --git a/src/events/ch13b-eventscript.h b/src/events/ch13b-eventscript.h index 7262ae05c..19cc39610 100644 --- a/src/events/ch13b-eventscript.h +++ b/src/events/ch13b-eventscript.h @@ -210,7 +210,7 @@ CONST_DATA EventListScr EventScr_089FBD90[] = { Text_BG(BG_NORMAL_VILLAGE, 0xaf8) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x59) + SVAL(EVT_SLOT_3, ITEM_STAFF_BARRIER) GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA @@ -221,7 +221,7 @@ CONST_DATA EventListScr EventScr_089FBDCC[] = { Text_BG(BG_NORMAL_VILLAGE, 0xaf9) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x61) + SVAL(EVT_SLOT_3, ITEM_BOOSTER_RES) GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA diff --git a/src/events/ch14a-eventscript.h b/src/events/ch14a-eventscript.h index 005d70b17..e2f3dbdb9 100644 --- a/src/events/ch14a-eventscript.h +++ b/src/events/ch14a-eventscript.h @@ -234,10 +234,10 @@ CONST_DATA EventListScr EventScr_Ch14a_EndingScene[] = { TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x91) + SVAL(EVT_SLOT_3, ITEM_SWORD_AUDHULMA) GIVEITEMTO(CHARACTER_JOSHUA) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x3e) + SVAL(EVT_SLOT_3, ITEM_ANIMA_EXCALIBUR) GIVEITEMTO(CHARACTER_JOSHUA) GOTO(0x1) LABEL(0x0) @@ -248,10 +248,10 @@ LABEL(0x0) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x91) + SVAL(EVT_SLOT_3, ITEM_SWORD_AUDHULMA) GIVEITEMTO(CHARACTER_EIRIKA) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x3e) + SVAL(EVT_SLOT_3, ITEM_ANIMA_EXCALIBUR) GIVEITEMTO(CHARACTER_EIRIKA) LABEL(0x1) MUSCSLOW(SONG_SILENT) diff --git a/src/events/ch14b-eventscript.h b/src/events/ch14b-eventscript.h index 46c1e606d..634d00585 100644 --- a/src/events/ch14b-eventscript.h +++ b/src/events/ch14b-eventscript.h @@ -305,10 +305,10 @@ CONST_DATA EventListScr EventScr_Ch14b_EndingScene[] = { TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x4a) + SVAL(EVT_SLOT_3, ITEM_DARK_GLEIPNIR) GIVEITEMTO(CHARACTER_EPHRAIM) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x93) + SVAL(EVT_SLOT_3, ITEM_AXE_GARM) GIVEITEMTO(CHARACTER_EPHRAIM) FADI(16) CLEA diff --git a/src/events/ch15a-eventscript.h b/src/events/ch15a-eventscript.h index 0eb826dd4..4cfd69d95 100644 --- a/src/events/ch15a-eventscript.h +++ b/src/events/ch15a-eventscript.h @@ -75,10 +75,10 @@ CONST_DATA EventListScr EventScr_089F6484[] = { TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x4a) + SVAL(EVT_SLOT_3, ITEM_DARK_GLEIPNIR) GIVEITEMTO(CHARACTER_EIRIKA) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x93) + SVAL(EVT_SLOT_3, ITEM_AXE_GARM) GIVEITEMTO(CHARACTER_EIRIKA) GOTO(0x1) LABEL(0x0) @@ -86,10 +86,10 @@ LABEL(0x0) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x91) + SVAL(EVT_SLOT_3, ITEM_SWORD_AUDHULMA) GIVEITEMTO(CHARACTER_EPHRAIM) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x3e) + SVAL(EVT_SLOT_3, ITEM_ANIMA_EXCALIBUR) GIVEITEMTO(CHARACTER_EPHRAIM) LABEL(0x1) FADI(16) @@ -134,7 +134,7 @@ CONST_DATA EventListScr EventScr_089F65C8[] = { Text_BG(BG_HOUSE, 0xb36) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x88) + SVAL(EVT_SLOT_3, ITEM_MASTERSEAL) GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA @@ -276,7 +276,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 +290,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 +304,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 +318,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 +332,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 +346,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 +360,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 +374,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 +388,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..7eeebc0c1 100644 --- a/src/events/ch15b-eventscript.h +++ b/src/events/ch15b-eventscript.h @@ -88,7 +88,7 @@ CONST_DATA EventListScr EventScr_089FC904[] = { Text_BG(BG_HOUSE, 0xb36) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x88) + SVAL(EVT_SLOT_3, ITEM_MASTERSEAL) GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA diff --git a/src/events/ch16a-eventscript.h b/src/events/ch16a-eventscript.h index aeb35fb36..2d2420378 100644 --- a/src/events/ch16a-eventscript.h +++ b/src/events/ch16a-eventscript.h @@ -373,13 +373,13 @@ CONST_DATA EventListScr EventScr_089F6E50[] = { TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x92) + SVAL(EVT_SLOT_3, ITEM_LANCE_SIEGMUND) GIVEITEMTO(CHARACTER_EPHRAIM) TEXTSHOW(0xb56) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x85) + SVAL(EVT_SLOT_3, ITEM_SWORD_SIEGLINDE) GIVEITEMTO(CHARACTER_EIRIKA) CHECK_MODE SVAL(EVT_SLOT_1, 0x2) @@ -529,7 +529,7 @@ LABEL(0x1) CONST_DATA EventListScr EventScr_089F74F0[] = { CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x98) + SVAL(EVT_SLOT_3, ITEM_LUNARBRACE) GIVEITEMTO(CHARACTER_EIRIKA) EVBIT_MODIFY(0x4) TUTORIALTEXTBOXSTART @@ -542,7 +542,7 @@ CONST_DATA EventListScr EventScr_089F74F0[] = { CONST_DATA EventListScr EventScr_089F7524[] = { CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x99) + SVAL(EVT_SLOT_3, ITEM_SOLARBRACE) GIVEITEMTO(CHARACTER_EPHRAIM) EVBIT_MODIFY(0x4) TUTORIALTEXTBOXSTART diff --git a/src/events/ch17a-eventscript.h b/src/events/ch17a-eventscript.h index 63417b1a9..20d936370 100644 --- a/src/events/ch17a-eventscript.h +++ b/src/events/ch17a-eventscript.h @@ -296,10 +296,10 @@ LABEL(0x1f) REMA MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x94) + SVAL(EVT_SLOT_3, ITEM_BOW_NIDHOGG) GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x8e) + SVAL(EVT_SLOT_3, ITEM_LANCE_VIDOFNIR) GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) BEQ(0x34, EVT_SLOT_7, EVT_SLOT_0) MUSC(SONG_RAID) @@ -319,7 +319,7 @@ LABEL(0x33) REMA MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x55) + SVAL(EVT_SLOT_3, ITEM_STAFF_RESCUE) GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) LABEL(0x34) ENDA diff --git a/src/events/ch19a-eventscript.h b/src/events/ch19a-eventscript.h index 2a59e5731..47502f50f 100644 --- a/src/events/ch19a-eventscript.h +++ b/src/events/ch19a-eventscript.h @@ -297,13 +297,13 @@ LABEL(0x15) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x87) + SVAL(EVT_SLOT_3, ITEM_LIGHT_IVALDI) GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x8c) + SVAL(EVT_SLOT_3, ITEM_STAFF_LATONA) GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x2710) + SVAL(EVT_SLOT_3, 10000) GIVEITEMTOMAIN(CHAR_EVT_PLAYER_LEADER) CHECK_MODE SVAL(EVT_SLOT_1, 0x2) @@ -331,7 +331,7 @@ LABEL(0x28) LABEL(0x29) REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x10) + SVAL(EVT_SLOT_3, ITEM_SWORD_LIGHTBRAND) GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) LABEL(0x2a) ENDA diff --git a/src/events/ch2-eventscript.h b/src/events/ch2-eventscript.h index 7f086236c..b9b847df3 100644 --- a/src/events/ch2-eventscript.h +++ b/src/events/ch2-eventscript.h @@ -239,7 +239,7 @@ LABEL(0x0) MUNO LABEL(0x1) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x76) + SVAL(EVT_SLOT_3, ITEM_REDGEM) GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA @@ -250,7 +250,7 @@ CONST_DATA EventListScr EventScr_Ch2_Village2[] = { Text_BG(BG_NORMAL_VILLAGE, 0x96b) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x6d) + SVAL(EVT_SLOT_3, ITEM_ELIXIR) GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA @@ -261,7 +261,7 @@ CONST_DATA EventListScr EventScr_Ch2_Village3[] = { Text_BG(BG_NORMAL_VILLAGE, 0x96c) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x6e) + SVAL(EVT_SLOT_3, ITEM_PUREWATER) GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA diff --git a/src/events/ch4-eventscript.h b/src/events/ch4-eventscript.h index a8fcf1eda..7d26c3a5b 100644 --- a/src/events/ch4-eventscript.h +++ b/src/events/ch4-eventscript.h @@ -224,7 +224,7 @@ CONST_DATA EventListScr EventScr_089F1BD8[] = { Text_BG(BG_NORMAL_VILLAGE, 0x9b5) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x1f) + SVAL(EVT_SLOT_3, ITEM_AXE_IRON) GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA diff --git a/src/events/ch5-eventscript.h b/src/events/ch5-eventscript.h index 0f9de77b4..59c185a83 100644 --- a/src/events/ch5-eventscript.h +++ b/src/events/ch5-eventscript.h @@ -204,7 +204,7 @@ LABEL(0x1) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x68) + SVAL(EVT_SLOT_3, ITEM_GUIDINGRING) GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) LABEL(0x2) ENUT(219) @@ -224,7 +224,7 @@ CONST_DATA EventListScr EventScr_089F2170[] = { Text_BG(BG_HOUSE, 0x9cd) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0xe) + SVAL(EVT_SLOT_3, ITEM_SWORD_ARMORSLAYER) GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) SVAL(EVT_SLOT_2, EventScr_089F2340) CALL(EventScr_CallOnTutorialMode) @@ -237,7 +237,7 @@ CONST_DATA EventListScr EventScr_089F21BC[] = { Text_BG(BG_HOUSE, 0x9ce) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x60) + SVAL(EVT_SLOT_3, ITEM_BOOSTER_DEF) GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA @@ -248,7 +248,7 @@ CONST_DATA EventListScr EventScr_089F21F8[] = { Text_BG(BG_HOUSE, 0x9cf) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x5d) + SVAL(EVT_SLOT_3, ITEM_BOOSTER_SKL) GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA @@ -258,7 +258,7 @@ CONST_DATA EventListScr EventScr_089F2234[] = { MUSI Text_BG(BG_HOUSE, 0x9d0) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x70) + SVAL(EVT_SLOT_3, ITEM_TORCH) GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) MUNO EVBIT_T(7) diff --git a/src/events/ch6-eventscript.h b/src/events/ch6-eventscript.h index 76fa1ac8a..e7ab388c4 100644 --- a/src/events/ch6-eventscript.h +++ b/src/events/ch6-eventscript.h @@ -146,7 +146,7 @@ CONST_DATA EventListScr EventScr_Ch6_EndingScene[] = { REMA MUSCMID(SONG_SILENT) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x66) + SVAL(EVT_SLOT_3, ITEM_ORIONSBOLT) GIVEITEMTO(CHARACTER_EIRIKA) LABEL(0x0) REMA @@ -170,7 +170,7 @@ CONST_DATA EventListScr EventScr_089F2A98[] = { Text_BG(BG_HOUSE, 0x9f3) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x6f) + SVAL(EVT_SLOT_3, ITEM_ANTITOXIN) GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) SVAL(EVT_SLOT_2, EventScr_089F2B54) CALL(EventScr_CallOnTutorialMode) diff --git a/src/events/ch8-eventscript.h b/src/events/ch8-eventscript.h index d55fa8e8d..fded44b1a 100644 --- a/src/events/ch8-eventscript.h +++ b/src/events/ch8-eventscript.h @@ -316,7 +316,7 @@ CONST_DATA EventListScr EventScr_SplitMenu[] = { REMA MUSCSLOW(SONG_SILENT) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x2710) + SVAL(EVT_SLOT_3, 10000) GIVEITEMTOMAIN(CHAR_EVT_PLAYER_LEADER) SetBackground(BG_CASTLE_INTERIOR) MUSC(SONG_SORROW) diff --git a/src/events/ch9a-eventscript.h b/src/events/ch9a-eventscript.h index f58678299..f47341344 100644 --- a/src/events/ch9a-eventscript.h +++ b/src/events/ch9a-eventscript.h @@ -279,7 +279,7 @@ CONST_DATA EventListScr EventScr_Ch9a_EndingScene[] = { TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x5b) + SVAL(EVT_SLOT_3, ITEM_BOOSTER_HP) GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) LABEL(0x0) ENUT(113) @@ -319,7 +319,7 @@ CONST_DATA EventListScr EventScr_089F3F9C[] = { Text_BG(BG_HOUSE, 0xa29) MURE(0x2) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x60) + SVAL(EVT_SLOT_3, ITEM_BOOSTER_DEF) GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA @@ -330,7 +330,7 @@ CONST_DATA EventListScr EventScr_089F3FDC[] = { Text_BG(BG_HOUSE, 0xa2a) MUNO CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x9) + SVAL(EVT_SLOT_3, ITEM_SWORD_RAPIER) GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA diff --git a/src/events/lordsplit-eventscript.h b/src/events/lordsplit-eventscript.h index d85dc77b4..7c3be49fe 100644 --- a/src/events/lordsplit-eventscript.h +++ b/src/events/lordsplit-eventscript.h @@ -30,7 +30,7 @@ LABEL(0x0) LABEL(0x1) REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 0x1388) + SVAL(EVT_SLOT_3, 5000) GIVEITEMTOMAIN(CHAR_EVT_PLAYER_LEADER) FADI(4) REMOVEPORTRAITS diff --git a/src/events_script_utils.c b/src/events_script_utils.c index 7bf3cdc08..cd5a96676 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) From 233b0a215d6c7db2bec5003b7ed0d2f52952cc6e Mon Sep 17 00:00:00 2001 From: Eebit Date: Sun, 4 May 2025 17:42:39 -0400 Subject: [PATCH 2/4] Update item event macros to be correct/consistent with DOC --- include/EAstdlib.h | 6 +++--- include/eventscript.h | 12 ++++++------ scripts/dump_events.py | 6 +++--- src/events/ch10b-eventscript.h | 6 +++--- src/events/ch12a-eventscript.h | 2 +- src/events/ch13a-eventscript.h | 4 ++-- src/events/ch13b-eventscript.h | 4 ++-- src/events/ch14a-eventscript.h | 8 ++++---- src/events/ch14b-eventscript.h | 4 ++-- src/events/ch15a-eventscript.h | 10 +++++----- src/events/ch15b-eventscript.h | 2 +- src/events/ch16a-eventscript.h | 8 ++++---- src/events/ch17a-eventscript.h | 6 +++--- src/events/ch19a-eventscript.h | 8 ++++---- src/events/ch2-eventscript.h | 6 +++--- src/events/ch4-eventscript.h | 2 +- src/events/ch5-eventscript.h | 10 +++++----- src/events/ch6-eventscript.h | 4 ++-- src/events/ch8-eventscript.h | 2 +- src/events/ch9a-eventscript.h | 6 +++--- src/events/common-events.h | 2 +- src/events/lordsplit-eventscript.h | 2 +- src/events/prologue-eventscript.h | 2 +- src/events_script_utils.c | 2 +- src/eventscr.c | 10 +++++----- 25 files changed, 67 insertions(+), 67 deletions(-) diff --git a/include/EAstdlib.h b/include/EAstdlib.h index 06215554e..66e223d2e 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 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 b9bdf40f3..2748945bb 100644 --- a/src/events/ch10b-eventscript.h +++ b/src/events/ch10b-eventscript.h @@ -277,7 +277,7 @@ LABEL(0x2) REMA CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_KNIGHTCREST) - GIVEITEMTO(CHARACTER_DUESSEL) + GIVE_ITEM(CHARACTER_DUESSEL) LABEL(0x3) REMA MUSCMID(SONG_SILENT) @@ -381,7 +381,7 @@ CONST_DATA EventListScr EventScr_089FAF54[] = { MUNO CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_STAFF_TORCH) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA }; @@ -392,7 +392,7 @@ CONST_DATA EventListScr EventScr_089FAF90[] = { MUNO CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_HEROCREST) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA }; diff --git a/src/events/ch12a-eventscript.h b/src/events/ch12a-eventscript.h index af3bcaec8..a1032265f 100644 --- a/src/events/ch12a-eventscript.h +++ b/src/events/ch12a-eventscript.h @@ -201,7 +201,7 @@ CONST_DATA EventListScr EventScr_089F536C[] = { MUNO CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_STAFF_BARRIER) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) TILECHANGE(0x2) EVBIT_T(7) ENDA diff --git a/src/events/ch13a-eventscript.h b/src/events/ch13a-eventscript.h index 3483926c7..3ca6d966e 100644 --- a/src/events/ch13a-eventscript.h +++ b/src/events/ch13a-eventscript.h @@ -161,7 +161,7 @@ LABEL(0x1) REMA CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, 5000) - GIVEITEMTOMAIN(CHAR_EVT_PLAYER_LEADER) + GIVE_MONEY(CHAR_EVT_PLAYER_LEADER) TEXTSHOW(0xa7a) TEXTEND MUSCMID(SONG_SILENT) @@ -177,7 +177,7 @@ LABEL(0xa) REMA CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, 5000) - GIVEITEMTOMAIN(CHAR_EVT_PLAYER_LEADER) + GIVE_MONEY(CHAR_EVT_PLAYER_LEADER) TEXTSHOW(0xa7c) TEXTEND MUSCMID(SONG_SILENT) diff --git a/src/events/ch13b-eventscript.h b/src/events/ch13b-eventscript.h index 19cc39610..0973ae112 100644 --- a/src/events/ch13b-eventscript.h +++ b/src/events/ch13b-eventscript.h @@ -211,7 +211,7 @@ CONST_DATA EventListScr EventScr_089FBD90[] = { MUNO CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_STAFF_BARRIER) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA }; @@ -222,7 +222,7 @@ CONST_DATA EventListScr EventScr_089FBDCC[] = { MUNO CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_BOOSTER_RES) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA }; diff --git a/src/events/ch14a-eventscript.h b/src/events/ch14a-eventscript.h index e2f3dbdb9..81e450557 100644 --- a/src/events/ch14a-eventscript.h +++ b/src/events/ch14a-eventscript.h @@ -235,10 +235,10 @@ CONST_DATA EventListScr EventScr_Ch14a_EndingScene[] = { REMA CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_SWORD_AUDHULMA) - GIVEITEMTO(CHARACTER_JOSHUA) + GIVE_ITEM(CHARACTER_JOSHUA) CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_ANIMA_EXCALIBUR) - GIVEITEMTO(CHARACTER_JOSHUA) + GIVE_ITEM(CHARACTER_JOSHUA) GOTO(0x1) LABEL(0x0) TEXTSHOW(0xa94) @@ -249,10 +249,10 @@ LABEL(0x0) REMA CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_SWORD_AUDHULMA) - GIVEITEMTO(CHARACTER_EIRIKA) + GIVE_ITEM(CHARACTER_EIRIKA) CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_ANIMA_EXCALIBUR) - GIVEITEMTO(CHARACTER_EIRIKA) + GIVE_ITEM(CHARACTER_EIRIKA) LABEL(0x1) MUSCSLOW(SONG_SILENT) FADI(16) diff --git a/src/events/ch14b-eventscript.h b/src/events/ch14b-eventscript.h index 634d00585..409619d2c 100644 --- a/src/events/ch14b-eventscript.h +++ b/src/events/ch14b-eventscript.h @@ -306,10 +306,10 @@ CONST_DATA EventListScr EventScr_Ch14b_EndingScene[] = { REMA CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_DARK_GLEIPNIR) - GIVEITEMTO(CHARACTER_EPHRAIM) + GIVE_ITEM(CHARACTER_EPHRAIM) CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_AXE_GARM) - GIVEITEMTO(CHARACTER_EPHRAIM) + GIVE_ITEM(CHARACTER_EPHRAIM) FADI(16) CLEA CLEE diff --git a/src/events/ch15a-eventscript.h b/src/events/ch15a-eventscript.h index 4cfd69d95..cd8c9dfd4 100644 --- a/src/events/ch15a-eventscript.h +++ b/src/events/ch15a-eventscript.h @@ -76,10 +76,10 @@ CONST_DATA EventListScr EventScr_089F6484[] = { REMA CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_DARK_GLEIPNIR) - GIVEITEMTO(CHARACTER_EIRIKA) + GIVE_ITEM(CHARACTER_EIRIKA) CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_AXE_GARM) - GIVEITEMTO(CHARACTER_EIRIKA) + GIVE_ITEM(CHARACTER_EIRIKA) GOTO(0x1) LABEL(0x0) TEXTSHOW(0xb28) @@ -87,10 +87,10 @@ LABEL(0x0) REMA CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_SWORD_AUDHULMA) - GIVEITEMTO(CHARACTER_EPHRAIM) + GIVE_ITEM(CHARACTER_EPHRAIM) CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_ANIMA_EXCALIBUR) - GIVEITEMTO(CHARACTER_EPHRAIM) + GIVE_ITEM(CHARACTER_EPHRAIM) LABEL(0x1) FADI(16) CLEA @@ -135,7 +135,7 @@ CONST_DATA EventListScr EventScr_089F65C8[] = { MUNO CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_MASTERSEAL) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA }; diff --git a/src/events/ch15b-eventscript.h b/src/events/ch15b-eventscript.h index 7eeebc0c1..7f5273006 100644 --- a/src/events/ch15b-eventscript.h +++ b/src/events/ch15b-eventscript.h @@ -89,7 +89,7 @@ CONST_DATA EventListScr EventScr_089FC904[] = { MUNO CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_MASTERSEAL) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA }; diff --git a/src/events/ch16a-eventscript.h b/src/events/ch16a-eventscript.h index 2d2420378..c870ce0a0 100644 --- a/src/events/ch16a-eventscript.h +++ b/src/events/ch16a-eventscript.h @@ -374,13 +374,13 @@ CONST_DATA EventListScr EventScr_089F6E50[] = { REMA CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_LANCE_SIEGMUND) - GIVEITEMTO(CHARACTER_EPHRAIM) + GIVE_ITEM(CHARACTER_EPHRAIM) TEXTSHOW(0xb56) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_SWORD_SIEGLINDE) - GIVEITEMTO(CHARACTER_EIRIKA) + GIVE_ITEM(CHARACTER_EIRIKA) CHECK_MODE SVAL(EVT_SLOT_1, 0x2) BNE(0x0, EVT_SLOT_C, EVT_SLOT_1) @@ -530,7 +530,7 @@ LABEL(0x1) CONST_DATA EventListScr EventScr_089F74F0[] = { CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_LUNARBRACE) - GIVEITEMTO(CHARACTER_EIRIKA) + GIVE_ITEM(CHARACTER_EIRIKA) EVBIT_MODIFY(0x4) TUTORIALTEXTBOXSTART SVAL(EVT_SLOT_B, 0xffffffff) @@ -543,7 +543,7 @@ CONST_DATA EventListScr EventScr_089F74F0[] = { CONST_DATA EventListScr EventScr_089F7524[] = { CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_SOLARBRACE) - GIVEITEMTO(CHARACTER_EPHRAIM) + GIVE_ITEM(CHARACTER_EPHRAIM) EVBIT_MODIFY(0x4) TUTORIALTEXTBOXSTART SVAL(EVT_SLOT_B, 0xffffffff) diff --git a/src/events/ch17a-eventscript.h b/src/events/ch17a-eventscript.h index 20d936370..068f59410 100644 --- a/src/events/ch17a-eventscript.h +++ b/src/events/ch17a-eventscript.h @@ -297,10 +297,10 @@ LABEL(0x1f) MUNO CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_BOW_NIDHOGG) - GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) + GIVE_ITEM(CHAR_EVT_PLAYER_LEADER) CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_LANCE_VIDOFNIR) - GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) + GIVE_ITEM(CHAR_EVT_PLAYER_LEADER) BEQ(0x34, EVT_SLOT_7, EVT_SLOT_0) MUSC(SONG_RAID) STAL(50) @@ -320,7 +320,7 @@ LABEL(0x33) MUNO CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_STAFF_RESCUE) - GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) + GIVE_ITEM(CHAR_EVT_PLAYER_LEADER) LABEL(0x34) ENDA }; diff --git a/src/events/ch19a-eventscript.h b/src/events/ch19a-eventscript.h index 47502f50f..819d9d710 100644 --- a/src/events/ch19a-eventscript.h +++ b/src/events/ch19a-eventscript.h @@ -298,13 +298,13 @@ LABEL(0x15) REMA CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_LIGHT_IVALDI) - GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) + GIVE_ITEM(CHAR_EVT_PLAYER_LEADER) CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_STAFF_LATONA) - GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) + GIVE_ITEM(CHAR_EVT_PLAYER_LEADER) CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, 10000) - GIVEITEMTOMAIN(CHAR_EVT_PLAYER_LEADER) + GIVE_MONEY(CHAR_EVT_PLAYER_LEADER) CHECK_MODE SVAL(EVT_SLOT_1, 0x2) BNE(0x1e, EVT_SLOT_C, EVT_SLOT_1) @@ -332,7 +332,7 @@ LABEL(0x29) REMA CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_SWORD_LIGHTBRAND) - GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) + GIVE_ITEM(CHAR_EVT_PLAYER_LEADER) LABEL(0x2a) ENDA }; diff --git a/src/events/ch2-eventscript.h b/src/events/ch2-eventscript.h index b9b847df3..ca76bb20b 100644 --- a/src/events/ch2-eventscript.h +++ b/src/events/ch2-eventscript.h @@ -240,7 +240,7 @@ LABEL(0x0) LABEL(0x1) CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_REDGEM) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA }; @@ -251,7 +251,7 @@ CONST_DATA EventListScr EventScr_Ch2_Village2[] = { MUNO CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_ELIXIR) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA }; @@ -262,7 +262,7 @@ CONST_DATA EventListScr EventScr_Ch2_Village3[] = { MUNO CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_PUREWATER) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA }; diff --git a/src/events/ch4-eventscript.h b/src/events/ch4-eventscript.h index 7d26c3a5b..685f3a0ec 100644 --- a/src/events/ch4-eventscript.h +++ b/src/events/ch4-eventscript.h @@ -225,7 +225,7 @@ CONST_DATA EventListScr EventScr_089F1BD8[] = { MUNO CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_AXE_IRON) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA }; diff --git a/src/events/ch5-eventscript.h b/src/events/ch5-eventscript.h index 59c185a83..43526a651 100644 --- a/src/events/ch5-eventscript.h +++ b/src/events/ch5-eventscript.h @@ -205,7 +205,7 @@ LABEL(0x1) REMA CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_GUIDINGRING) - GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) + GIVE_ITEM(CHAR_EVT_PLAYER_LEADER) LABEL(0x2) ENUT(219) ENUT(189) @@ -225,7 +225,7 @@ CONST_DATA EventListScr EventScr_089F2170[] = { MUNO CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_SWORD_ARMORSLAYER) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) SVAL(EVT_SLOT_2, EventScr_089F2340) CALL(EventScr_CallOnTutorialMode) EVBIT_T(7) @@ -238,7 +238,7 @@ CONST_DATA EventListScr EventScr_089F21BC[] = { MUNO CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_BOOSTER_DEF) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA }; @@ -249,7 +249,7 @@ CONST_DATA EventListScr EventScr_089F21F8[] = { MUNO CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_BOOSTER_SKL) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA }; @@ -259,7 +259,7 @@ CONST_DATA EventListScr EventScr_089F2234[] = { Text_BG(BG_HOUSE, 0x9d0) CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_TORCH) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) MUNO EVBIT_T(7) ENDA diff --git a/src/events/ch6-eventscript.h b/src/events/ch6-eventscript.h index e7ab388c4..661c30846 100644 --- a/src/events/ch6-eventscript.h +++ b/src/events/ch6-eventscript.h @@ -147,7 +147,7 @@ CONST_DATA EventListScr EventScr_Ch6_EndingScene[] = { MUSCMID(SONG_SILENT) CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_ORIONSBOLT) - GIVEITEMTO(CHARACTER_EIRIKA) + GIVE_ITEM(CHARACTER_EIRIKA) LABEL(0x0) REMA MUSC(SONG_LEGACY) @@ -171,7 +171,7 @@ CONST_DATA EventListScr EventScr_089F2A98[] = { MUNO CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_ANTITOXIN) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) 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 fded44b1a..0ead08474 100644 --- a/src/events/ch8-eventscript.h +++ b/src/events/ch8-eventscript.h @@ -317,7 +317,7 @@ CONST_DATA EventListScr EventScr_SplitMenu[] = { MUSCSLOW(SONG_SILENT) CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, 10000) - GIVEITEMTOMAIN(CHAR_EVT_PLAYER_LEADER) + GIVE_MONEY(CHAR_EVT_PLAYER_LEADER) SetBackground(BG_CASTLE_INTERIOR) MUSC(SONG_SORROW) TEXTSHOW(0xc0f) diff --git a/src/events/ch9a-eventscript.h b/src/events/ch9a-eventscript.h index f47341344..96ba11bb7 100644 --- a/src/events/ch9a-eventscript.h +++ b/src/events/ch9a-eventscript.h @@ -280,7 +280,7 @@ CONST_DATA EventListScr EventScr_Ch9a_EndingScene[] = { REMA CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_BOOSTER_HP) - GIVEITEMTO(CHAR_EVT_PLAYER_LEADER) + GIVE_ITEM(CHAR_EVT_PLAYER_LEADER) LABEL(0x0) ENUT(113) MNCH(0xb) @@ -320,7 +320,7 @@ CONST_DATA EventListScr EventScr_089F3F9C[] = { MURE(0x2) CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_BOOSTER_DEF) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) EVBIT_T(7) ENDA }; @@ -331,7 +331,7 @@ CONST_DATA EventListScr EventScr_089F3FDC[] = { MUNO CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, ITEM_SWORD_RAPIER) - GIVEITEMTO(CHAR_EVT_ACTIVE_UNIT) + 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 7c3be49fe..5c609796c 100644 --- a/src/events/lordsplit-eventscript.h +++ b/src/events/lordsplit-eventscript.h @@ -31,7 +31,7 @@ LABEL(0x1) REMA CALL(EventScr_RemoveBGIfNeeded) SVAL(EVT_SLOT_3, 5000) - GIVEITEMTOMAIN(CHAR_EVT_PLAYER_LEADER) + GIVE_MONEY(CHAR_EVT_PLAYER_LEADER) FADI(4) REMOVEPORTRAITS BACG(BG_CASTLE_BRIGHT) diff --git a/src/events/prologue-eventscript.h b/src/events/prologue-eventscript.h index e3388649d..6993c9437 100644 --- a/src/events/prologue-eventscript.h +++ b/src/events/prologue-eventscript.h @@ -214,7 +214,7 @@ CONST_DATA EventListScr EventScr_Prologue_GiveRapier[] = { /* Give item via slot3 */ SVAL(EVT_SLOT_3, ITEM_SWORD_RAPIER) - GIVEITEMTO(CHARACTER_EIRIKA) + GIVE_ITEM(CHARACTER_EIRIKA) 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 cd5a96676..4d7ad0922 100644 --- a/src/events_script_utils.c +++ b/src/events_script_utils.c @@ -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 }; From 77257156bf618ae345e0176d49ec517d3b110da0 Mon Sep 17 00:00:00 2001 From: Eebit Date: Sun, 4 May 2025 17:55:31 -0400 Subject: [PATCH 3/4] Simplify event item/money macros --- include/EA_Standard_Library/Main_Code_Helpers.h | 8 ++++++++ src/events/ch10b-eventscript.h | 9 +++------ src/events/ch12a-eventscript.h | 3 +-- src/events/ch13a-eventscript.h | 6 ++---- src/events/ch13b-eventscript.h | 6 ++---- src/events/ch14a-eventscript.h | 12 ++++-------- src/events/ch14b-eventscript.h | 6 ++---- src/events/ch15a-eventscript.h | 15 +++++---------- src/events/ch15b-eventscript.h | 3 +-- src/events/ch16a-eventscript.h | 12 ++++-------- src/events/ch17a-eventscript.h | 9 +++------ src/events/ch19a-eventscript.h | 12 ++++-------- src/events/ch2-eventscript.h | 9 +++------ src/events/ch4-eventscript.h | 3 +-- src/events/ch5-eventscript.h | 15 +++++---------- src/events/ch6-eventscript.h | 6 ++---- src/events/ch8-eventscript.h | 3 +-- src/events/lordsplit-eventscript.h | 3 +-- src/events/prologue-eventscript.h | 3 +-- 19 files changed, 53 insertions(+), 90 deletions(-) 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/src/events/ch10b-eventscript.h b/src/events/ch10b-eventscript.h index 2748945bb..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, ITEM_KNIGHTCREST) - GIVE_ITEM(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, ITEM_STAFF_TORCH) - GIVE_ITEM(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, ITEM_HEROCREST) - GIVE_ITEM(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 a1032265f..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, ITEM_STAFF_BARRIER) - GIVE_ITEM(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 3ca6d966e..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, 5000) - GIVE_MONEY(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, 5000) - GIVE_MONEY(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 0973ae112..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, ITEM_STAFF_BARRIER) - GIVE_ITEM(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, ITEM_BOOSTER_RES) - GIVE_ITEM(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 81e450557..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, ITEM_SWORD_AUDHULMA) - GIVE_ITEM(CHARACTER_JOSHUA) + GiveItemTo(CHARACTER_JOSHUA, ITEM_SWORD_AUDHULMA) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, ITEM_ANIMA_EXCALIBUR) - GIVE_ITEM(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, ITEM_SWORD_AUDHULMA) - GIVE_ITEM(CHARACTER_EIRIKA) + GiveItemTo(CHARACTER_EIRIKA, ITEM_SWORD_AUDHULMA) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, ITEM_ANIMA_EXCALIBUR) - GIVE_ITEM(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 409619d2c..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, ITEM_DARK_GLEIPNIR) - GIVE_ITEM(CHARACTER_EPHRAIM) + GiveItemTo(CHARACTER_EPHRAIM, ITEM_DARK_GLEIPNIR) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, ITEM_AXE_GARM) - GIVE_ITEM(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 cd8c9dfd4..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, ITEM_DARK_GLEIPNIR) - GIVE_ITEM(CHARACTER_EIRIKA) + GiveItemTo(CHARACTER_EIRIKA, ITEM_DARK_GLEIPNIR) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, ITEM_AXE_GARM) - GIVE_ITEM(CHARACTER_EIRIKA) + GiveItemTo(CHARACTER_EIRIKA, ITEM_AXE_GARM) GOTO(0x1) LABEL(0x0) TEXTSHOW(0xb28) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, ITEM_SWORD_AUDHULMA) - GIVE_ITEM(CHARACTER_EPHRAIM) + GiveItemTo(CHARACTER_EPHRAIM, ITEM_SWORD_AUDHULMA) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, ITEM_ANIMA_EXCALIBUR) - GIVE_ITEM(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, ITEM_MASTERSEAL) - GIVE_ITEM(CHAR_EVT_ACTIVE_UNIT) + GiveItemTo(CHAR_EVT_ACTIVE_UNIT, ITEM_MASTERSEAL) EVBIT_T(7) ENDA }; diff --git a/src/events/ch15b-eventscript.h b/src/events/ch15b-eventscript.h index 7f5273006..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, ITEM_MASTERSEAL) - GIVE_ITEM(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 c870ce0a0..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, ITEM_LANCE_SIEGMUND) - GIVE_ITEM(CHARACTER_EPHRAIM) + GiveItemTo(CHARACTER_EPHRAIM, ITEM_LANCE_SIEGMUND) TEXTSHOW(0xb56) TEXTEND REMA CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, ITEM_SWORD_SIEGLINDE) - GIVE_ITEM(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, ITEM_LUNARBRACE) - GIVE_ITEM(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, ITEM_SOLARBRACE) - GIVE_ITEM(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 068f59410..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, ITEM_BOW_NIDHOGG) - GIVE_ITEM(CHAR_EVT_PLAYER_LEADER) + GiveItemTo(CHAR_EVT_PLAYER_LEADER, ITEM_BOW_NIDHOGG) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, ITEM_LANCE_VIDOFNIR) - GIVE_ITEM(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, ITEM_STAFF_RESCUE) - GIVE_ITEM(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 819d9d710..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, ITEM_LIGHT_IVALDI) - GIVE_ITEM(CHAR_EVT_PLAYER_LEADER) + GiveItemTo(CHAR_EVT_PLAYER_LEADER, ITEM_LIGHT_IVALDI) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, ITEM_STAFF_LATONA) - GIVE_ITEM(CHAR_EVT_PLAYER_LEADER) + GiveItemTo(CHAR_EVT_PLAYER_LEADER, ITEM_STAFF_LATONA) CALL(EventScr_RemoveBGIfNeeded) - SVAL(EVT_SLOT_3, 10000) - GIVE_MONEY(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, ITEM_SWORD_LIGHTBRAND) - GIVE_ITEM(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 ca76bb20b..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, ITEM_REDGEM) - GIVE_ITEM(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, ITEM_ELIXIR) - GIVE_ITEM(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, ITEM_PUREWATER) - GIVE_ITEM(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 685f3a0ec..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, ITEM_AXE_IRON) - GIVE_ITEM(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 43526a651..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, ITEM_GUIDINGRING) - GIVE_ITEM(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, ITEM_SWORD_ARMORSLAYER) - GIVE_ITEM(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, ITEM_BOOSTER_DEF) - GIVE_ITEM(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, ITEM_BOOSTER_SKL) - GIVE_ITEM(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, ITEM_TORCH) - GIVE_ITEM(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 661c30846..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, ITEM_ORIONSBOLT) - GIVE_ITEM(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, ITEM_ANTITOXIN) - GIVE_ITEM(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 0ead08474..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, 10000) - GIVE_MONEY(CHAR_EVT_PLAYER_LEADER) + GiveMoney(10000) SetBackground(BG_CASTLE_INTERIOR) MUSC(SONG_SORROW) TEXTSHOW(0xc0f) diff --git a/src/events/lordsplit-eventscript.h b/src/events/lordsplit-eventscript.h index 5c609796c..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, 5000) - GIVE_MONEY(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 6993c9437..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) - GIVE_ITEM(CHARACTER_EIRIKA) + GiveItemTo(CHARACTER_EIRIKA, ITEM_SWORD_RAPIER) SVAL(EVT_SLOT_2, EventScr_Prologue_9EF828) CALL(EventScr_CallOnTutorialMode) From dc6e9ef02219fcfa7bf69be8c5c25b60031c2046 Mon Sep 17 00:00:00 2001 From: Eebit Date: Tue, 13 May 2025 00:07:18 -0400 Subject: [PATCH 4/4] Support backwards-compatible aliases for Item event codes --- include/EA_Standard_Library/Code_Ailases.h | 5 ----- include/EA_Standard_Library/Code_Aliases.h | 11 +++++++++++ include/EAstdlib.h | 2 +- 3 files changed, 12 insertions(+), 6 deletions(-) delete mode 100644 include/EA_Standard_Library/Code_Ailases.h create mode 100644 include/EA_Standard_Library/Code_Aliases.h 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/EAstdlib.h b/include/EAstdlib.h index 66e223d2e..f9ec21af6 100644 --- a/include/EAstdlib.h +++ b/include/EAstdlib.h @@ -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"