Commit Graph
22 Commits
Author SHA1 Message Date
Suppai_Neko d28afca972 Merged Emerald Expansion and Follower Pokemon 2023-04-07 19:22:49 -07:00
Eduardo Quezada D'Ottone f78bb4fb84 Merge remote-tracking branch 'pret/master' into item_expansion
# Conflicts:
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
2022-07-12 17:42:32 -04:00
sneed bcf9ed3fb8 Update spritesheet_rules.mk 2022-05-30 03:11:56 +03:00
GriffinR 5c8e1e81ea Color single-palette door anim graphics 2022-05-18 12:41:20 -04:00
LOuroboros eb1834ce84 Merge branch 'master' of https://github.com/pret/pokeemerald into iePret 2022-04-11 01:22:48 -03:00
GriffinR 0a0157b62c Name unknown_16.png 2022-03-14 15:54:47 -04:00
Syreldar a2794ae351 Updated berries' path on spritesheet_rules.mk 2021-01-15 09:52:19 +01:00
DizzyEggg 35559d6b71 Merge with master 2020-08-27 10:58:31 +02:00
GriffinR 1ce929157f Clean up field effect doc 2020-07-02 05:05:13 -04:00
GriffinR eb80012757 Document more misc field effects 2020-06-29 16:32:46 -04:00
GriffinR 4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00
GriffinR 18d57a3802 Document some overworld and field effects 2020-06-23 15:48:53 -04:00
DizzyEggg 13c0c64d70 Merge with master 2020-02-23 12:41:36 +01:00
Marcus Huderle 6b966d20e5 Update spritesheet rules 2020-02-12 18:07:13 -06:00
DizzyEggg 9a2888fdbf Merge into master 2019-12-23 16:46:03 +01:00
GriffinR 68cdd7b1cb Merge master into ObjEvent rename 2019-12-21 05:19:27 -05:00
GriffinR d1cf9006fb Document some warp/field screen effect 2019-12-17 05:23:07 -05:00
GriffinR 570881b119 Rename event_object directories 2019-11-21 00:44:55 -05:00
DizzyEggg cc4676df1c Fix berry trees 2019-06-29 11:30:58 +02: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
Marcus Huderle ba125b23fd Remove transparency from event object spritesheets 2018-09-11 17:18:10 -05:00