GriffinR
429d53b95c
Use runningState directly in CheckMovementInputNotOnBike
2022-01-09 11:12:35 -05:00
GriffinR
8b920691e6
Fix FLAG_DECORATION_0 name
2022-01-09 01:31:42 -05:00
GriffinR
8f1a760937
Add missing array constants in field_player_avatar
2022-01-08 23:55:26 -05:00
Eduardo Quezada D'Ottone
1374662998
Merge pull request #2030 from LOuroboros/patch-2
...
Update NUM_TECHNICAL_MACHINES
2022-01-08 21:42:54 -03:00
LOuroboros
5281fe63fc
Update NUM_TECHNICAL_MACHINES
2022-01-08 21:27:29 -03:00
GriffinR
30dbf3f858
Merge pull request #1595 from sphericalice/patch-3
...
Remove unneeded brackets in GetWeekCount
2022-01-08 17:44:25 -05:00
sphericalice
6a21c3f5f3
Remove unneeded brackets in GetWeekCount
2022-01-08 20:39:45 +00:00
GriffinR
ca9bc34bea
Clean up pokemon_storage_system graphics
2022-01-07 17:36:38 -05:00
GriffinR
5cbe572607
Add window constants in pokemon_storage_system
2022-01-07 17:05:58 -05:00
GriffinR
a837d1fe2c
Merge pull request #1593 from laqieer/master
...
Fix macro v069 in sound/MPlayDef.s
2022-01-07 12:09:51 -05:00
laqieer
1c6232bc2e
Fix macro v069 in sound/MPlayDef.s
2022-01-08 00:58:05 +08:00
GriffinR
577e6cc740
Merge pull request #1586 from GriffinRichards/clean-areascreen
...
Clean up pokedex_area_screen
2022-01-06 23:02:23 -05:00
GriffinR
713cd6616e
Add glow tile empty
2022-01-06 22:33:00 -05:00
GriffinR
71e0b480a9
Merge pull request #1591 from kiliwily/master
...
Fix brackets inconsistency in field_specials.c
2022-01-06 13:58:06 -05:00
kiliwily
8a9740b819
Update field_specials.c
2022-01-06 19:47:56 +01:00
kiliwily
ba9b533845
Revert "Update field_specials.c"
...
This reverts commit f67137ddb2
.
2022-01-06 19:45:38 +01:00
kiliwily
f67137ddb2
Update field_specials.c
2022-01-06 19:29:58 +01:00
GriffinR
d4111d5520
Add comment about pokedex reordering
2022-01-05 14:50:19 -05:00
GriffinR
5d033c2e4d
Convert pokedex defines to enums
2022-01-05 12:18:49 -05:00
GriffinR
ce55e58ad8
Misc cleanup
2022-01-04 10:09:42 -05:00
GriffinR
45e8cd4b84
Merge pull request #1589 from sphericalice/patch-2
...
Use SPECIES_NONE and ITEM_NONE in battle_tower.c
2022-01-04 08:55:33 -05:00
sphericalice
48bf1ab98d
Use SPECIES_NONE and ITEM_NONE in battle_tower.c
2022-01-04 13:46:46 +00:00
Eduardo Quezada D'Ottone
4f9e6faa48
Merge branch 'item_expansion' into flingIE
2022-01-02 18:31:03 -03:00
GriffinR
ac47489216
Merge pull request #1588 from sphericalice/patch-1
...
Use TEXT_SKIP_DRAW in CreateAvailableDecorationsMenu
2022-01-02 16:09:31 -05:00
sphericalice
2d536bf560
Use TEXT_SKIP_DRAW in CreateAvailableDecorationsMenu
2022-01-02 21:02:53 +00:00
Eduardo Quezada D'Ottone
797f41920c
Merge pull request #2013 from LOuroboros/items
...
Filled in missing item data
2022-01-01 19:45:00 -03:00
LOuroboros
b88d9c4cdc
Updated gItemEffectTable
...
-Rearranged the entries therein, keeping them consistent with the item ID order.
-Removed pointless duplicates of certain effects such as the Full Heal's.
-Added entries for the items that needed one.
-gItemEffect_EvoStone -> gItemEffect_EvoItem.
2022-01-01 19:02:40 -03:00
LOuroboros
5cdfe0a9fb
Fixed the Lures and adjusted 2 charms' descriptions
2022-01-01 18:03:00 -03:00
LOuroboros
74aa4f29df
Corrections and additions
...
-Fixed a handful of prices
-Re-added the Todo comment to the entries of the TMs 51-100 in gItemIconTable.
-Added the data and sprites of the LGPE Lures, thanks to AsparagusEduardo.
-Fixed small syntax mistakes in src/data/text/item_descriptions.h
-Slightly changed some item descriptions based on AsparagusEduardo's suggestions.
-Fixed the Exp. Charm's description, and the usage of "Exp." in the Exp. Candies' descriptions.
2022-01-01 17:17:21 -03:00
Eduardo Quezada D'Ottone
b25c89f8a1
Removed Redundant Key Stone item
2021-12-31 18:22:23 -03:00
LOuroboros
9b1fd796ae
Gave the Gracidea's old hold effect slot to the Enigma Berry
2021-12-31 18:07:33 -03:00
Eduardo Quezada D'Ottone
313df31e7e
Removed Jade Orb, since it has no use besides being a key-lock item.
2021-12-31 17:44:03 -03:00
LOuroboros
0c5652596b
Removed HOLD_EFFECT_GRACIDEA
2021-12-31 17:34:16 -03:00
LOuroboros
e961bdee14
Fixes
...
-Used Buffel Saft's sprite for the Ability Patch.
-Fixed the Mints' descriptions.
-Fixed the Damp Mulch's palette.
-Decapped the Pokémon Box Link's name.
-Fixed the target pocket of the Key Stone and the Dynamax Band.
2021-12-31 17:10:02 -03:00
LOuroboros
c70e73713f
Added the missing items' sprites
2021-12-31 16:28:05 -03:00
LOuroboros
5a8e51d858
Filled in missing items' sprite data
2021-12-31 16:27:06 -03:00
GriffinR
434086be69
Merge pull request #1585 from sphericalice/patch-2
...
Update field_specials.c to match the style
2021-12-31 12:39:43 -05:00
sphericalice
61a0036c47
Clarify ScrollableMultichoice_ProcessInput comment
2021-12-31 17:34:46 +00:00
sphericalice
9e660b2cdf
Update src/field_specials.c
...
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2021-12-31 16:29:11 +00:00
sphericalice
4f6323606f
Update field_specials.c to match the style
2021-12-31 16:24:44 +00:00
LOuroboros
d4dc672088
Filled in missing item data
2021-12-31 13:23:06 -03:00
GriffinR
23f5c9fd5c
Clean up pokedex_area_screen
2021-12-31 00:16:56 -05:00
GriffinR
643cc62f73
Merge pull request #1584 from sphericalice/patch-1
...
Remove some magic numbers from TryPushBoulder
2021-12-30 09:00:08 -05:00
sphericalice
50522fdea4
Remove some magic numbers from TryPushBoulder
2021-12-30 12:21:47 +00:00
GriffinR
4192a40adf
Merge pull request #1583 from GriffinRichards/renametilemaps
...
Give less generic names to some tilemaps, some misc fixes
2021-12-29 00:57:37 -05:00
GriffinR
aadab8b016
Move pokemon and easy chat constants to global, misc clean-up
2021-12-28 18:07:41 -05:00
GriffinR
aba5264260
RGB macro use in slot_machine
2021-12-28 17:46:05 -05:00
GriffinR
4fc345fff5
Rename unused frontier pass tilemap
2021-12-28 14:54:09 -05:00
GriffinR
3acf002a9c
Rename generic jp contest tilemaps
2021-12-28 13:16:40 -05:00
GriffinR
ee5e65d9ed
Rename generic title screen tilemaps
2021-12-28 03:57:44 -05:00