Commit Graph

761 Commits

Author SHA1 Message Date
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 bfbe446e73 moved all data to C 2017-08-21 13:42:49 +02:00
DizzyEggg 9f1842c55f Merge branch 'master' into decompile_berry_blender 2017-08-21 10:34:50 +02:00
DizzyEggg f121f43667 Merge branch 'master' into decompile_egg_hatch 2017-08-18 18:30:54 +02:00
DizzyEggg 705aa9e456 Merge branch 'master' into decompile_berry_blender 2017-08-18 18:30:31 +02:00
DizzyEggg 2324abcbee Merge branch 'master' into decompile_berry_blender 2017-08-14 08:15:57 +02:00
DizzyEggg de06f0b4da Merge branch 'master' into decompile_hall_of_fame 2017-08-14 08:15:06 +02:00
DizzyEggg b8df978e81 Merge branch 'master' into decompile_egg_hatch 2017-08-14 08:12:12 +02: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
camthesaxman 11f590a1e8 move ROM data into learn_move.c 2017-08-12 13:20:23 -05:00
camthesaxman a50ec1ee05 decompile sub_813265C - sub_81330E8 2017-08-11 16:06:12 -05:00
DizzyEggg e67214db6c start decompiling berry blender 2017-08-05 21:53:51 +02:00
DizzyEggg ba2577649a hall of fame is done 2017-08-03 18:02:13 +02:00
DizzyEggg edcacd232a more functions decompiled 2017-08-03 15:26:15 +02:00
DizzyEggg 1764de7db8 more functions decompiled 2017-08-03 10:07:50 +02:00
DizzyEggg b14554c6ae move data to C 2017-08-01 15:21:54 +02:00
DizzyEggg 9b73817c90 Battle3 is done. Except ABE. 2017-07-29 21:21:31 +02:00
DizzyEggg 6785868132 last function IsPokeDisobedient 2017-07-28 23:42:03 +02:00
DizzyEggg e453ffa7bb Merge branch 'master' into decompile_battle_3 2017-07-28 18:09:11 +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 d101fa39be attack canceller troubles 2017-07-25 17:09:47 +02:00
DizzyEggg 5513395999 start decompiling battle_3 git sucks 2017-07-23 23:56:42 +02:00
camthesaxman cdae8b6a12 decompile battle_anim_807B69C 2017-07-22 22:17:49 -05:00
drifloony 275344c3de finish decompiling mystery_event_script 2017-07-22 17:45:08 -07:00
Cameron Hall 5891cedc1b Merge pull request #372 from DizzyEggg/master
decompile battle_4
2017-07-22 18:44:01 -05:00
Cameron Hall 5e80a12ec9 Merge pull request #378 from PikalaxALT/rename_specials
Rename specials
2017-07-22 12:06:17 -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
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
PikalaxALT c564ff9afb Script macro special now takes, as its argument, the name of the function. 2017-07-18 21:47:19 -04:00
camthesaxman a8bcbe3fe4 make ROM variables non-const 2017-07-18 01:08:34 -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 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 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 32a9e2ae44 finish decompiling region_map 2017-07-15 20:52:54 -05:00
camthesaxman 4d28489c65 decompile sub_80FB600 - sub_80FBB3C 2017-07-15 14:50:23 -05:00
camthesaxman 563d7591e4 decompile sub_80FB170 - sub_80FB32C 2017-07-15 01:45:56 -05:00