mm/tools/disasm
TrulyNaN 53fc438d81
Merge z_bg_kin2 bombwall (#840)
* 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>
2022-06-20 20:57:09 +01:00
..
disasm.py ABI FPR names (#767) 2022-03-31 18:22:19 +01:00
dma_filenames.txt z_kaleido_manager and z_kaleido_scope_call OK (#489) 2021-12-27 03:59:50 +00:00
files.txt code_801323D0 (z_schedule) (#509) 2022-05-21 12:08:19 -04:00
functions.txt Merge z_bg_kin2 bombwall (#840) 2022-06-20 20:57:09 +01:00
mips_isa.py ABI FPR names (#767) 2022-03-31 18:22:19 +01:00
variables.txt Code_800E8EA0 Docs (#832) 2022-06-20 01:16:30 +01:00