Commit Graph

1714 Commits

Author SHA1 Message Date
Derek Hensley 96b75ffaa8 MAXFLOAT 2024-05-21 18:21:17 -07:00
Derek Hensley 67a30021b3 M_PI for cosf and sinf files 2024-05-21 18:15:12 -07:00
Derek Hensley b4527cc5c7 libc 2024-05-21 18:12:27 -07:00
Derek Hensley e2b4b1bbd1 math header 2024-05-21 18:06:36 -07:00
Derek Hensley 88868ee2f2 COLPOLY_GET_NORMAL 2024-05-19 19:37:32 -07:00
Derek Hensley de32e1110c LINKER_FILES in makefile 2024-05-19 19:14:13 -07:00
Derek Hensley b7e5468ca1
General cleanup (#1636)
* totalLoadedActors comparision

* OBJMINE_PARAMS

* Sort z64.h header includes

* MapSelect_LoadConsoleLogo

* Combine notebook tables into 1

* TGSw clean up
2024-05-19 11:02:20 -07:00
Derek Hensley a3a7b551ed
various makefile adjustments (#1635) 2024-05-19 10:43:14 -07:00
Tharo 44057c087a
ovl_En_Wdhand (#1629)
* 2 non-matching

* Matching

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Cleanup + docs

* Suggested changes

* Format

* Update EnWdhand_GetInitVelocity

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-05-19 10:18:34 -07:00
Derek Hensley fd3431fa48
warnings_count fix (#1634)
* warnings_count fix

* Split off rom and compress in check_new_warnings.sh
2024-05-17 07:35:12 -07:00
Anghelo Carvajal 7b2f062df1
Fix a fake match on `EnSGoro` (#1633)
* Fix

* worldPos
2024-05-17 07:05:15 -07:00
Anghelo Carvajal a04f1b8e05
Change tooling for better elf correctness (#1632)
* Add addresses for makerom and boot segments

* Mark entrypoint as the entry of the elf

* Add extra labels to macro.inc

* Use dlabel, jlabel and endlabel in disassembly

* Make jlabel global

* git subrepo pull tools/asm-processor

subrepo:
  subdir:   "tools/asm-processor"
  merged:   "92b9ec72f"
upstream:
  origin:   "git@github.com:simonlindholm/asm-processor.git"
  branch:   "main"
  commit:   "92b9ec72f"
git-subrepo:
  version:  "0.4.3"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "2f68596"

* Use `dlabel`s for non-functions in .text

* Add linker asserts

* Move framebuffer_lo to before the makerom segment to avoid `dot moved backwards` warnings

* fix

* Improve assert message

* fix

* Third fix

* Fix four

* Move undefined_syms to linker_script folder

* Make second linker script file to avoid abusing undefined_syms

* Update Makefile

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Rename to extra.ld

* Use entrypoint symbol on ROM header

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-05-17 06:41:23 -07:00
Derek Hensley de69d62800
New Romheader format (#1628) 2024-05-17 09:00:45 -04:00
Tharo c609d3dcae
c_keyframe.c decompiled and documented (#1630)
* 2 non-matching

* 1 function left

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Fully matching

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Documented, has bss reordering issues

* Fixes

* Apply suggestions

* Format

* Re-add cast oops

* Remove != 0 for override and transform limb draws, format

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-05-17 08:29:19 -04:00
inspectredc 27aa3f748b
Document Bug in EnMttag_GetCurrentCheckpoint and Cleanup (#1622)
* Document bug in EnMttag_GetCurrentCheckpoint and cleanup

* correct func name

* clarify bug message

* format

* address review
2024-05-16 21:22:59 -07:00
Synray e6a69dfb2b
Danpei movebg (#1429)
* Bg_Danpei_Movebg OK

* Cleanup

* PR comments

* Couple small things

* Address the nit

* Flags

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-05-16 08:29:14 -04:00
Tom Overton dd73e644cf
Remove unnecessary stuff from undefined_syms.txt (#1631)
* Remove unnecessary stuff from undefined_syms.txt

* Also remove `ovl_En_Po_Composer` symbols
2024-05-15 22:06:44 -04:00
Anghelo Carvajal f4e8ec14e9
Bss script update (#1601)
* port back AF's version

* Update to use mapfile_parser 2

* Allow to specify other sections

* hardcode map path

* eprint

* -r

* review

* review

* Use fixed version

* Update docs/tutorial/vscode.md

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* review

* Update tools/check_reordering.py

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* update build path

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-05-15 13:49:31 -04:00
louist103 ef6323b9cd
Consolidate array | z_en_fish2 (#1627)
* Consolidate array

* Format
2024-05-12 10:46:28 -07:00
louist103 8e5b376b8d
Remove s32 cast from actionfunc check (#1626) 2024-05-12 10:28:22 -07:00
Derek Hensley 6d315fa2ae
Use Romfile in place of vromStart and vromEnd in structs (#1618)
* DmaEntry

* KaleidoMgrOverlay

* ActorOverlay

* EffectSsOverlay

* GameStateOverlay

* TransitionOverlay
2024-05-12 10:08:52 -07:00
Archez 0e8b225279
document bug in talk wait animation (#1625) 2024-05-08 16:37:40 -04:00
Archez 77ea785cc1
fix song of time vtx count (#1624) 2024-05-08 10:48:28 -04:00
louist103 c2e1202551
Consolidate text array (#1623) 2024-05-07 06:12:52 -07:00
Archez 7a26cca36d
CLOSE_DISPS fixes and avoid early return (#1621)
* fix en_osn close_disps position

* rework en_mnk draw face to avoid returns

* use goto in effect draw to avoid returns

* feedback
2024-05-05 08:16:15 -04:00
Garrett Cox d0bdbd6f53
Document missing gDPSetEnvColor (#1620) 2024-05-03 09:14:28 -04:00
Tom Overton 7c93d5e125
EnInvadepoh (Aliens, UFO, Invasion Handler, etc.) OK and documented (#1614)
* deimplementation complete

* newlines

* match

* data import

* back port cleanup changes

* stuff

* naming and such

* all funcs provisionally named

* more stuff

* merge

* Fix merge issues

* begin cleanup

* Use constants for all face animation data

* Use THIS like almost every actor does

* Change "Light Ball" to "UFO"

* Rename the alien types

* EnInvadePoh -> EnInvadepoh

* Rename the types

* Rename some Twinmold stuff

* ConfusedRomani -> SilentRomani

* Fix stack size issues with EnInvadepoh_Cremia_Init

* Move a struct out of the header to where it belongs

* Some header cleanup and struct names

* Name remaining struct vars

* Some more struct var renames

* Finish reviewing the struct var names

* Rename most of the interactInfo stuff

* Consistency

* Remove unused union

* Define EN_INVADEPOH_LIMB_MAX like EndingHero6 does

* Fix header

* Update functions.txt and variables.txt

* Create macros for accessing spawn time and kill count

* Some defines

* Some minor comments and cleanup

* Rename some functions

* Comments for those three functions

* Draw function cleanups

* Some damaged and dead cleanup

* Death scale stuff

* Good chunk of alien functions

* Invasion state naming

* Weekeventreg naming

* Happy with >20% of functions now

* A couple more functions

* More consistent names for BSS variables

* Some Init cleanup

* Happy with 30% of the functions now

* Finish the abductors

* Some random functions to get the functions I'm happy with >1/3rd

* Use `InitPath` for everything

* UFO functions done, >40% functions I'm happy with

* Do a lot of work on InvasionHandler action funcs

* Finish invasion handler code

* InitVars

* Rename the "closest alien" stuff to "closest alien threat"

* Finish most of the dog functions

* Lots of small stuff here and there

* Finish documenting the dog bug

* Document `EnInvadepoh_Dog_IsCloseToPath`

* `EnInvadepoh_Dog_MoveAlongPath` and other fixes

* Simple comment for `EnInvadepoh_Dog_Move`

* Various path functions, finish dog

* Consistently use "SetMatrixTranslation"

* Change all the angleToPlayer stuff to pitch/yaw

* Some RewardRomani functions

* Finish RewardRomani

* Finish Night1Romani and BarnRomani, >75% of functions done

* Some minor stuff

* Document bug

* Finish all of SilentRomani minus the Idle functions

* Finish EnInvadepoh_SilentRomani_Idle

* Finish Night3Cremia

* Finish Night3Romani

* Finish `EnInvadepoh_Ufo_SpawnSparkles`

* Finish some library functions

* Finish the alien pathing stuff

* Finish Romani path stuff

* Finish all non-InteractInfo stuff

* InteractInfo -> ModelInfo

* Create a `EnInvadepohFaceAnimBase` struct

* Name some of the animation data

* Switch to `Chained`/`ChainedDelay` and do some other cleanup

* Name all of the animation data

* Finish documenting and cleaning up the face animation functions

* Some comments at the top of the file

* Clean up forward declarations

* Clean some stuff up to the ModelInfo functions

* Fix build

* Move the animation data around so all the ModelInfo functions are adjacent

* Review

* Use `CLOCK_TIME_MINUTE` in `EnInvadepoh_Alien_PathComputeProgress`

* Respond to some of Anghelo's review

* Update comment on spawn time macros explaining what indices are usable

* Create a `DEATH_SCALE` define

* `WEEKEVENTREG_RECEIVED_MILK_BOTTLE` -> `WEEKEVENTREG_RECEIVED_ALIENS_BOTTLE`

* Forgot to do the bomber's notebook stuff too

* parallelogram -> rectangle

* Respond to engineer's review

* Slight spacing fix

---------

Co-authored-by: petrie911 <petrie911@users.noreply.github.com>
Co-authored-by: petrie911 <pmontag@Monday.localdomain>
Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-04-29 08:19:55 -07:00
Tom Overton 6126e72df3
Add original asset names to all `object_s*` files (#1619) 2024-04-29 07:50:30 -07:00
Anghelo Carvajal 666cb6ad4a
More header cleanup (#1604)
* low hanging fruits on variables.h

* z_actor functions

* Move RomFile to z64object.h

* Revert "z_actor functions"

This reverts commit aa99967d16.

* yeet

* z64actor_dlftbls.h

* Move object segment declarations to object_table.c

* Move Camera functions

* z64nmi_buff.h

* fix merge

* su_mtx.h, sys_cmpdma.h and sys_initial_check.h

* sys_ucode.h

* sys_flashrom.h

* Remove unnecessary includes

* z64kanfont.h

* flg_set.h

* z64DLF.h

* z64lifemeter.h

* z64path.h

* format

* ObjectOverlay

* bss

* Yeet ObjectOverlay

* review

* review

* format

* bss

* z64font.h
2024-04-25 18:16:47 -07:00
Tom Overton 654fc4fd74
More weekeventregs naming for things related to receiving items (#1617)
* More weekeventregs naming for things related to receiving items

* `WEEKEVENTREG_OBTAINED_GREAT_SPIN_ATTACK` -> `WEEKEVENTREG_RECEIVED_GREAT_SPIN_ATTACK`
2024-04-24 21:10:48 -07:00
Anghelo Carvajal 76fadbd0e9
`ovl_En_Door` docs pass (#1603)
* DoorScheduleResult

* actionVar

* DOOR_DL_

* enums

* ENDOOR_TYPE_SCHEDULE and related stuff

* Name some functions and start figuring out stuff

* defines

* start documenting schedules

* Name Inn doors

* More door schedule naming

* ajar

* Name remaining schedule types

* parameters diagram and some cleanups

* Name renaiming types

* format

* rename some schedules

* Use more static_assert

* name anims

* yeet unrelated stuff

* requestOpen

* Yeet DoorScheduleResult

* whoops

* stuff i missed

* Update src/overlays/actors/ovl_En_Door/scheduleScripts.schl

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Door/z_en_door.h

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Door/z_en_door.h

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* review

* Update src/overlays/actors/ovl_En_Pm/z_en_pm.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sub_s.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* review

* FindScheduleDoor

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2024-04-22 18:34:02 -07:00
Isghj 5143cc4d0d
update lifemeter functions.txt (#1616) 2024-04-22 18:17:14 -07:00
Tom Overton c88ed51f17
Name a lot of the weekeventregs for when the player receives a Heart Piece (#1615) 2024-04-22 08:59:34 -04:00
Derek Hensley 13e02518cd
Remove tailing comma from vscode json file (#1613) 2024-04-20 08:07:12 -04:00
Derek Hensley f36681d697
Jenkinsfile Hotfix: install GitPython for progress script (#1612) 2024-04-06 21:22:30 -07:00
Derek Hensley 68c7e46a6a
Hotfix progress script due to extracted change (#1611) 2024-04-06 19:18:29 -03:00
Derek Hensley 471d86f530
Build Sync (#1600)
* Rename outputs

* Makefile target renames

* Add run target

* yeet z64compress

* venv

* baserom_uncompressed -> baserom-decompressed

* input rom name to baserom.z64

* Add BUILD_DIR makefile variable

* Move built roms to build dir

* Move baserom to baseroms folder

* Add version to map file name

* Makefile cleanup

* Rename ldscript to include version

* Multiversion build

* n64-us version name

* Remove venv as dependency of setup

* Readme wording

* extract_baserom.py suggestion

* Readd checksums

* Make .venv work with windows

* missed an endif

* Cleaner windows venv implementation

* Remove duplciate process

* Build process steps

* Move make_options back

* Fix schedule build directory

* Fix schedule includes

* Makefile NON_MATCHING check -> != 0

* OOT 1704 changes

* Small cleanups

* Missed 1 thing

* UNSET -> SYMS

* Update extract_baserom.py

* dmadata.py

* Small cleanup

* dmadata_start

* Format

* dmadata files

* Fix makefile comment

* Jenkins report fix

* extracted dir

* Python dependencies order in readme
2024-04-06 11:07:58 -07:00
petrie911 45ae63ccc5
Obj_Mine matched (#1225)
* Obj_Mine

* Obj_Mine

* Fixups

* Nonmatchings + cleanup

* Small cleanup

* externs

* structs complete

* wew

* some docs. still baffling

* documented physics stuff

* docs. physics be wack

* forgot some things

* format

* more cleanup

* merge and such

* format

* more format and cleanup

* asm stuff

* Update src/overlays/actors/ovl_Obj_Mine/z_obj_mine.c

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>

* now with decomp.me

* removed some extraneous macros I didn't end up using

* fixes and formats

* merge

* my god, it matches

* format

* removed macros

* more fixes

* format

* format

---------

Co-authored-by: Maide <eeeedddccc@hotmail.co.uk>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: petrie911 <petrie911@users.noreply.github.com>
Co-authored-by: petrie911 <pmontag@Monday.localdomain>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
2024-04-06 10:40:41 -07:00
Derek Hensley e3ce14c932
Misc Clean (#1602)
* thiefbird

* eff_ss_dead

* PreRender_AntiAliasFilterPixel tmp -> invCvg

* Skin_InitAnimatedLimb

* gfxalloc

* loadfragment

* loadfragment strings
2024-04-06 10:23:06 -07:00
Jeff Padgham 47d43f2fa1
Mayor Dotour (ovl_en_dt) OK and documented (#1607)
* EnDt deecomp first pass, two nonmatching

* Some cleanup, got the big boy matching

* Some light cleanup, documenting blinking behaviour

* Fixed last non-matching with some permuter silliness

* Decompilation complete

* Mayor documentation, first pass

* Updating some unknown vars in baisen

* Added an enum for mayor's cutscene state

* Formatting pass for mayor

* Cleaning up unk var in mayor meeting method

* Some cleanup and changes based on PR feedback

* Another cleanup and fix pass based on PR feedback

* Updated mayor event flags according to their usage

* All the parentheses

* Another round of PR feedback cleanup

* Having another crack at naming/cleanup based on PR feedback

* Renaming animation symbols

* Fixing broken references in other actors from anim rename

---------

Co-authored-by: GinNoOokami <noreply>
2024-04-06 10:05:04 -07:00
Archez 0a65e85856
bg_breakwall: fix great bay storm dl (#1609) 2024-04-06 09:46:12 -07:00
Archez 9c56b0e57a
increase audio seq cmd list size (#1610) 2024-04-06 09:24:22 -07:00
Archez 7e9bdb202a
bg_hakugin_post: replace hardcoded size for sizeof (#1608) 2024-04-06 08:52:24 -07:00
Derek Hensley 250be53cde
Add Shift-JIS support for some voice and message files (#1500)
* z_message iconv

* voicecheckword iconv

* format

* TODO

* voice_external iconv

* Missed a few in message

* Use shiftjis_conv instead

* space comment in message_nes

* Use chars for cases

* Add ending single quote check as well

* table comments

* No look up table

* align makefile tools
2024-03-31 20:24:06 -07:00
Anghelo Carvajal 997c45c2d2
Introduce `z64pause_menu.h` header (#1505)
* z64pause_menu.h

* move functions and variables

* Move PauseMenuPage

* move stuff that seems public to the new header

* KALEIDO_OVL_MAX

* bss

* review

* IS_PAUSED

* format

* add argument to pause macros

* Update include/z64pause_menu.h

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>

* bss

* More IS_PAUSED I missed

* early returns

* bss

* empty commit to trigger GHA

* bss

* bss

* bss

* includes

* bss

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2024-03-31 20:05:02 -07:00
engineer124 5bef89a6ff
Misc Cleanup 2 (#1521)
* begin cleanup

* more cleanup

* more cleanup

* more cleanup

* more cleanup

* more cleanup

* fake matches

* more cleanup

* more cleanup

* small thing

* PR Review

* PR Review
2024-03-23 08:04:07 -03:00
Derek Hensley a7fa8cc241
Clean2 (#1605)
* AnimationContext_Update

* TransitionTile_InitGraphics

* disasm files

* gPlayerFormItemRestrictions -> code_8012EC80

* fix

* Extract gCircleTex

* Const fixes

* gPlayerFormItemRestrictions suggestions

* Setup_InitRegs

* z_inventory
2024-02-20 14:04:23 +11:00
Anghelo Carvajal 3b8db093f6
Fix disasm.py (#1606)
* Fix disasm.py from doing the wrong thing

* Update requirements.txt
2024-02-20 09:41:36 +11:00
engineer124 eb577e29e4
Introduce More Audio Headers (#1515)
* 4 audio headers

* local first

* PR Review, more cleanup

* more cleanup

* fix bss

* PR Review

* PR Suggestions
2024-02-08 14:36:11 -03:00
Tharo 7e716e120f
ovl_En_Kitan (#1535)
* Decompiled

* Documented

* Suggested changes, mention that on debug there is an assert(false) in EnKitan_GetQuestionMessageId

* Format

* Update
2024-02-07 10:21:54 -03:00