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

More weekeventregs naming for things related to receiving items (#1617)

Browse Source 
* More weekeventregs naming for things related to receiving items

* `WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK` -> `WEEKEVENTREG_RECEIVED_GREAT_SPIN_ATTACK`
This commit is contained in:
Tom Overton
2024-04-24 21:10:48 -07:00
committed by GitHub
parent 76fadbd0e9
commit 654fc4fd74
12 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64save.h
+7 -7
View File
@@ -670,7 +670,7 @@ typedef enum {
#define WEEKEVENTREG_TALKED_TINGLE PACK_WEEKEVENTREG_FLAG(10, 0x01)
#define WEEKEVENTREG_10_02 PACK_WEEKEVENTREG_FLAG(10, 0x02)
#define WEEKEVENTREG_10_04 PACK_WEEKEVENTREG_FLAG(10, 0x04)
#define WEEKEVENTREG_10_08 PACK_WEEKEVENTREG_FLAG(10, 0x08)
#define WEEKEVENTREG_RECEIVED_BANK_WALLET_UPGRADE PACK_WEEKEVENTREG_FLAG(10, 0x08)
#define WEEKEVENTREG_10_10 PACK_WEEKEVENTREG_FLAG(10, 0x10)
#define WEEKEVENTREG_10_20 PACK_WEEKEVENTREG_FLAG(10, 0x20)
#define WEEKEVENTREG_10_40 PACK_WEEKEVENTREG_FLAG(10, 0x40)
@@ -746,7 +746,7 @@ typedef enum {
#define WEEKEVENTREG_17_10 PACK_WEEKEVENTREG_FLAG(17, 0x10)
#define WEEKEVENTREG_17_20 PACK_WEEKEVENTREG_FLAG(17, 0x20)
#define WEEKEVENTREG_17_40 PACK_WEEKEVENTREG_FLAG(17, 0x40)
#define WEEKEVENTREG_17_80 PACK_WEEKEVENTREG_FLAG(17, 0x80)
#define WEEKEVENTREG_RECEIVED_LAND_TITLE_DEED PACK_WEEKEVENTREG_FLAG(17, 0x80)
#define WEEKEVENTREG_18_01 PACK_WEEKEVENTREG_FLAG(18, 0x01)
#define WEEKEVENTREG_18_02 PACK_WEEKEVENTREG_FLAG(18, 0x02)
#define WEEKEVENTREG_TALKED_CURIOSITY_SHOP_MAN_AS_GORON PACK_WEEKEVENTREG_FLAG(18, 0x04)
@@ -804,13 +804,13 @@ typedef enum {
#define WEEKEVENTREG_22_40 PACK_WEEKEVENTREG_FLAG(22, 0x40)
#define WEEKEVENTREG_RECEIVED_HONEY_AND_DARLING_HEART_PIECE PACK_WEEKEVENTREG_FLAG(22, 0x80)
#define WEEKEVENTREG_23_01 PACK_WEEKEVENTREG_FLAG(23, 0x01)
#define WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK PACK_WEEKEVENTREG_FLAG(23, 0x02)
#define WEEKEVENTREG_RECEIVED_GREAT_SPIN_ATTACK PACK_WEEKEVENTREG_FLAG(23, 0x02)
#define WEEKEVENTREG_23_04 PACK_WEEKEVENTREG_FLAG(23, 0x04)
#define WEEKEVENTREG_23_08 PACK_WEEKEVENTREG_FLAG(23, 0x08)
#define WEEKEVENTREG_23_10 PACK_WEEKEVENTREG_FLAG(23, 0x10)
#define WEEKEVENTREG_23_20 PACK_WEEKEVENTREG_FLAG(23, 0x20)
#define WEEKEVENTREG_23_40 PACK_WEEKEVENTREG_FLAG(23, 0x40)
#define WEEKEVENTREG_RECEIVED_BEAVER_BROS_BOTTLE PACK_WEEKEVENTREG_FLAG(23, 0x80)
#define WEEKEVENTREG_RECEIVED_BEAVER_RACE_BOTTLE PACK_WEEKEVENTREG_FLAG(23, 0x80)
#define WEEKEVENTREG_24_01 PACK_WEEKEVENTREG_FLAG(24, 0x01)
#define WEEKEVENTREG_24_02 PACK_WEEKEVENTREG_FLAG(24, 0x02)
#define WEEKEVENTREG_24_04 PACK_WEEKEVENTREG_FLAG(24, 0x04)
@@ -991,7 +991,7 @@ typedef enum {
#define WEEKEVENTREG_41_01 PACK_WEEKEVENTREG_FLAG(41, 0x01)
#define WEEKEVENTREG_41_02 PACK_WEEKEVENTREG_FLAG(41, 0x02)
#define WEEKEVENTREG_41_04 PACK_WEEKEVENTREG_FLAG(41, 0x04)
#define WEEKEVENTREG_41_08 PACK_WEEKEVENTREG_FLAG(41, 0x08)
#define WEEKEVENTREG_RECEIVED_GORON_RACE_BOTTLE PACK_WEEKEVENTREG_FLAG(41, 0x08)
#define WEEKEVENTREG_41_10 PACK_WEEKEVENTREG_FLAG(41, 0x10)
#define WEEKEVENTREG_41_20 PACK_WEEKEVENTREG_FLAG(41, 0x20)
#define WEEKEVENTREG_41_40 PACK_WEEKEVENTREG_FLAG(41, 0x40)
@@ -1041,7 +1041,7 @@ typedef enum {
#define WEEKEVENTREG_52_40 PACK_WEEKEVENTREG_FLAG(52, 0x40)
#define WEEKEVENTREG_52_80 PACK_WEEKEVENTREG_FLAG(52, 0x80)
#define WEEKEVENTREG_53_01 PACK_WEEKEVENTREG_FLAG(53, 0x01)
#define WEEKEVENTREG_53_02 PACK_WEEKEVENTREG_FLAG(53, 0x02)
#define WEEKEVENTREG_RECEIVED_BUSINESS_SCRUB_HEART_PIECE PACK_WEEKEVENTREG_FLAG(53, 0x02)
#define WEEKEVENTREG_53_04 PACK_WEEKEVENTREG_FLAG(53, 0x04)
#define WEEKEVENTREG_GAVE_KOTAKE_MUSHROOM PACK_WEEKEVENTREG_FLAG(53, 0x08)
#define WEEKEVENTREG_RECEIVED_FREE_BLUE_POTION PACK_WEEKEVENTREG_FLAG(53, 0x10)
@@ -1250,7 +1250,7 @@ typedef enum {
#define WEEKEVENTREG_RECEIVED_ROOM_KEY PACK_WEEKEVENTREG_FLAG(75, 0x10)
#define WEEKEVENTREG_75_20 PACK_WEEKEVENTREG_FLAG(75, 0x20)
#define WEEKEVENTREG_75_40 PACK_WEEKEVENTREG_FLAG(75, 0x40)
#define WEEKEVENTREG_75_80 PACK_WEEKEVENTREG_FLAG(75, 0x80)
#define WEEKEVENTREG_RECEIVED_ROSA_SISTERS_HEART_PIECE PACK_WEEKEVENTREG_FLAG(75, 0x80)
#define WEEKEVENTREG_76_01 PACK_WEEKEVENTREG_FLAG(76, 0x01)
#define WEEKEVENTREG_76_02 PACK_WEEKEVENTREG_FLAG(76, 0x02)
#define WEEKEVENTREG_76_04 PACK_WEEKEVENTREG_FLAG(76, 0x04)
src/code/z_sram_NES.c
+7 -6
View File
@@ -84,7 +84,7 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
/* 7 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_ENTERED_WOODFALL_TEMPLE_PRISON),
/* 8 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_DOGGY_RACETRACK_HEART_PIECE),
/* 9 */ 0,
/* 10 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_10_08),
/* 10 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BANK_WALLET_UPGRADE),
/* 11 */ 0,
/* 12 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_KOTAKE_BOTTLE),
/* 13 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_OCEANSIDE_WALLET_UPGRADE),
@@ -98,8 +98,8 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
/* 21 */ 0,
/* 22 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_22_02) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_HONEY_AND_DARLING_HEART_PIECE),
/* 23 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_BOTTLE),
/* 23 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_GREAT_SPIN_ATTACK) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_RACE_BOTTLE),
/* 24 */ PERSISTENT_WEEKEVENTREG_ALT(WEEKEVENTREG_24_02) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_24_80),
/* 25 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_HEART_PIECE),
/* 26 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_26_40),
@@ -131,7 +131,7 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
/* 38 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_38_20),
/* 39 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_EVAN_HEART_PIECE),
/* 40 */ 0,
/* 41 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_41_08),
/* 41 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_GORON_RACE_BOTTLE),
/* 42 */ 0,
/* 43 */ 0,
/* 44 */ 0,
@@ -143,7 +143,8 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
/* 50 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_50_02) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_50_04),
/* 51 */ PERSISTENT_WEEKEVENTREG_ALT(WEEKEVENTREG_51_04),
/* 52 */ 0,
/* 53 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_53_02) | PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_53_40),
/* 53 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BUSINESS_SCRUB_HEART_PIECE) |
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_53_40),
/* 54 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_SPIRIT_HOUSE_HEART_PIECE),
/* 55 */ 0,
/* 56 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_MARINE_RESEARCH_LAB_FISH_HEART_PIECE),
@@ -224,7 +225,7 @@ u16 sPersistentCycleWeekEventRegs[ARRAY_COUNT(gSaveContext.save.saveInfo.weekEve
PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_72_80),
/* 73 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_73_08),
/* 74 */ 0,
/* 75 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_75_80),
/* 75 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_ROSA_SISTERS_HEART_PIECE),
/* 76 */ 0,
/* 77 */ PERSISTENT_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_POSTMAN_COUNTING_GAME_HEART_PIECE),
/* 78 */ 0,
src/overlays/actors/ovl_En_Az/z_en_az.c
+2 -2
View File
@@ -1004,11 +1004,11 @@ s32 func_80A9617C(EnAz* this, PlayState* play) {
case 0x10F1:
SET_WEEKEVENTREG(WEEKEVENTREG_93_01);
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_BOTTLE)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_RACE_BOTTLE)) {
this->getItemId = GI_RUPEE_RED;
} else {
this->getItemId = GI_BOTTLE;
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_BROS_BOTTLE);
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BEAVER_RACE_BOTTLE);
}
SubS_ChangeAnimationBySpeedInfo(&this->skelAnime, sAnimationSpeedInfo, BEAVER_ANIM_IDLE,
&this->animIndex);
src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c
+2 -2
View File
@@ -132,7 +132,7 @@ void EnElfgrp_Init(Actor* thisx, PlayState* play) {
switch (this->type) {
case ENELFGRP_TYPE_POWER:
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_GREAT_SPIN_ATTACK)) {
EnElfgrp_SetCutscene(this, 1);
} else {
this->stateFlags |= ELFGRP_STATE_2;
@@ -487,7 +487,7 @@ void func_80A3A398(EnElfgrp* this, PlayState* play) {
}
if (this->stateFlags & ELFGRP_STATE_2) {
SET_WEEKEVENTREG(WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK);
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_GREAT_SPIN_ATTACK);
}
if (this->stateFlags & ELFGRP_STATE_4) {
src/overlays/actors/ovl_En_Ginko_Man/z_en_ginko_man.c
+4 -4
View File
@@ -118,7 +118,7 @@ void EnGinkoMan_DepositDialogue(EnGinkoMan* this, PlayState* play) {
switch (this->curTextId) {
case 0x44C:
Actor_ChangeAnimationByInfo(&this->skelAnime, sAnimationInfo, GINKO_ANIM_SITTING);
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_10_08)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BANK_WALLET_UPGRADE)) {
Message_StartTextbox(play, 0x44E, &this->actor);
this->curTextId = 0x44E;
} else {
@@ -544,7 +544,7 @@ void EnGinkoMan_BankAward(EnGinkoMan* this, PlayState* play) {
this->actor.parent = NULL;
EnGinkoMan_SetupBankAward2(this);
} else if (this->curTextId == 0x45B) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_10_08)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BANK_WALLET_UPGRADE)) {
Actor_OfferGetItem(&this->actor, play, GI_WALLET_ADULT + CUR_UPG_VALUE(UPG_WALLET), 500.0f, 100.0f);
} else {
Actor_OfferGetItem(&this->actor, play, GI_RUPEE_BLUE, 500.0f, 100.0f);
@@ -566,8 +566,8 @@ void EnGinkoMan_SetupBankAward2(EnGinkoMan* this) {
// separate function to handle bank rewards... called while the player is receiving the award
void EnGinkoMan_BankAward2(EnGinkoMan* this, PlayState* play) {
if (Actor_TalkOfferAccepted(&this->actor, &play->state)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_10_08) && (this->curTextId == 0x45B)) {
SET_WEEKEVENTREG(WEEKEVENTREG_10_08);
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BANK_WALLET_UPGRADE) && (this->curTextId == 0x45B)) {
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BANK_WALLET_UPGRADE);
Message_StartTextbox(play, 0x47A, &this->actor);
this->curTextId = 0x47A; // Message after receiving reward for depositing 200 rupees.
} else {
src/overlays/actors/ovl_En_Gk/z_en_gk.c
+4 -4
View File
@@ -202,7 +202,7 @@ u16 func_80B50410(EnGk* this, PlayState* play) {
if (player->transformation == PLAYER_FORM_GORON) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_41_04)) {
if (this->unk_31C == 0xE88) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_41_08) || Inventory_HasEmptyBottle()) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_GORON_RACE_BOTTLE) || Inventory_HasEmptyBottle()) {
return 0xE89;
}
SET_WEEKEVENTREG(WEEKEVENTREG_41_04);
@@ -213,7 +213,7 @@ u16 func_80B50410(EnGk* this, PlayState* play) {
}
if ((this->unk_31C == 0xE8D) || (this->unk_31C == 0xE98)) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_41_08) || Inventory_HasEmptyBottle()) {
if (!CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_GORON_RACE_BOTTLE) || Inventory_HasEmptyBottle()) {
return 0xE89;
}
SET_WEEKEVENTREG(WEEKEVENTREG_41_04);
@@ -1008,7 +1008,7 @@ void func_80B52430(EnGk* this, PlayState* play) {
void func_80B5253C(EnGk* this, PlayState* play) {
s32 getItemId;
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_41_08)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_GORON_RACE_BOTTLE)) {
getItemId = GI_GOLD_DUST_2;
} else {
getItemId = GI_GOLD_DUST;
@@ -1017,7 +1017,7 @@ void func_80B5253C(EnGk* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actor.parent = NULL;
if (getItemId == GI_GOLD_DUST) {
SET_WEEKEVENTREG(WEEKEVENTREG_41_08);
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_GORON_RACE_BOTTLE);
}
this->actionFunc = func_80B525E0;
} else {
src/overlays/actors/ovl_En_M_Thunder/z_en_m_thunder.c
+1 -1
View File
@@ -144,7 +144,7 @@ void EnMThunder_Init(Actor* thisx, PlayState* play) {
player->stateFlags2 &= ~PLAYER_STATE2_20000;
this->isCharging = false;
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_GREAT_SPIN_ATTACK)) {
player->unk_B08 = 1.0f;
this->collider.info.toucher.damage = sDamages[this->type + ENMTHUNDER_TYPE_MAX];
this->subtype = ENMTHUNDER_SUBTYPE_SPIN_GREAT;
src/overlays/actors/ovl_En_Rz/z_en_rz.c
+3 -3
View File
@@ -356,7 +356,7 @@ EnRz* EnRz_FindSister(EnRz* this, PlayState* play) {
}
void func_80BFBDFC(PlayState* play) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_75_80)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_ROSA_SISTERS_HEART_PIECE)) {
Message_BombersNotebookQueueEvent(play, BOMBERS_NOTEBOOK_EVENT_RECEIVED_ROSA_SISTERS_HP);
}
Message_BombersNotebookQueueEvent(play, BOMBERS_NOTEBOOK_EVENT_MET_ROSA_SISTERS);
@@ -505,11 +505,11 @@ void func_80BFC36C(EnRz* this, PlayState* play) {
EnRz_UpdateSkelAnime(this, play);
if (func_80BFBFAC(this, play)) {
SET_WEEKEVENTREG(WEEKEVENTREG_77_04);
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_75_80)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_ROSA_SISTERS_HEART_PIECE)) {
this->actionFunc = func_80BFC214;
} else {
this->actionFunc = func_80BFC2F4;
SET_WEEKEVENTREG(WEEKEVENTREG_75_80);
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_ROSA_SISTERS_HEART_PIECE);
}
this->actor.csId = this->csIdList[1];
}
src/overlays/actors/ovl_En_Scopenuts/z_en_scopenuts.c
+2 -2
View File
@@ -197,7 +197,7 @@ void func_80BCAE78(EnScopenuts* this, PlayState* play) {
s16 func_80BCAF0C(EnScopenuts* this) {
switch (this->unk_33C) {
case 0x0:
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_53_02)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BUSINESS_SCRUB_HEART_PIECE)) {
this->unk_328 |= 1;
return 0x1638;
}
@@ -405,7 +405,7 @@ void func_80BCB6D0(EnScopenuts* this, PlayState* play) {
void func_80BCB90C(EnScopenuts* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actor.parent = NULL;
SET_WEEKEVENTREG(WEEKEVENTREG_53_02);
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_BUSINESS_SCRUB_HEART_PIECE);
this->actionFunc = func_80BCB6D0;
} else {
Actor_OfferGetItem(&this->actor, play, GI_HEART_PIECE, 300.0f, 300.0f);
src/overlays/actors/ovl_En_Sellnuts/z_en_sellnuts.c
+2 -2
View File
@@ -517,7 +517,7 @@ void func_80ADBAB8(EnSellnuts* this, PlayState* play) {
void func_80ADBBEC(EnSellnuts* this, PlayState* play) {
if (Actor_HasParent(&this->actor, play)) {
this->actor.parent = NULL;
SET_WEEKEVENTREG(WEEKEVENTREG_17_80);
SET_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_LAND_TITLE_DEED);
this->actionFunc = func_80ADBCE4;
} else {
Actor_OfferGetItem(&this->actor, play, GI_DEED_LAND, 300.0f, 300.0f);
@@ -987,7 +987,7 @@ void EnSellnuts_Init(Actor* thisx, PlayState* play) {
Player* player = GET_PLAYER(play);
s32 pad2;
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_17_80) || CHECK_WEEKEVENTREG(WEEKEVENTREG_61_10)) {
if (CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_LAND_TITLE_DEED) || CHECK_WEEKEVENTREG(WEEKEVENTREG_61_10)) {
Actor_Kill(&this->actor);
}
src/overlays/actors/ovl_player_actor/z_player.c
+1 -1
View File
@@ -10390,7 +10390,7 @@ void func_80840EC0(Player* this, PlayState* play) {
// Spin attack size
void func_80840F34(Player* this) {
Math_StepToF(&this->unk_B08, CHECK_WEEKEVENTREG(WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK) ? 1.0f : 0.5f, 0.02f);
Math_StepToF(&this->unk_B08, CHECK_WEEKEVENTREG(WEEKEVENTREG_RECEIVED_GREAT_SPIN_ATTACK) ? 1.0f : 0.5f, 0.02f);
}
s32 func_80840F90(PlayState* play, Player* this, CsCmdActorCue* cue, f32 arg3, s16 arg4, s32 arg5) {
tools/weekeventregconvert.py
+7 -7
View File
@@ -87,7 +87,7 @@ weekEventReg = {
(10 << 8) | 0x01: "WEEKEVENTREG_TALKED_TINGLE",
(10 << 8) | 0x02: "WEEKEVENTREG_10_02",
(10 << 8) | 0x04: "WEEKEVENTREG_10_04",
(10 << 8) | 0x08: "WEEKEVENTREG_10_08",
(10 << 8) | 0x08: "WEEKEVENTREG_RECEIVED_BANK_WALLET_UPGRADE",
(10 << 8) | 0x10: "WEEKEVENTREG_10_10",
(10 << 8) | 0x20: "WEEKEVENTREG_10_20",
(10 << 8) | 0x40: "WEEKEVENTREG_10_40",
@@ -147,7 +147,7 @@ weekEventReg = {
(17 << 8) | 0x10: "WEEKEVENTREG_17_10",
(17 << 8) | 0x20: "WEEKEVENTREG_17_20",
(17 << 8) | 0x40: "WEEKEVENTREG_17_40",
(17 << 8) | 0x80: "WEEKEVENTREG_17_80",
(17 << 8) | 0x80: "WEEKEVENTREG_RECEIVED_LAND_TITLE_DEED",
(18 << 8) | 0x01: "WEEKEVENTREG_18_01",
(18 << 8) | 0x02: "WEEKEVENTREG_18_02",
(18 << 8) | 0x04: "WEEKEVENTREG_TALKED_CURIOSITY_SHOP_MAN_AS_GORON",
@@ -189,13 +189,13 @@ weekEventReg = {
(22 << 8) | 0x40: "WEEKEVENTREG_22_40",
(22 << 8) | 0x80: "WEEKEVENTREG_RECEIVED_HONEY_AND_DARLING_HEART_PIECE",
(23 << 8) | 0x01: "WEEKEVENTREG_23_01",
(23 << 8) | 0x02: "WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK",
(23 << 8) | 0x02: "WEEKEVENTREG_RECEIVED_GREAT_SPIN_ATTACK",
(23 << 8) | 0x04: "WEEKEVENTREG_23_04",
(23 << 8) | 0x08: "WEEKEVENTREG_23_08",
(23 << 8) | 0x10: "WEEKEVENTREG_23_10",
(23 << 8) | 0x20: "WEEKEVENTREG_23_20",
(23 << 8) | 0x40: "WEEKEVENTREG_23_40",
(23 << 8) | 0x80: "WEEKEVENTREG_RECEIVED_BEAVER_BROS_BOTTLE",
(23 << 8) | 0x80: "WEEKEVENTREG_RECEIVED_BEAVER_RACE_BOTTLE",
(24 << 8) | 0x01: "WEEKEVENTREG_24_01",
(24 << 8) | 0x02: "WEEKEVENTREG_24_02",
(24 << 8) | 0x04: "WEEKEVENTREG_24_04",
@@ -335,7 +335,7 @@ weekEventReg = {
(41 << 8) | 0x01: "WEEKEVENTREG_41_01",
(41 << 8) | 0x02: "WEEKEVENTREG_41_02",
(41 << 8) | 0x04: "WEEKEVENTREG_41_04",
(41 << 8) | 0x08: "WEEKEVENTREG_41_08",
(41 << 8) | 0x08: "WEEKEVENTREG_RECEIVED_GORON_RACE_BOTTLE",
(41 << 8) | 0x10: "WEEKEVENTREG_41_10",
(41 << 8) | 0x20: "WEEKEVENTREG_41_20",
(41 << 8) | 0x40: "WEEKEVENTREG_41_40",
@@ -429,7 +429,7 @@ weekEventReg = {
(52 << 8) | 0x40: "WEEKEVENTREG_52_40",
(52 << 8) | 0x80: "WEEKEVENTREG_52_80",
(53 << 8) | 0x01: "WEEKEVENTREG_53_01",
(53 << 8) | 0x02: "WEEKEVENTREG_53_02",
(53 << 8) | 0x02: "WEEKEVENTREG_RECEIVED_BUSINESS_SCRUB_HEART_PIECE",
(53 << 8) | 0x04: "WEEKEVENTREG_53_04",
(53 << 8) | 0x08: "WEEKEVENTREG_GAVE_KOTAKE_MUSHROOM",
(53 << 8) | 0x10: "WEEKEVENTREG_RECEIVED_FREE_BLUE_POTION",
@@ -611,7 +611,7 @@ weekEventReg = {
(75 << 8) | 0x10: "WEEKEVENTREG_RECEIVED_ROOM_KEY",
(75 << 8) | 0x20: "WEEKEVENTREG_75_20",
(75 << 8) | 0x40: "WEEKEVENTREG_75_40",
(75 << 8) | 0x80: "WEEKEVENTREG_75_80",
(75 << 8) | 0x80: "WEEKEVENTREG_RECEIVED_ROSA_SISTERS_HEART_PIECE",
(76 << 8) | 0x01: "WEEKEVENTREG_76_01",
(76 << 8) | 0x02: "WEEKEVENTREG_76_02",
(76 << 8) | 0x04: "WEEKEVENTREG_76_04",