Commit Graph
449 Commits
Author SHA1 Message Date
Kenix3andGitHub c94fd6ccbc Updates README to add an FAQ, and also updates CONTRIBUTING to be explicit on the reservation workflow process. (#245) 2021-09-02 10:31:28 -04:00
Anghelo CarvajalandGitHub e6b73951c6 Fix renamed functions in EnDodongo (#285) 2021-09-01 21:25:29 -04:00
6fb180d0e1 En_Holl (Loading Halls/Holes) OK and mostly documented. (#270)
* EnHoll_Destroy() matching.

* EnHoll_Update() matching.

* EnHoll_Draw() matching and mostly documented.

* func_808999B0() matching and mostly documented.

* En_Holl OK (some asm remains)

* Renamed macros.

* func_80899B88 matching, but control flow could use some work.

* Got rid of GOTO in func_80899B88.

* Removed as many returns and magic numbers as currently possible.

* Renamed previous two functions to EnHoll_ChangeRooms and
EnHoll_VisibleIdle.

* EnHoll_SetAlwaysZero matching.

* EnHoll_TransparentIdle matching.

* func_8089A0C0 matching and mostly documented.

* func_8089A238 matching and mostly documented.

* Deleted last GLOBAL_ASM pragma.

* Final documentation for En_Holl PR.

* Switched spec to generated reloc.

* Clean up macros.

* Rename functions.

* Simplify name of ActionFunc array.

* Renamed globalCtx->unk_18878 to bgCoverAlpha.

* Ran format.sh.

* Added c file header.

* Update src/overlays/actors/ovl_En_Holl/z_en_holl.c

add trailing comma to sActionFuncs[]

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Update src/overlays/actors/ovl_En_Holl/z_en_holl.c

replace UNK_TYPE with s32.

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Run format.sh.

* s32 pad and declaration formatting

* Remove comma in EnHoll_TransparentIdle.

* Renamed sThis to sInstancePlayingSound.

* renamed gfxP to dl

* Improved affine transformation documentation.

* ran format.sh

* Updated documentation to be doxygen compatible.

* Extracted assets.

* fix bss

* Update src/overlays/actors/ovl_En_Holl/z_en_holl.c

replace bitmask == 0 with !

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* Rename extracted asset variables.

* Renamed argument to macro functions to match .c

* renamed Vertices to Vtx.

* Renamed Vtx and DL.

* Update src/overlays/actors/ovl_En_Holl/z_en_holl.c

Shorten documentation.

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Apply suggestions from code review

Newline changes for readability.

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_Holl/z_en_holl.c

* Update src/overlays/actors/ovl_En_Holl/z_en_holl.c

Change oldCurrRoom to tempRoom.

* Apply suggestions from code review

engineer124's suggestions

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-09-01 19:39:01 -04:00
MaideandGitHub c96d1df320 En_Dodongo (#242)
* En_Dodongo

* NBS

* PR

* PR

* PR

* PR
2021-09-01 18:53:12 -04:00
f21f393fcc EnBigpo (Big Poh) (#250)
* EnBigpo: start

* EnBigpo: uhh, this struct is weird

* EnBigpo: progress

* EnBigpo: so many of these functions are tiny

* EnBigpo nasty four loop function

* EnBigpo: hate draw functions

* EnBigpo: all functions attempted

* EnBigpo: data migrated, does not OK, 2 bytes off...

* Multi: Attempting to OK, issues

* EnBigpo: more docs

* EnBigpo: more docs2

* EnBigpo: more docs and cleaning

* EnBigpo: removed data to try to find the issues, matched a draw function thanks to Tharo

* EnBigpo: progress? maybe not

* EnBigpo: matched another function

* EnBigpo: overwrite limbdraw matches now

* EnBigpo: one more nonmatching rejected

* EnBigPo: not actual progress, probably

* Match Init, down to single stack pointer on second func

* EnBigPo OK

* EnBigpo: docs and cleaning

* EnBigpo: more docs and cleaning

* EnBigpo: back to OK with no warnings

* EnBigpo: more docs and cleaning

* EnBigpo: docs and cleaning

* EnBigpo: hmm, rename_sym doesn't like renaming system functions but I'm 98% sure I know what these are

* Multiple: changed some function names, maybe changed too much... hmm

* EnBigpo: even more changes to docs

* EnBigpo: formater pass

* EnBigpo: small fixes

* EnBigpo: c file description

* Apply suggestions from code review

Apply camera suggestions from eng124

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* EnBigpo: updating all requested changes and reverting one incorrect macro

* Apply suggestions from code review

Some of eng124's recommendations, need to add the last by hand

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* EnBigpo: back to OK

* EnBigpo: Minor cleanup changes

* Functions fixed: added function changes to actorfixer and fixed dinofos

* EnBigpo: BINANG_ROT180

* Apply suggestions from code review

First batch of requested changes, the simpler ones that shouldn't require checking

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* EnBigpo: fixes to recommended changes, back to OK

* EnBigpo: move idleTimer docs out of struct

* Sprite: removed old commented out pragma, it matches, I still dont get it

* EnBigpo: more changes I had to check first

* EnBigpo: more requested changes, and some macro uses found

* EnBigpo: forgot a requested change

* Update src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* EnBigPo: missed a disphead array access

* Apply suggestions from code review

More requested changes

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* EnBigpo: more hex to dec

* EnBigpo: more hex to dec 2

* Update src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update include/functions.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* EnBigpo: build being weird

* EnBigpo: weird, rename_sym didn't catch this earlier

* Tools: fixed actorfixer to use Play_CameraSetAtEye forgot I blew this change away trying to get build again,

* Update src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.h

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>

* EnBigpo: cutscene functions changed name to indicate they are stages

* EnBigpo: Rename Particles to Effect

* EnBigpo: changed draw function names, changed function comment format

* EnBigpo: renamed limbdraw functions, formater pass

Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-09-01 18:44:42 -04:00
MaideandGitHub e1cb76c258 En_Dnq (#240)
* En_Dnq

* NBS

* PR

* PR

* PR
2021-09-01 18:03:51 -04:00
Anghelo CarvajalandGitHub 97e066f23f Update asm-processor and diff.py (#278)
* fix asm differ branch

* git subrepo pull --force tools/asm-differ

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "fd0984c97"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "main"
  commit:   "fd0984c97"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* delete asm-processor

* git subrepo clone git@github.com:simonlindholm/asm-processor.git tools/asm-processor

subrepo:
  subdir:   "tools/asm-processor"
  merged:   "755f734fb"
upstream:
  origin:   "git@github.com:simonlindholm/asm-processor.git"
  branch:   "main"
  commit:   "755f734fb"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* re-add build.py

* remove subrepo

* git subrepo pull --force tools/asm-differ

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "1dfba80e1"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "main"
  commit:   "1dfba80e1"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
2021-08-25 01:11:41 -04:00
Anghelo CarvajalandGitHub 5ece221fe2 Port sfxconvert (#276) 2021-08-25 00:41:07 -04:00
MaideandGitHub e6d263b738 En_Dnk (#237)
* En_Dnk

* NBS

* PR

* PR
2021-08-24 19:38:19 -04:00
MaideandGitHub 7263ce0894 Fix functions.h (#273)
* functions.h

* PR
2021-08-24 00:11:13 -04:00
Tom OvertonandGitHub f0749d583c Obj_Kibako2 OK (#249)
* Data migrated and ObjKibako2_Init OK

* ObjKibako2_Destroy OK

* func_8098EC68 OK

* Commit what I have on Update as I figure it out

* Name skulltulaNoiseTimer and get a little closer to matching Update

* Wrap Update in NON_MATCHING for now

* Get this ready to push up

* func_8098ED20 OK (but it's not an actionFunc???)

* ObjKibako2_Draw OK

* func_8098E9C4 OK

* Turns out globalCtx *is* needed

* func_8098E8A8 OK

* Save my progress on func_8098E5C0 for now

* func_8098E900 OK

* func_8098EB78 OK

* Clean up some if-conditionals

* Delete pointless forward declaration

* ObjKibako2_Break OK

* Update names to match OoT equivalent

* func_8098E5C0 OK (though a little weird)

* ObjKibako2_Update OK

* Clean, document, and name ObjKibako2_ShouldBreak

* Clean and name ObjKibako2_ContainsSkulltula

* Some more cleanup

* Why did I mix snake case with camel case lol

* Update spec now that everything matches

* Actually rename the data

* sn/cs -> sin/cos

* Use true/false in ObjKibako2_ShouldBreak

* Use the AC_HIT macro and don't use the temp where it isn't needed

* Use macro and enum for contents

* Get rid of fake temp in Init

* Macros for collectible ID/Flag

* 0xFFFD -> ~AC_HIT

* In macros, x -> this

* Just kidding, use thisx for macros

* Add description to the top of C file

* Run ./format.sh after installing clang-format-11

* char -> UNK_TYPE1

* Remove unnecessary struct padding

* Initialize thisPos at the same time it's declared

* Clean up parentheses for bitwise operations to make it clearer what they do

* Clean up control flow in ObjKibako2_Idle

* Remove extraneous parentheses

* Move instantialization up in ObjKibako2_ContainsSkulltula

* Move tempRand instantiation up in ObjKibako2_Break

* Move collectible instantiation up in ObjKibako2_SpawnCollectible

* Remove extra brackets

* Remove extra brackets (again)

* Move contents instantiation up in ObjKibako2_Init
2021-08-23 22:14:18 -04:00
EllipticEllipsisandGitHub 04343a1202 z_construct OK (#267)
* z_construct OK

* Rename
2021-08-18 11:24:57 -04:00
EllipticEllipsisandGitHub fa95f9e6e8 Migrated a lot of boot bss, matched a few NON_MATCHINGs in boot (#266)
* Import bss to boot_main and idle, match last function in idle

* Some pointer cleanup in idle, spec

* Clean up idle, add build.c, add bss to CIC6105

* Import rand bss

* sptask bss and a macro

* sptask updated to use libultra macros

* siacs.c bss

* Macros in CIC and idle

* controller bss

* seteventmesg bss

* spec

* pimgr and piacs bss

* initialize OK, threadsave, initialize, pimgr bss

* Match DmaMgr_Start

* Fix bss reorder using separate file

* Small cleanup of hex/dec in buffer sizes

* Add comment, remove unused bss from spec

* Merge remote-tracking branch 'upstream/master' into boot_bss

* Format

* Delete files

* remove commented-out structs

* Bit more cleanup

* Addressed reviews

* Format
2021-08-18 11:12:35 -04:00
49922b4856 system_malloc OK (#261)
* move system_malloc to boot_O2

* Rename StartHeap into SystemArena

* match

* fake system_malloc data

* fix return types

* Rename Alloc to Malloc

* Update tools/disasm/files.txt

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>

* fix spec

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-08-18 08:48:08 -04:00
MaideandGitHub 9eb438860c Sort actor functions and extern'd symbols (#259)
* Sort funcs

* PR
2021-08-15 14:04:28 -04:00
3e0801890d z_lifemeter (#247)
* z_lifemeter done.

* fix new warning I didn't saw. add variables.txt

* suggested changes

* add new texture ptrs to undefined_sym, changed heartTex & temp to TexturePtr in LifeMeter_Draw

* change hex literal to decimal and other small suggestions

* change bool to u32; change hexa literal to decimal in LifeMeter_IsCritical; renamed undefined sym to their D_02 addresses

* re-applied format.sh on z_lifemeter

* coding style fixes

* fix typo in undefined_sym

* named func and vars.

* changed modulo check

* add extra line after var declaration in LifeMeter_Draw

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* changed unkTimer to camelCase; timer constant as decimal; flip some comparison in LifeMeter_Draw

* uncomment & rename func_ in functions.h

* Update include/functions.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

Co-authored-by: Andzura <andzura@andzura.fr>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-08-15 12:20:35 -04:00
Derek HensleyandGitHub f90e3ee739 Color_RGBAu32 (#253)
* Renamed deprecated RGB5A1 to RGBA16

* Cleanup shopkeeper structs with Color_RGBAu32 and Vec3f

* Rename functions with RGB5A1 in them

* BSS fix
2021-08-15 10:56:20 -04:00
EllipticEllipsisandGitHub 5dc98392e0 sqrtf.c OK (#257)
* sqrtf OK

* spec

* format

* Move to libultra
2021-08-12 18:57:21 -04:00
MaideandGitHub 1a963884f3 Remove argument names from action funcs (#254) 2021-08-12 16:33:07 -04:00
TharoandGitHub 82cc274b6a Sort boot files (#260) 2021-08-10 22:15:31 -04:00
9333306738 z_face_reaction OK (#255)
* match function and split data

* import data

* Rename function and variable

* format data

* Fix data

* { 0 }

* Update src/code/z_face_reaction.c

Co-authored-by: rylieb <31797144+rylieb@users.noreply.github.com>

* Rename return variable in en_ossan

* textId

* Rylie's review

* Try to format this properly

* Format again

Co-authored-by: rylieb <31797144+rylieb@users.noreply.github.com>
2021-08-08 23:14:07 -04:00
Derek HensleyandGitHub 3bac4232fd Matched last function in Ovl_en_encount2 (#252)
* Matched last function

* Format

* Fix Gfx arrays
2021-08-08 23:08:01 -04:00
EllipticEllipsisandGitHub 823281291b Script fixes, Type 1 cylinders fixed, rename main (#256)
* Fix actor_symbols.py

* Temporary fix to rename_sym.sh

* Fix the few Type1 cylinders

* Rename main -> Main

* chmod rename_global_asm, fix asm in rename_syms

* Format
2021-08-08 23:01:51 -04:00
Derek HensleyandGitHub 36e6f8cb3d Update makefile so compression only starts if checksum matches (#265)
* Change  dependency to uncompressed

* Change all to just run compressed
2021-08-08 22:40:46 -04:00
MaideandGitHub 9dd5821669 En_Dg (#233)
* En_Dg

* Macros & Anim struct

* NBS

* PR

* PR

* Sort funcs/externs
2021-08-08 17:10:31 -04:00