18156 Commits

Author SHA1 Message Date
Martin Griffin
7a9756953f
Fixed testrunner UB with RandomElement. (#3013) 2023-05-17 07:55:54 +01:00
AgustinGDLV
d22efc9a68 fixed UB with unassigned variable 2023-05-16 23:14:54 -07:00
AgustinGDLV
34abc440cb fixed RandomElement 2023-05-16 23:13:48 -07:00
AgustinGDLV
d133564e21 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-05-16 21:57:06 -07:00
AgustinGDLV
7b08713707 changed B_WEATHER_FORM_SUPPRESS config to preproc 2023-05-16 20:34:16 -07:00
AgustinGDLV
b269cc6906 changed gastro acid check to properly use GetBattlerAbility 2023-05-16 16:37:18 -07:00
AgustinGDLV
785b100693 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix 2023-05-16 16:29:38 -07:00
AgustinGDLV
0c182345bf reworked weather form reversion + added more tests 2023-05-16 16:24:25 -07:00
AgustinGDLV
37874fe5c1
fixed revival blessing failure still showing anim (#3010) 2023-05-16 19:21:05 -04:00
Ariel A
ad89f7cf06 Merge branch 'lighting' into lighting-expanded-id 2023-05-15 19:15:49 -04:00
Ariel A
540c536342 Merge branch 'followers-expanded-id' into lighting-expanded-id 2023-05-15 19:15:38 -04:00
Ariel A
5d392244be Merge branch 'followers' into followers-expanded-id 2023-05-15 19:08:45 -04:00
Ariel A
996f43120d Merge branch 'followers' into lighting 2023-05-15 18:50:55 -04:00
Ariel A
d12efe8cd7 Merge branch 'master' into followers 2023-05-15 18:37:38 -04:00
LOuroboros
7c8332e7a1
Fixed typo in include/config/battle.h (#3006) 2023-05-15 16:46:55 -03:00
LOuroboros
49a9210e9d
Fixed typo in include/config/battle.h 2023-05-15 16:45:30 -03:00
Eduardo Quezada D'Ottone
15b122bc17
convert a few various to callnatives (#2465) 2023-05-15 15:34:31 -04:00
ghoulslash
eaa44cc8b5 fix syntax 2023-05-15 15:20:44 -04:00
ghoulslash
6458cab70a use NATIVE_ARGS in various to callnative conversions 2023-05-15 15:07:09 -04:00
ghoulslash
60710f823e merge w upcoming 2023-05-15 13:13:28 -04:00
Bassoonian
0266d3ff82 Fix a sloppy copy paste 2023-05-15 11:46:26 +02:00
Eduardo Quezada D'Ottone
c42552a107
Fix Mega Evolution issues related to battlers and turn order (#2810) 2023-05-14 22:43:21 -04:00
Eduardo Quezada D'Ottone
2aca82300c
Merge branch 'upcoming' into mega_evo_issues 2023-05-14 22:33:01 -04:00
Eduardo Quezada D'Ottone
447739d005
Fix shiny animation not respecting Illusion mon target and Imposter revealing opponent ability (#2985) 2023-05-14 22:16:58 -04:00
Eclipse
76379661d0
Fixed mons mot disobeying with Gen8 mechanics disabled (#2990) 2023-05-14 22:09:45 -04:00
Frank DeBlasio
2420134e45
Updated Ability Patch for Gen 9 functionality (#2989) 2023-05-14 19:30:30 -04:00
Alex
f6f0e5fa33
Fix for wrong mon position for scripted wild doubles (#2996) 2023-05-14 19:03:14 -04:00
Eduardo Quezada D'Ottone
15adbc8368
Pret merge Friday (#2998) 2023-05-14 18:38:33 -04:00
Frank DeBlasio
d09072fd0d
Updated Esper Wing's accuracy if B_UPDATED_MOVE_DATA is Gen9 (#3004) 2023-05-14 12:55:08 -04:00
AgustinGDLV
e47eca1c5a mid converting script commands to callnative 2023-05-13 22:07:04 -07:00
ghoulslash
d71465d26a
Fix ability select in debug givemon (#2999) 2023-05-12 09:57:37 -04:00
Bassoonian
fd8570640c Implement Repeated Medicine 2023-05-12 15:29:03 +02:00
AaghatIsLive
a89288e30e
Fix Illumise pallete (#2995) 2023-05-12 08:24:47 -04:00
Bassoonian
292d460810 Fix ability select in debug givemon 2023-05-12 14:02:14 +02:00
Bassoonian
c05404e772 Merge branch 'master' of https://github.com/pret/pokeemerald into rhhpretmerge 2023-05-12 13:48:52 +02:00
AgustinGDLV
dceefacb95 moved tryfaintmon back, no bugs? 2023-05-11 22:35:08 -07:00
AgustinGDLV
3b6389ec21 updated tests 2023-05-11 22:13:43 -07:00
AgustinGDLV
aec51b5b04 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-05-11 20:02:06 -07:00
GriffinR
6fdf75bd8c Support plain pixel conversion, convert spinda spots to .png 2023-05-11 13:41:38 -04:00
ghoulslash
0585123da9 merge w pret 2023-05-11 10:44:57 -04:00
ghoulslash
5657f8369e merge w pret 2023-05-11 10:44:18 -04:00
ghoulslash
ee0652416d merge w pret 2023-05-11 10:27:41 -04:00
ghoulslash
b227d4c637 Merge branch 'master' of https://github.com/pret/pokeemerald into sideways_stairs 2023-05-11 10:03:46 -04:00
Salem
8fc4aa9dcd
Remove duplicate CanBePoisoned condition (#2988) 2023-05-10 18:16:57 -04:00
GriffinR
8c537ccd72 Colorize bag select button 2023-05-10 00:33:43 -04:00
GriffinR
41ac28b210 Index pokemon footprint pngs 2023-05-09 22:43:48 -04:00
GriffinR
8b37b4292a Document DrawFootprint 2023-05-09 22:43:25 -04:00
GriffinR
1497719f8c
Merge pull request #1884 from GriffinRichards/mapjson-err
Fix mapjson misreporting errors when processing map_groups.json
2023-05-09 10:48:29 -04:00
Ultimate Bob
64c2eb39c0 Ignore Illusion if the pokemon is the last slot in the party. 2023-05-09 02:33:12 +10:00
Ultimate Bob
f985eefaa1 Show Imposter abilty in popup instead of opponent's ability. 2023-05-09 01:40:28 +10:00