Two additional script macros

2019-10-19 22:37:08 -04:00
parent 5a956fd91a
commit 9d8c5b2250
43 changed files with 196 additions and 390 deletions
@@ -0,0 +1,22 @@
+#ifndef GUARD_CONSTANTS_FAME_CHECKER_H
+#define GUARD_CONSTANTS_FAME_CHECKER_H
+
+#define FAMECHECKER_OAK          0
+#define FAMECHECKER_DAISY        1
+#define FAMECHECKER_BROCK        2
+#define FAMECHECKER_MISTY        3
+#define FAMECHECKER_LTSURGE      4
+#define FAMECHECKER_ERIKA        5
+#define FAMECHECKER_KOGA         6
+#define FAMECHECKER_SABRINA      7
+#define FAMECHECKER_BLAINE       8
+#define FAMECHECKER_LORELEI      9
+#define FAMECHECKER_BRUNO       10
+#define FAMECHECKER_AGATHA      11
+#define FAMECHECKER_LANCE       12
+#define FAMECHECKER_BILL        13
+#define FAMECHECKER_MRFUJI      14
+#define FAMECHECKER_GIOVANNI    15
+#define NUM_FAMECHECKER_PERSONS 16
+
+#endif //GUARD_CONSTANTS_FAME_CHECKER_H
@@ -1223,19 +1223,19 @@
 #define FLAG_0x4AF               0x4AF

 // Boss clear flags
-#define FLAG_0x4B0               0x4B0
-#define FLAG_0x4B1               0x4B1
-#define FLAG_0x4B2               0x4B2
-#define FLAG_0x4B3               0x4B3
-#define FLAG_0x4B4               0x4B4
-#define FLAG_0x4B5               0x4B5
-#define FLAG_0x4B6               0x4B6
-#define FLAG_0x4B7               0x4B7
-#define FLAG_0x4B8               0x4B8
-#define FLAG_0x4B9               0x4B9
-#define FLAG_0x4BA               0x4BA
-#define FLAG_0x4BB               0x4BB
-#define FLAG_0x4BC               0x4BC
+#define FLAG_DEFEATED_BROCK           0x4B0
+#define FLAG_DEFEATED_MISTY           0x4B1
+#define FLAG_DEFEATED_LT_SURGE        0x4B2
+#define FLAG_DEFEATED_ERIKA           0x4B3
+#define FLAG_DEFEATED_KOGA            0x4B4
+#define FLAG_DEFEATED_SABRINA         0x4B5
+#define FLAG_DEFEATED_BLAINE          0x4B6
+#define FLAG_DEFEATED_LEADER_GIOVANNI 0x4B7
+#define FLAG_DEFEATED_LORELEI         0x4B8
+#define FLAG_DEFEATED_BRUNO           0x4B9
+#define FLAG_DEFEATED_AGATHA          0x4BA
+#define FLAG_DEFEATED_LANCE           0x4BB
+#define FLAG_DEFEATED_RIVAL           0x4BC

 // Unused?
 #define FLAG_0x4BD               0x4BD
@@ -2,26 +2,7 @@
 #define GUARD_FAME_CHECKER_H

 #include "main.h"
-
-enum {
-    FAMECHECKER_OAK,
-    FAMECHECKER_DAISY,
-    FAMECHECKER_BROCK,
-    FAMECHECKER_MISTY,
-    FAMECHECKER_LTSURGE,
-    FAMECHECKER_ERIKA,
-    FAMECHECKER_KOGA,
-    FAMECHECKER_SABRINA,
-    FAMECHECKER_BLAINE,
-    FAMECHECKER_LORELEI,
-    FAMECHECKER_BRUNO,
-    FAMECHECKER_AGATHA,
-    FAMECHECKER_LANCE,
-    FAMECHECKER_BILL,
-    FAMECHECKER_MRFUJI,
-    FAMECHECKER_GIOVANNI,
-    NUM_FAMECHECKER_PERSONS
-};
+#include "constants/fame_checker.h"

 enum {
    FCPICKSTATE_NO_DRAW,