Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,349 Commits 3 Branches 0 Tags 878 MiB
Commit Graph

914 Commits

Author SHA1 Message Date
golem galvanize 3006ff177b pushing so I can pull from master 2018-03-30 16:48:30 -04:00
Marcus Huderle a5cd6e8ef4
Merge pull request #231 from KDSKardabox/master 
Player PC
 2018-03-28 21:45:24 -07:00
Marcus Huderle d4c6ef7ae6
Merge pull request #227 from PikalaxALT/pokenav_match_call 
Pokenav match call
 2018-03-28 21:33:50 -07:00
Anders Løvig 57775a946d Rename start menu functions 2018-03-28 21:09:27 +02:00
Anders Løvig 5bc8ee6465 Added static modifers 2018-03-28 15:45:35 +02:00
KDSKardabox f9f64fff42 Resolve conflicts 2018-03-19 16:15:13 +05:30
KDSKardabox a24ffb1321 Finish decompiling player_pc rodata 2018-03-19 15:57:33 +05:30
Diegoisawesome 2ecbe252a2
Merge pull request #219 from Mother-Of-Dragons/master 
Fixed label names: battle_ai_scripts.s
 2018-03-14 17:47:46 -05:00
Avara e03004b4b6 Fixed label names: battle_ai_scripts.s 2018-03-13 11:55:18 +00:00
KDSKardabox f3b5ed0d12 Decompile more functions & rename some labels 2018-03-13 14:41:39 +05:30
KDSKardabox e7cf8e5c17 Start decompile player_pc 2018-03-12 13:56:20 +05:30
PikalaxALT aa2cb6a974 Rename match call assets 2018-03-06 08:52:29 -05:00
PikalaxALT 7b9930a0a2 Remaining data in match_call 2018-03-04 16:58:51 -05:00
PikalaxALT 1c67840652 Match call data, 2 2018-03-04 16:44:50 -05:00
PikalaxALT 9b25d02369 Match call data, 1 2018-03-04 16:14:56 -05:00
DizzyEggg 62e849a5df item menu is done 2018-03-04 20:03:11 +01:00
DizzyEggg 4c3f8ac6c6 start item menu icons decomp 2018-03-04 18:41:07 +01:00
PikalaxALT df128cbfed Merge branch 'master' into pokenav_match_call 2018-03-02 21:49:09 -05:00
PikalaxALT 89847427e4 match_call_t; through sub_81D17E4 2018-03-02 08:44:33 -05:00
PikalaxALT 988be1ab86 Carve out Match Call functions 2018-02-28 22:47:50 -05:00
KDSKardabox 85492c0dac Merge branch 'master' of https://github.com/pret/pokeemerald 2018-03-01 09:13:29 +05:30
DizzyEggg 988f0b7e19 Merge branch 'master' into decompile_battle_link_817C95C 2018-03-01 01:01:18 +01:00
Diegoisawesome bcef4e7d1c
Merge pull request #221 from DizzyEggg/data_to_c 
Move some data to C
 2018-02-28 16:55:45 -06:00
DizzyEggg 59ff4aec9b decompile and document battle tv 2018-02-27 20:40:09 +01:00
KDSKardabox 835777dec2 Decompile fleff_flash rodata 2018-02-27 10:33:23 +05:30
PikalaxALT 1616f998fc Rename some flags relevant to the conditions under which Wattson becomes available for rematch 2018-02-26 08:42:15 -05:00
DizzyEggg 1972303792 type and ability names to C 2018-02-26 14:29:17 +01:00
PikalaxALT f46e941f30 Name functions, variables, and that one flag constant 2018-02-26 08:23:17 -05:00
DizzyEggg 8821d6396a move battle moves to C 2018-02-26 12:59:52 +01:00
PikalaxALT 6bfc8579ad Decompile trainer_rematch 2018-02-25 21:56:09 -05:00
KDSKardabox a3c17fad22 Decompile Fossil Special & Groundshake Data 2018-02-22 12:17:46 +05:30
Avara 59c95c32db Fixed label names: battle_ai_scripts.s 2018-02-21 00:26:12 +00: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 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
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 2fb78b5ca8 Fix reviewed points. 2018-02-15 09:47:42 +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 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 f22be4d010 more overworld work 2018-02-12 18:26:26 +01:00
DizzyEggg 382442c4c8 start decompiling overworld.s 2018-02-12 15:01:43 +01:00
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 0347509704 make it compile o 2018-02-12 00:31:13 +01: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 9e7696f25a decompile pokemon1 2018-02-09 15:55:12 +01:00
DizzyEggg bce01bc518 battle labels merge with master 2018-02-09 00:43:07 +01: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
DizzyEggg 96290f4ee3 pokemon and battle constants 2018-02-08 11:17:41 +01:00
Diegoisawesome 772fd47564 Merge branch 'master' of https://github.com/pret/pokeemerald into menu 2018-02-07 18:06:59 -06:00
DizzyEggg a10fd5a7c4 create more battle constants 2018-02-08 00:35:13 +01:00
DizzyEggg 4b7d778a5c move mon data fix conflicts 2018-02-07 20:17:55 +01: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
Cameron Hall 13bc7a8dd2
Merge pull request #166 from camthesaxman/battle_refactor 
rename/refactor battle code
 2018-02-07 12:46:12 -06:00
