ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-19 13:07:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
3,358 Commits 1 Branch 0 Tags 235 MiB
53fac4417b
Commit Graph

2103 Commits

Author SHA1 Message Date
Diegoisawesome
416d67c832 Finish porting/decompiling field_effect.c 2018-05-10 18:36:57 -05:00
PikalaxALT
9bee601b16 through sub_80DB174 2018-05-10 19:28:52 -04:00
PikalaxALT
508a8e5182 through sub_80DAFA0 2018-05-10 18:16:58 -04:00
PikalaxALT
7fdebe0d15 through sub_80DAE0C 2018-05-10 17:54:30 -04:00
PikalaxALT
dfc83cf28f Merge branch 'master' into contest 2018-05-10 09:47:12 -04: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
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
PikalaxALT
5efe8f3a0d through sub_80DAB8C 2018-05-08 19:00:23 -04:00
PikalaxALT
f6fbecbc41 through sub_80DA874 2018-05-07 20:49:23 -04:00
PikalaxALT
e8bb464de9 through sub_80DA4F4 2018-05-07 19:46:48 -04:00
PikalaxALT
fd1d75ce37 Merge branch 'master' into mauville_old_man 2018-05-07 18:18:00 -04:00
PikalaxALT
61cc1d5574 Rename symbols using Ruby as a reference 2018-05-07 18:11:20 -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
e6cca15232 sub_80D8B38 2018-05-04 18:59:59 -04:00
PikalaxALT
58200616d5
Merge branch 'master' into trader 2018-05-04 17:45:50 -04:00
PikalaxALT
f05acd88d5 sub_80D8A88 2018-05-03 22:29:53 -04:00
PikalaxALT
210cedd077 through sub_80D883C 2018-05-03 21:01:22 -04:00
PikalaxALT
8aa462cd74 through sub_8121178 2018-05-03 18:05:07 -04:00
PikalaxALT
876e1eb7cc through sub_8121064 2018-05-03 17:51:14 -04:00
PikalaxALT
1943118a1e through sub_8120D34 2018-05-03 17:26:02 -04:00
PikalaxALT
c6115a2fec through sub_8120C0C 2018-05-03 17:03:52 -04:00
PikalaxALT
0bc7759f9b through sub_8120748 2018-05-03 13:40:08 -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
7d446a9ef7 through sub_80D8490 2018-05-03 08:51:52 -04:00
PikalaxALT
f9230e80aa through vblank_cb_battle 2018-05-02 19:59:00 -04:00
PikalaxALT
cae0fb8ec2 through sub_81203FC 2018-05-02 16:57:34 -04:00
PikalaxALT
21c3e7e8e5 through SetMauvilleOldMan 2018-05-02 11:31:58 -04:00
PikalaxALT
4bf0950421 through sub_80D7DE8 2018-05-02 08:43:27 -04:00
PikalaxALT
ef29d17c41 through sub_80D7B24 2018-05-01 21:27:24 -04:00
PikalaxALT
4b1e30434d Through sub_80D787C 2018-05-01 19:47:11 -04:00
PikalaxALT
4acbcf5759 Port trader from Ruby 2018-05-01 15:19:24 -04:00
DizzyEggg
b80fb98d9a make battle records compile 2018-05-01 16:35:38 +02:00
DizzyEggg
cc578fce18 battle records decompiled and documented 2018-05-01 15:54:31 +02:00
DizzyEggg
ae78786723 identify and name battle records things 2018-05-01 15:33:13 +02:00
DizzyEggg
95cf853762 battle records more decomp and subtle name changes 2018-05-01 14:01:54 +02:00
DizzyEggg
f9a2f6c4a2 start decompiling battle records 2018-05-01 12:38:55 +02:00
golem galvanize
f9331f15ef decompiled up to sub_80BFCF4 2018-04-30 20:41:17 -04:00
DizzyEggg
9f97646724 make item compile 2018-04-29 15:34:14 +02:00
DizzyEggg
fd40e93cb5 clear item, save and load save files 2018-04-29 14:21:59 +02:00
DizzyEggg
25c669e36b decompile item 2018-04-29 13:36:26 +02:00
golem galvanize
6a401b5386 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex 2018-04-25 00:28:57 -04:00
Slawter666
39fd42faea convert data/items.inc to include/data/items.h 
OK
 2018-04-25 02:33:55 +01:00
Slawter666
a49f80d552 Convert item_descriptions.inc to .h 
OK
 2018-04-25 01:41:04 +01:00
Slawter666
a9d65ae6b6 Move files to include/data 2018-04-24 00:58:14 +01:00
Slawter666
2d4ab9f4ac Updated items.c 
Working but non-matching
 2018-04-23 23:25:03 +01:00
Slawter666
f56067bb63
Update items.c 2018-04-23 22:14:30 +01:00
Slawter666
a04f8f6ee3 Convert item data files to .c (not compiling) 2018-04-23 21:44:46 +01:00
DizzyEggg
dede2cc300
Use DMA large macro in option menu 2018-04-18 21:53:51 +02:00
Diegoisawesome
d10844f1fe
Merge pull request #237 from KDSKardabox/master 
Decompile mon markings, rotating_gate & field_camera
 2018-04-18 14:12:51 -05:00
KDSKardabox
dc759a501b add braces 2018-04-18 22:17:23 +05:30
KDSKardabox
0bab373f49 Perform requested changes 2018-04-18 22:10:26 +05:30
Diegoisawesome
4e63a52832
Merge pull request #238 from DizzyEggg/decompile_battle_anim_sound_tasks 
decompile battle_anim_sound_tasks
 2018-04-18 11:40:01 -05:00
DizzyEggg
3d12a02f3e almost decomp sound tasks battle anim 2018-04-18 16:03:15 +02:00
KDSKardabox
7700fe61fe Decompile field camera 2018-04-18 17:42:41 +05:30
KDSKardabox
b818924feb Decompile rotating_rate & remove debug check 2018-04-18 14:09:50 +05:30
KDSKardabox
f5cbefc295 Decompile mon markings 2018-04-17 14:24:39 +05:30
KDSKardabox
936bb5925a Decompile dewford trend 2018-04-16 16:22:13 +05:30
KDSKardabox
447afe4505 Decompile pokemon icon 2018-04-13 17:51:49 +05:30
KDSKardabox
ac7d69eb6e Done requested changes 2018-04-12 22:36:07 +05:30
KDSKardabox
66e76d9633 Decompile script movement 2018-04-10 14:55:25 +05:30
KDSKardabox
a3d065d0bd Decompile rom6 2018-04-10 12:17:29 +05:30
KDSKardabox
a18dc6aa80 Decompile map_name_popup 2018-04-09 12:52:28 +05:30
KDSKardabox
3948614bff Decompile map_obj_lock 2018-04-03 16:22:31 +05:30
Edouard Veyrier
2f96282c7f cleaner 2018-04-03 00:10:19 +02:00
Edouard Veyrier
b2e8ee836d sub_81607EC and sub_816082C 2018-04-02 20:06:40 +02:00
Edouard Veyrier
09e29a5cf8 Fix three functions to have the right checksum 2018-04-01 18:22:09 +02:00
golem galvanize
069a7e71fc Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex 2018-03-30 16:49:08 -04:00
golem galvanize
3006ff177b pushing so I can pull from master 2018-03-30 16:48:30 -04:00
Edouard Veyrier
17b9f5d892 Fix compile error 2018-03-29 15:46:10 +02:00
Edouard Veyrier
cfacd23248 Fix temporarily 2018-03-29 11:56:10 +02:00
KDSKardabox
b74b576418 Fix 2 non-matchings 2018-03-29 10:43:49 +05:30
Marcus Huderle
a5cd6e8ef4
Merge pull request #231 from KDSKardabox/master 
Player PC
 2018-03-28 21:45:24 -07:00
Marcus Huderle
d4c6ef7ae6
Merge pull request #227 from PikalaxALT/pokenav_match_call 
Pokenav match call
 2018-03-28 21:33:50 -07:00
