Commit Graph

751 Commits

Author SHA1 Message Date
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
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
yenatch
a774610eaa Merge pull request #356 from camthesaxman/fix_various
formatting and nonmatching fixes
2017-07-17 19:28:36 -04:00
drifloony
92c40a7028 decompile fldeff_flash 2017-07-17 00:58:32 -07:00
ProjectRevoTPP
61d54c967a formatting 2017-07-17 01:07:17 -04:00
drifloony
a1d0d153c0 move ROM data into pokemon_icon.c 2017-07-16 21:56:19 -07:00
ProjectRevoTPP
93f767e26d resolve conflict 2017-07-16 20:09:46 -04:00
camthesaxman
6546ff5d0a fix merge conflicts 2017-07-16 13:53:55 -05:00
DizzyEggg
dd7e191078 Battle4.C
Changed labels:
sub_801A02C = ItemBattleEffects
sub_8015150 = GetBattleBank
gUnknown_02024BEA = gRandomMove
BattleBufferB = gBattleBufferB
sub_8090D90 = GetNationalPokedexFlag
sub_80151D4 = PressurePPLose
ai_rate_move = AI_TypeCalc
sub_801B928 = IsPokeDisobedient
sub_801E3B4 = BankGetTurnOrder
sub_801E3EC = SetMoveEffect
sub_814A7FC = DestroyMenuCursor
sub_8010B88 = SwitchInClearStructs
sub_80325B8 = BattleMusicStop
sub_8017718 = CantUseMove
sub_8028350 = IsTwoTurnsMove
b_feature_update_destiny_bond = DestinyBondFlagUpdate
sub_801C108 = JumpIfMoveAffectedByProtect
move_weather_interaction = AttacksThisTurn
sub_8025E20 = ChangeStatBuffs
sub_8020B54 = MoveValuesCleanUp
2017-07-16 20:03:00 +02:00
camthesaxman
d4bd4c393e more labeling and use static 2017-07-16 12:41:13 -05:00
yenatch
e50b9e28bc Merge pull request #354 from camthesaxman/decompile_item_menu
decompile item_menu
2017-07-16 13:33:38 -04:00
camthesaxman
b03a51e034 labeling 2017-07-16 10:35:31 -05:00
camthesaxman
32a9e2ae44 finish decompiling region_map 2017-07-15 20:52:54 -05:00
drifloony
944b907a26 decompile battle_records 2017-07-15 00:51:31 -07:00
drifloony
1cc8e50292 decompile field_screen_effect and unknown_task 2017-07-14 15:50:29 -07:00
camthesaxman
5dddba1eeb finish decompiling trainer_card (except two functions) 2017-07-14 15:43:19 -05:00
camthesaxman
2b39d8f7d7 clean up a bit 2017-07-14 01:48:30 -05:00
camthesaxman
5f5c808186 finish decompiling record_mixing 2017-07-13 23:55:40 -05:00
drifloony
1853efa954 move ROM variables into menu_helpers.c 2017-07-13 21:37:49 -07:00
camthesaxman
8c09deee82 decompile stuff 2017-07-13 15:43:03 -05:00
drifloony
761140fd1b decompile trader 2017-07-13 00:36:26 -07:00
drifloony
36841bbd93 decompile menu_helpers 2017-07-12 21:57:23 -07:00
camthesaxman
cb6e1059e6 do some labeling 2017-07-10 23:33:46 -05:00
camthesaxman
24ac9f1767 finish decompiling item_menu 2017-07-10 18:14:18 -05:00
camthesaxman
c8bcd2e54f decompile sub_80A6D98 - sub_80A79B4 2017-07-10 15:34:42 -05:00
camthesaxman
5c2c970d01 decompile sub_80A6354 - sub_80A6D1C 2017-07-09 22:59:49 -05:00
camthesaxman
bb096eb136 decompile sub_80A52C4 - sub_80A5B78 2017-07-09 16:30:01 -05:00
Marijn van der Werf
6bd06efe46 Mark source files as non-executable 2017-07-09 13:57:26 +02:00
camthesaxman
df1eb2b49e completely get rid of TextStruct 2017-07-09 01:09:26 -05:00