pret/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-10-09 10:01:24 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,547 Commits 2 Branches 0 Tags
673d64c35b21ebb8f3c6fc8b547c7f736fa4f593
Commit Graph

3547 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PikalaxALT 673d64c35b through sub_8097390 2018-01-08 13:53:24 -07:00
PikalaxALT 56c2c7ef00 through sub_8097078 2018-01-08 13:39:22 -07:00
PikalaxALT 6c177b622a Merge branch 'master' into pokemon_storage_system 2018-01-07 23:54:30 -05:00
camthesaxman 961d82002d fix Mailbox_DrawMailList 2018-01-07 22:58:03 -06:00
PikalaxALT 79c64d2b71 Merge branch 'master' into pokemon_storage_system 2018-01-07 23:53:43 -05:00
PikalaxALT fd42bcc78c sub_8096C84 2018-01-07 23:46:05 -05:00
Cameron Hall 6b38db228b Merge pull request #515 from huderlem/battle_2 
Decompile battle_2 and battle_util
 2018-01-07 22:16:52 -06:00
Marcus Huderle be36c50638 Finish battle_2.c and battle_util.c decompilation 2018-01-07 20:07:36 -08:00
Marcus Huderle 82ab732d67 Finish decompiling battle_2 2018-01-07 20:07:36 -08:00
Marcus Huderle c0e0004ffa Decompile through HandleEndTurn_BattleWon, and update trainer class constant names 2018-01-07 20:07:36 -08:00
Marcus Huderle 36841a8498 Decompile more battle_2 functions 2018-01-07 20:06:45 -08:00
Marcus Huderle 17d5ba39ac Match sub_806BC3C 2018-01-07 19:36:27 -08:00
Cameron Hall 886c9cd7a0 Merge pull request #516 from camthesaxman/fix_nonmatching 
match a few functions
 2018-01-07 21:28:24 -06:00
PikalaxALT 02fea36a2e through sub_8096C68 2018-01-07 22:25:16 -05:00
PikalaxALT ceebbe1991 through sub_8096BE0 2018-01-07 22:03:21 -05:00
PikalaxALT 0947fdf167 sub_80969A0 2018-01-07 21:27:40 -05:00
camthesaxman 3f9ca66670 match CB2_PartyMenuMain 2018-01-07 18:52:40 -06:00
PikalaxALT bfeaa80fcd through sub_8096884 2018-01-07 19:47:59 -05:00
PikalaxALT b9ad9b3ad5 through sub_8096874 2018-01-07 19:20:15 -05:00
camthesaxman bbb65b40f9 match DetermineBattleTowerPrize 2018-01-07 18:18:57 -06:00
camthesaxman 47acecb873 match SaveCurrentWinStreak 2018-01-07 18:11:16 -06:00
PikalaxALT 92fa7570b9 through task_intro_29 2018-01-07 18:55:15 -05:00
PikalaxALT aa023a5cb5 through sub_80963D0 2018-01-06 22:21:05 -05:00
PikalaxALT 9257764718 sub_8096264 2018-01-06 16:40:49 -05:00
PikalaxALT 666654ff6d through ResetPokemonStorageSystem 2018-01-06 16:04:53 -05:00
PikalaxALT d19de32aba through Task_PokemonStorageSystem 2018-01-06 15:16:51 -05:00
camthesaxman 680d3fd7b9 Merge branch 'master' of https://github.com/pret/pokeruby 2018-01-06 12:28:12 -06:00
camthesaxman b3551bc2f3 fix some code and formatting anomalies 2018-01-06 12:27:27 -06:00
Marcus Huderle 7bf330e9f2 Merge pull request #508 from huderlem/friendly_macros 
call_if and goto_if macros
 2018-01-06 10:03:30 -08:00
Marcus Huderle b396c6038c Merge pull request #445 from PikalaxALT/cable_car 
Cable car and Cable car util
 2018-01-06 09:53:56 -08:00
PikalaxALT a7e900e31b StorageSystemGetNextMonIndex 2018-01-06 12:47:00 -05:00
PikalaxALT 4db981200c nonmatching unref_sub_8095D08 2018-01-06 11:54:46 -05:00
PikalaxALT 6ce6e18fd5 sub_8095C8C 2018-01-06 11:05:39 -05:00
PikalaxALT e4a84faabf through unref_sub_8095C60 2018-01-06 10:49:52 -05:00
PikalaxALT e6d86ff774 Merge branch 'master' into cable_car 2018-01-06 10:15:45 -05:00
Cameron Hall 818dfa314e Merge pull request #511 from camthesaxman/combine_german_asm 
combine asm-de into asm
 2018-01-06 01:08:37 -06:00
camthesaxman ac4e2d3290 combine asm-de into asm 2018-01-06 01:01:19 -06:00
PikalaxALT e03aeeec0d Rename vars in cable car util 2018-01-06 00:17:45 -05:00
PikalaxALT 8d035c8152 cable car util 2018-01-05 22:15:05 -07:00
Cameron Hall f3399955b1 Merge pull request #504 from camthesaxman/decompile_easy_chat 
decompile easy_chat.s
 2018-01-05 22:39:18 -06:00
camthesaxman e95436b902 tabs to spaces 2018-01-05 22:33:15 -06:00
camthesaxman 7d181ec03b minor cleanup 2018-01-05 22:18:57 -06:00
PikalaxALT e28c11ef95 Update delcarations of cable car util funtions 2018-01-05 23:07:57 -05:00
camthesaxman 2ea6caea07 remove asm and combine easy chat files 2018-01-05 21:40:52 -06:00
camthesaxman 734fd13665 actually fix German build 2018-01-05 21:29:18 -06:00
camthesaxman 60ab994a0f fix German build 2018-01-05 21:27:40 -06:00
PikalaxALT 2692979c40 some renaming 2018-01-05 21:46:59 -05:00
PikalaxALT fe7e54d6d8 Make static what can be made static 2018-01-05 21:37:20 -05:00
PikalaxALT 27d47d5a8e sub_81248AC 2018-01-05 21:33:27 -05:00
PikalaxALT 675cf09efa sub_812476C 2018-01-05 21:29:32 -05:00