Suppai_Neko/PokemonEmeraldComplete
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,646 Commits 1 Branch 0 Tags
main
Commit Graph
5123 Commits
Author SHA1 Message Date
Eduardo Quezada 2cb54c49da Changed definitions of string conversion IDE macros to allow their use in compound literals without IDE errors 2023-03-14 15:38:18 -03:00
LOuroboros aefd318945 Applied review suggestions and expanded usage of activateAfterFaint in Cmd_setmoveeffect 2023-03-14 11:43:52 -03:00
Eduardo Quezada 0a9ab96390 Added STANDARD_FRIENDSHIP constant to allow easier custom adjustments 2023-03-14 08:54:49 -03:00
GriffinR 0c380862d6 Document the trendy saying word group 2023-03-13 15:58:40 -04:00
Alex aa29eced1f Merge branch 'rh-hideout:upcoming' into PLA_missing_sprites 2023-03-13 17:46:53 +01:00
W1serV1ser bbe087d27d Updated gamma names to color names 2023-03-12 12:34:34 -07:00
W1serV1ser 76ba156a5c Merge branch 'master' into FollowingPokemon_Gen1-3 2023-03-11 16:31:44 -08:00
DizzyEggg d695c76881 test for assist and removed assist array from battle struct 2023-03-08 22:11:28 +01:00
LOuroboros f06c040bca Updated the debug menu 
-Updated the text string used by Debug_FlagsNotSetMessage.
-Renamed Debug_FlagsNotSetMessage to Debug_FlagsNotSetOverworldConfigMessage.
-Added an equivalent for the battle config file called Debug_FlagsNotSetBattleConfigMessage,
-DEBUG_FLAG_NO_COLLISION -> OW_FLAG_NO_COLLISION
 -And moved it to include/config/overworld.h, because at the end of the day it's still an overworld flag just like the other 2 already in that file.
-Corrected miswritten preproc config in DebugAction_Flags_CatchingOnOff.
-Updated the comment that describes the effect of DEBUG_OVERWORLD_MENU reducing the number of characters a tiny bit and fixing a typo.
 2023-03-08 15:27:22 -03:00
