From 23f3bfabaa72e64db74566d53aa9f952925173e2 Mon Sep 17 00:00:00 2001 From: Martin Michelsen Date: Sat, 10 Feb 2024 20:33:42 -0800 Subject: [PATCH] fix angle_x type in AttackData --- src/BattleParamsIndex.hh | 2 +- src/QuestScript.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/BattleParamsIndex.hh b/src/BattleParamsIndex.hh index 6932ae17..cc2c26af 100644 --- a/src/BattleParamsIndex.hh +++ b/src/BattleParamsIndex.hh @@ -24,7 +24,7 @@ public: /* 04 */ le_int16_t ata_bonus; /* 06 */ le_uint16_t unknown_a4; /* 08 */ le_float distance_x; - /* 0C */ le_float angle_x; + /* 0C */ le_uint32_t angle_x; // Out of 0x10000 (high 16 bits are unused) /* 10 */ le_float distance_y; /* 14 */ le_uint16_t unknown_a8; /* 16 */ le_uint16_t unknown_a9; diff --git a/src/QuestScript.cc b/src/QuestScript.cc index d1331194..cee9b8db 100644 --- a/src/QuestScript.cc +++ b/src/QuestScript.cc @@ -1535,7 +1535,7 @@ std::string disassemble_quest_script(const void* data, size_t size, Version vers lines.emplace_back(string_printf(" %04zX ata_bonus %04hX /* %hd */", l->offset + offsetof(AttackData, ata_bonus), attack.ata_bonus.load(), attack.ata_bonus.load())); lines.emplace_back(string_printf(" %04zX a4 %04hX /* %hu */", l->offset + offsetof(AttackData, unknown_a4), attack.unknown_a4.load(), attack.unknown_a4.load())); lines.emplace_back(string_printf(" %04zX distance_x %08" PRIX32 " /* %g */", l->offset + offsetof(AttackData, distance_x), attack.distance_x.load_raw(), attack.distance_x.load())); - lines.emplace_back(string_printf(" %04zX angle_x %08" PRIX32 " /* %g */", l->offset + offsetof(AttackData, angle_x), attack.angle_x.load_raw(), attack.angle_x.load())); + lines.emplace_back(string_printf(" %04zX angle_x %08" PRIX32 " /* %" PRIu32 "/65536 */", l->offset + offsetof(AttackData, angle_x), attack.angle_x.load_raw(), attack.angle_x.load())); lines.emplace_back(string_printf(" %04zX distance_y %08" PRIX32 " /* %g */", l->offset + offsetof(AttackData, distance_y), attack.distance_y.load_raw(), attack.distance_y.load())); lines.emplace_back(string_printf(" %04zX a8 %04hX /* %hu */", l->offset + offsetof(AttackData, unknown_a8), attack.unknown_a8.load(), attack.unknown_a8.load())); lines.emplace_back(string_printf(" %04zX a9 %04hX /* %hu */", l->offset + offsetof(AttackData, unknown_a9), attack.unknown_a9.load(), attack.unknown_a9.load()));