Commit Graph
504 Commits
Author SHA1 Message Date
EllipticEllipsisandGitHub 151e098e48 z_debug OK (#330)
* z_debug OK

* Rename function

* Remove duplicate struct

* Update z64.h
2021-10-14 12:25:14 -03:00
engineer124andGitHub 3aeadb42b8 Macros: PLAYER -> GET_PLAYER(globalCtx) and ACTIVE_CAM -> GET_ACTIVE_CAM(globalCtx) (#283)
* PLAYER -> GET_PLAYER(globalCtx), ACTIVE_CAM -> GET_ACTIVE_CAM(globalCtx)

* formatter

* PR Suggestions

* `FIRST_ENEMY` -> `GET_FIRST_ENEMY(globalCtx)`

* Fix merge conflicts
2021-10-12 13:27:29 -03:00
EllipticEllipsisandGitHub 4c43661cf3 Decompile the GameStateOverlay table (#337)
* Decomp GameStateOverlayTable

* spec

* Review

* gSchedContext

* Format

* Fix bss
2021-10-12 10:25:20 -03:00
MaideandGitHub 94e6ebaec9 En_Fu (#343)
* En_Fu

* Fix non-matching, thanks Anon58
2021-10-11 16:48:03 -03:00
Anghelo CarvajalandGitHub d2ce39d24b Decomp sleep.c (#293) 2021-10-11 15:56:08 -03:00
EllipticEllipsisandGitHub 565b1f7579 flg_set.c OK and documented (#335)
* Draw OK, Update very much not

* Flag table imported

* Update OK

* Actually OK this time

* Begin documenting

* Rename some stuff

* Rename functions

* spec

* Review

* Format

* Anghelo's review

* Fix lifemeter bss

* Format

* Missed one

* idle.c bss
2021-10-11 15:28:16 -03:00
Connor AndersonandGitHub d061f1c666 ovl_En_Elfbub OK (#340)
* ovl_En_Elfbub matching

* Address initial PR comments

* Rename iterator variable to something more descriptive

* Address further PR comments
2021-10-11 15:21:26 -03:00
MaideandGitHub a2666a6ee0 En_Sw (6 non-matching) (#295)
* En_Sw

* spec

* Sw

* Fix
2021-10-11 13:41:02 -04:00
EllipticEllipsisandGitHub 28523e2980 Script to check global bss ordering (#339)
* Script to check global bss ordering

* Bit of cleanup

* Format

* Extremely important capilatisation correction

* Review
2021-10-11 13:11:11 -04:00
MaideandGitHub 1774416598 En_Poh (#291)
* En_Poh

* PR

* PR

* Fix wrong float
2021-10-11 10:21:17 -03:00
MaideandGitHub f059baa87f En_Owl (#271)
* En_Owl

* a

* PR

* a

* Rebase
2021-10-10 21:36:24 -04:00
Tom OvertonandGitHub 00fe40be51 Run ./format.sh on master again (#348) 2021-10-04 20:50:50 -03:00
EllipticEllipsisandGitHub edcf4e40cb setglobalintmask OK (#299) 2021-09-30 20:57:49 -04:00
EllipticEllipsisandGitHub b5e9427db4 Match last function in z_prenmi, add DISPS macros to ArmsHook (#305)
* preNMI OK, added DISP macros to ArmsHook

* Decimal colours in preNMI

* SCREEN_WIDTH

* engineer's review
2021-09-30 20:50:11 -04:00
EllipticEllipsisandGitHub 48b91053ee resetglobalintmask OK (#298) 2021-09-30 20:13:09 -04:00
Tom OvertonandGitHub fbd1a79942 Arrow_Ice OK (#314)
* Migrate data and ArrowIce_Init OK

* ArrowIce_Destroy OK (also define func_80115D5C in functions.h, maybe a bad thing???)

* ArrowIce_SetupAction OK

* func_809224DC OK

* ArrowIce_Update OK

* func_809227F4 OK (but with hacky float constant)

* func_809225D0 OK and use float constant in func_809227F4

* func_80922628 OK

* ArrowIce_Draw OK

* Migrate D_80924200.s to C

* Apply better names in ice_gfx, and document Draw slightly

* Name struct vars to match OoT

* Update function names to match OoT

* Explain that arrow's timer and hitFlags came from OoT

* Update spec + "migrate" bss to C

* Do a hex -> decimal conversion I missed

* Remove blank line in-between headers

* Remove extraneous forward declare

* Move initialization of arrow up one line

* Remove parentheses

* Use else if

* Use decrement operation

* Use decimal for an alpha calculation

* Switch func_80115D5C to take GameState*

* Put pad on the top of Draw

* Move initialization of arrow up (again)

* Early return from Update if we're killed

* Extract assets instead of putting them in the repo

* Add explanatory comment to top of file

* += 1 -> ++

* Use VEC3F_LERPIMPDST macro

* Force a jenkins rerun by adding a space

* Remove the space from the last commit

* Move literal to the back of the conditional

* Respond to review feedback

* Add ArrowIce_LerpFiredPosition to functions.txt
2021-09-30 10:34:45 -03:00
EllipticEllipsisandGitHub bd9e21b165 z_nmi_buff OK, code_8010C1B0 split and OK (#334)
* nmi_buff OK, code_8010C1B0 split and OK

* COLD_RESET

* spec

* Fix lifemeter bss

* Rename variable
2021-09-29 22:13:31 -04:00
EllipticEllipsisandGitHub f80b08450f ShrinkWindow OK (#303)
* OK, small amount of documentation, import bss

* Remove comments

* Actually commit functions.txt

* Add renames to actorfixer.py, review
2021-09-29 21:55:41 -04:00
Tom OvertonandGitHub 9dfeec7345 Fix some dummy label matches (#331)
* Fix some dummy label matches

* Remove dummy label in z_en_railgibud

* Remove dummy label from z_door_ana.c

* Remove dummy label from z_obj_raillift.c

* Remove dummy label from z_en_minislime.c

* A few more dummy label fixes

* Run format, whoops

* Add single line between pad and code

* Add OPEN/CLOSE_DISPS to GameState_Draw

* Add the padding in game.c too (how did I forget this???)

* Run format.sh

* pad -> requiredScopeTemp
2021-09-29 21:08:26 -04:00
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
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