diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2022-10-16 20:06:47 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-16 20:06:47 -0300 |
| commit | 8a714af8d0a1b6462e7eb78274e07b0fcb7918b8 (patch) | |
| tree | 11882b960a77f7962edb87302b957fe8aa0afa63 /src/overlays/actors/ovl_Demo_Kankyo | |
| parent | b570e0c98e2e2acf8634af4addd3379b16072616 (diff) | |
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 <elliptic.ellipsis@gmail.com>
* name unused parameters
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* 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 <elliptic.ellipsis@gmail.com>
Diffstat (limited to 'src/overlays/actors/ovl_Demo_Kankyo')
| -rw-r--r-- | src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c | 2 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c index be3a0ee47..8b396cad9 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c @@ -22,7 +22,7 @@ void DemoKakyo_MoonSparklesActionFunc(DemoKankyo* this, PlayState* play); static u8 sLostWoodsSparklesMutex = false; // make sure only one can exist at once static s16 sLostWoodsSkyFishParticleNum = 0; -const ActorInit Demo_Kankyo_InitVars = { +ActorInit Demo_Kankyo_InitVars = { ACTOR_DEMO_KANKYO, ACTORCAT_ITEMACTION, FLAGS, diff --git a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h index f6f05d0a6..971adb3bd 100644 --- a/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h +++ b/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.h @@ -48,6 +48,4 @@ typedef enum { /* 3 */ DEMO_KANKYO_STATE_DISABLED, } DemoKankyoStateType; -extern const ActorInit Demo_Kankyo_InitVars; - #endif // Z_DEMO_KANKYO_H |