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

Sync sprite and battle anim consts/labels #1055

Merged
merged 3 commits into from
Sep 17, 2023

Conversation

vulcandth
Copy link
Collaborator

@vulcandth vulcandth commented May 31, 2023

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: (see data/battle_anims_objects.asm)
    • ANIM_OBJ_* renamed to  BATTLE_ANIM_OBJ_*
    • NUM_ANIM_OBJS renamed to NUM_BATTLE_ANIM_OBJS
  • DoBattleAnimFrame: (see engine/battle_anims/functions.asm
    • BATTLEANIMFUNC_* renamed to BATTLE_ANIM_FUNC_*
    • NUM_BATTLEANIMFUNCS renamed to NUM_BATTLE_ANIM_FUNCS
  • BattleAnimFrameData: (see data/battle_anims/framsets.asm)
    • BATTLEANIMFRAMESET_* renamed to BATTLE_ANIM_FRAMSET_*
    • NUM_BATTLEANIMFRAMESETS renamed to NUM_BATTLE_ANIM_FRAMESETS
  • BattleAnimOAMData: (see data/battle_anim/oam.asm)
    • BATTLEANIMOAMSET_* renamed to BATTLE_ANIM_OAMSET_*
    • NUM_BATTLEANIMOAMSETS renamed to NUM_BATTLE_ANIM_OAMSETS
  • BattleBGEffects: (see engine/battle_anims/bg_effects.asm)
    • ANIM_BG_* renamed to BATTLE_BG_EFFECT_*
    • NUM_ANIM_BGS renamed to NUM_BATTLE_BG_EFFECTS
  • AnimObjGFX: (see data/battle_anims/object_gfx.asm)
    • ANIM_GFX_* renamed to BATTLE_ANIM_GFX_
    • NUM_ANIM_GFX renamed to NUM_BATTLE_ANIM_GFX

Sprite Animations

  • SpriteAnimSeqData: renamed to SpriteAnimObjects: (data/sprite_anims/sequences.asm renamed to data/sprite_anims/objects.asm)
    • SPRITE_ANIM_INDEX_* renamed to SPRITE_ANIM_OBJ_*
    • NUM_SPRITE_ANIM_INDEXES renamed to NUM_SPRITE_ANIM_OBJS
  • DoAnimFrame: renamed to DoSpriteAnimFrame: (engine/gfx/sprite_anims.asm moved/renamed to engine/sprite_anims/functions.asm)
    • SPRITE_ANIM_SEQ_* renamed to SPRITE_ANIM_FUNC_*
    • NUM_SPRITE_ANIM_SEQS renamed to NUM_SPRITE_ANIM_FUNCS
  • SpriteAnimFrameData: (see data/sprite_anims/framesets.asm)
    • SPRITE_ANIM_FRAMESET_* unchanged.
  • SpriteAnimOAMData: (see data/sprite_anims/oam.asm)
    • SPRITE_ANIM_OAMSET_* unchanged.

MISC

  • Added various ; 00 comments.
  • Renamed NUM_ANIM_OBJECTS to NUM_BATTLE_ANIM_STRUCTS

@vulcandth
Copy link
Collaborator Author

Related to #1016

@vulcandth vulcandth requested a review from mid-kid May 31, 2023 20:27
Copy link
Member

@mid-kid mid-kid left a comment

Choose a reason for hiding this comment

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

Looks great! This is essentially what I was aiming for, yeah.

@vulcandth
Copy link
Collaborator Author

Looks great! This is essentially what I was aiming for, yeah.

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
Copy link
Member

Rangi42 commented Jun 22, 2023

So, we have this for sprite animations:

  • SPRITE_ANIM_INDEX_* constants are indexes into SpriteAnimSeqData (see data/sprite_anims/sequences.asm) (SpriteAnimSeqData should be renamed!)
  • SPRITE_ANIM_SEQ_* constants are indexes into DoAnimFrame.Jumptable (see engine/gfx/sprite_anims.asm)
  • SPRITE_ANIM_FRAMESET_* constants are indexes into SpriteAnimFrameData (see data/sprite_anims/framesets.asm)
  • SPRITE_ANIM_OAMSET_* constants are indexes into SpriteAnimOAMData(see data/sprite_anims/oam.asm)

And for battle animations, with this PR:

  • BATTLE_ANIM_INDEX_* constants are indexes into BattleAnimObjects (see data/battle_anims/objects.asm) (BattleAnimObjects should be renamed!)
  • BATTLE_ANIM_SEQ_* constants are indexes into DoBattleAnimFrame.Jumptable (see engine/battle_anims/functions.asm)
  • BATTLE_ANIM_FRAMESET_* constants are indexes into BattleAnimFrameData (see data/battle_anims/framesets.asm)
  • BATTLE_ANIM_OAMSET_* constants are indexes into BattleAnimOAMData (see data/battle_anims/oam.asm)

This is mostly good. I would consider getting rid of the whole "seq(uence)" terminology, and just having indexes, functions, framesets, and oamsets.

@Rangi42 Rangi42 changed the title Sync OW Sprite and Battle Anim const/labels Sync sprite and battle anim consts/labels Jun 22, 2023
@vulcandth
Copy link
Collaborator Author

Going to draft this for now until I have a chance to work on it again.. and after SourApple's PR is merged.

@vulcandth vulcandth marked this pull request as draft August 9, 2023 19:07
@vulcandth vulcandth marked this pull request as ready for review August 22, 2023 02:23
@vulcandth
Copy link
Collaborator Author

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.

@mid-kid
Copy link
Member

mid-kid commented Aug 23, 2023

I'd prefer SpriteAnimFunc_ and BattleAnimFunc_ over spelling out the full Function. I also wonder if InitSpriteAnimStruct could be renamed into something else, maybe SpawnSprite or AddSprite.

@mid-kid
Copy link
Member

mid-kid commented Sep 12, 2023

Bumping to confirm that this may be merged.

@vulcandth
Copy link
Collaborator Author

Thanks! I'll merge this; this weekend. So I have time to do it for pokegold as well.

@vulcandth vulcandth merged commit aba1f14 into pret:master Sep 17, 2023
1 check passed
@vulcandth vulcandth deleted the battle_anim_seq branch September 17, 2023 18:09
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!
@xCrystal
Copy link
Member

Is it intended that SPRITEANIMSTRUCT_ANIM_SEQ_ID has not been renamed to SPRITEANIMSTRUCT_FUNC_ID (and idem for the associated WRAM addresses from the wSpriteAnim macro) even though SPRITE_ANIM_SEQ_* have been renamed to SPRITE_ANIM_FUNC_*?

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!
xaerochill pushed a commit to xaerochill/timecrystal that referenced this pull request Jun 26, 2024
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/pokecrystal#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 Jul 30, 2024
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

Battle enemy hud fix

Remember to check hall of fame for NO. tile weirdness

Minor Sync fixes with Type tiles GFX

Dex Tweaks 1 & minor tweaks

pokegear more readable, search mode and unown mode applies custom color

Added Dex Info Page

also removes the mewtwo color

Nayru's Dex 2.0

Developed originally on Crystal Legacy 1.2, rebased here for vanilla crystal with rgbasm 6.1

Fixing page counter bug for Surfing Area Dex

same fix as the walking/grass one, thanks Craig

EV code

Sorting out the EV/StatExp Handling for Stats page

Dex Area Map UI updates

wont affect pokegear and fly map

pokegear part of dex area map UI

UI Moved Type on Entry page, EVO arrows

and added up/down arrows to EVO, Current mon arrow, moved caught ball up by 1 on EVO page too

Pics page UI updates

Main UI updates

UI misc

Part 1 UI Overhaul

Part 1 UI Overhaul

UI Overhaul part 2

Moved Caught Ball Icon next to Dex #

top button banner comments

misc edits

celebi event ready

no nayru sprite

misc clean up
Nayru62 added a commit to Nayru62/pokecrystal that referenced this pull request Aug 12, 2024
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

Battle enemy hud fix

Remember to check hall of fame for NO. tile weirdness

Minor Sync fixes with Type tiles GFX

Dex Tweaks 1 & minor tweaks

pokegear more readable, search mode and unown mode applies custom color

Added Dex Info Page

also removes the mewtwo color

Nayru's Dex 2.0

Developed originally on Crystal Legacy 1.2, rebased here for vanilla crystal with rgbasm 6.1

Fixing page counter bug for Surfing Area Dex

same fix as the walking/grass one, thanks Craig

EV code

Sorting out the EV/StatExp Handling for Stats page

Dex Area Map UI updates

wont affect pokegear and fly map

pokegear part of dex area map UI

UI Moved Type on Entry page, EVO arrows

and added up/down arrows to EVO, Current mon arrow, moved caught ball up by 1 on EVO page too

Pics page UI updates

Main UI updates

UI misc

Part 1 UI Overhaul

Part 1 UI Overhaul

UI Overhaul part 2

Moved Caught Ball Icon next to Dex #

top button banner comments

misc edits

celebi event ready

no nayru sprite

misc clean up
Nayru62 added a commit to Nayru62/pokecrystal that referenced this pull request Aug 15, 2024
Updating to current pret main, and upgrade to rgbasm v8.0

PlaceHLTextAtBC -> PrintTextboxTextAt

SetPalettes -> SetDefaultBGPAndOBP

Nayru's Pokedex

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

Battle enemy hud fix

Remember to check hall of fame for NO. tile weirdness

Minor Sync fixes with Type tiles GFX

Dex Tweaks 1 & minor tweaks

pokegear more readable, search mode and unown mode applies custom color

Added Dex Info Page

also removes the mewtwo color

Nayru's Dex 2.0

Developed originally on Crystal Legacy 1.2, rebased here for vanilla crystal with rgbasm 6.1

Fixing page counter bug for Surfing Area Dex

same fix as the walking/grass one, thanks Craig

EV code

Sorting out the EV/StatExp Handling for Stats page

Dex Area Map UI updates

wont affect pokegear and fly map

pokegear part of dex area map UI

UI Moved Type on Entry page, EVO arrows

and added up/down arrows to EVO, Current mon arrow, moved caught ball up by 1 on EVO page too

Pics page UI updates

Main UI updates

UI misc

Part 1 UI Overhaul

Part 1 UI Overhaul

UI Overhaul part 2

Moved Caught Ball Icon next to Dex #

top button banner comments

misc edits

celebi event ready

no nayru sprite

misc clean up

Stats Page supports EVs, detects automatically

rangi_dex_tiles, removed extra, plus minor edits

Poliwag area bug fix

Tweaked logic to make sure we changed categories before stopping after printing 3rd entry per page, for both grass and surfing functions

Pokedex Functionality "Hints" Dialogue from Crystal Legacy

ported from Crystal Legacy commits: cRz-Shadows/Pokemon_Crystal_Legacy@6c49273

plus my edits: cRz-Shadows/Pokemon_Crystal_Legacy@d2f10b5

vanilla did not need to do this but it's related if you have a build error: cRz-Shadows/Pokemon_Crystal_Legacy@356b7d2

Craig's overlaying button banner idea

originally implemented for Crystal Legacy

Nayru62/Pokemon_Crystal_Legacy@3c3c44b

Nayru's Pokedex 3.2.0 :  Final Dex 3.2 UI Layout

originally implemented for Crystal Legacy

plan to implement improvements to streamline customization process for UI

also have been requested to add options to lock moves/evo page behind requiring to catch

Area Empty page bug, Rattata

lots of optimization that could be done

had forgotten to update category text for rocksmash

added Electrode special encounter. Should develop method to hide the location but still give a hint

considering reordering the categories so the weird ones are shown first

Nayru's Pokedex v3.2.2

Map name updates. can fit 18 chars instead of just 17 once i adjust the pokegear code to conditionally place the text depending on string length

Nayru's Dex 3.2.3 minor evo page bug fix

Stats Evo method (tyrouge, hitmon*) was using the wrong VRAM 1 Lvl tile, converted to charmap for more clarity and redundancy.

also added more comments to help differentiate which VRAM the tiles are expecting to have their CGB layout attrmap

3.2.4 Base Stats Page, page num fix & erase A button if not caught on lore

if on page 3, then scroll up/down to next/prev mon, the base stats page doesnt land on the right page number, and is stuck on 1 past the normal max page. fixed by adding a const that automatically detects if there is max 3 pages (for using vanilla/StatEXP) or max of 4 pages (if you've replaced StatEXP with EVs) and then the reinitdexentry func in pokedex.asm uses this const to check and set the right page number.

also adds a func that simply erases the A button indicator and the page number if you hit the INFO (lore) button when you havent caught the mon yet. it now just shows the mon's species nickname

No longer displays dex lore/info, unless you've caught the pokemon. added UncaughtMon_Info_Erase_PageNum which erases the A button prompt and page num when this is the case

from my original CL commit:
fixed the base stats page num bug, added const in pokedex_stats_page.asm that sets the const value depending on if StatEXP or EVs are being used in the ROM, and more elegant solution in pokedex.asm

whirl islands map name edit, pokemart name edits

still need to add the conditional strlen check in pokegear to allow for max of 18 chars in each mapname. pokedex supports length of 18 without additional intervention

added python script that calculates the true map name strlen and alerts to over defined max length or missing delimiters

3.2.5 AREA TREEMONS minor bug COMMON/RARE const

doesnt seem to have made an impact in this version, but im still changing it for correctness, and because it DID impact pk16 leaving it may cause issues

missed breakpoint

v3.2.6 map name strlen in pokegear, 18 char mapnames update

verified with my script tools\check_map_names_length.py

PokeGear Time of Day Icons

trying other layouts but this is how i got the icons loaded, and how i finally figured out how to apply the palettes and have it stick. not the CGB Layout!

debug options

make rare candy free, offer rare candy and master balls in stores. unlock pokedex unseen mons. warp to radio tower in neighbor house in newbark to get card fast

v3.2.6: Fixing the max Stats Page bug AGAIN

tested all scenarios. problem was my sloppy coding in the reinit func. had made it more complicated than it needed to be.

Area page consts, and No more dependency on Expanded Tilesets

gender ratio is 7:1 not 8:1

Accounting for 'Increase Pokémon sprite animation size'

https://github.com/pret/pokecrystal/wiki/Increase-Pok%C3%A9mon-sprite-animation-size

the IF DEF logic seems iffy

Species Nickname bug fix

i dont know how i missed this one...
thanks timkun55

Uncompress PokedexLZ and SlowpokeLZ, account for Expanded Townmap tiles

v3.3.0 Adding Options File for increased compatibility

still need to accommodate USING_EXPANDED_TILESETS

and USE_COMPRESSED_POKEDEX_GFX

and some of the basic custom evolution method

fixed a stray pixel in types_dark.png

3.3.1 Minor change for options

3.3.2 Added option to use Compressed PokedexGFX

when using compressed GFX, a white flash appears when loading search menu, or when exiting the Area Map

Found to be compatible: 'Expand Tileset to 255'

removed from options, moved to faq

v3.3.3 Now supporting 'Evolve while holding an item'

Supports two versions of Evolve while holding an item

following this tutorial:

https://github.com/pret/pokecrystal/wiki/Evolve-while-holding-an-item

Instead of just one constant, you must differentiate between EVOLVE_HELD which has no lvl requirement (and no -1 delim) EVOLVE_HELD_LEVEL is for using the lvl requirement.

v3.3.4 Fixed minor bug with Main Dex Cursor

It copies the orange square scrolling list cursor from main list, but was copying the tile before the cursor had been loaded by Slowpoke GFX

v3.3.5 Updated options menu

removed redundant instructions

re-ordered the modes

after choosing color, returns you to the options screen, since you might want to change the mode too

got rid of the custom blurb strings for the options menu

Nayrus Pokedex v3.4 part 1: Hide Unseen Mons from Evo chart

still need to add Curse Type GFX

??? gfx added for EVO page

Nayrus Dex v3.4.1: Pics page animation fix, default snorlax special encounter text fixed

On the pics page, animated frontpic wasnt finishing the entire idle animation (like it does on the Stats screen). Just needed to change the duration of the animation.

In vanilla crystal, snorlax is encountered at lvl 50 not lvl 40.

Tweaked eevee's and Tyrogue's defaul;t hint blurbs
Nayru62 added a commit to Nayru62/pokecrystal that referenced this pull request Aug 15, 2024
Updating to current pret main, and upgrade to rgbasm v8.0

PlaceHLTextAtBC -> PrintTextboxTextAt

SetPalettes -> SetDefaultBGPAndOBP

Nayru's Pokedex

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

Battle enemy hud fix

Remember to check hall of fame for NO. tile weirdness

Minor Sync fixes with Type tiles GFX

Dex Tweaks 1 & minor tweaks

pokegear more readable, search mode and unown mode applies custom color

Added Dex Info Page

also removes the mewtwo color

Nayru's Dex 2.0

Developed originally on Crystal Legacy 1.2, rebased here for vanilla crystal with rgbasm 6.1

Fixing page counter bug for Surfing Area Dex

same fix as the walking/grass one, thanks Craig

EV code

Sorting out the EV/StatExp Handling for Stats page

Dex Area Map UI updates

wont affect pokegear and fly map

pokegear part of dex area map UI

UI Moved Type on Entry page, EVO arrows

and added up/down arrows to EVO, Current mon arrow, moved caught ball up by 1 on EVO page too

Pics page UI updates

Main UI updates

UI misc

Part 1 UI Overhaul

Part 1 UI Overhaul

UI Overhaul part 2

Moved Caught Ball Icon next to Dex #

top button banner comments

misc edits

celebi event ready

no nayru sprite

misc clean up

Stats Page supports EVs, detects automatically

rangi_dex_tiles, removed extra, plus minor edits

Poliwag area bug fix

Tweaked logic to make sure we changed categories before stopping after printing 3rd entry per page, for both grass and surfing functions

Pokedex Functionality "Hints" Dialogue from Crystal Legacy

ported from Crystal Legacy commits: cRz-Shadows/Pokemon_Crystal_Legacy@6c49273

plus my edits: cRz-Shadows/Pokemon_Crystal_Legacy@d2f10b5

vanilla did not need to do this but it's related if you have a build error: cRz-Shadows/Pokemon_Crystal_Legacy@356b7d2

Craig's overlaying button banner idea

originally implemented for Crystal Legacy

Nayru62/Pokemon_Crystal_Legacy@3c3c44b

Nayru's Pokedex 3.2.0 :  Final Dex 3.2 UI Layout

originally implemented for Crystal Legacy

plan to implement improvements to streamline customization process for UI

also have been requested to add options to lock moves/evo page behind requiring to catch

Area Empty page bug, Rattata

lots of optimization that could be done

had forgotten to update category text for rocksmash

added Electrode special encounter. Should develop method to hide the location but still give a hint

considering reordering the categories so the weird ones are shown first

Nayru's Pokedex v3.2.2

Map name updates. can fit 18 chars instead of just 17 once i adjust the pokegear code to conditionally place the text depending on string length

Nayru's Dex 3.2.3 minor evo page bug fix

Stats Evo method (tyrouge, hitmon*) was using the wrong VRAM 1 Lvl tile, converted to charmap for more clarity and redundancy.

also added more comments to help differentiate which VRAM the tiles are expecting to have their CGB layout attrmap

3.2.4 Base Stats Page, page num fix & erase A button if not caught on lore

if on page 3, then scroll up/down to next/prev mon, the base stats page doesnt land on the right page number, and is stuck on 1 past the normal max page. fixed by adding a const that automatically detects if there is max 3 pages (for using vanilla/StatEXP) or max of 4 pages (if you've replaced StatEXP with EVs) and then the reinitdexentry func in pokedex.asm uses this const to check and set the right page number.

also adds a func that simply erases the A button indicator and the page number if you hit the INFO (lore) button when you havent caught the mon yet. it now just shows the mon's species nickname

No longer displays dex lore/info, unless you've caught the pokemon. added UncaughtMon_Info_Erase_PageNum which erases the A button prompt and page num when this is the case

from my original CL commit:
fixed the base stats page num bug, added const in pokedex_stats_page.asm that sets the const value depending on if StatEXP or EVs are being used in the ROM, and more elegant solution in pokedex.asm

whirl islands map name edit, pokemart name edits

still need to add the conditional strlen check in pokegear to allow for max of 18 chars in each mapname. pokedex supports length of 18 without additional intervention

added python script that calculates the true map name strlen and alerts to over defined max length or missing delimiters

3.2.5 AREA TREEMONS minor bug COMMON/RARE const

doesnt seem to have made an impact in this version, but im still changing it for correctness, and because it DID impact pk16 leaving it may cause issues

missed breakpoint

v3.2.6 map name strlen in pokegear, 18 char mapnames update

verified with my script tools\check_map_names_length.py

PokeGear Time of Day Icons

trying other layouts but this is how i got the icons loaded, and how i finally figured out how to apply the palettes and have it stick. not the CGB Layout!

debug options

make rare candy free, offer rare candy and master balls in stores. unlock pokedex unseen mons. warp to radio tower in neighbor house in newbark to get card fast

v3.2.6: Fixing the max Stats Page bug AGAIN

tested all scenarios. problem was my sloppy coding in the reinit func. had made it more complicated than it needed to be.

Area page consts, and No more dependency on Expanded Tilesets

gender ratio is 7:1 not 8:1

Accounting for 'Increase Pokémon sprite animation size'

https://github.com/pret/pokecrystal/wiki/Increase-Pok%C3%A9mon-sprite-animation-size

the IF DEF logic seems iffy

Species Nickname bug fix

i dont know how i missed this one...
thanks timkun55

Uncompress PokedexLZ and SlowpokeLZ, account for Expanded Townmap tiles

v3.3.0 Adding Options File for increased compatibility

still need to accommodate USING_EXPANDED_TILESETS

and USE_COMPRESSED_POKEDEX_GFX

and some of the basic custom evolution method

fixed a stray pixel in types_dark.png

3.3.1 Minor change for options

3.3.2 Added option to use Compressed PokedexGFX

when using compressed GFX, a white flash appears when loading search menu, or when exiting the Area Map

Found to be compatible: 'Expand Tileset to 255'

removed from options, moved to faq

v3.3.3 Now supporting 'Evolve while holding an item'

Supports two versions of Evolve while holding an item

following this tutorial:

https://github.com/pret/pokecrystal/wiki/Evolve-while-holding-an-item

Instead of just one constant, you must differentiate between EVOLVE_HELD which has no lvl requirement (and no -1 delim) EVOLVE_HELD_LEVEL is for using the lvl requirement.

v3.3.4 Fixed minor bug with Main Dex Cursor

It copies the orange square scrolling list cursor from main list, but was copying the tile before the cursor had been loaded by Slowpoke GFX

v3.3.5 Updated options menu

removed redundant instructions

re-ordered the modes

after choosing color, returns you to the options screen, since you might want to change the mode too

got rid of the custom blurb strings for the options menu

Nayrus Pokedex v3.4 part 1: Hide Unseen Mons from Evo chart

still need to add Curse Type GFX

??? gfx added for EVO page

Nayrus Dex v3.4.1: Pics page animation fix, default snorlax special encounter text fixed

On the pics page, animated frontpic wasnt finishing the entire idle animation (like it does on the Stats screen). Just needed to change the duration of the animation.

In vanilla crystal, snorlax is encountered at lvl 50 not lvl 40.

Tweaked eevee's and Tyrogue's defaul;t hint blurbs
xaerochill pushed a commit to xaerochill/timecrystal that referenced this pull request Aug 19, 2024
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/pokecrystal#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

Battle enemy hud fix

Remember to check hall of fame for NO. tile weirdness

Minor Sync fixes with Type tiles GFX

Dex Tweaks 1 & minor tweaks

pokegear more readable, search mode and unown mode applies custom color

Added Dex Info Page

also removes the mewtwo color

Nayru's Dex 2.0

Developed originally on Crystal Legacy 1.2, rebased here for vanilla crystal with rgbasm 6.1

Fixing page counter bug for Surfing Area Dex

same fix as the walking/grass one, thanks Craig

EV code

Sorting out the EV/StatExp Handling for Stats page

Dex Area Map UI updates

wont affect pokegear and fly map

pokegear part of dex area map UI

UI Moved Type on Entry page, EVO arrows

and added up/down arrows to EVO, Current mon arrow, moved caught ball up by 1 on EVO page too

Pics page UI updates

Main UI updates

UI misc

Part 1 UI Overhaul

Part 1 UI Overhaul

UI Overhaul part 2

Moved Caught Ball Icon next to Dex #

top button banner comments

misc edits

celebi event ready

no nayru sprite

misc clean up
xaerochill pushed a commit to xaerochill/timecrystal that referenced this pull request Aug 19, 2024
Updating to current pret main, and upgrade to rgbasm v8.0

PlaceHLTextAtBC -> PrintTextboxTextAt

SetPalettes -> SetDefaultBGPAndOBP

Nayru's Pokedex

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/pokecrystal#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

Battle enemy hud fix

Remember to check hall of fame for NO. tile weirdness

Minor Sync fixes with Type tiles GFX

Dex Tweaks 1 & minor tweaks

pokegear more readable, search mode and unown mode applies custom color

Added Dex Info Page

also removes the mewtwo color

Nayru's Dex 2.0

Developed originally on Crystal Legacy 1.2, rebased here for vanilla crystal with rgbasm 6.1

Fixing page counter bug for Surfing Area Dex

same fix as the walking/grass one, thanks Craig

EV code

Sorting out the EV/StatExp Handling for Stats page

Dex Area Map UI updates

wont affect pokegear and fly map

pokegear part of dex area map UI

UI Moved Type on Entry page, EVO arrows

and added up/down arrows to EVO, Current mon arrow, moved caught ball up by 1 on EVO page too

Pics page UI updates

Main UI updates

UI misc

Part 1 UI Overhaul

Part 1 UI Overhaul

UI Overhaul part 2

Moved Caught Ball Icon next to Dex #

top button banner comments

misc edits

celebi event ready

no nayru sprite

misc clean up

Stats Page supports EVs, detects automatically

rangi_dex_tiles, removed extra, plus minor edits

Poliwag area bug fix

Tweaked logic to make sure we changed categories before stopping after printing 3rd entry per page, for both grass and surfing functions

Pokedex Functionality "Hints" Dialogue from Crystal Legacy

ported from Crystal Legacy commits: cRz-Shadows/Pokemon_Crystal_Legacy@6c49273

plus my edits: cRz-Shadows/Pokemon_Crystal_Legacy@d2f10b5

vanilla did not need to do this but it's related if you have a build error: cRz-Shadows/Pokemon_Crystal_Legacy@356b7d2

Craig's overlaying button banner idea

originally implemented for Crystal Legacy

Nayru62/Pokemon_Crystal_Legacy@3c3c44b

Nayru's Pokedex 3.2.0 :  Final Dex 3.2 UI Layout

originally implemented for Crystal Legacy

plan to implement improvements to streamline customization process for UI

also have been requested to add options to lock moves/evo page behind requiring to catch

Area Empty page bug, Rattata

lots of optimization that could be done

had forgotten to update category text for rocksmash

added Electrode special encounter. Should develop method to hide the location but still give a hint

considering reordering the categories so the weird ones are shown first

Nayru's Pokedex v3.2.2

Map name updates. can fit 18 chars instead of just 17 once i adjust the pokegear code to conditionally place the text depending on string length

Nayru's Dex 3.2.3 minor evo page bug fix

Stats Evo method (tyrouge, hitmon*) was using the wrong VRAM 1 Lvl tile, converted to charmap for more clarity and redundancy.

also added more comments to help differentiate which VRAM the tiles are expecting to have their CGB layout attrmap

3.2.4 Base Stats Page, page num fix & erase A button if not caught on lore

if on page 3, then scroll up/down to next/prev mon, the base stats page doesnt land on the right page number, and is stuck on 1 past the normal max page. fixed by adding a const that automatically detects if there is max 3 pages (for using vanilla/StatEXP) or max of 4 pages (if you've replaced StatEXP with EVs) and then the reinitdexentry func in pokedex.asm uses this const to check and set the right page number.

also adds a func that simply erases the A button indicator and the page number if you hit the INFO (lore) button when you havent caught the mon yet. it now just shows the mon's species nickname

No longer displays dex lore/info, unless you've caught the pokemon. added UncaughtMon_Info_Erase_PageNum which erases the A button prompt and page num when this is the case

from my original CL commit:
fixed the base stats page num bug, added const in pokedex_stats_page.asm that sets the const value depending on if StatEXP or EVs are being used in the ROM, and more elegant solution in pokedex.asm

whirl islands map name edit, pokemart name edits

still need to add the conditional strlen check in pokegear to allow for max of 18 chars in each mapname. pokedex supports length of 18 without additional intervention

added python script that calculates the true map name strlen and alerts to over defined max length or missing delimiters

3.2.5 AREA TREEMONS minor bug COMMON/RARE const

doesnt seem to have made an impact in this version, but im still changing it for correctness, and because it DID impact pk16 leaving it may cause issues

missed breakpoint

v3.2.6 map name strlen in pokegear, 18 char mapnames update

verified with my script tools\check_map_names_length.py

PokeGear Time of Day Icons

trying other layouts but this is how i got the icons loaded, and how i finally figured out how to apply the palettes and have it stick. not the CGB Layout!

debug options

make rare candy free, offer rare candy and master balls in stores. unlock pokedex unseen mons. warp to radio tower in neighbor house in newbark to get card fast

v3.2.6: Fixing the max Stats Page bug AGAIN

tested all scenarios. problem was my sloppy coding in the reinit func. had made it more complicated than it needed to be.

Area page consts, and No more dependency on Expanded Tilesets

gender ratio is 7:1 not 8:1

Accounting for 'Increase Pokémon sprite animation size'

https://github.com/pret/pokecrystal/wiki/Increase-Pok%C3%A9mon-sprite-animation-size

the IF DEF logic seems iffy

Species Nickname bug fix

i dont know how i missed this one...
thanks timkun55

Uncompress PokedexLZ and SlowpokeLZ, account for Expanded Townmap tiles

v3.3.0 Adding Options File for increased compatibility

still need to accommodate USING_EXPANDED_TILESETS

and USE_COMPRESSED_POKEDEX_GFX

and some of the basic custom evolution method

fixed a stray pixel in types_dark.png

3.3.1 Minor change for options

3.3.2 Added option to use Compressed PokedexGFX

when using compressed GFX, a white flash appears when loading search menu, or when exiting the Area Map

Found to be compatible: 'Expand Tileset to 255'

removed from options, moved to faq

v3.3.3 Now supporting 'Evolve while holding an item'

Supports two versions of Evolve while holding an item

following this tutorial:

https://github.com/pret/pokecrystal/wiki/Evolve-while-holding-an-item

Instead of just one constant, you must differentiate between EVOLVE_HELD which has no lvl requirement (and no -1 delim) EVOLVE_HELD_LEVEL is for using the lvl requirement.

v3.3.4 Fixed minor bug with Main Dex Cursor

It copies the orange square scrolling list cursor from main list, but was copying the tile before the cursor had been loaded by Slowpoke GFX

v3.3.5 Updated options menu

removed redundant instructions

re-ordered the modes

after choosing color, returns you to the options screen, since you might want to change the mode too

got rid of the custom blurb strings for the options menu

Nayrus Pokedex v3.4 part 1: Hide Unseen Mons from Evo chart

still need to add Curse Type GFX

??? gfx added for EVO page

Nayrus Dex v3.4.1: Pics page animation fix, default snorlax special encounter text fixed

On the pics page, animated frontpic wasnt finishing the entire idle animation (like it does on the Stats screen). Just needed to change the duration of the animation.

In vanilla crystal, snorlax is encountered at lvl 50 not lvl 40.

Tweaked eevee's and Tyrogue's defaul;t hint blurbs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Sync overworld sprite and battle animation sprite OAM constants+labels
4 participants