7d88b9647f
Merge branch 'master' into event-flags
2018-10-17 12:30:45 -04:00
ff97873c30
label temp flags, test replace script
2018-10-17 12:25:12 -04:00
624a7552b6
use event flags in event scripts
2018-10-17 09:05:22 -04:00
da1b5365a7
label a flag in the asm
2018-10-17 08:55:09 -04:00
b7b1d609d0
More synchronisation
2018-10-17 13:52:26 +01:00
f67bbbdaaa
Merge pull request #364 from Diegoisawesome/master
...
Port/decompile field_control_avatar
2018-10-16 21:54:14 -05:00
e75f0b4f80
Port/decompile field_control_avatar
2018-10-16 21:47:08 -05:00
1435c96b41
Further synchronisation
2018-10-17 01:11:44 +01:00
832947f329
Merge pull request #363 from DizzyEggg/patch-1
...
Use constants
2018-10-16 17:07:54 -05:00
1f358fbb07
Use constants
2018-10-16 22:34:53 +02:00
0051947414
Merge remote-tracking branch 'upstream/master' into event-flags
2018-10-16 14:31:45 -04:00
ed1bb3030b
Merge pull request #362 from Deokishisu/patch-1
...
Fix "Vigaroth" misspelling in event_objects.h
2018-10-16 11:26:48 -05:00
b52b05368c
Fix "Vigaroth" misspelling in May's House 1F
2018-10-16 12:08:17 -04:00
e377c323c4
Fix "Vigaroth" misspelling in Brendan's House 1F
2018-10-16 12:07:47 -04:00
78a912a039
Fix "Vigaroth" misspelling to "Vigoroth"
2018-10-16 12:06:38 -04:00
3aff112127
Begin synchronising with pokeruby
2018-10-16 14:55:16 +01:00
a9abb930aa
Merge pull request #352 from huderlem/shop
...
[WIP] Shop
2018-10-14 19:03:48 -05:00
7f211b2588
Merge pull request #359 from Slawter666/label_field_effect_helpers
...
Label field_effect_helpers.c
2018-10-14 18:37:11 -05:00
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
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
137f6549ff
label field_effect_helpers
2018-10-14 23:43:40 +01:00
9496c50518
Merge pull request #358 from Deokishisu/LabelOWsProperly
...
Label OWs More Descriptively
2018-10-14 15:36:00 -05:00
94bec0b8db
Fix Double Underscores
...
Whoops.
2018-10-14 16:14:01 -04:00
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
a8afec762b
Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly
2018-10-14 14:22:56 -04:00
02049d52ee
Merge pull request #351 from DizzyEggg/apprentice
...
Decompile apprentice
2018-10-14 13:20:38 -05:00
c89b14f5ef
Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly
2018-10-14 14:19:23 -04:00
43316ffae8
Merge pull request #356 from DizzyEggg/clean_battlestruct
...
Clean a couple of battlestructs' fields
2018-10-14 13:18:29 -05:00
e129f4864f
Merge branch 'master' of https://github.com/pret/pokeemerald into LabelOWsProperly
2018-10-14 14:16:07 -04:00
0979ea91fb
Merge pull request #357 from DizzyEggg/move_heap
...
Move HEAP_SIZE to malloc and use void instead of empty argument list
2018-10-14 13:15:31 -05:00
c3113db931
Move HEAP_SIZE to malloc and use void instead of empty argument list
2018-10-14 20:00:14 +02:00
d40e737d52
Merge pull request #349 from golemgalvanize/decompile_field_effect_helpers
...
Decompile field effect helpers
2018-10-14 12:48:18 -05:00
e0bc3fd59c
Merge pull request #355 from DizzyEggg/use_eos
...
Use defines for text chars
2018-10-14 12:21:37 -05:00
355f014909
Merge pull request #354 from DizzyEggg/move_blendpal
...
Move blend_palette to util
2018-10-14 12:11:50 -05:00
ecdf0fd69d
Clean battle structs
2018-10-14 18:37:52 +02:00
2bd86dad2f
Rename Boy4 to RichBoy
2018-10-14 12:26:48 -04:00
b73611bccb
clean battle structs
2018-10-14 18:10:54 +02:00
cd4f65ecef
Make apprentice compile
2018-10-14 17:06:47 +02:00
f47ed3268c
Finish documenting apprentice for now
2018-10-14 17:00:41 +02:00
d60e4e23f8
Merge pull request #25 from Slawter666/apprentice-data
...
Move apprentice data to C
2018-10-14 16:28:27 +02:00
7952cfeba5
document more of apprentice
2018-10-14 16:27:48 +02:00
f08b56d645
Move apprentice data to C
2018-10-14 15:26:13 +01:00
af7aa624cd
make aprentice compile
2018-10-14 15:23:14 +02:00
84936b4260
Merge branch 'master' into apprentice
2018-10-14 15:07:16 +02:00
541043a661
Use defines for text chars
2018-10-14 15:04:25 +02:00
7a008a944a
Move 'blend_palette'.c to util.c
2018-10-14 14:43:19 +02:00
145df49063
Document more of apprentice
2018-10-14 14:35:51 +02:00
b4a42a6832
Decompile apprentice
2018-10-14 11:37:44 +02:00
36b8a6a9a2
More apprentice work
2018-10-13 23:23:33 +02:00
a496a763ca
Merge record mixing, pokemon and global with apprentice
2018-10-13 20:38:46 +02:00
garak