pret/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-10-07 17:30:43 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,920 Commits 2 Branches 0 Tags
a6d2bfaebd16940fc0ac1be3ca29caf0888296ca
Commit Graph

860 Commits

Author SHA1 Message Date
scnorton a6d2bfaebd Merge branch 'master' into secret_base 2017-10-16 14:12:59 -04:00
Marcus Huderle 72beb410f4 Merge remote-tracking branch 'upstream/master' into party_menu 2017-10-09 10:40:04 -07:00
camthesaxman f9e69ff281 remove trainer palettes 2017-10-08 21:38:28 -05:00
camthesaxman 338a3746c7 remove berry palettes 2017-10-08 21:12:24 -05:00
Marcus Huderle 3673298667 Move all data/party_menu.s data into party_menu.c 2017-10-07 20:21:11 -07:00
PikalaxALT 0685dd4920 Merge branch 'master' into trade 2017-10-01 19:52:40 -04:00
camthesaxman ab3c40fbf6 vloadptr -> vloadword 2017-10-01 14:39:25 -05:00
camthesaxman ac8f084ec5 imm -> value 2017-10-01 13:22:34 -05:00
camthesaxman dc802ea2be setmestatus -> setmysteryeventstatus 2017-10-01 13:02:25 -05:00
camthesaxman 3505da56b1 fix more command names 2017-10-01 12:40:07 -05:00
camthesaxman 6c9249af37 fix more command names 2017-10-01 12:32:19 -05:00
camthesaxman 89092b609a fix more command names 2017-10-01 12:21:52 -05:00
camthesaxman 639493e0ee fix more command names 2017-10-01 12:07:22 -05:00
camthesaxman 6ca1e8747d fix more command names 2017-10-01 11:51:50 -05:00
camthesaxman f91da8a210 Merge remote-tracking branch 'upstream/master' into script_cmd_renaming 2017-10-01 11:17:34 -05:00
camthesaxman e926119b72 update 2017-09-30 17:04:25 -05:00
camthesaxman 0f0f7856f1 update 2017-09-30 16:41:50 -05:00
camthesaxman c0c4ab681c update 2017-09-30 16:25:36 -05:00
camthesaxman e2f293d771 name some ScrCmd_ functions 2017-09-30 16:13:50 -05:00
camthesaxman 676ffb73ca stuff... I don't remember 2017-09-30 15:38:46 -05:00
Marcus Huderle f74d4742f5 Merge pull request #399 from Doesnty/battle4 
Improve battle_4
 2017-09-29 21:15:47 -07:00
PikalaxALT d0fbed6ad5 Merge branch 'master' into trade 2017-09-29 23:20:59 -04:00
PikalaxALT b3477c99c6 Merge branch 'master' into field_effect_helpers 2017-09-29 22:53:43 -04:00
PikalaxALT b014273d73 Merge branch 'master' into trade 2017-09-29 22:53:14 -04:00
PikalaxALT 22c795304d Merge branch 'master' into trade 2017-09-29 21:06:07 -04:00
PikalaxALT 6235276ca2 Merge branch 'master' into daycare 2017-09-28 21:41:17 -04:00
camthesaxman b4ba35a54c more command renaming 2017-09-26 14:33:52 -05:00
camthesaxman 9458b3fad1 single compare macro 2017-09-26 14:09:41 -05:00
camthesaxman 598756eaa4 more script command renaming 2017-09-24 17:57:54 -05:00
camthesaxman 207f8e6a76 more script command renaming 2017-09-24 17:36:39 -05:00
camthesaxman 1e2601a028 more script command renaming 2017-09-24 17:10:51 -05:00
camthesaxman 86e7bf1fd6 Replace more script commands and fix German build 2017-09-24 14:28:51 -05:00
camthesaxman ae5ec7f5b0 Replace script commands: snop -> nop, snop1 -> nop1, jump -> goto 2017-09-24 14:17:14 -05:00
camthesaxman 0c234d0929 more renaming 2017-09-24 12:12:53 -05:00
Marcus Huderle c3792f2bd4 Decompile HeldItemIcon funcs in party_menu 2017-09-23 20:50:35 -07:00
PikalaxALT d87ed69449 Merge branch 'master' into field_effect_helpers 2017-09-21 17:55:30 -04:00
camthesaxman 270bd98d41 more labeling 2017-09-13 00:03:22 -05:00
camthesaxman 2c87516ca3 more labels and fix build 2017-09-12 20:23:23 -05:00
camthesaxman 02104e52dd move data to overworld.c 2017-09-12 17:26:13 -05:00
camthesaxman a185f8a26d lots more relabeling 2017-09-12 16:53:04 -05:00
camthesaxman 6f9ad223a5 stuff 2017-09-10 16:21:30 -05:00
camthesaxman df71c1a803 lots more renaming 2017-09-10 12:34:41 -05:00
camthesaxman 5e9e52e3a9 more renaming/refactoring 2017-09-09 22:04:01 -05:00
camthesaxman 7309b13cb3 fix German build 2017-09-09 19:29:05 -05:00
camthesaxman 95f856c39e more script_menu refactoring 2017-09-09 18:17:09 -05:00
PikalaxALT add1b59b63 npc_pal_op and all data 2017-09-09 14:59:57 -04:00
PikalaxALT e011ca7ac9 Merge branch 'master' into trade 2017-09-09 08:51:16 -04:00
Cameron Hall 99dc97f6aa Merge pull request #417 from camthesaxman/decompile_mauville_old_man 
finish decompiling mauville_old_man
 2017-09-08 22:11:08 -05:00
Cameron Hall 0194be6556 Merge pull request #420 from DizzyEggg/decompile_evolution_scene 
decompile evolution scene
 2017-09-08 21:44:04 -05:00
Cameron Hall 4e64934d5f Merge pull request #424 from DizzyEggg/decompile_pokemon_menu 
decompile pokemon menu
 2017-09-08 19:11:14 -05:00