Marcus Huderle
c5f99a723e Remove s prefix from static functions 2018-03-28 21:26:52 -07:00
Anders Løvig
3f4c717d5c Rename stuff for more consistency 2018-03-29 02:16:02 +02:00
Anders Løvig
df94a8a77c Small changes and corrections 2018-03-28 22:43:25 +02:00
Edouard Veyrier
990784a6d9 Improve comments 2018-03-28 21:45:35 +02:00
Anders Løvig
57775a946d Rename start menu functions 2018-03-28 21:09:27 +02:00
Edouard Veyrier
75b07292c9 Translate first functions of learn move 2018-03-28 19:20:20 +02:00
Anders Løvig
5bc8ee6465 Added static modifers 2018-03-28 15:45:35 +02:00
Anders Løvig
6cd590f4fd Decompiled start_menu.s 2018-03-28 00:40:00 +02:00
KDSKardabox
f9f64fff42 Resolve conflicts 2018-03-19 16:15:13 +05:30
KDSKardabox
a24ffb1321 Finish decompiling player_pc rodata 2018-03-19 15:57:33 +05:30
KDSKardabox
a454bd98fa Finish .text part of player_pc 2018-03-16 16:01:11 +05:30
KDSKardabox
1f7fb45d0f Decompile more functions 2018-03-15 16:07:24 +05:30
KDSKardabox
f3b5ed0d12 Decompile more functions & rename some labels 2018-03-13 14:41:39 +05:30
KDSKardabox
e7cf8e5c17 Start decompile player_pc 2018-03-12 13:56:20 +05:30
DizzyEggg
711a345fd4 fix conflicts 2018-03-09 22:54:57 +01:00
Diegoisawesome
ae214eca8b
Merge pull request #226 from DizzyEggg/decompile_list_menu 
Decompile list menu
 2018-03-09 15:49:36 -06:00
DizzyEggg
70ec55386c if 2018-03-09 22:22:00 +01:00
DizzyEggg
db2839bd5b curly brace 2018-03-09 22:18:58 +01:00
PikalaxALT
9b920bfec3 More renaming 2018-03-07 18:03:13 -05:00
PikalaxALT
b2d8ce10ce Fix build crash 2018-03-06 21:51:25 -05:00
PikalaxALT
aa2cb6a974 Rename match call assets 2018-03-06 08:52:29 -05:00
DizzyEggg
18d8c9382a
Use EGG_HATCH_LEVEL define 2018-03-06 13:29:10 +01:00
PikalaxALT
b3fb7cfca5 Rename some struct fields 2018-03-04 17:30:59 -05:00
PikalaxALT
565b058545 Make visual alignment of structs more consistent 2018-03-04 17:08:10 -05:00
PikalaxALT
7b9930a0a2 Remaining data in match_call 2018-03-04 16:58:51 -05:00
PikalaxALT
1c67840652 Match call data, 2 2018-03-04 16:44:50 -05:00
PikalaxALT
9b25d02369 Match call data, 1 2018-03-04 16:14:56 -05:00
PikalaxALT
734375f101 Remaining functions in match_call 2018-03-04 15:47:54 -05:00
PikalaxALT
44fedd861d nonmatching sub_81D1B40 2018-03-04 15:36:01 -05:00
DizzyEggg
1771e8b458 make it compile 2018-03-04 20:12:45 +01:00
DizzyEggg
62e849a5df item menu is done 2018-03-04 20:03:11 +01:00
DizzyEggg
4c3f8ac6c6 start item menu icons decomp 2018-03-04 18:41:07 +01:00
PikalaxALT
30c20bbab6 through sub_81D1B00 2018-03-03 13:41:28 -05:00
PikalaxALT
19a89f2362 nonmatching sub_81D199C 2018-03-03 13:22:38 -05:00
DizzyEggg
18a92fdcc0 list menu is decompiled 2018-03-03 14:58:41 +01:00
PikalaxALT
df128cbfed Merge branch 'master' into pokenav_match_call 2018-03-02 21:49:09 -05:00
PikalaxALT
e3b078d08f through sub_81D1914 2018-03-02 21:43:18 -05:00
DizzyEggg
87274b9eed more list menu work 2018-03-03 01:02:07 +01:00
PikalaxALT
d25a9ffe16 through sub_81D1898 2018-03-02 18:12:23 -05:00
DizzyEggg
ae29f35afd start decompiling list menu 2018-03-02 16:34:31 +01:00
PikalaxALT
89847427e4 match_call_t; through sub_81D17E4 2018-03-02 08:44:33 -05:00
DizzyEggg
1f052cc08d unnecessary externs 2018-03-02 10:21:12 +01:00
DizzyEggg
a2458d966c match hidden power calc 2018-03-01 15:02:44 +01:00
DizzyEggg
edf2ea45b1 merge with master 2018-03-01 10:12:35 +01:00
PikalaxALT
988be1ab86 Carve out Match Call functions 2018-02-28 22:47:50 -05:00
KDSKardabox
85492c0dac Merge branch 'master' of https://github.com/pret/pokeemerald 2018-03-01 09:13:29 +05:30
KDSKardabox
2f9d69f67f use free_and_set_null macros 2018-03-01 09:11:26 +05:30
PikalaxALT
9abc121fa2 through sub_81D16DC 2018-02-28 22:09:28 -05:00
DizzyEggg
20baa1bc7a battle tv review changes 2018-03-01 01:05:34 +01:00
DizzyEggg
988f0b7e19 Merge branch 'master' into decompile_battle_link_817C95C 2018-03-01 01:01:18 +01:00
DizzyEggg
b846015343 more battle files cleaning 2018-03-01 00:59:52 +01:00
DizzyEggg
a28dfd6da4 Merge branch 'master' into clear_battle_files 2018-02-28 23:58:29 +01:00
DizzyEggg
fed5f03097 get rid of unnecessary externs 2018-02-28 23:57:08 +01:00
Diegoisawesome
bcef4e7d1c
Merge pull request #221 from DizzyEggg/data_to_c 
Move some data to C
 2018-02-28 16:55:45 -06:00
DizzyEggg
e93da9b1f9 make strings in battle message static 2018-02-28 23:50:25 +01:00
Diegoisawesome
a57e04e14d
Merge pull request #220 from PikalaxALT/trainer_rematch 
Decompile trainer_rematch
 2018-02-28 16:41:54 -06:00
Diegoisawesome
0cd9ba36ce
Merge pull request #224 from DizzyEggg/another_try 
Fix two nonmatching functions
 2018-02-28 13:05:05 -06:00
