Commit Graph

52 Commits

Author SHA1 Message Date
KiritoDv
903cfc811c Added an option to restore the old boost gauge and fixed coin 2025-01-04 15:40:12 -06:00
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
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 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
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 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
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
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
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
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
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
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
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
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
petrie911
3fbfdf01d2
names and namespaces cleaned up (#23)
* threads galore

* something's up

* try this

* I don't even

* who knows

* I can't stop it

* let's try data for fun

* ok I think I've gone far enough

* well maybe a little more

* visual assets somewhat documented

* just keeps going

* forgot formatting

* let
's try bss

* too much?

* one fix

* even more things

* one quick thing

* oh come on

* graph complete?

* format and such

* decomp and such

* small cleanup

* 6 and such

* more overlay fixes

* more of them

* again

* and done
2023-11-15 23:14:33 -03:00
petrie911
8f695918e3
More decomp, organization of variables.h (#21)
* threads galore

* something's up

* try this

* I don't even

* who knows

* I can't stop it

* let's try data for fun

* ok I think I've gone far enough

* well maybe a little more

* visual assets somewhat documented

* just keeps going

* forgot formatting

* let
's try bss

* too much?

* one fix

* even more things

* one quick thing

* oh come on

* graph complete?

* format and such

* decomp and such

* small cleanup
2023-11-15 00:34:10 -03:00
petrie911
77894de848
Decomped and named Matrix functions, decomped some sf_ files, some other cleanup and naming (#19)
* threads galore

* something's up

* try this

* I don't even

* who knows

* I can't stop it

* let's try data for fun

* ok I think I've gone far enough

* well maybe a little more

* visual assets somewhat documented

* just keeps going

* forgot formatting

* let
's try bss

* too much?

* one fix

* even more things

* one quick thing

* oh come on
2023-11-12 19:49:03 -03:00
Alejandro Asenjo Nitti
854cadfa16
sf_hud functions (#13)
* decompile func_80091F00

* decompile func_80092244

* decompile func_800922F4

* decompile func_800857DC

* decompile func_80085890

* decompile func_80086110

* decompile func_800886B8

* decompile func_800953A0

* decompile func_8009546C

* decompile func_80095538

* decompile func_8009092C

* decompile func_8008D0DC

* fix warnings

* decompile func_8008E51C

* underscore in offsets

* spaces
2023-10-29 17:17:25 -03:00
Alejandro Asenjo Nitti
a194fd2109
sf_hud functions (#11)
* space

* decompile func_80090CCC

* unk_ format

* Rand_ZeroOne

* decompile func_80090E8C

* decompile func_800910C0

* decompile func_80091298

* decompile func_80091368

* dec

* false

* decompile func_800914FC

* decompile func_80091864

* decompile func_80091B90
2023-10-27 02:11:13 -03:00
Alejandro Asenjo Nitti
bf55772bd9
sf_hud functions (#10)
* decompile func_8008C5C8

* decompile func_8008CA44

* decompile func_8008CFB8

* decompile func_8008D250

* decompile func_8008D31C

* decompile func_8008D4F0

* trailing comma

* x and y axis

* decompile func_8008D7F4

* decompile func_8008D984

* decompile func_8008DCB0

* decompile func_8008DD78

* decompile func_8008DE68. Co-authored-by @tharo

* unnecessary parenthesis

* decompile func_8008E2C8

* decompile func_8008E620

* decompile func_8008F96C

* dec

* space

* format

* dec

* decompile func_800907C4

* fix warnings

* decompile func_80090A00 (finally)

* format
2023-10-26 16:22:08 -03:00
petrie911
b698fd3628
Header fix (#9)
* headers

* format

* format

* format again

* headers oh my

* irix is love

* irix is life

* working

* even more fixes

* format

* touching to rebuild
2023-10-23 17:02:01 -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
63fe5d74e2 decompile func_80187CA8_EC0368 2023-10-18 16:32:17 -03:00
Alejandro Javier Asenjo Nitti
cbcad3b503 func_800863C8 2023-10-18 09:35:05 -03:00
petrie911
961e803117 now with more overlays 2023-10-16 15:49:24 -05:00
Alejandro Javier Asenjo Nitti
5947bd9c85 func_80085740 2023-10-13 10:08:45 -03:00
Alejandro Javier Asenjo Nitti
3dc822e6f6 func_800884E4 2023-10-13 09:47:30 -03:00
Alejandro Javier Asenjo Nitti
9972a5d4ad func_800884E4 2023-10-13 09:36:43 -03:00
Alejandro Javier Asenjo Nitti
c9615b9bec func_800856C0 2023-10-13 09:03:03 -03:00
Alejandro Javier Asenjo Nitti
c6644eb0cc func_8008DC34 2023-10-13 09:00:59 -03:00
Alejandro Javier Asenjo Nitti
052f6d5131 func_80085404 2023-10-13 08:56:02 -03:00
Alejandro Javier Asenjo Nitti
5ace513b0a func_800853A4 2023-10-13 08:54:08 -03:00
Alejandro Javier Asenjo Nitti
b743063568 func_8008D1F0 2023-10-13 08:35:10 -03:00
Alejandro Javier Asenjo Nitti
09de21a431 func_80085514 2023-10-13 08:34:11 -03:00
Alejandro Javier Asenjo Nitti
db2db40225 func_80085464 2023-10-13 07:43:32 -03:00
Alejandro Javier Asenjo Nitti
e158176239 func_8008556C 2023-10-13 07:39:50 -03:00
Alejandro Javier Asenjo Nitti
8ef6c6071e func_800854BC 2023-10-13 07:38:41 -03:00
Alejandro Javier Asenjo Nitti
b0595f7a7a func_8008566C 2023-10-13 07:29:58 -03:00
Alejandro Javier Asenjo Nitti
7c4292c63e func_800855C4 2023-10-13 07:24:35 -03:00
Alejandro Javier Asenjo Nitti
4201057c36 func_80095350 2023-10-13 07:21:44 -03:00
Alejandro Javier Asenjo Nitti
9de23c85f4 func_8008CB98 2023-10-13 06:58:09 -03:00
Alejandro Javier Asenjo Nitti
611863c269 func_8008B2A4 2023-10-13 06:53:13 -03:00
Alejandro Javier Asenjo Nitti
e4e0bf93dd func_8008BCBC 2023-10-13 06:51:15 -03:00
Alejandro Javier Asenjo Nitti
e2a5bebc69 func_80091254 2023-10-13 06:29:58 -03:00
Alejandro Javier Asenjo Nitti
172c30f58f func_8008B734 2023-10-13 06:27:28 -03:00
Alejandro Javier Asenjo Nitti
2629719e8d func_8008BC80 2023-10-13 06:19:33 -03:00