Commit Graph

315 Commits

Author SHA1 Message Date
Alejandro Asenjo Nitti
44c9eadbc2
3DS VERSION SfxIds applied to code (#232)
* NA_SE_ARWING_BOOST is everywhere

* man, there's just no end of these sfxIds

* NA_SE_GREATFOX_ENGINE everywhere

* NA_SE_OB_DAMAGE_M, another SfxId with massive usage

* massive usage of NA_SE_EN_REFLECT

* massive usage of NA_SE_EN_EXPLOSION_S

* massive usage of NA_SE_EN_EXPLOSION_M

* NA_SE_ARWING_ENGINE_FG

* save progress

* MISSION ACCOMPLISHED
2024-05-05 22:07:32 -03:00
petrie911
65cb9e270e
SFX Ids complete and upgraded level select (#231)
* sfx banks

* better level select

* left the mods on

* new description for level select
2024-05-05 17:48:16 -03:00
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