mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-04 15:04:31 +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

75
tools/csdis.py
View file

@ -138,32 +138,55 @@ cutscene_terminator_destinations = {
ocarina_action_ids = {
0x00: "OCARINA_ACTION_UNK_0",
0x01: "OCARINA_ACTION_FREE_PLAY_OCARINA",
0x02: "OCARINA_ACTION_MINUET",
0x03: "OCARINA_ACTION_BOLERO",
0x04: "OCARINA_ACTION_SERENADE",
0x05: "OCARINA_ACTION_REQUIEM",
0x06: "OCARINA_ACTION_NOCTURNE",
0x07: "OCARINA_ACTION_PRELUDE",
0x08: "OCARINA_ACTION_SARIAS_SONG",
0x09: "OCARINA_ACTION_EPONAS_SONG",
0x0A: "OCARINA_ACTION_ZELDAS_LULLABY",
0x0B: "OCARINA_ACTION_SUNS_SONG",
0x0C: "OCARINA_ACTION_SONG_OF_TIME",
0x0D: "OCARINA_ACTION_SONG_OF_STORMS",
0x0E: "OCARINA_ACTION_OCARINA_ACTION_UNK_E",
0x0F: "OCARINA_ACTION_MINUET_PLAYBACK",
0x10: "OCARINA_ACTION_BOLERO_PLAYBACK",
0x11: "OCARINA_ACTION_SERENADE_PLAYBACK",
0x12: "OCARINA_ACTION_REQUIEM_PLAYBACK",
0x13: "OCARINA_ACTION_NOCTURNE_PLAYBACK",
0x14: "OCARINA_ACTION_PRELUDE_PLAYBACK",
0x15: "OCARINA_ACTION_SARIAS_SONG_PLAYBACK",
0x16: "OCARINA_ACTION_EPONAS_SONG_PLAYBACK",
0x17: "OCARINA_ACTION_ZELDAS_LULLABY_PLAYBACK",
0x18: "OCARINA_ACTION_SUNS_SONG_PLAYBACK",
0x19: "OCARINA_ACTION_SONG_OF_TIME_PLAYBACK",
0x1A: "OCARINA_ACTION_SONG_OF_STORMS_PLAYBACK",
0x01: "OCARINA_ACTION_FREE_PLAY",
0x02: "OCARINA_ACTION_TEACH_MINUET",
0x03: "OCARINA_ACTION_TEACH_BOLERO",
0x04: "OCARINA_ACTION_TEACH_SERENADE",
0x05: "OCARINA_ACTION_TEACH_REQUIEM",
0x06: "OCARINA_ACTION_TEACH_NOCTURNE",
0x07: "OCARINA_ACTION_TEACH_PRELUDE",
0x08: "OCARINA_ACTION_TEACH_SARIA",
0x09: "OCARINA_ACTION_TEACH_EPONA",
0x0A: "OCARINA_ACTION_TEACH_LULLABY",
0x0B: "OCARINA_ACTION_TEACH_SUNS",
0x0C: "OCARINA_ACTION_TEACH_TIME",
0x0D: "OCARINA_ACTION_TEACH_STORMS",
0x0E: "OCARINA_ACTION_UNK_E",
0x0F: "OCARINA_ACTION_PLAYBACK_MINUET",
0x10: "OCARINA_ACTION_PLAYBACK_BOLERO",
0x11: "OCARINA_ACTION_PLAYBACK_SERENADE",
0x12: "OCARINA_ACTION_PLAYBACK_REQUIEM",
0x13: "OCARINA_ACTION_PLAYBACK_NOCTURNE",
0x14: "OCARINA_ACTION_PLAYBACK_PRELUDE",
0x15: "OCARINA_ACTION_PLAYBACK_SARIA",
0x16: "OCARINA_ACTION_PLAYBACK_EPONA",
0x17: "OCARINA_ACTION_PLAYBACK_LULLABY",
0x18: "OCARINA_ACTION_PLAYBACK_SUNS",
0x19: "OCARINA_ACTION_PLAYBACK_TIME",
0x1A: "OCARINA_ACTION_PLAYBACK_STORMS",
0x1B: "OCARINA_ACTION_UNK_1B",
0x1C: "OCARINA_ACTION_CHECK_MINUET",
0x1D: "OCARINA_ACTION_CHECK_BOLERO",
0x1E: "OCARINA_ACTION_CHECK_SERENADE",
0x1F: "OCARINA_ACTION_CHECK_REQUIEM",
0x20: "OCARINA_ACTION_CHECK_NOCTURNE",
0x21: "OCARINA_ACTION_CHECK_PRELUDE",
0x22: "OCARINA_ACTION_CHECK_SARIA",
0x23: "OCARINA_ACTION_CHECK_EPONA",
0x24: "OCARINA_ACTION_CHECK_LULLABY",
0x25: "OCARINA_ACTION_CHECK_SUNS",
0x26: "OCARINA_ACTION_CHECK_TIME",
0x27: "OCARINA_ACTION_CHECK_STORMS",
0x28: "OCARINA_ACTION_CHECK_SCARECROW",
0x29: "OCARINA_ACTION_FREE_PLAY_DONE",
0x2A: "OCARINA_ACTION_SCARECROW_LONG_RECORDING",
0x2B: "OCARINA_ACTION_SCARECROW_LONG_PLAYBACK",
0x2C: "OCARINA_ACTION_SCARECROW_RECORDING",
0x2D: "OCARINA_ACTION_SCARECROW_PLAYBACK",
0x2E: "OCARINA_ACTION_MEMORY_GAME",
0x2F: "OCARINA_ACTION_FROGS",
0x30: "OCARINA_ACTION_CHECK_NOWARP",
0x31: "OCARINA_ACTION_CHECK_NOWARP_DONE",
}
"""