Merge pull request #723 from kagnusdev/contrib/EventScr_9EE5BC

CT075 · web-flow · commit f2c3620cde19 · 2025-11-12T17:01:22.000-05:00
Rename EventScr_9EE5BC and use character constants in scripts calling it
diff --git a/include/eventcall.h b/include/eventcall.h
@@ -186,7 +186,7 @@ extern CONST_DATA EventListScr EventScr_UnitWarpIN[];
 extern CONST_DATA EventListScr EventScr_UnitWarpOUT[];
 extern CONST_DATA EventListScr EventScr_UnitFlushingIN[];
 extern CONST_DATA EventListScr EventScr_UnitFlushingOUT[];
-extern CONST_DATA EventListScr EventScr_9EE5BC[];
+extern CONST_DATA EventListScr EventScr_StrictLoadUniqueAlly[];
 extern CONST_DATA EventListScr EventScr_GiveTreasureToLuckyDog[];
 extern CONST_DATA EventListScr EventScr_ChangeAIinQueue[];
 extern CONST_DATA EventListScr EventScr_9EE6A0[];
diff --git a/src/events/ch10a-eventscript.h b/src/events/ch10a-eventscript.h
@@ -159,8 +159,8 @@ LABEL(0x1)
 	REMU(CHARACTER_GERIK)
 	REMU(CHARACTER_TETHYS)
 LABEL(0x2)
-	SVAL(EVT_SLOT_2, 0x16)
-	CALL(EventScr_9EE5BC)
+	SVAL(EVT_SLOT_2, CHARACTER_MARISA)
+	CALL(EventScr_StrictLoadUniqueAlly)
 	CLEA
 	CLEE
 	CLEN
diff --git a/src/events/ch10b-eventscript.h b/src/events/ch10b-eventscript.h
@@ -231,8 +231,8 @@ LABEL(0x0)
     MUSCMID(SONG_SILENT)
     FADI(16)
     CLEAN
-    SVAL(EVT_SLOT_2, 0xe)
-    CALL(EventScr_9EE5BC)
+    SVAL(EVT_SLOT_2, CHARACTER_CORMAG)
+    CALL(EventScr_StrictLoadUniqueAlly)
     CLEE
     FADU(16)
     CAMERA_CAHR(CHARACTER_EPHRAIM)
diff --git a/src/events/ch12b-eventscript.h b/src/events/ch12b-eventscript.h
@@ -149,8 +149,8 @@ CONST_DATA EventListScr EventScr_Ch12b_EndingScene[] = {
     CALL(EventScr_LoadUniqueAlly)
     GOTO(0x1)
 LABEL(0x0)
-    SVAL(EVT_SLOT_2, 0x16)
-    CALL(EventScr_9EE5BC)
+    SVAL(EVT_SLOT_2, CHARACTER_MARISA)
+    CALL(EventScr_StrictLoadUniqueAlly)
 LABEL(0x1)
     CLEA
     CLEE
diff --git a/src/events/ch14a-eventscript.h b/src/events/ch14a-eventscript.h
@@ -131,8 +131,8 @@ CONST_DATA EventListScr EventScr_089F5CC4[] = {
 
 CONST_DATA EventListScr EventScr_Ch14a_EndingScene[] = {
     FADI(16)
-    SVAL(EVT_SLOT_2, 0x1c)
-    CALL(EventScr_9EE5BC)
+    SVAL(EVT_SLOT_2, CHARACTER_RENNAC)
+    CALL(EventScr_StrictLoadUniqueAlly)
     MUSC(SONG_RAID)
     CLEA
     CLEE
diff --git a/src/events/ch14b-eventscript.h b/src/events/ch14b-eventscript.h
@@ -115,8 +115,8 @@ CONST_DATA EventListScr EventScr_089FC04C[] = {
 CONST_DATA EventListScr EventScr_Ch14b_EndingScene[] = {
     MUSCMID(SONG_SILENT)
     FADI(16)
-    SVAL(EVT_SLOT_2, 0x1c)
-    CALL(EventScr_9EE5BC)
+    SVAL(EVT_SLOT_2, CHARACTER_RENNAC)
+    CALL(EventScr_StrictLoadUniqueAlly)
     CLEA
     CLEE
     CLEN
diff --git a/src/events/ch2-eventscript.h b/src/events/ch2-eventscript.h
@@ -188,10 +188,10 @@ LABEL(0x0)
     ENUT(218)
     ENUT(203)
     MNCH(0x3)
-    SVAL(EVT_SLOT_2, 0x7)
-    CALL(EventScr_9EE5BC)
-    SVAL(EVT_SLOT_2, 0xa)
-    CALL(EventScr_9EE5BC)
+    SVAL(EVT_SLOT_2, CHARACTER_ROSS)
+    CALL(EventScr_StrictLoadUniqueAlly)
+    SVAL(EVT_SLOT_2, CHARACTER_GARCIA)
+    CALL(EventScr_StrictLoadUniqueAlly)
     ENDA
 };
 
diff --git a/src/events/ch3-eventscript.h b/src/events/ch3-eventscript.h
@@ -117,8 +117,8 @@ CONST_DATA EventListScr EventScr_Ch3_EndingScene[] = {
     CALL(EventScr_LoadUniqueAlly)
     GOTO(0x1)
 LABEL(0x0)
-    SVAL(EVT_SLOT_2, 0x9)
-    CALL(EventScr_9EE5BC)
+    SVAL(EVT_SLOT_2, CHARACTER_COLM)
+    CALL(EventScr_StrictLoadUniqueAlly)
 LABEL(0x1)
     SetBackground(BG_FORT)
     TEXTSHOW(0x996)
diff --git a/src/events/ch5-eventscript.h b/src/events/ch5-eventscript.h
@@ -176,8 +176,8 @@ LABEL(0x8020)
 
 CONST_DATA EventListScr EventScr_Ch5_EndingScene[] = {
     FADI(16)
-    SVAL(EVT_SLOT_2, 0x20)
-    CALL(EventScr_9EE5BC)
+    SVAL(EVT_SLOT_2, CHARACTER_JOSHUA)
+    CALL(EventScr_StrictLoadUniqueAlly)
     SetBackground(BG_SERAFEW_VILLAGE)
     CHECK_ALIVE(CHARACTER_NATASHA)
     BEQ(0x0, EVT_SLOT_C, EVT_SLOT_0)
diff --git a/src/events/ch9b-eventscript.h b/src/events/ch9b-eventscript.h
@@ -167,8 +167,8 @@ CONST_DATA EventListScr EventScr_Ch9b_EndingScene[] = {
     TEXTEND
     REMA
     FADI(16)
-    SVAL(EVT_SLOT_2, 0x12)
-    CALL(EventScr_9EE5BC)
+    SVAL(EVT_SLOT_2, CHARACTER_AMELIA)
+    CALL(EventScr_StrictLoadUniqueAlly)
     CLEAN
     CAMERA2(17, 9)
     CLEA
diff --git a/src/events_script_utils.c b/src/events_script_utils.c
@@ -462,7 +462,7 @@ CONST_DATA EventListScr EventScr_UnitFlushingOUT[] = {
     ENDA
 };
 
-CONST_DATA EventListScr EventScr_9EE5BC[] = {
+CONST_DATA EventListScr EventScr_StrictLoadUniqueAlly[] = {
     CHECK_EXISTS(CHAR_EVT_SLOT2)
     BNE(0x0, EVT_SLOT_C, EVT_SLOT_0)
 
