3145 Commits
Author SHA1 Message Date
EllipticEllipsisandGitHub 3098767688 sethwinterrupt OK (#301) 2021-09-29 20:09:13 -04:00
EllipticEllipsisandGitHub ef875bc221 Improve check new warnings (#308)
* Change check_new_warnings to output stderr to console too

* Colour warnings and functions in check_new_warnings

* Remove unneeded prototype in EnDai

* Add multithreading options, colour to output, help

* Give Jenkins a script again

* Test

* Remove tput warnings, hopefully

* Try -T dumb

* Undo test warning
2021-09-29 18:42:24 -04:00
EllipticEllipsisandGitHub 5c06a6b240 Main OK (#329)
* Main OK, use defines where known

* Couple more defines

* Tharo's review

* Fix lifemeter bss
2021-09-29 18:27:07 -04:00
petrie911 745583303b merge, I hope 2021-09-29 12:13:07 -05:00
petrie911 0b54149025 Merge remote-tracking branch 'upstream/master' into Majora 2021-09-29 10:27:10 -05:00
petrie911 87da5d2b36 more functions 2021-09-29 10:26:28 -05:00
96cd49b6d5 ovl_En_Test4 with 1 non-matching (#319)
* Decompile update and stuff

* Decompile some more

* func_80A41FA4 non_matching

* init is a disaster

* Import bss

* match func_80A41D70

* Improve func_80A42AB8 a bit

* equivalent EnTest4_Init

* Import data

* CLOCK_TIME

* Run formatter

* func_80A42AB8 may be equivalent now, not completely sure

* match func_80A42AB8

* Some minor renames

* Name some struct members

* Format

* format in bigpo

* fix merge issue

* Apply suggestions from code review

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

* Description: Day transition effects

* Un-rename unk_144

* Update include/macros.h

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

* sIsLoaded

* Update src/overlays/actors/ovl_En_Test4/z_en_test4.c

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

* review

* format

* daytemp

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-09-29 00:08:54 -03:00
2f000058f5 ovl_select: ZELDA MAP SELECT matched and documented (#310)
* basic functions

* errr

* Progress, kinda

* func_808016E8

* func_808019FC and func_80801A64

* Import data

* Format

* some progress

* func_808013B8

* func_80801620

* fix stuff

* func_80800930

* improve func_80800A44 a bit

* At least it is equivalent now

* matches!

* small renames

* Use generated reloc

* move functions

* Renaming a lot of stuff

* Some functions renames

* Rename members

* Add translations for everything

* Run formatter

* Update include/alloca.h

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

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

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

* review changes

* review comments

* Update src/overlays/gamestates/ovl_select/z_select.h

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

* Update src/overlays/gamestates/ovl_select/z_select.h

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

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-09-28 22:23:08 -04:00
EllipticEllipsisandGitHub ddc643f708 ovl_opening OK (#300)
* ovl_opening OK

* un-format z64save.h

* Actually change the other uses of nextCutsceneIndex

* format

* Review

* engineer's review

* Get it to match again
2021-09-28 21:17:39 -04:00
Connor AndersonandGitHub 1713e8a97d ovl_En_Ending_Hero6 OK (#333)
* All functions in z_en_ending_hero6.c matching

* Add data to z_en_ending_hero6.c

* Remove duplicate declarations

* Add symbols to undefined_syms.txt

* Address initial PR comments

* Add heading, rename variables, and remove U suffix

* Further variable renamings according to PR suggestions
2021-09-28 20:50:04 -04:00
MaideandGitHub 9478fc760f Thiefbird (#290)
* Thiefbird

* Fix enums

* Rename funcs

* PR
2021-09-28 17:56:25 -04:00
Maide 831fa5485a Obj_Mine 2021-09-28 21:01:36 +01:00
MaideandGitHub edb1dd4675 En_Zot (#320)
* En_Zot

* PR
2021-09-28 10:28:06 -03:00
Tom OvertonandGitHub 0f4bdbc020 Obj_Etcetera (Deku Flower) OK and somewhat documented (#326)
* Migrate data to C

* ObjEtcetera_Init OK

* ObjEtcetera_Destroy OK

* ObjEtcetera_Update OK

* func_80A7C690 OK

* func_80A7C718 OK

* func_80A7C168 OK

* func_80A7BE8C OK

* Make the draw functions take Actor*

* CollisionCheck_SetAC should take a Collider

* func_80A7BDC8 OK (with silly dummy label meme)

* func_80A7C1F0 OK

* unk_276 is almost certainly a u16 since I constantly have to cast it, so just retype it

* func_80A7BF08 OK

* Some minor cleanup

* Convert D_80A7C80C to array of CollisionHeader*

* Finish defining struct to prepare for func_80A7C308

* func_80A7C308 OK

* Move gameplay_keep symbols to variables.h

* Explanatory comment at the top

* Type gameplay_keep animation headers too

* Update the spec (why do I always forget this?)

* Rename func_80A7BDC8 to ObjEtcetera_PerformFlutter (name still up for debate)

* Name objIndex

* Document the types of flowers

* Name displayListPtr

* Name burrowFlag and provide a macro

* Name specialFlutterScale and clean up some things with newer understanding

* Give the draw functions (bad) names

* Name ObjEtcetera_Idle

* Name ObjEtcetera_Setup (name sucks but oh well lol)

* Name ObjEtcetera_ReturnToIdle. These names all suck but they're a start

* Document some of ObjEtcetera_Idle's behavior

* Name and document objectIds

* Remove the burrow macro because it's frankly more confusing for now

* Name the draw functions something slightly better

* MUCH better names for things + more documentation

* Clean up ObjEtcetera_Setup a bit

* Call it NUMBER_OF_FLOWER_TYPES instead

* A few more name changes

* Link -> Player in comments

* displayListPtr -> dList

* Trailing commas + format

* Move initialization of type up

* Improve conditional check

* Use BGCHECK_SCENE macro

* Move initialization of floorBgId up

* Use documentation comment style

* Match ObjEtcetera_DoNormalOscillation without a dummy label

* param_2 -> arg1

* Insert blank line after scoped pad

* OBJETCETERA_TYPE -> DEKU_FLOWER_TYPE

* Cleanup and rename enum

* Break up ObjEtcetera_Setup a bit and convert DekuFlowerType to an s32 to remove warnings

* Whoops, run format

* Delete leading 0 on struct comments

* Rename pad to requiredScopeTemp to match my other PR
2021-09-28 08:18:31 -04:00
MaideandGitHub 27e41b73a8 En_Rd (#316)
* En_Rd

* PR

* a
2021-09-27 23:17:28 -03:00
petrie911 9b5864da9d merge master 2021-09-27 20:59:19 -05:00
petrie911 62ddc37c0e more matches 2021-09-27 20:58:01 -05:00
EllipticEllipsisandGitHub 14ad66b4ed ovl_title OK (#311)
* OK, asset XML made and symbols imported

* Missed a GLOBAL_ASM

* Remove data from spec

* engineer's review

* Correct arg

* Un-format functions.h

* Hopefully fix it
2021-09-27 21:29:30 -04:00
EllipticEllipsisandGitHub a6d26c82f2 afterprenmi.c OK (#297) 2021-09-27 21:00:55 -04:00
emilybrooksandGitHub de4cf63f63 obj_aqua OK (#321)
* setup

* almost done

* only 3 floating point registers swapped

* forgot newline

* Audio_PlaySoundAtPosition

* review suggestions

* missed a hex number

* matched func_80ACBDFC
2021-09-27 20:21:08 -04:00
f642ed6eef boot_0x80086760 OK and documented (#288)
* boot_80086760 OK, added fp header, resplit data

* Some more documentation, data imported with unions

* Sweep data under the rug

* Move the fp header properly

* Format

* include/fp.h header guards

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

* Engineer's review

* Fix typo

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

* Rename header

* while (true)

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-09-27 21:07:09 -03:00
ryliebandGitHub 1362615cc6 Add ctags "tags" files to .gitignore for vim users (#328) 2021-09-27 17:41:36 -04:00
EllipticEllipsisandGitHub c72b5788a3 sys_math, cosf OK and documented, sinf, coss, sins documented (#289)
* OK, data imported, document

* spec

* Match cosf, document sinf and cosf

* Some more documentation, switch fu back

* Format

* Little more documentation

* Document coss too

* Move macros

* Review, add some .s

* Fix headers, review
2021-09-27 17:41:07 -04:00
MaideandGitHub 039fc4623e En_Syateki_Man (#269)
* En_Syateki_Man

* a
2021-09-25 13:22:51 -03:00
Anghelo CarvajalandGitHub 456cf789ac Add -I. (#323)
* Add `-I.`

* IINC
2021-09-25 12:47:18 -03:00