ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-18 04:27:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,023 Commits 1 Branch 0 Tags 235 MiB
6a3266a265
Commit Graph

4852 Commits

Author SHA1 Message Date
GriffinR
8b95e1964b
Merge pull request #1121 from GriffinRichards/doc-roulette 
Document roulette
 2020-08-10 17:18:09 -04:00
GriffinR
4bf43311f0 Remove redundant parens 2020-08-10 17:09:17 -04:00
GriffinR
078c341b2b
Merge pull request #1122 from GriffinRichards/clean-battlemsg 
Add stat stage constants, clean up misc battle msg data
 2020-08-10 14:29:27 -04:00
GriffinR
e947729d65 Start documenting use_pokeblock 2020-08-10 13:48:16 -04:00
GriffinR
82e322bb96 Finish documenting naming screen 2020-08-07 20:18:09 -04:00
GriffinR
463d79c7c1 Start documenting naming screen 2020-08-07 02:00:41 -04:00
DizzyEggg
9a7963e4ce Multi battle support for var arguments 2020-08-06 09:14:17 +02:00
DizzyEggg
a42bd3f37d Fix multiple turn moves staying after hitting no target 2020-08-05 12:35:51 +02:00
GriffinR
4aed5b078a
Merge pull request #1119 from PokeCodec/patch-2 
Match function signatures
 2020-08-04 20:46:14 -04:00
GriffinR
5e8ffff62f Add stat stage constants 2020-08-04 20:38:57 -04:00
GriffinR
f8f6575360 Rename roulette_util to palette_util 2020-08-04 19:24:36 -04:00
GriffinR
8e800e2061 Document roulette flash util 2020-08-04 19:20:55 -04:00
GriffinR
868f831167 More roulette doc 2020-08-04 14:25:13 -04:00
GriffinR
b40cee540e Continue documenting roulette 2020-08-02 14:52:05 -04:00
DizzyEggg
d072897354
Update event_object_movement.c 2020-08-02 15:37:04 +02:00
DizzyEggg
7890a16d27
Fix UB in event_object_movement.c 2020-08-02 15:04:55 +02:00
PikalaxALT
03eba6a62c
Merge pull request #1116 from GriffinRichards/doc-slotmachine 
Document slot machine
 2020-08-01 09:56:44 -04:00
PokeCodec
412f341588
Match function signatures 
To make them consistent with the declarations
 2020-07-31 20:20:00 -04:00
DizzyEggg
9bc4395212 bizzara revied typos 2020-07-31 09:45:19 +02:00
DizzyEggg
f744986bb2 Fix Safari Zone healthbox glitch 2020-07-31 09:29:56 +02:00
GriffinR
22b5b6b074 Start documenting roulette 2020-07-30 19:37:16 -04:00
pi1024e
f39de3f503 terminal newline 2020-07-29 22:47:03 -04:00
PokeCodec
b39047226b Match CreateWaterPulseRingBubbles 2020-07-29 22:44:19 -04:00
GriffinR
e06de33cbd
Merge branch 'master' into doc-overworld 2020-07-28 17:46:17 -04:00
GriffinR
5eecaf92ba
Merge branch 'master' into doc-slotmachine 2020-07-28 17:41:34 -04:00
GriffinR
1f4813bfd2 Document slot machine funcs 2020-07-28 17:38:05 -04:00
PokeCodec
93be3a08ce Match 2020-07-28 15:31:08 -04:00
GriffinR
e52ffacc25 Clean up slot machine data doc 2020-07-28 15:28:16 -04:00
PokeCodec
3b43fc12fc Merge https://github.com/pret/pokeemerald into Matching 2020-07-28 15:26:05 -04:00
PokeCodec
044d968513 Match 2020-07-28 15:23:14 -04:00
PokeCodec
7b6607d9e3 Update secret_base.c 2020-07-28 15:23:04 -04:00
PokeCodec
37957b2d15 semicolon 2020-07-28 15:23:02 -04:00
PokeCodec
c722b77558 holding back on casts 2020-07-28 15:22:15 -04:00
PokeCodec
ebcb982e16 Change signedness and add casts to avoid implicit conversion warnings 2020-07-28 15:22:15 -04:00
GriffinR
b22709ee3d More slot machine data documentation 2020-07-28 14:29:44 -04:00
PikalaxALT
70617d56e4
Merge pull request #1104 from PokeCodec/Explcit-Casting 
Reduce "Implicit conversion" warnings
 2020-07-28 11:10:00 -04:00
PokeCodec
1e8ffcb898 Merge branch 'Explcit-Casting' of https://github.com/PokeCodec/pokeemerald into Explcit-Casting 2020-07-28 10:25:33 -04:00
DizzyEggg
427bad6413 Fix Switch-in ability battler sometimes not properly printed 2020-07-28 10:18:44 +02:00
ExpoSeed
b401e2eb86 Fix naming style of function 2020-07-27 21:22:16 -05:00
PokeCodec
fb6f859edd semicolon 2020-07-27 19:17:34 -04:00
ExpoSeed
71dc5edf2e Document some battle_util.c 2020-07-27 17:10:42 -05:00
DizzyEggg
c576da5397 Fix Forewarn typo 2020-07-27 21:15:27 +02:00
PokeCodec
5f6e7e2279
Update secret_base.c 2020-07-27 14:59:37 -04:00
DizzyEggg
11178a49db Fix undefined behaviour in protect animation 
gPlttBufferFaded[sprite->data[2] + ++i] = gPlttBufferFaded[sprite->data[2] + i + 1]

The above does NOT make it certain that i gets incremented before reading from the right side. Changed it, so the function always increments i first, then reads from pal buffer.
 2020-07-27 13:17:18 -04:00
GriffinR
1c55734e44 Document faraway island 2020-07-27 13:14:48 -04:00
PokeCodec
ddd012f3ed holding back on casts 2020-07-27 12:47:08 -04:00
DizzyEggg
0066640a1e Merge with master 2020-07-27 14:51:39 +02:00
DizzyEggg
f007165c53
Fix undefined behaviour in protect animation 
gPlttBufferFaded[sprite->data[2] + ++i] = gPlttBufferFaded[sprite->data[2] + i + 1] 

The above does NOT make it certain that i gets incremented before reading from the right side. Changed it, so the function always increments i first, then reads from pal buffer.
 2020-07-27 12:27:35 +02:00
DizzyEggg
3a220d0733 ai tweaks 2020-07-26 13:48:25 +02:00
DizzyEggg
1ad76ff3d2 Fix Aftermath on fainted 2020-07-26 12:32:02 +02:00
GriffinR
36a4764a78 Document some slot machine data 2020-07-26 02:15:59 -04:00
PokeCodec
c5aa91741b Change signedness and add casts to avoid implicit conversion warnings 2020-07-24 22:18:57 -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
PikalaxALT
5348674bc4
Merge pull request #1102 from GriffinRichards/doc-faraway 
Document faraway island
 2020-07-23 09:12:19 -04:00
GriffinR
a4e47f1201 Clean some battle_message.c data 2020-07-23 05:01:42 -04:00
DizzyEggg
af5090c892
Update agb_flash.c 2020-07-22 19:25:09 +02:00
GriffinR
bfa7dfcd58
Merge pull request #1105 from AsparagusEduardo/Coordinates 
Changed mon front and back coordinates from hex to decimal so they're easier to edit.
 2020-07-21 19:43:14 -04:00
Eduardo Quezada
6eccf019db Fixed missing changes. 2020-07-21 19:32:33 -04:00
PokeCodec
97ceca6527 Match AnimTask_RotateAuroraRingColors_Step 2020-07-21 16:11:11 -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
2273458d50 Label option menu pal 2020-07-19 15:44:58 -04:00
GriffinR
a1cc7d2bd6 Document faraway island 2020-07-19 14:12:38 -04:00
Eduardo Quezada
551334b20b Fixed missing lowercase field name. 2020-07-18 23:10:37 -04:00
Eduardo Quezada
3bec840419 Fixed field names lowercase. 2020-07-18 23:08:44 -04:00
Eduardo Quezada
9b32cafd57 Some PSS documentation. 2020-07-18 21:58:01 -04:00
GriffinR
af09e73d67
Merge branch 'master' into doc-overworld 2020-07-18 20:24:09 -04:00
GriffinR
8e6dd3bafe
Merge pull request #1086 from GriffinRichards/doc-unktrans 
Document unk_transition
 2020-07-18 20:22:58 -04:00