GriffinR dbf757be88 Treat map data as const 2023-03-08 12:00:30 -05:00
LOuroboros fdebc994d2 Updated Supreme Overlord's effect's code 2023-03-07 19:14:38 -03:00
Eduardo Quezada D'Ottone 81a80e566c Refactor Mega Evolution indicator sprite (#2805) 2023-03-07 08:06:28 -03:00
DizzyEggg e055456b7e Fix Protean / Libero when AI calculates Damage (#2714) 
* Fix Protean / Libero when AI calculates Damage

* fix ai changing types when calculating dmg
 2023-03-07 09:34:26 +01:00
DizzyEggg a04046dbb6 Add tests for Defog and fix Defog battle strings (#2737) 
* start working on defog tests

* defog tests + improve terrain end battlescripts

* newline
 2023-03-06 20:35:08 +01:00
DizzyEggg 306c4565a0 merge 2023-03-06 15:32:28 +01:00
DizzyEggg d3d99c3f8c alpha omega indicator sprites use the same palete 2023-03-06 15:22:28 +01:00
GriffinR bb078e0618 Merge pull request #1864 from AsparagusEduardo/pret/doc/songsComments 
Document music usage to make it easier to search for a specific track
 2023-03-05 15:29:38 -05:00
Eduardo Quezada a6bd35ceab Review changes 2023-03-05 17:17:39 -03:00
ghoulslash dec1b16138 Swallow/Spit Up Gen 5 Behavior and tests for Swallow/Spit Up/Stockpile (#2790) 2023-03-05 09:50:47 -05:00
GriffinR ce6875817f Merge pull request #1860 from GriffinRichards/metatile-labels 
Format metatile_labels
 2023-03-04 23:36:04 -05:00
Eduardo Quezada 9917f5cc8b Merge remote-tracking branch 'pret/master' into RHH/sync/pret_20230303 
# Conflicts:
#	Makefile
#	include/constants/pokemon.h
#	include/pokemon.h
#	make_tools.mk
#	src/battle_ai_script_commands.c
#	src/battle_controllers.c
#	src/battle_main.c
#	src/battle_script_commands.c
#	src/party_menu.c
#	src/pokemon.c
#	src/trade.c
#	src/trainer_pokemon_sprites.c
 2023-03-03 11:00:50 -03:00
Alex 487e26e700 fix enamorus_t + samuroutt sprite + conflicts 2023-03-02 11:05:59 +01:00
LOuroboros fe735f9700 Applied review suggestions 
-Merged EFFECT_CEASELESS_EDGE and EFFECT_STONE_AXE into EFFECT_HIT_SET_ENTRY_HAZARD

-Updated gDmgHazardsStringIds and relevant battle scripts. Can't say that I like it at all. String tables are stupid imo.

-Coupled Barb Barrage's effect in CalcMoveBasePower with Venoshock's
 2023-03-02 01:39:44 -03:00
LOuroboros 23673c2e9d Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch1 2023-03-01 03:57:00 -03:00
GriffinR ec89e519f9 Merge pull request #1858 from AsparagusEduardo/pret/doc/fateful 
Rename eventLegal to modernFatefulEncounter
 2023-02-28 11:48:34 -05:00
Eduardo Quezada 3b27b602fd End of file 2023-02-28 00:09:43 -03:00
Eduardo Quezada 90021f3be6 Removed zMovePower field in gBattleMoves in favor of a function. 2023-02-27 23:49:43 -03:00
DizzyEggg c92a65dc40 Add config for stockpile raising def stats 2023-02-27 21:09:02 +01:00
GriffinR adf28c2f63 Merge pull request #1855 from GriffinRichards/doc-chat 
Add/correct some union room chat documentation
 2023-02-27 13:25:05 -05:00
GriffinR 8d88a38561 Merge pull request #1854 from GriffinRichards/constants-num-frames 
Add MAX_MON_PIC_FRAMES, and trainer pic size constants
 2023-02-27 13:16:49 -05:00
GriffinR 4a6ea87247 Merge pull request #1865 from AsparagusEduardo/pret/doc/species2 
Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarity
 2023-02-27 13:06:04 -05:00
DizzyEggg 3338a6b786 add messages for stockpile effects wear off 2023-02-27 12:31:29 +01:00
AgustinGDLV e537be76ea Z-moves bypass protection (#2730) 2023-02-27 09:17:07 +01:00
DizzyEggg 919fb184fe AI knows how to handle Illusion (#2726) 
* AI knows how to handle Illusion
 2023-02-27 09:12:52 +01:00
DizzyEggg 44d2cc7232 Fix bugs related to Trainer Slide messages (#2699) 
* start working on trainer slides

* use cmd->nextInstr
 2023-02-27 09:11:25 +01:00
DizzyEggg 4bdca43dbd refactor mega evolution indicator sprite 2023-02-26 12:51:35 +01:00
Zunawe f376b71f7c Fix wrong route in item flag name 2023-02-25 13:48:39 -08:00
Eduardo Quezada 31ab56bceb Fixed footprint symbol names. 2023-02-25 09:23:34 -03:00
Eduardo Quezada ca81d7a0f9 Forgot about Jangmo-o 2023-02-24 21:58:09 -03:00
Eduardo Quezada bbefee6bd4 Use proper symbol styles for Hakamo-O and Kommo-O 2023-02-24 15:22:58 -03:00
Eduardo Quezada 079ca8ab29 Renamed MON_DATA_SPECIES2 to MON_DATA_SPECIES_OR_EGG for clarification 2023-02-24 07:53:02 -03:00
Alex 48391d8eff Basculegion female form 2023-02-24 08:46:34 +01:00
Eduardo Quezada d330ca051a Document music usage to make it easier to search for a specific track 2023-02-23 11:44:23 -03:00
Eduardo Quezada f5aa3b8272 Document the 2 different sText_GotchaPkmnCaught 2023-02-23 11:43:40 -03:00
ghoulslash 827bf11307 Merge pull request #2660 from DizzyEggg/ace_voltswitch 
Fix Volt Switch / Roar with ace pokemon
 2023-02-23 09:20:18 -05:00
Alex a870ec3c22 enamorus_t cry, basculegionf sprite, new typhlosion back sprite 2023-02-23 15:20:12 +01:00
DizzyEggg dc83708443 Remove unused script BattleScript_TargetAbilityStatRaiseOnMoveEnd 2023-02-22 22:51:59 +01:00
Zunawe 60be59d18b Fix wrong route in hidden item flag name 2023-02-22 13:13:57 -08:00
Alex 1f694ae7ed missing pla sprites 2023-02-22 20:41:01 +01:00
DizzyEggg 877e3fd6af merge with upcoming 2023-02-22 19:27:42 +01:00