Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,854 Commits 1 Branch 0 Tags
Commit Graph

13536 Commits

Author SHA1 Message Date
GriffinR
0cc10a1ada Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize 2023-01-18 11:07:12 -05:00
GriffinR
4a9c4951ab
Merge pull request #1815 from tustin2121/patch-5 
Adding FindObjectEventPaletteIndexByTag bugfix
 2023-01-18 10:40:07 -05:00
GriffinR
a203c03eac Add bugfix to LoadObjectEventPalette 2023-01-18 10:33:39 -05:00
GriffinR
d68e81c2be Clarify MB_SEMI_DEEP_WATER name 2023-01-17 21:32:55 -05:00
LOuroboros
773e7f0de2 Fixed Explosion & Intimidate's 'interaction' 2023-01-17 22:16:42 -03:00
sbird
a7cd4ca592 [script-command, dynmultichoice] implement event handler 2023-01-17 21:49:06 +01:00
sbird
276ce62d95 [script-command, dynmultichoice] add shouldSort, initialSelected arguments. read pushed arguments front to back 2023-01-17 21:49:06 +01:00
sbird
569fa0a60a [script-command] add dynmultichoice 
* supports variable length arguments
 * automatically scrolls
 * supports building list menus from a stack
 2023-01-17 21:49:06 +01:00
GriffinR
d5a4bfcd6f
Merge pull request #1843 from GriffinRichards/colorize 
Colorize more grayscaled/incorrectly colored pngs
 2023-01-15 12:48:42 -05:00
Jaizu
a3ae182fc2
Add constants when using GetMonsStateToDoubles_2 2023-01-15 09:50:31 +01:00
GriffinR
c0e68f33f7 Colorize pokemon storage tiles 2023-01-15 00:39:51 -05:00
GriffinR
18384894e0
Merge pull request #1822 from AsparagusEduardo/pret/doc/typesEggGroups 
Made Types and Egg Groups into arrays
 2023-01-15 00:27:20 -05:00
Eduardo Quezada
70d59d6aa9 Improve Easy Chat documentation 2023-01-15 02:15:11 -03:00
GriffinR
387ea563fc Move FRLG trainer card gfx to own folder, fix tiles 2023-01-13 13:40:13 -05:00
GriffinR
1707f82992 Combine/colorize status graphics 2023-01-13 12:53:08 -05:00
Eduardo Quezada D'Ottone
6e1981369b
Fixed Exp Candy S using the XS description 2023-01-13 13:22:27 -03:00
Eduardo Quezada
ac4825ad28 Merge branch 'RHH/upcoming' into RHH/pr/feature/formBattleChange 
# Conflicts:
#	src/battle_util.c
 2023-01-13 11:50:47 -03:00
ghoulslash
c72274ee98
Merge pull request #2566 from AsparagusEduardo/RHH/pr/feature/breedBalls 
Config for ball inheritence when breeding
 2023-01-13 09:35:15 -05:00
GriffinR
ee3f5033b3 Colorize contest/interface.png 2023-01-13 00:26:40 -05:00
Ariel A
244f3ceb15 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-01-12 21:58:39 -05:00
Ariel A
7b40e481ce Improved saving & loading expanded OWs. 2023-01-12 21:45:41 -05:00
Ariel A
3a0dc0f4f6 Reworked how OW pokemon's graphics are loaded. 2023-01-12 21:45:36 -05:00
Ariel A
5d5d97b46a Fixed most functions that take/return graphicsIds to accept u16s. 2023-01-12 21:44:56 -05:00
Eduardo Quezada
77cc407386 Review change 2023-01-12 23:44:34 -03:00
GriffinR
12cbb0b30f Colorize and combine birch_bag/birch_grass 2023-01-12 15:22:23 -05:00
GriffinR
5b3596108d Add some missing PARTY_SIZE usage 2023-01-12 10:51:20 -05:00
Bassoonian
3b4cba9b51
Apply suggestions from code review 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2023-01-11 14:11:47 +01:00
Bassoonian
333917941b Add PLA+ obedience mechanics (with config) 2023-01-11 08:15:57 +01:00
GriffinR
b873d69679 Sync trade anim 2023-01-09 15:32:04 -05:00
LOuroboros
bdcc84f019 Updated the implementation 2023-01-09 15:18:22 -03:00
LOuroboros
dccceb9689 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into iceFaceRedux 2023-01-09 14:59:41 -03:00
ghoulslash
cc7c546011
Merge pull request #2473 from LOuroboros/mimicry 
Reimplemented Mimicry
 2023-01-09 12:54:44 -05:00
