Commit Graph

143 Commits

Author SHA1 Message Date
KiritoDv
5a7eb59aa1 Bump torch 2024-04-06 16:10:50 -06:00
KiritoDv
2c22c1067e Fixed aquas duplicates and bump torch 2024-04-06 15:35:01 -06:00
KiritoDv
9e6800d369 The game is fucking running 2024-04-06 04:33:03 -06:00
petrie911
126a55aa0e
Event Actor docs that kind of ballooned into a bunch of stuff (#200)
* stuff

* too much

* Torch commit

* torch again
2024-04-05 17:11:36 -03:00
Alejandro Javier Asenjo Nitti
53eaeaaf04 update torch 2024-04-01 19:07:16 -03:00
petrie911
2938919f6f
WIP on script documentation, some cleanup (#194)
* gfx

* script

* Torch

* headers

* format
2024-04-01 19:04:22 -03:00
Alejandro Javier Asenjo Nitti
b3298dfc5f update torch 2024-04-01 18:14:42 -03:00
inspectredc
5844ffc4dd
export configuration ast_zoness and bump torch for generic array factory (#192)
* ast_zoness

* format

* remove ast_zoness.h

* change name to D_ZO_601996C

* rename to yaml and use vec3f array

* prevent_bss_reordering in fox_edisplay

* format

---------

Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
2024-04-01 15:17:46 -03:00
Lywx
576d42fabd
[WIP] Export configuration for ast_common (#176)
* Close to fully implement the whole file

* Filled gaps with blobs

* Added config into assets.yaml

* Removed a more blobs

* Fully extracted ast_common

* Bump torch
2024-03-29 16:43:25 -05:00
Lywx
1b72918e7f
Bump torch to use file change detection (#182)
* Bump torch to use file change detection

* Added -f flag on rm
2024-03-29 14:31:28 -03:00
petrie911
bb7b2b19ca
Last Titania asset, fix to hibox exporter, more cleanup (#180)
* yaml

* ti

* hud

* a

* torch

* forgot header

* fix?

* format
2024-03-28 11:13:34 -03:00
petrie911
97f544c557
Improved match for fox_ti, add custom gbi macro, some cleanup (#178)
* splits

* torch

* torch again

* headers

* merges

* format

* matches

* commit

* colpoly

* SY
2024-03-27 17:06:28 -03:00
Alejandro Asenjo Nitti
ec1d3da564
export configuration for ast_great_fox & ast_sector_z & ast_sector_y (#175)
* Matchpoint

* remove symbols from undef

* remove header

* comments

* var rename

* remove header

* first asset

* progress

* progress

* progress, should be matching. Torch bug?

* comments

* update torch with Peter's fix

* PRINTF

* replace symbol usage

* todo comment

* D_SX_6000000 usage

* progress

* Matchpoint

* progress replacing symbol usage (apo apo ahora)

* remove headers

* va bene

* format

* remove header
2024-03-27 01:07:41 -03:00
Alejandro Asenjo Nitti
6c27771ff4
export configuration for ast_map (#172)
* progress

* progress

* progress

* progress

* progress

* progress

* progress

* finished?

* remove unnecessary header

* rename to map

* remove header

* rename to ast_map

* problem with torch

* Matchpoint

* take out pads and update Torch
2024-03-21 15:41:46 -03:00
petrie911
5531a140d8
matches (#170) 2024-03-18 00:23:01 -03:00
petrie911
a7aac0753d
torch update, ast_area_6 and ast_vs_player, new names (#169)
* split up

* format

* torch

* headers

* just keep going

* torch

* names and such

* format

* remove headers
2024-03-17 01:06:28 -03:00
Alejandro Javier Asenjo Nitti
c6f36f8b7c update Torch 2024-03-15 12:34:03 -03:00
petrie911
11c6a8c7dc
Split headers as much as possible. add unique tags to segment 6 addresses (#167)
* split up

* format

* torch
2024-03-14 18:31:03 -03:00
petrie911
75bbe0ba6a
torch update, aquas export, some asset cleanup (#166)
* a start

* some things

* format

* hitboxes

* soon

* fixes and such

* Torch

* one fix

* torch

* formatting

* whoops the math
2024-03-14 12:43:50 -03:00
petrie911
01e87f1680
Colpoly factory and Torch fixes + sonicdcer's ast_sector_X (#164)
* a start

* some things

* format

* hitboxes

* soon

* fixes and such

* Torch

* one fix
2024-03-13 18:48:03 -03:00
petrie911
46ce729392
Hitbox factory and minor hitbox cleanup (#162)
* a start

* some things

* format

* hitboxes
2024-03-12 23:21:47 -03:00
petrie911
036e58535b
Add Script Factory. Also some colpoly docs and vector cleanup (#161)
* a start

* some things

* format
2024-03-12 16:46:25 -03:00
petrie911
e6f62df332
Skeleton factory and more Titania assets (#160)
* skellingtons

* sort
2024-03-11 23:18:02 -03:00
Lywx
97d067e0f6
export configuration for ast_radio (#157)
* Extracted ast_radio

* Removed externs from sf64mesg
2024-03-11 14:54:44 -03:00
Alejandro Asenjo Nitti
db21b5e96c
export configuration for ast_7_ti_1 (#156)
* progress

* progress

* progress

* update torch

* progress

* Matchpoint

* bye header

* remove unnecessary externs

* comment

* Animation extraction

* include Animations

* a couple more animations

* clean up
2024-03-11 14:46:59 -03:00
MegaMech
783ab23941
Update Makefile (#158) 2024-03-11 14:44:05 -03:00
Alejandro Asenjo Nitti
ec7ece3c61
export configuration for ast_option (#155)
* initial

* progress so far

* progress

* progress

* progress

* progress

* more progress

* more progress

* progress so far

* comment out BLOB

* comment

* D_8015DF0

* Matchpoint

* matching

* update torch again

* verbose Torch

* remove comments

* fix
2024-03-10 22:38:13 -03:00
MegaMech
a49f81eede
Update yamls for new Torch build (#152)
* Update yamls

* Update Torch

* Update ast_ending_award_back.yaml

---------

Co-authored-by: = <=>
2024-03-08 18:40:59 -03:00
petrie911
7e99fe712d
In my nightmares, I see audio_synthesis (#146)
* heapsort

* suff

* load init

* split

* split data

* begone asm

* names

* names and cleanup

* let's try this

* woo macros

* general

* bgm macro

* names

* audio_thread

* Update Torch

* I think it's time to move on

* Merge remote-tracking branch 'upstream/master' into play

---------

Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
2024-03-05 19:51:52 -03:00
petrie911
5152d504b3
audio_general, audio data import, naming lots of audio functions (#144)
* heapsort

* suff

* load init

* split

* split data

* begone asm

* names

* names and cleanup

* let's try this

* woo macros

* general

* bgm macro

* names
2024-03-01 15:57:44 -03:00
Alejandro Javier Asenjo Nitti
6ab18c98b7 ast_ending_award_front & ast_ending_award_back 2024-02-22 00:21:58 -03:00
Alejandro Asenjo Nitti
807ade8ff7
ast_blue_marine extraction (#140)
* progress so far

* progress

* progress

* progress

* matching

* revert F3DEX_MK64

* update torch

* update gitIgnore

* correction

* add src/assets to clean recipe
2024-02-21 12:52:42 -03:00
petrie911
f227194d24
docs and such (#137) 2024-02-19 10:05:11 -03:00
Alejandro Asenjo Nitti
41698a131a
Extract ast_warp_zone (#136)
* try

* progress

* hasta la vista, baby

* ast_warp_zone matching

* remove symbols from linker

* new version of Torch

* ast_warp_zone
2024-02-18 22:34:56 -03:00
Lywx
0b13c0edef
Asset extraction (#133)
* Added torch and ast_logo yml

* Added torch into makefile

* Added torch into tools all rule

* Fixed version and removed clang-format from c header

* Reverted settings.json unrelated change

* Bump version

* Readded -s flag

* Fixed Makefile indentation
2024-02-17 23:19:18 -03:00
petrie911
f83d179ea9
improve match on i3, add scratches, some linker cleanup (#127)
* stuff

* fixes

* addrs
2024-02-14 12:33:21 -06:00
petrie911
25694f9d49
Finished Ve1, added permuter macros, fixed an error in Player struct (#121)
* format

* format

* cleanup

* offsets
2024-02-10 15:09:27 -03:00
Alejandro Javier Asenjo Nitti
1475004917 update m2c to array-indexing 2024-02-02 00:20:26 -03:00
Alejandro Javier Asenjo Nitti
dd1e5ed1a7 update m2c 2024-02-02 00:08:35 -03:00
Ryan Myers
22f5d22fa0
sf_i5_4.c WIP (#113)
* Match func_i5_801B49D0

* Match func_i5_801B4A54

* Fix warning

* merge master

* WIP func_i5_801B4AA8

* Stack fixed func_i5_801B4AA8

* Match func_i5_801B4AA8

* Better math for the func

* Match func_i5_801B5110

* Migrate RODATA

* format

* Match func_i5_801B6AEC

* Match func_i5_801B68A8

* Translation update

* WIP func_i5_801B58AC

* header cleanup

* make format
2024-02-02 00:02:52 -03:00
Alejandro Javier Asenjo Nitti
2c405ec3f3 m2c update 2024-01-28 18:30:55 -03:00
petrie911
6528b2b5cf
Rand and degree macros (#110)
* half

* pm

* dtor

* pi and such

* permuter settings

* angles

* float fix

* macro

* formatting

* small thing
2024-01-28 18:27:23 -03:00
Alejandro Javier Asenjo Nitti
f642fc18b6 update mips2c 2024-01-27 15:26:37 -03:00
Alejandro Javier Asenjo Nitti
b6cc3567c8 update mips2c submodule 2024-01-26 22:40:02 -03:00
Ryan Myers
e812ca54b7
Match ovl1_sf_tr360 (#99)
* Update from master to new branch

* WIP func_i1_8019949C

* Match func_i1_8019949C

* Attempt to migrate data for sf_tr360

* Match sf_tr360.c with data migration.
2024-01-20 23:21:29 -03:00
Ryan Myers
8e808803e2
fox_effects decompiled (#77)
* Match 5 funcs

* Match func_8007E93C

* Match func_8007EBB8

* Match func_8007ED54

* Match func_8007EE68

* 0.017453292f to M_DTOR

* format

* 3 more matches

* Match 2 more

* 2 more matches

* Match func_8007F958

* Match func_8007FBE0

* Match func_8007FD84

* Match func_8007FE88

* 5 new matches

* Match func_80080D04

* Match func_800815DC and func_8008165C

* Match func_80081BEC

* MAtch func_80081B24

* Match 2 more

* 3 more matches

* Small tweaks

* Give names to function params

* Match func_80080ACC

* MAtch func_80083D2C

* Match func_800837EC

* WIP func_80081C5C

* Add view of rodata that needs to be migrated somewhere

* Match func_80081C5C!

* Fix bss reordering, and formatting.

* Add a submodule of m2c, and a new script for generating the context for a file, and a m2c output to an ignored folder.

* Migrate rodata

* Start importing data for sf_77E40.c

* Successful data migration for sf_77E40.c

* make format

* Reorganzie data for sf_77E40.c

* Try stubbing a PRINTF, to help with RODATA strings.

* Rename sf_77E40 to fox_effect

* Rename Object_8C to Effect

* make format...

* Rename gObjects8C to gEffects
2024-01-13 10:43:04 -03:00
inspectredc
3dfa02af80
Initial float-convert tool (#75)
* Initial float-convert tool

* Change formatting output

* remove arg needed for print

* dont always print

* printing option works

* add help option

* add semi-colon

* always print help if option

* properly format non arrays

* better ascii parsing
2024-01-12 14:12:09 -03:00
Alejandro Asenjo Nitti
410a5b017b
fox_versus decompiled, introduce first_diff.py to the project, fixed fox_option NON_MATCHING build (#71)
* fox_versus functions

* more functions

* more input!

* functions so far

* fix bss reordering

* all functions matching

* fix caller addresses

* import data cleanup

* introduce first_diff to the project

* fix wrong type

* second version of bss reordering prevention header

* move versus symbols to variables.h

* BSS importing attempt (failed)
terrain is prepared for another contributor to try

* fix fox_option NON_MATCHING build

* format

* remove static keyword from fox_map data symbols

* IMPORT BSS

* rename fox_versus

* FIX ADDRESSES & SYMBOLS y fox map

* fix more addresses

* more address fixes for fox_map

* all fox_map addresses done

* fix bss build in fox_map, migration pending

* bss reorder failed attempt

* remove unused externs

* remove unnecessary config file

* remove unnecessary entries in settings.json

* comments

* move structs to fox_map header

* put static back in fox_option data

* PR review
2024-01-10 11:55:08 -06:00
Lywx
9c2707adc1
Symbol scanner (#74)
* Created tool to scan unused symbols

* Removed unused comments

* Removed unused function and readded fail

* Fixed error while cleaning symbol

* Fixed logic to show used files and added csv export

* Added from where is the symbol

* Swapped text to a shorter one
2024-01-10 13:09:10 -03:00
Lywx
40af0ffc3d
Fixed and imported sym_info and name_fixer tools (#73) 2024-01-08 16:32:15 -03:00
Lywx
3036b48338
Fixed and imported global_bss_check (#72) 2024-01-08 08:48:08 -03:00
Lywx
d1ae1f4891
Decompiled fox_demo (#61)
* Decompiled func_8004990C, func_8004A700, func_8004A840, func_8004C90C, func_8004D3C8 and func_8004D3D4

* Fixed format issues

* Decompiled func_8004AA84

* Decompiled func_80049A9C

* Matched func_80049B44

* Matched func_8004D738

* Matched func_8004E3D8

* Matched func_8004F798

* Matched func_80049968

* Reverted note_data

* Matched func_80048AC0

* Matched func_80049630

* Changed variable order

* Matched func_8004A52C

* Matched func_8004A888

* Matched func_8004C930

* Matched func_8004DEF8

* Matched func_8004CCC0

* Matched func_8004D828

* Matched func_80048CC4

* Matched func_8004AAF4 and func_8004FEC0

* Matched func_8004FCB8

* Swapped returns with break

* Fixed incorrect return types on externs

* Matched func_8004F8AC

* Match func_8004EBD0

* Moved code out of the if

* Matched func_80048E40 and func_800515C4

* Cleaned externs and enums

* Cleaned up and matched func_80049C0C

* Matched func_8004D440

* Matched func_8004B368

* Matched func_8004E4D4

* Matching func_8004F05C

* Fixed weird rodata

* Imported data

* Fixed PR needed changes

* PR Changes suggested

* More cleanup

* Fixed upstream issues

* Fixed warnings
2024-01-05 13:19:25 -06:00
Lywx
bd920b9b6e
Added more information on progress bot (#65) 2023-12-31 01:20:39 -03:00
Lywx
d00cff570a
Discord matching progress inside CI (#64)
* Discord matching progress inside CI

* Readded frogress rule
2023-12-30 17:33:27 -03:00
petrie911
c69978c5eb
fox_360 and fox_bg decompiled, two more matches, some names. (#62)
* it begins

* stuff

* remove extra

* matched

* forgot one

* small things

* more matches

* filenames
2023-12-27 17:14:13 -03:00
Lywx
d7d9e472c3
MacOS Building Support (#59)
* Fixed MacOS compilation

* Updated spimdisasm requirement to use latest develop

* Updated README

* Fixed python requirements

* Readded --gc-sections on mio0

* Added a conditional flag for gc-sections

* Fixed indentation errors
2023-12-26 17:55:57 -03:00
Ryan Myers
92b2bed0f5
Make progress script executable and add requirements (#57) 2023-12-23 14:19:54 -03:00
Ryan Myers
015ce283b4
Match over 20 new funcs in sf 77e40 (#55)
* Match func_8007B9DC and func_8007BB14

* Remove macro and add debug notices

* Fix merge diff

* Match func_8007BC7C

* Match func_8007BCE8

* Match func_8007BDE0

* Match func_8007BE54 and an audio func func_8001A500

* Match func_8007BEE8

* Match func_8007BF64

* Match func_8007BFFC

* Match func_8007C088

* Match func_8007C120

* Match func_8007C1AC

* Match func_8007C250

* Fix merge from master

* Match func_8007C3B4

* Match func_8007C484 and func_8007C50C

* Match func_8007C608 and func_8007C688

* Match func_8007C6FC and func_8007C85C

* Match func_8007C8C4

* Add a progress script WIP
2023-12-21 12:52:51 -03:00
Ryan Myers
80053694ea
Wip on sf_77E40 (#42)
* Match func_80077240

* Apply changes from style guide

* Match func_8007729C and style guide changes

* Further style guide changes

* Several matches courtesy of petrie911

* Match func_80077B84

* Run make format

* Match func_80078038

* Match func_800780F8

* Match func_800783C0

* Match func_80078438 and func_800784B4

* Match func_80078550

* Match func_80078604

* Match func_8007868C

* WIP func_80084194

* Rename funcs as required from merge with master.

* Match func_8007879C

* Match func_800788B0 and func_80084194

* Match func_80078A64

* Match 3 more funcs

* Match func_80078C84

* Match func_80078D60 and func_80078CE8

* Match func_80078E50

* Match func_80078EBC

* Match func_80078F78

* Add function prototypes to functions.h

* (M_PI / 180.0f) to M_DTOR

* Match func_8007905C

* Match func_800794CC

* Match func_8007953C

* Match func_80079618

* Fix changes from master

* Match func_8007968C

* Match func_800798C4

* Match func_800798F0

* return -> break

* Match func_8007A28C

* Match func_8007A3C0

* Match func_8007A4B8

* Match func_8007A568

* Match two more funcs
2023-12-06 07:29:49 -06:00
Ryan Myers
065b566eb6
Makefile Changes (#40)
* Remove existing recomp

* Compile ido-static-recomp instead of relying on precompiled version. Also introduce makefile changes to allow aarch64 devices to compile.

* Get mio0 from the source, and build it in the init.

* Workaround for sm64tools not ignoring it's build files.

* Fix cflags

* Fancy colours for build system

* Remove sm64tools submodule and just take the minimum required files instead.

* Remove ido-static-recomp submodule and just fetch latest from GH instead.

* Add support for using a venv in python.

* remove mio0-decompressor temp

* Fix the mio0-decompress files being somehow missing.

* Fix stray message about "fix_checksum"

* Update logo to be a VAR, and have a failed build say FAILED

* Add checksum fix back in.
2023-12-04 18:36:31 -03:00
petrie911
2f67ed8638
Names and such (#38)
* names and such 1

* more names

* format
2023-11-29 23:44:42 -03:00
petrie911
cae711a312
should work (#37) 2023-11-29 08:40:43 -03:00
petrie911
8f695918e3
More decomp, organization of variables.h (#21)
* threads galore

* something's up

* try this

* I don't even

* who knows

* I can't stop it

* let's try data for fun

* ok I think I've gone far enough

* well maybe a little more

* visual assets somewhat documented

* just keeps going

* forgot formatting

* let
's try bss

* too much?

* one fix

* even more things

* one quick thing

* oh come on

* graph complete?

* format and such

* decomp and such

* small cleanup
2023-11-15 00:34:10 -03:00
petrie911
4311c670c3
Libultra headers and some decomp (#14)
* lib is ultra

* it just keeps going

* math names

* format
2023-10-29 18:19:30 -03:00
Alejandro Asenjo Nitti
fd742f93be
sf_hud functions + code organization (#8)
* decompile func_80086C08

* decompile func_80086CC8

* format

* decompile func_80088784

* preserve macros

* better match func_80005708

* format

* *arg0

* decompile func_80089670

* decompile func_80089710

* decompile func_800897B0

* decompile func_80089850

* decompile func_800898F0

* decompile func_80089994

* decompile func_80089AF4

* decompile func_80089B94

* decompile func_80089C38

* decompile func_80089D28

* space

* format

* decompile func_80089E98

* correction

* declare segmented addresses in func_80088784

* segmented addresses in undefined_syms

* correction

* Gfx type

* *arg0 + 1 in func_80005708

* roll back s32 -> Gfx

* fix

* array of Gfx pointers

* decompile func_8008AD94

* decompile func_8008AD94

* decompile func_8008B1B0

* decompile func_8008B2F0

* create structs.h

* reordering

* format

* decompile func_8008B5B0

* decompile func_8008B9E8

* decompile func_8008BAE4

* decompile func_8008C390

* fixes

* fixes

* fix warnings

* move protos to functions header

* move variables to variables.h

* roll back segmented config in header
2023-10-23 11:01:29 -05:00
Alejandro Asenjo Nitti
cdfa9d45cf
correct version of gfxdis (#6) 2023-10-19 13:40:37 -05:00
petrie911
0e74b7902a
Split game engine files and rodata, fix some rodata offsets (#4)
* fixed

* and cleanup

* format

* hud escaped

* format
2023-10-19 10:57:03 -05:00
Alejandro Javier Asenjo Nitti
8b658f46e0 update splat 2023-10-18 09:40:23 -03:00
Alejandro Javier Asenjo Nitti
78ac40085d set o32abi bit patch 2023-10-17 18:50:51 -03:00
Alejandro Javier Asenjo Nitti
ffcc468c36 permissions 2023-10-17 12:25:11 -03:00
petrie911
05f38ec927 Merge branch 'master' of github.com:sonicdcer/sf64 2023-10-16 15:49:44 -05:00
petrie911
961e803117 now with more overlays 2023-10-16 15:49:24 -05:00
Alejandro Javier Asenjo Nitti
bc14ecbb17 check_format correction 2023-10-16 16:02:23 -03:00
Alejandro Javier Asenjo Nitti
e1180d9ea9 check_format.sh 2023-10-16 14:57:33 -03:00
Alejandro Javier Asenjo Nitti
4985931714 decompile memcpy 2023-10-16 13:52:40 -03:00
petrie911
f97d418f5b stuff 2023-10-16 08:54:41 -05:00
petrie911
859bb5e899 merge 2023-10-15 17:15:33 -05:00
petrie911
86c1fe412b yaml stuff 2023-10-15 17:14:01 -05:00
Alejandro Javier Asenjo Nitti
c1c2382930 comment out prints 2023-10-15 19:04:09 -03:00
Alejandro Javier Asenjo Nitti
30e7037097 permissions 2023-10-15 04:10:18 -03:00
petrie911
31c5caf998 Merge remote-tracking branch 'upstream/master' 2023-10-14 14:13:17 -05:00
petrie911
55dbe6a29f decomp script yay 2023-10-14 14:10:18 -05:00
Alejandro Javier Asenjo Nitti
b93c463b9b add asm-differ submodule 2023-10-14 05:10:23 -03:00
Alejandro Javier Asenjo Nitti
9b09515c26 include gfxdis tool 2023-10-14 02:20:16 -03:00
Alejandro Javier Asenjo Nitti
10b2b0697e python requirements 2023-10-12 14:00:52 -03:00
Alejandro Javier Asenjo Nitti
a93640fe22 ido_recomp 2023-10-12 13:50:08 -03:00
Alejandro Javier Asenjo Nitti
3142735caf mio0 + libultra symbols 2023-10-10 00:22:11 -03:00
Alejandro Javier Asenjo Nitti
23431bef86 permuter_settings 2023-10-07 07:48:31 -03:00
Alejandro Javier Asenjo Nitti
7a62910a13 Add formatter 2023-10-07 04:38:28 -03:00
Alejandro Javier Asenjo Nitti
83d216d6fd find duplicates script 2023-10-06 10:57:24 -03:00
Alejandro Javier Asenjo Nitti
121283fbed git ignore settings 2023-09-21 19:26:35 -03:00
Alejandro Javier Asenjo Nitti
55572660e7 add asm-processor 2023-09-21 19:26:26 -03:00
Alejandro Javier Asenjo Nitti
1b8b296552 add splat submodule 2023-09-19 16:15:21 -03:00