Merge pull request #108 from FireEmblemUniverse/develop

Prologue - Ch9 Polish

.gitignore

@@ -63,3 +63,4 @@ Temporary Items
 *.csv#
 Maps/TMX2EA Readme.txt
 *.png
+!Mugs/*.png

Battle Palettes/Battle Palettes.txt

@@ -4,6 +4,15 @@
 
 # char{0x15} "MariyaPalette" set{0x15, 0x3, WyvernKnight_F}
     5553FF7F1F7C1F7C183A1E4BB02DAD3608228C32B453F0422D36871D4619A514
-	
+
 # char{0x1E} "MichealPPalette" set{0x1E, 0x3, Journeyman_3}
-    55537F4E9C733967B556EF3DBD7718639452B55631464A29DE39F71C8E00A514
+    55537F4E9C733967B556EF3DBD7718639452B55631464A29DE39F71C8E00A514
+
+# char{0x3} "NaughtCavPalette" set{0x3, 0x1, Cavalier}
+    007EFF7FFF5B737FF431AA79C312010672328B1D4919E6141D4736324E1DA514
+
+# char{0x25} "NaughtGKPalette" set{0x3, 0x4, GreatKnight}
+    5553DE7BFF5B1F4BB229DF739873ED398A295A7FB57ECD59723249150711A514
+
+# char{0x2A} "NaughtPaladinPalette" set{0x3, 0x3, Paladin}
+    5453FF7FFF6FBD2ED32DFF27D0120106B23272328B1D49199873D15E0C46A514

Custom Definitions.event

@@ -1,8 +1,15 @@
+#ifndef VBABT_DEFINITIONS
+#define VBABT_DEFINITIONS
 
+#include "EAstdlib.event"
 
-#define FreeSpace 0xb2a610
-#define EndOfFreeSpace 0xC00000
-#define FreeSpaceBLRange 0x1c1ec0
+#define FreeSpace        0xB2A610
+#define FreeSpaceEnd     0xC00000
+
+#define FreeSpace2       0xEFB2E0
+#define FreeSpace2End    0xFE0000
+
+#define FreeSpaceBLRange 0x1C1EC0
 
 #define ChapterTileset(chapter, object, palette, config) "PUSH; ORG 0x8b0890 + (148* chapter) + 4; SHORT object; BYTE palette config; POP"
 #define ChapterTileAnims(chapter, anim1, anim2) "PUSH; ORG 0x8b0890 + (148* chapter) + 9; BYTE anim1 anim2; POP"
@@ -22,12 +29,26 @@
 #ifndef DeathQuoteTable
   #define DeathQuoteTable 0x9ECD4C
 #endif
+#ifndef SongTableOffset
+  #define SongTableOffset  0x224470
+  #define SongTable(index,SongPointer,Group) "PUSH; ORG SongTableOffset+(8*index); POIN SongPointer; SHORT Group Group; POP"
+#endif
+#ifndef AIKeyTable
+  #define AIKeyTable 0x0D8538
+  #define SetAIKeyUsability(chapter, doorKey, lockpick, antitoxin) "PUSH; ORG AIKeyTable+4*chapter; WORD (doorKey | lockpick << 1 | antitoxin << 1); POP"
+  #define SetAIKeyUsability(chapter, doorKey) "SetAIKeyUsability(chapter, doorKey, 1, 1)"
+#endif
 
 #define LunarBrace MoonBracelet
 #define SolarBrace SunBracelet
 
 #include "Engine Hacks/Skill System/skill_definitions.event"
 
+#define BloodyStream 0x57
+
+//If 0x35 doesn't work do 0x2C
+#define Intro(textID) "MUSC BloodyStream; ShowCG(0x35); _0x1A22; TEXTSHOW textID; TEXTEND; ClearBackground; MUSC Silent"
+
 //Class definitions
 #define VoidLord 0x1
 #define BlitzLord 0x2
@@ -80,9 +101,11 @@
 #define Hecwood 0x48
 #define Elitor 0x49
 #define Grudge 0x4A
+#define Lash 0x4C
 #define Ch27ChrZomboss 0x4D // dracozombie boss
 #define Edgelard 0x4E
 #define Dennis 0x50
+#define Faust 0x52
 #define Ch11LdrID 0x56
 #define Ch11MiscID 0x57
 #define Cameron 0x58
@@ -246,3 +269,5 @@
 #define WTYPE_LIGHT    0x06
 #define WTYPE_ELDER    0x07
 #define WTYPE_DARK     0x07
+
+#endif // VBABT_DEFINITIONS

Engine Hacks/DragonVeins.event

@@ -15,11 +15,6 @@ PUSH
     // #define UMText_DVDesc 0xd1
 #endif
 
-#ifndef SongTableOffset
-  #define SongTableOffset  0x224470
-  #define SongTable(index,SongPointer,Group) "PUSH; ORG SongTableOffset+(8*index); POIN SongPointer; SHORT Group Group; POP"
-#endif
-
 SongTable(DragonVeinSFXID,DragonVeinSFX,7) //Song Group 7 is for map sfx
 
 ORG (0x037864+4*(DragonVeinTrapID-1))
@@ -103,4 +98,3 @@ WORD $FF00FF
 
 DragonVeinWav:
 #incbin "bin/DragonVein_wav.dmp"
-

Engine Hacks/ModularStatScreen.event

@@ -5,13 +5,15 @@
 #define Trv_Icon_X 0xB8
 #define Trv_Icon_Y 0x2E
 #include "MSS/Display Growths Options/Display Growths Options.txt"
- 
+
   PUSH
   ORG 0x205b24 //24 for stat screen
   POIN MSS_page1|1 MSS_page2|1 MSS_page3|1 MSS_page4|1
 
+/* Let's not make it 4 pages.
   ORG $88690
   BYTE 4 //make 4 pages
+*/
 
   ORG $88650
   POIN NewPageNameGraphic
