Commit Graph

  • 8318898fbd Merge pull request #212 from PikalaxALT/travis_use_r47 Diegoisawesome 2018-02-14 14:11:54 -06:00
  • deeaac2bf1 Decompile fldeff_sweetsecent.c KDSKardabox 2018-02-14 17:24:31 +05:30
  • e1bd37dca9 fix merge conflicts golem galvanize 2018-02-13 22:19:14 -05:00
  • e5b6d15f91 move data to c golem galvanize 2018-02-13 22:12:02 -05:00
  • 6ed3da2eb8 Update devkitARM to r47 PikalaxALT 2018-02-13 19:31:50 -05:00
  • 3762f27727 make it compiler DizzyEggg 2018-02-14 01:19:25 +01:00
  • 5dde701c81 merge overworld with master DizzyEggg 2018-02-14 01:12:17 +01:00
  • 94b47c0686 decompile overworld DizzyEggg 2018-02-14 00:58:22 +01:00
  • c959dc1174 Finish fldeff_strength.s KDSKardabox 2018-02-13 23:08:54 +05:30
  • e375606810 [Do not Merge] fldeff_strength.s KDSKardabox 2018-02-13 21:52:33 +05:30
  • bb8c53f898 Merge pull request #208 from KDSKardabox/master Diegoisawesome 2018-02-12 22:36:55 -06:00
  • aaea65c37b Merge branch 'master' of https://github.com/pret/pokeemerald KDSKardabox 2018-02-13 10:02:27 +05:30
  • ae321d6e7c move to strings.h KDSKardabox 2018-02-13 09:32:40 +05:30
  • 7b360b2e33 Review fixes KDSKardabox 2018-02-13 09:16:38 +05:30
  • 398e775d90 Merge pull request #201 from golemgalvanize/decompile_item_menu Diegoisawesome 2018-02-12 13:29:21 -06:00
  • 511831ff1f fix const variable golem galvanize 2018-02-12 14:06:52 -05:00
  • 4ac064bbaf Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu golem galvanize 2018-02-12 14:00:47 -05:00
  • f81c52b56e more fixes golem galvanize 2018-02-12 13:59:42 -05:00
  • f22be4d010 more overworld work DizzyEggg 2018-02-12 18:26:26 +01:00
  • 382442c4c8 start decompiling overworld.s DizzyEggg 2018-02-12 15:01:43 +01:00
  • db898d0e48 Minor edit to make it possible to build when trying to match the nonmatching fn PikalaxALT 2018-02-12 08:16:28 -05:00
  • 54922641af Port smokescreen.s KDSKardabox 2018-02-12 16:44:04 +05:30
  • 185cf71842 Missing label KDSKardabox 2018-02-12 16:17:57 +05:30
  • d52a54e64f Updating pokedex count function labels KDSKardabox 2018-02-12 16:15:51 +05:30
  • 0ca0ad1c63 Decompile birch_pc.c KDSKardabox 2018-02-12 15:42:15 +05:30
  • a4787bc06a Merge pull request #207 from DizzyEggg/decompile_pokemon_123 Diegoisawesome 2018-02-11 22:13:15 -06:00
  • 98860220e9 Merge pull request #110 from PikalaxALT/link Diegoisawesome 2018-02-11 21:10:32 -06:00
  • f2144e9932 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu golem galvanize 2018-02-11 20:34:56 -05:00
  • 590c4b500b Merge branch 'master' into record_mixing PikalaxALT 2018-02-11 20:12:40 -05:00
  • ea347199a2 Merge branch 'master' into link PikalaxALT 2018-02-11 19:22:06 -05:00
  • 1bb05809d2 make it compile x2 DizzyEggg 2018-02-12 00:37:07 +01:00
  • 0347509704 make it compile o DizzyEggg 2018-02-12 00:31:13 +01:00
  • 5e781f5b3f change some constants to male and female DizzyEggg 2018-02-12 00:11:10 +01:00
  • 42cfbcb197 some fixes golem galvanize 2018-02-11 18:00:45 -05:00
  • 2736c0fd4a add more const pokemon data, clear include DizzyEggg 2018-02-11 23:46:50 +01:00
  • 601a942db4 decompile main_menu golem galvanize 2018-02-11 17:19:36 -05:00
  • 14a76793e5 Merge pull request #206 from DizzyEggg/battle_labels Diegoisawesome 2018-02-11 14:50:18 -06:00
  • d704a2b5df thonk DizzyEggg 2018-02-11 21:45:26 +01:00
  • 4c19790ff1 review battle code clean up change DizzyEggg 2018-02-11 21:05:42 +01:00
  • fd17ca59b0 more pokemon work DizzyEggg 2018-02-11 17:35:01 +01:00
  • 084ba7a7a4 decompile all pokemon files DizzyEggg 2018-02-10 13:24:03 +01:00
  • 5707c5c7c6 start pokemon 3 DizzyEggg 2018-02-10 02:06:32 +01:00
  • 99d0b4bbfd Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_main_menu golem galvanize 2018-02-09 17:47:01 -05:00
  • 1a1bad3129 decompile pokemon_item_effect DizzyEggg 2018-02-09 18:46:00 +01:00
  • 9e7696f25a decompile pokemon1 DizzyEggg 2018-02-09 15:55:12 +01:00
  • 56e1a52823 Fixes golem galvanize 2018-02-08 21:00:28 -05:00
  • ff6a0316c1 get rid of unnecessary externs DizzyEggg 2018-02-09 01:09:02 +01:00
  • bce01bc518 battle labels merge with master DizzyEggg 2018-02-09 00:43:07 +01:00
  • de95a703b0 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu golem galvanize 2018-02-08 16:03:53 -05:00
  • 368a63d5a7 decompiled up to task_new_game_prof_birch_speech_10 golem galvanize 2018-02-08 16:01:24 -05:00
  • 387dbf48d0 Merge pull request #202 from DizzyEggg/move_mon_data Diegoisawesome 2018-02-08 14:06:57 -06:00
  • 9df5e16343 more battle labels DizzyEggg 2018-02-08 12:13:29 +01:00
  • 96290f4ee3 pokemon and battle constants DizzyEggg 2018-02-08 11:17:41 +01:00
  • 03f8d0d6ce Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_main_menu golem galvanize 2018-02-07 19:31:33 -05:00
  • 4a903279df decompile task_new_game_prof_birch_speech_4 golem galvanize 2018-02-07 19:30:58 -05:00
  • 250538fcae Merge pull request #205 from Diegoisawesome/menu Diegoisawesome 2018-02-07 18:24:42 -06:00
  • 772fd47564 Merge branch 'master' of https://github.com/pret/pokeemerald into menu Diegoisawesome 2018-02-07 18:06:59 -06:00
  • caf5d136b9 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu golem galvanize 2018-02-07 18:59:00 -05:00
  • a10fd5a7c4 create more battle constants DizzyEggg 2018-02-08 00:35:13 +01:00
  • 5db765a475 Make small change to sub_819A080 Diegoisawesome 2018-02-07 17:13:59 -06:00
  • caf9af321d get rid of unnecessary externs DizzyEggg 2018-02-08 00:00:25 +01:00
  • 48e63979c8 Merge pull request #200 from DizzyEggg/decompile_title_screen Diegoisawesome 2018-02-07 16:53:08 -06:00
  • 1a32010f13 iwram common symbols to c DizzyEggg 2018-02-07 23:21:51 +01:00
  • 5ac6cc4860 move battle vars to c file DizzyEggg 2018-02-07 22:53:40 +01:00
  • 76e6be7ff2 update function name and struct names golem galvanize 2018-02-07 14:22:49 -05:00
  • 4b7d778a5c move mon data fix conflicts DizzyEggg 2018-02-07 20:17:55 +01:00
  • b67afb9490 I hope this fixes the conflicts golem galvanize 2018-02-07 14:14:08 -05:00
  • 1b303aeee8 decompiled up to task_new_game_prof_birch_speech_3 golem galvanize 2018-02-07 14:11:08 -05:00
  • c5e2092e8b title screen with master DizzyEggg 2018-02-07 20:10:56 +01:00
  • 802b505d7b Merge pull request #199 from DizzyEggg/decompile_rtc_screen Diegoisawesome 2018-02-07 13:03:59 -06:00
  • ccae0ee970 Merge pull request #198 from DizzyEggg/decompile_item_icon Diegoisawesome 2018-02-07 12:59:40 -06:00
  • 1ae5adbb19 Merge pull request #196 from DizzyEggg/decompile_ray_scene Diegoisawesome 2018-02-07 12:59:13 -06:00
  • 9b4b19fd5a rtc screen review changes DizzyEggg 2018-02-07 19:59:02 +01:00
  • a61dc815b0 bag arrow to item count plus 1 DizzyEggg 2018-02-07 19:51:41 +01:00
  • 593031904b ray changes DizzyEggg 2018-02-07 19:47:55 +01:00
  • 13bc7a8dd2 Merge pull request #166 from camthesaxman/battle_refactor Cameron Hall 2018-02-07 12:46:12 -06:00
  • 3fb2471016 Merge pull request #197 from DizzyEggg/decompile_berry_tag_screen Diegoisawesome 2018-02-07 12:27:25 -06:00
  • db97098b91 Merge pull request #204 from DizzyEggg/match_nonmatchings Diegoisawesome 2018-02-07 09:34:32 -06:00
  • b3a94a359f match berry fix func DizzyEggg 2018-02-07 15:02:47 +01:00
  • 96ab6f8353 match secret base func and fix struct DizzyEggg 2018-02-07 13:49:33 +01:00
  • 1d8476e06f Merge branch 'PikalaxALT-menu' into menu Diegoisawesome 2018-02-07 00:16:35 -06:00
  • 41c389e565 Merge branch 'menu' of git://github.com/PikalaxALT/pokeemerald into PikalaxALT-menu Diegoisawesome 2018-02-07 00:16:11 -06:00
  • d396a8f89c Merge new_menu_helpers and menu Diegoisawesome 2018-02-07 00:07:42 -06:00
  • 18abda9dca Finish menu.s and eliminate TextColor Diegoisawesome 2018-02-06 20:37:54 -06:00
  • c3dc14ba66 more renaming camthesaxman 2018-02-06 16:09:39 -06:00
  • 08516ae12c take a sharp knife and jam it into sub_819A080 scnorton 2018-02-06 16:29:12 -05:00
  • 97c9a4ec22 Skip sub_819A080 Diegoisawesome 2018-02-06 14:35:23 -06:00
  • aba388d332 GetBattlerSpriteId -> GetAnimBattlerSpriteId camthesaxman 2018-02-06 14:00:01 -06:00
  • 6a4967689e more renaming camthesaxman 2018-02-06 13:48:02 -06:00
  • c9ef0be15d Merge branch 'master' of github.com:pret/pokeemerald Diegoisawesome 2018-02-06 12:47:23 -06:00
  • 4c6f6c4738 Use fixed width types in TintPalette funcs Diegoisawesome 2018-02-06 12:47:09 -06:00
  • 91387a95c3 Merge remote-tracking branch 'Egg/match_non' Diegoisawesome 2018-02-06 12:12:27 -06:00
  • 3ec68d5f79 reorganize berry graphics files camthesaxman 2018-02-06 11:51:43 -06:00
  • 89e6170748 remove some redundant .pal files camthesaxman 2018-02-06 11:46:34 -06:00
  • ab5977e7e4 match item use func DizzyEggg 2018-02-06 18:15:10 +01:00
  • 9e43b01a4c match obj update pos2 DizzyEggg 2018-02-06 17:42:24 +01:00
  • 1902ff0238 match palette functions DizzyEggg 2018-02-06 15:31:04 +01:00
  • 06e1aca2ac Move start_menu EWRAM symbols into C file Diegoisawesome 2018-02-05 23:12:34 -06:00
  • f78fa6aabf rename bank to battler camthesaxman 2018-02-05 19:46:59 -06:00
  • 607cba8c2e Merge branch 'master' into battle_refactor camthesaxman 2018-02-05 17:38:23 -06:00