mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-16 05:09:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #281 from hatal175/sub_0806D5D4

Browse Source
This commit is contained in:
notyourav
2022-01-12 10:35:01 -08:00
committed by GitHub
parent 3cd77bb034 5476829893
commit 453e400945
8 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/npc/bigGoron.c
+2 -4
View File
@@ -298,18 +298,16 @@ void sub_0806D514(Entity* this) {
ASM_FUNC("asm/non_matching/bigGoron/sub_0806D520.inc", void sub_0806D520(Entity* this, u32 param))
// TODO itemOnA and itemOnB would need to be in array?
NONMATCH("asm/non_matching/bigGoron/sub_0806D5D4.inc", void sub_0806D5D4(void)) {
void sub_0806D5D4(void) {
u32 itemSlot;
InitBiggoronTimer();
itemSlot = IsItemEquipped(0xd);
if (itemSlot != 2) {
((u8*)&gSave.stats.itemOnA)[itemSlot] = 0;
gSave.stats.itemButtons[itemSlot] = 0;
}
sub_0807CAA0(0xd, 0);
}
END_NONMATCH
void sub_0806D600(Entity* this, ScriptExecutionContext* context) {
context->condition = gSave.timers[2] == 0;
src/npc/bladeBrothers.c
+2 -2
View File
@@ -149,10 +149,10 @@ void sub_08068B84(Entity* this) {
}
void sub_08068BB4(Entity* this) {
u32 item = gSave.stats.itemOnA;
u32 item = gSave.stats.itemButtons[SLOT_A];
this->field_0x68.HALF.HI = item;
item = gSave.stats.itemOnB;
item = gSave.stats.itemButtons[SLOT_B];
*(&this->field_0x68.HALF.HI + 1) = item;
}
src/npc/npc4E.c
+2 -2
View File
@@ -176,8 +176,8 @@ u32 sub_0806DBF4(u32 param_1) {
}
void sub_0806DC3C(Entity* this) {
this->field_0x68.HALF.LO = gSave.stats.itemOnA;
this->field_0x68.HALF.HI = gSave.stats.itemOnB;
this->field_0x68.HALF.LO = gSave.stats.itemButtons[SLOT_A];
this->field_0x68.HALF.HI = gSave.stats.itemButtons[SLOT_B];
}
void sub_0806DC58(Entity* this) {