dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix object event graphic names (#731)

Browse Source 
* Fixed object event graphic names

* Updated files and other variable names

* Fix from finding and replacing without matching case

* spritesheet updates

* Update flag name

---------

Co-authored-by: Marcus Huderle <huderlem@gmail.com>
This commit is contained in:
Frank DeBlasio
2026-03-22 09:28:44 -04:00
committed by GitHub
parent 59bf609685
commit aac6ebbc27
46 changed files with 156 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/maps/SaffronCity_PokemonTrainerFanClub/map.json
+4 -4
View File
@@ -18,7 +18,7 @@
{
"local_id": "LOCALID_TRAINER_FAN_CLUB_BATTLE_GIRL",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL",
"x": 7,
"y": 13,
"elevation": 3,
@@ -27,7 +27,7 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl",
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirl",
"flag": "0"
},
{
@@ -123,7 +123,7 @@
{
"local_id": "LOCALID_TRAINER_FAN_CLUB_BLACK_BELT",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 5,
"y": 11,
"elevation": 3,
@@ -133,7 +133,7 @@
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SaffronCity_PokemonTrainerFanClub_EventScript_BlackBelt",
"flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT"
"flag": "FLAG_HIDE_SAFFRON_FAN_CLUB_BLACK_BELT"
},
{
"type": "object",
data/maps/SaffronCity_PokemonTrainerFanClub/scripts.inc
+9 -9
View File
@@ -155,38 +155,38 @@ SaffronCity_PokemonTrainerFanClub_EventScript_SetMemberPosForFirstMeeting::
call SaffronCity_PokemonTrainerFanClub_EventScript_MoveMember8ToFarTable
end
SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirl::
SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirl::
lock
faceplayer
setvar VAR_0x8004, FANCLUB_MEMBER1
special Script_BufferFanClubTrainerName
goto_if_eq VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0, SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion
goto_if_eq VAR_MAP_SCENE_SAFFRON_CITY_POKEMON_TRAINER_FAN_CLUB, 0, SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlPlayerNotChampion
specialvar VAR_RESULT, Script_IsFanClubMemberFanOfPlayer
goto_if_eq VAR_RESULT, TRUE, SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan
goto_if_eq VAR_RESULT, TRUE, SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlPlayersFan
specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
goto_if_eq VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1), SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan
goto_if_eq VAR_RESULT, (NUM_TRAINER_FAN_CLUB_MEMBERS - 1), SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlOnlyNonFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_WasYourFanNotAnymore
release
end
SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayersFan::
SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlPlayersFan::
specialvar VAR_RESULT, Script_GetNumFansOfPlayerInTrainerFanClub
goto_if_eq VAR_RESULT, 1, SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan
goto_if_eq VAR_RESULT, 1, SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlOnlyFan
msgbox SaffronCity_PokemonTrainerFanClub_Text_AlwaysCheerForYou
release
end
SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyFan::
SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlOnlyFan::
msgbox SaffronCity_PokemonTrainerFanClub_Text_IllAlwaysBelieveInYou
release
end
SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlOnlyNonFan::
SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlOnlyNonFan::
msgbox SaffronCity_PokemonTrainerFanClub_Text_EveryonesYourFanButICantBe
release
end
SaffronCity_PokemonTrainerFanClub_EventScript_BattleGirlPlayerNotChampion::
SaffronCity_PokemonTrainerFanClub_EventScript_CrushGirlPlayerNotChampion::
msgbox SaffronCity_PokemonTrainerFanClub_Text_TrainersCoolWhenBattling
release
end