encounter/tp
0
0
Fork 0
mirror of https://github.com/encounter/tp.git synced 2026-07-11 06:18:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

Lv5key / Iceblock done (#2177)

Browse Source 
* obj_lv5key

* obj_iceblock done

* remove asm
This commit is contained in:
TakaRikka
2024-07-13 09:24:50 +03:00
committed by GitHub
parent 89e14f9f97
commit ca1ece683b
94 changed files with 1303 additions and 5515 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rel/d/a/door/d_a_door_push/d_a_door_push.cpp
+2 -2
View File
@@ -13,7 +13,7 @@
* PPCallBack__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */
static void PPCallBack(fopAc_ac_c* i_this, fopAc_ac_c* i_unused, s16 i_unused2,
dBgW_Base::PushPullLabel param_3) {
if (cLib_checkBit(param_3, dBgW_Base::PUSHPULL_LABEL1) != 0) {
if (cLib_checkBit(param_3, dBgW_Base::PPLABEL_PUSH) != 0) {
daDoorPush_c* l_this = (daDoorPush_c*)i_this;
l_this->field_0x62e[0]++;
l_this->field_0x62e[1] = 0;
@@ -25,7 +25,7 @@ static void PPCallBack(fopAc_ac_c* i_this, fopAc_ac_c* i_unused, s16 i_unused2,
* PPCallBack2__FP10fopAc_ac_cP10fopAc_ac_csQ29dBgW_Base13PushPullLabel */
static void PPCallBack2(fopAc_ac_c* i_this, fopAc_ac_c* i_unused, s16 i_unused2,
dBgW_Base::PushPullLabel param_3) {
if (cLib_checkBit(param_3, dBgW_Base::PUSHPULL_LABEL1) != 0) {
if (cLib_checkBit(param_3, dBgW_Base::PPLABEL_PUSH) != 0) {
daDoorPush_c* l_this = (daDoorPush_c*)i_this;
l_this->field_0x62e[1]++;
l_this->field_0x62e[0] = 0;
rel/d/a/obj/d_a_obj_Lv5Key/d_a_obj_Lv5Key.cpp
+303 -588
View File
File diff suppressed because it is too large Load Diff
rel/d/a/obj/d_a_obj_iceblock/Makefile
-2
View File
@@ -8,12 +8,10 @@ M481_MAP := $(BUILD_DIR)/rel/d/a/obj/d_a_obj_iceblock.map
M481_CPP_FILES := \
rel/executor.cpp \
rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_bss.cpp \
rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp \
M481_O_FILES := \
$(BUILD_DIR)/rel/executor.o \
$(BUILD_DIR)/rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_bss.o \
$(BUILD_DIR)/rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.o \
M481_LIBS := \
rel/d/a/obj/d_a_obj_iceblock/d_a_obj_iceblock.cpp
+790 -1056
View File
File diff suppressed because it is too large Load Diff
rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_bss.cpp
-28
View File
@@ -1,28 +0,0 @@
//
// Generated By: dol2asm
// Translation Unit: unknown_translation_unit_bss
//
#include "rel/d/a/obj/d_a_obj_iceblock/unknown_translation_unit_bss.h"
#include "dolphin/types.h"
//
// Forward References:
//
extern "C" extern u8 struct_80C24698[4];
//
// External References:
//
//
// Declarations:
//
/* ############################################################################################## */
/* 80C24698-80C2469C -00001 0004+00 0/0 2/2 0/0 .bss None */
/* 80C24698 0001+00 data_80C24698 None */
/* 80C24699 0003+00 data_80C24699 None */
extern u8 struct_80C24698[4];
u8 struct_80C24698[4];