mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-11 09:20:17 +00:00
No longer use asm-processor (#1824)
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "b3bfa14cf"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "b3bfa14cf"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo"
commit: "110b9eb"
* use CS_FLOAT
* update csdis
* update committed csdata
* finish updating csdis.py
* add script to reextract committed csdata
* dont use asm-processor, use iconv for reencoding utf8 to eucjp
* remove asm-processor csdata usage remnants
* --cs-float hex
* delete tempfile at end of reencode.sh (may want to rm even if compilation fails though?)
* comment reencode.sh
* comment CMD_F
* do not break permuter guessing compile command, by not reencode.sh-wrapping compilation under PERMUTER (thanks anghelo)
* fix the permuter fix
* pad -> sBssDummyNeg1
* reencode.sh: rm tempfile on script exit (including on error)
* renumber sBssDummy vars in zcolchk from 0
* Revert "--cs-float hex"
This reverts commit 85267dc348
.
* Revert BSS changes
* Add linemarker to reencoded files for better error message
* fix audio/general.c bss
* make reencode.sh work on macOS
* touch up csdis, csdis_re
---------
Co-authored-by: cadmic <cadmic24@gmail.com>
This commit is contained in:
parent
c9e97a3055
commit
bdee3d33b4
53 changed files with 3279 additions and 1771 deletions
|
@ -1259,7 +1259,6 @@ u32 sOcarinaInputButtonCur;
|
|||
u32 sOcarinaInputButtonStart;
|
||||
u32 sOcarinaInputButtonPrev;
|
||||
s32 sOcarinaInputButtonPress;
|
||||
s32 sOcarinaUnused;
|
||||
u8 sCurOcarinaSongWithoutMusicStaff[8];
|
||||
u8 sOcarinaWithoutMusicStaffPos;
|
||||
u8 sOcarinaHasStartedSong;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue