diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2024-11-14 23:32:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-14 23:32:55 -0700 |
| commit | 475f167bb2803999c5116bc285601d1f9a05d7de (patch) | |
| tree | 859fec292c5c9807cc9690ebf4f0600f558b6063 /include | |
| parent | 4fbb031dd95f2a84e73fbca269f517e98808d293 (diff) | |
[modding] Big Update PR (#118)
* Implement kart vehicle
* Fix menu CC
* Actors
* variable framerate
* Implement Actors vector
* Fix water & scrolling textures
* Finish ACoin
* Refactor finishline
* Refactor mtx to vector
* Fix refactored screen code bugs
* Fix playlist bug
* Switching courses working now
* Fix podium ceremony
* Mostly Fix Demo and Credits
* Credits Load Actors and Textures
* Fix credits
* Formatting
* Update lus and torch
* Fix water features
* Fix crabs
* Combine function
* Fix wheels
* Add Moon Jump Cheat
* Wheel Change
* Fix smoke due to wheel change
* Fix screens for wheels
* Fix transparency
* Fix staff ghost
* Fix lakitu transition widescreen
* Rename and export credits text
* Fixes
---------
Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/actor_types.h | 7 | ||||
| -rw-r--r-- | include/bomb_kart.h | 5 | ||||
| -rw-r--r-- | include/mk64.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/include/actor_types.h b/include/actor_types.h index 387aa285e..2b600ec13 100644 --- a/include/actor_types.h +++ b/include/actor_types.h @@ -83,8 +83,11 @@ enum ActorType { ACTOR_CAR, ACTOR_KIWANO_FRUIT }; +size_t m_GetActorSize(void); +#define ACTOR_LIST_SIZE m_GetActorSize() -#define ACTOR_LIST_SIZE 100 +struct Actor* m_GetActor(size_t); +#define GET_ACTOR(index) m_GetActor(index) // Actor flags #define ACTOR_IS_NOT_EXPIRED 0xF // The actor possesses some kind of collision and can be removed @@ -133,7 +136,7 @@ struct Actor { }; // size = 0x70 // Duplicate declare for simplicity when externing actors & packed files. -extern struct Actor gActorList[ACTOR_LIST_SIZE]; // D_8015F9B8 +extern struct Actor gActorList[100]; // D_8015F9B8 /* Specialized actor types diff --git a/include/bomb_kart.h b/include/bomb_kart.h index 0ae47f309..d8dc260f0 100644 --- a/include/bomb_kart.h +++ b/include/bomb_kart.h @@ -56,9 +56,6 @@ typedef struct { extern s32 gIndexObjectBombKart[NUM_BOMB_KARTS_MAX]; extern BombKart gBombKarts[NUM_BOMB_KARTS_MAX]; -extern Collision D_80164038[NUM_BOMB_KARTS_MAX]; - -// data/data_0DD0A0_1.s -extern BombKartSpawn gBombKartSpawns[NUM_COURSES][NUM_BOMB_KARTS_MAX]; +extern Collision gBombKartCollision[NUM_BOMB_KARTS_MAX]; #endif diff --git a/include/mk64.h b/include/mk64.h index 1e8066bc5..97d5ffb84 100644 --- a/include/mk64.h +++ b/include/mk64.h @@ -43,7 +43,7 @@ typedef enum { /* 0x08 */ COURSE_LUIGI_RACEWAY, /* 0x09 */ COURSE_MOO_MOO_FARM, /* 0x0A */ COURSE_TOADS_TURNPIKE, - /* 0x0B */ COURSE_KALAMARI_DESERT, + /* 0x0B */ COURSE_KALIMARI_DESERT, /* 0x0C */ COURSE_SHERBET_LAND, /* 0x0D */ COURSE_RAINBOW_ROAD, /* 0x0E */ COURSE_WARIO_STADIUM, |