Commit Graph

42 Commits

Author SHA1 Message Date
petrie911
4a572e7e30
Remove assets.h from global.h, some other header adjustments (#174)
* splits

* torch

* torch again

* headers

* merges

* format
2024-03-21 17:19:38 -03:00
petrie911
df268e3bad
titania boss assets, cleanup pads, update torch, split remaining segments other than 6 (#173)
* splits

* torch

* torch again

* headers
2024-03-21 15:45:13 -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 Asenjo Nitti
60a64d402f
export configuration for ast_enmy_space (#168)
* Matchpoint

* remove header

* remove comments

* add ENMY_SPACE_ to every symbol

* missed one
2024-03-16 20:10:21 -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
Alejandro Asenjo Nitti
206bfac9ef
export configuration for ast_landmaster & ast_training (#165)
* remove header

* Matchpoint

* remove unnecessary externs

* Matchpoint (2 blobs)

* Asset analysis complete, here it comes!

* bye bye header

* MISSION ACCOMPLISHED
2024-03-14 12:42:24 -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
Lywx
976539b8c0
export configuration for ast_arwing (#163)
* Arwing completely extracted ( With Issues )

* Fixed remaining issues

* Fixed remaining issues

* Fixed last one

* Renamed D_3000000 to use blue_marine

* Fixed missing declarations on fox_hud
2024-03-13 18:47:50 -03:00
petrie911
e6f62df332
Skeleton factory and more Titania assets (#160)
* skellingtons

* sort
2024-03-11 23:18:02 -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
Alejandro Asenjo Nitti
14aa8c9db7
export configuration for ast_font (#151)
* progress

* goodbye ast_font.h

* progress

* progress

* progress

* progress

* progress

* progress

* progress

* Matchpoint

* comments

* comment

* ast_font debinarized

* add header to files

* cleanup
2024-03-08 13:18:34 -03:00
Alejandro Javier Asenjo Nitti
68cf4fd5d7 remove unnecessary symbols 2024-02-22 00:33:59 -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
05747b1b52
Clean up hardcoded symbols (#139)
* heapsort

* suff
2024-02-20 15:01:42 -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
inspectredc
16cc6a411f
Titania decomp - 4 non-matching, 2 non-equiv (possibly equivalent) (#129)
* progress

* progress2

* more matches and remove warnings

* add non matching/equivs and move assets to top

* update post merge

* data

* bss

* clean up

* correct numbers

* address review
2024-02-16 14:15:58 -06:00
Alejandro Javier Asenjo Nitti
16c0dc371f roll back rspboot & aspmain disassembly 2024-02-14 15:46:33 -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
Alejandro Javier Asenjo Nitti
ff2627c1ca rsp_boot & aspmain assembly extraction 2024-02-13 21:40:09 -03: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
650dc4778a fox_option symbols 2024-02-06 23:12:45 -03:00
Alejandro Javier Asenjo Nitti
731f363dfc fox_versus symbols 2024-02-06 21:23:57 -03:00
Alejandro Javier Asenjo Nitti
7fb19f9825 fox_hud symbols 2024-02-06 20:59:18 -03:00
Alejandro Javier Asenjo Nitti
0084ed5123 fox_enmy2 symbols 2024-02-06 20:44:02 -03:00
Alejandro Javier Asenjo Nitti
a9caa3d48d fox_enmy symbols 2024-02-06 20:13:26 -03:00
Alejandro Javier Asenjo Nitti
c8977375e0 fox_demo lone symbol 2024-02-06 19:09:36 -03:00
Alejandro Javier Asenjo Nitti
1d90a928ec fox_std_lib symbols 2024-02-06 17:45:24 -03:00
Alejandro Javier Asenjo Nitti
c3fe1175ea fox_edisplay symbols 2024-02-06 16:38:23 -03:00
Alejandro Javier Asenjo Nitti
0e2578a9fe fox_end1 symbols 2024-02-06 14:13:29 -03:00
Alejandro Asenjo Nitti
4a85ee2663
fox_end2 decompiled (#116)
* func_ending_8018CE20

* progress

* func_ending_8018D638

* func_ending_8018D814

* func_ending_8018DA0C

* func_ending_8018DCB4

* func_ending_8018E1B8

* func_ending_8018E7B8

* func_ending_8018F2A8

* func_ending_8018F64C

* func_ending_8018FC60

* func_ending_80190274

* func_ending_80190648

* func_ending_80190778

* func_ending_80190CF0

* func_ending_80191234

* func_ending_80191294

* func_ending_80191710

* func_ending_80191C7C

* func_ending_80192164

* func_ending_80192290

* func_ending_8019237C

* func_ending_801926D4

* .

* everything matches

* MISSION ACCOMPLISHED

* review

* ultratype

* LEVEL_UNK_M1
2024-02-06 12:14:05 -03:00
petrie911
c968a071cc
Ending 1 decomped (#114)
* ending

* ending
2024-02-03 14:14:43 -03:00
petrie911
119dfa9354
Solar decompiled, some cleanup (#102)
* stuff

* stuff

* temps

* matched

* so complete

* merge and clean

* format

* graphics macros
2024-01-22 00:28:02 -03:00
Alejandro Asenjo Nitti
cc970381c8
fox_hud & fox_me Decompiled (#95)
* func_80092D48

* func_800927A0

* TempComp.bin.mio0 git ignored

* func_800924E0

* func_80094D20

* func_80096A74

* func_80095604

* all functions done

* symbols for segmented addresses

* move symbols to c file for now

* failed attempt to import data

* fix

* Import data

* move data below

* ready for BSS attempt

* fix warnings

* ordering

* symbols for some segmented addresses

* rename to fox_hud

* clear mess

* .

* .

* space

* .

* func_i2_80187530

* func_i2_8018756C

* func_i2_80187650

* func_i2_801877C4

* func_i2_8018795C

* func_i2_80187B08

* func_i2_80187C68

* bss again (#98)

* func_i2_80187D08

* func_i2_80187D98

* func_i2_80187FF8

* func_i2_801881A8

* func_i2_80188228

* func_i2_80188298

* ARRAY_COUNT

* func_i2_80188344

* func_i2_80188B84

* func_i2_80188C2C

* func_i2_80188E8C

* func_i2_80188F2C

* func_i2_80188CAC

* func_i2_80189114

* func_i2_8018B7C4

* func_i2_8018C77C

* func_i2_8018C8F4

* func_i2_8018CA10

* func_i2_8018CB50

* func_i2_8018BACC co-authored-by: @inspectredc

* func_i2_8018CCF8

* func_i2_8018CB50

* func_i2_8018CD8C co-authored-by: @inspectredc & @petrie911

* func_i2_8018D9EC

* func_i2_8018DA6C

* func_i2_8018DAEC

* func_i2_8018DB6C

* func_i2_8018DBEC

* func_i2_8018DCE4

* func_i2_8018DE14

* func_i2_8018DF08 co-authored-by @inspectredc & @petrie911

* func_i2_8018E084

* func_i2_8018ED9C

* func_i2_80188088

* func_i2_801892F0

* func_i2_8018978C co-authored-by @KiritoDv & inspectredc

* fox_me DATA IMPORTED

* resolve conflicts

* func_i6_80197B30

* func_i6_80197CC4

* func_i6_80197F84

* func_i6_80198244

* merge and solve bss

* func_i6_801983E4

* PR review

---------

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
2024-01-21 13:27:47 -03:00
inspectredc
770f48bf4a
fox_ve2 decompiled (#96)
* match remaining funcs

* arg renames and cleanup pt 1

* hex pass, id to enum and some basic docs

* data, bss and format

* change file name

* commit pr suggestions
2024-01-21 09:30:53 -06:00
petrie911
56c2bd3e10
fox_zo decomped, work buffer enums for bosses implemented, changed overlay name to i3, various docs (#78)
* zo

* more

* more stuff

* hitboxes suck

* i3 test

* i3

* names

* remove extras

* whoops symbols

* more cleaning

* oh god it comes

* one last thing
2024-01-13 22:09:13 -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
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
petrie911
50107c8ec3
fox_beam, more use of enum types, some cleanup (#67)
* cleaning and such

* stuff

* enum types

* format

* a touch more
2024-01-02 18:33:26 -03:00
petrie911
89ae8dff96
fox_6B3B0 and a bunch of names for things (#50)
* stuff

* three whole files

* format

* format and such

* a switch in time

* merge prep

* nintendo switch

* format

* the great switch statement of our time

* 43AC0 matched

* stuff

* Enums everywhere

* oh god the switch

* knakyo

* new headers

* format

* fox

* everyone hates recursion

* format

* one more thing

* one more one more thing

* renames
2023-12-14 11:41:43 -03:00
petrie911
8dbe02a3b4
fox_52730 decomped, other cleanup (#46)
* objects?

* objects2?

* more stuff

* format

* even more cleanup

* RCP function names

* format

* NO U

* makerom too

* stuff

* last function

* symbols...why

* data

* cleaning

* expert mode

* foxname

* one more name

* forgot something

* one more variable cleanup

* I swear I can stop
2023-12-06 21:16:49 -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 Javier Asenjo Nitti
50496a895c linker things 2023-10-03 04:31:03 -03:00