mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 14:31:17 +00:00
Code Issues Projects Releases Wiki Activity

z_message_PAL, message_data_static and surrounding doc (#996)

Browse source 
* 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 2021-11-23 01:20:30 +00:00 • committed by GitHub
parent 03636166b3
commit a497f33bda
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
216 changed files with 7052 additions and 16801 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/overlays/actors/ovl_En_Elf/z_en_elf.c
View file

@ -1257,14 +1257,14 @@ void func_80A05040(Actor* thisx, GlobalContext* globalCtx) {
func_80A04DE4(this, globalCtx);
if ((func_8010BDBC(&globalCtx->msgCtx) == 4) && func_80106BC8(globalCtx)) {
if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_CHOICE) && Message_ShouldAdvance(globalCtx)) {
switch (globalCtx->msgCtx.choiceIndex) {
case 0: // yes
func_8010B720(globalCtx, ElfMessage_GetSariaText(globalCtx));
Message_ContinueTextbox(globalCtx, ElfMessage_GetSariaText(globalCtx));
this->actor.update = func_80A05114;
break;
case 1: // no
func_80106CCC(globalCtx);
Message_CloseTextbox(globalCtx);
this->actor.update = func_80A053F0;
func_80A01C38(this, 0);
this->fairyFlags &= ~0x20;
@ -1280,8 +1280,8 @@ void func_80A05114(Actor* thisx, GlobalContext* globalCtx) {
func_80A04DE4(this, globalCtx);
if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && func_80106BC8(globalCtx)) {
func_8010B720(globalCtx, 0xE3);
if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(globalCtx)) {
Message_ContinueTextbox(globalCtx, 0xE3);
this->actor.update = func_80A05040;
}
@ -1293,8 +1293,8 @@ void func_80A05188(Actor* thisx, GlobalContext* globalCtx) {
func_80A04DE4(this, globalCtx);
if ((func_8010BDBC(&globalCtx->msgCtx) == 5) && func_80106BC8(globalCtx)) {
func_8010B720(globalCtx, ElfMessage_GetSariaText(globalCtx));
if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_EVENT) && Message_ShouldAdvance(globalCtx)) {
Message_ContinueTextbox(globalCtx, ElfMessage_GetSariaText(globalCtx));
this->actor.update = func_80A05114;
}
@ -1308,21 +1308,21 @@ void func_80A05208(Actor* thisx, GlobalContext* globalCtx) {
func_80A04DE4(this, globalCtx);
if ((func_8010BDBC(&globalCtx->msgCtx) == 4) && func_80106BC8(globalCtx)) {
if ((Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_CHOICE) && Message_ShouldAdvance(globalCtx)) {
switch (globalCtx->msgCtx.choiceIndex) {
case 0: // yes
naviCUpText = ElfMessage_GetCUpText(globalCtx);
if (naviCUpText != 0) {
func_8010B720(globalCtx, naviCUpText);
Message_ContinueTextbox(globalCtx, naviCUpText);
} else {
func_8010B720(globalCtx, 0x15F);
Message_ContinueTextbox(globalCtx, 0x15F);
}
this->actor.update = func_80A052F4;
break;
case 1: // no
func_80106CCC(globalCtx);
Message_CloseTextbox(globalCtx);
this->actor.update = func_80A053F0;
func_80A01C38(this, 0);
this->fairyFlags &= ~0x20;
@ -1339,22 +1339,22 @@ void func_80A052F4(Actor* thisx, GlobalContext* globalCtx) {
func_80A04DE4(this, globalCtx);
if (func_8010BDBC(&globalCtx->msgCtx) == 4) {
if (func_80106BC8(globalCtx)) {
if (Message_GetState(&globalCtx->msgCtx) == TEXT_STATE_CHOICE) {
if (Message_ShouldAdvance(globalCtx)) {
globalCtx->msgCtx.unk_E3F2 = 0xFF;
switch (globalCtx->msgCtx.choiceIndex) {
case 0: // yes
this->actor.update = func_80A05188;
func_8010B720(globalCtx, 0xE2);
Message_ContinueTextbox(globalCtx, 0xE2);
break;
case 1: // no
this->actor.update = func_80A05208;
func_8010B720(globalCtx, 0xE1);
Message_ContinueTextbox(globalCtx, 0xE1);
break;
}
}
} else if (func_8002F334(thisx, globalCtx)) {
} else if (Actor_TextboxIsClosing(thisx, globalCtx)) {
this->actor.update = func_80A053F0;
func_80A01C38(this, 0);
this->fairyFlags &= ~0x20;
@ -1384,7 +1384,7 @@ void func_80A053F0(Actor* thisx, GlobalContext* globalCtx) {
thisx->flags |= 0x10000;
}
if (func_8002F194(thisx, globalCtx)) {
if (Actor_ProcessTalkRequest(thisx, globalCtx)) {
func_800F4524(&D_801333D4, NA_SE_VO_SK_LAUGH, 0x20);
thisx->focus.pos = thisx->world.pos;