Commit Graph

363 Commits

Author SHA1 Message Date
Anghelo Carvajal 278ff4a4b3
`motor.c` OK (#397)
* use motor in the spec

* import bss

* Delete viextendvstart.c

* rename functions

* move stuff and format

* remove globals.h and ultra64.h

* Update src/libultra/io/motor.c

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

* add motor.h to padmgr

* fix

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-11-06 00:29:56 -03:00
Derek Hensley 49f55ff005
EnvFlags OK (#404)
* Matched

* Remove magic number

* Rename system to EnvFlags
2021-11-05 23:15:47 -03:00
petrie911 ad4c16d40f
osFlash (#158)
* some matches

* Decompile code_0x80186A70 Add defines for KSEG0/1 and (Un)Cached RDRAM

* format

* cleanup

* moved osFlash and imported data

* implement fixes

* format again

* Update include/functions.h

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Update include/variables.h

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Update src/libultra/flash/osFlash.c

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Update src/libultra/flash/osFlash.c

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

* returns are needed

* format

* Update src/libultra/flash/osFlash.c

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Update src/libultra/flash/osFlash.c

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Update src/libultra/flash/osFlash.c

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Update src/libultra/flash/osFlash.c

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

* Update src/libultra/flash/osFlash.c

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

* Update src/libultra/flash/osFlash.c

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

* should be fixed

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: MMDecomp <mmdecomp@gmail.com>
Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-11-03 18:30:20 -04:00
louist103 8e88768a70
Fireobj Kinda OK (#400)
* done

* format

* PR fixes

* revert formatting z64.h

* Update warnings_build_current.txt
2021-11-03 15:09:43 -03:00
Tom Overton 8250fd0941
Match EnItem00_Update (#381) 2021-11-03 14:56:12 -03:00
Anghelo Carvajal 5e7c19ce29
Match `SkelAnime_GetFrameDataLegacy` (#392)
* Properly rename SkelAnime_GetFrameDataLegacy

* Match
2021-11-03 12:23:37 -03:00
louist103 fcbd524b5d
Debug display mostly OK (#399)
* WIP

* done?

* remove something from variables.h

* missed a warning

* PR fixes (AngheloAlf)

* fix lights

* restore ZAPD makefile

* format

* format again

* fix a graph alloc

* Missed one in skin
2021-11-03 11:52:01 -03:00
Derek Hensley 888627d364
Common data OK (#398)
* Matched common data

* Change one hex to dec
2021-11-03 11:15:39 -03:00
Lucas Shaw 52960d5c2f
z_path.c OK (#379)
* z_path.c OK

* Ran format
2021-11-03 10:55:08 -03:00
rylieb b37e3db802
Rename yDistTo variables (#286)
* Change yDistTo to yDirDistTo.

* Run format.sh.

* Apply suggestions from code review

Fix comments in header file.

* Added "Surface" to yDirDistToWater.

* Update names in sellnuts and skb.

* Actually fix skb

* Rename yDirDistToWaterSurface to depthInWater.

* Rename yDirDistToPlayer to playerHeightRel.

* Apply suggestions from code review

Fix capitalization in header file comments.

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

* Fix Jenkins (Obj_Aqua).

* Fix Jenkins (Obj_Etcetera).

* Fix Jenkins (En_Thiefbird).

* Fix misformatted files in current master.

* Fix Jenkins and run format.sh.

* Fix misformatted file in current master (z_debug).

* Update PR to include new actors.

* Update PR to include elforg, po_sisters, wf.

* update actorfixer.py with variable name changes.

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2021-11-02 21:29:20 -03:00
Tharo b1b114e142
Decompile graph.c (#274)
* Decompiled, 1 non-matching, add some bss reordering helpers

* Document stuff

* Review suggestions

* graphutil.c -> graphalloc.c

* Try to fix fault callback warnings

* Remove extra comments in GfxMasterList

* char pad -> u32 pad

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

* Fix gameState

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

* Other suggestions

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-10-29 15:30:48 -03:00
Tharo ef53ba8261
z_game_over.c (#263)
* game over

* Fixes

* Revert save field rename

* Fix comment indent

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

* Add bss reordering stuff, fix bss reordering in z_scene_proc

* Enum uggestions, fix item id

* link -> player in enum comments

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

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-10-24 13:41:50 -03:00
Lucas Shaw dcf44596d2
Animation system updated, some more boot files decompiled (+6%), z_fcurve_data_skelanime decompiled (1 non-matching), some asm files split, etc (#89)
* Progress on various files

* gfxprint stuff

* split some rodata, add iconv for rodata string parsing

* z_std_dma rodata

* 2 nonmatchings in gfxprint

* mtxuty-cvt ok

* more

* match a function in idle.c

* progress

* Cleanup

* Rename BgPolygon to CollisionPoly

* progress

* some effect stuff

* more effect progress

* updates

* made suggested changes

* z_effect_soft_sprite_old_init mostly ok

* remove old effects enum

* gamealloc.c OK

* added more files

* motor.c almost done

* motor.c OK

* updates

* migration of two files

* listalloc.c oK

* z_fcurve_data_skelanime split

* z_fcurve_data_skelanime.c decompiled

* more files split

* z_malloc.c OK

* contpfs.c OK

* fault.c rodata migrated

* migrated fault_drawer rodata

* update

* update preprocess.py

* renamed functions in z_skelanime

* started z_skelanime cleanup

* like halfway through fixing z_skelanime

* animation system updated to meet oot standards

* remove unused animation structs

* rename matrix structs to fit oot

* Add -woff 712

* fix diff_settings.py because i accidentally broke it before

* fixed merge conflict, doesn't match though

* It matches now

* Updates

* Fixed warnings...added gcc code syntax checking

* Remove gcc check, added in Tharo's PR

* warnings fixed (i think)

* fixed all warnings i think

* ok

* not sure what to do

* Fix all warnings i think (z_en_a_keep needs some file cleanup thouguh)

* it matches if i do this

* remove comment

* accidentally put osPfsFreeBlocks in epilinkhandle.c

* memcmp -> bcmp

* change u32 size to size_t size, delete string.h because it caused unnecessary confusion with defining size_t twice

* format.sh

* MTXMODE_NEW and MTXMODE_APPLY to matrix functions

* Made suggested changes

* pragma sFaultDrawerFont instead of including in repo

* add some functions to functions.h

* Bss reordering fixed in z_collision_check...added hack to disasm.py

* Updated z_en_a_keep.c

* Missed suggestion in EnAObj_Destroy

* .

* update z_fcurve_Data_skelanime and z_skelanime with suggestions

* devmgr.c ok

* minor changes

* Addressed comments

* remove redundant file

* gfxp -> dlist in game.c

* updated actorfixer.py

* fixed warnings in z_malloc

* Change void* back to Actor*

* format

* Add the soft_sprit comments back

* Rename SV->Flex

* remove .common

* run format

* Update src/code/z_skelanime.c

* u32 channel

Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-10-24 10:59:14 -04:00
Tom Overton 961913f18f
Format the misformatted files in master (#354)
* Format the misformatted files in master

* Correct arms_hook double-semicolon, since it was almost certainly just an accident
2021-10-23 09:14:25 -04:00
EllipticEllipsis 151e098e48
`z_debug` OK (#330)
* z_debug OK

* Rename function

* Remove duplicate struct

* Update z64.h
2021-10-14 12:25:14 -03:00
engineer124 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
EllipticEllipsis 4c43661cf3
Decompile the GameStateOverlay table (#337)
* Decomp GameStateOverlayTable

* spec

* Review

* gSchedContext

* Format

* Fix bss
2021-10-12 10:25:20 -03:00
EllipticEllipsis 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
Tom Overton 00fe40be51
Run ./format.sh on master again (#348) 2021-10-04 20:50:50 -03:00
EllipticEllipsis 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
EllipticEllipsis 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
EllipticEllipsis 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 Overton 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
EllipticEllipsis 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
Anghelo Carvajal 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
EllipticEllipsis 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
Anghelo Carvajal 2ff7320409
`ovl_daytelop` OK (#277)
* eeeee

* nonequivalents

* draw

* Import data

* Match Daytelop_LoadGraphics

* draw kinda better

* extract daytelops and gameover

* SEGMENT_ROM macros

* Use extracted symbols for daytelop

* match Daytelop_Draw

* Fix bss

* draw cleanup

* Daytelop_Update from non equivalent to non matching

* Some renames and spec

* Run formatter

* enum

* sfx

* Use SEGMENT_ROM_START macros everywhere

* more macros

* run formatter

* Add description

* update variables.txt

* Remove extra stuff in gbi.h

* Would this fix it?

* and again

* whoops

* Apply suggestions from code review

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Tharo's suggestions

* match Daytelop_Update

* run formatter

* fix merge issues

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
2021-09-22 21:50:35 -04:00
Maide 1f4973d9b4
En_Kgy (#244)
* En_Kgy

* NBS

* PR

* PR

* PR
2021-09-02 11:27:26 -04:00
rylieb 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
Isghj 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
EllipticEllipsis 04343a1202
z_construct OK (#267)
* z_construct OK

* Rename
2021-08-18 11:24:57 -04:00
EllipticEllipsis 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
Anghelo Carvajal 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
Andzura 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 Hensley 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
Anghelo Carvajal 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
EllipticEllipsis 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
Maide f5cbbc3268
Daiku2 (#228)
* Daiku2

* PR

* Macros

* NBS

* PR

* Format
2021-08-08 15:28:45 -04:00
Tharo 1c544d2351
sched.c OK (#248)
* sched

* Minor fixes

* Format headers in the ultra64 folder, bitshifts in defines

* Fix PI_STATUS_ERROR

* Update variables
2021-08-07 12:43:11 -04:00
Maide 1836844ea8
En_Dinofos (#235)
* En_Dinofos

* PR

* NBS

* PR

* PR
2021-08-06 17:14:09 -04:00
Anghelo Carvajal 51111676c4
Fix gcc warnings (#246)
* fix a huge amount of warnings

* fix another big bunch

* fix remaining warnings

* Run formatter
2021-08-04 08:14:38 -04:00
Tharo 7743e5a2c4
Overhaul the build system (#234)
* wip

* fix

* add disassembler

* Disasm builds OK

* Variable addends

* More wip

* Rodata migration implemented

* Cleanup old tools

* Try fix submodule -> subrepo merge

* git subrepo pull --force --remote=https://github.com/zeldaret/ZAPD.git tools/ZAPD

subrepo:
  subdir:   "tools/ZAPD"
  merged:   "602e609"
upstream:
  origin:   "https://github.com/zeldaret/ZAPD.git"
  branch:   "master"
  commit:   "602e609"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Builds again but assets are totally broken

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

subrepo:
  subdir:   "tools/asm-processor"
  merged:   "1ffdb08a"
upstream:
  origin:   "https://github.com/simonlindholm/asm-processor.git"
  branch:   "master"
  commit:   "1ffdb08a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* More cleanup, move functions.txt and variables.txt to tools/disasm and rm tables

* rm z64compress in preparation for subrepo

* git subrepo clone (merge) https://github.com/z64me/z64compress.git tools/z64compress

subrepo:
  subdir:   "tools/z64compress"
  merged:   "eb11085c"
upstream:
  origin:   "https://github.com/z64me/z64compress.git"
  branch:   "main"
  commit:   "eb11085c"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Fix asset extraction

* Fix diff-init make rule

* Split code bss

* Split assumed linker bug padding from assembly files

* add filelists for mm.us.rev1

* Maybe working, but I'm not sure

* add overlays to spec

* Add rodata to actos

* Everything compiles

* Make a lot of C files for code

* Add almost every file in code to spec

* whoops

* 3 code files left

* add scenes to spec

* More progress on progress.py

* Fix skelanime in spec

* audio files!

* Fix merge issues

* Fix some C files in code

* Fix remaining code files

* Use existing O1 C files in spec

* reorder boot order in spec

* update spec

* fault.c

* Convert relocs on completed actors, fixbaserom uses current rom name

* more boot files

* Add VT macros and script

* finish already existing boot files

* most of  libultra

* fix 64bits libultra files

* Use C files for libultra, wrap some functions in NON_MATCHING

* Remove duplicate of OS_CLOCK_RATE from fault.c

* C files for fbdemos

* delete dumb files

* bootstrap C files, still need to add them to the spec

* update fixbaserom

* boot OK?

* I forgot to commit the spec

* C for gamestates

* C for kaleido

* Change all includes to ""

* copy actor sizes script from oot

* I forgot to delete those files

* Basic C files for effects

* Add effects initvars names

* Remove mislabelled boot functions from header/txt

* Begin porting bootstrap_fx, some sizes

* Fix <>

* Fix enum

* Fix diff.py

* fix libultra stuff

* update regconvert

* update setup warnings

* add some missing ;

* Fix some makefile stuff and other fixes on some non_matching functions

* add executable flag in extract_baserom and fixbaserom

* fix relative path

* copy assist from oot

* fix map path

* another assist path fix

* Delete C files for handwritten files

* add code_801A51F0 to spec

* add gfxbuffers to spec

* Move rodata to top of each file when possible

* UNK_TYPEs for func_801A51F0

* Remove kaleido rodata from spec

* Update spec and undefined_syms for recent merge

* GCC warnings and fix errors in nonmatchings,

* round percentage numbers

* progress script: format changes

* progress: error on non-existing files

* fix warning in z_scene_table

* Match 2 nonmatchings in z_actor

* Warnings in lightswitch and invadepoh

* Fix warning in z_actor_dlftbls

* I though I fixed this one

* whoops

* Comment out CC_CHECK

* Removed redundant ultra64.h includes

* Update asm_processor, sorted boot_O1 into other folders, completed the fbdemo bootstrap, cleaned up undefined_syms

* Completed gamestates bootstrap

* Split kaleido_scope

* Remove section.h and segment.h, move keep object externs to a common location in variables.h

* Completed effects bootstrap

* Segmented address externs for effects, fbdemos, gamestates and kaleido

* Move actor data externs out of the if 0

* Segmented address externs for actors

* Prepare actionfunc detection

* fix script, how did it even work before

* Fix actionfunc script again, re-introduce some more intermediate prints to the disassembler

* Automated actionFunc detection in actors

* Segmented addresses from player .text

* rm old segment addrs script and fix build

* Move sizes folder to tools

* Make build.py executable

* New Jenkinsfile Prayge

* Remove numpy dependencies

* Add warnings_disasm_current.txt

* my bad

* Update spec and undefined_syms

* Add z_eff_ss_hahen to pametfrog

* git subrepo pull (merge) --force tools/z64compress

subrepo:
  subdir:   "tools/z64compress"
  merged:   "163ca2af"
upstream:
  origin:   "https://github.com/z64me/z64compress.git"
  branch:   "main"
  commit:   "163ca2af"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "2f68596"

* Make z64compress print to stdout

* sneeky commit to update warnings tooling

* test

* Another test

* Mark fixing overlay reloc generating as a TODO

* Update warnings stuff

* Communicate the return code from running z64compress back to the Makefile through the wrapper

* Run formatter, remove extra commented copy of function

* Re-fix some includes

* Convert atan to hex to conform to decided style

* Some tidying up, remove c for fp and the other two handwritten code files

* BSS in z_collision_check & z_scene_proc

* add static back in

* Fix timerintr bss, add file to spec, some cleanup

* Remove externs

* Newline

* Readd enums

* Typo

* Colours

* Comments for hitmark enum values

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

* Improvements and suggestions

* Organize and remove unused imports and use env for python3 scripts, delete unused overlay.py

Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
2021-08-03 23:21:31 -04:00
engineer124 37fc242e22
En_Minislime OK and Documented (#231)
* Get Minislime code from Bigslime Branch

* format

* PR Feedback, add Damage Effects Enum, add +1 use of Room Coordinates Macro
2021-07-28 22:45:13 -04:00
EllipticEllipsis 930d605c5c
Matched func_8012EF0C and correct D_801C2380 (#227)
* Match func_8012EF0C and correct D_801C2380

* format

* Review suggestions
2021-07-26 16:30:29 -04:00
engineer124 7b154c23e1
AudioMgr OK and Mostly Documented (#208)
* AudioMgr OK

* Cleanup

* Improve naming from PR Feedback
2021-07-19 19:49:29 -04:00
Derek Hensley 594a3ceaff
Ovl_En_Fsn Ok and Documented (#204)
* First decomp pass: Matched everything w/ data

* Minor cleanup of func_80AE2F78

* Documented

* Format

* Some cleanup and PR suggestions

* Format

* Add the word player to a few functions to specify it is the player trying to buy

* Add controller macros

* Move common shopkeeper defines

* name unk274 and add note to unk27A

* Remove macros and just use flag defines

* Convert Controller Macros to take globalCtx

* Fix merge conflicts
2021-07-19 19:26:47 -04:00
engineer124 b5c931e432
z_quake OK and documented (#213)
* Create z_quake.c file

* Match all quake functions with OoT counterparts (quake2 left)

* z_quake OK

* Document first half of quake

* More docs

* more cleanup

* remember to format!

* PR Suggestions

* More PR Suggestions
2021-07-19 19:06:54 -04:00
EllipticEllipsis 184e67c841
Introduce DamageTable formatting and macros (#211)
* Improve match in EnFirefly_Draw

* Vestigial fishing files, add enums

* Improve scripts, add ColChkInfo one

* Some minor actor cleanup (static etc)

* C file for Fishing, remove some local vars from variables.h

* Remove comma and format

* Newline

* Review suggestions

* Fix colchkinfoinit, add damage_table

* DMG macros, format existing DamageTables

* Convert preset damage tables to new format
2021-07-17 00:35:29 -04:00
EllipticEllipsis 66d0656128
C file for Fishing, some changes to collider scripts, a few minor cleanups (#210)
* Improve match in EnFirefly_Draw

* Vestigial fishing files, add enums

* Improve scripts, add ColChkInfo one

* Some minor actor cleanup (static etc)

* C file for Fishing, remove some local vars from variables.h

* Remove comma and format

* Newline

* Review suggestions
2021-07-15 00:33:20 -04:00
engineer124 fe6cce76dc
z_olib.c OK and Documented (#202)
* z_olib.c OK

* Clean-Up Clamp

* Take out extra space
2021-07-13 21:59:04 -04:00
Anghelo Carvajal 5fcd494a7a
`ovl_En_Ma4` matched and mostly documented (#199)
* First pass

* limbdraw

* another one

* lots of stuff

* stuff

* big one

* func_80ABEB6C

* The NON_MATCHING that matches in reality

* "Fix" some cases

* Fix merge issues

* fix func_80ABF254

* match a pair

* func_80ABF7C8

* func_80ABE1C4

* func_80ABF354

* func_80ABF534

* Import data

* Limb fixes

* Minor renames

* Fix merge issues

* A few renames

* Rename half the functions

* More renames

* More renaming

* documentation finished

* Format

* fix typo

* whoops

* Fix merge issues

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h

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

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h

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

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h

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

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c

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

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c

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

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c

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

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.c

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

* Update variables names

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-07-13 21:49:05 -04:00
Zelllll 6db3fc7b32
Document most of global context (#198)
* doesn't build for some reason..?

* some formatting fixes

* windows calculator is trash

* fix!

* fix2

* most of global context documented

* interfacectx

* hopefully fix interface

* document restrictions

* envCtx done

* revert accidental change

* fix

* pause ctx done

* fixxxxxxxxxxxxxxx

* remove unintended zapd change

* fix..?

* format files

* Update include/z64.h

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* ocarinstaff

* Update include/z64.h

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* Update include/z64.h

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>

* suggestions

* fix mistake in pausectx

* typo

* door context

* renames

* all nb removed

* Update include/z64.h

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

* Update include/functions.h

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

* fix kanfont, new docs

* format files, merge master

* fix typo in linker script

* extract asm properly

* door context rename

* fixes in door context

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-07-05 21:14:27 -04:00
EllipticEllipsis 0e51bf35a1
EnFirefly OK and mostly documented (#194)
* Data imported, 8/30 functions done

* OK

* Delete ASM references, add SFX

* Named functions

* more naming

* Type the nop ActorFunc correctly

* A couple more bits of documentation

* Sorted object_script

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

* format

* Update other includes

* Review suggestions

* Review changes; named Actor_Noop

* Format
2021-07-05 17:47:55 -04:00
EllipticEllipsis e57fb5780d
z64player.h and Player struct work (#195)
* Rename Player, name some of its struct vars,
add collision flag macros to actors missing them

* Name Player_GetMask/RemoveMask, add a few macros

* Format

* Update include/functions.h

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

* Fix unk_14B in a non-matching

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-07-01 23:15:26 -04:00
Isghj abef65a6db
En_Niw (Cucco) (#191)
* EnNiw: Rebase of WIP to work on collsion

init almost matches

EnNiw: WIP

EnNiw: running low, and too many not-matches for my liking

EnNiw: WIP 3

* EnNiw: update to master

* EnNiw: fix late rodata

* wtf is going on

* EnNiw: update is a thing, glad I'm doing it last

* EnNiw: likely branch mysery

* EnNiw: a horrible little draw function

* EnNiw: nope, feather draw still fucked

* EnNiw: fixing merge issues with master

* EnNiw: update is no longer non-matching

* EnNiw: cleaning/docs

* EnNiw: cleaning/docs 3

* EnNiw: more docs 4

* EnNiw: OKs again now that data was removed

* EnNiw: Docs and cleaning 5

* EnNiw: Docs and cleaning 6

* EnNiw: Docs/cleaning and changed a function and that changed a bunch ugh

* EnNiw: format and make check

* EnNiw: data re-merged, and matches

* EnNiw: forgot about these

* EnNiw: another attempt at feather draw, still not even close

* Multiple: now that we know the last paramter is a flag, change all to hex

* Player: fix wrong padding

* EnNiw

parameter name consistency

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

REG

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.h

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.h

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* Update src/overlays/actors/ovl_En_Niw/z_en_niw.c

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

* EnNiw: Likely suggestions first

easy suggestions first, then I'll attempt the stuff I'm not sure will match

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

* EnNiw: compiling again

* EnNiw: more suggestions added

* EnNiw: last of minor changes

* EnNiw: shorten overly long float

* EnNiw: feather counts as define

* EnNiw: add c file description

* EnNiw: Some Suggested Changes

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>

* EnNiw: more suggestions

* EnNiw: More suggestions

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>

* EnNiw: moved OPEN_DISPS to contentional location, still not close

* BgIcicle/EnSb: renamed func_800B78B8 to Actor_UpdateBgCheckInfo

Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
2021-07-01 22:20:34 -04:00
Anghelo Carvajal 3098abd4f6
Add current missing functions prototypes (#181)
* First bash

* Another batch

* Another bunch

* Update actorfixer

* run format

* Apply suggestions from code review

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

* Suggestion

* context renaming

* Update include/functions.h

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

* Fix renamings

* fix

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-06-17 08:54:18 -04:00
Derek Hensley 74e418f24f
ovl_En_GirlA OK and documented (#182)
* EnGirlA Matches

* Convert func to boolean

* Cleanup

* missed a little cleanup

* Update with new MACRO

* revert z_en_item00.c macro, and add one more macro

* Documented

* Format macros.h

* Fix VTX format

* rename isBought to isOutOfStock

* PR suggestions

* Document a bug

* PR comments
2021-06-15 08:45:19 -04:00
engineer124 c203b9b606
Importing Sound Effects from MM3D (#179)
* Add sfx & update Audio_PlayActorSound2

* more sfx

* Match Enemies sfxId

* Update with PR

* Update sfx for new pr

* Fix commit
2021-06-11 21:08:47 -04:00
engineer124 059c9075ca
effect_soft_sprite matching! (#177) 2021-06-10 18:05:40 -04:00
engineer124 e9eb4d4e0a
Match z_effect.c (#176) 2021-06-10 08:13:43 -04:00
Anghelo Carvajal 83e263ab12
`ovl_En_Ma_Yts` OK and partially documented (#164)
* destroy

* moar

* limbdraw

* some setups identified

* func_80B8D6F8

* func_80B8E0BC

* fix unmatching

* func_80B8D12C

* func_80B8D1E8

* func_80B8DBB8

* some renaiming

* some renaimings

* symbols

* small renaming and a few functions

* Almost every function done

* lots of renames

* Fix merge conflicts

* misc notes

* struct_800BD888_arg1

* some renamings and enum

* func_80B8D2D8

* func_80B8DA28

* import data and cleanup

* format

* minor changes

* Documentation pass

* update enum name

* Remove object XML

* run format

* Move EN_MA_YTS_PARSE_TYPE to header

* fix conflicts

* Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c

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

* Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.h

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

* Update src/overlays/actors/ovl_En_Ma_Yts/z_en_ma_yts.c

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

* move struct to z64animation

* Change PARSE_TYPE macro to accept actor param

* format

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
2021-06-09 18:38:35 -04:00
Anghelo Carvajal 2f239c939d
ovl_Obj_Milk_Bin OK (#161)
* First pass

* second pass

* Everything matches now

* Fix ori

* final pass

* Add description

* Fix warnings (I hope)

* move dlist to top of the file

* Fix conflicts
2021-05-25 21:15:41 -04:00
Zelllll 6c86016603
partially finish `code_0x8012EC80`, document all of gSaveContext (#138)
* not ok, why?

* OK!

* fix data

* finish data etc

* work on save context

* save finished

* first func done

* roomInf

* done for now

* add missing file

* add most og names for struct members

* fix accidental change

* Update z_en_ginko_man.c

* Update z_scene.c

* maybe fix stuff hopefully

* proto

* sasa

* Update include/z64save.h

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>

* Update z64save.h

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
2021-05-25 18:49:11 -04:00
engineer124 f4687fbbe7
General Cleanup (#155)
* minor fixes

* Consolidate into globalCtx

* fix error

* Fix Warnings

Co-authored-by: engineer124 <engineer124enginer124@gmail.com>
2021-05-20 21:24:47 -04:00
Anghelo Carvajal 062a813fba
Misc fixes (#159)
* Fix `extract_assets` not properly checking if scenes files were updated

* fix `first_diff.py` path due to the baserom renaming

* FlexSkeletonHeader and other stuff

* fix some SkeletonHeader instead of FlexSkeletonHeader

* Add blob compilation to makefile

* CURRENT_DAY and type swaps

* Remove extra cast

* run format

* zbanks suggestions
2021-05-20 18:52:07 -04:00
Zach Banks ad9c5565ee
z_view matching (#134) 2021-05-19 17:01:22 -04:00
Anghelo Carvajal 4d6d9c27a4
code_0x8017FEB0 OK (#137)
* almost every function

* atans ok

* import data and rodata

* format `atan_first_8th_array`

* fix signature and rodata

* rename to angle

* Rename the functions to match their OoT counterparts

* rename code_0x8017FEB0 to sys_math_atan
2021-05-18 22:58:30 -04:00
Zach Banks dea3c8fd79
Fix all warnings raised by IDO (#152)
* Fix all warnings raised by IDO, ignore trailing commas

* Set -woff=624,...; keep const in printf functions

* Remove redefined macros in irqmgr.c

* Remove DECR macro & reformat

* Address PR comments from AngheloAlf
2021-05-18 22:28:04 -04:00
Anghelo Carvajal c56934038a
Format everything (#141)
* Add trailing comma

* Run format and add some missing trailing commas

* Enforce the same clang-format version for everybody

* z_en_m_fire1
2021-05-18 20:00:36 -04:00
Zelllll 874a75f456
Scene Changes (#114)
* match function

* major cleanups

* rename switch functions

* use graph_alloc to fix fake matches

* more documentation

* more matches, lots of changes

* lots more work

* format

* Update z_scene_proc.c

* very hard lagrange interpolation function OK!

* remove any remaining

* documentation done, only two functions left

* a few more things

* one function left!

* document another oot leftover

* last function decompiled, not matched yet

* scene_proc complete

* start work on z_scene

* done with z_scene

* remove unessecary typedefs

* fix some things to remove warnings

* Add z_scene_table and decomp data

* Delete ctx.c

* add draw cfg enum

* cleanup

* most scene table functions done

* done for now

* all scene files done

* Update include/z64scene.h

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>

* add missing macros

* fix some renames

* scene texture file rename

* added temporary structs so it still builds

* more structs

* even more old structs

* fix boyo

* should fix compile error

* lets hope nothing broke

* ub comment back

Co-authored-by: Anghelo Carvajal <anghelo.carvajal.14@sansano.usm.cl>
2021-05-09 22:12:42 -04:00
Zelllll 1ca8a9c24d
(Mostly) Decompile PreRender.c (#105)
* start prerender

* match func_8016FDB8

* fix fake af match

* actually add prerender

* Delete ctx.c

* test

* lots of oot transfers

* lots of new functions done

* match even more functions

* slowly thread functions

* two prerender functions left

* some docs

* make names more consistent with oot

* ready for pr?

* Update PreRender.c
2021-05-01 02:44:29 -04:00
Kenix3 c40bb119e1
Adds in scene support (#117)
* 1 scene done, Z2_SOUGEN OK

* All scenes OK

* Makefile improvements

* Use WIP ZAPD branch as submodule

* Add spawn rotation flag macro

* Fix bad merge

* Move scenes to be in their own subfolders

* Rename and restructure extracted baserom files

* Progress tracking for assets

* Add asset progress to csv

* Use master ZAPD

* Use distclean like in OOT

* Fix up a few things with the makefile

* Fix scenes not being dumped from ELF

Co-authored-by: Rozelette <Uberpanzermensch@gmail.com>
2021-04-29 18:56:18 -04:00
Rozelette e97f10a6fa
sys_slowly OK (#101)
* sys_slowly OK

* Feedback

* rename type member
2021-04-19 17:44:12 -04:00
Isghj 768ca0839b
DoorAna: OK (#90)
* DoorAna: OK

* DoorAna: changed z_lib functionname to match new master

* DoorAna: requested changes

* DoorAna: requested changes

* DoorAna: Renamed nextEntranceIndex

* DoorAna: some changes requested

Co-authored-by: isghj8 <isghj8@gmail.com>
2021-04-18 14:16:14 -04:00
Rozelette 84040f6ba6
z_skin_matrix OK (#81)
* Set up file

* Rename

* z_skin_matrix OK

* Cleanup

* /n nits
2021-04-12 00:41:35 -05:00
Rozelette d2c181a0a9
z_lib fully matched (#85)
* z_lib OK

* Documentation

* Added stdbool and stdint

* Fixup for new names

* Fixup bad merge

* Feedback

* Use u/s32 for intptr_t
2021-04-07 17:16:16 -04:00
Rozelette b22e26dbd8
z_en_item00 (#78)
* z_en_item00 WIP 17/21 match, rest close to matching

* Split .rodata for z_en_item00

* Item00 documentation, some misc cleanup

* Minor cleanup

* Fixup for z_collision_check

* Address feedback

* Delete old file

* Fix bad merge
2021-03-27 19:55:42 -05:00
Lucas Shaw 623b6d5318
Some OOT transfers, some renaming, etc (#75)
* Progress on various files

* gfxprint stuff

* split some rodata, add iconv for rodata string parsing

* z_std_dma rodata

* 2 nonmatchings in gfxprint

* mtxuty-cvt ok

* more

* match a function in idle.c

* progress

* Cleanup

* Rename BgPolygon to CollisionPoly

* progress

* some effect stuff

* more effect progress

* updates

* made suggested changes

* z_effect_soft_sprite_old_init mostly ok

Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
2021-03-27 16:17:41 -05:00
Rozelette fee7a49abc
z_lights fully matched (#80)
* z_lights OK

* Documentation

* Fixup for z_collision_check

* Improve function types of bind functions

* Fixup for types
2021-03-27 14:29:30 -05:00
Rozelette d0af9587ba
Bg_Lotus OK (#86) 2021-03-27 12:29:06 -05:00
kyleburnette a0b8a7c718
TwoHeadArena and TwoHeadGfxArena OK (#83)
* TwoHeadArena and TwoHeadGfxArena OK

* Changed negatives to ~ in TwoHeadArena.c

* Renamed functions to match OoT

* Formatted code files

* Removed dispbuf
2021-03-27 12:13:56 -05:00
Rozelette 6e4d156ad7
Door_Spiral OK (from zel) (#87)
* Door_Spiral OK

* Cleanup
2021-03-27 12:17:42 -04:00
Isghj e64d4d8bf2
EnPoFusen: OK (#69)
* EnPoFusen: OK

EnPoFusen: WIP

EnPoFusen: init is matched

* EnPoFusen: requested changes

* Update src/overlays/actors/ovl_En_Ma4/z_en_ma4.h

Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>

* EnPoFusen: forgot I renamed a function to check diff, changed back

* EnPoFusen: Bad search and replace

* EnPoFusen: really bad search replace

* EnPoFusen: ColliderInit and requested changes

* Functions: renamed func_800B8EC8 to Audio_PlayActorSound2

Co-authored-by: isghj8 <isghj8@gmail.com>
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
2021-03-24 03:58:25 -05:00
Tharo 1a2e6d7ffe
z_collision_check.c (#58)
* setup

* Progress on z_collision_check.c

* Further progress on z_collision_check.c

* renamed code_0x800E03A0 to z_collision_btltbls, z_collision_check.c decompiled besides bss

* Structs changes

* Document functions

* overlayhelpers folder, colliderinit.py and ichaindis.py

* Flags, format existing ColliderInits

* Fix merge

* Few more small improvements

* Review suggestions
2021-03-22 17:48:15 -04:00
Rozelette 8342329538
yaz0.c OK (#71) 2021-03-16 21:49:27 -04:00
Kenix3 a53626049f
Decompiles z_vr_box (from zel) (#73) 2021-03-16 21:27:14 -04:00
Tharo a983d14081
functions and variables headers cleanup (#63) 2021-03-11 20:27:39 -05:00
Kenix3 037ba9a22e Initial support of tracking progress per code/boot/overlay, and outputs the stats to csv. 2021-03-10 22:28:06 -05:00
Zelllll fb1ed529ad
Add OoT actor structs and enums (#55)
* add oot structs

* revert formatting

* fix comment thing

* fix accidental renames

* slight fix

* naviEnemyId -> hintId

* fix headers
2021-02-28 22:52:12 -05:00
Tharo c55e9eeee5
pragma variant for GLOBAL_ASM (#49)
* pragma GLOBAL_ASM

* Revert split_asm.py arg description change
2021-02-23 23:15:58 -05:00
fullgrowngaming f927730418
Arms_Hook OK (#33)
* All but 2 functions matched

* More work on hookshot

* hookshot work

* 2 functions left (and one is almost done)

* sp issues with draw, but matching otherwise

* hookshot matching

* Changed rodata inclusion for armshook

* Hookshot OK

* Resolve script conflicts

* Rename unk variables to match MM standard

* Made requested changes
2020-10-11 18:30:22 -05:00
fullgrowngaming 1c4a3047de
z_skelanime OK (#34)
* initial skelanime commit

* Skelanime OK

* Forgot to add z64animation.h and skelanime.c
2020-10-11 13:31:06 -04:00
Bonfam 280d7b7eea
GlobalContext: unwrap CameraContext (#31)
* GlobalContext: unwrap CameraContext

Makes ACTIVE_CAM macro usable.
func_8013A530 changes to use new GlobalContext struct.

* z64.h: remove CameraContext
2020-09-27 20:38:43 -04:00
Rozelette 07efebe2ff
z_actor_dlftbls.c OK. Rework a bunch of segment address organization. (#29) 2020-09-27 20:19:06 -04:00
Rozelette 189d0d6c30
Bootstrap actors (#14)
* Bootstrap actors

* Address feedback. Improve header guard. Remove ovl_Player_Actor, it will need to be handled seperately.
2020-09-13 14:21:43 -04:00
Rozelette 0844c24773
Split headers to be more similar to OOT (#13) 2020-08-31 19:02:37 -04:00
Rozelette de7a521857
Decompile z_snap (#11) 2020-08-29 01:10:24 -04:00
Rozelette 125b16cb17
Add object enum (#9) 2020-08-07 18:12:03 -04:00
Rozelette 12e258561e
Cleanup some function identifications. (#7)
* Add missed functions, remove not functions

* Fix typo
2020-08-06 18:11:32 -04:00
Rozelette f37da749f6
Add actor and scene enums (#8) 2020-08-06 18:06:38 -04:00
Kenix3 e80336d4a8 Initial code format 2020-07-24 20:00:52 -04:00
Kenix3 07cfe5b43f Merge branch 'master' of https://github.com/zeldaret/mm 2020-06-23 17:38:34 -04:00
Rafael Moura c9dc82cbe5 func_800B72F8 decompiled 2020-06-23 17:35:29 -04:00
MMDecomp 7d61d4e6ff Decompile `game.c` 2020-06-23 10:55:11 -04:00
Kenix3 2d191e301a Adds TODO comments to remove implementation defined pointer manipulation. 2020-06-06 19:27:28 -04:00
Kenix3 cb8b9a2020 z_lib now uses SEGMENTED_TO_VIRTUAL macro
Additionally removed some TODO comments in z_scene and defining gRspSegmentPhysAddrs array size as NUM_SEGMENTS
2020-06-04 23:25:57 -04:00
Kenix3 5c97d35841 Added macros header
Additionally, updated code to use PHYSICAL_TO_VIRTUAL and ALIGN16 macros.
Additionally, retyped gRspSegmentPhysAddrs back to u32 as in OOT. These get the straight return value of PHYSICAL_TO_VIRTUAL, so they are u32.
2020-06-04 23:07:09 -04:00
Kenix3 664182c289 Fixes known undefined behaviour from DmaMgr and Lib_Ptr taking u32 rather than void* 2020-06-04 21:41:44 -04:00
Kenix3 dfbcac539e All z_scene functions now OK 2020-06-04 20:41:16 -04:00
Kenix3 f230898dfe
z_scene functions now use the same structs as OOT (#3)
* z_scene now uses OOT structs where available

Additionally commits a decompiled z_actor function.

* Fixes audio_setBGM function call in Scene_HeaderCommand15

* Update structs.h

Co-authored-by: rozlette <uberpanzermensch@gmail.com>
Co-authored-by: Egor Ananyin <ananinegor@gmail.com>
2020-04-29 22:14:29 -05:00
rozlette 01c86ec621 Decompile z_prenmi.c 2020-04-23 01:11:25 -05:00
rozlette c1bb5f00d6 Decompile z_rpc.c 2020-04-22 15:38:09 -05:00
rozlette 639df45a03 Some work on z_view 2020-04-21 11:49:16 -05:00
rozlette ec3ccda941 Fix build issue 2020-04-21 00:45:00 -05:00
Kenix3 2ab90dca27
Adds in fully matching Scene_HeaderCommand00
Additionally fixes code formatting in Scene_HeaderCommand15
2020-04-08 18:37:27 -04:00
Kenix3 4e63d23cf4
Merge pull request #2 from Kenix3/master
Decompile functions in z_scene
2020-04-08 17:52:03 -04:00
Kenix f8713ceb46 Decompile functions in z_scene 2020-04-08 17:49:40 -04:00
rozlette b1dda27053 Decompile code_0x800AF710.c 2020-03-19 22:59:03 -05:00
Egor Ananyin 42f515dd4c z_actor.c: Some functions 2020-03-18 16:01:00 +03:00
rozlette ff958ad932 Rename many functions, structs, and variables to match the oot decomp. Some things have not been renamed as their respective files have not been decompiled yet. 2020-03-15 01:13:53 -05:00
Cleverking2003 0c35be2381
More functions from z_actor.c (#6)
* More functions from z_actor.c

* Apply suggestions from code review

Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
2020-03-10 12:24:59 -05:00
Cleverking2003 da9aaf43c1
Some functions from z_actor.c (#5)
* Decompiled some functions from z_actor.c

* More functions

* Coding style

* Minor fixes
2020-03-04 11:44:43 -06:00
rozlette 50930aa4da Update names in z_bgcheck.c 2020-03-02 01:23:14 -06:00
rozlette d4d8f58636 Start on z_bgcheck.c 2020-03-01 19:17:22 -06:00
rozlette 74c1dc2145 Decompile code_0x800CAE10.c 2020-03-01 16:49:45 -06:00
rozlette 581a97b561 Make non-matchings consistent with oot 2020-02-20 16:29:22 -06:00
rozlette e45d0ef673 Normalize line endings 2020-02-19 11:18:03 -06:00
Kenix3 bfcc1d6a9a
Decompiling functions in z_scene (#4)
* Decompiling functions in z_scene

* Bringing decompiled functions in line with project style
2020-02-17 23:17:07 -06:00
rozlette 69351886bf Fix nonmatching location in z_scene stub 2020-01-25 00:23:32 -06:00
Kenix 498909ea18 Splits out z_scene for decompilation. 2020-01-23 22:24:02 -05:00
rozlette 36f623023d Port over fault.c from oot decomp 2020-01-12 16:52:32 -06:00
rozlette 727a546fcf Update to latest ghidra project 2020-01-08 08:32:20 -06:00
rozlette 8d8df1848e More work on z_scene_proc.c 31/36 matching, 3 non-matching, 2 not attempted 2019-12-29 21:34:58 -06:00
rozlette 6a74885a38 Little bit of work on z_scene_proc 2019-12-28 00:24:30 -06:00
rozlette 664bb49a5d Decompile z_kanfont 2019-12-24 03:52:37 -06:00
rozlette d6faee7318 Port some of z_room from the oot decomp 2019-12-24 01:46:19 -06:00
rozlette 85c60e561c Fix typo in comment 2019-12-23 03:14:09 -06:00
rozlette d605458fa5 Redo z_lights.c for new code base 2019-12-20 21:57:05 -06:00
rozlette 962a957166 Decompile code_0x800E8EA0.c 2019-12-18 01:31:47 -06:00
rozlette 82ad58e489 Cleanup files in code. Decompile code_800CAAD0.c 2019-12-17 18:47:52 -06:00
rozlette bdf36b85d3 Decompile z_eff_footmark.c 2019-12-15 03:31:57 -06:00
rozlette 9bc4990814 Update to latest from ghidra project 2019-12-14 23:38:35 -06:00
rozlette 60eaf159b4 Generate all major headers from ghidra project 2019-12-07 18:21:34 -06:00
rozlette 86ab9c2067 Use variable names from ghidra project. Reorganize some data tables and header files to work easier with it. 2019-11-28 00:26:09 -06:00
rozlette a09a799eef Rename tons of structs because we aren't using the z_ prefix anymore ;_; 2019-11-14 00:52:31 -06:00
rozlette b1938991fa Update structs.h because Ghidra can handle bitfields now 2019-11-13 22:14:03 -06:00
rozlette 57633d0e26 Decomp 1 function in z_actor 2019-09-29 14:19:42 -05:00
rozlette a8060ddcff Use structs.h generated from Ghidra project 2019-09-29 01:37:21 -05:00
rozlette 2581bed7bf Use per-function ASM blocks 2019-09-20 20:47:01 -05:00
rozlette 4c11f2f364 Add tons of function names. Datatypes TODO 2019-09-20 01:43:40 -05:00
rozlette 15d44ed724 Add z_effect_soft_sprite 2019-04-15 21:01:57 -05:00
rozlette 6d1d172eb5 Add more filenames 2019-03-31 01:04:12 -05:00
rozlette 2b7d9ed708 Do most of code_0x800FEC90 2019-03-06 21:48:32 -06:00
rozlette a309571228 Updata current progress 2018-12-06 13:47:07 -06:00
rozlette dffd187304 Use hex instead of decimal 2018-11-16 22:14:07 -06:00
rozlette 93a02aba78 Disassemble a bunch of files 2018-11-13 22:16:08 -06:00
rozlette 5cda2411e7 Get code_0x800F4F40 close to matching 2018-10-28 22:29:20 -05:00
rozlette e5737d1688 Decompile code_0x80183070 2018-10-28 03:32:16 -05:00
rozlette c47dba1a0d Decompile code_0x800E03A0 2018-10-28 00:52:59 -05:00
rozlette c2bedffee0 Get code_0x800BF940 close to matching 2018-10-28 00:15:46 -05:00
rozlette c15ac4a925 code_0x800A5AC0 almost matches 2018-10-27 22:59:47 -05:00
rozlette 4edcdeb811 Fix tabs 2018-10-25 22:22:38 -05:00
rozlette cc9baa93a8 Dump current status 2018-10-25 22:09:52 -05:00