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
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
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
39d4217ecf
Match retail BossFd2_UpdateMane ( #1908 )
2024-03-04 12:35:48 -05: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
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
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
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
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
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
cadmic
8db76a27da
Match retail system_malloc.c and z_malloc.c ( #1683 )
...
* Match system_malloc.c and z_malloc.c
* Rename CHECK_POINTER
2024-02-02 15:01:49 -05:00
Dragorn421
0444a6f094
.clang-format: break short enums, TypenameMacros (#1671 )
...
* IndentPPDirectives: AfterHash
* AllowShortEnumsOnASingleLine: false
* IndentPPDirectives: BeforeHash
* format
* format
* TypenameMacros: [BAD_RETURN]
* IndentPPDirectives: None
2024-02-02 14:46:12 -05:00
cadmic
8c909c5d98
Match retail logutils.c and z_locale.c ( #1699 )
...
* Match retail logutils.c and z_locale.c
* Update src/boot/logutils.c
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
---------
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2024-02-02 13:45:02 -05:00
cadmic
a337416530
Match retail code_800D31A0.c ( #1698 )
2024-02-02 13:33:00 -05:00
cadmic
67d4f0f36a
Match retail z_skin.c, z_skin_awb.c, z_skin_matrix.c ( #1697 )
...
* Match retail z_skin_matrix.c
* Match retail z_skin_awb.c
* Match retail z_skin.c
* Remove same-line hacks
2024-02-02 13:29:58 -05:00
engineer124
f23a05eecd
Misc Small Retail Files Part 2 OK ( #1696 )
...
* z_draw.c OK
* more files
2024-02-02 13:15:38 -05:00
engineer124
387149fda0
Retail File Select OK ( #1695 )
...
* file select OK
* cleanup
* oops
* cleanup
2024-02-02 12:54:41 -05:00
fig02
23de92d2f9
Match z_debug for retail ( #1694 )
...
* match z_debug for retail
* prototype
* directive
2024-02-02 12:44:31 -05:00
cadmic
4e2d2885bc
Match retail padmgr.c and sys_rumble.c ( #1693 )
...
* Match retail padmgr.c
* Match retail sys_rumble.c
* Poke jenkins
2024-02-02 12:25:44 -05:00
cadmic
8f481b648d
Match retail effects files in code ( #1690 )
...
* Match code effects files
* Poke jenkins
2024-02-02 11:45:50 -05:00
cadmic
3be307bf35
Match stackcheck.c and code_800FC620.c ( #1656 )
...
* Match stackcheck.c
* Match code_800FC620.c
2024-02-01 23:17:17 -05:00
fig02
c701a2181f
match z_actor_dlftbls ( #1679 )
2024-02-01 22:56:17 -05:00
fig02
8d0076b010
Match retail Title and Sample gamestates ( #1692 )
...
* match title and sample
* change to directive
* no bad return
2024-02-01 19:52:52 -05:00
engineer124
9289b0211d
Retail z_player_lib.c OK ( #1689 )
...
* z_player_lib OK
* space
* line break
2024-02-01 19:36:48 -05:00
engineer124
a6d5e00925
z_scene_table.c OK ( #1691 )
2024-02-01 19:07:37 -05:00
engineer124
1e21f69b37
z_play retail OK ( #1688 )
...
* z_play OK
* cleanup spacing
* PR
2024-02-01 17:00:27 -05:00
engineer124
e33d76568c
Misc Small Retail Files OK ( #1687 )
...
* shrink_window, z_lib, z_lights OK
* sys_cfb.c OK
* cleanup
2024-02-01 11:15:53 -05:00
cadmic
7c5ab8fcec
Use IDO_PRINTF_WORKAROUND everywhere ( #1685 )
2024-02-01 10:11:33 -05:00
cadmic
99fd784bc2
Match sys_matrix.c ( #1682 )
2024-02-01 09:13:24 -05:00
fig02
593a86014c
Retail z_scene matching ( #1677 )
...
* one left
* cursed match for Scene_CommandObjectList
* format
* revert printf modification for permuter
* more bad-returns
* format
* typedef scene command func
2024-02-01 09:29:02 +01:00
Tharo
5e8e01f110
z_view.c gc-eu-mq OK ( #1681 )
...
* z_view.c retail
* Replace PERSPECTIVE_EDITOR_ACTIVE, adjust PRINTF selection condition
* Macro-ify View_ErrorCheckEyePosition
2024-01-31 20:09:16 -05:00
Derek Hensley
2bc159e518
Irqmgr and Sched Retail OK ( #1678 )
...
* irqmgr OK
* sched OK
* PR review renames
2024-01-31 19:26:31 -05:00
Derek Hensley
06379c3109
Gamealloc, Graph, and Graphalloc retail OK ( #1675 )
...
* Gamealloc OK
* Graph + Graphalloc OK
* PR review
* gfxalloc
* new lines
* Remove imposter
2024-01-31 19:07:12 -05:00
engineer124
a0d31dba68
Document Audio Thread Commands ( #1399 )
...
* begin docs
* cleanup
* copy over progress
* cleanup
* small cleanup
* more docs, fill out cmds
* small touchup
* pan weight ganon comment
* fix specId
* seqcmd cleanup
* format
* small cleanup
* one more thing
* small feedback from MM
* partial PR
* some PR Suggestions
* small adjustments
* ticks, seqticks, frames, updates: term cleanup
* small fix
* PR Review
* PR Review
* PR Review
* rm param
* adjust comment
* update renamed functions
* format
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-01-31 18:25:23 -05:00
cadmic
87a886df5b
Match sys_math3d.c ( #1674 )
2024-01-30 21:42:15 -05:00
engineer124
8ae003b0d7
z_actor retail OK ( #1670 )
...
* actor ok
* cleanup
* cleanup
* cleanup
* player
* ACTOR_PRINTF
* PR Suggestion
* gcc
* c file
* ACTOR_DEBUG_PRINTF
* bool
* more review
* newline
2024-01-30 21:07:34 -05:00
cadmic
8ea4cb87e5
Match retail z_std_dma.c ( #1665 )
...
* Match z_std_dma.c
* Fix DmaMgr_Error doc comment
* Unindent
2024-01-30 19:53:16 -05:00
cadmic
17da5e7bf9
z_collision_check.c OK ( #1642 )
...
* Match z_collision_check.c
* Disable function declarations
* Remove /* OOT_DEBUG */
* Remove newlines around ifdef
* Newlines
* Tweak z_actor.c #if to avoid merge conflicts
2024-01-30 19:43:10 -05:00
Derek Hensley
77c9c97ff9
Overlay_Relocate and Overlay_Load retail OK ( #1662 )
...
* Overlay_Relocate OK
* Overlay_Load
* format
* PR + better match for Overlay_Load
2024-01-30 19:30:27 -05:00
fig02
8be8848f85
z_demo retail code matched ( #1655 )
...
* match all functions
* format
* clarify between 'dest' and 'skip' debug features
* format
* better match for CutsceneHandler_RunScript
* review
* format
* remove macro
2024-01-30 18:52:04 -05:00
engineer124
af6b821193
Audio retail OK ( #1650 )
...
* general OK
* wait for data
* sfx and sequence
* PR Suggestions
* debug file
* data
* PR
2024-01-30 18:24:13 -05:00
cadmic
18b7030534
Revert bad uses of if (OOT_DEBUG) ( #1666 )
2024-01-30 15:19:00 -05:00
Derek Hensley
7b770dc1e0
vr_box OK ( #1663 )
2024-01-30 14:22:55 -05:00
Yanis42
24df1480a3
Match `z_select.c` ( #1659 )
...
* match ``z_select.c``
* add missing newline
* missed newlines
* ifdef -> if
2024-01-30 14:17:49 -05:00
cadmic
9816f62129
Define OOT_DEBUG=0 in retail builds ( #1658 )
...
* Define OOT_DEBUG=0 in retail builds
* Fix ifndef
* Replace VI_MODE_EDITOR_INACTIVE
* Revert "Replace VI_MODE_EDITOR_INACTIVE"
This reverts commit f7c4cae7c3
2024-01-30 13:54:38 -05:00
engineer124
6d09437c21
Retail z_quake.c and z_room.c OK ( #1661 )
...
* quake OK
* z_room OK
2024-01-29 21:08:35 -05:00
cadmic
5ba625b171
Match yaz0.c ( #1660 )
2024-01-29 18:14:30 -05:00
Yanis42
9f169a67cd
Match `game.c` - OK ( #1644 )
2024-01-29 15:27:29 -05:00
cadmic
64d384b4c1
is_debug.c and boot_main.c OK ( #1641 )
...
* Match is_debug.c and boot_main.c
* Disable function declarations
* Remove /* OOT_DEBUG */
* Remove newlines around ifdef
2024-01-29 12:10:28 -05:00
cadmic
be731f8a35
Move __osPfsInodeCache and __osPfsPifRam ( #1654 )
...
* Move __osPfsInodeCache to pfsgetstatus.c
* Move __osPfsInodeCache to contfps.c and __osPfsPifRam to pfsisplug.c
2024-01-29 07:30:29 -05:00
cadmic
6e0d67f9ec
Check formatting in CI ( #1652 )
...
* Check formatting in CI
* Move deleteDir() to cleanup section
* Revert "Move deleteDir() to cleanup section"
This reverts commit 4b0dd80cac
2024-01-29 07:25:58 -05:00
cadmic
8af0919e7d
Match idle.c ( #1643 )
2024-01-29 12:48:06 +01:00
engineer124
795f7e5251
z_parameter retail OK (#1649 )
...
* z_parameter okay
* no u32
2024-01-28 16:20:21 -05:00
Yanis42
8a8b6cf90b
Match `main.c` - OK ( #1645 )
...
* main.c OK
* removed comment
* better match
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-28 15:46:08 -05:00
cadmic
0e6dc594e9
Match z_en_dodongo.c ( #1640 )
2024-01-28 13:17:57 -05:00
cadmic
88aa6de9ff
Match z_en_bom.c ( #1639 )
2024-01-28 13:03:33 -05:00
Anghelo Carvajal
3d9db8d34d
Setup rom decompression and compression ( #1614 )
...
* decompress baserom
* cleanup
* specific hash check
* rename baserom
* git subrepo clone (merge) --branch=5da3132606e4fd427a8d72b8428e4f921cd6e56f git@github.com:z64tools/z64compress.git tools/z64compress
subrepo:
subdir: "tools/z64compress"
merged: "5da313260"
upstream:
origin: "git@github.com:z64tools/z64compress.git"
branch: "5da3132606e4fd427a8d72b8428e4f921cd6e56f"
commit: "5da313260"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* setup compression
* Add all compressed segments to the spec
* Update md5 files
* readme instructions
* cleanup
* Setup python dependencies on Jenkinsfile
* Update Makefile
Co-authored-by: cadmic <cadmic24@gmail.com>
* review
* . .venv/bin/activate
* update readme
* whoops
* Yeet other versions from decompress_baserom.py
* my bad
* Move everything to baseroms/VERSION/
* Active venv on each command
* jenkinsfile: use multiline syntax
* Put the correct path on the jenkinsfile
* Forgot to call per_version_fixes
* CC0
* Update readme
* Change where baserom segments are put into
* Update Makefile
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update crunch64
* Label compressed instead of uncompressed
* Update README.md
Co-authored-by: fig02 <fig02srl@gmail.com>
* Fix
* `make rom`
* baserom-uncompressed
* Update README.md
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update README.md
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update README.md
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update README.md
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update README.md
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* review
* baserom-decompressed.z64
* ignore baseroms
* rm -rf tools/z64compress
* wip crunch64-based compress.py
* OK compress
* use ipl3checksum sum directly for cic update on compressed rom
* multithreading
* "docs"
* fix MT: move set_sigint_ignored to global level for pickling
* license compress.py
* rm junk
* Fix (or at least sort out) compress_ranges.txt dependencies
* Update tools/overlayhelpers/damage_table.py
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
---------
Co-authored-by: cadmic <cadmic24@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-24 13:00:10 -05:00
Dragorn421
5e406f754e
Small Math_Vec3f_Yaw doc ( #1433 )
...
* Small `Math_Vec3f_Yaw` doc
* remove actor from arg names
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-18 17:56:54 -05:00
cadmic
6b5533ccd9
Create debug macros for LogUtils functions ( #1610 )
2024-01-16 09:59:02 -05:00
cadmic
a5fbfdba01
Move Scene_SetTransitionForNextEntrance to z_scene.c ( #1609 )
2024-01-16 09:50:28 -05:00
Phil
616d6d4e46
Named a couple things in z_boss_ganon2.c ( #1606 )
...
* Fixed minor style inconsistencies for CollisionCheckInfoInit
* Minor renaming in z_boss_ganon2.c
* Update z_boss_ganon2.c
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-12 11:56:16 -05:00
mzxrules
f4306900ee
en_honotrap MM sync ( #1564 )
...
* MM pr suggestions
* more changes to match MM
* linebreak in switch
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-12 11:38:14 -05:00
Dragorn421
4982f32384
Name actor flags 1: ACTOR_FLAG_REACT_TO_LENS, ACTOR_FLAG_IGNORE_POINT_LIGHTS ( #1583 )
...
* 7 -> `ACTOR_FLAG_REACT_TO_LENS`
* move comment above actor flag
* 22 -> `ACTOR_FLAG_IGNORE_POINT_LIGHTS`
* newlines between flags
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2024-01-12 10:48:54 -05:00
cadmic
324db1d578
Replace most osSyncPrintf calls with PRINTF macro ( #1598 )
...
* Replace most osSyncPrintf calls with PRINTF macro
* DEBUG -> OOT_DEBUG
2024-01-12 10:38:13 -05:00
Dragorn421
1a8772e540
Cleanup z_collision_check 1 ( #1427 )
...
* Cleanup `z_collision_check.c` and structs
* Revert `other*` names to master, split to other pr
* WIP/experimental: `ColliderCylinderElement`
* Revert "WIP/experimental: `ColliderCylinderElement`"
This reverts commit cfc8c32ace
2024-01-11 10:30:47 -05:00
cadmic
cd917b0cb8
Create debug macros for common functions ( #1597 )
...
* Create debug macros for common functions
* Revert NDEBUG change
* MALLOCR -> MALLOC_R
* DEBUG -> OOT_DEBUG
* Use the same name for debug and non-debug matrix functions
* Fix file/line argument order
* Revert g[s]DPNoOp[Tag]
* Use SystemArena_MallocDebug directly in GameAlloc_MallocDebug
* MTXF_TO_MTX -> MATRIX_TO_MTX
2024-01-09 07:59:03 -05:00
engineer124
e146d7bc26
Introduce Face Reaction Enum ( #1586 )
...
* face reactions
* cleanup
* cleanup fake match
* PR Review
* while I'm here
* mask reaction
* small fix
* Small cleanup
* oops
2024-01-08 17:17:22 -05:00
Phil
dcab429bf2
Fixed minor style inconsistencies for CollisionCheckInfoInit ( #1603 )
2024-01-05 18:57:05 -05:00
Yanis42
21cb04db2c
Document `z_bg_mizu_movebg.c` ( #1565 )
...
* document z_bg_mizu_movebg.c + assets
* remove temp comment
* renamed "temp" variable
* review 1
* format + type names comments at dLists/colHeaders
* review 2
* review 3
* named dragon statue 1
* float -> floating + review
* format
* review 5
2023-12-15 15:33:50 -05:00
fig02
2b5b0fac06
name shock and burn functions ( #1594 )
2023-12-15 08:53:51 -05:00
krm01
e3316c9fb1
[Doc] Actor Bg_Bdan_Objects (Jabu Jabu misc dungeon actors) ( #1577 )
...
* bdan_objects type 2
* other bdan object types
* finish off bigocto platform
* run formatter
* remove stray comment
* add namespacing prefix to enums
* abbreviate camera to cam
* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* fix typo on enum
* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.h
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* enum name fixes
* remove unnecessary enum assignment
* Waterbox -> WaterBox
* named union, sfx to use SFX_FLAG
* friendly names for enums
* fix over-eager sed rename
* indent union fields
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2023-12-11 10:55:35 -05:00
fig02
0ed57f61b7
Cleanup: Remove uneeded casts on collider members ( #1595 )
...
* rm casts
* format
2023-12-10 14:53:51 -05:00
hiisuya
cc96184a96
Doc Actor: En_Ma1 (Child Malon) ( #1584 )
...
* started malon documentation
* docd all event and inf table checks
* doc cleanup
* ran formatter
* fixed misnamed eventcheck
* revert isNotSinging oops
* removed unnecessary comments
* changed from handle to update
* revert vec3f name change
* moved texture information
* isNotSinging to singingDisabled
* rename of inftable and eventchk
* small cleanup
* anim enum change
* enum names for child malon limbs
2023-12-10 14:36:12 -05:00
cadmic
2ab90bc517
Document a bug in Actor_ChangeCategory where actors may not be updated correctly ( #1587 )
...
* Document Actor_ChangeCategory bug
* Reword
* actor update function -> actor update
2023-11-30 20:18:00 -05:00
Tharo
5ce4670fd1
Documentation for audio_thread_manager.c ( #1562 )
...
* Documentation for audio_thread_manager.c
* Fixes
* Move AudioTask back to z64audio.h and include in audiomgr.h, adjust bug comment
* Adjust AudioMgrDebugLevel enum
2023-11-30 16:22:30 -05:00
engineer124
f2c06ce441
Misc Cleanup ( #1585 )
...
* misc cleanup
* more fake matches
* revert for sym
2023-11-22 04:19:31 -05:00
krm01
2aaa286cf8
[Doc] Actor Bg_Hidan_Fslift (Fire Temple hookshot elevator) ( #1579 )
...
* doc bg_hidan_fslift
* improve name for hookshot block pos function
* comment explaining cameraSetting
* improve comment
* Update src/overlays/actors/ovl_Bg_Hidan_Fslift/z_bg_hidan_fslift.c
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* rename to Idle
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2023-11-19 13:34:25 -05:00
engineer124
aef0335681
Struct Returns ( #1574 )
...
* change args
* PR Review
* format
2023-11-19 11:17:31 -05:00
engineer124
3d1ee33d7b
Document Actor "OfferTalk" ( #1567 )
...
* OfferTalk
* rm comment
* exch to offer in comment
* reword again
* Partial PR Review
* Actor_AcknowledgeTalking
* Actor_TalkOfferAccepted
* PR Review
* rm part of comment
* rm comment
2023-11-19 11:11:59 -05:00
fig02
c11ce9c994
Player Docs: Some Item Action function names ( #1575 )
...
* progress
* unname shield upper action
* add more to sword comment
2023-11-19 09:38:49 -05:00
hiisuya
68bdbf7759
Doc Actor: En_Brob (Jabu Jabu Wobble Flesh Block) ( #1581 )
...
* brob function naming
* modified brob header file
* renamed skel, collision, and anims
* named limbs and dls
* renamed shock function
* ran formatter
* doc modifications
* Update assets/xml/objects/object_brob.xml
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
---------
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2023-11-19 05:11:52 -05:00
engineer124
81a3c3da32
More Camera Flags ( #1453 )
...
* Generic Camera Flags
* New flag names
* Add flags to functions
* Finish flag docs
* More docs
* More cleanup
* More clarity
* Better shrinkwindow flag docs
* Improve name
* CAM_INTERFACE_FLAGS
* Better approach to edge cases
* Change ordering for consistency
* Oops
* Add masks to macro
* PR/Discord discussions
* cleanup comment
* Oops
* PR Suggestions
* More PR Feedback
* More PR Suggestions
* More Camera Flags
* PR Suggestions
* More flag style change
* Small cleanup
* More flag docs
* Another flag
* Fix flags
* sync names with other PRs
* more fixes
* fix comments
* update with hud visibility mode docs
* missed one
* fix comments
* Roman PR Suggestions
* interfaceField
* small fix
* letterbox cleanup
* cleanup
* fix macro arg
* fix func declaration
* many more docs
* better docs?
* missed some
* oops, revert
* add flags to name
* cleanup
* flag
* double signal
* simplify cam func name
* more suggestions
* PR Suggestion
2023-11-19 02:17:32 +01:00
krm01
d1df4e4c7e
bombowlman typo ( #1582 )
2023-11-18 12:30:36 -05:00
krm01
0a48348f8d
doc for menkuri_eye ( #1580 )
2023-11-14 14:20:23 -05:00
Dragorn421
4c75260097
Fix misc 21 ( #1573 )
...
* Make `sNew` in (unused) `code_800FC620.c` a string
It is passed as a filename to `__osMallocDebug` so should be a nul-terminated string, not a char[3] missing an explicit \0
* Fix gcc warning in `JpegDecoder_ParseNextSymbol` about SLL on negative value
-1U is an unsigned value, aka 0xFFFFFFFF
I keep -1 because it seems that's what a jpeg standard has too
References:
https://stackoverflow.com/questions/40508958/shifting-a-negative-signed-value-is-undefined
https://www.w3.org/Graphics/JPEG/itu-t81.pdf (page 105, figure F.12)
* Small cleanup
* Fix few mistakes (thanks gcc warnings)
* Add `@bug` in file select settings draw code, using the wrong array
* format
* format main
* rename arg for a happy formatter
* Move important function call out of a printf
2023-11-12 16:59:52 -05:00
Javarooster
dc323052c3
Changed gLinkChildSlinghotStringDL to gLinkChildSlingshotStringDL ( #1576 )
2023-11-12 00:01:55 +01:00
fig02
836adb83ea
Rename "ITEM_LAST_USED" ( #1572 )
...
* rename
* format
* remove formatter changes
* change model group comments
2023-11-07 14:11:59 -05:00
fig02
042a5c5530
rename to upper action ( #1570 )
2023-11-04 02:59:12 -04:00
Dragorn421
8718a5c8c0
Remove (ActorFunc) casts in initvars ( #1571 )
...
* Remove `(ActorFunc)` casts in initvars, use `/**/` trick for format
Achieved by using the following regex:
(ActorInit.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*)(\n\s+)(?:\(ActorFunc\))?(.*\n\};)
replaced with
$1$2/**/ $3$4/**/ $5$6/**/ $7$8/**/ $9$10/**/ $11$12/**/ $13$14/**/ $15$16/**/ $17$18/**/ $19
plus a change from /**/ to #if 0 #endif in docs/
* Manual fixes
2023-10-30 10:19:16 -04:00
