Commit Graph

1165 Commits

Author SHA1 Message Date
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 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 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
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 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 66fd9b2ddf Label trainer hill battle type 2018-09-20 22:00:00 +02:00
Marcus Huderle f2a76b54bd Re-dump tileset images as RGB-indexed, rather than greyscale 2018-09-16 11:07:48 -05: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
Slawter666 991151f461 Move item_use data to C 2018-09-11 03:04:19 +01:00
Slawter666 3c16d8c598 Move braille_puzzles data to C 2018-09-11 02:17:21 +01:00
Slawter666 b6ee8823f0 Move field_special_scene data to C 2018-09-11 02:04:03 +01:00
Slawter666 bcea321494 Finish converting data2b data 2018-09-11 01:35:47 +01:00
DizzyEggg 10b479a3ca Document battle animation scripts. 2018-09-10 21:19:19 +02:00
DizzyEggg b87856b58e Battle Factory is decompiled and documented. 2018-09-10 01:01:39 +02:00
Slawter666 135e98a824 Move battle factory data to C 2018-09-09 16:06:35 +01:00
Slawter666 1ba17e1666 Merge branch 'decompile_frontier_2' of https://github.com/DizzyEggg/pokeemerald into factory-data 2018-09-09 15:51:13 +01:00
DizzyEggg 6454740587 More battle factory 2018-09-09 13:12:26 +02:00
Diegoisawesome cf8f73bde1 Merge pull request #314 from Slawter666/data
Convert data to C
2018-09-07 11:39:07 -05:00
Marcus Huderle fa9d1759bd checkpoint 2018-09-06 11:37:45 -05:00
Slawter666 9ad7dc9fd7 Move remaining field_player_avatar data across 2018-09-06 12:02:37 +01:00
Slawter666 26c91f1502 Move field_player_avatar data to C 2018-09-06 03:11:33 +01:00
Diegoisawesome f8f7a8e300 Merge pull request #304 from Slawter666/graphics
Move data from graphics.s to C
2018-09-05 20:32:23 -05:00