atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9361 commits 2 branches 40 tags 600 MiB
Commit graph

813 commits

Author SHA1 Message Date
surskitty
a96179a308 Changed Neutralizing Gas. 2021-01-02 17:16:44 -05:00
ExpoSeed
b7b1b26b57
Merge pull request #1289 from LOuroboros/final_gambit 
Corrected Final Gambit's move data and tweaked its effect
 2020-12-31 18:39:00 -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
surskitty
533d9f1c54 Updating move names and ability names. 2020-12-31 18:45:25 -05:00
amiosi
8d1383f0d5 no text 2020-12-30 23:51:08 -05:00
amiosi
556a863ee3 minimize pr (also text) 2020-12-30 22:56:15 -05:00
LOuroboros
0aae069db8 Made Fiery Wrath unaffected by King's Rock 2020-12-19 21:11:17 -03:00
LOuroboros
ffa35a33c1 Review corrections 2020-12-19 07:44:34 -03:00
Evan
916d0416e3 outline AI_CheckGoodMove 2020-12-15 21:57:33 -07:00
Evan
ac332d5e98 check bad move 2020-12-13 15:02:21 -07:00
LOuroboros
55bc2b4bb9 Corrected small inconsistency in move flag names 2020-12-12 12:18:56 -03:00
LOuroboros
e9c6c96b9d Corrected Final Gambit's move data 
It didn't have its own working effect assigned, and it wasn't being affected by King's Rock even though it should.
 2020-12-12 11:57:49 -03:00
LOuroboros
c5e04cf243 Removed the unnecessary Dragon Energy effect 
The move is an Eruption clone, whose effect was already done. Thanks to BuffelSaft for the heads up.
I took the chance and fixed its target too.
 2020-12-12 01:35:54 -03:00
LOuroboros
0ac026e6ca Added the data of SwSh's Crown Tundra's moves 
And Dragon Energy's effect. Eerie Spell's is the only one missing out of this bunch.
 2020-12-11 20:49:23 -03:00
GriffinR
076b2c2edc Designated initializers for gTrainerBackPicTable 2020-11-30 15:32:08 -05:00
Ashley Coleman
0f04944b81 Rename graphics files for COOLTRAINER to match define 2020-11-26 11:05:02 -08:00
GriffinR
513c7c5f45 Clarify Kecleon objects 2020-11-23 14:42:47 -05:00
GriffinR
bf65c1fb25 Name object event pals/tags 2020-11-23 14:24:48 -05:00
ultima-soul
63bd0ec836 Remove Cacophony and fix some Gen 8 ability descriptions to fit. 2020-11-16 15:42:09 -08: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
ghoulslash
686ff59b11
Merge pull request #13 from AsparagusEduardo/PR-LGPE_IOA_Moves 
LGPE & Isle of Armor move data.
 2020-11-15 08:29:10 -07:00
Eduardo Quezada D'Ottone
f0154028ff Review changes 2 2020-11-14 09:01:43 -03:00
Eduardo Quezada D'Ottone
e87f0f1ddb Review changes 2020-11-13 14:51:50 -03:00
Eduardo Quezada D'Ottone
9eea1cc296 Updated to use internal Gen 8 move data. 2020-11-09 13:34:38 -03:00
ExpoSeed
d2566c8988 Refactor Multi-Attack, Judgment, and Techno Blast to use the same move effect 2020-11-07 23:34:04 -06:00
LOuroboros
93d9ad0997
Fixed the descriptions of Freeze Dry and Flying Press 
Addresses https://github.com/DizzyEggg/pokeemerald/issues/508
 2020-11-06 15:24:00 -03:00
Evan
6c39977a8d HGSS supereffective change 2020-11-01 15:16:51 -07:00
Evan
9ad9dbff9f fix ability descriptions 2020-11-01 09:22:28 -07:00
Eduardo Quezada
cb53c91b07 rip 2020-10-25 22:36:18 -03:00
Eduardo Quezada
ae60ae8a2d Review changes. 2020-10-24 03:07:45 -03:00
Eduardo Quezada
b5834b617d Merge branch 'BattleEngine' into PR-LGPE_IOA_Moves 
# Conflicts:
#	src/data/text/move_descriptions.h
 2020-10-24 00:36:29 -03:00
ExpoSeed
34729ce99c
Merge pull request #150 from AsparagusEduardo/PR-MoreBattleConfigs 
More Battle Config options
 2020-10-23 10:59:12 -05:00
