ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-24 20:30:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,964 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

633 Commits

Author SHA1 Message Date
ultima-soul
d30ab7760f Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-06-07 13:52:08 -07:00
ultima-soul
cf19635a80 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-06-07 13:15:46 -07:00
ultima-soul
092f02f119 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-06-07 12:00:23 -07:00
MissingNoL
c876de5a5b Done! Merge branch 'battle_engine' into Photon_Geyser 2021-06-05 17:40:06 -07:00
MissingNoL
f30a9542ee Problem: Photon Geyser is calculating as Shell Side Arm?? Needs: Poison effect, contact move for Shell Side Arm 2021-05-27 22:21:55 -07:00
ghoulslash
c356ffaed4 merge with be. fix null ptr check in GetBattleMoveSplit 2021-05-24 10:46:53 -06:00
ghoulslash
5840b1f0ed utility umbrella effect 2021-05-24 09:52:45 -06:00
ghoulslash
c3e28e9b1a merge with be 2021-05-23 12:22:52 -06:00
gAlfonso-bit
9a195c0fef Cherry-pick roamer bug fix from pokefirered 
Adapted https://github.com/pret/pokefirered/blob/master/src/battle_main.c#L3831 to pokeemerald
 2021-05-13 11:23:42 -05:00
ultima-soul
cf0fd961b9 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-28 23:56:58 -07:00
ultima-soul
00c3f060b1 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-28 23:53:23 -07:00
ultima-soul
56fc420187 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-28 21:34:30 -07:00
ultima-soul
75a9fdbafa Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-28 20:50:59 -07:00
ultima-soul
0da3f74a7e Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-28 18:58:38 -07:00
ultima-soul
14a0303e2f Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-27 18:36:37 -07:00
GriffinR
aad090e154 Document TV 2021-04-26 12:35:35 -04:00
GriffinR
f94540c2b8 Misc reg constant cleanup 2021-04-15 03:14:42 -04:00
GriffinR
62abcecc54 More usage of DISPLAY constants 2021-04-15 02:22:24 -04:00
Marcus Huderle
e92d2005c4 Use designated initializers for gTypeNames 2021-04-12 17:41:16 -05:00
ExpoSeed
2bbab03eba
Merge pull request #1430 from LOuroboros/decap_battle_types 
Decapped the in battle type strings
 2021-04-04 15:11:13 -05:00
ultima-soul
be7acc919a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-04-03 21:53:29 -07:00
GriffinR
9ea9ffde09 Add remaining multistring chooser constants 2021-04-03 11:49:06 -04:00
ultima-soul
4a81102a46 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-02 13:57:19 -07:00
ultima-soul
b8721034ef Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-02 13:42:05 -07:00
ultima-soul
939608f5b8 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-02 13:16:40 -07:00
ghoulslash
d89e2c1775 merge with be 2021-04-02 08:55:54 -06:00
LOuroboros
66e86e3aac Decapped the in battle type strings 2021-03-31 00:47:57 -03:00
GriffinR
8c6e89e994 Bit shifts from hex to decimal 2021-03-30 17:38:09 -04:00
ghoulslash
a595b213b4 merge with be 2021-03-28 17:29:22 -06:00
ultima-soul
7abfe7469a Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-03-23 18:41:53 -07:00
ultima-soul
56a1cab314 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-03-23 15:21:19 -07:00
ultima-soul
5bab9474dc Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-03-22 23:08:19 -07:00
PikalaxALT
925e68c03f Update newly named fields 2021-03-15 15:22:41 -04:00
PikalaxALT
8d4dcb228a More documentation in battle_main 2021-03-12 16:55:58 -05:00
PikalaxALT
e32a1571af Resolve link comm buffers in gBattleStruct 2021-03-12 15:37:31 -05:00
PikalaxALT
e6b1b97aa1 Nonmatching resoltuion 
- Fix fakematch in Cmd_get_used_held_item
- Remove `static` overrides in MODERN in four objects
 2021-03-12 13:55:07 -05:00
GriffinR
55a40b901f Label battle tower link script 2021-03-04 19:30:19 -06:00
Evan
2ccdf1d89e merge with be. magic guard checks 2021-03-03 09:21:06 -07:00
ghoulslash
bcb6fe154b
Update src/battle_main.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-03-03 09:14:00 -07:00
Evan
b130396c0e merge with be 2021-03-01 17:05:10 -07:00
Evan
55b8538f68 merge with be 2021-03-01 11:22:37 -07:00
ultima-soul
ef054c5d48
Merge pull request #1342 from ghoulslash/fixes 
Magic Room Affects Macho Brace/Power Item Speed Drop
 2021-03-01 08:50:59 -08:00
GriffinR
b71b10623b Add palette selection constants 2021-02-24 11:03:51 -05:00
GriffinR
8634710996 Document PokemonUseItemEffects 2021-02-12 16:02:04 -05:00
Evan
f3d975e239 merge with be 2021-02-12 08:59:55 -07:00
ultima-soul
46e853c13b Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-02-03 16:23:23 -08:00
ultima-soul
daf5e0167e Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-02-03 16:06:48 -08:00
Evan
0483114a05 merge and some fixes 2021-02-02 11:45:15 -07:00
ultima-soul
5fdb578747 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-02-01 15:58:18 -08:00
ultima-soul
2a20d50904 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-02-01 15:54:08 -08:00