Commit Graph
58 Commits
Author SHA1 Message Date
Slawter666 137f6549ff label field_effect_helpers 2018-10-14 23:43:40 +01:00
Slawter666 f08b56d645 Move apprentice data to C 2018-10-14 15:26:13 +01: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
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
Slawter666 291ac2cee9 Add build rules for overworld sprite sheets 2018-09-08 00:28:32 +01:00
Slawter666 54d5a7ad97 Format event object pic tables 2018-09-07 14:14:52 +01:00
Slawter666 9dec2bdef8 Merge branch 'master' of https://github.com/pret/pokeemerald into spritesheet 2018-09-07 11:50:23 +01: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
Slawter666 9350ac0a74 Move battle_pyramid_bag data to C 2018-09-06 01:24:11 +01:00
Slawter666 07c2882390 Move starter_choose data to C 2018-09-06 00:47:29 +01:00
Slawter666 0cd250a83e Deleted accidently uploaded file 2018-09-06 00:00:29 +01:00
Slawter666 5656ceab6c Move graphics to src/data/graphics 2018-09-05 23:53:54 +01:00
Slawter666 4c54212b1f Bring labels for overworld.c over from pokeruby 2018-09-04 23:31:37 +01:00
Slawter666 5c66b8a7ef Label event_object_movement.c 2018-09-02 23:20:45 +01:00
Slawter666 f74adc80c1 Format more templates 2018-09-02 17:53:52 +01:00
Slawter666 6106154801 Format WindowTemplate in battle_pyramid_bag.c 2018-09-02 16:26:23 +01:00
Slawter666 c1b3dfa15a Format templates in wallclock.c 2018-09-02 16:10:06 +01:00
Slawter666 c9db9b7a59 Format WindowTemplate in berry_blender.c 2018-09-02 15:14:23 +01:00
Slawter666 3119aae4b2 Format WindowTemplate in berry_tag_screen.c 2018-09-02 15:02:39 +01:00
Slawter666 f45c9e75db Format templates in item_menu.c 2018-09-02 14:49:29 +01:00
Slawter666 ef4695a72c Minor labelling 2018-09-02 13:47:12 +01:00
Slawter666 e30c2251ce Convert more of data2b 2018-08-27 00:26:54 +01:00
Slawter666 ca07412686 Format SpriteTemplate 2018-08-26 15:45:08 +01:00
Slawter666 69c20f18ac Convert battle dome data to C 2018-08-26 13:40:36 +01:00
Slawter666 709b63efa9 Split files 2018-08-24 21:21:19 +01:00
Slawter666 6b145ed77c Move data from graphics.s to C 2018-08-24 04:21:07 +01:00
Slawter666 ed24233274 Convert more of data2b.s to C 2018-08-22 23:03:44 +01:00
Slawter666 4db5ef3ae6 Convert more data 2018-08-22 21:41:34 +01:00
Slawter666 ef6a3c2278 Move some data from data2b.s to C 2018-08-22 14:34:36 +01:00
Slawter666 bc42c5054c Merge remaining overworld frames 2018-08-10 00:20:19 +01:00
Slawter666 877a80d3bc Merge berry tree frames 2018-08-09 23:19:45 +01:00
Slawter666 dea0bba64e Merge "pokemon" frames 2018-08-09 00:55:32 +01:00
Slawter666 704e3c7334 Merge https://github.com/pret/pokeemerald into spritesheet 2018-08-07 22:18:30 +01:00
Slawter666 ab2cc59629 Merge remaining "people" overworld frames 2018-08-07 22:16:03 +01:00
Slawter666 5917f7d108 Merge frontier brains, team magma and team aqua frames 2018-08-02 00:34:28 +01:00
Slawter666 52aa9cedcf Merge May frames into sprite sheets
Plus fix Brendan's surfing and watering frame order.
2018-07-29 17:29:36 +01:00
Slawter666 d5825230e5 Merge "brendan" frames into sprite sheets 2018-07-28 18:11:28 +01:00
Slawter666 08774bdd88 Merge https://github.com/pret/pokeemerald into pokedex-doc 2018-07-08 01:23:28 +01:00
Slawter666 dd228fae5a Minor variable labelling 2018-07-08 01:20:01 +01:00
Slawter666 7f2329253f requested changes 2018-05-06 17:31:50 +01:00
Slawter666 190ac275bb Formatting item_icon_table.h 2018-05-06 13:45:56 +01:00
Slawter666 279a6e1ddc Convert item_icon_table.inc to C 2018-05-06 13:37:28 +01:00
Slawter666 aab1238ec0 Revert "Convert item_graphics.inc to C"
This reverts commit 546217d281.
2018-05-06 09:12:23 +01:00
Slawter666 546217d281 Convert item_graphics.inc to C
I have tried to group the items that share the same icon but have different palettes where possible. This commit also splits data/graphics.s into two files.
2018-05-05 23:27:26 +01:00
Slawter666 22ec43a6ed resolve merge conflicts 2018-05-05 18:50:26 +01:00
Slawter666 39fd42faea convert data/items.inc to include/data/items.h
OK
2018-04-25 02:33:55 +01:00
Slawter666 a49f80d552 Convert item_descriptions.inc to .h
OK
2018-04-25 01:41:04 +01:00
Slawter666 a9d65ae6b6 Move files to include/data 2018-04-24 00:58:14 +01:00
Slawter666 5a7a0d621c minor documentation of constants/items.h 2018-04-24 00:17:09 +01:00
Slawter666 2d4ab9f4ac Updated items.c
Working but non-matching
2018-04-23 23:25:03 +01:00
Slawter666 f56067bb63 Update items.c 2018-04-23 22:14:30 +01:00
Slawter666 a04f8f6ee3 Convert item data files to .c (not compiling) 2018-04-23 21:44:46 +01:00