Commit Graph

696 Commits

Author SHA1 Message Date
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
Alejandro Javier Asenjo Nitti
917488eb7e SQ macro 2024-01-13 10:49:59 -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
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
921bceb967
[MOD] Level Select & Sound Effects Jukebox (#76)
* level select mod

* map name

* move mod to c file

* Sfx Jukebox

* fix bank boundaries

* fix

* expert modes

* co-authored-by @petrie911

* add sfx
2024-01-12 14:11:40 -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
Alejandro Asenjo Nitti
7106c6a4c9
Update README.md 2024-01-08 20:57:46 -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
petrie911
a0ec7a5516
Area 6 decomp, Object_408 -> boss, more overlay symbols in main (#70)
* 408

* more stuff

* brutal matches

* data and such

* gPlayer

* names and boss and such

* cat

* forgot something
2024-01-06 19:39:23 -03:00
Alejandro Javier Asenjo Nitti
c36c713da5 fox_demo description 2024-01-05 17:32:04 -03:00
Alejandro Javier Asenjo Nitti
dd3a487166 fox_demo style pass 2024-01-05 17:28:02 -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
Ryan Myers
ec3bc32c5c
sf_77e40 - Match 30 more funcs (#69)
* Match func_8007C9E0

* Match func_8007CAF0

* Match func_8007CC00

* Match func_8007CCBC

* Match func_8007CD7C

* Match func_8007CEBC

* Match func_8007CF30

* Match 4 more funcs

* Match 5 more funcs

* Match func_8007D2F4

* Match func_8007D55C

* func_8007D748

* Match several more

* Match func_8007DB70

* Match func_8007DED4

* Match func_8007E014

* Match another handful

* obj2F4->unk_0E8 -> obj2F4->vel

* Object_8C.unk_54 -> Object_8C.vel

* obj80->unk_64 -> obj80->vel

* obj408->unk_06C -> obj408->vel

* Name gravity

* obj8C names

* Run make format
2024-01-05 09:53:32 -06:00
Alejandro Asenjo Nitti
fb7cf7ce65
Update README.md 2024-01-05 02:07:59 -03:00
Alejandro Asenjo Nitti
32e15fe11c
Update README.md 2024-01-05 02:06:17 -03:00
Alejandro Asenjo Nitti
c5d9eb962b
fox_map decompiled (#68)
* func_EBFBE0_801A116C

* func_EBFBE0_801A0D14

* put some order

* func_EBFBE0_801A1528

* func_EBFBE0_801A53C8

* func_EBFBE0_801A4FC4

* func_EBFBE0_801A9448

* func_EBFBE0_801A4394

* func_EBFBE0_801A3A00

* func_EBFBE0_801A5834

* func_EBFBE0_801A89BC

* void

* dec

* cleanup

* func_EBFBE0_801A2EB8

* func_EBFBE0_801A1C14

* func_EBFBE0_801AA778

* begin importing data

* func_EBFBE0_801A2B8C

* fix

* fox_map DATA IMPORTED

* ovl_menu rename

* fix

* fix warnings

* fix build

* move symbol addresses
2024-01-04 12:53:38 -03: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
Alejandro Asenjo Nitti
16b16ce0eb
more fox_map functions (#66)
* fix func_EBFBE0_801A2674

* func_EBFBE0_801AA1CC

* func_EBFBE0_8019F164

* func_EBFBE0_8019E99C

* func_EBFBE0_801AD11C

* gTeamShieldsMapDisplay

* func_EBFBE0_801AB978

* func_EBFBE0_801AB300

* func_EBFBE0_801AA434

* func_EBFBE0_801A6A98

* roll back gTeamShieldsMapDisplay

* func_EBFBE0_801A5E80

* func_EBFBE0_801A9A8C

* func_EBFBE0_801A2B8C

* func_EBFBE0_801A281C

* func_EBFBE0_801A25C8 enum use

* f32 func_EBFBE0_801A25C8(PlanetId);

* func_EBFBE0_801A0954
2024-01-01 19:55:06 -03:00
Alejandro Asenjo Nitti
faef6f85f8
Update README.md 2024-01-01 17:29:08 -03: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
Alejandro Asenjo Nitti
62a4a36804
Update README.md 2023-12-30 14:43:01 -03:00