ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,351 Commits 1 Branch 0 Tags 235 MiB
b3ffc9d1c4
Commit Graph

12351 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GriffinR
9be0818b78 Fix intro/scene_1 tiles 2023-01-14 00:48:58 -05:00
GriffinR
9c34bc2385 Colorize picture_frame tiles 2023-01-13 15:30:57 -05: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
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
0064db7a6d Correct colors for frontier_pass 2023-01-13 02:25:23 -05:00
GriffinR
ee3f5033b3 Colorize contest/interface.png 2023-01-13 00:26:40 -05:00
Eduardo Quezada
77cc407386 Review change 2023-01-12 23:44:34 -03:00
GriffinR
52e00ac603 Correct colors in summary_screen/tiles.png 2023-01-12 21:41:06 -05:00
GriffinR
3a253ece0f Fix some colors in crusher.png 2023-01-12 19:04:49 -05:00
GriffinR
89286c91e3
Merge pull request #1842 from GriffinRichards/gbagfx-pals 
Automatically constrain png pixels to bit depth
 2023-01-12 16:36:05 -05:00
GriffinR
a12432a0f3 Colorize crusher.png 2023-01-12 16:34:36 -05:00
GriffinR
12cbb0b30f Colorize and combine birch_bag/birch_grass 2023-01-12 15:22:23 -05:00
GriffinR
863779afbb Colorize rayquaza_scene/scene_1/clouds.png 2023-01-12 14:56:44 -05:00
GriffinR
0fd0eb7163 Colorize cable_car/bg.png 2023-01-12 14:47:04 -05:00
GriffinR
68f97d02f4 Colorize menu_info.png 2023-01-12 13:17:31 -05:00
GriffinR
cf14c1fd13 Colorize mirage_tower.png 2023-01-12 11:40:15 -05:00
GriffinR
5b3596108d Add some missing PARTY_SIZE usage 2023-01-12 10:51:20 -05:00
Eduardo Quezada D'Ottone
fa61f6a238
Merge pull request #2569 from Bassoonian/gen9moves 
Add PLA+ obedience mechanics (with config)
 2023-01-11 18:24:07 -03:00
GriffinR
3009cc7220 Colorize door animations that use multiple palettes 2023-01-11 13:31:17 -05:00
GriffinR
3ee3d6e346 Support reducing png bit depth 2023-01-11 10:11:11 -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
ghoulslash
5eb62199cd
Merge pull request #2255 from LOuroboros/iceFaceRedux 
Implemented Ice Face
 2023-01-09 17:24:33 -05: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
Eduardo Quezada
f8c9e7af40 Fixed config comment 2023-01-09 11:06:27 -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
ghoulslash
05e9bfeedf
Merge pull request #2531 from AsparagusEduardo/RHH/pr/feature/IncenseBaby 
Refactored incense baby checks into table and added Gen 9 config.
 2023-01-08 19:14:53 -05: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
Eduardo Quezada D'Ottone
335be4db5b
Merge pull request #2562 from rh-hideout/revert-2457-RHH/pr/cleanup/unown 
Revert "Removed Unown hack"
 2023-01-07 22:21:21 -03: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
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 D'Ottone
11c3e9c7f8
Merge pull request #2318 from AsparagusEduardo/RHH/pr/palleteConversion2 
Gen 1-5 Palette Conversion Redemption
 2023-01-04 18:03:07 -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
Eduardo Quezada
55be15f690 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2 
# Conflicts:
#	include/config/pokemon.h
 2023-01-04 16:19:57 -03:00
ghoulslash
1d2cb49bc6
Merge pull request #2542 from AsparagusEduardo/RHH/pr/config/multiTargetDmg 
Config to restore Gen 3's damage reduction to multi target moves
 2023-01-04 09:18:39 -05:00