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

8381 Commits

Author SHA1 Message Date
LOuroboros
ae482ed1f4 Implemented Ceaseless Edge's effect 2022-12-21 19:47:00 -03:00
Eduardo Quezada D'Ottone
da535fc8f1
Merge pull request #2530 from mrgriffin/rhh-setroost-cleanup 
Minor Roost fixes/cleanup
 2022-12-21 17:04:14 -03:00
ghoulslash
dba1aa4f0b fix ai helping hand 2022-12-21 12:05:38 -05:00
Eduardo Quezada D'Ottone
42d2bee519
Merge pull request #2527 from mrgriffin/rhh-cleanup-handle-terrain-move 
Cleanup HandleTerrainMove
 2022-12-21 12:21:46 -03:00
Martin Griffin
632ec92475 Minor Roost changes 
- Fix 'mon with Flying in type3 but not type1 or type2 is set to
  uninitialized roostTypes.
- Remove unread third roostTypes element.
- Option for Gen IV pure-Flying behavior.
 2022-12-21 14:52:01 +00:00
Philipp AUER
766c0140ee
Refactor sInverseTypeEffectivenessTable to implicit lookup (#2528) 
* [refactor, battle_util] replace sInverseTypeEffectivenessTable LUT by implicit lookup

* [review, style, squashme] update switch/case codestyle

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>

* [review, squashme] merge code branches

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

Co-authored-by: sbird <sbird@no.tld>
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-12-20 22:48:41 -03:00
Martin Griffin
682c59869b Cleanup HandleTerrainMove 2022-12-20 21:28:54 +00:00
ghoulslash
79fa2c79e2
Merge pull request #2517 from LOuroboros/speed_swap 
Fixed Speed Swap's effect
 2022-12-19 08:56:36 -05:00
Eduardo Quezada
bd7d949f5f Fixed B_DOUBLE_WILD_CHANCE becoming 1% less than what's set 2022-12-18 13:49:02 -03:00
LOuroboros
089104cd9c
Update battle_script_commands.c 2022-12-18 10:35:58 -03:00
LOuroboros
4f951b7887
Updated ENDTURN_PLASMA_FISTS 2022-12-17 03:44:19 -03:00
Eduardo Quezada
c03f354dca Finished cleaning up the animations to the new standard 2022-12-16 20:58:41 -03:00
Eduardo Quezada
6a57dcdc4c Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20221216 
# Conflicts:
#	src/data.c
#	src/data/pokemon_graphics/front_pic_anims.h
 2022-12-16 19:19:23 -03:00
Eduardo Quezada D'Ottone
0dca5a5230
Merge pull request #2516 from LOuroboros/patch-1 
Updated SetMoveEffect
 2022-12-15 18:10:08 -03:00
LOuroboros
852f06deea Updated SIDE constant usages 2022-12-15 17:44:56 -03:00
LOuroboros
7c447a1f62 Small corrections 2022-12-14 12:09:16 -03:00
LOuroboros
4c9446ed0a Fixed Speed Swap's effect 2022-12-14 12:00:45 -03:00
LOuroboros
af6ea91e72 Applied Eduardo's suggestion 2022-12-14 10:48:12 -03:00
LOuroboros
37151e4a2d Updated SetMoveEffect 2022-12-14 10:46:11 -03:00
ghoulslash
340278c83b
Merge pull request #2452 from LOuroboros/intimidate 
Optimized Intimidate's code
 2022-12-11 22:04:16 -05:00
Bassoonian
07a8af5975 Set FLAG_SYS_POKEMON_GET when debug gifting yourself a Pokémon 2022-12-11 22:09:23 +01:00
ghoulslash
e3e0d60222
Merge pull request #2467 from Bassoonian/gen9moves 
Generation IX Moves
 2022-12-11 14:47:47 -05:00
Eduardo Quezada
2f96344cd9 Removed ANIM_CMD macro from unused_anims.h 2022-12-10 11:46:41 -03:00
Eduardo Quezada D'Ottone
3718f58a0a
Merge pull request #2469 from LOuroboros/patch-1 
Updated TryChangeBattleTerrain
 2022-12-05 23:40:52 -03:00
LOuroboros
f9458117ee
Updated TryChangeBattleTerrain 2022-12-05 23:31:41 -03:00
Eduardo Quezada
2d694a84e3 Trying to fix remote reference 2022-12-05 21:57:28 -03:00
Bassoonian
8c77ae59d6 Use official Double Shock message 2022-12-04 21:57:02 +01:00
Bassoonian
06ab4fc842 Update move flags 2022-12-04 21:56:40 +01:00
Bassoonian
b0ead44ee8 Update battle_tv.c 2022-12-04 21:23:45 +01:00
Bassoonian
5bcb6b8afd Update B_METRONOME_MOVES 2022-12-04 18:16:15 +01:00
Bassoonian
dc97a31c31 Change battle_debug.c to MOVES_COUNT 2022-12-04 18:15:35 +01:00
Bassoonian
c14fa82f43 Fix Headlong Rush description 2022-12-04 18:14:27 +01:00
Bassoonian
051ad7bf69 Update src/data/text/move_descriptions.h 
Co-Authored-By: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-12-04 00:26:05 +01:00
GriffinR
f55443656f Add NUM_TILES_PER_METATILE 2022-12-03 17:29:02 -05:00
ghoulslash
6140cacbef set BS_SCRIPING before BattleScript_TrainerSlideMsgRet 2022-11-29 18:28:33 -05:00
Eduardo Quezada
9d1149c423 Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221124 
# Conflicts:
#	src/pokemon.c
 2022-11-29 17:40:09 -03:00
ghoulslash
b869b836cc add callnative bs func, convert metal burst dmg calc 2022-11-28 10:34:27 -05:00
ghoulslash
1037613b0e
Merge pull request #2418 from LOuroboros/zPP 
Made Z-Moves unusable without PP
 2022-11-28 09:52:28 -05:00
ghoulslash
ac30ebd5a4
Merge pull request #2453 from AsparagusEduardo/RHH/pr/cleanup/configShiny 
Refactored Shiny configs + cleanup
 2022-11-28 09:51:39 -05:00
tustin2121
cf6f343726 Use multi-include incbins for stormy_water 
- Removes a special case rule from the make files.
 2022-11-26 23:38:39 -05:00
LOuroboros
add75d84c0 Applied a couple of tweaks 
-Made it so only Rare Candies can evolve Lv100 'mons. Game Freak dumb. The Exp. Candies SHOULD work too.
-Made sure to remove the candy that was used from the bag.
 2022-11-25 18:12:51 -03:00
LOuroboros
53110a0ff6 Allow Lv100 'mons to access level based evos 2022-11-25 17:34:11 -03:00
Eduardo Quezada
e858b4e709 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124 
# Conflicts:
#	include/battle.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_dome.c
#	src/battle_main.c
#	src/battle_pike.c
#	src/battle_script_commands.c
#	src/battle_tower.c
#	src/data/pokemon/species_info.h
#	src/pokemon.c
 2022-11-24 15:36:00 -03:00
GriffinR
004ce32da0 Sync text ctrl codes with pokefirered 2022-11-23 21:13:00 -05:00
Bassoonian
4ac1e4fc61 Power Shift is now a clone of Power Trick 2022-11-19 13:41:56 +01:00
GriffinR
4736b4b14d
Merge pull request #1810 from AsparagusEduardo/pret/pr/baseStatsRename 
Renamed gBaseStats to gSpeciesInfo
 2022-11-18 17:45:23 -05:00
GriffinR
5fa364256d
Merge pull request #1808 from AsparagusEduardo/pret/PR/numSides 
Introduce NUM_BATTLE_SIDES
 2022-11-18 17:39:00 -05:00
Bassoonian
4da9ecbcea Prepare FLAG_SLICING_MOVE for merger with abilities branch 2022-11-18 22:37:31 +01:00
Bassoonian
4034f18c0e Update PLA descriptions 2022-11-18 22:30:40 +01:00
Bassoonian
739680e425 Victory Dance effect 2022-11-18 22:23:34 +01:00