18854 Commits

Author SHA1 Message Date
ExpoSeed
f2ad600cdc
Merge pull request #1445 from LOuroboros/the_potion_seller
Added a config for the amount of HP recovered by healing items
2021-04-07 15:42:25 -05:00
LOuroboros
75b6d2837e Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into the_potion_seller 2021-04-07 17:10:52 -03:00
ExpoSeed
8a49d66622
Revert "Made Thousand Arrows bypass type immunity" 2021-04-07 15:03:11 -05:00
ExpoSeed
f8d3029537
Merge pull request #1453 from LOuroboros/thousand_arrows
Made Thousand Arrows bypass type immunity
2021-04-07 14:58:48 -05:00
GriffinR
c95e89e083 Remove old variables 2021-04-07 13:32:08 -04:00
GriffinR
356e63db03 Clean up fieldmap, port frlg macros 2021-04-07 13:26:02 -04:00
GriffinR
d717a635c8 event_object_movement cleanup 2021-04-06 17:55:29 -04:00
ghoulslash
71b85031e0 update NUM_BATTLE_MOVE_EFFECTS 2021-04-06 15:42:21 -06:00
GriffinR
0dc7ff8994 Minor misc field doc 2021-04-06 17:17:41 -04:00
GriffinR
7d2a94282a Label horizontal fog data 2021-04-06 17:05:38 -04:00
GriffinR
4a1cfbead2 Document remaining overworld 2021-04-06 16:55:43 -04:00
GriffinR
86a9d94ce1 Document fieldmap 2021-04-06 16:05:43 -04:00
GriffinR
8bad478b49 Document disguise field effects 2021-04-06 14:51:39 -04:00
GriffinR
756fad0e61 Document some event object movement 2021-04-06 14:34:36 -04:00
LOuroboros
bd802ce976 Update species_names.h 2021-04-06 09:53:21 -03:00
GriffinR
802d2b2f0f Label Kyogre/Groudon anims 2021-04-06 03:46:19 -04:00
GriffinR
00c3044c96 Clarify Groudon/Kyogre/Rayquaza gfx names 2021-04-06 02:38:15 -04:00
ExpoSeed
5eed23b5d8 Razor claw effect 2021-04-05 23:19:03 -05:00
GriffinR
806abe2999 Document some objev anims, make objevgfx info static 2021-04-05 19:52:35 -04:00
GriffinR
553fe6239a Document more field effects 2021-04-05 18:21:17 -04:00
GriffinR
f90026826a Document some weather, field effects 2021-04-04 17:52:07 -04: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
ExpoSeed
afb97abba0
Merge pull request #1425 from LOuroboros/nature_names
Decapped nature names
2021-04-04 15:11:12 -05:00
ExpoSeed
df900ca310
Merge pull request #1419 from LOuroboros/mega_bracelet
Added a check for the Mega Bracelet in CanMegaEvolve
2021-04-04 15:06:40 -05:00
Eduardo Quezada D'Ottone
2034d6eb32
Merge pull request #1424 from ghoulslash/popup
Ability Pop Up Apostrophes
2021-04-04 15:32:32 -04:00
Eduardo Quezada D'Ottone
8bc91f9d23
Merge pull request #1435 from LOuroboros/defeatist
Fixed Defeatist's check
2021-04-04 13:59:34 -04:00
LOuroboros
63edb34fe2 Minor syntax tweaks to HandleAction_UseMove 2021-04-04 08:47:38 -03:00
LOuroboros
228f711bf6 Made Thousand Arrows bypass type immunity 2021-04-04 07:38:38 -03:00
ExpoSeed
3517baae2d Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into IE/item-use-form-change 2021-04-04 01:21:18 -05:00
ExpoSeed
cf9d5f8563 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table 2021-04-04 01:11:32 -05:00
ultima-soul
02c20c0737
Merge pull request #1452 from ultima-soul/master_sync
Master Upstream Sync
2021-04-03 23:04:55 -07:00
ultima-soul
2b8d13b88e Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-04-03 22:10:32 -07:00
ultima-soul
f1423bb78f Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-04-03 22:10:07 -07: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
5fa20534f9 Label remaining fields in Weather struct 2021-04-04 00:52:17 -04:00
GriffinR
b926fa6b07 Document thunderstorm 2021-04-04 00:44:20 -04:00
GriffinR
1494a83035 Sync drought with pokefirered, add weather tags 2021-04-03 22:47:58 -04:00
LOuroboros
9f83c9b574 Implemented Stench's battle effect
And updated its description.
2021-04-03 23:47:10 -03:00
GriffinR
fe1b757af5 Some constant use in WallyHandleActions 2021-04-03 16:37:00 -04:00
GriffinR
b6711441f5 Fix AI Guard Spec use, and Specs->Spec 2021-04-03 15:18:17 -04:00
GriffinR
f4d8a91ba4 Misc battle script cleanup 2021-04-03 14:07:31 -04:00
GriffinR
9ea9ffde09 Add remaining multistring chooser constants 2021-04-03 11:49:06 -04:00
ultima-soul
e5c8e841dc
Merge pull request #1449 from ExpoSeed/master
item expansion ci
2021-04-02 22:46:46 -07:00
ultima-soul
b831d2a16b
Merge pull request #1448 from ExpoSeed/master
pokemon expansion ci
2021-04-02 22:46:34 -07:00
ultima-soul
5073be0a0b
Merge pull request #1447 from ExpoSeed/master
battle engine ci
2021-04-02 22:46:19 -07:00
ExpoSeed
579ff8aeaf newline 2021-04-03 00:38:15 -05:00
ExpoSeed
77d5699072 new workflow 2021-04-03 00:26:55 -05:00
ultima-soul
f518ec911c
Merge pull request #1428 from ultima-soul/item_expansion_sync
Item Expansion Upstream Sync
2021-04-02 22:18:42 -07:00
ultima-soul
4517196c3f
Merge pull request #1427 from ultima-soul/pokemon_expansion_sync
Pokemon Expansion Upstream Sync
2021-04-02 22:18:05 -07:00
ultima-soul
17bdabaf54
Merge pull request #1426 from ultima-soul/battle_engine_sync
Battle Engine Upstream Sync
2021-04-02 22:17:43 -07:00