summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpetrie911 <petrie911@yahoo.com>2024-04-07 15:56:09 -0500
committerLywx <kiritodev01@gmail.com>2024-04-08 13:40:13 -0600
commit4a1c3292d7f0567415cbad33db1734586b1e6ab6 (patch)
treebb6b14cbf8dd17548e4ea2bbff512c6548daca5b
parent5c264dfc0893112249c96508d7c907e2e18f3828 (diff)
script
-rw-r--r--src/factories/sf64/ScriptFactory.cpp22
1 files changed, 19 insertions, 3 deletions
diff --git a/src/factories/sf64/ScriptFactory.cpp b/src/factories/sf64/ScriptFactory.cpp
index 4c40b0c..64c6a31 100644
--- a/src/factories/sf64/ScriptFactory.cpp
+++ b/src/factories/sf64/ScriptFactory.cpp
@@ -72,12 +72,20 @@ std::string MakeScriptCmd(uint16_t s1, uint16_t s2) {
case 25:
cmd << "EVENT_STOP_ROTATE(";
break;
+ case 44:
+ cmd << "EVENT_CHASE_TARGET(" << std::dec << arg1 << ", " << s2;
+ break;
+ case 45: {
+ auto teamId = VALUE_TO_ENUM(arg1, "TeamId", "TEAMID_UNK");
+ cmd << "EVENT_SET_TARGET(" << teamId << ", " << std::dec << s2;
+ } break;
case 56:
cmd << "EVENT_SET_CALL(" << std::dec << s2 << ", " << arg1;
break;
- case 57:
- cmd << "EVENT_RESTORE_TEAM(" << std::dec << s2;
- break;
+ case 57: {
+ auto teamId = VALUE_TO_ENUM(s2, "TeamId", "TEAMID_UNK");
+ cmd << "EVENT_RESTORE_TEAM(" << teamId;
+ } break;
case 58:
case 59: {
// auto sfxIndex = Companion::Instance->GetEnumFromValue("EventSfx", s2).value_or("/* EVSFX_UNK */ " + std::to_string(s2));
@@ -101,6 +109,10 @@ std::string MakeScriptCmd(uint16_t s1, uint16_t s2) {
auto actorInfo = VALUE_TO_ENUM(s2, "EventActorInfo", "EINFO_UNK");
cmd << "EVENT_INIT_ACTOR(" << actorInfo << ", " << std::dec << arg1;
} break;
+ case 105: {
+ auto teamId = VALUE_TO_ENUM(s2, "TeamId", "TEAMID_UNK");
+ cmd << "EVENT_SET_TEAM_ID(" << teamId;
+ } break;
case 112:{
// auto actiontype = Companion::Instance->GetEnumFromValue("EventAction", s2).value_or("/* EVACT_UNK */ " + std::to_string(s2));
auto actiontype = VALUE_TO_ENUM(s2, "EventAction", "EVACT_UNK");
@@ -130,6 +142,10 @@ std::string MakeScriptCmd(uint16_t s1, uint16_t s2) {
auto rcidName = VALUE_TO_ENUM(arg1, "RadioCharacterId", "RCID_UNK");
cmd << "EVENT_PLAY_MSG(" << rcidName << ", " << std::dec << s2;
} break;
+ case 121: {
+ auto teamId = VALUE_TO_ENUM(s2, "TeamId", "TEAMID_UNK");
+ cmd << "EVENT_DAMAGE_TEAM(" << teamId << ", " << std::dec << arg1;
+ } break;
case 122:
cmd << "EVENT_STOP_BGM(";
break;