DizzyEggg
305a4fa744 match two functions 2018-02-28 19:37:48 +01:00
DizzyEggg
85a959f321 clean up files 2018-02-28 13:07:58 +01:00
DizzyEggg
edf9f706c4 decomp blit 2018-02-28 12:56:01 +01:00
DizzyEggg
d29b9d268f make it compile 2018-02-28 00:18:59 +01:00
DizzyEggg
59ff4aec9b decompile and document battle tv 2018-02-27 20:40:09 +01:00
DizzyEggg
a9212eeb66 battle file more done and clean up tv 2018-02-27 18:13:28 +01:00
PikalaxALT
7f7b182ca4 sub_81D1574 2018-02-27 08:47:47 -05:00
KDSKardabox
99630e954c Merge branch 'master' of https://github.com/pret/pokeemerald 2018-02-27 10:35:17 +05:30
KDSKardabox
835777dec2 Decompile fleff_flash rodata 2018-02-27 10:33:23 +05:30
DizzyEggg
2fa00d01ee make it compile 2018-02-26 15:56:59 +01:00
DizzyEggg
1972303792 type and ability names to C 2018-02-26 14:29:17 +01:00
PikalaxALT
f46e941f30 Name functions, variables, and that one flag constant 2018-02-26 08:23:17 -05:00
KDSKardabox
2d7d686cc1 Decompile fldeff_flash 2018-02-26 17:54:54 +05:30
DizzyEggg
919f803214 correct move target defines 2018-02-26 13:24:46 +01:00
DizzyEggg
8821d6396a move battle moves to C 2018-02-26 12:59:52 +01:00
DizzyEggg
8ff9cb0ede give up for now 2018-02-26 11:45:47 +01:00
PikalaxALT
80906f022b Cleanup; create enums for trainer rematches 2018-02-25 22:33:58 -05:00
PikalaxALT
6bfc8579ad Decompile trainer_rematch 2018-02-25 21:56:09 -05:00
DizzyEggg
4a45b4de4e more work 2018-02-25 18:45:00 +01:00
KDSKardabox
392b869fa3 Code cleanup 2018-02-25 17:23:51 +05:30
DizzyEggg
c0ea81afc5 add meaningful struct field names 2018-02-25 00:36:37 +01:00
DizzyEggg
f2052e5d8f PRAISE CAM FOR HE IS CHAMP 2018-02-24 19:34:43 +01:00
DizzyEggg
558133bba0 almost match 2018-02-24 13:44:26 +01:00
KDSKardabox
5e76251ea9 match 2 functions 2018-02-23 01:52:08 +05:30
KDSKardabox
48fdddf638 Bring non-matchings in a compiling state 2018-02-22 15:15:03 +05:30
KDSKardabox
a3c17fad22 Decompile Fossil Special & Groundshake Data 2018-02-22 12:17:46 +05:30
DizzyEggg
25a57093b1 start battle link file 2018-02-20 02:01:51 +01:00
KDSKardabox
9719e2fa22 Start decompile fossil_specials.s 2018-02-19 15:37:02 +05:30
DizzyEggg
0adda180ac
match ScrCmd_braillemessage 2018-02-19 01:46:32 +01:00
KDSKardabox
caaf41fd49 Refine logic 2018-02-19 00:53:06 +05:30
DizzyEggg
d7c486aa18 match some functions 2018-02-18 19:12:09 +01:00
KDSKardabox
5ed68a87f8 Merge branch 'master' of https://github.com/pret/pokeemerald 2018-02-18 17:35:36 +05:30
KDSKardabox
b1cb82fc67 Finish fldeff_groundshake 2018-02-18 17:33:48 +05:30
KDSKardabox
52b631a092 Decompile more functions 2018-02-18 04:30:20 +05:30
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
KDSKardabox
e518a40508 [WIP} Start decomp Ground Shake 2018-02-16 15:21:27 +05:30
Diegoisawesome
0a206ee52c Finish decompiling intro 2018-02-15 22:30:39 -06:00
KDSKardabox
ffeca135bc Merge branch 'master' of https://github.com/pret/pokeemerald 2018-02-16 09:29:11 +05:30
golem galvanize
6cbea9af6d Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex 2018-02-15 18:20:53 -05:00
golem galvanize
4a71a61e58 start decompiling 2018-02-15 18:20:19 -05:00
Diegoisawesome
34716558b1 Almost finish decompiling intro 2018-02-15 16:54:34 -06:00
DizzyEggg
824699f505 overworld review changes2 2018-02-15 23:09:52 +01:00
KDSKardabox
a200d9406b Finish fldeff_softboiled.c 2018-02-15 22:32:28 +05:30
KDSKardabox
301664db2f Matching the unmatched and another function 2018-02-15 17:12:02 +05:30
DizzyEggg
90fa97f810 merge overworld with master 2018-02-15 12:41:32 +01:00
DizzyEggg
4b4495f3fe overworld review changes 2018-02-15 12:36:52 +01:00
KDSKardabox
44c1ea16b9 Cleanup and one non-matching function 2018-02-15 16:05:27 +05:30
KDSKardabox
64683e1473 [WIP] Decompile fledd_softboiled.h 2018-02-15 15:29:26 +05:30
KDSKardabox
2fb78b5ca8 Fix reviewed points. 2018-02-15 09:47:42 +05:30
KDSKardabox
895c72cb26 Merge branch 'master' of https://github.com/pret/pokeemerald 2018-02-15 09:45:15 +05:30
golem galvanize
ce28fa900b fixes 2018-02-14 22:11:31 -05:00
golem galvanize
c3c30417ef fixes 2018-02-14 20:45:27 -05:00
KDSKardabox
deeaac2bf1 Decompile fldeff_sweetsecent.c 2018-02-14 17:24:31 +05:30
golem galvanize
e1bd37dca9 fix merge conflicts 2018-02-13 22:19:14 -05:00
golem galvanize
e5b6d15f91 move data to c 2018-02-13 22:12:02 -05:00
DizzyEggg
3762f27727 make it compiler 2018-02-14 01:19:25 +01:00
DizzyEggg
5dde701c81 merge overworld with master 2018-02-14 01:12:17 +01:00
DizzyEggg
94b47c0686 decompile overworld 2018-02-14 00:58:22 +01:00
KDSKardabox
c959dc1174 Finish fldeff_strength.s 2018-02-13 23:08:54 +05:30
KDSKardabox
e375606810 [Do not Merge] fldeff_strength.s 2018-02-13 21:52:33 +05:30
KDSKardabox
aaea65c37b Merge branch 'master' of https://github.com/pret/pokeemerald 
# Conflicts:
#	include/strings.h
 2018-02-13 10:02:27 +05:30
KDSKardabox
ae321d6e7c move to strings.h 2018-02-13 09:32:40 +05:30
KDSKardabox
7b360b2e33 Review fixes 2018-02-13 09:16:38 +05:30
golem galvanize
511831ff1f fix const variable 2018-02-12 14:06:52 -05:00
golem galvanize
4ac064bbaf Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu 2018-02-12 14:00:47 -05:00
golem galvanize
f81c52b56e more fixes 2018-02-12 13:59:42 -05:00
DizzyEggg
f22be4d010 more overworld work 2018-02-12 18:26:26 +01:00
DizzyEggg
382442c4c8 start decompiling overworld.s 2018-02-12 15:01:43 +01:00
PikalaxALT
db898d0e48 Minor edit to make it possible to build when trying to match the nonmatching fn 2018-02-12 08:16:28 -05:00
KDSKardabox
54922641af Port smokescreen.s 2018-02-12 16:44:04 +05:30
KDSKardabox
d52a54e64f Updating pokedex count function labels 2018-02-12 16:15:51 +05:30
KDSKardabox
0ca0ad1c63 Decompile birch_pc.c 2018-02-12 15:42:15 +05:30
Diegoisawesome
a4787bc06a
Merge pull request #207 from DizzyEggg/decompile_pokemon_123 
Decompile and clean pokemon files
 2018-02-11 22:13:15 -06:00
golem galvanize
f2144e9932 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu 2018-02-11 20:34:56 -05:00
PikalaxALT
590c4b500b Merge branch 'master' into record_mixing 2018-02-11 20:12:40 -05:00
PikalaxALT
ea347199a2 Merge branch 'master' into link 2018-02-11 19:22:06 -05:00
DizzyEggg
1bb05809d2 make it compile x2 2018-02-12 00:37:07 +01:00
DizzyEggg
5e781f5b3f change some constants to male and female 2018-02-12 00:11:10 +01:00
golem galvanize
42cfbcb197 some fixes 2018-02-11 18:00:45 -05:00
DizzyEggg
2736c0fd4a add more const pokemon data, clear include 2018-02-11 23:46:50 +01:00
golem galvanize
601a942db4 decompile main_menu 2018-02-11 17:19:36 -05:00
DizzyEggg
d704a2b5df thonk 2018-02-11 21:45:26 +01:00
DizzyEggg
4c19790ff1 review battle code clean up change 2018-02-11 21:05:42 +01:00
DizzyEggg
fd17ca59b0 more pokemon work 2018-02-11 17:35:01 +01:00
DizzyEggg
084ba7a7a4 decompile all pokemon files 2018-02-10 13:24:03 +01:00
DizzyEggg
5707c5c7c6 start pokemon 3 2018-02-10 02:06:32 +01:00
golem galvanize
99d0b4bbfd Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_main_menu 2018-02-09 17:47:01 -05:00
DizzyEggg
1a1bad3129 decompile pokemon_item_effect 2018-02-09 18:46:00 +01:00
DizzyEggg
9e7696f25a decompile pokemon1 2018-02-09 15:55:12 +01:00
golem galvanize
56e1a52823 Fixes 2018-02-08 21:00:28 -05:00
DizzyEggg
ff6a0316c1 get rid of unnecessary externs 2018-02-09 01:09:02 +01:00
DizzyEggg
bce01bc518 battle labels merge with master 2018-02-09 00:43:07 +01:00
golem galvanize
de95a703b0 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu 2018-02-08 16:03:53 -05:00
golem galvanize
368a63d5a7 decompiled up to task_new_game_prof_birch_speech_10 2018-02-08 16:01:24 -05:00
Diegoisawesome
387dbf48d0
Merge pull request #202 from DizzyEggg/move_mon_data 
Move data from asm to pokemon_1.c
 2018-02-08 14:06:57 -06:00
