Merge pull request #733 from 8bit-penguin/small_fixes

Identify some constants related to terrains and items

Author: Eebit

include/bmbattle.h

@@ -284,6 +284,6 @@ void BattlePrintDebugHitInfo(void);
 void BattleGenerateHitScriptedDamage(struct BattleUnit* bu);
 void BattleUnwindScripted(void);
 
-#define BUNIT_IS_OBSTACLE(aBu) (((aBu)->terrainId == TERRAIN_WALL_1B) || ((aBu)->terrainId == TERRAIN_SNAG))
+#define BUNIT_IS_OBSTACLE(aBu) (((aBu)->terrainId == TERRAIN_WALL_DAMAGED) || ((aBu)->terrainId == TERRAIN_SNAG))
 
 #endif // GUARD_BMBATTLE_H

include/bmitem.h

@@ -93,8 +93,8 @@ enum {
     ITYPE_ITEM  = 9,
     ITYPE_DRAGN = 10,
 
-    ITYPE_11    = 11,
-    ITYPE_12    = 12,
+    ITYPE_MONSTER    = 11,
+    ITYPE_DANCE    = 12,
 };
 
 enum {

include/constants/characters.h

@@ -96,7 +96,7 @@ enum {
     CHARACTER_MONSTER_BA   = 0xBA,
     CHARACTER_FOMORTIIS    = 0xBE,
 
-    CHARACHER_FRELIAN      = 0xC0,
+    CHARACTER_FRELIAN      = 0xC0,
     CHARACTER_FADO         = 0xC5,
 
     CHARACTER_HAYDEN       = 0xC7,

include/constants/terrains.h

@@ -7,44 +7,44 @@ enum {
     // I'm going by the in-game names + some old FE7 nmm for this
     // TODO: figure out in better details
 
-    TERRAIN_TILE_00    = 0x00,
+    TERRAIN_NONE    = 0x00,
     TERRAIN_PLAINS     = 0x01,
     TERRAIN_ROAD       = 0x02,
-    TERRAIN_VILLAGE_03 = 0x03,
-    TERRAIN_VILLAGE_04 = 0x04,
-    TERRIAN_HOUSE      = 0x05,
+    TERRAIN_VILLAGE_REGULAR = 0x03,
+    TERRAIN_VILLAGE_CLOSED = 0x04,
+    TERRAIN_HOUSE      = 0x05,
     TERRAIN_ARMORY     = 0x06,
     TERRAIN_VENDOR     = 0x07,
-    TERRAIN_ARENA_08   = 0x08,
+    TERRAIN_ARENA_REGULAR   = 0x08,
     TERRAIN_C_ROOM_09  = 0x09,
     TERRAIN_FORT       = 0x0A,
-    TERRAIN_GATE_0B    = 0x0B,
+    TERRAIN_GATE_CASTLE    = 0x0B,
     TERRAIN_FOREST     = 0x0C,
     TERRAIN_THICKET    = 0x0D,
     TERRAIN_SAND       = 0x0E,
     TERRAIN_DESERT     = 0x0F,
     TERRAIN_RIVER      = 0x10,
     TERRAIN_MOUNTAIN   = 0x11,
     TERRAIN_PEAK       = 0x12,
-    TERRAIN_BRIDGE_13  = 0x13,
+    TERRAIN_BRIDGE_REGULAR  = 0x13,
     TERRAIN_BRIDGE_14  = 0x14,
     TERRAIN_SEA        = 0x15,
     TERRAIN_LAKE       = 0x16,
-    TERRAIN_FLOOR_17   = 0x17,
-    TERRAIN_FLOOR_18   = 0x18,
-    TERRAIN_FENCE_19   = 0x19,
-    TERRAIN_WALL_1A    = 0x1A,
-    TERRAIN_WALL_1B    = 0x1B,
+    TERRAIN_FLOOR_REGULAR   = 0x17,
+    TERRAIN_FLOOR_MAGIC   = 0x18, // Unused in FE8; leftover from FE6
+    TERRAIN_FENCE_REGULAR   = 0x19,
+    TERRAIN_WALL_REGULAR    = 0x1A,
+    TERRAIN_WALL_DAMAGED    = 0x1B,
     TERRAIN_RUBBLE     = 0x1C,
     TERRAIN_PILLAR     = 0x1D,
     TERRAIN_DOOR       = 0x1E,
     TERRAIN_THRONE     = 0x1F,
-    TERRAIN_CHEST_20   = 0x20,
-    TERRAIN_CHEST_21   = 0x21,
+    TERRAIN_CHEST_EMPTY   = 0x20,
+    TERRAIN_CHEST_FULL   = 0x21,
     TERRAIN_ROOF       = 0x22,
-    TERRAIN_GATE_23    = 0x23,
+    TERRAIN_GATE_REGULAR    = 0x23,
     TERRAIN_CHURCH     = 0x24,
-    TERRAIN_RUINS_25   = 0x25,
+    TERRAIN_RUINS_REGULAR   = 0x25,
     TERRAIN_CLIFF      = 0x26,
     TERRAIN_BALLISTA_REGULAR = 0x27,
     TERRAIN_BALLISTA_LONG    = 0x28,
@@ -59,10 +59,10 @@ enum {
     TERRAIN_VALLEY     = 0x31,
     TERRAIN_FENCE_32   = 0x32,
     TERRAIN_SNAG       = 0x33,
-    TERRAIN_BRIDGE_34  = 0x34,
+    TERRAIN_BRIDGE_SNAG  = 0x34,
     TERRAIN_SKY        = 0x35,
     TERRAIN_DEEPS      = 0x36,
-    TERRAIN_RUINS_37   = 0x37,
+    TERRAIN_RUINS_VILLAGE   = 0x37, // Unused in FE8; leftover from FE7
     TERRAIN_INN        = 0x38,
     TERRAIN_BARREL     = 0x39,
     TERRAIN_BONE       = 0x3A,

include/variables.h

@@ -529,13 +529,13 @@ extern CONST_DATA s8 TerrainTable_MovCost_BrigandNormal[];
 extern CONST_DATA s8 TerrainTable_MovCost_PirateNormal[];
 extern CONST_DATA s8 TerrainTable_MovCost_ThiefNormal[];
 extern CONST_DATA s8 TerrainTable_MovCost_MagicNormal[];
-extern CONST_DATA s8 Unk_TerrainTable_0880BA51[];
+extern CONST_DATA s8 TerrainTable_MovCost_CivilianNormal[];
 extern CONST_DATA s8 TerrainTable_MovCost_HorseT1Normal[];
 extern CONST_DATA s8 TerrainTable_MovCost_HorseT2Normal[];
-extern CONST_DATA s8 Unk_TerrainTable_0880BB14[];
-extern CONST_DATA s8 Unk_TerrainTable_0880BB55[];
+extern CONST_DATA s8 TerrainTable_MovCost_AnimalT1Normal[];
+extern CONST_DATA s8 TerrainTable_MovCost_AnimalT2Normal[];
 extern CONST_DATA s8 TerrainTable_MovCost_FlyNormal[];
-extern CONST_DATA s8 Unk_TerrainTable_0880BBD7[];
+extern CONST_DATA s8 TerrainTable_MovCost_DemonKing[];
 extern CONST_DATA s8 Unk_TerrainTable_0880BC18[];
 extern CONST_DATA s8 TerrainTable_MovCost_CommonT2Rain[];
 extern CONST_DATA s8 TerrainTable_MovCost_CommonT1Rain[];
@@ -546,11 +546,11 @@ extern CONST_DATA s8 TerrainTable_MovCost_BrigandRain[];
 extern CONST_DATA s8 TerrainTable_MovCost_PirateRain[];
 extern CONST_DATA s8 TerrainTable_MovCost_ThiefRain[];
 extern CONST_DATA s8 TerrainTable_MovCost_MagicRain[];
-extern CONST_DATA s8 Unk_TerrainTable_0880BEA2[];
+extern CONST_DATA s8 TerrainTable_MovCost_CivilianRain[];
 extern CONST_DATA s8 TerrainTable_MovCost_HorseT1Rain[];
 extern CONST_DATA s8 TerrainTable_MovCost_HorseT2Rain[];
-extern CONST_DATA s8 Unk_TerrainTable_0880BF65[];
-extern CONST_DATA s8 Unk_TerrainTable_0880BFA6[];
+extern CONST_DATA s8 TerrainTable_MovCost_AnimalT1Rain[];
+extern CONST_DATA s8 TerrainTable_MovCost_AnimalT2Rain[];
 extern CONST_DATA s8 TerrainTable_MovCost_FlyRain[];
 extern CONST_DATA s8 Unk_TerrainTable_0880C028[];
 extern CONST_DATA s8 TerrainTable_MovCost_CommonT2Snow[];
@@ -562,11 +562,11 @@ extern CONST_DATA s8 TerrainTable_MovCost_BrigandSnow[];
 extern CONST_DATA s8 TerrainTable_MovCost_PirateSnow[];
 extern CONST_DATA s8 TerrainTable_MovCost_ThiefSnow[];
 extern CONST_DATA s8 TerrainTable_MovCost_MagicSnow[];
-extern CONST_DATA s8 Unk_TerrainTable_0880C2B2[];
+extern CONST_DATA s8 TerrainTable_MovCost_CivilianSnow[];
 extern CONST_DATA s8 TerrainTable_MovCost_HorseT1Snow[];
 extern CONST_DATA s8 TerrainTable_MovCost_HorseT2Snow[];
-extern CONST_DATA s8 Unk_TerrainTable_0880C375[];
-extern CONST_DATA s8 Unk_TerrainTable_0880C3B6[];
+extern CONST_DATA s8 TerrainTable_MovCost_AnimalT1Snow[];
+extern CONST_DATA s8 TerrainTable_MovCost_AnimalT2Snow[];
 extern CONST_DATA s8 TerrainTable_MovCost_FlySnow[];
 extern CONST_DATA s8 Unk_TerrainTable_0880C438[];
 extern CONST_DATA s8 TerrainTable_Avo_Common[];
@@ -580,8 +580,8 @@ extern CONST_DATA s8 Unk_TerrainTable_0880C640[];
 extern CONST_DATA s8 Unk_TerrainTable_0880C681[];
 extern CONST_DATA s8 Unk_TerrainTable_0880C6C2[];
 extern CONST_DATA s8 Unk_TerrainTable_0880C703[];
-extern CONST_DATA s8 Unk_TerrainTable_0880C744[];
-extern CONST_DATA s8 Unk_TerrainTable_0880C785[];
+extern CONST_DATA s8 TerrainTable_HealAmount[];
+extern CONST_DATA s8 TerrainTable_HealsStatus[];
 extern CONST_DATA s8 BanimTerrainGroundDefault[];
 extern CONST_DATA s8 BanimTerrainGround_Tileset01[];
 extern CONST_DATA s8 BanimTerrainGround_Tileset02[];
@@ -629,13 +629,13 @@ extern u16 CONST_DATA gUnknown_0880D374[]; // terrainid-to-textid lookup
 // extern ??? gUnknown_088ACBC4
 extern CONST_DATA u8 ItemEffectiveness_088ADEB0[];
 extern CONST_DATA u8 ItemEffectiveness_Armor[];
-extern CONST_DATA u8 ItemEffectiveness_088ADEC2[];
-extern CONST_DATA u8 ItemEffectiveness_088ADED7[];
-extern CONST_DATA u8 ItemEffectiveness_088ADEE0[];
-extern CONST_DATA u8 ItemEffectiveness_088ADEF1[];
+extern CONST_DATA u8 ItemEffectiveness_ArmorAndHorse[];
+extern CONST_DATA u8 ItemEffectiveness_Swordsman[];
+extern CONST_DATA u8 ItemEffectiveness_Horse[];
+extern CONST_DATA u8 ItemEffectiveness_FlierAndMonsters[];
 extern CONST_DATA u8 ItemEffectiveness_Dragon[];
 extern CONST_DATA u8 ItemEffectiveness_088ADF1F[];
-extern CONST_DATA u8 ItemEffectiveness_088ADF2A[];
+extern CONST_DATA u8 ItemEffectiveness_Flier[];
 extern CONST_DATA u8 ItemEffectiveness_Monsters[];
 extern CONST_DATA u8 JidLutUnk_Tier0[];
 extern CONST_DATA u8 gItemUseJidList_HeroCrest[];

scripts/fe8db.py

@@ -310,7 +310,7 @@
     0xBA: "CHARACTER_MONSTER_BA",
     0xBE: "CHARACTER_FOMORTIIS",
 
-    0xC0: "CHARACHER_FRELIAN",
+    0xC0: "CHARACTER_FRELIAN",
     0xC5: "CHARACTER_FADO",
 
     0xC7: "CHARACTER_HAYDEN",
@@ -706,8 +706,8 @@ def ITEM_IDX(iid):
     0x08: "ITYPE_BLLST",
     0x09: "ITYPE_ITEM",
     0x0A: "ITYPE_DRAGN",
-    0x0B: "ITYPE_11",
-    0x0C: "ITYPE_12",
+    0x0B: "ITYPE_MONSTER",
+    0x0C: "ITYPE_DANCE",
 }
 
 def ITYPE_IDX(itype):
@@ -770,44 +770,44 @@ def UNIT_AFFIN(affin):
     return None
 
 _TERRAIN_IDX = {
-	0x00: "TERRAIN_TILE_00",
+	0x00: "TERRAIN_NONE",
 	0x01: "TERRAIN_PLAINS",
 	0x02: "TERRAIN_ROAD",
-	0x03: "TERRAIN_VILLAGE_03",
-	0x04: "TERRAIN_VILLAGE_04",
-	0x05: "TERRIAN_HOUSE",
+	0x03: "TERRAIN_VILLAGE_REGULAR",
+	0x04: "TERRAIN_VILLAGE_CLOSED",
+	0x05: "TERRAIN_HOUSE",
 	0x06: "TERRAIN_ARMORY",
 	0x07: "TERRAIN_VENDOR",
-	0x08: "TERRAIN_ARENA_08",
+	0x08: "TERRAIN_ARENA_REGULAR",
 	0x09: "TERRAIN_C_ROOM_09",
 	0x0A: "TERRAIN_FORT",
-	0x0B: "TERRAIN_GATE_0B",
+	0x0B: "TERRAIN_GATE_CASTLE",
 	0x0C: "TERRAIN_FOREST",
 	0x0D: "TERRAIN_THICKET",
 	0x0E: "TERRAIN_SAND",
 	0x0F: "TERRAIN_DESERT",
 	0x10: "TERRAIN_RIVER",
 	0x11: "TERRAIN_MOUNTAIN",
 	0x12: "TERRAIN_PEAK",
-	0x13: "TERRAIN_BRIDGE_13",
+	0x13: "TERRAIN_BRIDGE_REGULAR",
 	0x14: "TERRAIN_BRIDGE_14",
 	0x15: "TERRAIN_SEA",
 	0x16: "TERRAIN_LAKE",
-	0x17: "TERRAIN_FLOOR_17",
-	0x18: "TERRAIN_FLOOR_18",
-	0x19: "TERRAIN_FENCE_19",
-	0x1A: "TERRAIN_WALL_1A",
-	0x1B: "TERRAIN_WALL_1B",
+	0x17: "TERRAIN_FLOOR_REGULAR",
+	0x18: "TERRAIN_FLOOR_MAGIC",
+	0x19: "TERRAIN_FENCE_REGULAR",
+	0x1A: "TERRAIN_WALL_REGULAR",
+	0x1B: "TERRAIN_WALL_DAMAGED",
 	0x1C: "TERRAIN_RUBBLE",
 	0x1D: "TERRAIN_PILLAR",
 	0x1E: "TERRAIN_DOOR",
 	0x1F: "TERRAIN_THRONE",
-	0x20: "TERRAIN_CHEST_20",
-	0x21: "TERRAIN_CHEST_21",
+	0x20: "TERRAIN_CHEST_EMPTY",
+	0x21: "TERRAIN_CHEST_FULL",
 	0x22: "TERRAIN_ROOF",
-	0x23: "TERRAIN_GATE_23",
+	0x23: "TERRAIN_GATE_REGULAR",
 	0x24: "TERRAIN_CHURCH",
-	0x25: "TERRAIN_RUINS_25",
+	0x25: "TERRAIN_RUINS_REGULAR",
 	0x26: "TERRAIN_CLIFF",
 	0x27: "TERRAIN_BALLISTA_REGULAR",
 	0x28: "TERRAIN_BALLISTA_LONG",
@@ -822,10 +822,10 @@ def UNIT_AFFIN(affin):
 	0x31: "TERRAIN_VALLEY",
 	0x32: "TERRAIN_FENCE_32",
 	0x33: "TERRAIN_SNAG",
-	0x34: "TERRAIN_BRIDGE_34",
+	0x34: "TERRAIN_BRIDGE_SNAG",
 	0x35: "TERRAIN_SKY",
 	0x36: "TERRAIN_DEEPS",
-	0x37: "TERRAIN_RUINS_37",
+	0x37: "TERRAIN_RUINS_VILLAGE",
 	0x38: "TERRAIN_INN",
 	0x39: "TERRAIN_BARREL",
 	0x3A: "TERRAIN_BONE",

src/banim-efxmisc.c

@@ -599,24 +599,24 @@ void NewEfxSunakemuriOBJ(struct Anim *anim, int type)
     switch (terrain) {
     case TERRAIN_PLAINS:
     case TERRAIN_ROAD:
-    case TERRAIN_VILLAGE_03:
-    case TERRAIN_VILLAGE_04:
-    case TERRIAN_HOUSE:
+    case TERRAIN_VILLAGE_REGULAR:
+    case TERRAIN_VILLAGE_CLOSED:
+    case TERRAIN_HOUSE:
     case TERRAIN_FORT:
     case TERRAIN_FOREST:
     case TERRAIN_THICKET:
     case TERRAIN_SAND:
     case TERRAIN_DESERT:
     case TERRAIN_MOUNTAIN:
     case TERRAIN_PEAK:
-    case TERRAIN_BRIDGE_13:
-    case TERRAIN_FENCE_19:
-    case TERRAIN_WALL_1A:
-    case TERRAIN_WALL_1B:
+    case TERRAIN_BRIDGE_REGULAR:
+    case TERRAIN_FENCE_REGULAR:
+    case TERRAIN_WALL_REGULAR:
+    case TERRAIN_WALL_DAMAGED:
     case TERRAIN_RUBBLE:
     case TERRAIN_ROOF:
-    case TERRAIN_GATE_23:
-    case TERRAIN_RUINS_25:
+    case TERRAIN_GATE_REGULAR:
+    case TERRAIN_RUINS_REGULAR:
     case TERRAIN_CLIFF:
     case TERRAIN_BALLISTA_REGULAR:
     case TERRAIN_BALLISTA_LONG:
@@ -652,27 +652,27 @@ void NewEfxSunakemuriOBJ(struct Anim *anim, int type)
 
     case TERRAIN_ARMORY:
     case TERRAIN_VENDOR:
-    case TERRAIN_ARENA_08:
+    case TERRAIN_ARENA_REGULAR:
     case TERRAIN_C_ROOM_09:
-    case TERRAIN_GATE_0B:
-    case TERRAIN_FLOOR_17:
-    case TERRAIN_FLOOR_18:
+    case TERRAIN_GATE_CASTLE:
+    case TERRAIN_FLOOR_REGULAR:
+    case TERRAIN_FLOOR_MAGIC:
     case TERRAIN_PILLAR:
     case TERRAIN_DOOR:
     case TERRAIN_THRONE:
-    case TERRAIN_CHEST_20:
-    case TERRAIN_CHEST_21:
+    case TERRAIN_CHEST_EMPTY:
+    case TERRAIN_CHEST_FULL:
     case TERRAIN_CHURCH:
     case TERRAIN_STAIRS:
     case TERRAIN_ARENA_30:
     case TERRAIN_VALLEY:
     case TERRAIN_FENCE_32:
-    case TERRAIN_RUINS_37:
+    case TERRAIN_RUINS_VILLAGE:
     case TERRAIN_DECK:
         SpellFx_RegisterObjPal(Pal_EfxSunakemuriOBJ3, 0x20);
         break;
 
-    case TERRAIN_TILE_00:
+    case TERRAIN_NONE:
     default:
         break;
     }