mirror/tmc
1
0
Fork 0
mirror of https://github.com/zeldaret/tmc synced 2026-08-20 06:06:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
theo3
2022-03-28 12:15:15 -07:00
parent a9784e96ba 2043b59ec6
commit c0eae31c2c
42 changed files with 1082 additions and 2790 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/enemy/businessScrub.c
+9 -6
View File
@@ -526,21 +526,24 @@ bool32 sub_080291DC(Entity* this) {
return FALSE;
}
NONMATCH("asm/non_matching/businessScrub/sub_0802922C.inc", void sub_0802922C(Entity* this)) {
const struct SalesOffering* offer = (const struct SalesOffering*)this->field_0x7c.WORD;
void sub_0802922C(Entity* this) {
const struct SalesOffering* offer;
this->action = 6;
this->field_0x80.HALF.HI = 0;
offer = (const struct SalesOffering*)this->field_0x7c.WORD;
switch (offer->offeredItem) {
case ITEM_BOTTLE1:
SetGlobalFlag(AKINDO_BOTTLE_SELL);
// It only matters here that ITEM_BOMBS10 is here and some item that is higher
// Not sure about the original code
case ITEM_ARROWS10:
case ITEM_BOMBS10:
default:
sub_080290E0(this, 3);
break;
}
sub_080290E0(this, 3);
}
END_NONMATCH
void sub_0802925C(Entity* this) {
sub_08078784(this, sub_0801E99C(this));