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
Diegoisawesome
804d0a4b6a
Merge pull request #371 from Diegoisawesome/align_lz
...
Fix LZ compressed data alignment
2018-10-21 12:24:24 -05:00
Diegoisawesome
8e7202ec3d
Fix LZ compressed data alignment
2018-10-21 12:05:34 -05:00
Diegoisawesome
97bbb326b8
GameClear nonsense
2018-10-20 19:53:41 -05: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
Slawter666
7a072d4527
Continue synchronising
2018-10-20 21:01:45 +01: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
DizzyEggg
f4e55999a5
begin porting and decomping battle tower
2018-10-20 00:33:51 +02: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
Diegoisawesome
95d8815721
Merge pull request #368 from Diegoisawesome/master
...
Finish porting/decompiling field_player_avatar
2018-10-19 00:08:59 -05:00
Diegoisawesome
dd3689fdbf
Finish porting/decompiling field_player_avatar
2018-10-19 00:05:54 -05:00
garak
cb5981cdf2
name more event flags
2018-10-18 21:32:21 -04:00
Diegoisawesome
442baf1a00
Merge pull request #367 from DizzyEggg/move_blitmap
...
Move Bitmap struct and clear sprite/text files a bit
2018-10-18 19:18:44 -05:00
garak
c27043bd3c
more event flags
2018-10-18 15:28:59 -04:00
DizzyEggg
dfee5deca8
Move Bitmap struct and clear sprite/text files
2018-10-18 21:24:37 +02:00
Diegoisawesome
b23dc9a123
Merge pull request #366 from Diegoisawesome/master
...
Finish shop and fldeff_escalator
2018-10-18 12:08:38 -05: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
garak
da1b5365a7
label a flag in the asm
2018-10-17 08:55:09 -04:00
Slawter666
b7b1d609d0
More synchronisation
2018-10-17 13:52:26 +01:00
Diegoisawesome
f67bbbdaaa
Merge pull request #364 from Diegoisawesome/master
...
Port/decompile field_control_avatar
2018-10-16 21:54:14 -05: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
Diegoisawesome
832947f329
Merge pull request #363 from DizzyEggg/patch-1
...
Use constants
2018-10-16 17:07:54 -05:00
DizzyEggg
1f358fbb07
Use constants
2018-10-16 22:34:53 +02:00
garak
0051947414
Merge remote-tracking branch 'upstream/master' into event-flags
2018-10-16 14:31:45 -04:00
Diegoisawesome
ed1bb3030b
Merge pull request #362 from Deokishisu/patch-1
...
Fix "Vigaroth" misspelling in event_objects.h
2018-10-16 11:26:48 -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
Deokishisu
78a912a039
Fix "Vigaroth" misspelling to "Vigoroth"
2018-10-16 12:06:38 -04:00
Slawter666
3aff112127
Begin synchronising with pokeruby
2018-10-16 14:55:16 +01: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
Diegoisawesome
eafea33dd9
Merge pull request #360 from Deokishisu/Fix-Event-Object-Defines
...
Update All EVENT_OBJ_GFX References
2018-10-14 18:26:31 -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
Diegoisawesome
9496c50518
Merge pull request #358 from Deokishisu/LabelOWsProperly
...
Label OWs More Descriptively
2018-10-14 15:36:00 -05:00
Deokishisu
94bec0b8db
Fix Double Underscores
...
Whoops.
2018-10-14 16:14:01 -04:00
Deokishisu
d7ba8a306c
Rename OW Sprites
...
Rename OW Sprites to be more descriptive where possible. If an OW sprite was used by only one Trainer class, it was renamed. Additionally, some non-Trainer sprites were renamed.
Renamed:
LittleBoy1 -> NinjaBoy
LittleGirl1 -> Twin
Woman2 -> PokefanF
OldMan1 -> ExpertM
OldWoman1 -> ExpertF
Man3 -> PokefanM
Woman6 -> LinkReceptionist
Man7 -> DevonEmployee
Boy4 -> RichBoy
Boy5 -> GameboyKid (Consistent with pokecrystal)
ContestOldMan -> ContestJudge
Renamed Because of Numbering Changes:
LittleBoy2 -> LittleBoy
LittleGirl2 -> LittleGirl
OldWoman2 -> OldWoman
OldMan2 -> OldMan
Man4 -> Man3
Man5 -> Man4
Man6 -> Man5
Woman3 -> Woman2
Woman4 -> Woman3
Woman5 -> Woman4
Woman7 -> Woman5
2018-10-14 15:49:55 -04:00
