Commit Graph

362 Commits

Author SHA1 Message Date
KiritoDv
0b23e06b77 Fixed stars 2024-10-16 12:46:04 -06:00
KiritoDv
efe08a91bf Added interpolation system 2024-10-16 11:53:41 -06:00
KiritoDv
93e6d673e6 Fixed sf64 clear screen buffer for widescreen 2024-09-17 20:29:20 -03:00
KiritoDv
3ca7b499ae Fixed wrong types 2024-09-17 20:22:18 -03:00
KiritoDv
41447af1b7 Fixed ObjectRam compilation 2024-09-17 20:20:56 -03:00
KiritoDv
94ff373a84 Set ram mod as enabled by default 2024-09-17 20:20:56 -03:00
KiritoDv
69cfe9b2c4 Fixed all remaining compilation issues 2024-09-17 20:20:26 -03:00
KiritoDv
7c801d33d9 Repo upstreamed 2024-09-17 20:16:46 -03:00
KiritoDv
f71ebdca82 Fixed some weird casts 2024-09-17 19:31:14 -03:00
KiritoDv
3892bcefa2 Merge branch 'master' into otr 2024-09-17 19:14:09 -03:00
Alejandro Asenjo Nitti
0022481a03
ActorCutsceneModels Enum (#274)
* ActorCutsceneModels

* ACTOR_CS_FO_EXPLOSION

* update
2024-09-17 02:04:15 -03:00
Alejandro Asenjo Nitti
53363d6619
Hud, Title, Map & Option Docs (#272)
* hud title and option docs

* hud docs

* aspMain vram comment

* more hud docs

* HUD docs

* Hud_ -> HUD_ consistency

* ActorMissileSeekModes

* fox_option docs

* more option docs

* more option docs

* more option docs

* fox_title docs

* more fox_title docs

* fox_map docs

* fix map TLUTs

* more fox_map docs

* jp1 explore

* explore us rev0

* SETUPDL comments

* format

* fox_map docs

* more fox_map docs
2024-09-13 00:59:33 -03:00
Alejandro Asenjo Nitti
e82019fa2b
Actor Docs (#270)
* Docs

* actor timer_04C -> work_04C

* Actor & Boss unk_04A -> work_04A

* actor & boss unk_048 -> work_048

* actor & boss unk_046 -> work_046

* boss unk_044 -> work_044

* actor event docs

* ActorEvent docs

* name all Event Actor IDs

* EVID names in EventActorInfo comments

* refactor EVC_PASSED_ALL_RINGS by @inspectredc

* clarification comment

* some option docs

* audio enums and macros

* some audio renamings
2024-08-24 19:36:53 -03:00
Alejandro Javier Asenjo Nitti
669fff8759 SzGreatFox 2024-08-15 15:31:20 -03:00
Alejandro Javier Asenjo Nitti
a1134c296a actor docs 2024-08-15 11:54:53 -03:00
Alejandro Javier Asenjo Nitti
92ccdeb991 more actor docs 2024-08-15 06:19:21 -03:00
Alejandro Javier Asenjo Nitti
e2f6ce3075 actor docs 2024-08-15 05:20:30 -03:00
Alejandro Javier Asenjo Nitti
56d49ec767 corrections 2024-08-15 05:10:00 -03:00
Alejandro Javier Asenjo Nitti
f17c7bdc27 teamFaceId -> drawFace 2024-08-15 04:28:42 -03:00
Alejandro Javier Asenjo Nitti
76f7d6e335 replace all ArwingInfo unks for names 2024-08-15 04:01:44 -03:00
Alejandro Javier Asenjo Nitti
02ea67c9cc unk_0C -> upperLeftFlapYrot 2024-08-15 03:26:01 -03:00
Alejandro Javier Asenjo Nitti
5f5c0d2edf unk_08 -> bottomRightFlapYrot 2024-08-15 03:24:04 -03:00
Alejandro Javier Asenjo Nitti
885a20e29f unk_04 -> upperRightFlapYrot 2024-08-15 03:00:22 -03:00
Alejandro Javier Asenjo Nitti
bef7345bf7 leftState -> leftWingState 2024-08-15 02:56:41 -03:00
Alejandro Javier Asenjo Nitti
ccb74bd0fe rightState -> rightWingState 2024-08-15 02:55:25 -03:00
Alejandro Javier Asenjo Nitti
e073a7d0d7 wings -> arwing 2024-08-15 02:52:41 -03:00
Alejandro Javier Asenjo Nitti
8d3d4cd2d0 WingInfo -> ArwingInfo 2024-08-15 02:05:53 -03:00
Alejandro Javier Asenjo Nitti
e291a588e5 LEVELMODE_TURRET 2024-08-15 01:02:52 -03:00
Alejandro Asenjo Nitti
0251769d16
General docs (#269)
* fox_display.c DOCS

* PRINTF

* actor->destroy boolean

* corneria docs

* Boss->unk_04C to Boss->animFrame

* aCoGrangaWalkingAnim

* more corneria docs

* Spawner

* Spawner code refined

* Spawner description

* Actor Spawn guard

* Molar Rock (name by @inspectredc)

* more docs

* actor docs

* initial disassembly config for lodgenet

* correct vram addresses for lodgenet

* Actor Docs

* More actor docs

* more actor docs

* correction

* correction

* more actor docs

* Preliminary work for Effect documentation

* Change Init for Setup

* fox_play cleanup and defake

* fox_zo function names

* fox_so function renaming

* more object docs

* venom 1 actors

* actor docs

* some fox_bo docs

* some fox_fo corrections

* fox_ma obj->this

* fox_ma renamings

* fox_ma docs

* fox_ti Actors

* revert permuter settings to ido

* some renames on fox_andross.c

* fox_sy actors

* object names

* corrections

* some effect comments

* fix AudioTable struct and data to avoid UB

* uintptr_t in audio

* audio load changes

* event id enum usage in fox_sy

* clear padding in sPlaylists

* HUD_FoBase_ExplodeCs

* HUD
2024-08-12 11:58:54 -03:00
petrie911
83c5442915
Improve audio docs and partial audio disassembly support (#268)
* audiodiasm

* start of sound disasm

* disasm

* source
2024-07-07 14:43:41 -03:00
Alejandro Asenjo Nitti
c348962cab
Sector Z, Fortuna & General Docs (#261)
* Sector Z Docs initial

* Sector Z docs

* some other things

* correction

* Space Junk

* SectorZ_SetLevelObjects

* rename assets with correct prefix

* aSzBackgroundTex

* details

* pr review

* Sector X initials

* Meteo Initials

* Sector X things I forgot

* fox_tr360 & fox_ve1 & fox_so initials

* fox_so details

* Zones initials

* More Zones initials

* more zones initials

* area 6 initials

* fortuna inits

* fortuna actors

* some more docs

* more docs for Fortuna

* fix mistake in data incorrectly imported

* Fortuna Radars

* BossFO

* Sector Y Initials

* Venom 2 general Docs

* Some Corneria Docs

* Actor, Scenery and Boss IDs in update and draw functions of gObjectInfo

* more docs and this usage

* fox_360 this usage

* more actor types and this usages

* fox_effect type usage

* training docs

* some Sector X docs

* fix incorrect usage of "this"

* fix comment

* more docs

* funcNames

* fox_bg spacing

* boolean

* scenery corneria bumbs

* terrain bumps

* corneria arch

* more corneria objects

* hitboxes

* more corneria objects

* more corneria level objects

* more corneria objects

* aCoWaterfallDL

* corneria docs

* more corneria docs

* Granga swork start

* corneria swork

* Corneria

* Corneria Granga docs

* more granga docs

* granga work buffer enum

* CarrierParts enum use

* option

* Corneria Docs

* GRANGA_FWK

* fox_co.h header

* fix Fault_FillRectangle typo

* PR reviews

* sCsTeamInitialPos

* Doodad
2024-07-06 09:47:49 -03:00
Alejandro Javier Asenjo Nitti
dc6fdbcf69 fix gcc 2024-06-07 19:12:48 -03:00
petrie911
0f6d7cca33
Player and Vs docs, some improvement to ve1 boss (#259)
* playerstuff

* stuff

* small fixes

* Torch

* torch update again
2024-05-25 12:17:03 -05:00
petrie911
03ce166cca
Implement common data in EU and JP and clean up US data (#258)
* data fixes

* format

* alignment

* include
2024-05-23 20:40:42 -03:00
petrie911
566f9db5a5
cheats (#257) 2024-05-20 11:28:13 -03:00
petrie911
53c05e51a4
give EU a symbol addrs file (#256)
* srceu

* remove warning

* and some cleanup

* symbol addrs for eu

* data

* one cleanup

* move macros to header
2024-05-19 01:27:17 -03:00
petrie911
80eaf7d2e5
support for EU rev 0, updates to tools, other cleanup (#255)
* srceu

* remove warning

* and some cleanup
2024-05-18 19:49:49 -03:00
petrie911
2c98d106a1
Fix some names, use setup DL enum, add dma offsets to srcjp (#254)
* cleanup

* buffers

* setupDLs and such
2024-05-17 14:22:51 -03:00
Alejandro Javier Asenjo Nitti
837ac7ea83 fox_aq styling 2024-05-16 16:08:58 -03:00
petrie911
1a5569bef5
Comptool support for byteswapped ROMs (#249)
* comptool update

* further updates

* lodgenet

* comptool and main split

* one last thing
2024-05-15 13:41:15 -05:00
petrie911
cf51ec5332
Updates to sf64Mesg and a couple global names (#247)
* id start

* stuff

* comp and cam

* add errors

* names and such

* message fixes and names
2024-05-14 13:54:13 -03:00
petrie911
3045745789
name remaining files, fix some fake matches (#245)
* splits

* split and migrate

* readwrite const

* format
2024-05-14 11:44:12 -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
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