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

Move event bits enum

Browse Source
This commit is contained in:
LagoLunatic
2024-01-04 02:19:34 -05:00
parent a0ea511650
commit e0279f6218
11 changed files with 55 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_com_inf_game.h
-1
View File
@@ -9,7 +9,6 @@
#include "d/d_drawlist.h"
#include "d/d_event.h"
#include "d/d_event_manager.h"
#include "d/d_event_bit.h"
#include "d/d_map.h"
#include "d/d_particle.h"
#include "d/d_resorce.h"
include/d/d_event_bit.h
-23
View File
@@ -1,23 +0,0 @@
#ifndef D_EVENT_BIT_H
#define D_EVENT_BIT_H
enum dEventBit_e {
dEvtBit_SHIP_RIDDEN_e = 0x2A08,
dEvtBit_BARRIER_BREAK_e = 0x2C02,
dEvtBit_LITHOGRAPH_1_e = 0x3508,
dEvtBit_LITHOGRAPH_2_e = 0x3504,
dEvtBit_LITHOGRAPH_3_e = 0x3502,
dEvtBit_LITHOGRAPH_4_e = 0x3501,
dEvtBit_LITHOGRAPH_5_e = 0x3680,
dEvtBit_LITHOGRAPH_6_e = 0x3640,
dEvtBit_LITHOGRAPH_7_e = 0x3620,
dEvtBit_LITHOGRAPH_8_e = 0x3610,
dEvtBit_LITHOGRAPH_9_e = 0x3608,
dEvtBit_LITHOGRAPH_10_e = 0x3604,
};
enum dEventReg_e {
dEvtReg_NOTE_TO_MOM_e = 0xAC03,
};
#endif /* D_EVENT_BIT_H */
include/d/d_save.h
+1 -3
View File
@@ -790,8 +790,6 @@ public:
STATIC_ASSERT(sizeof(dSv_info_c) == 0x12A0);
enum dSv_eventBit_e {
EV_BIT_TALKED_TO_IRCH_IN_FOREST_HAVEN = 0x3802,
};
#include "d/d_save_event_bit.inc"
#endif /* D_SAVE_D_SAVE_H */
include/d/d_save_event_bit.inc
+22
View File
@@ -0,0 +1,22 @@
// All names in this file are fake.
class dSv_evtBit_c {
public:
enum {
MET_KORL = 0x0F80,
RODE_KORL = 0x2A08,
BARRIER_BREAK = 0x2C02,
LITHOGRAPH_1 = 0x3508,
LITHOGRAPH_2 = 0x3504,
LITHOGRAPH_3 = 0x3502,
LITHOGRAPH_4 = 0x3501,
LITHOGRAPH_5 = 0x3680,
LITHOGRAPH_6 = 0x3640,
LITHOGRAPH_7 = 0x3620,
LITHOGRAPH_8 = 0x3610,
LITHOGRAPH_9 = 0x3608,
LITHOGRAPH_10 = 0x3604,
COLORS_IN_HYRULE = 0x3802,
NOTE_TO_MOM = 0xAC03,
};
};
src/d/actor/d_a_obj_Ygush00.cpp
+1 -1
View File
@@ -95,7 +95,7 @@ bool daObjYgush00_c::_delete() {
/* 00000524-0000066C .text _execute__14daObjYgush00_cFv */
bool daObjYgush00_c::_execute() {
if (mType != 3 || dComIfGs_isEventBit(EV_BIT_TALKED_TO_IRCH_IN_FOREST_HAVEN) == 1) {
if (mType != 3 || dComIfGs_isEventBit(dSv_evtBit_c::COLORS_IN_HYRULE) == 1) {
mBtkAnm.play();
mBckAnm.play();
}
src/d/actor/d_a_obj_barrier.cpp
+2 -2
View File
@@ -242,7 +242,7 @@ void daObjBarrier_c::break_start_wait_proc() {
case 8:
case 9:
case 10:
dComIfGs_onEventBit(dEvtBit_BARRIER_BREAK_e);
dComIfGs_onEventBit(dSv_evtBit_c::BARRIER_BREAK);
mEventID = dComIfGp_evmng_getEventIdx("seal", 0xFF);
mBarrierProc = PROC_BREAK_ORDER;
break;
@@ -484,7 +484,7 @@ int daObjBarrier_c::_create() {
mMoya = param_get_moya();
if (mMoya != 0) {
mBarrierActive = true;
} else if (dComIfGs_isEventBit(dEvtBit_BARRIER_BREAK_e) == true) {
} else if (dComIfGs_isEventBit(dSv_evtBit_c::BARRIER_BREAK) == true) {
mBarrierActive = false;
} else {
mBarrierActive = true;
src/d/actor/d_a_obj_toripost.cpp
+4 -4
View File
@@ -22,7 +22,7 @@ extern dScnPly_reg_HIO_c g_regHIO;
const char daObjTpost_c::m_arc_name[] = "Toripost";
const daObjTpost_c__letter_data daObjTpost_c::m_letter[] = {
{false, 0x1AAF, 0x07, dEvtReg_NOTE_TO_MOM_e},
{false, 0x1AAF, 0x07, dSv_evtBit_c::NOTE_TO_MOM},
{false, 0x0CF9, 0x07, 0xB503},
{false, 0x0CFA, 0xC3, 0x7D03},
{false, 0x0CFC, 0x04, 0x7B03},
@@ -30,7 +30,7 @@ const daObjTpost_c__letter_data daObjTpost_c::m_letter[] = {
{false, 0x0CFD, 0x01, 0x7A03},
{true, 0x0DB6, 0xCB, 0xB203},
{false, 0x1148, 0x04, 0x8B03},
{false, 0x1AAF, 0x07, dEvtReg_NOTE_TO_MOM_e},
{false, 0x1AAF, 0x07, dSv_evtBit_c::NOTE_TO_MOM},
{true, 0x0F76, 0x9D, 0xB003},
{false, 0x19A6, 0x3F, 0xAE03},
{true, 0x0CFB, 0x04, 0x7C03},
@@ -234,7 +234,7 @@ void daObjTpost_c::deliverLetter() {
dComIfGs_onEventBit(0x1220);
break;
case MAGIC_SEED:
dLetter_send(dEvtReg_NOTE_TO_MOM_e);
dLetter_send(dSv_evtBit_c::NOTE_TO_MOM);
break;
}
}
@@ -895,7 +895,7 @@ void daObjTpost_c::createInit() {
dLetter_autoStock(0x7D03);
}
if(dLetter_isDelivery(dEvtReg_NOTE_TO_MOM_e) && dComIfGs_isStageBossEnemy(dSv_save_c::STAGE_ET)) {
if(dLetter_isDelivery(dSv_evtBit_c::NOTE_TO_MOM) && dComIfGs_isStageBossEnemy(dSv_save_c::STAGE_ET)) {
dLetter_autoStock(0x7C03);
}
src/d/actor/d_a_player_main.cpp
+1 -1
View File
@@ -5131,7 +5131,7 @@ BOOL daPy_lk_c::startRestartRoom(u32 param_1, int eventInfoIdx, f32 param_3, int
setDamagePoint(param_3);
mTinkleShieldTimer = 0;
if (stageType == dStageType_SEA_e && !dComIfGs_isEventBit(dEvtBit_SHIP_RIDDEN_e) &&
if (stageType == dStageType_SEA_e && !dComIfGs_isEventBit(dSv_evtBit_c::RODE_KORL) &&
(current.roomNo == 11 || current.roomNo == 44) && dStage_chkPlayerId(0x80, current.roomNo))
{
dComIfGp_setNextStage(dComIfGp_getStartStageName(), 0x80, current.roomNo, -1, 0.0f, param_1);
src/d/d_com_inf_game.cpp
+4 -4
View File
@@ -236,13 +236,13 @@ int dComIfG_play_c::getLayerNo(int i_roomNo) {
if (dComIfGs_isEventBit(0x2C01)) {
#else
if (dComIfGs_isEventBit(0x2C01) ||
(dComIfGs_isEventBit(0x3802) && !dComIfGs_isEventBit(0x3280)))
(dComIfGs_isEventBit(dSv_evtBit_c::COLORS_IN_HYRULE) && !dComIfGs_isEventBit(0x3280)))
{
#endif
return layer | 6;
} else if (dComIfGs_getTriforceNum() == 8) {
return layer | 4;
} else if (dComIfGs_isEventBit(VERSION_SELECT(0x3280, 0x3802, 0x3802))) {
} else if (dComIfGs_isEventBit(VERSION_SELECT(0x3280, dSv_evtBit_c::COLORS_IN_HYRULE, dSv_evtBit_c::COLORS_IN_HYRULE))) {
return layer | 2;
}
} else if (strcmp(dComIfGp_getStartStageName(), "M2tower") == 0) {
@@ -1123,8 +1123,8 @@ void dComIfGs_setGameStartStage() {
};
static check_data l_checkData[] = {
{true, dEvtBit_SHIP_RIDDEN_e, "", 0, 0},
{true, 0xF80, "sea", 11, 128},
{true, dSv_evtBit_c::RODE_KORL, "", 0, 0},
{true, dSv_evtBit_c::MET_KORL, "sea", 11, 128},
{true, 0x801, "MajyuE", 0, 0},
{true, 0x808, "MajyuE", 0, 18},
{true, 0x2401, "A_umikz", 0, 204},
src/d/d_item.cpp
+19 -19
View File
@@ -1424,47 +1424,47 @@ void item_func_tincle_rupee6() {
/* 800C4DB4-800C4DE4 .text item_func_lithograph1__Fv */
void item_func_lithograph1() {
dComIfGs_onEventBit(dEvtBit_LITHOGRAPH_1_e);
dComIfGs_onEventBit(dSv_evtBit_c::LITHOGRAPH_1);
}
/* 800C4DE4-800C4E14 .text item_func_lithograph2__Fv */
void item_func_lithograph2() {
dComIfGs_onEventBit(dEvtBit_LITHOGRAPH_2_e);
dComIfGs_onEventBit(dSv_evtBit_c::LITHOGRAPH_2);
}
/* 800C4E14-800C4E44 .text item_func_lithograph3__Fv */
void item_func_lithograph3() {
dComIfGs_onEventBit(dEvtBit_LITHOGRAPH_3_e);
dComIfGs_onEventBit(dSv_evtBit_c::LITHOGRAPH_3);
}
/* 800C4E44-800C4E74 .text item_func_lithograph4__Fv */
void item_func_lithograph4() {
dComIfGs_onEventBit(dEvtBit_LITHOGRAPH_4_e);
dComIfGs_onEventBit(dSv_evtBit_c::LITHOGRAPH_4);
}
/* 800C4E74-800C4EA4 .text item_func_lithograph5__Fv */
void item_func_lithograph5() {
dComIfGs_onEventBit(dEvtBit_LITHOGRAPH_5_e);
dComIfGs_onEventBit(dSv_evtBit_c::LITHOGRAPH_5);
}
/* 800C4EA4-800C4ED4 .text item_func_lithograph6__Fv */
void item_func_lithograph6() {
dComIfGs_onEventBit(dEvtBit_LITHOGRAPH_6_e);
dComIfGs_onEventBit(dSv_evtBit_c::LITHOGRAPH_6);
}
/* 800C4ED4-800C4F04 .text item_func_collectmap64__Fv */
void item_func_collectmap64() {
dComIfGs_onEventBit(dEvtBit_LITHOGRAPH_7_e);
dComIfGs_onEventBit(dSv_evtBit_c::LITHOGRAPH_7);
}
/* 800C4F04-800C4F34 .text item_func_collectmap63__Fv */
void item_func_collectmap63() {
dComIfGs_onEventBit(dEvtBit_LITHOGRAPH_8_e);
dComIfGs_onEventBit(dSv_evtBit_c::LITHOGRAPH_8);
}
/* 800C4F34-800C4F64 .text item_func_collectmap62__Fv */
void item_func_collectmap62() {
dComIfGs_onEventBit(dEvtBit_LITHOGRAPH_9_e);
dComIfGs_onEventBit(dSv_evtBit_c::LITHOGRAPH_9);
}
/* 800C4F64-800C4FB8 .text item_func_collectmap61__Fv */
@@ -2531,52 +2531,52 @@ int item_getcheck_func_xxx_039() {
/* 800C77E4-800C7814 .text item_getcheck_func_lithograph1__Fv */
int item_getcheck_func_lithograph1() {
return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_1_e);
return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_1);
}
/* 800C7814-800C7844 .text item_getcheck_func_lithograph2__Fv */
int item_getcheck_func_lithograph2() {
return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_2_e);
return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_2);
}
/* 800C7844-800C7874 .text item_getcheck_func_lithograph3__Fv */
int item_getcheck_func_lithograph3() {
return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_3_e);
return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_3);
}
/* 800C7874-800C78A4 .text item_getcheck_func_lithograph4__Fv */
int item_getcheck_func_lithograph4() {
return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_4_e);
return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_4);
}
/* 800C78A4-800C78D4 .text item_getcheck_func_lithograph5__Fv */
int item_getcheck_func_lithograph5() {
return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_5_e);
return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_5);
}
/* 800C78D4-800C7904 .text item_getcheck_func_lithograph6__Fv */
int item_getcheck_func_lithograph6() {
return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_6_e);
return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_6);
}
/* 800C7904-800C7934 .text item_getcheck_func_lithograph7__Fv */
int item_getcheck_func_lithograph7() {
return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_7_e);
return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_7);
}
/* 800C7934-800C7964 .text item_getcheck_func_lithograph8__Fv */
int item_getcheck_func_lithograph8() {
return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_8_e);
return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_8);
}
/* 800C7964-800C7994 .text item_getcheck_func_lithograph9__Fv */
int item_getcheck_func_lithograph9() {
return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_9_e);
return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_9);
}
/* 800C7994-800C79C4 .text item_getcheck_func_lithograph10__Fv */
int item_getcheck_func_lithograph10() {
return dComIfGs_isEventBit(dEvtBit_LITHOGRAPH_10_e);
return dComIfGs_isEventBit(dSv_evtBit_c::LITHOGRAPH_10);
}
/* 800C79C4-800C79F4 .text item_getcheck_func_lithograph11__Fv */
src/d/d_stage.cpp
+1 -1
View File
@@ -1888,7 +1888,7 @@ int dStage_shipInfoInit(dStage_dt_c* i_stage, void* i_data, int i_num, void*) {
s32 roomId = dComIfGp_getShipRoomId();
if (dStage_chkTaura(roomId)) {
if (!dComIfGs_isEventBit(dEvtBit_SHIP_RIDDEN_e) && dStage_setShipPos(0x80, roomId)) {
if (!dComIfGs_isEventBit(dSv_evtBit_c::RODE_KORL) && dStage_setShipPos(0x80, roomId)) {
shipId = 0xFF;
roomId = 0xFF;
dComIfGp_setShipId(0xFF);