ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-19 04:57:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,310 Commits 1 Branch 0 Tags 235 MiB
408485263d
Commit Graph

1849 Commits

Author SHA1 Message Date
DizzyEggg
5318cc656a Add some new battlestrings. 2018-07-15 18:53:43 +02:00
DizzyEggg
6f484c20ce Final ai damage calc touches 2018-07-15 18:07:01 +02:00
Diegoisawesome
07ef762770
Merge pull request #275 from Diegoisawesome/master 
Document list_menu.c and main_menu.c
 2018-07-15 04:43:03 -07:00
Diegoisawesome
731d6d59bc Document list_menu.c and main_menu.c 2018-07-15 04:30:37 -07:00
DizzyEggg
9c7db9f45e New AI damage and type functions 2018-07-15 12:39:07 +02:00
DizzyEggg
5a38bb61db Basic damage calc is ready. 2018-07-14 22:56:03 +02:00
DizzyEggg
c00fa14b66 Create template of new dmg calc 2018-07-14 19:29:25 +02:00
DizzyEggg
2ebf14a83d Get rid of scripting dmg multiplier 2018-07-14 18:58:45 +02:00
DizzyEggg
939127bfff Important battle util functions 2018-07-14 16:41:14 +02:00
DizzyEggg
b24427f3bf Introduce Field Statuses 2018-07-14 13:17:10 +02:00
DizzyEggg
3a10ae9a94 Crit changes accomodated to ai scripts 2018-07-14 12:54:12 +02:00
DizzyEggg
1afbcda042 Add ability names 2018-07-14 11:20:57 +02:00
DizzyEggg
c9d1ee3c4a Move high crit to a flag and update move table 2018-07-14 10:11:38 +02:00
DizzyEggg
e94a0e2ddf Add new gen constants. 2018-07-13 23:31:00 +02:00
DizzyEggg
626b80106e Basic Battle Debug Menu is done 2018-07-13 23:00:56 +02:00
Marcus Huderle
546819bc72 Use map type constants in map headers 2018-07-12 22:39:38 -05:00
Marcus Huderle
7d375972ba Sync bg_event macros with pokeruby 2018-07-11 11:12:26 -05:00
Marcus Huderle
d675b7578c Move movement type constants into include/constants/event_object_movement_constants.h 2018-07-10 18:04:41 -05:00
DizzyEggg
008d961b2a add party menu defines 2018-07-07 19:57:09 +02:00
DizzyEggg
1c48e58574 small fixes 2018-07-07 14:24:19 +02:00
DizzyEggg
9892298645 Merge branch 'master' into final_battle_files_touches 2018-07-07 14:11:04 +02: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
DizzyEggg
c556358e47 label multiuse sprite template functions 2018-07-01 15:28:57 +02:00
DizzyEggg
f35c0abe80 merge with battle tent update 2018-07-01 12:16:52 +02:00
DizzyEggg
d2e47323fe document frontier related 2018-07-01 11:15:42 +02:00
DizzyEggg
bfc64c9689 C vars sym ewram 2018-06-30 15:35:54 +02:00
DizzyEggg
15fe5a031b Merge branch 'master' into decompile_battle_tent 2018-06-30 14:43:41 +02:00
DizzyEggg
30c85a5128 more battle documentation 2018-06-30 14:12:17 +02:00
DizzyEggg
272b98da6c document party status summary 2018-06-28 21:06:32 +02:00
Marcus Huderle
5e00c0bfcf Fix map constants 2018-06-20 19:54:21 -05:00
Marcus Huderle
ed8b006e67 Rename map-layout-related things 2018-06-20 19:54:21 -05:00
DizzyEggg
ab36efdaf4 document bounce effect 2018-06-20 23:07:51 +02:00
DizzyEggg
94752d4207 document battle bars 2018-06-19 00:43:15 +02:00
DizzyEggg
caa36b530a label and document battle windows 2018-06-17 16:48:58 +02: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
acc1a5d446 Get all map constants from include/ rather than constants/ 2018-06-15 07:49:21 -05:00
Marcus Huderle
4d13e3394a Bring all movement function names up-to-date with pokeruby 2018-06-13 17:51:26 -05: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
4018acfae1 Update event object struct members 2018-06-11 09:19:17 -05:00
Marcus Huderle
38a126df66 Rename field_map_obj to event_object_movement 2018-06-11 08:46:33 -05:00
DizzyEggg
5526d980ec union room is too hard 2018-06-10 18:28:37 +02:00
DizzyEggg
166295acc7 union room prepare for battle 2018-06-09 22:14:52 +02:00
DizzyEggg
dbb9cdd424 more link stuff 2018-06-04 12:07:32 +02:00
DizzyEggg
e50f4b4999 still going 2018-06-03 22:39:10 +02:00
DizzyEggg
e95b1156d2 more progress 2018-06-03 09:37:01 +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
9e7965fab0 document record mixing 2018-05-26 00:25:36 +02:00
DizzyEggg
b051cbaaab more record mixing decomp 2018-05-25 21:00:41 +02:00
PikalaxALT
6ae395a636 Merge branch 'master' into contest 2018-05-24 10:26:55 -04:00
DizzyEggg
03b593d3c3 try my luck with record mixing 2018-05-22 21:54:57 +02:00
DizzyEggg
4d5bfc149e Merge branch 'master' into decomp_record_mixing 2018-05-20 12:16:45 +02:00
DizzyEggg
1a8d5132d6 fix record mixing for real 2018-05-20 10:51:09 +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
Diegoisawesome
23b050a99e Update naked attribute and ASM_DIRECT to NAKED macro 2018-05-11 17:24:32 -05:00
PikalaxALT
8d0da7d8e0 Propagate ASM_DIRECT --> NAKED renaming 2018-05-11 09:41:32 -04:00
PikalaxALT
4488bbe9e6 Merge branch 'master' into contest 2018-05-11 09:25:26 -04:00
PikalaxALT
c15b50ac68 through prints_contest_move_description 2018-05-11 08:44:21 -04: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
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
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
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
7f2329253f requested changes 2018-05-06 17:31:50 +01:00
Slawter666
190ac275bb
Formatting item_icon_table.h 2018-05-06 13:45:56 +01:00
Slawter666
279a6e1ddc Convert item_icon_table.inc to C 2018-05-06 13:37:28 +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
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
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
5a7a0d621c minor documentation of constants/items.h 2018-04-24 00:17:09 +01:00
Slawter666
2d4ab9f4ac Updated items.c 
Working but non-matching
 2018-04-23 23:25:03 +01: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
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
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
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
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
Anders Løvig
3f4c717d5c Rename stuff for more consistency 2018-03-29 02:16:02 +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
1f7fb45d0f Decompile more functions 2018-03-15 16:07:24 +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
PikalaxALT
aa2cb6a974 Rename match call assets 2018-03-06 08:52:29 -05: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
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
DizzyEggg
87274b9eed more list menu work 2018-03-03 01:02:07 +01:00
DizzyEggg
ae29f35afd start decompiling list menu 2018-03-02 16:34:31 +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
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
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
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
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
PikalaxALT
1616f998fc Rename some flags relevant to the conditions under which Wattson becomes available for rematch 2018-02-26 08:42:15 -05: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
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
DizzyEggg
4a45b4de4e more work 2018-02-25 18:45:00 +01:00
KDSKardabox
a3c17fad22 Decompile Fossil Special & Groundshake Data 2018-02-22 12:17:46 +05:30
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
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
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
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
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
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
KDSKardabox
54922641af Port smokescreen.s 2018-02-12 16:44:04 +05:30
KDSKardabox
185cf71842 Missing label 2018-02-12 16:17:57 +05:30
KDSKardabox
d52a54e64f Updating pokedex count function labels 2018-02-12 16:15:51 +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
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
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
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
bce01bc518 battle labels merge with master 2018-02-09 00:43:07 +01: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
Diegoisawesome
772fd47564 Merge branch 'master' of https://github.com/pret/pokeemerald into menu 2018-02-07 18:06:59 -06:00
DizzyEggg
a10fd5a7c4 create more battle constants 2018-02-08 00:35:13 +01: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
DizzyEggg
4b7d778a5c move mon data fix conflicts 2018-02-07 20:17:55 +01: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
a61dc815b0 bag arrow to item count plus 1 2018-02-07 19:51:41 +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
DizzyEggg
96ab6f8353 match secret base func and fix struct 2018-02-07 13:49:33 +01: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
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
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
ae8e89a10d move some pokemon data to c 2018-02-05 17:39:26 +01: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
0826ea552e forgot a semicolon LMAO 2018-02-02 16:09:17 +01:00
DizzyEggg
e13eacda39 decompile item icon 2018-02-02 16:06:20 +01:00
DizzyEggg
79fbee559f add func to include 2018-02-02 14:42:29 +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
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
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
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
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
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
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
232dea1a63
Merge pull request #193 from DizzyEggg/decompile_scanline_effect 
decompile scanline effect
 2018-01-30 15:37:34 -06:00