Eduardo Quezada
1bc38feca5 Fixed indentation for various files. 2020-10-19 18:01:19 -03:00
Eduardo Quezada
8f9659f846 Fixed Pika Papow's name. 2020-10-19 11:45:54 -03:00
Eduardo Quezada
e42a565a84 Adapting move changes (part 3) + fixed Wish being affected by Protect. 2020-10-18 17:53:27 -03:00
Eduardo Quezada
a23e9a8a37 Adapting move changes (part 2) + Hyperspace Fury type. 2020-10-18 12:07:11 -03:00
Eduardo Quezada
3342573881 Updated name of setting. 2020-10-18 11:19:39 -03:00
Eduardo Quezada
30d999bb6f Adapting move changes (part 2) 2020-10-18 11:15:42 -03:00
Eduardo Quezada
2ba2751049 Moved if-else to the top. 2020-10-18 10:26:07 -03:00
Eduardo Quezada
09401f0620 Fixed repeated fields. 2020-10-17 23:27:55 -03:00
Eduardo Quezada
b1903af8c1 Adapting move changes (part 1) 2020-10-17 23:08:39 -03:00
Eduardo Alvaro Quezada D'Ottone
1df696c1fb
Merge pull request #17 from LOuroboros/move_updates 
Updated many moves' data to Gen. 8 standards
 2020-10-15 20:56:58 -03:00
Eduardo Quezada
47259092e3 LGPE & Isle of Armor move data. 2020-10-14 21:50:22 -03:00
ExpoSeed
9e2c8a95c1 Sync bev2 with pret 2020-10-11 01:01:47 -05:00
GriffinR
65a4e06737 Add ITEM6_HEAL constants, change move flags to shifts 2020-10-05 18:48:51 -04:00
GriffinR
5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
tustin2121
be9100fe52 Review changes 2020-09-20 13:04:20 -04:00
tustin2121
832be34898 More documenting trainer hill 
- Renamed members and added comments in the TrHillDisplay struct.
- Formatted the trainer hill data to better match the metatile layout its representing.
- Documented the function which uses this data.
 2020-09-20 01:50:54 -04:00
tustin2121
0d3646c0b9 Trainer hill location data 
Changed the trainer hill data for trainer locations, directions, and ranges from vague unusable numbers into readable data via use of preprocessor macros.
 2020-09-20 01:09:22 -04:00
ExpoSeed
227d2dce32 Make description slightly more precise 2020-09-16 12:51:14 -05:00
ExpoSeed
778e6925de Complete TMHM Learnset description 2020-09-16 12:36:11 -05:00
GriffinR
921f389e4e Fix Rusboro and Lavarige typos 2020-09-11 14:47:47 -04:00
DizzyEggg
97d0643110 Merge with master 2020-09-08 12:48:28 +02:00
LOuroboros
9e6ae57f9f Updated some more moves' data to Gen. 8 standards 2020-09-07 15:28:15 -03:00
LOuroboros
c90c146d0d Updated a few more moves' data to Gen. 8 standards 2020-09-04 16:34:40 -03:00
GriffinR
4ad147f75d
Merge pull request #1156 from GriffinRichards/doc-rayscene 
Document Rayquaza cutscene
 2020-09-01 14:46:14 -04:00
GriffinR
f5495d1220 Give proper names to underwater maps 2020-09-01 03:03:14 -04:00
GriffinR
38d4fc9c17 Clean up rayquaza scene documentation 2020-08-27 16:04:11 -04:00
GriffinR
52b1251b48 Document second rayquaza scene 2020-08-27 15:43:27 -04:00
GriffinR
ba13e9ec95 Document first rayquaza scene 2020-08-27 15:43:18 -04:00
DizzyEggg
f70a9ce153 Merge with master 2020-08-27 12:01:28 +02:00
GriffinR
95ea0e92e7 Start documenting rayquaza_scene 2020-08-25 17:49:42 -04:00
PikalaxALT
d2c7a862c7
Merge pull request #1147 from GriffinRichards/doc-contestai 
Document contest AI
 2020-08-21 15:16:37 -04:00
GriffinR
fbb70b3727 Document contest AI scripts 2020-08-21 14:57:17 -04:00
PikalaxALT
cd895e497d
Merge pull request #1141 from GriffinRichards/add-nonmatch 
Wrap asm statements in NONMATCHING
 2020-08-21 12:44:07 -04:00
LOuroboros
1b9aa1f023 Updated many moves' data to Gen. 8 standards 2020-08-20 15:44:58 -03:00
GriffinR
0e7f634b00 Wrap asm statements in NONMATCHING 2020-08-18 08:16:09 -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
2749948eeb Clean up contest doc 2020-08-16 05:52:17 -04:00
GriffinR
cc4255d4c0 Add some charmap constant usage 2020-08-11 00:23:28 -04:00
PikalaxALT
03eba6a62c
Merge pull request #1116 from GriffinRichards/doc-slotmachine 
Document slot machine
 2020-08-01 09:56:44 -04:00
