ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-22 11:20:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,273 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

7991 Commits

Author SHA1 Message Date
Eduardo Quezada D'Ottone
1cfb267b34 Config for Explosion halving defense 2022-07-18 13:10:27 -04:00
ghoulslash
f2ee9f3ba0 tweak z indicator position relative to healthbox 2022-07-18 09:44:04 -04:00
Eduardo Quezada D'Ottone
e55fea47f3 Added missing MOVE_UNAVAILABLE to Gorilla Tactics check 2022-07-18 09:24:08 -04:00
ghoulslash
18affe8c1a new z move indicator, credits to blackforest 2022-07-18 09:21:59 -04:00
Eduardo Quezada D'Ottone
1dcbf59686 Config for Plus and Minus interaction 2022-07-18 08:11:02 -04:00
sphericalice
65db9238e8
Give Pikachu its typing back 2022-07-18 09:41:04 +01:00
GriffinR
a8c93dcf35 Add missing font constants after EXT_CTRL_CODE_FONT 2022-07-18 02:36:25 -04:00
ghoulslash
f6b6ab56be some style fixes 2022-07-17 19:16:13 -04:00
ghoulslash
6b84a9f0b3 merge w be 2022-07-17 12:40:43 -04:00
ghoulslash
9b5aee3b93 fix z stat-boosts 2022-07-17 12:17:54 -04:00
GriffinR
165f51a295
Merge pull request #1701 from GriffinRichards/faint-cmd-name 
Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall
 2022-07-16 08:15:54 -04:00
ExpoSeed
da4d1bc626
Merge pull request #2176 from LOuroboros/patch-1 
Fixed Pokéblock Case's description
 2022-07-16 03:35:26 -05:00
LOuroboros
0651cc9fe4
Updated Cmd_handleballthrow 2022-07-16 05:09:32 -03:00
Eduardo Quezada D'Ottone
e791cf90ad Merge tag 'pretmaster' into BE_pretmerge2 
# Conflicts:
#	data/battle_anim_scripts.s
#	include/battle_anim.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/battle_main.h
#	include/battle_setup.h
#	include/constants/battle_anim.h
#	include/constants/battle_string_ids.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_fire.c
#	src/battle_anim_normal.c
#	src/battle_controllers.c
#	src/battle_dome.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/pokemon.c
 2022-07-15 12:58:46 -04:00
LOuroboros
26e03dcda8 Linked MENU_ACTION constants to the items in sStartMenuItems 2022-07-15 04:45:05 -03:00
LOuroboros
cec7e30ef1
Update battle_moves.h 2022-07-15 01:51:36 -03:00
GriffinR
16ab534ddb Add some missing pocket constant usage 2022-07-14 10:27:51 -04:00
GriffinR
f85b4699dc Fix conditional in SpriteCB_DeoxysRockFragment 2022-07-12 21:29:36 -04:00
Eduardo Quezada D'Ottone
f78bb4fb84 Merge remote-tracking branch 'pret/master' into item_expansion 
# Conflicts:
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-12 17:42:32 -04:00
Eduardo Quezada D'Ottone
c69275f373 Merge remote-tracking branch 'pret/master' into PE_pretmerge 
# Conflicts:
#	include/battle_anim.h
#	include/pokemon.h
#	src/data/pokemon/base_stats.h
 2022-07-12 17:20:49 -04:00
sphericalice
167353223c Use MAX_MON_MOVES in Cmd_trysetencore 2022-07-11 15:23:23 +01:00
sphericalice
186f2c0232 Introduce a MOVE_UNAVAILABLE constant 2022-07-11 15:18:13 +01:00
Greenphx9
4294682d8c 16-letter move names 
Move define, add spaces between comments, fix include
if TRUE -> if set to TRUE

Co-Authored-By: LOuroboros <lunosouroboros@gmail.com>
 2022-07-11 12:49:30 +10:00
