ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 12:07:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,323 Commits 1 Branch 0 Tags 235 MiB
0a090616ef
Commit Graph

8323 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ExpoSeed
1f75f6e201
Merge pull request #1605 from LOuroboros/canEvolve 
Corrected `CanEvolve` function
 2021-08-26 19:32:22 -05:00
BuffelSaft
1d1546c7b2 Suggested changes 2021-08-26 19:00:43 +12:00
ghoulslash
b6d0996467
Merge pull request #1606 from BuffelSaft/venoshock 
Fix Venoshock
 2021-08-25 13:53:24 -06:00
BuffelSaft
bc298d242f Move mega indicator for lv 100 mons 
Indicator sprite overlaps the "100" without this.
 2021-08-25 23:15:30 +12:00
BuffelSaft
bb89d03a1d Fix Venoshock 
Damage should double if target is poisoned, not attacker.
 2021-08-25 22:57:10 +12:00
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
ExpoSeed
38120afbac
Merge pull request #1593 from ultima-soul/battle_engine_sync 
Battle Engine Upstream Sync
 2021-08-16 19:47:35 -05: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
85f98300ff use B_WAIT_TIME_SHORT and B_WAIT_TIME_LONG 2021-08-12 14:14:51 -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
3a14f4472d
Merge pull request #1495 from GriffinRichards/fix-symbols 
Fix symbols branch commit message, limit to upstream
 2021-08-11 17:35:31 -04:00
GriffinR
1860b7682f Allow symbols branch on forks 2021-08-11 17:19:21 -04:00
GriffinR
5098fbf7bb Fix symbols branch commit message, limit to upstream 2021-08-11 17:09:03 -04:00
GriffinR
2fb7440315
Merge pull request #1494 from GriffinRichards/tag-regionmap 
Use tag constants in region_map.c
 2021-08-11 12:24:36 -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
30c983d9ca Define Burmy forms in battle engine 
Title. BE needs these to compile on its own.
 2021-08-08 13:14:51 +12: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
0e33df21b9
Merge pull request #1491 from LOuroboros/inconsFlag 
Corrected inconsistent flag label spelling
 2021-08-05 16:41:10 -04:00
LOuroboros
b4c4650186 Corrected inconsistent flag label spelling 2021-08-05 17:26:03 -03:00
GriffinR
3714963f0d
Merge pull request #1490 from GriffinRichards/align-marts 
Add align directives to all marts
 2021-08-05 14:35:45 -04:00
GriffinR
44cd9eed6b Add align directives to all marts 2021-08-04 11:50:33 -04: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