ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 20:17:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,067 Commits 1 Branch 0 Tags 235 MiB
ba61970edb
Commit Graph

6067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
huderlem
204c431993
Merge pull request #910 from GriffinRichards/fix-eventobj 
Standardize Object Event naming
 2020-02-12 18:34:19 -06:00
Marcus Huderle
6b966d20e5 Update spritesheet rules 2020-02-12 18:07:13 -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
Diegoisawesome
66c6b7a38b
Merge pull request #976 from GriffinRichards/fix-parens 
Resolve missing parens errors
 2020-02-11 21:54:23 -08:00
GriffinR
eaf508ba5e Resolve missing parens errors 2020-02-12 00:44:09 -05:00
Evan
7c91183eda Merge branch 'battle_engine_v2' of https://github.com/dizzyeggg/pokeemerald 2020-02-11 07:43:32 -07: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
6640c509c0 Remove unnecessary declaration 2020-02-08 14:22:53 -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
Pokestia
f92b03f266 Fix wrong variable name 2020-02-08 14:19: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
97eaf8b559 Fix Shadow Claw anim 2020-02-08 12:22:10 +01:00
DizzyEggg
c9774f6e25 Transformed Aegi cannot change forms 2020-02-08 12:09:38 +01:00
DizzyEggg
e7d5ebb3b6 Make Charge raise sp.def 2020-02-08 11:55:16 +01:00
LOuroboros
6d39eb8826
Fixed Charge Beam's animation. (#252) 2020-02-08 11:41:44 +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
c859fe3606 Fix typo 2020-02-04 08:02:28 -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
39d70e364a
Merge pull request #964 from PikalaxALT/combined_moves 
sCombinedMoves
 2020-02-01 13:10:03 -05: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
Diegoisawesome
53eb1ecf2b
Merge pull request #962 from GriffinRichards/bug-aiweather 
Note AI weather bug
 2020-01-22 20:42:18 -08:00
GriffinR
6f392632c2 Note AI weather bug 2020-01-22 18:05:42 -05: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
4a5a84e5c7 Facade AI fix; AI uses fake out more often 2020-01-19 11:07:09 +01:00
DizzyEggg
a6bf183653 Fix Aegi ability pop up sliding 2020-01-18 20:33:46 +01:00