Skip to content

Commit 0a3191a

Browse files
Crazycolorz5Crazycolorz5
authored
Merge pull request #108 from FireEmblemUniverse/develop
Prologue - Ch9 Polish
2 parents 5a2d81c + 6403e90 commit 0a3191a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+7002
-1052
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,3 +63,4 @@ Temporary Items
6363
*.csv#
6464
Maps/TMX2EA Readme.txt
6565
*.png
66+
!Mugs/*.png

‎Battle Palettes/Battle Palettes.txt‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@
44

55
# char{0x15} "MariyaPalette" set{0x15, 0x3, WyvernKnight_F}
66
5553FF7F1F7C1F7C183A1E4BB02DAD3608228C32B453F0422D36871D4619A514
7-
7+
88
# char{0x1E} "MichealPPalette" set{0x1E, 0x3, Journeyman_3}
9-
55537F4E9C733967B556EF3DBD7718639452B55631464A29DE39F71C8E00A514
9+
55537F4E9C733967B556EF3DBD7718639452B55631464A29DE39F71C8E00A514
10+
11+
# char{0x3} "NaughtCavPalette" set{0x3, 0x1, Cavalier}
12+
007EFF7FFF5B737FF431AA79C312010672328B1D4919E6141D4736324E1DA514
13+
14+
# char{0x25} "NaughtGKPalette" set{0x3, 0x4, GreatKnight}
15+
5553DE7BFF5B1F4BB229DF739873ED398A295A7FB57ECD59723249150711A514
16+
17+
# char{0x2A} "NaughtPaladinPalette" set{0x3, 0x3, Paladin}
18+
5453FF7FFF6FBD2ED32DFF27D0120106B23272328B1D49199873D15E0C46A514

‎Custom Definitions.event‎

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
1+
#ifndef VBABT_DEFINITIONS
2+
#define VBABT_DEFINITIONS
13

4+
#include "EAstdlib.event"
25

3-
#define FreeSpace 0xb2a610
4-
#define EndOfFreeSpace 0xC00000
5-
#define FreeSpaceBLRange 0x1c1ec0
6+
#define FreeSpace 0xB2A610
7+
#define FreeSpaceEnd 0xC00000
8+
9+
#define FreeSpace2 0xEFB2E0
10+
#define FreeSpace2End 0xFE0000
11+
12+
#define FreeSpaceBLRange 0x1C1EC0
613

714
#define ChapterTileset(chapter, object, palette, config) "PUSH; ORG 0x8b0890 + (148* chapter) + 4; SHORT object; BYTE palette config; POP"
815
#define ChapterTileAnims(chapter, anim1, anim2) "PUSH; ORG 0x8b0890 + (148* chapter) + 9; BYTE anim1 anim2; POP"
@@ -22,12 +29,26 @@
2229
#ifndef DeathQuoteTable
2330
#define DeathQuoteTable 0x9ECD4C
2431
#endif
32+
#ifndef SongTableOffset
33+
#define SongTableOffset 0x224470
34+
#define SongTable(index,SongPointer,Group) "PUSH; ORG SongTableOffset+(8*index); POIN SongPointer; SHORT Group Group; POP"
35+
#endif
36+
#ifndef AIKeyTable
37+
#define AIKeyTable 0x0D8538
38+
#define SetAIKeyUsability(chapter, doorKey, lockpick, antitoxin) "PUSH; ORG AIKeyTable+4*chapter; WORD (doorKey | lockpick << 1 | antitoxin << 1); POP"
39+
#define SetAIKeyUsability(chapter, doorKey) "SetAIKeyUsability(chapter, doorKey, 1, 1)"
40+
#endif
2541

2642
#define LunarBrace MoonBracelet
2743
#define SolarBrace SunBracelet
2844

2945
#include "Engine Hacks/Skill System/skill_definitions.event"
3046

47+
#define BloodyStream 0x57
48+
49+
//If 0x35 doesn't work do 0x2C
50+
#define Intro(textID) "MUSC BloodyStream; ShowCG(0x35); _0x1A22; TEXTSHOW textID; TEXTEND; ClearBackground; MUSC Silent"
51+
3152
//Class definitions
3253
#define VoidLord 0x1
3354
#define BlitzLord 0x2
@@ -80,9 +101,11 @@
80101
#define Hecwood 0x48
81102
#define Elitor 0x49
82103
#define Grudge 0x4A
104+
#define Lash 0x4C
83105
#define Ch27ChrZomboss 0x4D // dracozombie boss
84106
#define Edgelard 0x4E
85107
#define Dennis 0x50
108+
#define Faust 0x52
86109
#define Ch11LdrID 0x56
87110
#define Ch11MiscID 0x57
88111
#define Cameron 0x58
@@ -246,3 +269,5 @@
246269
#define WTYPE_LIGHT 0x06
247270
#define WTYPE_ELDER 0x07
248271
#define WTYPE_DARK 0x07
272+
273+
#endif // VBABT_DEFINITIONS

‎Engine Hacks/DragonVeins.event‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ PUSH
1515
// #define UMText_DVDesc 0xd1
1616
#endif
1717

18-
#ifndef SongTableOffset
19-
#define SongTableOffset 0x224470
20-
#define SongTable(index,SongPointer,Group) "PUSH; ORG SongTableOffset+(8*index); POIN SongPointer; SHORT Group Group; POP"
21-
#endif
22-
2318
SongTable(DragonVeinSFXID,DragonVeinSFX,7) //Song Group 7 is for map sfx
2419

2520
ORG (0x037864+4*(DragonVeinTrapID-1))
@@ -103,4 +98,3 @@ WORD $FF00FF
10398

10499
DragonVeinWav:
105100
#incbin "bin/DragonVein_wav.dmp"
106-

‎Engine Hacks/ModularStatScreen.event‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
#define Trv_Icon_X 0xB8
66
#define Trv_Icon_Y 0x2E
77
#include "MSS/Display Growths Options/Display Growths Options.txt"
8-
8+
99
PUSH
1010
ORG 0x205b24 //24 for stat screen
1111
POIN MSS_page1|1 MSS_page2|1 MSS_page3|1 MSS_page4|1
1212

13+
/* Let's not make it 4 pages.
1314
ORG $88690
1415
BYTE 4 //make 4 pages
16+
*/
1517

