Commit Graph

4519 Commits

Author SHA1 Message Date
DizzyEggg
74de0f59bd Merge branch 'master' into dump 2019-01-24 21:53:06 +01:00
Diegoisawesome
0827945698
Merge pull request #525 from pret/revert-524-master
Revert "Obsolete common_syms and rewrite sym files, to keep up with pokeruby"
2019-01-24 14:49:57 -06:00
DizzyEggg
ebfaf3f6be Merge branch 'master' into dump 2019-01-24 21:30:19 +01:00
Diegoisawesome
dedc289914
Revert "Obsolete common_syms and rewrite sym files, to keep up with pokeruby" 2019-01-24 14:18:01 -06:00
Diegoisawesome
dcf79a29ba
Merge pull request #524 from nullableVoidPtr/master
Obsolete common_syms and rewrite sym files, to keep up with pokeruby
2019-01-24 14:13:24 -06:00
nullableVoidPtr
10fca92833 Obsolete common_syms and rewrite sym files, to keep up with pokeruby 2019-01-25 03:50:41 +08:00
Diegoisawesome
4cd4cbe133
Merge pull request #522 from DizzyEggg/trainer_card
Trainer card
2019-01-23 14:43:37 -06:00
DizzyEggg
524db6068e Merge branch 'master' into trainer_card 2019-01-22 21:59:32 +01:00
DizzyEggg
b6e5b4ee1a trainer card diego pls 2019-01-22 21:56:57 +01:00
Diegoisawesome
900f294011 Add var const prefix for some missed var numbers 2019-01-21 22:34:01 -06:00
Diegoisawesome
6c1cb7219e Update devkitPro version in Travis 2019-01-21 14:04:07 -06:00
DizzyEggg
23b396dd3f
Merge pull request #59 from garakmon/trhill
trainer hill easy chat constants
2019-01-21 20:08:36 +01:00
garak
261955b6ed trainer hill easy chat constants 2019-01-21 12:01:49 -05:00
DizzyEggg
75a1c022dd Make trainer card compile 2019-01-20 18:48:29 +01:00
DizzyEggg
4e396207d3 document more of trainer card 2019-01-20 18:24:35 +01:00
DizzyEggg
576d1b3474 Document and match somne trainer card 2019-01-19 23:04:33 +01:00
shinny456
f06c0749bc trainer_card up to sub_80C4998 2019-01-19 12:14:59 -05:00
shinny456
1b30da21d9 merge trainer hill changes 2019-01-19 10:44:58 -05:00
DizzyEggg
f84b22fca4 Dump trainer hill trainers 2019-01-19 12:57:18 +01:00
DizzyEggg
fac9631235 Fix Sandstorm raining 2019-01-19 11:22:49 +01:00
DizzyEggg
f34ab49f63
Merge pull request #56 from SBird1337/feature/battle-engine-animpack1
Add some animations (see below)
2019-01-18 23:06:19 +01:00
DizzyEggg
2c3210f4d1 merge with master 2019-01-18 22:30:34 +01:00
Karathan
0f19f969c9 modify net animation for sticky web 2019-01-15 01:11:34 +01:00
Diegoisawesome
6857b73ee3 Split pokenav so calcrom works properly 2019-01-14 15:25:29 -06:00
Diegoisawesome
b4b4fb951a
Merge pull request #519 from DizzyEggg/trainer_hill
Trainer Hill
2019-01-14 14:18:29 -06:00
DizzyEggg
87763d133f bites to bits 2019-01-14 20:57:44 +01:00
Karathan
5ad85f0d55 add bullet punch animation 2019-01-14 00:21:36 +01:00
DizzyEggg
353ad13f91 make trainer hill compile 2019-01-13 20:58:42 +01:00
DizzyEggg
4b420643dc Merge branch 'master' into trainer_hill 2019-01-13 20:51:05 +01:00
DizzyEggg
edddd847c5 Document and clean up trainer hill 2019-01-13 20:50:08 +01:00
Karathan
200f0a09d3 add sticky web 2019-01-13 19:35:29 +01:00
Karathan
bb38edad23 add x-scissor animation 2019-01-13 19:13:37 +01:00
Karathan
cb617401a6 add air slash 2019-01-13 17:03:23 +01:00
DizzyEggg
c0bc01d301 Move some vars to C 2019-01-13 13:15:23 +01:00
DizzyEggg
11a49a7f02 Decompile trainer hill 2019-01-13 12:12:27 +01:00
SBird1337
3a5e5d04e7 add iceshard 2019-01-13 01:21:05 +01:00
Karathan
74ae0a6e83 add thunder fang and fire fang animations 2019-01-12 17:03:44 +01:00
Karathan
768af79b36 add ice fang animation 2019-01-12 17:02:24 +01:00
Karathan
e0be163978 add seed bomb animation 2019-01-12 17:02:24 +01:00
Karathan
832c0d6333 add toxic spike animation 2019-01-12 17:02:24 +01:00
Karathan
8c73045fd6 add brave bird animation 2019-01-12 17:02:24 +01:00
Philipp AUER
e13895e58a fix debug symbol in Makefile 2019-01-11 10:41:51 -06:00
Philipp AUER
f53279b1e1 add DWARF debug sections to ld_script.txt 2019-01-11 10:41:51 -06:00
Philipp AUER
372d5f63d8 add debug flag to Makefile 2019-01-11 10:41:51 -06:00
shinny456
8a5fce7837 start decompiling trainer_card.s 2019-01-08 21:51:19 -05:00
Diegoisawesome
1285f96e1d
Merge pull request #517 from Diegoisawesome/master
Rename non-mapsec constants
2019-01-08 14:18:24 -06:00
Diegoisawesome
af2c39860d Rename non-mapsec constants 2019-01-08 13:40:11 -06:00
ultima-soul
b8ff71e65e Fix build conflicts. 2019-01-06 14:11:31 -08:00
ultima-soul
284751e761 Decompile through ClearContestWinnerPicsInContestHall, 10 NONMATCHINGs present. 2019-01-06 13:41:18 -08:00
ultima-soul
2ca482dc24 Committing progress so far. 2019-01-06 13:38:31 -08:00