@@ -27,7 +29,7 @@
 
   ORG $889d0
   SHORT $e010 //Temporary r-text fix to prevent freezing
-  ORG $889f2  
+  ORG $889f2
   SHORT $BD30
   BL(RText_Page4_ladder) //this has to be in bl range somewhere
 
@@ -46,22 +48,22 @@
     ORG $8888C
     BYTE 0x82
   #endif
-  
+
   ORG $88896
   SHORT 0x46C0
   jumpToHack(Button_Branch)
-  
+
   //Remember whether we were looking at growths or stats
   ORG $8895C //Loads byte to store 1 before stat screen struct
   callHack_r1(Load_Page)
-	
+
   ORG $888BC //Stores byte to store 1 before stat screen struct
   callHack_r3(Store_Page)
-  
+
   //Display an R-button text about pressing Select, since I can't seem to fit it nicely, and make that the default
   ORG $889D8
   POIN PersonalDataRText
-  
+
   //HP name color
   ORG $86ED4
   callHack_r3(HP_Name_Color)
@@ -74,8 +76,8 @@
 
   ORG $17E98
   callHack_r3(New_Unit_Exp)
-  SHORT 0xE005  
-  
+  SHORT 0xE005
+
   POP
   ALIGN 4
   MSS_page1:
@@ -90,7 +92,7 @@
   WORD Growth_Options
   POIN Growth_Getter_Table
   POIN Get_Palette_Index
-  
+
   ALIGN 4
   MSS_page2:
   #incbin "MSS/mss_page2_original.dmp"
@@ -117,11 +119,11 @@ NewPageNamePalette:
 	ALIGN 4
 	Button_Branch:
 	#incbin "MSS/Button Branch.dmp"
-	
+
 	ALIGN 4
 	Growth_Getter_Table:
 	POIN Get_Hp_Growth Get_Str_Growth Get_Skl_Growth Get_Spd_Growth Get_Luk_Growth Get_Def_Growth Get_Res_Growth
-	
+
 	ALIGN 4
 	Get_Hp_Growth:
 	#incbin "MSS/Growth Getters/Get_Hp_Growth.dmp"
@@ -150,63 +152,63 @@ NewPageNamePalette:
 	Get_Luk_Growth:
 	#incbin "MSS/Growth Getters/Get_Luk_Growth.dmp"
 	POIN Extra_Growth_Boosts|1
-	
+
 	ALIGN 4
 	Extra_Growth_Boosts:
 	#incbin "MSS/Growth Getters/Extra_Growth_Boosts.dmp"
 	WORD Growth_Options
 	POIN ItemTable
-	
+
 	ALIGN 4
 	Load_Page:
 	#incbin "MSS/Load Page.dmp"
 	WORD Stat_Page_Ram_Loc
-	
+
 	ALIGN 4
 	Store_Page:
 	#incbin "MSS/Store Page.dmp"
 	WORD Stat_Page_Ram_Loc
 
-	
+
 	ALIGN 4
 	Rescue_Arrows:
 	#incbin "MSS/Check Rescue Arrows.dmp"
 	POIN SkillTester
 	WORD SaviorID
-	
+
 	ALIGN 4
 	Get_Palette_Index:
 	#incbin "MSS/Get_Palette_Index.dmp"
 	POIN Growth_Color_Table
-	
+
 	ALIGN 4
 	HP_Name_Color:
 	#incbin "MSS/HP Name Color.dmp"
 	POIN New_Palettes
 	WORD Growth_Options
 	POIN Get_Hp_Growth
 	POIN Get_Palette_Index
-	
+
 	ALIGN 4
 	Write_Growths_To_Battle_Struct:
 	#incbin "MSS/Write_Growths_To_Battle_Struct.dmp"
 	POIN Class_Level_Cap_Table Get_Hp_Growth Get_Str_Growth Get_Skl_Growth Get_Spd_Growth Get_Def_Growth Get_Res_Growth Get_Luk_Growth
 	WORD Growth_Options
-	
+
 	ALIGN 4
 	Class_Level_Cap_Table:
 	#incbin "MSS/Display Growths Options/Class_Level_Cap_Table.dmp"
-	
+
 	ALIGN 4
 	Enemy_Autolevel:
 	#incbin "MSS/Enemy_Autolevel.dmp"
 	WORD Growth_Options
-	
+
 	ALIGN 4
 	New_Unit_Exp:
 	#incbin "MSS/New_Unit_Exp.dmp"
 	POIN Class_Level_Cap_Table
-	
+
 	Growth_Color_Table:
 	#include "MSS/Display Growths Options/Growth Colors Table.txt"
 
@@ -219,7 +221,7 @@ NewPageNamePalette:
   BYTE 0
   ALIGN 4
   setText(0x0D4B,TxtData0x0D4B)
-  
+
   /*stat screen R menu is at 8a00b38
 find by breaking on key press while R menu open
 

Engine Hacks/Skill System/skill_lists.event

@@ -211,7 +211,8 @@ BYTE 00 00
 ALIGN 4
 
 BrigandSkillList:
-BYTE 10 IntimidateID
+BYTE 10 ShoveID
+BYTE 20 IntimidateID
 BYTE 00 00
 ALIGN 4
 

Events/Ch1.event

@@ -142,6 +142,7 @@ ENUN
 LOAD1 0x1 Bad
 ENUN
 CAM1 Vedge
+Intro(Chapter1_Intro)
 Text(Chapter1_Beginning)
 NoFade
 ENDA