garak
68814c42de
begin 80FE840 data
2018-10-23 08:25:51 -04:00
DizzyEggg
b330bdba51
More and more battle tower
2018-10-22 19:22:57 +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
garak
2b9fd18dd4
battle_anims.s data to C
2018-10-21 22:30:20 -04:00
garak
f2363f5982
more tag names
2018-10-21 19:30:27 -04:00
garak
7a9c7e5f06
Merge branch 'master' into sprite-tags
2018-10-21 15:12:18 -04:00
garak
2bb286ab4e
begin ANIM_TAG port
2018-10-21 15:07:10 -04:00
DizzyEggg
0ab27e44b1
more tower, fail
2018-10-21 20:13:12 +02:00
Slawter666
3d8874d919
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
2018-10-21 00:20:09 +01:00
DizzyEggg
16026fe91d
More battle tower.
2018-10-21 00:06:42 +02:00
Diegoisawesome
2a3ba78831
Merge pull request #369 from garakmon/pan-constants
...
Use sound pan constants in data/battle_anim_scripts.s
2018-10-19 20:27:54 -05:00
garak
ecd482fa2c
fix merge conflicts in battle_anim_scripts
2018-10-19 16:19:36 -04:00
garak
38fcc46abb
Merge remote-tracking branch 'upstream/master' into pan-constants
2018-10-19 16:05:14 -04:00
garak
901f3ff557
use sound panning constants in battle_anim_scripts
2018-10-19 15:57:19 -04:00
Diegoisawesome
bf8fa23462
Merge pull request #365 from garakmon/event-flags
...
[WIP] Event flags
2018-10-19 14:24:34 -05:00
garak
113a8d1efd
clean flags and remove temp macro
2018-10-19 14:59:18 -04:00
garak
1441ee6bc3
finish event object flags
2018-10-19 13:04:47 -04:00
garak
cb5981cdf2
name more event flags
2018-10-18 21:32:21 -04:00
garak
c27043bd3c
more event flags
2018-10-18 15:28:59 -04:00
Diegoisawesome
6206acd2d2
Finish shop and fldeff_escalator
2018-10-18 12:05:02 -05:00
garak
d1b7f32b0a
begin event flag names, add temporary hidden item macro
2018-10-17 22:07:23 -04:00
garak
7d88b9647f
Merge branch 'master' into event-flags
2018-10-17 12:30:45 -04:00
garak
ff97873c30
label temp flags, test replace script
2018-10-17 12:25:12 -04:00
garak
624a7552b6
use event flags in event scripts
2018-10-17 09:05:22 -04:00
Diegoisawesome
e75f0b4f80
Port/decompile field_control_avatar
2018-10-16 21:47:08 -05:00
Slawter666
1435c96b41
Further synchronisation
2018-10-17 01:11:44 +01:00
Deokishisu
b52b05368c
Fix "Vigaroth" misspelling in May's House 1F
2018-10-16 12:08:17 -04:00
Deokishisu
e377c323c4
Fix "Vigaroth" misspelling in Brendan's House 1F
2018-10-16 12:07:47 -04:00
Diegoisawesome
a9abb930aa
Merge pull request #352 from huderlem/shop
...
[WIP] Shop
2018-10-14 19:03:48 -05:00
Diegoisawesome
7f211b2588
Merge pull request #359 from Slawter666/label_field_effect_helpers
...
Label field_effect_helpers.c
2018-10-14 18:37:11 -05:00
Deokishisu
bf2063cc1a
Update All EVENT_OBJ_GFX References
...
Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.
2018-10-14 19:09:18 -04:00
Slawter666
137f6549ff
label field_effect_helpers
2018-10-14 23:43:40 +01:00
DizzyEggg
b3ad32bbe6
Merge with master
2018-10-14 20:51:34 +02:00
Diegoisawesome
02049d52ee
Merge pull request #351 from DizzyEggg/apprentice
...
Decompile apprentice
2018-10-14 13:20:38 -05:00
Diegoisawesome
d40e737d52
Merge pull request #349 from golemgalvanize/decompile_field_effect_helpers
...
Decompile field effect helpers
2018-10-14 12:48:18 -05:00
DizzyEggg
f47ed3268c
Finish documenting apprentice for now
2018-10-14 17:00:41 +02:00
DizzyEggg
d60e4e23f8
Merge pull request #25 from Slawter666/apprentice-data
...
Move apprentice data to C
2018-10-14 16:28:27 +02:00
DizzyEggg
7952cfeba5
document more of apprentice
2018-10-14 16:27:48 +02:00
Slawter666
f08b56d645
Move apprentice data to C
2018-10-14 15:26:13 +01:00
DizzyEggg
84936b4260
Merge branch 'master' into apprentice
2018-10-14 15:07:16 +02:00
DizzyEggg
145df49063
Document more of apprentice
2018-10-14 14:35:51 +02:00
DizzyEggg
b4a42a6832
Decompile apprentice
2018-10-14 11:37:44 +02:00
DizzyEggg
a496a763ca
Merge record mixing, pokemon and global with apprentice
2018-10-13 20:38:46 +02:00
Diegoisawesome
32fbf67d47
Merge branch 'master' into shop
2018-10-13 12:55:06 -05:00
Diegoisawesome
a26380663c
Merge branch 'master' of github.com:pret/pokeemerald
2018-10-13 12:44:23 -05:00
Diegoisawesome
35c6938814
Port/decompile cable_club.s
2018-10-13 12:41:10 -05:00
Marcus Huderle
b24559d69b
Merge remote-tracking branch 'upstream/master' into shop
...
# Conflicts:
# asm/shop.s
2018-10-13 10:22:58 -05:00
golem galvanize
803c2388ce
finish porting field_effect_helpers
2018-10-10 12:02:02 -04:00
golem galvanize
35ee9f67c0
ported some of field_effect_helpers
2018-10-09 17:32:39 -04:00
DizzyEggg
e44fef30ff
Fix move animations
2018-10-07 19:57:17 +02:00
DizzyEggg
b80b94ee73
merge with master
2018-10-07 19:40:34 +02:00
DizzyEggg
413e26e83d
port 80d51ac
2018-10-07 17:45:37 +02:00
DizzyEggg
61343d5069
Decompile battle_anim_80A9C70
2018-10-07 15:39:46 +02:00
DizzyEggg
8c834b9ae8
battle anim 80a5c6c decompiled
2018-10-07 12:32:20 +02:00
DizzyEggg
54fc92bc92
Start porting ruby battle anim file
2018-10-06 23:04:53 +02:00
DizzyEggg
7925000a54
merge with master
2018-10-06 16:05:58 +02:00
DizzyEggg
6b5c52e926
Flower Shield and protect moves
2018-10-06 15:50:35 +02:00
Marcus Huderle
b9e38a569e
Merge pull request #320 from DizzyEggg/anims
...
Document battle animation scripts
2018-10-06 08:20:41 -05:00
DizzyEggg
17c5b4089a
Label most of the anim tags
2018-10-06 09:37:52 +02:00
Tetrable
e80a53060b
Start anim tags
2018-10-05 23:00:07 +01:00
DizzyEggg
de9e9072fc
Rototiller and 2 turn moves
2018-09-30 14:04:46 +02:00
DizzyEggg
162c83fcff
Bestow
2018-09-30 12:27:51 +02:00
DizzyEggg
7623eabdee
After you
2018-09-29 19:37:39 +02:00
DizzyEggg
b9cf1fdcfe
Psycho Shift, Power Trick, Flame Burst
2018-09-29 18:40:14 +02:00
DizzyEggg
dddefbb0e3
Full support for moves hitting all battlers
2018-09-29 16:41:25 +02:00
DizzyEggg
ada76cbe4f
Synchronoise and Smack Down
2018-09-29 15:43:56 +02:00
DizzyEggg
597299136f
Add Pollen Puff effect
2018-09-29 14:10:53 +02:00
DizzyEggg
cbaae44f9f
Add pop-up to battlescripts
2018-09-29 13:36:33 +02:00
DizzyEggg
731ff38067
Ability pop-up functionality is done
2018-09-29 12:47:35 +02:00
DizzyEggg
3f2beff554
Defog
2018-09-23 19:03:53 +02:00
DizzyEggg
6b7a171dbe
Ability pop-up fail, maybe will do something about it later
2018-09-23 14:24:06 +02:00
DizzyEggg
37d8859404
random move to called move
2018-09-22 19:27:56 +02:00
DizzyEggg
60e8c80c4c
Merge branch 'master' into battle_engine_v2
2018-09-22 19:14:56 +02:00
DizzyEggg
611360c29e
calledattack to calledmove
2018-09-22 19:08:41 +02:00
DizzyEggg
e362c06aea
gRandomMove to gCalledMove
2018-09-22 18:41:00 +02:00
DizzyEggg
19e1606595
Add Copycat
2018-09-22 18:37:03 +02:00
DizzyEggg
db44a7e25a
Techno Blast and Autotomize
2018-09-22 17:27:51 +02:00
DizzyEggg
9474254e4d
Final Gambit, Dragon Tail
2018-09-22 16:15:00 +02:00
DizzyEggg
ca9876b0b4
Updated Wrap Mechanics, Infestation, stat changing move effects
2018-09-22 12:20:33 +02:00
DizzyEggg
f455f663f4
Shell Smash move effect
2018-09-22 11:13:17 +02:00
DizzyEggg
1284bb94f1
Last Resort, Fangs and Flare Blitz/Volt Tackle
2018-09-22 10:45:43 +02:00
DizzyEggg
23a06c0836
Close combat effect
2018-09-22 01:12:27 +02:00
DizzyEggg
7b60a654b2
Growth gen6 effect
2018-09-22 01:01:13 +02:00
DizzyEggg
a69af8f2f5
Merge with master
2018-09-22 00:22:13 +02:00
DizzyEggg
66fd9b2ddf
Label trainer hill battle type
2018-09-20 22:00:00 +02:00
DizzyEggg
602c1322e4
almost full support for link battles mega evolution
2018-09-20 11:23:12 +02:00
DizzyEggg
e7e110de55
Merge with master
2018-09-17 20:02:49 +02:00
DizzyEggg
2042788fdc
Mega Evolution done except sprites.
2018-09-16 21:08:49 +02:00
DizzyEggg
55f21c1776
Mega Evolution support is mostly done.
2018-09-16 18:55:32 +02:00
Marcus Huderle
f2a76b54bd
Re-dump tileset images as RGB-indexed, rather than greyscale
2018-09-16 11:07:48 -05:00
DizzyEggg
0800a44f7a
Merge branch 'master' into battle_engine_v2
2018-09-16 09:22:05 +02:00
DizzyEggg
4d2637883a
Slot machine is decompiled.
2018-09-15 23:19:37 +02:00
DizzyEggg
db248dada2
slot machine is decompiled
2018-09-15 22:59:45 +02:00
DizzyEggg
0547e260a4
More of slot machine
2018-09-15 18:01:20 +02:00
DizzyEggg
2a7811456a
Add anim tag sprite defines
2018-09-15 00:30:20 +02:00
DizzyEggg
a08d9dd451
Merge branch 'master' into anims
2018-09-12 22:59:04 +02:00
DizzyEggg
8a81bd1bce
Sync battle anim labels with pokeruby
2018-09-12 22:58:03 +02:00
Diegoisawesome
095cbbc5c2
Merge pull request #321 from Slawter666/data
...
Move more data to C
2018-09-11 22:10:26 -05:00
Slawter666
f40fa37398
Move battle_bg data to C
2018-09-11 23:37:47 +01:00