DizzyEggg
9df5e16343 more battle labels 2018-02-08 12:13:29 +01:00
DizzyEggg
96290f4ee3 pokemon and battle constants 2018-02-08 11:17:41 +01:00
golem galvanize
03f8d0d6ce Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_main_menu 2018-02-07 19:31:33 -05:00
golem galvanize
4a903279df decompile task_new_game_prof_birch_speech_4 2018-02-07 19:30:58 -05:00
Diegoisawesome
772fd47564 Merge branch 'master' of https://github.com/pret/pokeemerald into menu 2018-02-07 18:06:59 -06:00
golem galvanize
caf5d136b9 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu 2018-02-07 18:59:00 -05:00
DizzyEggg
a10fd5a7c4 create more battle constants 2018-02-08 00:35:13 +01:00
Diegoisawesome
5db765a475 Make small change to sub_819A080 2018-02-07 17:13:59 -06:00
DizzyEggg
caf9af321d get rid of unnecessary externs 2018-02-08 00:00:25 +01:00
DizzyEggg
1a32010f13 iwram common symbols to c 2018-02-07 23:21:51 +01:00
DizzyEggg
5ac6cc4860 move battle vars to c file 2018-02-07 22:53:40 +01:00
golem galvanize
76e6be7ff2 update function name and struct names 2018-02-07 14:22:49 -05:00
DizzyEggg
4b7d778a5c move mon data fix conflicts 2018-02-07 20:17:55 +01:00
golem galvanize
b67afb9490 I hope this fixes the conflicts 2018-02-07 14:14:08 -05:00
golem galvanize
1b303aeee8 decompiled up to task_new_game_prof_birch_speech_3 2018-02-07 14:11:08 -05:00
DizzyEggg
c5e2092e8b title screen with master 2018-02-07 20:10:56 +01:00
Diegoisawesome
802b505d7b
Merge pull request #199 from DizzyEggg/decompile_rtc_screen 
decompile rtc reset screen
 2018-02-07 13:03:59 -06:00
Diegoisawesome
ccae0ee970
Merge pull request #198 from DizzyEggg/decompile_item_icon 
decompile item icon
 2018-02-07 12:59:40 -06:00
Diegoisawesome
1ae5adbb19
Merge pull request #196 from DizzyEggg/decompile_ray_scene 
Decompile rayquaza scene
 2018-02-07 12:59:13 -06:00
DizzyEggg
9b4b19fd5a rtc screen review changes 2018-02-07 19:59:02 +01:00
DizzyEggg
593031904b ray changes 2018-02-07 19:47:55 +01:00
Cameron Hall
13bc7a8dd2
Merge pull request #166 from camthesaxman/battle_refactor 
rename/refactor battle code
 2018-02-07 12:46:12 -06:00
Diegoisawesome
3fb2471016
Merge pull request #197 from DizzyEggg/decompile_berry_tag_screen 
Decompile berry tag screen
 2018-02-07 12:27:25 -06:00
Diegoisawesome
db97098b91
Merge pull request #204 from DizzyEggg/match_nonmatchings 
Match a couple of nonmatching functions
 2018-02-07 09:34:32 -06:00
DizzyEggg
b3a94a359f match berry fix func 2018-02-07 15:02:47 +01:00
DizzyEggg
96ab6f8353 match secret base func and fix struct 2018-02-07 13:49:33 +01: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
camthesaxman
c3dc14ba66 more renaming 2018-02-06 16:09:39 -06:00
scnorton
08516ae12c take a sharp knife and jam it into sub_819A080 2018-02-06 16:29:12 -05:00
Diegoisawesome
97c9a4ec22 Skip sub_819A080 2018-02-06 14:35:23 -06:00
camthesaxman
aba388d332 GetBattlerSpriteId -> GetAnimBattlerSpriteId 2018-02-06 14:00:01 -06:00
camthesaxman
6a4967689e more renaming 2018-02-06 13:48:02 -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
DizzyEggg
ab5977e7e4 match item use func 2018-02-06 18:15:10 +01:00
DizzyEggg
9e43b01a4c match obj update pos2 2018-02-06 17:42:24 +01:00
DizzyEggg
1902ff0238 match palette functions 2018-02-06 15:31:04 +01:00
Diegoisawesome
06e1aca2ac Move start_menu EWRAM symbols into C file 2018-02-05 23:12:34 -06:00
camthesaxman
f78fa6aabf rename bank to battler 2018-02-05 19:46:59 -06:00
camthesaxman
607cba8c2e Merge branch 'master' into battle_refactor 2018-02-05 17:38:23 -06:00
DizzyEggg
541fef5368 move wild data to C 2018-02-05 22:27:29 +01:00
DizzyEggg
e6eae224fc mon ewram data to c 2018-02-05 17:56:28 +01:00
DizzyEggg
ae8e89a10d move some pokemon data to c 2018-02-05 17:39:26 +01:00
golem galvanize
5f7709dc8b decompile item_menu 2018-02-04 23:47:47 -05:00
DizzyEggg
0c60ffe22a decompile title screen 2018-02-04 16:11:00 +01:00
PikalaxALT
f39053ee30 common syms in window.c, because why not 2018-02-03 10:19:56 -05:00
PikalaxALT
d52f52fa73 Merge branch 'master' into link 2018-02-03 09:42:19 -05:00
DizzyEggg
27452ca822 decompile rtc reset screen 2018-02-02 19:00:01 +01:00
DizzyEggg
e13eacda39 decompile item icon 2018-02-02 16:06:20 +01:00
DizzyEggg
b6437b8d80 document berry tag screen 2018-02-02 14:41:56 +01:00
DizzyEggg
ebc8af50f1 decompile berry tag screen 2018-02-02 14:03:48 +01:00
DizzyEggg
14d2caaf8d start decompiling berry tag screen 2018-02-02 12:32:12 +01:00
DizzyEggg
af068e74ad more function names in ray scene 2018-02-01 23:39:53 +01:00
DizzyEggg
be08cc06f2 more function names in ray scene 2018-02-01 15:32:12 +01:00
DizzyEggg
9976e21f6a give some names ray scene 2018-02-01 14:53:27 +01:00
DizzyEggg
b697497835 ray scene is decompiled 2018-02-01 14:47:41 +01:00
DizzyEggg
68146af07c more ray scene work 2018-02-01 11:17:07 +01:00
golem galvanize
0a67b1d80c decompiled up to sub_81AC10C 2018-01-31 20:22:51 -05:00
Diegoisawesome
eb6aed50e5
Update save.c with recorded battle sector 2018-01-31 16:12:46 -06:00
ProjectRevoTPP
a998cba4f0 depreciate depreciate 2018-01-31 15:53:38 -05:00
ProjectRevoTPP
78bd2b0849 move save rodata to source and use saveblock chunk macros 2018-01-31 15:26:57 -05:00
DizzyEggg
db6185275e start decompiling rayquaza scene 2018-01-31 13:05:36 +01:00
golem galvanize
e78697494c Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu 2018-01-31 00:29:38 -05:00
ProjectRevoTPP
e7fffb5e9a merge 2018-01-31 00:13:49 -05:00
Diegoisawesome
3167dec946
Merge pull request #188 from golemgalvanize/decompile_field_message_box 
decompile field_message_box
 2018-01-30 23:11:53 -06:00
golem galvanize
155a371064 decompile set_callback3_to_bag 2018-01-31 00:03:52 -05:00
ProjectRevoTPP
09302c0bc5 Merge branch 'master' of https://github.com/pret/pokeemerald into field_map_obj_helpers 2018-01-30 23:23:45 -05:00
Diegoisawesome
eb5737357d
Merge pull request #194 from DizzyEggg/decompile_mystery_event_menu 
decompile mystery event menu
 2018-01-30 20:33:27 -06:00
