Marcus Huderle
fb2d1591c1
Document more battle anim effects
2018-12-31 16:53:38 -06:00
Diegoisawesome
d004ce065c
Merge branch 'master' of github.com:pret/pokeemerald into trade
2018-12-31 02:30:30 -06:00
Diegoisawesome
c5c6e437ec
Document, cleanup, extract data from trade
2018-12-31 01:23:27 -06:00
Marcus Huderle
58f130d007
Document some battle anims and helpers
2018-12-30 11:04:17 -06:00
Diegoisawesome
2fb9f490fb
Almost done with trade
2018-12-29 12:46:15 -06:00
Melody
dc6c0ed17e
add event object var references
2018-12-29 11:56:53 -06:00
Marcus Huderle
6e7bdb3ca4
Document misc field_specials things
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
c3dde7353d
Add newline to Route111_NoMirageTower layout.inc
...
To match all other layout.inc files.
2018-12-26 17:04:24 -06:00
Marcus Huderle
a1ea3b5e39
Use map_header_flags macro ( #483 )
2018-12-26 12:20:15 -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
Melody
c7971ecb20
improve event script object calls
2018-12-25 11:20:33 -06:00
Diegoisawesome
a54aa03d20
Merge pull request #475 from DizzyEggg/learn
...
asm party and fldeff clean-up
2018-12-24 16:50:14 -06:00
Diegoisawesome
c2ca57e8ac
Merge pull request #477 from melthelesbian/object_script_commands
...
use player constant in obj script commands
2018-12-24 16:09:42 -06:00
Melody
38293d4293
use player constant in obj script commands
2018-12-24 16:31:24 -05:00
Melody
1e87810414
document setweather calls
2018-12-24 16:23:58 -05:00
DizzyEggg
442b1826a2
asm party and fldeff clean-up
2018-12-24 21:59:05 +01:00
DizzyEggg
6fa5f33519
Merge branch 'master' into battle_engine_v2
2018-12-24 09:07:18 +01: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
Diegoisawesome
81b38c00e4
Merge pull request #466 from melthelesbian/compare_macros
...
improve compare macros
2018-12-23 11:17:30 -06:00
DizzyEggg
efa820469a
move data to c
2018-12-23 14:52:47 +01:00
DizzyEggg
6d57a9dfc8
start data converting
2018-12-23 13:52:53 +01:00
DizzyEggg
ef55bdac89
Merge branch 'master' into battle_engine_v2
2018-12-22 23:57:42 +01:00
Diegoisawesome
ebbe826133
Merge pull request #437 from DizzyEggg/storage
...
Pokemon Storage System
2018-12-22 16:12:27 -06:00
DizzyEggg
bea1faec10
some ai scripts touch
2018-12-22 21:43:21 +01:00
DizzyEggg
e54dd6a02b
Merge with master
2018-12-22 13:53:07 +01:00
Melody
55005f1588
improve call_if macros
2018-12-21 21:32:45 -05:00
Melody
ac2e4adf2d
improve goto_if macros
2018-12-21 20:28:24 -05:00
golem galvanize
314b718471
finish porting ice
2018-12-21 01:37:59 -05:00
DizzyEggg
ecee02816d
Merge with master
2018-12-20 22:53:08 +01:00
DizzyEggg
7dcb614cca
PSS is done
2018-12-20 22:14:36 +01:00
Marcus Huderle
efd7013f62
Add poison bubble effect to Poison Jab
2018-12-20 14:58:13 -06:00
Marcus Huderle
4aecea2ce8
Add Night Slash animation
2018-12-20 12:46:08 -06: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
Marcus Huderle
b7ce383a96
Document a bunch of battle anims
2018-12-19 21:19:44 -06:00
Diegoisawesome
48d7c0a7a3
Merge pull request #454 from golemgalvanize/decompile_party_menu
...
Decompile party menu
2018-12-19 19:57:31 -06:00
Marcus Huderle
fe66019bc5
Fix ROOST healing effect graphical bug
2018-12-19 16:36:55 -06:00
Melody
5e6ceeb631
update applymovement to remove magic numbers
2018-12-19 14:08:01 -05:00
Marcus Huderle
d2b5a0e83f
Convert battle_anim_815A0D4 data to .c
2018-12-18 19:15:59 -06:00
golem galvanize
8781d969ff
finish party_menu
2018-12-18 05:38:08 -05:00
Marcus Huderle
c74468fd11
Document a bunch of battle anim stuff
2018-12-17 22:16:17 -06:00
Marcus Huderle
c04ce0ee64
Decompile battle_anim_effects_2.c
2018-12-17 22:16:17 -06:00
DizzyEggg
9ffd0c7382
3.5 asm left
2018-12-17 23:00:08 +01:00
garak
e292d0ca83
Merge branch 'master' into fldeff
2018-12-16 20:05:31 -05:00
DizzyEggg
aae36b5653
6k left
2018-12-16 21:10:01 +01:00
DizzyEggg
f1421d94c3
Up to sub 0x80ce580
2018-12-15 23:58:47 +01:00
Marcus Huderle
1ca3656d74
Decompile contest_painting.c ( #447 )
2018-12-15 13:07:07 -06:00
Marcus Huderle
5e92481f51
Merge pull request #443 from Meowsy/misc-renamings
...
Misc renamings.
2018-12-13 21:35:36 -06:00
Marcus Huderle
2c6849bee8
Decompile battle_anim_8170478.c ( #445 )
2018-12-13 21:33:54 -06:00
Marcus Huderle
170b6ef449
Decompile battle_intro.c ( #444 )
2018-12-12 23:18:25 -06:00
DizzyEggg
59a69eb627
Storage up to icon palettes
2018-12-12 23:19:50 +01:00
DizzyEggg
c5b5f4bd77
More storage
2018-12-10 23:42:44 +01:00
Meowsy
d3e32ab287
Rename Mauville Man text.
2018-12-10 15:50:10 -05:00
DizzyEggg
c2d8876174
Document PSS functions
2018-12-10 21:36:52 +01:00
Diegoisawesome
bfdfe367e8
Merge pull request #422 from garakmon/frontier_data_1
...
Battle tower data
2018-12-10 11:22:16 -06:00
garak
e1e2132a37
sync fldeff function names with pokeruby
2018-12-09 22:24:54 -05:00
garak
b4312648e2
decompile fldeff_80F9BCC with data
2018-12-09 19:22:59 -05:00
Marcus Huderle
a7722a0b93
Decompile cable_car.c ( #438 )
2018-12-09 13:41:52 -06:00
DizzyEggg
e0f3de0b74
Start pokemon storage system
2018-12-09 16:44:01 +01:00
DizzyEggg
180aa839c4
Fix conflicts
2018-12-09 13:12:02 +01:00
DizzyEggg
58c4cec946
decompile field screen
2018-12-08 21:42:36 +01:00
DizzyEggg
5caca7a4d6
Clean up field weather
2018-12-08 19:43:21 +01:00
DizzyEggg
4c23adb5f5
Decompile field weather
2018-12-08 19:05:03 +01:00
DizzyEggg
b60915539d
Fix Phantom Force
2018-12-08 16:19:50 +01: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
Melody
2615ece23b
Use normal apostrophes like adults
2018-12-07 10:41:08 -05:00
garak
80c3258504
finish battle tower data except sRubyFacilityClassToEmerald
2018-12-04 12:09:35 -05:00
garak
2c14d6ee6c
fix merge conflicts
2018-12-03 16:58:28 -05:00
DizzyEggg
b9e711bbf4
Add Powder
2018-12-03 12:50:32 +01: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
52d1e69591
Add AI support for newly added moves
2018-12-02 23:50:51 +01: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
d46c3ebe5b
Fix Future Sight
2018-12-02 18:47:39 +01:00
Melody
862265b73a
defines register_matchcall macro
2018-12-02 06:04:59 -05:00
Melody
c557ac61ae
adds constants, cleans up callstd and msgbox code
...
* adds some constants for standard script names and messagebox types
* replaces some callstd calls with msgbox calls where equivalent
* replaces msgbox and callstd calls using raw digits with versions that use the constants
2018-12-02 03:37:46 -05:00
DizzyEggg
6ae949e360
Psychic Terrain blocks priority moves
2018-12-01 11:35:49 +01:00
DizzyEggg
1a8859b1d8
Add Dazzling
2018-11-30 22:12:18 +01:00
DizzyEggg
0329175f06
Add Protean
2018-11-30 21:21:43 +01:00
DizzyEggg
7fa55704b2
merge with master
2018-11-30 20:46:09 +01:00
Marcus Huderle
9dd7f8f214
Decompile pokedex_area_screen.c ( #412 )
2018-11-30 10:41:03 -06:00
Marcus Huderle
0148e38973
Decompile pokedex_cry_screen.c ( #406 )
2018-11-28 10:14:32 -06:00
DizzyEggg
7cfe0342f0
Finish frontier data
2018-11-27 22:45:50 +01:00
garak
f316d53c58
Merge branch 'frontier-data' of https://github.com/garakmon/pokeemerald into frontier-data
2018-11-27 13:28:44 -05:00
garak
2707bd9b91
clean frontier data
2018-11-27 13:27:49 -05:00
garak
a636005066
delete createsprite.py
2018-11-27 11:40:29 -05:00
garak
73cce79753
Merge remote-tracking branch 'upstream/master' into frontier-data
2018-11-27 11:35:19 -05:00
garak
091b5194e7
frontier pike and pyramid data
2018-11-27 11:21:48 -05:00
Slawter666
deb7adbad5
Convert pokédex data to C
2018-11-27 04:00:38 +00:00
Marcus Huderle
fb6120da5b
Fixup some names
2018-11-25 15:50:54 -06: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
cc635c5e6d
Custom wild multi battles functionality
2018-11-24 17:31:45 +01:00
DizzyEggg
1c8e574646
Custom Multi Battles - fix defeat msg
2018-11-24 17:06:48 +01:00
DizzyEggg
d52016bc31
Mon creation in custom multi battles
2018-11-24 13:29:10 +01:00
DizzyEggg
539b05ff73
Begin working on custom multi battles
2018-11-24 01:02:02 +01:00
LOuroboros
9d93817319
Update battle_anim_scripts.s
2018-11-21 18:27:35 -03:00
LOuroboros
67375ba3c8
Update battle_anim_scripts.s
...
New mega evolution animation.
2018-11-19 21:45:15 -03:00
DizzyEggg
e4fba4bc7e
make it assemble
2018-11-19 20:49:38 +01:00
DizzyEggg
a5df797804
Merge branch 'master' into battle_engine_v2
2018-11-19 20:42:07 +01:00
Marcus Huderle
72f0a079a9
Decompile all of battle_anim_utility_funcs
2018-11-19 09:37:25 -06:00
DizzyEggg
623f1963b7
Merge with master
2018-11-18 20:49:52 +01:00
DizzyEggg
4e37723288
Document Battle Pyramid
2018-11-18 17:52:22 +01:00
DizzyEggg
c9f57a3b7b
Merge pull request #28 from PALPATlNE/battle_engine_work
...
Fixed U-turn
2018-11-17 23:20:43 +01:00
PALPATlNE
f7cd950b69
Fixed U-turn
2018-11-17 23:17:41 +01:00
DizzyEggg
dff968d1f1
Merge pull request #26 from PALPATlNE/battle_engine_work
...
Battle engine work
2018-11-17 23:04:00 +01:00
PALPATlNE
4284816d81
Fixed Createsprite command arguments
2018-11-17 21:16:48 +01:00
PALPATlNE
fe8c70b9f8
Fix
2018-11-17 19:59:03 +01:00
DizzyEggg
eb66b60f38
Begin battle pyramid
2018-11-17 15:30:34 +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
Slawter666
6fcf878e2f
Tidy up header files
2018-11-13 22:28:46 +00: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
b5ea69cf74
Fix conflicts
2018-11-12 19:22:23 +01:00
DizzyEggg
69683f9572
Decompile Battle Palace
2018-11-12 15:41:19 +01:00
Slawter666
1b895ff52c
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
2018-11-12 14:14:50 +00:00
DizzyEggg
d5abd7b696
Document Battle Pie
2018-11-12 14:36:31 +01:00
DizzyEggg
a4235c9ff8
Document battle arena
2018-11-11 18:33:16 +01:00
DizzyEggg
81410fee17
Factory done
2018-11-11 16:44:27 +01:00
Diegoisawesome
18839a4872
Merge remote-tracking branch 'pret/master' into script_menu
2018-11-06 20:20:56 -06:00
Diegoisawesome
054a015c95
Finish decompiling/porting script_menu
2018-11-06 20:13:40 -06:00
Diegoisawesome
7dd4ed7060
r5/r6 swap on sub_80E2578
2018-11-05 14:45:54 -06:00
DizzyEggg
c3eac92af8
fix protect
2018-11-03 23:32:18 +01:00
DizzyEggg
bc42de5f60
Aurora Veil, Revelation Dance, Diamond Storm
2018-11-03 14:35:45 +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
DizzyEggg
0bb51037d7
Finish frontier util
2018-11-01 21:31:10 +01:00
DizzyEggg
90ef269426
Merge branch 'master' into battle_frontier_2
2018-10-30 21:48:18 +01:00
DizzyEggg
0da7d7e6ae
why is this function so hard to match
2018-10-30 21:45:26 +01:00
Diegoisawesome
2837859bdb
Merge pull request #373 from garakmon/battle-anim
...
Split battle_anim_80FE840 and move data to C
2018-10-30 11:53:05 -05:00
Diegoisawesome
c8ef69a00d
Merge pull request #372 from garakmon/sprite-tags
...
Synchronize sprite tags
2018-10-30 11:26:44 -05:00
DizzyEggg
3a9eeef844
Frontier, finish ranking hall
2018-10-28 21:11:53 +01:00
DizzyEggg
98d8dbfd8a
Up to sub_81a443c
2018-10-28 00:50:06 +02:00
DizzyEggg
0e6fbbfe09
Make battle tower compile
2018-10-27 00:04:18 +02:00
DizzyEggg
52be8eeaf1
Merge branch 'master' into battle_tower
2018-10-26 23:55:36 +02:00
garak
7747a891a2
finish 80FE840 data (actually)
2018-10-25 18:59:05 -04:00
