Commit Graph

685 Commits

Author SHA1 Message Date
Derek Hensley e17b05b8fa
Ovl_Bg_Ctower_Rot Ok (#149)
* Ovl_Bg_Ctower_Rot Ok

* Move enum to h file

* Rename D_808E2564 to bgCtowerRotDlists

* Rename D_808E2564 to bgCtowerRotDlists take 2
2021-05-20 17:23:23 -04:00
Anghelo Carvajal 25afa196f6
Make Jenkins check if a PR will add new warnings (#150)
* warning count

* update warnings

* Update warnings

* Use `tee`

* Suggestions of zbanks

* I hope this will fix it
2021-05-19 22:14:20 -04:00
Zach Banks 43ccf66c48
ovl_En_Torch2 OK (Elegy of Emptiness Shell) (#130)
* ovl_En_Torch2 OK (Elegy of Emptiness Statue)

* Identify dlists; address PR comments

* Rename object segment symbols
2021-05-19 20:58:32 -04:00
Derek Hensley 5e7e5a1d9f
Ovl_Obj_Tokei_Step OK (#122)
* Everything matches but func_80AD6508

* Changed func_80AD6508 to non_matching

* Some cleanup

* Everything matches

* Finished cleanup and documentation

* Updated BgMeshHeader to Collision Header

* Add newline

* Update functions.txt

* Better function names

* format

* Better naming
2021-05-19 20:24:33 -04:00
Zach Banks ad9c5565ee
z_view matching (#134) 2021-05-19 17:01:22 -04:00
Anghelo Carvajal f3dc829456
`ovl_Eff_Dust` OK (#136)
* some easy functions

Signed-off-by: Angie <angheloalf95@gmail.com>

* init is cursed

Signed-off-by: Angie <angheloalf95@gmail.com>

* func_80919230 is weird

Signed-off-by: Angie <angheloalf95@gmail.com>

* I'm dumb

Signed-off-by: Angie <angheloalf95@gmail.com>

* func_80919768 nonmatching

Signed-off-by: Angie <angheloalf95@gmail.com>

* everything is wrong

Signed-off-by: Angie <angheloalf95@gmail.com>

* This thing still doesn't want to match

Signed-off-by: Angie <angheloalf95@gmail.com>

* improved a bit

Signed-off-by: Angie <angheloalf95@gmail.com>

* a bit of renaming, but it still doesn't work

Signed-off-by: Angie <angheloalf95@gmail.com>

* almost matching

* func_80919768 ok

* func_809199FC ok

* init was dumb

* add enum and other minor changes

* run format
2021-05-18 23:01:48 -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 7f14659919
`diff.py` symlink and `graphovl.py` (#151)
* Add `diff.py` symlink

* Add graphovl.py

* remove graphovl

* add graphovl subrepo

* git subrepo pull --force tools/graphovl

subrepo:
  subdir:   "tools/graphovl"
  merged:   "577e7159"
upstream:
  origin:   "https://github.com/AngheloAlf/graphovl.git"
  branch:   "master"
  commit:   "577e7159"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
2021-05-18 22:21:14 -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
Zach Banks 091219d742
Small env fixes: git submodules & python3 (#127)
* Small env fixes: for git submodules & python3

Using `/usr/bin/env python3` is preferred over `/usr/bin/python3`
because it is compatible with virtualenvs, etc. It picks the version of
`python3` currently on the `PATH`, rather than the system-wide default.

For the git submodules, I had two issues:

The ZAPD repo is currently pointing at a commit not on the master
branch, which has to be specifically fetched. Adding `--remote` to the
update command fixes this.

The decomp-permuter has primary branch `main` not `master` like this
repo, so this has to be specified in `.gitmodules` when using `--remote`.

* Rework `git submodule update...` part of Makefile
2021-05-18 19:53:11 -04:00
Anghelo Carvajal 0e3e008da4
Hotfix: Fix running `make init` without `-jN` (#139)
* `assembly` target

* update phony

* temporary cp

* add todo

* use @hensldm suggestion
2021-05-18 19:20:31 -04:00
Parker Burnett 490924df23
QOL addtions to the readme (#104)
* adding changes to the README

* adding in progress shield

adding in the shield icon to show percentage complete

* updating the files, added gitignore for ctx.c

* fixing the typos

* fixing things to hopefully build now
2021-05-18 18:39:08 -04:00
Zach Banks c6fb5665d4
Split code BSS segment by file (#140)
Discussed on Discord: https://discord.com/channels/688807550715560050/688851976746041391/843916746989633547
2021-05-18 17:35:22 -04:00
Kenix3 5a776fabde
Updates progress.py script for the new location of built assets (#143) 2021-05-18 17:22:43 -04:00
Derek Hensley 4279f12414
Ovl Bg_Ctower_Gear OK (#123)
* BgCtowerGear OK

* Added description header

* Updated functions.txt

* Added MACRO to get type

* Renamed init chains to match tyype

* Added one more use of Macro, and addressed PR comment

* Fixed data copy error and better naming
2021-05-13 22:15:06 -04:00
Anghelo Carvajal 86bdadf4da
Extract assets in `make setup`, don't extract them to `assets/src/` and build them in `make` (#132)
* extract assets in setup and build them in make

* Add assetclean
2021-05-13 21:00:38 -04:00
Anghelo Carvajal aae6d9d364
Port `actorfixer.py` to MM (#126)
* Port actorfixer

* Run actorfixer
2021-05-10 21:22:03 -04:00
engineer124 cf1da451aa
Update actor symbols (#124)
* update actor symbols

* switch to baserom directory

Co-authored-by: Jared Collette <jcollette@4000v-udp25-l.eng.unimelb.edu.au>
2021-05-10 18:47:30 -04:00
Zach Banks 23d63852de
Use decompiled overlays when building ROM (#121)
* Restore padding in ObjVisiblock struct

* Copy overlays out of compiled `code.elf` to put into the ROM

This is just a "tempory fix"

It seems like the built code/assets in `code.elf` should not be copied
into `build/baserom/...` (over the original ROM's files) but instead
into a `build/decomp/...` tree or similar.

`dmadata_table.txt` would also need to be updated to read from the
correct location.

* Use dmadata_table.txt to generate build rules

`makerom_files.txt` & `makerom_uncompressed_files.txt` contained a lot
of the same data in `dmadata_table.txt`, so I added a small python
script to generate this information into `build/`

Segments are no longer dumped out of `code.elf` into `build/baserom/``,
instead they are put in `build/binary/`.

`linker_scripts/dmadata_script.txt` was checked in, but generated by
`dmadata.py`. I deleted it / moved it to `build/dmadata_script.txt.pre`.

I also introduced some sentinel files (`dep`). I ended up needing these
to make incremental builds work smoothly? (Without them, there were a
lot of steps that were getting re-triggered on every build.) If this
style isn't welcome, I can try to fiddle with the Makefile more to try
to avoid having them?

* Restore padding in BgLbfshot struct

* Touch sentinel file before command; rm on failure

* Restore padding in ObjKepnKoya struct

* Ensure asm/ directories exist before disasm steps

* Clean up Makefile rules

* Set default goal; silent objcopy; fix code_script path

* Fix ovl_En_Ginko_Man, ovl_Obj_Lightswitch merge

ovl_En_Encount2 still needs work to bring back to matching

* Fix ovl_En_Encount2 merge
2021-05-10 18:24:59 -04:00
Isghj 024ba29706
EnEncount2 (Majora Baloon in Bomber's Hideout) (#108)
* EnEncount2: start

* EnEncount2: got some easy functions down, but now I have a really weird unk struct

* EnEncount2: draw function nowhere close

* EnEncount2: cleaning/docs

* EnEncount2: removed bad function attempt

* EnEncount2: function name change to match mster changes

* EnEncount2: corrected old BgMeshheader to CollisionHeader

* EnEncount2: requested changes

* EnEncount2: forgot to add these requested changes

* EnEncount2: requested changes

Co-authored-by: isghj8 <isghj8@gmail.com>
2021-05-09 22:20:53 -04:00
Isghj fec0c38768
En_Ginko_Man (Bank Teller) (#118)
* EnGinkoMan: init

* EnGinkoMan: more matches

* EnGinkoMan: that's closer at least

* EnGinkoMan: better control flow at least...

* EnGinkoMan: docs

* EnGinkoMan: more docs

* EnGinkoMan: more docs 2

* EnGinkoMan: cleaning

* EnGinkoMan: missed something in savecontext

* EnGinko: requested changes and further docs

Co-authored-by: isghj8 <isghj8@gmail.com>
2021-05-09 22:20:47 -04:00
Isghj d98e9dfb01
Obj_Lightswitch (Sunswitch and Stonetower Temple flip switch) (#107)
* ObjLightswitch: fast

* ObjLightswitch: data migrated, except collider init is broke

* ObjLightswitch: nvm, collider documented

* ObjLightswitch: OK with 3 non-equiv, docs starting

* ObjLightswitch: more docs

* ObjLightswitch: some requested changes

* ObjLightswitch: requested changes

Co-authored-by: isghj8 <isghj8@gmail.com>
2021-05-09 22:18:57 -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
Derek Hensley e39141fb3d
Ovl en nutsball OK (#115)
* EnNutsball Match but one function with sp issues

* Updated ActorPlayer

* Renamed unk144 to timer and added data as comment

* Got update matched but stack issues with two vars

* add back new line

* Fixed stack issue based on PR comments. Added data

* more descriptive variable names

* Use OPEN_DISPS/CLOSE_DISPS macros in draw

* Address PR comments
2021-05-04 23:10:59 -04:00
Zach Banks fcc87b3ae2
ovl_Dm_Ravine (Link Riding Through Lost Woods Cutscene - Tree Trunk) (#120)
* ovl_Dm_Ravine OK (Link Riding Through Lost Woods Cutscene - Tree Trunk)

* ovl_Dm_Ravine: respond to PR comments

* Rename/retype DmRavine_Action -> DmRavine_DoNothing

* ovl_Dm_Ravine: incorporate PR feedback from kyleburnette

* ovl_Dm_Ravine: rename fields; use enum for state
2021-05-04 22:58:47 -04:00
Parker Burnett d61d236a04
En_jc_mato matching (#119)
* starting actor

* close to being done

* updating txt files

* z_en_jc_mato OK

* Merge branch 'master' into en_jc_mato

* fixing some suggestions

* adding names

* changing name to movement
2021-05-04 22:03:41 -04:00
Parker Burnett d44d842192
z_en_warp_uzu OK (#113)
* matched all functions

* Jk I figured it out....forgot to add static...

* Fixing name suggestion
2021-05-04 21:16:05 -04:00
Derek Hensley 7605041f0a
Ovl_En_Cha OK (#116)
* EnCha OK

* pr comments, else if branches, file header comment

* Better function names
2021-05-04 20:10:30 -04:00
kyleburnette 751c5e1049
obj_funen OK (#91)
* initial funen work

* obj_funen OK

* ran format script
2021-05-04 19:51:42 -04:00
kyleburnette 94ef01b42f
kepn_koya OK (#97)
* kepn_koya OK

* actually commited change to header
2021-05-04 19:08:19 -04:00
kyleburnette 0beaddd30b
bg_lbfshot OK (#92)
* bg_lbfshot OK

* formatted source files

* Update z_bg_lbfshot.c

* Update z_bg_lbfshot.h
2021-05-04 18:59:45 -04:00
kyleburnette a91eaad34c
obj_visiblock OK (#93)
* obj_visiblock OK

* re-oked obj_visiblock

* removed unnecessary pad
2021-05-03 18:07:08 -04:00
kyleburnette 0d4e4ffc38
bg_kin2_fence OK and documented (#103)
* initial fence work

* more fence work

* bg_kin2_fence OK and documented

* removed ctx file

* got rid of unk283 which didn't exist

* Renamed the array of eye sparkle particle spawns locations as suggested

* reok-ed kin2_fence
2021-05-03 17:18:59 -04:00
Derek Hensley b084717acb
Ovl obj ending OK but no data (#109)
* ObjEnding Matches but with unkStruct and no data

* Removed inital code comments

* Added data as a comment

* Add missing semicolon

* Addressed PR comments
2021-05-01 12:58:29 -04:00
Derek Hensley c7a1fb739f
En_M_Fire1 OK (#106)
* En_M_Fire1 OK

* Removed Null cast

* Added newline

* Address PR Review Comments

* Update src/overlays/actors/ovl_En_M_Fire1/z_en_m_fire1.c

Co-authored-by: Parker Burnett <burnettparker@gmail.com>

* Renamed unk190 to timer

Co-authored-by: Parker Burnett <burnettparker@gmail.com>
2021-05-01 12:33:57 -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
kyleburnette c377ffe4ac
en_bu OK (#96)
* en_bu OK

* renamed action func

* made the char array in the header of type UNK_TYPE1

* renamed display list pointer as suggested
2021-05-01 00:42:16 -04:00
kyleburnette 441f33968c
item_inbox OK (#95)
* item_inbox OK

* renamed func_80945534 to suggested name
2021-04-30 23:36:55 -04:00
Zelllll 536a484f73
ovl_Obj_Boyo OK (#112)
* start

* more functions

* fix bg thingy

* finish boyo

* conflict fix1
2021-04-30 23:04:05 -04:00
Zelllll f0cd2db055
ovl_Item_B_Heart OK (#110)
* finish heart

* fix linker
2021-04-29 21:54:53 -04:00
Zelllll fed1b37da1
ovl_Bg_Keikoku_Spr OK (#111)
* finish actor

* fix linker
2021-04-29 20:46:01 -04:00
kyleburnette 69d9f32ef3
dm_statue OK (#94)
* dm_statue OK

* dm_statue OK

* Reworked types of segmented addresses

* ran format script
2021-04-29 19:17:53 -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
kyleburnette d327f3e6c3
Changed ichaindis to output actual names by default and added an --offset arg to output offset names if needed. Also changed permission on all the overlayhelper scripts (#102) 2021-04-12 21:47:36 -05: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 75f1d51940
Optimization when building all to let compression happen as early as possible (#98) 2021-04-07 18:38:23 -04:00
kyleburnette 50d0bbe087
dm_sa OK (#88)
* initial dm_sa work

* more dmsa work

* dm_sa OK

* Changed char arrays in header to be UNK_TYPE1

* Made all of roz's suggested changes

* merge
2021-04-07 18:08:19 -04:00