GriffinR
06dc93fc2f Clean up field_poison.c 2022-07-06 21:04:54 -04:00
GriffinR
2c4c9497d2 Fix comment 2022-07-06 15:02:17 -04:00
GriffinR
e6a374f2b6 Rename faintifabilitynotdamp and jumpifattackandspecialattackcannotfall 2022-07-06 14:49:08 -04:00
LOuroboros
640974b164
Update items.h 2022-07-05 22:13:15 -03:00
LOuroboros
ce5aba16f6 Removed global and unused IsPinchBerryItemEffect 2022-07-05 18:24:50 -03:00
ghoulslash
fc81b4cac6 fix GetAiLogicData logic 2022-07-05 13:19:03 -04:00
Martin Griffin
c9958e3087 Simplify GetBattleTransitionTypeByMap 2022-07-05 14:17:46 +01:00
Martin Griffin
4e76ffb4ca Identify a % 16 2022-07-04 21:25:19 +01:00
Blackforest92
ff861ff963 Add some of Legends Arceus battle sprites 2022-07-04 12:28:40 +07:00
ghoulslash
3f739a8f3b AI_CalcDamage returns 0 for status moves 2022-07-03 17:23:59 -04:00
ghoulslash
57e110aa6a fix AI_GetEffectiveness declaration 2022-07-03 17:20:39 -04:00
ghoulslash
f0edbeb0b0 minor format fix 2022-07-03 16:31:00 -04:00
ghoulslash
fac6f21ed0 AI_EFFECTIVENESS_xY are enums 2022-07-03 16:28:34 -04:00
ghoulslash
e4bf99d777 merge w be 2022-07-03 16:20:05 -04:00
LOuroboros
3c9be7c3b2
Fixed Pokéblock Case's description 2022-07-03 13:36:00 -03:00
Blackforest92
8c88e8a9b7 Legends Arceus Pokemon 95% Finished 2022-07-03 17:15:37 +07:00
ghoulslash
ade935f6cf
Merge pull request #2167 from LOuroboros/ampedSyntax 
Syntax fixes for Toxel's evo methods
 2022-07-01 15:29:06 -04:00
LOuroboros
e2cc269b43 Updated syntax 2022-07-01 16:19:35 -03:00
ghoulslash
02a62e245b
Merge pull request #1992 from AsparagusEduardo/BE_WhiteOutMoney 
Config for lost money after losing a battle
 2022-07-01 11:58:36 -04:00
ghoulslash
1ddf3ca7e0
Merge pull request #2169 from Sneed69/inverse-flying 
Make ungrounded flying mons weak to ground in inverse battles
 2022-07-01 11:57:43 -04:00
ghoulslash
6cf0620f93
Merge pull request #2159 from Sneed69/trap-move-arrays 
Trap move battle string related code cleanup
 2022-07-01 11:07:28 -04:00
sneed
c1af418340 define B_MSG_WRAPPED_ constants 2022-07-01 17:52:46 +03:00
ghoulslash
5ed30b43a4
Merge pull request #2170 from Sneed69/best_type_matchup 
AI chooses most resistant mon instead of best offensive type
 2022-07-01 10:37:06 -04:00
ghoulslash
fc2cfd8c9d
Merge pull request #2136 from LOuroboros/pePretMerge 
Pret merge for the pokemon_expansion
 2022-07-01 09:22:55 -04:00
ghoulslash
a349462b78
Merge pull request #2134 from LOuroboros/bePretMerge 
Pret merge for the battle_engine
 2022-07-01 09:21:51 -04:00
ghoulslash
42f3cccdbe
Merge pull request #2154 from HamishSinclair/poltergeist 
add poltergeist animation
 2022-07-01 09:19:49 -04:00
ghoulslash
f4918222e8
Merge pull request #2156 from Sneed69/ai_3rd_type 
Type effectivess related AI bugfixes
 2022-07-01 09:09:12 -04:00