Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,156 Commits 1 Branch 0 Tags
Commit Graph

18156 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GriffinR
46e0a0607d Array count for easy chat word groups 2021-01-14 03:48:49 -05:00
GriffinR
f63bc6e27a Index sTMHMMoves 2021-01-14 03:41:28 -05:00
GriffinR
7dc52f6a5e
Merge pull request #1303 from GriffinRichards/doc-battledef 
Label remaining battle types
 2021-01-14 02:20:55 -05:00
ghoulslash
a05e7cc6f9
Merge pull request #1345 from ultima-soul/sync_be_move_constants_pe 
Sync Battle Engine Defines for Crown Tundra Moves and Renamed Moves
 2021-01-13 21:39:22 -07:00
LOuroboros
c21c0f8c37 Fixed incorrect preprocessor directive in ASM file 2021-01-13 22:42:56 -03:00
Evan
062d2ee50e add atk up 3 effects to HpAware 2021-01-13 16:42:10 -07:00
Evan
d571c8b028 B_TERRAIN_BG_CHANGE TRUE by default 2021-01-13 16:02:32 -07:00
Evan
d26605c9fe fix bad bg fade if no permanent terrain 2021-01-13 16:01:47 -07:00
Evan
9902f6e603 merge with be 2021-01-13 14:32:14 -07:00
Evan
8ef6a2c80d merge with be 2021-01-13 14:23:30 -07:00
Evan
c568c3d5f7 Merge branch 'master' of https://github.com/pret/pokeemerald into stair_warps 2021-01-13 13:58:09 -07:00
GriffinR
b9e1b050e1 Label remaining battle types 2021-01-13 15:20:29 -05:00
GriffinR
29e59c8eef
Merge pull request #1300 from GriffinRichards/bugfix-clean 
Minor BUGFIX changes, remove redundant bug fix descriptions
 2021-01-13 14:22:42 -05:00
Evan
09dc1b7e89 fix double battle ai logic 2021-01-13 11:08:43 -07:00
Evan
56395a060f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2021-01-13 09:23:07 -07:00
Evan
47bf5b2840 a few tweaks 2021-01-12 22:45:02 -07:00
GriffinR
707441827b
Merge pull request #1301 from GriffinRichards/anim-index 
List battle animation indexes alongside tables
 2021-01-12 23:41:49 -05:00
luckytyphlosion
cb7b77500f Just remove the commented out function and notes. 2021-01-12 18:52:37 -05:00
luckytyphlosion
f626fac9dc Fix AI corruption bug. 2021-01-12 18:43:16 -05:00
ultima-soul
9c5ec33aa7 Sync Crown Tundra and renamed moves Battle Engine defines. 2021-01-12 14:22:33 -08:00
ghoulslash
e013c44340
Merge pull request #1319 from LOuroboros/item_tweaks 
Updated the type-enhancing items' boost
 2021-01-12 09:24:55 -07:00
ghoulslash
a24ce5c715
Merge pull request #1341 from SBird1337/pokemon_expansion 
Define missing Items for gEvolutionTable
 2021-01-12 09:21:58 -07:00
ghoulslash
fba17a96a4
Merge pull request #1253 from surskitty/battle_engine 
Increase readability of too-long names
 2021-01-12 09:20:53 -07:00
amiosi
7e91129332 may as well do the rest 2021-01-11 20:18:23 -05:00
amiosi
eaca987879 more fixes 
light ball and gen 6 evolution held items
 2021-01-11 19:54:41 -05:00
amiosi
3aadd69303 fixes 
pokeblock berries and evolution items
 2021-01-11 19:49:03 -05:00
Evan
4912bc1d25 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2021-01-11 17:15:41 -07:00
ultima-soul
3cb09b6507 Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into deoxys_handling_removal 2021-01-11 15:19:11 -08:00
GriffinR
92de664f79 List battle animation indexes alongside tables 2021-01-11 16:07:16 -05:00
Philipp AUER
b5fa0129d5 [pokemon-expansion] Changes as requested by code review 
Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update src/data/pokemon/evolution.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update src/data/pokemon/evolution.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update src/data/pokemon/evolution.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-01-11 21:43:00 +01:00
surskitty
29343ce1ec
Remove synonyms 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-01-11 15:00:11 -05:00
GriffinR
9ed413fe8f Remove redundant bug fix description 2021-01-11 10:39:53 -05:00
GriffinR
fa3acd79e7 Fix missing header for sub_817F77C BUGFIX 2021-01-11 10:37:22 -05:00
GriffinR
4a7a3df205 Move SeedRngWithRtc fix to BUGFIX conditional 2021-01-11 10:36:53 -05:00
GriffinR
a733b211a3
Merge pull request #1297 from SatoMew/master 
Document the unused battle strings for downpour weather
 2021-01-11 10:01:57 -05:00
GriffinR
a6317b7f57
Merge pull request #1299 from opakedragon/payday-string-id 
rename payday string id
 2021-01-11 09:51:18 -05:00
opakedragon
295ec313f5
rename string id/variable to reflect usage 2021-01-11 08:49:31 -05:00
opakedragon
cbaf9b38b2
rename string id to reflect usage 2021-01-11 08:48:00 -05:00
opakedragon
3ce4e6b24b
rename string id to reflect usage 2021-01-11 08:47:11 -05:00
ultima-soul
e804e4c4ba
Merge pull request #1242 from ghoulslash/totem 
Totem Boosts
 2021-01-10 18:43:46 -08:00
Evan
8bad377a2e magic room affects macho brace/power item speed drop 2021-01-10 16:57:27 -07:00
SatoMew
ead437e89b Document the unused battle strings for downpour weather 2021-01-10 22:26:00 +00:00
surskitty
f58539b602 Renaming the last two and fixing the merge conflict with PE. 2021-01-10 15:48:57 -05:00
surskitty
a0f1dcb9cf Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2021-01-10 15:40:21 -05:00
amiosi
8d7d819cde beast ball cannot be sold 2021-01-10 15:08:48 -05:00
GriffinR
e6aebc16da
Merge pull request #1296 from GriffinRichards/bugfix-typo 
Add missing braces to bugfix in CalculateMonStats
 2021-01-10 12:34:39 -05:00
sbird
95665c24b4 [pokemon_expansion] define missing items from ITEM_EXPANSION for gEvolutionTable 2021-01-10 18:30:15 +01:00
GriffinR
8afc28c98f Add missing braces to bugfix in CalculateMonStats 2021-01-10 12:24:59 -05:00
Evan
1e22ae4cf2 merge with be 2021-01-10 09:08:25 -07:00
Evan
d4e4405cf5 merge with be 2021-01-10 09:04:21 -07:00