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

Player sprites & more #1055

Merged
merged 40 commits into from
Jun 26, 2023
Merged

Player sprites & more #1055

merged 40 commits into from
Jun 26, 2023

Conversation

ethteck
Copy link
Member

@ethteck ethteck commented May 14, 2023 •
edited
Loading

Adds player sprite building, fixes various things, separates the installation of compilers (in-repo tools) into a separate script

Todo:

  • Add player sprite support to all versions (except JP, since it's not identical like the other ones)
  • Generate player sprite header
  • Add max thing clover wants to sprite header
  • Incorporate player sprite header into code wherever possible
  • Migrate NPC sprite animations to the new human-readable format
  • Combine player and npc sprites into one segment
  • Un-hardcode npc sprite filesize offset from main sprite header
  • Make build dependencies
  • Add build date to main output xml
  • Implement building with an asset stack
  • Figure out differences with JP sprite bundle (there were no differences)
  • Implement marking the proper objects as ninja dependencies in the asset stack

ethteck and others added 24 commits April 25, 2023 15:52
@ethteck
WIP work on sprites (sprite_stuff.py)
6967df3
@ethteck
cleanup of various stuff
724aa36
@ethteck
separate compiler installation into separate script
0dbcf7d
@ethteck
Merge branch 'main' into player-sprites
18f19fc
@ethteck
wipz
ba7940a
@ethteck
Merge branch 'main' into player-sprites
3f369ad
@ethteck
more
ed8ed40
@ethteck
renames, bugfixes
046536e
@ethteck
more
d49ebbb
@ethteck
Merge branch 'main' into player-sprites
c143111
@ethteck
Merge branch 'main' into player-sprites
77bc930
@ethteck
very grood
183b0eb
@ethteck
cleanin
50190ee
@ethteck
goods and services
3cf63ec
@ethteck
oopth
483054c
@ethteck
oopth2
000df18
@pixel-stuck
Parse palette data from xml
7e73b83
@ethteck
more work
a78fd89
@ethteck
more wipperz
e86c47a
@ethteck
Merge branch 'main' into player-sprites
b190284
@ethteck
more
35a6668
@ethteck
it working
4dfc357
@ethteck
git subrepo pull --force tools/splat
b4e839a 
subrepo:
  subdir:   "tools/splat"
  merged:   "e72a868f9f"
upstream:
  origin:   "https://github.com/ethteck/splat.git"
  branch:   "master"
  commit:   "e72a868f9f"
git-subrepo:
  version:  "0.4.5"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "aa416e4"
@ethteck
fix symbol_addrs for new splat
65e45fb
This was linked to issues May 14, 2023
Separate out install.sh into in-repo things and system things #1028
Closed
Player sprite asset #575
Closed
bates64
bates64 previously requested changes May 15, 2023
View reviewed changes
tools/build/configure.py Show resolved Hide resolved
tools/build/sprite/player_sprites.py Outdated Show resolved Hide resolved
tools/build/sprite/player_sprites.py Outdated Show resolved Hide resolved
tools/build/configure.py Outdated Show resolved Hide resolved
bates64
bates64 reviewed May 15, 2023
View reviewed changes
tools/splat_ext/pm_player_sprites.py Outdated Show resolved Hide resolved
tools/splat_ext/pm_player_sprites.py Outdated Show resolved Hide resolved
@bates64 bates64 mentioned this pull request May 15, 2023
Closed
@ethteck ethteck mentioned this pull request May 20, 2023
Open
@bates64 bates64 added the asset Relates to a particular asset in the build graph label May 24, 2023
@ethteck ethteck mentioned this pull request May 31, 2023
Closed
This was linked to issues Jun 4, 2023
configure: sprite building should be able to merge sprite dirs #1053
Closed
Reassignable NPC sprite IDs in asset dir rather than splat.yaml #1054
Closed
@ethteck ethteck requested review from bates64 and z64a June 17, 2023 10:22
@ethteck ethteck marked this pull request as ready for review June 17, 2023 12:35
@ethteck ethteck marked this pull request as draft June 17, 2023 12:55
@ethteck ethteck marked this pull request as ready for review June 19, 2023 23:38
bates64
bates64 approved these changes Jun 26, 2023
View reviewed changes
src/battle/move/star_power/twink_dash.c Outdated Show resolved Hide resolved
@ethteck ethteck merged commit 8837fbd into main Jun 26, 2023
@ethteck ethteck deleted the player-sprites branch June 26, 2023 10:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bates64 bates64 bates64 approved these changes

@z64a z64a Awaiting requested review from z64a

Assignees
No one assigned
Labels
asset Relates to a particular asset in the build graph
Projects
None yet
Milestone
No milestone
3 participants
@ethteck @bates64 @pixel-stuck