From 8a714af8d0a1b6462e7eb78274e07b0fcb7918b8 Mon Sep 17 00:00:00 2001 From: Anghelo Carvajal Date: Sun, 16 Oct 2022 20:06:47 -0300 Subject: Introduce `actor_table.h` (#985) * Make actor_table.h * DECLARE_OVERLAY_SEGMENT * InitVars * Remove InitVars from actor headers * format * Use table for ActorID enum * Move segment symbols declarations back to segment_symbols.h * add newline to actor_table.h * Add effects back to segnt_symbols.h * Update include/tables/actor_table.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Shot_Sun/z_shot_sun.h Co-authored-by: EllipticEllipsis * name unused parameters Co-authored-by: EllipticEllipsis * format * Revert "name unused parameters" This reverts commit 14fe63313a32b4779ccfb6cf71cb227542a3958f. * Remove `const` from InitVars * Add underscore to unused parameters * ActorID -> ActorId * bss * missing symbols and bss * lower diff a bit Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: EllipticEllipsis --- docs/tutorial/data.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/tutorial/data.md') diff --git a/docs/tutorial/data.md b/docs/tutorial/data.md index 0a19113e4..6884ebb12 100644 --- a/docs/tutorial/data.md +++ b/docs/tutorial/data.md @@ -43,7 +43,7 @@ Once we have decompiled enough things to know what the data is, we can import it ```C #if 0 -const ActorInit En_Recepgirl_InitVars = { +ActorInit En_Recepgirl_InitVars = { ACTOR_EN_RECEPGIRL, ACTORCAT_NPC, FLAGS, @@ -99,7 +99,7 @@ endseg Next remove all the externs, and uncomment their corresponding commented data: ```C -const ActorInit En_Recepgirl_InitVars = { +ActorInit En_Recepgirl_InitVars = { ACTOR_EN_RECEPGIRL, ACTORCAT_NPC, FLAGS, @@ -139,7 +139,7 @@ As we'd expect, of course: we didn't fulfil our promise that they were defined e For actors which have yet to be decompiled, this is mitigated by use of the file `undefined_syms.txt`, which feeds the linker the raw addresses to use as the symbol definitions. However, we want to replace these segmented addresses with proper object symbols whenever possible. In `En_Recepgirl_InitVars`, we can see that this actor uses the object `OBJECT_BG`: ```c -const ActorInit En_Recepgirl_InitVars = { +ActorInit En_Recepgirl_InitVars = { ACTOR_EN_RECEPGIRL, ACTORCAT_NPC, FLAGS, -- cgit v1.2.3