Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The Indigo Disk Item/Move/Ability ids #3727

Merged
merged 4 commits into from
Dec 14, 2023
Merged

The Indigo Disk Item/Move/Ability ids #3727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc3fecd
Reserve ability ids
Bassoonian Dec 14, 2023
122463c
Reserve item ids (base64 encoding for reference)
Bassoonian Dec 14, 2023
2896961
Reserve move ids
Bassoonian Dec 14, 2023
dd9e88c
Merge branch 'upcoming' into indigodiskids
AlexOn1ine Dec 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion include/constants/abilities.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,12 @@
#define ABILITY_EMBODY_ASPECT_CORNERSTONE 304
#define ABILITY_TOXIC_CHAIN 305
#define ABILITY_SUPERSWEET_SYRUP 306
#define ABILITY_307 307
#define ABILITY_308 308
#define ABILITY_309 309
#define ABILITY_310 310

#define ABILITIES_COUNT_GEN9 307
#define ABILITIES_COUNT_GEN9 311

#define ABILITIES_COUNT ABILITIES_COUNT_GEN9

Expand Down
4 changes: 3 additions & 1 deletion include/constants/items.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -986,8 +986,10 @@
#define ITEM_SWIFT_MOCHI 811
#define ITEM_FRESH_START_MOCHI 812
#define ITEM_GLIMMERING_CHARM 813
#define ITEM_814 814 // TWV0YWwgQWxsb3k=
#define ITEM_815 815 // U3RlbGxhciBUZXJhIFNoYXJk

#define ITEMS_COUNT 814
#define ITEMS_COUNT 816
#define ITEM_FIELD_ARROW ITEMS_COUNT

// A special item id associated with "Cancel"/"Exit" etc. in a list of items or decorations
Expand Down
17 changes: 16 additions & 1 deletion include/constants/moves.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -890,8 +890,23 @@
#define MOVE_MATCHA_GOTCHA 830
#define MOVE_SYRUP_BOMB 831
#define MOVE_IVY_CUDGEL 832
#define MOVE_833 833
#define MOVE_834 834
#define MOVE_835 835
#define MOVE_836 836
#define MOVE_837 837
#define MOVE_838 838
#define MOVE_839 839
#define MOVE_840 840
#define MOVE_841 841
#define MOVE_842 842
#define MOVE_843 843
#define MOVE_844 844
#define MOVE_845 845
#define MOVE_846 846
#define MOVE_847 847

#define MOVES_COUNT_GEN9 833
#define MOVES_COUNT_GEN9 848

#define MOVES_COUNT MOVES_COUNT_GEN9

Expand Down
Loading