Commit Graph

1958 Commits

Author SHA1 Message Date
DizzyEggg
2f0e6350b1 battle_h update, labelling battle2.c 2017-06-21 20:56:11 +02:00
DizzyEggg
c84bb67156 Merge pull request #2 from pret/master
be up to date with master2
2017-06-21 20:47:58 +02:00
yenatch
42ae04c74f Merge pull request #309 from Wack0/patch-1
item.c: Replace item identifier with item enum
2017-06-20 20:50:11 -04:00
yenatch
4ba573ed1e Merge branch 'master' into patch-1 2017-06-20 20:41:33 -04:00
yenatch
b22e5219ba Merge pull request #335 from marijnvdwerf/camthesaxman/decompile_pokeball
Decompile pokeball
2017-06-20 20:26:44 -04:00
camthesaxman
a80eef47ca whitespace 2017-06-20 15:13:45 +02:00
camthesaxman
e072ddd6fb move data to C and introduce CompressedSpriteSheet and CompressedSpritePalette 2017-06-20 15:13:44 +02:00
camthesaxman
1fafe80241 finish decompiling pokedex.s 2017-06-20 15:11:59 +02:00
camthesaxman
5041f91c4b decompile sub_8046FBC - sub_80470C4 2017-06-20 15:06:46 +02:00
camthesaxman
829371c3e0 decompile sub_8046400 - sub_8046E9C 2017-06-20 15:06:18 +02:00
DizzyEggg
102f5b1e15 Battle labels named (#333)
* Changed battle labels
2017-06-19 23:46:48 -04:00
yenatch
2c4dc714db Merge pull request #327 from camthesaxman/trig_data
convert trig data to C
2017-06-19 20:56:40 -04:00
DizzyEggg
11ad653b57 Merge pull request #1 from pret/master
be up to date with the master
2017-06-19 15:29:24 +02:00
yenatch
13ff901d46 Merge pull request #310 from marijnvdwerf/clean/headers
Clean up headers
2017-06-17 17:36:03 -04:00
yenatch
8b97aa2804 Merge remote-tracking branch 'marijn/clean/headers' 2017-06-16 23:59:58 -04:00
camthesaxman
2c6e9e9bc5 use macros to convert floating point to fixed point 2017-06-15 21:29:45 -05:00
yenatch
dda361afb7 Merge pull request #326 from ProjectRevoTPP/master
move player_pc data to C file and restructure/label the file
2017-06-15 22:20:16 -04:00
ProjectRevoTPP
0a779312c8 Merge branch 'master' of https://github.com/pret/pokeruby 2017-06-15 22:08:57 -04:00
yenatch
c8213423ce Merge pull request #323 from camthesaxman/decompile_pokedex
finish decompiling pokedex
2017-06-15 22:08:23 -04:00
yenatch
61e65d1b8e 0x134 -> SPECIES_SPINDA 2017-06-15 21:57:45 -04:00
camthesaxman
3344d86d90 move trig data to C 2017-06-15 19:37:42 -05:00
camthesaxman
c6d0933a62 remove baserom-symbol-cache file 2017-06-15 18:56:53 -05:00
camthesaxman
9fbdcdbc70 use static and fix a few nonmatching functions 2017-06-15 18:42:10 -05:00
camthesaxman
376e4f1384 finish later 2017-06-15 15:50:43 -05:00
ProjectRevoTPP
4b1f25117c whitespace 3: revenge of the tabs 2017-06-15 03:48:20 -04:00
ProjectRevoTPP
33bda740ea field_effect.c merge 2017-06-15 03:36:53 -04:00
ProjectRevoTPP
8435b8835a move player_pc data to C file and do a lot of labeling 2017-06-15 03:34:11 -04:00
camthesaxman
c8f941f5e3 make it build again 2017-06-15 01:41:20 -05:00
camthesaxman
8c5d8a5507 fix merge conflicts 2017-06-15 01:31:19 -05:00
camthesaxman
86a26c9282 finish converting pokedex data to C 2017-06-15 01:26:40 -05:00
yenatch
6f4bf2cb05 Merge pull request #322 from PikalaxALT/field_effect
Decompile field_effect.s
2017-06-14 23:07:38 -04:00
PikalaxALT
baa9f7f55f Move min/max macros to global.h 2017-06-14 23:07:27 -04:00
PikalaxALT
d8f4d3da44 Remove unnecessary macros 2017-06-14 23:02:07 -04:00
PikalaxALT
3d4c2f73cb FILE MODES BrokeBack 2017-06-14 22:54:42 -04:00
PikalaxALT
a4c1cb55e8 Merge branch 'master' of github.com:pret/pokeruby 2017-06-14 22:05:17 -04:00
yenatch
f22e583db6 Merge pull request #321 from camthesaxman/decompile_rom_8094928
decompile rom_8094928
2017-06-14 22:04:43 -04:00
PikalaxALT
200bdcb5c2 Merge branch 'master' of github.com:pret/pokeruby 2017-06-14 22:01:31 -04:00
yenatch
817f20d227 Merge pull request #320 from ProjectRevoTPP/master
finish decompiling player_pc.c
2017-06-14 22:01:02 -04:00
PikalaxALT
8219bb53d5 Merge branch 'master' of github.com:pret/pokeruby 2017-06-14 21:59:09 -04:00
ProjectRevoTPP
07080a6e59 Merge branch 'master' of https://github.com/pret/pokeruby 2017-06-14 21:55:35 -04:00
camthesaxman
f8765c07ab style and formatting 2017-06-14 20:52:56 -05:00
yenatch
daf3212ee1 Merge pull request #319 from camthesaxman/decompile_battle_7
decompile battle_7
2017-06-14 21:48:44 -04:00
camthesaxman
f37f616252 remove gPokedexView from pokedex.h 2017-06-14 18:43:32 -05:00
camthesaxman
aba52dbd95 convert some data to C 2017-06-14 18:15:36 -05:00
camthesaxman
b7031c448a finish decompiling pokedex.s 2017-06-14 17:36:31 -05:00
camthesaxman
75957d8f73 decompile sub_8092508 - sub_80927F0 2017-06-14 01:03:57 -05:00
PikalaxALT
fb18a31ae9 Merge branch 'master' of github.com:pret/pokeruby 2017-06-14 00:30:42 -04:00
ProjectRevoTPP
b3dc66655e merge 2017-06-14 00:14:37 -04:00
Cameron Hall
373dfb5710 Merge branch 'master' into decompile_battle_7 2017-06-13 23:12:05 -05:00
yenatch
48a15638c6 Merge pull request #316 from PikalaxALT/decoration
Decoration
2017-06-14 00:05:22 -04:00