GriffinR
1a27af8855
Merge pull request #1100 from GriffinRichards/clean-battlescrdata 
Misc battle and battle palace documentation
 2020-07-18 20:22:44 -04:00
GriffinR
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
GriffinR
1cf2470aac
Merge pull request #1097 from PokeCodec/asm 
Allow assembly on Clang
 2020-07-17 18:19:06 -04:00
GriffinR
96fd719a19
Merge pull request #1081 from GriffinRichards/add-localids 
Add local object event ids for referenced objects
 2020-07-17 18:18:47 -04:00
GriffinR
50e48898d2
Merge pull request #1088 from GriffinRichards/doc-starterchoose 
Document starter_choose.c
 2020-07-17 16:02:10 -04:00
DizzyEggg
14daa9f4a5 Inverse battles 2020-07-17 20:53:22 +02:00
PokeCodec
98441b1199 Sort out asm 2020-07-16 18:28:38 -04:00
DizzyEggg
42f48d1a61 Power Construct 2020-07-16 15:40:56 +02:00
DizzyEggg
759bde46bb Cheek Pouch 2020-07-16 15:20:03 +02:00
DizzyEggg
60d5d00dba Unnerve 2020-07-16 14:17:38 +02:00
DizzyEggg
c8e1079736
Use stat constants in MonGainEVs 2020-07-16 09:58:16 +02:00
Evan
b428b39fd1 hide hp boxes during anims 2020-07-15 16:23:44 -06:00
DizzyEggg
ec4c73711e Rest Sleep Talk wake up awaraness 2020-07-15 21:30:24 +02:00
GriffinR
7bea28cb84
Merge pull request #1093 from GriffinRichards/fix-frontiermonconst 
Clean up some frontier mon use in battle factory
 2020-07-15 13:37:07 -04:00
DizzyEggg
1a94d27fe6 Emergency Exit 2020-07-15 17:21:12 +02:00
DizzyEggg
c10be546bc Fix AI using normal moves on ground mons with Galvanize 2020-07-15 12:31:50 +02:00
DizzyEggg
62dc94e9c8 Merge with master 2020-07-15 10:13:19 +02:00
GriffinR
0c4f3b269e
Merge pull request #1083 from GriffinRichards/playse-constants 
Use charmap constants for PLAY_SE
 2020-07-15 02:53:53 -04:00
GriffinR
e129d04b93
Merge branch 'master' into doc-overworld 2020-07-15 00:40:47 -04:00
GriffinR
3c356a1d7a
Merge pull request #1082 from GriffinRichards/add-flagvarsave 
Allow flag/var counts to be updated alongside values
 2020-07-14 19:58:38 -04:00
GriffinR
a583dfcc42
Merge pull request #1094 from DizzyEggg/rename 
Give proper names to some functions
 2020-07-14 19:56:46 -04:00
GriffinR
c177872c9c
Merge pull request #1080 from AsparagusEduardo/EndBalls 
Created constant for easier Ball Expansion.
 2020-07-14 19:56:20 -04:00
