Merge remote-tracking branch 'refs/remotes/origin/master'

battle_engine

@@ -1 +1 @@
-Subproject commit 4a4fb7ac2ac3def1d4270796bdd2c04e8231d382
+Subproject commit a201b518834f0208efdb82ac95b08675f5279950

g3headers

@@ -1 +1 @@
-Subproject commit 3934c9b2ba672863275d517403a558278e549786
+Subproject commit 04e8a122f208ca1ee8052fef39f2dca51dcffe10

src/include/mugssprites.h

@@ -1,15 +1,53 @@
 #ifndef MUG_IDS_H_
-#define MUG_IDS_H_
+#define  MUG_IDS_H_
 
-#define MUG_NOAH 0x1
-#define MUG_EMMA 0x2
-#define MUG_LINDA 0x3
-#define MUG_IDAN 0x4
-#define MUG_ACHIM 0x5
-#define MUG_NORMAN 0x6
-#define MUG_JANA 0x7
-#define MUG_VORSTAND 0x8
-#define MUG_VORSTANDIN 0x9
-#define MUG_DIANA 0xA
+#define MUG_NOAH, 1
+#define MUG_EMMA, 9
+#define MUG_LINDA, 17
+#define MUG_IDAN, 20
+#define MUG_ACHIM, 24
+#define MUG_NORMAN, 27
+#define MUG_JANA, 30
+#define MUG_MARKUS, 33
+#define MUG_ISABELLE, 35
+#define MUG_DIANA, 37
+
+#define MUG_NOAH_NORMAL, 1
+#define MUG_NOAH_LACHEN, 2
+#define MUG_NOAH_BESCHEIDEN, 3
+#define MUG_NOAH_ERSTAUNT, 4
+#define MUG_NOAH_TRAURIG, 5
+#define MUG_NOAH_SAUER, 6
+#define MUG_NOAH_WUT, 7
+#define MUG_NOAH_GRINSEN, 8
+#define MUG_EMMA_NORMAL, 9
+#define MUG_EMMA_LACHEN, 10
+#define MUG_EMMA_BESCHEIDEN, 11
+#define MUG_EMMA_ERSTAUNT, 12
+#define MUG_EMMA_TRAURIG, 13
+#define MUG_EMMA_SAUER, 14
+#define MUG_EMMA_WUT, 15
+#define MUG_EMMA_GRINSEN, 16
+#define MUG_LINDA_NORMAL, 17
+#define MUG_LINDA_LACHEN, 18
+#define MUG_LINDA_BESCHEIDEN, 19
+#define MUG_IDAN_NORMAL, 20
+#define MUG_IDAN_ERSTAUNT, 21
+#define MUG_IDAN_STUTZIG, 22
+#define MUG_IDAN_TRAURIG, 23
+#define MUG_ACHIM_NORMAL, 24
+#define MUG_ACHIM_GRINSEN, 25
+#define MUG_ACHIM_TRAURIG, 26
+#define MUG_NORMAN_NORMAL, 27
+#define MUG_NORMAN_GRINSEN, 28
+#define MUG_NORMAN_LACHEN, 29
+#define MUG_JANA_NORMAL, 30
+#define MUG_JANA_GRINSEN, 31
+#define MUG_JANA_LACHEN, 32
+#define MUG_MARKUS_NORMAL, 33
+#define MUG_MARKUS_NACHDENKEN, 34
+#define MUG_ISABELLE_NORMAL, 35
+#define MUG_ISABELLE_NACHDENKEN, 36
+#define MUG_DIANA_NORMAL, 37
 
 #endif /* MUG_IDS_H */

src/interface/mugshot_table.s

@@ -1,37 +1,122 @@
 .align 2
 .thumb
 .section .rodata
-
 .align 2
-
 .global mugshots
 mugshots:
-.word mug_00Tiles
-.word mug_00Pal
 
