Commit Graph
100 Commits
Author SHA1 Message Date
Diegoisawesome 8a05bf82ec Merge branch 'master' of github.com:pret/pokeemerald 2018-09-18 10:03:57 -05:00
Diegoisawesome 899ae7a59a Add defines for tile, metatile, and palette count 2018-09-18 10:03:24 -05:00
Diegoisawesome 3303c416d4 Merge remote-tracking branch 'Egg/slotmachine' 2018-09-15 20:42:58 -05:00
Diegoisawesome 3028fdc353 Update mid2agb source
Credit to @camthesaxman
2018-09-15 15:49:31 -05:00
Diegoisawesome 48586660fd Merge branch 'master' of github.com:Diegoisawesome/pokeemerald 2018-09-14 22:35:18 -05:00
Diegoisawesome e8be47abb8 Add running status to mid2agb 2018-09-14 22:35:04 -05:00
Diegoisawesome b860d583e4 Document main_menu 2018-09-14 12:15:46 -05:00
Diegoisawesome 8026188e36 Make long param use two dashes 2018-09-10 13:15:53 -05:00
Diegoisawesome aa0782c40b Make gbafix silent 2018-09-10 12:13:07 -05:00
Diegoisawesome d9941cd1a8 Standardize sprite visibility to boolean 2018-09-10 10:25:58 -05:00
Diegoisawesome e1834c9d7b Change overworld_frame macro to use tiles 2018-09-08 03:07:44 -05:00
Diegoisawesome eb8b0ff0f7 Merge branch 'master' of github.com:pret/pokeemerald 2018-09-08 02:43:19 -05:00
Diegoisawesome 12521fb1a8 Merge branch 'Slawter666-spritesheet' 2018-09-08 02:37:33 -05:00
Diegoisawesome 2b07588c02 Merge branch 'master' of github.com:Diegoisawesome/pokeemerald 2018-09-08 02:36:59 -05:00
Diegoisawesome 8827a52aa2 Fix makefile rules 2018-09-08 02:26:19 -05:00
Diegoisawesome f73807ea60 Add palette tags for event objects 2018-09-07 23:52:11 -05:00
Diegoisawesome d945a8bf2f Macroize main_menu and general cleanup 2018-09-07 19:24:33 -05:00
Diegoisawesome e0a83e3d72 Update scaninc and preproc with multi-file incbins 2018-09-06 03:45:50 -05:00
Diegoisawesome b22b6c5057 Update devkitARM to r49 2018-08-29 23:48:35 -05:00
Diegoisawesome 064216d3be Add gbafix from devkitPro/gba-tools 2018-08-29 23:39:03 -05:00
Diegoisawesome 7737025f4e Use gbafix to generate header and checksum 2018-08-29 16:34:59 -05:00
Diegoisawesome 96d744706d Merge branch 'master' of https://github.com/pret/pokeemerald 2018-08-23 02:42:45 -05:00
Diegoisawesome 26ef40553c Move data from include to src 2018-08-23 02:32:34 -05:00
Diegoisawesome 2b81db7ace Fix Task_Truck1 2018-08-15 19:49:17 -07:00
Diegoisawesome 13dc7a4170 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-15 16:22:54 -07:00
Diegoisawesome e7da514382 Finish documenting and cleaning up summary_screen
Also fix remaining nonmatchings
2018-08-15 15:58:41 -07:00
Diegoisawesome ac3f4fd994 Continue documentation and cleanup of pokemon_summary_screen 2018-08-15 11:51:47 -07:00
Diegoisawesome 0bc975bf57 Document and cleanup pokemon_summary_screen 2018-08-15 01:44:20 -07:00
Diegoisawesome 332a8bcb1d Extract rodata for unk_pokedex_area_screen_helper 2018-08-14 22:37:59 -07:00
Diegoisawesome a07d69d7c2 Finish pokemon_summary_screen 2018-08-14 22:00:35 -07:00
Diegoisawesome 6dac87abfd Cleanup and document learn_move 2018-08-12 14:28:15 -07:00
Diegoisawesome b40957c09b Finish decompiling learn_move 2018-08-12 13:33:41 -07:00
Diegoisawesome bd2b7beb07 Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move 2018-08-12 13:17:51 -07:00
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