mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
z_demo with 4 NON_MATCHINGs (#514)
* starting * a bunch * and another bunch * a bunch * Match func_800EB1DC * func_800EB4B4 * func_800EB6F8 * 2 more * fix prototype of a random kankyo function * func_800EBD60 non matching * func_800EC678 matched? * func_800EC6D4 * break * func_800ECD7C * A bunch of functions * func_800EE200 * func_800EDF78 and func_800EE0CC * func_800EDBE0 NON_MATCHING * Cutscene_Init NON_MATCHING * func_800EA324 NON_EQUIVALENT * Fix warnings * func_800EC924 NON_EQUIVALENT * Cutscene_ProcessCommands NON_EQUIVALENT * Format * Split z_demo data and import it * Import bss * Match func_800EB364 * Rename Cutscene_Command_SetTime * Improve Cutscene_ProcessCommands a bit (still not equivalent, probably) * Improve Cutscene_ProcessCommands thanks to engineer and anon * Cutscene_ProcessCommands NON_MATCHING * Name some commands * Fix * Renames based on Engineer knowledge of Audio stuff * More command names * Cutscene_Command_GiveTatlToPlayer * Some cutscene commands macros * more command macros * Macros for unknown commands * Improve Cutscene_Command_Textbox a bit * Rename stuff * Name Terminator and Camera * MOTIONBLUR * Macros for textbox commands * CS_PLAYER_ACTION_LIST * A few macro renames * Small cleaning * A bit more of cleanup * Rumble * Entrance comments in func_800EB6F8 * Some var renames * CS_CMD_FADESCREEN * More clean up * Clean functions protos * Move CutsceneStateHandler out of z64.h * Cutscene_DoNothing * Cutscene_IsPlayingCs & Cutscene_GetSceneSetupIndex * And more renames * name some stuff in the cutscenecontext struct * npcActionIndex->actorActionIndex * Undo names of CS_STATE_ enum * Name Cutscene_ActorTranslate family of functions * small docs pass * sfxconvert and format * Hopefully last cleanup * Add some missing functions to actorfixer * Fix merge issues and remove trailing commas * Cutscene commands fix * Cutscene_Command_Misc improved by engineer * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Address review * bss * Match Cutscene_Command_Textbox by anon58 * Fix merge issues * Match Cutscene_Command_Misc by @hensldm * review * float time macros * fix merge issues * format * Fix building assets * fix merge issues * format * Fix * format * fix merge issues * fix * fix * format * fix issues and run format * bss * Fix conflicts, bss and formatter * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/z64.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/z64cutscene.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/z64cutscene.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/z64cutscene.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * address review and fix some stuff * fix merge problems * more fixes and format * Fixes * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update include/functions.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_demo.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Engineer suggestions * format * Elliptic review * Use dec for ShrinkWindow_SetLetterboxTarget * add a few comments * Cutscene_Command_ChooseCreditsScenes * Update src/code/z_demo.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * format * some cleanups and some comments * change actorActionCmd from hex to dec in the codebase * minor comment on textboxcmd * ahhhh * Update src/code/z_demo.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * brackets * minor comments * rewording * im dumb * brackets * another bracket * Dawn of the New Day * Update src/code/z_demo.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * fixes * Cutscene_Command_TransitionFX by Anon Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
This commit is contained in:
co-authored by
engineer124
EllipticEllipsis
parent
8b7cbb1273
commit
77cfd399d0
+7
-16
@@ -869,14 +869,9 @@ extern EffectShieldParticleInit shieldParticleInitWood;
|
||||
// extern UNK_TYPE1 D_801BB0DC;
|
||||
// extern UNK_TYPE2 D_801BB0FC;
|
||||
// extern UNK_TYPE1 D_801BB100;
|
||||
// extern UNK_TYPE2 D_801BB124;
|
||||
// extern UNK_TYPE2 D_801BB128;
|
||||
|
||||
extern u8 D_801BB12C;
|
||||
// extern UNK_TYPE1 D_801BB130;
|
||||
extern cutscene_update_func sCsStateHandlers1[5];
|
||||
extern cutscene_update_func sCsStateHandlers2[5];
|
||||
// extern UNK_TYPE2 D_801BB15C;
|
||||
// extern UNK_TYPE4 D_801BB160;
|
||||
|
||||
extern s801BB170 D_801BB170[118];
|
||||
// extern UNK_TYPE1 D_801BC210;
|
||||
extern Gfx D_801BC240[9];
|
||||
@@ -3193,15 +3188,11 @@ extern GameInfo* gGameInfo;
|
||||
// extern UNK_TYPE1 D_801F3F80;
|
||||
// extern UNK_TYPE1 D_801F3F83;
|
||||
// extern UNK_TYPE1 D_801F48C8;
|
||||
// extern UNK_TYPE1 D_801F4D40;
|
||||
// extern UNK_TYPE2 D_801F4D42;
|
||||
// extern UNK_TYPE1 D_801F4D48;
|
||||
// extern UNK_TYPE1 D_801F4DC8;
|
||||
// extern UNK_TYPE1 D_801F4DCA;
|
||||
// extern UNK_TYPE2 D_801F4DCC[8];
|
||||
// extern UNK_TYPE1 D_801F4DDC;
|
||||
// extern UNK_TYPE1 D_801F4DE0;
|
||||
|
||||
extern UNK_TYPE D_801F4DDC;
|
||||
extern u8 D_801F4DE0;
|
||||
extern s16 D_801F4DE2;
|
||||
|
||||
extern ActorCutscene* actorCutscenes;
|
||||
extern s16 actorCutsceneCount;
|
||||
extern u8 actorCutsceneWaiting[16];
|
||||
@@ -3220,7 +3211,7 @@ extern Vec3f D_801F4E50;
|
||||
extern f32 D_801F4E5C;
|
||||
extern f32 D_801F4E60;
|
||||
extern s16 D_801F4E64;
|
||||
// extern UNK_TYPE1 D_801F4E68;
|
||||
extern u8 D_801F4E68;
|
||||
extern f32 D_801F4E70;
|
||||
// extern UNK_TYPE1 D_801F4E74;
|
||||
extern u16 D_801F4E78;
|
||||
|
||||
Reference in New Issue
Block a user