Commit Graph

537 Commits

Author SHA1 Message Date
Alejandro Javier Asenjo Nitti
fb7b087664 make clean clears version specific asm folders 2024-05-13 19:41:31 -03:00
petrie911
bccb26174b
Set up yaml and linker scripts for jp0 (#244)
* splits

* split and migrate
2024-05-13 18:49:53 -03:00
petrie911
1f452ce232
Forgot an update to first_diff (#242)
* verbose

* indices

* small updates
2024-05-12 11:18:36 -05:00
Alejandro Asenjo Nitti
cd3444b727
Isolate rev1 building tree (#239)
* try

* move yamls

* gitignore

* fix

* gitignore starfox64.us.rev1.yaml

* fix RM

* update readme

* readme again, forgot a few things

* okay one more...

* fix ci
2024-05-11 21:11:29 -03:00
petrie911
0dbbf453f9
More actor docs. starting on event IDs (#238)
* id start

* stuff

* comp and cam

* add errors
2024-05-11 17:53:37 -03:00
Alejandro Asenjo Nitti
5bda92de97
Katina: Boss States and tweaks (#237)
* Boss states and tweaks

* fixes

* roll back filename changes

* variable name fix

* Katina_Init
2024-05-10 23:28:18 -03:00
petrie911
7eff38a5f9
Add quick boot and add ram editing to object ram watch (#236)
* upgrades

* one cleanup

* streamlining

* whoops mods

* more ub

* cast cleanup
2024-05-08 15:57:11 -03:00
petrie911
182eb5c65a
Use SF3DS BGM names, some other audio-related cleanup. (#235)
* remember to undo mods

* bgm macros
2024-05-08 12:32:05 -03:00
petrie911
a864e5ebe2
oh god the docs (#234) 2024-05-06 19:45:24 -03:00
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
inspectredc
d08678a5ac
Use array count for more things (#230)
* array count more things

* fix array count error

* undo array count for later

---------

Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
2024-05-05 17:29:59 -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
d2436e5850 Ending_8018845C fake match scratch comment 2024-04-30 09:46:49 -03:00
Alejandro Javier Asenjo Nitti
6dbc0ba6b1 name vars in Message_DisplayScrollingText 2024-04-27 14:36:31 -03:00
Alejandro Javier Asenjo Nitti
25d8938483 AVOID_UB in fox_message 2024-04-27 14:33:59 -03:00
Alejandro Javier Asenjo Nitti
5056a6ef31 bools and names 2024-04-27 12:32:07 -03:00
Alejandro Javier Asenjo Nitti
9bc64bd212 RadioCharacterId 2024-04-27 12:14:16 -03:00
Alejandro Javier Asenjo Nitti
bb4c68a22d radioPortraitTex 2024-04-27 10:39:24 -03:00
Alejandro Javier Asenjo Nitti
78683d8c03 pad 2024-04-27 10:08:19 -03:00
Alejandro Javier Asenjo Nitti
35859e4306 teamId 2024-04-27 10:07:44 -03:00
Alejandro Javier Asenjo Nitti
bd30371b04 bool 2024-04-27 10:03:49 -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 Javier Asenjo Nitti
ee59dfc57f missionNoTex 2024-04-25 16:11:01 -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
e1785c35dd fix warning 2024-04-21 16:01:38 -03:00
Alejandro Javier Asenjo Nitti
4f95948de5 Fix level select 2024-04-21 15:54:51 -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
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
Alejandro Javier Asenjo Nitti
8ad92b4b3b fix texture 2024-04-12 14:08:38 -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
inspectredc
4362338efb
Match Area6_80187944 (#209)
* Match Area6_80187944

* actually commit all changes

* Area6_80187944

* merge

* AUDIO_PLAY_BGM

* team ids

---------

Co-authored-by: Alejandro Javier Asenjo Nitti <alejandro.asenjo88@gmail.com>
2024-04-11 09:39:53 -03:00
inspectredc
001b3e0aa7
Match Ending_80187860 (#207) 2024-04-10 19:20:03 -03:00
inspectredc
eeea74e454
Match Zoness_80194A84 (#206) 2024-04-10 09:22:43 -03:00
inspectredc
f63251d512
Match Aquas_801AFA5C (#205) 2024-04-09 01:08:20 -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
Alejandro Javier Asenjo Nitti
be0d328b4e avoid ub in func_play_800B79B0 & comment 2024-04-08 00:05:42 -03:00
Alejandro Javier Asenjo Nitti
b2b8ea3c79 Merge branch 'master' of github.com:sonicdcer/sf64 2024-04-07 18:52:16 -03:00
Alejandro Javier Asenjo Nitti
f6fc05afd3 fix wrong symbol use 2024-04-07 18:52:11 -03:00
inspectredc
ccfd4e8159
Match Aquas_801B638C (#203) 2024-04-07 18:50:23 -03:00
Alejandro Javier Asenjo Nitti
5e1d4ab9a8 Merge branch 'master' of github.com:sonicdcer/sf64 2024-04-07 18:43:03 -03:00
Alejandro Javier Asenjo Nitti
f8cceb5f1d fix wrong symbol use 2024-04-07 18:42:58 -03:00
inspectredc
b4ca33057e
Match Aquas_801B6FF8 (#202) 2024-04-07 17:41:16 -03:00
inspectredc
2d3e940f26
Match Area6_8018C54C (#201)
* Match Area6_8018C54C

* can remove if now rest is matching

* just use if 1
2024-04-07 14:10:58 -03:00
Alejandro Javier Asenjo Nitti
b8278dd1d7 Add scratches in the repo for remaining functions in audio_symthesis 2024-04-07 10:53:00 -03:00
Alejandro Javier Asenjo Nitti
f2c5292e7b fix fakes 2024-04-07 01:05:58 -03:00
Alejandro Javier Asenjo Nitti
5c59226db4 fix fake 2024-04-07 00:37:21 -03:00
Alejandro Javier Asenjo Nitti
d777ce9917 SectorZ_Missile_Update rename 2024-04-06 12:35:39 -03:00
Alejandro Javier Asenjo Nitti
1128c200e2 rewrite func_hud_800915FC 2024-04-06 12:14:20 -03: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
a903e81638 fix level select for venom 2024-04-03 01:02:07 -03:00
Alejandro Javier Asenjo Nitti
b8ee8bc770 Merge branch 'master' of github.com:sonicdcer/sf64 2024-04-03 00:39:31 -03:00
Alejandro Javier Asenjo Nitti
e2826b2a6f level select fix for venom 2024-04-03 00:39:26 -03:00
inspectredc
bc4c757145
Match AudioLoad_RelocateFontAndPreloadSamples (#198) 2024-04-02 23:38:21 -03:00
inspectredc
ec94904725
Match Audio_ProcessSeqCmd (#197) 2024-04-02 22:52:04 -03:00
Alejandro Javier Asenjo Nitti
d29fc5697f fix warnings 2024-04-02 22:01:27 -03:00
Alejandro Javier Asenjo Nitti
98023e669c these functions should take void pointers 2024-04-02 22:00:06 -03:00
Alejandro Javier Asenjo Nitti
60a4176f27 improve level select 2024-04-02 20:32:51 -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
inspectredc
34b0701ac1
Match func_800097A8 (#195) 2024-04-02 18:31:34 -03:00
Alejandro Javier Asenjo Nitti
b9b48aebdf fix wrong displaylist usage 2024-04-02 17:11:20 -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
1890dcda47 generic file descriptors 2024-04-01 18:58:42 -03:00
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
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