Diegoisawesome
6873f47821
Merge pull request #190 from DizzyEggg/decompile_time_events 
decompile time events
 2018-01-30 15:20:24 -06:00
Diegoisawesome
3793152bc3 More work on menu 2018-01-29 17:26:36 -06: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
Diegoisawesome
a3ed94dc69 Continue work on menu.c 2018-01-27 17:46:32 -06: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
Diegoisawesome
10037ac0e1 Fix spelling of 'Parametrized' to 'Parameterized' 2018-01-24 01:03:20 -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
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
f4455bb2a5
Merge pull request #180 from DizzyEggg/decompile_mystery_event_script 
Decompile mystery event script
 2018-01-21 14:38:09 -06:00
Devin
26624e2414 Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms 2018-01-21 15:22:49 -05:00
Devin
35cc20c9aa Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms 2018-01-21 15:22:05 -05:00
scnorton
89bbecd34b Include <string.h> in global.h 2018-01-21 14:40:19 -05:00
DizzyEggg
f53a39e7a2 mystery event labels 2018-01-21 19:30:01 +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
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
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
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
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
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
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
Diegoisawesome
24e0edee9f Merge remote-tracking branch 'Pi/song-names' 2018-01-17 00:43:01 -06:00
Devin
9c84e8fd56 Fix typos in songs.h and song_table.inc again, and made the comments match. 
I'm sorry if I sound like a brolen record. ;)
 2018-01-16 19:36:34 -05: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
camthesaxman
157b88b6db identity -> position 2018-01-16 14:01:31 -06: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
Devin
200aea1b09 Fixed typos 2018-01-15 14:10:07 -05:00
Devin
694f7f45bf Add most English song and SFX names as comments in songs.h and song_table.inc 2018-01-15 04:41:24 -05: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
ProjectRevoTPP
0bf530da12 nocashgba printf 2018-01-08 22:03:07 -05:00
camthesaxman
3b097262f5 completely label and document dma3_manager.c 2018-01-07 23:59:42 -06:00
ProjectRevoTPP
d98c14444a NDEBUG which is supposed to be NDEBUG... 2018-01-07 23:46:35 -05: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
10ddfac7ab consistency 2018-01-06 22:00:08 -05:00
ProjectRevoTPP
419e6d885b use firered isagbprint header. 2018-01-06 21:38:34 -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
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
DizzyEggg
ba176dfe07 start working on battle transition 2018-01-01 17:41:34 +01:00
Diegoisawesome
e852700954 Merge remote-tracking branch 'origin/avara-opponent-constants' 2017-12-31 17:40:28 -06: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
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
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
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
sceptillion
3c286feec6 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_songs 2017-12-22 00:17:34 -08:00
sceptillion
e675043558 phoneme constants 2017-12-22 00:14:56 -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
4554b546ef Add missing phoneme entries 2017-12-21 21:20:06 -06:00
DizzyEggg
bcffcb0c1c pokeblock merge conflicts 2017-12-21 23:12:36 +01:00
DizzyEggg
19c25a8f2b start dumping pokedex 2017-12-21 22:56:20 +01:00
DizzyEggg
78f35494a3 fix trainer see pr 2017-12-21 17:51:48 +01: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
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
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
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
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
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
Diegoisawesome
e3c366df64 Merge remote-tracking branch 'pret/master' 2017-12-15 00:08:48 -06:00
Avara
c8ac4e8ce4 Opponents fixed and moved~ 2017-12-12 02:58:57 +00: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
Avara
0c20cd6990 Opponent Constants 2017-12-11 14:37:13 +00: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
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
PikalaxALT
8b5d6fe5d9 CreateWirelessStatusIndicatorSprite 2017-12-03 22:01:06 -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
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
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
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
Diegoisawesome
8e9428c482 Add languages to enum 2017-11-29 00:53:18 -06: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
DizzyEggg
7275585d56 its flavour, not flavor 2017-11-27 21:54:15 +01:00
DizzyEggg
7144b3b7af fix flavour flavor not building, fuccing americans 2017-11-27 21:24:34 +01: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
b0657350a4 berry blender fix merge conflicts 2017-11-26 19:21:51 +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
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
b210d5f86b through c3_80BF560 2017-11-24 21:06:46 -05:00
PikalaxALT
efd23cb91b Cb2_ViewWallClock 2017-11-24 20:06:29 -05:00
PikalaxALT
24009ea941 through Cb2_StartWallClock and associated data 2017-11-24 19:49:03 -05:00
PikalaxALT
f54f2c424f LoadWallClockGraphics 2017-11-24 18:00:26 -05:00
PikalaxALT
ab569cc466 clock.s 2017-11-24 14:57:00 -05:00
PikalaxALT
da04898840 Clean up includes 2017-11-23 23:10:51 -05:00
PikalaxALT
772da493f9 data/unk_81BAD84 2017-11-23 21:15:57 -05:00
PikalaxALT
e8b1059345 CHAR_SPECIAL_F7 constant 
Preface for string decompilation
 2017-11-23 13:29:11 -05:00
PikalaxALT
ef18d3b8ec Decompile asm/unk_text_util.s 2017-11-23 11:23:05 -05:00
PikalaxALT
eff1ad3300 Decompile field poison 2017-11-22 20:13:15 -05:00
PikalaxALT
73b0f9eb53 sub_800CEB0 2017-11-22 00:16:00 -05:00
PikalaxALT
7a38a43f81 sub_800C7B4 2017-11-21 09:14:43 -05:00
PikalaxALT
035c0b0ecd sub_800C744 2017-11-19 18:34:28 -05:00
DizzyEggg
ad3a97e178 berry blender merge conflicts 2017-11-19 22:58:13 +01:00
PikalaxALT
cc82358864 sub_800C54C 2017-11-19 16:54:49 -05:00
DizzyEggg
a3b5af17ea berry blender is done 2017-11-19 22:48:46 +01:00
PikalaxALT
03ce7b042a sub_800C36C 2017-11-19 10:20:44 -05:00
PikalaxALT
d6d315d817 Merge branch 'master' into link 2017-11-19 00:07:56 -05:00
PikalaxALT
22600e81cc Start parsing out link_rfu common syms 2017-11-19 00:02:15 -05:00
PikalaxALT
bf06edfcd3 sub_800C27C 2017-11-18 23:30:23 -05:00
PikalaxALT
155bb03f46 sub_800C210 2017-11-18 21:09:42 -05:00
PikalaxALT
bd30e5aa24 sub_800C12C 2017-11-18 20:55:57 -05:00
PikalaxALT
728532be77 Return stuff to its rightful place, and set up struct definitions for later 2017-11-18 20:33:53 -05:00
DizzyEggg
3de416662b wild encounter, fix merge conflicts 2017-11-18 21:45:52 +01:00
DizzyEggg
185402fe21 more work on berry blender 2017-11-18 21:38:57 +01:00
PikalaxALT
648f3245c1 through sub_800C054 2017-11-18 15:00:38 -05:00
Diegoisawesome
5dc8beb034
Merge pull request #112 from DizzyEggg/decompile_recorded_battle 
Decompile recorded battle
 2017-11-18 13:29:27 -06:00
