Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bomb Arrows #10

Open
wants to merge 45 commits into
base: develop
Choose a base branch
from
Open

Bomb Arrows #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
509985f
Bomb Arrows
lilDavid Dec 14, 2023
f4a22ce
Bomb arrows: Improvements and fixes
lilDavid Dec 14, 2023
df01a29
Bomb Arrows: Add enhancement checkbutton
lilDavid Dec 14, 2023
e6d84e2
Fix z_en_bom.h include capitalization
lilDavid Dec 21, 2023
ed831a8
Duplicate function in z_en_bom.c to remove implicit declaration
lilDavid Dec 21, 2023
0d0d59f
Fix broken messages
lilDavid Dec 21, 2023
426efee
Fix broken custom messages
lilDavid Dec 21, 2023
d3f7e6d
Fix Forest Medallion message box texture
lilDavid Dec 23, 2023
fa8a0e2
[Rando] Fix Check Tracker Area Totals (#3758)
Malkierian Dec 31, 2023
96abadd
Update Boost download URL (#3776)
xoascf Dec 31, 2023
6cb3a83
Restore previous Boost download URL (#3809)
xoascf Jan 5, 2024
37b2fc0
Make noclip only effect player (#3788)
garrettjoecox Jan 6, 2024
02938cf
Fix Starting Triforce Piece Count (#3797)
Malkierian Jan 6, 2024
321c258
Fix Fire Temple Boss Door Logic (#3774)
inspectredc Jan 6, 2024
2179636
Use temporary mirror for Boost download URL (#3822)
xoascf Jan 8, 2024
8426cc9
Fix: Tektite texture not loading for death animation (#3808)
Archez Jan 15, 2024
861bd09
Adds a log statement to show the SoH version at startup, in case cras…
Malkierian Jan 15, 2024
db02870
Restore Original Scene Command Object List Behaviour (MacReady) (#3827)
inspectredc Jan 15, 2024
1da1b1a
Tweak: Improve pause menu dungeon map performance (#3773)
Archez Jan 15, 2024
dd5d808
Revert actor uncullZone related checks back to match decomp (#3828)
inspectredc Jan 15, 2024
63cf361
Fix: Move Ruto earring fix to graphic patch and fix Ganon fight rubbl…
Archez Jan 15, 2024
cb82e77
fix bombchu logic bugs (#3720)
Pepper0ni Feb 2, 2024
e3825ec
Unify defaults for reward count sliders with Greg As Reward so they n…
Malkierian Feb 2, 2024
7ef6a43
fix timestamp truncation (#3874)
Archez Feb 2, 2024
16ee20c
Renames Freecam to Free Look. (#3771)
Malkierian Feb 2, 2024
61cf2bd
No Magic Numbers for Preset Location Exclusions (#3801)
Malkierian Feb 2, 2024
2529dc5
Increase Door Cull range (#3888)
inspectredc Feb 2, 2024
bb1078e
Account for removed object dependency in Deku Scrub Leader (#3878)
Rozelette Feb 2, 2024
107a365
Add safety measure to Scene_CommandObjectList to prevent crash (#3904)
inspectredc Feb 16, 2024
11a0a00
Add `CVarClear` to appropriate sections of randomizer Locations and T…
Malkierian Feb 16, 2024
43fed2d
ci: pin switch docker image to known working version (#3917)
briaguya-ai Feb 16, 2024
0cb4cd1
Adds reset function to z_en_si (GS Token) to set getItemId to vanilla…
Malkierian Feb 16, 2024
3d3b8bf
Allow IsSaveLoaded to consider debug saves (#3929)
Archez Feb 16, 2024
cf6101f
Logic bug: child cannot climb forest temple to the straight hallway e…
Pepper0ni Feb 16, 2024
30a063b
[Tweak] Move Personal Notes to Save File (#3909)
Malkierian Feb 16, 2024
19af448
fix object unload using wrong index (#3949)
Archez Feb 20, 2024
ef9fc0a
fix endianess issue with camera setting data (#3950)
Archez Feb 20, 2024
ea1ffdd
Adds messageboxes to `no_ui` handling so they don't show if you have …
Malkierian Feb 29, 2024
358dd47
remove zapd extraction from mac launch script (#3981)
Archez Feb 29, 2024
b26f2b2
[UX Improvement] Catch save loading errors and notify user (#3979)
Malkierian Feb 29, 2024
fb6ea42
prevent remember save location in dungeons/boss rooms (#3983)
Archez Feb 29, 2024
ed9cb1d
Fix CVar evaluation for scummed checks being hidden. (#3985)
Malkierian Feb 29, 2024
368a901
Add Unix timestamp to renamed corrupted file to prevent trying to cop…
Malkierian Feb 29, 2024
612da02
Bump version to MacReady Foxtrot 8.0.5 (#3982)
garrettjoecox Feb 29, 2024
d23c0ba
Merge tag 'tags/8.0.5' into bomb_arrow
lilDavid May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/generate-builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ jobs:
needs: generate-soh-otr
runs-on: ${{ (vars.LINUX_RUNNER && fromJSON(vars.LINUX_RUNNER)) || 'ubuntu-latest' }}
container:
image: devkitpro/devkita64:latest
image: devkitpro/devkita64:20240120
steps:
- name: Install dependencies
run: |
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")

set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")

project(Ship VERSION 8.0.4 LANGUAGES C CXX)
set(PROJECT_BUILD_NAME "MacReady Echo" CACHE STRING "")
project(Ship VERSION 8.0.5 LANGUAGES C CXX)
set(PROJECT_BUILD_NAME "MacReady Foxtrot" CACHE STRING "")
set(PROJECT_TEAM "github.com/harbourmasters" CACHE STRING "")

set_property(DIRECTORY ${CMAKE_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT soh)
Expand Down
2 changes: 1 addition & 1 deletion libultraship
Open in desktop
Submodule libultraship updated 3 files
+4 −4 src/graphic/Fast3D/gfx_metal.cpp
+9 −1 src/graphic/Fast3D/gfx_pc.cpp
+2 −0 src/graphic/Fast3D/gfx_pc.h
2 changes: 1 addition & 1 deletion soh/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ endif()
include(FetchContent)
FetchContent_Declare(
Boost
URL https://boostorg.jfrog.io/artifactory/main/release/1.81.0/source/boost_1_81_0.tar.gz
URL https://archives.boost.io/release/1.81.0/source/boost_1_81_0.tar.gz
URL_HASH SHA256=205666dea9f6a7cfed87c7a6dfbeb52a2c1b9de55712c9c1a87735d7181452b6
SOURCE_SUBDIR "null" # Set to a nonexistent directory so boost is not built (we don't need to build it)
DOWNLOAD_EXTRACT_TIMESTAMP false # supress timestamp warning, not needed since the url wont change
Expand Down
2 changes: 1 addition & 1 deletion soh/include/variables.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ extern "C"
extern u16 gUpgradeCapacities[8][4];
extern u32 gGsFlagsMasks[4];
extern u32 gGsFlagsShifts[4];
extern void* gItemIcons[0x82];
extern void* gItemIcons[0x83];
extern u8 gItemAgeReqs[];
extern u8 gSlotAgeReqs[];
extern u8 gItemSlots[56];
Expand Down
5 changes: 4 additions & 1 deletion soh/include/z64.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,6 @@ typedef struct {
/* 0x0134 */ char** doActionSegment;
/* 0x0138 */ u8* iconItemSegment;
/* 0x013C */ char** mapSegment;
char** mapSegmentName;
/* 0x0140 */ u8 mapPalette[32];
/* 0x0160 */ DmaRequest dmaRequest_160;
/* 0x0180 */ DmaRequest dmaRequest_180;
Expand Down Expand Up @@ -815,6 +814,10 @@ typedef struct {
/* 0x026C */ u8 dinsNayrus; // "m_magic"; din's fire and nayru's love
/* 0x026D */ u8 all; // "another"; enables all item restrictions
} restrictions;
// #region SOH [General]
/* */ char* mapSegmentName[2]; // Tracks the map segment texture by OTR sig name
/* */ u8 mapPalettesPulse[40][32]; // Used to have unique pointers per map pulse color for the shader backend. 40 for map pulse timer x2
// #endregion
} InterfaceContext; // size = 0x270

typedef struct {
Expand Down
171 changes: 86 additions & 85 deletions soh/include/z64item.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,91 +221,92 @@ typedef enum {
/* 0x44 */ ITEM_BOOTS_KOKIRI,
/* 0x45 */ ITEM_BOOTS_IRON,
/* 0x46 */ ITEM_BOOTS_HOVER,
/* 0x47 */ ITEM_BULLET_BAG_30,
/* 0x48 */ ITEM_BULLET_BAG_40,
/* 0x49 */ ITEM_BULLET_BAG_50,
/* 0x4A */ ITEM_QUIVER_30,
/* 0x4B */ ITEM_QUIVER_40,
/* 0x4C */ ITEM_QUIVER_50,
/* 0x4D */ ITEM_BOMB_BAG_20,
/* 0x4E */ ITEM_BOMB_BAG_30,
/* 0x4F */ ITEM_BOMB_BAG_40,
/* 0x50 */ ITEM_BRACELET,
/* 0x51 */ ITEM_GAUNTLETS_SILVER,
/* 0x52 */ ITEM_GAUNTLETS_GOLD,
/* 0x53 */ ITEM_SCALE_SILVER,
/* 0x54 */ ITEM_SCALE_GOLDEN,
/* 0x55 */ ITEM_SWORD_KNIFE,
/* 0x56 */ ITEM_WALLET_ADULT,
/* 0x57 */ ITEM_WALLET_GIANT,
/* 0x58 */ ITEM_SEEDS,
/* 0x59 */ ITEM_FISHING_POLE,
/* 0x5A */ ITEM_SONG_MINUET,
/* 0x5B */ ITEM_SONG_BOLERO,
/* 0x5C */ ITEM_SONG_SERENADE,
/* 0x5D */ ITEM_SONG_REQUIEM,
/* 0x5E */ ITEM_SONG_NOCTURNE,
/* 0x5F */ ITEM_SONG_PRELUDE,
/* 0x60 */ ITEM_SONG_LULLABY,
/* 0x61 */ ITEM_SONG_EPONA,
/* 0x62 */ ITEM_SONG_SARIA,
/* 0x63 */ ITEM_SONG_SUN,
/* 0x64 */ ITEM_SONG_TIME,
/* 0x65 */ ITEM_SONG_STORMS,
/* 0x66 */ ITEM_MEDALLION_FOREST,
/* 0x67 */ ITEM_MEDALLION_FIRE,
/* 0x68 */ ITEM_MEDALLION_WATER,
/* 0x69 */ ITEM_MEDALLION_SPIRIT,
/* 0x6A */ ITEM_MEDALLION_SHADOW,
/* 0x6B */ ITEM_MEDALLION_LIGHT,
/* 0x6C */ ITEM_KOKIRI_EMERALD,
/* 0x6D */ ITEM_GORON_RUBY,
/* 0x6E */ ITEM_ZORA_SAPPHIRE,
/* 0x6F */ ITEM_STONE_OF_AGONY,
/* 0x70 */ ITEM_GERUDO_CARD,
/* 0x71 */ ITEM_SKULL_TOKEN,
/* 0x72 */ ITEM_HEART_CONTAINER,
/* 0x73 */ ITEM_HEART_PIECE,
/* 0x74 */ ITEM_KEY_BOSS,
/* 0x75 */ ITEM_COMPASS,
/* 0x76 */ ITEM_DUNGEON_MAP,
/* 0x77 */ ITEM_KEY_SMALL,
/* 0x78 */ ITEM_MAGIC_SMALL,
/* 0x79 */ ITEM_MAGIC_LARGE,
/* 0x7A */ ITEM_HEART_PIECE_2,
/* 0x7B */ ITEM_SINGLE_MAGIC,
/* 0x7C */ ITEM_DOUBLE_MAGIC,
/* 0x7D */ ITEM_DOUBLE_DEFENSE,
/* 0x7E */ ITEM_INVALID_4,
/* 0x7F */ ITEM_INVALID_5,
/* 0x80 */ ITEM_INVALID_6,
/* 0x81 */ ITEM_INVALID_7,
/* 0x82 */ ITEM_MILK,
/* 0x83 */ ITEM_HEART,
/* 0x84 */ ITEM_RUPEE_GREEN,
/* 0x85 */ ITEM_RUPEE_BLUE,
/* 0x86 */ ITEM_RUPEE_RED,
/* 0x87 */ ITEM_RUPEE_PURPLE,
/* 0x88 */ ITEM_RUPEE_GOLD,
/* 0x89 */ ITEM_INVALID_8,
/* 0x8A */ ITEM_STICKS_5,
/* 0x8B */ ITEM_STICKS_10,
/* 0x8C */ ITEM_NUTS_5,
/* 0x8D */ ITEM_NUTS_10,
/* 0x8E */ ITEM_BOMBS_5,
/* 0x8F */ ITEM_BOMBS_10,
/* 0x90 */ ITEM_BOMBS_20,
/* 0x91 */ ITEM_BOMBS_30,
/* 0x92 */ ITEM_ARROWS_SMALL,
/* 0x93 */ ITEM_ARROWS_MEDIUM,
/* 0x94 */ ITEM_ARROWS_LARGE,
/* 0x95 */ ITEM_SEEDS_30,
/* 0x96 */ ITEM_BOMBCHUS_5,
/* 0x97 */ ITEM_BOMBCHUS_20,
/* 0x98 */ ITEM_STICK_UPGRADE_20,
/* 0x99 */ ITEM_STICK_UPGRADE_30,
/* 0x9A */ ITEM_NUT_UPGRADE_30,
/* 0x9B */ ITEM_NUT_UPGRADE_40,
ITEM_BOW_ARROW_BOMB,
/* 0x48 */ ITEM_BULLET_BAG_30,
/* 0x49 */ ITEM_BULLET_BAG_40,
/* 0x4a */ ITEM_BULLET_BAG_50,
/* 0x4B */ ITEM_QUIVER_30,
/* 0x4C */ ITEM_QUIVER_40,
/* 0x4D */ ITEM_QUIVER_50,
/* 0x4E */ ITEM_BOMB_BAG_20,
/* 0x4F */ ITEM_BOMB_BAG_30,
/* 0x50 */ ITEM_BOMB_BAG_40,
/* 0x51 */ ITEM_BRACELET,
/* 0x52 */ ITEM_GAUNTLETS_SILVER,
/* 0x53 */ ITEM_GAUNTLETS_GOLD,
/* 0x54 */ ITEM_SCALE_SILVER,
/* 0x55 */ ITEM_SCALE_GOLDEN,
/* 0x56 */ ITEM_SWORD_KNIFE,
/* 0x57 */ ITEM_WALLET_ADULT,
/* 0x58 */ ITEM_WALLET_GIANT,
/* 0x59 */ ITEM_SEEDS,
/* 0x5a */ ITEM_FISHING_POLE,
/* 0x5B */ ITEM_SONG_MINUET,
/* 0x5C */ ITEM_SONG_BOLERO,
/* 0x5D */ ITEM_SONG_SERENADE,
/* 0x5E */ ITEM_SONG_REQUIEM,
/* 0x5F */ ITEM_SONG_NOCTURNE,
/* 0x60 */ ITEM_SONG_PRELUDE,
/* 0x61 */ ITEM_SONG_LULLABY,
/* 0x62 */ ITEM_SONG_EPONA,
/* 0x63 */ ITEM_SONG_SARIA,
/* 0x64 */ ITEM_SONG_SUN,
/* 0x65 */ ITEM_SONG_TIME,
/* 0x66 */ ITEM_SONG_STORMS,
/* 0x67 */ ITEM_MEDALLION_FOREST,
/* 0x68 */ ITEM_MEDALLION_FIRE,
/* 0x69 */ ITEM_MEDALLION_WATER,
/* 0x6a */ ITEM_MEDALLION_SPIRIT,
/* 0x6B */ ITEM_MEDALLION_SHADOW,
/* 0x6C */ ITEM_MEDALLION_LIGHT,
/* 0x6D */ ITEM_KOKIRI_EMERALD,
/* 0x6E */ ITEM_GORON_RUBY,
/* 0x6F */ ITEM_ZORA_SAPPHIRE,
/* 0x70 */ ITEM_STONE_OF_AGONY,
/* 0x71 */ ITEM_GERUDO_CARD,
/* 0x72 */ ITEM_SKULL_TOKEN,
/* 0x73 */ ITEM_HEART_CONTAINER,
/* 0x74 */ ITEM_HEART_PIECE,
/* 0x75 */ ITEM_KEY_BOSS,
/* 0x76 */ ITEM_COMPASS,
/* 0x77 */ ITEM_DUNGEON_MAP,
/* 0x78 */ ITEM_KEY_SMALL,
/* 0x79 */ ITEM_MAGIC_SMALL,
/* 0x7a */ ITEM_MAGIC_LARGE,
/* 0x7B */ ITEM_HEART_PIECE_2,
/* 0x7C */ ITEM_SINGLE_MAGIC,
/* 0x7D */ ITEM_DOUBLE_MAGIC,
/* 0x7E */ ITEM_DOUBLE_DEFENSE,
/* 0x7F */ ITEM_INVALID_4,
/* 0x80 */ ITEM_INVALID_5,
/* 0x81 */ ITEM_INVALID_6,
/* 0x82 */ ITEM_INVALID_7,
/* 0x83 */ ITEM_MILK,
/* 0x84 */ ITEM_HEART,
/* 0x85 */ ITEM_RUPEE_GREEN,
/* 0x86 */ ITEM_RUPEE_BLUE,
/* 0x87 */ ITEM_RUPEE_RED,
/* 0x88 */ ITEM_RUPEE_PURPLE,
/* 0x89 */ ITEM_RUPEE_GOLD,
/* 0x8a */ ITEM_INVALID_8,
/* 0x8B */ ITEM_STICKS_5,
/* 0x8C */ ITEM_STICKS_10,
/* 0x8D */ ITEM_NUTS_5,
/* 0x8E */ ITEM_NUTS_10,
/* 0x8F */ ITEM_BOMBS_5,
/* 0x90 */ ITEM_BOMBS_10,
/* 0x91 */ ITEM_BOMBS_20,
/* 0x92 */ ITEM_BOMBS_30,
/* 0x93 */ ITEM_ARROWS_SMALL,
/* 0x94 */ ITEM_ARROWS_MEDIUM,
/* 0x95 */ ITEM_ARROWS_LARGE,
/* 0x96 */ ITEM_SEEDS_30,
/* 0x97 */ ITEM_BOMBCHUS_5,
/* 0x98 */ ITEM_BOMBCHUS_20,
/* 0x99 */ ITEM_STICK_UPGRADE_20,
/* 0x9a */ ITEM_STICK_UPGRADE_30,
/* 0x9B */ ITEM_NUT_UPGRADE_30,
/* 0x9C */ ITEM_NUT_UPGRADE_40,
/* 0xFC */ ITEM_LAST_USED = 0xFC,
/* 0xFE */ ITEM_NONE_FE = 0xFE,
/* 0xFF */ ITEM_NONE = 0xFF
Expand Down
8 changes: 4 additions & 4 deletions soh/include/z64player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ typedef enum {
/* 0x09 */ PLAYER_IA_BOW_FIRE,
/* 0x0A */ PLAYER_IA_BOW_ICE,
/* 0x0B */ PLAYER_IA_BOW_LIGHT,
/* 0x0C */ PLAYER_IA_BOW_0C,
/* 0x0C */ PLAYER_IA_BOW_BOMB,
/* 0x0D */ PLAYER_IA_BOW_0D,
/* 0x0E */ PLAYER_IA_BOW_0E,
/* 0x0F */ PLAYER_IA_SLINGSHOT,
Expand Down Expand Up @@ -426,14 +426,14 @@ typedef struct {
#define PLAYER_STATE1_ENEMY_TARGET (1 << 4)
#define PLAYER_STATE1_INPUT_DISABLED (1 << 5)
#define PLAYER_STATE1_TEXT_ON_SCREEN (1 << 6)
#define PLAYER_STATE1_DEAD (1 << 7)
#define PLAYER_STATE1_DEAD (1 << 7)
#define PLAYER_STATE1_START_PUTAWAY (1 << 8)
#define PLAYER_STATE1_READY_TO_FIRE (1 << 9)
#define PLAYER_STATE1_GETTING_ITEM (1 << 10)
#define PLAYER_STATE1_ITEM_OVER_HEAD (1 << 11)
#define PLAYER_STATE1_CHARGING_SPIN_ATTACK (1 << 12)
#define PLAYER_STATE1_HANGING_OFF_LEDGE (1 << 13)
#define PLAYER_STATE1_CLIMBING_LEDGE (1 << 14)
#define PLAYER_STATE1_CLIMBING_LEDGE (1 << 14)
#define PLAYER_STATE1_TARGETING (1 << 15)
#define PLAYER_STATE1_TARGET_LOCKED (1 << 16)
#define PLAYER_STATE1_TARGET_NOTHING (1 << 17)
Expand Down Expand Up @@ -490,7 +490,7 @@ typedef struct {
#define PLAYER_STATE3_PAUSE_ACTION_FUNC (1 << 2)
#define PLAYER_STATE3_FINISHED_ATTACKING (1 << 3)
#define PLAYER_STATE3_CHECK_FLOOR_WATER_COLLISION (1 << 4)
#define PLAYER_STATE3_FORCE_PULL_OCARINA (1 << 5)
#define PLAYER_STATE3_FORCE_PULL_OCARINA (1 << 5)
#define PLAYER_STATE3_RESTORE_NAYRUS_LOVE (1 << 6) // Set by ocarina effects actors when destroyed to signal Nayru's Love may be restored (see `ACTOROVL_ALLOC_ABSOLUTE`)
#define PLAYER_STATE3_HOOKSHOT_TRAVELLING (1 << 7) //Travelling to target

Expand Down
Loading
Loading