1618
ORG $88650
1719
POIN NewPageNameGraphic
@@ -27,7 +29,7 @@
2729

2830
ORG $889d0
2931
SHORT $e010 //Temporary r-text fix to prevent freezing
30-
ORG $889f2
32+
ORG $889f2
3133
SHORT $BD30
3234
BL(RText_Page4_ladder) //this has to be in bl range somewhere
3335

@@ -46,22 +48,22 @@
4648
ORG $8888C
4749
BYTE 0x82
4850
#endif
49-
51+
5052
ORG $88896
5153
SHORT 0x46C0
5254
jumpToHack(Button_Branch)
53-
55+
5456
//Remember whether we were looking at growths or stats
5557
ORG $8895C //Loads byte to store 1 before stat screen struct
5658
callHack_r1(Load_Page)
57-
59+
5860
ORG $888BC //Stores byte to store 1 before stat screen struct
5961
callHack_r3(Store_Page)
60-
62+
6163
//Display an R-button text about pressing Select, since I can't seem to fit it nicely, and make that the default
6264
ORG $889D8
6365
POIN PersonalDataRText
64-
66+
6567
//HP name color
6668
ORG $86ED4
6769
callHack_r3(HP_Name_Color)
@@ -74,8 +76,8 @@
7476

7577
ORG $17E98
7678
callHack_r3(New_Unit_Exp)
77-
SHORT 0xE005
78-
79+
SHORT 0xE005
80+
7981
POP
8082
ALIGN 4
8183
MSS_page1:
@@ -90,7 +92,7 @@
9092
WORD Growth_Options
9193
POIN Growth_Getter_Table
9294
POIN Get_Palette_Index
93-
95+
9496
ALIGN 4
9597
MSS_page2:
9698
#incbin "MSS/mss_page2_original.dmp"
@@ -117,11 +119,11 @@ NewPageNamePalette:
117119
ALIGN 4
118120
Button_Branch:
119121
#incbin "MSS/Button Branch.dmp"
120-
122+
121123
ALIGN 4
122124
Growth_Getter_Table:
123125
POIN Get_Hp_Growth Get_Str_Growth Get_Skl_Growth Get_Spd_Growth Get_Luk_Growth Get_Def_Growth Get_Res_Growth
124-
126+
125127
ALIGN 4
126128
Get_Hp_Growth:
127129
#incbin "MSS/Growth Getters/Get_Hp_Growth.dmp"
@@ -150,63 +152,63 @@ NewPageNamePalette:
150152
Get_Luk_Growth:
151153
#incbin "MSS/Growth Getters/Get_Luk_Growth.dmp"
152154
POIN Extra_Growth_Boosts|1
153-
155+
154156
ALIGN 4
155157
Extra_Growth_Boosts:
156158
#incbin "MSS/Growth Getters/Extra_Growth_Boosts.dmp"
157159
WORD Growth_Options
158160
POIN ItemTable
159-
161+
160162
ALIGN 4
161163
Load_Page:
162164
#incbin "MSS/Load Page.dmp"
163165
WORD Stat_Page_Ram_Loc
164-
166+
165167
ALIGN 4
166168
Store_Page:
167169
#incbin "MSS/Store Page.dmp"
168170
WORD Stat_Page_Ram_Loc
169171

170-
172+
171173
ALIGN 4
172174
Rescue_Arrows:
173175
#incbin "MSS/Check Rescue Arrows.dmp"
174176
POIN SkillTester
175177
WORD SaviorID
176-
178+
177179
ALIGN 4
178180
Get_Palette_Index:
179181
#incbin "MSS/Get_Palette_Index.dmp"
180182
POIN Growth_Color_Table
181-
183+
182184
ALIGN 4
183185
HP_Name_Color:
184186
#incbin "MSS/HP Name Color.dmp"
185187
POIN New_Palettes
186188
WORD Growth_Options
187189
POIN Get_Hp_Growth
188190
POIN Get_Palette_Index
189-
191+
190192
ALIGN 4
191193
Write_Growths_To_Battle_Struct:
192194
#incbin "MSS/Write_Growths_To_Battle_Struct.dmp"
193195
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
194196
WORD Growth_Options
195-
197+
196198
ALIGN 4
197199
Class_Level_Cap_Table:
198200
#incbin "MSS/Display Growths Options/Class_Level_Cap_Table.dmp"
199-
201+
200202
ALIGN 4
201203
Enemy_Autolevel:
202204
#incbin "MSS/Enemy_Autolevel.dmp"
203205
WORD Growth_Options
204-
206+
205207
ALIGN 4
206208
New_Unit_Exp:
207209
#incbin "MSS/New_Unit_Exp.dmp"
208210
POIN Class_Level_Cap_Table
209-
211+
210212
Growth_Color_Table:
211213
#include "MSS/Display Growths Options/Growth Colors Table.txt"
212214

@@ -219,7 +221,7 @@ NewPageNamePalette:
219221
BYTE 0
220222
ALIGN 4
221223
setText(0x0D4B,TxtData0x0D4B)
222-
224+
223225
/*stat screen R menu is at 8a00b38
224226
find by breaking on key press while R menu open
225227

‎Engine Hacks/Skill System/skill_lists.event‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,8 @@ BYTE 00 00
211211
ALIGN 4
212212

213213
BrigandSkillList:
214-
BYTE 10 IntimidateID
214+
BYTE 10 ShoveID
215+
BYTE 20 IntimidateID
215216
BYTE 00 00
216217
ALIGN 4
217218

‎Events/Ch1.event‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ ENUN
142142
LOAD1 0x1 Bad
143143
ENUN
144144
CAM1 Vedge
145+
Intro(Chapter1_Intro)
145146
Text(Chapter1_Beginning)
146147
NoFade
147148
ENDA

0 commit comments

Comments
 (0)