izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add humanName to actor table (#71)

Browse Source
This commit is contained in:
Garrett Cox
2024-05-22 09:04:59 -05:00
parent 8894215a4b
commit 2bce365364
4 changed files with 705 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mm/include/segment_symbols.h
+3 -2
View File
@@ -90,8 +90,9 @@ DECLARE_BSS_SEGMENT(code)
DECLARE_OVERLAY_SEGMENT(kaleido_scope)
DECLARE_OVERLAY_SEGMENT(player_actor)
#define DEFINE_ACTOR(name, _enumValue, _allocType, _debugName) DECLARE_OVERLAY_SEGMENT(name)
#define DEFINE_ACTOR_INTERNAL(_name, _enumValue, _allocType, _debugName)
// 2S2H Added columns to actor table: _humanName
#define DEFINE_ACTOR(name, _enumValue, _allocType, _debugName, _humanName) DECLARE_OVERLAY_SEGMENT(name)
#define DEFINE_ACTOR_INTERNAL(_name, _enumValue, _allocType, _debugName, _humanName)
#define DEFINE_ACTOR_UNSET(_enumValue)
#include "tables/actor_table.h"
mm/include/tables/actor_table.h
+692 -690
View File
File diff suppressed because it is too large Load Diff
mm/include/z64actor.h
+3 -2
View File
@@ -450,8 +450,9 @@ typedef enum {
/* 32 */ ACTOR_DRAW_DMGEFF_ELECTRIC_SPARKS_LARGE
} ActorDrawDamageEffectType;
#define DEFINE_ACTOR(_name, enumValue, _allocType, _debugName) enumValue,
#define DEFINE_ACTOR_INTERNAL(_name, enumValue, _allocType, _debugName) enumValue,
// 2S2H Added columns to actor table: _humanName
#define DEFINE_ACTOR(_name, enumValue, _allocType, _debugName, _humanName) enumValue,
#define DEFINE_ACTOR_INTERNAL(_name, enumValue, _allocType, _debugName, _humanName) enumValue,
#define DEFINE_ACTOR_UNSET(enumValue) enumValue,
typedef enum ActorId {
mm/src/code/z_actor_dlftbls.c
+7 -5
View File
@@ -3,8 +3,9 @@
#include "fault.h"
// Init Vars declarations (also used in the table below)
#define DEFINE_ACTOR(name, _enumValue, _allocType, _debugName) extern ActorInit name##_InitVars;
#define DEFINE_ACTOR_INTERNAL(name, _enumValue, _allocType, _debugName) extern ActorInit name##_InitVars;
// 2S2H Added columns to actor table: _humanName
#define DEFINE_ACTOR(name, _enumValue, _allocType, _debugName, _humanName) extern ActorInit name##_InitVars;
#define DEFINE_ACTOR_INTERNAL(name, _enumValue, _allocType, _debugName, _humanName) extern ActorInit name##_InitVars;
#define DEFINE_ACTOR_UNSET(_enumValue)
#include "tables/actor_table.h"
@@ -25,11 +26,12 @@
// allocType, \
// 0 },
#define DEFINE_ACTOR_INTERNAL(name, _enumValue, allocType, _debugName) \
// 2S2H Added columns to actor table: _humanName
#define DEFINE_ACTOR_INTERNAL(name, _enumValue, allocType, _debugName, _humanName) \
{ 0, 0, NULL, NULL, NULL, &name##_InitVars, NULL, allocType, 0 },
#define DEFINE_ACTOR(name, _enumValue, allocType, _debugName) \
DEFINE_ACTOR_INTERNAL(name, _enumValue, allocType, _debugName)
#define DEFINE_ACTOR(name, _enumValue, allocType, _debugName, _humanName) \
DEFINE_ACTOR_INTERNAL(name, _enumValue, allocType, _debugName, _humanName)
#define DEFINE_ACTOR_UNSET(_enumValue) { 0 },