ProjectRevoTPP
3ff5db0b69 forward declarations 2018-01-30 21:17:36 -05:00
golem galvanize
f7c9a6cb54 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu 2018-01-30 19:38:24 -05:00
golem galvanize
d5d62c9d4d fix ewram 2018-01-30 19:28:38 -05:00
ProjectRevoTPP
05bd37bf46 rename header 2018-01-30 18:30:59 -05:00
ProjectRevoTPP
c5f1b576f2 Merge branch 'master' of https://github.com/pret/pokeemerald into field_map_obj_helpers 2018-01-30 18:24:14 -05:00
ProjectRevoTPP
536a338ff9 cleanup 2018-01-30 18:22:56 -05:00
ProjectRevoTPP
6453b88433 finish decompiling field_map_obj_helpers.c 2018-01-30 18:19:41 -05:00
DizzyEggg
9fbedcc41c coord weather fix conflicts 2018-01-31 00:02:16 +01:00
DizzyEggg
741b8adf9a decompile mystery event menu 2018-01-30 23:23:35 +01:00
golem galvanize
f0cc705d35 fixes 2018-01-30 17:16:41 -05:00
Diegoisawesome
b3315b64a1
Merge pull request #187 from golemgalvanize/decompile_item_use 
decompile item_use
 2018-01-30 15:41:43 -06:00
Diegoisawesome
232dea1a63
Merge pull request #193 from DizzyEggg/decompile_scanline_effect 
decompile scanline effect
 2018-01-30 15:37:34 -06:00
golem galvanize
231b69451b fixed 2018-01-30 16:33:20 -05:00
Diegoisawesome
6873f47821
Merge pull request #190 from DizzyEggg/decompile_time_events 
decompile time events
 2018-01-30 15:20:24 -06:00
golem galvanize
092da42723 decompiled up to set_callback3_to_bag 2018-01-30 16:12:40 -05:00
golem galvanize
f220ac971c got Task_BagMenu closer 2018-01-30 15:26:46 -05: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
golem galvanize
9f902df79b decompiled up to sub_81ABCC0 2018-01-30 13:19:37 -05:00
Diegoisawesome
3793152bc3 More work on menu 2018-01-29 17:26:36 -06:00
ProjectRevoTPP
42bfa15ae0 decompile more of field_map_obj_helpers.c 2018-01-29 15:49:28 -05:00
DizzyEggg
db3ecf5012 decompile scanline effect 2018-01-29 17:47:12 +01:00
DizzyEggg
e6fb626c1f decompile_coord_event_weather 2018-01-29 16:46:56 +01:00
DizzyEggg
76fc1d1c12 make time events compile 2018-01-29 16:25:09 +01:00
DizzyEggg
d728124a7b decompile time events 2018-01-29 15:55:34 +01:00
DizzyEggg
78fc471f32 mon anim with master 2018-01-29 14:40:50 +01:00
DizzyEggg
78728ae454 add rgb constants 2018-01-29 14:36:13 +01:00
DizzyEggg
ed546d680f pokemon animation is decompiled 2018-01-29 12:36:56 +01:00
ProjectRevoTPP
3eaaa59c04 start decompiling field_map_obj_helpers 2018-01-29 04:13:15 -05:00
golem galvanize
2a16b7cb81 decompile field_message_box 2018-01-28 00:22:06 -05:00
golem galvanize
b377112cd6 decompile item_use 2018-01-27 22:58:44 -05:00
DizzyEggg
16c46905ff more pokemon animation functions 2018-01-28 00:51:20 +01:00
Diegoisawesome
a3ed94dc69 Continue work on menu.c 2018-01-27 17:46:32 -06:00
DizzyEggg
8ca9bbe425 more pokemon anim functions decompiled 2018-01-27 21:10:00 +01:00
DizzyEggg
95827ab64b more pokemon anim functions decompiled 2018-01-27 11:57:46 +01: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
golem galvanize
7231aa2658 got it almost matching 2018-01-24 16:45:37 -05:00
DizzyEggg
4e43a251b0 more pokemon anim funcs 2018-01-24 19:37:30 +01: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
DizzyEggg
ad73f92061 start decompiling pokemon animation 2018-01-22 21:32:50 +01:00
camthesaxman
663ecd0014 Merge branch 'master' of https://github.com/pret/pokeemerald into battle_refactor 2018-01-21 22:29:35 -06:00
PikalaxALT
d4e8c20f84 Merge branch 'master' into link 2018-01-21 23:20:13 -05:00
PikalaxALT
d35cf06854 nonmatching sub_801120C 2018-01-21 18:25:23 -05:00
Diegoisawesome
2ba141eac4
Merge pull request #182 from DizzyEggg/decompile_hof_pc 
decompile hof pc
 2018-01-21 15:10:26 -06:00
Diegoisawesome
f4455bb2a5
Merge pull request #180 from DizzyEggg/decompile_mystery_event_script 
Decompile mystery event script
 2018-01-21 14:38:09 -06:00
DizzyEggg
fbf91fabcf review changes mystery event 2018-01-21 21:32:30 +01:00
Devin
35cc20c9aa Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms 2018-01-21 15:22:05 -05:00
DizzyEggg
f59eedb672 decompile hof pc 2018-01-21 20:45:43 +01:00
DizzyEggg
f53a39e7a2 mystery event labels 2018-01-21 19:30:01 +01:00
DizzyEggg
e85d7d5492
Add a comment about one battle transition 2018-01-21 14:23:04 +01:00
DizzyEggg
e0fbd5daad text window cleanup 2018-01-21 13:32:11 +01:00
DizzyEggg
ad2ef517bd option menu fix conflicts 2018-01-21 12:46:19 +01:00
DizzyEggg
0bc7fb92db start decompiling mystery event script 2018-01-21 12:36:11 +01:00
PikalaxALT
772f0aa3fd Merge branch 'master' into link 2018-01-20 22:08:41 -05:00
PikalaxALT
7af3cd051e through sub_80111FC 2018-01-20 19:51:19 -05:00
golem galvanize
bdc8cf6ac4 fixing conflicts 2018-01-20 19:44:34 -05:00
PikalaxALT
3faaeafffe through sub_8011090 2018-01-20 19:23:21 -05:00
PikalaxALT
1566dca0c2 through sub_8010EC0 2018-01-20 18:43:58 -05:00
PikalaxALT
ef412145d0 through sub_8010A70 2018-01-20 17:28:10 -05:00
golem galvanize
59e1aacd26 DIEGO SEND HELP 2018-01-20 17:26:30 -05: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
PikalaxALT
95d77c25f3 through sub_801084C 2018-01-20 16:38:44 -05:00
PikalaxALT
a8e8bfb4c8 through sub_8010750 2018-01-20 15:50:45 -05:00
PikalaxALT
aa6ffc5ba1 through sub_8010528 2018-01-20 14:59:34 -05:00
PikalaxALT
c5096c81ad through task_add_05_task_del_08FA224_when_no_RfuFunc 2018-01-20 14:29:13 -05:00
PikalaxALT
b8ad1a0fc4 through sub_8010198 2018-01-20 12:02:06 -05:00
PikalaxALT
b8af0f011d through rfufunc_80FA020 2018-01-20 11:53:35 -05:00
PikalaxALT
6ac0175c1e nonmatching sub_800FD14 2018-01-20 10:16:09 -05: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
PikalaxALT
b9e5ad9f11 through sub_800FCD8 2018-01-19 22:03:02 -05:00
PikalaxALT
1c15b896a8 sub_800F86C 2018-01-19 21:50:30 -05:00
PikalaxALT
c383d490ad through sub_800F850 2018-01-19 19:13:45 -05:00
Devin
c408110319 Fix file permissions. 2018-01-19 15:06:49 -05:00
Diegoisawesome
c74334c26a Fix address of berry struct in item.c 2018-01-19 12:49:08 -06:00
PikalaxALT
58def21c62 nonmatching sub_800F638 2018-01-18 19:23:12 -05:00
scnorton
68e9b5719c sub_800F4F0 2018-01-18 17:38:51 -05:00
Diegoisawesome
d6567414ed Merge remote-tracking branch 'Ketsuban/document-weirdness' 2018-01-18 14:04:31 -06:00
scnorton
090f70dd5b sub_800F498 2018-01-18 13:18:24 -05:00
PikalaxALT
75a32c9dc5 Merge branch 'link' of github.com:pikalaxalt/pokeemerald into link 2018-01-18 12:55:48 -05:00
scnorton
c6ff1a6ce3 Merge branch 'master' into link 2018-01-18 12:53:31 -05:00
PikalaxALT
cfb0e233ee sub_800F1E0 2018-01-18 08:46:17 -05:00
Thomas Winwood
6fa557c2ec
Document sub_814F8F8, sub_814F950 and sUnknownMoveTable 
These are left over from the Japanese games, which provide more variation to
the attack string than the English games.
 2018-01-17 19:33:23 +00:00
