pret/pokeruby
1
0
Fork 0
mirror of https://github.com/pret/pokeruby.git synced 2026-10-03 08:06:46 -04:00
Code Issues Packages Projects Releases Wiki Activity
3,964 Commits 2 Branches 0 Tags
c28d691ff2821adcf43600a308d523fd609e12e2
Commit Graph

1374 Commits

Author SHA1 Message Date
PikalaxALT c28d691ff2 Merge branch 'master' into fix_nonmatching 2018-02-07 00:55:50 -05:00
Cameron Hall 7a264da18b Merge branch 'master' into german_debug 2018-02-06 18:50:47 -06:00
PikalaxALT ecfdc57e1c Merge branch 'master' into fix_nonmatching 2018-02-04 23:06:04 -05:00
Marcus Huderle 338d2b0b18 Finish decompiling dark.s except one function 2018-02-04 12:34:18 -08:00
PikalaxALT 9776f51f06 Declare gBagPockets as non-const in item.c for the sake of getting AddBagItem to match without the NONMATCHING define 2018-02-03 09:18:12 -05:00
Marcus Huderle 513d85e2df Finish decompiling psychic.s 2018-02-01 12:20:37 -08:00
Marcus Huderle c410df5100 Start decompiling psychic.s 2018-01-31 18:33:01 -08:00
camthesaxman 46023e742c Merge branch 'master' into german_debug 
Conflicts:
	asm/pokemon_storage_system.s
	data/pokemon_storage_system.s
	src/pokemon/pokemon_1.c
	src/pokemon/pokemon_storage_system.c
	sym_common.txt
	sym_ewram.txt
 2018-01-31 17:37:03 -06:00
Marcus Huderle 2bd2dd1db7 Merge pull request #512 from PikalaxALT/pokemon_storage_system 
[Merge if you so choose] Pokemon Storage System
 2018-01-30 20:37:10 -08:00
Marcus Huderle 58928acf41 Use standard naming convention for pc_screen_effect.h guard 2018-01-30 20:13:43 -08:00
Marcus Huderle 710477b8a5 Merge pull request #558 from huderlem/rock 
Decompile rock.s
 2018-01-30 20:03:31 -08:00
Marcus Huderle 2df648dc4b Finish decompiling rock.s 2018-01-30 19:56:12 -08:00
PikalaxALT cce651aabe match sub_8116100 2018-01-30 17:54:25 -05:00
PikalaxALT 6ecfa94ffb Remove some explicit calls to memcpy in matsuda_debug_menu; label fields in ContestPokemon 2018-01-30 16:30:08 -05:00
PikalaxALT a5f9a15d0d Merge branch 'master' into pokemon_storage_system 2018-01-29 22:07:02 -05:00
camthesaxman cb9aec1278 integrate debug code in pokenav_before.c 2018-01-29 15:08:10 -06:00
camthesaxman 1416a4c4ef clean up option_menu.c and field_poison.c a bit 2018-01-28 23:10:53 -06:00
Cameron Hall 0597628ae7 Merge branch 'master' into german_debug 2018-01-27 16:51:06 -06:00
Cameron Hall 4c1e0b8b30 integrate debug functions in mail.c and decompile some debug code 2018-01-25 00:07:15 -06:00
Cameron Hall 8cce685377 integrate debug functions in field_control_avatar.c 2018-01-24 20:11:06 -06:00
Cameron Hall d125e9b461 integrate debug Blender_PrintBlendingResults 2018-01-24 01:35:05 -06:00
Cameron Hall dbcf1ce9cb integrate some debug differences 2018-01-24 00:58:38 -06:00
Cameron Hall 6437a2acd5 decompile kagaya_debug_menu.c 2018-01-23 21:44:01 -06:00
Cameron Hall 1e6cb59a0c start decompiling start_menu_debug.c 2018-01-23 20:43:28 -06:00
Cameron Hall 1685a7977a dump some debug baseroms 2018-01-22 21:42:14 -06:00
PikalaxALT cc0d7a675d Rename some static functions 2018-01-22 21:01:33 -05:00
PikalaxALT c723b341c5 through sub_80C8F34 2018-01-22 20:52:41 -05:00
PikalaxALT 399856bc7e sub_80C8C80 2018-01-22 20:30:31 -05:00
PikalaxALT cbab0f7403 sub_80C8AD0 2018-01-22 20:24:02 -05:00
PikalaxALT 84769240d2 sub_80C88AC 2018-01-22 18:04:04 -05:00
PikalaxALT fc504ce61b through (nonmatching) sub_80C86A0 2018-01-22 15:51:57 -05:00
PikalaxALT 4e98ffed33 through sub_80C8604 2018-01-22 14:54:37 -05:00
PikalaxALT 79b3229185 Merge branch 'master' into pokemon_storage_system 2018-01-21 19:49:52 -05:00
Cameron Hall 11a9371349 resolve merge conflicts and make it compile 2018-01-21 13:53:32 -06:00
Marcus Huderle 003ed9293b More documentation of field_weather 2018-01-20 14:17:03 -08:00
Marcus Huderle 428f712da6 Further document weather 2018-01-19 21:30:16 -08:00
Cameron Hall e2a0522780 Merge pull request #543 from camthesaxman/label_field_weather 
label field_weather.c
 2018-01-19 18:32:40 -06:00
ProjectRevoTPP a0cb6c72b6 shop enum 2018-01-18 21:18:06 -05:00
camthesaxman 6553903150 start labeling field_weather 2018-01-18 18:56:44 -06:00
ProjectRevoTPP 751af64d72 Merge branch 'master' of https://github.com/pret/pokeruby into fixes 2018-01-18 15:04:09 -05:00
ProjectRevoTPP 723a50665a remove unnecessary padding 2018-01-17 23:45:37 -05:00
Cameron Hall 8835353325 resolve more undefined references 2018-01-17 18:24:33 -06:00
ProjectRevoTPP f07cdb4c97 use Dma Large loops for every while(1) Dma loop 2018-01-17 17:47:46 -05:00
ProjectRevoTPP 3ab6bf09d8 split out crash.c 2018-01-17 00:29:25 -05:00
Cameron Hall e11494a4c1 Merge branch 'master' into german_debug 2018-01-16 22:39:45 -06:00
Cameron Hall 91cfb6a564 add debug ifdefs 2018-01-16 22:25:35 -06:00
camthesaxman 58dd1c92ac remove some symbols from sym_ewram.txt 2018-01-16 18:10:40 -06:00
ProjectRevoTPP 9e4d9171e3 Merge branch 'master' of https://github.com/pret/pokeruby into fixes 2018-01-16 17:45:16 -05:00
Cameron Hall 76250c7ab0 Merge pull request #538 from easyaspi314/song-names 
Add most English song and SFX names as comments in songs.h and song_t…
 2018-01-16 16:44:50 -06:00
ProjectRevoTPP 7860ce8dbe split data2a and make shop.c stuff static 2018-01-16 14:00:52 -05:00