-
Notifications
You must be signed in to change notification settings - Fork 77
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
Decompile pl_batt_obj NARC, document related battle_icon.c #269
Open
joshua-smith-12
wants to merge
29
commits into
pret:main
Choose a base branch
from
joshua-smith-12:document_pl_batt_obj
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 26 commits
Commits
Show all changes
29 commits
Select commit
Hold shift + click to select a range
cf9f42d
unpack pl_batt_obj and document some related code (not matching yet)
joshua-smith-12 67d9df6
fix build process for pl_batt_obj, resolve filesystem diffs
joshua-smith-12 d458f65
resolve ROM diff - need to keep narc at same filesystem level
joshua-smith-12 54f8f91
update some naming scheme for BattleObj
joshua-smith-12 fdf3cf9
rename a couple of icon rendering functions
joshua-smith-12 663e218
remove unnecessary copy step
joshua-smith-12 b218cbb
rename to battle_icon
joshua-smith-12 faae000
fix header guards in battle_icon.h
joshua-smith-12 ec50ea9
fix missed renaming after rebase onto main
joshua-smith-12 b8cb5db
update PNG files for balls, healthbars, battle platforms
joshua-smith-12 d597f8f
update names to align with emerald, add terrain names, rename some pa…
joshua-smith-12 c4f1a2d
apply clang-format to code changes
joshua-smith-12 ec4f1ff
rename all terrain img/pals, better describe arrays using pl_batt_obj…
joshua-smith-12 434a250
generate + use naix for pl_batt_obj, rename known NCER/NANR files
joshua-smith-12 fa6cd30
apply clang-format again after adding naix
joshua-smith-12 0986173
update const names and method names from review
joshua-smith-12 6611b55
convert all NCER files into json and adjust build system
joshua-smith-12 cc7c504
build all NANRs for pl_batt_obj using nitrogfx
joshua-smith-12 c43f294
rename back sprites for players, update levelup background with naix …
joshua-smith-12 f427b7a
fix some issues with anim/cell definitions, update a couple source lo…
joshua-smith-12 cb7b584
format on files using new naix fields
joshua-smith-12 15a5e94
use new generators to produce NARC contents
joshua-smith-12 0ef8173
convert to generators instead of Python for build, update NAIX fields…
joshua-smith-12 2113cb3
apply clang-format, format got messed up after rebase
joshua-smith-12 79c1b33
Merge remote-tracking branch 'upstream/main' into document_pl_batt_obj
joshua-smith-12 c7ab5db
fix build issue after merge from main
joshua-smith-12 c3353f6
apply changes from review
joshua-smith-12 d314612
Merge remote-tracking branch 'upstream/main' into document_pl_batt_obj
joshua-smith-12 41bbde7
fix palette line endings, fix merge issue, adjust NCER build with new…
joshua-smith-12 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| subdir('pl_batt_obj') | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| { | ||
| "labelEnabled": true, | ||
| "sequenceCount": 2, | ||
| "frameCount": 5, | ||
| "sequences": [{ | ||
| "frameCount": 4, | ||
| "loopStartFrame": 0, | ||
| "animationElement": 0, | ||
| "animationType": 1, | ||
| "playbackMode": 2, | ||
| "frameData": [{ | ||
| "frameDelay": 2, | ||
| "resultId": 0 | ||
| }, { | ||
| "frameDelay": 2, | ||
| "resultId": 1 | ||
| }, { | ||
| "frameDelay": 2, | ||
| "resultId": 2 | ||
| }, { | ||
| "frameDelay": 2, | ||
| "resultId": 3 | ||
| }] | ||
| }, { | ||
| "frameCount": 1, | ||
| "loopStartFrame": 0, | ||
| "animationElement": 0, | ||
| "animationType": 1, | ||
| "playbackMode": 2, | ||
| "frameData": [{ | ||
| "frameDelay": 60, | ||
| "resultId": 0 | ||
| }] | ||
| }], | ||
| "animationResults": [{ | ||
| "resultType": 0, | ||
| "index": 0 | ||
| }, { | ||
| "resultType": 0, | ||
| "index": 1 | ||
| }, { | ||
| "resultType": 0, | ||
| "index": 2 | ||
| }, { | ||
| "resultType": 0, | ||
| "index": 3 | ||
| }], | ||
| "resultCount": 4, | ||
| "labels": ["CellAnime0", "CellAnime1"], | ||
| "labelCount": 2 | ||
| } |
62 changes: 62 additions & 0 deletions
62
res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_opponent.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| { | ||
| "labelEnabled": true, | ||
| "sequenceCount": 4, | ||
| "frameCount": 4, | ||
| "sequences": [{ | ||
| "frameCount": 1, | ||
| "loopStartFrame": 0, | ||
| "animationElement": 0, | ||
| "animationType": 1, | ||
| "playbackMode": 2, | ||
| "frameData": [{ | ||
| "frameDelay": 4, | ||
| "resultId": 0 | ||
| }] | ||
| }, { | ||
| "frameCount": 1, | ||
| "loopStartFrame": 0, | ||
| "animationElement": 0, | ||
| "animationType": 1, | ||
| "playbackMode": 2, | ||
| "frameData": [{ | ||
| "frameDelay": 4, | ||
| "resultId": 1 | ||
| }] | ||
| }, { | ||
| "frameCount": 1, | ||
| "loopStartFrame": 0, | ||
| "animationElement": 0, | ||
| "animationType": 1, | ||
| "playbackMode": 2, | ||
| "frameData": [{ | ||
| "frameDelay": 4, | ||
| "resultId": 2 | ||
| }] | ||
| }, { | ||
| "frameCount": 1, | ||
| "loopStartFrame": 0, | ||
| "animationElement": 0, | ||
| "animationType": 1, | ||
| "playbackMode": 2, | ||
| "frameData": [{ | ||
| "frameDelay": 4, | ||
| "resultId": 3 | ||
| }] | ||
| }], | ||
| "animationResults": [{ | ||
| "resultType": 0, | ||
| "index": 0 | ||
| }, { | ||
| "resultType": 0, | ||
| "index": 1 | ||
| }, { | ||
| "resultType": 0, | ||
| "index": 2 | ||
| }, { | ||
| "resultType": 0, | ||
| "index": 3 | ||
| }], | ||
| "resultCount": 4, | ||
| "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3"], | ||
| "labelCount": 4 | ||
| } |
62 changes: 62 additions & 0 deletions
62
res/battle/graphic/pl_batt_obj/anims/ball_status_indicator_player.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| { | ||
| "labelEnabled": true, | ||
| "sequenceCount": 4, | ||
| "frameCount": 4, | ||
| "sequences": [{ | ||
| "frameCount": 1, | ||
| "loopStartFrame": 0, | ||
| "animationElement": 0, | ||
| "animationType": 1, | ||
| "playbackMode": 2, | ||
| "frameData": [{ | ||
| "frameDelay": 4, | ||
| "resultId": 0 | ||
| }] | ||
| }, { | ||
| "frameCount": 1, | ||
| "loopStartFrame": 0, | ||
| "animationElement": 0, | ||
| "animationType": 1, | ||
| "playbackMode": 2, | ||
| "frameData": [{ | ||
| "frameDelay": 4, | ||
| "resultId": 1 | ||
| }] | ||
| }, { | ||
| "frameCount": 1, | ||
| "loopStartFrame": 0, | ||
| "animationElement": 0, | ||
| "animationType": 1, | ||
| "playbackMode": 2, | ||
| "frameData": [{ | ||
| "frameDelay": 4, | ||
| "resultId": 2 | ||
| }] | ||
| }, { | ||
| "frameCount": 1, | ||
| "loopStartFrame": 0, | ||
| "animationElement": 0, | ||
| "animationType": 1, | ||
| "playbackMode": 2, | ||
| "frameData": [{ | ||
| "frameDelay": 4, | ||
| "resultId": 3 | ||
| }] | ||
| }], | ||
| "animationResults": [{ | ||
| "resultType": 0, | ||
| "index": 0 | ||
| }, { | ||
| "resultType": 0, | ||
| "index": 1 | ||
| }, { | ||
| "resultType": 0, | ||
| "index": 2 | ||
| }, { | ||
| "resultType": 0, | ||
| "index": 3 | ||
| }], | ||
| "resultCount": 4, | ||
| "labels": ["CellAnime0", "CellAnime1", "CellAnime2", "CellAnime3"], | ||
| "labelCount": 4 | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
suggestion: Can we name the internal folder something more meaningful? Maybe
res/battle/graphics/objects? We generally try to avoid using the actual NARC names outside of where strictly necessary for matching (e.g., on NARC names)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've renamed the directory, I considered renaming some of the other files (
pl_batt_obj.ignore,pl_batt_obj.order) but these are more directly related to the final NARC name so I've left them as-is