Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-03-21 18:04:50 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge commit '75642625439306f0cc5aed81177dc191f0d5950e' into merrp-merge

Browse Source 
Conflicts:
	include/constants/event_objects.h
	src/event_object_movement.c
	src/follower_helper.c
This commit is contained in:
Hedara 2025-06-25 17:54:59 +02:00
commit c0a50096f3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
data/maps/MtChimney/scripts.inc
View File

@ -851,4 +851,3 @@ MtChimney_Text_SawyerRematchDefeat:
MtChimney_Text_SawyerPostRematch:
.string "Actually, it really is hot here.\n"
.string "I'm overdressed for these parts.$"

6
include/constants/event_objects.h
View File

@ -333,10 +333,12 @@
#define LOCALID_BERRY_BLENDER_PLAYER_END 240 // This will use 5 (MAX_RFU_PLAYERS) IDs ending at 240, i.e. 236-240
#define LOCALID_FOLLOWING_POKEMON 254
#define LOCALID_PLAYER 255
#define OBJ_EVENT_ID_FOLLOWER 0xFE
#define OBJ_EVENT_ID_NPC_FOLLOWER 0xFD
#define OBJ_EVENT_ID_FOLLOWER 0xFE
#define OBJ_EVENT_ID_NPC_FOLLOWER 0xFD
// Aliases for old names. "object event id" normally refers to an index into gObjectEvents, which these are not.
// Used for link player OWs in CreateLinkPlayerSprite
#define OBJ_EVENT_ID_DYNAMIC_BASE 0xF0
#define OBJ_EVENT_ID_CAMERA LOCALID_CAMERA
#define OBJ_EVENT_ID_PLAYER LOCALID_PLAYER