ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-06 19:50:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,948 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

188 Commits

Author SHA1 Message Date
Kurausukun
bf062f5547 [LEAK-INFORMED] fix battle dome fakematching 
yes they actually fucking did this
 2021-02-14 03:51:38 -05: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
ultima-soul
2a20d50904 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-02-01 15:54:08 -08:00
ultima-soul
96232ea166 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-01-28 23:59:08 -08:00
ghoulslash
32cc04c91c
Merge pull request #1311 from ultima-soul/deoxys_handling_removal 
Remove Special Handling for Deoxys
 2021-01-21 12:22:03 -07:00
ultima-soul
9c5ec33aa7 Sync Crown Tundra and renamed moves Battle Engine defines. 2021-01-12 14:22:33 -08: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
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
SphericalIce
3c2a33b9b2 Use constants for max IVs & the random IV generation flag 2021-01-07 22:13:14 +00:00
ExpoSeed
7dadcb94b8 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-03 17:14:43 -06:00
surskitty
aa9796a6ae Renaming constants for High Jump Kick, Faint Attack, Smelling Salts, and Vise Grip. 2020-12-31 18:57:36 -05:00
ultima-soul
6a0939cd4e Remove special handling for Deoxys. 2020-12-21 22:39:19 -08:00
GriffinR
81d95b9325 Use BUGFIX for some inline fixes 2020-12-12 23:30:51 -05:00
ultima-soul
99fdc13e61 Merge branch 'master' into battle_engine_sync 2020-11-07 15:59:20 -08:00
aaaaaa123456789
bacc831aa9 Re-apply joypad macros (minus merge conflicts) 2020-11-02 22:02:39 -03:00
Kurausukun
6545745e59 Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts 2020-11-02 18:43:40 -05:00
Kurausukun
8bf401c227 address comments 2020-11-02 18:43:11 -05:00
aaaaaa123456789
1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Kurausukun
16cf49ffbe re-match GetTypeEffectivenessPoints (from #1177) 2020-10-23 20:59:27 -04:00
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -05:00
GriffinR
5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
aaaaaa123456789
7dc95a0103 Undo PokeCodec's PRs 
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
 2020-09-13 06:30:55 -03:00
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
PokeCodec
28ef2fb774 Switch to button macros 2020-09-04 21:11:55 -04:00
PokeCodec
d4158e490a Match more functions 2020-09-04 19:49:53 -04:00
Thomas Winwood
a529bcf0b6 Tidy up naked functions 2020-09-02 14:49:04 +01:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
PokeCodec
86a1e89879 Documentation of unk field 2020-08-23 21:34:31 -04:00
PokeCodec
6aee7d38f3 sizeOf data type, not pointer value 2020-08-23 21:34:31 -04:00
GriffinR
65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
GriffinR
3779422489 Split contest funcs from script_pokemon_util 2020-08-13 17:42:12 -04:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +02:00
GriffinR
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
DizzyEggg
013f9b6a17 merge wiith masteer and summary screen change 2020-05-29 12:50:54 +02:00
Sierraffinity
929e64ad33 Fix HblankCb_TourneyTree fakematch 2020-05-20 20:31:16 -07:00
DizzyEggg
060b795d8e Merge with master 2020-04-11 19:48:24 +02:00
GriffinR
7a5deff0bc Add misc party constant usage 2020-04-09 15:18:53 -04:00
DizzyEggg
d8aab3d112 Merge with master 2020-01-18 18:17:25 +01:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome 2020-01-08 01:15:36 -05:00
GriffinR
017fa294b5 Add battle tent mon/trainer constants 2020-01-08 01:07:53 -05:00
GriffinR
fb5bea98ce More battle_dome.c doc 2020-01-07 22:30:37 -05:00
DizzyEggg
4c9ea32d19 Merge with master 2019-12-30 18:52:23 +01:00
GriffinR
3efc8199d4 More battle_dome.c documentation 2019-12-25 22:27:33 -08:00
GriffinR
ff2d8a9c4e Add frontier trainer constants 2019-12-20 21:14:05 -05:00
GriffinR
63c8cf97d1 Document Battle Dome scripts and some battle_dome.c 2019-12-20 16:53:33 -05:00
GriffinR
ddfa0c6298 Document Battle Tower scripts 2019-12-17 20:56:13 -05:00
DizzyEggg
ac499bc896 Merge with master 2019-12-09 08:16:18 +01:00
GriffinR
c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
GriffinR
9b3d1cfab6 Set up Battle Dome and Tower macros 2019-12-05 21:11:17 -06:00
GriffinR
be17c1602d Set up remaining facility script doc, use Palace macros 2019-12-05 21:11:17 -06:00