diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2024-05-30 17:00:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-30 14:00:57 -0700 |
| commit | fd0581121366309a56c648eda7a299537e355b28 (patch) | |
| tree | 6fb8d8b167fecd8799748ccb1caab1a013c7e739 /include/m_actor.h | |
| parent | 1f7fbf9b291d5685633e6e819b2579f36dc4ef2b (diff) | |
`m_trademark` OK (#192)
* C file
* trademark_init
* trademark_cancel, trademark_move, trademark_main
* trademark_draw
* trademark_goto_demo_scene and func_80805360_jp
* set_npc_4_title_demo
* func_80804C40_jp
* trademark_cleanup
* func_808052B8_jp
* func_80805104_jp
* func_80804F78_jp
* func_80804EE0_jp
* fix warnings
* small cleanup
* fix build
* some fixes
* stuff
* some cleanups
* Fix rebase
* Import data
* Migrate bss
* cleanup
* Save substruct
* format
* TrademarkState and some other stuff
* remove fake match
* stuff I missed
* whoops
* Stupid `-Wtype-limits`
* Update src/overlays/gamestates/ovl_trademark/m_trademark.c
Co-authored-by: Prakxo <87568477+Prakxo@users.noreply.github.com>
* Review
* Update src/overlays/gamestates/ovl_trademark/m_trademark.c
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
* Update src/overlays/gamestates/ovl_trademark/m_trademark.c
Co-authored-by: Prakxo <87568477+Prakxo@users.noreply.github.com>
* clang-tidy changes???
* review
---------
Co-authored-by: Prakxo <87568477+Prakxo@users.noreply.github.com>
Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
Diffstat (limited to 'include/m_actor.h')
| -rw-r--r-- | include/m_actor.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/m_actor.h b/include/m_actor.h index 0096964..955be5d 100644 --- a/include/m_actor.h +++ b/include/m_actor.h @@ -6,7 +6,6 @@ #include "m_collision_bg.h" #include "z64math.h" #include "unk.h" -#include "m_collision_bg.h" struct Actor; struct Game_Play; @@ -251,7 +250,7 @@ void Actor_info_dt(ActorInfo* actorInfo, struct Game_Play* game_play); void Actor_info_call_actor(struct Game_Play* game_play, ActorInfo* actorInfo); void Actor_info_draw_actor(struct Game_Play* game_play, ActorInfo* actorInfo); void Actor_free_overlay_area(struct ActorOverlay* overlayEntry); -void Actor_get_overlay_area(struct ActorOverlay* overlayEntry, const u8*, size_t overlaySize); +void Actor_get_overlay_area(struct ActorOverlay* overlayEntry, const u8* arg1, size_t overlaySize); void Actor_init_actor_class(Actor* actor, ActorProfile* profile, struct ActorOverlay* overlayEntry, struct Game_Play* game_play, s32 arg4, f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s8 argB, s8 argC, s16 argD, u16 fgName, s16 params); Actor* Actor_info_make_actor(ActorInfo* actorInfo, struct Game_Play* game_play, s16 actorId, f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s8 arg9, s8 argA, s16 argB, u16 fgName, s16 params, s8 argE, s32 argF); Actor* Actor_info_make_child_actor(ActorInfo* actorInfo, Actor* arg1, struct Game_Play* game_play, s16 actorId, f32 x, f32 y, f32 z, s16 rotX, s16 rotY, s16 rotZ, s16 argA, u16 fgName, s16 params, s32 argD); |