ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 12:14:20 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,025 Commits 1 Branch 0 Tags 235 MiB
daf8e6ca0b
Commit Graph

13025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bassoonian
c279830892 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into formbattlechangecontribution 2023-04-27 10:50:32 +02:00
Bassoonian
d5fb13ca17 Fix status icons 2023-04-26 23:33:22 +02:00
GriffinR
36e6981ac0 Replace some & usage with % 2023-04-26 16:12:00 -04:00
grunt-lucas
32dcea0cdb
Fix issue with Enamorus Therian cry define order (#2956) 2023-04-26 15:08:15 -04:00
Eduardo Quezada D'Ottone
408aa30aa7
Merge pull request #17 from AgustinGDLV/pr/castform_fix 2023-04-26 14:25:36 -04:00
GriffinR
e83e08f21c Add time ranges to UpdateAmbientCry 2023-04-26 12:32:43 -04:00
ghoulslash
5afe3f5e20
GetSideParty/GetBattlerParty (#2910) 2023-04-26 11:38:52 -04:00
CallmeEchoo
a5d39155c6 add Max Mushroom test 2023-04-26 14:15:35 +02:00
Martin Griffin
4a0abc5129
Merge branch 'upcoming' into rhh-get-party 2023-04-26 12:12:03 +01:00
CallmeEchoo
a2809acfd1 fix gChosenMovePos not being assigned correctly for battle items 
thanks griffin <3

Co-Authored-By: Martin Griffin <838573+mrgriffin@users.noreply.github.com>
 2023-04-26 01:02:47 +02:00
CallmeEchoo
9f2589e159 better usage of THEN over FINALLY 2023-04-25 23:06:07 +02:00
Bassoonian
0315f704c1 Fix thawing being triggered by every move 2023-04-25 23:01:58 +02:00
CallmeEchoo
d3e9a689fd restore pp item tests 2023-04-25 21:26:19 +02:00
Salem
78c4d07b23
Add Berserk Gene Item (#2893) 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-04-25 15:03:57 -04:00
CallmeEchoo
08ec873ef2 update MoveWithPP macro to use struct 2023-04-25 20:35:36 +02:00
Bassoonian
b1f75569a1
Merge branch 'upcoming' into rhhupcomingdev 2023-04-25 19:50:26 +02:00
Bassoonian
2885ec2411 Fix move descriptions 2023-04-25 19:48:45 +02:00
CallmeEchoo
7fad0a2dbc add MovesWithPP macro to allow for setting pps in tests 2023-04-25 19:45:35 +02:00
Bassoonian
2aa4d2da38 Fix Ice Heal message 2023-04-25 19:38:47 +02:00
CallmeEchoo
60e048b83e more robust status cure tests 2023-04-25 13:44:16 +02:00
Frank DeBlasio
9562c7a37a
Added forbidden Metronome moves from PLA and SV (#2949) 2023-04-24 18:49:53 -04:00
CallmeEchoo
59666a1eb4 heal powder test 2023-04-24 22:36:58 +02:00
CallmeEchoo
f74a1b0766 fix strings after update 2023-04-24 22:26:56 +02:00
CallmeEchoo
632668e8b2 Merge branch 'battleItemFixes' into battleItemTests 2023-04-24 21:13:12 +02:00
CallmeEchoo
503035010e Merge branch 'upcoming' into battleItemFixes 2023-04-24 21:11:34 +02:00
CallmeEchoo
e0cae31a13 Merge branch 'battleItemFixes' into battleItemTests 2023-04-24 21:05:58 +02:00
ghoulslash
868838a87d
Add thunder cage case to trap anim IDs (#2941) 2023-04-24 14:35:42 -04:00
Frank DeBlasio
a845eb1dfa Fixed Budew evolution method (#2928) 2023-04-24 12:47:53 -04:00
Eduardo Quezada D'Ottone
e89dc0dd00 Fixes Ominous Wind targeting (#2896) 2023-04-24 12:46:23 -04:00
ghoulslash
c283eacd08 Fixed instances of gSideTimers not using side constants (#2867) 2023-04-24 12:44:47 -04:00
ghoulslash
69f58adbb2 add check for Gorilla Tactics when resetting choicedMove from knock off (#2854) 2023-04-24 12:43:13 -04:00
Eduardo Quezada D'Ottone
e176fd285e Fixed erroneous uses of non e-reader Enigma Berries (#2839) 2023-04-24 12:40:52 -04:00
AgustinGDLV
d922ac43e9 changed CanBeConfused to actually check its argument (#2855) 2023-04-24 12:40:22 -04:00
ghoulslash
19ec7e2a1a
Added new conditions for the trainer slide-in system (#2713) 2023-04-24 08:53:08 -04:00
LOuroboros
a128192bfe Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into trainerSlideMsgUpdate 2023-04-24 09:36:09 -03:00
LOuroboros
330e85ba64 Updates 
-Undeclared size for certain trainer slide-in variables at struct BattleStruct for reasons.
-Added a BattlerHPPercentage function to make HP threshold checks in ShouldDoTrainerSlide a bit more readable.
 2023-04-24 09:34:11 -03:00
CallmeEchoo
c4497bc0a8 revive tests 2023-04-24 14:16:17 +02:00
CallmeEchoo
0b66cf01ec remove no longer needed variable 2023-04-24 14:15:43 +02:00
Bassoonian
a2bc21d902 Update battle_ai_util.h 
Co-Authored-By: Salem <65783283+callmeechoo@users.noreply.github.com>
 2023-04-24 14:05:35 +02:00
ghoulslash
1f6e335a24 merge w upcoming 2023-04-23 18:11:57 -04:00
Bassoonian
f13c39d784 Thawing out for frostbite 2023-04-23 21:20:23 +02:00
Bassoonian
0b8d148c26 Let AI take Frostbite into account 2023-04-23 20:53:51 +02:00
Bassoonian
6b2a873071 Add comment in Ice Beam 2023-04-23 20:41:19 +02:00
Bassoonian
a020001a78 Battle Pike functionality 2023-04-23 20:33:28 +02:00
Bassoonian
13f6acf9a1 General mechanics 2023-04-23 19:20:48 +02:00
Eduardo Quezada D'Ottone
47b013fc22 Debug menu to give items based on max quantity and map number 3digits display (#2807) 2023-04-23 10:21:06 -04:00
ghoulslash
25327b9031
Adds GetMovesArray in CanTargetFaintAi (#2936) 2023-04-23 08:50:06 -04:00
ghoulslash
909a20c27a
Reset battle vars and flags after player whites out (#2875) 2023-04-23 08:42:52 -04:00
ghoulslash
cf17324040
Fixed duplicate item strings in Bag/Party menus with battle items (#2915) 2023-04-23 08:32:38 -04:00
ghoulslash
594bc831d6
Adds define B_RESTORE_HELD_BATTLE_ITEMS following Gen9 (#2932) 2023-04-23 08:26:51 -04:00