Commit Graph

2344 Commits

Author SHA1 Message Date
DizzyEggg
3d0adf4157 Unreferenced move merger 2017-07-28 19:24:11 +02:00
DizzyEggg
e453ffa7bb Merge branch 'master' into decompile_battle_3 2017-07-28 18:09:11 +02:00
DizzyEggg
dddca2951a IBE matches 2017-07-28 18:02:08 +02:00
Cameron Hall
8b39cdac9a Merge pull request #387 from camthesaxman/decompile_battle_anim_807B69C
decompile battle_anim_807B69C
2017-07-27 11:39:12 -05:00
DizzyEggg
1416c0c79d the ultimate challenge 2017-07-26 18:23:41 +02: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
camthesaxman
cdae8b6a12 decompile battle_anim_807B69C 2017-07-22 22:17:49 -05:00
Cameron Hall
833f9026ff Merge pull request #385 from drifloony/mystery_event_script
finish decompiling mystery_event_script
2017-07-22 19:57:00 -05:00
drifloony
275344c3de finish decompiling mystery_event_script 2017-07-22 17:45:08 -07:00
Cameron Hall
566392f441 Merge pull request #384 from camthesaxman/battle_4
battle_4 fixes
2017-07-22 19:10:50 -05: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
5e80a12ec9 Merge pull request #378 from PikalaxALT/rename_specials
Rename specials
2017-07-22 12:06:17 -05:00
Cameron Hall
39efec3f1e Merge pull request #375 from drifloony/mon_markings
decompile mon_markings
2017-07-21 23:45:58 -05:00
drifloony
e7e1d546f3 incorporate suggested improvements into mon_markings.c 2017-07-21 21:28:45 -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
5652108d99 Merge pull request #376 from drifloony/reset_rtc_screen
decompile reset_rtc_screen
2017-07-21 22:20:07 -05:00
drifloony
8ed167339c Merge branch 'master' into mon_markings 2017-07-21 15:34:05 -07:00
Cameron Hall
68e47a6fa0 Merge pull request #370 from drifloony/ram_variables
map out ram variables
2017-07-21 17:31:28 -05:00
drifloony
4b3cdd8692 make gUnknown_02039248 into struct 2017-07-21 15:19:00 -07: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
drifloony
9eca72fc7f use -2 instead of 0xFFFE 2017-07-21 09:14:35 -07: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
yenatch
7d960d219f Merge pull request #371 from drifloony/fix_CreateMonWithEVSpread
fix CreateMonWithEVSpread
2017-07-20 23:00:42 -04:00
yenatch
c9e64b65ac Merge pull request #368 from drifloony/battle_records
decompile battle_records
2017-07-20 22:40:04 -04: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
ac5a0fb3d6 finish decompiling battle_8 2017-07-18 22:53:23 -05:00
PikalaxALT
c564ff9afb Script macro special now takes, as its argument, the name of the function. 2017-07-18 21:47:19 -04:00
drifloony
41becb8dda fix comment regarding palettes 2017-07-18 16:56:17 -07:00
camthesaxman
11528c7581 decompile OpponentHandleTrainerThrow - sub_803541C 2017-07-18 15:41:53 -05:00
camthesaxman
ae93b43bcf decompile OpponentHandleGetAttributes - sub_8034B74 2017-07-18 12:42:06 -05:00
camthesaxman
a8bcbe3fe4 make ROM variables non-const 2017-07-18 01:08:34 -05:00
drifloony
9236732e50 decompile reset_rtc_screen 2017-07-17 20:36:11 -07:00
drifloony
95d3a7848c fix German build 2017-07-17 20:00:20 -07:00
drifloony
1af7c00d13 decompile mon_markings 2017-07-17 19:47:32 -07: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