Commit Graph

363 Commits

Author SHA1 Message Date
Alejandro Asenjo Nitti
455aa0aa2c
Initial Katina documentation (#228)
* initial docs

* func names

* docs

* more docs

* more katina docs

* format

* format

* yRot

* more docs

* more docs

* this

* some fixes

* fixes

* ActorAllRange

* These should not be used here

* corrections

* some renamings

* more docs

* format

* Merge remote-tracking branch 'origin' into fox_ka_docs

* ActorCutscene

* PR review

* comment

* bump torch

* PR review

* review
2024-05-05 17:23:49 -03:00
petrie911
9303fba359
Event opcodes documented, more all range stuff (#229)
* stuff

* Torch1

* dark link
2024-05-04 18:24:24 -03:00
petrie911
77060ba506
Start on sfx IDs (#227)
* sfx stuff

* sfxIds
2024-05-03 16:56:26 -03:00
petrie911
c9df6fda72
More docs (#226)
* docs

* more docs

* forgot timers
2024-05-02 17:46:51 -03:00
petrie911
926677aa6c
In-game ram watch mod + upgraded jukebox (#225)
* new mods

* Torch
2024-05-01 21:57:50 -03:00
Alejandro Javier Asenjo Nitti
5056a6ef31 bools and names 2024-04-27 12:32:07 -03:00
petrie911
3ab050421e
use array count for collision headers (#222)
* lights fix

* names

* remove header

* so many names

* format

* more docs

* makefile

* colheaders

* it's gone too far

* torch
2024-04-25 19:01:25 -03:00
Alejandro Asenjo Nitti
7c2ce8a678
DOCS: ast_text (ex ast_font) (#223)
* progress of docs

* caiman here, no problems

* Emergency manouvers!

* complete

* rename ast_font to ast_text
2024-04-25 14:08:40 -05:00
petrie911
0c9be776da
Cumulative docs update (#221)
* lights fix

* names

* remove header

* so many names

* format

* more docs

* makefile
2024-04-25 01:14:49 -03:00
Alejandro Javier Asenjo Nitti
a6b80a5825 some spaces, corrections and TeamId Enum usages 2024-04-25 01:00:23 -03:00
petrie911
81291a0c44
More docs and renames, fox_bg now mostly figured out (#220)
* lights fix

* names

* remove header

* so many names

* format
2024-04-22 23:51:20 -03:00
Alejandro Javier Asenjo Nitti
31b2a56251 get rid of fixed size in gPlanetPathStatus 2024-04-21 16:04:34 -03:00
petrie911
95e5f4f07a
Some further docs for audio spec and planet paths (#219)
* avoid ub

* format

* torch

* more stuff
2024-04-20 17:07:29 -05:00
petrie911
e3716b5d48
Fix out-of-bound loop UB (#218)
* avoid ub

* format

* torch
2024-04-20 18:47:46 -03:00
petrie911
b3929bea72
Docs update, added list of all SFX Ids used in the game. (#217)
* docs

* format

* format plz

* stuff

* more stuff

* more names and such

* torch update
2024-04-20 16:18:31 -03:00
Alejandro Asenjo Nitti
1272524325
MOD: FPS COUNTER (#216)
* progress

* working

* move to Play_Draw

* remove mods.h include from fox_hud

* fix name

* __floatundisf needed by GCC

* Improve level select

* __floatundisf in yaml for GCC

* jump directly to level loading in Map_LevelSelect

* comments

* fix level select

* AVOID_UB in audio

* stable flags

* fix UB in AudioHeap_DiscardSampleCaches co-authored-by: @petrie911

* fox_map fix

* move frame counter a few pixels to the right

* format

* add measurement correction for overclocked N64s
2024-04-20 16:18:09 -03:00
Alejandro Javier Asenjo Nitti
7969da8a9d fix offset comment 2024-04-16 00:40:12 -03:00
Alejandro Javier Asenjo Nitti
aa97afffb4 fix GCC UB with audio (finally) 2024-04-16 00:14:12 -03:00
petrie911
0e54a13433
Docs relating to fox_360. Also a UB fix in audio_load. (#215)
* docs

* format

* format plz
2024-04-15 20:38:19 -03:00
Alejandro Asenjo Nitti
1ee6762797
Initial GCC Support (#212)
* first try

* progress

* progress

* gcc compiling, rom not booting yet

* format

* restore word compiler

* comment

* fix

* fix

* fix addresses for new splat

* progress

* splat

* we don't need these anymore

* gcc build seems stable now
2024-04-15 20:15:45 -03:00
petrie911
c532f31e24
Script and hitbox docs, update torch (#210)
* script2

* more docs and such

* torch update
2024-04-11 13:55:32 -03:00
petrie911
52e1b6cb17
Further docs on script, various other things (#204)
* stuff

* too much

* Torch commit

* torch again

* names and such

* names

* even more stuff

* format

* enums

* whoops on the gbi
2024-04-08 19:25:56 -03:00
KiritoDv
2518e45bd2 Ported mods as enhancements and impl reset button 2024-04-06 18:33:30 -06:00
KiritoDv
b36783ba8e Fixed asset loading on overlays and engine, including switching iwork to uintptr_t 2024-04-06 15:34:46 -06:00
Alejandro Javier Asenjo Nitti
d777ce9917 SectorZ_Missile_Update rename 2024-04-06 12:35:39 -03:00
KiritoDv
83cb18d9db Fixed compilation 2024-04-06 04:35:56 -06:00
KiritoDv
ed967484e3 First ingame boot 2024-04-06 04:33:13 -06:00
KiritoDv
defb215e78 Attempt to fix math weirdness on Windows 2024-04-06 04:33:13 -06:00
KiritoDv
b5b93e0e56 Added gfx_dimensions.h 2024-04-06 04:33:13 -06:00
KiritoDv
11ddc641c0 Fixed compilation on windows 2024-04-06 04:33:13 -06:00
KiritoDv
9e6800d369 The game is fucking running 2024-04-06 04:33:03 -06:00
KiritoDv
110e54c562 First compilation running owo 2024-04-06 04:32:13 -06:00
KiritoDv
641a43cbf9 First compilation, we just need more stupid assets 2024-04-06 04:32:13 -06:00
petrie911
126a55aa0e
Event Actor docs that kind of ballooned into a bunch of stuff (#200)
* stuff

* too much

* Torch commit

* torch again
2024-04-05 17:11:36 -03:00
petrie911
ac41c180a9
Reorganizaton of main (#199)
* reorganize main

* more names

* libc
2024-04-03 11:30:50 -03:00
Alejandro Javier Asenjo Nitti
5f2b690a2b fix s32 <=> bool inconsistencies 2024-04-03 02:18:35 -03:00
inspectredc
bc4c757145
Match AudioLoad_RelocateFontAndPreloadSamples (#198) 2024-04-02 23:38:21 -03:00
petrie911
988a36d03f
Name functions after their files, also global variables in engine and ovl_i1-6 (#196)
* cleanup

* mass rename

* forgot some
2024-04-02 20:20:08 -03:00
Alejandro Javier Asenjo Nitti
69b70a9d3f remove all the undefined symbols from the list 2024-04-01 21:17:43 -03:00
Alejandro Javier Asenjo Nitti
e9c93209c4 omg kill me 2024-04-01 21:08:01 -03:00
petrie911
2938919f6f
WIP on script documentation, some cleanup (#194)
* gfx

* script

* Torch

* headers

* format
2024-04-01 19:04:22 -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
Lywx
576d42fabd
[WIP] Export configuration for ast_common (#176)
* Close to fully implement the whole file

* Filled gaps with blobs

* Added config into assets.yaml

* Removed a more blobs

* Fully extracted ast_common

* Bump torch
2024-03-29 16:43:25 -05:00
petrie911
b4c43da7d8
export ast_ve1_boss (#186)
* ve1

* fix vs

* one thing
2024-03-29 15:37:49 -05:00
petrie911
94fd988b80
export ast_title, add missing assets to ast_map (#185)
* WIP ast_title assets

* Fixed format

* macbeth

* title

* title

* bss

* small fix

---------

Co-authored-by: KiritoDv <kiritodev01@gmail.com>
2024-03-29 16:21:43 -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
Alejandro Asenjo Nitti
7a43255fea
export configuration for ast_enmy_planet (#181)
* complete?

* done
2024-03-28 08:01:37 -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
26a3873e16
export configuration for ast_star_wolf (#177)
* MISSION
ACCOMPLISHED

* remove header

* remove comment
2024-03-27 14:37:20 -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
df268e3bad
titania boss assets, cleanup pads, update torch, split remaining segments other than 6 (#173)
* splits

* torch

* torch again

* headers
2024-03-21 15:45:13 -03:00
Alejandro Asenjo Nitti
6c27771ff4
export configuration for ast_map (#172)
* progress

* progress

* progress

* progress

* progress

* progress

* progress

* finished?

* remove unnecessary header

* rename to map

* remove header

* rename to ast_map

* problem with torch

* Matchpoint

* take out pads and update Torch
2024-03-21 15:41:46 -03:00
petrie911
5531a140d8
matches (#170) 2024-03-18 00:23:01 -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
Alejandro Asenjo Nitti
60a64d402f
export configuration for ast_enmy_space (#168)
* Matchpoint

* remove header

* remove comments

* add ENMY_SPACE_ to every symbol

* missed one
2024-03-16 20:10:21 -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
petrie911
75bbe0ba6a
torch update, aquas export, some asset cleanup (#166)
* a start

* some things

* format

* hitboxes

* soon

* fixes and such

* Torch

* one fix

* torch

* formatting

* whoops the math
2024-03-14 12:43:50 -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
Alejandro Javier Asenjo Nitti
66ac732861 remove header 2024-03-13 19:50:34 -03:00
petrie911
01e87f1680
Colpoly factory and Torch fixes + sonicdcer's ast_sector_X (#164)
* a start

* some things

* format

* hitboxes

* soon

* fixes and such

* Torch

* one fix
2024-03-13 18:48:03 -03:00
Lywx
976539b8c0
export configuration for ast_arwing (#163)
* Arwing completely extracted ( With Issues )

* Fixed remaining issues

* Fixed remaining issues

* Fixed last one

* Renamed D_3000000 to use blue_marine

* Fixed missing declarations on fox_hud
2024-03-13 18:47:50 -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
e6f62df332
Skeleton factory and more Titania assets (#160)
* skellingtons

* sort
2024-03-11 23:18:02 -03:00
Alejandro Asenjo Nitti
7c64f94d22
export configuration for ast_font_3d (#159)
* progress

* goodbye header

* Torch

* new torch

* Update Torch

* progress

* Matchpoint
2024-03-11 21:50:12 -03:00
Lywx
97d067e0f6
export configuration for ast_radio (#157)
* Extracted ast_radio

* Removed externs from sf64mesg
2024-03-11 14:54:44 -03:00
Alejandro Asenjo Nitti
db21b5e96c
export configuration for ast_7_ti_1 (#156)
* progress

* progress

* progress

* update torch

* progress

* Matchpoint

* bye header

* remove unnecessary externs

* comment

* Animation extraction

* include Animations

* a couple more animations

* clean up
2024-03-11 14:46:59 -03:00
Alejandro Asenjo Nitti
ec7ece3c61
export configuration for ast_option (#155)
* initial

* progress so far

* progress

* progress

* progress

* progress

* more progress

* more progress

* progress so far

* comment out BLOB

* comment

* D_8015DF0

* Matchpoint

* matching

* update torch again

* verbose Torch

* remove comments

* fix
2024-03-10 22:38:13 -03:00
petrie911
77959b1753
Audio_seqplayer finished (#154)
* heapsort

* suff

* load init

* split

* split data

* begone asm

* names

* names and cleanup

* let's try this

* woo macros

* general

* bgm macro

* names

* audio_thread

* Update Torch

* I think it's time to move on

* Merge remote-tracking branch 'upstream/master' into play

* playback

* bss

* it's over

---------

Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
2024-03-10 15:30:31 -03:00
petrie911
8ccd568cc8
Audio_effects, _playback, and most of _seqplayer (#153)
* heapsort

* suff

* load init

* split

* split data

* begone asm

* names

* names and cleanup

* let's try this

* woo macros

* general

* bgm macro

* names

* audio_thread

* Update Torch

* I think it's time to move on

* Merge remote-tracking branch 'upstream/master' into play

* playback

* bss

---------

Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
2024-03-08 18:53:53 -03:00
Alejandro Asenjo Nitti
14aa8c9db7
export configuration for ast_font (#151)
* progress

* goodbye ast_font.h

* progress

* progress

* progress

* progress

* progress

* progress

* progress

* Matchpoint

* comments

* comment

* ast_font debinarized

* add header to files

* cleanup
2024-03-08 13:18:34 -03:00
Lywx
ddf28ecd3e
"export configuration for ast_allies" by Sonic fixed (#150)
* begin

* progress

* progress

* Matchpoint

* clean up unnecessary externs

* dec

---------

Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
2024-03-06 20:33:08 -03:00
petrie911
7e99fe712d
In my nightmares, I see audio_synthesis (#146)
* heapsort

* suff

* load init

* split

* split data

* begone asm

* names

* names and cleanup

* let's try this

* woo macros

* general

* bgm macro

* names

* audio_thread

* Update Torch

* I think it's time to move on

* Merge remote-tracking branch 'upstream/master' into play

---------

Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
2024-03-05 19:51:52 -03:00
Alejandro Asenjo Nitti
1c204a0151
Export configuration for ast_bg_planet (#145)
* Matching

* remove unnecessary header

* fix

* add rule to extract textures as PNGs
2024-03-03 12:19:57 -03:00
Alejandro Javier Asenjo Nitti
7fa45ce716 remove unnecessary externs 2024-03-02 22:36:52 -03:00
Alejandro Javier Asenjo Nitti
ac5074a40c remove unnecessary header 2024-03-02 22:16:39 -03:00
Alejandro Javier Asenjo Nitti
5dd5534f95 MATCHPOINT! 2024-03-02 22:12:21 -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
Alejandro Javier Asenjo Nitti
647f0f5d2e rename ast_reward to ast_ending_expert 2024-02-22 01:02:16 -03:00
Alejandro Javier Asenjo Nitti
d8808a923c remove part of the comment for imported assets 2024-02-22 00:34:51 -03:00
Alejandro Javier Asenjo Nitti
332967f7f6 remove headers 2024-02-22 00:22:41 -03:00
Alejandro Javier Asenjo Nitti
6ab18c98b7 ast_ending_award_front & ast_ending_award_back 2024-02-22 00:21:58 -03:00
Alejandro Javier Asenjo Nitti
c8b33370a7 Antialias modes documented 2024-02-21 19:53:29 -03:00
petrie911
c651825586
Name audio files and finish splitting them (#141)
* heapsort

* suff

* load init

* split

* split data

* begone asm
2024-02-21 19:10:06 -03:00
Alejandro Asenjo Nitti
807ade8ff7
ast_blue_marine extraction (#140)
* progress so far

* progress

* progress

* progress

* matching

* revert F3DEX_MK64

* update torch

* update gitIgnore

* correction

* add src/assets to clean recipe
2024-02-21 12:52:42 -03:00
petrie911
05747b1b52
Clean up hardcoded symbols (#139)
* heapsort

* suff
2024-02-20 15:01:42 -03:00
petrie911
389ad0cd35
heapsort (#138) 2024-02-19 19:21:20 -03:00
petrie911
f227194d24
docs and such (#137) 2024-02-19 10:05:11 -03:00
Alejandro Asenjo Nitti
41698a131a
Extract ast_warp_zone (#136)
* try

* progress

* hasta la vista, baby

* ast_warp_zone matching

* remove symbols from linker

* new version of Torch

* ast_warp_zone
2024-02-18 22:34:56 -03:00
Alejandro Asenjo Nitti
e3b26ca666
sys_audio_C870.c Initial work (#135)
* func_8000BFE8

* func_8000BF6C

* func_8000BFD8

* func_8000BF94

* func_8000BFA8

* func_8000E1C4

* func_8000DBE4

* func_8000C0C0

* func_8000C1F8

* func_8000C13C

* matching

* various fixes

* AudioHeap_SearchRegularCaches

* func_8000CAF4

* func_8000DC84

* func_8000DC84

* .

* sf64 audio provisional header

* .
2024-02-18 12:43:21 -03:00
Lywx
0b13c0edef
Asset extraction (#133)
* Added torch and ast_logo yml

* Added torch into makefile

* Added torch into tools all rule

* Fixed version and removed clang-format from c header

* Reverted settings.json unrelated change

* Bump version

* Readded -s flag

* Fixed Makefile indentation
2024-02-17 23:19:18 -03:00
petrie911
9346a22c63
Asset names and headers (#131)
* assets and such

* here goes

* here goes again

* once more

* once more

* type fixing

* type fixing

* type fixing

* here goes

* here goes

* format
2024-02-16 21:58:59 -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
inspectredc
16cc6a411f
Titania decomp - 4 non-matching, 2 non-equiv (possibly equivalent) (#129)
* progress

* progress2

* more matches and remove warnings

* add non matching/equivs and move assets to top

* update post merge

* data

* bss

* clean up

* correct numbers

* address review
2024-02-16 14:15:58 -06:00
petrie911
234b36ebb5
match fox_sy (#128)
* match

* pointer cleanup

* more cleanup

* more cleanup
2024-02-14 20:22:37 -03:00
petrie911
f83d179ea9
improve match on i3, add scratches, some linker cleanup (#127)
* stuff

* fixes

* addrs
2024-02-14 12:33:21 -06:00
Lywx
503ec0a01b
Splitted buffers to a new file (#126)
* Splitted buffers

* Moved buffers to latest overlay

* Removed sizes and moved buffers to a new overlays segment

* Removed addrs from libultra

* Readded symbols into symbol_addrs

* rename buffers to fox_buffers

---------

Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
2024-02-14 15:32:33 -03:00
Lywx
902dc0b829
Match Libultra (#120)
* Matched perspective, contquery, contreaddata, recvmesg and sendmesg

* Fixed libultra compilation flags

* Matched viblack

* Matched virepeatline, visetmode, visetspecial and viswapbuf

* Matched cartrominit, dpsetstat, sptask, sptaskyield, visetevent, createthread, gettime, setthreadpri, settime, settimer and starthread

* Fixed bss bs

* Matched even more libultra stuff

* Matched even more

* __osRdbSend

* Decompiled most of the functions of libultra <3

* Matched last functions

* Added a separation to libultra macros

* Removed ARRLEN from controller.h

* Fix libultra warnings

---------

Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
2024-02-14 12:24:31 -03:00
petrie911
32ff1bf34d
format (#124) 2024-02-12 15:53:43 -03:00
petrie911
a66dbbfb0c
match fox_i6_4 (#122)
* match

* name
2024-02-10 15:10:45 -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
650dc4778a fox_option symbols 2024-02-06 23:12:45 -03:00
Alejandro Javier Asenjo Nitti
731f363dfc fox_versus symbols 2024-02-06 21:23:57 -03:00
Alejandro Javier Asenjo Nitti
7fb19f9825 fox_hud symbols 2024-02-06 20:59:18 -03:00
Alejandro Javier Asenjo Nitti
0084ed5123 fox_enmy2 symbols 2024-02-06 20:44:02 -03:00
Alejandro Javier Asenjo Nitti
a9caa3d48d fox_enmy symbols 2024-02-06 20:13:26 -03:00
Alejandro Javier Asenjo Nitti
1d90a928ec fox_std_lib symbols 2024-02-06 17:45:24 -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
Alejandro Asenjo Nitti
092b8fc169
fox_bo (BOLSE) Decompiled (#115)
* func_i4_8018BD60

* func_i4_8018C158

* func_i4_8018CC60

* func_i4_8018D278

* func_i4_8018D394

* func_i4_8018D414

* func_i4_8018D454

* func_i4_8018D584

* func_i4_8018D4F0 co-authored-by @inspectredc

* func_i4_8018D874

* func_i4_80192264

* func_i4_80191ED8 co-authored-by: @petrie911

* func_i4_80191DB0

* func_i4_80191BAC

* func_i4_80191AFC

* func_i4_80191AFC

* func_i4_80191180

* func_i4_80190FE8

* func_i4_80190F58

* func_i4_80190EE4

* func_i4_80190D98

* fix fake symbol

* func_i4_8018F94C

* func_i4_8018F94C refactor

* format

* function prototypes

* v

* func_i4_8018EAEC

* func_i4_8018ECB4

* func_i4_8018EC1C

* func_i4_8018EE4C

* func_i4_8018ED44

* func_i4_8018D960

* func_i4_8018CCE8

* func_i4_8018D008

* func_i4_8018D124

* func_i4_8018E710

* func_i4_801918E4

* func_i4_80191A6C

* func_i4_801912FC

* func_i4_8018EF6C

* func_i4_8018E870

* func_i4_8018CE5C

* func_i4_8018BEF8

* refact func_i4_8018D4F0

* func_i4_8018E3FC & func_i4_8018E05C co-authored-by: @inspectredc

* func_i4_8018DE8C

* func_i4_8018D9CC co-authored-by: @petrie911

* data imported

* import bss

* dec

* clean up

* PR review

* dec

* dec

* review
2024-02-05 16:52:41 -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
Ryan Myers
22f5d22fa0
sf_i5_4.c WIP (#113)
* 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
2024-02-02 00:02:52 -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
a784be473a
fox_fo Decompiled & Data imported (#109)
* func_i4_80187884

* func_i4_801888C0

* func_i4_80188A48

* func_i4_80188F08

* func_i4_80188FE4

* func_i4_8018906C

* func_i4_801890EC

* strings

* func_i4_801875F0 co-authored-by: @petrie911

* func_i4_80187960

* func_i4_8018BA2C

* func_i4_8018927C

* Import Data

* unnecessary externs

* fix

* Inspect review

* Us

* dec

* dec timers

* obj.status enum

* PR REVIEW
2024-01-28 17:49:14 -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
Jefferson
66bf56c2fd
Match func_i1_80192518 (#105)
* Match func_i1_80192518

* Match func_i1_8019AA4

* A bunch of small functions

* format

* 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>

* 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>

* fix PR

* fake variable removed

---------

Co-authored-by: Alejandro Asenjo Nitti <96613413+sonicdcer@users.noreply.github.com>
Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
2024-01-25 00:50:42 -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
inspectredc
a6f627074e
Partial Sector Y decomp (#103)
* allbut2

* quick naming cleanup

* post merge warning/error cleanup

* hex, enums, extern funcs

* data

* bss

* u

* format

* review stuff

* format review stuff

* reorder externs

* suggestions
2024-01-23 13:04:12 -03:00
inspectredc
8f794a6335
sf_i6_2 decompiled (#104)
* sf_i6_2

* use macro

* suggestion macros

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* decimal suggestion

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>

* file rename

---------

Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
2024-01-23 12:49:43 -03:00
petrie911
119dfa9354
Solar decompiled, some cleanup (#102)
* stuff

* stuff

* temps

* matched

* so complete

* merge and clean

* format

* graphics macros
2024-01-22 00:28:02 -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
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
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
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
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
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