change Lord's classcard from brigand to lord icon

Signed-off-by: laqieer <[email protected]>
laqieer · Feb 20, 2020 · c354a86 · c354a86
1 parent f3a9ba6
commit c354a86
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 aux_source_directory(src DIR_SRCS)
 set_source_files_properties(src/dummy.c PROPERTIES OBJECT_DEPENDS ${CMAKE_SOURCE_DIR}/linkerscript)
 
-process_gfx(GFX_SRCS font.grit title_screen.grit standing_sprite_Alfonse.grit moving_sprite_Alfonse.grit standing_sprite_Anna.grit moving_sprite_Anna.grit standing_sprite_Sharena.grit moving_sprite_Sharena.grit)
+process_gfx(GFX_SRCS font.grit title_screen.grit standing_sprite_Alfonse.grit moving_sprite_Alfonse.grit standing_sprite_Anna.grit moving_sprite_Anna.grit standing_sprite_Sharena.grit moving_sprite_Sharena.grit portrait_Lord_classcard.grit)
 process_gfx_portrait(GFX_SRCS_PORTRAIT portrait_alfonse.grit portrait_Anna_commander.grit portrait_Sharena_princess.grit portrait_Bruno.grit portrait_Xander.grit portrait_Veronica.grit)
 
 add_executable(${PROJECT_NAME} ${DIR_SRCS} ${GFX_SRCS} ${GFX_SRCS_PORTRAIT}

diff --git a/include/portrait.h b/include/portrait.h
@@ -25,5 +25,6 @@ typedef struct Proc PortaritProc;
 #define DEFINE_PORTRAIT(name) const Portrait portrait##name = {portrait_##name##_tilesetTiles, portrait_##name##_miniTiles, portrait_##name##_tilesetPal, 0, 0, 0, 0};
 #define DEFINE_PORTRAIT_SPECIAL(name) const Portrait portrait##name = {portrait_##name##_tilesetTiles, portrait_##name##_miniTiles, portrait_##name##_tilesetPal, portrait_##name##_obj, 0, portrait_##name##_bg, portrait_##name##_mask};
 #define DEFINE_PORTRAIT_SPECIAL_WITHOUT_MASK(name) const Portrait portrait##name = {portrait_##name##_tilesetTiles, portrait_##name##_miniTiles, portrait_##name##_tilesetPal, portrait_##name##_obj, 0, portrait_##name##_bg, PORTRAIT_NO_MASK};
+#define DEFINE_CLASSCARD(name) const Portrait classcard##name = {0, 0, portrait_##name##_classcardPal, 0, portrait_##name##_classcardTiles, 0, 0};
 
 #endif //FE7_JP_STUNNING_TRIBBLE_PORTRAIT_H
diff --git a/res/gfx/portrait/portrait_Lord_classcard.png b/res/gfx/portrait/portrait_Lord_classcard.png
diff --git a/res/gfx/portrait_Lord_classcard.grit b/res/gfx/portrait_Lord_classcard.grit
@@ -0,0 +1 @@
+../gfx/portrait/portrait_Lord_classcard.png -gB4 -pn16 -gzl
diff --git a/src/job.c b/src/job.c
@@ -15,23 +15,23 @@ const struct JobBattleAnimationConf SharenaAnimationConf[] = {
 const struct Job jobs[] = {
 {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 86, 5, 0, 0, -3, 57, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} ,  // 0x00 None
 
-{1172, 559, 1, 7, 0, 0, 215, 1, 19, 9 - 3, 6 - 3, 6 - 3, 8 - 3, 5 - 3, 13, 5, 60, 20, 20, 20, 20, 20, 20, 3, 90, 45, 40, 45, 15, 15, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 148245776, 147139476, 147140581, 147141621, 147142661, 147142726, 147142791, 0} ,  // 0x01 Eliwood Lord
+{1172, 559, 1, 7, 0, 0, 0x130, 1, 19, 9 - 3, 6 - 3, 6 - 3, 8 - 3, 5 - 3, 13, 5, 60, 20, 20, 20, 20, 20, 20, 3, 90, 45, 40, 45, 15, 15, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 148245776, 147139476, 147140581, 147141621, 147142661, 147142726, 147142791, 0} ,  // 0x01 Eliwood Lord
 
-{1173, 559, 2, 8, 1, 0, 215, 1, 19, 8 - 3, 8 - 3, 8 - 3, 7 - 3, 5 - 3, 8, 5, 60, 20, 20, 20, 20, 20, 20, 3, 90, 45, 40, 45, 15, 20, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 31, 0, 0, 0, 0, 0, 0, SharenaAnimationConf, 147139476, 147140581, 147141621, 147142661, 147142726, 147142791, 0} ,  // 0x02 Lyn Lord
+{1173, 559, 2, 8, 1, 0, 0x130, 1, 19, 8 - 3, 8 - 3, 8 - 3, 7 - 3, 5 - 3, 8, 5, 60, 20, 20, 20, 20, 20, 20, 3, 90, 45, 40, 45, 15, 20, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 31, 0, 0, 0, 0, 0, 0, SharenaAnimationConf, 147139476, 147140581, 147141621, 147142661, 147142726, 147142791, 0} ,  // 0x02 Lyn Lord
 
-{1172, 559, 3, 9, 2, 0, 215, 1, 19, 7 - 3, 8 - 3, 10 - 3, 5 - 3, 6 - 3, 7, 5, 60, 20, 20, 20, 20, 20, 20, 3, 90, 45, 40, 45, 15, 12, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 148245800, 147139476, 147140581, 147141621, 147142661, 147142726, 147142791, 0} ,  // 0x03 Hector Lord
+{1172, 559, 3, 9, 2, 0, 0x130, 1, 19, 7 - 3, 8 - 3, 10 - 3, 5 - 3, 6 - 3, 7, 5, 60, 20, 20, 20, 20, 20, 20, 3, 90, 45, 40, 45, 15, 12, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 148245800, 147139476, 147140581, 147141621, 147142661, 147142726, 147142791, 0} ,  // 0x03 Hector Lord
 
 {1174, 559, 4, 42, 0, 0, 204, 2, 20, 5, 2, 5, 6, 0, 7, 7, 60, 20, 20, 20, 20, 20, 20, 3, 75, 35, 40, 28, 15, 15, 30, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 31, 0, 0, 0, 0, 0, 0, 148245820, 147140126, 147141231, 147142271, 147142661, 147142726, 147142791, 0} ,  // 0x04 Lord Knight (only by class name)
 
 {1176, 559, 5, 16, 1, 0, 190, 2, 16, 4, 9, 9, 2, 0, 5, 5, 60, 20, 20, 20, 20, 20, 20, 3, 70, 35, 40, 40, 15, 20, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 31, 0, 0, 0, 0, 0, 0, 0, 148245832, 147139541, 147140646, 147141686, 147142661, 147142726, 147142791, 0} ,  // 0x05 Blade Lord (only by class name)
 
 {1175, 559, 6, 22, 2, 1, 194, 2, 17, 5, 2, 0, 9, 0, 13, 4, 60, 20, 20, 20, 20, 20, 20, 3, 80, 40, 35, 15, 28, 12, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 31, 0, 31, 0, 0, 0, 0, 0, 148245844, 147139606, 147140711, 147141751, 147142661, 147142726, 147142791, 0} ,  // 0x06 Great Lord (only by class name)
 
-{1177, 560, 7, 1, 3, 0, 215, 2, 18, 3, 3, 4, 5, 0, 9, 7, 60, 27, 26, 24, 23, 25, 25, 3, 90, 45, 40, 45, 15, 15, 40, 4, 2, 0, 1, 1, 3, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 31, 31, 0, 0, 0, 0, 0, 0, 148245864, 147140191, 147141296, 147142336, 147142661, 147142726, 147142791, 0} ,  // 0x07 Lord Knight
+{1177, 560, 7, 1, 3, 0, 0x130, 2, 18, 3, 3, 4, 5, 0, 9, 7, 60, 27, 26, 24, 23, 25, 25, 3, 90, 45, 40, 45, 15, 15, 40, 4, 2, 0, 1, 1, 3, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 31, 31, 0, 0, 0, 0, 0, 0, 148245864, 147140191, 147141296, 147142336, 147142661, 147142726, 147142791, 0} ,  // 0x07 Lord Knight
 
-{1179, 562, 8, 2, 4, 0, 215, 2, 18, 3, 3, 4, 5, 0, 6, 6, 60, 24, 29, 30, 22, 22, 25, 3, 90, 45, 40, 45, 15, 12, 40, 3, 2, 2, 0, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 31, 0, 0, 31, 0, 0, 0, 0, 148245884, 147139476, 147140581, 147141621, 147142661, 147142726, 147142791, 0} ,  // 0x08 Blade Lord
+{1179, 562, 8, 2, 4, 0, 0x130, 2, 18, 3, 3, 4, 5, 0, 6, 6, 60, 24, 29, 30, 22, 22, 25, 3, 90, 45, 40, 45, 15, 12, 40, 3, 2, 2, 0, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 31, 0, 0, 31, 0, 0, 0, 0, 148245884, 147139476, 147140581, 147141621, 147142661, 147142726, 147142791, 0} ,  // 0x08 Blade Lord
 
-{1178, 561, 9, 3, 5, 0, 215, 2, 18, 3, 3, 4, 5, 0, 15, 5, 60, 30, 24, 24, 29, 20, 25, 3, 90, 45, 40, 45, 15, 20, 40, 3, 0, 2, 3, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 31, 0, 31, 0, 0, 0, 0, 0, 148245904, 147139606, 147140711, 147141751, 147142661, 147142726, 147142791, 0} ,  // 0x09 Great Lord
+{1178, 561, 9, 3, 5, 0, 0x130, 2, 18, 3, 3, 4, 5, 0, 15, 5, 60, 30, 24, 24, 29, 20, 25, 3, 90, 45, 40, 45, 15, 20, 40, 3, 0, 2, 3, 1, 5, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 31, 0, 31, 0, 0, 0, 0, 0, 148245904, 147139606, 147140711, 147141751, 147142661, 147142726, 147142791, 0} ,  // 0x09 Great Lord
 
 {1180, 571, 10, 12, 6, 0, 220, 3, 18, 4, 8, 8, 4, 0, 9, 5, 60, 20, 20, 20, 20, 20, 20, 3, 80, 40, 40, 32, 18, 20, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 31, 0, 0, 0, 0, 0, 0, 0, 148245932, 147139541, 147140646, 147141686, 147142661, 147142726, 147142791, 0} ,  // 0x0A Mercenary
 

diff --git a/src/portrait.c b/src/portrait.c
@@ -19,6 +19,7 @@
 #include "portrait_Xander_tileset.h"
 #include "portrait_Veronica_mini.h"
 #include "portrait_Veronica_tileset.h"
+#include "portrait_Lord_classcard.h"
 
 const Portrait portraitAlfonse = {
         portrait_alfonse_tilesetTiles,
@@ -127,13 +128,16 @@ DEFINE_PORTRAIT_SPECIAL_WITHOUT_MASK(Bruno)
 DEFINE_PORTRAIT_SPECIAL_WITHOUT_MASK(Xander)
 DEFINE_PORTRAIT_SPECIAL_WITHOUT_MASK(Veronica)
 
+DEFINE_CLASSCARD(Lord)
+
 const Portrait* const portraits[] = {
     [0x101] = &portraitAlfonse,
     [0x102] = &portraitSharena_princess,
     [0x103] = &portraitAnna_commander,
     [0x104] = &portraitBruno,
     [0x105] = &portraitVeronica,
     [0x116] = &portraitXander,
+    [0x130] = &classcardLord,
 };
 
 extern const Portrait portraitsOrig[];
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		../gfx/portrait/portrait_Lord_classcard.png -gB4 -pn16 -gzl