DizzyEggg
295aa96a05 decompile unk transition 2018-01-16 23:57:26 +01:00
camthesaxman
a78b0636f5 more renaming 2018-01-16 16:42:31 -06:00
camthesaxman
b4bb562363 rename battle_2.c to battle_main.c 2018-01-16 16:15:02 -06:00
camthesaxman
c3c13d0acf more renaming 2018-01-16 15:12:38 -06:00
Diegoisawesome
309640a28c Merge remote-tracking branch 'Egg/decompile_battle_transition' 2018-01-16 14:51:00 -06:00
DizzyEggg
50f9615dc9 battle transition review changes 2018-01-16 21:37:46 +01:00
camthesaxman
157b88b6db identity -> position 2018-01-16 14:01:31 -06:00
DizzyEggg
77352c7ee4 give the s prefix to a variable 2018-01-16 19:41:25 +01:00
DizzyEggg
4dd06dbcd3 optiom menu move data to C 2018-01-16 19:39:35 +01:00
DizzyEggg
a6072ae293 decompile option menu 2018-01-16 18:59:06 +01:00
Diegoisawesome
11cb3275cc Merge remote-tracking branch 'Diego/master' 2018-01-14 21:41:29 -06:00
DizzyEggg
05aba58d5d fix battle transition conflicts 2018-01-14 22:19:26 +01:00
DizzyEggg
bc1a957674 make battle transition compile 2018-01-14 22:15:50 +01:00
DizzyEggg
d7644cd3d8 battle transition is decompiled 2018-01-14 22:09:35 +01:00
DizzyEggg
fdbe7fa7de up to 30 battle transitions 2018-01-14 20:45:44 +01:00
DizzyEggg
9106d8df18 up to groudon transition 2018-01-13 21:03:07 +01:00
Marcus Huderle
d1630d481a
Merge pull request #155 from ProjectRevoTPP/assert 
add assert support to pokeemerald.
 2018-01-11 18:25:42 -08:00
Diegoisawesome
3241b1405f Add symbols to music_player_table 
Also rename gMPlay structs to gMPlayInfo
 2018-01-09 21:30:54 -06:00
ProjectRevoTPP
e1801885a0 both print defines for nocashgba 2018-01-09 19:39:51 -05:00
ProjectRevoTPP
ecc2408cd5 comment 2018-01-09 19:28:32 -05:00
ProjectRevoTPP
0bf530da12 nocashgba printf 2018-01-08 22:03:07 -05:00
ProjectRevoTPP
ba1eb6d952 nogba to nocashgba 2018-01-08 21:39:07 -05:00
ProjectRevoTPP
d215fcc78e actually change NOGBAPrint, stupid 2018-01-08 17:05:26 -05:00
ProjectRevoTPP
7d501c8b13 let the user deal with nogbaprint, forget this 2018-01-08 17:03:28 -05:00
camthesaxman
3b097262f5 completely label and document dma3_manager.c 2018-01-07 23:59:42 -06:00
ProjectRevoTPP
dd2d49144b Merge branch 'master' of https://github.com/pret/pokeemerald into assert 2018-01-07 20:01:56 -05:00
Diegoisawesome
0eadf71b1a Move forward declaration 2018-01-07 18:58:52 -06:00
Diegoisawesome
75f9c16504 Merge branch 'master' of https://github.com/pret/pokeemerald 2018-01-07 18:47:05 -06:00
Diegoisawesome
a11c65ff1a Port field_door 2018-01-07 17:50:13 -06:00
ProjectRevoTPP
d1e08c88bf Merge branch 'master' of https://github.com/pret/pokeemerald into assert 2018-01-07 18:11:14 -05:00
camthesaxman
75c359e300 match ScrollWindow 2018-01-07 16:58:20 -06:00
ProjectRevoTPP
3da57eb98d Merge branch 'master' of https://github.com/pret/pokeemerald into assert 2018-01-07 16:23:09 -05:00
camthesaxman
0fd6ae4791 match ProcessDma3Requests 2018-01-07 15:06:16 -06:00
ProjectRevoTPP
10ddfac7ab consistency 2018-01-06 22:00:08 -05:00
ProjectRevoTPP
8cf6da7a3b don't forget to add the file dummy 2018-01-06 21:13:18 -05:00
ProjectRevoTPP
7be61cfb1a add assert support to pokeemerald. 2018-01-06 21:12:42 -05:00
camthesaxman
601ec28721 remove explicit memcpy and add HEAP_SIZE constant 2018-01-06 00:35:48 -06:00
camthesaxman
462a0030ae match MoveSaveBlocks_ResetHeap 2018-01-06 00:17:31 -06:00
DizzyEggg
eb00e8ba4a more work on battle transition 2018-01-02 20:38:33 +01:00
Diegoisawesome
e3585d7d66 Review fixes 2018-01-01 19:21:30 -06:00
Diegoisawesome
4f726232b8 Merge remote-tracking branch 'EternalCode/master' 2018-01-01 16:31:35 -06:00
EternalCode
d8c329b888
Update fldeff_teleport.c 2018-01-01 14:36:27 -05:00
DizzyEggg
ba176dfe07 start working on battle transition 2018-01-01 17:41:34 +01:00
Diegoisawesome
31140b10c5 Merge remote-tracking branch 'Egg/dump_battle_anim_scripts' 2017-12-31 13:35:14 -06:00
Diegoisawesome
4633de0665 Merge remote-tracking branch 'Egg/dump_trainer_ai_scripts' 2017-12-31 13:06:42 -06:00
DizzyEggg
4f950d698c dump battle animation scripts 2017-12-31 16:28:57 +01:00
DizzyEggg
ca29ad22e8 dump trainer ai scripts 2017-12-30 16:04:31 +01:00
DizzyEggg
9bad1921df Merge branch 'master' into dump_trainer_ai_scripts 2017-12-30 12:20:16 +01:00
DizzyEggg
5ae6461cc5 commit 2017-12-30 12:19:02 +01:00
ProjectRevoTPP
48378f791c last wave of graphics.s dumps 2017-12-30 01:09:06 -05:00
ProjectRevoTPP
06aa07306e sixteenth wave of graphics.s dumps 2017-12-29 20:25:32 -05:00
ProjectRevoTPP
77b7462dbb merge 2017-12-28 17:26:58 -05:00
ProjectRevoTPP
03a2a3b81b fourteenth wave of graphics.s dumps 2017-12-28 17:15:37 -05:00
Diegoisawesome
1496ea3a24 Merge branch 'master' of github.com:pret/pokeemerald 2017-12-28 03:00:15 -06:00
Diegoisawesome
2d04eb22ab Split rom_81370FC and port function names 2017-12-28 02:09:11 -06:00
ProjectRevoTPP
8a338f44db thirteenth wave of graphics.s dumps 2017-12-26 22:37:36 -05:00
Diegoisawesome
f9a9391ff3 Split/extract/port landmark 2017-12-26 21:20:29 -06:00
ProjectRevoTPP
0af942e0b8 twelfth wave of graphics.s dumps 2017-12-26 01:39:01 -05:00
Diegoisawesome
15c92318d3 Extract data from misc files 
Also split data4d.s
 2017-12-25 00:32:01 -06:00