LOuroboros
ba21ffb3f2 Oopsie. Protosynthesis is NOT a terrain ability 2023-01-09 14:37:18 -03:00
LOuroboros
620a6a5e90 Extra review changes 
-Foolproofed the ability checks in ABILITYEFFECT_ON_WEATHER and ABILITYEFFECT_ON_TERRAIN
-Made BattleScript_OverworldWeatherStarts and BattleScript_OverworldTerrain call the battle scripts that handle weather form changes, weather abilities, terrain seeds and terrain abilities.
-Consequentially, I removed the activation for weather and terrain abilities that I added to TryDoEventsBeforeFirstTurn, and the activation of Protosynthesis in ABILITYEFFECT_ON_SWITCHIN.
-Added a weatherAbilityDone to prevent abilities that lack self-checks like Protosynthesis from getting stuck in a loop.
-Removed now pointless ABILITYEFFECT_WEATHER_FORM. I think Duke/Sneed69 added it to fix Castform's form change, but it no longer serves a purpose.
 2023-01-09 14:22:14 -03:00
LOuroboros
91b2e1bb50 More review changes and added lackings 
-Removed unnecessary special handling of terrain-inducing overworld weather states from ChangeTypeBasedOnTerrain.
-Mimicry now activates normally for terrain-inducing overworld weather states.
-Weather abilities now activate normally when switchineffects is called, and at the beginning of a battle.
-Terrain abilities now activate normally at the beginning of a battle.
 2023-01-09 07:55:55 -03:00
Eduardo Quezada
1b0ce96e12 Config for ball inheritence when breeding 2023-01-09 02:16:29 -03:00
LOuroboros
c32f584940 Applied review changes 2023-01-08 19:50:27 -03:00
Eduardo Quezada
612ef46d82 Forgot to add these suggestions 2023-01-08 19:26:34 -03:00
Eduardo Quezada
911541ba4f Merge branch 'RHH/upcoming' into RHH/pr/feature/IncenseBaby 
# Conflicts:
#	include/config/pokemon.h
 2023-01-08 18:48:01 -03:00
Eduardo Quezada
c5ea97ecc3 Review changes 2023-01-08 18:42:39 -03:00
Eduardo Quezada
9250f8c994 Standarized Pichu/Light Ball/Volt Tackle interaction into their own table, allowing for custom combinations 2023-01-08 18:35:47 -03:00
ghoulslash
da27df9f18
Merge pull request #2326 from AsparagusEduardo/RHH/pr/reworkScald 
Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change
 2023-01-08 16:25:29 -05:00
Ariel A
72e723df65 Expanded graphicsId field. 2023-01-07 19:54:12 -05:00
GriffinR
c91b13a12b Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows 2023-01-07 13:30:11 -05:00
Eduardo Quezada D'Ottone
7622d84a4f
Revert "Removed Unown hack" 2023-01-07 11:39:56 -03:00
Eduardo Quezada
d72a3731d4 Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald 
# Conflicts:
#	include/constants/battle_move_effects.h
 2023-01-06 15:25:49 -03:00
LOuroboros
f39f48fc51 Made MOVE_EFFECT_DIRE_CLAW a tiny bit prettier 2023-01-05 03:07:28 -03:00
LOuroboros
72566e6323 Turned Stone Axe's and Ceaseless Edge's effects into MOVE_EFFECTs 2023-01-05 03:02:56 -03:00
Eduardo Quezada D'Ottone
34d27eca0e
Merge pull request #2457 from AsparagusEduardo/RHH/pr/cleanup/unown 
Removed Unown hack
 2023-01-04 18:57:28 -03:00
Eduardo Quezada
74d8c587fe Merge branch 'RHH/upcoming' into RHH/pr/cleanup/unown 
# Conflicts:
#	src/data/pokemon/species_info.h
#	src/data/pokemon_graphics/front_pic_anims.h
 2023-01-04 17:58:54 -03:00