Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update unknown values in move data #388

Merged
merged 5 commits into from
Jul 30, 2023
Merged

Update unknown values in move data #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e25a866
skytemple/skytemple#573: Update unknown values in move data
theCapypara Jul 29, 2023
9321afd
Update to be bool
theCapypara Jul 29, 2023
382d554
Fix type of ai_frozen_check for attribute test
theCapypara Jul 29, 2023
0e07a0c
Fix some typing related issues
theCapypara Jul 30, 2023
85c2ea9
Fix test fixtures for WazaP tests
theCapypara Jul 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions skytemple_files/data/waza_p/_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,9 +136,9 @@ class WazaMove(WazaMoveProtocol[WazaMoveRangeSettings], AutoString):
affected_by_magic_coat: bool
is_snatchable: bool
uses_mouth: bool
unk13: u8
ai_frozen_check: bool
ignores_taunted: bool
unk15: u8
range_check_text: u8
move_id: u16
message_id: u8

Expand Down Expand Up @@ -179,12 +179,12 @@ def __init__(self, data: bytes):
self.is_snatchable = bool(read_u8(data, 0x11))
# 0x12 1 uint8 Unk#15 Boolean, whether the move is disabled by the "muzzled" status.
self.uses_mouth = bool(read_u8(data, 0x12))
# 0x13 1 uint8 Unk#16 Unknown.
self.unk13 = read_u8(data, 0x13)
# 0x13 1 uint8 Unk#16 If true, the AI won't try to use the move on frozen targets.
self.ai_frozen_check = bool(read_u8(data, 0x13))
# 0x14 1 uint8 Unk#17 Boolean, whether the move can be used while taunted.
self.ignores_taunted = bool(read_u8(data, 0x14))
# 0x15 1 uint8 Unk#18 Unknown. Possible bitfield.
self.unk15 = read_u8(data, 0x15)
# 0x15 1 uint8 Unk#18 Determines the string that is displayed for the range of the move in-game
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could clarify that the value is offset by a certain amount here, but I guess it's not too important.

self.range_check_text = read_u8(data, 0x15)
# 0x16 2 uint16 Move ID The move's ID, possibly used by the game code for allocating resources and etc..
self.move_id = read_u16(data, 0x16)
# 0x18 1 uint8 Unk#19 Message ID offset that is displayed for the move.
Expand All @@ -209,9 +209,9 @@ def to_bytes(self) -> bytes:
write_u8(data, u8(int(self.affected_by_magic_coat)), 16)
write_u8(data, u8(int(self.is_snatchable)), 17)
write_u8(data, u8(int(self.uses_mouth)), 18)
write_u8(data, self.unk13, 19)
write_u8(data, u8(int(self.ai_frozen_check)), 19)
write_u8(data, u8(int(self.ignores_taunted)), 20)
write_u8(data, self.unk15, 21)
write_u8(data, self.range_check_text, 21)
write_u16(data, self.move_id, 22)
write_u8(data, self.message_id, 24)
return bytes(data)
Expand All @@ -236,9 +236,9 @@ def __eq__(self, other: object) -> bool:
and self.affected_by_magic_coat == other.affected_by_magic_coat
and self.is_snatchable == other.is_snatchable
and self.uses_mouth == other.uses_mouth
and self.unk13 == other.unk13
and self.ai_frozen_check == other.ai_frozen_check
and self.ignores_taunted == other.ignores_taunted
and self.unk15 == other.unk15
and self.range_check_text == other.range_check_text
and self.move_id == other.move_id
and self.message_id == other.message_id
)
Expand Down
4 changes: 2 additions & 2 deletions skytemple_files/data/waza_p/protocol.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,9 @@ class WazaMoveProtocol(Protocol[R]):
affected_by_magic_coat: bool
is_snatchable: bool
uses_mouth: bool
unk13: u8
ai_frozen_check: bool
ignores_taunted: bool
unk15: u8
range_check_text: u8
move_id: u16
message_id: u8

Expand Down
16 changes: 8 additions & 8 deletions test/skytemple_files_test/data/waza_p/fixture.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ def eq_move(one: WazaMoveProtocol, two: WazaMoveProtocol) -> bool:
one.affected_by_magic_coat == two.affected_by_magic_coat and
one.is_snatchable == two.is_snatchable and
one.uses_mouth == two.uses_mouth and
one.unk13 == two.unk13 and
one.ai_frozen_check == two.ai_frozen_check and
one.ignores_taunted == two.ignores_taunted and
one.unk15 == two.unk15 and
one.range_check_text == two.range_check_text and
one.move_id == two.move_id and
one.message_id == two.message_id
)
Expand Down Expand Up @@ -152,9 +152,9 @@ class WazaMoveStub(WazaMoveProtocol[int]): # type: ignore
affected_by_magic_coat: bool
is_snatchable: bool
uses_mouth: bool
unk13: u8
ai_frozen_check: bool
ignores_taunted: bool
unk15: u8
range_check_text: u8
move_id: u16
message_id: u8

Expand All @@ -177,9 +177,9 @@ def stub_new(
affected_by_magic_coat: bool,
is_snatchable: bool,
uses_mouth: bool,
unk13: u8,
ai_frozen_check: u8,
ignores_taunted: bool,
unk15: u8,
range_check_text: u8,
move_id: u16,
message_id: u8,
) -> WazaMoveStub:
Expand All @@ -200,9 +200,9 @@ def stub_new(
self.affected_by_magic_coat = affected_by_magic_coat
self.is_snatchable = is_snatchable
self.uses_mouth = uses_mouth
self.unk13 = unk13
self.ai_frozen_check = ai_frozen_check
self.ignores_taunted = ignores_taunted
self.unk15 = unk15
self.range_check_text = range_check_text
self.move_id = move_id
self.message_id = message_id
return self
Expand Down
Loading
Loading