-.word mug_01Tiles
-.word mug_01Pal
+@@----------------------------------------------------------------------------------------------------------
+@@ Noah
+@@----------------------------------------------------------------------------------------------------------
+.word mug_01_00Tiles
+.word mug_01_00Pal
+.word mug_01_01Tiles
+.word mug_01_01Pal
+.word mug_01_02Tiles
+.word mug_01_02Pal
+.word mug_01_03Tiles
+.word mug_01_03Pal
+.word mug_01_04Tiles
+.word mug_01_04Pal
+.word mug_01_05Tiles
+.word mug_01_05Pal
+.word mug_01_06Tiles
+.word mug_01_06Pal
+.word mug_01_07Tiles
+.word mug_01_07Pal
+
+@@----------------------------------------------------------------------------------------------------------
+@@ Emma
+@@----------------------------------------------------------------------------------------------------------
+.word mug_02_00Tiles
+.word mug_02_00Pal
+.word mug_02_01Tiles
+.word mug_02_01Pal
+.word mug_02_02Tiles
+.word mug_02_02Pal
+.word mug_02_03Tiles
+.word mug_02_03Pal
+.word mug_02_04Tiles
+.word mug_02_04Pal
+.word mug_02_05Tiles
+.word mug_02_05Pal
+.word mug_02_06Tiles
+.word mug_02_06Pal
+.word mug_02_07Tiles
+.word mug_02_07Pal
 
-.word mug_02Tiles
-.word mug_02Pal
+@@----------------------------------------------------------------------------------------------------------
+@@ Linda
+@@----------------------------------------------------------------------------------------------------------
+.word mug_03_00Tiles
+.word mug_03_00Pal
+.word mug_03_01Tiles
+.word mug_03_01Pal
+.word mug_03_02Tiles
+.word mug_03_02Pal
 
-.word mug_03Tiles
-.word mug_03Pal
+@@----------------------------------------------------------------------------------------------------------
+@@ Idan
+@@----------------------------------------------------------------------------------------------------------
+.word mug_04_00Tiles
+.word mug_04_00Pal
+.word mug_04_01Tiles
+.word mug_04_01Pal
+.word mug_04_02Tiles
+.word mug_04_02Pal
+.word mug_04_03Tiles
+.word mug_04_03Pal
+.word mug_04_04Tiles
+.word mug_04_04Pal
 
-.word mug_04Tiles
-.word mug_04Pal
+@@----------------------------------------------------------------------------------------------------------
+@@ Achim
+@@----------------------------------------------------------------------------------------------------------
+.word mug_05_00Tiles
+.word mug_05_00Pal
+.word mug_05_01Tiles
+.word mug_05_01Pal
+.word mug_05_02Tiles
+.word mug_05_02Pal
 
-.word mug_05Tiles
-.word mug_05Pal
+@@----------------------------------------------------------------------------------------------------------
+@@ Norman
+@@----------------------------------------------------------------------------------------------------------
+.word mug_06_00Tiles
+.word mug_06_00Pal
+.word mug_06_01Tiles
+.word mug_06_01Pal
+.word mug_06_02Tiles
+.word mug_06_02Pal
 
-.word mug_06Tiles
-.word mug_06Pal
+@@----------------------------------------------------------------------------------------------------------
+@@ Jana
+@@----------------------------------------------------------------------------------------------------------
+.word mug_07_00Tiles
+.word mug_07_00Pal
+.word mug_07_01Tiles
+.word mug_07_01Pal
+.word mug_07_02Tiles
+.word mug_07_02Pal
 
-.word mug_07Tiles
-.word mug_07Pal
+@@----------------------------------------------------------------------------------------------------------
+@@ Markus
+@@----------------------------------------------------------------------------------------------------------
+.word mug_08_00Tiles
+.word mug_08_00Pal
+.word mug_08_01Tiles
+.word mug_08_01Pal
 
-.word mug_08Tiles
-.word mug_08Pal
+@@----------------------------------------------------------------------------------------------------------
+@@ Isabelle
+@@----------------------------------------------------------------------------------------------------------
+.word mug_09_00Tiles
+.word mug_09_00Pal
+.word mug_09_01Tiles
+.word mug_09_01Pal
 
-.word mug_09Tiles
-.word mug_09Pal
+@@----------------------------------------------------------------------------------------------------------
+@@ Diana
+@@----------------------------------------------------------------------------------------------------------
+.word mug_10_00Tiles
+.word mug_10_00Pal