Commit Graph

570 Commits

Author SHA1 Message Date
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
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
Alejandro Javier Asenjo Nitti
980d2e44b4 Merge branch 'master' of github.com:sonicdcer/sf64 2024-02-02 00:07:41 -03:00
Alejandro Javier Asenjo Nitti
aa719279ba Spyborg attacks 2024-02-02 00:07:28 -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
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
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 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 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 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
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
Jefferson
66bf56c2fd
Match func_i1_80192518 (#105)
* Match func_i1_80192518

* Match func_i1_8019AA4

* A bunch of small functions

* format

* Update src/overlays/ovl_i1/sf_ve1.c

Co-authored-by: Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com>

* Update src/overlays/ovl_i1/sf_ve1.c

Co-authored-by: Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com>

* Update src/overlays/ovl_i1/sf_ve1.c

Co-authored-by: Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com>

* Update src/overlays/ovl_i1/sf_ve1.c

Co-authored-by: Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com>

* fix PR

* fake variable removed

---------

Co-authored-by: Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com>
Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
2024-01-25 00:50:42 -03:00
petrie911
c197daf499
Bonus Text, more object field names, consistent vector component names (#106)
* fixes and stuff

* filenames

* xyz
2024-01-24 11:45:55 -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
61b55d90ce
Update README.md 2024-01-21 19:39:28 -03:00
Alejandro Asenjo Nitti
8f631b3e24
Update README.md 2024-01-21 19:32:34 -03:00
Alejandro Asenjo Nitti
4ea045c7dc
Update README.md 2024-01-21 19:32:09 -03:00
petrie911
b7a36ae8ea
cleanup to object fields, some new names (#101)
* names and such

* enum

* dying
2024-01-21 14:42:06 -06:00
Alejandro Javier Asenjo Nitti
18a99b767f fix CI 2024-01-21 14:21:06 -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
Alejandro Javier Asenjo Nitti
b8af624d0b fix ve2 bss 2024-01-21 13:23:18 -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
Jefferson Sá
44a73ae55e
Match Func i1 801922 dc (#94)
* update func_i1_801922DC  from Boss* -> Object_4C

* Moving 85c4666 commit to a proper branch

* Match func_i1_801920F0

* Match func_i1_801920F0

* Match func_i1_801988B8

* forgot to delete func.s call

* Match func_i1_801923C0

* Update src/overlays/ovl_i1/sf_ve1.c

Goto replaced by loop for.

Co-authored-by: Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com>

* Match func_i1_8019243C

Match function "func_i1_801923C0"

* Apply suggestions from code review

Co-authored-by: Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com>

* Update src/overlays/ovl_i1/sf_ve1.c

Co-authored-by: Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com>

* Update src/overlays/ovl_i1/sf_ve1.c

Co-authored-by: Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com>

* Space between declaration and code

---------

Co-authored-by: Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com>
2024-01-20 23:54:53 -03:00
Alejandro Javier Asenjo Nitti
fdaffa0772 rename fox_tr360 2024-01-20 23:28:49 -03:00
Alejandro Javier Asenjo Nitti
a3282cd9e6 PR REVIEW 2024-01-20 23:25:47 -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
inspectredc
59bb497b17
Match remaining function in fox_co (#97)
* func_i1_80189058

* use correct gPlayer

* match player change
2024-01-20 13:29:08 -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 Javier Asenjo Nitti
f4257e65b9 discord link 2024-01-17 11:24:33 -03:00
inspectredc
3ce61b6d95
E9F1D0 partial (#91)
* E9F1D0 partial

* format

* unformat format
2024-01-17 08:04:59 -06:00
Alejandro Asenjo Nitti
4ba101e283
Fox hud functions (#88)
* func_80086664

* func_80086DCC

* func_80087788

* func_80087B5C

* func_80088564

* func_80088970

* func_8008A07C

* func_8008A240

* func_8008A4DC

* func_8008B774

* func_8008B774

* func_8008BD00

* func_8008C104

* review

* func_8008C6F4

* func_8008CBE4

* func_8008EA14

* func_8008FA84

* func_8008FFF0

* func_80090200

* func_800915FC

* func_80093164

* func_80092EC0
2024-01-17 06:57:31 -06:00
Ryan Myers
086cfd5e62
Rematch E05620 (#87)
* Rematch E05620

* Update src/overlays/ovl_i1/E05620.c

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

* Update src/overlays/ovl_i1/E05620.c

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

* Fix suggested changes.

---------

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
2024-01-17 06:31:29 -06: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
Lywx
b975246483
Fixed settings.json (#84)
* Fixed settings.json

* Readded fox_i1
2024-01-16 12:58:30 -03:00
Alejandro Asenjo Nitti
8bf3781f9e
add license (#86) 2024-01-15 00:16:47 -03: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
Lywx
cbe2ad4546
Documentation of fox_option (#80)
* Renamed functions and variables related to the option cards

* Fixed format

* Renamed OptionLabel to OptionTexture

* Added more types on fox_option

* Reverted note_data

* Renamed OptionEntryId to OptionId

* Renamed ranking menu

* Added OPTION_COUNT

* Renamed missing declarations on option cards

* Added vars on symbol_addrs_overlays

* Removed hardcoded option count

* Fixed format

* Added missing option state assingments

* Fixed fox_game format
2024-01-13 22:33:38 -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
Alejandro Javier Asenjo Nitti
262a0bede2 style pass on fox_effect 2024-01-13 11:23:50 -03:00