Commit Graph

527 Commits

Author SHA1 Message Date
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
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
Alejandro Javier Asenjo Nitti
4bba3fa8be webhook test 2023-12-30 02:07:01 -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
Lywx
d7d9e472c3
MacOS Building Support (#59)
* Fixed MacOS compilation

* Updated spimdisasm requirement to use latest develop

* Updated README

* Fixed python requirements

* Readded --gc-sections on mio0

* Added a conditional flag for gc-sections

* Fixed indentation errors
2023-12-26 17:55:57 -03:00
Alejandro Asenjo Nitti
510071802a
More fox_map functions (#60)
* func_EBFBE0_801A19A8

* func_EBFBE0_801A3550

* func_EBFBE0_801A1AE8

* func_EBFBE0_801A9910

* func_EBFBE0_801A48C0

* func_EBFBE0_801A2674

* func_EBFBE0_8019F42C

* func_EBFBE0_801A9FD4

* func_EBFBE0_801A5C90

* func_EBFBE0_801A8F40

* func_EBFBE0_801A4D7C

* func_EBFBE0_801A9224

* func_EBFBE0_801A4AE8

* func_EBFBE0_8019F600

* func_EBFBE0_801A4650

* .

* func_EBFBE0_801ACD90

* func_EBFBE0_801AC9A0

* void func_EBFBE0_801AC530(s32 index) {

* func_EBFBE0_801AC200

* func_EBFBE0_801A8738

* func_EBFBE0_801A809C

* func_EBFBE0_801A4394

* func_EBFBE0_801A2304
2023-12-26 17:55:45 -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
Alejandro Javier Asenjo Nitti
9d4aa08c2b Failed message 2023-12-24 17:01:44 -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
Alejandro Asenjo Nitti
f76ce38ad1
fox_map functions (#56)
* func_EBFBE0_80187520

* func_EBFBE0_8019E85C

* func_EBFBE0_8019E8D0

* funcs

* func_EBFBE0_801A6A24

* func_EBFBE0_801A4D0C

* func_EBFBE0_801A62FC

* names

* func_EBFBE0_801A5770

* dec

* boolean

* func_EBFBE0_801A4A38

* func_EBFBE0_8019F83C

* func_EBFBE0_8019F910

* func_EBFBE0_8019F97C

* func_EBFBE0_8019FA1C

* comment

* func_EBFBE0_8019FC04

* func_EBFBE0_8019FD1C

* func_EBFBE0_8019FF48

* func_EBFBE0_801A01A8

* func_EBFBE0_801A05B4

* func_EBFBE0_801A07E8

* func_EBFBE0_801A655C

* func_EBFBE0_801AB284

* func_EBFBE0_801AB17C

* func_EBFBE0_801AD048

* func_EBFBE0_801A914C

* func_EBFBE0_801A9EE4

* func_EBFBE0_801A9DE8

* func_EBFBE0_801A9814

* func_EBFBE0_801A25C8

* func_EBFBE0_801A6DAC

* func_EBFBE0_801A6DAC

* func_EBFBE0_801A3440

* func_EBFBE0_801A7684

* primColor

* planetId

* func_EBFBE0_801A77B0

* func_EBFBE0_801A791C

* func_EBFBE0_801A7A84

* func_EBFBE0_801A7BEC

* func_EBFBE0_801A7BEC

* func_EBFBE0_801A7D3C

* progress script permissions

* func_EBFBE0_801A7F1C

* func_EBFBE0_801A74F4

* format

* func_EBFBE0_801A7230

* func_EBFBE0_801A6EC0

* func_EBFBE0_801AD718

* func_EBFBE0_801AD7EC

* func_EBFBE0_801AC80C

* func_EBFBE0_801ABF1C

* func_EBFBE0_801ABCDC

* scopes

* func_EBFBE0_801A68E4

* func_EBFBE0_801A6694

* func_EBFBE0_801A6480

* func_EBFBE0_801A6368

* func_EBFBE0_801A61B4

* LevelId

* LevelId

* func_EBFBE0_801A62FC

* level enum

* levelIDs

* enum
2023-12-24 10:12:09 -06:00
Ryan Myers
92b2bed0f5
Make progress script executable and add requirements (#57) 2023-12-23 14:19:54 -03:00
Alejandro Asenjo Nitti
e14aa665a1
Update README.md 2023-12-22 20:56:06 -03: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
Alejandro Javier Asenjo Nitti
cd865be215 func_EFFA40_80187520 2023-12-20 01:17:24 -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