DizzyEggg
e9965dd341
merge with master
2018-11-02 22:55:32 +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
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
garak
de90ce9123
finish 80FE840 data (almost)
2018-10-25 17:46:23 -04:00
DizzyEggg
1efdaebe23
finish decompiling battle tower
2018-10-25 21:27:10 +02:00
garak
17c26fae1a
fire, electric, ice data
2018-10-24 20:01:40 -04:00
garak
22a0b58e57
effects_2 and water data
2018-10-24 15:52:21 -04:00
garak
2f4b00e34b
finish effects_1 data
2018-10-23 12:17:31 -04:00
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
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
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