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

633 Commits

Author SHA1 Message Date
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 5883f867f0
Merge pull request #278 from vblm12/trainer_data 
Move some trainer data into c structs
 2018-07-24 18:58:56 -07:00
DizzyEggg 1e9143e0b2 merge union room with master 2018-07-22 13:14:58 +02:00
vblm12 29276cc76c Move some trainer data from data2b.s to c structs. 2018-07-20 22:14:31 -05: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
DizzyEggg 0fe3e612eb battle tent start and create frontier struct in saveblock 2018-06-17 12:30:09 +02:00
DizzyEggg 3bcd30969a cut field effect is decompiled and documented 2018-06-16 14:04:29 +02:00
Marcus Huderle aa9a45c16f Rebrand 'map object' and 'field object' to 'event object' 2018-06-11 19:11:48 -05:00
Marcus Huderle ed245b677a Add remaining rodata to event_object_movement.c 2018-06-11 18:17:31 -05:00
Marcus Huderle 89edf6d9e9 Move all field object data into src/data and event_object_movement.c 2018-06-11 17:33:50 -05:00
Marcus Huderle eb8dbff4a7 Move event_object_movement_helpers into event_object_movement 2018-06-11 10:56:14 -05:00
Marcus Huderle 73327f0d44 Decompile field_ground_effect into event_object_movement.c 2018-06-11 10:23:14 -05:00
Marcus Huderle 38a126df66 Rename field_map_obj to event_object_movement 2018-06-11 08:46:33 -05:00
DizzyEggg dbb9cdd424 more link stuff 2018-06-04 12:07:32 +02:00
Diegoisawesome 0b09575fd4
Merge pull request #249 from golemgalvanize/decompile_pokedex 
Decompile pokedex
 2018-06-01 00:02:46 -07:00
Diegoisawesome dd28854a22
Merge pull request #255 from DizzyEggg/decomp_record_mixing 
Fix pika's Record Mixing PR
Also closes #107.
 2018-05-30 16:51:30 -07:00
DizzyEggg ff0c615870 decompile rom_8034C54 2018-05-27 23:26:01 +02:00
DizzyEggg b051cbaaab more record mixing decomp 2018-05-25 21:00:41 +02:00
Diegoisawesome 489f90b832 Update Makefile with help from devkitPro maintainers 2018-05-22 18:46:38 -05:00
DizzyEggg 4d5bfc149e Merge branch 'master' into decomp_record_mixing 2018-05-20 12:16:45 +02:00
Diegoisawesome de60bdf2fe
Merge pull request #256 from DizzyEggg/decompile_field_tasks 
Decompile field tasks
 2018-05-19 23:34:30 -05:00
DizzyEggg d1798d0ed9 decompile field tasks 2018-05-19 18:02:43 +02:00
DizzyEggg e44f35c7b7 fix record mixing merge conflicts 2018-05-19 12:32:44 +02:00
DizzyEggg 4857757431 merge list menu and list indicators 2018-05-19 11:36:31 +02:00
DizzyEggg 1ead30ad40 decompile menu indicators 2018-05-19 10:54:02 +02:00
DizzyEggg 303c9f0917 start menu indicators decomp 2018-05-16 22:16:22 +02:00
DizzyEggg 0cf3836a03 decompile menu helpers 2018-05-15 20:22:19 +02:00
DizzyEggg 7735fb2ad3 start menu helpers decomp 2018-05-14 23:03:40 +02: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
golem galvanize 13efa1ef62 fixing conflicts 2018-05-10 03:34:36 -04:00
golem galvanize d31600e70e finish decompiling pokedex 2018-05-10 03:30:42 -04:00
PikalaxALT 4470f77b3d Merge branch 'master' into mauville_old_man 2018-05-09 15:30:21 -04: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
PikalaxALT fd1d75ce37 Merge branch 'master' into mauville_old_man 2018-05-07 18:18:00 -04:00
PikalaxALT 0231ed13ee Remaining functions in mauville_old_man 2018-05-07 16:35:29 -04:00
Slawter666 279a6e1ddc Convert item_icon_table.inc to C 2018-05-06 13:37:28 +01:00
Slawter666 aab1238ec0 Revert "Convert item_graphics.inc to C" 
This reverts commit 546217d281.
 2018-05-06 09:12:23 +01:00
Slawter666 546217d281 Convert item_graphics.inc to C 
I have tried to group the items that share the same icon but have different palettes where possible. This commit also splits data/graphics.s into two files.
 2018-05-05 23:27:26 +01:00
Slawter666 22ec43a6ed resolve merge conflicts 2018-05-05 18:50:26 +01:00
PikalaxALT 58200616d5
Merge branch 'master' into trader 2018-05-04 17:45:50 -04:00
PikalaxALT 8aa462cd74 through sub_8121178 2018-05-03 18:05:07 -04:00
Marcus Huderle cdb5e9e314
Merge pull request #242 from DizzyEggg/decompile_battle_records 
Decompile battle records
 2018-05-03 08:42:44 -07:00
PikalaxALT 21c3e7e8e5 through SetMauvilleOldMan 2018-05-02 11:31:58 -04:00
PikalaxALT 4acbcf5759 Port trader from Ruby 2018-05-01 15:19:24 -04:00
DizzyEggg ae78786723 identify and name battle records things 2018-05-01 15:33:13 +02:00