Troubadour's magic animation. #10.

laqieer · Aug 20, 2022 · 512f66a · 512f66a
1 parent eeb4c9e
commit 512f66a
Show file tree

Hide file tree

Showing 31 changed files with 1,722 additions and 2 deletions.
diff --git a/content/battle_animation/troubadour_magic.S b/content/battle_animation/troubadour_magic.S
diff --git a/content/battle_animation/troubadour_magic.inc b/content/battle_animation/troubadour_magic.inc
diff --git a/content/battle_animation/troubadour_magic/000.png b/content/battle_animation/troubadour_magic/000.png
diff --git a/content/battle_animation/troubadour_magic/001.png b/content/battle_animation/troubadour_magic/001.png
diff --git a/content/battle_animation/troubadour_magic/002.png b/content/battle_animation/troubadour_magic/002.png
diff --git a/content/battle_animation/troubadour_magic/003.png b/content/battle_animation/troubadour_magic/003.png
diff --git a/content/battle_animation/troubadour_magic/004.png b/content/battle_animation/troubadour_magic/004.png
diff --git a/content/battle_animation/troubadour_magic/005.png b/content/battle_animation/troubadour_magic/005.png
diff --git a/content/battle_animation/troubadour_magic/006.png b/content/battle_animation/troubadour_magic/006.png
diff --git a/content/battle_animation/troubadour_magic/007.png b/content/battle_animation/troubadour_magic/007.png
diff --git a/content/battle_animation/troubadour_magic/008.png b/content/battle_animation/troubadour_magic/008.png
diff --git a/content/battle_animation/troubadour_magic/009.png b/content/battle_animation/troubadour_magic/009.png
diff --git a/content/battle_animation/troubadour_magic/010.png b/content/battle_animation/troubadour_magic/010.png
diff --git a/content/battle_animation/troubadour_magic/011.png b/content/battle_animation/troubadour_magic/011.png
diff --git a/content/battle_animation/troubadour_magic/012.png b/content/battle_animation/troubadour_magic/012.png
diff --git a/content/battle_animation/troubadour_magic/013.png b/content/battle_animation/troubadour_magic/013.png
diff --git a/content/battle_animation/troubadour_magic/014.png b/content/battle_animation/troubadour_magic/014.png
diff --git a/content/battle_animation/troubadour_magic/015.png b/content/battle_animation/troubadour_magic/015.png
diff --git a/content/battle_animation/troubadour_magic/016.png b/content/battle_animation/troubadour_magic/016.png
diff --git a/content/battle_animation/troubadour_magic/animation.gif b/content/battle_animation/troubadour_magic/animation.gif
diff --git a/content/battle_animation/troubadour_magic/script.txt b/content/battle_animation/troubadour_magic/script.txt
@@ -0,0 +1,173 @@
+/// - Mode 1
+C03
+C07
+1 p- 000.png
+C1C
+4 p- 001.png
+4 p- 002.png
+C1C
+5 p- 003.png
+4 p- 004.png
+10 p- 005.png
+10 p- 006.png
+C05
+1 p- 007.png
+10 p- 015.png
+1 p- 007.png
+C01
+4 p- 005.png
+4 p- 008.png
+4 p- 009.png
+7 p- 010.png
+C1E
+1 p- 011.png
+C06
+3 p- 011.png
+3 p- 012.png
+C0D
+~~~
+/// - Mode 3
+C03
+C07
+1 p- 000.png
+C1C
+4 p- 001.png
+4 p- 002.png
+C1C
+5 p- 003.png
+4 p- 004.png
+10 p- 005.png
+10 p- 006.png
+C05
+1 p- 007.png
+10 p- 016.png
+1 p- 007.png
+C01
+4 p- 005.png
+4 p- 008.png
+4 p- 009.png
+7 p- 010.png
+C1E
+1 p- 011.png
+C06
+3 p- 011.png
+3 p- 012.png
+C0D
+~~~
+/// - Mode 5
+C03
+C07
+1 p- 000.png
+C1C
+4 p- 001.png
+4 p- 002.png
+C1C
+5 p- 003.png
+4 p- 004.png
+10 p- 005.png
+10 p- 006.png
+C05
+1 p- 007.png
+10 p- 015.png
+1 p- 007.png
+C01
+4 p- 005.png
+4 p- 008.png
+4 p- 009.png
+7 p- 010.png
+C1E
+1 p- 011.png
+C06
+3 p- 011.png
+3 p- 012.png
+C0D
+~~~
+/// - Mode 6
+C03
+C07
+1 p- 000.png
+C1C
+4 p- 001.png
+4 p- 002.png
+C1C
+5 p- 003.png
+4 p- 004.png
+10 p- 005.png
+10 p- 006.png
+C05
+1 p- 007.png
+10 p- 016.png
+1 p- 007.png
+C01
+4 p- 005.png
+4 p- 008.png
+4 p- 009.png
+7 p- 010.png
+C1E
+1 p- 011.png
+C06
+3 p- 011.png
+3 p- 012.png
+C0D
+~~~
+/// - Mode 7
+C02
+1 p- 000.png
+C0E
+3 p- 013.png
+1 p- 014.png
+C01
+3 p- 013.png
+C0D
+~~~
+/// - Mode 8
+C02
+1 p- 000.png
+C0E
+3 p- 013.png
+1 p- 014.png
+C01
+3 p- 013.png
+C0D
+~~~
+/// - Mode 9
+1 p- 000.png
+C01
+~~~
+/// - Mode 10
+1 p- 000.png
+C01
+~~~
+/// - Mode 11
+1 p- 000.png
+C01
+~~~
+/// - Mode 12
+C03
+C07
+1 p- 000.png
+C1C
+4 p- 001.png
+4 p- 002.png
+C1C
+5 p- 003.png
+4 p- 004.png
+10 p- 005.png
+10 p- 006.png
+C05
+1 p- 007.png
+10 p- 015.png
+1 p- 007.png
+C01
+4 p- 005.png
+4 p- 008.png
+4 p- 009.png
+7 p- 010.png
+C1E
+1 p- 011.png
+C06
+3 p- 011.png
+3 p- 012.png
+C0D
+~~~
+/// - End of animation
diff --git a/content/battle_animation/troubadour_magic/sheet_0.png b/content/battle_animation/troubadour_magic/sheet_0.png
diff --git a/content/battle_animation/troubadour_magic/sheet_1.png b/content/battle_animation/troubadour_magic/sheet_1.png
diff --git a/content/battle_animation/troubadour_magic/sheet_2.png b/content/battle_animation/troubadour_magic/sheet_2.png
diff --git a/content/battle_animation/troubadour_magic_sheets.c b/content/battle_animation/troubadour_magic_sheets.c
diff --git a/content/battle_animations.s b/content/battle_animations.s
@@ -36,6 +36,7 @@ BattleAnimations:
  .word 0, 0, 0, vanguard_sword_modes, vanguard_sword_script_header, vanguard_sword_frames_r_header, vanguard_sword_frames_l_header, vanguard_sword_basic_pal
  .word 0, 0, 0, cavalier_axe_modes, cavalier_axe_script_header, cavalier_axe_frames_r_header, cavalier_axe_frames_l_header, cavalier_vanilla_basic_pal
  .word 0, 0, 0, cavalier_handaxe_modes, cavalier_handaxe_script_header, cavalier_handaxe_frames_r_header, cavalier_handaxe_frames_l_header, cavalier_vanilla_basic_pal
