FF7: Add additional main models eye-to-model mapping

julianxhokaxhiu · Sep 2, 2023 · b135afd · b135afd
1 parent 8080625
commit b135afd
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 17 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -5,7 +5,8 @@
 ## FF7
 
 - Ambient: Allow ambient effects to playback in fields that use movies as background
-- Renderer: Fix black color in some field maps (spipe2 for example)
+- Core: Add additional main models eye-to-model mapping
+- Renderer: Fix black color in some field maps (`spipe2` for example) ( https://github.com/julianxhokaxhiu/FFNx/pull/587 )
 
 # 1.16.0
 

diff --git a/src/ff7/field/model.cpp b/src/ff7/field/model.cpp
@@ -308,28 +308,69 @@ namespace ff7::field
 
     int ff7_field_models_eye_to_model(char* model_name)
     {
-        if ( !_strcmpi(model_name, "AAAA") ) // Cloud
+        // Cloud
+        if ( !_strcmpi(model_name, "AAAA") )
             return 0;
-        if ( !_strcmpi(model_name, "ACGD") ) // Barret
-            return 3;
-        if ( !_strcmpi(model_name, "AAGB") ) // Tifa
+
+        // Tifa
+        if ( !_strcmpi(model_name, "AAGB") )
+            return 1;
+        if ( !_strcmpi(model_name, "AXJA") )
+            return 1;
+        if ( !_strcmpi(model_name, "EQIB") )
             return 1;
-        if ( !_strcmpi(model_name, "ADDA") ) // Red XIII
+        if ( !_strcmpi(model_name, "BIDB") )
+            return 1;
+        if ( !_strcmpi(model_name, "AGGB") )
+            return 1;
+
+        // Aerith
+        if ( !_strcmpi(model_name, "AUFF") )
+            return 2;
+        if ( !_strcmpi(model_name, "CAHC") )
+            return 2;
+        if ( !_strcmpi(model_name, "AZBB") )
+            return 2;
+
+        // Barret
+        if ( !_strcmpi(model_name, "ACGD") )
+            return 3;
+        if ( !_strcmpi(model_name, "FQCB") )
+            return 3;
+        if ( !_strcmpi(model_name, "AYFB") )
+            return 3;
+        if ( !_strcmpi(model_name, "AIBA") )
+            return 3;
+
+        // Red XIII
+        if ( !_strcmpi(model_name, "ADDA") )
+            return 4;
+        if ( !_strcmpi(model_name, "HVJF") )
             return 4;
-        if ( !_strcmpi(model_name, "ABDA") ) // Cid
+
+        // Cid
+        if ( !_strcmpi(model_name, "ABDA") )
+            return 5;
+        if ( !_strcmpi(model_name, "AIHB") )
             return 5;
-        if ( !_strcmpi(model_name, "ABJB") ) // Yuffie
+
+        // Vincent
+        if ( !_strcmpi(model_name, "AEHD") )
+            return 6;
+        if ( !_strcmpi(model_name, "BIJD") )
+            return 6;
+
+        // Yuffie
+        if ( !_strcmpi(model_name, "ABJB") )
             return 7;
-        if ( !_strcmpi(model_name, "AEBC") ) // Cait Sith
+        if ( !_strcmpi(model_name, "FEEA") )
+            return 7;
+        if ( !_strcmpi(model_name, "AHDF") )
+            return 7;
+
+        // Cait Sith
+        if ( !_strcmpi(model_name, "AEBC") )
             return 8;
-        if ( !_strcmpi(model_name, "AEHD") ) // Vincent
-            return 6;
-        if ( !_strcmpi(model_name, "AUFF") ) // Aerith
-            return 2;
-        if ( !_strcmpi(model_name, "CAHC") ) // Aerith
-            return 2;
-        if ( !_strcmpi(model_name, "FQCB") ) // Young Barret
-            return 3;
 
         return 9; // Defaults to Cloud eye
     }