mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-05 23:44:53 +00:00
z_message_PAL, message_data_static and surrounding doc (#996)
* Initial progress on z_message_PAL, very messy * Fix merge * Some more progress * Fix merge * More z_message_PAL * Small progress * More small progress * message_data_static files OK * Prepare z_message_tables * Matched another function, small updates * Attempt to use asm-processor static-symbols branch * Refactor text id declarations * Begin large text codes parser function * Fix merge * Refactor done * Build OK, add color and highscore names * Remove encoded text headers and automatically encode during build * Fix kanfont * Various cleanups * DISP macros * Another match aside data * Further progress * Small improvements * Deduplicate magic values for text control codes, small improvements * Tiny progress * Minor cleanups * Clean up z_message_PAL comment * Progress on large functions * Further progress on large functions * Changes to mkldscript to link .data in the .rodata section * data OK * Few improvements * Use gDPLoadTextureBlock macros where appropriate * rm z_message_tables, progress on large functions * 2 more matches * Improvements * Small progress * More progress on big function * progress * match func_80107980 * match Message_Update * match func_8010BED8 * done * Progress on remaining large functions * Small progress on largest function * Another match, extract text and move to assets, improve text build system * Small nonmatchings improvements * docs wip * Largest function maybe equivalent * Fix merge * Document do_action values, largest function is almost instruction-matching * Rename NAVI do_action to NONE, as that appears to be how that value is used in practice * Fix merge * one match * Last function is instruction-matching * Fix * Improvements thanks to engineer124 * Stack matched thanks to petrie911, now just a/v/low t regalloc issues, some cleanup * More variables labeled, use text state enum everywhere * More labels and names * Fix * Actor_IsTalking -> Actor_TalkRequested * Match func_8010C39C and remove unused asm * More docs * Mostly ocarina related docs * All msgModes named * Fix assetclean * Cleanup * Extraction fixes and headers * Suggestions * Review suggestions * Change text extraction again, only extract if the headers do not already exist * Fix * Use ast for charmap, fix assetclean for real this time * Review suggestions * BGM ids and ran formatter * Review comments * rename include_readonly to include_data_with_rodata * Remove leading 0s in number directives * Review suggestions for message_data_static * textbox pos enum comments, rename several enum names from Message to TextBox Co-authored-by: Thar0 <maximilianc64@gmail.com> Co-authored-by: Zelllll <56516451+Zelllll@users.noreply.github.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: Roman971 <romanlasnier@hotmail.com>
This commit is contained in:
Tharo
GitHub
parent
03636166b3
commit
a497f33bda
216 changed files with 7052 additions and 16801 deletions
|
|
@ -427,14 +427,14 @@ PosRot* Actor_GetFocus(PosRot* arg0, Actor* actor);
|
|||
PosRot* Actor_GetWorld(PosRot* arg0, Actor* actor);
|
||||
PosRot* Actor_GetWorldPosShapeRot(PosRot* arg0, Actor* actor);
|
||||
s32 func_8002F0C8(Actor* actor, Player* player, s32 arg2);
|
||||
u32 func_8002F194(Actor* actor, GlobalContext* globalCtx);
|
||||
u32 Actor_ProcessTalkRequest(Actor* actor, GlobalContext* globalCtx);
|
||||
s32 func_8002F1C4(Actor* actor, GlobalContext* globalCtx, f32 arg2, f32 arg3, u32 arg4);
|
||||
s32 func_8002F298(Actor* actor, GlobalContext* globalCtx, f32 arg2, u32 arg3);
|
||||
s32 func_8002F2CC(Actor* actor, GlobalContext* globalCtx, f32 arg2);
|
||||
s32 func_8002F2F4(Actor* actor, GlobalContext* globalCtx);
|
||||
u32 func_8002F334(Actor* actor, GlobalContext* globalCtx);
|
||||
u32 Actor_TextboxIsClosing(Actor* actor, GlobalContext* globalCtx);
|
||||
s8 func_8002F368(GlobalContext* globalCtx);
|
||||
void func_8002F374(GlobalContext* globalCtx, Actor* actor, s16* x, s16* y);
|
||||
void Actor_GetScreenPos(GlobalContext* globalCtx, Actor* actor, s16* x, s16* y);
|
||||
u32 Actor_HasParent(Actor* actor, GlobalContext* globalCtx);
|
||||
s32 func_8002F434(Actor* actor, GlobalContext* globalCtx, s32 getItemId, f32 xzRange, f32 yRange);
|
||||
void func_8002F554(Actor* actor, GlobalContext* globalCtx, s32 getItemId);
|
||||
|
|
@ -505,7 +505,7 @@ void func_8003424C(GlobalContext* globalCtx, Vec3f* arg1);
|
|||
void Actor_SetColorFilter(Actor* actor, s16 colorFlag, s16 colorIntensityMax, s16 xluFlag, s16 duration);
|
||||
Hilite* func_800342EC(Vec3f* object, GlobalContext* globalCtx);
|
||||
Hilite* func_8003435C(Vec3f* object, GlobalContext* globalCtx);
|
||||
s32 func_800343CC(GlobalContext* globalCtx, Actor* actor, s16* arg2, f32 arg3, u16 (*unkFunc1)(GlobalContext*, Actor*),
|
||||
s32 func_800343CC(GlobalContext* globalCtx, Actor* actor, s16* arg2, f32 interactRange, u16 (*unkFunc1)(GlobalContext*, Actor*),
|
||||
s16 (*unkFunc2)(GlobalContext*, Actor*));
|
||||
s16 func_800347E8(s16 arg0);
|
||||
void func_80034A14(Actor* actor, struct_80034A14_arg1* arg1, s16 arg2, s16 arg3);
|
||||
|
|
@ -865,9 +865,9 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* workBuff, u32 workSize);
|
|||
void KaleidoSetup_Update(GlobalContext* globalCtx);
|
||||
void KaleidoSetup_Init(GlobalContext* globalCtx);
|
||||
void KaleidoSetup_Destroy(GlobalContext* globalCtx);
|
||||
void func_8006EE50(Font* font, s16 arg1, s16 arg2);
|
||||
void func_8006EE50(Font* font, u16 arg1, u16 arg2);
|
||||
void Font_LoadChar(Font* font, u8 character, u16 codePointIndex);
|
||||
void Font_LoadMessageBoxEndIcon(Font* font, u16 icon);
|
||||
void Font_LoadMessageBoxIcon(Font* font, u16 icon);
|
||||
void Font_LoadOrderedFont(Font* font);
|
||||
s32 func_8006F0A0(s32 arg0);
|
||||
u16 Environment_GetPixelDepth(s32 x, s32 y);
|
||||
|
|
@ -2011,14 +2011,14 @@ void AudioSeq_ResetSequencePlayer(SequencePlayer* seqPlayer);
|
|||
void AudioSeq_InitSequencePlayerChannels(s32 playerIdx);
|
||||
void AudioSeq_InitSequencePlayers(void);
|
||||
void func_800ECC04(u16);
|
||||
void func_800ED858(u8);
|
||||
void func_800ED93C(s8 songIdx, s8 arg1);
|
||||
void func_800EE170(u8);
|
||||
OcarinaStaff* func_800EE3C8(void);
|
||||
OcarinaStaff* func_800EE3D4(void);
|
||||
OcarinaStaff* Audio_OcaGetDisplayStaff(void);
|
||||
void func_800EE57C(u8 minigameIdx);
|
||||
s32 func_800EE5EC(void);
|
||||
void Audio_OcaSetInstrument(u8);
|
||||
void Audio_OcaSetSongPlayback(s8 songIdxPlusOne, s8 playbackState);
|
||||
void Audio_OcaSetRecordingState(u8);
|
||||
OcarinaStaff* Audio_OcaGetRecordingStaff(void);
|
||||
OcarinaStaff* Audio_OcaGetPlayingStaff(void);
|
||||
OcarinaStaff* Audio_OcaGetDisplayingStaff(void);
|
||||
void Audio_OcaMemoryGameStart(u8 minigameIdx);
|
||||
s32 Audio_OcaMemoryGameGenNote(void);
|
||||
void func_800EE824(void);
|
||||
void AudioDebug_Draw(GfxPrint* printer);
|
||||
void AudioDebug_ScrPrt(const s8* str, u16 num);
|
||||
|
|
@ -2063,7 +2063,7 @@ s32 func_800F5A58(u8);
|
|||
void func_800F5ACC(u16 bgmID);
|
||||
void func_800F5B58(void);
|
||||
void func_800F5BF0(u8 arg0);
|
||||
void func_800F5C64(u16);
|
||||
void Audio_PlayFanfare(u16);
|
||||
void func_800F5C2C(void);
|
||||
void func_800F5E18(u8 playerIdx, u16 seqId, u8 fadeTimer, s8 arg3, s8 arg4);
|
||||
void func_800F5E90(u8);
|
||||
|
|
@ -2374,45 +2374,23 @@ s32 __osSpSetPc(void* pc);
|
|||
f32 absf(f32);
|
||||
void* func_80106860(void* ptr, s32 val, size_t size);
|
||||
void* func_801068B0(void* dst, void* src, size_t size);
|
||||
// ? func_801069B0(?);
|
||||
void func_80106AA8(GlobalContext* globalCtx);
|
||||
u8 func_80106BC8(GlobalContext* globalCtx);
|
||||
// ? func_80106C88(?);
|
||||
void func_80106CCC(GlobalContext*);
|
||||
// ? func_80106D40(?);
|
||||
// ? func_80106F1C(?);
|
||||
// ? func_80107244(?);
|
||||
// ? func_80107448(?);
|
||||
// ? func_80107628(?);
|
||||
// ? func_801076CC(?);
|
||||
// ? func_80107980(?);
|
||||
// ? func_801080B4(?);
|
||||
// ? func_801083F8(?);
|
||||
// ? func_801086B0(?);
|
||||
// ? func_80109968(?);
|
||||
// ? func_80109B3C(?);
|
||||
// ? func_8010B0C0(?);
|
||||
void func_8010B680(GlobalContext*, u16 textID, Actor* actor);
|
||||
void func_8010B720(GlobalContext* globalCtx, u16 textId);
|
||||
// ? func_8010B820(?);
|
||||
// ? func_8010BD58(?);
|
||||
void Message_UpdateOcarinaGame(GlobalContext* globalCtx);
|
||||
u8 Message_ShouldAdvance(GlobalContext* globalCtx);
|
||||
void Message_CloseTextbox(GlobalContext*);
|
||||
void Message_StartTextbox(GlobalContext* globalCtx, u16 textId, Actor* actor);
|
||||
void Message_ContinueTextbox(GlobalContext* globalCtx, u16 textId);
|
||||
void func_8010BD58(GlobalContext* globalCtx, u16 arg1);
|
||||
void func_8010BD88(GlobalContext* globalCtx, u16 arg1);
|
||||
u8 func_8010BDBC(MessageContext* msgCtx);
|
||||
// ? func_8010BED8(?);
|
||||
// ? func_8010C358(?);
|
||||
// ? func_8010C39C(?);
|
||||
// ? func_8010F2CC(?);
|
||||
// ? func_8010F494(?);
|
||||
void func_8010F58C(GlobalContext* globalCtx);
|
||||
void func_8010F6F0(GlobalContext* globalCtx);
|
||||
void func_8011040C(void);
|
||||
u8 Message_GetState(MessageContext* msgCtx);
|
||||
void Message_Draw(GlobalContext* globalCtx);
|
||||
void Message_Update(GlobalContext* globalCtx);
|
||||
void Message_SetTables(void);
|
||||
void GameOver_Init(GlobalContext* globalCtx);
|
||||
void GameOver_FadeInLights(GlobalContext* globalCtx);
|
||||
void GameOver_Update(GlobalContext* globalCtx);
|
||||
void func_80110990(GlobalContext* globalCtx);
|
||||
void func_801109B0(GlobalContext* globalCtx);
|
||||
void func_80110F68(GlobalContext* globalCtx);
|
||||
void Message_Init(GlobalContext* globalCtx);
|
||||
void func_80112098(GlobalContext* globalCtx);
|
||||
|
||||
void Title_Init(GameState* thisx);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue