mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-15 20:35:13 +00:00
Code Issues Projects Releases Wiki Activity

More descriptive names for CS_BEGIN_CUTSCENE and CS_END (#2311)

Browse source 
* rename CS_BEGIN_CUTSCENE and CS_END

* matching

* naming consistency for END command, improved comments

* remove CS_CMD_NONE

Co-authored-by: mzxrules <mzxrules@gmail.com>

* remove comma from end of enum

* git subrepo pull --force tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "c04562d30"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "c04562d30"
git-subrepo:
  version:  "0.4.9"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "cce3d93"

---------

Co-authored-by: mzxrules <mzxrules@gmail.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
This commit is contained in:
mracsys 2024-12-02 16:50:58 -05:00 • committed by GitHub
parent 3f703a39d9
commit bdc774058d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
29 changed files with 82 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tools/csdis.py
View file

@ -484,7 +484,7 @@ Argument format:
"""
cutscene_command_macros = {
-1:
("CS_END()", 1, None, None,
("CS_END_OF_SCRIPT()", 1, None, None,
None, None),
3:
("CS_MISC_LIST(%w1:1:s)", 2, None, 0,
@ -551,7 +551,7 @@ cutscene_command_macros = {
None, None),
}
begin_cutscene_entry = ("CS_BEGIN_CUTSCENE(%w1:0:s, %w1:1:s)", 2, None, None,
begin_cutscene_entry = ("CS_HEADER(%w1:0:s, %w1:1:s)", 2, None, None,
None, None)
unk_data_entry = ("CS_UNK_DATA_LIST(%w1:0:x, %w1:1:s)", 2, None, 0,
@ -757,7 +757,7 @@ def disassemble_cutscene(cs_in):
i += n_words_list_item
else:
i += n_words
print("Warning: cutscene reached maximum entries without encountering a CS_END command")
print("Warning: cutscene reached maximum entries without encountering a CS_END_SCRIPT command")
return macros
def hex_parse(s):