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.

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

Update common_data.h and main.cpp #174

Merged
merged 4 commits into from
Feb 24, 2021
Merged

Update common_data.h and main.cpp #174

merged 4 commits into from
Feb 24, 2021

Conversation

PhlexPlexico
Copy link
Contributor

Some more decomp'd things like the RespawnData.

Increased assert size due to the fact that sub13s[8] contains respawn data.

Created RespawnData struct.

Found some BitFields that indicate counters for items.

Found bitfiled for sword and shield.

Include enums for sword and shield.

I mean, it built with no errors so I hope it's okay!

Some more decomp'd things like the RespawnData.

Increased assert size due to the fact that sub13s[8]  contains respawn data.

Created RespawnData struct.

Found some BitFields that indicate counters for items.

Found bitfiled for sword and shield.

Include enums for sword and shield.
source/game/common_data.h Outdated Show resolved Hide resolved
source/game/common_data.h Outdated Show resolved Hide resolved
source/game/common_data.h Outdated Show resolved Hide resolved
source/game/common_data.h Outdated Show resolved Hide resolved
source/game/common_data.h Outdated Show resolved Hide resolved
Update raw to u32.

Collect Register didn't change in main?
@leoetlino leoetlino merged commit 5018d63 into leoetlino:master Feb 24, 2021
PhlexPlexico pushed a commit to PhlexPlexico/project-restoration that referenced this pull request Aug 4, 2021
rst: Move custom message logic out of game/

Remove more extern "C"

game: Fix GlobalContext pause flag definition

New field definitions in player.h and actor.h.

Some have a few explanations as to what they really mean as well.

Update boss lines to ztarget_pos

Update common_data.h and main.cpp (leoetlino#174)

* Update common_data.h and main.cpp

Some more decomp'd things like the RespawnData.

Increased assert size due to the fact that sub13s[8]  contains respawn data.

Created RespawnData struct.

Found some BitFields that indicate counters for items.

Found bitfiled for sword and shield.

Include enums for sword and shield.

* Keep naming convention.

* Remove extra value in sub13s.

Update raw to u32.

Collect Register didn't change in main?

* Remove old BitField.

Update more structs in player.h and common_data.h (leoetlino#176)

* Update common_data.h and main.cpp

Some more decomp'd things like the RespawnData.

Increased assert size due to the fact that sub13s[8]  contains respawn data.

Created RespawnData struct.

Found some BitFields that indicate counters for items.

Found bitfiled for sword and shield.

Include enums for sword and shield.

* Keep naming convention.

* Remove extra value in sub13s.

Update raw to u32.

Collect Register didn't change in main?

* Remove old BitField.

* Update inventory registers.

* Include more common_data changes.

Include player changes.

game: Add memory allocator structures

game: Update player struct to add PlayerUtils

Update common_data.h and main.cpp

Some more decomp'd things like the RespawnData.

Increased assert size due to the fact that sub13s[8]  contains respawn data.

Created RespawnData struct.

Found some BitFields that indicate counters for items.

Found bitfiled for sword and shield.

Include enums for sword and shield.

Keep naming convention.

Remove extra value in sub13s.

Update raw to u32.

Collect Register didn't change in main?

Remove old BitField.

Update inventory registers.

Include more common_data changes.

Include player changes.

Update common_data struct.

Include rupee accumulator  and bottle contents array.

Change casing.

Update Common Data (leoetlino#187)

Implement ISG (leoetlino#188)

I saw this feature being asked for by a few people. Since it shouldn't directly interfere with gameplay, unless specifically activated (pickup item while shielding and swinging). I've checked both on patched and non-patched versions of the game to see if this implementation works, and they both had the same expected behaviour (8 slashes with kokiri sword to kill Gibdos). It appears that this implementation should not impact any regular game play.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants