ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
4,006 Commits 1 Branch 0 Tags 235 MiB
7bc4a3b3f7
Commit Graph

4006 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DizzyEggg
7bc4a3b3f7 Merge with master 2019-01-29 22:12:53 +01:00
Marcus Huderle
14641e916e Cleanup Rustboro City House layout label 2019-01-29 14:36:02 -06:00
Marcus Huderle
bd667102fa Fix PetaburgCity map scripts label 2019-01-29 14:36:02 -06:00
Marcus Huderle
e43f341799 Cleanup link contest map scripts 2019-01-29 14:36:02 -06:00
Marcus Huderle
8f832434e5 Change drought colors table files to .bin 2019-01-29 14:36:02 -06:00
Marcus Huderle
d2d44a97b8 Cleanup link contest map events 2019-01-29 14:36:02 -06:00
Marcus Huderle
36a1825bbe Document trainer approach funcs, and use movement type constants in scripts 2019-01-29 14:36:02 -06:00
Marcus Huderle
e81838dba3 Misc. documentation and move some data into .c files 2019-01-29 14:36:02 -06:00
DizzyEggg
77fcb62015
Merge pull request #64 from Kurausukun/patch-1 
Prevent Skarmory from Evolving via Level
 2019-01-28 20:43:29 +01:00
DizzyEggg
94d2a30d44 Merge with master 2019-01-28 20:41:46 +01:00
Diegoisawesome
5bfd802dbb
Merge pull request #527 from DizzyEggg/contest 
Finish up Contest.c
 2019-01-28 12:48:39 -06:00
DizzyEggg
73d919fa0f Define double single left right qutoation marks char 2019-01-28 19:02:34 +01:00
DizzyEggg
922726ff3d contest 2019-01-28 18:19:58 +01:00
DizzyEggg
ad59811154 Decompile whole contest 2019-01-28 18:13:07 +01:00
DizzyEggg
26a2a4f9e7 Match all of contest functions 2019-01-28 12:29:47 +01:00
Kurausukun
c3126df436
Prevent Skarmory from Evolving via Level 2019-01-28 00:49:26 -05:00
Diegoisawesome
183b6857ff
Merge pull request #458 from ultima-soul/contest 
Decompile more of contest
 2019-01-27 23:08:24 -06:00
ultima-soul
72720204da Fix stuff 2019-01-27 20:54:21 -08:00
ultima-soul
d633ee6f58 Minor changes 2019-01-27 20:48:18 -08:00
ultima-soul
f828823bf0 Make changes 2019-01-27 20:21:30 -08:00
DizzyEggg
ceb56e2fce
Merge pull request #62 from Mother-Of-Dragons/battle_engine_v2 
Decapitalize item names and add new item descriptions
 2019-01-27 23:01:59 +01:00
DizzyEggg
736826e863 New feature - battle 2 vs 1 opponent 2019-01-27 20:54:34 +01:00
Avara
dd44ab8150 Decapitalize item names and add new item descriptions 2019-01-27 17:33:29 +00:00
DizzyEggg
abd518b668 Refactor GF's idiotic coding 2019-01-27 13:52:02 +01:00
DizzyEggg
88b788bfab Fix Charge Beam effect 2019-01-27 11:57:13 +01:00
DizzyEggg
6653ecf676 Fix Safari zone bug 2019-01-27 11:47:36 +01:00
DizzyEggg
897592a8d4 Merge branch 'master' into battle_engine_v2 2019-01-27 10:58:57 +01:00
Diegoisawesome
6b2dda422b Merge branch 'master' of github.com:pret/pokeemerald 2019-01-27 00:11:44 -06:00
Diegoisawesome
7a60f36954 Clean up variable numbers mistakenly written as decimal 2019-01-27 00:11:32 -06:00
Diegoisawesome
f4af987c01
Merge pull request #526 from DizzyEggg/frontier_pass 
Frontier Pass
 2019-01-26 15:14:17 -06:00
DizzyEggg
54ddbaaf0c Frontier pass clean-up 2019-01-26 22:09:24 +01:00
DizzyEggg
251d16b733 Make Frontier pass compile 2019-01-26 21:06:20 +01:00
DizzyEggg
01c3f3fc05 Document all of frontier pass 2019-01-26 20:56:06 +01:00
DizzyEggg
03549349f8 Decompile all frontier pass 2019-01-26 19:20:14 +01:00
DizzyEggg
0688725afb Document and decompile more of frontier pass. 2019-01-26 14:50:24 +01:00
DizzyEggg
08a3533682 Start frontier pass 2019-01-25 23:32:45 +01:00
Diegoisawesome
29b9483f39
Merge pull request #521 from DizzyEggg/dump 
Dump trainer hill trainers
 2019-01-24 17:21:04 -06:00
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