[Community PR] Integrate merrp's followers branch #4022

AsparagusEduardo · 2024-01-18T19:32:25Z

Description

This PR integrates @aarant's followers-expanded-id branch.
It includes Dynamic Overworld Palettes and Expanded Overworld IDs.

Details here: https://github.com/aarant/pokeemerald

Sprites taken from HGSS, with exception of onces that exceed 32x32 dimensions.
New custom 32x32 sprites by LarryTurbo on DeviantArt

TODO list:

Add follower sprites to debug menu.
Fix 64x64 sprites.
Add config to disable following Pokémon and their graphics/object events.
Move follower data to gSpeciesInfo and graphics to src/data/pokemon/graphics.
Clean up code style to be consistent with the rest of the repository.

Being worked on by @aarant

Add Substitute Doll follower sprite as a placeholder for disabled/non-existent followers (commisioned to an artist)
Implement asymetric support for followers

Being worked on by Gerben BSc on Discord

Fix follower sprite palettes from changes that have happened since last year.

Non-blocking:

Decouple following Pokémon from the first slot of the party
- Add party menu option to choose what Pokémon is following.
- Config to not have follower if their sprite is not available

Images

Feature(s) this PR does NOT handle:

Does not include the lighting-expanded-id or icons branches.
- lighting-expanded-id will be handled in a separate PR after this one is merged.
Link contests should be checked to make sure that they aren't broken by loading other player's palettes dynamically.
This PR keeps the follower branch's callfunc as a sorta-duplicate of our current callnative. Main difference is that callfunc can return a value. In a follow up PR, we need to update callnative to also have this and remove callfunc.
- ~~ScrFunc_ functions should be renamed as well.~~ Done, callfunc functions were converted to callnatives
Check integration with @ghoulslash's "follow_me" branch (mostly likely it might need something like "follower Pokémon hides when NPC follower is following").

Discord contact info

AsparagusEduardo

…DatH

https://www.pokecommunity.com/showthread.php?p=10410294#post10410294

…Exchange Corner shop.

Was caused by quick `applymovements` not giving enough time to move the follower on top of the player.

Fixed minor graphical bug in LoadWhiteFlashPalette.

…blob, bird)

…tive objects.

… palette. Credit: Jaizu

…nused "emote" macro

Fixes follower pokeball gfx showing garbage for 1 frame when emerging

# Conflicts: # src/data/graphics/pokemon.h # src/data/pokemon/species_info.h # src/data/pokemon/species_info/gen_1_families.h # src/data/pokemon/species_info/gen_2_families.h # src/data/pokemon/species_info/gen_4_families.h # src/data/pokemon/species_info/gen_5_families.h # src/data/pokemon/species_info/gen_8_families.h

asm/macros/event.inc

data/scripts/field_move_scripts.inc

data/scripts/follower.inc

graphics/weather/fog.pal

src/event_object_movement.c

data/tilesets/secondary/rustboro/metatile_attributes.bin

src/event_object_movement.c

…to _RHH/pr/upcoming/merrpFollowers # Conflicts: # src/event_object_movement.c # src/scrcmd.c

This reverts commit 24913f5. # Conflicts: # src/data/pokemon/species_info/gen_4_families.h # src/data/pokemon/species_info/gen_5_families.h # src/data/pokemon/species_info/gen_8_families.h

pkmnsnfrn · 2024-09-18T17:26:28Z

@ghoulslash asked me to put this here, so I am

List of files changed
Patch Diff

aarant and others added 30 commits December 23, 2021 04:13

Fixed follower appearance in shops.

58a3e55

Added flag for safe follower movement.

d06e1d4

Follower pokemon now emerge matching the player's direction.

149f443

Added movements to follower messages. Movement credit: SonikkuA-DatH

cf673fd

Added support for Ghoulslash's sideways stairs with followers.

a4e1c84

Updated Donphan, Taillow, Swellow follower sprites. Credit: SonikkuA-…

d8a5fbd

…DatH

Added more follower footprint types. Credit: Sonikku-DatH

7daa783

https://www.pokecommunity.com/showthread.php?p=10410294#post10410294

Fixed shadow palette tag. Fully removed permanent shadows.

ea5e081

Re-indexed follower & pokeball GFX IDs.

2273a61

Fixed bug where decor icons cleared dynamic palettes in the Frontier …

c78736c

…Exchange Corner shop.

Fixed script release breaking followers when called mid-movement.

570b592

Fixed bug where followers could be talked to while invisible.

6ef4e92

Was caused by quick `applymovements` not giving enough time to move the follower on top of the player.

Fixed Sky Pillar Rayquaza sprite having the wrong image.

23782c1

