summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2018-10-18Merge pull request #366 from Diegoisawesome/masterDiegoisawesome
Finish shop and fldeff_escalator
2018-10-18Finish shop and fldeff_escalatorDiegoisawesome
2018-10-17begin event flag names, add temporary hidden item macrogarak
2018-10-17Merge branch 'master' into event-flagsgarak
2018-10-17label temp flags, test replace scriptgarak
2018-10-17More synchronisationSlawter666
2018-10-16Merge pull request #364 from Diegoisawesome/masterDiegoisawesome
Port/decompile field_control_avatar
2018-10-16Port/decompile field_control_avatarDiegoisawesome
2018-10-17Further synchronisationSlawter666
2018-10-16Use constantsDizzyEggg
2018-10-16Begin synchronising with pokerubySlawter666
2018-10-14Merge pull request #352 from huderlem/shopDiegoisawesome
[WIP] Shop
2018-10-14Merge pull request #359 from Slawter666/label_field_effect_helpersDiegoisawesome
Label field_effect_helpers.c
2018-10-14Update All EVENT_OBJ_GFX ReferencesDeokishisu
Didn't realize that this needed to be done as well for renaming OW sprites. The event_objects.h file has had its corresponding defines renamed and all references in all files to those defines have been relabeled.
2018-10-14label field_effect_helpersSlawter666
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-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 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-10finish porting field_effect_helpersgolem galvanize
2018-10-09ported some of field_effect_helpersgolem galvanize
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-24 21:23:02 +0000