Commit Graph

1681 Commits

Author SHA1 Message Date
scnorton 3c2b1731ee Merge branch 'master' into link 2017-12-17 14:09:06 -05:00
PikalaxALT 5b526906e1 through sub_800F0F8 2017-12-16 12:07:20 -05:00
PikalaxALT 190a2cba61 Merge branch 'master' into link 2017-12-16 11:27:10 -05:00
PikalaxALT 6d73bb4b57 Import function labels from Ruby 2017-12-16 10:23:05 -05:00
DizzyEggg c3abe2863f rename 2017-12-16 15:12:55 +01:00
DizzyEggg 5b409d49ed pokeblock.s is decompiled 2017-12-16 15:10:29 +01:00
DizzyEggg f4ab21ee67 Merge branch 'master' into decompile_use_pokeblock 2017-12-16 11:42:59 +01:00
PikalaxALT da2e0dfe50 Merge branch 'master' into clock 2017-12-15 21:04:25 -05:00
DizzyEggg 930fea6fad mail review changes 2017-12-16 01:18:31 +01:00
DizzyEggg bb82032208 battle setup review changes 2017-12-16 01:15:19 +01:00
DizzyEggg 44abbae60b nerge with master, fix conflicts 2017-12-16 01:08:55 +01:00
DizzyEggg 4351676749 decompile more of pokeblock.s 2017-12-16 00:08:23 +01:00
Diegoisawesome 224fdbf026 Merge pull request #138 from Diegoisawesome/master
Rename some symbols and add languages
2017-12-15 00:38:21 -06:00
Diegoisawesome e3c366df64 Merge remote-tracking branch 'pret/master' 2017-12-15 00:08:48 -06:00
Avara c8ac4e8ce4 Opponents fixed and moved~ 2017-12-12 02:58:57 +00:00
Cameron Hall c9f196cdfe Merge pull request #137 from camthesaxman/constants_headers
move constants to C headers
2017-12-11 12:45:08 -06:00
camthesaxman 9525fdd54d convert more constants 2017-12-11 12:41:13 -06:00
camthesaxman c681b482c2 convert more constants 2017-12-11 12:27:51 -06:00
DizzyEggg 8ac17e0948 move data from asm to pokeblock.c 2017-12-11 16:52:28 +01:00
Avara 0c20cd6990 Opponent Constants 2017-12-11 14:37:13 +00:00
DizzyEggg b4d10ab7ab split pokeblock files 2017-12-10 19:02:51 +01:00
DizzyEggg 37ae6a7758 move more pokeblock data to C and label 2017-12-10 16:38:27 +01:00
PikalaxALT b1c6f80e10 through sub_800F048 2017-12-10 10:31:11 -05:00
PikalaxALT beeb86be37 through (nonmatching) sub_800EFB0 2017-12-10 10:23:43 -05:00
DizzyEggg fb30acbc30 pokeblock feed is decompiled 2017-12-10 15:04:03 +01:00
DizzyEggg bb1ae5f857 Merge branch 'master' into decompile_use_pokeblock 2017-12-09 21:24:47 +01:00
DizzyEggg 6561b62986 start pokeblock feed 2017-12-09 21:23:40 +01:00
PikalaxALT 253b3c2fa5 sub_800EDD4 2017-12-08 08:24:54 -05:00
PikalaxALT abc3869eca through sub_800EDBC 2017-12-07 20:21:50 -05:00
PikalaxALT 6441ba7832 sub_800EB44 2017-12-07 20:04:07 -05:00
PikalaxALT c9f43116aa through sub_800EAFC 2017-12-07 08:48:49 -05:00
PikalaxALT 399d3731da Reformat asm/librfu.s to clarify what is being accessed in pc-relative loads 2017-12-07 00:29:58 -05:00
PikalaxALT 94da6de903 sub_800E94C 2017-12-07 00:28:12 -05:00
PikalaxALT 4f342198c2 sub_800E88C 2017-12-06 23:55:40 -05:00
PikalaxALT dc0d544119 sub_800E87C, remaining data in link_rfu 2017-12-05 23:54:31 -05:00
camthesaxman 19fbf024ff fix merge conflicts 2017-12-05 12:42:30 -06:00
camthesaxman 00896cb3b5 rename rng.c to random.c and rom4.c to overworld.c 2017-12-05 12:27:33 -06:00
Cameron Hall fd75493bc6 Merge pull request #129 from DizzyEggg/dumb_naming
Name some battle labels
2017-12-05 12:05:06 -06:00
Cameron Hall 7597433af6 Merge pull request #130 from DizzyEggg/decompile_pokeball
Decompile pokeball
2017-12-05 11:57:54 -06:00
camthesaxman caa13f8777 convert some constants to C headers 2017-12-05 11:55:48 -06:00
PikalaxALT 21619096da sub_800E748 2017-12-04 21:05:41 -05:00
PikalaxALT 765ad80884 through sub_800E700 2017-12-04 20:06:03 -05:00
PikalaxALT 92fd61d6f2 through sub_800E604 2017-12-04 19:51:26 -05:00
PikalaxALT 0b58905eea sub_800E3A8 2017-12-04 19:10:37 -05:00
DizzyEggg ddcf52bcae get rid of ball pal files 2017-12-04 23:22:48 +01:00
EternalCode 266dd492a7 void parameter in function header 2017-12-04 17:12:05 -05:00
DizzyEggg ad07843f2d start working on use pokeblock 2017-12-04 23:09:44 +01:00
PikalaxALT feb0d13534 sub_800E174 2017-12-03 23:33:49 -05:00
PikalaxALT 3dd7ec7526 through sub_800E15C 2017-12-03 22:23:46 -05:00
PikalaxALT 8b5d6fe5d9 CreateWirelessStatusIndicatorSprite 2017-12-03 22:01:06 -05:00