DizzyEggg
8fd3081306 start working on berry blender 2017-11-18 16:11:34 +01:00
DizzyEggg
f8b40754c7 wild encounter done 2017-11-18 12:27:10 +01:00
DizzyEggg
6b075ae0ff wild encounter file is decompiled 2017-11-17 22:28:55 +01:00
DizzyEggg
d0245cf8d2 recorded battle merge conflicts fix 2017-11-17 19:34:55 +01:00
DizzyEggg
1b7246395d merge conflicts, review changes, daycare 2017-11-17 19:31:03 +01:00
DizzyEggg
a2a17bba92 more work on wild encounter 2017-11-17 17:50:07 +01:00
PikalaxALT
06c1908d00 through sub_800BFCC 2017-11-17 08:44:54 -05:00
PikalaxALT
a054b244ab sub_800BF4C 2017-11-17 08:33:25 -05:00
PikalaxALT
8377b00662 rfu_REQ_sendData_wrapper 2017-11-17 00:05:28 -05:00
PikalaxALT
3c20c54b83 sub_800BEC0 2017-11-16 23:37:09 -05:00
PikalaxALT
236cbf96c8 Merge origin/master into pikalaxalt/link 2017-11-16 19:00:07 -05:00
DizzyEggg
b37d8c0821 start decompiling wild encounter 2017-11-16 20:38:10 +01:00
Diegoisawesome
c0d180a870
Merge pull request #100 from PikalaxALT/heal_location 
Heal location and Field Region Map
 2017-11-15 23:24:45 -06:00
PikalaxALT
b46a15b03e Enclose flag macro definitions in parentheses 2017-11-16 00:13:06 -05:00
Diegoisawesome
6a73c89e54
Merge pull request #113 from DizzyEggg/decompile_pss 
Start Pokemon Storage System
 2017-11-15 20:55:38 -06:00
DizzyEggg
ba00a1c688 daycare file fully done 2017-11-15 22:12:18 +01:00
DizzyEggg
1e79d53d2f merge daycare with master 2017-11-15 17:18:05 +01:00
PikalaxALT
89b695278d Merge branch 'master' into heal_location 2017-11-15 09:01:56 -05:00
PikalaxALT
50501396b2 DoHandshake 2017-11-15 08:44:11 -05:00
Diegoisawesome
ce0e5cbfe4 Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps 2017-11-15 00:47:34 -06:00
Diegoisawesome
3fb2a488f9
Merge pull request #111 from DizzyEggg/decompile_battle5 
Decompile battle5
 2017-11-14 16:52:40 -06:00
Diegoisawesome
118bf4f4b1
Merge pull request #108 from DizzyEggg/decompile_starter_choose 
Decompile starter choose
 2017-11-14 16:41:53 -06:00
DizzyEggg
0310be3007 more of daycare done 2017-11-14 23:25:07 +01:00
DizzyEggg
95949c772e more of daycare done 2017-11-14 21:43:23 +01:00
DizzyEggg
a972de7bca start working on daycare 2017-11-14 20:23:25 +01:00
PikalaxALT
3bb450645b LinkVSync 2017-11-14 08:44:32 -05:00
PikalaxALT
6f8da5dcb6 through DequeueRecvCmd 2017-11-14 08:31:37 -05:00
DizzyEggg
516a5b2219 fix merge conflicts, review changes 2017-11-13 20:00:20 +01:00
DizzyEggg
3e1f3d0e1e recorded battle file is decompiled 2017-11-13 19:01:23 +01:00
DizzyEggg
209b6eb467 more of recorded battle done 2017-11-13 18:07:23 +01:00
PikalaxALT
c81d50cb2f LinkMain1 2017-11-13 01:46:22 -05:00
PikalaxALT
910c39d4ef DisableSerial 2017-11-13 01:20:38 -05:00
PikalaxALT
fcb8c8cf32 through sub_800B524 2017-11-13 01:12:34 -05:00
PikalaxALT
7e4cb5f332 HandleLinkConnection 2017-11-13 01:01:27 -05:00
PikalaxALT
f21c5ebea5 through sub_800B1A0 2017-11-12 23:58:05 -05:00
PikalaxALT
85cf626316 sub_800B080 2017-11-12 23:33:03 -05:00
PikalaxALT
344a71d347 through CB2_LinkError 2017-11-12 23:16:51 -05:00
PikalaxALT
e6b38426b7 sub_800ADF8 2017-11-12 22:44:20 -05:00
PikalaxALT
ccf6599b40 sub_800AC34 2017-11-12 22:09:11 -05:00
PikalaxALT
79609d52c8 MAPSEC_DYNAMIC 2017-11-12 21:39:44 -05:00
PikalaxALT
b346bac98b through GetLinkPlayerCount_2 2017-11-12 21:31:08 -05:00
PikalaxALT
1ca032c6ff Address review items, 1 2017-11-12 21:13:18 -05:00
PikalaxALT
2e95c5575f sub_800AA60 2017-11-12 20:57:21 -05:00
DizzyEggg
c4674735d2 start working on recorded battle 2017-11-12 22:59:36 +01:00
DizzyEggg
716590c165 one more battle label change 2017-11-12 17:11:06 +01:00
DizzyEggg
9febe24d9f label some battle struct fields 2017-11-12 17:06:31 +01:00
DizzyEggg
cd879d6f8a Merge branch 'battle4_fixes' into decompile_battle5 2017-11-12 16:46:44 +01:00
DizzyEggg
47a8c6c432 battle5 decompiled and renamed 2017-11-12 16:39:21 +01:00
DizzyEggg
b7fa10d01e Merge branch 'master' into battle4_fixes 2017-11-12 00:17:38 +01:00
DizzyEggg
7472d639cf match one function in battlescript cmds 2017-11-11 20:01:04 +01:00
DizzyEggg
fa3691ca40 start pss 2017-11-11 14:45:08 +01:00
PikalaxALT
3321548956 Link common syms 2017-11-11 00:25:05 -05:00
PikalaxALT
e874cbd9d9 Rename functions in link.c 2017-11-11 00:05:44 -05:00
PikalaxALT
efd0651efe through sub_800A678 2017-11-10 22:34:23 -05:00
PikalaxALT
27c0dc0fd5 through sub_800A588 2017-11-10 22:08:17 -05:00
PikalaxALT
50c1622507 Split link.s and link_rfu.s 2017-11-10 20:47:24 -05:00
PikalaxALT
3503444d3b Some EWRAM offsets abstracted away 2017-11-10 20:27:02 -05:00
Diegoisawesome
2e40384fa2 Extract baseroms from event_scripts 2017-11-10 18:12:18 -06:00
PikalaxALT
27f9dd0a97 sub_800A0C8 2017-11-10 19:06:06 -05:00
PikalaxALT
d76901ff64 through sub_800A0AC 2017-11-10 08:37:50 -05:00
PikalaxALT
1523d5c01e sub_8009D90 2017-11-09 21:48:27 -05:00
Diegoisawesome
09e431077a Merge remote-tracking branch 'pret/master' into dump_maps 2017-11-09 20:30:56 -06:00
PikalaxALT
d94f74d261 sub_8009AA0 2017-11-09 21:14:43 -05:00
PikalaxALT
9a9f601244 sub_8009900 2017-11-08 19:58:59 -05:00
PikalaxALT
e68dbd6276 through sub_8009818 2017-11-08 19:29:37 -05:00
Diegoisawesome
e6ef86e4b0 Update variable and flag names 2017-11-08 15:20:10 -06:00
DizzyEggg
61408456e8 starter choose file is decompiled 2017-11-08 18:05:47 +01:00
PikalaxALT
d5547a3744 main.c common syms 2017-11-07 23:53:30 -05:00
PikalaxALT
9029fb27c1 through sub_8009734 2017-11-07 22:52:10 -05:00
PikalaxALT
f90106ae6c sub_8009638 2017-11-07 22:26:00 -05:00
PikalaxALT
0709dc7e4c sub_8009570 2017-11-07 22:14:40 -05:00
PikalaxALT
59eb766f47 sub_80094EC 2017-11-07 21:45:44 -05:00
PikalaxALT
fce326fbd4 through sub_8009414 2017-11-07 20:25:24 -05:00
PikalaxALT
bc063b45d0 sub_80E7FF8 2017-11-06 23:33:39 -05:00
PikalaxALT
8d6007256f sub_80E7F68 2017-11-06 23:20:11 -05:00
PikalaxALT
0a17fc98f6 nonmatching sub_80E7B60 2017-11-06 23:03:11 -05:00
DizzyEggg
a729e9838e move data to hall of fame c file 2017-11-06 18:41:32 +01:00
DizzyEggg
bd56bb073f start working on hall of fame 2017-11-05 12:05:07 +01:00
PikalaxALT
8d05aeccec sub_80E7A14 2017-11-04 19:03:41 -04:00
PikalaxALT
f2e723660b sub_80E7948 2017-11-04 18:48:13 -04:00
PikalaxALT
158e9ff762 sub_80E78C4 2017-11-04 12:20:40 -04:00
PikalaxALT
d921e555d2 sub_80E7630 2017-11-04 11:39:23 -04:00
DizzyEggg
32c7d4f252 make it compile 2017-11-04 16:25:19 +01:00
PikalaxALT
6c746425ed sub_80E756C 2017-11-04 11:16:07 -04:00
DizzyEggg
352102a07a Merge branch 'master' into decompile_battle_7 2017-11-04 16:12:45 +01:00
DizzyEggg
6c8155074b battle 7 is decompiled 2017-11-04 16:11:13 +01:00
PikalaxALT
411cb29f4a sub_80E7324 2017-11-04 10:55:39 -04:00
PikalaxALT
c054446790 through sub_80E715C 2017-11-04 10:15:58 -04:00
PikalaxALT
1c3e7f169f sub_80E6E24 2017-11-03 22:26:12 -04:00
PikalaxALT
20ebcf7169 sub_80E6D54 2017-11-03 22:07:36 -04:00
PikalaxALT
f8486b31c5 sub_80E6CA0 2017-11-03 21:56:18 -04:00
PikalaxALT
ca2bc94c2b through sub_80E6BF8 2017-11-03 20:59:29 -04:00
PikalaxALT
01d6114da2 easy_chat_input_maybe 2017-11-02 19:26:14 -04:00
PikalaxALT
ed7ded0748 Merge branch 'master' into easy_chat 2017-11-02 18:34:41 -04:00
DizzyEggg
5243285ab2 start working on battle 7 2017-11-02 18:19:49 +01:00
PikalaxALT
ab3b8cd51a Merge branch 'master' into heal_location 2017-11-02 07:59:29 -04:00
Diegoisawesome
af197ccd3b
Merge pull request #98 from PikalaxALT/bard_music 
Decompile bard music
 2017-11-01 23:18:10 -05:00
