Eduardo Quezada
|
341ce6fd95
|
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into merrp/followers_RHH_merge3
# Conflicts:
# .github/workflows/build.yml
# README.md
# gflib/sprite.c
# graphics/pokemon/banette/anim_front.png
# graphics/pokemon/banette/normal.pal
# graphics/pokemon/sentret/normal.pal
# graphics/pokemon/togetic/anim_front.png
# graphics/pokemon/togetic/normal.pal
# include/battle_script_commands.h
# include/data.h
# ld_script.txt
# src/battle_controller_player.c
# src/bike.c
# src/event_object_movement.c
|
2023-06-16 21:25:16 -04:00 |
|
Ariel A
|
9beee311c4
|
Merge branch 'master' into romhack
|
2022-07-17 15:13:15 -04: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 |
|
Ariel A
|
01f73f54e1
|
Added follower transform effect and Castform forms. Credit: larryturbo
Castform forms from https://www.deviantart.com/larryturbo/art/351-Castform-Froms-830190053
|
2022-05-18 19:12:30 -04: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 |
|
Ariel A
|
7daa78311b
|
Added more follower footprint types. Credit: Sonikku-DatH
https://www.pokecommunity.com/showthread.php?p=10410294#post10410294
|
2022-02-07 23:06:38 -05:00 |
|
Ariel Antonitis
|
b2f901058e
|
Changed 64x64 follower sprites to 32x32 ones, by LarryTurbo.
Sprite resource:
https://www.deviantart.com/larryturbo/art/Resized-OWs-for-Gen-1-4-mons-larger-than-32x32-878575906
|
2021-09-23 23:30:46 -04:00 |
|
Ariel Antonitis
|
875c4edd50
|
Added some conditional messages.
Added emote graphics.
|
2021-04-18 21:00:27 -04:00 |
|
Ariel Antonitis
|
418cab092c
|
Fixed old graphics info collisions.
|
2021-03-03 02:00:22 -05:00 |
|
Ariel Antonitis
|
04ce1eaf83
|
Added Mr. Mime & Farfetch'd. Fixed transparency issues.
|
2021-03-03 01:48:45 -05:00 |
|
Ariel Antonitis
|
bd01b80c1d
|
Added Castform.
|
2021-03-03 01:47:37 -05:00 |
|
Ariel Antonitis
|
693246f711
|
Added Unown OW forms.
|
2021-03-03 01:47:20 -05:00 |
|
Ariel Antonitis
|
6969f3d6f7
|
Added Nidoran M & Nidoran F sprites.
|
2021-03-03 01:47:09 -05:00 |
|
Ariel Antonitis
|
6692cd992f
|
Added all 386 follower sprites.
Allow NPC pokemon objects via a custom script header.
|
2021-03-03 01:46:43 -05:00 |
|
Ariel Antonitis
|
be60824263
|
Add Banette event object.
|
2021-03-03 01:33:26 -05:00 |
|
Ariel Antonitis
|
e52b70e46f
|
Updated follower scripting (applymovement).
|
2021-03-03 01:04:37 -05:00 |
|
Ariel Antonitis
|
8a3dfbf252
|
Added pokemon followers & script commands.
|
2021-03-03 01:04:22 -05:00 |
|
Ariel Antonitis
|
2e32a27d75
|
Testing follower pokemon.
|
2021-03-03 00:51:43 -05: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 |
|