Eduardo Quezada
|
1359966a14
|
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
# src/event_object_movement.c
# src/scrcmd.c
|
2024-06-01 20:17:19 -04:00 |
|
Ariel A
|
e420f99fc3
|
Merge branch 'followers' into followers-expanded-id
|
2024-06-01 15:20:56 -04:00 |
|
Ariel A
|
3727be9511
|
fix: fixed a few oversights with follower message generation
|
2024-06-01 14:46:45 -04:00 |
|
Eduardo Quezada
|
de760e697f
|
More review
|
2024-05-31 08:28:57 -04:00 |
|
Eduardo Quezada
|
e7f66e663b
|
Convert callfuncs to callnative
|
2024-05-29 19:25:51 -04:00 |
|
Eduardo Quezada
|
3d05961dd5
|
getdirectiontoface macro
|
2024-05-29 15:52:21 -04:00 |
|
Eduardo Quezada
|
ff480dec27
|
More review comments
|
2024-05-28 18:32:20 -04:00 |
|
Eduardo Quezada
|
2f4077ba5d
|
Adjusted function names to align with pret
|
2024-05-28 17:25:18 -04:00 |
|
Eduardo Quezada
|
8854eaa880
|
Removed duplicated object event tags
|
2024-05-28 14:16:34 -04:00 |
|
Ariel A
|
0630acce44
|
fix: make LoadSheetGraphicsInfo load, then free, tiles
Fixes follower pokeball gfx showing garbage for 1 frame when emerging
|
2024-05-27 18:15:02 -04:00 |
|
Eduardo Quezada
|
a6bfcc1194
|
More style fixes
|
2024-05-18 14:36:06 -04:00 |
|
Eduardo Quezada
|
06094a2137
|
More style fixes.
|
2024-05-18 11:39:46 -04:00 |
|
Eduardo Quezada
|
569749f9c2
|
Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
# Makefile
# gflib/sprite.h
# graphics/object_events/pics/pokemon/wailord.png
# include/constants/event_objects.h
# include/random.h
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info.h
# src/data/object_events/object_event_graphics_info_pointers.h
# src/event_object_movement.c
# src/random.c
# src/scrcmd.c
|
2024-05-18 10:12:17 -04:00 |
|
Ariel A
|
d785fad8cf
|
refactor: code review for expansion
|
2024-05-17 21:37:18 -04:00 |
|
Ariel A
|
d3849f2fc6
|
Merge branch 'followers' into followers-expanded-id
|
2024-05-17 20:46:24 -04:00 |
|
Ariel A
|
6856bcf610
|
refactor: code review for expansion
|
2024-05-17 20:45:32 -04:00 |
|
Eduardo Quezada
|
d5268b9f01
|
Final cleanup
|
2024-05-16 18:08:10 -04:00 |
|
Ariel A
|
f3b637c115
|
fix: castform OW sprite & palette
fixed #34
|
2024-05-04 18:47:25 -04:00 |
|
Ariel A
|
e36a7c59cf
|
Merge branch 'followers' into followers-expanded-id
|
2024-05-03 00:45:04 -04:00 |
|
Ariel A
|
758e4049cd
|
fix: LARGE_OW_SUPPORT and affine OW movements
fixed #33
|
2024-05-03 00:43:39 -04:00 |
|
Eduardo Quezada
|
5322127868
|
Fixed game not compiling when followers are disabled
|
2024-04-28 12:43:21 -04:00 |
|
Eduardo Quezada
|
3710fb5331
|
Fixed Shiny Palettes not visible in the debug menu
|
2024-04-24 14:52:07 -04:00 |
|
Eduardo Quezada
|
a200fe1590
|
Read separate palettes and apply it to Gen 1-3
|
2024-04-21 10:20:23 -04:00 |
|
Eduardo Quezada
|
3d9c7732f6
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
# include/event_object_movement.h
# src/data.c
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info/gen_4_families.h
|
2024-04-20 13:23:14 -04:00 |
|
Bassoonian
|
8329d8368d
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergemidapril
|
2024-04-12 12:16:28 +02:00 |
|
GriffinR
|
af0165a35d
|
Merge pull request #1987 from PokemonSanFran/cancelGroundEffectsCamera
Added fix to Keep the Camera from Making Waves
|
2024-04-11 14:41:04 -04:00 |
|
pkmnsnfrn
|
f9d690bafe
|
Added fix to Keep the Camera from Making Waves
|
2024-04-05 14:58:31 -07:00 |
|
pkmnsnfrn
|
71b8d20397
|
Replaced magic numbers regarding triggerGroundEffectsOnMove to TRUE / FALSE
|
2024-04-04 16:21:34 -04:00 |
|
Eduardo Quezada
|
3d181e5c70
|
Merge remote-tracking branch '_pret/master' into _RHH/pr/master/pret_sync20240324
# Conflicts:
# src/battle_anim_fight.c
|
2024-03-24 13:52:18 -03:00 |
|
Eduardo Quezada
|
70924c64b4
|
Better handling of disabling followers
|
2024-02-19 13:11:53 -03:00 |
|
Eduardo Quezada
|
f350000b44
|
Option to disabling follower Pokémon
|
2024-02-17 23:49:52 -03:00 |
|
Eduardo Quezada
|
124c17d315
|
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
# README.md
# data/field_effect_scripts.s
# data/maps/AncientTomb/scripts.inc
# data/maps/DesertRuins/scripts.inc
# data/maps/IslandCave/scripts.inc
# data/scripts/follower.inc
# graphics/object_events/pics/pokemon/wailord.png
# graphics/object_events/pics/pokemon_old/substitute.png
# include/constants/event_objects.h
# include/global.h
# remote_build.sh
# spritesheet_rules.mk
# src/bike.c
# src/data/object_events/object_event_anims.h
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info_followers.h
# src/data/object_events/object_event_pic_tables.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_screen_effect.c
# src/overworld.c
# src/palette.c
# src/pokemon_summary_screen.c
# src/scrcmd.c
# src/trainer_see.c
|
2024-02-17 23:40:08 -03:00 |
|
Ariel A
|
195d2bb79a
|
Merge branch 'followers' into followers-expanded-id
|
2024-02-17 17:19:01 -05:00 |
|
Ariel A
|
6bceacf403
|
Added override table for standalone follower palettes.
|
2024-02-17 16:55:11 -05:00 |
|
Ariel A
|
725252905b
|
Merge branch 'merrp/pr/style' into followers
|
2024-02-15 22:49:36 -05:00 |
|
Ariel A
|
915f40c654
|
Improved follower message system.
|
2024-02-12 20:37:08 -05:00 |
|
Ariel A
|
a407c72235
|
Cleaned up follower code.
Added support for asymmetrical follower pokemon.
Fixed bug with changing GraphicsInfo size.
Added follower Substitute gfx. Credit: shikashipx
|
2024-02-12 20:37:01 -05:00 |
|
Eduardo Quezada
|
5119ee2d39
|
Can disable follower graphics
|
2024-01-24 20:13:07 -03:00 |
|
Eduardo Quezada
|
f5239aae3c
|
Reading Follower data from gSpeciesInfo
|
2024-01-24 19:28:40 -03:00 |
|
Eduardo Quezada
|
ebbcb7d025
|
Whitespace, documentation and style
|
2024-01-22 19:12:52 -03:00 |
|
Ariel A
|
b56158428e
|
Added new follower pokeballs & toggle.
Credit: shikashipx
|
2024-01-21 17:21:33 -05:00 |
|
Eduardo Quezada
|
1aa7fea14f
|
Made OW_GFX_COMPRESS into C ifs
|
2024-01-19 10:58:02 -03:00 |
|
Eduardo Quezada
|
d53d34b3c5
|
Restored missing code
|
2024-01-18 09:36:39 -03:00 |
|
Eduardo Quezada
|
381a0bf8a1
|
Fixed compile issues
|
2024-01-18 09:10:20 -03:00 |
|
Eduardo Quezada
|
5d372b5f8a
|
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
# README.md
# gflib/sprite.c
# graphics/object_events/pics/pokemon/togetic.png
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info.h
# src/data/object_events/object_event_graphics_info_followers.h
# src/event_object_movement.c
# src/field_effect_helpers.c
|
2024-01-18 08:12:09 -03:00 |
|
Eduardo Quezada
|
ddc752eb14
|
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
# Conflicts:
# asm/macros/event.inc
# data/field_effect_scripts.s
# data/maps/BattleFrontier_BattleTowerLobby/scripts.inc
# data/script_cmd_table.inc
# graphics/pokemon/castform/sunny/anim_front.png
# graphics/pokemon/castform/sunny/normal.pal
# include/battle_util.h
# include/constants/event_object_movement.h
# include/constants/field_effects.h
# src/battle_controller_player.c
# src/battle_util.c
# src/data/object_events/movement_action_func_tables.h
# src/data/object_events/object_event_pic_tables.h
# src/data/trainer_graphics/back_pic_anims.h
# src/daycare.c
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/load_save.c
# src/scrcmd.c
# src/trainer_see.c
|
2024-01-17 18:11:35 -03:00 |
|
Bassoonian
|
b948accc80
|
Remove redundant table
|
2024-01-04 16:07:12 +00:00 |
|
Ariel A
|
398a9ee8fa
|
Merge branch 'followers' into followers-expanded-id
|
2023-12-31 01:49:56 -05:00 |
|
Ariel A
|
7d7531f2fa
|
Merge branch 'master' into followers
|
2023-12-31 01:28:27 -05:00 |
|
Ariel A
|
7842a8305a
|
Fixed follower elevation/subpriority issues when player crosses elevations.
|
2023-12-31 01:18:39 -05:00 |
|