cadmic
a94661054e
Revert "Replace ‾ with - in z_bg_gnd_iceblock.c for encoding into EUC-JP ( #1937 )" ( #1940 )
...
This reverts commit a9ec5e1245
.
2024-04-10 15:21:17 -04:00
cadmic
a9ec5e1245
Replace ‾ with - in z_bg_gnd_iceblock.c for encoding into EUC-JP ( #1937 )
2024-04-01 11:27:49 -04:00
cadmic
8bd599588c
Match retail camera ( #1917 )
...
* Create CAM_DEBUG_RELOAD_PARAMS and CAM_DEBUG_RELOAD_PREG macros
* Create debug macros for camera OREGs
* Move static data into Camera_Demo5
* Match retail camera functions, except Camera_Battle1
* Match camera data and bss sizes
* Restore R_CAM reg names, remove OREG_DEBUG[_SCALED]
* CAM_DATA_n -> CAM_GLOBAL_n
* Remove old debug macros
* Add braces to CAM_DEBUG_RELOAD_PREG macro
* Hackily match Camera_Battle1
* Format
* Better Camera_Battle1 match
* Format
* Revert R_CAM_N comments for sOREGInit
2024-03-30 23:48:06 -04:00
fig02
86bd6e9232
Document en_ba damage bug ( #1934 )
...
* comment on en_ba collision bug
* format
2024-03-29 11:27:34 -04:00
cadmic
4e1b0f6694
Fix various data issues in gc-eu-mq ( #1921 )
...
* Fix various data issues
* D_80153D78 -> sMessageDebuggerTextboxCount
2024-03-29 11:19:55 -04:00
cadmic
731fe6da82
Line up code segment for gc-eu-mq ( #1918 )
2024-03-29 11:11:45 -04:00
cadmic
93642f97bc
Use gcc -E
instead of cpp
to fix macOS build ( #1935 )
...
* Use `gcc -E` instead of `cpp` to fix macOS build
* -xc++ -> -xc
2024-03-29 11:03:28 -04:00
fig02
7445169e42
targetActor -> talkActor ( #1933 )
2024-03-24 12:27:45 -04:00
Tharo
ea72e87e92
Rework rom_header.s ( #1932 )
...
* Rework rom_header.s
* Offset comments, spaces in libultra version
* Adjust some comments, remove value arg from checksum macro
2024-03-23 13:06:00 -04:00
cadmic
8456e4be8a
Match retail ovl_kaleido_scope ( #1931 )
...
* WIP
* cleanup
* small progress
* small cleanup
* Finish retail ovl_kaleido_scope
* GREG + markPoint -> markPoint + GREG
---------
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2024-03-23 12:58:02 -04:00
cadmic
39de6ce293
Extract unused scene headers ( #1930 )
...
* Extract unused scene headers
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "1300a4f36"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "1300a4f36"
git-subrepo:
version: "0.4.6"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "110b9eb"
* Add more unused arguments to CS_LIGHT_SETTING
2024-03-23 12:38:05 -04:00
cadmic
872940d664
More data fixes ( #1929 )
2024-03-23 12:30:09 -04:00
fig02
bd0941405d
Document Player's Face and z_actor FaceChange functions ( #1928 )
...
* create some enums
* gonna try struct instead of array
* struct works. add docs too
* inline function comments
* fix function comment
* name faces, move enums
* rename textures
* outnames
* remove comments
* change comment slightly
* fixup face comments
* review
* offset comments
* add and use PLAYER_FACE_MAX
* typo
* more comment on blinkDuration
* another change to the comment
2024-03-23 12:21:45 -04:00
cadmic
07505dae37
Match retail build date ( #1926 )
2024-03-17 19:36:01 -04:00
Dragorn421
5834c335e6
git subrepo pull --force tools/fado ( #1924 )
...
subrepo:
subdir: "tools/fado"
merged: "7fad57f83"
upstream:
origin: "git@github.com:EllipticEllipsis/fado.git"
branch: "master"
commit: "7fad57f83"
git-subrepo:
version: "0.4.6"
origin: "https://github.com/ingydotnet/git-subrepo "
commit: "110b9eb"
2024-03-13 12:33:58 -04:00
cadmic
17d683780d
Make BSS ordering script check ordering for all sections ( #1920 )
...
* Rename bss_reordering.py -> check_ordering.py
* Check all segments for ordering issues, not just bss
* Reword error message
* mapfile_segments -> source_code_segments
* Remove redundant vram check
2024-03-09 17:28:46 -05:00
Tharo
0159d43352
mkldscript: Capture more special rodata sections for GCC ( #1919 )
2024-03-09 16:54:42 +01:00
Dragorn421
68a86d2d00
Colliders: change "touch, bump" to AT and AC (elems) ( #1637 )
...
* toucherFlags, bumperFlags -> atElemFlags, acElemFlags
* TOUCH_ -> ATELEM_
* BUMP_ -> ACELEM_
* ColliderElementTouch,Bump -> ColliderElementDamageInfoAT,AC
* toucher,bumper -> atDmgInfo,acDmgInfo
* Update docs and zcolchk funcs names
* run formatter
* remove the last mentions of "bump" for colliders
* Update renamed functions in disasm
2024-03-04 19:33:08 -05:00
cadmic
bf37ad1368
Move baserom segments to extracted/ ( #1916 )
...
* Move baserom segments to extracted/
* Add old baserom segments dir back to .gitignore
* Rename segments/ -> baserom/
2024-03-04 19:06:26 -05:00
cadmic
9a5b4f3845
Add script to report BSS reordering ( #1914 )
...
* Write script to report BSS reordering
* Pin pyelftools version
* Fail on unknown relocation types
* Add sanity check for shifted ROM
* segment -> mapfile_segment
* Fix inconsistent offset/address naming
* Format negative addends
* Don't attempt to find relocs in .bss sections
* Compare build_value to mapfile VRAM
2024-03-04 18:58:36 +01:00
cadmic
39d4217ecf
Match retail BossFd2_UpdateMane ( #1908 )
2024-03-04 12:35:48 -05:00
cadmic
b9d1fe50cc
Make distclean delete build artifacts for all versions ( #1909 )
2024-03-04 18:26:04 +01:00
cadmic
63a95da5db
Match retail BossMo_DrawCore ( #1907 )
2024-03-04 18:22:23 +01:00
cadmic
9c09dcd4cd
Match retail z_fishing.c ( #1905 )
2024-03-04 17:57:16 +01:00
cadmic
01a5fa9a45
Remove 0xFF padding from uncompressed ROMs ( #1910 )
...
* Remove 0xFF padding from uncompressed ROMs
* Add comment about overdump contents
* Update checksum in README
* Reword comment
2024-03-04 11:39:16 -05:00
cadmic
e7b1868d84
Match retail BossFd_DrawBody ( #1915 )
2024-03-03 17:07:51 -05:00
cadmic
9e5df5ba79
Remove reference to Cutscene_DrawDebugInfo in retail ( #1913 )
2024-03-02 16:14:48 -05:00
cadmic
0407594107
Hacks for building nes_font_static and nes_message_data_static with gc-eu-mq ( #1721 )
...
* Hack nes_font_static and nes_message_data_static
* Make hardcoded config a bit more consistent
* Put debug ROM first
* Reword comment
* Move nes_font_static hack to spec
* Restore extracted/gc-eu-mq
2024-03-02 16:05:15 -05:00
Dragorn421
feb64e6ad8
Match retail text for some actors ❤️ ( #1912 )
...
* Match retail text for some of my dear actors
* Fix fake `EnDoor_SetupType` match, ty cadmic
2024-03-02 15:36:38 -05:00
Dragorn421
ff81e2a891
Build fixups: build gc-eu-mq with extracted/dbg, remove asmproc pragmas ( #1911 )
...
* Remove asmproc recurse (somehow these two survived)
* Use `extracted/gc-eu-mq-dbg` anyway for gc-eu-mq
2024-03-02 12:47:10 -05:00
cadmic
6b9a2433ab
Match retail EnNiw_Update ( #1906 )
2024-03-01 22:20:05 -05:00
Dragorn421
a6f646dc65
Introduce extracted/VERSION, with text extracted there ( #1730 )
...
* Introduce assets/_extracted/VERSION, with text extracted there
* move to `extracted/text/`
* Update gitignore s
* rework args for msgenc.py
* put mkdir with others, until theyre all moved at once
* move 0xFFFC back to being extracted, making it use specific macro `DEFINE_MESSAGE_NES` to handle its special behavior
* prettier gitignore
* Move messages 0xFFFC, 0xFFFD to committed message_data.h
2024-03-01 22:09:57 -05:00
cadmic
ca45c543f6
Add script to print block numbers for BSS ordering ( #1707 )
...
* Write script to print block numbers for BSS ordering
* Rename to ido_block_numbers.py
* Update ido_block_numbers.py for reencode.sh
2024-03-01 16:40:27 -05:00
Dragorn421
bdee3d33b4
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>
2024-03-01 16:12:22 -05:00
cadmic
c9e97a3055
Mostly match retail bosses, part 1 ( #1898 )
...
* Retail bosses part 1
* Use GameState* local variable in BossGanon/BossGanon2 draw helper functions
2024-03-01 12:43:02 -05:00
Tharo
3670a48aee
Some GCC flags improvements ( #1903 )
...
* Some GCC flags improvements
* Move -fno-reorder-blocks -fno-zero-initialized-in-bss to assets only
* Add -fno-PIC since some gcc versions use -fPIC as default
* Enable builtin functions on gcc, with appropriate changes to missing_gcc_functions.c
and ultra64/libc.h
* Move -fno-merge-constants -mno-explicit-relocs -mno-split-addresses to overlays only
as they are only needed there for reloc reasons
* Remove unneeded casts in missing_gcc_functions.c
* Change gcc assets flags handling
2024-02-29 15:11:54 -05:00
Derek Hensley
1b60dcf6dd
Use Romfile in place of vromStart and vromEnd in structs ( #1742 )
...
* KaleidoMgrOverlay
* GameStateOverlay
* ActorOverlay
* EffectSsOverlay
* MapMarkDataOverlay
* Missed DEFINE_ACTOR_UNSET
* ROM_FILE_UNSET
* DEFINE_OBJECT_EMPTY
* DmaEntry
* ACTOR_UNSET
* romfile.h
* newline
* Format
2024-02-29 14:15:04 +01:00
Tharo
7a2c46d4eb
AVOID_UB for out-of-bounds access in AudioLoad_Init ( #1902 )
2024-02-28 09:06:03 -05:00
Tharo
c521f1f8ae
Remove gSystemHeap and use _buffersSegmentEnd instead, make buffer alignments explicit for gcc ( #1901 )
...
* Remove gSystemHeap and use _buffersSegmentEnd instead, make buffer alignments explicit for gcc
* ALIGNEDn -> ALIGNED(n), reposition alignment attribute for PreNmiBuff
* Correct positioning of ALIGNED for filter data in audio/lib/data.c
* Add ALIGNED to TypenameMacros
* ALIGNED(4) on same line for PreNmiBuff
* Revert audio load.c change, to be submitted separately
2024-02-27 19:01:47 -05:00
Tharo
6e2ea18154
Add proper bug comment for gSaveContext.save.dayTime getting cleared as s32 when it is u16 ( #1900 )
...
* Add proper bug comment for gSaveContext.save.dayTime getting cleared as s32 when it is u16
* Formatting?
2024-02-27 17:48:22 -05:00
cadmic
350b82c675
Restore terminal colors in retail, except in __osMalloc.c ( #1899 )
2024-02-27 14:08:20 -05:00
Tharo
dcf61174e9
Filename & line number args cleanup ( #1891 )
...
* Filename & line number args cleanup
* Use int for line number args over s32/u32
* Add missing const qualifiers from filename args
* Fix gcc warning in game.c
* Add comment to weird assignments in GameState_Init
2024-02-27 02:37:33 -05:00
cadmic
a32221c36e
Match retail z_en_ds.c, z_en_horse.c, z_en_fhg_fire.c ( #1897 )
...
* Actually match z_en_ds.c
* Match z_en_horse.c
* Match z_en_fhg_fire.c
2024-02-27 02:30:42 -05:00
cadmic
c6e3ef4570
Match retail code data sizes ( #1741 )
...
* Match retail audio data
* Fix various small code data problems
* Disable terminal colors in debug builds
* Match z_actor_dlftbls.c .rodata
* Use _3 for unused nameString macro parameter
* Move sDebugCutsceneScriptBuf to be in-function static
* Comment on actor name being NULL
* Split out padding the fault_drawer.bss.s
2024-02-27 02:23:19 -05:00
cadmic
c3faefc061
Fix some retail boot
data ( #1668 )
...
* Fix is_debug.c bss
* Fix stackcheck.c rodata
* Poke jenkins
* Don't introduce new variable
2024-02-27 01:53:10 -05:00
Tharo
7f64ace8f0
RNG doc ( #1892 )
...
* RNG doc
* Add some missing note qualifiers in comments
* code_800FD970 -> rand in Makefile and disasm CSVs
2024-02-26 22:21:25 -05:00
cadmic
57ae8ae1dd
Mostly match retail bosses, part 2 ( #1894 )
...
* Bosses part 2
* Remove newline
2024-02-26 22:16:38 -05:00
cadmic
1da87b1e7f
Match En actors D-G ( #1889 )
...
* Match entity actors D-G
* Remove SET_EN_GOROIWA_SPEED
* Actually match z_en_elf.c
* GET_EN_GOROIWA_SPEED -> EN_GOROIWA_SPEED
2024-02-26 21:55:30 -05:00
cadmic
c86bf5011b
Match entity actors O-T ( #1826 )
2024-02-26 21:39:44 -05:00
cadmic
cdd24f2ac6
Match retail En actors V-Z ( #1825 )
...
* Entity actors starting with Z
* Use CS_STATE_IDLE
* z -> playerPosZ
* Remove comment
2024-02-26 21:29:40 -05:00