Commit Graph

810 Commits

Author SHA1 Message Date
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
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 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 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 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
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
PikalaxALT 8b5d6fe5d9 CreateWirelessStatusIndicatorSprite 2017-12-03 22:01:06 -05:00
PikalaxALT d5bc329de7 through sub_800DF90 2017-12-03 20:32:49 -05:00
PikalaxALT 519c8d42f8 through sub_800DD94 2017-12-03 20:04:54 -05:00
DizzyEggg 4faa442d5a decompile and label mail 2017-12-03 19:19:11 +01:00
DizzyEggg 790df7159e more battlescript labels 2017-12-03 00:47:21 +01:00
DizzyEggg e10aea9a51 give some more labels to battle struct fields 2017-12-02 23:31:58 +01:00
DizzyEggg 2fe25da65a move pokeball data to rom 2017-12-02 21:27:00 +01:00
DizzyEggg c2fdde3a49 pokeball file is decompiled 2017-12-02 20:38:26 +01:00
DizzyEggg c27f7a8131 start working on pokeball 2017-12-02 19:39:07 +01:00
PikalaxALT c282e4fa59 sub_800DBF8 2017-12-02 10:19:02 -05:00
DizzyEggg d75e7ace1d label battle stuff 2017-12-02 14:08:55 +01:00
PikalaxALT e2244831a7 through sub_800DB18 2017-12-01 21:51:06 -05:00
DizzyEggg 273474d57a give names to some battlescripts 2017-12-02 00:03:46 +01:00
DizzyEggg 039c9f4bd8 merge with master 2017-12-01 21:27:29 +01:00
DizzyEggg 646664ff29 battle setup file is decompiled 2017-12-01 21:25:13 +01:00
PikalaxALT a7e95b97ca sub_800D7D8 2017-11-30 23:20:43 -05:00
PikalaxALT cf539e253e through sub_800D780 2017-11-30 22:56:56 -05:00
PikalaxALT 6f84853b08 sub_800D434 2017-11-30 08:26:39 -05:00
PikalaxALT a781a6d5fd through sub_800D358 2017-11-30 00:19:44 -05:00
PikalaxALT c906978692 through sub_800D294; fix sub_800CF34 2017-11-29 23:58:48 -05:00
DizzyEggg e8ecb01ab2 more work on battle setup 2017-11-29 19:54:15 +01:00
PikalaxALT 295e45c788 sub_800D158 2017-11-29 08:46:16 -05:00
PikalaxALT 921011592c unsigned -> unsigned int; create header 2017-11-29 08:30:18 -05:00
PikalaxALT 10068b0345 Merge branch 'master' into field_poison 2017-11-29 08:19:54 -05:00
Diegoisawesome 8e9428c482 Add languages to enum 2017-11-29 00:53:18 -06:00