diff --git a/tools/ability_data.py b/tools/ability_data.py index 375024a..07d92a5 100644 --- a/tools/ability_data.py +++ b/tools/ability_data.py @@ -28,6 +28,6 @@ for i in range(1, MAX_ABILITIES): print(f"{name} = 0x{name_vaddr:X}") - # print(f"({i}):\t", (field_0x0, field_0x2, field_0x3, field_0x4, field_0x5, - # field_0x6, field_0x7, field_0x8, field_0x9, field_0xa, - # field_0xb)) \ No newline at end of file + print(f"({i}):\t", (field_0x0, element, field_0x2, field_0x3, field_0x4, field_0x5, + field_0x6, field_0x7, field_0x8, field_0x9, field_0xa, + field_0xb)) \ No newline at end of file diff --git a/tools/class_data.py b/tools/class_data.py index b0d1f57..f76584b 100644 --- a/tools/class_data.py +++ b/tools/class_data.py @@ -95,18 +95,21 @@ if __name__ == "__main__": name = read_rom(name_addr_diff, name_addr_diff + 32).split(b'\0', 1)[0] print(f"Class= {name} ({i})") - print(f"Gender={class_data.gender}") - print(f"ItemUpperLeft= {item_data.item_get_name(item_data.item_read(class_data.item_upper_left).name)}") - print(f"ItemUpperRight= {item_data.item_get_name(item_data.item_read(class_data.item_upper_right).name)}") - print(f"ItemLowerLeft= {item_data.item_get_name(item_data.item_read(class_data.item_lower_left).name)}") - print(f"ItemLowerRight= {item_data.item_get_name(item_data.item_read(class_data.item_lower_right).name)}") + # print(f"Gender={class_data.gender}") + # print(f"Leadership rank={class_data.leadership_rank}") + + # print(f"Leadership rank={class_data.leadership_rank}") + + # print(f"ItemUpperLeft= {item_data.item_get_name(item_data.item_read(class_data.item_upper_left).name)}") + # print(f"ItemUpperRight= {item_data.item_get_name(item_data.item_read(class_data.item_upper_right).name)}") + # print(f"ItemLowerLeft= {item_data.item_get_name(item_data.item_read(class_data.item_lower_left).name)}") + # print(f"ItemLowerRight= {item_data.item_get_name(item_data.item_read(class_data.item_lower_right).name)}") unidentified = [] for val in class_data._fields: - if val.startswith("field_"): - unidentified.append(f"{val}: {getattr(class_data, val)}") + unidentified.append(f"{val}: {getattr(class_data, val)}") - print("Unidentified fields: ") + print("Fields: ") print("\n".join(unidentified), end="") print() print("-----------------------------------------")