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

6077 Commits

Author SHA1 Message Date
LOuroboros
e42d329fc6 Small tweak 2021-08-25 02:16:38 -03:00
LOuroboros
d270892a6b Corrected CanEvolve function 2021-08-25 01:56:25 -03:00
LOuroboros
2c35006627 Tweaked sText_MegaEvoEvolved 2021-08-24 18:33:56 -03:00
ultima-soul
b620349da0 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-16 15:43:27 -07:00
GriffinR
ee5eee6ccc
Merge pull request #1493 from GriffinRichards/doc-itemmenu2 
Document item menu
 2021-08-15 12:01:57 -04:00
ghoulslash
d344612346 fix last used ball window in wild doubles 2021-08-12 14:49:17 -06:00
ghoulslash
a2d885c0d4 merge with be 2021-08-12 14:48:58 -06:00
ghoulslash
0bbbd1e7a9 fix electric/misty yawn/rest interactions 2021-08-12 14:08:41 -06:00
ghoulslash
5e250853c6 misty terrain blocks toxic spikes 2021-08-12 13:45:50 -06:00
ghoulslash
f050168c55 misty terrain blocks toxic spikes 2021-08-12 13:41:18 -06:00
ghoulslash
c7c0fbc296 merge with be, make AI CanBeStatused functions separate from general util ones 2021-08-12 13:37:53 -06:00
ghoulslash
7b0e60c705 some tweaks 2021-08-12 12:44:53 -06:00
ghoulslash
e3d30602d9 record item effect with trick 2021-08-12 01:29:52 -04:00
ghoulslash
d218322b2c merge with be 2021-08-12 01:26:13 -04:00
PikalaxALT
c7fc6ac893
Merge pull request #1492 from Kurausukun/cgbsound 
Fix CgbSound Fakematches (Thanks to Revo)
 2021-08-11 19:55:44 -04:00
ultima-soul
02c9e040df Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-11 16:33:10 -07:00
GriffinR
034b7f0513 Fix conflicting PC window names 2021-08-11 19:14:50 -04:00
GriffinR
80348e7188
Merge branch 'master' into doc-itemmenu2 2021-08-11 19:01:47 -04:00
GriffinR
cc51627465
Merge pull request #1489 from GriffinRichards/doc-playerpc 
Document player pc
 2021-08-11 18:59:58 -04:00
GriffinR
0bc26d9d79
Merge pull request #1488 from GriffinRichards/doc-frontierpass2 
Document frontier pass
 2021-08-11 17:40:55 -04:00
GriffinR
d951d7c363 Use tag constants in region_map.c 2021-08-11 09:31:20 -04:00
GriffinR
28a8fe191a Document item menu 2021-08-10 22:13:02 -04:00
Kurausukun
2e892c6961 unsigned int -> u32 2021-08-08 22:22:50 -04:00
Kurausukun
ddb3911d0d oops 2021-08-08 20:49:29 -04:00
Kurausukun
0bceaab046 rename variable 2021-08-08 20:34:16 -04:00
Kurausukun
b51d025f1c port cgb fakematching fixes (thanks to revo) 2021-08-08 20:33:21 -04:00
BuffelSaft
e1ca2af8b3
Update src/battle_util.c 
Fix copy/paste typo

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-08-08 00:52:27 +12:00
BuffelSaft
6c6363f7cf Use form table in species check 2021-08-07 20:59:04 +12:00
BuffelSaft
f0cb6190e0 Implement Burmy form change 
Burmy changes form based on where it last battled.
 2021-08-07 20:56:10 +12:00
BuffelSaft
1f3983cb05 Shields Down protects all meteor form Minior 
This was only working with red core minior.
 2021-08-07 20:38:35 +12:00
GriffinR
bd5cf07059
Merge branch 'master' into doc-playerpc 2021-08-02 14:08:10 -04:00
GriffinR
06b909bcd8 Document player pc 2021-08-02 13:58:40 -04:00
GriffinR
3e60a78406
Merge branch 'master' into doc-frontierpass2 2021-07-31 13:30:40 -04:00
GriffinR
602855ea99 Document frontier pass 2021-07-31 13:28:08 -04:00
GriffinR
459b20d762
Merge pull request #1479 from PikalaxALT/flatten_sprite_pos 
Flatten pos fields in struct Sprite
 2021-07-27 18:02:00 -04:00
ghoulslash
ab529b4e89 add stuff cheeks 2021-07-27 10:31:48 -06:00
LOuroboros
f1195e1884 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-07-27 09:08:52 -03:00
ghoulslash
4ca6d76160 add bug bite 2021-07-25 14:55:52 -06:00
ghoulslash
c914ed8572 fix sucker punch, surging strikes, obstruct, and snipe shot 2021-07-25 09:38:54 -06:00
ghoulslash
a37d4c3da9 merge with be, give life dew jungle healing effect 2021-07-25 08:22:05 -06:00
ghoulslash
fd61770c34 water bubble prevents burn 2021-07-25 07:53:44 -06:00
ghoulslash
eadd09bebd block item use under embargo 2021-07-25 07:39:02 -06:00
sphericalice
71de6ea939 Use the correct constant for PSS page comparison 2021-07-24 18:54:37 +01:00
ghoulslash
e6a2d2226f
Merge pull request #1540 from DizzyEggg/rage_powder 
Rage powder updated to gen6
 2021-07-24 07:15:58 -06:00
ghoulslash
07e3e73372 fix ITEM_NONE to 0 for compilation reasons 2021-07-18 11:20:51 -06:00
ghoulslash
d1bc7b5676 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball 2021-07-18 11:16:53 -06:00
ghoulslash
45d4cee243 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into last_ball 2021-07-18 11:11:03 -06:00
LOuroboros
29b1ba2a3c Fixed calls to UndoFormChange in battle_script_commands.c 2021-07-18 12:34:17 -03:00
DizzyEggg
312583de5e
Merge pull request #1564 from BuffelSaft/form-capture 
Undo form changes on capture
 2021-07-16 09:22:23 +02:00
DizzyEggg
304f3b9203
Merge pull request #1565 from BuffelSaft/disguise-fix 
Fix Disguise reverting on switch out
 2021-07-16 09:17:10 +02:00