Commit Graph

47 Commits

Author SHA1 Message Date
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
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 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
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
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
petrie911
a864e5ebe2
oh god the docs (#234) 2024-05-06 19:45:24 -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
c9df6fda72
More docs (#226)
* docs

* more docs

* forgot timers
2024-05-02 17:46:51 -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
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
b36783ba8e Fixed asset loading on overlays and engine, including switching iwork to uintptr_t 2024-04-06 15:34:46 -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
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
petrie911
2938919f6f
WIP on script documentation, some cleanup (#194)
* gfx

* script

* Torch

* headers

* format
2024-04-01 19:04:22 -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
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
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
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
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
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
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
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
3ce61b6d95
E9F1D0 partial (#91)
* E9F1D0 partial

* format

* unformat format
2024-01-17 08:04:59 -06: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
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
7633af7a28
fox_play finished, lots of new names for things (#58)
* stuff

* three whole files

* format

* format and such

* a switch in time

* merge prep

* nintendo switch

* format

* the great switch statement of our time

* 43AC0 matched

* stuff

* Enums everywhere

* oh god the switch

* knakyo

* new headers

* format

* fox

* everyone hates recursion

* format

* one more thing

* one more one more thing

* renames

* matches

* matrix scale why

* names and such

* cleanup

* name back

* it just keeps going

* they don't give up

* splits

* merge going poorly

* I object

* more names

* one nonmatching

* merge time

* merge complete

* cleanup

* poor rambo

* level fix
2023-12-24 13:28:35 -06:00
petrie911
11197f6c28
Making the name changes discussed (#54)
* stuff

* three whole files

* format

* format and such

* a switch in time

* merge prep

* nintendo switch

* format

* the great switch statement of our time

* 43AC0 matched

* stuff

* Enums everywhere

* oh god the switch

* knakyo

* new headers

* format

* fox

* everyone hates recursion

* format

* one more thing

* one more one more thing

* renames

* matches

* matrix scale why

* names and such

* cleanup

* name back

* it just keeps going

* they don't give up

* splits

* merge going poorly

* I object

* more names
2023-12-20 16:32:50 -03:00
petrie911
8101aa8bc2
file splits, renames, more functions in play (#53)
* stuff

* three whole files

* format

* format and such

* a switch in time

* merge prep

* nintendo switch

* format

* the great switch statement of our time

* 43AC0 matched

* stuff

* Enums everywhere

* oh god the switch

* knakyo

* new headers

* format

* fox

* everyone hates recursion

* format

* one more thing

* one more one more thing

* renames

* matches

* matrix scale why

* names and such

* cleanup

* name back

* it just keeps going

* they don't give up

* splits

* merge going poorly

* I object
2023-12-19 11:54:50 -03:00
petrie911
af26374677
Match Matrix_Scale, change some file names (#52)
* stuff

* three whole files

* format

* format and such

* a switch in time

* merge prep

* nintendo switch

* format

* the great switch statement of our time

* 43AC0 matched

* stuff

* Enums everywhere

* oh god the switch

* knakyo

* new headers

* format

* fox

* everyone hates recursion

* format

* one more thing

* one more one more thing

* renames

* matches

* matrix scale why

* names and such

* cleanup

* name back
2023-12-15 17:09:49 -03:00
petrie911
89ae8dff96
fox_6B3B0 and a bunch of names for things (#50)
* stuff

* three whole files

* format

* format and such

* a switch in time

* merge prep

* nintendo switch

* format

* the great switch statement of our time

* 43AC0 matched

* stuff

* Enums everywhere

* oh god the switch

* knakyo

* new headers

* format

* fox

* everyone hates recursion

* format

* one more thing

* one more one more thing

* renames
2023-12-14 11:41:43 -03:00