Skip to content

Feature: Adding Gau and Father Reunion as a Quest #32

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

Open
asilverthorn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Feature: Adding Gau and Father Reunion as a Quest #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions constants/objectives/condition_bits.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
NameBit("Suplex A Train", event_bit.SUPLEXED_TRAIN),
NameBit("Win An Auction", event_bit.WON_AN_AUCTION),
NameBit("Win A Coliseum Match", event_bit.WON_A_COLISEUM_MATCH),
NameBit("Reunite Gau and Father", event_bit.GAU_FATHER_REUNION),
]

boss_bit = []
Expand Down
1 change: 1 addition & 0 deletions data/event_bit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
FOUND_ANCIENT_CASTLE = 0x2df
GOT_ODIN = 0x0c8
SUPLEXED_TRAIN = 0x2b0 # custom, previously unused but set in nikeah entrance event
GAU_FATHER_REUNION = 0x247

DEFEATED_NARSHE_DRAGON = 0x11a # custom
DEFEATED_MT_ZOZO_DRAGON = 0x11b # custom
Expand Down
15 changes: 15 additions & 0 deletions event/gau_father_house.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ def mod(self):

self.merchant_mod()
self.entrance_event_mod()
self.reunion_mod()

if self.reward.type == RewardType.CHARACTER:
self.character_mod(self.reward.id)
Expand Down Expand Up @@ -108,3 +109,17 @@ def finish_check_mod(self):
space.write(
field.Call(finish_check),
)

def reunion_mod(self):
src = [
Read(0xb6785, 0xb678a), # displaced code
field.CheckObjectives(),
field.Return(),
]
space = Write(Bank.CB, src, "gau father reunion set event bit, check objectives")
check_objectives = space.start_address

space = Reserve(0xb6785, 0xb678a, "gau father reunion field bit set", field.NOP())
space.write(
field.Call(check_objectives),
)