Sync sprite and battle anim consts/labels #1055
Merged
Conversation
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
|
Related to #1016 |
mid-kid
approved these changes
May 31, 2023
Great! I'll just wait for Rangi to have time to take a quick look as well and then i'll merge this and work on pokegold as well. |
Rangi42
reviewed
Jun 22, 2023
Rangi42
reviewed
Jun 22, 2023
Rangi42
reviewed
Jun 22, 2023
Rangi42
reviewed
Jun 22, 2023
Rangi42
reviewed
Jun 22, 2023
|
So, we have this for sprite animations:
And for battle animations, with this PR:
This is mostly good. I would consider getting rid of the whole "seq(uence)" terminology, and just having indexes, functions, framesets, and oamsets. |
Rangi42
changed the title
|
Going to draft this for now until I have a chance to work on it again.. and after SourApple's PR is merged. |
vulcandth
force-pushed
the
battle_anim_seq
branch
from
9c483d9
to
a9b5c6f
Compare
|
Alright I completely reworked this PR... so the old feedback is mostly irrelevant now. Look at the first comment for updated information on what this PR has changed. |
|
I'd prefer |
mid-kid
approved these changes
Aug 23, 2023
|
Bumping to confirm that this may be merged. |
Rangi42
approved these changes
Sep 13, 2023
|
Thanks! I'll merge this; this weekend. So I have time to do it for pokegold as well. |
github-actions bot
pushed a commit
that referenced
this pull request
Sep 17, 2023
* Sync sprite and battle anim consts/labels * Add `; 00` comments * Renamed to `SpriteAnimFunc_` and `BattleAnimFunc_`
vulcandth
added a commit
to pret/pokegold
that referenced
this pull request
Sep 17, 2023
* Sync sprite and battle anim consts/labels * Add `; 00` comments * Renamed to `SpriteAnimFunc_` and `BattleAnimFunc_`
github-actions bot
pushed a commit
to pret/pokegold
that referenced
this pull request
Sep 17, 2023
* Sync sprite and battle anim consts/labels * Add `; 00` comments * Renamed to `SpriteAnimFunc_` and `BattleAnimFunc_`
Nayru62
added a commit
to Nayru62/pokecrystal
that referenced
this pull request
Sep 27, 2023
reflected the latest commit that changed sprite stuff, copied the relevant old funcs from lilikoi and updated to the new Constants pret#1055
Nayru62
added a commit
to Nayru62/pokecrystal
that referenced
this pull request
Sep 28, 2023
Bundled: Idain's Custom Dex Colors and Toggle Shiny Palettes, doesnt impact you if you dont want it. REQUIRED: Replace StatExp with EVs, Expanded Tilesets to 255, Unique Mon Icons (or at least adapt to the new Bank structure, actual icons used are irrelevant) and my Gen3 Type/Status/Cat Tiles. Pokedex portion must be implemented. Other parts, optional. FEATURES: Base stats and info, Move Info, Detailed area info, Evoulation chart, and sprite page showing animated sprites (reflects shiny toggle too). Move Information: Lvl-Up Moves -> Field Moves (plus lvl learned and/or TM/HM/Move Tutor) -> Egg Moves -> TMs. I have fully functional code commented out to include HMs. But I decided not to since Field Moves serve the same purpse. But, if you've messed with adding or deleting Field Moves, I reccomend scrapping the Field Moves code and restoring the HM code. Please feel free to DM about this if it's an issue. I'm working on better solutions at some point. Move Page Future Ideas: Full Page toggle option, to show additional details about the moves, Type, power, category, accuracy, effects, etc AREA Pages: Currently supports Johto/Kanto Walking/grass/surfing encounters plus their swarms. Fishing Rods information is also included. Right now, all it will show you is the relevant Fishing Group Name. In the near future, it will print Route information like the other pages. To check your local Fishing Group, check your PokeGear. POKEGEAR: Now shows the detailed name of map you're currently in (based on Map Group & Map Number) and it also reads the map's attribute to see it's fishing group, if it has one. COMING SOON: AREA support for Headbutt Trees and Rock Smash Rocks and the Bug contest. Roaming Support for the dogs and any custom roamers. I also have an idea to have a python script scrape all information about special event pokemon (like Celebi, Ho-oh, Lugia, Starters, Casinos, Gift pokemon like Eevee) and NPC trades and displaying that. The script should be run if you ever make edits to these and will recompile the list. I should probably do this for Field Moves too, since people can and do have custom Field Moves... Feel Free to DM me any suggestions and feedback. If you want to help me design Tiles/GFX to help make everything easier to look at, I would be eternally grateful. Commit Notes: newest to oldest. I'm still not happy with field moves, having to maintain a seperate data table about the moves and if they're TM/HM/MT goes against the spirit of the project. but for now, it works, and will display the field move twice if can learn via lvl up & TM/HM/MT pokedexpart1 need to get mon icons pokedexpart2 Mon Icons are broken, Evo Page is borked, Sprite Page isnt animating Customizable Pokédex Color https://github.com/pret/pokecrystal/wiki/Customizable-Pok%C3%A9dex-Color Plus changing _CGB_PokedexSearchOption: in engine/gfx/cgb_layouts.asm, ld a, PREDEFPAL_POKEDEX -> call CheckPokedexColor pokedex Restore EV code Pokedex, fixed animations reflected the latest commit that changed sprite stuff, copied the relevant old funcs from lilikoi and updated to the new Constants pret#1055 Pokedex: PokeGear shows fish group, cards wrap In the Pokedex, Press start to bring up the Vanilla AREA option, and Kanto is enabled regardless of HoF Card icons: Test w/: - Only clock + phone - clock, map, phone Need to test w/ Radio Pokegear: forgot a few things forgot to add check for radio when going left on clock screen added print local fishing group name. It's ugly. Soooo much space for tiles on the pokegear!
|
Is it intended that |
Nayru62
added a commit
to Nayru62/pokecrystal
that referenced
this pull request
Oct 5, 2023
Bundled: Idain's Custom Dex Colors and Toggle Shiny Palettes, doesnt impact you if you dont want it. REQUIRED: Replace StatExp with EVs, Expanded Tilesets to 255, Unique Mon Icons (or at least adapt to the new Bank structure, actual icons used are irrelevant) and my Gen3 Type/Status/Cat Tiles. Pokedex portion must be implemented. Other parts, optional. FEATURES: Base stats and info, Move Info, Detailed area info, Evoulation chart, and sprite page showing animated sprites (reflects shiny toggle too). Move Information: Lvl-Up Moves -> Field Moves (plus lvl learned and/or TM/HM/Move Tutor) -> Egg Moves -> TMs. I have fully functional code commented out to include HMs. But I decided not to since Field Moves serve the same purpse. But, if you've messed with adding or deleting Field Moves, I reccomend scrapping the Field Moves code and restoring the HM code. Please feel free to DM about this if it's an issue. I'm working on better solutions at some point. Move Page Future Ideas: Full Page toggle option, to show additional details about the moves, Type, power, category, accuracy, effects, etc AREA Pages: Currently supports Johto/Kanto Walking/grass/surfing encounters plus their swarms. Fishing Rods information is also included. Right now, all it will show you is the relevant Fishing Group Name. In the near future, it will print Route information like the other pages. To check your local Fishing Group, check your PokeGear. POKEGEAR: Now shows the detailed name of map you're currently in (based on Map Group & Map Number) and it also reads the map's attribute to see it's fishing group, if it has one. COMING SOON: AREA support for Headbutt Trees and Rock Smash Rocks and the Bug contest. Roaming Support for the dogs and any custom roamers. I also have an idea to have a python script scrape all information about special event pokemon (like Celebi, Ho-oh, Lugia, Starters, Casinos, Gift pokemon like Eevee) and NPC trades and displaying that. The script should be run if you ever make edits to these and will recompile the list. I should probably do this for Field Moves too, since people can and do have custom Field Moves... Feel Free to DM me any suggestions and feedback. If you want to help me design Tiles/GFX to help make everything easier to look at, I would be eternally grateful. Commit Notes: newest to oldest. I'm still not happy with field moves, having to maintain a seperate data table about the moves and if they're TM/HM/MT goes against the spirit of the project. but for now, it works, and will display the field move twice if can learn via lvl up & TM/HM/MT pokedexpart1 need to get mon icons pokedexpart2 Mon Icons are broken, Evo Page is borked, Sprite Page isnt animating Customizable Pokédex Color https://github.com/pret/pokecrystal/wiki/Customizable-Pok%C3%A9dex-Color Plus changing _CGB_PokedexSearchOption: in engine/gfx/cgb_layouts.asm, ld a, PREDEFPAL_POKEDEX -> call CheckPokedexColor pokedex Restore EV code Pokedex, fixed animations reflected the latest commit that changed sprite stuff, copied the relevant old funcs from lilikoi and updated to the new Constants pret#1055 Pokedex: PokeGear shows fish group, cards wrap In the Pokedex, Press start to bring up the Vanilla AREA option, and Kanto is enabled regardless of HoF Card icons: Test w/: - Only clock + phone - clock, map, phone Need to test w/ Radio Pokegear: forgot a few things forgot to add check for radio when going left on clock screen added print local fishing group name. It's ugly. Soooo much space for tiles on the pokegear! Pokedex BETA pokegear fish str fix just forgot the @ vanilla merged fonts charmap for evopage Vanilla Dex changes Vanilla complete, short text version cleanup Pokedex Choose Theme Color fix https://github.com/pret/pokecrystal/wiki/Customizable-Pok%C3%A9dex-Color Type GFX Vanilla GFX SETup
Nayru62
added a commit
to Nayru62/pokecrystal
that referenced
this pull request
Oct 5, 2023
https://github.com/pret/pokecrystal/wiki/Customizable-Pok%C3%A9dex-Color Nayru's Pokedex ALPHA Bundled: Idain's Custom Dex Colors and Toggle Shiny Palettes, doesnt impact you if you dont want it. REQUIRED: Replace StatExp with EVs, Expanded Tilesets to 255, Unique Mon Icons (or at least adapt to the new Bank structure, actual icons used are irrelevant) and my Gen3 Type/Status/Cat Tiles. Pokedex portion must be implemented. Other parts, optional. FEATURES: Base stats and info, Move Info, Detailed area info, Evoulation chart, and sprite page showing animated sprites (reflects shiny toggle too). Move Information: Lvl-Up Moves -> Field Moves (plus lvl learned and/or TM/HM/Move Tutor) -> Egg Moves -> TMs. I have fully functional code commented out to include HMs. But I decided not to since Field Moves serve the same purpse. But, if you've messed with adding or deleting Field Moves, I reccomend scrapping the Field Moves code and restoring the HM code. Please feel free to DM about this if it's an issue. I'm working on better solutions at some point. Move Page Future Ideas: Full Page toggle option, to show additional details about the moves, Type, power, category, accuracy, effects, etc AREA Pages: Currently supports Johto/Kanto Walking/grass/surfing encounters plus their swarms. Fishing Rods information is also included. Right now, all it will show you is the relevant Fishing Group Name. In the near future, it will print Route information like the other pages. To check your local Fishing Group, check your PokeGear. POKEGEAR: Now shows the detailed name of map you're currently in (based on Map Group & Map Number) and it also reads the map's attribute to see it's fishing group, if it has one. COMING SOON: AREA support for Headbutt Trees and Rock Smash Rocks and the Bug contest. Roaming Support for the dogs and any custom roamers. I also have an idea to have a python script scrape all information about special event pokemon (like Celebi, Ho-oh, Lugia, Starters, Casinos, Gift pokemon like Eevee) and NPC trades and displaying that. The script should be run if you ever make edits to these and will recompile the list. I should probably do this for Field Moves too, since people can and do have custom Field Moves... Feel Free to DM me any suggestions and feedback. If you want to help me design Tiles/GFX to help make everything easier to look at, I would be eternally grateful. Commit Notes: newest to oldest. I'm still not happy with field moves, having to maintain a seperate data table about the moves and if they're TM/HM/MT goes against the spirit of the project. but for now, it works, and will display the field move twice if can learn via lvl up & TM/HM/MT pokedexpart1 need to get mon icons pokedexpart2 Mon Icons are broken, Evo Page is borked, Sprite Page isnt animating Customizable Pokédex Color https://github.com/pret/pokecrystal/wiki/Customizable-Pok%C3%A9dex-Color Plus changing _CGB_PokedexSearchOption: in engine/gfx/cgb_layouts.asm, ld a, PREDEFPAL_POKEDEX -> call CheckPokedexColor pokedex Restore EV code Pokedex, fixed animations reflected the latest commit that changed sprite stuff, copied the relevant old funcs from lilikoi and updated to the new Constants pret#1055 Pokedex: PokeGear shows fish group, cards wrap In the Pokedex, Press start to bring up the Vanilla AREA option, and Kanto is enabled regardless of HoF Card icons: Test w/: - Only clock + phone - clock, map, phone Need to test w/ Radio Pokegear: forgot a few things forgot to add check for radio when going left on clock screen added print local fishing group name. It's ugly. Soooo much space for tiles on the pokegear! Pokedex BETA pokegear fish str fix just forgot the @ vanilla merged fonts charmap for evopage Vanilla Dex changes Vanilla complete, short text version
Nayru62
added a commit
to Nayru62/pokecrystal
that referenced
this pull request
Oct 7, 2023
Bundled: Idain's Custom Dex Colors and Toggle Shiny Palettes, doesnt impact you if you dont want it. REQUIRED: Replace StatExp with EVs, Expanded Tilesets to 255, Unique Mon Icons (or at least adapt to the new Bank structure, actual icons used are irrelevant) and my Gen3 Type/Status/Cat Tiles. Pokedex portion must be implemented. Other parts, optional. FEATURES: Base stats and info, Move Info, Detailed area info, Evoulation chart, and sprite page showing animated sprites (reflects shiny toggle too). Move Information: Lvl-Up Moves -> Field Moves (plus lvl learned and/or TM/HM/Move Tutor) -> Egg Moves -> TMs. I have fully functional code commented out to include HMs. But I decided not to since Field Moves serve the same purpse. But, if you've messed with adding or deleting Field Moves, I reccomend scrapping the Field Moves code and restoring the HM code. Please feel free to DM about this if it's an issue. I'm working on better solutions at some point. Move Page Future Ideas: Full Page toggle option, to show additional details about the moves, Type, power, category, accuracy, effects, etc AREA Pages: Currently supports Johto/Kanto Walking/grass/surfing encounters plus their swarms. Fishing Rods information is also included. Right now, all it will show you is the relevant Fishing Group Name. In the near future, it will print Route information like the other pages. To check your local Fishing Group, check your PokeGear. POKEGEAR: Now shows the detailed name of map you're currently in (based on Map Group & Map Number) and it also reads the map's attribute to see it's fishing group, if it has one. COMING SOON: AREA support for Headbutt Trees and Rock Smash Rocks and the Bug contest. Roaming Support for the dogs and any custom roamers. I also have an idea to have a python script scrape all information about special event pokemon (like Celebi, Ho-oh, Lugia, Starters, Casinos, Gift pokemon like Eevee) and NPC trades and displaying that. The script should be run if you ever make edits to these and will recompile the list. I should probably do this for Field Moves too, since people can and do have custom Field Moves... Feel Free to DM me any suggestions and feedback. If you want to help me design Tiles/GFX to help make everything easier to look at, I would be eternally grateful. Commit Notes: newest to oldest. I'm still not happy with field moves, having to maintain a seperate data table about the moves and if they're TM/HM/MT goes against the spirit of the project. but for now, it works, and will display the field move twice if can learn via lvl up & TM/HM/MT pokedexpart1 need to get mon icons pokedexpart2 Mon Icons are broken, Evo Page is borked, Sprite Page isnt animating Customizable Pokédex Color https://github.com/pret/pokecrystal/wiki/Customizable-Pok%C3%A9dex-Color Plus changing _CGB_PokedexSearchOption: in engine/gfx/cgb_layouts.asm, ld a, PREDEFPAL_POKEDEX -> call CheckPokedexColor pokedex Restore EV code Pokedex, fixed animations reflected the latest commit that changed sprite stuff, copied the relevant old funcs from lilikoi and updated to the new Constants pret#1055 Pokedex: PokeGear shows fish group, cards wrap In the Pokedex, Press start to bring up the Vanilla AREA option, and Kanto is enabled regardless of HoF Card icons: Test w/: - Only clock + phone - clock, map, phone Need to test w/ Radio Pokegear: forgot a few things forgot to add check for radio when going left on clock screen added print local fishing group name. It's ugly. Soooo much space for tiles on the pokegear!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
resolves #765
I'm fairly confident this is what we wanted to accomplish here. I think this is much more consistent. Let me know what you think Rangi / Mid-kid.
Edit:
What this PR has done:
Battle Animations
BattleAnimObjects:(seedata/battle_anims_objects.asm)ANIM_OBJ_*renamed toBATTLE_ANIM_OBJ_*NUM_ANIM_OBJSrenamed toNUM_BATTLE_ANIM_OBJSDoBattleAnimFrame:(seeengine/battle_anims/functions.asm)BATTLEANIMFUNC_*renamed toBATTLE_ANIM_FUNC_*NUM_BATTLEANIMFUNCSrenamed toNUM_BATTLE_ANIM_FUNCSBattleAnimFrameData:(seedata/battle_anims/framsets.asm)BATTLEANIMFRAMESET_*renamed toBATTLE_ANIM_FRAMSET_*NUM_BATTLEANIMFRAMESETSrenamed toNUM_BATTLE_ANIM_FRAMESETSBattleAnimOAMData:(seedata/battle_anim/oam.asm)BATTLEANIMOAMSET_*renamed toBATTLE_ANIM_OAMSET_*NUM_BATTLEANIMOAMSETSrenamed toNUM_BATTLE_ANIM_OAMSETSBattleBGEffects:(seeengine/battle_anims/bg_effects.asm)ANIM_BG_*renamed toBATTLE_BG_EFFECT_*NUM_ANIM_BGSrenamed toNUM_BATTLE_BG_EFFECTSAnimObjGFX:(seedata/battle_anims/object_gfx.asm)ANIM_GFX_*renamed toBATTLE_ANIM_GFX_NUM_ANIM_GFXrenamed toNUM_BATTLE_ANIM_GFXSprite Animations
SpriteAnimSeqData:renamed toSpriteAnimObjects:(data/sprite_anims/sequences.asmrenamed todata/sprite_anims/objects.asm)SPRITE_ANIM_INDEX_*renamed toSPRITE_ANIM_OBJ_*NUM_SPRITE_ANIM_INDEXESrenamed toNUM_SPRITE_ANIM_OBJSDoAnimFrame:renamed toDoSpriteAnimFrame:(engine/gfx/sprite_anims.asmmoved/renamed toengine/sprite_anims/functions.asm)SPRITE_ANIM_SEQ_*renamed toSPRITE_ANIM_FUNC_*NUM_SPRITE_ANIM_SEQSrenamed toNUM_SPRITE_ANIM_FUNCSSpriteAnimFrameData:(seedata/sprite_anims/framesets.asm)SPRITE_ANIM_FRAMESET_*unchanged.SpriteAnimOAMData:(seedata/sprite_anims/oam.asm)SPRITE_ANIM_OAMSET_*unchanged.MISC
; 00comments.NUM_ANIM_OBJECTStoNUM_BATTLE_ANIM_STRUCTS