mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-06-14 06:13:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update NONMATCH macro

Browse Source
This commit is contained in:
Aetias
2024-02-26 21:12:35 +01:00
parent 77934d4999
commit b736e9e539
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/global.h
+5 -3
View File
@@ -4,13 +4,15 @@
#define NULL 0
#define GET_FLAG(arr, pos) (((1 << ((pos) & 0x1f)) & (arr)[((u32)(pos)) >> 5]) != 0)
#define SET_FLAG(arr, pos) ((arr)[((u32(pos))) >> 5] |= 1 << ((pos) & 0x1f))
#define SET_FLAG(arr, pos) ((arr)[((u32)(pos)) >> 5] |= 1 << ((pos) & 0x1f))
#define RESET_FLAG(arr, pos) ((arr)[((u32)(pos)) >> 5] &= ~(1 << ((pos) & 0x1f)))
// NONMATCH(name) marks the function `name` as nonmatching
// The reason for the macro is to easily detect it in progress.py
#ifdef NONMATCHING
#define NONMATCH
#define NONMATCH(name) name
#else
#define NONMATCH asm
#define NONMATCH(name) asm name
#endif
// Prevent the IDE from reporting errors that the compiler/linker won't report
src/ItemManager.cpp
+1 -1
View File
@@ -241,7 +241,7 @@ extern unk32 data_027e0fc8;
extern "C" bool func_ov00_020bbd80(unk32 param1, unk32 param2);
extern "C" bool _ZNK11ItemManager7HasItemEi();
extern "C" void _ZN11ItemManager12GetEquipItemEi();
ARM NONMATCH bool ItemManager::func_ov00_020ad790(unk32 param1) {
ARM bool NONMATCH(ItemManager::func_ov00_020ad790)(unk32 param1) {
#ifndef NONMATCHING
#include "../asm/ov00/ItemManager/ItemManager_func_ov00_020ad790.inc"
#else