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
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
02049d52ee
Merge pull request #351 from DizzyEggg/apprentice
...
Decompile apprentice
2018-10-14 13:20:38 -05:00
Diegoisawesome
43316ffae8
Merge pull request #356 from DizzyEggg/clean_battlestruct
...
Clean a couple of battlestructs' fields
2018-10-14 13:18:29 -05:00
Diegoisawesome
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
DizzyEggg
c3113db931
Move HEAP_SIZE to malloc and use void instead of empty argument list
2018-10-14 20:00:14 +02: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
Diegoisawesome
e0bc3fd59c
Merge pull request #355 from DizzyEggg/use_eos
...
Use defines for text chars
2018-10-14 12:21:37 -05:00
DizzyEggg
ecdf0fd69d
Clean battle structs
2018-10-14 18:37:52 +02:00
DizzyEggg
b73611bccb
clean battle structs
2018-10-14 18:10:54 +02:00
DizzyEggg
f47ed3268c
Finish documenting apprentice for now
2018-10-14 17:00:41 +02:00
DizzyEggg
7952cfeba5
document more of apprentice
2018-10-14 16:27:48 +02:00
DizzyEggg
84936b4260
Merge branch 'master' into apprentice
2018-10-14 15:07:16 +02:00
DizzyEggg
541043a661
Use defines for text chars
2018-10-14 15:04:25 +02:00
DizzyEggg
7a008a944a
Move 'blend_palette'.c to util.c
2018-10-14 14:43:19 +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
36b8a6a9a2
More apprentice work
2018-10-13 23:23:33 +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
DizzyEggg
74b81bf229
start apprentice
2018-10-13 00:48:26 +02:00
Diegoisawesome
04836db167
Start porting cable_club.c
2018-10-11 16:02: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
Diegoisawesome
72c9abbb66
Remove invalid version entries
2018-10-07 23:28:36 -05:00
Marcus Huderle
807050a048
Merge pull request #348 from DizzyEggg/anim_files
...
Decompile/Port battle_anim_80A5C6C
2018-10-07 12:23:07 -05: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
Diegoisawesome
7a7aeed5e8
Merge pull request #347 from Deokishisu/GamV
...
Fill out VERSION_ enum with all possible values
2018-10-06 13:45:21 -05:00
Marcus Huderle
b9e38a569e
Merge pull request #320 from DizzyEggg/anims
...
Document battle animation scripts
2018-10-06 08:20:41 -05:00
Deokishisu
2070c246f9
Added new findings about invalid version IDs.
...
After transferring Pokemon up to Gen 6 and then to Gen 7, I discovered that invalid version IDs display the "a distant land" string that is used for the Gamecube games, so that information was added in a comment.
Also clarified that it's not just Gen 4 that displays the Johto string, it's Gen 4 and up.
2018-10-06 07:40:56 -04:00
DizzyEggg
17c5b4089a
Label most of the anim tags
2018-10-06 09:37:52 +02:00
Deokishisu
76a9cf0d54
Fix captitalization of HGSS in comment and match FRLG formatting in enum
2018-10-06 01:56:03 -04:00
Deokishisu
cc0d2288d5
Match comment formatting
2018-10-06 01:46:17 -04:00
Deokishisu
024700769a
Document all possible VERSION_ numbers and add them to the enum
2018-10-06 01:45:36 -04:00
Tetrable
61ab631dec
Fixed a small error
2018-10-05 23:02:04 +01:00
Tetrable
e80a53060b
Start anim tags
2018-10-05 23:00:07 +01:00
Marcus Huderle
ec0d350137
Move metatile behavior constants to include/constants and sync closer to pokeruby
2018-10-04 17:57:07 -05:00
Diegoisawesome
584cad6c0b
Merge pull request #339 from Kermalis/master
...
Rename voicegroups
2018-09-22 15:48:29 -05:00
Kermalis
e93f1182e6
Rename voicegroups
2018-09-22 16:42:34 -04:00
Diegoisawesome
58a5e4a261
Merge branch 'master' of github.com:pret/pokeemerald
2018-09-22 15:39:34 -05:00
Diegoisawesome
9e840dc5fe
Merge remote-tracking branch 'Tetra/master'
2018-09-22 15:23:47 -05:00
