ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 20:24:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,498 Commits 1 Branch 0 Tags 235 MiB
ed24233274
Commit Graph

2498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Slawter666
ed24233274 Convert more of data2b.s to C 2018-08-22 23:03:44 +01:00
Slawter666
4db5ef3ae6 Convert more data 2018-08-22 21:41:34 +01:00
Slawter666
ef6a3c2278 Move some data from data2b.s to C 2018-08-22 14:34:36 +01:00
Diegoisawesome
1fd1faef92
Merge pull request #297 from DizzyEggg/contest_table 
Decompile contest_effect
 2018-08-16 14:16:00 -07:00
DizzyEggg
5dd1afd383 contest effect review changes 2018-08-16 22:55:36 +02:00
DizzyEggg
0bfe894566 Merge with master 2018-08-16 22:53:01 +02:00
Diegoisawesome
2b81db7ace Fix Task_Truck1 2018-08-15 19:49:17 -07:00
Diegoisawesome
8ac98f7441
Merge pull request #298 from Diegoisawesome/master 
Finish decompiling pokemon_summary_screen
 2018-08-15 16:27:49 -07:00
Diegoisawesome
13dc7a4170 Merge branch 'master' of github.com:pret/pokeemerald 2018-08-15 16:22:54 -07:00
Diegoisawesome
f65da613cf
Merge pull request #299 from DizzyEggg/contest_ai 
Decompile Contest ai
 2018-08-15 16:19:18 -07:00
Diegoisawesome
e7da514382 Finish documenting and cleaning up summary_screen 
Also fix remaining nonmatchings
 2018-08-15 15:58:41 -07:00
Diegoisawesome
d28398b8dd
Merge pull request #301 from Tetrable/master 
Add national/hoenn dex defines, update dex arrays
 2018-08-15 14:17:41 -07:00
Tetrable
8896b54e8f Add national/hoenn dex defines, update dex arrays 2018-08-15 20:10:28 +01:00
Diegoisawesome
ac3f4fd994 Continue documentation and cleanup of pokemon_summary_screen 2018-08-15 11:51:47 -07:00
DizzyEggg
dc6cf391ce Make contest ai compile. 2018-08-15 12:06:23 +02:00
DizzyEggg
92c4fc6345 Contest AI clean-up 2018-08-15 11:50:18 +02:00
DizzyEggg
c806992cfc Port contest ai from pokeruby 2018-08-15 11:43:57 +02: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
DizzyEggg
ba225f8eaa Fix fakematching in contest effect 2018-08-15 00:25:19 +02:00
DizzyEggg
0b22ad4ab5 make contest effect build 2018-08-15 00:01:43 +02:00
DizzyEggg
0c7063c5ba Make contest effect table easier to edit in the future 2018-08-14 23:50:58 +02:00
DizzyEggg
c72b55a5c4 Match the worst function ever 2018-08-14 22:28:25 +02:00
DizzyEggg
1a0e6f7aed match contest effect 2018-08-13 21:24:11 +02:00
Diegoisawesome
6dac87abfd Cleanup and document learn_move 2018-08-12 14:28:15 -07:00
DizzyEggg
0d68af7f06 copy contest effect from ruby 2018-08-12 23:20:17 +02: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
335f4c1e81
Merge pull request #296 from DizzyEggg/event_data 
Event data
 2018-08-12 13:17:36 -07:00
DizzyEggg
f1daf7442d event data review changes 2018-08-12 22:04:49 +02:00
Diegoisawesome
9a73a47ddd Merge branch 'master' of github.com:pret/pokeemerald into Edwearth-learn_move 2018-08-12 12:55:21 -07:00
DizzyEggg
577e6e7c1f Merge branch 'patch-2' of https://github.com/DizzyEggg/pokeemerald into event_data 2018-08-12 21:55:20 +02:00
Diegoisawesome
2dd5fc23d4 Prepare learn_move for merge 2018-08-12 12:54:07 -07:00
Diegoisawesome
25832810f6
Merge pull request #288 from DizzyEggg/slot_machine 
Port a little bit of slot machine
 2018-08-12 12:27:23 -07:00
Diegoisawesome
32b0e102cf
Merge pull request #287 from DizzyEggg/easy_chat 
Pikalax's Easy chat
 2018-08-12 12:17:23 -07:00
Diegoisawesome
6bb761a711
Merge pull request #277 from atasro2/player_field_avatar 
decompile a portion of field_player_avatar.s
 2018-08-12 12:09:09 -07:00
Diegoisawesome
26e18f2292
Merge pull request #289 from DizzyEggg/contests 
Pikalax's contests
 2018-08-12 12:04:53 -07:00
MCboy
1bc93c5a66
Merge branch 'master' into player_field_avatar 2018-08-12 23:26:00 +04:30
MCboy
9e9ec8dc96
god damn it contributers :c 2018-08-12 23:17:27 +04:30
Diegoisawesome
21060091d1
Merge pull request #295 from DizzyEggg/pokemon_storage_system 
Decompile a bit of pokemon storarage system
 2018-08-12 11:38:39 -07:00
MCboy
2ddabca996
apply some changes 2018-08-12 22:31:58 +04:30
MCboy
f7c3151ef2
add functions to header 2018-08-12 22:31:19 +04:30
MCboy
e6db9c5d19
add function to header 2018-08-12 22:29:44 +04:30
MCboy
8650f2345d
define function in header 2018-08-12 22:28:41 +04:30
DizzyEggg
7dac22314e Decompile a bit of pokemon storarage system 2018-08-12 16:40:31 +02:00
DizzyEggg
957dcd01b3 merge with master 2018-08-12 12:11:35 +02:00
DizzyEggg
e787d5b602 Contest review changes 2018-08-12 12:08:51 +02:00
DizzyEggg
1229bead2e slot machine review changes 2018-08-12 11:50:26 +02:00
DizzyEggg
3a72e6a80d Easy chat review changes 2018-08-12 11:39:09 +02:00