Leahnaya/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-08-08 18:45:06 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,330 Commits 2 Branches 0 Tags 134 MiB
32977818e7
Commit Graph

736 Commits

Author SHA1 Message Date
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
drifloony
1cc8e50292 decompile field_screen_effect and unknown_task 2017-07-14 15:50:29 -07:00
camthesaxman
48407f4c37 decompile sub_80FA8EC - sub_80FAB60 2017-07-14 17:24:36 -05: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
drifloony
1853efa954 move ROM variables into menu_helpers.c 2017-07-13 21:37:49 -07:00
drifloony
761140fd1b decompile trader 2017-07-13 00:36:26 -07: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
camthesaxman
9a57e78557 decompile sub_80A3740 - swap32 2017-07-08 12:16:19 -05:00
camthesaxman
ee0d3f82b5 option_menu.c data 2017-07-07 19:13:45 -05:00
camthesaxman
297d757a8e berry_tag_screen.c data 2017-07-07 19:10:00 -05:00
camthesaxman
6c7d05587a item data 2017-07-07 19:02:30 -05:00
camthesaxman
bc14a02ef3 util.c data 2017-07-07 17:19:08 -05:00
camthesaxman
e9908459ed task.c data 2017-07-07 17:06:07 -05:00
camthesaxman
f719abf104 fix merge conflicts 2017-07-07 16:54:14 -05:00
camthesaxman
2d60419159 delete data/diploma.s 2017-07-07 16:40:09 -05:00
yenatch
06bf25405c Merge remote-tracking branch 'origin/master' into merge-pika 
Conflicts:
	include/use_pokeblock.h
 2017-07-05 21:37:14 -04:00
yenatch
1eacd4ee74 Merge pull request #351 from Touched/decompile/rotating_gate 
Decompile rotating_gate.s
 2017-07-05 21:31:11 -04:00
yenatch
550333dd91 Merge pull request #349 from PikalaxALT/pokeblock 
Pokeblock
 2017-07-05 19:39:43 -04:00
yenatch
792a2c6976 Merge pull request #347 from PikalaxALT/field_tasks 
Field tasks
 2017-07-05 18:16:22 -04:00
yenatch
3b3eb45b91 Merge pull request #346 from ProjectRevoTPP/sound_check_menu 
Sound check menu
 2017-07-05 18:11:34 -04:00
ProjectRevoTPP
6607a00674 add data to C file 2017-06-30 18:59:17 -04:00
Touched
c2daf4f6c9 Rename rotating gate exported functions 2017-06-30 21:34:15 +02:00