+ .word 0, 0, 0, troubadour_magic_modes, troubadour_magic_script_header, troubadour_magic_frames_r_header, troubadour_magic_frames_l_header, troubadour_vanilla_basic_pal
 
  .word 0, 0, 0, roy_sword_modes, roy_sword_script_header, roy_sword_frames_r_header, roy_sword_frames_l_header, roy_sword_basic_pal
  .word 0, 0, 0, roy_legendary_modes, roy_legendary_script_header, roy_legendary_frames_r_header, roy_legendary_frames_l_header, roy_legendary_basic_pal

diff --git a/content/class_animations.c b/content/class_animations.c
@@ -477,3 +477,32 @@ const struct BattleAnimationConfig CavalierAnimations[] = {
  },
  ANCFG_END
 };
+
+const struct BattleAnimationConfig TroubadourAnimations[] = {
+ {
+ ITYPE_STAFF,
+ true,
+ ANID_TROUBADOUR_STAFF
+ },
+ {
+ ITYPE_ANIMA,
+ true,
+ ANID_TROUBADOUR_MAGIC
+ },
+ {
+ ITYPE_LIGHT,
+ true,
+ ANID_TROUBADOUR_MAGIC
+ },
+ {
+ ITYPE_DARK,
+ true,
+ ANID_TROUBADOUR_MAGIC
+ },
+ {
+ ITYPE_ITEM,
+ true,
+ ANID_TROUBADOUR_STAFF
+ },
+ ANCFG_END
+};
diff --git a/content/classes.c b/content/classes.c
@@ -2947,7 +2947,7 @@ const struct Class Classes[] = {
  WPN_EXP_0, // Light
  WPN_EXP_0, // Dark
  },
- BattleAnimConf_Troubadour, // pBattleAnimConf
+ TroubadourAnimations, // pBattleAnimConf
  // pMovCostTable
  {
  (const s8*)0x8c52e1e, // standard

diff --git a/include/animation_id.h b/include/animation_id.h
@@ -111,7 +111,7 @@ enum {
  ANID_DRUID_STAFF,
  ANID_DARK_DRUID,
  ANID_DARK_DRUID_STAFF,
- ANID_TROUBADOUR,
+ ANID_TROUBADOUR_STAFF,
  ANID_TROUBADOUR_DISARMED,
  ANID_VALKYRIE,
  ANID_VALKYRIE_STAFF,
@@ -198,6 +198,7 @@ enum {
  ANID_VANGUARD_SWORD,
  ANID_CAVALIER_AXE,
  ANID_CAVALIER_HAND_AXE,
+ ANID_TROUBADOUR_MAGIC,
 
  ANID_ROY_SWORD,
  ANID_ROY_LEGENDARY,

diff --git a/include/battle_anim_conf.h b/include/battle_anim_conf.h
@@ -99,6 +99,7 @@ extern const struct BattleAnimationConfig HalberdierAnimations[];
 extern const struct BattleAnimationConfig RangerIkeAnimations[];
 extern const struct BattleAnimationConfig VanguardAnimations[];
 extern const struct BattleAnimationConfig CavalierAnimations[];
+extern const struct BattleAnimationConfig TroubadourAnimations[];
 
 extern const struct BattleAnimationConfig LuciusT1Animations[];
 extern const struct BattleAnimationConfig LuciusT2Animations[];

diff --git a/linkerscript/data.lds b/linkerscript/data.lds
@@ -783,6 +783,7 @@ HawkeyeAnimations = 0x8d61340;
 /* Battle Animation Palette. */
 
 cavalier_vanilla_basic_pal = 0x8eac0cc;
+troubadour_vanilla_basic_pal = 0x8f24490;
 
 /* Background. */