Diegoisawesome 3fb2471016
Merge pull request #197 from DizzyEggg/decompile_berry_tag_screen 
Decompile berry tag screen
 2018-02-07 12:27:25 -06:00
Diegoisawesome 18abda9dca Finish menu.s and eliminate TextColor 2018-02-06 20:37:54 -06:00
camthesaxman c3dc14ba66 more renaming 2018-02-06 16:09:39 -06:00
camthesaxman 6a4967689e more renaming 2018-02-06 13:48:02 -06:00
camthesaxman 3ec68d5f79 reorganize berry graphics files 2018-02-06 11:51:43 -06:00
camthesaxman f78fa6aabf rename bank to battler 2018-02-05 19:46:59 -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 e6eae224fc mon ewram data to c 2018-02-05 17:56:28 +01:00
DizzyEggg ae8e89a10d move some pokemon data to c 2018-02-05 17:39:26 +01: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 14d2caaf8d start decompiling berry tag screen 2018-02-02 12:32:12 +01:00
ProjectRevoTPP 78bd2b0849 move save rodata to source and use saveblock chunk macros 2018-01-31 15:26:57 -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
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 6873f47821
Merge pull request #190 from DizzyEggg/decompile_time_events 
decompile time events
 2018-01-30 15:20:24 -06: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 78728ae454 add rgb constants 2018-01-29 14:36:13 +01:00
DizzyEggg ed546d680f pokemon animation is decompiled 2018-01-29 12:36:56 +01:00
DizzyEggg 16c46905ff more pokemon animation functions 2018-01-28 00:51:20 +01:00
DizzyEggg 95827ab64b more pokemon anim functions decompiled 2018-01-27 11:57:46 +01:00
Diegoisawesome 2da7bdbb11 Begin menu.s decomp 2018-01-26 23:41:52 -06:00
Diegoisawesome 0c47cd6fc3 Renamed link_strings and fixed warning in fldeff_cut.s 2018-01-24 00:18:10 -06:00
Diegoisawesome 5784098446 Organization and naming 2018-01-23 23:14:22 -06:00
Diegoisawesome 5a57485ece Decompile naming_screen.c 2018-01-23 21:30:13 -06:00
DizzyEggg ad73f92061 start decompiling pokemon animation 2018-01-22 21:32:50 +01:00
camthesaxman 663ecd0014 Merge branch 'master' of https://github.com/pret/pokeemerald into battle_refactor 2018-01-21 22:29:35 -06:00
PikalaxALT d4e8c20f84 Merge branch 'master' into link 2018-01-21 23:20:13 -05:00
Diegoisawesome 2ba141eac4
Merge pull request #182 from DizzyEggg/decompile_hof_pc 
decompile hof pc
 2018-01-21 15:10:26 -06:00
