From e0d1db0363e6928c8e85dd44a458fc6ad77ceceb Mon Sep 17 00:00:00 2001 From: Martin Michelsen Date: Sat, 29 Mar 2025 16:32:53 -0700 Subject: [PATCH] handle DARK_GUNNER_CONTROL properly --- src/EnemyType.cc | 1 + src/EnemyType.hh | 1 + src/Map.cc | 2 +- src/RareItemSet.cc | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/EnemyType.cc b/src/EnemyType.cc index 71e8c089..658fc14f 100644 --- a/src/EnemyType.cc +++ b/src/EnemyType.cc @@ -42,6 +42,7 @@ static const vector type_defs{ {EnemyType::DARK_FALZ_2, EP1, 0x2F, 0x37, "DARK_FALZ_2", "Dark Falz (phase 2)", nullptr}, {EnemyType::DARK_FALZ_3, EP1, 0x2F, 0x38, "DARK_FALZ_3", "Dark Falz (phase 3)", nullptr}, {EnemyType::DARK_GUNNER, EP1, 0x22, 0x1E, "DARK_GUNNER", "Dark Gunner", nullptr}, + {EnemyType::DARK_GUNNER_CONTROL, EP1, 0xFF, 0xFF, "DARK_GUNNER_CONTROL", "Dark Gunner (control)", nullptr}, {EnemyType::DARVANT, EP1, 0xFF, 0x35, "DARVANT", "Darvant", nullptr}, {EnemyType::DARVANT_ULTIMATE, EP1, 0xFF, 0x39, "DARVANT_ULTIMATE", "Darvant (ultimate)", nullptr}, {EnemyType::DE_ROL_LE, EP1, 0x2D, 0x0F, "DE_ROL_LE", "De Rol Le", "Dal Ral Lie"}, diff --git a/src/EnemyType.hh b/src/EnemyType.hh index 20de215e..43ddd142 100644 --- a/src/EnemyType.hh +++ b/src/EnemyType.hh @@ -33,6 +33,7 @@ enum class EnemyType : uint8_t { DARK_FALZ_2, DARK_FALZ_3, DARK_GUNNER, + DARK_GUNNER_CONTROL, DARVANT, DARVANT_ULTIMATE, DE_ROL_LE, diff --git a/src/Map.cc b/src/Map.cc index 85c71447..16db4c41 100644 --- a/src/Map.cc +++ b/src/Map.cc @@ -4146,7 +4146,7 @@ shared_ptr SuperMap::add_enemy_and_children( add(EnemyType::DARK_GUNNER); break; case 0x00A3: // TObjEneDarkGunCenter - add(EnemyType::DEATH_GUNNER); + add(EnemyType::DARK_GUNNER_CONTROL); break; case 0x00A4: // TObjEneDf2Bringer add(EnemyType::CHAOS_BRINGER); diff --git a/src/RareItemSet.cc b/src/RareItemSet.cc index b9467582..ba59dc3b 100644 --- a/src/RareItemSet.cc +++ b/src/RareItemSet.cc @@ -472,7 +472,7 @@ string RareItemSet::serialize_html( EnemyType::DELSABER, EnemyType::CHAOS_SORCERER, EnemyType::BEE_L, EnemyType::BEE_R, EnemyType::DARK_BELRA, - EnemyType::DARK_GUNNER, EnemyType::DEATH_GUNNER, + EnemyType::DARK_GUNNER, EnemyType::DARK_GUNNER_CONTROL, EnemyType::DEATH_GUNNER, EnemyType::CHAOS_BRINGER, EnemyType::DARVANT, EnemyType::DARVANT_ULTIMATE, EnemyType::DARK_FALZ_1, EnemyType::DARK_FALZ_2, EnemyType::DARK_FALZ_3, }},