PikalaxALT
75262c1920 Merge branch 'master' into bard_music 2017-11-02 00:09:14 -04:00
PikalaxALT
17fd3bccf7 Merge branch 'master' into secret_base 2017-11-01 23:39:54 -04:00
PikalaxALT
9cfdc8b7e8 Merge branch 'master' into heal_location 2017-11-01 23:37:41 -04:00
PikalaxALT
c99a08d448 More data decomp in region_map 2017-11-01 23:00:22 -04:00
PikalaxALT
4ff03f85a9 Decompile data related to Emerald-specific areas 2017-11-01 22:07:30 -04:00
PikalaxALT
50efd7b68d Decompile region map entry structs 2017-11-01 21:51:59 -04:00
PikalaxALT
e3005e88c7 Decompile remaining functions in region_map 2017-11-01 00:34:57 -04:00
PikalaxALT
8c73c1450f sub_8124904 2017-10-31 23:11:48 -04:00
PikalaxALT
f61822535b MCB2_FlyMap 2017-10-31 22:34:12 -04:00
PikalaxALT
f6d1e5a965 through sub_8124668 2017-10-31 22:05:23 -04:00
PikalaxALT
c3c08bf037 through sub_8124610 2017-10-31 21:55:57 -04:00
PikalaxALT
ef535b98b5 through GetMapName 2017-10-31 21:51:11 -04:00
PikalaxALT
968ff8c3c8 through UnhideRegionMapPlayerIcon 2017-10-31 20:58:47 -04:00
PikalaxALT
7d7c8e8ba6 sub_8124288 2017-10-31 19:40:35 -04:00
DizzyEggg
6cb1c4fd6e fix merge conflicts, evo scene 2017-10-31 19:36:25 +01:00
DizzyEggg
192817a7dc clarify controllers terminator 2017-10-31 18:49:29 +01:00
DizzyEggg
712ae56167 review change battle controllers 2017-10-31 18:04:08 +01:00
PikalaxALT
6cd0086bf9 through CreateRegionMapCursor 2017-10-31 08:38:17 -04:00
PikalaxALT
853ced6687 sub_8123FB0 2017-10-30 22:35:28 -04:00
PikalaxALT
4db83e0097 through sub_8123F9C 2017-10-30 22:20:09 -04:00
PikalaxALT
ccbeaccc9b sub_8123F30 2017-10-30 21:47:37 -04:00
PikalaxALT
7b6792230a sub_8123EB4 2017-10-30 21:34:19 -04:00
PikalaxALT
f0c71c7e3f get_flagnr_blue_points 2017-10-30 21:20:31 -04:00
PikalaxALT
cd9022f929 sub_8123C00 2017-10-30 21:14:52 -04:00
PikalaxALT
525b17a110 sub_81238AC 2017-10-30 21:08:28 -04:00
PikalaxALT
c324722987 through GetRegionMapSectionIdAt 2017-10-30 08:58:43 -04:00
PikalaxALT
f6a55433a2 through sub_81237B4 2017-10-30 08:46:36 -04:00
PikalaxALT
474df27136 through CalcZoomScrollParams 2017-10-30 08:39:39 -04:00
PikalaxALT
35a6d2046a sub_8123418 2017-10-29 23:08:06 -04:00
PikalaxALT
1597284694 sub_8123334 2017-10-29 22:05:15 -04:00
PikalaxALT
16c5a58f35 sub_8123254 2017-10-29 21:38:45 -04:00
PikalaxALT
8d35bf1c9e _swiopen 2017-10-29 21:31:38 -04:00
PikalaxALT
f07307dc73 sub_81230C4 2017-10-29 21:14:53 -04:00
PikalaxALT
a9afb8b130 through sub_81230AC 2017-10-29 20:58:53 -04:00
PikalaxALT
6f68e5af95 sub_8122DB0 2017-10-29 20:49:49 -04:00
PikalaxALT
76bb397e83 region_map.c through sub_8122CF8 2017-10-29 19:33:53 -04:00
DizzyEggg
51df918c04 evo scene file is done 2017-10-29 16:15:23 +01:00
PikalaxALT
6e10e8caad sub_8170428 2017-10-29 11:05:42 -04:00
PikalaxALT
929638f572 sub_8170290 2017-10-29 10:58:33 -04:00
PikalaxALT
0a060ae254 Start decompiling field_region_map 2017-10-29 10:38:25 -04:00
PikalaxALT
4049ed7e2c Rename REGION_MAP constants to adopt MAPSEC names from Ruby 2017-10-28 22:03:33 -04:00
PikalaxALT
bbda7125f6 Rename functions 2017-10-28 21:43:06 -04:00
PikalaxALT
00f4bba6d8 Decompile heal location functions 2017-10-28 20:55:01 -04:00
PikalaxALT
6fcde15bb6 Decompile heal location data 2017-10-28 20:43:33 -04:00
PikalaxALT
975e28c01e Merge branch 'master' into easy_chat 2017-10-28 20:03:24 -04:00
PikalaxALT
6e5dcf19f7 Slight reorganization of data includes 2017-10-28 15:43:50 -04:00
PikalaxALT
175e2e6b37 Slight touchup 2017-10-28 10:44:19 -04:00
PikalaxALT
607b7ac834 Decompile remaining bard music data 2017-10-28 10:42:12 -04:00
PikalaxALT
4ae9b1d9d0 Decompile Bard Sound structs 2017-10-28 10:27:28 -04:00
PikalaxALT
5da296e94e GetWordPhonemes; assign names and improve guess of types 2017-10-28 09:46:35 -04:00
PikalaxALT
002b394855 through sub_817C7F4 2017-10-28 09:05:40 -04:00
PikalaxALT
bb10a4dd57 Merge branch 'master' into secret_base 2017-10-27 23:25:15 -04:00
PikalaxALT
a5951592be Decompile data 2017-10-27 23:21:09 -04:00
PikalaxALT
9c3a79f3de through sub_80EB218 2017-10-27 22:12:11 -04:00
DizzyEggg
e8903fb4dd start workin on evo scene 2017-10-27 18:52:21 +02:00
DizzyEggg
f4e134569f evo graphics file is done 2017-10-27 15:49:14 +02:00
PikalaxALT
fbfcce3f35 sub_80EA3E4 2017-10-26 23:35:41 -04:00
PikalaxALT
fcaccb8501 through sub_80EA30C 2017-10-26 22:49:51 -04:00
PikalaxALT
1ed15b3952 through sub_80EA20C 2017-10-26 22:37:16 -04:00
PikalaxALT
81100d155a sub_80EA08C 2017-10-26 22:21:20 -04:00
PikalaxALT
68a253990d through sub_80E9FB0 2017-10-26 22:10:38 -04:00
PikalaxALT
48f38a888b through sub_80E9E44 2017-10-26 21:53:00 -04:00
PikalaxALT
135da0136f through game_continue 2017-10-26 21:39:34 -04:00
DizzyEggg
5e285c3bca Merge branch 'master' into decompile_battle_controllers 2017-10-26 23:13:09 +02:00
DizzyEggg
1506184465 battle controller opponent is done 2017-10-26 23:12:48 +02:00
camthesaxman
5ea2f463d7 also fix ambiguous MON_DATA_SPD_EV and MON_DATA_SPD2 constants 2017-10-26 13:47:14 -05:00
PikalaxALT
84a9441267 MWF: sub_80E9914 2017-10-25 19:54:24 -04:00
DizzyEggg
fa36e23683 start opponent controller, thx bird 2017-10-25 21:57:28 +02:00
PikalaxALT
ea507b8d43 sub_80E9780 2017-10-25 08:41:25 -04:00
PikalaxALT
b4f9acd039 sub_80E9744 2017-10-25 08:34:41 -04:00
PikalaxALT
835a04ada8 through sub_80E9668 2017-10-25 08:22:36 -04:00
PikalaxALT
9e3bb08e04 sub_80E933C 2017-10-24 22:34:52 -04:00
PikalaxALT
09605333c8 sub_80E9238 2017-10-24 22:17:26 -04:00
PikalaxALT
1f5378c6d1 sub_80E9108 2017-10-24 21:41:22 -04:00
PikalaxALT
0b0926f127 through sub_80E909C 2017-10-24 21:27:46 -04:00
PikalaxALT
6558af388b sub_80E8F9C 2017-10-24 21:10:58 -04:00
PikalaxALT
326e37a0d3 through sub_80E8D4C 2017-10-24 20:19:33 -04:00
DizzyEggg
3ece244246 wally controller is done 2017-10-24 21:45:41 +02:00
DizzyEggg
94b3a8dd69 spd to speed 2017-10-24 15:35:36 +02:00
DizzyEggg
0659b19e99 Merge branch 'master' into decompile_battle_controllers 2017-10-24 15:27:55 +02:00
DizzyEggg
bffcd426cf link opponent controller is done 2017-10-24 15:25:20 +02:00
camthesaxman
1bb931245b use SPEED instead of SPD in mon data constants 2017-10-23 20:43:26 -05:00
PikalaxALT
7bf352944f sub_80E8BF8 2017-10-23 19:29:16 -04:00
PikalaxALT
eb2c2f0a3f through sub_80E8BC8 2017-10-23 19:21:08 -04:00
DizzyEggg
1f3a867a0b battle link partner controller is done 2017-10-23 16:38:11 +02:00
DizzyEggg
356eb34e32 undo revert 2017-10-23 14:40:22 +02:00
DizzyEggg
5b70307962 revert merge coz its bugged 2017-10-23 13:36:55 +02:00
DizzyEggg
7d1373e3fa Merge branch 'master' into decompile_battle_controllers 2017-10-23 13:33:32 +02:00
DizzyEggg
918625196e recorded player controller is done 2017-10-23 13:32:11 +02:00
Diegoisawesome
88230e8d16 Merge pull request #91 from golemgalvanize/summary 
partially decompile pokemon_summary_screen
 2017-10-22 20:16:16 -05:00
