Commit Graph

229 Commits

Author SHA1 Message Date
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
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
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 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
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
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
petrie911
89cde81114
fox_43E80 decomped, matches and data import in fox_bg, some cleanup (#63)
* tank?

* matches and data

* excess files

* another extra file
2023-12-30 11:14:06 -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
Alejandro Javier Asenjo Nitti
833b4fe92b style pass, file rename and fix fox_radio NON_MATCHING 2023-12-24 19:32:31 -03:00
Alejandro Javier Asenjo Nitti
f780759077 enmy2 rename 2023-12-24 18:49:01 -03:00
petrie911
7633af7a28
fox_play finished, lots of new names for things (#58)
* 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

* matches

* matrix scale why

* names and such

* cleanup

* name back

* it just keeps going

* they don't give up

* splits

* merge going poorly

* I object

* more names

* one nonmatching

* merge time

* merge complete

* cleanup

* poor rambo

* level fix
2023-12-24 13:28:35 -06: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
petrie911
11197f6c28
Making the name changes discussed (#54)
* 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

* matches

* matrix scale why

* names and such

* cleanup

* name back

* it just keeps going

* they don't give up

* splits

* merge going poorly

* I object

* more names
2023-12-20 16:32:50 -03:00
petrie911
8101aa8bc2
file splits, renames, more functions in play (#53)
* 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

* matches

* matrix scale why

* names and such

* cleanup

* name back

* it just keeps going

* they don't give up

* splits

* merge going poorly

* I object
2023-12-19 11:54:50 -03:00
petrie911
af26374677
Match Matrix_Scale, change some file names (#52)
* 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

* matches

* matrix scale why

* names and such

* cleanup

* name back
2023-12-15 17:09:49 -03:00
petrie911
19410dedd5
A bunch of matches, fox_52730 and fox_edisplay OK (#51)
* 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

* matches
2023-12-14 14:58:53 -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
Ryan Myers
2b051a0828
Match 30 more funcs in sf_77e40 (#48)
* Match func_8007A5F8

* Match func_8007A774

* Match func_8007A818

* Match func_8007A900

* Match func_8007A994

* Match func_8007AA60

* Match func_8007AB50

* Match func_8007AC0C

* Few more func matches

* remove strings

* Match func_8007AF30 and func_8007AFD0

* Match func_8007B040

* Match func_8007B0F4

* MAtch func_8007B228

* Match func_8007B3B8

* Fix todo

* 7 new matches

* Match 3 more funcs.
2023-12-13 16:48:05 -06:00
petrie911
c9e58a815d
97F80, A4290, and A48B0 matching, started bss import on engine. (#47)
* stuff

* three whole files

* format

* format and such

* one cleanup
2023-12-09 15:53:24 -03:00
Ryan Myers
392305e919
Warnings Fixes (#45)
* fox_option and fox_title warnings

* Couple small warnings

* Fix all remaining warnings

* Run make format

* make tools on its own

* Fix warnings introduced in last master version

* Better use of the drawGfx union
2023-12-08 15:58:37 -06: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
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
petrie911
3a38f87ea5
wip on sf_A4B50 (probably fox_play), also names and cleanup (#43)
* objects?

* objects2?

* more stuff

* format

* even more cleanup

* RCP function names

* format

* NO U

* makerom too
2023-12-04 15:50:52 -03:00
Alejandro Asenjo Nitti
aa59b6ff69
fox_option functions (#39)
* func_EBFBE0_80195B74

* func_EBFBE0_80196894

* func_EBFBE0_8019896C

* fix

* func_EBFBE0_80194CE4

* func_EBFBE0_801952B4

* RCP_SetupDL

* format

* move data around

* space
2023-11-30 16:35:40 -06:00
petrie911
2f67ed8638
Names and such (#38)
* names and such 1

* more names

* format
2023-11-29 23:44:42 -03:00
petrie911
078a9f5897
Sf_bb360, also major data import (#35)
* all sorts of imports and such

* oops

* names and such
2023-11-28 17:03:47 -03:00
Alejandro Asenjo Nitti
be46258c0c
fox_title decompiled (#33)
* func_EBFBE0_8018C1C0

* func_EBFBE0_8018C644

* func_EBFBE0_8018CB90

* func_EBFBE0_8018CC30

* func_EBFBE0_8018CD9C

* func_EBFBE0_8018D2B8

* M_DTOR

* func_EBFBE0_8018D510

* func_EBFBE0_8018DDB8

* func_EBFBE0_8018FD08

* func_EBFBE0_8018FD08

* func_EBFBE0_801903B8

* func_EBFBE0_8018E200

* func_EBFBE0_8018E67C

* func_EBFBE0_8018EDC8

* func_EBFBE0_80192D58

* func_EBFBE0_80193C4C
2023-11-28 10:38:25 -06:00
petrie911
0205789a28
a bunch of graphics related functions and data importation (#31)
* graphics?

* more stuff

* missed one

* headers

* data import and such
2023-11-26 18:27:05 -03:00
Alejandro Asenjo Nitti
d6fc56adc0
fox_title (#30)
* func_EBFBE0_801919C4

* fox_title functions

* func_EBFBE0_8019C66C

* broken branch

* fix branch

* more functions

* remove unnecessary file

* sizes

* func_EBFBE0_80188010

* func_EBFBE0_801894E8

* func_EBFBE0_8018A2F8

* func_EBFBE0_8018A338
2023-11-25 14:08:39 -06:00
petrie911
d32854ced1
Proposed names for library stuff (#29)
* get this started

* linker scripts fixed

* oh god what now

* names

* the blue pill

* names, perhaps

* save

* clean out structs

* save for later again

* more names

* save, again
2023-11-24 16:11:20 -03:00
Lywx
e0cc3dbc0e
Decomp 2F300.c (#26)
* Decompiled func_8002EE34

* Fixed format

* Matched func_8002F64C

* Decompiled func_8002FE74 and fixed array size
2023-11-22 11:57:54 -03:00
petrie911
c2a2b60871
enemy drawing routines decomped (#28)
* graphics?

* more stuff

* missed one
2023-11-22 11:56:29 -03:00
Alejandro Asenjo Nitti
4cfdc163e9
fox_option.c (#27)
* func_EBFBE0_801920C4

* func_EBFBE0_80192190

* func_EBFBE0_801924C4

* func_EBFBE0_80192598

* func_EBFBE0_80192738

* func_EBFBE0_801928BC

* func_EBFBE0_80192938

* rename to fox_option found in sf643D rom symbols

* dec

* few functions

* need input! more input!

* NO DISASSEMBLE!

* func_EBFBE0_80196E54 & func_EBFBE0_80196EFC

* func_EBFBE0_80196F9C

* func_EBFBE0_80196FC4 & func_EBFBE0_80197074

* format

* func_EBFBE0_8019715C

* fix stack

* func_EBFBE0_801973C0

* sneaky ido

* data indicates these are floats

* did i say floats? i was looking at the wrong offsets

* func_EBFBE0_8019752C

* func_EBFBE0_80197914

* func_EBFBE0_80197A3C

* func_EBFBE0_80197DE4

* func_EBFBE0_8019A214

* break

* func_EBFBE0_80199284

* func_EBFBE0_80199424

* func_EBFBE0_8019978C

* func_EBFBE0_8019A080

* func_EBFBE0_8019A298

* func_EBFBE0_8019B8A0

* func_EBFBE0_8019C824

* func_EBFBE0_8019CAE0

* func_EBFBE0_8019DF64

* func_EBFBE0_8019DE74

* func_EBFBE0_8019E030

* func_EBFBE0_8019DD44

* func_EBFBE0_8019DCE8

* func_EBFBE0_8019CBC0

* format

* func_EBFBE0_80193B04

* func_EBFBE0_801944F0

* .

* func_EBFBE0_80197F74

* more functions
2023-11-22 11:47:38 -03:00
petrie911
ca9899deed
sf_61B30 decomped (#25)
* my god it's done

* save for later
2023-11-18 12:44:33 -03:00
Alejandro Asenjo Nitti
d34a5e370a
more "hud" functions (#24)
* decompile func_80086444

* func_80084930

* func_80084B94

* decompile func_80084E78

* pr review
2023-11-17 12:17:56 -03:00