Alejandro Javier Asenjo Nitti
0366bf315b
remove includes for bss reordering that are no longer needed.
2024-04-01 17:32:21 -03:00
Alejandro Javier Asenjo Nitti
58612dd506
remove assets.h and fix various symbols
2024-04-01 17:25:27 -03:00
inspectredc
1a6675cad9
export configuration for ast_solar ( #193 )
...
* ast_zoness
* format
* ast_solar
* post merge resolving and format
* remove ast_solar
2024-04-01 16:32:59 -03:00
inspectredc
5844ffc4dd
export configuration ast_zoness and bump torch for generic array factory ( #192 )
...
* ast_zoness
* format
* remove ast_zoness.h
* change name to D_ZO_601996C
* rename to yaml and use vec3f array
* prevent_bss_reordering in fox_edisplay
* format
---------
Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
2024-04-01 15:17:46 -03:00
Lywx
9604a29140
export configuration for ast_fortuna, ast_katina, ast_venom_1 & ast_venom_2 ( #190 )
...
* Matched ast_fortuna
* Added FO prefix into every asset
* Fully matched PR
* Removed katina from assets.h
* WIP ast_venom_2
* Debinarized ast_venom_2
* Removed venom_2 from assets.h
* Renamed VE1 to VE1B
* Matched ast_venom_1
* Renamed to D_VE1
* Renamed venom_1 boss assets back to D_VE1
* Fixed merge conflicts
2024-04-01 13:54:47 -03:00
inspectredc
2ef09bcf5d
export configuration for ast_andross ( #189 )
...
* export configuration for ast_andross
* format
* assets yaml
2024-03-31 22:53:09 -03:00
Alejandro Asenjo Nitti
8b4bb6d943
export configuration for ast_meteo & ast_bolse ( #188 )
...
* progress
* remove header
* - '#include "sf64level.h"'
* MatchPoint
* asset analysis complete, here it comes. Wheeeeeh
* comment
* correction
* some missile docs
* format
* preparations for ast_bolse extraction
* Matchpoint
* Jackpot
2024-03-31 22:04:45 -03:00
petrie911
4255ef5519
finish export on segment 7, rename the versus assets ( #187 )
...
* versus
* ending
* ending
* header
* vs names
* errant header
2024-03-29 20:19:29 -03:00
Alejandro Asenjo Nitti
7ee062df9e
export configuration for ast_corneria ( #184 )
...
* complete?
* done
* remove header
* ast_corneria.yaml prepared
* progress
* more progress
* progress
* finished?
* fix duplicated symbol
* matchpoint
* add torch.hash.yml to git ignore
* progress replacing symbol use
* Ready ?
* fix bss reordering issues
* remove redundant entry in gitignore
* remove externs
* we don't need these anymore, libultra is finished
2024-03-29 14:09:14 -05:00
petrie911
09541d8ad3
None of woman born Shall export Macbeth ( #183 )
...
* macbeth
* fix
* forgot header
2024-03-29 14:40:09 -03:00
petrie911
bb7b2b19ca
Last Titania asset, fix to hibox exporter, more cleanup ( #180 )
...
* yaml
* ti
* hud
* a
* torch
* forgot header
* fix?
* format
2024-03-28 11:13:34 -03:00
petrie911
38eba417f5
Add level tags to some segment 6 addresses ( #179 )
...
* env
* format
* syms
2024-03-27 17:54:11 -03:00
petrie911
97f544c557
Improved match for fox_ti, add custom gbi macro, some cleanup ( #178 )
...
* splits
* torch
* torch again
* headers
* merges
* format
* matches
* commit
* colpoly
* SY
2024-03-27 17:06:28 -03:00
Alejandro Asenjo Nitti
ec1d3da564
export configuration for ast_great_fox & ast_sector_z & ast_sector_y ( #175 )
...
* Matchpoint
* remove symbols from undef
* remove header
* comments
* var rename
* remove header
* first asset
* progress
* progress
* progress, should be matching. Torch bug?
* comments
* update torch with Peter's fix
* PRINTF
* replace symbol usage
* todo comment
* D_SX_6000000 usage
* progress
* Matchpoint
* progress replacing symbol usage (apo apo ahora)
* remove headers
* va bene
* format
* remove header
2024-03-27 01:07:41 -03: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
petrie911
a7aac0753d
torch update, ast_area_6 and ast_vs_player, new names ( #169 )
...
* split up
* format
* torch
* headers
* just keep going
* torch
* names and such
* format
* remove headers
2024-03-17 01:06:28 -03:00
petrie911
11c6a8c7dc
Split headers as much as possible. add unique tags to segment 6 addresses ( #167 )
...
* split up
* format
* torch
2024-03-14 18:31:03 -03:00
Alejandro Asenjo Nitti
206bfac9ef
export configuration for ast_landmaster & ast_training ( #165 )
...
* remove header
* Matchpoint
* remove unnecessary externs
* Matchpoint (2 blobs)
* Asset analysis complete, here it comes!
* bye bye header
* MISSION ACCOMPLISHED
2024-03-14 12:42:24 -03:00
petrie911
46ce729392
Hitbox factory and minor hitbox cleanup ( #162 )
...
* a start
* some things
* format
* hitboxes
2024-03-12 23:21:47 -03:00
petrie911
036e58535b
Add Script Factory. Also some colpoly docs and vector cleanup ( #161 )
...
* a start
* some things
* format
2024-03-12 16:46:25 -03:00
petrie911
5152d504b3
audio_general, audio data import, naming lots of audio functions ( #144 )
...
* heapsort
* suff
* load init
* split
* split data
* begone asm
* names
* names and cleanup
* let's try this
* woo macros
* general
* bgm macro
* names
2024-03-01 15:57:44 -03:00
petrie911
e7fbb38c98
Decomp audio_load. Add names for audio context fields and audio_heap ( #143 )
...
* heapsort
* suff
* load init
* split
* split data
* begone asm
* names
* names and cleanup
2024-02-23 22:56:08 -03:00
petrie911
f227194d24
docs and such ( #137 )
2024-02-19 10:05:11 -03:00
petrie911
209b929eda
Import main, context, and option bss. Refactor headers. Some enum cleanup. ( #130 )
...
* stuff
* fixes
* addrs
* new header
* its bss time
* format and such
* fake symbols begone
* whoops forgot pragmas
2024-02-16 19:04:22 -03:00
petrie911
32ff1bf34d
format ( #124 )
2024-02-12 15:53:43 -03:00
Alejandro Javier Asenjo Nitti
f88d780765
func_800AF07C matched
2024-02-11 16:07:32 -03:00
petrie911
25694f9d49
Finished Ve1, added permuter macros, fixed an error in Player struct ( #121 )
...
* format
* format
* cleanup
* offsets
2024-02-10 15:09:27 -03:00
Alejandro Javier Asenjo Nitti
c3fe1175ea
fox_edisplay symbols
2024-02-06 16:38:23 -03:00
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
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
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
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
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
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
petrie911
b7a36ae8ea
cleanup to object fields, some new names ( #101 )
...
* names and such
* enum
* dying
2024-01-21 14:42:06 -06: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
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
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
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
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
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
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
