Skip to content

Commit

Permalink
Merge branch 'logictest' of https://github.com/coveleski/rb2 into log…
Browse files Browse the repository at this point in the history
…ictest
  • Loading branch information
coveleski committed May 15, 2024
2 parents 07c1fe8 + f47382d commit b6b9961
Show file tree
Hide file tree
Showing 8 changed files with 176 additions and 107 deletions.
Binary file added images/items/champ.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/items/itemicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/items/itemicon_opened.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions items/items.json
Original file line number Diff line number Diff line change
Expand Up @@ -340,5 +340,11 @@
"type": "toggle",
"img": "images/items/silph.png",
"codes": "silphco"
},
{
"name": "Beat the Champ",
"type": "toggle",
"img": "images/items/champ.png",
"codes": "champ"
}
]
12 changes: 12 additions & 0 deletions items/options.json
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,12 @@
"codes": "free_fly, fly_vermilion",
"inherit_codes": false
},
{
"name": "Lavender",
"img": "images/items/flavender.png",
"codes": "free_fly, fly_lavender",
"inherit_codes": false
},
{
"name": "Celadon",
"img": "images/items/fceladon.png",
Expand Down Expand Up @@ -544,6 +550,12 @@
"codes": "tm_free_fly, fly_vermilion",
"inherit_codes": false
},
{
"name": "Lavender",
"img": "images/items/mlavender.png",
"codes": "tm_free_fly, fly_lavender",
"inherit_codes": false
},
{
"name": "Celadon",
"img": "images/items/mceladon.png",
Expand Down
Loading

0 comments on commit b6b9961

Please sign in to comment.