summaryrefslogtreecommitdiff
path: root/assets/xml/objects
AgeCommit message (Collapse)Author
2022-08-07Effect EnFire OK (#977)Derek Hensley
* OK * Gameplay keep fire * & * &2 * PR * Fire textures * Second mask
2022-08-07Effect EnIce OK (#976)Derek Hensley
* Ok * Material/Model * Cleanup * format * IceFragment Assets * PR
2022-08-07Effect Firetail OK (#974)Derek Hensley
* OK * description * gEffFire1DL * format * PR
2022-08-07ovl_En_Test2 Decompiled (#968)Alejandro Asenjo
* all functions matching * all functions matching * data problem * ovl_En_Test2 Decompiled * format + fix constants * final details * pr review * pr review * pr review
2022-08-04EnGe1 OK and documented, document `z_snap` (#952)EllipticEllipsis
* Move PictoActor typedefs to z64actor.h * OK, data imported * Minor snap stuff * Name most functions and variables * Name most of object, apart from animations * Document snap * Fix actors to use the PictoActor struct * Format * Finish documenting EnGe1 * Finish documenting z_snap and related actors * Format * Review, format * Name last couple of things * bss * Review * Review * bss * Introduce z64snap.h, add SCREEN_TO_DEVICE macros * Back to PROJECTED_TO_SCREEN
2022-07-23`z_draw` OK and Documented (#900)engineer124
* Import data for z_draw * Match z_draw * cleanup * rupees * Some object gi docs * More documents * Add explanation on function names * more cleanup * Fixed some things * More docs * Object docs WIP, still not done. I'll continue tomorrow * More WIP, should just be mask gi objects left now * Some masks done, many more to go * cleanup * Last masks finish * Shield Stolen * cleanup * Apply various dicussions * remove casts * PR Suggestions * Sync PowderKeg
2022-07-23`ovl_En_Po_Sisters` and `object_po_sisters`Documented (#930)Isghj
* EnPoSisters: basic docs back in * EnPoSisters: some docs * EnPoSisters: some docs * EnPoSisters: more docs 2 * EnPoSisters: more docs * PoSisters: documented most of object xml * PoSisters: swapped DL * PoSisters: more docs * EnPoSisters: minor docs * PoSisters: more docs * PoSisters: fix wrong prefix * PoSisters:Minor docks * more doc * more fun * More functions named, all of them? * doc * EnPoSisters: docs, formater pass * z_actor: removed comment, fixes formater * Apply suggestions from code review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * PoSisters: formater * PoSister: requested object xml changes * Apply suggestions from code review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * PoSisters: remove bgId comment, add meg reverse timer comments, format * PoSisters: megCountRemaining union and some comments, formater pass * PoSisters: better first actionfunc name * PoSisters: Skeleton -> Skel * PoSisters: Formater pls Co-authored-by: Isghj8 <isghj8@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-07-23ovl_Dm_Char03 OK (#963)Chloe
* Decompile ovl_Dm_Char03 * review fixes * more review fixes * remove leading zeroes
2022-07-23General Cleanup 8 (#958)Derek Hensley
* EnBigokuta * EnBji * Soldiers * Start harfgibud * Finish harfgibud * Pamela * PametFrog * format * bigslime * bji comment * PR + small cleanup of Eye Tex anims * Shikashi
2022-07-23Document DmChar02 and its animations, rename one struct var in DmStk (#951)Tom Overton
* Document DmChar02 and its animations, rename one struct var in DmStk * Better description
2022-07-23`EnNnh` (Butler's Son) Documentation and one Kakasi thing I missed (#957)Isghj
* EnNnh: Docs * EnKakasi: added targetmode params macro * EnNnh: requested move of object description
2022-07-23Document object_ma2 (Cremia) (#950)Tom Overton
* Document object_ma2 (Cremia) * Clarify what the box is for * Use CREMIA_LIMB_MAX in Invadepoh
2022-07-23Some minor cleanup involving stray fairies (#949)Tom Overton
* Some minor cleanup involving stray fairies * Fix build
2022-07-23Document object_ma1 (Romani) (#948)Tom Overton
* Document object_ma1 (Romani) * Sync up one of the mouth name textures with how I did it for Cremia * Specify what the box is for * Respond to hensldm's review * Sync texture names with what Anghelo is doing in his Obj_Um PR
2022-07-23`ovl_Obj_Um` OK (#887)Anghelo Carvajal
* Pass the whole actor in mips2c * hacky way to fix some types * decomp a few functions and second mips2c pass * draw * another mips2c pass * some functions * Init almost matching * mips2c pass * Match update and a few more * A bunch of functions * horses gonna horse * func_80B7A860 * mips2c pass * func_80B7984C * func_80B795A0 * func_80B783E0 * func_80B78764 * Tried func_80B7BEA4 * func_80B79BA0 * func_80B7A494 * func_80B7A614 * lots of non equivalents * fix * Match func_80B77770 * func_80B7BEA4 * import data * func_80B7B93C * minor fixes * ObjUm_Init * func_80B7AF30 * func_80B7B18C * func_80B7BABC * func_80B77FA4 * func_80B7B598 * func_80B781DC is equivalent * func_80B781DC * func_80B7BABC * Cleanup * limbs * minor members renames * First docs pass * small pass * yes * another pass * more renames * flags defines * arePotsBroken * some flags * yet another docs pass * Some members named * Add weekEventReg docs * small rename * And more * Another 2 * actorfixer and other fixes * format * Use extracted object symbols * fixes * Some stuff improved * very minor naming * format * remove debugging stuff * cleanup * Some EnHorse stuff * horse params * ! FAKE * Update include/functions.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Update assets/xml/objects/object_um.xml * IS_BANDIT_TYPE Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * remove a fake match Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Update src/overlays/actors/ovl_En_Horse/z_en_horse.h Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_En_Ma_Yto/z_en_ma_yto.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * anim enum * name anim enum * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * remove repeated forward declarations * fixes * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Update src/overlays/actors/ovl_Obj_Um/z_obj_um.c Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * comment * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * areAllPotsBroken Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * fix merge Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
2022-07-22ovl_Eff_Change Decompiled (#946)Alejandro Asenjo
* all functions matching * progress * ovl_Eff_Change Decompiled * ovl_Eff_Change Decompiled * space * spec
2022-07-22Effect Gfire Ok (#941)Derek Hensley
* OK * description
2022-07-22Effect Gspk OK (#939)Derek Hensley
* OK * cleanup * newline
2022-07-22Document En_Dg (dog) and do some light cleanup on En_Racedog (#926)Tom Overton
* Document some low-hanging fruit in EnDg * Animation and type documentation * Document a bunch of stuff * Name more functions * Params macro * Defines for dog flags * Name all struct variables * Give all animations better names * Better name for Swim2 * Document/name a bunch of stuff * Make index enum * Respond to engineer's review * Respond to mzx's review * Fix up comment (again) * Respond to hensldm's review
2022-07-22EnBjt OK and documented (#912)EllipticEllipsis
* OK, data imported * Fix some typos * Start docs * Struct almost finished * Start object, add state enum * undefined_syms * Finish object, name some more stuff * Name a few states and another function * PlayState * Minor tweaks in z_room and z_sub_s * Complete documentation * spec * Review 1 * functions.txt * Schedule result enum * Rename schedule results * Review * Remove update comments * Inventory_DeleteItem * PLAYER_STATE * Format * Review * Update struct name
2022-07-22EnBaba Documented (Bomb Shop Lady) (#825)Derek Hensley
* Merge in sub_s_models * Update subs DL names * Unused Weight pathing * Function headers for weightpathing * TimePathing WIP * Timepathing, still unsure about unk184 * Move subs functions from functions.h to z64subs.h * Add fake comment * Some cleanup and renames * Renames/cleanup of actors that use timepath * Cleanup * More cleanup * Rename unk stuff * Merge in upstream/master * TimeElapsed -> elapsedTime * Fix * Final cleanup * SubS Time Paths * Still needs dialog action functions * Fix waypoint comments * Review pt. 1 * Baba review * ScheduleResult -> ScheduleOutput * Forgot to update functions.txt oops * Add clarifying comment to SubS_TimePathing_FillWeightArray * format.sh * Finish up docs * Fix order comments * Fix * Change bombShopkeeper struct member to * Fix a few merge mistakes * Add ScheduleOutput to namefixer * format * Format and fix merge * Review * PR * z64schedule.h * text summary Co-authored-by: Maide <34639600+Kelebek1@users.noreply.github.com> Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2022-07-19Effect Gripple (#940)Derek Hensley
* OK * description * undef * format
2022-07-19ovl_Bg_Fu_Mizu Decompiled (#935)Alejandro Asenjo
* All functions matching + data imported * ovl_Bg_Fu_Mizu Decompiled * heightTarget
2022-07-19EnBat OK and documented (#924)EllipticEllipsis
* OK, start documentation * Name some more stuff * Name rest of functions and bss var, tidy up floats * Document object and paramflags * Cleanup bat * Cleanup crow * Cleanup firefly * Couple of minor things in arrow * Review 1 * PLAYER_STATE * Remove unnecessary f32 casts * Review * Review
2022-07-19ovl_Eff_Lastday Decompiled (#921)Alejandro Asenjo
* all functions matching * ovl_Eff_Lastday Decompiled * renaming * final clean up * enums * pr review * pr review * Prefix * renamings
2022-07-19ovl_Obj_Lift Decompiled and Documented (#917)Alejandro Asenjo
* progress * all functions matching * data imported * ovl_Obj_Lift Decompiled and Documented * pr review * chain assignments * pr review * fixes * yOffsets
2022-07-19ovl_Dm_Al Decompiled + Some Documentation (#913)Alejandro Asenjo
* all functions matching, data isn't? * cleanup in progress * ovl_Dm_Al Decompiled * pr review * Documentation Fixes and new entries * forgot one * pr review
2022-07-19ovl_Eff_Kamejima_Wave Decompiled (#908)Alejandro Asenjo
* almost there * ovl_Eff_Kamejima_Wave Decompiled * Us removal * minor clean up * pr review * review * sikihi rollback and function name fix * params rename * SetVtxAlpha * params prefix * Jenkins re-run
2022-07-19ovl_En_Sekihi Decompiled and Documented (#907)Alejandro Asenjo
* progress * All functions matching * ovl_En_Sekihi Decompiled and Documented * pr review * pr review * params enum * corrections and renaming * pr review * Update src/overlays/actors/ovl_En_Sekihi/z_en_sekihi.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-07-19ovl_Obj_Hsblock decompiled (#866)Alejandro Asenjo
* ovl_Obj_Hsblock decompiled * PlayState + PR Reviews * s * pr review * sFocusHeights * displaylists rename * bring up names from OOT * fix * fix * xml comment
2022-07-18En_Ik OK (#821)Parker Burnett
* starting en_ik * updating and more matching funcs * matched more functions and ran format.sh * matched another, started on init * updating things with master, and more matches * another function down * some more progress * some documenting * master merge * maybe some progress? * one more func left * IK OK * inital cleanup passthrough * fixing warnings and formatting * some cleanup * touch up * more docs * doin dat dere docs * actorfixer * finishing function names * initial round of fixes * format * Naming things * namefixer * review comments pt2 * comment updates * PR Feedback * forgot a format * naming enum * more fixes * minor fix * minor fix * format * fixes for daaays * for some reason these keep showing up? * fixing blob * names * fixes * naming things...can't discern the last ones... * updating TLUT and names * formating and fisxes * fixing func name * naming effect variable * name fixer, and renaming variable * Fixing xml * forgot to fix name
2022-07-11`z_player_lib`: Part 1 (#688)Anghelo Carvajal
* fix some symbols and file splits * PLAYER_STATE macros * Move over a few functions * AP functions and update struct * another small bunch * Add player_lib prototypes * A few more functions * Some fixes and add stuff to actorfixer * format * bss * Elliptic's review * Engineer's review * Some renames and cleanups * bss * A bit of cleaning up * Player_DrawZoraShield * format * actorfixer, bss and format * Forgot to merge master again * Rename some LinkGoron dlists * PlayerMeleeWeaponAnimation enum * format * actorfixer, bss and format * more bss * actorfixer * format * actorfixer and format * bss * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * sEnvironmentTextTriggers * Update include/z64save.h Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/code/z_player_lib.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * breman mask march comment * fix * fixes * bss * RESPAWN_MODE_RETURN * review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * format * Engineer's review Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * Update src/code/z_player_lib.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update include/z64player.h Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * review Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com> * format * unused mwas * fixes 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> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
2022-07-11General Cleanup 5 (#872)Derek Hensley
* TexAnim * Animmode * Collider ArrayCount * Rand_Next * Revert "Rand_Next" This reverts commit ba1046ac54b07c6b37a3bb4ec8632a5c4fd41e98. * kendo_js cast * PR review
2022-07-11object_rotlift documented, various cleanup of Deku Flower stuff, finish ↵Tom Overton
documentation of ObjRotlift (#879) * Make params-packing macro * Move limb enum to object * Minor deku flower cleanup * Document object_rotlift * Rotlift cleanup and documentation * Respond to review
2022-07-11General Cleanup 4 (#871)Derek Hensley
* PartTimerWorker -> PartTimer * cleanup * format * objChan draw macro * Fix macro * Fix warning * PR Review * Missed 1 ull * UINT16_MAX * Remove todo from footmark * Remove * from tex in AnimatedMat_DrawTexCycle
2022-07-11Document object_boss04 (Wart and Bubbles) (#915)Tom Overton
* Document object_boss04 (Wart and Bubbles) * Use WART_LIMB_MAX * Fix include error
2022-07-11Document object_uch (Aliens) and remove a dummy label match in EnInvadepoh ↵Tom Overton
(#899) * Document object_uch (Aliens) * Remove dummy label match that has been annoying me for a year!!!!!!!!!!!!! * Respond to reviews * Fix a small thing brought up in review * Swap to gAlienJerkingAnim
2022-07-11`object_keikoku_demo`: documented (Lost Woods Trees) (#863)Isghj
* object_keikoku_demo: Doc'd * Update src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * DmOpstage: requested changes * Update assets/xml/objects/object_keikoku_demo.xml Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * DmOpstage: SnakeCase * DmOpStage: Mention duplicate textures in xml * DmOpstage: formater pls * Update src/overlays/actors/ovl_Dm_Opstage/z_dm_opstage.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * DmOpstage: moved object description Co-authored-by: Isghj8 <isghj8@gmail.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-07-11`ovl_En_Fall2` OK (#916)Lucas
* `ovl_En_Fall2` decompiled * Suggested changes * Minor suggestions Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Don't commit directly from github * Define vertices in xml, add macro Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-07-11ovl_En_Bh Decompiled (#906)Alejandro Asenjo
* ovl_En_Bh Decompiled * some minor things * Documentation * pr review * gEnBh - > gBh * noneSkel nonsense fix * pr review * pr review
2022-07-11Bg_Iknv_Doukutu (#891)Maide
* Bg_Iknv_Doukutu * PR
2022-07-11Effect Hahen Ok (#875)Derek Hensley
* OK * format * gameplay keep * undef syms * drawFlags -> params * Format * Fix railskb include * DL consistency with OoT * Hex
2022-07-11Effect Hitmark Ok (#874)Derek Hensley
* OK * gameplay keep * undef syms * Cleanup * format * HitMark -> Hitmark * Remove EffectSsHitmark_Spawn from functions.h * PR
2022-07-11ovl_Obj_Shutter decompiled (#864)Alejandro Asenjo
* ovl_Obj_Shutter decompiled * pr review * format * Empty-Commit * rename
2022-07-11Ds2n: OK (unused potion shop man from OoT) (#858)Isghj
* Ds2n: OK * Ds2n: requested changes * EnDs2n: GlobalCtx is dead * Ds2n: formater pls * Update src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Ds2n/z_en_ds2n.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Ds2n: more limbs named * Ds2n: right, formatter for longer limb names * EnDs2: moved comment back... did git merge the wrong way? * Ds2n: broken anim is clearly wrong, its something else * Ds2n: almost mappeded entire blob * Ds2n: found another texture Co-authored-by: Isghj8 <isghj8@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2022-07-11ovl_Bg_Icefloe decompiled (#855)Alejandro Asenjo
* ovl_Bg_Icefloe decompiled * reloc * pr review changes * xml renaming * displayList rename * renaming * almost forgot * Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com * PlayState + reviews Co-authored-by: SonicDcer <noreply@github.com>
2022-07-11ovl_Bg_Spout_Fire decompiled (#853)Alejandro Asenjo
* ovl_Bg_Spout_Fire decompiled, asset decomp pending * object_fwall decompiled * fwall Texture leftovers name update from OOT * pr review fixes * pr review fixes * renaming * xml * xml * xml * xml Co-authored-by: SonicDcer <noreply@github.com>
2022-07-11ovl_Bg_Ikana_Mirror OK and documented (#873)TrulyNaN
* test commit * undoing test commit * making sure this is the right repo * removing test file * init for OSH bombable wall started. put back Actor* in function declarations. * BgKin2Bombwall_Init is matching. * started z_bg_kin2_bombwall destroy function. One mismatch right now. * BgKin2Bombwall_Destroy matches. * BgKin2Bombwall_Draw matches. * Fixed BgKin2Bombwall_Init * BgKin2Bombwall_Init and BgKin2Bombwall_Destroy both match. Fixed s32 array in struct. * BgKin2Bombwall_Draw and BgKin2Bombwall_Update match. * Only func_80B6E020 and func_80B6E090 left to match in ovl_Bg_Kin2_Bombwall. * func_80B6E020 from ovl_Bg_Kin2_Bombwall matches. * Went from 8925 to about 5-6k diff score for func_80B6E090 in ovl_Bg_Kin2_Bombwall * Took func_80B6E090 from about 5300 diff score to about 4300 diff score in ovl_Bg_Kin2_Bombwall. * Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 4k ish to 3277 * Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 3277 to 2262. * Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 2262 to 1589. * only slight progress on ovl_Bg_Kinw_Bombwall's func_80B6E090 * Got to 1473 diff score on ovl_Bg_Kinw_Bombwall's func_80B6E090 * Put in the changes made by EllipticEllipsis and hensldm for ovl_Bg_Kin2_Bombwall's func_8066E090. * renamed some symbols. Fake symbol removal makes nonzero diff, but rom OK's after make. * moving declarations around, ordering. * One.word.away. from importing data in ovl_Bg_Kin2_Bombwall. * ovl_Bg_Kin2_Bombwall data imported. Matching. * Edited spec for reloc of ovl_Bg_Kin2_Bombwall. * Removed extra comments for ovl_Bg_Kin2_Bombwall. * unpushed stuff. dunno. * forgot to save z_bg_kin2_bombwall.c * need to commit before make-ing in master. * Ported z_bg_kin2_bombwall's code. Data next. * Imported data for merging z_bg_kin2_bombwall. Yes, I yelled when it OK'd. * Added comments to remember what does what in z_bg_kin2_bombwall. * Some comments in z_bg_kin2_bombwall.c and function names ideas. * Added comments for function name ideas. Cleaned up temps in z_bg_kin2_bombwall except in func_80B6E090. * Renamed most functions and some variables in z_bg_kin2_bombwall. * Made a name suggestion for func_80B6E020 after testing in game. * Ran format.sh. * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c 1 and 0 replaced by true and false in func_80B6E020. Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c Bending to the x-- supremacy. Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> * PR fixes (not done yet) including more consistent use of THIS, removing arg0 and arg1 variable names, standardizing params for z_bg_kin2_bombwall, turning some if-return to if-else, removing unnecessary casts. * Applied isghj5's and EllipticEllipsis' suggestions except for the object file in z_bg_kin2_bombwall. Object file next. * Screwd up formatting. * Thinking of playing with object_kin2_obj. * Documented most of object_kin2_obj based on bombwall, fence and shelf actors. * Had forgotten an arg1 in z_bg_kin2_bombwall.c * First commit for ovl_Bg_Ikana_Mirror branch. * Started decompiling ovl_Bg_Ikana_Mirror. Setup functions and _Update done matching. * Replaced a float by its fractional representation. I need to learn float magic. * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.h Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Applied more formatting and naming remarks from PR about the C file. Assets and object stuff next. * Display lists and collision header in z_bg_kin2_bombwall.c renamed after their descriptive names in the object's XML file. Name for Ocean Spider House drawers chests left to change. * Working on BgIkanaMirror_Destroy. Stack and registers left essentially. * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * One extra line in an if, collision naming convention applied and renamed Ocean Spider House nightstands to drawers chests. * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Changed drawers chest to chest of drawers in object_kin2_obj and z_bg_kin2_shelf. * Removed some unnecessary comment. * almost done with BgIkanaMirror_Destroy function. * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * BgIkanaMirror_Destroy OK. * Almost done with BgIkanaMirror_Init. Mostly stack stuff left. * Registers and stack left to fix for BgIkanaMirror_Init. * BgIkanaMirror_Init matching. * Ran permuter to improve BgIkanaMirror_Draw's score. * Actually not mad at permuter for BgIkanaMirror_Draw headstart. * Matched func_80B7F730 in ovl_Bg_Ikana_Mirror. Progress on its _Init done too. * func_80B7FA9C in ovl_Bg_Ikana_Mirror is matching. _Init left then documentation. * Mistake in last commit message: actually, _Draw is left for ovl_Bg_Ikana_Mirror. * Going to do some groceries, so pushing. About 2/3 across func_80B7FBA4 in ovl_Bg_Ikana_Mirror. * func_80B7FBA4 in ovl_Bg_Ikana_Mirror is matching. _Draw then data left. * Need to switch branch. * Fixed BgKin2Bombwall_SpawnEffects after the Rand_Next() type update. * Switching branch. * Learning to decomp draw functions with BgIkanaMirror_Draw. YEP * Switching branch. * Went through the first wave of graphics macros attempts for BgIkanaMirror_Draw. * Removed some temps in BgIkanaMirror_Draw. * Second pass of macro attempts for BgIkanaMirror_Draw. * Diff score for BgIkanaMirror_Draw at 1873. Getting there. * BgIkanaMirror_Draw diff score down to 854. 4 instructions off and registers to fix. * Instructions are matching for BgIkanaMirror_Draw. Registers left. * BgIkanaMirror_Draw matches. Data next. Adding some co-authors * BgIkanaMirror_Draw matches. Data next. Adding some co-authors Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: Tom-Overton <hensley.derek58@gmail.com> Co-authored-by: Isghj5 <isghj5@gmail.com> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com> * Data imported and OK. Co-authored-by: Maide <eeeedddccc@hotmail.co.uk> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com> * Removed commented lines of unused code and useless externs. Documenting C file and object next. * Renamed fields in actor and variables in 3 functions for ovl_bg_ikana_mirror. Some conventions applied. * Renamed more variables in the struct and C file for ovl_bg_ikana_mirror. * More cleanups and naming in ovl_Bg_Ikana_Mirror. * Renamed some functions in ovl_Bg_Ikana_Mirror. More cleanups. Object documentation next once function names confirmed. * Renamed collision header, animated textures and display lists for ovl_Bg_Ikana_Mirror in ovl_Bg_Ikana_Mirror and object_ikana_obj. Some textures left to rename. * Renamed textures only used by ovl_Bg_Ikana_Mirror. Must go back through docs for conventions and styles plus an extra cleanup before PR. * Went through merging and review docs for extra cleanups. Adding co-authors for documentation. Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com> * Creating branch to merge ovl_Bg_Ikana_Mirror. * Fixed the merge from zeldaret/mm. ovl_Bg_Ikana_Mirror OK and documented. PR-ready. * Applied first batch of fixes from PR comments. Adding co-authors for documentation and a function rewrite. Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com> Co-authored-by: Kelebek1 <eeeedddccc@hotmail.co.uk> * Renamed the colliders in ovl_Bg_Ikana_Mirror's struct and fixed naming in object file plus spacing cleanups. * Full rename for data and temps with respect to the mirror's and light rays' respective colliders. * Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.h Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_Bg_Ikana_Mirror/z_bg_ikana_mirror.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Formatting needed to be applied after commiting suggestions. * Renamed more textures and removed unnecessary array sizes in the data. * Forgot to run formatter. Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: Isghj5 <isghj5@gmail.com> Co-authored-by: mzxrules <mzxrules@gmail.com> Co-authored-by: Maide <eeeedddccc@hotmail.co.uk>
2022-06-20ovl_Obj_Y2lift decompiled (#856)Alejandro Asenjo
* ovl_Obj_Y2lift decompiled * format * pr review fixes * clean up Co-authored-by: SonicDcer <noreply@github.com>
2022-06-20Merge z_bg_kin2 bombwall (#840)TrulyNaN
* test commit * undoing test commit * making sure this is the right repo * removing test file * init for OSH bombable wall started. put back Actor* in function declarations. * BgKin2Bombwall_Init is matching. * started z_bg_kin2_bombwall destroy function. One mismatch right now. * BgKin2Bombwall_Destroy matches. * BgKin2Bombwall_Draw matches. * Fixed BgKin2Bombwall_Init * BgKin2Bombwall_Init and BgKin2Bombwall_Destroy both match. Fixed s32 array in struct. * BgKin2Bombwall_Draw and BgKin2Bombwall_Update match. * Only func_80B6E020 and func_80B6E090 left to match in ovl_Bg_Kin2_Bombwall. * func_80B6E020 from ovl_Bg_Kin2_Bombwall matches. * Went from 8925 to about 5-6k diff score for func_80B6E090 in ovl_Bg_Kin2_Bombwall * Took func_80B6E090 from about 5300 diff score to about 4300 diff score in ovl_Bg_Kin2_Bombwall. * Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 4k ish to 3277 * Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 3277 to 2262. * Diff score for ovl_Bg_Kin2_Bombwall func_80B6E090 went from 2262 to 1589. * only slight progress on ovl_Bg_Kinw_Bombwall's func_80B6E090 * Got to 1473 diff score on ovl_Bg_Kinw_Bombwall's func_80B6E090 * Put in the changes made by EllipticEllipsis and hensldm for ovl_Bg_Kin2_Bombwall's func_8066E090. * renamed some symbols. Fake symbol removal makes nonzero diff, but rom OK's after make. * moving declarations around, ordering. * One.word.away. from importing data in ovl_Bg_Kin2_Bombwall. * ovl_Bg_Kin2_Bombwall data imported. Matching. * Edited spec for reloc of ovl_Bg_Kin2_Bombwall. * Removed extra comments for ovl_Bg_Kin2_Bombwall. * unpushed stuff. dunno. * forgot to save z_bg_kin2_bombwall.c * need to commit before make-ing in master. * Ported z_bg_kin2_bombwall's code. Data next. * Imported data for merging z_bg_kin2_bombwall. Yes, I yelled when it OK'd. * Added comments to remember what does what in z_bg_kin2_bombwall. * Some comments in z_bg_kin2_bombwall.c and function names ideas. * Added comments for function name ideas. Cleaned up temps in z_bg_kin2_bombwall except in func_80B6E090. * Renamed most functions and some variables in z_bg_kin2_bombwall. * Made a name suggestion for func_80B6E020 after testing in game. * Ran format.sh. * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c 1 and 0 replaced by true and false in func_80B6E020. Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c Bending to the x-- supremacy. Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> * PR fixes (not done yet) including more consistent use of THIS, removing arg0 and arg1 variable names, standardizing params for z_bg_kin2_bombwall, turning some if-return to if-else, removing unnecessary casts. * Applied isghj5's and EllipticEllipsis' suggestions except for the object file in z_bg_kin2_bombwall. Object file next. * Screwd up formatting. * Thinking of playing with object_kin2_obj. * Documented most of object_kin2_obj based on bombwall, fence and shelf actors. * Had forgotten an arg1 in z_bg_kin2_bombwall.c * Replaced a float by its fractional representation. I need to learn float magic. * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.h Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Applied more formatting and naming remarks from PR about the C file. Assets and object stuff next. * Display lists and collision header in z_bg_kin2_bombwall.c renamed after their descriptive names in the object's XML file. Name for Ocean Spider House drawers chests left to change. * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * One extra line in an if, collision naming convention applied and renamed Ocean Spider House nightstands to drawers chests. * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Changed drawers chest to chest of drawers in object_kin2_obj and z_bg_kin2_shelf. * Removed some unnecessary comment. * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Fixed BgKin2Bombwall_SpawnEffects after the Rand_Next() type update. * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c Rand_Next() update. Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c Rand_Next() update. Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Adding Co-authors Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com Co-authored-by Derek-Hensley hensley.derek58@gmail.com Co-authored-by Maide eeeedddccc@hotmail.co.uk Co-authored-by Tom-Overton tom.overton@outlook.com Co-authored-by Fig02 fig02srl@gmail.com Co-authored-by Parker-Burnett burnettparker@gmail.com Co-authored-by isghj5 isghj5@gmail.com * Adding Co-authors Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com Co-authored-by Derek-Hensley hensley.derek58@gmail.com Co-authored-by Maide eeeedddccc@hotmail.co.uk Co-authored-by Tom-Overton tom.overton@outlook.com Co-authored-by Fig02 fig02srl@gmail.com Co-authored-by Parker-Burnett burnettparker@gmail.com Co-authored-by isghj5 isghj5@gmail.com * Adding Co-authors Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com Co-authored-by Derek-Hensley hensley.derek58@gmail.com Co-authored-by Maide eeeedddccc@hotmail.co.uk Co-authored-by Tom-Overton tom.overton@outlook.com Co-authored-by Fig02 fig02srl@gmail.com Co-authored-by Parker-Burnett burnettparker@gmail.com Co-authored-by isghj5 isghj5@gmail.com * Adding Co-authors Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com Co-authored-by Derek-Hensley hensley.derek58@gmail.com Co-authored-by Maide eeeedddccc@hotmail.co.uk Co-authored-by Tom-Overton tom.overton@outlook.com Co-authored-by Fig02 fig02srl@gmail.com Co-authored-by Parker-Burnett burnettparker@gmail.com Co-authored-by isghj5 isghj5@gmail.com * Adding Co-authors Co-authored-by EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com Co-authored-by Derek-Hensley hensley.derek58@gmail.com Co-authored-by Maide eeeedddccc@hotmail.co.uk Co-authored-by Tom-Overton tom.overton@outlook.com Co-authored-by Fig02 fig02srl@gmail.com Co-authored-by Parker-Burnett burnettparker@gmail.com Co-authored-by isghj5 isghj5@gmail.com * Adding Co-authors Co-authored-by: EllipticEllipsis 73679967+EllipticEllipsis@users.noreply.github.com Co-authored-by: Derek-Hensley hensley.derek58@gmail.com Co-authored-by: Maide eeeedddccc@hotmail.co.uk Co-authored-by: Tom-Overton tom.overton@outlook.com Co-authored-by: Fig02 fig02srl@gmail.com Co-authored-by: Parker-Burnett burnettparker@gmail.com Co-authored-by: isghj5 isghj5@gmail.com * Adding Co-authors Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: Derek-Hensley <hensley.derek58@gmail.com> Co-authored-by: Maide <eeeedddccc@hotmail.co.uk> Co-authored-by: Tom-Overton <tom.overton@outlook.com> Co-authored-by: Fig02 <fig02srl@gmail.com> Co-authored-by: Parker-Burnett <burnettparker@gmail.com> Co-authored-by: isghj5 <isghj5@gmail.com> * Update src/overlays/actors/ovl_Bg_Kin2_Bombwall/z_bg_kin2_bombwall.c Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: Maide <eeeedddccc@hotmail.co.uk> Co-authored-by: Tom-Overton <tom.overton@outlook.com> Co-authored-by: Fig02 <fig02srl@gmail.com> Co-authored-by: Parker-Burnett <burnettparker@gmail.com> Co-authored-by: isghj5 <isghj5@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2026-09-27 14:40:19 +0000