ProjectRevoTPP
7dd75f453d merge 2017-12-25 00:05:39 -05:00
DizzyEggg
9ee677d567 commit 2017-12-24 19:08:55 +01:00
DizzyEggg
43f23b8a78 Merge branch 'master' into dump_pointers 2017-12-24 11:15:00 +01:00
DizzyEggg
8cd4908fa3 merge bike with master, fix conflicts 2017-12-24 00:08:55 +01:00
DizzyEggg
e647cb2308 dump start menu and a bit of textwindow and trainercard 2017-12-23 19:23:55 +01:00
DizzyEggg
4f6ca126b5 dump all rayquaza scene data to C 2017-12-23 13:23:23 +01:00
ProjectRevoTPP
3499ff51b5 second wave of graphics.s dumps (battle_anim part 1) 2017-12-23 01:45:04 -05:00
DizzyEggg
e7111984a9 start rayquaza dumping 2017-12-23 00:22:07 +01:00
DizzyEggg
3ca5af4d5d do some pointer storage system hunting 2017-12-22 20:10:51 +01:00
DizzyEggg
9c45ca0c5f dump pokemon icon 2017-12-22 19:16:15 +01:00
DizzyEggg
08ebf59e44 get rid of pointers in pokedex 2017-12-22 18:43:41 +01:00
DizzyEggg
cddd44834e Merge branch 'master' into dump_pointers 2017-12-22 16:22:16 +01:00
Diegoisawesome
4a4a10a990 Merge remote-tracking branch 'pret/master' 2017-12-22 03:10:09 -06:00
Diegoisawesome
841ee0f2b2 Fix pokeblock songs include 2017-12-22 03:06:57 -06:00
sceptillion
3c286feec6 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_songs 2017-12-22 00:17:34 -08:00
sceptillion
96511dc214 use internal song names 2017-12-22 00:10:20 -08:00
Diegoisawesome
6bd6cfcac7 Merge remote-tracking branch 'pret/master' 2017-12-22 01:22:16 -06:00
Diegoisawesome
0e8d6645f8 Attempts to fix nonmatchings in palette.c 2017-12-22 01:03:16 -06:00
Diegoisawesome
0403f6eea9 Merge remote-tracking branch 'Egg/decompile_use_pokeblock' 2017-12-21 16:19:50 -06:00
DizzyEggg
bcffcb0c1c pokeblock merge conflicts 2017-12-21 23:12:36 +01:00
Diegoisawesome
2c0e5a41a2 Merge remote-tracking branch 'Shanty/script_macros' 2017-12-21 16:03:37 -06:00
DizzyEggg
19c25a8f2b start dumping pokedex 2017-12-21 22:56:20 +01:00
Marcus Huderle
173761a5a1 Port generic event script macros from pokeruby 2017-12-21 13:47:52 -06:00
Diegoisawesome
a705a863d1 Fix incorrect slash in battle_bg.c 2017-12-21 12:26:00 -06:00
DizzyEggg
6b5157b2a3 decompile bike.s 2017-12-21 17:46:03 +01:00
DizzyEggg
504363f2a6 Merge branch 'master' into decompile_trainer_see 2017-12-20 17:21:46 +01:00
DizzyEggg
df479661ff pokeblock review changes 2017-12-20 17:20:41 +01:00
DizzyEggg
b615af4184 fix pokeblock merge conflicts 2017-12-20 17:16:56 +01:00
Diegoisawesome
7e6a68a99a Merge remote-tracking branch 'Egg/static_to_s' 2017-12-20 00:25:54 -06:00
DizzyEggg
4949411f3e make battle bg compile 2017-12-19 17:41:05 +01:00
DizzyEggg
7581218569 Merge branch 'master' into decompile_battle1 2017-12-19 17:37:53 +01:00
DizzyEggg
4abc2eea8a ram vars to C files 2017-12-19 17:33:07 +01:00
DizzyEggg
b7a2335347 clean up trainer see file 2017-12-19 17:18:44 +01:00
DizzyEggg
5744356989 decompile trainer see 2017-12-18 23:26:44 +01:00
DizzyEggg
a612ef12a0 start working on trainer see 2017-12-18 19:35:50 +01:00
DizzyEggg
cb229f56e8 fix pokeblock conflicts 2017-12-18 16:58:14 +01:00
Diegoisawesome
6a674e1e83 Merge remote-tracking branch 'Egg/decompile_mail_data' 2017-12-17 22:51:40 -06:00
DizzyEggg
314b96af46 static names given s prefix 2017-12-17 23:45:27 +01:00
DizzyEggg
720bd555bc add constants trainers file 2017-12-17 21:19:08 +01:00
DizzyEggg
54dccc8512 give batter script command names 2017-12-17 20:38:01 +01:00
DizzyEggg
7517f6a030 fix battle setup conflicts 2017-12-17 20:26:13 +01:00
DizzyEggg
46fa2557d7 merge mail with master, fix conflicts 2017-12-17 20:22:56 +01:00
DizzyEggg
eb8055eb07 battle 1 is decompiled 2017-12-17 20:10:57 +01:00
scnorton
3c2b1731ee Merge branch 'master' into link 2017-12-17 14:09:06 -05:00
PikalaxALT
5b526906e1 through sub_800F0F8 2017-12-16 12:07:20 -05:00
PikalaxALT
190a2cba61 Merge branch 'master' into link 2017-12-16 11:27:10 -05:00
PikalaxALT
6d73bb4b57 Import function labels from Ruby 2017-12-16 10:23:05 -05:00
DizzyEggg
c3abe2863f rename 2017-12-16 15:12:55 +01:00
DizzyEggg
5b409d49ed pokeblock.s is decompiled 2017-12-16 15:10:29 +01:00
DizzyEggg
f4ab21ee67 Merge branch 'master' into decompile_use_pokeblock 2017-12-16 11:42:59 +01:00
PikalaxALT
da2e0dfe50 Merge branch 'master' into clock 2017-12-15 21:04:25 -05:00
DizzyEggg
930fea6fad mail review changes 2017-12-16 01:18:31 +01:00
DizzyEggg
bb82032208 battle setup review changes 2017-12-16 01:15:19 +01:00
DizzyEggg
44abbae60b nerge with master, fix conflicts 2017-12-16 01:08:55 +01:00
DizzyEggg
4351676749 decompile more of pokeblock.s 2017-12-16 00:08:23 +01:00
camthesaxman
c681b482c2 convert more constants 2017-12-11 12:27:51 -06:00
DizzyEggg
8ac17e0948 move data from asm to pokeblock.c 2017-12-11 16:52:28 +01:00
DizzyEggg
b4d10ab7ab split pokeblock files 2017-12-10 19:02:51 +01:00
DizzyEggg
37ae6a7758 move more pokeblock data to C and label 2017-12-10 16:38:27 +01:00
PikalaxALT
b1c6f80e10 through sub_800F048 2017-12-10 10:31:11 -05:00
PikalaxALT
beeb86be37 through (nonmatching) sub_800EFB0 2017-12-10 10:23:43 -05:00
DizzyEggg
fb30acbc30 pokeblock feed is decompiled 2017-12-10 15:04:03 +01:00
DizzyEggg
bb1ae5f857 Merge branch 'master' into decompile_use_pokeblock 2017-12-09 21:24:47 +01:00
DizzyEggg
6561b62986 start pokeblock feed 2017-12-09 21:23:40 +01:00
PikalaxALT
253b3c2fa5 sub_800EDD4 2017-12-08 08:24:54 -05:00
PikalaxALT
abc3869eca through sub_800EDBC 2017-12-07 20:21:50 -05:00
PikalaxALT
6441ba7832 sub_800EB44 2017-12-07 20:04:07 -05:00
PikalaxALT
c9f43116aa through sub_800EAFC 2017-12-07 08:48:49 -05:00
PikalaxALT
94da6de903 sub_800E94C 2017-12-07 00:28:12 -05:00
PikalaxALT
4f342198c2 sub_800E88C 2017-12-06 23:55:40 -05:00
PikalaxALT
dc0d544119 sub_800E87C, remaining data in link_rfu 2017-12-05 23:54:31 -05:00
camthesaxman
19fbf024ff fix merge conflicts 2017-12-05 12:42:30 -06:00
camthesaxman
00896cb3b5 rename rng.c to random.c and rom4.c to overworld.c 2017-12-05 12:27:33 -06:00
Cameron Hall
fd75493bc6
Merge pull request #129 from DizzyEggg/dumb_naming 
Name some battle labels
 2017-12-05 12:05:06 -06:00
