Merge pull request #725 from kagnusdev/contrib/arguments-for-EventScr_LoadUniqueAlly

CT075 · web-flow · commit b67c7ee5de81 · 2025-11-15T14:29:37.000-05:00
Use CHARACTER_* constants instead of raw hex when calling EventScr_LoadUniqueAlly
diff --git a/src/events/ch10a-eventscript.h b/src/events/ch10a-eventscript.h
@@ -126,7 +126,7 @@ CONST_DATA EventListScr EventScr_089F43A0[] = {
 
 CONST_DATA EventListScr EventScr_Ch10a_EndingScene[] = {
 	FADI(16)
-	SVAL(EVT_SLOT_2, 0xb)
+	SVAL(EVT_SLOT_2, CHARACTER_INNES)
 	CALL(EventScr_LoadUniqueAlly)
 	SVAL(EVT_SLOT_7, 0x2)
 	CHECK_EXISTS(CHARACTER_GERIK)
@@ -143,9 +143,9 @@ LABEL(0x0)
 	SVAL(EVT_SLOT_1, 0x1)
 	SSUB(EVT_SLOT_7, EVT_SLOT_7, EVT_SLOT_1)
 LABEL(0x1)
-	SVAL(EVT_SLOT_2, 0x14)
+	SVAL(EVT_SLOT_2, CHARACTER_GERIK)
 	CALL(EventScr_LoadUniqueAlly)
-	SVAL(EVT_SLOT_2, 0x15)
+	SVAL(EVT_SLOT_2, CHARACTER_TETHYS)
 	CALL(EventScr_LoadUniqueAlly)
 	BEQ(0x2, EVT_SLOT_7, EVT_SLOT_0)
 	SVAL(EVT_SLOT_1, 0x0)
diff --git a/src/events/ch10b-eventscript.h b/src/events/ch10b-eventscript.h
@@ -251,7 +251,7 @@ LABEL(0x1)
     FADI(16)
 LABEL(0x2)
     MUSC(SONG_VICTORY)
-    SVAL(EVT_SLOT_2, 0x1d)
+    SVAL(EVT_SLOT_2, CHARACTER_DUESSEL)
     CALL(EventScr_LoadUniqueAlly)
     CLEA
     CLEE
diff --git a/src/events/ch11a-eventscript.h b/src/events/ch11a-eventscript.h
@@ -94,9 +94,9 @@ LABEL(0x2)
     REMA
     MUSCMID(SONG_SILENT)
     FADI(16)
-    SVAL(EVT_SLOT_2, 0x19)
+    SVAL(EVT_SLOT_2, CHARACTER_LARACHEL)
     CALL(EventScr_LoadUniqueAlly)
-    SVAL(EVT_SLOT_2, 0x1a)
+    SVAL(EVT_SLOT_2, CHARACTER_DOZLA)
     CALL(EventScr_LoadUniqueAlly)
     CLEA
     CLEE
diff --git a/src/events/ch11b-eventscript.h b/src/events/ch11b-eventscript.h
@@ -164,9 +164,9 @@ CONST_DATA EventListScr EventScr_Ch11b_EndingScene[] = {
 LABEL(0x0)
     REMA
     FADI(16)
-    SVAL(EVT_SLOT_2, 0x19)
+    SVAL(EVT_SLOT_2, CHARACTER_LARACHEL)
     CALL(EventScr_LoadUniqueAlly)
-    SVAL(EVT_SLOT_2, 0x1a)
+    SVAL(EVT_SLOT_2, CHARACTER_DOZLA)
     CALL(EventScr_LoadUniqueAlly)
     ENUT(115)
     MNC2(0x19)
diff --git a/src/events/ch12b-eventscript.h b/src/events/ch12b-eventscript.h
@@ -145,7 +145,7 @@ CONST_DATA EventListScr EventScr_Ch12b_EndingScene[] = {
     CHECK_ALIVE(CHARACTER_EWAN)
     BEQ(0x0, EVT_SLOT_C, EVT_SLOT_0)
     SVAL(EVT_SLOT_A, 0x1)
-    SVAL(EVT_SLOT_2, 0x16)
+    SVAL(EVT_SLOT_2, CHARACTER_MARISA)
     CALL(EventScr_LoadUniqueAlly)
     GOTO(0x1)
 LABEL(0x0)
diff --git a/src/events/ch17a-eventscript.h b/src/events/ch17a-eventscript.h
@@ -207,7 +207,7 @@ CONST_DATA EventListScr EventScr_089F79D4[] = {
 LABEL(0x0)
     MUSCMID(SONG_SILENT)
     FADI(16)
-    SVAL(EVT_SLOT_2, 0x21)
+    SVAL(EVT_SLOT_2, CHARACTER_SYRENE)
     CALL(EventScr_LoadUniqueAlly)
     CLEA
     CLEE
diff --git a/src/events/ch2-eventscript.h b/src/events/ch2-eventscript.h
@@ -141,9 +141,9 @@ CONST_DATA EventListScr EventScr_Ch2_EndingScene[] = {
     TEXTEND
     REMA
     FADI(16)
-    SVAL(EVT_SLOT_2, 0xa)
+    SVAL(EVT_SLOT_2, CHARACTER_GARCIA)
     CALL(EventScr_LoadUniqueAlly)
-    SVAL(EVT_SLOT_2, 0x7)
+    SVAL(EVT_SLOT_2, CHARACTER_ROSS)
     CALL(EventScr_LoadUniqueAlly)
 LABEL(0x0)
     SetBackground(BG_VILLAGE_SUNSET)
diff --git a/src/events/ch3-eventscript.h b/src/events/ch3-eventscript.h
@@ -113,7 +113,7 @@ CONST_DATA EventListScr EventScr_Ch3_EndingScene[] = {
     TEXTEND
     REMA
     FADI(16)
-    SVAL(EVT_SLOT_2, 0x9)
+    SVAL(EVT_SLOT_2, CHARACTER_COLM)
     CALL(EventScr_LoadUniqueAlly)
     GOTO(0x1)
 LABEL(0x0)
