Commit Graph

778 Commits

Author SHA1 Message Date
DizzyEggg 4f36e317f9 name labels 2017-08-23 15:55:01 +02:00
DizzyEggg 13f917d4ff cleaning up the file 2017-08-22 10:34:45 +02:00
DizzyEggg 8a03b38327 Merge branch 'master' into decompile_berry_blender 2017-08-22 09:13:53 +02:00
Cameron Hall 2e37f5e0cf Merge pull request #402 from camthesaxman/decompile_learn_move
decompile learn_move
2017-08-21 22:43:44 -05:00
DizzyEggg 9f1842c55f Merge branch 'master' into decompile_berry_blender 2017-08-21 10:34:50 +02:00
DizzyEggg 1563763c18 Merge branch 'master' into decompile_battle_message 2017-08-20 17:34:26 +02:00
DizzyEggg eb392e3755 Merge branch 'master' into decompile_battle_message 2017-08-14 08:17:05 +02:00
DizzyEggg 2324abcbee Merge branch 'master' into decompile_berry_blender 2017-08-14 08:15:57 +02:00
DizzyEggg b8df978e81 Merge branch 'master' into decompile_egg_hatch 2017-08-14 08:12:12 +02:00
Cameron Hall 3f0250648e Merge pull request #390 from camthesaxman/fix_various
various cleanups
2017-08-13 19:21:07 -05:00
golemgalvanize 00abce98db decompile intro_credits_graphics.s (#381)
* Update

* Update

* Update

* update

* intro_credits_graphics

* decompiled up to sub_80cb438

* decompiled up to sub_80CB7EC

* decompiled up to sub_80cbc8c

* decompiled up to sub_80CC408

* decompiled up to sub_80CCD24

* fixed it up a little

* more fixes

* Update ld_script.txt

* Delete battle_anim_80CA710.c

* Update battle_anim_80CA710.s

reverted
2017-08-13 19:05:42 -05:00
DizzyEggg 79a04893ce almost done 2017-08-12 22:35:53 +02:00
camthesaxman f3b6f3c273 finish decompiling learn_move 2017-08-12 12:39:45 -05:00
DizzyEggg f246b05d99 finish up egg hatch, make it compile 2017-08-01 12:47:03 +02:00
DizzyEggg d413187fa8 start decompiling egg hatch 2017-08-01 11:07:23 +02:00
DizzyEggg bba94787f7 battle message decompiled 2017-07-31 16:11:41 +02:00
DizzyEggg 6785868132 last function IsPokeDisobedient 2017-07-28 23:42:03 +02:00
DizzyEggg 3d0adf4157 Unreferenced move merger 2017-07-28 19:24:11 +02:00
DizzyEggg dddca2951a IBE matches 2017-07-28 18:02:08 +02:00
DizzyEggg 1416c0c79d the ultimate challenge 2017-07-26 18:23:41 +02:00
camthesaxman 6f52c5238c decompile the two remaining functions of berry_tag_screen.c 2017-07-25 22:07:49 -05:00
DizzyEggg d101fa39be attack canceller troubles 2017-07-25 17:09:47 +02:00
DizzyEggg 7b5f9c3d5e a loop problem 2017-07-24 18:24:06 +02:00
DizzyEggg 5513395999 start decompiling battle_3 git sucks 2017-07-23 23:56:42 +02:00
Cameron Hall bb0cad7c07 Merge pull request #386 from drifloony/field_fadetransition
decompile field_fadetransition
2017-07-22 22:34:07 -05:00
drifloony 275344c3de finish decompiling mystery_event_script 2017-07-22 17:45:08 -07:00
camthesaxman 32977818e7 fix warning about DisableStruct being declared in parameter list 2017-07-22 18:56:53 -05:00
camthesaxman f5e9d5be60 various fixes before merge 2017-07-22 18:49:23 -05:00
Cameron Hall 5891cedc1b Merge pull request #372 from DizzyEggg/master
decompile battle_4
2017-07-22 18:44:01 -05:00
drifloony af0348cefe decompile field_fadetransition 2017-07-22 12:24:56 -07:00
Cameron Hall 297f1c2502 Merge pull request #377 from camthesaxman/decompile_battle_8
decompile battle_8
2017-07-21 22:40:49 -05:00
Cameron Hall 68e47a6fa0 Merge pull request #370 from drifloony/ram_variables
map out ram variables
2017-07-21 17:31:28 -05:00
Cameron Hall c1a82f1aab Merge pull request #374 from drifloony/fldeff_flash
decompile fldeff_flash
2017-07-21 15:41:48 -05:00
Cameron Hall 989877283f Merge pull request #373 from drifloony/pokemon_icon
decompile pokemon_icon
2017-07-21 12:15:21 -05:00
Cameron Hall 959f78fe14 Merge branch 'master' into master 2017-07-20 22:42:32 -05:00
drifloony e4a72cbff3 map out ram variables 2017-07-20 20:13:02 -07:00
drifloony e4c1e80941 Merge branch 'master' into battle_records 2017-07-20 19:32:09 -07:00
yenatch 3606fccc83 Merge pull request #367 from drifloony/field_screen_effect
decompile field_screen_effect and unknown_task
2017-07-20 22:26:59 -04:00
yenatch c47c3abe65 Merge pull request #366 from camthesaxman/decompile_region_map
decompile region_map
2017-07-20 22:20:48 -04:00
yenatch e2fec17262 Merge pull request #365 from camthesaxman/decompile_trainer_card
finish decompiling trainer_card
2017-07-20 19:19:09 -04:00
yenatch 457f4cc993 Merge pull request #364 from camthesaxman/decompile_record_mixing
finish decompiling record_mixing
2017-07-20 19:08:11 -04:00
camthesaxman 11528c7581 decompile OpponentHandleTrainerThrow - sub_803541C 2017-07-18 15:41:53 -05:00
camthesaxman e2ab2e50a0 fix merge conflicts 2017-07-17 20:15:15 -05:00
ProjectRevoTPP b23014cfa0 Merge branch 'master' of https://github.com/pret/pokeruby 2017-07-17 20:48:34 -04:00
yenatch 67ced1d77e Merge pull request #363 from drifloony/trader
decompile trader
2017-07-17 20:46:06 -04:00
ProjectRevoTPP 23c169df9d Merge branch 'master' of https://github.com/pret/pokeruby 2017-07-17 20:10:29 -04:00
ProjectRevoTPP 8027698fd3 resolve tv.c conflict 2017-07-17 20:10:21 -04:00
yenatch c043463631 Merge pull request #362 from drifloony/menu_helpers
Decompile menu_helpers
2017-07-17 20:09:25 -04:00
yenatch d01a28c82f Merge pull request #359 from marijnvdwerf/fix-755
Mark source files as non-executable
2017-07-17 19:53:28 -04:00
yenatch d5c9a02e51 Merge pull request #357 from camthesaxman/integrate_data
define more data in C
2017-07-17 19:40:47 -04:00