Commit Graph

670 Commits

Author SHA1 Message Date
Reonu
74730e7852 Simplified lives defines (#439)
* Combined ENABLE_LIVES and DEFAULT_NUM_LIVES, and removed SAVE_NUM_LIVES

* removed commented out lines

* numLives no longer modified by default when lives are disabled

This allows for the variable to be repurposed more easily

* Remove SAVE_NUM_LIVES define

* Remove SAVE_NUM_LIVES and DISABLE_LIVES define (Take 2)

* Apply MAX_NUM_LIVES and MAX_NUM_COINS to update_hud_values()

Co-authored-by: gheskett <gheskett@gmail.com>
2022-09-30 09:52:22 +13:00
thecozies
1ef73290d9 Added WORLDSPACE_LIGHTING define (#461)
Co-authored-by: Gregory Heskett <gheskett@gmail.com>
2022-09-30 09:50:49 +13:00
Arceveti
ebf19af70e Clean up a bit of code in file_select.c, fixing copy menu buttons not properly getting deleted when switching pages. 2022-09-28 21:49:25 -04:00
Gregory Heskett
8864e5f3a2 Revert "Implemented native Gamecube controller support and corresponding emulator hint in ROM header (#408)" (#494)
This reverts commit 4dfb8d9a64.
2022-09-22 07:30:02 -04:00
Mr-Wiseguy
4dfb8d9a64 Implemented native Gamecube controller support and corresponding emulator hint in ROM header (#408)
* Implemented native Gamecube controller support and corresponding emulator hint in ROM header

* Added X and Y buttons to VALID_BUTTONS in sm64.h

* Added workaround in controller type detection for mupen bug

* read GC controllers from port 2

* L to Z logic for GC controller uses a threshold

* Changed threshold for L trig to around 33%

Changed threshold based on feedback

* Added gGamecubeControllerPort

* fixed wrong check

Co-authored-by: Reonu <danileon95@gmail.com>
2022-09-21 21:30:36 -05:00
someone2639
6dbe379990 remove warnings from rnc1/2 files (#468)
Co-authored-by: someone2639 <someone2639@gmail.com>
2022-09-21 20:42:38 -05:00
thecozies
de34eb3b84 Remove redundant s2d directory and delete unused files/defines (#457) 2022-09-21 20:18:37 -05:00
someone2639
2e701ad9e7 add error macro that will always fire (#492)
* add error macro that will always fire

* add an aggress macro

like an assert macro but more aggressive and independent of DEBUG being defined (gives us 3 crash reporting options)

Co-authored-by: someone2639 <someone2639@gmail.com>
2022-09-21 20:03:24 -05:00
thecozies
c09f178df0 reverted geo bone (#474) 2022-09-21 19:14:12 -05:00
Tubular Bells
d5019ffd78 Clean up remaining DISABLE_LEVEL_CHECKS ifndefs (#479) 2022-09-21 19:13:19 -05:00
Arceveti
058399308a Fix inverted null check in obj_get_model_id (#484) 2022-09-21 19:10:41 -05:00
Gregory Heskett
c0e00beaf7 Sound effect tables now support up to 255 sounds instead of 128 (#465) 2022-09-21 18:51:31 -05:00
Tubular Bells
1af9f2b94a Restores dither effect on teleport (#476) 2022-09-21 18:49:23 -05:00
Tubular Bells
ac45e70e5c Restored exit course sound effect functionality independent of vanilla level check. (#475)
May be worth revisiting in the future to address the fact the exit course warp node will always trigger this sound effect, even when shared with other warps. Would potentially also be nice to add an option for using this sound effect with 0xF3 floor warps.
2022-09-21 18:29:00 -05:00
Gregory Heskett
aa5df070c0 Add define for using JP red coin sound (#489) 2022-09-21 11:58:25 -04:00
Arceveti
3149239b9a Clean up gotos from find_wall_collisions_from_list (#288) 2022-07-22 08:58:17 -05:00
thecozies
a3e831d160 Merge pull request #456 from HackerN64/master
Merge master into 2.1.0
2022-07-19 12:22:10 -05:00
Reonu
5b7b0ab8d6 moved CASTLE_MUSIC_FIX into level specific checks (#437) 2022-07-19 08:34:00 -05:00
Reonu
5a9b5a9751 Mat Stack Fix
* Implemented new lightweight CPU/RDP profiler
* Added RSP profiling to the lightweight profiler
* Added CPU audio to lightweight profiler
* Changed lingering manual light struct definitions to gdSPDefLights1, made a dummy light for Koopa's pink shorts
* Ran script to convert all light commands to lightcolor commands
* Added define guards for the profiler
* Wrote function for setting up global light direction in the frame
* Moved camera matrix into projection stack
* Corrected cameraToObject for the new matrix stack (fixes culling and sound)
* Fixed billboarding with new matrix stack
* Fixed shadows with new matrix stack
* Fixed some areas where the game was previously extracting the camera matrix from various matrices
* Restored vanilla light and env map directions under new matrix stack
* Fix goddard crash
* Fix geo_process_level_of_detail
* Remove 'construct_float' from 'geo_process_level_of_detail'
* Removed some accidentally added files
* Removed unnecessary matrix multiplications in geo_process_object
* Added fixlights script to build system for fixing custom assets and added option to disable it if needed
* Fixed visual debug with new matstack and cleaned up visual debug code
* Fixed handling of WORLD_SCALE in view matrix so it doesn't get cancelled out
* Fixed clip planes not scaling based on WORLD_SCALE

Co-authored-by: Mr-Wiseguy <mrwiseguyromhacking@gmail.com>
Co-authored-by: Arceveti <arceveti@gmail.com>
Co-authored-by: thecozies <collinpferguson@gmail.com>
2022-07-19 08:04:54 -05:00
arthurtilly
1820b146c0 Fixed memory leak between areas from automatic surface pool size (#452)
* fixed mem leak

* Add comment to second pop
2022-07-19 06:24:16 -05:00
thecozies
f4b13d474a Merge pull request #431 from gheskett/gcc10-compiler-warning
Suppress a gcc10 compiler warning for uninitialized variable
2022-07-19 06:19:25 -05:00
Fazana
f6bb8b5aab Clear only used dynamic cells (#451)
Clear only used dynamic cells
2022-07-18 21:22:22 -05:00
gheskett
8698cc0f89 Bugfix: patch_audio_bank crash (hopefully) resolved for good 2022-07-15 00:25:18 -04:00
arthurtilly
b864e0d6da Adjust the static surface pool's size automatically per level and add static object collision (#444) 2022-07-05 22:27:23 -04:00
gheskett
6f6c055f1c Suppress a gcc10 compiler warning for uninitialized variable 2022-06-29 00:17:04 -04:00