dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity
2,465 Commits 4 Branches 0 Tags
9a73a47dddbd84b03987cc9caba52bbb797cb9fa
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Diegoisawesome 9a73a47ddd Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move 2018-08-12 12:55:21 -07:00
Diegoisawesome 2dd5fc23d4 Prepare learn_move for merge 2018-08-12 12:54:07 -07:00
Diegoisawesome a000eb4f36 Merge branch 'learn_move' of git://github.com/Edwearth/pokeemerald into Edwearth-learn_move 2018-08-11 19:03:38 -07:00
Diegoisawesome 419917cdb0 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-11 16:59:08 -07:00
Diegoisawesome 18d5186630 Merge remote-tracking branch 'garakmon/heal-loc-2' 2018-08-11 16:57:46 -07:00
Diegoisawesome cf9518f237 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-11 16:32:03 -07:00
Diegoisawesome 57b3393192 Fix compile error 2018-08-11 15:42:08 -07:00
Diegoisawesome cb9127ccaf Revert "Rename some specials" 
This reverts commit 658f9351fe.
 2018-08-11 15:16:41 -07:00
Diegoisawesome 658f9351fe Rename some specials 2018-08-11 14:59:43 -07:00
Diegoisawesome b54793be91 Finish decompiling field_specials 2018-08-11 14:51:54 -07:00
Diegoisawesome 1e0f3ec433 Continue decompiling field_specials 2018-08-10 14:07:23 -07:00
Diegoisawesome 12ff59f9c1 Continue decompiling field_specials 2018-08-10 00:42:06 -07:00
Diegoisawesome bad170b0cb Continue decompiling field_specials 2018-08-08 23:53:21 -07:00
Diegoisawesome 90896e38c9 Begin porting/decompiling field_specials 2018-08-08 01:37:12 -07:00
Diegoisawesome 85ebd76cd0 Fix fanfare constant to use define 2018-08-04 18:41:53 -07:00
Diegoisawesome 7270e73fee Move strings to C 2018-07-25 01:15:36 -07:00
Diegoisawesome e92e2cb0aa Merge branch 'master' of github.com:pret/pokeemerald 2018-07-24 21:18:36 -07:00
Diegoisawesome 156fb472e1 Clean up files and add entries to charmap 2018-07-24 21:18:23 -07:00
Diegoisawesome 731d6d59bc Document list_menu.c and main_menu.c 2018-07-15 04:30:37 -07:00
Diegoisawesome 6313f360d5 Merge branch 'DizzyEggg-decompile_cut' 2018-07-05 20:33:47 -07:00
Diegoisawesome f79ac26ce3 Rename SetLastTalkedObjectInFrontOfPlayer to CheckObjectGraphicsInFrontOfPlayer 2018-07-05 20:33:07 -07:00
Diegoisawesome 5189442bcc Merge branch 'decompile_cut' of git://github.com/DizzyEggg/pokeemerald into DizzyEggg-decompile_cut 2018-07-05 20:32:12 -07:00
Diegoisawesome 489f90b832 Update Makefile with help from devkitPro maintainers 2018-05-22 18:46:38 -05:00
Diegoisawesome ce5fc0277a Remove extra space at end of sym_common 2018-05-11 17:24:56 -05:00
Diegoisawesome 23b050a99e Update naked attribute and ASM_DIRECT to NAKED macro 2018-05-11 17:24:32 -05:00
Diegoisawesome 4e2886db81 Use song constants 2018-05-11 00:33:32 -05:00
Diegoisawesome 2b6d2dfadd Merge branch 'master' of https://github.com/pret/pokeemerald 2018-05-10 18:38:24 -05:00
Diegoisawesome 416d67c832 Finish porting/decompiling field_effect.c 2018-05-10 18:36:57 -05:00
Diegoisawesome 80062972ae Begin porting field_effect 2018-05-10 03:02:33 -05:00
Diegoisawesome 279276c539 Fix capitalization on filename 2018-05-09 05:14:24 -05:00
Diegoisawesome b570f87152 Merge master from pret 2018-05-09 05:10:23 -05:00
Diegoisawesome d66c1c642c Port/decompile fieldmap.c 2018-05-09 05:07:56 -05:00
Diegoisawesome ef3a7a06b4 Merge branch 'intro' of https://github.com/Diegoisawesome/pokeemerald 2018-02-17 13:44:56 -06:00
Diegoisawesome 247e1293f4 Fix nonmatching in intro_credits_graphics 2018-02-17 13:44:10 -06: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
Diegoisawesome 34716558b1 Almost finish decompiling intro 2018-02-15 16:54:34 -06:00
Diegoisawesome 772fd47564 Merge branch 'master' of https://github.com/pret/pokeemerald into menu 2018-02-07 18:06:59 -06:00
Diegoisawesome 5db765a475 Make small change to sub_819A080 2018-02-07 17:13:59 -06:00
Diegoisawesome 1d8476e06f Merge branch 'PikalaxALT-menu' into menu 2018-02-07 00:16:35 -06:00
Diegoisawesome 41c389e565 Merge branch 'menu' of git://github.com/PikalaxALT/pokeemerald into PikalaxALT-menu 2018-02-07 00:16:11 -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
Diegoisawesome 97c9a4ec22 Skip sub_819A080 2018-02-06 14:35:23 -06:00
Diegoisawesome c9ef0be15d Merge branch 'master' of github.com:pret/pokeemerald 2018-02-06 12:47:23 -06:00
Diegoisawesome 4c6f6c4738 Use fixed width types in TintPalette funcs 2018-02-06 12:47:09 -06:00
Diegoisawesome 91387a95c3 Merge remote-tracking branch 'Egg/match_non' 2018-02-06 12:12:27 -06:00
Diegoisawesome 06e1aca2ac Move start_menu EWRAM symbols into C file 2018-02-05 23:12:34 -06:00
Diegoisawesome a75c476d57 Get RenderText a bit closer (thanks Egg) 2018-01-30 13:13:07 -06:00
Diegoisawesome 7941558b80 Merge remote-tracking branch 'Bird/attempt_RenderText' 2018-01-30 13:08:47 -06:00
Diegoisawesome 3793152bc3 More work on menu 2018-01-29 17:26:36 -06:00
Diegoisawesome 8dbab51c0e Merge remote-tracking branch 'Pikalax/libc' 2018-01-29 11:03:26 -06:00
Diegoisawesome a3ed94dc69 Continue work on menu.c 2018-01-27 17:46:32 -06:00
Diegoisawesome 2da7bdbb11 Begin menu.s decomp 2018-01-26 23:41:52 -06:00
Diegoisawesome 7d8a2ae7f0 Decompile new_menu_helpers.s 2018-01-25 15:25:35 -06:00
Diegoisawesome 10037ac0e1 Fix spelling of 'Parametrized' to 'Parameterized' 2018-01-24 01:03:20 -06:00
Diegoisawesome 0c47cd6fc3 Renamed link_strings and fixed warning in fldeff_cut.s 2018-01-24 00:18:10 -06:00
Diegoisawesome b8b0431477 Identification 2018-01-23 23:32:16 -06:00
Diegoisawesome 5784098446 Organization and naming 2018-01-23 23:14:22 -06:00
Diegoisawesome cc307730a1 Add entry in sym_ewram.txt and organize a bit 2018-01-23 21:34:59 -06:00
Diegoisawesome 5a57485ece Decompile naming_screen.c 2018-01-23 21:30:13 -06:00
Diegoisawesome f57340b729 Revert "Use standard flags to link libgcc, libc" 
This reverts commit 454e44aa43.
 2018-01-21 15:50:12 -06:00
Diegoisawesome 8a60952fc0 Merge branch 'master' of github.com:pret/pokeemerald 2018-01-21 04:11:52 -06:00
Diegoisawesome 5bf86da366 Fix tool newlines 2018-01-21 04:11:43 -06:00
Diegoisawesome c5b3c4168a Remove attempt at guarding specials.inc 2018-01-21 03:30:31 -06: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
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
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
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
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
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
Diegoisawesome 7086bf0048 Merge remote-tracking branch 'Bird/dump_slot_machine.s' 2018-01-18 14:19:13 -06:00
Diegoisawesome d6567414ed Merge remote-tracking branch 'Ketsuban/document-weirdness' 2018-01-18 14:04:31 -06:00
Diegoisawesome 48c1e4961e Merge remote-tracking branch 'Egg/decompile_unk_transition' 2018-01-18 14:02:13 -06:00
Diegoisawesome dcdf91c111 Merge remote-tracking branch 'Bird/dump_learn_move.s' 2018-01-18 13:46:34 -06:00