dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity
6,713 Commits 4 Branches 0 Tags
f42eafc85b007cd27e90bc9a1350d589e31bda43
Commit Graph

360 Commits

Author SHA1 Message Date
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
Diegoisawesome e1834c9d7b Change overworld_frame macro to use tiles 2018-09-08 03:07:44 -05:00
Diegoisawesome 12521fb1a8 Merge branch 'Slawter666-spritesheet' 2018-09-08 02:37:33 -05:00
Diegoisawesome f73807ea60 Add palette tags for event objects 2018-09-07 23:52:11 -05:00
Slawter666 291ac2cee9 Add build rules for overworld sprite sheets 2018-09-08 00:28:32 +01:00
Slawter666 54d5a7ad97 Format event object pic tables 2018-09-07 14:14:52 +01:00
Slawter666 9dec2bdef8 Merge branch 'master' of https://github.com/pret/pokeemerald into spritesheet 2018-09-07 11:50:23 +01:00
Diegoisawesome f8f7a8e300 Merge pull request #304 from Slawter666/graphics 
Move data from graphics.s to C
 2018-09-05 20:32:23 -05:00
Slawter666 0cd250a83e Deleted accidently uploaded file 2018-09-06 00:00:29 +01:00
Slawter666 5656ceab6c Move graphics to src/data/graphics 2018-09-05 23:53:54 +01:00
DizzyEggg 5c7ca813e7 Add AI flags to trainers data 2018-09-01 21:25:19 +02:00
Slawter666 e30c2251ce Convert more of data2b 2018-08-27 00:26:54 +01:00
Diegoisawesome 96d744706d Merge branch 'master' of https://github.com/pret/pokeemerald 2018-08-23 02:42:45 -05:00
Diegoisawesome 26ef40553c Move data from include to src 2018-08-23 02:32:34 -05:00
DizzyEggg 5dd1afd383 contest effect review changes 2018-08-16 22:55:36 +02:00
DizzyEggg 0bfe894566 Merge with master 2018-08-16 22:53:01 +02:00
Diegoisawesome a07d69d7c2 Finish pokemon_summary_screen 2018-08-14 22:00:35 -07:00
DizzyEggg 0c7063c5ba Make contest effect table easier to edit in the future 2018-08-14 23:50:58 +02:00
DizzyEggg 1a0e6f7aed match contest effect 2018-08-13 21:24:11 +02:00
DizzyEggg 0d68af7f06 copy contest effect from ruby 2018-08-12 23:20:17 +02:00
Diegoisawesome 18d5186630 Merge remote-tracking branch 'garakmon/heal-loc-2' 2018-08-11 16:57:46 -07:00
DizzyEggg df5009cb3e Move move descriptions to C 2018-08-12 00:03:19 +02:00
garak c3512e3b39 port larger heal location changes from poke ruby pr 2018-08-10 10:45:15 -04:00
Slawter666 bc42c5054c Merge remaining overworld frames 2018-08-10 00:20:19 +01:00
Slawter666 877a80d3bc Merge berry tree frames 2018-08-09 23:19:45 +01:00
Slawter666 dea0bba64e Merge "pokemon" frames 2018-08-09 00:55:32 +01:00