Commit Graph

1726 Commits

Author SHA1 Message Date
engineer124 6aaeb80f99
Decompile Remaining code_8019AF00.c Functions (1 non-matching) (#1442)
* remaining code_8019AF00 functions

* oops

* decimal duration

* PR Review
2023-10-26 10:09:08 -03:00
Anghelo Carvajal c3b19739c6
`map_grand_static` and `map_i_static` (#1443)
* update makeyar.c

* xmls

* commit c files

* remove paddings and update the spec

* Tell ZAPD to not generate C files for the 2 problematic XMLs

* Rename symbols to follow style

* cleanup the generated files a bit

* comment on makeyar

* fix distclean deleting the `assets/c/` files

* actually fix distclean
2023-10-26 21:07:13 +11:00
EllipticEllipsis 6bdb7c31ea
`code_80140E80` OK and preliminary documentation, Fbdemo_Wipe4 OK and documented (#1106)
* OK, start documentation

* More documentation

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

* Decompile func_80167F0C

* FbdemoWipe4 OK and documented

* Mark bug in Wipe4

* More docs

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

* Mark bug

* Few more notes

* Fix function in Play

* Format

* Review

* Name Play_PostWorldDraw

* functions.h...

* Revert func_80167F0C

* Review

* functions.h

* Review

* Update Wipe4

* Rename system

* Format

* Put skeleton back in the cupboard

* bss

* Fix build

* rename to z_visfbuf

* review

* format

* bss

* some bss cleanup

* review

* bss

* review

---------

Co-authored-by: Tharo <17233964+Thar0@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
2023-10-26 17:42:24 +11:00
engineer124 7176ed4299
Player Docs: csMode -> csAction (#1433)
* csAction

* more cleanup

* namefixer

* simpleReplace

* fix brackets

* sneak in 2 player typos

* fix merge
2023-10-26 17:12:04 +11:00
Nuss 71fae65062
object_test3 (kafei) (#1431)
* naming

* improvements

* improvements

* ups
2023-10-24 08:32:07 +11:00
Anghelo Carvajal 1e19cfe869
Anju objects (#1444)
* bring over the objects from the other branch

* kafeis mask

* use symbols

* dman naming after assets

* stateFlags

* remaining stuff

* anim array bug

* Name everything in DmGm after DmAn

* WEEKEVENTREG_COUPLES_MASK_CUTSCENE_FINISHED

* undef

* format

* idk

* ing

* format

* name animations from an4, thanks emil!

* emptydl

* disbelief

* review

* format

* Update assets/xml/objects/object_mask_kerfay.xml

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

* review

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2023-10-23 16:03:16 +11:00
Nuss a468be77d5
object_owl (#1430)
* some naming

* naming

* comments

* improvements

* improvements
2023-10-23 10:31:55 +11:00
Wimmer 002f5ba6de
obj_oyu (#1436)
* object_oyu

object_oyu.xml / z_bg_goron_oyu.c updated

* Hot Spring Water Update

* updated comments

* GoronGraveyard prefix

* Update object_oyu.xml
2023-10-22 19:43:57 -03:00
Derek Hensley 3569ef97ad
progress ld fix (#1449) 2023-10-22 08:51:58 -03:00
Anghelo Carvajal ec86f10b0f
`SCHEDULE_TIME` (#1438)
* SCHEDULE_CALC_TIME_ALT

* add s32 cast to avoid f32 -> u16 direct cast

* SCHEDULE_TIME

* remove the alts

* Update explanation about the script
2023-10-22 16:52:40 +11:00
engineer124 425238fd5d
Match `Camera_Battle1` (#1445)
* match Camera_Battle1

* more cleanup

* more docs from OoT
2023-10-21 13:17:47 -03:00
engineer124 cbca59d49e
Match `Camera_KeepOn1` (#1447)
* Match Camera_KeepOn1

* small cleanup
2023-10-21 12:35:23 -03:00
engineer124 2dc405b6af
Match `Camera_Normal1` (#1446)
* improve Camera_Normal1

* decompme

* Match Camera_Normal1, thanks darkeye

* use the pad
2023-10-20 16:30:18 -03:00
Nuss 1d3f38dcaa
object_zoraegg (#1439)
* naming

* improvements

* bss order
2023-10-15 19:01:04 -03:00
Nuss 9e5777e473
object_po (#1426)
* naming

* typos and sLimbToBodyParts

* POE_LIMB_MAX instead of 21

* typos

* EnumName

* prefix
2023-10-15 21:02:31 +11:00
engineer124 f545f164b4
Switch Flag "None" macro (#1412)
* switch flag none

* cleanup brackets

* individual actor switch flag none

* missed some, small cleanup

* <= 0x80
2023-10-15 19:59:25 +11:00
Tom Overton a1bdc6c382
EnJso (Garo) OK and documented (#1440)
* EnJso (Garo) OK and documented

* Respond to review

* Replace some weird ifs with early returns

* Respond to Anghelo's review
2023-10-15 17:39:47 +11:00
engineer124 93713a1da0
Audio Sequences Decompiled & Documented (z_obj_sound OK, more code_8019AF00.c) (#1407)
* import audio docs

* cleanup

* SEQ_SCREEN_WEIGHTED_DIST

* PR

* PR
2023-10-13 17:39:10 -03:00
Wimmer 576cf6964c
Obj_visiblock (#1422)
* Obj_visiblock

Object for the Lens of Truth Platforms

* Update assets/xml/objects/object_visiblock.xml

DList update

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

* Update assets/xml/objects/object_visiblock.xml

Tex outname update

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

* Update z_obj_visiblock.c

DList name update

* Revert "Update assets/xml/objects/object_visiblock.xml
"

This reverts commit 228d6e8914.

* Revert "Update assets/xml/objects/object_visiblock.xml
"

This reverts commit 53a8786f26.

* Update object_visiblock.xml

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-10-13 14:23:09 -03:00
Nuss a03335d325
ovl_Door_Spiral decompiled (#1432)
* data

* some matching

* all funcs

* improvements

* improvements

* improvements

* small clean up
2023-10-13 14:04:36 -03:00
Wimmer 01d5816417
obj_big_fwall (#1435)
* Big Fire Wall

Big fire wall.xml / Z en encount3.c update

* RingOfFire update
2023-10-13 08:50:00 -03:00
CodeOverFLow 2e344b8d15
Boyo (#1341)
* updated variables.txt

* continue investigation

* format to style

* matching more asm

* still more asm matching

* finally matching

* matching even more

* add rodata

* match more asm for Update

* matching 99.58% of ObjBoyo_Update

* matched ObjBoyo_Update

* some cleanup

* formatted

* review: remove ACTOR_COLLISION_HANDLING_CASES define

* review: fix main functions parameters

* review: fix collision function signatures

* review: fix ObjBoyo_FindCollidedActor parameters

* review: better formatting for InitVars

* review: fix ObjBoyoCollisionHandler typedef

* review: fix segmented AnimatedMaterial

* review: fix static ColliderCylinderInit

* review: disassembled initchain

* review: fix collision functions

* review: fix functions.txt

* review: fix variables.txt

* review: clean z_obj_boyo.h

* review: fix ObjBoyo_Destroy

* remove fake variable from ObjBoyo_Init

* review: rematch FindCollidedActor

* review: make asm match again

* review: update spec file

* review: fix spec file

* review: remove static D_***

* review: fix bad logic to find collided actor

* review: fix ObjBoyo size (local make is now OK)

* review: rename collision handlers array

* review: use constant

* review: clean PushPlayer function

* review: fix LSP bad renaming

* review: use GET_PLAYER macro

* review: remove ugly pointer deref

* review: replace += 1 with ++

* review: return NULL to emphasize it is a pointer

* review: check against NULL instead of 0

* review: remove unnecessary casts

* review: use constants

* review: remove unnecessary include

* review: rename variables + fix assembly matching

* review: change ++i to i++

* review: fix inline comments

* review: replace != with < in for loop
2023-10-13 18:59:49 +11:00
Nuss 2c182bf7e3
object_icicle (#1421)
* Naming

* naming

* naming

* top comment
2023-10-11 10:44:20 -03:00
mzxrules f17e85d1fd
ovl_Obj_Grass_Unit OK and some grass documentation (#1172)
* z_obj_grass_unit OK

* document some grass

* pr suggestions, add grass_unit comment

* pr suggestions

* implement constants
2023-10-11 09:32:02 -03:00
Tom Overton dd4206bb24
Document `object_jso` (Garo and Garo Master) (#1428)
* Document `object_jso` (Garo and Garo Master)

* Fix TexAnim names
2023-10-10 12:11:21 +11:00
Nuss e2dcde6a92
object_kinsta1_obj (#1415)
* naming

* Original naming

* Original naming

* wrong file

* Swamp Spider House Door

* naming

* ups

* fix
2023-10-09 22:13:48 +11:00
Nuss e174672223
object_ladder (#1419)
* naming

* Original naming

* removed comments

* comments
2023-10-08 23:05:12 -03:00
Nuss ab4c207be4
object_random_obj (#1416)
* naming

* Secret Shrine doors

* naming

* OutName
2023-10-08 22:25:49 -03:00
Nuss d25e10dcc2
object_redead_obj (#1417)
* naming

* comment

* Out Name

* The Gibdo's Well Doors

* naming

* typos
2023-10-08 22:07:54 -03:00
Nuss 808f60a1fa
naming (#1425) 2023-10-08 21:39:15 -03:00
Nuss 5dced7a09b
object_f40_switch (#1418)
* naming

* naming to gStoneTowerFloorSwitch
2023-10-08 21:13:41 -03:00
engineer124 ae4a8fbe00
Object Name Cleanup (#1427) 2023-10-08 20:57:25 -03:00
Zach North da0c9072f5
Document object_skb (#1404)
* object_skb: Limb and Anim docs

* object_skb: DL and text docs

* Formatting changed files

* Changed names for some bones to reflect oot names

* updating some names to address code review comments

* Whoops, forgot to change the name of MAX

* Rename EnHinkSkbAnimation in src/overlays/actors/ovl_En_Hint_Skb/z_en_hint_skb.c

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

* Changed STALCHILD_ANIM_x to STALCHILD_HINT_ANIM_x

* forgot to rename both parts of a typedef enum

* gStalchildSwingOnBranch missing Anim tag

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

* Fixed all instances of gStalchildSwingOnBranchAnim

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-10-07 16:11:10 +11:00
Nuss 43df8f4454
object_comb (#1420)
* naming

* OutName
2023-10-07 15:47:03 +11:00
Nuss a980067bd8
ovl_En_Takaraya decompiled (#1409)
* EnTakaraya_Destroy

* some matching

* some matching

* some matching

* matched func_80ADF7CC

* func_80ADEF74 wrong arg

* data

* clean up

* improvements

* actionFunc pointer

* fake

* improvements

* improvements

* naming for the bool

* function naming

* improvements

* improvements

* GET_PLAYER_FORM macro

* macro
2023-10-07 12:40:59 +11:00
Nuss 16bc54b63b
object_lightblock (#1414)
* naming

* Original naming

* sun block
2023-10-07 07:40:56 +11:00
Nuss 6ea91335c5
object_zl1 (#1381)
* object_zl1

* formating

* improvements

* offset

* order

* offset

* blobs

* offset
2023-10-05 21:45:26 -03:00
engineer124 e810559391
Object Cleanup (#1410)
* object cleanup

* namefixer

* objectPtr

* PR Review

* PR Review

* more uses of macro

* missed another one
2023-10-05 17:37:52 -03:00
Tom Overton ac8d49ea6f
Skeleton and shin name cleanup (#1413)
* Skeleton and shin name cleanup

* Use ANI_LIMB_MAX
2023-10-05 10:19:30 -03:00
Derek Hensley 03d1a794e1
z_kankyo pt 1 (#1377)
* z64environment.h

* remove todo

* Cleanup

* data + bss + 2 functions

* Bring over simple functions

* Remove lerp comment

* code functions csv

* Remove docs changes

* ZBufValToFixedPoint

* Remove leading 0's

* SEGMENT macros

* eventDayCount

* format

* z64bombers_notebook.h

* fix merge

* Comments

---------

Co-authored-by: angie <angheloalf95@gmail.com>
2023-10-05 16:08:08 +11:00
engineer124 d3104be63c
Switch Flag Cleanup (#1406)
* cleanup switchFlag

* more cleanup

* switchFlags
2023-10-05 15:44:51 +11:00
fig02 f4a490bb6a
Port Proposed OoT Object Docs (#1361)
* port docs in z_scene

* undo accidental ctrl-f

* another fix

* expose Object_SpawnPersistent

---------

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2023-10-04 14:01:04 +11:00
MegaIDK d635b81ee6
document object_kanban (cuttable sign) (#1364)
* initial commit of doc

* comment

* model and material

* indeed c file exists

* renamed confusing stuff

* space

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

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-10-04 13:31:06 +11:00
Derek Hensley 9e72c240d9
Z_message (2 NON_MATCHINGS) (#1398)
* matched func_8014D62C

* matched func_8014D304

* matched func_80149048

* matched func_80159438 & func_8014CDF0

* matched Message_GetState

* matched func_80152CAC

* matched func_80149454

* matched func_801491DC

* matched func_80150A84

* matched func_801496C8

* matched func_80149C18

* func_8014995C progress

* matched 8014995C

* matched func_80153EF0

* fix MessageContext lottery guess array size to match func_801496C8

* matched 80148D64

* matched func_8014AAD0

* progress func_8014CFDC

* matched func_8014CFDC

* progress func_801514B0

* progress#2 func_801514B0

* matched func_801514B0

* progress func_8014C70C

* Progress on few functions

* fix some variables & func name

* change unk11F00 type and usages

* func_8014C70C matched

* match func_8015268c

* fix building

* format

* engi message WIP

* enums, cleanup

* missed one

* oops

* even more enums

* another oops

* func_8015E7EC NON_MATCHING

* cleanup Message_DrawTextCredits

* MSGMODE cleanup

* import sFontWidths

* Import z_message_nes data

* Message_DrawTextNES draft

* fix types in message_nes

* Message_DrawTextNES NON_EQUIVALENT

* Message_DrawTextNES improvement

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

* Import bss

* fixes

* Data clean up

* Delete Message_Decode m2c output

* Readd Message_Update data

* import data

* func declaration

* cleanup

* Language enum

* fix naming, some flags

* Update functions and variables related to the bombers notebook event queue.

* Update renamed variables.txt

* format

* attempt Message_DecodeCredits

* begin Message_DecodeNES

* decode cleanup

* incremental improvements on Message_DecodeNES

* oops

* more progress

* first attempt at Message_Decode

* cleanup Message_Decode

* Message_Decode progress

* good progress on decode loops

* more progress

* good Message_Decode progress, thank anon

* decode creep

* big improvements, thanks anon/hatal

* small nes improvement

* cleanup

* match Message_DrawTextDefault, big progress on Message_DrawTextNES

* namefixer for save structs

* Some cleanup/fix non-equivalencies in decodes

* cleanup

* Small cleanup

* func_80150A84

* TextBoxType enum usage

* Format

* match Message_DecodeCredit by Maide, small improvement in Message_DrawTextNES

* comments

* some docs

* cleanup, improve matches

* Some improvement

Co-Authored-By: Santiago <github-santaclose-noreplay@NA.com>

* Fixes

* Missed

* Match Message_DrawTextNES

* Move functions to z64message.h

* string macros

* Small cleanups

* 1 more small thing

* decompme scratches

* Cleanup

* Item enum

* PR

* SEGMENT_ROM_START

* PR

* format

* ocarina cleanup

---------

Co-authored-by: andzura <andzura@andzura.fr>
Co-authored-by: Angie <angheloalf95@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Zoey Zolotova <zoey.zolotova@gmail.com>
Co-authored-by: Santiago <github-santaclose-noreplay@NA.com>
2023-10-04 08:51:45 +11:00
Anghelo Carvajal f08a69a2cb
`ovl_Bg_Dy_Yoseizo` and related docs (#1390)
* Add ido setting to permuter

* OK

* Data imported & named, change spec

* Some easy naming

* Cleanup

* More object stuff and enums

* Document EnDyExtra

* Document DemoGetitem

* Document DemoEffect

* Some work on Elforg

* Elforg params macro, some more on Elfgrp

* Defines for number of fairies

* Tweak some flags wording

* Label beam

* Elfgrp: Name most of the stray fairy handling stuff

* cleanup

* fix typo

* GreatFairyAnimation

* name animations

* BgDyYoseizo_TrainPlayer

* Choose behaviour?

* fix merge

* format

* self review

* WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK

* jenkins

* review

* Update src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c

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

* review

* Update src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c

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

* Update src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c

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

* Update src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c

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

* Update src/overlays/actors/ovl_En_Elfgrp/z_en_elfgrp.c

* review

---------

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2023-10-04 08:13:22 +11:00
Nuss f6a2f4492a
En_Encount3 decompiled (#1405)
* data

* some matches

* draw func

* Update func

* improvements

* forgot extern

* improvements

* improvements

* improvements

* improvements
2023-10-03 18:58:46 +11:00
Tom Overton 9d043f0197
Add original asset names to all `object_l*` and `object_m*` files (#1403) 2023-10-03 17:26:50 +11:00
Derek Hensley 4ca54d704e
Speedmeter OK (#1393)
* Match

* data + bss

* x

* Small cleanup

* maxVal

* gUnkTimeAcc

* SET_FULLSCREEN_VIEWPORT_HIRES

* Update permuter settings

* SET_FULLSCREEN_VIEWPORT_DYNAMIC
2023-10-03 15:52:41 +11:00
engineer124 2a485ad774
Animation Cleanup: En_J* (#1401)
* cleanup J

* small fix
2023-10-01 17:12:09 +11:00
engineer124 1509349bd7
Animation Cleanup: En_K* (#1402)
* cleanup k

* one more name
2023-10-01 12:56:38 +11:00