Ignored species shiny/form bits in ScrCmd_bufferspeciesname.

acfd11b

Updated / genericized remote_build.sh.

eeaefee

Added support for setting overworld species via GFX script vars.

30c366e

Fixed minor graphical bug in LoadWhiteFlashPalette.

Fixed all field effects with gendered palette tags (warp arrow, surf …

483d4b3

…blob, bird)

Fixed removeobject clearing the palettes of unloaded dummy sprites.

13565fc

Fixed sprite palette gamma types.

2bc5da3

Fixed GetFollowerObject being able to sometimes return removed/inac…

5e1c6e0

…tive objects.

Changed default follower elevation to player's current elevation.

7d4015d

Updated remote_build to use --force-with-lease instead of --force.

9993f72

Added system for conditional follower messages.

831c73c

Fixed OrbEffect hanging when follower pokemon is out.

e8f3dca

Removed old debugPtr.

40d610e

Fixed some field effect palettes. Removed leftover CacheLightMetatiles.

28ec60a

Fixed palette weather shading (again).

f623406

Using follower's nickname instead of ther species name.

21d8c8e

Fixed missing include in event_object_movement. Fixed Lombre follower…

8672530

… palette. Credit: Jaizu

Fixed object events not being unfrozen after using Flash.

ec756d3

aarant and others added 9 commits May 21, 2024 22:23

Merge branch 'followers' into followers-expanded-id

a49d908

Moved callfuncs to general macros folder + added comments + removed u…

2556707

…nused "emote" macro

Revert NUM_DECORATION_FLAGS definition

1be5581

fix: make LoadSheetGraphicsInfo load, then free, tiles

0630acc

Fixes follower pokeball gfx showing garbage for 1 frame when emerging

Removed duplicated object event tags

8854eaa

Removed duplicate tags

6d5cd7c

Adjusted function names to align with pret

2f4077b

Added comment to Nurse movement

5812ca7

Bassoonian reviewed May 28, 2024

View reviewed changes

More review comments

ff480de

Bassoonian reviewed May 29, 2024

View reviewed changes

data/tilesets/secondary/rustboro/metatile_attributes.bin Outdated Show resolved Hide resolved

src/event_object_movement.c Outdated Show resolved Hide resolved

src/event_object_movement.c Outdated Show resolved Hide resolved

AsparagusEduardo added 5 commits May 29, 2024 14:40

Proper macro capitalization

d1e2f62

getdirectiontoface macro

3d05961

Convert callfuncs to callnative

e7f66e6

Metatile + commas

5bd440f

More review

de760e6

Sneed69 reviewed May 31, 2024

View reviewed changes

src/event_object_movement.c Outdated Show resolved Hide resolved

aarant and others added 6 commits June 1, 2024 14:46

fix: fixed a few oversights with follower message generation

3727be9

Merge branch 'followers' into followers-expanded-id

e420f99

Merge remote-tracking branch '_merrp_origin/followers-expanded-id' in…

1359966

…to _RHH/pr/upcoming/merrpFollowers # Conflicts: # src/event_object_movement.c # src/scrcmd.c

Restored Gen 4-8 followers

3202625

This reverts commit 24913f5. # Conflicts: # src/data/pokemon/species_info/gen_4_families.h # src/data/pokemon/species_info/gen_5_families.h # src/data/pokemon/species_info/gen_8_families.h

Remove unused callfunc

da91e6a

Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers

ee1d147

Bassoonian approved these changes Jun 2, 2024

View reviewed changes

Bassoonian merged commit f11826b into rh-hideout:upcoming Jun 2, 2024
1 check passed

AsparagusEduardo deleted the _RHH/pr/upcoming/merrpFollowers branch June 2, 2024 15:28

AlexOn1ine mentioned this pull request Nov 1, 2024

Allow Pokémon party interaction menu to be scrollable #3918

Closed

NicoSwag pushed a commit to NicoSwag/pokeemerald-expansion that referenced this pull request Nov 15, 2024

[Community PR] Integrate merrp's followers branch (rh-hideout#4022)

c54f4b9

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Community PR] Integrate merrp's followers branch #4022

[Community PR] Integrate merrp's followers branch #4022

AsparagusEduardo commented Jan 18, 2024 •

edited

Loading

pkmnsnfrn commented Sep 18, 2024

[Community PR] Integrate merrp's followers branch #4022

[Community PR] Integrate merrp's followers branch #4022

Conversation

AsparagusEduardo commented Jan 18, 2024 • edited Loading

Description

Images

Feature(s) this PR does NOT handle:

Discord contact info

pkmnsnfrn commented Sep 18, 2024

AsparagusEduardo commented Jan 18, 2024 •

edited

Loading