Commit Graph

527 Commits

Author SHA1 Message Date
PikalaxALT f46e941f30 Name functions, variables, and that one flag constant 2018-02-26 08:23:17 -05:00
PikalaxALT 6bfc8579ad Decompile trainer_rematch 2018-02-25 21:56:09 -05:00
Diegoisawesome ebd88b3606 Merge branch 'master' of https://github.com/pret/pokeemerald into intro 2018-02-17 04:03:59 -06:00
Diegoisawesome 1605f62535 Decompile credits 2018-02-17 04:00:22 -06:00
Diegoisawesome bc4bb5b32e Start intro_credits_graphics decomp 2018-02-16 13:08:21 -06:00
Diegoisawesome 0a206ee52c Finish decompiling intro 2018-02-15 22:30:39 -06:00
KDSKardabox ffeca135bc Merge branch 'master' of https://github.com/pret/pokeemerald 2018-02-16 09:29:11 +05:30
Diegoisawesome 34716558b1 Almost finish decompiling intro 2018-02-15 16:54:34 -06:00
KDSKardabox a200d9406b Finish fldeff_softboiled.c 2018-02-15 22:32:28 +05:30
DizzyEggg 90fa97f810 merge overworld with master 2018-02-15 12:41:32 +01:00
KDSKardabox 64683e1473 [WIP] Decompile fledd_softboiled.h 2018-02-15 15:29:26 +05:30
KDSKardabox 895c72cb26 Merge branch 'master' of https://github.com/pret/pokeemerald 2018-02-15 09:45:15 +05:30
KDSKardabox deeaac2bf1 Decompile fldeff_sweetsecent.c 2018-02-14 17:24:31 +05:30
golem galvanize e1bd37dca9 fix merge conflicts 2018-02-13 22:19:14 -05:00
golem galvanize e5b6d15f91 move data to c 2018-02-13 22:12:02 -05:00
DizzyEggg 5dde701c81 merge overworld with master 2018-02-14 01:12:17 +01:00
DizzyEggg 94b47c0686 decompile overworld 2018-02-14 00:58:22 +01:00
KDSKardabox c959dc1174 Finish fldeff_strength.s 2018-02-13 23:08:54 +05:30
KDSKardabox e375606810 [Do not Merge] fldeff_strength.s 2018-02-13 21:52:33 +05:30
KDSKardabox aaea65c37b Merge branch 'master' of https://github.com/pret/pokeemerald
# Conflicts:
#	include/strings.h
2018-02-13 10:02:27 +05:30
golem galvanize 4ac064bbaf Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu 2018-02-12 14:00:47 -05:00
golem galvanize f81c52b56e more fixes 2018-02-12 13:59:42 -05:00
DizzyEggg 382442c4c8 start decompiling overworld.s 2018-02-12 15:01:43 +01:00
KDSKardabox 54922641af Port smokescreen.s 2018-02-12 16:44:04 +05:30
KDSKardabox 0ca0ad1c63 Decompile birch_pc.c 2018-02-12 15:42:15 +05:30
Diegoisawesome a4787bc06a Merge pull request #207 from DizzyEggg/decompile_pokemon_123
Decompile and clean pokemon files
2018-02-11 22:13:15 -06:00
PikalaxALT ea347199a2 Merge branch 'master' into link 2018-02-11 19:22:06 -05:00
DizzyEggg 2736c0fd4a add more const pokemon data, clear include 2018-02-11 23:46:50 +01:00
golem galvanize 601a942db4 decompile main_menu 2018-02-11 17:19:36 -05:00
DizzyEggg fd17ca59b0 more pokemon work 2018-02-11 17:35:01 +01:00
DizzyEggg 084ba7a7a4 decompile all pokemon files 2018-02-10 13:24:03 +01:00
DizzyEggg 5707c5c7c6 start pokemon 3 2018-02-10 02:06:32 +01:00
golem galvanize 99d0b4bbfd Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_main_menu 2018-02-09 17:47:01 -05:00
DizzyEggg 1a1bad3129 decompile pokemon_item_effect 2018-02-09 18:46:00 +01:00
golem galvanize de95a703b0 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu 2018-02-08 16:03:53 -05:00
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