fig02
078e21f6c6
InitVars -> Profile (#2011 )
...
* rename ActorInit
* rename actorInit
* rename initInfo
* EffectSs Profile
* _InitVars -> _Profile
* format, loose ends
* revert tutorial
2024-08-02 17:50:02 -04: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
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
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
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
Dragorn421
57ce0cf8d9
Doc/Cleanup pass on object handling ( #1227 )
...
* `Object_InitBank` -> `Object_InitContext`
* Add and use `OBJECT_SPACE_SIZE_BASE`
* Remove `OBJECT_EXCHANGE_BANK_MAX` -> use `ARRAY_COUNT()` instead
* "object status" -> "object load entry"
* Misc. cleanup/renames
* Partial docs and way too much batch renaming and cleanup for a single commit
* ctrl shift h
* format
* format clang-11.1
* fix regressions
* Improve a `@bug` comment
* Move `OBJECT_SPACE_SIZE_BASE` from header to near `Object_InitContext`
* "objectID" -> "objectId"
* Revert iterator index to `i` in `Actor_KillActorsWithUnloadedObject`
* "object load entry index" -> "object entry"
* `Object_UpdateLoadEntries` -> `Object_UpdateEntries`
* Run format.sh
* "object entry" -> "object slot" (except internal usage)
* Proper `Object_SpawnPersistent` doc
Co-authored-by: fig02 <fig02srl@gmail.com>
* fixup one comment "object bank index" -> "object slot"
* Amend `Object_SpawnPersistent` comment to mention running out of free slots
* `Actor_KillActorsWithUnloadedObject` -> `Actor_KillAllWithMissingObject`
* Remove useless mention of what uses `Object_SpawnPersistent`
* Fix mistake on `Object_SpawnPersistent` doing sync dma, not async
* run formatter
* `Object_InitContext` -> `Object_Init`
* `waitObjectSlot` -> `requiredObjectSlot`
* `Object_Init` -> `func_80097DD8`
* one objectIndex -> objectSlot
* Remove `OBJECT_SPACE_SIZE_BASE`
* light fix on the merge (rm OBJECT_EXCHANGE_BANK_MAX)
* `func_80097DD8` -> `Object_InitContext`
---------
Co-authored-by: fig02 <fig02srl@gmail.com>
2023-09-19 14:10:12 -04:00
Dragorn421
ab90300062
Rename vt.h to terminal.h ( #1339 )
...
* `vt.h` -> `terminal.h`
* `VT_` -> `T_` (as in Terminal)
* `vt.h` -> `terminal.h` in includes too Pepega
* Sort out tiny terminal.h include inconsistencies
* Format
* -> `TE_`
* format
* `TE_` -> back to `VT_` (parkour!)
* explicit VT
2022-11-01 19:17:11 -04:00
Dragorn421
c0a0688dc5
Remove const from ActorInit initvars declarations ( #1417 )
2022-10-24 19:29:38 -04:00
Roman971
b0bfa9eb69
Fix asset file includes to always start with assets/ ( #1260 )
...
* Fix asset includes to consistently start with assets/
* Fix header paths in asset xmls to start with assets/
* Remove -Iassets from compiler options
2022-06-06 15:37:25 -04:00
Dragorn421
1a41694d58
Add enum for setup dls and name z_rcp.c functions ( #1196 )
...
* Introduce `SetupDL` enum
* wip
* wip
* Remove comments on each setupdl index
* Name setup dl functions by setupdl index
* `Gfx_SetupDl` -> `Gfx_SetupDL`
* Run formatter
* globalctx -> play
* fix regressions
* `Gfx_SetupDL` -> `Gfx_SetupDL_` (add separating underscore)
* `CallSetupDL` -> `SetupDL`
2022-06-03 18:25:48 -04:00
fig02
2e6279bc8e
PlayState Rename ( #1231 )
...
* global context -> play
* fix PlayState* PlayState
2022-05-21 14:23:43 -04:00
EllipticEllipsis
eadc477187
New relocation-generating program ( #1016 )
...
* Update makefiles
* git subrepo clone git@github.com:EllipticEllipsis/fado.git tools/fado
subrepo:
subdir: "tools/fado"
merged: "46c4d751a"
upstream:
origin: "git@github.com:EllipticEllipsis/fado.git"
branch: "master"
commit: "46c4d751a"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* git subrepo pull tools/fado
subrepo:
subdir: "tools/fado"
merged: "88114ebce"
upstream:
origin: "git@github.com:EllipticEllipsis/fado.git"
branch: "master"
commit: "88114ebce"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* A few ideas for computing dependencies
* Remove reserved identifiers from spec.h and util.h
and add required headers
* Fix a couple more headers
* Program for reloc prerequisites
* git subrepo pull tools/fado
subrepo:
subdir: "tools/fado"
merged: "36a905f72"
upstream:
origin: "git@github.com:EllipticEllipsis/fado.git"
branch: "master"
commit: "36a905f72"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* Update makefile to make dependency files and use overlay's name
* git subrepo pull tools/fado
subrepo:
subdir: "tools/fado"
merged: "43c339a59"
upstream:
origin: "git@github.com:EllipticEllipsis/fado.git"
branch: "master"
commit: "43c339a59"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* Change awk to grep, delete ZAPD files, gitignore elf
* Delete all the cfg files
* Fix memory leaks
* Rename and add coloured errors
* Makefile tweaks
- preprocess spec before grep
- split order prerequisites via phony target to reduce dependency edges
- remove `resources` target
- remove separate overlays targets
- use `$(SPEC)` throughout
- change to using filenames of relocs for overlay names via `$*`
- Rearrange targets to better reflect their categories
* Update gitignore
* Review
* Add a check for the reloc file name
* get_segment_by_name
* get_stmt_id_by_stmt_name
* Cleaning up
* algorithm change
* function rename
* Fix typos
Co-authored-by: angie <angheloalf95@gmail.com>
2022-02-06 14:40:26 -05:00
Dragorn421
a9284494f2
Use defines for actor flags ( #873 )
...
* Add ACTOR_FLAG_ defines
* Add ACTOR_FLAGS_ALL macro and use ACTOR_FLAG_* constants everywhere
* Remove unused ACTOR_FLAG_* constants
* actor flags in bigokuta & ko
* actor flags in obj_mure
* actor flags in stalfos, twinrova & ganon2
* actor flags in morpha & barinade
* name some previously missed actor flags
* found some comments using hex for actor flags
* Actor flags in ovl_En_Ganon_Mant
* Actor flags in EnWf
* Flags in en_zf
* Actor flags in BossGanon (FeelsOKMan)
* Remove `ACTOR_FLAG_NONE`
* Wrap expansion of `FLAGS` in parentheses
* `ACTOR_FLAGS_ALL` -> `CHECK_FLAG_ALL`
* Move `CHECK_FLAG_ALL` to `macros.h`
* Run formatter
2021-12-05 19:11:38 -05:00
fig02
e635e34265
Remove THIS macro ( #1047 )
...
* remove THIS
* fix
* forgot dorf
2021-12-04 11:33:00 -05:00
Dragorn421
669732abbe
Misc Cleanup 2 ( #1007 )
...
* Cleanup `UNK_TYPE`, `UNK_PTR` usage
* Add some missing empty lines after declarations
* Remove some legacy comments from non-matching times
* Fix some grammar (mostly "it's"/"its")
* Use proper names for two symbols after ZAPD bugfix
* Cleanup `place_title_cards.xml`
* Use `NULL` to check against `D_8012D260` pointer
* Parentheses around some macro arguments
* wip proofread headers up to z64animation.h
2021-11-30 18:40:42 -05:00
louist103
e3f1ccd902
Fix all headers to comply with C standard ( #957 )
...
* Fix all headers to comply with C standard
* fix a file in libultra
* Update include/stdbool.h
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* Update stdbool.h
* Update z64animation.h
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2021-09-15 19:24:19 -04:00
Roman971
15c3a5eb91
Remove InitVars declarations from actor headers ( #939 )
...
* Remove InitVars declarations from actor headers
* Remove unused files in ovl_En_Ms
2021-09-01 15:03:52 -04:00
Dragorn421
89634377c6
Cleanup symbols from undefined_syms.txt (2nd round) ( #934 )
2021-08-31 19:00:55 -04:00
Lucas Shaw
0f644b7545
Decompiled A LOT of objects ( #815 )
...
* .
* remove tools/ZAP2 from origin master
* object_spot04_objects
* remove accidentally added xml
* object_spot00_objects
* object_bombf ok
* object_dy_obj
* object_masterzoora
* object_mastergolon and object_masterkokirihead
* object_aob
* object_gt
* object_gt
* object_geff
* object_mag kinda
* object_gjyo_objects OK
* object_ani OK
* object_door_gerudo
* object_md and object_trap
* object_js OK
* object_goroiwa
* object_gs
* object_nwc
* object_niw
* object_ane
* object_os_anime OK
* object_d_hsblock OK
* object_fz OK
* object_ru2 OK
* fixed object_mag
* object_cow OK
* object_spot01_objects OK
* object_spot15_obj
* object_umajump OK
* object_spot18_obj
* object_spot12_obj
* fix symbols in z_item_b_heart
* object_bdan_objects & object_bowl
* object_ddan_objects
* object_owl OK
* object_spot01_matoyab.xml OK
* object_haka OK
* object_heavy_object
* object_ingate and objet_menkuri_objects
* objet_spot00_break & object_relay_objects OK
* object_spot01_matoya OK
* object_spot06_objects OK
* undefined_syms
* object_spot08_obj OK
* object_efc_doughnut & object_zg
* object_ik OK
* object_vm
* object_ei OK
* object_ds OK
* updated spec
* map_48x85_static OK
* object_zl1 & object_peehat ok
* some z_parameter naming and other undefined symbol stuff, object_yukabyun OK
* object_bubble & object_fw ok
* object_shopnuts
* restore delete file
* object_timeblock OK
* object_d_lift OK
* object_kibako2 OK
* object_mamenoki OK
* matches
* remove unused asm
* object_mag ok now
* fixed object_ani
* done for now, im tired
* object_bdan_objects fixed up
* fix bdan
* object_bombf fixed
* object_bowl fixed up
* object_cow fixed
* did more, im tired
* fixed some stuff in object_ddan_objects
* fix object_ddan_object
* object_door_gerudo fixed
* object_ds fix
* object_dy progress
* fixed great fairy
* some more
* more
* object_haka fix
* progress
* ingo_gate fixed
* object_js
* forgot collision
* object_relay_objects fixed
* object_kibako2
* object_mag fixed
* u64* to void*
* more u64* to void*
* object_mamenoki fix
* object_mastergolon & object_masterkokirihead fix
* mido is weird
* fixed build
* fix object_menkuri_objects
* add missing textures in object_menkuri_objects
* object_ms
* fixed object_peehat
* some cleanup stuff
* object_zg fix
* object_spot00_break fix
* object_niw fix
* object_nwc fixed
* object_ru2 object_rr and some of object_owl fix
* object_spot15_obj fix
* business scrub
* object_spot01_matoya fixed
* object_spot18_obj fix
* object_spot01_objects fix
* object_spot04_objects fix
* object_spot04_objects actually fixed
* object_spot12_obj fix
* object_timeblock fix
* object_spot06_objects fixed
* object_spot08_obj fix
* spot01_matoyab fix
* object_trap fix
* object_umajump fix
* object_vm fix
* z_en_niw_lady fix
* object_yukabyun fix
* object_zl1 fixed
* added offsets to object_os_anime
* object_md fix
* object_ane fix
* object_aob fix
* add palette comment
* object_spot00_objects fix
* spot00 fix
* remove unused asm
* updates
* Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815
* Updated object_bdan_objects, ran format.sh
* Change rgb5a1 to rgba16 in my object xmls
* Addressed Anghelo's comments
* review
Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
2021-08-05 11:53:58 -04:00
EllipticEllipsis
02b3640bde
Fix most actor compiler warnings ( #656 )
...
* functions.h
* Bg_Hidan_Kowarerukabe
* Demo_Geff
* Arrow_Fire
* Demo_Sa
* Arms_Hook
* En_Okarina_Effect
* Demo_Im
* Bg_Menkuri_Kaiten
* Bg_Spot09_Obj (minus CollisionHeader)
* Obj_Hsblock
* Obj_Elevator
* En_Anubice_Tag
* Bg_Ydan_Hasi
(minus BgYdanHasi_MoveWater return shenanigans)
* En_Heishi4
* Demo_Go
* Bg_Spot00_Break
* Bg_Hidan_Kousi
* Bg_Spot17_Bakudankabe
* Bg_Spot18_Basket
* En_Dha
* Bg_Jya_Goroiwa
* En_Js
* Bg_Mori_Hineri
* Bg_Spot18_Shutter
* Bg_Jya_Bombchuiwa
* Bg_Bdan_Objects
* Bg_Jya_Amishutter
* Bg_Toki_Swd
* En_Heishi2
* En_Fu
* Bg_Jya_Kanaami
* Bg_Pushbox
* Bg_Spot12_Saku
* En_Ani
* En_Zl1
* En_Vase
* Bg_Spot05_Soko
* En_Crow (and a rename in En_Firefly)
* Bg_Hidan_Fslift
* En_Dog
* Bg_Heavy_Block
* En_Boom
* Bg_Ddan_Kd
* Bg_Spot16_Bombstone
* Demo_Effect
* Bg_Hidan_Syoku
* En_Firefly
* En_Fw
* Bg_Jya_Bombiwa
* En_Fd
* ovl_Bg_Spot15_Saku
* En_Mb
* Bg_Spot18_Obj
* Bg_Zg
* Bg_Bdan_Switch
* En_Md
* En_Box
* En_Bw
* En_Viewer
* En_Hs2
* Bg_Ydan_Maruta
* En_St
* En_Ru1
* Bg_Ddan_Jd
* En_Sb
* Bg_Jya_Cobra
* Bg_Spot12_Gate
* Bg_Haka_Trap
* En_Ms
* En_Kakasi2
* En_Horse_Link_Child
* Obj_Bombiwa
* En_Ds
* En_Kz
* Bg_Umajump
* Bg_Spot03_Taki
* Door_Toki
* Item_Etcetera
* En_Ru2
* En_Niw
* Bg_Spot15_Rrbox
* Demo_Tre_Lgt
* Obj_Oshihiki
* Bg_Mjin
* Bg_Spot18_Futa
* Bg_Spot01_Idosoko
* En_Arow_Trap
* Bg_Mizu_Uzu
* En_Horse_Zelda
* Player
* fix func_800358DC to work in functions.h
* fix fix to functions.h
* enum fixes
* Some review comments addressed
* DynaPoly_GetActor standardisation
* ovl_Daiku_Kakariko
* ovl_En_Vase
* ovl_En_Mk
* ovl_Bg_Spot00_Hanebasi
* ovl_Bg_Spot06_Objects
* ovl_En_Go
* ovl_En_Go2
* ovl_Bg_Jya_Bombiwa
* ovl_En_Cs
* ovl_En_Dodojr
* ovl_En_Ny
* ovl_En_Mm2
* Apply review suggestion
2021-02-02 18:44:24 -05:00
fig02
00a5edea71
Actor Struct Changes (and a few related things) ( #617 )
...
* reformat header
* type -> category
* done for now i think
* some more stuff
* first -> head
* focus
* flag comment
* ground -> floor
* remove asm, name wrapper funcs
* name func, format
* review
* targetPriority, format
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "0305ec2c2"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git "
branch: "master"
commit: "0305ec2c2"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git "
commit: "2f68596"
* comment
* review
* feet flags
* horse shadow
2021-01-18 16:04:04 -05:00
i82orbom
2ca9c78838
z_demo_gt.c, 2/112 non matching ( #480 )
...
* Z_demo_gt.c
* More progress
* More progress
* Some more progress
* Mooore progress
* Removes unused asm
* Additional progress
* More progress
* 36 remaining
* More progress??
* 19 remaining
* some progress?
* First draw function decompiled
* func_80981694
* func_8097F508
* func_8097FF9C
* WIP
* func_80981E84
* func_80982244
* func_80981AA0 cannot believe it matched
* func_8097D7D8
* Rand functions matched
* Changes after rebase of GFX macros
* func_8097F280
* func_8097FDDC
* func_8097E824 some more progress, 2 left
* Removes unused ASM
* Cleanup / Function renaming
* More cleanup / Renaming
* review
* review
* format
Co-authored-by: i82orbom <i82orbom i82orbom@github>
Co-authored-by: fig <fig02srl@gmail.com>
2020-12-05 16:19:48 -05:00
fig02
3c5fe66dcd
Use macros for oGfxCtx accesses ( #465 )
...
* fix colliderinit typo
* fix initchain
* reloc
* add defines
* add defines
* missed some on merge
* rename gfxCtx and add comment
* remove space
2020-10-29 17:31:09 -04:00
Random
174af7384d
libultra cleanup ( #215 )
...
* cleanup libultra
* fixes
- use quotes instead of <> for includes
- add macros for zelda specific thread priorities
- fix Makefile
- properly format the remaining pfs structs
* fix button macros + add CHECK_BTN_ANY/CHECK_BTN_ALL
* remove ULTRA_ABS
* fix includes
* update z_player.c/z_lib.c + run format.sh
* merge upstream/master
* fix include in En_Goroiwa
* fix includes
2020-10-03 11:22:44 -04:00
Roman971
b8da64ee01
Improve PHYSICAL/VIRTUAL macros and match Interface_LoadActionLabel ( #371 )
2020-08-31 21:06:44 -04:00
Roman971
2a2fdf7f3e
Introduce OPEN_DISPS/CLOSE_DISPS macros ( #360 )
2020-08-29 19:00:17 -04:00
fig02
78d0883f04
Actor Cleanups ( #177 )
...
* rename init chains, colchkinfo, colider inits, damage tables
* actor cleanups
* fix collider init script names
* small fixes
* ichain arg name
* change dynapoly types and names
* revert enru1 data name
* and the type
* pr suggestions
2020-05-31 05:55:48 -04:00
Roman971
1425678d8a
More actor cleanup Part 3 ( #118 )
...
* Add custom types for actor specific functions (like actions)
* Add a forward struct declaration for all other actors
2020-05-05 18:53:15 -04:00
Roman971
f114df8929
More actor cleanup Part 2 ( #116 )
...
* Change all main actor functions to take a 'Actor* thisx' argument
* Change all actor callbacks to also take a 'Actor* thisx' argument
2020-05-04 15:02:51 -04:00
Lucas Shaw
045a92d7c3
Big actor cleanup (fixed) ( #69 )
...
* Started doing cleanup
* did more work
* did more migration
* migrated more rodata and worked on some structs
* did more work
* Removal of ROOM field from initvars, some rodata migration, some string decompilation
* General update
* Decompiled vt strings
* Tool work
* Tool improvements
* 270 overlay rodata files remaining
* better float handling
* floats
* Many more floats
* migrated boss_mo
* assorted fixes
* Migrated 10
* tool improvements
* migrated 10
* 10 more
* 1 more
* did a few more
* fixes
* 10 more
* more floats
* Did some more, updated migrate-rodata.py to 'modify' the C file after processing in order to make to compiler process it as if it was changed.
* removed changes made to script by accident
* migrated largest rodata - ovl_fishing
* Did some more
* 114 remaining
* 99 left !
* almost done migrating rodata
* did some more, done for tonight
* almost done, tried add support to the script for z_player
* All possible rodata migrated in actor overlays
* update
* removed static from all overlays, ran format.sh
* Removed unknown actor structs
* converted a few floats
* Added new lines to header files that were missing them. Removed unused asm files
* Removed unused asm files
* Formatting newlines
Further formatting
spacing
.float spacing
More space formatting
More spacing formatting
Removing .balign 4 after floats
Co-authored-by: Ethan Roseman <ethteck@gmail.com>
2020-04-14 14:16:34 -04:00
Random
43acba22a9
Fixes in PR #50 (3)
...
- Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps
- Rename gfxArr to dispRefs
2020-04-05 19:29:30 +02:00
Random
f818fb5299
Decompile graph.c
...
- decompile `graph.c` (2 non-matchings left)
- decompile `z_game_dlftbls.c`
- add noop macros in `gbi.h`
2020-04-04 18:12:59 +02:00
Roman971
51290f6126
Partially format header files
2020-03-22 22:50:15 +01:00
Roman971
8cfe7cce9f
Format all src C files
2020-03-22 22:20:03 +01:00
Ethan Roseman
124c93c5a9
Made suggested changes
2020-03-21 18:09:59 -04:00
Ethan Roseman
bb5ce4a656
Finished
2020-03-21 17:33:39 -04:00
Ethan Roseman
61a32a5820
1 more down, slight documentation
2020-03-21 14:27:58 -04:00
Ethan Roseman
3e8c79c670
More
2020-03-21 03:16:18 -04:00
Ethan Roseman
78c14f7fad
More progress
2020-03-20 02:20:55 -04:00
Ethan Roseman
db822f7d0f
More
2020-03-19 20:06:46 -04:00
Jack Walker
087f561f77
First proper commit.
2020-03-17 00:31:30 -04:00
