DizzyEggg
|
a3460c9e45
|
Code Belch effect
|
2019-02-01 14:17:24 +01:00 |
|
Marcus Huderle
|
29d6221935
|
Convert map data to JSON
|
2019-01-31 15:51:20 -06:00 |
|
Marcus Huderle
|
5c1667b41a
|
Define layout constants
|
2019-01-29 16:55:25 -06:00 |
|
DizzyEggg
|
736826e863
|
New feature - battle 2 vs 1 opponent
|
2019-01-27 20:54:34 +01:00 |
|
DizzyEggg
|
88b788bfab
|
Fix Charge Beam effect
|
2019-01-27 11:57:13 +01:00 |
|
DizzyEggg
|
897592a8d4
|
Merge branch 'master' into battle_engine_v2
|
2019-01-27 10:58:57 +01:00 |
|
Diegoisawesome
|
900f294011
|
Add var const prefix for some missed var numbers
|
2019-01-21 22:34:01 -06:00 |
|
DizzyEggg
|
f34ab49f63
|
Merge pull request #56 from SBird1337/feature/battle-engine-animpack1
Add some animations (see below)
|
2019-01-18 23:06:19 +01:00 |
|
DizzyEggg
|
2c3210f4d1
|
merge with master
|
2019-01-18 22:30:34 +01:00 |
|
DizzyEggg
|
4b420643dc
|
Merge branch 'master' into trainer_hill
|
2019-01-13 20:51:05 +01:00 |
|
DizzyEggg
|
c0bc01d301
|
Move some vars to C
|
2019-01-13 13:15:23 +01:00 |
|
Karathan
|
832c0d6333
|
add toxic spike animation
|
2019-01-12 17:02:24 +01:00 |
|
Diegoisawesome
|
af2c39860d
|
Rename non-mapsec constants
|
2019-01-08 13:40:11 -06:00 |
|
Slawter666
|
aeaf390706
|
Update constants
|
2019-01-05 20:12:50 +00:00 |
|
DizzyEggg
|
4827776a3c
|
Merge with master
|
2019-01-05 10:14:20 +01:00 |
|
Tetrable
|
97ebeef1db
|
Relabel TEMP_FLAG_20 into FLAG_UNUSED_0x020
|
2019-01-03 18:13:16 +00:00 |
|
Tetrable
|
30e7ac0dca
|
Fix merge conflicts
|
2019-01-03 02:28:18 +00:00 |
|
Tetrable
|
50aa222aff
|
Corrected typos
|
2019-01-03 01:54:55 +00:00 |
|
Marcus Huderle
|
e1092028ec
|
Decompile match_call.c
|
2019-01-02 19:46:15 -06:00 |
|
Tetrable
|
a3ebca4d81
|
Fix merge conflicts
|
2019-01-02 21:25:14 +00:00 |
|
Tetrable
|
1e3da62d24
|
Finish off labelling flags
|
2019-01-02 21:12:43 +00:00 |
|
Melody
|
dc6c0ed17e
|
add event object var references
|
2018-12-29 11:56:53 -06:00 |
|
DizzyEggg
|
55e44b0951
|
a bit more of contest painting effect
|
2018-12-29 11:48:28 -06:00 |
|
Marcus Huderle
|
d0d870e193
|
Cleanup formatting
|
2018-12-29 11:36:54 -06:00 |
|
Marcus Huderle
|
67636b7c64
|
Document deoxys rock
|
2018-12-29 11:36:54 -06:00 |
|
DizzyEggg
|
27b1d74dad
|
Merge branch 'master' into battle_engine_v2
|
2018-12-29 15:11:54 +01:00 |
|
Melody
|
6d556f8cf7
|
improve checkplayergender calls
clean up constant definitions
make tweaks from review
|
2018-12-28 08:22:21 -06:00 |
|
Marcus Huderle
|
d59f5a8e56
|
Misc overworld documentation
|
2018-12-27 16:52:13 -06:00 |
|
DizzyEggg
|
6411d1d693
|
Merge pull request #55 from huderlem/anims
Some battle anims
|
2018-12-26 17:48:03 +01:00 |
|
DizzyEggg
|
517573eb4b
|
Update with master
|
2018-12-26 17:46:51 +01:00 |
|
Marcus Huderle
|
dcbc8db6a3
|
Document mirage_tower.c. (Combine fldeff_groundshake.c and fossil_specials.c)
|
2018-12-25 11:46:35 -06:00 |
|
Marcus Huderle
|
c17f7d73fa
|
Merge remote-tracking branch 'origin/battle_engine_v2' into features
# Conflicts:
# ld_script.txt
# src/effects_1.c
|
2018-12-23 17:24:14 -06:00 |
|
DizzyEggg
|
bd817d70d6
|
Refactor battle intro, allow to speed it up
|
2018-12-23 18:47:00 +01:00 |
|
DizzyEggg
|
ef55bdac89
|
Merge branch 'master' into battle_engine_v2
|
2018-12-22 23:57:42 +01:00 |
|
DizzyEggg
|
f7a7ddde0c
|
Fix Quick Guard
|
2018-12-22 15:10:24 +01:00 |
|
DizzyEggg
|
0748069705
|
Merge pull request #53 from ultima-soul/battle_engine
Added new battle items.
|
2018-12-22 13:54:19 +01:00 |
|
DizzyEggg
|
e54dd6a02b
|
Merge with master
|
2018-12-22 13:53:07 +01:00 |
|
DizzyEggg
|
ecee02816d
|
Merge with master
|
2018-12-20 22:53:08 +01:00 |
|
Marcus Huderle
|
ecda59a406
|
Add Poison Jab animation
|
2018-12-20 11:58:21 -06:00 |
|
Marcus Huderle
|
0369780db9
|
Add Rock Polish animation
|
2018-12-20 10:18:17 -06:00 |
|
Diegoisawesome
|
6ef9671718
|
Merge pull request #440 from garakmon/fldeff
Decompile / port fldeff_80F9BCC
|
2018-12-19 22:16:59 -06:00 |
|
Melody
|
5e6ceeb631
|
update applymovement to remove magic numbers
|
2018-12-19 14:08:01 -05:00 |
|
garak
|
e292d0ca83
|
Merge branch 'master' into fldeff
|
2018-12-16 20:05:31 -05:00 |
|
DizzyEggg
|
f1421d94c3
|
Up to sub 0x80ce580
|
2018-12-15 23:58:47 +01:00 |
|
ultima-soul
|
a00eb2f5d8
|
Added new battle items.
|
2018-12-13 09:31:47 -08:00 |
|
Diegoisawesome
|
bfdfe367e8
|
Merge pull request #422 from garakmon/frontier_data_1
Battle tower data
|
2018-12-10 11:22:16 -06:00 |
|
garak
|
62384e7a61
|
use facility class constants
|
2018-12-09 22:57:46 -05:00 |
|
garak
|
b4312648e2
|
decompile fldeff_80F9BCC with data
|
2018-12-09 19:22:59 -05:00 |
|
DizzyEggg
|
180aa839c4
|
Fix conflicts
|
2018-12-09 13:12:02 +01:00 |
|
DizzyEggg
|
4683cdc30c
|
Merge branch 'master' into weather
|
2018-12-09 11:56:50 +01:00 |
|
DizzyEggg
|
5caca7a4d6
|
Clean up field weather
|
2018-12-08 19:43:21 +01:00 |
|
DizzyEggg
|
b60915539d
|
Fix Phantom Force
|
2018-12-08 16:19:50 +01:00 |
|
nullableVoidPtr
|
8a8baaeaaa
|
Merge remote-tracking branch 'upstream/master'
|
2018-12-08 12:13:15 +08:00 |
|
DizzyEggg
|
6068495619
|
Document trainer battle scripts (#430)
|
2018-12-07 16:50:56 -06:00 |
|
DizzyEggg
|
470df386c9
|
Fix conflicts
|
2018-12-07 23:01:14 +01:00 |
|
nullableVoidPtr
|
f24584cd31
|
Tabs -> spaces & align in include/
|
2018-12-07 21:01:59 +08:00 |
|
DizzyEggg
|
a9e6154fa9
|
Finish porting battle frontier data
|
2018-12-05 22:21:26 +01:00 |
|
Melody
|
2347e36d60
|
document pokédex options
|
2018-12-05 10:10:33 -05:00 |
|
garak
|
2c14d6ee6c
|
fix merge conflicts
|
2018-12-03 16:58:28 -05:00 |
|
DizzyEggg
|
0d122bc831
|
Fix merge conflicts
|
2018-12-03 17:56:36 +01:00 |
|
DizzyEggg
|
a83fc52a7e
|
Make data easier to edit
|
2018-12-03 14:49:16 +01:00 |
|
Melody
|
0e5e487b78
|
tweak alignment
|
2018-12-03 08:04:11 -05:00 |
|
Melody
|
2779421ad4
|
fix brendan/may/wally consistency issues
|
2018-12-03 08:01:52 -05:00 |
|
DizzyEggg
|
b9e711bbf4
|
Add Powder
|
2018-12-03 12:50:32 +01:00 |
|
Melody
|
52fa5137c9
|
tweak alignment
|
2018-12-03 00:31:15 -05:00 |
|
garak
|
462e7c8295
|
begin batle tower data
|
2018-12-02 23:22:42 -05:00 |
|
Melody
|
eeb6446da4
|
add more consistent names
|
2018-12-02 22:36:09 -05:00 |
|
DizzyEggg
|
ad67f4f26f
|
Merge with master and REQ arguments
|
2018-12-02 22:05:23 +01:00 |
|
Melody
|
10725def8e
|
trainerbattle_normal → trainerbattle_single
* trainerbattle_normal → trainerbattle_single
* TRAINER_BATTLE_NORMAL → TRAINER_BATTLE_SINGLE
* improves the macro documentation a little
|
2018-12-02 15:08:19 -05:00 |
|
Melody
|
bad5323642
|
cleans up trainer battle scripts
* adds battle type macros
* adds `trainerbattle_normal` macro
* adds `trainerbattle_double` macro
* adds rematch macros
* adds no intro macro
|
2018-12-02 15:08:19 -05:00 |
|
DizzyEggg
|
8f8e6fb88b
|
Merge branch 'master' into battle_engine_v2
|
2018-12-02 16:59:38 +01:00 |
|
Melody
|
b9cf4f27b5
|
renames the winstrate graphics names to pokefan
|
2018-12-02 00:47:04 -05:00 |
|
DizzyEggg
|
1a8859b1d8
|
Add Dazzling
|
2018-11-30 22:12:18 +01:00 |
|
DizzyEggg
|
a0699dba52
|
Add Aromatic Mist
|
2018-11-25 12:59:22 +01:00 |
|
DizzyEggg
|
434e257943
|
Add Acupressure
|
2018-11-24 21:06:53 +01:00 |
|
DizzyEggg
|
194139a35b
|
Add Move Effect - Feint
|
2018-11-24 19:37:10 +01:00 |
|
DizzyEggg
|
539b05ff73
|
Begin working on custom multi battles
|
2018-11-24 01:02:02 +01:00 |
|
DizzyEggg
|
623f1963b7
|
Merge with master
|
2018-11-18 20:49:52 +01:00 |
|
DizzyEggg
|
1b0cfb0757
|
Party Size and Num Stats
|
2018-11-18 20:00:36 +01:00 |
|
DizzyEggg
|
15b8046b2b
|
Add third type
|
2018-11-17 12:10:24 +01:00 |
|
DizzyEggg
|
65036b9a09
|
Merge with master
|
2018-11-15 21:53:32 +01:00 |
|
Diegoisawesome
|
032dd251e6
|
Merge pull request #383 from garakmon/createsprite
Update createsprite macro and rename BANK to BATTLER
|
2018-11-15 14:45:13 -06:00 |
|
DizzyEggg
|
bb9dbc0c6d
|
Merge with master
|
2018-11-14 22:50:27 +01:00 |
|
garak
|
c6833c903c
|
remove extra macro and shorten names
|
2018-11-13 16:19:52 -05:00 |
|
garak
|
269aebaca7
|
update createsprite macro and rename BANK to BATTLER
|
2018-11-13 15:35:46 -05:00 |
|
Slawter666
|
1d46507110
|
Move field effects enum to defines
|
2018-11-13 14:19:04 +00:00 |
|
DizzyEggg
|
a4235c9ff8
|
Document battle arena
|
2018-11-11 18:33:16 +01:00 |
|
DizzyEggg
|
258ec3162f
|
frontier util review changes
|
2018-11-05 22:13:59 +01:00 |
|
DizzyEggg
|
bc42de5f60
|
Aurora Veil, Revelation Dance, Diamond Storm
|
2018-11-03 14:35:45 +01:00 |
|
DizzyEggg
|
52a68f6f1c
|
Introduce ability pop-up define
|
2018-11-03 10:51:51 +01:00 |
|
DizzyEggg
|
68d94ad316
|
Implement trainer sliding
|
2018-11-03 01:17:16 +01:00 |
|
DizzyEggg
|
e9965dd341
|
merge with master
|
2018-11-02 22:55:32 +01:00 |
|
Diegoisawesome
|
9adbb5d871
|
Merge pull request #375 from garakmon/animation-test-temp
Back animation names
|
2018-10-30 12:00:37 -05:00 |
|
garak
|
3cb7a33f42
|
label back animations
|
2018-10-30 12:37:53 -04:00 |
|
Diegoisawesome
|
c8ef69a00d
|
Merge pull request #372 from garakmon/sprite-tags
Synchronize sprite tags
|
2018-10-30 11:26:44 -05:00 |
|
DizzyEggg
|
52be8eeaf1
|
Merge branch 'master' into battle_tower
|
2018-10-26 23:55:36 +02:00 |
|
DizzyEggg
|
dc273cc19d
|
Battle tower - ewram variables
|
2018-10-26 23:54:41 +02:00 |
|
DizzyEggg
|
549b669f2a
|
battle tower, match sth and dumb loop instead of goto
|
2018-10-24 23:14:45 +02:00 |
|
garak
|
6cf39e8a6e
|
clean up sprite tags
|
2018-10-22 10:51:40 -04:00 |
|
garak
|
d267fcbfb1
|
name remaining tags
|
2018-10-22 10:36:43 -04:00 |
|