Commit Graph

253 Commits

Author SHA1 Message Date
Tyler McGavran ccd33e9e10
Finished matching code_8008C1D0 (#357)
* Matched code_8008C1D0.c

Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-08-08 20:58:36 -06:00
Matthew 21a5645e12
More matches in code_80057C60 (#351)
* Some matchings for code_80057C60

* Remove matched assembly
2023-08-08 13:05:58 -06:00
tomas cf9841d39f
small changes. One matching func, Two nonmatching funcs (#355)
* Various decomp and non_matchings.
2023-08-08 12:41:17 -06:00
Tyler McGavran a240af0693
Run iconv as part of build (#354)
* Run iconv as part of build

That way files that need to be in EUC-JP encoding can still be
 worked on in UTF-8

Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-08-08 11:54:57 -06:00
Joshua Peisach fe36d4a738
audio/external: Match 800CAD40/800CAFC0/800CAC60 (#350)
* audio/external: Match 800CAD40/800CAFC0

* Match func_800CAC60, mark unused arg0's as UNUSED
2023-08-08 11:40:30 -06:00
Tyler McGavran e7632b3227
Some mathes and some non-matchings in code_80057C60 (#352)
* Some matches and some non-matchings in code_80057C60

* Mirgrate code_80057C60 rw data


Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-08-06 11:07:09 -06:00
Tyler McGavran 87297bc3b4
Lots of code_80071F00 matches (#347)
* Lots of code_80071F00 matches

Also removed a bunch of fake variables related to the object list.

Also gave names to some of the members of the object list type

Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-08-04 15:05:13 -06:00
tomas 9d716d921a
very cool debug display list (#348)
* added a very cool debug display list ^^ (prints variables to screen)

* Decompiled various functions
2023-08-04 13:04:49 -06:00
Tyler McGavran ce15ceac10
Assorted matches (#346)
Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-07-17 20:06:10 -04:00
Tyler McGavran 93117587c1
Finalize matches in code_80004740 (#342)
Since the animation stuff was merged, I'm finalizing the matching
 of the 3 functions in code_80004740

Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-07-14 21:36:24 -06:00
Tyler McGavran ab86bf2d7b
Add some structs related to model animation (#331)
* Add some structs related to model animation

Also reorder some of the data in the course files that have model
 animation.

Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-07-11 23:21:13 -06:00
Tyler McGavran 890aaee162
Move plan data for code_8008C1D0 into asm files (#340)
Had to create a new file in order to get stuff matching right,
 even though making a separate file for just 3 functions is
 incredibly silly.

Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-07-11 12:54:39 -06:00
Tyler McGavran 04b9d5b4b8
Move some data into kart_dma.c (#338)
* Move texture data into kart_dma.c
Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-07-11 12:42:33 -06:00
Tyler McGavran 90dce9303e
Matched a couple functions in code_80027D00 (#337)
* Match funcs in code_80027D00
Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-07-11 12:27:01 -06:00
tomas 84edd67231
controller pak stuff (#333)
- Named some variables
2023-07-11 12:14:23 -06:00
Tyler McGavran cf33e2ea5f
Migrate rodata for code_80005FD0 into asm files (#332)
Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-07-11 11:58:02 -06:00
Tyler McGavran 2f7719086a
Rename a bunch of D_06XXXXXX variables (#330)
* Rename a bunch of D_06XXXXXX variables

Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-07-08 17:54:58 -06:00
Tyler McGavran ed404043f2
Migrate player emblemb assets (#326)
* Migrate player emblem assets

Can't find these textures being used anywhere, might be leftovers
 from an earlier time in the game's development.

Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-07-02 20:41:07 -06:00
Tyler McGavran 178dfc5591
Match a couple functions and migrate assets related to HUD Type C (#328)
Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-07-02 14:16:24 -06:00
Tyler McGavran aaa2707e11
Give names to the item curves (#324)
Also use actual item names instead of raw numbers

Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-07-02 13:47:41 -06:00
tomas dc44aad0ec
Matched func_800B5B94 (#329)
* Matched func_800B5B94
2023-07-02 13:00:51 -06:00
Tyler McGavran c9ad612442
Migrate debug font asset to new extract utility (#325)
Required fixing a restriction some old n64graphics chagnes had.
 We can now use the `-Z` option with both ci8 and ci4 images.

Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-07-01 23:47:10 -06:00
Tyler McGavran 74d3ffec0d
Add asset file for some bomb asset (#323)
Yellow bomb, not sure where/if its actually used

Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-06-30 20:36:49 -06:00
Tyler McGavran a966aa1787
Add some more asset make and json files (#322)
Course outlines, course previews, unused traffic light, and
 character portraits

Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-06-30 08:34:33 -06:00
MegaMech d6eb25aae3
Cleaning Up Warnings (#317)
* Update mk64 makefile to reflect sm64 makefile

* print func matches and fix some warnings
2023-06-28 14:30:11 -06:00
Tyler McGavran 1b659170dc
Make adjustments to most course files (#318)
* Make adjustments to the Mario Raceway course file

Added quotes in "*.mk" to the find command for finding the .mk files.

* Make adjustments to the Choco Mountain course file

* Make adjustments to the Frappe Snowland course file

* Make adjustments to the Toad's Turnpike course file

* Make adjustments to the Moo Moo Farm course file

* Make adjustments to the Luigi Raceway course file

* Make adjustments to the Koopa Troopa Beach course file

* Make adjustments to the Kalimari Desert course file

* Make adjustments to the Bowser's Castle course file

* Make adjustements to the Wario Stadium course file

* Make adjustments to the Sherbet Land course file

* Make adjustments to the Royal Raceway course file

* Make adjustments to the Banshee Boardwalk course file

* Make adjustments to the Yoshi Valley course file

* Make adjustments to the Rainbow Road course file

* Make adjustments to the Big Donut course file

* Make adjustments to the Block Fort course file

* Remove some unneeded lines from the Makefile

Signed-off-by: Taggerung <tyler.taggerung@email.com>
2023-06-28 14:20:02 -06:00
MegaMech 7970b8d9c2
Fix repeated building of course_data files and wip warnings fix (#316)
* Fix building course_data files

* wip warnings
2023-06-17 21:08:15 -06:00
Tyler McGavran 1b67ee01df
New asset extraction utility (#306)
* Add new asset extraction tool. Changes motivated by the quirks of how kart animation frames are stored
 in the ROM.

    each frame has a palette that is actually
    composed of 2 other, incomplete palettes. As such, the existent
    extract.py isn't really able to handle them.

* Move a variety of assets to new extract tool
---------

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
2023-06-17 15:13:06 -06:00
MegaMech 680e64fe29
Fix course data & course table warnings (#313) 2023-06-16 16:29:56 -06:00
MegaMech 779ae6f6f1
Item & Various decomp (#311)
* Item & Various decomp
2023-06-16 10:30:39 -06:00
MegaMech e371f88b2d
UI and print debug matches (#310)
* various decomp
2023-05-22 13:05:54 -06:00
MegaMech eda4a3f117
Various documentation (#309)
* Various matches

* Various documentation

* fix
2023-04-18 22:31:05 -06:00
MegaMech 5cb8fd367f
Update main.c (#305) 2023-04-10 17:16:45 -06:00
MegaMech fb7c3bce61
Various matches (#304) 2023-04-10 01:40:47 -06:00
MegaMech 1643909b34
Match render_courses.c (#303)
* Update render_courses.c

* Update render_courses.h

* Delete func_8029122C.s

* Update code_802AAA70.h
2023-04-09 01:47:10 -06:00
MegaMech afb29a5a65
Match memory.c, remove warnings, fix fake matches (#301)
* Match memory, remove warnings, fix fake matches

* label switch
2023-04-07 22:13:28 -06:00
Tyler McGavran 6b4d71e66c
Match credits (#297)
* Match credits data and ro data

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
2023-03-31 05:40:53 -06:00
Tyler McGavran 782ed71f61
Massive data relocation (#295)
Mostly relocating rodata from data/* files to the appropriate
 asm/nonmatching/* files, although there is some plain data
 relocating to be found in here too.

Big change to note is the addition of the code_802AAA70.c file,
 split from memory.c. Based on some padding in the ro/data for
 memory it seems clear that a split is needed, although it is
 not clear that exact spot chosen for the split is correct.
 Still, it gets the file padding for the ro/data and text segments
 correct so it can't be too wrong.

Also included is an update to the asm_processor tool to support
 the .hword directive. I made a PR to the main repo of that
 project with an identical change and it was accepted.

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
2023-03-29 18:52:15 -06:00
MegaMech 8d118db0b2
Labelling of some hard-coded addr to syms (#294)
* Updated final displaylist symbol

* Cleaned up loader script

* Random changes

* Various naming and decomp
2023-03-28 16:40:03 -06:00
Tyler McGavran 889520b045
Relocated rodata for code_800431B0 (#293)
Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
2023-03-26 16:53:41 -06:00
Tyler McGavran bd82bf5f0c
Relocate rodata for some OS related function (#292)
Required moving a struct def to another file, and I renamed a
 struct to something nicer

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
2023-03-24 00:49:30 -06:00
Tyler McGavran 3b8e76054d
Move all ro/data for code_8001F980 out of data/* (#291)
Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
2023-03-21 22:27:54 -06:00
MegaMech db4e0a3727
Disassembled courses, added DLpacker, and disassembled packed DLs (#290)
* Disassembled all courses; packed DLs and course data.

* Added displaylist packer

* Minor documentation and naming
2023-03-07 19:48:17 -07:00
Tyler McGavran 3a99685c2f
Clean up some more bin2c calls from the Makefile (#286)
* Remove some bin2c calls from the Makefile

* Found a way to make n64graphics use shared tluts

* Added an option that makes n64graphics operate in a mode where it
 takes an image and tlut (as pngs) and spits out the appropriate
 CI8 indices inc.c form

* Turns out all the TLUTs for Lakitu are kept in one place, far away
 from the textures that use them

* Names some textures and tluts

* Pretty helpful actually, helped identify where a few different
 objects types are initialized. Should be a little useful to
 whoever dives into the object stuff more deeply

* Minor cleanup in n64graphics

* Added some comments, gave more appropriate names to some
 variables.

* Leaving the new mode argument as `-Z` for now

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>

* Textures compile using makefile rules

* Patched n64 graphics memory leak and ci output

* Added memset16safe to initialize ci palettes to magic numbers (transparent pixels).

---------

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
2023-02-06 22:52:34 -07:00
Tyler McGavran 533d035875
Some assorted matches (#289)
Also renamed a couple variables

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
2023-01-31 07:02:40 -07:00
Tyler McGavran d1ebe06b29
Assorted matches (#288)
* Matches in code_80071F00

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
2023-01-25 07:50:32 -07:00
Tyler McGavran e7ceabf94f
Couple matches and giving names to some textures (#285)
* Give names to some textures

* Match a couple functions

* Remove a use of bin2c from the makefile

* Its a little strange, but two of the portrait textures share
 a TLUT. I believe this necessitates that the portraits be
 part of the same PNG file.

* 2nd portrait referenced in undefined_syms.txt

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
2023-01-03 20:43:30 -07:00
Tyler McGavran c705bc4a6a
Lots of matches related to the object list (#284)
Identified a couple more lists of object list indices, added some
 comments indicating what they're used for. Those comments are
 most likely non-exhaustive so there's still some investigation
 to be done there.

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
2022-12-28 20:19:11 -07:00
i-do-cpp 94b3a6f07b
Match func_8006ED94 (#283)
* Match func_8006ED94
2022-12-28 10:26:22 -07:00
Tyler McGavran 3e3561bbf1
Couple small matches and m2c refreshing (#282)
* Moved stuff into header files to
 make m2c_helper a more useful

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
2022-12-25 18:56:35 -07:00