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
Eduardo Quezada D'Ottone
6fcbc4c074
Merge pull request #2012 from LOuroboros/patch-2
...
Update battle_ai_util.c
2021-12-30 07:32:30 -03:00
LOuroboros
34c6e6ca31
Update battle_ai_util.c
2021-12-30 01:48:56 -03:00
Eduardo Quezada D'Ottone
5b54986e6b
Merge pull request #1980 from LOuroboros/multiBattles
...
Multi battle updates
2021-12-29 22:09:06 -03:00
Eduardo Quezada D'Ottone
ba43280a7c
Refactored Instruct to use the regular forbidden move lookup table
2021-12-29 21:04:15 -03: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
Eduardo Quezada D'Ottone
16398d4dc6
Merge pull request #2009 from LOuroboros/patch-2
...
Update pokemon.h
2021-12-28 22:49:10 -03: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
Eduardo Quezada D'Ottone
1d12b01615
Merge pull request #2008 from LOuroboros/globalWarming
...
Fixed struct names
2021-12-28 15:13:52 -03:00
LOuroboros
ce7815ebcc
Update pokemon.h
2021-12-28 15:11:52 -03:00
LOuroboros
677da7b5e7
Fixed struct names
2021-12-28 14:48:57 -03:00
LOuroboros
cc1a243145
Update src/battle_script_commands.c
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-12-28 12:18:44 -03:00
GriffinR
ee5e65d9ed
Rename generic title screen tilemaps
2021-12-28 03:57:44 -05:00
GriffinR
f554f09aed
Merge pull request #1582 from LOuroboros/patch-2
...
Update main_menu.c
2021-12-27 16:29:08 -05:00
W1serV1ser
e0f7e7a2d9
Updated variable name in MOVEEND_SKY_DROP_CONFUSE
2021-12-27 12:10:38 -08:00
Eduardo Quezada D'Ottone
e405bd8ad3
Merge pull request #2005 from LOuroboros/evoMoves
...
Implemented evolution moves
2021-12-26 17:24:37 -03:00
LOuroboros
3f010d9aa8
Tweaked GiveBoxMonInitialMoveset
...
Otherwise, Pokémon would be generated with their evo moves learned.
2021-12-26 17:13:36 -03:00
LOuroboros
86ed53997b
Update src/pokemon.c
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-12-26 12:39:56 -03:00
LOuroboros
96012ba065
Update src/pokemon.c
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2021-12-26 12:39:45 -03:00
Eduardo Quezada D'Ottone
4d6f54e8d6
Merge pull request #2007 from ghoulslash/be/roleplay
...
Update Role Play
2021-12-25 11:37:57 -03:00
LOuroboros
599ca58059
Update main_menu.c
2021-12-25 07:04:19 -03:00
Eduardo Quezada D'Ottone
7bffe6d1d5
Merge pull request #2004 from ghoulslash/be/sports
...
Add sport effects back
2021-12-24 18:59:50 -03:00
Eduardo Quezada D'Ottone
75fbc5c0ab
Merge pull request #1981 from ghoulslash/be/aquaring
...
Fix aqua ring heal anim
2021-12-24 15:11:28 -03:00
ghoulslash
93a7e139ec
merge w be
2021-12-24 09:40:12 -05:00
GriffinR
84925a892b
Merge pull request #1576 from Kurausukun/aif2pcm16
...
Accept 16-bit AIFF Files and Convert to 8-bit
2021-12-24 02:48:48 -05:00
GriffinR
94c2b7f1c6
Merge pull request #1581 from LOuroboros/patch-2
...
Fixed typo in src/battle_script_commands.c
2021-12-24 00:07:24 -05:00
LOuroboros
03205c995d
Update battle_script_commands.c
2021-12-24 01:59:40 -03:00
Eduardo Quezada D'Ottone
2ebe427a42
Merge branch 'BattleEngine' into BE_wildNaturalEnemies
...
# Conflicts:
# src/battle_controller_opponent.c
2021-12-23 21:19:59 -03:00
ghoulslash
770224d341
increase TEXT_BUFF_ARRAY_COUNT for expanded ability names
2021-12-23 18:58:15 -05:00
WiserVisor
8923ffb3af
Merge branch 'battle_engine' into battle_engine
2021-12-23 15:29:10 -08:00
Eduardo Quezada D'Ottone
934ffd5a7e
Merge pull request #2002 from LOuroboros/gen78footprints
...
Added the footprints of all Gen. 7 and 8 species
2021-12-23 20:28:55 -03:00
W1serV1ser
58a5a9cbec
Simplified skyDropTargets storage and made other minor improvements
...
A lot of these changes are based on ghoulslash's version of Sky Drop.
2021-12-23 15:27:11 -08:00
Eduardo Quezada D'Ottone
a725592a6b
Merge pull request #1999 from ghoulslash/be/moveeffect
...
More battle-will-end checks on stat-changing damaging effects
2021-12-23 20:23:16 -03:00
Eduardo Quezada D'Ottone
67697d2de3
Merge pull request #1582 from ghoulslash/smart_wild_ai
...
Smart Wild AI Option
2021-12-23 20:18:18 -03:00
ghoulslash
0a95a31ee9
fix formatting
2021-12-23 08:44:54 -05:00