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
graphics/object_events/pics/people/blackbelt.png → graphics/object_events/pics/people/black_belt.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 864 B

After

Width:  |  Height:  |  Size: 864 B

graphics/object_events/pics/people/battle_girl.png → graphics/object_events/pics/people/crush_girl.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 778 B

After

Width:  |  Height:  |  Size: 778 B

graphics/object_events/pics/people/super_nerd.png → graphics/object_events/pics/people/poke_maniac.png
View File
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 826 B

After

Width:  |  Height:  |  Size: 826 B

include/constants/event_objects.h
+3 -3
View File
@@ -27,7 +27,7 @@
#define OBJ_EVENT_GFX_SITTING_BOY 21
#define OBJ_EVENT_GFX_LASS 22
#define OBJ_EVENT_GFX_WOMAN_1 23
#define OBJ_EVENT_GFX_BATTLE_GIRL 24
#define OBJ_EVENT_GFX_CRUSH_GIRL 24
#define OBJ_EVENT_GFX_MAN 25
#define OBJ_EVENT_GFX_ROCKER 26
#define OBJ_EVENT_GFX_FAT_MAN 27
@@ -55,9 +55,9 @@
#define OBJ_EVENT_GFX_ROCKET_M 49
#define OBJ_EVENT_GFX_ROCKET_F 50
#define OBJ_EVENT_GFX_GBA_KID 51
#define OBJ_EVENT_GFX_SUPER_NERD 52
#define OBJ_EVENT_GFX_POKE_MANIAC 52
#define OBJ_EVENT_GFX_BIKER 53
#define OBJ_EVENT_GFX_BLACKBELT 54
#define OBJ_EVENT_GFX_BLACK_BELT 54
#define OBJ_EVENT_GFX_SCIENTIST 55
#define OBJ_EVENT_GFX_HIKER 56
#define OBJ_EVENT_GFX_FISHER 57
include/constants/flags.h
+2 -2
View File
@@ -121,7 +121,7 @@
#define FLAG_HIDE_UNION_ROOM_PLAYER_7 0x069
#define FLAG_HIDE_UNION_ROOM_PLAYER_8 0x06A
#define FLAG_HIDE_CINNABAR_SEAGALLOP 0x06B
#define FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT 0x06C
#define FLAG_HIDE_SAFFRON_FAN_CLUB_BLACK_BELT 0x06C
#define FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER 0x06D
#define FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN 0x06E
#define FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY 0x06F
@@ -138,7 +138,7 @@
#define FLAG_HIDE_LOSTELLE_IN_BERRY_FOREST 0x07A
#define FLAG_HIDE_TWO_ISLAND_WOMAN 0x07B
#define FLAG_HIDE_TWO_ISLAND_BEAUTY 0x07C
#define FLAG_HIDE_TWO_ISLAND_SUPER_NERD 0x07D
#define FLAG_HIDE_TWO_ISLAND_POKE_MANIAC 0x07D
#define FLAG_HIDE_THREE_ISLAND_ANTIBIKERS 0x07E
#define FLAG_0x07F 0x07F
#define FLAG_HIDE_ROUTE_16_SNORLAX 0x080
spritesheet_rules.mk
+3 -3
View File
@@ -22,7 +22,7 @@ $(OBJEVENTGFXDIR)/people/agatha.4bpp: %.4bpp: %.png
$(OBJEVENTGFXDIR)/people/balding_man.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OBJEVENTGFXDIR)/people/battle_girl.4bpp: %.4bpp: %.png
$(OBJEVENTGFXDIR)/people/crush_girl.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OBJEVENTGFXDIR)/people/beauty.4bpp: %.4bpp: %.png
@@ -34,7 +34,7 @@ $(OBJEVENTGFXDIR)/people/biker.4bpp: %.4bpp: %.png
$(OBJEVENTGFXDIR)/people/bill.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OBJEVENTGFXDIR)/people/blackbelt.4bpp: %.4bpp: %.png
$(OBJEVENTGFXDIR)/people/black_belt.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OBJEVENTGFXDIR)/people/blaine.4bpp: %.4bpp: %.png
@@ -241,7 +241,7 @@ $(OBJEVENTGFXDIR)/people/scientist.4bpp: %.4bpp: %.png
$(OBJEVENTGFXDIR)/people/sitting_boy.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OBJEVENTGFXDIR)/people/super_nerd.4bpp: %.4bpp: %.png
$(OBJEVENTGFXDIR)/people/poke_maniac.4bpp: %.4bpp: %.png
$(GFX) $< $@ -mwidth 2 -mheight 4
$(OBJEVENTGFXDIR)/people/swimmer_f_land.4bpp: %.4bpp: %.png
src/data/object_events/object_event_graphics.h
+3 -3
View File
@@ -62,7 +62,7 @@ const u16 gObjectEventPic_Boy[] = INCBIN_U16("graphics/object_events/pics/people
const u16 gObjectEventPic_Woman1[] = INCBIN_U16("graphics/object_events/pics/people/woman_1.4bpp");
const u16 gObjectEventPic_Woman3[] = INCBIN_U16("graphics/object_events/pics/people/woman_3.4bpp");
const u16 gObjectEventPic_BugCatcher[] = INCBIN_U16("graphics/object_events/pics/people/bug_catcher.4bpp");
const u16 gObjectEventPic_BattleGirl[] = INCBIN_U16("graphics/object_events/pics/people/battle_girl.4bpp");
const u16 gObjectEventPic_CrushGirl[] = INCBIN_U16("graphics/object_events/pics/people/crush_girl.4bpp");
const u16 gObjectEventPic_RichBoy[] = INCBIN_U16("graphics/object_events/pics/people/rich_boy.4bpp"); // Unused
const u16 gObjectEventPic_FatMan[] = INCBIN_U16("graphics/object_events/pics/people/fat_man.4bpp");
const u16 gObjectEventPic_BaldingMan[] = INCBIN_U16("graphics/object_events/pics/people/balding_man.4bpp");
@@ -80,14 +80,14 @@ const u16 gObjectEventPic_Picnicker[] = INCBIN_U16("graphics/object_events/pics/
const u16 gObjectEventPic_CooltrainerM[] = INCBIN_U16("graphics/object_events/pics/people/cooltrainer_m.4bpp");
const u16 gObjectEventPic_CooltrainerF[] = INCBIN_U16("graphics/object_events/pics/people/cooltrainer_f.4bpp");
const u16 gObjectEventPic_Psyduck[] = INCBIN_U16("graphics/object_events/pics/pokemon/psyduck.4bpp");
const u16 gObjectEventPic_SuperNerd[] = INCBIN_U16("graphics/object_events/pics/people/super_nerd.4bpp");
const u16 gObjectEventPic_PokeManiac[] = INCBIN_U16("graphics/object_events/pics/people/poke_maniac.4bpp");
const u16 gObjectEventPic_Channeler[] = INCBIN_U16("graphics/object_events/pics/people/channeler.4bpp");
const u16 gObjectEventPic_RocketF[] = INCBIN_U16("graphics/object_events/pics/people/rocket_f.4bpp");
const u16 gObjectEventPic_SwimmerMWater[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_m_water.4bpp");
const u16 gObjectEventPic_SwimmerFWater[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_f_water.4bpp");
const u16 gObjectEventPic_SwimmerMLand[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_m_land.4bpp");
const u16 gObjectEventPic_SwimmerFLand[] = INCBIN_U16("graphics/object_events/pics/people/swimmer_f_land.4bpp");
const u16 gObjectEventPic_Blackbelt[] = INCBIN_U16("graphics/object_events/pics/people/blackbelt.4bpp");
const u16 gObjectEventPic_BlackBelt[] = INCBIN_U16("graphics/object_events/pics/people/black_belt.4bpp");
const u16 gObjectEventPic_Scientist[] = INCBIN_U16("graphics/object_events/pics/people/scientist.4bpp");
const u16 gObjectEventPic_Gentleman[] = INCBIN_U16("graphics/object_events/pics/people/gentleman.4bpp");
const u16 gObjectEventPic_Sailor[] = INCBIN_U16("graphics/object_events/pics/people/sailor.4bpp");
src/data/object_events/object_event_graphics_info.h
+6 -6
View File
@@ -283,7 +283,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Boy = {
.affineAnims = gDummySpriteAffineAnimTable,
};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl = {
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CrushGirl = {
.tileTag = TAG_NONE,
.paletteTag = OBJ_EVENT_PAL_TAG_NPC_WHITE,
.reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE,
@@ -298,7 +298,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl = {
.oam = &gObjectEventBaseOam_16x32,
.subspriteTables = gObjectEventSpriteOamTables_16x32,
.anims = sAnimTable_Standard,
.images = sPicTable_BattleGirl,
.images = sPicTable_CrushGirl,
.affineAnims = gDummySpriteAffineAnimTable,
};
@@ -587,7 +587,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CooltrainerF = {
.affineAnims = gDummySpriteAffineAnimTable,
};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd = {
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokeManiac = {
.tileTag = TAG_NONE,
.paletteTag = OBJ_EVENT_PAL_TAG_NPC_PINK,
.reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE,
@@ -602,7 +602,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd = {
.oam = &gObjectEventBaseOam_16x32,
.subspriteTables = gObjectEventSpriteOamTables_16x32,
.anims = sAnimTable_Standard,
.images = sPicTable_SuperNerd,
.images = sPicTable_PokeManiac,
.affineAnims = gDummySpriteAffineAnimTable,
};
@@ -720,7 +720,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SwimmerFLand = {
.affineAnims = gDummySpriteAffineAnimTable,
};
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt = {
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt = {
.tileTag = TAG_NONE,
.paletteTag = OBJ_EVENT_PAL_TAG_NPC_WHITE,
.reflectionPaletteTag = OBJ_EVENT_PAL_TAG_NONE,
@@ -735,7 +735,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt = {
.oam = &gObjectEventBaseOam_16x32,
.subspriteTables = gObjectEventSpriteOamTables_16x32,
.anims = sAnimTable_Standard,
.images = sPicTable_Blackbelt,
.images = sPicTable_BlackBelt,
.affineAnims = gDummySpriteAffineAnimTable,
};
src/data/object_events/object_event_graphics_info_pointers.h
+6 -6
View File
@@ -22,7 +22,7 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BugCatcher;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SittingBoy;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Lass;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Woman1;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BattleGirl;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CrushGirl;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Man;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Rocker;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FatMan;
@@ -50,9 +50,9 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_WorkerF;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketM;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RocketF;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_GBAKid;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SuperNerd;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PokeManiac;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Biker;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Blackbelt;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BlackBelt;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Scientist;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Hiker;
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_Fisher;
@@ -177,7 +177,7 @@ const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM
[OBJ_EVENT_GFX_SITTING_BOY] = &gObjectEventGraphicsInfo_SittingBoy,
[OBJ_EVENT_GFX_LASS] = &gObjectEventGraphicsInfo_Lass,
[OBJ_EVENT_GFX_WOMAN_1] = &gObjectEventGraphicsInfo_Woman1,
[OBJ_EVENT_GFX_BATTLE_GIRL] = &gObjectEventGraphicsInfo_BattleGirl,
[OBJ_EVENT_GFX_CRUSH_GIRL] = &gObjectEventGraphicsInfo_CrushGirl,
[OBJ_EVENT_GFX_MAN] = &gObjectEventGraphicsInfo_Man,
[OBJ_EVENT_GFX_ROCKER] = &gObjectEventGraphicsInfo_Rocker,
[OBJ_EVENT_GFX_FAT_MAN] = &gObjectEventGraphicsInfo_FatMan,
@@ -205,9 +205,9 @@ const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM
[OBJ_EVENT_GFX_ROCKET_M] = &gObjectEventGraphicsInfo_RocketM,
[OBJ_EVENT_GFX_ROCKET_F] = &gObjectEventGraphicsInfo_RocketF,
[OBJ_EVENT_GFX_GBA_KID] = &gObjectEventGraphicsInfo_GBAKid,
[OBJ_EVENT_GFX_SUPER_NERD] = &gObjectEventGraphicsInfo_SuperNerd,
[OBJ_EVENT_GFX_POKE_MANIAC] = &gObjectEventGraphicsInfo_PokeManiac,
[OBJ_EVENT_GFX_BIKER] = &gObjectEventGraphicsInfo_Biker,
[OBJ_EVENT_GFX_BLACKBELT] = &gObjectEventGraphicsInfo_Blackbelt,
[OBJ_EVENT_GFX_BLACK_BELT] = &gObjectEventGraphicsInfo_BlackBelt,
[OBJ_EVENT_GFX_SCIENTIST] = &gObjectEventGraphicsInfo_Scientist,
[OBJ_EVENT_GFX_HIKER] = &gObjectEventGraphicsInfo_Hiker,
[OBJ_EVENT_GFX_FISHER] = &gObjectEventGraphicsInfo_Fisher,
src/data/object_events/object_event_pic_tables.h
+33 -33
View File
@@ -266,17 +266,17 @@ static const struct SpriteFrameImage sPicTable_Woman3[] = {
overworld_frame(gObjectEventPic_Woman3, 2, 4, 8),
};
static const struct SpriteFrameImage sPicTable_BattleGirl[] = {
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 0),
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 1),
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 2),
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 3),
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 4),
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 5),
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 6),
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 7),
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 8),
overworld_frame(gObjectEventPic_BattleGirl, 2, 4, 9),
static const struct SpriteFrameImage sPicTable_CrushGirl[] = {
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 0),
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 1),
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 2),
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 3),
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 4),
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 5),
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 6),
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 7),
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 8),
overworld_frame(gObjectEventPic_CrushGirl, 2, 4, 9),
};
static const struct SpriteFrameImage sPicTable_BugCatcher[] = {
@@ -494,17 +494,17 @@ static const struct SpriteFrameImage sPicTable_Boy[] = {
overworld_frame(gObjectEventPic_Boy, 2, 4, 9),
};
static const struct SpriteFrameImage sPicTable_SuperNerd[] = {
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 0),
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 1),
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 2),
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 3),
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 4),
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 5),
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 6),
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 7),
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 8),
overworld_frame(gObjectEventPic_SuperNerd, 2, 4, 9),
static const struct SpriteFrameImage sPicTable_PokeManiac[] = {
overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 0),
overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 1),
overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 2),
overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 3),
overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 4),
overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 5),
overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 6),
overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 7),
overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 8),
overworld_frame(gObjectEventPic_PokeManiac, 2, 4, 9),
};
static const struct SpriteFrameImage sPicTable_Channeler[] = {
@@ -584,17 +584,17 @@ static const struct SpriteFrameImage sPicTable_SwimmerFLand[] = {
overworld_frame(gObjectEventPic_SwimmerFLand, 2, 4, 9),
};
static const struct SpriteFrameImage sPicTable_Blackbelt[] = {
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 0),
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 1),
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 2),
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 3),
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 4),
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 5),
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 6),
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 7),
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 8),
overworld_frame(gObjectEventPic_Blackbelt, 2, 4, 9),
static const struct SpriteFrameImage sPicTable_BlackBelt[] = {
overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 0),
overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 1),
overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 2),
overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 3),
overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 4),
overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 5),
overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 6),
overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 7),
overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 8),
overworld_frame(gObjectEventPic_BlackBelt, 2, 4, 9),
};
static const struct SpriteFrameImage sPicTable_Scientist[] = {
src/dynamic_placeholder_text_util.c
+3 -3
View File
@@ -21,7 +21,7 @@ static const u8 sTextColorTable[] =
[OBJ_EVENT_GFX_YOUNGSTER / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_BOY
[OBJ_EVENT_GFX_BUG_CATCHER / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_SITTING_BOY
[OBJ_EVENT_GFX_LASS / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_WOMAN_1
[OBJ_EVENT_GFX_BATTLE_GIRL / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_MAN
[OBJ_EVENT_GFX_CRUSH_GIRL / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_MAN
[OBJ_EVENT_GFX_ROCKER / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_FAT_MAN
[OBJ_EVENT_GFX_WOMAN_2 / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_BEAUTY
[OBJ_EVENT_GFX_BALDING_MAN / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_FEMALE), // OBJ_EVENT_GFX_WOMAN_3
@@ -35,8 +35,8 @@ static const u8 sTextColorTable[] =
[OBJ_EVENT_GFX_SWIMMER_F_LAND / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_WORKER_M
[OBJ_EVENT_GFX_WORKER_F / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_ROCKET_M
[OBJ_EVENT_GFX_ROCKET_F / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_GBA_KID
[OBJ_EVENT_GFX_SUPER_NERD / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_BIKER
[OBJ_EVENT_GFX_BLACKBELT / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_SCIENTIST
[OBJ_EVENT_GFX_POKE_MANIAC / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_BIKER
[OBJ_EVENT_GFX_BLACK_BELT / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_SCIENTIST
[OBJ_EVENT_GFX_HIKER / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_FISHER
[OBJ_EVENT_GFX_CHANNELER / 2] = COLORS(NPC_TEXT_COLOR_FEMALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_CHEF
[OBJ_EVENT_GFX_POLICEMAN / 2] = COLORS(NPC_TEXT_COLOR_MALE, NPC_TEXT_COLOR_MALE), // OBJ_EVENT_GFX_GENTLEMAN
src/fame_checker.c
+6 -6
View File
@@ -337,20 +337,20 @@ static const u8 sFameCheckerArrayNpcGraphicsIds[] = {
OBJ_EVENT_GFX_BRUNO,
OBJ_EVENT_GFX_BRUNO,
OBJ_EVENT_GFX_CLIPBOARD,
OBJ_EVENT_GFX_BLACKBELT,
OBJ_EVENT_GFX_BLACK_BELT,
OBJ_EVENT_GFX_BEAUTY,
OBJ_EVENT_GFX_BLACKBELT,
OBJ_EVENT_GFX_BLACK_BELT,
// AGATHA
OBJ_EVENT_GFX_AGATHA,
OBJ_EVENT_GFX_BLACKBELT,
OBJ_EVENT_GFX_BLACKBELT,
OBJ_EVENT_GFX_BLACK_BELT,
OBJ_EVENT_GFX_BLACK_BELT,
OBJ_EVENT_GFX_CLIPBOARD,
OBJ_EVENT_GFX_AGATHA,
OBJ_EVENT_GFX_OLD_WOMAN,
// LANCE
OBJ_EVENT_GFX_LANCE,
OBJ_EVENT_GFX_LANCE,
OBJ_EVENT_GFX_BATTLE_GIRL,
OBJ_EVENT_GFX_CRUSH_GIRL,
OBJ_EVENT_GFX_WOMAN_1,
OBJ_EVENT_GFX_CLIPBOARD,
OBJ_EVENT_GFX_COOLTRAINER_M,
@@ -1235,7 +1235,7 @@ void UpdatePickStateFromSpecialVar8005(void)
{
if (gSpecialVar_0x8005 == FCPICKSTATE_NO_DRAW)
return;
if ( gSpecialVar_0x8005 == FCPICKSTATE_SILHOUETTE
if ( gSpecialVar_0x8005 == FCPICKSTATE_SILHOUETTE
&& gSaveBlock1Ptr->fameChecker[gSpecialVar_0x8004].pickState == FCPICKSTATE_COLORED
)
return;
src/trainer_fan_club.c
+1 -1
View File
@@ -63,7 +63,7 @@ static void UpdateTrainerFanClubGameClear(struct TrainerFanClub *fanClub)
SetPlayerGotFirstFans(fanClub);
SetInitialFansOfPlayer(fanClub);
VarSet(VAR_FANCLUB_LOSE_FAN_TIMER, gSaveBlock2Ptr->playTimeHours);
FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_BLACKBELT);
FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_BLACK_BELT);
FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_ROCKER);
FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_WOMAN);
FlagClear(FLAG_HIDE_SAFFRON_FAN_CLUB_BEAUTY);
src/trainer_tower.c
+13 -13
View File
@@ -109,17 +109,17 @@ static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = {
{OBJ_EVENT_GFX_TUBER_M_LAND, FACILITY_CLASS_RS_TUBER_M, MALE},
{OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_RS_COOLTRAINER_M, MALE},
{OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_RS_COOLTRAINER_F, FEMALE},
{OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_HEX_MANIAC, MALE},
{OBJ_EVENT_GFX_POKE_MANIAC, FACILITY_CLASS_HEX_MANIAC, MALE},
{OBJ_EVENT_GFX_WOMAN_2, FACILITY_CLASS_RS_LADY, FEMALE},
{OBJ_EVENT_GFX_BEAUTY, FACILITY_CLASS_RS_BEAUTY, FEMALE},
{OBJ_EVENT_GFX_BOY, FACILITY_CLASS_RICH_BOY, MALE},
{OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_RS_POKEMANIAC, MALE},
{OBJ_EVENT_GFX_POKE_MANIAC, FACILITY_CLASS_RS_POKEMANIAC, MALE},
{OBJ_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_RS_SWIMMER_M, MALE},
{OBJ_EVENT_GFX_BLACKBELT, FACILITY_CLASS_RS_BLACK_BELT, MALE},
{OBJ_EVENT_GFX_BLACK_BELT, FACILITY_CLASS_RS_BLACK_BELT, MALE},
{OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_GUITARIST, MALE},
{OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_KINDLER, MALE},
{OBJ_EVENT_GFX_CAMPER, FACILITY_CLASS_RS_CAMPER, MALE},
{OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_BUG_MANIAC, MALE},
{OBJ_EVENT_GFX_POKE_MANIAC, FACILITY_CLASS_BUG_MANIAC, MALE},
{OBJ_EVENT_GFX_BOY, FACILITY_CLASS_RS_PSYCHIC_M, MALE},
{OBJ_EVENT_GFX_WOMAN_1, FACILITY_CLASS_RS_PSYCHIC_F, FEMALE},
{OBJ_EVENT_GFX_GENTLEMAN, FACILITY_CLASS_RS_GENTLEMAN, MALE},
@@ -134,7 +134,7 @@ static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = {
{OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_DRAGON_TAMER, MALE},
{OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_RS_BIRD_KEEPER, MALE},
{OBJ_EVENT_GFX_LITTLE_BOY, FACILITY_CLASS_NINJA_BOY, MALE},
{OBJ_EVENT_GFX_BATTLE_GIRL, FACILITY_CLASS_BATTLE_GIRL, FEMALE},
{OBJ_EVENT_GFX_CRUSH_GIRL, FACILITY_CLASS_BATTLE_GIRL, FEMALE},
{OBJ_EVENT_GFX_BEAUTY, FACILITY_CLASS_PARASOL_LADY, FEMALE},
{OBJ_EVENT_GFX_SWIMMER_F_LAND, FACILITY_CLASS_RS_SWIMMER_F, FEMALE},
{OBJ_EVENT_GFX_PICNICKER, FACILITY_CLASS_RS_PICNICKER, FEMALE},
@@ -153,11 +153,11 @@ static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = {
{OBJ_EVENT_GFX_SAILOR, FACILITY_CLASS_SAILOR, MALE},
{OBJ_EVENT_GFX_CAMPER, FACILITY_CLASS_CAMPER, MALE},
{OBJ_EVENT_GFX_PICNICKER, FACILITY_CLASS_PICNICKER, FEMALE},
{OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_POKEMANIAC, MALE},
{OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_SUPER_NERD, MALE},
{OBJ_EVENT_GFX_POKE_MANIAC, FACILITY_CLASS_POKEMANIAC, MALE},
{OBJ_EVENT_GFX_POKE_MANIAC, FACILITY_CLASS_SUPER_NERD, MALE},
{OBJ_EVENT_GFX_HIKER, FACILITY_CLASS_HIKER, MALE},
{OBJ_EVENT_GFX_BIKER, FACILITY_CLASS_BIKER, MALE},
{OBJ_EVENT_GFX_SUPER_NERD, FACILITY_CLASS_BURGLAR, MALE},
{OBJ_EVENT_GFX_POKE_MANIAC, FACILITY_CLASS_BURGLAR, MALE},
{OBJ_EVENT_GFX_BALDING_MAN, FACILITY_CLASS_ENGINEER, MALE},
{OBJ_EVENT_GFX_FISHER, FACILITY_CLASS_FISHERMAN, MALE},
{OBJ_EVENT_GFX_SWIMMER_M_LAND, FACILITY_CLASS_SWIMMER_M, MALE},
@@ -170,14 +170,14 @@ static const struct SinglesTrainerInfo sSingleBattleTrainerInfo[] = {
{OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_JUGGLER, MALE},
{OBJ_EVENT_GFX_MAN, FACILITY_CLASS_TAMER, MALE},
{OBJ_EVENT_GFX_ROCKER, FACILITY_CLASS_BIRD_KEEPER, MALE},
{OBJ_EVENT_GFX_BLACKBELT, FACILITY_CLASS_BLACK_BELT, MALE},
{OBJ_EVENT_GFX_BLACK_BELT, FACILITY_CLASS_BLACK_BELT, MALE},
{OBJ_EVENT_GFX_SCIENTIST, FACILITY_CLASS_SCIENTIST, MALE},
{OBJ_EVENT_GFX_COOLTRAINER_M, FACILITY_CLASS_COOLTRAINER_M, MALE},
{OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOLTRAINER_F, FEMALE},
{OBJ_EVENT_GFX_GENTLEMAN, FACILITY_CLASS_GENTLEMAN, MALE},
{OBJ_EVENT_GFX_CHANNELER, FACILITY_CLASS_CHANNELER, FEMALE},
{OBJ_EVENT_GFX_WOMAN_1, FACILITY_CLASS_PSYCHIC_F, FEMALE},
{OBJ_EVENT_GFX_BATTLE_GIRL, FACILITY_CLASS_CRUSH_GIRL, FEMALE},
{OBJ_EVENT_GFX_CRUSH_GIRL, FACILITY_CLASS_CRUSH_GIRL, FEMALE},
{OBJ_EVENT_GFX_TUBER_F, FACILITY_CLASS_TUBER, FEMALE},
{OBJ_EVENT_GFX_WOMAN_2, FACILITY_CLASS_PKMN_BREEDER, FEMALE},
{OBJ_EVENT_GFX_CAMPER, FACILITY_CLASS_PKMN_RANGER_M, MALE},
@@ -197,7 +197,7 @@ static const struct DoublesTrainerInfo sDoubleBattleTrainerInfo[] = {
{OBJ_EVENT_GFX_LITTLE_GIRL, OBJ_EVENT_GFX_LITTLE_GIRL, FACILITY_CLASS_TWINS, FEMALE, FEMALE},
{OBJ_EVENT_GFX_COOLTRAINER_M, OBJ_EVENT_GFX_COOLTRAINER_F, FACILITY_CLASS_COOL_COUPLE, MALE, FEMALE},
{OBJ_EVENT_GFX_BEAUTY, OBJ_EVENT_GFX_MAN, FACILITY_CLASS_YOUNG_COUPLE, FEMALE, MALE},
{OBJ_EVENT_GFX_BATTLE_GIRL, OBJ_EVENT_GFX_BLACKBELT, FACILITY_CLASS_CRUSH_KIN, FEMALE, MALE},
{OBJ_EVENT_GFX_CRUSH_GIRL, OBJ_EVENT_GFX_BLACK_BELT, FACILITY_CLASS_CRUSH_KIN, FEMALE, MALE},
{OBJ_EVENT_GFX_SWIMMER_F_LAND, OBJ_EVENT_GFX_TUBER_M_LAND, FACILITY_CLASS_SIS_AND_BRO, FEMALE, MALE}
};
@@ -653,7 +653,7 @@ static void BufferTowerOpponentSpeech(void)
u16 trainerId = gSpecialVar_0x8006;
u8 facilityClass;
u8 challengeType = CURR_FLOOR.challengeType;
if (challengeType != CHALLENGE_TYPE_DOUBLE)
facilityClass = CURR_FLOOR.trainers[trainerId].facilityClass;
else
@@ -759,7 +759,7 @@ static void TrainerTowerAddFloorCleared(void)
static void GetFloorAlreadyCleared(void)
{
u16 mapLayoutId = gMapHeader.mapLayoutId;
if (mapLayoutId - LAYOUT_TRAINER_TOWER_1F == TRAINER_TOWER.floorsCleared
if (mapLayoutId - LAYOUT_TRAINER_TOWER_1F == TRAINER_TOWER.floorsCleared
&& mapLayoutId - LAYOUT_TRAINER_TOWER_LOBBY <= CURR_FLOOR.floorIdx)
gSpecialVar_Result = FALSE;
else
src/union_room_player_avatar.c
+2 -2
View File
@@ -33,7 +33,7 @@ static void SetUnionRoomObjectFacingDirection(s32 member, s32 leaderId, u8 direc
static const u8 sUnionRoomObjGfxIds[GENDER_COUNT][NUM_UNION_ROOM_CLASSES + 2] = {
[MALE] = {
OBJ_EVENT_GFX_COOLTRAINER_M,
OBJ_EVENT_GFX_BLACKBELT,
OBJ_EVENT_GFX_BLACK_BELT,
OBJ_EVENT_GFX_CAMPER,
OBJ_EVENT_GFX_YOUNGSTER,
OBJ_EVENT_GFX_BOY,
@@ -47,7 +47,7 @@ static const u8 sUnionRoomObjGfxIds[GENDER_COUNT][NUM_UNION_ROOM_CLASSES + 2] =
OBJ_EVENT_GFX_PICNICKER,
OBJ_EVENT_GFX_LASS,
OBJ_EVENT_GFX_WOMAN_1,
OBJ_EVENT_GFX_BATTLE_GIRL,
OBJ_EVENT_GFX_CRUSH_GIRL,
OBJ_EVENT_GFX_WOMAN_2,
OBJ_EVENT_GFX_BEAUTY
}
src/vs_seeker.c
+4 -4
View File
@@ -644,7 +644,7 @@ void VsSeekerResetObjectMovementAfterChargeComplete(void)
for (i = 0; i < gMapHeader.events->objectEventCount; i++)
{
if ((templates[i].objUnion.normal.trainerType == TRAINER_TYPE_NORMAL
|| templates[i].objUnion.normal.trainerType == TRAINER_TYPE_BURIED)
|| templates[i].objUnion.normal.trainerType == TRAINER_TYPE_BURIED)
&& (templates[i].objUnion.normal.movementType == MOVEMENT_TYPE_RAISE_HAND_AND_STOP
|| templates[i].objUnion.normal.movementType == MOVEMENT_TYPE_RAISE_HAND_AND_JUMP
|| templates[i].objUnion.normal.movementType == MOVEMENT_TYPE_RAISE_HAND_AND_SWIM))
@@ -946,7 +946,7 @@ void ClearRematchStateByTrainerId(void)
for (i = 0; i < gMapHeader.events->objectEventCount; i++)
{
if ((objectEventTemplates[i].objUnion.normal.trainerType == TRAINER_TYPE_NORMAL
if ((objectEventTemplates[i].objUnion.normal.trainerType == TRAINER_TYPE_NORMAL
|| objectEventTemplates[i].objUnion.normal.trainerType == TRAINER_TYPE_BURIED)
&& vsSeekerDataIdx == LookupVsSeekerOpponentInArray(sRematches, GetTrainerFlagFromScript(objectEventTemplates[i].script)))
{
@@ -1139,7 +1139,7 @@ static u8 GetRunningBehaviorFromGraphicsId(u8 graphicsId)
case OBJ_EVENT_GFX_BUG_CATCHER:
case OBJ_EVENT_GFX_LASS:
case OBJ_EVENT_GFX_WOMAN_1:
case OBJ_EVENT_GFX_BATTLE_GIRL:
case OBJ_EVENT_GFX_CRUSH_GIRL:
case OBJ_EVENT_GFX_MAN:
case OBJ_EVENT_GFX_ROCKER:
case OBJ_EVENT_GFX_WOMAN_2:
@@ -1152,7 +1152,7 @@ static u8 GetRunningBehaviorFromGraphicsId(u8 graphicsId)
case OBJ_EVENT_GFX_COOLTRAINER_F:
case OBJ_EVENT_GFX_SWIMMER_M_LAND:
case OBJ_EVENT_GFX_SWIMMER_F_LAND:
case OBJ_EVENT_GFX_BLACKBELT:
case OBJ_EVENT_GFX_BLACK_BELT:
case OBJ_EVENT_GFX_HIKER:
case OBJ_EVENT_GFX_SAILOR:
return MOVEMENT_TYPE_RAISE_HAND_AND_JUMP;