Leahnaya/pokeemerald-expansion
1
0
Fork 0
mirror of https://github.com/rh-hideout/pokeemerald-expansion.git synced 2026-09-29 21:33:02 -05:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'rhh/master' into upcoming

Browse Source
This commit is contained in:
Martin Griffin
2026-06-07 08:05:52 +01:00
parent 33f9c20cf8 08e503fb66
commit 5ab619eba2
122 changed files with 1256 additions and 575 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
data/scripts/cable_club_frlg.inc
View File

@@ -298,7 +298,7 @@ CableClub_EventScript_EnterColosseum_Frlg::
release
goto_if_eq VAR_0x8004, USING_MULTI_BATTLE, CableClub_EventScript_WarpTo4PColosseum_Frlg
special SetCableClubWarp
warp MAP_BATTLE_COLOSSEUM_2P, 6, 8
warp MAP_BATTLE_COLOSSEUM_2P_FRLG, 6, 8
special DoCableClubWarp
end
@@ -310,7 +310,7 @@ CableClub_EventScript_PlayerApproachLinkRoomRight_Frlg::
CableClub_EventScript_WarpTo4PColosseum_Frlg::
special SetCableClubWarp
warp MAP_BATTLE_COLOSSEUM_4P, 5, 8
warp MAP_BATTLE_COLOSSEUM_4P_FRLG, 5, 8
special DoCableClubWarp
end

2
data/scripts/mart_clerk.inc
View File

@@ -6,7 +6,7 @@ gText_PleaseComeAgain::
.string "Please come again!$"
gText_PlayerWhatCanIDoForYou::
.string "{PLAYER}{STRING 5}, welcome!\p"
.string "{PLAYER}{KUN}, welcome!\p"
.string "What can I do for you?$"
Pokemart_DefaultItemList::

2
data/scripts/std_msgbox.inc
View File

@@ -33,7 +33,7 @@ Std_ReceivedItem::
textcolor NPC_TEXT_COLOR_NEUTRAL
call_if_eq VAR_0x8002, MUS_LEVEL_UP, EventScript_ReceivedItemFanfare1
call_if_eq VAR_0x8002, MUS_RG_OBTAIN_KEY_ITEM, EventScript_ReceivedItemFanfare2
message 0x0
message NULL
waitmessage
waitfanfare
call_if_eq VAR_0x8002, MUS_LEVEL_UP, EventScript_ReceivedItemWaitFanfare