Commit Graph

246 Commits

Author SHA1 Message Date
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
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
Lywx
ddf28ecd3e
"export configuration for ast_allies" by Sonic fixed (#150)
* begin

* progress

* progress

* Matchpoint

* clean up unnecessary externs

* dec

---------

Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
2024-03-06 20:33:08 -03:00
Alejandro Asenjo Nitti
1c204a0151
Export configuration for ast_bg_planet (#145)
* Matching

* remove unnecessary header

* fix

* add rule to extract textures as PNGs
2024-03-03 12:19:57 -03:00
Alejandro Javier Asenjo Nitti
5dd5534f95 MATCHPOINT! 2024-03-02 22:12:21 -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
petrie911
e7fbb38c98
Decomp audio_load. Add names for audio context fields and audio_heap (#143)
* heapsort

* suff

* load init

* split

* split data

* begone asm

* names

* names and cleanup
2024-02-23 22:56:08 -03:00
Alejandro Javier Asenjo Nitti
647f0f5d2e rename ast_reward to ast_ending_expert 2024-02-22 01:02:16 -03:00
Alejandro Javier Asenjo Nitti
c97b9ad6f3 ast_reward 2024-02-22 00:32:47 -03:00
Alejandro Javier Asenjo Nitti
6ab18c98b7 ast_ending_award_front & ast_ending_award_back 2024-02-22 00:21:58 -03:00
petrie911
c651825586
Name audio files and finish splitting them (#141)
* heapsort

* suff

* load init

* split

* split data

* begone asm
2024-02-21 19:10:06 -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
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
9346a22c63
Asset names and headers (#131)
* assets and such

* here goes

* here goes again

* once more

* once more

* type fixing

* type fixing

* type fixing

* here goes

* here goes

* format
2024-02-16 21:58:59 -03:00
petrie911
209b929eda
Import main, context, and option bss. Refactor headers. Some enum cleanup. (#130)
* stuff

* fixes

* addrs

* new header

* its bss time

* format and such

* fake symbols begone

* whoops forgot pragmas
2024-02-16 19:04:22 -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
Lywx
503ec0a01b
Splitted buffers to a new file (#126)
* Splitted buffers

* Moved buffers to latest overlay

* Removed sizes and moved buffers to a new overlays segment

* Removed addrs from libultra

* Readded symbols into symbol_addrs

* rename buffers to fox_buffers

---------

Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
2024-02-14 15:32:33 -03:00
Lywx
902dc0b829
Match Libultra (#120)
* Matched perspective, contquery, contreaddata, recvmesg and sendmesg

* Fixed libultra compilation flags

* Matched viblack

* Matched virepeatline, visetmode, visetspecial and viswapbuf

* Matched cartrominit, dpsetstat, sptask, sptaskyield, visetevent, createthread, gettime, setthreadpri, settime, settimer and starthread

* Fixed bss bs

* Matched even more libultra stuff

* Matched even more

* __osRdbSend

* Decompiled most of the functions of libultra <3

* Matched last functions

* Added a separation to libultra macros

* Removed ARRLEN from controller.h

* Fix libultra warnings

---------

Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
2024-02-14 12:24:31 -03:00
Alejandro Javier Asenjo Nitti
ff2627c1ca rsp_boot & aspmain assembly extraction 2024-02-13 21:40:09 -03:00
petrie911
32ff1bf34d
format (#124) 2024-02-12 15:53:43 -03:00
petrie911
a66dbbfb0c
match fox_i6_4 (#122)
* match

* name
2024-02-10 15:10:45 -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
Lywx
3d82f475de
Match fox_ka (#119)
* Decompiled a ton of functions

* Matched even more functions!

* Decompiled even more functions, now with Bill!

* Moved externs

* Matched func_i4_80192E20, func_i4_80193EF0, func_i4_801946C4, func_i4_80197290 and func_i4_80198AA0

* Cleaned code

* Sorted externs

* Added new line into breaks

* Added D_i4_8019F18C into symbol_addrs

* Added D_i4_8019F168 symbol

* TOMÁAAAAA

* Fixed merge conflicts

* Converted hex values to decimal

* Fixed format

* Added spaces on some ifs

* Removed unnecesary casts

* Added overlays.yaml

* Cleanup based on comments

* Cleaned based on petrie comments

* Changed obj status

* Fixed rot variables

---------

Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
2024-02-08 23:12:28 -03:00
petrie911
e941d81b7f
Finished sf_i5_4, now fox_ground (#117)
* 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

* a start

* match

* ground

---------

Co-authored-by: Ryan Myers <ryan.p.myers@gmail.com>
2024-02-06 12:14:35 -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
Alejandro Asenjo Nitti
092b8fc169
fox_bo (BOLSE) Decompiled (#115)
* func_i4_8018BD60

* func_i4_8018C158

* func_i4_8018CC60

* func_i4_8018D278

* func_i4_8018D394

* func_i4_8018D414

* func_i4_8018D454

* func_i4_8018D584

* func_i4_8018D4F0 co-authored-by @inspectredc

* func_i4_8018D874

* func_i4_80192264

* func_i4_80191ED8 co-authored-by: @petrie911

* func_i4_80191DB0

* func_i4_80191BAC

* func_i4_80191AFC

* func_i4_80191AFC

* func_i4_80191180

* func_i4_80190FE8

* func_i4_80190F58

* func_i4_80190EE4

* func_i4_80190D98

* fix fake symbol

* func_i4_8018F94C

* func_i4_8018F94C refactor

* format

* function prototypes

* v

* func_i4_8018EAEC

* func_i4_8018ECB4

* func_i4_8018EC1C

* func_i4_8018EE4C

* func_i4_8018ED44

* func_i4_8018D960

* func_i4_8018CCE8

* func_i4_8018D008

* func_i4_8018D124

* func_i4_8018E710

* func_i4_801918E4

* func_i4_80191A6C

* func_i4_801912FC

* func_i4_8018EF6C

* func_i4_8018E870

* func_i4_8018CE5C

* func_i4_8018BEF8

* refact func_i4_8018D4F0

* func_i4_8018E3FC & func_i4_8018E05C co-authored-by: @inspectredc

* func_i4_8018DE8C

* func_i4_8018D9CC co-authored-by: @petrie911

* data imported

* import bss

* dec

* clean up

* PR review

* dec

* dec

* review
2024-02-05 16:52:41 -03:00
petrie911
c968a071cc
Ending 1 decomped (#114)
* ending

* ending
2024-02-03 14:14:43 -03:00
petrie911
85da422168
fox_aq decomped, some type cleanup (#112)
* stuff

* stuff

* temps

* matched

* so complete

* merge and clean

* format

* graphics macros

* aq

* more stuff

* oh god the clam

* limbdraw

* headers?

* format, name changes

* enums

* merge and format
2024-02-02 00:05:17 -03:00
inspectredc
3dcd59adc1
fox_ma decompiled (#111)
* progress 1

* match functions

* data

* add brackets

* bss

* cleanup

* format

* post merge fixing

* cleanup 2

* suggestions
2024-01-30 15:17:20 -03:00
Alejandro Asenjo Nitti
a784be473a
fox_fo Decompiled & Data imported (#109)
* func_i4_80187884

* func_i4_801888C0

* func_i4_80188A48

* func_i4_80188F08

* func_i4_80188FE4

* func_i4_8018906C

* func_i4_801890EC

* strings

* func_i4_801875F0 co-authored-by: @petrie911

* func_i4_80187960

* func_i4_8018BA2C

* func_i4_8018927C

* Import Data

* unnecessary externs

* fix

* Inspect review

* Us

* dec

* dec timers

* obj.status enum

* PR REVIEW
2024-01-28 17:49:14 -03:00
Alejandro Asenjo Nitti
9f1dd5e049
SECTOR Z Decompiled: fox_sz, DATA & BSS IMPORTED (1 NON_MATCHING) (#107)
* func_i4_80199900

* func_i4_80199B18

* func_i4_80199BDC

* func_i4_8019A1D0

* func_i4_8019B48C

* func_i4_8019B568

* func_i4_8019B630

* func_i4_8019B75C

* func_i4_8019B888

* func_i4_8019DD20

* func_i4_8019E234

* func_i4_80199C60 NON_MATCHING

* func_i4_8019E454

* func_i4_8019E98C

* func_i4_8019C574

* func_i4_8019C70C

* func_i4_8019C85C

* cleanup

* cleanup 2

* func_i4_8019BA64

* func_i4_8019AB8C

* func_i4_8019AA9C

* func_i4_8019A3E8

* func_i4_8019EA68 Authored-by: @inspectredc

* merge with master

* PRINTF

* IMPORT DATA & BSS

* move data around

* obj IDs

* rename func_800BA808 to Radio_PlayMessage

* PR review

* gActors gPlayer
2024-01-25 10:43:39 -03:00
inspectredc
a6f627074e
Partial Sector Y decomp (#103)
* allbut2

* quick naming cleanup

* post merge warning/error cleanup

* hex, enums, extern funcs

* data

* bss

* u

* format

* review stuff

* format review stuff

* reorder externs

* suggestions
2024-01-23 13:04:12 -03:00
inspectredc
8f794a6335
sf_i6_2 decompiled (#104)
* sf_i6_2

* use macro

* suggestion macros

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* decimal suggestion

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* file rename

---------

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
2024-01-23 12:49: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
2b101658fe
import bss for title and map. some adjustment to headers (#100)
* bss, a bit fake. Revisit later

* format
2024-01-21 11:00:53 -03:00
Alejandro Javier Asenjo Nitti
fdaffa0772 rename fox_tr360 2024-01-20 23:28:49 -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
Lywx
63053c4653
Sector X Overlay Decompiled (#89)
* Decompiled 18 / 19

* Matched func_i2_80194728

* ITS TIME

* DESTROY, DESTROY

* Cleaned code and fixed comments from PR

* Fixed merge conflicts

* Fixed data and order on externs

* Found multiple chain assignments
2024-01-17 13:07:08 -03:00
petrie911
0fb8d58334
finish overlay file renaming and split off their headers (#92)
* names

* format 1

* more names
2024-01-17 12:36:58 -03:00
Alejandro Asenjo Nitti
431ae096fb
fox_ti_cs decompiled (#83)
* A few fox_ti_cs functions

* func_i5_8018769C

* actor

* space

* MISSION ACCOMPLISHED

* remove padding in data

* pass

* pr review
2024-01-16 11:15:25 -06:00
Alejandro Asenjo Nitti
1cc17481e9
File splits and names (#82)
* working file splits

* ovl_i2

* func_E08400_80187520

* working so far

* resolve conflicts

* .

* i2 working

* i1 working

* i1

* ovl_i1

* fox_i2

* i5 split

* i5 good

* ovl_i6

* split bss in ovl_menu

* so far, so good

* maaaan...

* ovl_unused

* ovl_i4 bss split

* ovl_i4

* ovl_i2

* foxmat!

* import more data and bss

* renamings
2024-01-14 01:30:21 -03: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
inspectredc
31bfc1ecdd
fox_co decomp, Object_2F4 rename to Actor with work buffers (#79)
* first few functions

* funcs so far - messy

* only large funcs left

* func_DF4260_8018F880 and func_DF4260_80191160

* func_DF4260_8018C19C

* func_DF4260_8018F880 player

* build post merge

* first cleanup pass

* add work buffers to Object_2F4

* halfway through data import

* finish data import

* cleanup and add non_matching

* bss complete

* actor rename

* post merge cleanup

* file rename

* arg rename

* other object variables rename

* hex cleanup for func_DF4260_80189058

* format

* revert note_data

* suggestions

* format suggestions
2024-01-13 19:45:37 -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 Javier Asenjo Nitti
abfeeee15b discover file split 2024-01-12 19:44:00 -03:00