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
cadmic
769986874c
Finish player ( #1895 )
2024-02-26 14:24:14 -05:00
cadmic
10bae68937
Match En actors A-C, and a few more ( #1890 )
2024-02-24 13:00:37 -05:00
cadmic
7d128adf83
Match more of player for retail ( #1893 )
2024-02-24 12:47:17 -05:00
cadmic
93295a842b
Match some entity actors H-N ( #1827 )
2024-02-22 09:08:40 -05:00
cadmic
33d8044e45
Match retail demo actors ( #1745 )
...
* Match GetCue functions
* Match retail demo actors
* Add redundant parentheses around kREG(X) == Y in z_demo_gt.c
* Remove goto in DemoEffect_DrawLightEffect
* Rename "dl"
* Comment on possible array
* Use the word "fake"
* Remove redundant return
2024-02-20 15:15:52 -05:00
cadmic
5c31e686f6
More bg actors ( #1743 )
2024-02-20 07:00:55 -05:00
cadmic
b32d0a91ed
Match even more retail actors ( #1720 )
...
* Match even more actors
* Add macro for DebugDisplay_AddObject
* Prefer OOT_DEBUG &&
* Better EnReeba_Stunned match
* Revert "Add macro for DebugDisplay_AddObject"
This reverts commit 8197823abb
.
* Prefer OOT_DEBUG && some more
* Reformatting
* Add fake match comment
2024-02-13 09:10:28 -05:00
cadmic
6c405b6ea3
Match retail PreRender_DivotFilter ( #1740 )
2024-02-10 11:38:04 -05:00
cadmic
097db907ca
Match the rest of z_onepointdemo.c ( #1739 )
2024-02-09 13:26:20 -05:00
cadmic
ea17b9619e
Match OnePointCutscene_Init by inlining static data ( #1738 )
...
* Match OnePointCutscene_Init by inlining static data
* Inline what's left of z_onepointdemo_data.inc.c
2024-02-09 13:17:24 -05:00
cadmic
10ebdf9ff5
Match retail z_message_PAL.c ( #1736 )
2024-02-09 13:08:28 -05:00
fig02
f492c04186
match function ( #1737 )
2024-02-08 17:23:22 -05:00
engineer124
488b0e7783
Retail kankyo OK ( #1735 )
...
* only Environment_Update plus 1 fake match
* more WIP
* remove fake matches
* Environment_Update OK
* void
* add fake comment
* better match for update
* cleanup
* fix fake match
* more fixes
* add comment
2024-02-08 08:57:06 -05:00
engineer124
63f0033fe5
Match Retail BgCheck ( #1734 )
...
* 2 funcs left
* so close
* bgcheck OK
2024-02-08 08:47:07 -05:00
engineer124
e48cdaf598
Match Retail Kaleido Code Files ( #1702 )
...
* OK
* PR Review
2024-02-08 08:40:08 -05:00
cadmic
53b0114464
Match InitDynaPoly actors ( #1733 )
...
* Match InitDynaPoly actors
* Change BgJyaBombiwa_SetupDynaPoly pads to s32
* kzIceScale -> sKingZoraRedIceScale
2024-02-07 18:58:46 -05:00
engineer124
563f717bc6
Misc 1: Retail Overlay Actors OK ( #1703 )
2024-02-07 19:46:51 +01:00
Derek Hensley
92203011b8
Skelanime + Kanfont Retail OK ( #1729 )
...
* Skelanime retail OK
* kanfont retail OK
* PR review
2024-02-07 11:11:56 -05:00
cadmic
bc9c1f2be2
Match more code files ( #1724 )
2024-02-07 11:03:55 -05:00
cadmic
be4f3142e0
Match retail z_sram.c ( #1722 )
2024-02-07 10:41:12 -05:00
cadmic
300b3a8ffd
Match retail z_fbdemo.c and z_fbdemo_fade.c ( #1727 )
...
* Match retail z_fbdemo.c and z_fbdemo_fade.c
* Tweak macro arguments
2024-02-07 00:32:23 -05:00
cadmic
e7b37c6d60
Reorder boot/code spec includes for retail ( #1667 )
...
* Shuffle spec segments for retail
* Remove z_text.o from retail
* Un-#if DebugCamera_ScreenTextColored
2024-02-06 21:48:02 -05:00
fig02
13143f4743
Retail Player matches part 2 ( #1725 )
...
* match a couple
* match some more
* revert accidental newline removal
2024-02-05 23:30:50 -05:00
fig02
c240184229
Retail Player_Update/Noclip mode + some docs ( #1718 )
...
* matched but its kinda ugly
* goto
* semi-colon to stop formatter
* some more docs
* noclip function doc
* remove noclip function from retail
* newline
* format
* reword noclip function comment a bit and fix typo
* format
* changes to doc comments
* reorganize button check
2024-02-05 18:13:15 -05:00
Derek Hensley
a2945801d6
rcp retail OK ( #1713 )
...
* rcp OK
* Format
2024-02-05 11:35:27 -05:00
Lucas Shaw
36d4756e59
z_construct.c retail OK ( #1716 )
2024-02-05 02:17:23 -05:00
Derek Hensley
f3df4d13b8
Overlay Effects Retail OK ( #1717 )
...
* Effect_Ss_Bomb Retail OK
* Effect_Ss_Bomb2 Retail OK
* Effect_Ss_Stone1 Retail OK
2024-02-05 02:12:28 -05:00
Lucas Shaw
7d2b7bce50
PreRender.c retail 1 not matching ( #1710 )
...
* one more function in prerender
* one non matching
* ran format.py
* var name change
2024-02-05 06:19:02 +01:00
fig02
a46941a195
Retail Player Matches part 1 ( #1712 )
...
* player matches part 1
* remove noclip if for now
* remove direvtive
2024-02-04 23:38:28 -05:00
cadmic
454b1caa52
Match more retail actors ( #1711 )
...
* More actors
* Format
2024-02-04 22:28:18 -05:00
cadmic
0cbcebfded
Match some overlay effects files ( #1705 )
2024-02-03 17:36:35 -05:00
cadmic
178e95ae50
Give debug_malloc.c the same treatment as system_malloc.c and z_malloc.c ( #1700 )
2024-02-03 10:59:25 -05:00
cadmic
d9a1148d13
Match retail __osMalloc.c ( #1684 )
...
* Match retail __osMalloc.c
* Add TODO about N64 ArenaNode debug info
* FLAG prefix -> FLAG suffix
2024-02-02 17:37:32 -05:00