mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 06:54:33 +00:00
Code Issues Projects Releases Wiki Activity

Changes to support renaming segments in the spec (#1259)

Browse source 
* Allow dmadata to have names different from the original table

Added an argument to the dma define which is used to match debug strings in z_std_dma.c

* Update kaleido manager to support different overlay names

* Update the actor table to support different actor names

Added an argument to the define which is used to match debug strings in z_actor_dlftbls.c

* PR suggestions for argument descriptions
This commit is contained in:
Roman971 2022-06-06 21:51:03 +02:00 • committed by GitHub
parent b0bfa9eb69
commit 6f0b8f1e74
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 1993 additions and 1987 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/code/z_actor_dlftbls.c
View file

@ -1,8 +1,8 @@
#include "global.h"
// Linker symbol declarations (used in the table below)
#define DEFINE_ACTOR(name, _1, _2) DECLARE_OVERLAY_SEGMENT(name)
#define DEFINE_ACTOR_INTERNAL(_0, _1, _2)
#define DEFINE_ACTOR(name, _1, _2, _3) DECLARE_OVERLAY_SEGMENT(name)
#define DEFINE_ACTOR_INTERNAL(_0, _1, _2, _3)
#define DEFINE_ACTOR_UNSET(_0)
#include "tables/actor_table.h"
@ -12,8 +12,8 @@
#undef DEFINE_ACTOR_UNSET
// Init Vars declarations (also used in the table below)
#define DEFINE_ACTOR(name, _1, _2) extern ActorInit name##_InitVars;
#define DEFINE_ACTOR_INTERNAL(name, _1, _2) extern ActorInit name##_InitVars;
#define DEFINE_ACTOR(name, _1, _2, _3) extern ActorInit name##_InitVars;
#define DEFINE_ACTOR_INTERNAL(name, _1, _2, _3) extern ActorInit name##_InitVars;
#define DEFINE_ACTOR_UNSET(_0)
#include "tables/actor_table.h"
@ -23,18 +23,19 @@
#undef DEFINE_ACTOR_UNSET
// Actor Overlay Table definition
#define DEFINE_ACTOR(name, _1, allocType) \
{ (u32)_ovl_##name##SegmentRomStart, \
(u32)_ovl_##name##SegmentRomEnd, \
_ovl_##name##SegmentStart, \
_ovl_##name##SegmentEnd, \
NULL, \
&name##_InitVars, \
#name, \
allocType, \
#define DEFINE_ACTOR(name, _1, allocType, nameString) \
{ (u32)_ovl_##name##SegmentRomStart, \
(u32)_ovl_##name##SegmentRomEnd, \
_ovl_##name##SegmentStart, \
_ovl_##name##SegmentEnd, \
NULL, \
&name##_InitVars, \
nameString, \
allocType, \
0 },
#define DEFINE_ACTOR_INTERNAL(name, _1, allocType) { 0, 0, NULL, NULL, NULL, &name##_InitVars, #name, allocType, 0 },
#define DEFINE_ACTOR_INTERNAL(name, _1, allocType, nameString) \
{ 0, 0, NULL, NULL, NULL, &name##_InitVars, nameString, allocType, 0 },
#define DEFINE_ACTOR_UNSET(_0) { 0 },