atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2250 commits 2 branches 40 tags 600 MiB
Commit graph

1549 commits

Author SHA1 Message Date
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