DizzyEggg
8213222337
Merge with master
2019-04-06 23:20:16 +02:00
DizzyEggg
f8713f9c15
Merge with master
2019-04-06 20:43:13 +02:00
Papa Cancer
33d484a7ed
Merge branch 'battle_engine_v2' into beta
2019-04-06 00:38:56 +01:00
Papa Cancer
43525d2a9c
Merge branch 'battle_engine_v2' into delta
2019-04-05 23:13:41 +01:00
DizzyEggg
a83255d103
fix after prs
2019-04-06 00:03:03 +02:00
DizzyEggg
794c9aa255
Merge pull request #121 from thechurchofcage/epsilon
...
Three pointless moves
2019-04-05 23:47:54 +02:00
DizzyEggg
ef9a339fde
Merge pull request #122 from Fontbane/decap
...
Decap Ability Names
2019-04-05 23:41:12 +02:00
DizzyEggg
7c8f69e6e3
Merge pull request #109 from Fontbane/patch-4
...
Field Effects for Gen IV Abilities
2019-04-05 23:40:30 +02:00
Marcus Huderle
033580da96
Document secret base
2019-04-05 16:24:57 -05:00
Fontbane
2743b069da
Decap Ability Names
...
Also fixed names that are too long
2019-04-05 14:16:39 -04:00
Papa Cancer
4c8bc9d526
Three pointless moves
...
Celebrate, Hold Hands and Happy Hour. Yay(!)
Update: turns out Pay Day works differently to how I thought, so I added a new move effect for Happy Hour doubling prize money.
Made all three effects subset of EFFECT_SPLASH, now called EFFECT_DUMB, as per Egg's instructions ( ͡° ͜ʖ ͡°)
2019-04-05 18:10:02 +01:00
Fontbane
9ee2e1c99a
Fix honey tab
2019-04-05 12:03:09 -04:00
Fontbane
e8dd8f93d1
Remove Honey functionality
2019-04-05 10:33:19 -04:00
DizzyEggg
b0223f691f
Clean up data headers
2019-04-05 07:53:23 -05:00
DizzyEggg
c36476af85
Clean up data2b.c
2019-04-05 07:53:23 -05:00
DizzyEggg
183b714ff1
Merge with master and fix web moves
2019-04-05 12:43:44 +02:00
Fontbane
9e74409bb2
Fix labels, label more scripts
2019-04-04 19:34:35 -05:00
DizzyEggg
a6e345e095
Coordinates for gen5 sprites
2019-04-04 17:31:25 +02:00
DizzyEggg
9c6d3d33c7
Remove still pics
2019-04-04 16:12:55 +02:00
DizzyEggg
e00d40848b
Gen1-4 correct coordinates
2019-04-04 15:29:27 +02:00
DizzyEggg
240e9bda17
All data for gen 6.7 mons, placeholder sprites
2019-04-04 13:36:47 +02:00
DizzyEggg
b407967cea
Gen5 sprites and icon placeholder data
2019-04-04 12:57:01 +02:00
DizzyEggg
b21d960c5c
Add Egg Moves data
2019-04-03 23:09:07 +02:00
DizzyEggg
7dcd7362d3
Add Evolution data
2019-04-03 23:00:49 +02:00
DizzyEggg
de4722708b
Add Gen4 mon sprites
2019-04-03 17:39:08 +02:00
DizzyEggg
adfd151f47
Add Gen4 icons
2019-04-03 13:08:41 +02:00
DizzyEggg
27bafdc04d
Begin pokemon expansion
2019-04-02 21:22:16 +02:00
DizzyEggg
cd3de7821e
Merge branch 'master' into battle_engine_v2
2019-04-02 08:37:54 +02:00
Phlosioneer
845307b3a6
Rename contest AI stuff
2019-04-01 22:16:07 -04:00
DizzyEggg
22be08f723
Revert Bubblebeam to hit only one target
2019-04-01 23:17:50 +02:00
Papa Cancer
c9ad96d228
Stomping Tantrum
...
Uses timer in gBattleStruct to count time since last failed move. This is augmented by a MOVE_FAILED result in atk_49 and decreased with an ENDTURN case. EFFECT_STOMPING_TANTRUM doubles base power if the timer is set.
2019-04-01 20:06:45 +01:00
Phlosioneer
37c7441a15
Merge branch 'master' into contest-data
2019-03-31 20:22:47 -04:00
Phlosioneer
207a54393c
Fix mistakes and use EVENT_OBJ_GFX_* macros
2019-03-31 20:07:24 -04:00
Papa Cancer
1d5cf3acb5
Misc. move updates
...
Bind: 75% Acc -> 85% Acc
Disable: 55% Acc. -> 100% Acc.
Freeze-Dry: 10% chance to freeze
Hammer Arm and Ice Hammer: lower user's speed
High Jump Kick: 130BP, 10 PP
Jump Kick: 100BP, 10 PP
Tail Glow: raises Sp. Atk by 3 stages
Waterfall: 20% chance to flinch
2019-03-31 18:25:37 +01:00
Papa Cancer
ebe2dc6bbb
Mat Block
...
Nothing more needs to be said
2019-03-31 17:17:13 +01:00
Fontbane
2cfa5ea326
Fixed Honey
...
And updated gitignore
2019-03-25 19:00:46 -04:00
Fontbane
fc69631a10
Field effects for Gen IV Abilities
...
Also added Honey (acts like White Flute for now) and made it so the Griseous Orb can't be removed from Giratina in battle.
2019-03-25 17:49:29 -04:00
DizzyEggg
54ab6b43dc
Merge with master
2019-03-22 10:40:31 +01:00
Phlosioneer
9848f84b9e
Use constants for Oam .shape and .size fields
...
Also some general formatting fixes for constants.
2019-03-16 12:37:04 -05:00
garak
d0115db565
move pokemon graphics to mon-specific directories
2019-03-16 12:21:47 -05:00
garak
14211fb495
fix incbin paths
2019-03-16 12:21:47 -05:00
Phlosioneer
0c935a8bd5
Move the contest opponent filter to C
2019-03-09 22:54:17 -05:00
Phlosioneer
a32e8e7405
Move gContestOpponents into C
...
2,400 LOC by hand.
2019-03-09 20:56:36 -05:00
Phlosioneer
153499ed6f
Clean up contest_opponents.inc
2019-03-09 01:38:38 -05:00
Phlosioneer
5b4b0a245b
Move contest winner list to C
2019-03-09 00:01:49 -05:00
Phlosioneer
88c3781880
Move text pointer tables into C
2019-03-08 22:33:40 -05:00
DizzyEggg
055f5a17b4
Merge pull request #103 from LOuroboros/battle_engine_v2
...
Protective Pads' description and Safety Goggles
2019-03-07 19:20:51 +01:00
DizzyEggg
b3ec24ab12
Merge pull request #102 from LOuroboros/battle_engine_v2
...
Gen. 5 Gems and Gen. 7 hold items stuff
2019-03-07 18:53:48 +01:00
LOuroboros
7d7e54c59a
Added the item sprite of the Safety Goggles.
2019-03-07 13:54:54 -03:00
LOuroboros
25ff138ead
Reordered the Item IDs a little bit to add the Safety Goggles and also added their item data.
2019-03-07 13:52:46 -03:00