Commit Graph

135 Commits

Author SHA1 Message Date
garak e292d0ca83 Merge branch 'master' into fldeff 2018-12-16 20:05:31 -05:00
Diegoisawesome bfdfe367e8 Merge pull request #422 from garakmon/frontier_data_1
Battle tower data
2018-12-10 11:22:16 -06:00
garak e1e2132a37 sync fldeff function names with pokeruby 2018-12-09 22:24:54 -05:00
nullableVoidPtr f50faac244 Clean more tables 2018-12-08 14:10:30 +08:00
nullableVoidPtr 8a8baaeaaa Merge remote-tracking branch 'upstream/master' 2018-12-08 12:13:15 +08:00
Melody 2615ece23b Use normal apostrophes like adults 2018-12-07 10:41:08 -05:00
nullableVoidPtr 4fc3fa9e44 Realign comments, clean tables in pokemon_animation.c and use SPECIES_OLD_UNOWN_ defines 2018-12-07 20:18:24 +08:00
nullableVoidPtr f9ff7316d5 Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs 2018-12-06 10:38:28 +08:00
DizzyEggg a9e6154fa9 Finish porting battle frontier data 2018-12-05 22:21:26 +01:00
garak 80c3258504 finish battle tower data except sRubyFacilityClassToEmerald 2018-12-04 12:09:35 -05:00
garak e69cb6b276 update frontier class names 2018-12-03 17:21:34 -05:00
garak 2c14d6ee6c fix merge conflicts 2018-12-03 16:58:28 -05:00
DizzyEggg ba1fc05558 tabs 2018-12-03 18:10:03 +01:00
DizzyEggg 0d122bc831 Fix merge conflicts 2018-12-03 17:56:36 +01:00
DizzyEggg 846b5d79e4 Get rid of headers in src/data 2018-12-03 16:10:41 +01:00
DizzyEggg a83fc52a7e Make data easier to edit 2018-12-03 14:49:16 +01:00
Melody 44af811033 index trainer front anims ptr table 2018-12-03 08:36:10 -05:00
Melody 2779421ad4 fix brendan/may/wally consistency issues 2018-12-03 08:01:52 -05:00
DizzyEggg d8b952f94c Clean up items data 2018-12-03 13:37:32 +01:00
garak 462e7c8295 begin batle tower data 2018-12-02 23:22:42 -05:00
Melody eeb6446da4 add more consistent names 2018-12-02 22:36:09 -05:00
Melody 72bd670ba6 index trainer class lookups 2018-12-02 22:35:31 -05:00
DizzyEggg a42bfd7a0e fix brackes n ne file 2018-12-02 19:27:56 +01:00
Melody b9cf4f27b5 renames the winstrate graphics names to pokefan 2018-12-02 00:47:04 -05:00
Melody c7f52c4203 cleans up trainer name defines 2018-12-01 22:49:33 -05:00
DizzyEggg 7cfe0342f0 Finish frontier data 2018-11-27 22:45:50 +01:00
garak 73cce79753 Merge remote-tracking branch 'upstream/master' into frontier-data 2018-11-27 11:35:19 -05:00
garak 091b5194e7 frontier pike and pyramid data 2018-11-27 11:21:48 -05:00
Slawter666 deb7adbad5 Convert pokédex data to C 2018-11-27 04:00:38 +00:00
Jefferson Steelflex af08f3bb13 Update back_pic_coordinates.h 2018-11-26 16:55:37 -05:00
Jefferson Steelflex 8e5e4c2304 Fix labels, shifted off by one. 2018-11-26 16:51:08 -05:00
Slawter666 1b895ff52c Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise 2018-11-12 14:14:50 +00:00
Slawter666 bd766b9049 Minor labelling of field effects 2018-11-03 20:20:28 +00:00
Diegoisawesome 8e7202ec3d Fix LZ compressed data alignment 2018-10-21 12:05:34 -05:00
Slawter666 3d8874d919 Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise 2018-10-21 00:20:09 +01:00
Diegoisawesome e75f0b4f80 Port/decompile field_control_avatar 2018-10-16 21:47:08 -05:00
Slawter666 3aff112127 Begin synchronising with pokeruby 2018-10-16 14:55:16 +01:00
Diegoisawesome 7f211b2588 Merge pull request #359 from Slawter666/label_field_effect_helpers
Label field_effect_helpers.c
2018-10-14 18:37:11 -05:00
Slawter666 137f6549ff label field_effect_helpers 2018-10-14 23:43:40 +01:00
Deokishisu 94bec0b8db Fix Double Underscores
Whoops.
2018-10-14 16:14:01 -04:00
Deokishisu d7ba8a306c Rename OW Sprites
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-14 15:49:55 -04:00
Deokishisu 2bd86dad2f Rename Boy4 to RichBoy 2018-10-14 12:26:48 -04:00
DizzyEggg 54fc92bc92 Start porting ruby battle anim file 2018-10-06 23:04:53 +02:00
Diegoisawesome 6978a896d1 Merge pull request #331 from DizzyEggg/patch-3
Use pokeruby's formatting for move descriptions
2018-09-17 10:11:12 -05:00
DizzyEggg 94bbfa7fa0 Use pokeruby's formatting for move descriptions 2018-09-16 15:58:13 +02:00
DizzyEggg de65ddf4b6 Make it easier to edit ability text 2018-09-16 10:17:10 +02:00
Diegoisawesome b8c9d9a980 Merge pull request #324 from Diegoisawesome/master
Document main_menu
2018-09-14 12:17:11 -05:00
Diegoisawesome b860d583e4 Document main_menu 2018-09-14 12:15:46 -05:00
Marcus Huderle ba125b23fd Remove transparency from event object spritesheets 2018-09-11 17:18:10 -05:00
Tetrable 044ef98309 Document trainer animations, correct unused table labelling 2018-09-09 22:35:07 +01:00