ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-07 10:03:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
8,244 Commits 1 Branch 0 Tags 235 MiB
1031703309
Commit Graph

1195 Commits

Author SHA1 Message Date
GriffinR
72bb2bd160
Merge pull request #1474 from GriffinRichards/clean-miragetower 
Clean up Mirage Tower
 2021-07-10 23:26:41 -04:00
GriffinR
0f538102d9 Add local id constants for C 2021-07-05 13:54:43 -04:00
ExpoSeed
fb69b65337 Fix redefinition error in battle_config.h 2021-07-02 14:36:55 -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
10886a586b Clean up mirage tower 2021-07-01 23:46:15 -04:00
GriffinR
810b51f96c Clarify contest heart tiles 2021-06-21 13:48:03 -04:00
BuffelSaft
4c18cb7fe7 Remove EFFECT_THAW_HIT 2021-06-19 11:49:00 +12:00
BuffelSaft
e6a8faec1e Fix thawing moves 
Replace IsThawingMove with a move flag and add a check for it to CANCELLER_FROZEN. This makes thawing moves actually thaw the user.
 2021-06-10 23:48:18 +12:00
ultima-soul
092f02f119 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-06-07 12:00:23 -07:00
ultima-soul
3448e19275
Merge pull request #1459 from ExpoSeed/BE/rename-flags 
Rename flags
 2021-06-04 19:33:45 -07:00
ExpoSeed
4bb33367df Newline 2021-06-04 19:35:16 -05:00
ExpoSeed
ec2c140ecb Disambiguate Thousand Arrows flag from other flags 2021-06-04 19:34:37 -05:00
ExpoSeed
15914d7af8 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/rename-flags 2021-06-04 19:00:29 -05:00
ultima-soul
6edec5bc3d
Merge pull request #1437 from LOuroboros/oblivious 
Tweaked Oblivious
 2021-06-04 16:51:38 -07:00
ExpoSeed
0e96b47584 Review comments 2021-06-04 18:50:11 -05:00
LOuroboros
b552db7193 Tweaked the Oblivious immunities 
Pokémon that are infatuated or taunted and obtain Oblivious through Skill Swap will now be healed of said conditions and a text string signaling it will be printed.
 2021-06-04 19:23:07 -03:00
LOuroboros
b215b44951 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into clanging_scales 2021-06-03 05:09:14 -03:00
LOuroboros
6ccb493f12 Adjusted the list of item hold effects 2021-06-02 17:23:58 -03:00
BuffelSaft
2a6b989c92 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into body-press 2021-06-02 12:41:28 +12:00
amiosi
b588e94395 more requested changes 2021-05-28 15:05:33 -04:00
amiosi
f7651fd592 most fixes from requested changes 2021-05-27 15:55:19 -04:00
amiosi
fc81994579 Merge branch 'battle_engine' into old_findings 2021-05-27 15:28:02 -04:00
ghoulslash
c3e28e9b1a merge with be 2021-05-23 12:22:52 -06:00
ghoulslash
54b03a474d fix SIDE_STATUS_SCREEN_ANY 2021-05-23 12:22:07 -06:00
Eduardo Quezada D'Ottone
04c6331a60
Merge pull request #1432 from BuffelSaft/thousand_arrows 
Fix Thousand Arrows
 2021-05-21 11:40:13 -04:00
GriffinR
65fd334256 Name map groups 2021-05-11 10:16:04 -05:00
LOuroboros
95d41524a2 Implemented Clanging Scales' effect 2021-05-09 18:20:03 -03:00
Flametix
a8fab62c89 Fix Substitute typo 2021-05-06 20:49:04 -04:00
ultima-soul
e864c39a5d Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync 2021-05-04 10:04:35 -07:00
ultima-soul
56fc420187 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-28 21:34:30 -07:00
GriffinR
f7a699c686
Merge pull request #1421 from GriffinRichards/doc-tvrecordmix 
Document TV
 2021-04-29 00:25:01 -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
ultima-soul
14a0303e2f Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-27 18:36:37 -07:00
GriffinR
aad090e154 Document TV 2021-04-26 12:35:35 -04:00
GriffinR
86475c5ded Document trainer hill ereader 2021-04-24 18:04:27 -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
ExpoSeed
27c6964a05 Merge branch 'num_ability_slots' into BE/num_ability_slots 2021-04-16 20:45:34 -05:00
ExpoSeed
49bb345338 Introduce NUM_ABILITY_SLOTS 2021-04-16 20:36:45 -05:00
GriffinR
82f870091e
Merge pull request #1400 from GriffinRichards/doc-pokemonanim 
Document Pokémon animation
 2021-04-13 01:36:15 -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
ExpoSeed
8494306d1d Rename flags 2021-04-07 16:07:30 -05: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
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
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
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
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
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
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
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
LOuroboros
68980cf18c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-03-10 03:58:21 -03:00
ghoulslash
d5004638a9
Update include/constants/battle_config.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-03-09 16:35:47 -07:00
ghoulslash
3f9bf5acc0 merge with be 2021-03-09 10:33:48 -07:00
GriffinR
55a40b901f Label battle tower link script 2021-03-04 19:30:19 -06:00
Evan
2ccdf1d89e merge with be. magic guard checks 2021-03-03 09:21:06 -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
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
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
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
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
f3d975e239 merge with be 2021-02-12 08:59:55 -07:00
LOuroboros
21ee6cb9fb Added constant labels for EV manipulating item effects 2021-02-12 07:26:11 -03:00