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/event_scripts.s
+3 -3
View File
@@ -1030,7 +1030,7 @@ EventScript_ResetAllMapFlags::
setflag FLAG_HIDE_CINNABAR_SEAGALLOP
setflag FLAG_HIDE_CINNABAR_POKECENTER_BILL
setflag FLAG_HIDE_LORELEI_IN_HER_HOUSE
setflag FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT
setflag FLAG_HIDE_SAFFRON_FAN_CLUB_BLACK_BELT
setflag FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER
setflag FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN
setflag FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY
@@ -1038,7 +1038,7 @@ EventScript_ResetAllMapFlags::
setflag FLAG_HIDE_TWO_ISLAND_GAME_CORNER_BIKER
setflag FLAG_HIDE_TWO_ISLAND_WOMAN
setflag FLAG_HIDE_TWO_ISLAND_BEAUTY
setflag FLAG_HIDE_TWO_ISLAND_SUPER_NERD
setflag FLAG_HIDE_TWO_ISLAND_POKE_MANIAC
setflag FLAG_HIDE_LOSTELLE_IN_HER_HOME
setflag FLAG_HIDE_THREE_ISLAND_LONE_BIKER
setflag FLAG_HIDE_FOUR_ISLAND_RIVAL
@@ -1123,7 +1123,7 @@ EventScript_HandOverItem::
return
.include "data/scripts/pokemon_league.inc"
.include "data/scripts/movement.inc"
.include "data/scripts/movement.inc"
.include "data/scripts/flavor_text.inc"
.include "data/scripts/questionnaire.inc"
data/maps/CeladonCity_Condominiums_3F/map.json
+1 -1
View File
@@ -45,7 +45,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC",
"x": 4,
"y": 10,
"elevation": 3,
data/maps/CeladonCity_Condominiums_RoofRoom/map.json
+1 -1
View File
@@ -17,7 +17,7 @@
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 3,
"y": 5,
"elevation": 3,
data/maps/CinnabarIsland_Gym/map.json
+3 -3
View File
@@ -18,7 +18,7 @@
{
"local_id": "LOCALID_QUINN",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC",
"x": 25,
"y": 11,
"elevation": 3,
@@ -62,7 +62,7 @@
{
"local_id": "LOCALID_RAMON",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC",
"x": 16,
"y": 11,
"elevation": 3,
@@ -92,7 +92,7 @@
{
"local_id": "LOCALID_DUSTY",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC",
"x": 4,
"y": 19,
"elevation": 3,
data/maps/CinnabarIsland_PokemonLab_ResearchRoom/map.json
+1 -1
View File
@@ -17,7 +17,7 @@
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC",
"x": 5,
"y": 4,
"elevation": 3,
data/maps/IndigoPlateau_PokemonCenter_1F/map.json
+1 -1
View File
@@ -75,7 +75,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 23,
"y": 13,
"elevation": 3,
data/maps/MtEmber_Exterior/map.json
+1 -1
View File
@@ -61,7 +61,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL",
"x": 22,
"y": 35,
"elevation": 3,
data/maps/OneIsland_KindleRoad/map.json
+6 -6
View File
@@ -93,7 +93,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL",
"x": 9,
"y": 53,
"elevation": 3,
@@ -107,7 +107,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL",
"x": 18,
"y": 105,
"elevation": 4,
@@ -121,7 +121,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 16,
"y": 64,
"elevation": 3,
@@ -135,7 +135,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 11,
"y": 64,
"elevation": 3,
@@ -177,7 +177,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 8,
"y": 68,
"elevation": 3,
@@ -191,7 +191,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL",
"x": 9,
"y": 68,
"elevation": 3,
data/maps/OneIsland_KindleRoad_EmberSpa/map.json
+1 -1
View File
@@ -45,7 +45,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 6,
"y": 8,
"elevation": 3,
data/maps/OneIsland_PokemonCenter_1F/map.json
+2 -2
View File
@@ -90,7 +90,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL",
"x": 7,
"y": 4,
"elevation": 3,
@@ -99,7 +99,7 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "OneIsland_PokemonCenter_1F_EventScript_BattleGirl",
"script": "OneIsland_PokemonCenter_1F_EventScript_CrushGirl",
"flag": "0"
}
],
data/maps/OneIsland_PokemonCenter_1F/scripts.inc
+3 -3
View File
@@ -379,15 +379,15 @@ OneIsland_PokemonCenter_1F_EventScript_Hiker::
msgbox OneIsland_PokemonCenter_1F_Text_EnormousVolcanoOnIsland, MSGBOX_NPC
end
OneIsland_PokemonCenter_1F_EventScript_BattleGirl::
OneIsland_PokemonCenter_1F_EventScript_CrushGirl::
lock
faceplayer
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_PokemonCenter_1F_EventScript_BattleGirlHoennLinked
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, OneIsland_PokemonCenter_1F_EventScript_CrushGirlHoennLinked
msgbox OneIsland_PokemonCenter_1F_Text_WishICouldTradeWithBoyfriend
release
end
OneIsland_PokemonCenter_1F_EventScript_BattleGirlHoennLinked::
OneIsland_PokemonCenter_1F_EventScript_CrushGirlHoennLinked::
msgbox OneIsland_PokemonCenter_1F_Text_TradedWithFarAwayBoyfriend
release
end
data/maps/PokemonMansion_2F/map.json
+1 -1
View File
@@ -17,7 +17,7 @@
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC",
"x": 5,
"y": 23,
"elevation": 3,
data/maps/PokemonMansion_3F/map.json
+1 -1
View File
@@ -17,7 +17,7 @@
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC",
"x": 7,
"y": 13,
"elevation": 3,
data/maps/PokemonMansion_B1F/map.json
+1 -1
View File
@@ -31,7 +31,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC",
"x": 20,
"y": 25,
"elevation": 3,
data/maps/RockTunnel_1F/map.json
+1 -1
View File
@@ -101,7 +101,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC",
"x": 27,
"y": 10,
"elevation": 3,
data/maps/RockTunnel_B1F/map.json
+3 -3
View File
@@ -17,7 +17,7 @@
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC",
"x": 2,
"y": 6,
"elevation": 3,
@@ -87,7 +87,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC",
"x": 23,
"y": 23,
"elevation": 3,
@@ -115,7 +115,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC",
"x": 29,
"y": 35,
"elevation": 3,
data/maps/Route10/map.json
+2 -2
View File
@@ -56,7 +56,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC",
"x": 15,
"y": 70,
"elevation": 3,
@@ -84,7 +84,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC",
"x": 13,
"y": 44,
"elevation": 3,
data/maps/Route15/map.json
+2 -2
View File
@@ -182,7 +182,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 39,
"y": 7,
"elevation": 3,
@@ -196,7 +196,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL",
"x": 40,
"y": 7,
"elevation": 3,
data/maps/Route4/map.json
+2 -2
View File
@@ -84,7 +84,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 47,
"y": 3,
"elevation": 3,
@@ -98,7 +98,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 50,
"y": 3,
"elevation": 3,
data/maps/SaffronCity/map.json
+2 -2
View File
@@ -236,7 +236,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL",
"x": 47,
"y": 24,
"elevation": 3,
@@ -245,7 +245,7 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "SaffronCity_EventScript_BattleGirl",
"script": "SaffronCity_EventScript_CrushGirl",
"flag": "FLAG_HIDE_POSTGAME_GOSSIPERS"
}
],
data/maps/SaffronCity_Dojo/map.json
+5 -5
View File
@@ -17,7 +17,7 @@
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 11,
"y": 10,
"elevation": 3,
@@ -31,7 +31,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 1,
"y": 10,
"elevation": 3,
@@ -45,7 +45,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 11,
"y": 8,
"elevation": 3,
@@ -59,7 +59,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 1,
"y": 8,
"elevation": 3,
@@ -74,7 +74,7 @@
{
"local_id": "LOCALID_KARATE_MASTER",
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 6,
"y": 5,
"elevation": 3,
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
data/maps/SevenIsland_SevaultCanyon/map.json
+2 -2
View File
@@ -28,7 +28,7 @@
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BATTLE_GIRL",
"graphics_id": "OBJ_EVENT_GFX_CRUSH_GIRL",
"x": 13,
"y": 43,
"elevation": 3,
@@ -294,7 +294,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 8,
"y": 26,
"elevation": 3,
data/maps/SixIsland_RuinValley/map.json
+1 -1
View File
@@ -94,7 +94,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC",
"x": 21,
"y": 29,
"elevation": 5,
data/maps/TwoIsland/map.json
+3 -3
View File
@@ -79,7 +79,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC",
"x": 27,
"y": 6,
"elevation": 3,
@@ -88,8 +88,8 @@
"movement_range_y": 1,
"trainer_type": "TRAINER_TYPE_NONE",
"trainer_sight_or_berry_tree_id": "0",
"script": "TwoIsland_EventScript_SuperNerd",
"flag": "FLAG_HIDE_TWO_ISLAND_SUPER_NERD"
"script": "TwoIsland_EventScript_PokeManiac",
"flag": "FLAG_HIDE_TWO_ISLAND_POKE_MANIAC"
},
{
"type": "object",
data/maps/TwoIsland/scripts.inc
+2 -2
View File
@@ -54,7 +54,7 @@ TwoIsland_EventScript_SetShopExpanded2::
TwoIsland_EventScript_SetShopExpanded3::
setvar VAR_MAP_SCENE_TWO_ISLAND, 4
clearflag FLAG_HIDE_TWO_ISLAND_SUPER_NERD
clearflag FLAG_HIDE_TWO_ISLAND_POKE_MANIAC
return
TwoIsland_EventScript_Clerk::
@@ -192,7 +192,7 @@ TwoIsland_EventScript_Beauty::
release
end
TwoIsland_EventScript_SuperNerd::
TwoIsland_EventScript_PokeManiac::
msgbox TwoIsland_Text_BuyRareItemsHere, MSGBOX_NPC
end
data/maps/VictoryRoad_2F/map.json
+2 -2
View File
@@ -17,7 +17,7 @@
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_SUPER_NERD",
"graphics_id": "OBJ_EVENT_GFX_POKE_MANIAC",
"x": 7,
"y": 4,
"elevation": 3,
@@ -31,7 +31,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 20,
"y": 11,
"elevation": 4,
data/maps/ViridianCity_Gym/map.json
+3 -3
View File
@@ -17,7 +17,7 @@
"object_events": [
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 10,
"y": 2,
"elevation": 3,
@@ -45,7 +45,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 11,
"y": 14,
"elevation": 3,
@@ -87,7 +87,7 @@
},
{
"type": "object",
"graphics_id": "OBJ_EVENT_GFX_BLACKBELT",
"graphics_id": "OBJ_EVENT_GFX_BLACK_BELT",
"x": 3,
"y": 11,
"elevation": 3,
data/scripts/fame_checker.inc
+2 -2
View File
@@ -211,7 +211,7 @@ EventScript_LanceUnused::
release
end
SaffronCity_EventScript_BattleGirlUnused::
SaffronCity_EventScript_CrushGirlUnused::
lock
faceplayer
famechecker FAMECHECKER_LANCE, 1
@@ -219,7 +219,7 @@ SaffronCity_EventScript_BattleGirlUnused::
release
end
SaffronCity_EventScript_BattleGirl::
SaffronCity_EventScript_CrushGirl::
lock
faceplayer
famechecker FAMECHECKER_LANCE, 2