PikalaxALT
1ef4dbe691 Fix global declarations of libc fns 2017-10-22 20:43:03 -04:00
PikalaxALT
0dd3db7061 Rename some functions and all RAM objects in decoration.c 2017-10-22 20:13:31 -04:00
PikalaxALT
c042e5148b Decoration + decoration_inventory (#89) 
* SetDecorationInventoriesPointers

* ClearDecorationInventories

* CheckHasDecoration

* DecorationAdd

* DecorationCheckSpace

* DecorationRemove

* sub_8161A38

* CountDecorations; Funcion renaming

* Disassemble decoration data structs, tilemaps, and descriptions

* sub_8126968

* sub_81269D4

* through sub_8126A88

* through sub_8126B2C

* sub_8126B80

* sub_8126C08

* sub_8126C48

* sub_8126CA4

* sub_8126D10

* sub_8126E44

* sub_8126E8C

* sub_8126F68

* sub_8127058

* sub_8127088

* sub_81270E8

* through sub_8127208

* through sub_8127268

* sub_8127284

* through sub_81272F8

* sub_8127330

* through sub_8127480

* sub_81274A0

* sub_8127500; makefile now tells scaninc to scan headers

* Actual real fix to mapfile being in build/emerald instead of wd

* through sub_812759C

* through sub_812764C

* through sub_8127744

* through sub_81277BC

* sub_81277E8

* sub_8127814

* through sub_81279C4

* through sub_8127ACC

* sub_8127B04

* sub_8127B54

* sub_8127B90

* sub_8127D38

* sub_8127E18

* sub_8127F68

* sub_8128060

* ConfigureCameraObjectForPlacingDecoration

* SetUpPlacingDecorationPlayerAvatar

* sub_812826C

* through sub_8128414

* through sub_81284F4

* sub_812853C

* sub_8128950

* through sub_8128AAC

* through sub_8128BBC

* c1_overworld_prev_quest

* sub_8128C64

* sub_8128CD4

* sub_8128D10

* sub_8128DB4

* through sub_8128E18

* through sub_8129068

* sub_8129088

* through sub_81291E8

* sub_812925C

* sub_81292D0

* sub_81292E8

* gpu_pal_decompress_alloc_tag_and_upload

* AddDecorationIconObjectFromIconTable

* GetDecorationIconPicOrPalette

* AddDecorationIconObjectFromFieldObject

* AddDecorationIconObject

* through sub_8129708

* sub_81297F8

* sub_81298EC

* SetUpPuttingAwayDecorationPlayerAvatar

* sub_8129ABC

* sub_8129B34

* sub_8129BCC

* through sub_8129C74

* through sub_8129D8C

* sub_8129E0C

* sub_8129E74

* sub_8129F20

* sub_8129FC8

* sub_812A040

* nonmatching sub_812A0E8

* through sub_812A22C

* sub_812A25C

* sub_812A2C4

* through sub_812A39C

* Remaining fns in decoration.s

* Decompile decoration headers

* Decompile all remaining decoration data that had already been disassembled

* Disassemble two data objects

* Suggest structure of list menu template

* decompile through decoration list menu template

* Disassemble decoration icon graphics table

* Rip icon gfx

* Decompile deco icon table

* Decompile more data related to drawing decorations

* Decompile gUnknown_085A7250 structs

* Decompile two sprite templates

* Decompile remaining data in decoration.s

* Decompile decoration ewram

* deco -> decor
 2017-10-22 17:55:07 -05:00
DizzyEggg
26c79313d8 safari controller is done 2017-10-22 20:38:23 +02:00
DizzyEggg
f77dcef59d Merge branch 'master' into decompile_battle_controllers 2017-10-22 18:47:06 +02:00
DizzyEggg
df4e32a307 player battle controller is done 2017-10-22 18:43:15 +02:00
ProjectRevoTPP
29fb6d8d1e whoops 2017-10-21 23:23:03 -04:00
ProjectRevoTPP
a43d6d4a53 review changes 2017-10-21 23:20:50 -04:00
Diegoisawesome
b8f23aa20d Merge branch 'master' of github.com:pret/pokeemerald 2017-10-21 20:20:52 -05:00
Diegoisawesome
667914075b Merge branch 'librfu-decomp' 2017-10-21 20:11:31 -05:00
DizzyEggg
813b1bfd4a label and do more work at player controller 2017-10-22 01:04:02 +02:00
shinyquagsire23
482b42a295 Split librfu into separate C files in its own directory, rfu_initializeAPI matching except for register differences 2017-10-21 13:46:41 -06:00
DizzyEggg
3d1c16523e start working on battle controllers, especially player 2017-10-21 17:32:35 +02:00
Diegoisawesome
afd42c8e14 Merge pull request #92 from DizzyEggg/decompile_walda_phrase 
decompile walda phrase
 2017-10-20 14:01:40 -05:00
DizzyEggg
31e0b468c7 move from raq scene to walda phrase 2017-10-20 20:46:26 +02:00
DizzyEggg
8c85a27346 walda phrase is done 2017-10-20 20:39:00 +02:00
Diegoisawesome
d2cf86bff9 Merge pull request #82 from PikalaxALT/mail 
Decompile functions for reading mail
 2017-10-20 13:22:56 -05:00
DizzyEggg
ccd7e8b3b1 battle interface review changes 2017-10-20 19:24:46 +02:00
DizzyEggg
cda5c5f925 start working on walda phrase 2017-10-20 18:52:01 +02:00
DizzyEggg
b65da491a9 merge with master, fix conflicts 2017-10-20 10:49:21 +02:00
PikalaxALT
7bc152e2ed Merge branch 'master' into mail 2017-10-19 18:45:38 -04:00
DizzyEggg
36035518dc review battle anim changes 2017-10-20 00:01:17 +02:00
DizzyEggg
dee6133076 fix merge conflicts 2017-10-19 19:46:37 +02:00
Diegoisawesome
8ceecd9fba Merge pull request #81 from DizzyEggg/decompile_rom3 
Decompile rom_3
 2017-10-19 12:40:56 -05:00
DizzyEggg
9ccc472b97 label some functions 2017-10-19 18:25:48 +02:00
DizzyEggg
11bead31e9 battle interface is done 2017-10-19 15:28:41 +02:00
U-User-PC\User
d4532c70cb fix merge conflicts 2017-10-18 19:28:36 -04:00
DizzyEggg
ee6bdc9068 more battle interface 2017-10-18 23:52:21 +02:00
DizzyEggg
7c24b03742 Merge branch 'master' into decompile_battle_interface 2017-10-18 23:05:55 +02:00
DizzyEggg
6e56211f40 more of battle interface done 2017-10-18 21:42:00 +02:00
DizzyEggg
0ffc5652fd hp printing in healthboxes done I hope 2017-10-18 00:00:46 +02:00
DizzyEggg
4b45282dd3 start working on battle interface 2017-10-16 18:12:27 +02:00
DizzyEggg
003a8a501b fix merge conflict 2017-10-15 23:27:27 +02:00
DizzyEggg
dd0f19476c battle anim file is decompiled 2017-10-15 23:21:59 +02:00
DizzyEggg
ebb2999c03 more of battle anim done 2017-10-14 23:37:44 +02:00
DizzyEggg
752ce9b90d start working on battle anim 2017-10-14 16:55:25 +02:00
PikalaxALT
a252140f3b Merge branch 'master' into mail 2017-10-14 09:52:56 -04:00
DizzyEggg
455202eca0 Merge branch 'master' into decompile_rom3 2017-10-14 11:36:28 +02:00
DizzyEggg
14e41d6c50 rom3 is decompiled 2017-10-14 11:34:26 +02:00
Diegoisawesome
924c0c6b5a Merge branch 'master' of https://github.com/pret/pokeemerald into decomp_scrcmd 2017-10-13 20:29:11 -05:00
Diegoisawesome
2852f4f1b8 Continue attempt to decomp braillemessage 2017-10-13 19:48:09 -05:00
DizzyEggg
72ed861715 fix rom3 conflicts 2017-10-13 19:58:45 +02:00
DizzyEggg
20d158cf4a start decompiling emitters 2017-10-13 19:46:27 +02:00
Diegoisawesome
3040c1e1aa Merge pull request #75 from DizzyEggg/decompile_reshow_battle_screen 
Decompile reshow battle screen
 2017-10-13 12:42:42 -05:00
PikalaxALT
32168adbc8 Remaining functions 2017-10-13 12:03:15 -04:00
PikalaxALT
cc84713249 sub_8121B1C 2017-10-13 11:47:17 -04:00
DizzyEggg
c78679ae66 rom3 decomp start 2017-10-13 17:22:50 +02:00
PikalaxALT
e24f3808f4 Merge branch 'master' into mail 2017-10-13 11:16:34 -04:00
PikalaxALT
52db3ad5aa Decompile TV (#80) 
* ClearTVShowData

* special_0x44

* DoTVShow (nonmatching because align)

* DoTVShowBravoTrainerPokemonProfile

* Update field names

* DoTVShowBravoTrainerBattleTower

* Renaming of struct fields

* sub_80EBFF4 and UpdateTVScreensOnMap

* SetTVMetatilesOnMap

* Power buttons for the TV screens on the map

* special_0x45

* sub_80EC18C

* special_0x4a

* ResetGabbyAndTy

* GabbyAndTyBeforeInterview

* GabbyAndTyAfterInterview

* Through IsTVShowInSearchOfTrainersAiring

* GabbyAndTyGetLastQuote

* GabbyAndTyGetLastBattleTrivia

* GabbyAndTySetScriptVarsToFieldObjectLocalIds

* InterviewAfter; use TVShow as a precursor for making the individual show structs anonymous

* Make TV structs anonymous within the union

* Move the TV union to its own subheader

* Move TV show enums to the global.tv.h subheader

* Funcion renaming

* Apply static attributes where able

* PutPokemonTodayCaughtOnAir

* sub_80EC8A4

* PutPokemonTodayFailedOnTheAir

* sub_80EC9E8, sub_80ECA10

* sub_80ECA38

* sub_80ECB00

* Put3CheersForPokeblocksOnTheAir

* PutFanClubSpecialOnTheAir

* ContestLiveUpdates_BeforeInterview

* Other before-interview Contest Live Updates functions

* ContestLiveUpdates_BeforeInterview_5

* InterviewAfter_BravoTrainerPokemonProfile

* BravoTrainerPokemonProfile_BeforeInterview1

* BravoTrainerPokemonProfile_BeforeInterview2

* Disassemble TV data

* Decompile TV data

* InterviewAfter_BravoTrainerBattleTowerProfile

* SaveRecordedItemPurchasesForTVShow

* PutNameRaterShowOnTheAir

* StartMassOutbreak

* PutLilycoveContestLadyShowOnTheAir

* InterviewAfter_FanClubLetter

* Rip TV strings

* InterviewAfter_RecentHappenings

* InterviewAfter_PkmnFanClubOpinions

* sub_80ED718

* EndMassOutbreak

* sub_80ED888

* sub_80ED8B4

* UpdateMassOutbreakTimeLeft

* sub_80ED950

* PutFishingAdviceShowOnTheAir

* through sub_80EDA80

* ewram and common syms are now fetched from the object files

* BSS symbols are taken from the tv.o file

* through sub_80EDC60

* sub_80EDCE8

* sub_80EDD78

* through sub_80EDE84

* nomatching sub_80EDE98

* sub_80EDFB4

* sub_80EE104

* sub_80EE104

* sub_80EE184

* sub_80EE2CC

* sub_80EE35C

* sub_80EE44C

* sub_80EE4DC

* sub_80EE5A4

* sub_80EE69C

* sub_80EE72C

* sub_80EE7C0

* sub_80EE818

* sub_80EE8C8

* sub_80EEA70

* sub_80EEB98

* sub_80EEBF4

* through sub_80EED60

* Functions relating to Pokemon News

* sub_80EEF6C

* GetPriceReduction

* IsPriceDiscounted

* sub_80EF120

* through sub_80EF370

* sub_80EF40C

* HasMixableShowAlreadyBeenSpawnedWithPlayerID

* TV_SortPurchasesByQuantity

* FindActiveBroadcastByShowType_SetScriptResult

* InterviewBefore

* through sub_80EF88C

* through sub_80EF93C

* through sub_80EFA24

* through TV_BernoulliTrial

* sub_80EFB58

* sub_80EFBA4

* sub_80EFBDC

* through sub_80EFD98

* ChangePokemonNickname

* ChangeBoxPokemonNickname

* sub_80EFF9C

* through player_id_to_dword

* CheckForBigMovieOrEmergencyNewsOnTV

* GetMomOrDadStringForTVMessage

* sub_80F01E8

* sub_80F0358

* sub_80F049C

* TV record mixing functions

* sub_80F06D0

* sub_80F0708 nonmatching

* through sub_80F0B24

* sub_80F0B64

* through sub_80F0C04

* sub_80F0C7C

* sub_80F0D60

* sub_80F0E58

* sub_80F0E84

* through sub_80F0F24

* sub_80F0F64

* sub_80F1208

* sub_80F1254

* sub_80F1290

* sub_80F12A4

* sub_80F14F8

* DoTVShowTodaysSmartShopper

* DoTVShowTheNameRaterShow

* DoTVShowPokemonTodaySuccessfulCapture

* DoTVShowPokemonTodayFailedCapture

* DoTVShowPokemonFanClubLetter

* DoTVShowRecentHappenings

* DoTVShowPokemonFanClubOpinions

* DoTVShowPokemonNewsMassOutbreak

* DoTVShowPokemonContestLiveUpdates

* DoTVShowPokemonBattleUpdate

* DoTVShow3CheersForPokeblocks

* DoTVShowInSearchOfTrainers

* Label GabbyAndTyData fields; remove ddump comments from data/text/tv.inc

* DoTVShowPokemonAngler

* DoTVShowTheWorldOfMasters; update RAM symbols and field names

* Decorate static functions

* DoTVShowTodaysRivalTrainer; region map enums

* TVDewfordTrendWatcherNetworkTextGroup

* DoTVShowHoennTreasureInvestigators

* DoTVShowFindThatGamer

* DoTVShowBreakingNewsTV

* DoTVShowSecretBaseVisit

* DoTVShowPokemonLotterWinnerFlashReport

* DoTVShowThePokemonBattleSeminar

* DoTVShowTrainerFanClubSpecial, DoTVShowTrainerFanClub

* DoTVShowSpotTheCuties

* DoTVShowPokemonNewsBattleFrontier

* DoTVShowWhatsNo1InHoennToday

* Helpers for DoTVShowSecretBaseSecrets

* DoTVShowSecretBaseSecrets

* DoTVShowSafariFanClub

* Finish decompilation of tv.s

* Some renaming

* Rename text group pointers

* revoke statis; pokenews enums

* Labels are number one

* Label all TV struct fields

* Make data/text/tv.inc more readable

* Split data/text/tv.inc

* Rename pokenews text pointers

* Frontier Symbol constants; indicate static rodata objects with 's' prefix

* Fix leading spaces/tabs

F*** CLion sometimes

* Fix inconsequential warning
 2017-10-13 10:09:36 -05:00
PikalaxALT
74c59af856 sub_8121A1C 2017-10-13 08:47:26 -04:00
DizzyEggg
0f44747788 review changes 2017-10-13 12:25:32 +02:00
DizzyEggg
b229a1c295 Merge branch 'master' into decompile_reshow_battle_screen 2017-10-13 12:18:32 +02:00
PikalaxALT
3c4478b370 Decompile data 2017-10-13 00:11:55 -04:00
Diegoisawesome
24bd8c73e1 Name some new script commands 2017-10-12 22:34:58 -05:00
PikalaxALT
aa3af7a3a7 sub_81219F0 2017-10-12 23:05:36 -04:00
PikalaxALT
52af334b89 sub_81215EC 2017-10-12 22:59:01 -04:00
Diegoisawesome
df04aca8d2 Merge branch 'decompile_battle_9' of https://github.com/DizzyEggg/pokeemerald into DizzyEggg-decompile_battle_9 2017-10-12 19:46:39 -05:00
Diegoisawesome
3131014b1b Merge branch 'qwerty2' of https://github.com/DizzyEggg/pokeemerald into DizzyEggg-qwerty2 2017-10-12 17:55:10 -05:00
PikalaxALT
8d31a46c6f sub_8121478 2017-10-12 15:59:43 -04:00
Diegoisawesome
f300f853c8 Add const qualifiers to scrcmd 2017-10-12 14:39:18 -05:00
Diegoisawesome
f1b6358047 Port/decomp scrcmd 2017-10-12 02:06:19 -05:00
DizzyEggg
a3b62f43ee battle 9 is decompiled 2017-10-11 12:49:42 +02:00
DizzyEggg
6dfe8ced2c ai switching basically done 2017-10-10 21:45:07 +02:00
DizzyEggg
57e5624e06 battle9 is being worked on 2017-10-10 18:01:45 +02:00
DizzyEggg
e382a73e9d merge branch master 2017-10-10 11:48:16 +02:00
Diegoisawesome
8914645231 Merge pull request #72 from DizzyEggg/fix_static_names 
Add Save Location header and fix static names
 2017-10-09 18:17:04 -05:00
U-User-PC\User
42f633cbf4 (un)fix battle.h 2017-10-09 16:00:18 -04:00
U-User-PC\User
f438734192 fixing merge conflicts 2017-10-09 13:32:57 -04:00
DizzyEggg
ab03b03c4b decompile reshow battle screen 2017-10-09 18:18:40 +02:00
DizzyEggg
9d4acb9635 some work on international string util 2017-10-09 15:40:08 +02:00
DizzyEggg
fdfbbb4951 add diploma header and static names fix 2017-10-09 13:55:31 +02:00
DizzyEggg
7b690dbe3a add save location header, change static names 2017-10-09 13:48:41 +02:00
DizzyEggg
95e4ae06ce battle message decompiled and dumped 2017-10-08 14:54:51 +02:00
DizzyEggg
7552caaadc placeholders for battle strings are done 2017-10-07 19:59:41 +02:00
DizzyEggg
db63fc1a09 battle message huge take off 2017-10-07 15:15:47 +02:00
ProjectRevoTPP
e38fd8347d use rodata for save_failed_screen 2017-10-06 21:59:47 -04:00
ProjectRevoTPP
4b4d9907a8 merge 2017-10-06 18:35:51 -04:00
ProjectRevoTPP
d0dfc758fc decompile save_failed_screen.c 2017-10-06 18:33:35 -04:00
DizzyEggg
7b88c7f2f0 move const data to battle files 2017-10-06 19:09:37 +02:00
DizzyEggg
3cc20c7c3f battle 2 is done 2017-10-06 17:06:45 +02:00
DizzyEggg
342e616d4b battle2 more and more and more 2017-10-06 00:12:01 +02:00
DizzyEggg
d87d19cfe5 more battle2 done 2017-10-04 19:25:14 +02:00
DizzyEggg
aaa191f0d8 Merge branch 'master' into decomp_battle2 2017-10-04 11:18:50 +02:00
U-User-PC\User
750937c58c fix battle.h 2017-10-03 16:10:18 -04:00
U-User-PC\User
1ae3d9b57b I hope this fixes merge conflicts 2017-10-03 15:54:19 -04:00
DizzyEggg
46fe1f441f giant battle handler is done wohohohhohoho 2017-10-03 21:35:27 +02:00
DizzyEggg
c8114eb3a5 create battle_transition.h 2017-10-03 12:11:13 +02:00
Diegoisawesome
d32ec8bf72 Merge pull request #59 from PikalaxALT/sym_bss 
BSS; decompile tileset_anims
 2017-10-03 01:26:01 -05:00
PikalaxALT
2701191a76 Merge branch 'master' into unk_text_util_2 2017-10-02 22:09:29 -04:00
PikalaxALT
10c5a7a2dd Merge branch 'master' into sym_bss 2017-10-02 22:04:43 -04:00
DizzyEggg
db58d5e24a battle2 3500 C lines 2017-10-02 23:32:39 +02:00
PikalaxALT
993d5e2a6a clean up declarations in src/palette.c 2017-10-01 21:50:58 -04:00
DizzyEggg
d4e1c417d3 Merge branch 'master' into decomp_battle2 2017-10-01 18:55:21 +02:00
DizzyEggg
1fcafaf35a more of battle2 done 2017-10-01 18:54:01 +02:00
DizzyEggg
729f4e10ed start decompiling battle2 2017-10-01 01:12:42 +02:00
Diegoisawesome
a96cadf4ee Merge pull request #56 from PikalaxALT/map_constants 
Add Avara's map_constants.h
 2017-09-30 11:58:24 -05:00
PikalaxALT
ef0b022707 BSS: src/main.o, src/dma3_manager.o 2017-09-30 09:32:46 -04:00
PikalaxALT
87b16995eb Add Avara's map_constants.h 2017-09-30 08:40:21 -04:00
Diegoisawesome
13017a3b19 Merge pull request #55 from DizzyEggg/decompile_metatile_behavior 
decompile metatile behavior
 2017-09-30 03:11:36 -05:00
Diegoisawesome
741c99cded Merge pull request #45 from DizzyEggg/decomp_battle4 
Decompile Battle 4
 2017-09-30 03:00:10 -05:00
Diegoisawesome
f09a6a653c Merge pull request #52 from DizzyEggg/patch-2 
Update songs.h
 2017-09-30 02:49:15 -05:00
Diegoisawesome
52a66f0d4c Merge pull request #50 from DizzyEggg/decomp_roamer 
decompile roamer
 2017-09-30 02:31:43 -05:00
DizzyEggg
f5387cf6b1 decompile metatile behav 2017-09-29 19:03:50 +02:00
DizzyEggg
eb4f195c19 Update songs.h 
Thanks to Jughead Jones, Wobb, Lunos, Bela and anyone else who helped.
 2017-09-29 08:37:15 +02:00
DizzyEggg
e41b9cbbb3 decompile money 2017-09-29 00:11:42 +02:00
DizzyEggg
f1fe0c217d decompile roamer 2017-09-28 20:52:36 +02:00
DizzyEggg
6d4d58a8a7 rename battle4 and battleai 2017-09-28 17:38:07 +02:00
DizzyEggg
7273b8f262 battle 4 is all done 2017-09-28 16:51:24 +02:00
DizzyEggg
14fcc9ec20 merge with master and move to C 2017-09-28 16:32:23 +02:00
DizzyEggg
bc3b4b4d9a battle 4 commands are decompiled 2017-09-28 15:34:21 +02:00
DizzyEggg
69928d3904 battle 4 up to 0xE5 2017-09-27 23:43:45 +02:00
scnorton
d160ca4679 Merge branch 'master' into easy_chat 2017-09-26 18:24:39 -04:00
yenatch
3c8091393c Merge pull request #47 from PikalaxALT/split_data3 
Split data3
 2017-09-26 18:16:52 -04:00
DizzyEggg
d769ec1374 battle 4 up to a8 2017-09-26 22:39:59 +02:00
PikalaxALT
0e75d957d6 Update offset comments in save block 1 2017-09-25 19:57:44 -04:00
Diegoisawesome
d1efbcd282 Extract scattered baseroms and cleanup 2017-09-25 16:27:02 -05:00
scnorton
bf9e2b7210 split data3_a1 2017-09-25 15:03:52 -04:00
PikalaxALT
0984461aeb Start decomp of easy_chat 2017-09-25 08:53:25 -04:00
DizzyEggg
52a951276f battle 4, up to x69 2017-09-25 00:09:13 +02:00
DizzyEggg
898d0b20ad up to x50 2017-09-24 00:29:52 +02:00
DizzyEggg
7bb0fcf182 merge with master and fix conflicts 2017-09-23 20:36:00 +02:00
DizzyEggg
601fc9e85b atk49 is matching baby WOHOHOHOHO 2017-09-23 20:13:45 +02:00
PikalaxALT
4cf1150002 clion pls 2017-09-22 21:26:37 -04:00
DizzyEggg
fc57c6c817 atk 48 is really troublesome 2017-09-23 00:06:52 +02:00
DizzyEggg
d5afb0c6e9 up to x48 and troubles 2017-09-22 21:33:49 +02:00
PikalaxALT
15212c4f8d Font6Func 2017-09-21 23:43:13 -04:00
DizzyEggg
9ee9a20152 fix merge conflicts 2017-09-21 10:50:15 +02:00
PikalaxALT
27903a102b Merge branch 'master' into berry_fix_program 2017-09-20 23:18:20 -04:00
PikalaxALT
8d5250fdaa Merge branch 'master' into lilycove_lady 2017-09-20 23:02:17 -04:00
yenatch
e7f91c65d9 Merge pull request #38 from PikalaxALT/battle_dome_cards 
Battle dome cards
 2017-09-20 22:41:18 -04:00
PikalaxALT
942fbe87d4 Populate header, label as static whatever won't break things 2017-09-20 21:03:57 -04:00
PikalaxALT
d263750f19 remaining lilycove lady functions 2017-09-20 20:48:32 -04:00
PikalaxALT
45d53d9242 Merge branch 'master' into lilycove_lady 2017-09-20 20:17:31 -04:00
DizzyEggg
0c7555e237 SetMoveEffect functionally equivalent and close 2017-09-20 22:54:26 +02:00
PikalaxALT
7c8cbc6b88 SetLilycoveContestLady 2017-09-20 16:49:22 -04:00
PikalaxALT
d22a9acc63 through sub_818E490 2017-09-20 16:12:18 -04:00
U-User-PC\User
c2f1e2fe53 decompiled up to sub_81C0510 2017-09-20 15:07:24 -04:00
scnorton
fdea92edff through sub_818E3E0 2017-09-20 11:48:11 -04:00
scnorton
213fef6042 through sub_818E308 2017-09-20 11:44:20 -04:00
scnorton
8a31e58689 sub_818E298 2017-09-20 11:30:09 -04:00
scnorton
0b81c2920a sub_818E1F4 2017-09-20 10:45:00 -04:00
DizzyEggg
3919b7130b Fix merge conflicts 2017-09-20 13:12:43 +02:00
DizzyEggg
28da80e19a battle 4 up to SetMoveEffect 2017-09-20 12:56:45 +02:00
PikalaxALT
28d0fa33fe SetLilicoveQuizLady 2017-09-19 22:35:40 -04:00
PikalaxALT
73ee165ef6 sub_818DF00 2017-09-19 22:25:31 -04:00