GriffinR
cc51627465
Merge pull request #1489 from GriffinRichards/doc-playerpc
...
Document player pc
2021-08-11 18:59:58 -04:00
GriffinR
0bc26d9d79
Merge pull request #1488 from GriffinRichards/doc-frontierpass2
...
Document frontier pass
2021-08-11 17:40:55 -04:00
GriffinR
28a8fe191a
Document item menu
2021-08-10 22:13:02 -04:00
LOuroboros
b4c4650186
Corrected inconsistent flag label spelling
2021-08-05 17:26:03 -03:00
GriffinR
bd5cf07059
Merge branch 'master' into doc-playerpc
2021-08-02 14:08:10 -04:00
GriffinR
06b909bcd8
Document player pc
2021-08-02 13:58:40 -04:00
GriffinR
3e60a78406
Merge branch 'master' into doc-frontierpass2
2021-07-31 13:30:40 -04:00
GriffinR
602855ea99
Document frontier pass
2021-07-31 13:28:08 -04:00
Blackforest92
3bd81d347d
Add missing Gen8 icons
2021-07-31 14:48:55 +07:00
LOuroboros
8012f4b25a
Re-ordered the hidden item flags list
...
Instead of sorting them by location, it makes more sense to sort them by their value.
2021-07-26 20:18:11 -03:00
LOuroboros
bfa824f761
Removed unused status ailment constants
2021-07-23 13:18:24 -03:00
GriffinR
01f2381e01
Add LINK_MANAGER field comments from SDK
2021-07-11 16:48:59 -04:00
GriffinR
72bb2bd160
Merge pull request #1474 from GriffinRichards/clean-miragetower
...
Clean up Mirage Tower
2021-07-10 23:26:41 -04:00
GriffinR
32fe412755
Merge pull request #1475 from GriffinRichards/doc-minor
...
Label remaining symbols in a few files
2021-07-08 00:24:56 -04:00
GriffinR
fced9e507d
Merge pull request #1478 from Kurausukun/itemprint
...
Change ItemPrintFunc to Use u32 Instead of s32
2021-07-08 00:15:45 -04:00
GriffinR
0f538102d9
Add local id constants for C
2021-07-05 13:54:43 -04:00
ExpoSeed
630d172393
Include expansion_branches.h in global.h
2021-07-04 12:41:21 -05:00
Kurausukun
42730a8315
Revert "remove gflib"
...
This reverts commit 8b59909ac5
2021-07-03 17:39:33 -04:00
GriffinR
b4f66496ed
Merge pull request #1471 from GriffinRichards/fix-lock
...
Fix some object lock names
2021-07-03 11:21:10 -04:00
ExpoSeed
788b9f675f
Fix redefinition error in pokemon_config.h
2021-07-02 14:36:02 -05:00
GriffinR
64d06f4c8f
Condense battle AI scripts, minor clean up
2021-07-02 02:46:01 -04:00
GriffinR
8f43d1ebeb
Document smart shopper TV show
2021-07-02 01:45:23 -04:00
GriffinR
fe89a4d147
Label remaining region_map symbols
2021-07-02 00:52:36 -04:00
GriffinR
10886a586b
Clean up mirage tower
2021-07-01 23:46:15 -04:00
PikalaxALT
e0b58592b2
Merge pull request #1469 from GriffinRichards/fix-contesthearts
...
Clarify contest heart tiles
2021-06-21 13:59:50 -04:00
GriffinR
810b51f96c
Clarify contest heart tiles
2021-06-21 13:48:03 -04:00
Kurausukun
10c80230c4
change printItemFunc to use u32 instead of s32
...
also change a use of -2 to LIST_CANCEL
2021-06-18 00:15:45 -04:00
Kurausukun
8b59909ac5
remove gflib
2021-06-17 22:09:48 -04:00
ExpoSeed
b6b0062bd6
Change map header flags to use a bitfield
2021-06-13 17:02:06 -05:00
ExpoSeed
3ed06c2cc2
Remove remaining grey and replace with gray
2021-06-10 11:36:10 -05:00
ultima-soul
cf19635a80
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-06-07 13:15:46 -07:00
Kurausukun
2bbaf71998
[LEAK-INFORMED] fix CreateShedinja fakematch
...
info: the header change is required. accesses to the struct need to be
treated as non-const, even though the array must be const. thanks to
jiang for figuring this out.
2021-05-31 08:20:46 -05:00
ultima-soul
eedd374a5f
Merge pull request #1420 from Blackforest92/pokemon_expansion
...
Added missing gen8 battle sprites and available icons and various fixes
2021-05-24 21:13:12 -07:00
Blackforest92
d74492b591
Returning Alcremie back to monkey
2021-05-25 10:57:06 +07:00
Scott
265cdcdc12
Handle GetAbilityBySpecies edge cases
2021-05-23 16:17:43 -04:00
ultima-soul
50c2514267
Merge pull request #1469 from ultima-soul/pokemon_expansion_sync
...
Pokemon Expansion Upstream Sync
2021-05-13 20:56:29 -07:00
gAlfonso-bit
2be29cdb77
Update IsPokemonCryPlaying
2021-05-13 11:23:11 -05:00
GriffinR
65fd334256
Name map groups
2021-05-11 10:16:04 -05:00
Flametix
a8fab62c89
Fix Substitute typo
2021-05-06 20:49:04 -04:00
GriffinR
6ce27c0ff0
Restore EReaderTrainerHillSet dummy
2021-05-04 15:43:24 -04:00
GriffinR
4206359862
Fix some object lock names
2021-05-04 01:21:50 -04:00
ultima-soul
cf0fd961b9
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-04-28 23:56:58 -07:00
GriffinR
f7a699c686
Merge pull request #1421 from GriffinRichards/doc-tvrecordmix
...
Document TV
2021-04-29 00:25:01 -04:00
ultima-soul
0da3f74a7e
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-04-28 18:58:38 -07:00
GriffinR
6c38837b26
Merge pull request #1420 from GriffinRichards/doc-dataanims
...
Document battler affine anims, default pokeball throw
2021-04-28 13:56:42 -04:00
GriffinR
58cef0ae52
Merge pull request #1418 from GriffinRichards/sync-ereaderhelp
...
Sync e-reader helpers, document trainer hill e-reader
2021-04-28 06:08:57 -04:00
GriffinR
c6300b5325
Merge pull request #1417 from GriffinRichards/doc-pyramidbag
...
Document Battle Pyramid Bag
2021-04-27 14:48:09 -04:00
GriffinR
18f85b5cf0
Merge pull request #1415 from GriffinRichards/doc-contestutil
...
Some Contest clean up
2021-04-27 02:29:41 -04:00
GriffinR
d74017d256
Merge pull request #1419 from GriffinRichards/doc-animstatus
...
Label more unused battle anims
2021-04-26 13:32:15 -04:00
GriffinR
c0aedf8df4
Merge pull request #1410 from GriffinRichards/doc-tradedata
...
Document trade sequence animation, some trade cleanup
2021-04-26 13:26:12 -04:00
GriffinR
aad090e154
Document TV
2021-04-26 12:35:35 -04:00
GriffinR
bee60f4c64
Document battler sprite affine anims, default pokeball throw
2021-04-25 02:18:34 -04:00
GriffinR
e065c0c285
Label more unused battle anims
2021-04-24 18:26:25 -04:00
GriffinR
86475c5ded
Document trainer hill ereader
2021-04-24 18:04:27 -04:00
GriffinR
004c37bf02
Sync ereader_helpers with pokefirered
2021-04-24 18:03:06 -04:00
GriffinR
8c820878bf
Document Battle Pyramid Bag
2021-04-23 15:07:36 -04:00
GriffinR
bc9fc38254
Misc contest cleanup
2021-04-22 15:51:04 -04:00
GriffinR
dbe24f0baa
Clean up contest_painting
2021-04-21 20:04:12 -04:00
GriffinR
a2a9f22612
Clean up contest_util
2021-04-20 21:16:47 -04:00
GriffinR
04af378904
Document trade sequence animation, some trade cleanup
2021-04-20 05:50:39 -04:00
GriffinR
cd2a99b7c4
Doc storage - misc cleanup, some item/cursor
2021-04-17 13:33:29 -04:00
ExpoSeed
f922d42988
Refactor hidden abilities
2021-04-16 23:38:35 -05:00
ExpoSeed
db2b995bc6
Introduce NUM_ABILITY_SLOTS
2021-04-16 23:37:55 -05:00
GriffinR
80cc7d46ae
Doc storage - fix row/column flip
2021-04-16 15:07:10 -04:00
GriffinR
838a452363
Doc storage - choose box menu, move wallpaper gfx
2021-04-15 18:46:20 -04:00
GriffinR
a1ed59450e
Doc storage - wallpaper and titles
2021-04-15 16:09:41 -04:00
GriffinR
c4ef45c161
Merge pull request #1403 from GriffinRichards/doc-pokeblock
...
Document Pokéblock menu and feeding scene
2021-04-14 14:17:36 -04:00
GriffinR
33ea2a1061
Remove unnecessary scope for TEST_BUTTON
2021-04-13 02:50:50 -04:00
GriffinR
82f870091e
Merge pull request #1400 from GriffinRichards/doc-pokemonanim
...
Document Pokémon animation
2021-04-13 01:36:15 -04:00
GriffinR
042a2ecc41
Document pokeblock feed scene
2021-04-12 18:44:37 -04:00
GriffinR
c786a9b20c
Document pokeblock menu
2021-04-11 18:10:05 -04:00
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
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
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
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
b8721034ef
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-04-02 13:42:05 -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
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
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
GriffinR
7a5c6d4d86
Standardize Friendship/Happiness
2021-03-27 17:27:20 -05:00
ultima-soul
56a1cab314
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-03-23 15:21: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
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
Blackforest92
badf8945d8
Added missing gen8 battle sprites and available icons - Fix Arceus, Palkia, Kyurem White and Black - Implement 1 tile 10 palettes system for Alcremie
2021-03-14 18:31:24 +07: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
ExpoSeed
3655fe52f3
Prison Bottle and Reveal Glass don't exist yet
2021-03-09 11:54:56 -06:00
GriffinR
55a40b901f
Label battle tower link script
2021-03-04 19:30:19 -06:00
ExpoSeed
f49da96f1d
Fix consumable item form change
2021-03-03 15:24:58 -06:00
ExpoSeed
07af84db8a
Implement FORM_ITEM_USE. Credits to Lunos for work on Gracidea
2021-03-03 13:54:25 -06:00
GriffinR
b9c733495b
Document dodrio berry picking
2021-03-03 14:26:05 -05:00
ExpoSeed
6f64c1b2b9
Implement GetFormChangeTargetSpecies
2021-03-03 13:07:50 -06:00
ExpoSeed
f7d42cd3c8
Formatting
2021-03-02 14:25:15 -06:00
ExpoSeed
ec1a09bcd5
Revamp table
2021-03-02 14:18:34 -06:00
ExpoSeed
7e8659c4ee
Fix missed merge conflict
2021-03-02 14:17:48 -06:00
ExpoSeed
7802264732
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table
2021-03-01 19:38:13 -06: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
GriffinR
8634710996
Document PokemonUseItemEffects
2021-02-12 16:02:04 -05:00
LOuroboros
21ee6cb9fb
Added constant labels for EV manipulating item effects
2021-02-12 07:26:11 -03: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
amiosi
762dcb8a7c
cry fixes, type null
2021-02-03 14:10:39 -05:00
amiosi
663cc5b15c
oricorio...
2021-02-03 13:02:13 -05:00
amiosi
f46f21bb38
tapus again
2021-02-02 14:40:04 -05:00
amiosi
9c2c337e6f
tapu case
2021-02-02 14:24:15 -05:00
amiosi
f700004188
proper CamelCase
2021-02-02 14:21:00 -05:00
amiosi
2d6b80455d
Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr
2021-02-02 13:25:53 -05:00
amiosi
47e1d6b790
MIMEJR -> MIME_JR
2021-02-02 12:36:05 -05: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
96232ea166
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-01-28 23:59:08 -08: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
ExpoSeed
34c6771e94
Create form change table
2021-01-27 16:30:43 -06: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
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
GriffinR
8fe4d004e3
Merge pull request #1305 from GriffinRichards/doc-battletv
...
Document battle tv data
2021-01-21 12:27:14 -05: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
b4b1d2b9e2
Merge pull request #1315 from ultima-soul/form_species_tables_pe
...
Add Form Species ID Tables
2021-01-20 13:54:20 -07:00
ultima-soul
9663ed0d3c
Merge branch 'form_species_tables' into form_species_tables_pe
2021-01-20 12:06:59 -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
GriffinR
6999b237eb
Merge pull request #1309 from GriffinRichards/misc-macro
...
Use constants for item data, misc other constants/fixes
2021-01-19 20:49:58 -05:00
SphericalIce
2746fd1f95
Name object event ID arguments properly
2021-01-19 23:35:57 +00:00
SphericalIce
6dd973012b
Correct ground effect flag names for reflections & document sprite data usage
2021-01-19 23:21:50 +00:00
GriffinR
752982552e
Add FIRST_BALL, some FIRST_BERRY_INDEX usage
2021-01-19 13:39:18 -05:00
SphericalIce
2dfaba9472
Name color return values more accurately
2021-01-19 17:59:36 +00:00
GriffinR
305ebdbc4a
Parentheses for GET_UNOWN_LETTER
2021-01-19 12:36:36 -05:00
SphericalIce
8de76ed533
Make broader use of RGB macros
2021-01-19 17:15:12 +00:00
GriffinR
cf9f8d01c5
Add misc item data constants
2021-01-19 05:49:20 -05:00
GriffinR
bc20fda604
Use GET_UNOWN_LETTER macro
2021-01-19 04:03:16 -05:00
GriffinR
2da0c3436e
Make filler in PokemonSubstruct0 explicit
2021-01-15 00:14:46 -05:00
GriffinR
564278fd49
Document battle tv data
2021-01-14 06:29:59 -05:00
GriffinR
b9e1b050e1
Label remaining battle types
2021-01-13 15:20:29 -05: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
GriffinR
92de664f79
List battle animation indexes alongside tables
2021-01-11 16:07:16 -05:00
Philipp AUER
b5fa0129d5
[pokemon-expansion] Changes as requested by code review
...
Update include/constants/pokemon_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update include/constants/pokemon_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update include/constants/pokemon_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update include/constants/pokemon_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update include/constants/pokemon_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update include/constants/pokemon_config.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update src/data/pokemon/evolution.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update src/data/pokemon/evolution.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
Update src/data/pokemon/evolution.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-01-11 21:43:00 +01:00
opakedragon
cbaf9b38b2
rename string id to reflect usage
2021-01-11 08:48:00 -05:00
sbird
95665c24b4
[pokemon_expansion] define missing items from ITEM_EXPANSION for gEvolutionTable
2021-01-10 18:30:15 +01:00
SphericalIce
3c2a33b9b2
Use constants for max IVs & the random IV generation flag
2021-01-07 22:13:14 +00:00
GriffinR
e0c0143f41
Fix substitute back sprite
2021-01-04 10:14:01 -05:00
GriffinR
d992e4277e
Merge pull request #1283 from GriffinRichards/doc-factscreen
...
Document battle factory screen
2021-01-03 02:51:59 -05:00
GriffinR
f2ce06683d
Merge pull request #1285 from GriffinRichards/doc-fieldscr
...
Minor field_screen_effect / field_player_avatar documentation
2021-01-03 01:59:36 -05:00
ExpoSeed
10f4b48215
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
2021-01-01 14:14:51 -08:00
GriffinR
88e951bfe3
Label some ReturnToField funcs
2021-01-01 17:11:06 -05:00
GriffinR
c711a2f73b
Document warp spin functions
2021-01-01 17:11:02 -05:00
GriffinR
ec85c01e7c
Merge branch 'master' into doc-factscreen
2020-12-31 00:40:45 -05:00
GriffinR
0bf49198f6
Resume factory screen doc
2020-12-30 13:28:15 -05:00
GriffinR
2f426e0e7d
Index battle controller cmd tables
2020-12-29 17:21:58 -05:00
GriffinR
769ddf22c2
Label remaining subs in battle_tower.c
2020-12-24 16:18:47 -05:00
ultima-soul
6a0939cd4e
Remove special handling for Deoxys.
2020-12-21 22:39:19 -08:00
ultima-soul
ad67068f7e
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into gen_8_mon_data
2020-12-16 13:28:42 -08:00
ultima-soul
c675c92a1d
Add Gen 8 Pokemon data.
2020-12-16 12:57:36 -08:00
GriffinR
15c2856b24
Merge pull request #1265 from Kurausukun/berry_crush
...
fakematch fixes, begin documenting Berry Crush (based on #1187 )
2020-12-14 23:22:41 -05:00
GriffinR
c611421882
Merge pull request #1267 from ipatix/m4a_names
...
refactor m4a.c/m4a_1.s constant/variable/type naming
2020-12-14 20:03:53 -05:00
GriffinR
18a5feb413
Merge pull request #1269 from GriffinRichards/bugfix
...
Use BUGFIX for some inline fixes
2020-12-14 20:00:59 -05:00
GriffinR
f7a729df30
BUGFIX implies UBFIX
2020-12-13 16:16:48 -05:00
Tim Gates
581306db7b
docs: fix simple typo, redunant -> redundant
...
There is a small typo in include/constants/battle_frontier.h.
Should read `redundant` rather than `redunant`.
2020-12-13 22:14:50 +11:00
GriffinR
81d95b9325
Use BUGFIX for some inline fixes
2020-12-12 23:30:51 -05:00
LOuroboros
55bc2b4bb9
Corrected small inconsistency in move flag names
2020-12-12 12:18:56 -03:00
Michael Panzlaff
91ccf9e343
fix typo
2020-12-12 13:07:56 +01:00
Michael Panzlaff
f177c736fc
more CgbSound decipher work
2020-12-11 16:33:58 +01:00
Michael Panzlaff
15ff55eee5
use better m4a variable/constant names
2020-12-11 16:33:55 +01:00
Kurausukun
58976ebaa8
Merge remote-tracking branch 'upstream/master' into berry_crush
2020-12-10 23:30:52 -05:00
LOuroboros
8b5a5a1896
Reverted include/constants/abilities.h to vanilla
...
With the new abilities introduced by the battle_engine in src/data/pokemon/base_stats.h behind locked behind that branch's defined label, we don't need to define them in this branch anymore.
2020-12-10 16:38:29 -03:00
GriffinR
f95192ed87
Define terminal species IDs relatively
2020-12-08 00:45:05 -05:00
LOuroboros
ce8f794100
Updated abilities.h
...
Straight up copied from the BE to avoid silly merge conflicts.
2020-12-05 14:57:13 -03:00
ghoulslash
66ed10a826
Merge pull request #1251 from ExpoSeed/PE-mon-flags
...
Add mon flags
2020-12-03 15:07:17 -05:00
ExpoSeed
f2259d7ce1
Remove IS_ULTRA_BEAST
2020-11-24 22:44:00 -06:00
ExpoSeed
3adf316574
Add mon flags
2020-11-24 22:42:42 -06:00
LOuroboros
c4c802162e
A few more evo related changes.
...
-EVO_MAP -> EVO_MAPSEC
-Introduced a new EVO_SPECIFIC_MAP method. Its name is self-explanatory. (Thanks to Pyredrid!)
-Changed the maps where Eevee can evolve into Leafeon and Glaceon to make use of it.
2020-11-25 01:15:19 -03:00
LOuroboros
89f6036e77
Bumped EVOS_PER_MON from 8 to 10
2020-11-24 23:47:07 -03:00
GriffinR
9d056e8656
Move object event pal declarations to graphics
2020-11-23 14:45:16 -05: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
kageru
6f91f7e0e3
Use more constants in Battle Tower code
2020-11-17 17:40:26 +01:00
LOuroboros
890144f153
Defined Isle of Armor moves
...
Straight up copied from the battle_engine branch.
2020-11-15 13:05:49 -03:00
Eduardo Quezada D'Ottone
29c33b908b
Apply suggestions from code review
...
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2020-11-13 21:34:37 -03:00
Eduardo Quezada D'Ottone
54630ff5a9
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
...
# Conflicts:
# src/data/pokemon/evolution.h
2020-11-13 16:40:31 -03:00
Eduardo Quezada D'Ottone
b2f078410f
Review changes 2
2020-11-13 16:13:13 -03:00
Eduardo Quezada D'Ottone
26db02e95a
Review changes 1
2020-11-13 15:36:36 -03:00
LOuroboros
6f122ac8f8
Defined EVO_MOVE_MEGA_EVOLUTION for BE compatibility
2020-11-11 15:18:39 -03:00
Eduardo Quezada D'Ottone
caf6253ba3
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
...
# Conflicts:
# src/pokemon_icon.c
2020-11-10 19:37:02 -03:00
Eduardo Quezada D'Ottone
d97932c009
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
...
# Conflicts:
# src/pokemon.c
2020-11-10 19:29:50 -03:00
ghoulslash
7a9476323c
Merge pull request #566 from AsparagusEduardo/PE-GenderDifferences
...
Support for Gender Differences
2020-11-10 12:31:03 -07:00
Eduardo Quezada D'Ottone
03c7843e45
Capitalization
2020-11-09 14:52:58 -03:00
Eduardo Quezada D'Ottone
690307dbf9
Updated comment.
2020-11-09 14:49:23 -03:00
Eduardo Quezada D'Ottone
df11b68acb
Moved POKEMON_EXPANSION define to global.h to fix reading from other branches
2020-11-09 12:58:03 -03:00
Eduardo Quezada D'Ottone
68627882a5
Merge remote-tracking branch 'pret/master' into PE-pretSync
2020-11-07 15:00:10 -03:00
Eduardo Quezada D'Ottone
cb6802f01e
Standarized naming schemes.
2020-11-06 20:15:28 -03:00
Eduardo Quezada D'Ottone
5e33281350
Support for gender difference mon icons.
2020-11-06 17:48:03 -03:00
Eduardo Quezada D'Ottone
d7fbaa6cbf
Support for gender palettes.
2020-11-06 17:12:57 -03:00
MCboy
e31158d017
add spaces around - and remove comment from include in battle.h
2020-11-06 23:29:52 +03:30
Eduardo Quezada D'Ottone
3849f7dd5d
Female Eevee backsprite.
2020-11-06 16:45:25 -03:00
MCboy
3b91735e63
use constants for ball throw count
2020-11-06 22:59:46 +03:30
Eduardo Quezada D'Ottone
4d4b111327
Front pic gender differences for Eevee
2020-11-06 16:21:45 -03:00
PikalaxALT
99dd461bef
Merge pull request #1189 from aaaaaa123456789/reverts
...
Undo PokeCodec's PRs and port changes
2020-11-03 09:28:45 -05:00
Eduardo Quezada D'Ottone
0c6dc6abab
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
...
# Conflicts:
# graphics/pokemon/burmy/footprint.png
# graphics/pokemon/gastrodon/footprint.png
# graphics/pokemon/rotom/footprint.png
# graphics/pokemon/shellos/footprint.png
# graphics/pokemon/wormadam/footprint.png
# include/constants/species.h
# src/data/pokemon/base_stats.h
2020-11-03 00:13:51 -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
ultima-soul
1e283e9dbf
Merge pull request #551 from LOuroboros/gen5_footprints
...
Added footprints for the Gen. 5 species
2020-11-02 10:28:06 -08:00
ultima-soul
104b48986c
Merge pull request #538 from AsparagusEduardo/PE-IsUltraBeast
...
Created macro used to detect Ultra Beasts.
2020-11-02 09:53:28 -08:00
ExpoSeed
d6cbbc71a5
Merge pull request #29 from AsparagusEduardo/PR-CommentGen4Abilities
...
Toggle options for abilities and Egg Groups.
2020-11-01 21:07:24 -06:00
Eduardo Quezada D'Ottone
b372ab1c34
Fixed label for Egg Group config.
2020-11-01 14:50:29 -03:00
LOuroboros
7cf3c256cd
Added footprints for the Gen. 5 species, thanks to Blackforest
2020-11-01 09:44:05 -03:00
GriffinR
be1685c87f
Use constants for menu info icon table
2020-10-29 16:34:33 -04:00
LOuroboros
6435158742
Added footprints for the Gen. 4 species
2020-10-27 09:38:04 -03:00
Eduardo Quezada
ed6fd6c964
Fixed compile
2020-10-26 22:37:01 -03:00
Eduardo Quezada
2c098d8294
Merge branch 'pokemon_expansion' into PE-Ultima-Forms
...
# Conflicts:
# src/data/pokemon/base_stats.h
2020-10-26 20:06:37 -03:00
aaaaaa123456789
1c3d75f673
Merge branch 'master' into reverts
2020-10-26 12:16:36 -03:00
Kurausukun
fe40c0c466
re-match BattleIntroOpponent1SendsOutMonAnimation
...
a lot of functions and a bit of data had to be moved from battle_main.c
to battle_util.c; I have added a note to battle_util.c stating the
reason for this
2020-10-26 05:52:00 -04:00
Kurausukun
83846b913a
port sub_806F160 fakematch fix
2020-10-26 00:01:53 -04:00
Eduardo Quezada
641daafb3f
Fixed identation for better readability.
2020-10-25 12:34:48 -03:00
Eduardo Quezada
13a6b70e8c
Updating Egg Groups.
2020-10-24 08:04:30 -03:00
