diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2025-11-09 19:07:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-09 19:07:44 -0700 |
| commit | de9c5d510175bba11ab8704e67be3a3a94f9149e (patch) | |
| tree | 34c42dbfe9f2a6eb5fbce5f6a31b532ff2a3f243 /include | |
| parent | 760fa3bf5226c2a6052a5d4d53fd0e27f2911e60 (diff) | |
Implement SpawnParams struct (#536)
* Impl SpawnParams
* Added json submodule
* Update json
* Update
* Works
* Remove comment
* Works refactor
* Snowman and thwomp working
* Impl hot air balloon
* More progress
* All OObjects are done
* cleanup
* Refactor 2Dpath to normal path
* Update nlohmann json & fix compile
* Rest of actors
* MORE CHANGES
* Finish actors
* Done PR, some fix to collision viewer
* Impl falling rocks
* Add const
* wip editor refactor
* Property work
* continue
* Overridable editor properties
* Actor saving/loading works now
* Fix light alignment
* Clarification
* Impl penguin
* params impl signs
* properties impl falling rock
* More property impls
* impl air balloon
* Add spawnParams to OObject Translate
* Snowman translate better
* impl hedgehog properly
* properties impl trophy
* thwomp progress
* Finish impl properties
* Fix compile
* Fix cursor collisions
* Move registered actors
* Rename pathPoint XYZ to xyz
* Fix editor pause bug
* Clean up
* Review comments
* Remove SpawnParams struct from actor classes
* Rename
* Player Label First Iteration
* Work now
* Working 3d text
* Fix boo bug
* Finish AText actor
* Fix spawnparams compile
* Register AText
* Finish Text Actor
* Fix thwomp interpolation
* Fix compile
* Fix crab and hedgehog
* Fix loading flagpole
* Fix Hot Air Balloon
* Turn zbuffer on for AText
* Update
---------
Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/actor_types.h | 4 | ||||
| -rw-r--r-- | include/defines.h | 9 | ||||
| -rw-r--r-- | include/waypoints.h | 6 |
3 files changed, 14 insertions, 5 deletions
diff --git a/include/actor_types.h b/include/actor_types.h index e9f8844de..40bca6050 100644 --- a/include/actor_types.h +++ b/include/actor_types.h @@ -62,9 +62,9 @@ enum ActorType { ACTOR_MARIO_SIGN, ACTOR_UNKNOWN_0x18, ACTOR_PALM_TREE, - ACTOR_UNKNOWN_0x1A, + ACTOR_TREE_LUIGI_RACEWAY, ACTOR_UNKNOWN_0x1B, - ACTOR_TREE_BOWSERS_CASTLE, + ACTOR_TREE_PEACH_CASTLE, ACTOR_TREE_FRAPPE_SNOWLAND, ACTOR_CACTUS1_KALAMARI_DESERT, ACTOR_CACTUS2_KALAMARI_DESERT, diff --git a/include/defines.h b/include/defines.h index 60c21af83..11ca54efc 100644 --- a/include/defines.h +++ b/include/defines.h @@ -112,6 +112,15 @@ #define FOUR_PLAYERS_SELECTED 4 #define SELECTED_PLAYER_DEFINES_TOTAL 5 +// Camera index into cameras array +enum CameraId { + CAMERA_ONE = 0, + CAMERA_TWO, + CAMERA_THREE, + CAMERA_FOUR, + CAMERA_FREECAM +}; + enum PlayerId { PLAYER_NONE = -1, PLAYER_ONE = 0, diff --git a/include/waypoints.h b/include/waypoints.h index 0d5a09e09..3798eae9e 100644 --- a/include/waypoints.h +++ b/include/waypoints.h @@ -12,9 +12,9 @@ enum { }; typedef struct { - /* 0x00 */ s16 posX; - /* 0x02 */ s16 posY; - /* 0x04 */ s16 posZ; + /* 0x00 */ s16 x; + /* 0x02 */ s16 y; + /* 0x04 */ s16 z; /* 0x06 */ u16 trackSectionId; } TrackPathPoint; // size = 0x08 |