GriffinR
09a9efd5c5
Merge pull request #1398 from GriffinRichards/doc-field
...
Document field
2021-04-10 13:05:51 -04:00
GriffinR
f6016838b1
Merge pull request #1397 from GriffinRichards/doc-moremisc
...
Clean up battle scripts
2021-04-10 12:41:35 -04:00
GriffinR
72ba8cf58d
Document pokemon animation types
2021-04-10 00:50:28 -04:00
ExpoSeed
8494306d1d
Rename flags
2021-04-07 16:07:30 -05:00
GriffinR
d717a635c8
event_object_movement cleanup
2021-04-06 17:55:29 -04:00
GriffinR
0dc7ff8994
Minor misc field doc
2021-04-06 17:17:41 -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
GriffinR
00c3044c96
Clarify Groudon/Kyogre/Rayquaza gfx names
2021-04-06 02:38:15 -04: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
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
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
939608f5b8
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-04-02 13:16:40 -07:00
GriffinR
1b8d405b5e
Add missing include guard suffixes
2021-04-02 12:54:40 -04:00
GriffinR
c9d3b26ff7
Label miss string indexes
2021-04-02 02:12:46 -04:00
GriffinR
8be2c5d60b
Document Contest Lady TV Show
2021-04-02 01:49:38 -04:00
GriffinR
a0b3d4df12
Merge pull request #1390 from GriffinRichards/doc-introcred
...
Document intro and credits sequences
2021-04-01 23:13:59 -04:00
GriffinR
51970f97b0
Merge pull request #1393 from GriffinRichards/doc-dewfordtrend
...
Document Dewford Trend and match_call.c
2021-04-01 22:19:48 -04:00
GriffinR
f58465a274
Document match_call.c
2021-04-01 03:29:15 -04:00
LOuroboros
ed74430d26
Added a variation of BattleScript_NotAffected
...
This one triggers the Ability PopUp.
2021-03-31 23:33:51 -03:00
GriffinR
771a434730
Label Trend Watcher TV show texts
2021-03-31 16:29:42 -04:00
GriffinR
86856098a3
Document Dewford Trend
2021-03-31 16:08:42 -04:00
BuffelSaft
35add44a90
Thousand Arrows hits airborne targets
...
Thousand Arrows now hits flying types, Pokémon with Levitate, Pokémon holding an Air Balloon, and Pokémon under the effect of Magnet Rise, Telekinesis etc.
Also fixed its effect chance, which was 0 instead of 100.
2021-03-31 23:05:30 +13:00
GriffinR
50e9666e16
Merge branch 'master' into doc-introcred
2021-03-29 20:56:15 -04:00
GriffinR
dea07dc865
Standardize intro gfx names
2021-03-29 20:48:48 -04:00
GriffinR
09ff1524b4
Finish documenting credits
2021-03-29 19:58:29 -04:00
Kurausukun
102582a3df
Merge branch 'master' of https://github.com/pret/pokeemerald into fr_doc
2021-03-29 18:36:18 -04:00
GriffinR
c40fb9288c
Merge pull request #1378 from GriffinRichards/doc-berrycrush
...
Document Berry Crush
2021-03-29 12:38:16 -04:00
GriffinR
62968895ca
Add MON_PIC_SIZE constant
2021-03-29 09:38:19 -04:00
GriffinR
357c5439f5
Document some credits
2021-03-29 08:52:40 -04:00
GriffinR
c86cc8b371
Document intro, start intro_credits/credits
2021-03-28 23:13:56 -04:00
ghoulslash
a595b213b4
merge with be
2021-03-28 17:29:22 -06:00
GriffinR
7a5c6d4d86
Standardize Friendship/Happiness
2021-03-27 17:27:20 -05:00
ultima-soul
5bab9474dc
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-03-22 23:08:19 -07:00
GriffinR
6127c6f32e
Misc labels in battle facilities
2021-03-22 15:30:19 -05:00
GriffinR
dfc6ee0e9e
Add SAFE_DIV
2021-03-21 13:43:14 -05:00
GriffinR
557152b06e
Minor link cleanup
2021-03-21 13:40:40 -05:00
Kurausukun
5b910a11b4
port miscellaneous fr documentation
2021-03-18 20:35:39 -04:00
GriffinR
22e2c0a47c
Document Berry Crush
2021-03-18 15:18:23 -04:00
BuffelSaft
7d237d8ff6
Implement Body Press' effect
...
Body Press calculates damage using the user's defense stat instead of its attack. Also adds a special variant of the effect that uses the special defense stat.
2021-03-16 22:56:44 +13:00
GriffinR
ecd269ba2c
Merge pull request #1372 from GriffinRichards/doc-countdown
...
Document minigame countdown
2021-03-15 21:39:58 -04:00
PikalaxALT
925e68c03f
Update newly named fields
2021-03-15 15:22:41 -04:00
amiosi
b081a00891
Merge branch 'battle_engine' into old_findings
2021-03-13 09:59:09 -05:00
Eduardo Quezada D'Ottone
292993e360
Merge pull request #1338 from ghoulslash/ripen
...
Add Ripen and Finish Gen4 Berries
2021-03-13 11:16:42 -03: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
GriffinR
b1a69d95ea
Document minigame countdown
2021-03-11 14:25:22 -05:00
GriffinR
6c297d19e8
Merge pull request #1356 from GriffinRichards/doc-dodrioberrypicking
...
Document Dodrio Berry Picking
2021-03-10 18:55:41 -05:00
ghoulslash
3f9bf5acc0
merge with be
2021-03-09 10:33:48 -07:00
ghoulslash
68388f633f
merge with be
2021-03-08 18:58:16 -07:00
GriffinR
55a40b901f
Label battle tower link script
2021-03-04 19:30:19 -06:00
GriffinR
b9c733495b
Document dodrio berry picking
2021-03-03 14:26:05 -05:00
Evan
41d47a867e
format fixes
2021-03-03 10:48:57 -07:00
Evan
2ccdf1d89e
merge with be. magic guard checks
2021-03-03 09:21:06 -07:00
ghoulslash
0ee9425599
Update include/battle_scripts.h
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:14:07 -07:00
ghoulslash
3a30fe900a
Update include/constants/hold_effects.h
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-03-03 09:13:49 -07:00
ultima-soul
e5fa583a08
Merge pull request #1334 from ghoulslash/gen8_abilities
...
More Gen 8 Abilities
2021-03-01 10:40:09 -08:00
Evan
6cb8c6309a
merge with be
2021-03-01 11:28:51 -07:00
Evan
55649a67cc
Merge branch 'terrain' of https://github.com/ghoulslash/pokeemerald into terrain
2021-03-01 11:23:05 -07:00
Evan
55b8538f68
merge with be
2021-03-01 11:22:37 -07:00
ultima-soul
f6147ee054
Merge pull request #1356 from ghoulslash/tailwind_turns
...
Update tailwind timer To Gen5
2021-03-01 08:51:40 -08:00
GriffinR
91ab30fa71
Rename mon markings struct
2021-02-28 17:11:46 -06:00
GriffinR
ed0347476c
Remove old declaration and define
2021-02-28 17:11:46 -06:00
GriffinR
031da44cab
Document mon markings
2021-02-28 17:11:46 -06:00
GriffinR
cbc7a72814
Merge pull request #1346 from GriffinRichards/doc-pokejump
...
Document pokemon jump
2021-02-28 11:19:02 -05:00
N
cab3728e96
Strangest match
2021-02-28 10:06:07 -06:00
huderlem
10c77f1bc2
Merge pull request #1345 from GriffinRichards/doc-rtcscreen
...
Document/clean up some minor screens
2021-02-28 10:03:22 -06:00
Marcus Huderle
c900de35e7
Fix build and cleanup mistakes
2021-02-28 09:54:55 -06:00
Marcus Huderle
a85fada314
Document more battle anim effects
2021-02-28 09:54:55 -06:00
GriffinR
1912b0cf0a
Merge branch 'master' into doc-rtcscreen
2021-02-28 10:28:43 -05:00
GriffinR
3f59362397
Merge branch 'master' into doc-pokejump
2021-02-28 10:27:50 -05:00
GriffinR
ea748ff7f5
Merge pull request #1344 from GriffinRichards/doc-ec
...
Document easy chat and mail, script.c cleanup, add/use some general constants
2021-02-28 10:26:49 -05:00
Marcus Huderle
c323e7f061
Document some battle anim funcs and data
2021-02-27 11:04:45 -06:00
GriffinR
117b90a261
Document pokemon jump
2021-02-26 17:26:39 -05:00
GriffinR
f172ff84c9
Clean up save_failed_screen
2021-02-24 14:53:32 -05:00
GriffinR
b71b10623b
Add palette selection constants
2021-02-24 11:03:51 -05:00
GriffinR
c6141fea83
Document easy chat
2021-02-24 11:03:45 -05:00
GriffinR
1cac608dbe
Document mail
2021-02-24 11:03:39 -05:00
GriffinR
a5852d57d1
Use TASK_NONE constant
2021-02-24 11:03:25 -05:00
GriffinR
e52b46ab43
Clean up script.c
2021-02-24 11:03:17 -05:00
GriffinR
06ae5a37e2
Merge pull request #1336 from GriffinRichards/giftribbons
...
Document some ribbon usage
2021-02-24 10:07:59 -05:00
GriffinR
fc3d6eb178
Merge pull request #1328 from GriffinRichards/doc-pokeuseitem
...
Document PokemonUseItemEffects
2021-02-22 12:15:19 -05:00
SphericalIce
381116b3c4
Add labels for cracked floor metatiles
2021-02-22 15:29:14 +00:00
GriffinR
64fc585cc3
Document pokenav ribbons summary screen
2021-02-18 11:33:55 -05:00
GriffinR
d62f89b20c
Minor window/bg cleanup
2021-02-18 10:00:07 -05:00
GriffinR
02c1fbd733
Document ribbon TV show, add new ribbon IDs/size
2021-02-18 09:59:24 -05:00
GriffinR
e059c4fdfa
Use new gift ribbons size, label unused ribbons
2021-02-17 14:11:45 -05:00
Deokishisu
1dda9939ab
Fix Swapped Comments on PokeCoupon Tiers
2021-02-16 16:08:58 -05:00
Deokishisu
7f55bf875c
Move BoxRS Data Down to ExternalEventFlags
...
As suggested, moved the BoxRS data fields into ExternalEventFlags and packed that struct.
2021-02-16 16:01:18 -05:00
Deokishisu
fb60e036ce
Document Box: Ruby & Sapphire Fields
...
Labeled another field in the ExternalEventData struct used by Pokémon Box: Ruby & Sapphire.
Special thanks to Citrus Bolt#4642.
2021-02-16 15:37:58 -05:00
Deokishisu
cd89d17b12
Document More External Events
...
Did research to determine how the Japanese Colosseum Bonus Disc modifies the ExternalEventData fields. The Ageto Celebi flag, as well as the flag for the three PokeCoupon title rewards, have been documented and included into the struct.
The PokeCoupon fields are actually 3-byte fields, so they have been turned into bitfields, since u24 isn't possible.
Also discovered that Channel and US Colosseum Bonus Disc Jirachi use the same flag, so renamed that flag and commented to explain.
Also made general comments explaining how the ExternalEventData and ExternalEventFlags are applicable to Emerald specifically.
2021-02-16 09:41:07 -05:00
GriffinR
ee4af94a36
Merge pull request #1324 from GriffinRichards/doc-sb
...
Document remainder of secret_base.c
2021-02-15 17:41:55 -05:00
Deokishisu
7b2bf8c7e2
Rename obedient/fatefulEncounter to eventLegal
...
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind.
Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
2021-02-15 14:54:35 -05:00
Deokishisu
b89c3e901e
Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h
...
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.
The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
2021-02-15 11:40:16 -05:00
GriffinR
5f58ea02c6
Merge pull request #1330 from sphericalice/hidden-to-buried
...
Rename 'hidden' Trainers/obj events to 'buried'
2021-02-14 21:48:21 -05:00
SphericalIce
56e047f949
Fix Lilcove Motel typos
2021-02-14 21:38:39 +00:00
SphericalIce
70ff6c3b84
Rename 'hidden' Trainers/obj events to 'buried'
2021-02-14 19:25:23 +00:00
GriffinR
be0699bd64
Merge pull request #1326 from GriffinRichards/doc-layouts
...
Label unused layouts
2021-02-14 14:22:28 -05:00
GriffinR
a85ac11b28
Merge pull request #1325 from GriffinRichards/constants-berrytree
...
Add berry tree id constants
2021-02-14 14:15:51 -05:00
Evan
d65d5cb8fd
add AI_FLAG_SMART_SWITCHING, some burn checks
2021-02-14 09:37:04 -07:00
GriffinR
8634710996
Document PokemonUseItemEffects
2021-02-12 16:02:04 -05:00
Evan
0664daf384
fix some post-merge errors
2021-02-12 11:02:10 -07:00
Evan
f3d975e239
merge with be
2021-02-12 08:59:55 -07:00
Evan
4782f713f2
update semi invulnerable state check
2021-02-12 08:57:57 -07:00
LOuroboros
21ee6cb9fb
Added constant labels for EV manipulating item effects
2021-02-12 07:26:11 -03:00
amiosi
1df295a582
battle config and zippy zap
...
plus fix mirror move mistakes
2021-02-11 17:11:07 -05:00
amiosi
c0ba7436af
water shuriken and howl
2021-02-11 16:20:13 -05:00
GriffinR
20b76c6071
Fix swapped route 102 berries
2021-02-10 16:26:09 -05:00
GriffinR
987fdf6fcd
Merge pull request #1321 from GriffinRichards/doc-evoscene
...
Document evolution scene
2021-02-08 18:21:30 -05:00
GriffinR
2237d0748f
Label unused layouts
2021-02-08 14:45:56 -05:00
GriffinR
0851c34bac
Add berry tree id constants
2021-02-05 15:25:12 -05:00
GriffinR
a240481d5f
Document secret_base.c
2021-02-05 12:08:25 -05:00
Deokishisu
ac43365d58
Fix "Compatibility" Misspelling
...
Someone misspelled "compatibility" as "compatability" in the daycare-related files. This commit spells them correctly.
2021-02-05 01:27:11 -05:00
GriffinR
15906ca143
Document evolution scene
2021-02-03 17:55:37 -05:00
Evan
6139b12a49
fix hp boxes not dissapearing
2021-02-02 23:30:08 -07:00
Evan
f4d4cf262e
fix screen cleaner, curious medicine, as one
2021-02-02 09:00:07 -07:00
GriffinR
64460e01ae
Merge pull request #1314 from GriffinRichards/doc-controllers
...
Document battle controllers, misc other battle
2021-02-02 00:24:16 -05:00
GriffinR
7e26aa3d21
Merge pull request #1316 from GriffinRichards/doc-scrcmd
...
Label remaining script commands, document some scrcmd.c, event_object_lock, trainer_see, berry tree
2021-02-01 21:04:00 -05:00
ultima-soul
2a20d50904
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
2021-02-01 15:54:08 -08:00
Evan
f428e5e2dc
some quick claw/custap berry fixes
2021-01-31 23:31:27 -07:00
GriffinR
12af03cd62
Label bard music pitch table
2021-01-28 16:36:56 -05:00
GriffinR
89b85a49ec
Index gBardSounds_Moves and gBardSounds_Pokemon with constants
2021-01-28 15:55:33 -05:00
Evan
c003f1c023
check move effectiveness with status effects
2021-01-26 15:41:59 -07:00
GriffinR
92bd6400b7
Fix up berry sparkle
2021-01-26 05:40:34 -05:00
GriffinR
9e59581220
Document object lock and some trainer approach
2021-01-26 04:42:18 -05:00
GriffinR
0064333e4a
Clean up scrcmd.c
2021-01-26 02:16:26 -05:00
GriffinR
3fd5e143a9
Misc battle anim documentation
2021-01-23 00:40:46 -05:00
GriffinR
a392cca928
Misc battle documentation
2021-01-23 00:40:31 -05:00
GriffinR
c106f7f130
Document battle_controller_opponent.c
2021-01-22 21:35:16 -05:00
GriffinR
63a7828772
Document battle_controller_player.c
2021-01-22 20:03:27 -05:00
GriffinR
4eca05ccf5
Document remainder of battle_controllers.c
2021-01-22 02:48:22 -05:00
Evan
5aff5333dc
fix B_MEMENTO_FAIL comment
2021-01-21 12:05:01 -07:00
Evan
bfb7333507
memento gen4 failing
2021-01-21 12:03:30 -07:00
GriffinR
8fe4d004e3
Merge pull request #1305 from GriffinRichards/doc-battletv
...
Document battle tv data
2021-01-21 12:27:14 -05:00
Evan
4611c71bd1
merge with be
2021-01-21 08:55:14 -07:00
Evan
8ec12c665c
merge with be
2021-01-20 17:36:13 -07:00
GriffinR
3ceb43177d
Merge pull request #1312 from sphericalice/pokeemerald
...
Fix misnamed ground effect flags & document reflections
2021-01-20 18:50:31 -05:00
ghoulslash
71f18bfbf4
Merge pull request #1316 from ultima-soul/form_species_tables_be
...
Add Form Species ID Tables
2021-01-20 13:54:39 -07:00
ultima-soul
d3b0e98325
Merge branch 'form_species_tables' into form_species_tables_be
2021-01-20 11:40:48 -08:00
ultima-soul
267900bdcb
Add Form Species ID tables and functions to access them.
2021-01-20 11:31:20 -08:00
SphericalIce
4334f7a379
Include NUM_REFLECTION_TYPES in the ReflectionTypes enum
2021-01-20 10:17:07 +00:00
ExpoSeed
61db82e64a
Revert "Included global.h into battle_config.h"
2021-01-19 22:55:08 -06:00
