summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-14Fix Double UnderscoresDeokishisu
Whoops.
2018-10-14Rename OW SpritesDeokishisu
Rename OW Sprites to be more descriptive where possible. If an OW sprite was used by only one Trainer class, it was renamed. Additionally, some non-Trainer sprites were renamed. Renamed: LittleBoy1 -> NinjaBoy LittleGirl1 -> Twin Woman2 -> PokefanF OldMan1 -> ExpertM OldWoman1 -> ExpertF Man3 -> PokefanM Woman6 -> LinkReceptionist Man7 -> DevonEmployee Boy4 -> RichBoy Boy5 -> GameboyKid (Consistent with pokecrystal) ContestOldMan -> ContestJudge Renamed Because of Numbering Changes: LittleBoy2 -> LittleBoy LittleGirl2 -> LittleGirl OldWoman2 -> OldWoman OldMan2 -> OldMan Man4 -> Man3 Man5 -> Man4 Man6 -> Man5 Woman3 -> Woman2 Woman4 -> Woman3 Woman5 -> Woman4 Woman7 -> Woman5
2018-10-14Merge branch 'master' of https://github.com/pret/pokeemerald into ↵Deokishisu
LabelOWsProperly
2018-10-14Merge pull request #351 from DizzyEggg/apprenticeDiegoisawesome
Decompile apprentice
2018-10-14Merge branch 'master' of https://github.com/pret/pokeemerald into ↵Deokishisu
LabelOWsProperly
2018-10-14Merge pull request #356 from DizzyEggg/clean_battlestructDiegoisawesome
Clean a couple of battlestructs' fields
2018-10-14Merge branch 'master' of https://github.com/pret/pokeemerald into ↵Deokishisu
LabelOWsProperly
2018-10-14Merge pull request #357 from DizzyEggg/move_heapDiegoisawesome
Move HEAP_SIZE to malloc and use void instead of empty argument list
2018-10-14Move HEAP_SIZE to malloc and use void instead of empty argument listDizzyEggg
2018-10-14Merge pull request #349 from golemgalvanize/decompile_field_effect_helpersDiegoisawesome
Decompile field effect helpers
2018-10-14Merge pull request #355 from DizzyEggg/use_eosDiegoisawesome
Use defines for text chars
2018-10-14Merge pull request #354 from DizzyEggg/move_blendpalDiegoisawesome
Move blend_palette to util
2018-10-14Clean battle structsDizzyEggg
2018-10-14Rename Boy4 to RichBoyDeokishisu
2018-10-14clean battle structsDizzyEggg
2018-10-14Make apprentice compileDizzyEggg
2018-10-14Finish documenting apprentice for nowDizzyEggg
2018-10-14Merge pull request #25 from Slawter666/apprentice-dataDizzyEggg
Move apprentice data to C
2018-10-14document more of apprenticeDizzyEggg
2018-10-14Move apprentice data to CSlawter666
2018-10-14make aprentice compileDizzyEggg
2018-10-14Merge branch 'master' into apprenticeDizzyEggg
2018-10-14Use defines for text charsDizzyEggg
2018-10-14Move 'blend_palette'.c to util.cDizzyEggg
2018-10-14Document more of apprenticeDizzyEggg
2018-10-14Decompile apprenticeDizzyEggg
2018-10-13More apprentice workDizzyEggg
2018-10-13Merge record mixing, pokemon and global with apprenticeDizzyEggg
2018-10-13Merge branch 'master' into shopDiegoisawesome
2018-10-13Merge pull request #353 from Diegoisawesome/masterDiegoisawesome
Port/decompile cable_club.s
2018-10-13Merge branch 'master' of github.com:pret/pokeemeraldDiegoisawesome
2018-10-13Port/decompile cable_club.sDiegoisawesome
2018-10-13Merge remote-tracking branch 'upstream/master' into shopMarcus Huderle
# Conflicts: # asm/shop.s
2018-10-13start apprenticeDizzyEggg
2018-10-11Start porting cable_club.cDiegoisawesome
2018-10-10Merge pull request #350 from Kermalis/masterDiegoisawesome
Sound Effects Part 2/6
2018-10-10Match se_kouka_m.midKermalis
2018-10-10Match se_kouka_l.midKermalis
2018-10-10Match se_kouka_h.midKermalis
2018-10-10Match se_kon4.midKermalis
2018-10-10Match se_kon3.midKermalis
2018-10-10Match se_kon2.midKermalis
2018-10-10Match se_kon.midKermalis
2018-10-10Match se_ki_gasyan.midKermalis
2018-10-10Match se_kaifuku.midKermalis
2018-10-10Match se_kaidan.midKermalis
2018-10-10Match se_jyuni.midKermalis
2018-10-10Match se_jitensya.midKermalis
2018-10-10Match se_jite_pyoko.midKermalis
2018-10-10Match se_jihanki.midKermalis