GriffinR
b22709ee3d More slot machine data documentation 2020-07-28 14:29:44 -04:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +02:00
GriffinR
36a4764a78 Document some slot machine data 2020-07-26 02:15:59 -04:00
GriffinR
aca50c87be Continue new contest documentation 2020-07-24 00:14:53 -04:00
GriffinR
52a4428ba6 Begin new contest documentation 2020-07-23 17:55:40 -04:00
GriffinR
4a42e2a710
Merge branch 'master' into doc-overworld 2020-07-23 10:31:52 -04:00
Eduardo Quezada
6eccf019db Fixed missing changes. 2020-07-21 19:32:33 -04:00
Eduardo Quezada
f825ba875e Reverted size. 2020-07-19 21:17:32 -04:00
Eduardo Quezada
49ee0fd953 Front pic coordinates. 2020-07-19 20:54:12 -04:00
Eduardo Quezada
10c4debe31 Back pic coordinates 2020-07-19 20:37:11 -04: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
ghoulslash
7e8ec4c315
add gen 8 move data (#461) 2020-07-13 20:39:43 +02:00
DizzyEggg
4c3f40a361 Merge with master 2020-07-11 12:59:23 +02:00
Eduardo Alvaro Quezada D'Ottone
43cfe70a78
Fix Sacred Fire and Fake Out's move data. (#465) 2020-07-11 12:14:45 +02:00
GriffinR
ebb6c4ee66
Merge branch 'master' into doc-overworld 2020-07-08 15:51:58 -04:00
GriffinR
1ce929157f Clean up field effect doc 2020-07-02 05:05:13 -04:00
GriffinR
abdf7cbf02 Label fishing effect functions 2020-06-29 16:53:38 -04:00
GriffinR
4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00
LOuroboros
5d037198b3
Made Throat Chop be affected by Sheer Force (#455) 
Addresses #452
 2020-06-28 10:11:06 +02:00
Eduardo Alvaro Quezada D'Ottone
9fb073ca23
Some cleanup (#454) 
* Toxic Thread doesn't have power.

* Added missing commas.

* Autotomize typo.

It wasn't until today that I learned that autotomize was a word.
 2020-06-27 11:21:13 +02:00
GriffinR
18d57a3802 Document some overworld and field effects 2020-06-23 15:48:53 -04:00
DizzyEggg
f2d2c1b76f
Merge pull request #438 from LOuroboros/effect_sleep_hit 
Implemented Relic Song's effect
 2020-06-22 10:10:15 +02:00
DizzyEggg
2b52420065
Merge pull request #433 from LOuroboros/freeze-dry_bev2 
Fixed Freeze-Dry's InGame name
 2020-06-22 10:03:07 +02:00
DizzyEggg
947921c308
Merge pull request #412 from LOuroboros/patch-2 
Fix Lunge
 2020-06-22 10:02:01 +02:00
LOuroboros
33a45ba181 Implemented Relic Song's effect 2020-06-16 07:06:38 -03:00
LOuroboros
2621071f22 Fixed Freeze-Dry's InGame name 2020-06-16 03:36:17 -03:00
LOuroboros
746bdb581a
Fix Fire Lash 
As stated in #411, this move should hurt the opponent and lower their defense, not just the latter.
 2020-06-15 20:35:35 -03:00
LOuroboros
e2285850f3
Fix Lunge 
Addresses #411
 2020-06-15 20:33:47 -03:00
GriffinR
2859900ea9 Second pass on documenting union room 2020-06-10 17:30:59 -04:00
GriffinR
4fe507e453 Document union_room.c 2020-05-31 13:11:18 -04:00
DizzyEggg
013f9b6a17 merge wiith masteer and summary screen change 2020-05-29 12:50:54 +02:00
ultima-soul
9ee5db6a96 Expand ability ids to u16. Thanks to ghoulslash for some assistance! 2020-05-18 14:54:12 -07:00
AsparagusEduardo
179d84dcd7 Using ability constants for OLD_UNOWN stats 2020-05-16 18:08:56 -04:00
AsparagusEduardo
f6932518b0 Ordered OLD_UNOWN in the same way as the other base stats. 2020-05-03 00:00:01 -04:00
DizzyEggg
4fc88d18aa Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-04-29 09:17:25 +02:00
Eduardo Alvaro Quezada D'Ottone
deae125412
Updated moves affected by other moves (#361) 
* Updated moves affected by Snatch

* Updated moves that bypass protect

* Updated moves affected by Magic Coat
 2020-04-29 09:17:50 +02:00
GriffinR
09b39527ff Generalize oamtable names 2020-04-28 19:59:08 -05:00
GriffinR
ecd4824f67 Index heal location data, use better names 2020-04-28 19:59:08 -05:00
Eduardo Alvaro Quezada D'Ottone
7b4ccbc6bc
Counter affected by Protect, not by Mirror Move (#359) 2020-04-28 10:59:50 +02:00
Eduardo Alvaro Quezada D'Ottone
40a23ad799
String Shot lowers speed twice, (#360) 2020-04-28 10:59:28 +02:00
Eduardo Alvaro Quezada D'Ottone
a2cc51ac93
In Gen2 and Gen4 onwards, Razor Wind has a higher Critical Hit chance. (#355) 2020-04-26 20:59:53 +02:00
MandL27
073218d544
Mind Blown has contest data (#332) 
* uncomment mind blown

* more contest moves
 2020-04-25 11:22:12 +02:00
DizzyEggg
c8ba013539 Power Herb 2020-04-22 10:44:19 +02:00
Eduardo Alvaro Quezada D'Ottone
2de60b5562
Fix for Avalanche's description. (#350) 2020-04-22 08:32:27 +02:00
DizzyEggg
633ebe6148 Schooling 2020-04-21 20:43:47 +02:00
LOuroboros
f8f61c10ac
Added data for Plasma Fists, Photon Geyser and Double Iron Bash (#348) 2020-04-21 20:09:28 +02:00
LOuroboros
b1afb96a02
Added descriptions for the moves that were missing one (#346) 2020-04-21 20:08:49 +02:00
DizzyEggg
328e951afa Ally Switch, tbd 2020-04-20 20:05:04 +02:00
DizzyEggg
0f628c8ff2 Fairy Lock 2020-04-20 19:41:07 +02:00
DizzyEggg
2daf1fbbf8 Geomancy 2020-04-20 19:02:03 +02:00
LOuroboros
260cbe6b65
Fixed the definitions of King's Shield, Forest's Curse and Land's Wrath (#340) 2020-04-20 14:12:09 +02:00
Eduardo Alvaro Quezada D'Ottone
4697a5b687
More Battle configs (#339) 
* Fixed naming of King Shield's description variable.

* Config for King Shield lowering attack.

* Config for terrain type attack boost.

* Standarized battle config descriptions.

* Adjusted config logic accounting for GEN_8.

* Changed KING_S_SHIELD back to KINGS_SHIELD

* Missed B_ABILITY_WEATHER.
 2020-04-20 14:11:28 +02:00
DizzyEggg
28805b0f98 AI powder moves 2020-04-20 12:14:56 +02:00
DizzyEggg
d38e0d8ae5 AI dont rely on power if bad effects 2020-04-20 11:27:09 +02:00
DizzyEggg
d5307c3e54 Poison Touch 2020-04-19 14:24:31 +02:00
DizzyEggg
6a3944d27c Frisk, would be easier if it didnt scan 2 opponents 2020-04-19 13:37:56 +02:00
DizzyEggg
7178ea6b46 Shore Up 2020-04-18 18:34:18 +02:00
DizzyEggg
1395a7d382 Loafing Around bug fix 2020-04-18 13:04:28 +02:00
DizzyEggg
a2813e63de Slow Start 2020-04-18 12:52:15 +02:00
DizzyEggg
34f5d9e2ae Burn Up And Purify 2020-04-17 21:14:26 +02:00
DizzyEggg
e00b76b8da Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-04-15 13:31:52 +02:00
Eduardo Alvaro Quezada D'Ottone
2b9eb00486
Mind blown (#302) 
* Mind Blown Part 1 (Definition and self-damage)

* Mind Blown Part 2 (Damp interaction)
 2020-04-14 09:27:29 +02:00
GriffinR
8d3b7bd0b1 Use metatile labels for decor gfx 2020-04-13 14:43:50 -04:00
GriffinR
96958ba5e9 Drop unnecessary decor prefix 2020-04-13 13:04:22 -04:00
MandL27
2c9ee80004
Gen 4+ moves get contest effects (#319) 
* Add contest move effects

* Fix constants and also fix some laughable combo coding

* comment usum moves for cleaner merge

* clean up gitignore

* revert gitignore

* also revert moves.h because I'm bad at reading messages

* add some missing effects because the spreadsheet I sourced is bad
 2020-04-13 15:05:10 +02:00
DizzyEggg
cb5b673f8a Big Root and STRENGTH Sap 2020-04-13 15:00:17 +02:00
DizzyEggg
060b795d8e Merge with master 2020-04-11 19:48:24 +02:00
DizzyEggg
1435cd4692 Change inner structure of semi invulerable moves 2020-04-11 11:47:13 +02:00
GriffinR
2615a6838e Label unknown anims 2020-04-09 19:24:47 -04:00
PikalaxALT
7a059c75a6
Merge pull request #968 from GriffinRichards/doc-regionmap 
Document some pokenav and region map
 2020-03-17 10:38:20 -04:00
DizzyEggg
6968124529 Merge battle anim documentation 2020-02-29 13:59:41 +01:00
GriffinR
172cb7bae9 Sync Unown and qmark mon folders with pokefirered 2020-02-25 14:18:28 -06:00
GriffinR
b1d131ace2 Convert base_stats.h to UTF-8 2020-02-25 12:46:03 -06:00
DizzyEggg
108f6b711f Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-02-23 10:58:26 +01:00
Marcus Huderle
49421a41b2 Move field effects data and graphics into own directory, and cleanup naming for object events 2020-02-12 17:32:51 -06:00
GriffinR
956090b05f Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-02-12 13:05:57 -05:00
GriffinR
689acd3613 Move slot machine data to src 2020-02-09 14:11:50 -06:00
Eduardo Alvaro Quezada D'Ottone
bd8d304c01
Spark is now Physical (#261) 2020-02-08 09:40:51 +01:00
GriffinR
86354f1d50 Document some pokenav and region map 2020-02-05 21:04:43 -05:00
DizzyEggg
8889039a57 Merge with master 2020-01-31 21:15:08 +01:00
GriffinR
9c934c9664 Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers 2020-01-26 12:23:08 -05:00
GriffinR
7232bfecc2 Name null palettes 2020-01-26 09:40:35 -06:00
GriffinR
4c12ad00d2 Merge branch 'master' into fix-eventobj 2020-01-19 21:57:29 -05:00
Eduardo Alvaro Quezada D'Ottone
b87dac459b Implemented missing Neuroforce. (#242) 
* Added ID, name and description.

* Added damage multiplier.
 2020-01-18 18:34:04 +01:00
DizzyEggg
d8aab3d112 Merge with master 2020-01-18 18:17:25 +01:00
GriffinR
655910a16f
Merge branch 'master' into fix-eventobj 2020-01-12 22:42:43 -05:00
DizzyEggg
1141e733eb Merge with master 2020-01-12 14:29:43 +01:00
GriffinR
635267ce32
Merge branch 'master' into fix-eventobj 2020-01-08 05:51:49 -05:00
GriffinR
ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions 2020-01-08 05:43:06 -05: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
GriffinR
c85ca4b860 Standardize farfetchd spelling 2020-01-06 15:17:11 -06:00
GriffinR
379f7f5149 Add braces to trainer party moves 2020-01-06 15:16:49 -06:00
GriffinR
bb692a03eb Add frontier mon constants 2020-01-03 23:20:11 -05:00
DizzyEggg
4c9ea32d19 Merge with master 2019-12-30 18:52:23 +01:00
Marcus Huderle
ef751c8d1b Fix formatting and remove unnecessary comments 2019-12-28 12:07:02 -06:00
huderlem
3b05398975
Merge pull request #945 from Fontbane/patch-5 
Give rival and Maxie parties better names
 2019-12-28 12:06:35 -06:00
Fontbane
31b4656324 Labels better 2019-12-25 22:39:06 -05:00
Fontbane
2e8c20d72f Update trainers.h 2019-12-25 20:48:40 -05:00
huderlem
8d64bc9df8
Merge pull request #944 from GriffinRichards/doc-itemuse 
Document item_use.c
 2019-12-25 11:59:07 -06:00
huderlem
ee61726136
Merge pull request #936 from GriffinRichards/doc-tower 
Document Battle Tower scripts
 2019-12-25 11:39:20 -06:00
DizzyEggg
34bd81871c
Merge pull request #208 from Fontbane/patch-4 
Change move names to CamelCase
 2019-12-23 17:11:32 +01:00
AJ Fontaine
b80fa767ab
Give rivals and Maxie battles better names 
Name describes where the battle is and for rivals, which starter the player chose.
 2019-12-23 10:42:06 -05: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
749965d56b Document item_use.c 2019-12-21 21:39:30 -05:00
GriffinR
68cdd7b1cb Merge master into ObjEvent rename 2019-12-21 05:19:27 -05:00
Diegoisawesome
026e1108b2
Merge pull request #935 from GriffinRichards/doc-warp 
Document some warp/field screen effect
 2019-12-20 23:44:56 -08:00
GriffinR
ff2d8a9c4e Add frontier trainer constants 2019-12-20 21:14:05 -05:00
jiangzhengwenjz
681d929892 DrawTradeMenuPartyInfo 2019-12-21 06:09:59 +08:00
Fontbane
98ce80d231 Fix move names 2019-12-19 13:47:31 -05:00
GriffinR
23f952b34e Merge master into doc-tower 2019-12-17 21:17:46 -05:00
GriffinR
ddfa0c6298 Document Battle Tower scripts 2019-12-17 20:56:13 -05:00
GriffinR
d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
GriffinR
db8a5c6c2b
Merge branch 'master' into fix-eventobj 2019-12-15 11:47:27 -05:00
AJ Fontaine
2e7c21e528
Vise Grip to Vice Grip 
The weird thing is "vice" is the British way of saying it and "vise" is the American way, but the change happened in games based on the UK. Now matches its Gen 7 name.
 2019-12-14 17:01:33 -05:00
GriffinR
6556b556dd
Merge branch 'master' into fix-eventobj 2019-12-11 01:09:06 -05:00
GriffinR
47b0d8a597
Merge branch 'master' into doc-matchcall 2019-12-10 20:43:27 -05:00
GriffinR
b7ab9cbf4c Update JP translation and fix typo 2019-12-10 19:29:23 -06:00
GriffinR
ed1ff0ad77 Document misc strings and text colors 2019-12-10 19:29:23 -06:00
AJ Fontaine
25434b5179
Change move names to CamelCase 
To match with Gen 4 and 5. "Vicegrip" was changed to "Vice Grip" in Gen 6 and then "Vise Grip" in Gen 8, so I changed it to "Vise Grip".
 2019-12-09 11:09:57 -05:00
DizzyEggg
ac499bc896 Merge with master 2019-12-09 08:16:18 +01:00
GriffinR
b93101bbeb Merge master into ObjEvent rename 2019-12-06 21:37:33 -05:00
GriffinR
2756771958 More usage of ST_OAM constants and SPRITE macros 2019-12-06 19:05:44 -06:00
GriffinR
c40879aa36 Use ST_OAM constants for OamData definitions 2019-12-06 19:05:44 -06:00
GriffinR
c51e0f3bae
Merge branch 'master' into fix-eventobj 2019-12-06 02:34:54 -05:00
GriffinR
548af3c0f1 Document a bit of Match Call 2019-12-05 15:33:36 -05:00
DizzyEggg
dcb5d16cb3 Merge with master 2019-11-29 21:47:31 +01:00
AJ Fontaine
2d1a780dd8
Fix Hondrew Berry typo 2019-11-28 11:44:13 -05:00
GriffinR
f559fa3fe2 Merge master into ObjEvent rename 2019-11-25 20:00:04 -05:00
GriffinR
63ee15fc28 Document Frontier Util 2019-11-25 18:37:48 -06:00
DizzyEggg
8cc0439182 merge master 2019-11-22 22:47:19 +01:00
GriffinR
570881b119 Rename event_object directories 2019-11-21 00:44:55 -05:00
GriffinR
98b81722e7 Rename field_objet_palettes 2019-11-20 23:54:22 -05:00
GriffinR
82cb741d8b Standardize EVENT_OBJECT to OBJECT_EVENT 2019-11-20 23:12:51 -05:00
GriffinR
ec3e86f1d2 Standardize Event Object to Object Event 2019-11-20 22:55:44 -05:00
GriffinR
81507fc8b7 Move Apprentice data 2019-11-20 19:04:25 -05:00
GriffinR
a486c8affd Begin documenting Apprentice, merge with master 2019-11-18 12:47:10 -05:00
GriffinR
3bbdee61b8 Clean up Trainer Hill doc 2019-11-16 13:02:35 -06:00
GriffinR
5e01871f8b Document Trainer Hill 2019-11-16 13:02:35 -06:00
GriffinR
2c3726a328 Document contest strings 2019-11-16 12:50:01 -06:00
GriffinR
248b85c3cb Document Frontier Exchange Corner scripts 2019-11-16 12:00:35 -06:00
GriffinR
fc3783b739 WIP Document apprentice 2019-11-16 12:28:49 -05:00
GriffinR
ef8370566f Document Contest scripts 2019-11-13 18:20:55 -06:00
DizzyEggg
ea6736cd8d merge 2019-11-10 12:09:14 +01:00
GriffinR
5c627518b3 Rename Grunts to use location-specific names 2019-11-04 16:45:00 -06:00
DizzyEggg
1d8cc9b741 Fix merge conflicts 2019-11-03 19:55:19 +01:00
GriffinR
b1ea2592c3
Merge branch 'master' into doc-partymenu 2019-10-31 14:22:51 -04:00
GriffinR
b33db9b96c Move party menu data 2019-10-31 14:16:43 -04:00
GriffinR
973e6f9667 Document mauville_man.inc 2019-10-21 17:21:53 -05:00
DizzyEggg
621dd4f0bf Fix Sheer Force moves and effects happening 2019-10-21 14:48:03 +02:00
DizzyEggg
e736c369d6 Merge with master 2019-10-19 17:47:55 +02:00
garak
9b9b14ad0a remove empty groups from wild encounter fields json objects 2019-10-14 18:12:03 -05:00
garak
c73e20b6af add subgroups for fishing rods to encounter json 2019-10-14 18:12:03 -05:00
Marcus Huderle
8df4982b3f Merge remote-tracking branch 'upstream/master' into document-trade 2019-10-12 15:39:17 -05:00
GriffinR
3514f9dd6b Clean up trade.c doc 2019-10-10 18:46:42 -04:00
DizzyEggg
bae5d2038f Update with master 2019-10-10 16:18:48 +02:00
GriffinR
07fa82c911 Last non-anim trade.c doc 2019-10-10 03:50:51 -04:00
GriffinR
32aa87c7e1 More trade doc, fix switch indentations 2019-10-09 14:21:29 -04:00
GriffinR
2c062dc764 More trade documentation 2019-10-09 05:56:44 -04:00
GriffinR
d1bcd60b58 Document more trade.c 2019-10-08 20:25:46 -04:00
Marcus Huderle
799edaf3e6 Document hide/show reflection movement actions 2019-10-06 14:17:34 -05:00
GriffinR
66a68159b1 Continue trade doc 2019-10-05 10:41:37 -04:00
GriffinR
dadb1cb9f1 More trade/union room doc, incidental party_menu doc 2019-10-04 23:31:25 -04:00
GriffinR
6b556900f8 Move union room data, more trade doc 2019-10-04 17:24:03 -04:00
GriffinR
2b0c944286 Document more of trade 2019-10-04 07:42:45 -04:00
GriffinR
4a7f061885 Document some of trade 2019-10-03 19:39:37 -04:00
GriffinR
c3c8fb40cf Move trade data, some trade.c clean up documentation 2019-10-03 01:16:22 -04:00
GriffinR
de6e1e9ecf Use multi constants from merge 2019-09-23 00:36:49 -04:00
GriffinR
b6dffcf8b7 Clean up script_menu documentation 2019-09-19 19:23:24 -04:00
GriffinR
9fb24bbbce Remainder of script_menu documentation 2019-09-19 18:31:09 -04:00
GriffinR
275695c189 Document more script_menu, lilycove harbor 2019-09-19 17:27:34 -04:00
GriffinR
de0084ef7a Document multichoice ids 2019-09-19 00:56:51 -04:00
GriffinR
b596322ca2 Initial script_menu documentation 2019-09-18 18:57:25 -04:00
GriffinR
6ab192e739 Review changes for #807 2019-09-17 16:50:17 -05:00
GriffinR
3dbd375779 Some frontier field_specials documentation 2019-09-17 16:50:17 -05:00
GriffinR
aac9658a8e Document some field_specials data 2019-09-17 16:50:17 -05:00
GriffinR
6c9997a906 Document decor icons 2019-09-16 19:23:21 -05:00
PikalaxALT
e87f4f4cc7 Unify TrHillTag struct definitions (variable floors) 2019-09-05 20:48:48 -05:00
PikalaxALT
904bba9e16 NULL_BATTLE_TOWER_POKEMON define 2019-09-05 20:48:48 -05:00
PikalaxALT
e2fbce996e Use designated initializers (C99 feat) 2019-09-05 20:48:48 -05:00
PikalaxALT
f3bed6045e Disassemble data/ereader_screen.s 2019-09-05 20:48:48 -05:00
PikalaxALT
a9918c3b89 Partial refactor of TryWriteTrainerHill_r 2019-09-05 20:48:48 -05:00
PikalaxALT
5c7eac7134
Merge pull request #744 from PikalaxALT/remove_tutor_casts 
Remove unnecessary tutor learnset casts
 2019-09-04 16:51:06 -04:00
PikalaxALT
36723a235a
Merge pull request #735 from garakmon/encounter_json 
Add Different Field Info to Wild Encounters JSON
 2019-09-04 16:50:39 -04:00
tustin2121
cdae0c1444 Change event object graphics pointer table to use explicit indexes 
- This makes it easier for future hack makers to rearrange, add, or delete graphic object ids without having to count indexes or keep them in order.
- Porymap will have to be updated, but I have some code for this already in a fork.
 2019-08-29 16:44:10 -05:00
DizzyEggg
e96e98a8de Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-08-25 13:10:32 +02:00
GriffinR
d931ba9602 document remaining funcs 2019-08-21 17:06:55 -05:00
GriffinR
771a7b25fa move data, more contest lady funcs 2019-08-21 17:06:55 -05:00
DizzyEggg
0dd9a3dd0c Fix Stealth Rock msg and target 2019-08-05 12:26:53 +02:00
DizzyEggg
c219776034 Merge with master 2019-08-04 23:09:28 +02:00
garak
2580693ea5 INDEX to SLOT in encounter inja template 2019-07-29 13:12:20 -04:00
garak
b6483d7026 name match call messages by trainers 2019-07-29 12:58:15 -04:00
garak
dfa3e079c0 finish pokenav data decomp 2019-07-19 22:57:33 -04:00
garak
f6d55db535 decompile pokenav_unk_5 data 2019-07-19 21:05:55 -04:00
garak
c400d1dc7f decompile pokenav_unk_3 data 2019-07-19 18:31:42 -04:00
PikalaxALT
71dff6dbf1 Remove unnecessary tutor learnset casts 2019-07-10 16:38:05 -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
9e175c9f1b Merge branch 'master' into battle_engine_v2 2019-06-10 11:21:16 +02:00
DizzyEggg
453be19670 change cooltrainer unused class name 2019-05-25 08:26:40 -05:00
DizzyEggg
a074f36766 USE PROTAG 2019-05-25 08:26:40 -05:00
DizzyEggg
e706280503 Rename PKMN TRAINER CALSS 4 2019-05-25 08:26:40 -05:00
DizzyEggg
76c5287629 Bug Bite 2019-05-23 12:32:14 +02:00
DizzyEggg
32aeba21e0 Some AI tweaking 2019-05-23 11:41:35 +02:00
Papa Cancer
e53ba4773d Documenting bags, berries and graphics 
Bag graphics and berry graphics mostly documented
item_menu.c significantly documented
Bag structs documented and functions renamed to match formatting
 2019-05-22 21:10:16 -05:00
DizzyEggg
e9829c16c4 Correct effect for seed flare 2019-05-20 09:18:49 +02:00
DizzyEggg
7ec9123b0a Merge branch 'battle_engine_v2' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-05-20 09:16:13 +02:00
DizzyEggg
a70dceefb2
Merge pull request #154 from LOuroboros/patch-1 
FLAG_SNATCH_AFFECTED for Healing Wish and Lunar Dance
 2019-05-20 09:15:58 +02:00
DizzyEggg
88bbdc494b Merge branch 'battle_engine_v2' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2019-05-20 09:14:32 +02:00
DizzyEggg
09c0a195ac Merge branch 'master' into battle_engine_v2 2019-05-20 09:05:12 +02:00
LOuroboros
a14016240a
Razor Leaf is a Physical move, not a Special one. 2019-05-20 03:34:13 -03:00
LOuroboros
f81daeab45
FLAG_SNATCH_AFFECTED for Healing Wish and Lunar Dance 
Title is self-explanatory. As of Gen. 5, Healing Wish and Lunar Dance are affected by Snatch.
 2019-05-19 23:32:59 -03:00
DizzyEggg
ab421f1089 Use array count for trainer parties 2019-05-17 07:33:22 -05:00
DizzyEggg
f22f7866ac Merge with master, fix conficts 2019-05-17 09:52:20 +02:00
DizzyEggg
188f2aa29e ability random define for battle pyramind 2019-05-16 17:09:43 -05:00
DizzyEggg
4ae1e014bc Change abilities in base stats to array 2019-05-16 17:09:43 -05:00
DizzyEggg
33979f0fa6 use ability num instead of alt ability 2019-05-16 17:09:43 -05:00
DizzyEggg
94045ace0b Merge branch 'master' into battle_engine_v2 2019-05-15 13:31:53 +02:00
DizzyEggg
824a95fe07 Incinerate 2019-05-10 15:12:33 +02:00
Marcus Huderle
0babaa8c07 Convert wild encounter data to JSON 2019-05-08 17:06:39 -05:00
DizzyEggg
c0470c3932 Remove skarmory mega evo 2019-05-03 17:31:23 +02:00
DizzyEggg
d0f91a996d Tweak up mega evo 2019-05-02 23:10:01 +02:00
DizzyEggg
a7f2fa67ef
Merge pull request #142 from thechurchofcage/beta 
Magnetic Flux + Gear Up
 2019-05-01 11:11:46 +02:00
DizzyEggg
bbe3a28b78 Merge with master 2019-05-01 11:10:41 +02:00
Papa Cancer
3cde800bd0 Magnetic Flux + Gear Up 
Both have the same effect so they're in one commit. Uses custom script to check both user and partner for stats and abilities.
Magnetic Flux uses Charge animation.
 2019-04-20 20:17:56 +01:00
Papa Cancer
b50007e861 Instruct 
Re-PR'd due to excess "merges"
 2019-04-20 20:11:49 +01:00
Papa Cancer
7e99272482 Laser Focus 
Re-PR'd due to excess "merges"
 2019-04-20 20:02:52 +01:00