pmret/papermario
1
0
Fork 0
mirror of https://github.com/pmret/papermario.git synced 2024-11-09 12:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove commented INCLUDE_ASM macros

Browse Source
This commit is contained in:
Alex Bates 2020-08-19 01:55:56 +01:00
parent cc7cd275e6
commit 05d0eff2b1
No known key found for this signature in database
GPG Key ID: 5E11C2DB78877706
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/code_dbd70_len_700.c
View File

@ -1,13 +1,11 @@
#include "common.h"
void default_trigger_function_handler(s32* arg0) {
arg0[0] |= 2;
}
INCLUDE_ASM(code_dbd70_len_700, clear_trigger_data);
//INCLUDE_ASM(code_dbd70_len_700, init_trigger_list);
void init_trigger_list(void) {
if ((*gGameStatusPtr)->isBattle == 0) {
*gCurrentTriggerListPtr = gTriggerList1;
@ -22,7 +20,6 @@ INCLUDE_ASM(code_dbd70_len_700, create_trigger);
INCLUDE_ASM(code_dbd70_len_700, update_triggers);
void delete_trigger(trigger* toDelete) {
s32 i;
@ -40,7 +37,6 @@ void delete_trigger(trigger* toDelete) {
INCLUDE_ASM(code_dbd70_len_700, is_trigger_bound);
//INCLUDE_ASM(code_dbd70_len_700, get_trigger_by_id);
trigger* get_trigger_by_id(s32 triggerID) {
return (*gCurrentTriggerListPtr)[triggerID];
}
@ -55,7 +51,7 @@ INCLUDE_ASM(code_dbd70_len_700, func_80145CE8);
}
for (i = 0; i < ARRAY_COUNT(gCurrentTriggerListPtr); i++) {
if (((*gCurrentTriggerListPtr)[i] == NULL) ||
if (((*gCurrentTriggerListPtr)[i] == NULL) ||
((*gCurrentTriggerListPtr)[i]->unk_30 == 0) ||
((*gCurrentTriggerListPtr)[i]->colliderID != arg0) ||
((*gCurrentTriggerListPtr)[i]->genericFlagIndex & 0x100) == 0) {

7
src/code_e92d0_len_5da0.c
View File

@ -70,7 +70,6 @@ s32 si_handle_if_AND(script_context* script) {
return 2;
}
//INCLUDE_ASM(code_e92d0_len_5da0, si_handle_if_not_AND);
s32 si_handle_if_not_AND(script_context* script) {
s32 var1;
s32 *ptrReadPos = script->ptrReadPos;
@ -100,7 +99,7 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_switch_const);
/*s32 si_handle_switch_const(script_context* script) {
s32 ptrReadPos = *script->ptrReadPos;
s8 switchDepth = script->switchDepth + 1;
if (switchDepth >= 8) {
inf_loop: goto inf_loop; //todo
}
@ -143,7 +142,7 @@ s32 si_handle_break_case(script_context* script) {
s32 si_handle_end_switch(script_context* script) {
s32 switchDepth = script->switchDepth;
if (switchDepth < 0) {
inf_loop: goto inf_loop; // todo macro? how to do without label
}
@ -249,7 +248,6 @@ INCLUDE_ASM(code_e92d0_len_5da0, si_handle_allocate_array);
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_AND);
//INCLUDE_ASM(code_e92d0_len_5da0, si_handle_AND_const);
s32 si_handle_AND_const(script_context* script) {
s32* ptrReadPos = script->ptrReadPos;
// todo ???
@ -264,7 +262,6 @@ s32 si_handle_AND_const(script_context* script) {
INCLUDE_ASM(code_e92d0_len_5da0, si_handle_OR);
//INCLUDE_ASM(code_e92d0_len_5da0, si_handle_OR_const);
s32 si_handle_OR_const(script_context* script) {
s32* ptrReadPos = script->ptrReadPos;
// todo ???