DizzyEggg
ca2b8ebcaa make it compile 2020-07-14 17:54:15 +02:00
ghoulslash
8f669bb57d
Add critical capture (#402) 
* add critical capture

* synax and format fixes
 2020-07-14 17:47:15 +02:00
DizzyEggg
0425cb66ef Give proper names to some functions 2020-07-14 11:13:03 +02:00
DizzyEggg
b32f3433ae Merge branch 'battle_engine_v2' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-07-14 10:40:32 +02:00
DizzyEggg
2c9b4f4b17 Show targets in double battles while hitting multiple pokemon at once 2020-07-14 10:39:54 +02:00
ghoulslash
7e8ec4c315
add gen 8 move data (#461) 2020-07-13 20:39:43 +02:00
GriffinR
1c75396276 Clean up some frontier mon use in battle factory 2020-07-13 00:47:30 -04:00
DizzyEggg
78a1f351d9 Fix stat stage bug 2020-07-12 22:54:47 +02:00
DizzyEggg
3e27de72fa AI learns abilities which halve/double damage 2020-07-12 10:09:23 +02:00
Eduardo Quezada
b31efcd6e3 Renamed constant, 2020-07-12 01:49:32 -04:00
PikalaxALT
535189bf14 Fix some UB exposed with GCC 10.1.0 2020-07-11 10:22:34 -04:00
DizzyEggg
1b56216d7c Dry Skin Weather fix 2020-07-11 14:25:57 +02:00
DizzyEggg
4c3f40a361 Merge with master 2020-07-11 12:59:23 +02:00
DizzyEggg
6a7e874280 Battle debug allows changing of all stat stages at once 2020-07-11 12:38:14 +02:00
DizzyEggg
8c4f5f946d Curse defiant 2020-07-11 12:28:42 +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
Flametix
4ba2799849 Update pokemon.c 2020-07-09 14:52:19 -04:00
GriffinR
beeb673ba1 Merge branch 'master' of https://github.com/pret/pokeemerald into add-flagvarsave 2020-07-08 16:03:32 -04:00
GriffinR
ebb6c4ee66
Merge branch 'master' into doc-overworld 2020-07-08 15:51:58 -04:00
GriffinR
89bcf3cbd9
Merge branch 'master' into add-localids 2020-07-08 15:47:45 -04:00
GriffinR
431c60c92c Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti 2020-07-08 15:45:31 -04:00
PikalaxALT
8b80b417e2
Merge pull request #1069 from GriffinRichards/doc-link 
Document linking
 2020-07-08 15:43:45 -04:00
PikalaxALT
550875757b
Merge pull request #1087 from ipatix/fix_aggressive_loop_optimizations 
fix aggressive loop optimizations
 2020-07-08 15:42:08 -04:00
DizzyEggg
b1d0bc1721 UTurn Battle Arena no switchin try number 2 2020-07-08 17:51:01 +02:00
DizzyEggg
e319c7da61 UTurn Battle Arena no switchin try number 2 2020-07-08 17:50:12 +02:00
DizzyEggg
fc510a6b44 oran berry doesnt activate when mons is kill 2020-07-08 17:22:10 +02:00
PokeCodec
938aec45d3 Match CreatePokeDexList 
Cherry-picked from the pret Ruby repo
 2020-07-07 20:57:20 -04:00
GriffinR
43c48d95c2 Document starter_choose.c 2020-07-06 17:26:25 -04:00
GriffinR
c0bc7e8f7b Fix elevator metatile typo 2020-07-06 16:02:49 -04:00
Michael Panzlaff
3264cf697f fix aggressive loop optimizations 
Previously, aggressive loop optimizations with a new compiler were not
possible due to undefined behaviour at end of arrays.

A macro "UBFIX" is added to allow ifdefs for fixes which resolve
undefined behavior. For example newer GCC versions will detect various
bugs in the original game code and will otherwise not compile with -Werror.
 2020-07-05 18:09:59 +02:00
GriffinR
72edc46ab6 Document unk_transition 2020-07-02 15:45:37 -04:00
DizzyEggg
52c63cd671 lightning rod no longer redirects mold braker 2020-07-02 11:58:48 +02:00
GriffinR
1ce929157f Clean up field effect doc 2020-07-02 05:05:13 -04:00
GriffinR
8589e138a8 Eliminate METATILE_ID() macro 2020-07-02 00:17:14 -04:00
GriffinR
c84f98a7ff Document misc field control 2020-06-29 17:24:17 -04:00
GriffinR
abdf7cbf02 Label fishing effect functions 2020-06-29 16:53:38 -04:00
GriffinR
eb80012757 Document more misc field effects 2020-06-29 16:32:46 -04:00
DizzyEggg
08a5ba0db2 Sitrus berry gen4 effect code 2020-06-29 18:56:19 +02:00
DizzyEggg
89ed5bc8bb Fix mega evo switch-in intimidate not working 2020-06-29 18:40:05 +02:00
DizzyEggg
5a2d9fe9fe Fix Grassy Terrain bad loop 2020-06-29 18:26:53 +02:00
DizzyEggg
5ddb4634f5 berries work like in gen4 2020-06-29 18:04:13 +02:00
DizzyEggg
36aec5658c Transform Imposter Illusion fix 2020-06-29 13:45:27 +02:00
GriffinR
4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00
DizzyEggg
3bdf675221 Hopefully illusion works as intended now 2020-06-28 19:45:48 +02: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
DizzyEggg
3cf091d635 Improve animations of moves hitting all foes 2020-06-26 23:28:46 +02:00
DizzyEggg
db715335c3 Fix Gastro Acid animation 2020-06-26 22:20:00 +02:00
DizzyEggg
59ddebd727 Rocky Helmet softlock fix 2020-06-26 21:56:18 +02:00
DizzyEggg
5698af3742 Magic Guard leech seed and slight ai tweaks 2020-06-26 15:14:15 +02:00
DizzyEggg
219a43304a Improve Electro Ball animation 2020-06-26 13:58:34 +02:00
GriffinR
7d5ad8f7b4 Use charmap constants for PLAY_SE 2020-06-26 02:44:07 -04:00
DizzyEggg
548a43f8d9 Rocky Helmet before Knock Off 2020-06-25 16:15:11 +02:00
GriffinR
06025e887f Allow flag/var counts to be updated alongside values 2020-06-24 17:00:19 -04:00
DizzyEggg
f19ba68cb9 Fix mega indicator sprite overwriting ram 2020-06-24 12:55:08 +02:00
GriffinR
18d57a3802 Document some overworld and field effects 2020-06-23 15:48:53 -04:00
GriffinR
fac6288156 Add local object event ids for referenced objects 2020-06-22 17:18:58 -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
fde2c25b3f
Merge pull request #434 from LOuroboros/freeze_shock 
Fixed Freeze Shock
 2020-06-22 10:04:43 +02:00
DizzyEggg
ba61970edb
Merge pull request #431 from LOuroboros/electrify 
Fixed Electrify
 2020-06-22 10:03:49 +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
Eduardo Quezada
7244b80fc6 Created constant for easier Ball Expansion. 2020-06-21 02:36:46 -04:00
GriffinR
8b462f3f6c Specify confetti util name 2020-06-18 18:14:30 -04:00
GriffinR
d2a760afdb Rename contest_link_80FC4F4, 80F57C4, and 81D9DE4 2020-06-18 18:01:32 -04:00
GriffinR
24569583e4 Document contest results 2020-06-18 17:50:13 -04:00
GriffinR
f600aff711 Rename rom_81520A8 2020-06-17 03:42:10 -04:00
GriffinR
76f6d05173 Document confetti 2020-06-17 03:39:03 -04:00
LOuroboros
33a45ba181 Implemented Relic Song's effect 2020-06-16 07:06:38 -03:00
LOuroboros
5f763a8380 Fixed Freeze Shock's 1st turn battle string 2020-06-16 04:11:37 -03:00
LOuroboros
2621071f22 Fixed Freeze-Dry's InGame name 2020-06-16 03:36:17 -03:00
LOuroboros
2fb4c0cab1 Corrected Electrify's battle string 2020-06-16 02:58:58 -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
e507770425 Remove some unneeded link filler 2020-06-15 13:17:53 -04:00
GriffinR
c2a07276ae
Merge branch 'master' into doc-link 2020-06-13 16:15:11 -04:00
Sierra A
46f4a4bbf7
Merge pull request #1074 from Sierraffinity/item-menu-cleanup 
Begin item_menu.c cleanup
 2020-06-10 17:17:35 -07:00
Sierra A
a05eea9312
Merge pull request #1075 from Sierraffinity/master 
Fix out of bounds array access in intro Groudon segment
 2020-06-10 17:16:04 -07:00
GriffinR
a9a427c6f2
Merge branch 'master' into doc-link 2020-06-10 17:36:43 -04:00
GriffinR
2859900ea9 Second pass on documenting union room 2020-06-10 17:30:59 -04:00
Sierraffinity
452f1e0047 Fix out of bounds array access in intro Groudon segment 2020-06-10 13:27:46 -07:00
Sierra A
a7815857ad
Merge pull request #1071 from PokeCF/patch-3 
Unnest if statements
 2020-06-10 13:23:57 -07:00
Sierraffinity
74edaed426 Begin item_menu.c cleanup 2020-06-10 13:07:42 -07:00
nullableVoidPtr
8381828571 Match sub_80F0708 
Special thanks to @kazblox
 2020-06-10 21:13:58 +08:00
PokeCF
760baec098
Unnest if statements 
Overall, it is generally considered bad style to continually nest loops. However, if this is what the decompiler outputted, then why bother touching it?

However, this can be rewritten as returning early if the playtime is less than 60.

The reason for this is not because of the original code, but because it looks better, has the same output, and is easier to understand.
 2020-06-08 17:09:54 -04:00
GriffinR
35867f531b Some link rfu cleanup / link.c documentation 2020-06-08 15:24:25 -04:00
GriffinR
c98342c973 Document link_rfu_3.c 2020-06-08 00:28:21 -04:00
GriffinR
e6f5c4f264 Sync link_rfu_2.c 2020-06-07 12:54:50 -04:00
GriffinR
3f97763181 Document cable_club.c 2020-06-06 16:10:03 -04:00
huderlem
675f5ac03e Remove unnecessary comment 2020-06-03 19:55:15 -05:00
SBird
5d752bbe49 shop: document some constants s.t. object events don't break 2020-06-03 19:55:15 -05:00
GriffinR
aaf5d91c18 Document field_message_box.c 2020-06-03 19:47:45 -05:00
GriffinR
9190af73b7 Label union room battle trainer 2020-06-03 15:28:29 -04:00
GriffinR
fd77eb1eb9 Document wireless_communication_status_screen.c 2020-06-03 14:07:40 -04:00
GriffinR
bc6bd36813 Document union_room_battle.c 2020-06-02 19:05:59 -04:00
GriffinR
18a00da820 Split wireless_communication_status_screen.c out 2020-06-02 18:51:26 -04:00
GriffinR
7632404ba5 Document union_room_chat.c 2020-06-02 18:35:00 -04:00
DizzyEggg
0690abd5a4 its time to ddddddduel 2020-06-02 17:28:47 +02:00
DizzyEggg
754266cb0f battle transitions 2020-06-02 13:32:30 +02:00
DizzyEggg
f608ae9f70 make battle transition OK ok Ok oK 2020-06-02 13:30:05 +02:00
PikalaxALT
72b332d551
Revert "More transitions documentation" 2020-06-01 18:05:31 -04:00
GriffinR
f53e2491bf Document union_room_player_avatar.c 2020-06-01 10:23:12 -04:00
DizzyEggg
ab3eb6065b More transitions documentation 2020-06-01 16:17:25 +02:00
GriffinR
4fe507e453 Document union_room.c 2020-05-31 13:11:18 -04:00
DizzyEggg
b1ffe6efd7
Battle transition arrays easier to edit 2020-05-31 12:41:27 +02:00
DizzyEggg
dd8879ca7c
Merge pull request #394 from ghoulslash/battle_engine 
fix a bunch of anims
 2020-05-31 11:26:01 +02:00
LOuroboros
c77bed7bfb Fixed Regenerator overhealing a Pokémon 2020-05-30 05:04:23 -03:00
PikalaxALT
24075e9e72
Merge pull request #1061 from GriffinRichards/fix-egg 
Clear up misleading egg step name
 2020-05-29 16:50:37 -04:00
PikalaxALT
e0ae696479
Merge pull request #1027 from PikalaxALT/gbagfx_tilemap 
Add tilemap rendering capability to gbagfx
 2020-05-29 16:49:46 -04:00
Evan
5d232c34fe fix a bunch of anims 2020-05-29 11:15:00 -06:00
DizzyEggg
19699bee23
Merge pull request #390 from ghoulslash/battle_engine 
add animations for all moves
 2020-05-29 12:53:17 +02:00
DizzyEggg
013f9b6a17 merge wiith masteer and summary screen change 2020-05-29 12:50:54 +02:00
Evan
fdc6e80e1e fix anim defines 2020-05-28 12:19:07 -06:00
Eduardo Alvaro Quezada D'Ottone
8d848997c9
Battle Configs: The Revenge (#363) 
* Turns for Uproar

* Chances for the amount of hits with multi-hit moves.

* Electric type mon's immunity to paralysis

* (Hi) Jump Kick to always do 1/2 of maxHP when crashing

* Turns for Disable.

* Minimized mons can always be hit by moves like Stomp

* Grass types immune to powder and spore moves.

* Psywave's damage formula

* Fixed random usage.
 2020-05-28 10:38:27 +02:00
GriffinR
e27c3d2abd Clear up misleading egg step name 2020-05-27 16:41:23 -04:00
Sierraffinity
d528d75af7 Connect title screen BG palettes together 2020-05-27 07:58:48 -05:00
Sierraffinity
6963c00016 battle_anim_mons: Make cast not depend on size of struct 2020-05-27 07:58:48 -05:00
Sierraffinity
ec92241d8f Fix REG_OFFSET_WININ/OUT mislabeling 2020-05-27 07:58:48 -05:00
Sierraffinity
42747663b5 Fix OAM region mislabeling 2020-05-27 07:58:48 -05:00
MandL27
c3d690a380 consistency with pokefirered 2020-05-27 07:58:04 -05:00
MandL27
6964d37db6 document UNKNOWN_A special char 2020-05-27 07:58:04 -05:00
DizzyEggg
5eeecb56c1 More touches to pokemon summary screen document 2020-05-27 07:57:15 -05:00
Evan
ed4035caf1 fix anim particle config options 2020-05-26 08:54:02 -06:00
Evan
6c20a49dc6 animations for all moves 2020-05-25 00:37:32 -06:00
Marcus Huderle
79a1127122 Match sub_817F9F4 2020-05-24 17:22:56 -05:00
Philipp AUER
f1f4000914
anim: add some animation moves (#383) 
- fell stinger
 - draining kiss
 - kings shield (==protect)
 - scald
 - fire pledge
 - water pledge
 - grass pledge

Co-authored-by: SBird <sbird@no.tld>
 2020-05-24 18:14:59 +02:00
ghoulslash
13cf2cb217
Animation Particles, BGs, and gen 4 anims (#384) 
* undo some revert(?)

* cfru particles and bgs

* remove commented out particles
 2020-05-24 18:13:40 +02:00
GriffinR
f9e6f7540f Use fixed point macros for math util 2020-05-24 08:28:02 -05:00
GriffinR
c6205b3df4 Document math_util.c 2020-05-24 08:28:02 -05:00
GriffinR
210862f7b6 Match InBoxInput_Normal, HandleInput_InParty, HandleInput_OnBox, and HandleInput_OnButtons 2020-05-24 08:26:38 -05:00
GriffinR
5019381911 Match sub_8024604 2020-05-24 08:26:38 -05:00
GriffinR
89350cb81a Clean up sub_8022C58 2020-05-24 08:26:38 -05:00
GriffinR
b29c7554ea Match sub_8022250 2020-05-24 08:26:38 -05:00
hondew
cfc47e642f Clean up slot drawing 
Fix typos
 2020-05-24 08:24:20 -05:00
hondew
26a197847a Rename tag offset functions 
Fix typo
 2020-05-24 08:24:20 -05:00
DizzyEggg
fcc5ec1dd0 Fix Teleport wild double battle 2020-05-24 10:58:33 +02:00
LOuroboros
fa1e5d1a37
Fix Brine (#388) 
Addresses #387
 2020-05-24 10:05:26 +02:00
Philipp AUER
de6811b85e
battle-engine: fix acupressure crash (#381) 
- fixes #380

Co-authored-by: SBird <sbird@no.tld>
 2020-05-24 10:03:52 +02:00
AJ Fontaine
12b08670f1
Fix confusion not working at all (#385) 2020-05-24 10:02:58 +02:00
Sierra A
25f0dac1b5
Merge pull request #1055 from Sierraffinity/mystery_gift_fakematchfix 
Fix mystery gift fakematchings
 2020-05-20 21:08:31 -07:00
Sierra A
783ebfe163
Merge pull request #1052 from Missingmew/unused-decompress 
Decompile unused decompress function, as seen in ruby
 2020-05-20 21:06:47 -07:00
Sierraffinity
ac6bcecdf5 Fix mystery gift fakematchings 2020-05-20 21:00:21 -07:00
Sierra A
7b16d6b6f0
Merge pull request #1054 from Sierraffinity/battle_dome_fakematchfix 
Fix HblankCb_TourneyTree fakematch
 2020-05-20 20:40:24 -07:00
Sierraffinity
929e64ad33 Fix HblankCb_TourneyTree fakematch 2020-05-20 20:31:16 -07:00
Sierra A
02416dc79c
Merge pull request #1053 from Sierraffinity/text-drawdownarrow-fix 
Fix TextPrinterDrawDownArrow fakematch
 2020-05-20 19:50:52 -07:00
Sierraffinity
d301d438c1 Fix the fix 2020-05-20 19:33:40 -07:00
Missingmew
9a13be4e7b switch to pret short-types and tabs vs spaces 2020-05-21 00:25:30 +02:00
Missingmew
1beca515ed Decompile unused function, as seen in ruby 2020-05-20 23:58:20 +02:00
GriffinR
2a1781b2ed sPrizeListGigaSwap typo fix 2020-05-19 16:13:25 -04:00
PikalaxALT
7c248947f4
Merge pull request #1038 from ProjectRevoTPP/master 
restore SeedRngWithRtc comment and declaration of GF oversight.
 2020-05-19 13:31:41 -04:00
PikalaxALT
3c4b9dfacc
Merge pull request #1044 from DizzyEggg/sss 
Document pokemon summary screen
 2020-05-19 13:30:42 -04:00
Sierra A
da30244b6c
Merge pull request #1041 from AsparagusEduardo/UnownStats 
Using ability constants for OLD_UNOWN stats
 2020-05-18 16:33:23 -07:00
Sierra A
ab6bbd7ef0
Merge pull request #1039 from GriffinRichards/doc-inconnect 
Label in_connection's field in ObjectEventTemplate
 2020-05-18 16:32:55 -07:00
ultima-soul
9ee5db6a96 Expand ability ids to u16. Thanks to ghoulslash for some assistance! 2020-05-18 14:54:12 -07:00
Eduardo Alvaro Quezada D'Ottone
4c5de0998a
Fixed chances of confusion self-damage. (#371) 2020-05-18 14:51:30 +02:00
DizzyEggg
bdebab834c Document pokemon summary screen 2020-05-18 14:03:01 +02:00
GriffinR
db17f8091c Fix CreatedHatchedMon typo 2020-05-17 01:06:17 -04:00
AsparagusEduardo
179d84dcd7 Using ability constants for OLD_UNOWN stats 2020-05-16 18:08:56 -04:00
GriffinR
5bb688df3e Label in_connection's field in ObjectEventTemplate 2020-05-14 17:11:18 -04:00
ProjectRevoTPP
468793e34a restore SeedRngWithRtc comment and declaration of GF oversight. 2020-05-14 16:33:19 -04:00
Sierraffinity
a1244aa5dd Merge branch 'master' of github.com:pret/pokeemerald 2020-05-04 20:54:27 -07:00
Sierra A
b398ef344f
Merge pull request #1030 from SBird1337/gfx/fix-hp-anim 
gfx: fix hpbar_anim.png visual palette
 2020-05-03 11:40:32 -07:00
SBird
7c4c1d3a5c gfx: merge battle_interface gfx table 2020-05-03 15:24:33 +02:00
Sierra A
8778aec7d6
Merge pull request #1031 from hondew/berry-yield 
Document minor berry yield bug
 2020-05-03 02:26:18 -07:00
Sierra A
5c49bc6d34
Merge pull request #1032 from AsparagusEduardo/OldUnown 
Ordered OLD_UNOWN in the same way as the other base stats.
 2020-05-03 02:24:48 -07:00
DizzyEggg
a35ce6ecdf
Give a define for all dex interface sprites 
for easier editing
 2020-05-03 11:12:05 +02:00
AsparagusEduardo
f6932518b0 Ordered OLD_UNOWN in the same way as the other base stats. 2020-05-03 00:00:01 -04:00
hondew
84f012fc6e Update external links 2020-05-02 13:59:28 -04:00
hondew
048d1ffbdb Clarify stages 2020-05-02 13:38:25 -04:00
hondew
49184cd799 Document berry yield 
fix wording
 2020-05-02 11:51:49 -04:00
Eduardo Alvaro Quezada D'Ottone
f82bd2f9c4
Fix sleeping turns (#370) 
* Fix sleeping turns

* Readjusted numbers. Thanks Doesnt
 2020-05-02 10:35:50 +02:00
DizzyEggg
a848c96798 Fix Tailwind string 2020-04-29 11:58:57 +02:00
DizzyEggg
f71f1c9d62 Possibly fix gem issue 2020-04-29 11:53:03 +02: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
cb5b8da77b More trainer type usage 2020-04-28 19:59:08 -05:00
GriffinR
8d9e39e6d1 Sync map types with pokefirered 2020-04-28 19:59:08 -05: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
GriffinR
b1d26e10a8 Sync map header property names with pokefirered 2020-04-28 19:59:08 -05:00
DizzyEggg
98b2e88e56 Forewarn 2020-04-28 15:36:13 +02:00
DizzyEggg
36b52eb063 Shed Shell 2020-04-28 11:14:20 +02: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
jiangzhengwenjz
c7d8d5dae2 fix remainSize type 2020-04-28 07:28:27 +08:00
jiangzhengwenjz
2010ed0f12 librfu issues 2020-04-28 07:25:55 +08:00
DizzyEggg
432ae46570 Fix Acrobatics gem boost 2020-04-27 10:58:35 +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
Sierraffinity
072a98ca9a Document undefined sprite template behavior 2020-04-25 18:25:55 -07:00
MandL27
073218d544
Mind Blown has contest data (#332) 
* uncomment mind blown

* more contest moves
 2020-04-25 11:22:12 +02:00
DizzyEggg
ee68f0f826 Fix switch-in abilities when shift style switch 2020-04-25 11:17:59 +02:00
PikalaxALT
14f76fbe03 Add tilemap rendering capability to gbagfx 2020-04-24 08:47:22 -04:00
DizzyEggg
738d92e39d Infiltrator affects mist safeguard 2020-04-23 11:29:19 +02:00
Eduardo Alvaro Quezada D'Ottone
d529ac3b60
More Battle config (#352) 
* Binding move turns.

* Binding damage.

* Incineratable Gems.

* Flash Fire while frozen.

* Sleep turns.

* Synchronized natures %

* Confusion self damage chance.

* Fixed confused self-damage check
 2020-04-23 09:01:28 +02:00
DizzyEggg
40ce053ce1 Adrenaline Orb 2020-04-22 15:12:25 +02:00
DizzyEggg
d56aaf7c0b Destiny Knot 2020-04-22 14:40:44 +02:00
DizzyEggg
e2524bed49 Metronome item 2020-04-22 12:49:25 +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
Eduardo Alvaro Quezada D'Ottone
c5a6acc7db
Corrosion (#306) 
* Status move poisoning for Steel and Poison types.

* Can poison itself with Toxic Orb.

* Secondary effect poisoning now working.

* Created a function that checks if abilities can bypass type immunities.

* Created macro to handle typeimmunity

* Applied review changes.

* Applied review requests.

* Left more readable version of HOLD_EFFECT_TOXIC_ORB.
 2020-04-21 15:59:19 +02:00
DizzyEggg
a80150f890 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-04-21 11:51:35 +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
DizzyEggg
5d412d37d8 More Ai tweaks 2020-04-20 14:47:00 +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
Eduardo Alvaro Quezada D'Ottone
1fdb195bd9
Added Gen 8 overworld effects. (#342) 
- LIGHTNING_ROD
- FLASH_FIRE
- HARVEST
- STORM_DRAIN
- MAGNET_PULL
- INFILTRATOR
- SUPER LUCK
 2020-04-20 13:22:42 +02:00
DizzyEggg
3dfd19b3e2 AI Weather moves tweaks 2020-04-20 13:00:04 +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
ce28454461 Fix Life Orb fainting an already fainted mon 2020-04-20 08:55:21 +02:00
Eduardo Alvaro Quezada D'Ottone
30900879a9
Option for setting Payback's damage double damage if the opponent switches out. (#338) 
* Option for setting Payback's damage double damage if the opponent switches out.

* Simplified

* Moody moved to ability settings
 2020-04-20 00:00:44 +02:00
DizzyEggg
dd17360ab0 Zen Mode and Shields Down 2020-04-19 21:18:39 +02:00
DizzyEggg
726af8efaa Moody small fix 2020-04-19 16:51:29 +02:00
DizzyEggg
ad481c8688 Moody 2020-04-19 15:44:44 +02:00
DizzyEggg
c01ed5325c Poison Touch fix 2020-04-19 14:43:54 +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
e62f1475d4 Beast Boost and Receiver 2020-04-19 12:07:56 +02:00
DizzyEggg
ee8a00be81 some ability tweaks 2020-04-18 20:34:09 +02:00
DizzyEggg
6ef28be22b Innards Out 2020-04-18 20:12:29 +02:00
DizzyEggg
e42ead10c9 Soul Heart 2020-04-18 19:59:09 +02:00
DizzyEggg
307bbcfe97 Stakeout 2020-04-18 19:15:24 +02:00
DizzyEggg
cbc0d8a57d Healer 2020-04-18 19:09:17 +02:00
DizzyEggg
7178ea6b46 Shore Up 2020-04-18 18:34:18 +02:00
DizzyEggg
093eca07b3 Volt Switch UTurn anim fix when cant switch out 2020-04-18 18:04:20 +02:00
DizzyEggg
68bcc76538 Fix trainer slide in shadow steal 2020-04-18 13:26:40 +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
b5ba1de7cf Intimidate affects defiant 2020-04-18 12:29:35 +02:00
DizzyEggg
bc86292c93 Psycho Cut fix, small AI tweak 2020-04-18 12:19:07 +02:00
DizzyEggg
34f5d9e2ae Burn Up And Purify 2020-04-17 21:14:26 +02:00
DizzyEggg
01b6b63e99 Some more move animations. Thanks Doesnt 2020-04-17 17:44:28 +02:00
DizzyEggg
90486324c6 Animation for Tupsy Toruvy 2020-04-16 16:52:25 +02:00
PlatinumMaster
3ff8b0cb5c Remove debug sound check. 2020-04-15 14:19:46 -04:00
PlatinumMaster
1b696e8119 Finalized pull request. 2020-04-15 13:35:12 -04:00
Eduardo Alvaro Quezada D'Ottone
81617eb577
Overworld effects (#245) 
* Snow Cloak's overworld effect. (reduces the chance of encountering wild Pokémon on Snow by 50%)

* Quick Feet's overworld effect. (reduces the chance of encountering wild Pokémon by 50%)

* No Guard's overworld effect. (raises the chance of encountering wild Pokémon by 50%)

* Honey Gather.

* Checks if honey is defined.

* Applied review changes.

* Fixed pointer reference

* Applied requested changes.

* Using weather constants.
 2020-04-15 14:45:07 +02:00
DizzyEggg
4c473d057e Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-04-15 14:41:50 +02:00
AsparagusEduardo
6eefcb1f82 Using sandstorm weather constant for Sand Veil encounter rate. 2020-04-15 07:40:39 -05:00
DizzyEggg
e00b76b8da Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-04-15 13:31:52 +02:00
DizzyEggg
83b251a69c Stamina, Liquid Voice, Water Compaction 2020-04-15 09:37:12 +02:00
PikalaxALT
a12de6e480
Merge pull request #1022 from GriffinRichards/doc-gcn 
Label GCN link flags field
 2020-04-14 15:54:34 -04:00
DizzyEggg
8ea7fcc348 better ai debug 2020-04-14 13:40:27 +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
DizzyEggg
51e1639513 Magic Guard protects from stuff 2020-04-13 15:49:40 +02: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
GriffinR
dde4a0416c Label GCN link flags field 2020-04-13 08:42:31 -04:00
DizzyEggg
51e2e0ad10 Ability pop-up for levitate and wonder guard 2020-04-13 13:06:31 +02:00
brain_face
9abda59bd1 Renamed sub_808C1B4 -> PlayerUseAcroBikeOnBumpySlope 2020-04-12 16:22:03 +02:00
brain_face
007a038031 Renamed sub_808B9D4 -> PlayerEndWheelieWhileMoving 2020-04-12 15:43:45 +02:00
brain_face
ce2fe10bec Renamed sub_808B9A4 -> PlayerPopWheelieWhileMoving 2020-04-12 15:35:38 +02:00
brain_face
1be48a61c1 Renamed sub_808B9BC -> PlayerWheelieMove 2020-04-12 15:31:11 +02:00
brain_face
1472a3a7d4 Renamed sub_808B980 -> PlayerWheelieInPlace 2020-04-12 14:38:18 +02:00
DizzyEggg
8f61445dfe Berserk 2020-04-12 12:41:26 +02:00
DizzyEggg
458809c5f7 Fix Payback not boosting on switching 2020-04-12 12:14:22 +02:00
DizzyEggg
060b795d8e Merge with master 2020-04-11 19:48:24 +02:00
DizzyEggg
a2a9f259c8 Change handlinf of forbidden moves for mimic metronome etc 2020-04-11 13:22:35 +02:00
DizzyEggg
d28992d2ed Anticipation clean-up 2020-04-11 12:34:53 +02:00
Eduardo Alvaro Quezada D'Ottone
6078cd3e15
Anticipation ability (#282) 2020-04-11 12:24:25 +02:00
DizzyEggg
bfd1874945 Assurance, attacker -> target fix 2020-04-11 12:18:58 +02:00
LOuroboros
3a202ea850
Made the opponent's self damage induced by the confusion status affect Assurance's power (#313) 2020-04-11 12:18:45 +02:00
DizzyEggg
6daab7a5c9 Fix Damp loop 2020-04-11 12:02:51 +02:00
DizzyEggg
1435cd4692 Change inner structure of semi invulerable moves 2020-04-11 11:47:13 +02:00
PikalaxALT
7eaabab3f0
Merge pull request #1020 from GriffinRichards/doc-unkanim 
Give partial labels to unknown anims
 2020-04-10 14:07:23 -04:00
PikalaxALT
c08b4ff3e1
Merge pull request #1019 from GriffinRichards/constants-party 
Add misc party constant usage
 2020-04-10 14:05:35 -04:00
PikalaxALT
8188615db8
Merge pull request #1018 from GriffinRichards/sync-util 
Sync link game util files
 2020-04-10 14:02:53 -04:00
PikalaxALT
384a7cdef8
Merge pull request #1011 from GriffinRichards/doc-avflag 
Minor player avatar doc
 2020-04-10 13:56:52 -04:00
PikalaxALT
6133c6b0af
Merge pull request #1006 from AsparagusEduardo/UsingBattleAction 
Using Battle Action constants
 2020-04-10 13:56:25 -04:00
GriffinR
2615a6838e Label unknown anims 2020-04-09 19:24:47 -04:00
GriffinR
7a5deff0bc Add misc party constant usage 2020-04-09 15:18:53 -04:00
GriffinR
e485857df3 Sync minigame_countdown 2020-04-08 17:23:32 -04:00
GriffinR
8853588af0 Sync digit_obj_util 2020-04-08 16:27:11 -04:00
jiangzhengwenjz
afdcb69bf4 better matching approach than upstream 2020-04-02 20:30:31 +08:00
jiangzhengwenjz
61b7b45084 Merge branch 'master' of https://github.com/pret/pokeemerald into nonmatching 2020-04-02 20:26:16 +08:00
Sewef
1c895bb8d0
Match HighlightSubmenuScreenSelectBarItem 2020-04-02 13:17:33 +02:00
Sewef
096e57f56c
Match HighlightScreenSelectBarItem 2020-04-02 13:11:18 +02:00
jiangzhengwenjz
0fe5ff34dc Pokeblock_BufferEnhancedStatText 2020-04-02 13:53:53 +08:00
jiangzhengwenjz
cd60736e36 PrintMonWeight 2020-04-02 12:15:03 +08:00
jiangzhengwenjz
69f6d2afad HighlightSubmenuScreenSelectBarItem 2020-04-02 01:03:44 +08:00
jiangzhengwenjz
3d2c42adfe HighlightScreenSelectBarItem 2020-04-02 01:03:25 +08:00
GriffinR
487080b425 Minor player avatar doc 2020-04-01 02:54:26 -04:00
Sewef
685f120b5e
Fix 'AnimMovmentWaves' typo 2020-03-27 14:50:15 +01:00
GriffinR
8e4b987699 Revert more porymap-breaking changes 2020-03-18 03:22:07 -04:00
AsparagusEduardo
f45336c546 Using Battle Action constants 2020-03-17 22:14:14 -03:00
GriffinR
ab87c90998 Revert city_zoom_tiles.png name 2020-03-17 12:08:05 -04:00
PikalaxALT
39da49495d
Merge pull request #1000 from GriffinRichards/doc-dex 
Document pokedex.c
 2020-03-17 10:43:57 -04:00
PikalaxALT
784e29352d
Merge pull request #985 from mrgriffin/decoration 
Document decoration.c
 2020-03-17 10:39:37 -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
3d1b546e05 Eviolite 2020-03-14 12:23:51 +01:00
Eduardo Alvaro Quezada D'Ottone
1fc89941ac
Fixed Ability Pop Up for Immunity-type abilities with Mold Breaker. (#301) 
* Fixed Ability Pop Up for Immunity-type abilities with Mold Breaker

When a mon with Mold Breaker caused a status move to another one with an Immunity-type ability such as that mon healed inmiediatly from it, the ability pop up would incorrectly show the attacker's ability instead.

* Compressed 3 lines into one.
 2020-03-14 12:16:18 +01:00
Eduardo Alvaro Quezada D'Ottone
64031dd672
Option for Toxic never missing if user is Poison type. (#304) 2020-03-14 12:15:36 +01:00
DizzyEggg
cf4d5f6e59 Merge with master 2020-03-13 23:02:17 +01:00
garakmon
b1dd945cbf move fonts from data/graphics/ to graphics/ 2020-03-12 13:40:00 -04:00
AsparagusEduardo
c73fdb8954 Restored some tItemCount instances as requested. 2020-03-10 17:46:26 -05:00
AsparagusEduardo
130929a7a4 Slight item_menu.c documentation 2020-03-10 17:46:26 -05:00
AsparagusEduardo
97096aab07 Applied review changes 2020-03-10 17:45:29 -05:00
AsparagusEduardo
1b9a01798e monMarks 2020-03-10 17:45:29 -05:00
AsparagusEduardo
fdf1faa563 SetMonIconTransparency 2020-03-10 17:45:29 -05:00
AsparagusEduardo
1159180a25 sMovingItemId 2020-03-10 17:45:29 -05:00
AsparagusEduardo
f9725affd0 MODE_2 renamed to MODE_MOVING 2020-03-10 17:45:29 -05:00
GriffinR
a495379ff0 Document pokedex cry screen 2020-03-10 14:02:03 -04:00
GriffinR
31b0cbe9b4 Document pokedex.c 2020-03-09 16:24:01 -04:00
Eduardo Quezada
f821303429 Using True/False on SetMoveEffect. 2020-03-07 16:54:13 -06:00
DizzyEggg
5db3449b50 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-03-06 11:40:41 +01:00
Martin Griffin
4485d51522 Document decoration.c 2020-03-06 09:47:20 +00:00
jiangzhengwenjz
93f0bff49c sub_8021A28 2020-03-06 07:01:12 +08:00
jiangzhengwenjz
69aff34afd sub_8027E30 2020-03-06 05:31:27 +08:00
GriffinR
8e1e09562e Use array count for InitBgsFromTemplates 2020-03-03 22:46:48 -05:00
PikalaxALT
9259b378ef
Merge pull request #991 from GriffinRichards/fix-eventticket 
Clarify event ticket flag names
 2020-03-03 16:15:27 -05:00
GriffinR
b6c9ad505d Minor fixes in trainer_battle.inc 2020-03-03 14:47:14 -05:00
GriffinR
4637085390 Clarify event ticket flag names 2020-03-03 01:36:20 -05:00
DizzyEggg
6968124529 Merge battle anim documentation 2020-02-29 13:59:41 +01:00
PikalaxALT
afe081cbba Match MultiplyInvertedPaletteRGBComponents and MultiplyPaletteRGBComponents 2020-02-27 14:00:36 -06:00
GriffinR
172cb7bae9 Sync Unown and qmark mon folders with pokefirered 2020-02-25 14:18:28 -06:00
GriffinR
51cd0ac081 Rename battle anim type files, remove unneeded ARG_RET_IDs 2020-02-25 12:54:08 -06:00
GriffinR
dc3c2b72f2 Clean up move anim doc 2020-02-25 12:54:08 -06:00
GriffinR
68dc68907b Label move anim data 2020-02-25 12:54:08 -06:00
GriffinR
efd53d080c Clean up battle anim C for doc 2020-02-25 12:54:08 -06:00
GriffinR
afa1ae2209 Finish documenting move anim scripts 2020-02-25 12:54:08 -06:00
GriffinR
e633b57593 Document remaining status/general/special anims 2020-02-25 12:54:08 -06:00
GriffinR
208057d7ae Document move anims S-Z 2020-02-25 12:54:08 -06:00
GriffinR
0d651c7c9e Some battle anim review changes 2020-02-25 12:54:08 -06:00
GriffinR
1ba12dc050 Document move anims I-S 2020-02-25 12:54:08 -06:00
GriffinR
501d0d3c18 Document move anims C-H 2020-02-25 12:54:08 -06:00
GriffinR
faf0ba8662 Use macro for randomization with ISO value 2020-02-25 12:54:08 -06:00
GriffinR
6eb44dc507 Document move anims A-C 2020-02-25 12:54:08 -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
Eduardo Alvaro Quezada D'Ottone
e1dbf8e064
Fix for Turboblaze's Battle string formatting (#281) 
* Fix for Turboblaze's Battle string formatting

* Moved the "a" down the line.
 2020-02-22 19:27:45 +01:00
DizzyEggg
b1b1bf7f12 Fix two turn moves not activating moxie 2020-02-22 18:43:16 +01:00
DizzyEggg
bd75f16a9b Clear move effect after each turn 2020-02-22 18:22:04 +01:00
DizzyEggg
517974ebcb Can't Knock Off mega stones 2020-02-22 17:30:07 +01:00
jiangzhengwenjz
097b847303 sub_802C838 2020-02-19 06:23:01 +08:00
GriffinR
3456578c0f Move berry crush data to src 2020-02-17 13:10:23 -06:00
GriffinR
f6275cce57 Misc constant use in TV 2020-02-17 13:09:35 -06:00
GriffinR
e7ff7fb032 Fix move relearner struct 2020-02-17 13:08:03 -06:00
Eduardo Alvaro Quezada D'Ottone
1acd82ece6
Added non-traceable abilities. (#275) 
* Added non-traceable abilities.

* Added ABILITIES_COUNT to array size
 2020-02-17 10:59:39 +01:00
PikalaxALT
867734a791 Fix alignment in AgbRfu_LinkManager.h 2020-02-16 15:32:10 -05:00
PikalaxALT
91dd7f5cc3 Port librfu from firered 2020-02-16 13:49:36 -05:00
DizzyEggg
edb581af1f Mega evo elevation shadow 2020-02-16 13:46:35 +01:00
DizzyEggg
5054727167 Allow second mon to throw a ball if first dead 2020-02-16 13:24:50 +01:00
LOuroboros
a1c425fffb
Fixed Bad Dreams' in battle text. (#272) 2020-02-16 13:17:00 +01:00
GriffinR
ac1738e11d Move smokescreen data to src 2020-02-13 14:48:19 -06:00
GriffinR
d11cd5d217 Move text input strings to src 2020-02-13 14:48:19 -06: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
DizzyEggg
360665fac8 Fix ability preventing escape string 2020-02-09 11:02:22 +01:00
GriffinR
084bd66924 Document Trainer Card 2020-02-08 14:31:17 -06:00
GriffinR
faeb974c46 Minor berry fix data clean up 2020-02-08 14:23:41 -06:00
GriffinR
43ec11b92a Move berry powder data to src 2020-02-08 14:22:53 -06:00
GriffinR
d1035f027e Move contest_link_80F57C4 data to src 2020-02-08 14:22:53 -06:00
GriffinR
85dc8a528c Move rotating tile puzzle data to src 2020-02-08 14:22:53 -06:00
Eduardo Alvaro Quezada D'Ottone
33e8e20118
Disguise ability (#258) 
* Protection from attacks.

* Changes form when Busting Disguise.

* Ability changing moves set to fail.

- Simple Beam and Worry Seed now fail if the target has Disguise.
- Role Play and Skill Swap now fail if either the attacker or the target have Disguise.

* Disguise no longer triggers when transformed.

* Mimikyu reverts to Disguised

* No longer blocks from entry hazards and weather.

* Applied review changes

* Oops, new line

* yeah
 2020-02-08 19:29:51 +01:00
DizzyEggg
14bc2f65f3 Fix AI trying to switch when it can't, also ghosts can escape 2020-02-08 14:20:02 +01:00
DizzyEggg
c9774f6e25 Transformed Aegi cannot change forms 2020-02-08 12:09:38 +01:00
DizzyEggg
afe96552af Fix Unnerve string 2020-02-08 11:01:39 +01:00
DizzyEggg
41f0c0acb5 Sort out ohko moves 2020-02-08 10:39:22 +01:00
Eduardo Alvaro Quezada D'Ottone
90442ffbc2
Battle config options (#243) 
* Option to use pre-GenVI critical hit multiplier.

* Clarified the option that multiplies EXP by 1.5 for trainer battles.

* Fixed code style.

* Option to change Burn damage.

* Option to change to Gen 7 paralysis drop.

* Ordered settings.

* Implemented review suggestions.
 2020-02-08 09:51:55 +01:00
Eduardo Alvaro Quezada D'Ottone
bd8d304c01
Spark is now Physical (#261) 2020-02-08 09:40:51 +01:00
DizzyEggg
834b7b52d3 Merge with master 2020-02-08 09:38:29 +01:00
GriffinR
86354f1d50 Document some pokenav and region map 2020-02-05 21:04:43 -05:00
GriffinR
27c4329e45 Use friendship event constants 2020-02-04 12:16:15 -06:00
GriffinR
8a96aa9e97 Name pokenav files 2020-02-04 08:02:28 -06:00
GriffinR
be5d417236 Document some pokenav menu handlers 2020-02-04 08:02:28 -06:00
Sebastian Gabl
0cf84d13ef Use correct prefix 2020-02-04 07:42:04 -06:00
Sebastian Gabl
0bd9639478 Name Wally struct and use bag macros 2020-02-04 07:42:04 -06:00
PikalaxALT
462acaa7dc sCombinedMoves 2020-02-01 12:07:40 -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
9a6c2c25d0 Add some capacity constants 2020-01-26 09:42:55 -06:00
GriffinR
7232bfecc2 Name null palettes 2020-01-26 09:40:35 -06:00
GriffinR
a152900211 Combine animated door frames 2020-01-26 09:40:35 -06:00
GriffinR
25d7577d9d Label animated doors 2020-01-26 09:40:35 -06:00
Sahith Nallapareddy
25df146054 using item constant 2020-01-20 07:51:18 -06:00
GriffinR
4c12ad00d2 Merge branch 'master' into fix-eventobj 2020-01-19 21:57:29 -05:00
DizzyEggg
1d13004a0b Fix Power Gem anim 2020-01-18 20:28:36 +01:00
DizzyEggg
06a9165f75 Fix Ice Body not working 2020-01-18 19:18:57 +01:00
DizzyEggg
bcf6b02a55 Fix Last Resort 2020-01-18 18:57:23 +01: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
Eduardo Alvaro Quezada D'Ottone
000a709363 Gen7 trainer exp multiplier. (#200) 
* Gen7 trainer exp multiplier.

* Changed check for TRAINER_BATTLE_MULTIPLIER from "before Gen 7" to "not Gen 7" as requested.
.
 2020-01-18 18:29:56 +01:00
DizzyEggg
d8aab3d112 Merge with master 2020-01-18 18:17:25 +01:00
GriffinR
a40f054900 Move/rename gfx start/end vars 2020-01-18 08:49:34 -06:00
jiangzhengwenjz
aa631825fc resolve data sections 2020-01-16 08:14:27 -06:00
jiangzhengwenjz
46b00b11d4 match all the functions 2020-01-16 08:14:27 -06:00
jiangzhengwenjz
c2be2e8c69 sync documentation from firered 2020-01-16 08:14:27 -06:00
jiangzhengwenjz
8a5f292618 document symbols 2020-01-16 08:14:27 -06:00
GriffinR
ea8b1011d3 Merge master into fix-eventobj 2020-01-15 16:11:20 -05:00
Sebastian Gabl
5fff2f2234 Use SHINY_ODDS macro where intended 
The 3 locations where SHINY_ODDS was added generate mon sprites for
display in the dex, at game start and on starter choice.
The arguments are intended for otId but in this case they are set to the
same value as SHINY_ODDS to prevent the pictures created from using the
shiny palette.
 2020-01-15 08:10:20 -06:00
Marcus Huderle
755ae0facc Use empty braces for last null entry in sTransitionTypes array 2020-01-13 20:31:40 -06:00
Marcus Huderle
5a2d676e71 Merge remote-tracking branch 'upstream' into tustin2121-patch-5 2020-01-13 20:26:20 -06:00
GriffinR
22931846d6 Fix Colosseum name porymap issue 2020-01-13 20:20:48 -06:00
GriffinR
e92cc7752b Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-01-13 20:41:57 -05:00
huderlem
6d6c57f383
Merge pull request #953 from GriffinRichards/sync-script 
Port some macro/script fixes from pokefirered
 2020-01-13 19:33:47 -06:00
GriffinR
c19289596d Give/Take to Add/Remove for silent script macros 2020-01-12 23:24:52 -05:00
GriffinR
655910a16f
Merge branch 'master' into fix-eventobj 2020-01-12 22:42:43 -05:00
huderlem
fa5816915d
Merge pull request #949 from GriffinRichards/doc-dome 
Document Battle Dome and add facility party constants
 2020-01-12 20:10:03 -06:00
GriffinR
43962fe141 Fix BuffeInGameTradeMonName typo 2020-01-12 19:45:04 -06:00
GriffinR
10220d3b76 Label TryRecordMixLinkup 2020-01-12 19:39:30 -06:00
GriffinR
e736c2d2fd Document some easy chat specials 2020-01-12 19:39:30 -06:00
GriffinR
6a470ddfda Some script clean up, document secret base secrets show 2020-01-12 19:39:30 -06:00
GriffinR
0284014e0e Add missing save status use 2020-01-12 18:42:41 -06:00
GriffinR
58e64b9524 Clean up some of save.c 2020-01-12 18:42:41 -06:00
DizzyEggg
1141e733eb Merge with master 2020-01-12 14:29:43 +01:00
PikalaxALT
98b2ab9a77 Match sub_8072308 2020-01-10 16:38:47 -05: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
Slawter666
8b1595ebc3 Pokédex search menu documentation 2020-01-06 15:18:58 -06: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
DizzyEggg
ed46cde304 Fix Persim Berry and cure attract battler assignment 2020-01-06 21:33:44 +01:00
DizzyEggg
cafb0c3b6a Fix Surf taking 3 pp 2020-01-04 18:17:26 +01:00
GriffinR
bb692a03eb Add frontier mon constants 2020-01-03 23:20:11 -05:00
DizzyEggg
fcf5870062 Fix wild mons in double battles not having item 2020-01-01 11:12:04 +01:00
DizzyEggg
b69292248c Add constants for special multi battles 2020-01-01 00:22:42 +01:00
DizzyEggg
39e3b0b740 Form changes layout and Stance Change Aegi 2019-12-31 19:11:53 +01:00
DizzyEggg
b15f0b3bb3 Comatose 2019-12-31 16:36:53 +01:00
DizzyEggg
7051f261d1 Fix Queenly Majesty 2019-12-31 13:33:54 +01:00
DizzyEggg
4c9ea32d19 Merge with master 2019-12-30 18:52:23 +01:00
DizzyEggg
770a57bec7 Fix some moves hitting the user 2019-12-30 13:14:20 +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
GriffinR
3efc8199d4 More battle_dome.c documentation 2019-12-25 22:27:33 -08: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
77842b0376 Contact moves for Aftermath and Bestow for Unburden 2019-12-25 12:19:09 +01:00
DizzyEggg
eb029d557b
Merge pull request #215 from LOuroboros/aftermath 
Implemented Aftermath's effect
 2019-12-25 12:04:09 +01:00
ultima-soul
332aa80a33 Resolve review comments and encapsulate Unburden check and set. 2019-12-23 09:25:26 -08:00
ultima-soul
5786745d15 Merge branch 'battle_engine' into unburden 2019-12-23 09:01:16 -08:00
DizzyEggg
ea9109943d Aurora Veil now only works in Hail 2019-12-23 17:50:13 +01:00
DizzyEggg
63621da46c Heatproof lowers burn dmg 2019-12-23 17:41:42 +01:00
DizzyEggg
cec9e177d6 Gooey add check for not displaying ability pop up when not necessary 2019-12-23 17:26:48 +01:00
DizzyEggg
308e1594c9
Merge pull request #212 from Fontbane/gooey 
Queenly Majesty, Big Pecks, Gooey and Tangling Hair
 2019-12-23 17:23:33 +01:00
DizzyEggg
e4a9a228c5
Merge pull request #210 from ultima-soul/battle_engine 
Implement Leaf Guard.
 2019-12-23 17:15:51 +01:00
DizzyEggg
34bd81871c
Merge pull request #208 from Fontbane/patch-4 
Change move names to CamelCase
 2019-12-23 17:11:32 +01:00
DizzyEggg
15d34c3513 Fix strings coz they had the same name for some unknown to me reason 2019-12-23 17:09:13 +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
ultima-soul
1146de4561 Implement Unburden. 2019-12-21 23:09:06 -08: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
LOuroboros
c690d577a5 Implemented Aftermath's effect 2019-12-21 05:01:42 -03: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
Diegoisawesome
773a599bbb
Merge pull request #942 from jiangzhengwenjz/DrawTradeMenuPartyInfo 
'real' match DrawTradeMenuPartyInfo
 2019-12-20 15:49:14 -08:00