Commit Graph

698 Commits

Author SHA1 Message Date
Diegoisawesome 387dbf48d0 Merge pull request #202 from DizzyEggg/move_mon_data
Move data from asm to pokemon_1.c
2018-02-08 14:06:57 -06:00
golem galvanize 03f8d0d6ce Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_main_menu 2018-02-07 19:31:33 -05:00
golem galvanize 4a903279df decompile task_new_game_prof_birch_speech_4 2018-02-07 19:30:58 -05:00
Diegoisawesome 772fd47564 Merge branch 'master' of https://github.com/pret/pokeemerald into menu 2018-02-07 18:06:59 -06:00
golem galvanize caf5d136b9 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu 2018-02-07 18:59:00 -05:00
DizzyEggg 4b7d778a5c move mon data fix conflicts 2018-02-07 20:17:55 +01:00
golem galvanize b67afb9490 I hope this fixes the conflicts 2018-02-07 14:14:08 -05:00
golem galvanize 1b303aeee8 decompiled up to task_new_game_prof_birch_speech_3 2018-02-07 14:11:08 -05:00
DizzyEggg c5e2092e8b title screen with master 2018-02-07 20:10:56 +01:00
Diegoisawesome 802b505d7b Merge pull request #199 from DizzyEggg/decompile_rtc_screen
decompile rtc reset screen
2018-02-07 13:03:59 -06:00
Diegoisawesome ccae0ee970 Merge pull request #198 from DizzyEggg/decompile_item_icon
decompile item icon
2018-02-07 12:59:40 -06:00
Diegoisawesome 1ae5adbb19 Merge pull request #196 from DizzyEggg/decompile_ray_scene
Decompile rayquaza scene
2018-02-07 12:59:13 -06:00
Cameron Hall 13bc7a8dd2 Merge pull request #166 from camthesaxman/battle_refactor
rename/refactor battle code
2018-02-07 12:46:12 -06:00
Diegoisawesome d396a8f89c Merge new_menu_helpers and menu 2018-02-07 00:07:42 -06:00
Diegoisawesome 18abda9dca Finish menu.s and eliminate TextColor 2018-02-06 20:37:54 -06:00
camthesaxman 607cba8c2e Merge branch 'master' into battle_refactor 2018-02-05 17:38:23 -06:00
DizzyEggg 541fef5368 move wild data to C 2018-02-05 22:27:29 +01:00
DizzyEggg ae8e89a10d move some pokemon data to c 2018-02-05 17:39:26 +01:00
golem galvanize 5f7709dc8b decompile item_menu 2018-02-04 23:47:47 -05:00
DizzyEggg 0c60ffe22a decompile title screen 2018-02-04 16:11:00 +01:00
PikalaxALT d52f52fa73 Merge branch 'master' into link 2018-02-03 09:42:19 -05:00
DizzyEggg 27452ca822 decompile rtc reset screen 2018-02-02 19:00:01 +01:00
DizzyEggg e13eacda39 decompile item icon 2018-02-02 16:06:20 +01:00
DizzyEggg ebc8af50f1 decompile berry tag screen 2018-02-02 14:03:48 +01:00
DizzyEggg 14d2caaf8d start decompiling berry tag screen 2018-02-02 12:32:12 +01:00
DizzyEggg b697497835 ray scene is decompiled 2018-02-01 14:47:41 +01:00
ProjectRevoTPP 78bd2b0849 move save rodata to source and use saveblock chunk macros 2018-01-31 15:26:57 -05:00
golem galvanize e78697494c Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu 2018-01-31 00:29:38 -05:00
ProjectRevoTPP e7fffb5e9a merge 2018-01-31 00:13:49 -05:00
Diegoisawesome 3167dec946 Merge pull request #188 from golemgalvanize/decompile_field_message_box
decompile field_message_box
2018-01-30 23:11:53 -06:00
ProjectRevoTPP 09302c0bc5 Merge branch 'master' of https://github.com/pret/pokeemerald into field_map_obj_helpers 2018-01-30 23:23:45 -05:00
Diegoisawesome eb5737357d Merge pull request #194 from DizzyEggg/decompile_mystery_event_menu
decompile mystery event menu
2018-01-30 20:33:27 -06:00
golem galvanize f7c9a6cb54 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu 2018-01-30 19:38:24 -05:00
ProjectRevoTPP c5f1b576f2 Merge branch 'master' of https://github.com/pret/pokeemerald into field_map_obj_helpers 2018-01-30 18:24:14 -05:00
ProjectRevoTPP 6453b88433 finish decompiling field_map_obj_helpers.c 2018-01-30 18:19:41 -05:00
DizzyEggg 9fbedcc41c coord weather fix conflicts 2018-01-31 00:02:16 +01:00
DizzyEggg 741b8adf9a decompile mystery event menu 2018-01-30 23:23:35 +01:00
Diegoisawesome b3315b64a1 Merge pull request #187 from golemgalvanize/decompile_item_use
decompile item_use
2018-01-30 15:41:43 -06:00
Diegoisawesome 232dea1a63 Merge pull request #193 from DizzyEggg/decompile_scanline_effect
decompile scanline effect
2018-01-30 15:37:34 -06:00
golem galvanize 231b69451b fixed 2018-01-30 16:33:20 -05:00
Diegoisawesome 6873f47821 Merge pull request #190 from DizzyEggg/decompile_time_events
decompile time events
2018-01-30 15:20:24 -06:00
golem galvanize 59b0e69820 adding ld_script 2018-01-30 13:22:59 -05:00
DizzyEggg db3ecf5012 decompile scanline effect 2018-01-29 17:47:12 +01:00
DizzyEggg e6fb626c1f decompile_coord_event_weather 2018-01-29 16:46:56 +01:00
DizzyEggg d728124a7b decompile time events 2018-01-29 15:55:34 +01:00
DizzyEggg 78fc471f32 mon anim with master 2018-01-29 14:40:50 +01:00
DizzyEggg ed546d680f pokemon animation is decompiled 2018-01-29 12:36:56 +01:00
ProjectRevoTPP 3eaaa59c04 start decompiling field_map_obj_helpers 2018-01-29 04:13:15 -05:00
golem galvanize 2a16b7cb81 decompile field_message_box 2018-01-28 00:22:06 -05:00
golem galvanize b377112cd6 decompile item_use 2018-01-27 22:58:44 -05:00