mirror of
https://github.com/zeldaret/oot.git
synced 2024-12-25 06:06:05 +00:00
bdee3d33b4
* 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>
12 lines
416 B
Text
12 lines
416 B
Text
; DO NOT EDIT (unless you know what you are doing)
|
|
;
|
|
; This subdirectory is a git "subrepo", and this file is maintained by the
|
|
; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
|
|
;
|
|
[subrepo]
|
|
remote = https://github.com/zeldaret/ZAPD.git
|
|
branch = master
|
|
commit = b3bfa14cf432115a0a675d243f3a1b3197f17cbd
|
|
parent = 59017f201eae4a1bc9212ea2c7dc51d4a036108b
|
|
method = merge
|
|
cmdver = 0.4.6
|