Commit Graph

584 Commits

Author SHA1 Message Date
EllipticEllipsis 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
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 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
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 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 Anderson 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
Maide 9478fc760f
Thiefbird (#290)
* Thiefbird

* Fix enums

* Rename funcs

* PR
2021-09-28 17:56:25 -04:00
Maide edb1dd4675
En_Zot (#320)
* En_Zot

* PR
2021-09-28 10:28:06 -03:00
Tom Overton 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
Maide 27e41b73a8
En_Rd (#316)
* En_Rd

* PR

* a
2021-09-27 23:17:28 -03:00
EllipticEllipsis 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
EllipticEllipsis a6d26c82f2
afterprenmi.c OK (#297) 2021-09-27 21:00:55 -04:00
emilybrooks 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
EllipticEllipsis 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
rylieb 1362615cc6
Add ctags "tags" files to .gitignore for vim users (#328) 2021-09-27 17:41:36 -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
Maide 039fc4623e
En_Syateki_Man (#269)
* En_Syateki_Man

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

* IINC
2021-09-25 12:47:18 -03:00
rylieb bc5c3866d5
Obj_Syokudai (Torch) OK and mostly documented (#306)
* Started uncommenting statics, but then realized this actor has BSS, lol.

* Import .data and .bss. Run format.sh.

* ObjSyokudai_Init OK and mostly documented.

* ObjSyokudai_Destroy OK and fully documented.

* ObjSyokudai_Draw OK and partially documented.

* Good progress on ObjSyokudai_Update, but NOT OK.

* Instruction match, but needs regalloc and stack.

* Stack is closer now.

* Obj_Syokudai OK, no new warnings, ran formatter.

* Documented .data and .bss variables.

* Final documentation pass before PR.

* Add header, fix build errors.

* Use COLTYPE_METAL and COLTYPE_WOOD macros.

* Apply suggestions from code review

engineer124's suggestions.

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

* Apply suggestions from code review

engineer124: WaterBox* instead of UNK_PTR

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

* Update src/overlays/actors/ovl_Obj_Syokudai/z_obj_syokudai.c

engineer124: AC_HARD -> AC_HIT so Jenkins stops complaining

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

* Hopefully fix Jenkins via z_bg_lotus WaterBox*.

* Rename sp2C to waterBox in BgLotus.

* Run format.sh.

* Update include/functions.h

Change func_800F22C4 param_1 from s8 to s16.

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

* Change func_801A5CFC param_1 to sfxId in prototype

* Document interactions.

* Run formatter.

* Clarify that posDiff is relative to stick *tip*.

* Changed interaction comparisons to better fit enum

* snuffTimer enum

* Added more #defines.

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2021-09-25 09:53:53 -04:00
EllipticEllipsis f77cfb9020
Remove `.mdebug` sections by default (#313)
* Add RM_MDEBUG to makefile

* Add to diff settings to allow use of --source
2021-09-25 09:36:15 -04:00
EllipticEllipsis 9e4d51fb9f
printutils OK, add `va_end` to variadic functions (#294)
* printutils OK

* Add va_end to every variadic function
2021-09-23 20:14:12 -03: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
emilybrooks a59943bc4a
ovl_obj_lightblock OK (#282)
* initial commit

* review suggestions

* changed opacity to alpha

* changed to multiple of 10
2021-09-22 20:46:26 -04:00
EllipticEllipsis 01a6dea813
Update subrepos (#281)
* git subrepo pull tools/ZAPD --force

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

* git subrepo pull tools/decomp-permuter --force

subrepo:
  subdir:   "tools/decomp-permuter"
  merged:   "86b1975e"
upstream:
  origin:   "https://github.com/simonlindholm/decomp-permuter.git"
  branch:   "main"
  commit:   "86b1975e"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/graphovl --force

subrepo:
  subdir:   "tools/graphovl"
  merged:   "eb25be94"
upstream:
  origin:   "https://github.com/AngheloAlf/graphovl.git"
  branch:   "master"
  commit:   "eb25be94"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

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

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

* git subrepo pull tools/ZAPD --force

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

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

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "48e675ff"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "main"
  commit:   "48e675ff"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/ZAPD --force

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

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

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "47c94c99"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "main"
  commit:   "47c94c99"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Declare required textures

* Name texture, add decomp.me permuter settings

* git subrepo pull tools/ZAPD --force

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

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

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "97197f2a"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "main"
  commit:   "97197f2a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/ZAPD --force

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

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

subrepo:
  subdir:   "tools/asm-differ"
  merged:   "55bba23a"
upstream:
  origin:   "https://github.com/simonlindholm/asm-differ.git"
  branch:   "main"
  commit:   "55bba23a"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* git subrepo pull tools/decomp-permuter --force

subrepo:
  subdir:   "tools/decomp-permuter"
  merged:   "a20bac94"
upstream:
  origin:   "https://github.com/simonlindholm/decomp-permuter.git"
  branch:   "main"
  commit:   "a20bac94"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"
2021-09-21 20:13:03 -04:00
EllipticEllipsis 0ebd082592
position OK (#296)
* position OK

* Actually remove the function pragmas
2021-09-21 19:54:15 -04:00
EllipticEllipsis 367e500d02
Two minor fixes (#287)
* Change to -funsigned-char in makefile

* Change ROM/RAM to VROM/VRAM in sym_info.py

* Format

* Make the EnBigPo vectors shorter by removing `,`s
2021-09-21 18:09:14 -04:00
Maide 5b9a825cad
Bg_Hakugin_Post (#258)
* Bg_Hakugin_Post

* PR

* a

* PR

* a
2021-09-21 18:08:09 -04:00
Maide 4796e6f61d
En_Railgibud (#268)
* En_Railgibud

* Match func_80BA57F8 (thanks Petrie, Simon, Anghelo)

* Match func_80BA5E18, thanks to engineer

* a

* PR
2021-09-19 22:46:56 -03:00
Maide 9312fe4d11
En_Sellnuts (#264)
* En_Sellnuts

* a
2021-09-19 10:39:39 -04:00
Maide 3c779d7fd5
En_Skb (#262)
* En_Skb

* a

* a

* a

* Func namesW
2021-09-19 10:05:21 -04:00
Tom Overton b65d363cec
Fix some misformatted files in current master (#315)
* Run ./format.sh on current master

* Format something in bigpo better by deleting commas + running format again
2021-09-19 08:56:05 -04:00
Maide da1265f4bc
En_Dns (#241)
* En_Dns

* NBS

* PR

* PR

* Fix warnings

* PR

Co-authored-by: Angie <angheloalf95@gmail.com>
2021-09-02 12:27:11 -04:00
Tom Overton 6ecea0ec6f
Obj_KIbako cleanup (#280)
* Modify Kibako to use the same ID/FLAG macros as Kibako2

* Define KIBAKO_BANK_INDEX

* Add explanatory comment at the top of the file

* Add Kibako function names to functions.txt

* Define KIBAKO_BOMBER_CAN_HIDE_IN_BOX
2021-09-02 11:44:50 -04:00
Maide 1f4973d9b4
En_Kgy (#244)
* En_Kgy

* NBS

* PR

* PR

* PR
2021-09-02 11:27:26 -04:00
gamestabled b3816cd26b
ObjMakeoshihiki OK (#272)
* ObjMakeoshihiki OK

* suggested changed

Co-authored-by: gamestabled <gamest@bl.edu>
2021-09-02 10:49:00 -04:00
Kenix3 c94fd6ccbc
Updates README to add an FAQ, and also updates CONTRIBUTING to be explicit on the reservation workflow process. (#245) 2021-09-02 10:31:28 -04:00
Anghelo Carvajal e6b73951c6
Fix renamed functions in EnDodongo (#285) 2021-09-01 21:25:29 -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
Maide c96d1df320
En_Dodongo (#242)
* En_Dodongo

* NBS

* PR

* PR

* PR

* PR
2021-09-01 18:53:12 -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
Maide e1cb76c258
En_Dnq (#240)
* En_Dnq

* NBS

* PR

* PR

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

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

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

* delete asm-processor

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

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

* re-add build.py

* remove subrepo

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

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

* NBS

* PR

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

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

* ObjKibako2_Destroy OK

* func_8098EC68 OK

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

* Name skulltulaNoiseTimer and get a little closer to matching Update

* Wrap Update in NON_MATCHING for now

* Get this ready to push up

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

* ObjKibako2_Draw OK

* func_8098E9C4 OK

* Turns out globalCtx *is* needed

* func_8098E8A8 OK

* Save my progress on func_8098E5C0 for now

* func_8098E900 OK

* func_8098EB78 OK

* Clean up some if-conditionals

* Delete pointless forward declaration

* ObjKibako2_Break OK

* Update names to match OoT equivalent

* func_8098E5C0 OK (though a little weird)

* ObjKibako2_Update OK

* Clean, document, and name ObjKibako2_ShouldBreak

* Clean and name ObjKibako2_ContainsSkulltula

* Some more cleanup

* Why did I mix snake case with camel case lol

* Update spec now that everything matches

* Actually rename the data

* sn/cs -> sin/cos

* Use true/false in ObjKibako2_ShouldBreak

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

* Use macro and enum for contents

* Get rid of fake temp in Init

* Macros for collectible ID/Flag

* 0xFFFD -> ~AC_HIT

* In macros, x -> this

* Just kidding, use thisx for macros

* Add description to the top of C file

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

* char -> UNK_TYPE1

* Remove unnecessary struct padding

* Initialize thisPos at the same time it's declared

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

* Clean up control flow in ObjKibako2_Idle

* Remove extraneous parentheses

* Move instantialization up in ObjKibako2_ContainsSkulltula

* Move tempRand instantiation up in ObjKibako2_Break

* Move collectible instantiation up in ObjKibako2_SpawnCollectible

* Remove extra brackets

* Remove extra brackets (again)

* Move contents instantiation up in ObjKibako2_Init
2021-08-23 22:14:18 -04:00
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
Maide 9eb438860c
Sort actor functions and extern'd symbols (#259)
* Sort funcs

* PR
2021-08-15 14:04:28 -04:00