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

Fix Koume evaluating to never give pictograph box. #82

Merged
merged 1 commit into from
Jul 11, 2024
Merged

Fix Koume evaluating to never give pictograph box. #82

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 code/include/rnd/actors/dm_char03.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ namespace rnd {
extern "C" float rDmChar03Scale;
void Dm_Char03_Init(game::act::Actor* actor, game::GlobalContext* gctx);
void Dm_Char03_Draw(game::act::Actor* actor, game::GlobalContext* gctx);
void Dm_Char03_Destroy(game::act::Actor* actor, game::GlobalContext* gctx);

} // namespace rnd
#endif
7 changes: 2 additions & 5 deletions code/source/asm/patches.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,17 +285,14 @@ RemoveJimWhenExitingHideout_patch:
@ This patch performs the same event check to see if Koume was saved,
@ overriding the check to see if woodfall was cleared. This is due
@ to the fact you could beat the temple out of logic from saving koume
@ so this removes the temple check, and checks to see if she was saved twice.
@ For more information on the message system, see the following links in MM decomp
@ so this changes to a weekevent reg that is seemingly not used in game
@ and should always evaluate to false.
@ https://github.com/zeldaret/mm/blob/6541532abb5c03088ad67748bbb23965c654127e/src/overlays/actors/ovl_En_Dnh/z_en_dnh.c#L21
@ https://github.com/zeldaret/mm/blob/main/include/z64msgevent.h#L354
.section .patch_RemoveWoodfallClearConditionFromBoatHouse
.global patch_RemoveWoodfallClearConditionFromBoatHouse
patch_RemoveWoodfallClearConditionFromBoatHouse:
.byte 0x0C
.byte 0x08
.byte 0x00
.byte 0x08

.section .patch_loader
.global loader_patch
Expand Down
5 changes: 5 additions & 0 deletions code/source/rnd/actors/dm_char03.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,9 @@ namespace rnd {
util::GetPointer<void(game::act::Actor*, game::GlobalContext*)>(0x41CE70)(actor, gctx);
}

void Dm_Char03_Destroy(game::act::Actor* actor, game::GlobalContext* gctx) {
Model_DestroyByActor(actor);
util::GetPointer<void(game::act::Actor*, game::GlobalContext*)>(0x2043cc)(actor, gctx);
}

} // namespace rnd
7 changes: 4 additions & 3 deletions code/source/rnd/models.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,9 +297,10 @@ namespace rnd {

overlayTable[0x12B].info->init_fn = Dm_Char03_Init;
overlayTable[0x12B].info->draw_fn = Dm_Char03_Draw;
overlayTable[0x12B].info->deinit_fn = Dm_Char03_Destroy;

overlayTable[0x12D].info->init_fn = DMChar05_Init;
overlayTable[0x12D].info->draw_fn = DMChar05_Draw;
overlayTable[0x12D].info->deinit_fn = DMChar05_Destroy;
// overlayTable[0x12D].info->init_fn = DMChar05_Init;
// overlayTable[0x12D].info->draw_fn = DMChar05_Draw;
// overlayTable[0x12D].info->deinit_fn = DMChar05_Destroy;
}
} // namespace rnd
Loading