DizzyEggg f59eedb672 decompile hof pc 2018-01-21 20:45:43 +01:00
DizzyEggg f53a39e7a2 mystery event labels 2018-01-21 19:30:01 +01:00
DizzyEggg e0fbd5daad text window cleanup 2018-01-21 13:32:11 +01:00
DizzyEggg ad2ef517bd option menu fix conflicts 2018-01-21 12:46:19 +01:00
DizzyEggg 0bc7fb92db start decompiling mystery event script 2018-01-21 12:36:11 +01:00
Diegoisawesome c5b3c4168a Remove attempt at guarding specials.inc 2018-01-21 03:30:31 -06:00
golem galvanize 4499af0ec3 got another pointer 2018-01-20 23:36:17 -05:00
golem galvanize 452c0cfd7c BEGONE POINTER 2018-01-20 23:18:26 -05:00
golem galvanize bce63b3694 REMOVE BASEROM 2018-01-20 22:41:02 -05:00
PikalaxALT 772f0aa3fd Merge branch 'master' into link 2018-01-20 22:08:41 -05:00
golem galvanize f22d295cfc Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms 2018-01-20 21:37:47 -05:00
Diegoisawesome d279f50f57 Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald 2018-01-20 19:18:33 -06:00
Diegoisawesome 28c9f40b3e Extract data from fossil_special_fldeff_groundshake 2018-01-20 19:18:03 -06:00
golem galvanize 33ebcabc3a Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms 2018-01-20 19:45:38 -05:00
golem galvanize bdc8cf6ac4 fixing conflicts 2018-01-20 19:44:34 -05:00
Diegoisawesome f00bbdfeca Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald 2018-01-20 18:31:07 -06:00
Diegoisawesome 8d7a830151 Extract data from field_effect_misc 2018-01-20 18:30:33 -06:00
Diegoisawesome 064c813a95 Extract data from map_obj_8097404 2018-01-20 17:45:45 -06:00
Diegoisawesome ed8269889b Extract data from pokedex.s 2018-01-20 17:17:51 -06:00
golem galvanize 59e1aacd26 DIEGO SEND HELP 2018-01-20 17:26:30 -05:00
Diegoisawesome aca539d5dd Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald 2018-01-20 16:22:40 -06:00
Diegoisawesome b47b9e5758 Extract data from starter_choose 2018-01-20 16:22:16 -06:00
Diegoisawesome 692ed13fe7 Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald 2018-01-20 15:37:56 -06:00
Diegoisawesome d10c91f1b0 Extract data from item_menu_icons.s 2018-01-20 15:37:37 -06:00
golem galvanize 646aa19e87 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms 2018-01-20 15:56:36 -05:00
Diegoisawesome 82c6df71b6 Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald 2018-01-20 14:20:34 -06:00
Diegoisawesome 971b47755d Extract data from naming screen 2018-01-20 14:16:01 -06:00
Diegoisawesome 80e376d6cb Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald 2018-01-20 02:38:11 -06:00
Diegoisawesome 2ef7467951 Extract data from pokemon_summary_screen 2018-01-20 02:37:28 -06:00
golem galvanize 4729338e5b Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms 2018-01-20 03:07:04 -05:00
Diegoisawesome 4cb2853344 Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald 2018-01-20 00:49:43 -06:00
Diegoisawesome 098671750b Extract data from text window 2018-01-20 00:49:21 -06:00
Diegoisawesome ce3ab413ba Merge remote-tracking branch 'Diego/dump_data' 2018-01-19 23:43:05 -06:00
Diegoisawesome 7abfc6a989 Extract data from trainer card 2018-01-19 23:42:30 -06:00
Diegoisawesome 73082f2855 Merge remote-tracking branch 'Diego/dump_data' 2018-01-19 21:39:23 -06:00
Diegoisawesome fbb51bc24b Extract baseroms from party_menu.s 2018-01-19 21:38:57 -06:00
Diegoisawesome 2d74179d86 Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald 2018-01-19 20:08:30 -06:00
Diegoisawesome 4be109e60e Extract forgotten baserom in trade.s 2018-01-19 20:07:59 -06:00
golem galvanize 59b5957ebe Merge branch 'master' of https://github.com/pret/pokeemerald into dump_small_baseroms 2018-01-19 21:05:13 -05:00
golem galvanize e5ba5ccdbb dump battle_frontier_2.s 2018-01-19 21:04:43 -05:00
golem galvanize c45db79b5d dump contest.s 2018-01-19 21:03:17 -05:00
Diegoisawesome 4559a95d9b Merge branch 'dump_data' of https://github.com/Diegoisawesome/pokeemerald 2018-01-19 19:54:19 -06:00
Diegoisawesome b22a800581 Extract data from trade.s 
Also rename window_template_terminator to null_window_template, in keeping with naming conventions
 2018-01-19 19:52:46 -06:00
Diegoisawesome c74334c26a Fix address of berry struct in item.c 2018-01-19 12:49:08 -06:00
Diegoisawesome fd544ba438 Start extracting data from trade.s 2018-01-19 12:38:09 -06:00
Diegoisawesome 4c6511c8f9 Extract data from field_screen.s 
Also move files incorrectly placed in interface dir
 2018-01-18 22:36:24 -06:00
Diegoisawesome 6445394929 Extract rotating_gate.s 2018-01-18 15:38:31 -06:00
Diegoisawesome b7ee548897 Merge remote-tracking branch 'Bird/dump_pokenav.s' 2018-01-18 14:38:45 -06:00