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

Jump to bottom

z_map decompiled #1032

Merged
merged 56 commits into from
Jun 21, 2024
Merged

z_map decompiled #1032

merged 56 commits into from
Jun 21, 2024

Conversation

mzxrules
Copy link
Contributor

No description provided.

@mzxrules
First batch of functions
31f40ad
@mzxrules
more ok
7769846
@mzxrules
Merge remote-tracking branch 'upstream/master' into z_map_
0b99719
@mzxrules
z_map_data OK
30465e1
@mzxrules
More OKs, MinimapList ZAPD breaking change
2ac9fe4
@mzxrules
func_80103A58 improvements, more OK
bbdf16e
@mzxrules
Merge remote-tracking branch 'upstream/master' into z_map_
4ae7b95
@mzxrules
func_80106D5C and func_801091F0 decomped
90d82ee
@mzxrules
func_801031D0 decomped and some fixes
5c616b9
@mzxrules
house cleaning, more OKs more decomp
723c82c
@mzxrules
Merge remote-tracking branch 'upstream/master' into z_map_
e5c6aac
@mzxrules
Even more OKs
cdabbfd
@mzxrules
func_80105C40 almost OK, more OKs
5ece255
@mzxrules
func_80108AF8 OK and more
7879695
@mzxrules
All functions attempted
e71c8e6
@mzxrules
func_8010534C OK
30b83c1
@mzxrules
Start documentation, rename DoorCtx
64bced7
@mzxrules
More OKs, split map_data.data, more doc
1da0fa1
@mzxrules
incremental clean-up, more function names
a65750c
@mzxrules
more function names
b78ac55
@mzxrules
Merge remote-tracking branch 'origin/master' into z_map_
49492b6
@AngheloAlf
Copy link
Collaborator

This PR is still in draft. What is it waiting for?

@mzxrules
Copy link
Contributor Author

mzxrules commented Oct 2, 2022 •
edited
Loading

Was working on documentation before I ran out of steam.

  1. Need ZAPD changes to fix an incorrectly extracted type: MM Minimap Type changes needed NEstelami/ZAPD#254
  2. Need tooling to extract textures from yaz "archive" files to make it easier to continue the documentation process. @Thar0 said he did some work on this front so I haven't rolled my own solution just yet, but I imagine it'd need it's own ZAPD changes as well.
  3. I need to move the bit at the end of z64map.h into the proper locations

@hensldm hensldm added the Waiting-for-author Author needs fix to conflicts or address reviews label Oct 16, 2022
@hensldm hensldm mentioned this pull request Dec 31, 2022
Merged
AngheloAlf
AngheloAlf reviewed May 15, 2024
View reviewed changes
include/gDPLoadTextureBlock_Runtime.inc.c Outdated Show resolved Hide resolved
include/z64map.h

#define FLOOR_INDEX_MAX 4
#define FLOOR_MIN_Y -32767
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks nicer

Suggested change
#define FLOOR_MIN_Y -32767
#define FLOOR_MIN_Y -0x7FFF

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer keep coordinates stored in decimal, to stay consistent with e.g. z64bgcheck.h

include/z64map.h Outdated Show resolved Hide resolved
src/overlays/actors/ovl_Door_Shutter/z_door_shutter.h Outdated Show resolved Hide resolved
src/code/z_map_exp.c Outdated
* Test if the current scene is in a set of overworld scenes.
* @return -1 if not in the set, else returns the mapIndex of the overworld scene
*/
s32 Map_GetUnkOverworldAreaIndex(PlayState* play) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bump

src/code/z_map_disp.c Outdated Show resolved Hide resolved
src/code/z_map_disp.c Outdated Show resolved Hide resolved
hensldm
hensldm approved these changes May 15, 2024
View reviewed changes
Copy link
Collaborator

@hensldm hensldm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree with Anghelo's comment as well, but nothing new to add so going to approve.

include/gDPLoadTextureBlock_Runtime.inc.c Outdated Show resolved Hide resolved
@hensldm hensldm removed the Needs-first-approval First approval label May 17, 2024
@hensldm
Copy link
Collaborator

hensldm commented May 19, 2024

Looks like a format is needed

hensldm
hensldm requested changes May 23, 2024
View reviewed changes
src/code/z_map_exp.c Outdated Show resolved Hide resolved
src/code/z_map_exp.c Outdated Show resolved Hide resolved
src/code/z_map_exp.c Outdated Show resolved Hide resolved
src/code/z_map_exp.c Outdated Show resolved Hide resolved
src/code/z_map_exp.c Outdated Show resolved Hide resolved
@hensldm hensldm added Needs-first-approval First approval and removed Waiting-for-author Author needs fix to conflicts or address reviews labels May 23, 2024
@hensldm hensldm added the Waiting-for-author Author needs fix to conflicts or address reviews label Jun 13, 2024
@hensldm
Copy link
Collaborator

hensldm commented Jun 15, 2024

Might have demo bss issues again with the recent merges. Let me know if you want me to take a look at it.

hensldm
hensldm approved these changes Jun 18, 2024
View reviewed changes
Copy link
Collaborator

@hensldm hensldm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few little things.

tools/namefixer.py Outdated Show resolved Hide resolved
src/code/z_map_exp.c Outdated Show resolved Hide resolved
include/z64map.h Outdated Show resolved Hide resolved
@hensldm hensldm removed Waiting-for-author Author needs fix to conflicts or address reviews Needs-first-approval First approval labels Jun 18, 2024
hensldm
hensldm reviewed Jun 18, 2024
View reviewed changes
tools/namefixer.py Outdated Show resolved Hide resolved
tools/namefixer.py Outdated Show resolved Hide resolved
tools/namefixer.py Outdated Show resolved Hide resolved
AngheloAlf
AngheloAlf approved these changes Jun 20, 2024
View reviewed changes
Copy link
Collaborator

@AngheloAlf AngheloAlf left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One final nit

include/z64save.h Outdated Show resolved Hide resolved
@hensldm hensldm added Merge-ready All reviewers satisfied, just waiting for CI Waiting-for-author Author needs fix to conflicts or address reviews and removed Needs-second-approval Second approval labels Jun 20, 2024
hensldm
hensldm reviewed Jun 20, 2024
View reviewed changes
Copy link
Collaborator

@hensldm hensldm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you also please address the same comments about gDPLoadTextureBlock_Runtime.c that tharo brought up in zeldaret/oot#1896.

src/code/gDPLoadTextureBlock_Runtime.c Outdated
#ifndef GDP_LOADTEXTUREBLOCK_RUNTIME_C
#define GDP_LOADTEXTUREBLOCK_RUNTIME_C

#include "global.h"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#include "global.h"

src/code/gDPLoadTextureBlock_Runtime.c Outdated Show resolved Hide resolved
hensldm
hensldm reviewed Jun 20, 2024
View reviewed changes
src/code/z_map_disp.c Outdated Show resolved Hide resolved
@hensldm hensldm removed the Waiting-for-author Author needs fix to conflicts or address reviews label Jun 20, 2024
@hensldm hensldm merged commit 2c680ef into zeldaret:main Jun 21, 2024
1 check passed
@mzxrules mzxrules deleted the z_map_ branch June 21, 2024 03:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hensldm hensldm hensldm approved these changes

@engineer124 engineer124 engineer124 left review comments

@AngheloAlf AngheloAlf AngheloAlf approved these changes

Assignees
No one assigned
Labels
code Merge-ready All reviewers satisfied, just waiting for CI
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@mzxrules @AngheloAlf @hensldm @engineer124