Chapter 35

laqieer · May 16, 2020 · f869795 · f869795
1 parent 277b63e
commit f869795
Show file tree

Hide file tree

Showing 12 changed files with 2,098 additions and 10 deletions.
diff --git a/include/event.h b/include/event.h
@@ -58,6 +58,9 @@
 #define LOU1 .word 0x30,
 #define LOU2 .word 0x34,
 
+// Remove units.
+#define DISA .word 0x69,
+
 // Shows text.
 #define TEX1 .word 0xd,
 #define TEXT .word 0xd,

diff --git a/include/music_id.h b/include/music_id.h
@@ -9,6 +9,7 @@
 
 #define MUSIC_WIND_ACROSS_THE_PLAIN 48
 #define MUSIC_COMPANIONS 2
+#define MUSIC_SHADOW_APPROACHES 7
 
 #define MUSIC_EVENT_SERIOUS_3 0x405
 

diff --git a/res/map/event/Project Definition.txt b/res/map/event/Project Definition.txt
@@ -42,6 +42,33 @@
 #define GenericSoldierFlameWeak 0x7d
 #define GenericSoldierFlameStrong 0x7e
 
+#define GenericAskr 0x75
+#define GenericAskrWeak 0x76
+#define GenericAskrStrong 0x77
+
+#define GenericEmblian 0x67
+#define GenericEmblianWeak 0x68
+#define GenericEmblianStrong 0x69
+#define GenericEmblianSuperWeak 0x88
+
+#define GenericEmblianWeakDropItem 0x82
+#define GenericEmblianWeakDrop 0x82
+
+#define GenericSummoned 0x72
+#define GenericSummonedWeak 0x73
+#define GenericSummonedStrong 0x74
+
+#define GenericSummonedDropItem 0x7f
+#define GenericSummonedWeakDropItem 0x80
+#define GenericSummonedStrongDropItem 0x81
+#define GenericSummonedDrop 0x7f
+#define GenericSummonedWeakDrop 0x80
+#define GenericSummonedStrongDrop 0x81
+
+#define GenericFlame 0x7c
+#define GenericFlameWeak 0x7d
+#define GenericFlameStrong 0x7e
+
 // Classes
 
 #define AlfonseLord EliwoodLord

diff --git a/res/map/new_map/S0803.json b/res/map/new_map/S0803.json
@@ -0,0 +1,163 @@
+{ "columns":15,
+ "editorsettings":
+    {
+     "export":
+        {
+         "format":"Fire Emblem (GBA) Tileset Terrain Binary",
+         "target":"..\/..\/..\/tool\/map\/tmp\/S0803.terrain.bin"
+        }
+    },
+ "image":"S0803.png",
+ "imageheight":320,
+ "imagewidth":240,
+ "margin":0,
+ "name":"S0803",
+ "spacing":0,
+ "terrains":[
+        {
+         "name":"\u5730\u677f",
+         "properties":[
+                {
+                 "name":"default",
+                 "type":"bool",
+                 "value":true
+                }],
+         "tile":114
+        }, 
+        {
+         "name":"\u5899\u58c1",
+         "tile":225
+        }, 
+        {
+         "name":"\u7834\u5899",
+         "tile":272
+        }],
+ "tilecount":300,
+ "tiledversion":"1.3.4",
+ "tileheight":16,
+ "tiles":[
+        {
+         "id":0,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":1,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":15,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":30,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":45,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":60,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":75,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":90,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":105,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":114,
+         "properties":[
+                {
+                 "name":"default",
+                 "type":"bool",
+                 "value":true
+                }]
+        }, 
+        {
+         "id":120,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":135,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":150,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":165,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":180,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":195,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":208,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":209,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":210,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":223,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":224,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":225,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":240,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":255,
+         "terrain":[1, 1, 1, 1]
+        }, 
+        {
+         "id":270,
+         "terrain":[2, 2, 2, 2]
+        }, 
+        {
+         "id":271,
+         "terrain":[2, 2, 2, 2]
+        }, 
+        {
+         "id":272,
+         "terrain":[2, 2, 2, 2]
+        }, 
+        {
+         "id":285,
+         "terrain":[2, 2, 2, 2]
+        }, 
+        {
+         "id":286,
+         "terrain":[2, 2, 2, 2]
+        }],
+ "tilewidth":16,
+ "type":"tileset",
+ "version":1.2
+}