ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-09 05:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,713 Commits 1 Branch 0 Tags 235 MiB
2813b4f9bf
Commit Graph

66 Commits

Author SHA1 Message Date
ultima-soul
939608f5b8 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-02 13:16:40 -07:00
GriffinR
86856098a3 Document Dewford Trend 2021-03-31 16:08:42 -04:00
ultima-soul
e32659d4bb Merge branch 'battle_engine' into ability_expansion and add Gen 8 DLC abilities. 2020-11-16 13:50:26 -08:00
Eduardo Quezada
815b525855 Configurable double wild battle chance, surfing double battles and flag for forcing them. 2020-10-17 14:25:43 -03: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
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +02:00
GriffinR
af09e73d67
Merge branch 'master' into doc-overworld 2020-07-18 20:24:09 -04:00
GriffinR
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
GriffinR
abdf7cbf02 Label fishing effect functions 2020-06-29 16:53:38 -04:00
ultima-soul
9ee5db6a96 Expand ability ids to u16. Thanks to ghoulslash for some assistance! 2020-05-18 14:54:12 -07:00
Eduardo Alvaro Quezada D'Ottone
d529ac3b60
More Battle config (#352) 
* Binding move turns.

* Binding damage.

* Incineratable Gems.

* Flash Fire while frozen.

* Sleep turns.

* Synchronized natures %

* Confusion self damage chance.

* Fixed confused self-damage check
 2020-04-23 09:01:28 +02:00
Eduardo Alvaro Quezada D'Ottone
1fdb195bd9
Added Gen 8 overworld effects. (#342) 
- LIGHTNING_ROD
- FLASH_FIRE
- HARVEST
- STORM_DRAIN
- MAGNET_PULL
- INFILTRATOR
- SUPER LUCK
 2020-04-20 13:22:42 +02:00
Eduardo Alvaro Quezada D'Ottone
81617eb577
Overworld effects (#245) 
* Snow Cloak's overworld effect. (reduces the chance of encountering wild Pokémon on Snow by 50%)

* Quick Feet's overworld effect. (reduces the chance of encountering wild Pokémon by 50%)

* No Guard's overworld effect. (raises the chance of encountering wild Pokémon by 50%)

* Honey Gather.

* Checks if honey is defined.

* Applied review changes.

* Fixed pointer reference

* Applied requested changes.

* Using weather constants.
 2020-04-15 14:45:07 +02:00
DizzyEggg
4c473d057e Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-04-15 14:41:50 +02:00
AsparagusEduardo
6eefcb1f82 Using sandstorm weather constant for Sand Veil encounter rate. 2020-04-15 07:40:39 -05:00
DizzyEggg
6968124529 Merge battle anim documentation 2020-02-29 13:59:41 +01:00
GriffinR
faf0ba8662 Use macro for randomization with ISO value 2020-02-25 12:54:08 -06:00
DizzyEggg
9e3d5672e6 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-12-23 16:40:21 +01:00
GriffinR
75b0c9d7a9 Document Battle Pyramid scripts 2019-12-14 08:38:26 -06:00
DizzyEggg
dcb5d16cb3 Merge with master 2019-11-29 21:47:31 +01:00
GriffinR
4dfa959fa2 Begin documenting Battle Pike and Frontier Util 2019-11-25 18:37:48 -06:00
DizzyEggg
e736c369d6 Merge with master 2019-10-19 17:47:55 +02:00
garak
c73e20b6af add subgroups for fishing rods to encounter json 2019-10-14 18:12:03 -05:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
garak
08a3ff77dd index to slot in c file 2019-07-29 20:02:43 -04:00
garak
4594c955b4 create defines to support encounter index ratios 2019-07-01 23:47:45 -04:00
garak
adb0a44457 add field info to wild pokemon json 2019-06-30 12:05:45 -04:00
DizzyEggg
94045ace0b Merge branch 'master' into battle_engine_v2 2019-05-15 13:31:53 +02:00
Marcus Huderle
0babaa8c07 Convert wild encounter data to JSON 2019-05-08 17:06:39 -05:00
DizzyEggg
aa33a61e58 Merge branch 'master' into battle_engine_v2 2019-02-07 21:17:30 +01:00
Marcus Huderle
29d6221935 Convert map data to JSON 2019-01-31 15:51:20 -06:00
DizzyEggg
6653ecf676 Fix Safari zone bug 2019-01-27 11:47:36 +01:00
DizzyEggg
517573eb4b Update with master 2018-12-26 17:46:51 +01:00
Melody
370b1093cd fix feebas check 2018-12-24 13:48:31 -06:00
DizzyEggg
ef55bdac89 Merge branch 'master' into battle_engine_v2 2018-12-22 23:57:42 +01:00
DizzyEggg
e54dd6a02b Merge with master 2018-12-22 13:53:07 +01:00
DizzyEggg
ecee02816d Merge with master 2018-12-20 22:53:08 +01:00
Deokishisu
a3543c9a34 Move data out of wild_encounter.c 
wild_encounter.c is cleaned up, and its data has been moved to src/data/wild_encounters.h.
 2018-12-19 22:50:54 -05:00
DizzyEggg
f1421d94c3 Up to sub 0x80ce580 2018-12-15 23:58:47 +01:00
DizzyEggg
180aa839c4 Fix conflicts 2018-12-09 13:12:02 +01:00
nullableVoidPtr
f9ff7316d5 Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs 2018-12-06 10:38:28 +08:00
nullableVoidPtr
3909b6408c Fix alloc.c as per #386, define INVALID_ constants and rename malloc to alloc as per #325 
Some of the INVALID_ are likely erroneously placed, due to lack of documentation
 2018-12-06 09:44:08 +08:00
DizzyEggg
623f1963b7 Merge with master 2018-11-18 20:49:52 +01:00
DizzyEggg
4e37723288 Document Battle Pyramid 2018-11-18 17:52:22 +01:00
DizzyEggg
bb9dbc0c6d Merge with master 2018-11-14 22:50:27 +01:00
DizzyEggg
d5abd7b696 Document Battle Pie 2018-11-12 14:36:31 +01:00
DizzyEggg
e9965dd341 merge with master 2018-11-02 22:55:32 +01:00
DizzyEggg
16026fe91d More battle tower. 2018-10-21 00:06:42 +02:00