camthesaxman
caa13f8777 convert some constants to C headers 2017-12-05 11:55:48 -06:00
PikalaxALT
21619096da sub_800E748 2017-12-04 21:05:41 -05:00
PikalaxALT
765ad80884 through sub_800E700 2017-12-04 20:06:03 -05:00
PikalaxALT
92fd61d6f2 through sub_800E604 2017-12-04 19:51:26 -05:00
PikalaxALT
0b58905eea sub_800E3A8 2017-12-04 19:10:37 -05:00
EternalCode
266dd492a7
void parameter in function header 2017-12-04 17:12:05 -05:00
DizzyEggg
ad07843f2d start working on use pokeblock 2017-12-04 23:09:44 +01:00
PikalaxALT
feb0d13534 sub_800E174 2017-12-03 23:33:49 -05:00
PikalaxALT
3dd7ec7526 through sub_800E15C 2017-12-03 22:23:46 -05:00
PikalaxALT
8b5d6fe5d9 CreateWirelessStatusIndicatorSprite 2017-12-03 22:01:06 -05:00
EternalCode
d74c0d053e missed moving an extern to top 2017-12-03 20:48:08 -05:00
EternalCode
077089f0e5 fldeff_teleport file completed 2017-12-03 20:46:56 -05:00
PikalaxALT
d5bc329de7 through sub_800DF90 2017-12-03 20:32:49 -05:00
PikalaxALT
519c8d42f8 through sub_800DD94 2017-12-03 20:04:54 -05:00
DizzyEggg
4faa442d5a decompile and label mail 2017-12-03 19:19:11 +01:00
DizzyEggg
790df7159e more battlescript labels 2017-12-03 00:47:21 +01:00
DizzyEggg
e10aea9a51 give some more labels to battle struct fields 2017-12-02 23:31:58 +01:00
DizzyEggg
ce6e97fa0b sprite data fields to array 2017-12-02 21:44:50 +01:00
DizzyEggg
2fe25da65a move pokeball data to rom 2017-12-02 21:27:00 +01:00
DizzyEggg
c2fdde3a49 pokeball file is decompiled 2017-12-02 20:38:26 +01:00
DizzyEggg
c27f7a8131 start working on pokeball 2017-12-02 19:39:07 +01:00
PikalaxALT
c282e4fa59 sub_800DBF8 2017-12-02 10:19:02 -05:00
DizzyEggg
d75e7ace1d label battle stuff 2017-12-02 14:08:55 +01:00
PikalaxALT
e2244831a7 through sub_800DB18 2017-12-01 21:51:06 -05:00
DizzyEggg
273474d57a give names to some battlescripts 2017-12-02 00:03:46 +01:00
DizzyEggg
039c9f4bd8 merge with master 2017-12-01 21:27:29 +01:00
DizzyEggg
646664ff29 battle setup file is decompiled 2017-12-01 21:25:13 +01:00
PikalaxALT
b07ad8b169 through sub_800D9DC 2017-12-01 08:45:49 -05:00
PikalaxALT
a7e95b97ca sub_800D7D8 2017-11-30 23:20:43 -05:00
PikalaxALT
cf539e253e through sub_800D780 2017-11-30 22:56:56 -05:00
PikalaxALT
9f4ecadbfa through sub_800D658 2017-11-30 22:05:07 -05:00
PikalaxALT
f974812e9b through sub_800D5D0 2017-11-30 08:43:04 -05:00
PikalaxALT
f3ad97ad13 through sub_800D550 2017-11-30 08:35:33 -05:00
PikalaxALT
6f84853b08 sub_800D434 2017-11-30 08:26:39 -05:00
PikalaxALT
a781a6d5fd through sub_800D358 2017-11-30 00:19:44 -05:00
PikalaxALT
c906978692 through sub_800D294; fix sub_800CF34 2017-11-29 23:58:48 -05:00
DizzyEggg
e8ecb01ab2 more work on battle setup 2017-11-29 19:54:15 +01:00
PikalaxALT
295e45c788 sub_800D158 2017-11-29 08:46:16 -05:00
PikalaxALT
921011592c unsigned -> unsigned int; create header 2017-11-29 08:30:18 -05:00
PikalaxALT
10068b0345 Merge branch 'master' into field_poison 2017-11-29 08:19:54 -05:00
PikalaxALT
3f00d341d5 nonmatching sub_800CF34 2017-11-28 19:41:32 -05:00
DizzyEggg
10470ef536 start working on battle setup 2017-11-28 23:02:09 +01:00
Diegoisawesome
54da963091
Merge pull request #122 from PikalaxALT/unk_81BAD84 
Unk 81 bad84
 2017-11-28 10:11:49 -06:00
PikalaxALT
88636dfc2a Merge branch 'master' into clock 2017-11-27 20:09:53 -05:00
PikalaxALT
b9d08ed83b Merge branch 'master' into unk_81BAD84 2017-11-27 20:08:34 -05:00
PikalaxALT
1ac177723d Merge branch 'master' into field_poison 2017-11-27 20:07:33 -05:00
PikalaxALT
41eb2ed59e Merge branch 'master' into coins 2017-11-27 20:06:38 -05:00
PikalaxALT
cbd2718b5e Merge branch 'master' into link 2017-11-27 20:05:51 -05:00
Diegoisawesome
18c6b8efc2
Merge pull request #120 from PikalaxALT/unk_text_util 
Decompile asm/unk_text_util.s
 2017-11-27 18:39:50 -06:00
Diegoisawesome
db87e2db4c
Merge pull request #117 from ProjectRevoTPP/load_save 
finish load_save.c
 2017-11-27 15:19:08 -06:00
DizzyEggg
7144b3b7af fix flavour flavor not building, fuccing americans 2017-11-27 21:24:34 +01:00
ProjectRevoTPP
e6bcfee668 Encyprtion 2017-11-27 15:20:10 -05:00
Cameron Hall
6e317c6463
Merge pull request #124 from DizzyEggg/dump_battlescripts 
Dump Battle Scripts
 2017-11-27 14:00:29 -06:00
DizzyEggg
237261e193 berry blender review changes 2017-11-27 20:03:41 +01:00
DizzyEggg
77a6c30bd4 make various macros 2017-11-26 21:04:00 +01:00
DizzyEggg
b0657350a4 berry blender fix merge conflicts 2017-11-26 19:21:51 +01:00
DizzyEggg
d48392e677 change battle variables names 2017-11-26 18:07:00 +01:00
DizzyEggg
59f64c622b name more battlescripts 2017-11-26 17:26:11 +01:00
DizzyEggg
1bb5b1fd07 more battle labels 2017-11-26 17:15:28 +01:00
DizzyEggg
8c30c42c36 more labelling and changes 2017-11-26 14:17:02 +01:00
DizzyEggg
9886eeb5d8 fix, rename, label battle labels and battlescripts 2017-11-26 13:26:58 +01:00
DizzyEggg
cc572f7c00 clear battle code and battlescripts 2017-11-26 11:55:17 +01:00
DizzyEggg
938d346b6d fixes and labels 2017-11-26 01:19:57 +01:00
DizzyEggg
76f4a8b195 clean up and use names for printfromtable 2017-11-26 00:33:40 +01:00
PikalaxALT
6b84feaaf2 nonmatching sub_811AB68 2017-11-25 13:19:06 -05:00
DizzyEggg
9151a6d094 dump battlescripts, rename battlescripts 2017-11-25 18:42:31 +01:00
PikalaxALT
a875d665b8 Merge branch 'master' into easy_chat 2017-11-25 10:56:55 -05:00
PikalaxALT
9840be1f00 Slight cleanup 2017-11-24 22:43:05 -05:00
PikalaxALT
f9c3aeb919 sub_8135380 2017-11-24 22:30:20 -05:00
PikalaxALT
1063bcaab8 through sub_81352DC 2017-11-24 22:28:13 -05:00