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

Merge pull request #274 from GriffinRichards/doc-fourisland

Browse Source 
Document Four Island scripts, trainer_card.inc, sync trainer_card.c
This commit is contained in:
PikalaxALT
2020-03-02 10:43:01 -05:00
committed by GitHub
parent ff0034d597 a1995d8029
commit 55e00e0c13
46 changed files with 858 additions and 798 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/event_scripts.s
+1
View File
@@ -34,6 +34,7 @@
#include "constants/quest_log.h"
#include "constants/daycare.h"
#include "constants/easy_chat.h"
#include "constants/trainer_card.h"
.include "asm/macros.inc"
.include "asm/macros/event.inc"
.set FALSE, 0
data/maps/FourIsland/map.json
+5 -5
View File
@@ -90,7 +90,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_EventScript_167E2E",
"script": "FourIsland_EventScript_OldWoman",
"flag": "0"
},
{
@@ -155,7 +155,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_EventScript_167E73",
"script": "FourIsland_EventScript_FatMan",
"flag": "0"
},
{
@@ -168,7 +168,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_EventScript_167E5A",
"script": "FourIsland_EventScript_LittleGirl",
"flag": "0"
}
],
@@ -237,7 +237,7 @@
"x": 13,
"y": 19,
"elevation": 0,
"script": "FourIsland_EventScript_167E7C"
"script": "FourIsland_EventScript_IslandSign"
},
{
"type": "hidden_item",
@@ -264,7 +264,7 @@
"x": 31,
"y": 23,
"elevation": 0,
"script": "FourIsland_EventScript_167E85"
"script": "FourIsland_EventScript_LoreleisHouseSign"
}
]
}
data/maps/FourIsland/scripts.inc
+36 -34
View File
@@ -1,3 +1,6 @@
.equ LOCALID_DAYCARE_MAN, 1
.equ LOCALID_RIVAL, 10
FourIsland_MapScripts:: @ 8167CAE
map_script MAP_SCRIPT_ON_TRANSITION, FourIsland_OnTransition
map_script MAP_SCRIPT_ON_FRAME_TABLE, FourIsland_OnFrame
@@ -6,65 +9,64 @@ FourIsland_MapScripts:: @ 8167CAE
FourIsland_OnTransition:: @ 8167CB9
setworldmapflag FLAG_WORLD_MAP_FOUR_ISLAND
compare VAR_MAP_SCENE_FOUR_ISLAND, 0
call_if_eq EventScript_167CCD
call EventScript_167CD1
call_if_eq FourIsland_EventScript_ShowRival
call FourIsland_EventScript_TrySetDayCareManPos
end
EventScript_167CCD:: @ 8167CCD
FourIsland_EventScript_ShowRival:: @ 8167CCD
clearflag FLAG_HIDE_FOUR_ISLAND_RIVAL
return
EventScript_167CD1:: @ 8167CD1
goto_if_unset FLAG_PENDING_DAYCARE_EGG, EventScript_167CE1
setobjectxyperm 1, 16, 14
EventScript_167CE1:: @ 8167CE1
FourIsland_EventScript_TrySetDayCareManPos:: @ 8167CD1
goto_if_unset FLAG_PENDING_DAYCARE_EGG, FourIsland_EventScript_EndSetDayCareManPos
setobjectxyperm LOCALID_DAYCARE_MAN, 16, 14
FourIsland_EventScript_EndSetDayCareManPos:: @ 8167CE1
return
FourIsland_OnFrame:: @ 8167CE2
map_script_2 VAR_MAP_SCENE_FOUR_ISLAND, 0, EventScript_167CEC
map_script_2 VAR_MAP_SCENE_FOUR_ISLAND, 0, FourIsland_EventScript_RivalScene
.2byte 0
EventScript_167CEC:: @ 8167CEC
FourIsland_EventScript_RivalScene:: @ 8167CEC
lockall
textcolor 0
applymovement 10, Movement_WalkInPlaceFastestDown
applymovement LOCALID_RIVAL, Movement_WalkInPlaceFastestDown
waitmovement 0
playbgm MUS_RIVAL1, 0
applymovement 10, Movement_ExclamationMark
applymovement LOCALID_RIVAL, Movement_ExclamationMark
waitmovement 0
applymovement 10, Movement_Delay48
applymovement LOCALID_RIVAL, Movement_Delay48
waitmovement 0
delay 25
applymovement 10, Movement_167D49
applymovement LOCALID_RIVAL, FourIsland_Movement_RivalApproach
waitmovement 0
msgbox gUnknown_8182B37
msgbox FourIsland_Text_RivalAlreadyGotEggBeSmellingYa
closemessage
applymovement OBJ_EVENT_ID_PLAYER, Movement_167D52
applymovement 10, Movement_167D4E
applymovement OBJ_EVENT_ID_PLAYER, FourIsland_Movement_PlayerWatchRivalExit
applymovement LOCALID_RIVAL, FourIsland_Movement_RivalExit
waitmovement 0
fadedefaultbgm
playse SE_KAIDAN
delay 35
removeobject 10
removeobject LOCALID_RIVAL
setvar VAR_MAP_SCENE_FOUR_ISLAND, 1
releaseall
end
Movement_167D49:: @ 8167D49
FourIsland_Movement_RivalApproach:: @ 8167D49
walk_right
walk_right
walk_down
walk_down
step_end
Movement_167D4E:: @ 8167D4E
FourIsland_Movement_RivalExit:: @ 8167D4E
delay_16
delay_4
walk_down
step_end
Movement_167D52:: @ 8167D52
FourIsland_Movement_PlayerWatchRivalExit:: @ 8167D52
walk_left
walk_in_place_fastest_right
step_end
@@ -136,36 +138,36 @@ FourIsland_EventScript_CheckOnTwoMons:: @ 8167E19
release
end
FourIsland_EventScript_167E2E:: @ 8167E2E
FourIsland_EventScript_OldWoman:: @ 8167E2E
lock
faceplayer
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, EventScript_167E43
msgbox gUnknown_8182A2B
goto_if_set FLAG_SYS_CAN_LINK_WITH_RS, FourIsland_EventScript_OldWomanLoreleiLeft
msgbox FourIsland_Text_LoreleiHasReturned
release
end
EventScript_167E43:: @ 8167E43
FourIsland_EventScript_OldWomanLoreleiLeft:: @ 8167E43
famechecker FAMECHECKER_LORELEI, 5
msgbox gUnknown_8182A75
msgbox FourIsland_Text_LoreleiMetLaprasAsChild
release
end
FourIsland_EventScript_167E5A:: @ 8167E5A
FourIsland_EventScript_LittleGirl:: @ 8167E5A
lock
faceplayer
famechecker FAMECHECKER_LORELEI, 4
msgbox gUnknown_8182CE3
msgbox FourIsland_Text_LoreleiHasLotsOfStuffedDolls
release
end
FourIsland_EventScript_167E73:: @ 8167E73
msgbox gUnknown_8182D8E, MSGBOX_NPC
FourIsland_EventScript_FatMan:: @ 8167E73
msgbox FourIsland_Text_MadeSlushieUsingIcefallCaveIce, MSGBOX_NPC
end
FourIsland_EventScript_167E7C:: @ 8167E7C
msgbox gUnknown_8182A03, MSGBOX_SIGN
FourIsland_EventScript_IslandSign:: @ 8167E7C
msgbox FourIsland_Text_IslandSign, MSGBOX_SIGN
end
FourIsland_EventScript_167E85:: @ 8167E85
msgbox gUnknown_8182DEB, MSGBOX_SIGN
FourIsland_EventScript_LoreleisHouseSign:: @ 8167E85
msgbox FourIsland_Text_LoreleisHouse, MSGBOX_SIGN
end
data/maps/FourIsland/text.inc
+7 -7
View File
@@ -1,13 +1,13 @@
gUnknown_8182A03:: @ 8182A03
FourIsland_Text_IslandSign:: @ 8182A03
.string "FOUR ISLAND\n"
.string "The Warm, Blue, Floe Island$"
gUnknown_8182A2B:: @ 8182A2B
FourIsland_Text_LoreleiHasReturned:: @ 8182A2B
.string "LORELEI has returned.\p"
.string "Did she find the city life too\n"
.string "stressful, I wonder?$"
gUnknown_8182A75:: @ 8182A75
FourIsland_Text_LoreleiMetLaprasAsChild:: @ 8182A75
.string "LORELEI has gone back.\p"
.string "The LAPRAS she has, I imagine it\n"
.string "to be the one she met as a child.\p"
@@ -16,7 +16,7 @@ gUnknown_8182A75:: @ 8182A75
.string "Perhaps that POKéMON has been with\n"
.string "her ever since.$"
gUnknown_8182B37:: @ 8182B37
FourIsland_Text_RivalAlreadyGotEggBeSmellingYa:: @ 8182B37
.string "{RIVAL}: Hey!\n"
.string "{PLAYER}!\p"
.string "What are you doing here in the\n"
@@ -37,7 +37,7 @@ gUnknown_8182B37:: @ 8182B37
.string "waste.\p"
.string "Be smelling ya!$"
gUnknown_8182CE3:: @ 8182CE3
FourIsland_Text_LoreleiHasLotsOfStuffedDolls:: @ 8182CE3
.string "Oh, you found me!\n"
.string "Please don't tell LORELEI.\p"
.string "Did you know that LORELEI has lots\n"
@@ -45,12 +45,12 @@ gUnknown_8182CE3:: @ 8182CE3
.string "Every time she comes back to\n"
.string "FOUR ISLAND, her collection grows!$"
gUnknown_8182D8E:: @ 8182D8E
FourIsland_Text_MadeSlushieUsingIcefallCaveIce:: @ 8182D8E
.string "Ooh, chilly!\p"
.string "I made a slushie using ice I\n"
.string "shaved inside ICEFALL CAVE.\p"
.string "It's chilly and tasty!$"
gUnknown_8182DEB:: @ 8182DEB
FourIsland_Text_LoreleisHouse:: @ 8182DEB
.string "LORELEI'S HOUSE$"
data/maps/FourIsland_Harbor/map.json
+1 -1
View File
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_Harbor_EventScript_171C99",
"script": "FourIsland_Harbor_EventScript_Sailor",
"flag": "0"
}
],
data/maps/FourIsland_Harbor/scripts.inc
+1 -1
View File
@@ -1,7 +1,7 @@
FourIsland_Harbor_MapScripts:: @ 8171C98
.byte 0
FourIsland_Harbor_EventScript_171C99:: @ 8171C99
FourIsland_Harbor_EventScript_Sailor:: @ 8171C99
lock
faceplayer
message Text_WhereDoYouWantToSail
data/maps/FourIsland_House1/map.json
+1 -1
View File
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_House1_EventScript_171C45",
"script": "FourIsland_House1_EventScript_FatMan",
"flag": "0"
}
],
data/maps/FourIsland_House1/scripts.inc
+2 -2
View File
@@ -1,6 +1,6 @@
FourIsland_House1_MapScripts:: @ 8171C44
.byte 0
FourIsland_House1_EventScript_171C45:: @ 8171C45
msgbox gUnknown_81A3802, MSGBOX_NPC
FourIsland_House1_EventScript_FatMan:: @ 8171C45
msgbox FourIsland_House1_Text_YoureAwfullyHeavy, MSGBOX_NPC
end
data/maps/FourIsland_House1/text.inc
+8 -5
View File
@@ -1,4 +1,7 @@
Text_1A3778:: @ 81A3778
@ Text for this file was split weirdly, and is instead in FourIsland_PokemonCenter_1F/text.inc
@ Theres also an unused JP version of that text in this file instead
JPText_BodySlamTeach:: @ 81A3778
.string "そーれ　ぼよーん！\n"
.string "どっちが　さきに　へたばるか？\l"
.string "のしかかり　しょうぶ　してるんだ\p"
@@ -7,17 +10,17 @@ Text_1A3778:: @ 81A3778
.string "かわりに　きみの　ポケモンに\l"
.string "のしかかり　おしえて　やろっか？$"
Text_1A37DB:: @ 81A37DB
JPText_BodySlamDeclined:: @ 81A37DB
.string "また　おいで　ぼよーん！$"
Text_1A37E8:: @ 81A37E8
JPText_BodySlamWhichMon:: @ 81A37E8
.string "どの　ポケモンに\n"
.string "おしえたい　かい？$"
Text_1A37FB:: @ 81A37FB
JPText_BodySlamTaught:: @ 81A37FB
.string "ぼよよーん！$"
gUnknown_81A3802:: @ 81A3802
FourIsland_House1_Text_YoureAwfullyHeavy:: @ 81A3802
.string "There! Boing!\n"
.string "You're awfully heavy!$"
data/maps/FourIsland_House2/map.json
+1 -1
View File
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_House2_EventScript_1B2938",
"script": "FourIsland_House2_EventScript_StickerMan",
"flag": "0"
}
],
data/maps/FourIsland_LoreleisHouse/map.json
+15 -15
View File
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C58",
"script": "FourIsland_LoreleisHouse_EventScript_Lorelei",
"flag": "FLAG_HIDE_LORELEI_IN_HER_HOUSE"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "0"
},
{
@@ -51,7 +51,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "0"
},
{
@@ -64,7 +64,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "0"
},
{
@@ -77,7 +77,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "0"
},
{
@@ -90,7 +90,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "0"
},
{
@@ -103,7 +103,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "0"
},
{
@@ -116,7 +116,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEI_HOUSE_MEOWTH_DOLL"
},
{
@@ -129,7 +129,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEI_HOUSE_CHANSEY_DOLL"
},
{
@@ -142,7 +142,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEI_HOUSE_JIGGLYPUFF_DOLL"
},
{
@@ -155,7 +155,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_F_DOLL"
},
{
@@ -168,7 +168,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEIS_HOUSE_NIDORAN_M_DOLL"
},
{
@@ -181,7 +181,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEIS_HOUSE_PIDGEOT_DOLL"
},
{
@@ -194,7 +194,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEIS_HOUSE_FEAROW_DOLL"
},
{
@@ -207,7 +207,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_LoreleisHouse_EventScript_171C8D",
"script": "FourIsland_LoreleisHouse_EventScript_Doll",
"flag": "FLAG_HIDE_LORELEIS_HOUSE_LAPRAS_DOLL"
}
],
data/maps/FourIsland_LoreleisHouse/scripts.inc
+10 -10
View File
@@ -6,28 +6,28 @@ FourIsland_LoreleisHouse_OnTransition:: @ 8171C54
special Special_ComputeLoreleiDollCollection
end
FourIsland_LoreleisHouse_EventScript_171C58:: @ 8171C58
FourIsland_LoreleisHouse_EventScript_Lorelei:: @ 8171C58
lock
faceplayer
goto_if_set FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE, EventScript_171C83
goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, EventScript_171C76
msgbox gUnknown_81A3826
goto_if_set FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE, FourIsland_LoreleisHouse_EventScript_Lorelei3
goto_if_set FLAG_DEFEATED_ROCKETS_IN_WAREHOUSE, FourIsland_LoreleisHouse_EventScript_Lorelei2
msgbox FourIsland_LoreleisHouse_Text_IfAnythingWereToHappenToIsland
release
end
EventScript_171C76:: @ 8171C76
FourIsland_LoreleisHouse_EventScript_Lorelei2:: @ 8171C76
setflag FLAG_TALKED_TO_LORELEI_AFTER_WAREHOUSE
msgbox gUnknown_81A390C
msgbox FourIsland_LoreleisHouse_Text_IllReturnToLeagueInShortWhile
release
end
EventScript_171C83:: @ 8171C83
msgbox gUnknown_81A39D8
FourIsland_LoreleisHouse_EventScript_Lorelei3:: @ 8171C83
msgbox FourIsland_LoreleisHouse_Text_WillDoWhatICanHereAndNow
release
end
FourIsland_LoreleisHouse_EventScript_171C8D:: @ 8171C8D
FourIsland_LoreleisHouse_EventScript_Doll:: @ 8171C8D
lock
msgbox gUnknown_81A3A42
msgbox FourIsland_LoreleisHouse_Text_StuffedMonDollsGalore
release
end
data/maps/FourIsland_LoreleisHouse/text.inc
+4 -4
View File
@@ -1,4 +1,4 @@
gUnknown_81A3826:: @ 81A3826
FourIsland_LoreleisHouse_Text_IfAnythingWereToHappenToIsland:: @ 81A3826
.string "LORELEI: There's something weighing\n"
.string "heavily on my mind.\p"
.string "If anything were to happen on\n"
@@ -8,7 +8,7 @@ gUnknown_81A3826:: @ 81A3826
.string "I wonder if that would make me\n"
.string "irresponsible to my home…$"
gUnknown_81A390C:: @ 81A390C
FourIsland_LoreleisHouse_Text_IllReturnToLeagueInShortWhile:: @ 81A390C
.string "LORELEI: So, you managed to solve\n"
.string "all the problems here?\p"
.string "That's wonderful.\p"
@@ -18,12 +18,12 @@ gUnknown_81A390C:: @ 81A390C
.string "I'll return to the POKéMON LEAGUE\n"
.string "in a short while.$"
gUnknown_81A39D8:: @ 81A39D8
FourIsland_LoreleisHouse_Text_WillDoWhatICanHereAndNow:: @ 81A39D8
.string "I don't know what will happen in\n"
.string "the future, but…\p"
.string "I will do what I can here and now.\n"
.string "That's all I can do.$"
gUnknown_81A3A42:: @ 81A3A42
FourIsland_LoreleisHouse_Text_StuffedMonDollsGalore:: @ 81A3A42
.string "Stuffed POKéMON dolls galore!$"
data/maps/FourIsland_Mart/map.json
+3 -3
View File
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_Mart_EventScript_171CAE",
"script": "FourIsland_Mart_EventScript_Clerk",
"flag": "0"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_Mart_EventScript_1ACF46",
"script": "FourIsland_Mart_EventScript_OldMan",
"flag": "0"
},
{
@@ -51,7 +51,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_Mart_EventScript_171CE8",
"script": "FourIsland_Mart_EventScript_Camper",
"flag": "0"
}
],
data/maps/FourIsland_Mart/scripts.inc
+5 -5
View File
@@ -1,19 +1,19 @@
FourIsland_Mart_MapScripts:: @ 8171CAD
.byte 0
FourIsland_Mart_EventScript_171CAE:: @ 8171CAE
FourIsland_Mart_EventScript_Clerk:: @ 8171CAE
goto_if_questlog EventScript_ReleaseEnd
lock
faceplayer
message Text_MayIHelpYou
waitmessage
pokemart Items_171CD4
pokemart FourIsland_Mart_Items
msgbox Text_PleaseComeAgain
release
end
.align 2
Items_171CD4:: @ 8171CD4
FourIsland_Mart_Items:: @ 8171CD4
.2byte ITEM_ULTRA_BALL
.2byte ITEM_FULL_RESTORE
.2byte ITEM_MAX_POTION
@@ -26,6 +26,6 @@ Items_171CD4:: @ 8171CD4
release
end
FourIsland_Mart_EventScript_171CE8:: @ 8171CE8
msgbox gUnknown_81A3B14, MSGBOX_NPC
FourIsland_Mart_EventScript_Camper:: @ 8171CE8
msgbox FourIsland_Mart_Text_IcefallCaveIsFrigid, MSGBOX_NPC
end
data/maps/FourIsland_Mart/text.inc
+2 -2
View File
@@ -1,4 +1,4 @@
Text_1A3A60:: @ 81A3A60
FourIsland_Mart_Text_LoreleiGrewUpOnThisIsland:: @ 81A3A60
.string "We've had a great and powerful\n"
.string "TRAINER grow up on this island.\p"
.string "I bet even you'd know her.\n"
@@ -6,7 +6,7 @@ Text_1A3A60:: @ 81A3A60
.string "When LORELEI was just a tyke,\n"
.string "I taught her about POKéMON.$"
gUnknown_81A3B14:: @ 81A3B14
FourIsland_Mart_Text_IcefallCaveIsFrigid:: @ 81A3B14
.string "The SEVII ISLANDS are in a warm\n"
.string "region overall.\p"
.string "But there is one exception you\n"
data/maps/FourIsland_PokemonCenter_1F/map.json
+6 -6
View File
@@ -25,7 +25,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_PokemonCenter_1F_EventScript_171BF9",
"script": "FourIsland_PokemonCenter_1F_EventScript_Nurse",
"flag": "0"
},
{
@@ -38,7 +38,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_PokemonCenter_1F_EventScript_171C02",
"script": "FourIsland_PokemonCenter_1F_EventScript_Man",
"flag": "0"
},
{
@@ -51,7 +51,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_PokemonCenter_1F_EventScript_171C0B",
"script": "FourIsland_PokemonCenter_1F_EventScript_Woman",
"flag": "0"
},
{
@@ -64,7 +64,7 @@
"movement_range_y": 1,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
"script": "FourIsland_PokemonCenter_1F_EventScript_171C14",
"script": "FourIsland_PokemonCenter_1F_EventScript_Gentleman",
"flag": "0"
}
],
@@ -91,14 +91,14 @@
"x": 3,
"y": 1,
"elevation": 0,
"script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0"
"script": "FourIsland_PokemonCenter_1F_EventScript_PokemonJournal"
},
{
"type": "bg_event_type_1",
"x": 2,
"y": 1,
"elevation": 0,
"script": "FourIsland_PokemonCenter_1F_EventScript_1ACDD0"
"script": "FourIsland_PokemonCenter_1F_EventScript_PokemonJournal"
}
]
}
data/maps/FourIsland_PokemonCenter_1F/scripts.inc
+7 -7
View File
@@ -7,21 +7,21 @@ FourIsland_PokemonCenter_1F_OnTransition:: @ 8171BF5
setrespawn SPAWN_FOUR_ISLAND
end
FourIsland_PokemonCenter_1F_EventScript_171BF9:: @ 8171BF9
FourIsland_PokemonCenter_1F_EventScript_Nurse:: @ 8171BF9
lock
faceplayer
call EventScript_PkmnCenterNurse
release
end
FourIsland_PokemonCenter_1F_EventScript_171C02:: @ 8171C02
msgbox gUnknown_81A3627, MSGBOX_NPC
FourIsland_PokemonCenter_1F_EventScript_Man:: @ 8171C02
msgbox FourIsland_PokemonCenter_1F_Text_RareIceMonsInCave, MSGBOX_NPC
end
FourIsland_PokemonCenter_1F_EventScript_171C0B:: @ 8171C0B
msgbox gUnknown_81A3697, MSGBOX_NPC
FourIsland_PokemonCenter_1F_EventScript_Woman:: @ 8171C0B
msgbox FourIsland_PokemonCenter_1F_Text_DayCarePeopleFoundEggBefore, MSGBOX_NPC
end
FourIsland_PokemonCenter_1F_EventScript_171C14:: @ 8171C14
msgbox gUnknown_81A3734, MSGBOX_NPC
FourIsland_PokemonCenter_1F_EventScript_Gentleman:: @ 8171C14
msgbox FourIsland_PokemonCenter_1F_Text_NewPokemonJournalHasntArrived, MSGBOX_NPC
end
data/maps/FourIsland_PokemonCenter_1F/text.inc
+5 -4
View File
@@ -1,3 +1,4 @@
@ The 5 texts below are supposed to be in FourIsland_House1
Text_BodySlamTeach:: @ 81A3505
.string "Ready?\n"
.string "Boing!\p"
@@ -19,17 +20,17 @@ Text_BodySlamWhichMon:: @ 81A35DA
Text_BodySlamTaught:: @ 81A3609
.string "Boioing!$"
Text_1A3612:: @ 81A3612
FourIsland_House1_Text_FatMan:: @ 81A3612
.string "それ　ぼよーん！\n"
.string "おまえ　おもいなあー！$"
gUnknown_81A3627:: @ 81A3627
FourIsland_PokemonCenter_1F_Text_RareIceMonsInCave:: @ 81A3627
.string "There's a rare kind of ICE POKéMON\n"
.string "that lives in the cave.\p"
.string "We get a lot of visitors hoping to\n"
.string "see that POKéMON.$"
gUnknown_81A3697:: @ 81A3697
FourIsland_PokemonCenter_1F_Text_DayCarePeopleFoundEggBefore:: @ 81A3697
.string "Oh? A POKéMON EGG?\n"
.string "…I have no idea.\p"
.string "…Oh, wait. The DAY-CARE people\n"
@@ -37,7 +38,7 @@ gUnknown_81A3697:: @ 81A3697
.string "They said that they'd found EGGS\n"
.string "before on their property.$"
gUnknown_81A3734:: @ 81A3734
FourIsland_PokemonCenter_1F_Text_NewPokemonJournalHasntArrived:: @ 81A3734
.string "What's this?\p"
.string "The new POKéMON JOURNAL hasn't\n"
.string "arrived on this island?$"
data/scripts/fame_checker.inc
+4 -4
View File
@@ -27,11 +27,11 @@ EventScript_1ACDB5:: @ 81ACDB5
release
end
FourIsland_PokemonCenter_1F_EventScript_1ACDD0:: @ 81ACDD0
FourIsland_PokemonCenter_1F_EventScript_PokemonJournal:: @ 81ACDD0
lockall
famechecker FAMECHECKER_DAISY, 5
textcolor 3
msgbox gUnknown_81B1B3D
msgbox PokemonJournal_Text_SpecialFeatureDaisyOak
releaseall
end
@@ -143,11 +143,11 @@ FiveIsland_ResortGorgeous_House_EventScript_1ACF2C:: @ 81ACF2C
releaseall
end
FourIsland_Mart_EventScript_1ACF46:: @ 81ACF46
FourIsland_Mart_EventScript_OldMan:: @ 81ACF46
lock
faceplayer
famechecker FAMECHECKER_LORELEI, 2
msgbox Text_1A3A60
msgbox FourIsland_Mart_Text_LoreleiGrewUpOnThisIsland
release
end
data/scripts/trainer_card.inc
+164 -172
View File
@@ -1,79 +1,79 @@
CeladonCity_GameCorner_EventScript_PhotoPrinter:: @ 81B2867
lockall
showmoneybox 0, 0, 0
msgbox gUnknown_81B1D7D, MSGBOX_YESNO
msgbox CeladonCity_GameCorner_Text_TryPokemonPrinter, MSGBOX_YESNO
compare VAR_RESULT, NO
goto_if_eq EventScript_1B2926
goto_if_eq CeladonCity_GameCorner_EventScript_DeclinePhoto
checkmoney 50, 0
compare VAR_RESULT, FALSE
goto_if_eq EventScript_1B292B
goto_if_eq CeladonCity_GameCorner_EventScript_NotEnoughMoneyForPhoto
playse SE_SHOP
removemoney 50, 0
updatemoneybox 0, 0, 0
waitse
message gUnknown_81B1E24
message CeladonCity_GameCorner_Text_ChoosePrintType
waitmessage
multichoice 21, 0, MULTICHOICE_TRAINER_CARD_ICON_TINT, TRUE
switch VAR_RESULT
case 0, EventScript_1B28DB
case 1, EventScript_1B28E6
case 2, EventScript_1B28F1
case 3, EventScript_1B28FC
case 0, CeladonCity_GameCorner_EventScript_PrintTypeNormal
case 1, CeladonCity_GameCorner_EventScript_PrintTypeBlack
case 2, CeladonCity_GameCorner_EventScript_PrintTypePink
case 3, CeladonCity_GameCorner_EventScript_PrintTypeSepia
end
EventScript_1B28DB:: @ 81B28DB
setvar VAR_0x8004, 0
goto EventScript_1B2907
CeladonCity_GameCorner_EventScript_PrintTypeNormal:: @ 81B28DB
setvar VAR_0x8004, MON_ICON_TINT_NORMAL
goto CeladonCity_GameCorner_EventScript_PrintPhoto
end
EventScript_1B28E6:: @ 81B28E6
setvar VAR_0x8004, 1
goto EventScript_1B2907
CeladonCity_GameCorner_EventScript_PrintTypeBlack:: @ 81B28E6
setvar VAR_0x8004, MON_ICON_TINT_BLACK
goto CeladonCity_GameCorner_EventScript_PrintPhoto
end
EventScript_1B28F1:: @ 81B28F1
setvar VAR_0x8004, 2
goto EventScript_1B2907
CeladonCity_GameCorner_EventScript_PrintTypePink:: @ 81B28F1
setvar VAR_0x8004, MON_ICON_TINT_PINK
goto CeladonCity_GameCorner_EventScript_PrintPhoto
end
EventScript_1B28FC:: @ 81B28FC
setvar VAR_0x8004, 3
goto EventScript_1B2907
CeladonCity_GameCorner_EventScript_PrintTypeSepia:: @ 81B28FC
setvar VAR_0x8004, MON_ICON_TINT_SEPIA
goto CeladonCity_GameCorner_EventScript_PrintPhoto
end
EventScript_1B2907:: @ 81B2907
message gUnknown_81B1E42
CeladonCity_GameCorner_EventScript_PrintPhoto:: @ 81B2907
message CeladonCity_GameCorner_Text_BigSmileForPhoto
waitmessage
playse MUS_ME_PHOTO
dofieldeffect FLDEFF_UNK_45
delay 60
special Special_UpdateTrainerCardPhotoIcons
msgbox gUnknown_81B1E7D
msgbox CeladonCity_GameCorner_Text_PrintIsReadyCheckTrainerCard
hidemoneybox 0, 0
releaseall
end
EventScript_1B2926:: @ 81B2926
CeladonCity_GameCorner_EventScript_DeclinePhoto:: @ 81B2926
hidemoneybox 0, 0
releaseall
end
EventScript_1B292B:: @ 81B292B
msgbox gUnknown_81B1E07
CeladonCity_GameCorner_EventScript_NotEnoughMoneyForPhoto:: @ 81B292B
msgbox CeladonCity_GameCorner_Text_DontHaveEnoughMoney
hidemoneybox 0, 0
releaseall
end
FourIsland_House2_EventScript_1B2938:: @ 81B2938
FourIsland_House2_EventScript_StickerMan:: @ 81B2938
lock
specialvar VAR_0x8008, Special_StickerLadyGetBragFlags
goto_if_unset FLAG_MET_STICKER_LADY, EventScript_1B2951
goto_if_set FLAG_MET_STICKER_LADY, EventScript_1B2994
specialvar VAR_0x8008, StickerManGetBragFlags
goto_if_unset FLAG_MET_STICKER_MAN, FourIsland_House2_EventScript_MeetStickerMan
goto_if_set FLAG_MET_STICKER_MAN, EventScript_1B2994
end
EventScript_1B2951:: @ 81B2951
setflag FLAG_MET_STICKER_LADY
msgbox gUnknown_81B1EB3
FourIsland_House2_EventScript_MeetStickerMan:: @ 81B2951
setflag FLAG_MET_STICKER_MAN
msgbox FourIsland_House2_Text_WishICouldShowOffStickers
applymovement 1, Movement_FacePlayer
waitmovement 0
playse SE_PIN
@@ -82,10 +82,10 @@ EventScript_1B2951:: @ 81B2951
applymovement 1, Movement_Delay48
waitmovement 0
compare VAR_0x8008, 0
goto_if_eq EventScript_1B2B8E
message gUnknown_81B1EF8
goto_if_eq FourIsland_House2_EventScript_StickerManNothingToBrag
message FourIsland_House2_Text_GiveYouStickerIfYouBrag
waitmessage
goto EventScript_1B29D0
goto FourIsland_House2_EventScript_ChooseBrag
end
EventScript_1B2994:: @ 81B2994
@@ -95,290 +95,282 @@ EventScript_1B2994:: @ 81B2994
special sub_8112364
compare VAR_0x8008, 0
goto_if_eq EventScript_1B29C6
message gUnknown_81B2025
message FourIsland_House2_Text_BragAboutWhatToday
waitmessage
goto EventScript_1B29D0
goto FourIsland_House2_EventScript_ChooseBrag
end
EventScript_1B29C6:: @ 81B29C6
msgbox gUnknown_81B1FEF
msgbox FourIsland_House2_Text_BragAboutSomethingForMe
release
end
EventScript_1B29D0:: @ 81B29D0
FourIsland_House2_EventScript_ChooseBrag:: @ 81B29D0
switch VAR_0x8008
case 1, EventScript_1B2A23
case 2, EventScript_1B2A4F
case 4, EventScript_1B2A7B
case 3, EventScript_1B2AA7
case 5, EventScript_1B2ADE
case 6, EventScript_1B2B15
case 7, EventScript_1B2B4C
case 1, FourIsland_House2_EventScript_ChooseBragHoF
case 2, FourIsland_House2_EventScript_ChooseBragEggs
case 4, FourIsland_House2_EventScript_ChooseBragLinkWins
case 3, FourIsland_House2_EventScript_ChooseBragHoFEggs
case 5, FourIsland_House2_EventScript_ChooseBragHoFLinkWins
case 6, FourIsland_House2_EventScript_ChooseBragEggsLinkWins
case 7, FourIsland_House2_EventScript_ChooseBragHofEggsLinkWins
end
EventScript_1B2A23:: @ 81B2A23
FourIsland_House2_EventScript_ChooseBragHoF:: @ 81B2A23
multichoice 15, 8, MULTICHOICE_HOF_QUIT, FALSE
switch VAR_RESULT
case 0, EventScript_1B2B98
case 1, EventScript_1B2DF6
case SCR_MENU_CANCEL, EventScript_1B2DF6
case 0, FourIsland_House2_EventScript_BragHoF
case 1, FourIsland_House2_EventScript_QuitBrag
case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag
end
EventScript_1B2A4F:: @ 81B2A4F
FourIsland_House2_EventScript_ChooseBragEggs:: @ 81B2A4F
multichoice 16, 8, MULTICHOICE_EGGS_QUIT, FALSE
switch VAR_RESULT
case 0, EventScript_1B2C62
case 1, EventScript_1B2DF6
case SCR_MENU_CANCEL, EventScript_1B2DF6
case 0, FourIsland_House2_EventScript_BragEggs
case 1, FourIsland_House2_EventScript_QuitBrag
case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag
end
EventScript_1B2A7B:: @ 81B2A7B
FourIsland_House2_EventScript_ChooseBragLinkWins:: @ 81B2A7B
multichoice 15, 8, MULTICHOICE_VICTORIES_QUIT, FALSE
switch VAR_RESULT
case 0, EventScript_1B2D2C
case 1, EventScript_1B2DF6
case SCR_MENU_CANCEL, EventScript_1B2DF6
case 0, FourIsland_House2_EventScript_BragLinkWins
case 1, FourIsland_House2_EventScript_QuitBrag
case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag
end
EventScript_1B2AA7:: @ 81B2AA7
FourIsland_House2_EventScript_ChooseBragHoFEggs:: @ 81B2AA7
multichoice 15, 6, MULTICHOICE_HOF_EGGS_QUIT, FALSE
switch VAR_RESULT
case 0, EventScript_1B2B98
case 1, EventScript_1B2C62
case 2, EventScript_1B2DF6
case SCR_MENU_CANCEL, EventScript_1B2DF6
case 0, FourIsland_House2_EventScript_BragHoF
case 1, FourIsland_House2_EventScript_BragEggs
case 2, FourIsland_House2_EventScript_QuitBrag
case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag
end
EventScript_1B2ADE:: @ 81B2ADE
FourIsland_House2_EventScript_ChooseBragHoFLinkWins:: @ 81B2ADE
multichoice 15, 6, MULTICHOICE_HOF_VICTORIES_QUIT, FALSE
switch VAR_RESULT
case 0, EventScript_1B2B98
case 1, EventScript_1B2D2C
case 2, EventScript_1B2DF6
case SCR_MENU_CANCEL, EventScript_1B2DF6
case 0, FourIsland_House2_EventScript_BragHoF
case 1, FourIsland_House2_EventScript_BragLinkWins
case 2, FourIsland_House2_EventScript_QuitBrag
case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag
end
EventScript_1B2B15:: @ 81B2B15
FourIsland_House2_EventScript_ChooseBragEggsLinkWins:: @ 81B2B15
multichoice 15, 6, MULTICHOICE_EGGS_VICTORIES_QUIT, FALSE
switch VAR_RESULT
case 0, EventScript_1B2C62
case 1, EventScript_1B2D2C
case 2, EventScript_1B2DF6
case SCR_MENU_CANCEL, EventScript_1B2DF6
case 0, FourIsland_House2_EventScript_BragEggs
case 1, FourIsland_House2_EventScript_BragLinkWins
case 2, FourIsland_House2_EventScript_QuitBrag
case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag
end
EventScript_1B2B4C:: @ 81B2B4C
FourIsland_House2_EventScript_ChooseBragHofEggsLinkWins:: @ 81B2B4C
multichoice 15, 5, MULTICHOICE_HOF_EGGS_VICTORIES_QUIT, FALSE
switch VAR_RESULT
case 0, EventScript_1B2B98
case 1, EventScript_1B2C62
case 2, EventScript_1B2D2C
case 3, EventScript_1B2DF6
case SCR_MENU_CANCEL, EventScript_1B2DF6
case 0, FourIsland_House2_EventScript_BragHoF
case 1, FourIsland_House2_EventScript_BragEggs
case 2, FourIsland_House2_EventScript_BragLinkWins
case 3, FourIsland_House2_EventScript_QuitBrag
case SCR_MENU_CANCEL, FourIsland_House2_EventScript_QuitBrag
end
EventScript_1B2B8E:: @ 81B2B8E
msgbox gUnknown_81B1EF8
FourIsland_House2_EventScript_StickerManNothingToBrag:: @ 81B2B8E
msgbox FourIsland_House2_Text_GiveYouStickerIfYouBrag
release
end
EventScript_1B2B98:: @ 81B2B98
FourIsland_House2_EventScript_BragHoF:: @ 81B2B98
compare VAR_0x8004, 39
goto_if_le EventScript_1B2BC5
goto_if_le FourIsland_House2_EventScript_BragHoFLowest
compare VAR_0x8004, 99
goto_if_le EventScript_1B2BE3
goto_if_le FourIsland_House2_EventScript_BragHoFLow
compare VAR_0x8004, 199
goto_if_le EventScript_1B2C01
goto_if_le FourIsland_House2_EventScript_BragHoFHigh
compare VAR_0x8004, 200
goto_if_ge EventScript_1B2C1F
goto_if_ge FourIsland_House2_EventScript_BragHoFHighest
end
EventScript_1B2BC5:: @ 81B2BC5
FourIsland_House2_EventScript_BragHoFLowest:: @ 81B2BC5
compare VAR_HOF_BRAG_STATE, 1
goto_if_eq EventScript_1B2C3D
goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoF
setvar VAR_HOF_BRAG_STATE, 1
msgbox gUnknown_81B206E
goto EventScript_1B2C51
EventScript_1B2BE2:: @ 81B2BE2
msgbox FourIsland_House2_Text_WowHoFLowest
goto FourIsland_House2_EventScript_BraggedHoF
end
EventScript_1B2BE3:: @ 81B2BE3
FourIsland_House2_EventScript_BragHoFLow:: @ 81B2BE3
compare VAR_HOF_BRAG_STATE, 2
goto_if_eq EventScript_1B2C3D
goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoF
setvar VAR_HOF_BRAG_STATE, 2
msgbox gUnknown_81B20CF
goto EventScript_1B2C51
EventScript_1B2C00:: @ 81B2C00
msgbox FourIsland_House2_Text_WowHoFLow
goto FourIsland_House2_EventScript_BraggedHoF
end
EventScript_1B2C01:: @ 81B2C01
FourIsland_House2_EventScript_BragHoFHigh:: @ 81B2C01
compare VAR_HOF_BRAG_STATE, 3
goto_if_eq EventScript_1B2C3D
goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoF
setvar VAR_HOF_BRAG_STATE, 3
msgbox gUnknown_81B2133
goto EventScript_1B2C51
EventScript_1B2C1E:: @ 81B2C1E
msgbox FourIsland_House2_Text_WowHoFHigh
goto FourIsland_House2_EventScript_BraggedHoF
end
EventScript_1B2C1F:: @ 81B2C1F
FourIsland_House2_EventScript_BragHoFHighest:: @ 81B2C1F
compare VAR_HOF_BRAG_STATE, 4
goto_if_eq EventScript_1B2C47
goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedHoFMax
setvar VAR_HOF_BRAG_STATE, 4
msgbox gUnknown_81B21C4
goto EventScript_1B2C51
EventScript_1B2C3C:: @ 81B2C3C
msgbox FourIsland_House2_Text_WowHoFHighest
goto FourIsland_House2_EventScript_BraggedHoF
end
EventScript_1B2C3D:: @ 81B2C3D
msgbox gUnknown_81B227C
FourIsland_House2_EventScript_AlreadyBraggedHoF:: @ 81B2C3D
msgbox FourIsland_House2_Text_ComeBackWithBetterStoryHoF
release
end
EventScript_1B2C47:: @ 81B2C47
msgbox gUnknown_81B22B0
FourIsland_House2_EventScript_AlreadyBraggedHoFMax:: @ 81B2C47
msgbox FourIsland_House2_Text_LivingLegendHoF
release
end
EventScript_1B2C51:: @ 81B2C51
FourIsland_House2_EventScript_BraggedHoF:: @ 81B2C51
textcolor 3
playfanfare MUS_FANFA1
message gUnknown_81B2242
message FourIsland_House2_Text_HoFStickerApplied
waitmessage
waitfanfare
delay 90
release
end
EventScript_1B2C62:: @ 81B2C62
FourIsland_House2_EventScript_BragEggs:: @ 81B2C62
compare VAR_0x8005, 99
goto_if_le EventScript_1B2C8F
goto_if_le FourIsland_House2_EventScript_BragEggsLowest
compare VAR_0x8005, 199
goto_if_le EventScript_1B2CAD
goto_if_le FourIsland_House2_EventScript_BragEggsLow
compare VAR_0x8005, 299
goto_if_le EventScript_1B2CCB
goto_if_le FourIsland_House2_EventScript_BragEggsHigh
compare VAR_0x8005, 300
goto_if_ge EventScript_1B2CE9
goto_if_ge FourIsland_House2_EventScript_BragEggsHighest
end
EventScript_1B2C8F:: @ 81B2C8F
FourIsland_House2_EventScript_BragEggsLowest:: @ 81B2C8F
compare VAR_EGG_BRAG_STATE, 1
goto_if_eq EventScript_1B2D07
goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggs
setvar VAR_EGG_BRAG_STATE, 1
msgbox gUnknown_81B2308
goto EventScript_1B2D1B
msgbox FourIsland_House2_Text_WowEggsLowest
goto FourIsland_House2_EventScript_BraggedEggs
end
EventScript_1B2CAD:: @ 81B2CAD
FourIsland_House2_EventScript_BragEggsLow:: @ 81B2CAD
compare VAR_EGG_BRAG_STATE, 2
goto_if_eq EventScript_1B2D07
goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggs
setvar VAR_EGG_BRAG_STATE, 2
msgbox gUnknown_81B2372
goto EventScript_1B2D1B
msgbox FourIsland_House2_Text_WowEggsLow
goto FourIsland_House2_EventScript_BraggedEggs
end
EventScript_1B2CCB:: @ 81B2CCB
FourIsland_House2_EventScript_BragEggsHigh:: @ 81B2CCB
compare VAR_EGG_BRAG_STATE, 3
goto_if_eq EventScript_1B2D07
goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggs
setvar VAR_EGG_BRAG_STATE, 3
msgbox gUnknown_81B23E0
goto EventScript_1B2D1B
msgbox FourIsland_House2_Text_WowEggsHigh
goto FourIsland_House2_EventScript_BraggedEggs
end
EventScript_1B2CE9:: @ 81B2CE9
FourIsland_House2_EventScript_BragEggsHighest:: @ 81B2CE9
compare VAR_EGG_BRAG_STATE, 4
goto_if_eq EventScript_1B2D11
goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedEggsMax
setvar VAR_EGG_BRAG_STATE, 4
msgbox gUnknown_81B2448
goto EventScript_1B2D1B
msgbox FourIsland_House2_Text_WowEggsHighest
goto FourIsland_House2_EventScript_BraggedEggs
end
EventScript_1B2D07:: @ 81B2D07
msgbox gUnknown_81B251B
FourIsland_House2_EventScript_AlreadyBraggedEggs:: @ 81B2D07
msgbox FourIsland_House2_Text_ComeBackWithBetterStoryEggs
release
end
EventScript_1B2D11:: @ 81B2D11
msgbox gUnknown_81B254F
FourIsland_House2_EventScript_AlreadyBraggedEggsMax:: @ 81B2D11
msgbox FourIsland_House2_Text_LivingLegendEggs
release
end
EventScript_1B2D1B:: @ 81B2D1B
FourIsland_House2_EventScript_BraggedEggs:: @ 81B2D1B
textcolor 3
playfanfare MUS_FANFA1
message gUnknown_81B24EA
message FourIsland_House2_Text_EggStickerApplied
waitmessage
waitfanfare
delay 90
release
end
EventScript_1B2D2C:: @ 81B2D2C
FourIsland_House2_EventScript_BragLinkWins:: @ 81B2D2C
compare VAR_0x8006, 19
goto_if_le EventScript_1B2D59
goto_if_le FourIsland_House2_EventScript_BragLinkWinsLowest
compare VAR_0x8006, 49
goto_if_le EventScript_1B2D77
goto_if_le FourIsland_House2_EventScript_BragLinkWinsLow
compare VAR_0x8006, 99
goto_if_le EventScript_1B2D95
goto_if_le FourIsland_House2_EventScript_BragLinkWinsHigh
compare VAR_0x8006, 100
goto_if_ge EventScript_1B2DB3
goto_if_ge FourIsland_House2_EventScript_BragLinkWinsHighest
end
EventScript_1B2D59:: @ 81B2D59
FourIsland_House2_EventScript_BragLinkWinsLowest:: @ 81B2D59
compare VAR_LINK_WIN_BRAG_STATE, 1
goto_if_eq EventScript_1B2DD1
goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWins
setvar VAR_LINK_WIN_BRAG_STATE, 1
msgbox gUnknown_81B25A7
goto EventScript_1B2DE5
msgbox FourIsland_House2_Text_WowLinkWinsLowest
goto FourIsland_House2_EventScript_BraggedLinkWins
end
EventScript_1B2D77:: @ 81B2D77
FourIsland_House2_EventScript_BragLinkWinsLow:: @ 81B2D77
compare VAR_LINK_WIN_BRAG_STATE, 2
goto_if_eq EventScript_1B2DD1
goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWins
setvar VAR_LINK_WIN_BRAG_STATE, 2
msgbox gUnknown_81B2609
goto EventScript_1B2DE5
msgbox FourIsland_House2_Text_WowLinkWinsLow
goto FourIsland_House2_EventScript_BraggedLinkWins
end
EventScript_1B2D95:: @ 81B2D95
FourIsland_House2_EventScript_BragLinkWinsHigh:: @ 81B2D95
compare VAR_LINK_WIN_BRAG_STATE, 3
goto_if_eq EventScript_1B2DD1
goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWins
setvar VAR_LINK_WIN_BRAG_STATE, 3
msgbox gUnknown_81B267B
goto EventScript_1B2DE5
msgbox FourIsland_House2_Text_WowLinkWinsHigh
goto FourIsland_House2_EventScript_BraggedLinkWins
end
EventScript_1B2DB3:: @ 81B2DB3
FourIsland_House2_EventScript_BragLinkWinsHighest:: @ 81B2DB3
compare VAR_LINK_WIN_BRAG_STATE, 4
goto_if_eq EventScript_1B2DDB
goto_if_eq FourIsland_House2_EventScript_AlreadyBraggedLinkWinsMax
setvar VAR_LINK_WIN_BRAG_STATE, 4
msgbox gUnknown_81B26F6
goto EventScript_1B2DE5
msgbox FourIsland_House2_Text_WowLinkWinsHighest
goto FourIsland_House2_EventScript_BraggedLinkWins
end
EventScript_1B2DD1:: @ 81B2DD1
msgbox gUnknown_81B27DB
FourIsland_House2_EventScript_AlreadyBraggedLinkWins:: @ 81B2DD1
msgbox FourIsland_House2_Text_ComeBackWithBetterStoryLinkWins
release
end
EventScript_1B2DDB:: @ 81B2DDB
msgbox gUnknown_81B280F
FourIsland_House2_EventScript_AlreadyBraggedLinkWinsMax:: @ 81B2DDB
msgbox FourIsland_House2_Text_LivingLegendLinkWins
release
end
EventScript_1B2DE5:: @ 81B2DE5
FourIsland_House2_EventScript_BraggedLinkWins:: @ 81B2DE5
textcolor 3
playfanfare MUS_FANFA1
message gUnknown_81B27A6
message FourIsland_House2_Text_VictoryStickerApplied
waitmessage
waitfanfare
delay 90
release
end
EventScript_1B2DF6:: @ 81B2DF6
FourIsland_House2_EventScript_QuitBrag:: @ 81B2DF6
release
end
data/specials.inc
+1 -1
View File
@@ -368,7 +368,7 @@ gSpecials:: @ 815FD60
def_special ShouldShowBoxWasFullMessage
def_special ChangeBoxPokemonNickname
def_special Special_UpdateTrainerCardPhotoIcons
def_special Special_StickerLadyGetBragFlags
def_special StickerManGetBragFlags
def_special SetUsedPkmnCenterQuestLogEvent
def_special IsWirelessAdapterConnected
def_special TryBecomeLinkLeader
data/text/fame_checker.inc
+1 -1
View File
@@ -1468,7 +1468,7 @@ PokemonJournal_Text_SpecialFeatureProfOak:: @ 81B1AB9
.string "PROF. OAK reportedly lives with his\n"
.string "grandchildren DAISY and {RIVAL}.$"
gUnknown_81B1B3D:: @ 81B1B3D
PokemonJournal_Text_SpecialFeatureDaisyOak:: @ 81B1B3D
.string "This is a POKéMON JOURNAL from\n"
.string "years ago…\p"
.string "POKéMON JOURNAL\n"
data/text/trainer_card.inc
+30 -30
View File
@@ -1,31 +1,31 @@
gUnknown_81B1D7D:: @ 81B1D7D
CeladonCity_GameCorner_Text_TryPokemonPrinter:: @ 81B1D7D
.string "It's a POKéMON PRINTER!\p"
.string "It can put a print of your POKéMON\n"
.string "on the back of your TRAINER CARD.\p"
.string "It costs only ¥50.\n"
.string "Would you like to try it?$"
gUnknown_81B1E07:: @ 81B1E07
CeladonCity_GameCorner_Text_DontHaveEnoughMoney:: @ 81B1E07
.string "You don't have enough money.$"
gUnknown_81B1E24:: @ 81B1E24
CeladonCity_GameCorner_Text_ChoosePrintType:: @ 81B1E24
.string "Please choose the print type.$"
gUnknown_81B1E42:: @ 81B1E42
CeladonCity_GameCorner_Text_BigSmileForPhoto:: @ 81B1E42
.string "A big smile for the photo, please!\n"
.string "Three… Two… One…\p"
.string "Flash!$"
gUnknown_81B1E7D:: @ 81B1E7D
CeladonCity_GameCorner_Text_PrintIsReadyCheckTrainerCard:: @ 81B1E7D
.string "Your POKéMON print is ready!\n"
.string "Check your TRAINER CARD.$"
gUnknown_81B1EB3:: @ 81B1EB3
FourIsland_House2_Text_WishICouldShowOffStickers:: @ 81B1EB3
.string "Giggle…\n"
.string "I collected a ton of STICKERS.\l"
.string "I wish I could show them off…$"
gUnknown_81B1EF8:: @ 81B1EF8
FourIsland_House2_Text_GiveYouStickerIfYouBrag:: @ 81B1EF8
.string "Oh, excellent!\n"
.string "You've come to the right place!\p"
.string "Look, look! See? See?\n"
@@ -38,113 +38,113 @@ gUnknown_81B1EF8:: @ 81B1EF8
.string "yourself.\p"
.string "What will you brag about?$"
gUnknown_81B1FEF:: @ 81B1FEF
FourIsland_House2_Text_BragAboutSomethingForMe:: @ 81B1FEF
.string "Brag about something for me.\n"
.string "I'll give you a STICKER.$"
gUnknown_81B2025:: @ 81B2025
FourIsland_House2_Text_BragAboutWhatToday:: @ 81B2025
.string "Oh, hi!\n"
.string "Here comes the braggart.\p"
.string "What are you going to brag about\n"
.string "today?$"
gUnknown_81B206E:: @ 81B206E
FourIsland_House2_Text_WowHoFLowest:: @ 81B206E
.string "Oh, wow, you made it into the\n"
.string "HALL OF FAME.\p"
.string "That's pretty good, yup!\n"
.string "I'll give you one of these.$"
gUnknown_81B20CF:: @ 81B20CF
FourIsland_House2_Text_WowHoFLow:: @ 81B20CF
.string "Oh, wow, you've entered the\n"
.string "HALL OF FAME often!\p"
.string "That's impressive, yup!\n"
.string "I'll give you one of these.$"
gUnknown_81B2133:: @ 81B2133
FourIsland_House2_Text_WowHoFHigh:: @ 81B2133
.string "Whoa! You've made it into the\n"
.string "HALL OF FAME that often?\l"
.string "That's seriously incredible, yup!\p"
.string "You own the POKéMON LEAGUE!\n"
.string "I'll give you one of these.$"
gUnknown_81B21C4:: @ 81B21C4
FourIsland_House2_Text_WowHoFHighest:: @ 81B21C4
.string "No way! You've gone into the\n"
.string "HALL OF FAME that many times?\p"
.string "You're beyond incredible, yup!\n"
.string "That's it, I have to give you this.$"
gUnknown_81B2242:: @ 81B2242
FourIsland_House2_Text_HoFStickerApplied:: @ 81B2242
.string "The HALL OF FAME STICKER was\n"
.string "applied to the TRAINER CARD.$"
gUnknown_81B227C:: @ 81B227C
FourIsland_House2_Text_ComeBackWithBetterStoryHoF:: @ 81B227C
.string "Hmm…\p"
.string "Come back with a better story next\n"
.string "time, okay?$"
gUnknown_81B22B0:: @ 81B22B0
FourIsland_House2_Text_LivingLegendHoF:: @ 81B22B0
.string "Oh, no, no can do.\p"
.string "You're practically a living legend.\n"
.string "I have no SITCKERS left to give.$"
gUnknown_81B2308:: @ 81B2308
FourIsland_House2_Text_WowEggsLowest:: @ 81B2308
.string "Oh, wow, there are POKéMON EGGS?\n"
.string "I didn't know that!\p"
.string "That's pretty good, yup!\n"
.string "I'll give you one of these.$"
gUnknown_81B2372:: @ 81B2372
FourIsland_House2_Text_WowEggsLow:: @ 81B2372
.string "You've hatched that many EGGS?\n"
.string "You really must like them!\p"
.string "That's impressive, yup!\n"
.string "I'll give you one of these.$"
gUnknown_81B23E0:: @ 81B23E0
FourIsland_House2_Text_WowEggsHigh:: @ 81B23E0
.string "Whoa! You've hatched a whole\n"
.string "bunch of EGGS!\p"
.string "You're an EGG-hatching machine!\n"
.string "I'll give you one of these.$"
gUnknown_81B2448:: @ 81B2448
FourIsland_House2_Text_WowEggsHighest:: @ 81B2448
.string "Wh… You hatched that many EGGS?\p"
.string "What's behind your love of EGGS?\n"
.string "It's beyond incredible, yup!\p"
.string "You're too awesome, I tell you.\n"
.string "That's it, I have to give you this.$"
gUnknown_81B24EA:: @ 81B24EA
FourIsland_House2_Text_EggStickerApplied:: @ 81B24EA
.string "The EGG STICKER was applied\n"
.string "to the TRAINER CARD.$"
gUnknown_81B251B:: @ 81B251B
FourIsland_House2_Text_ComeBackWithBetterStoryEggs:: @ 81B251B
.string "Hmm…\p"
.string "Come back with a better story next\n"
.string "time, okay?$"
gUnknown_81B254F:: @ 81B254F
FourIsland_House2_Text_LivingLegendEggs:: @ 81B254F
.string "Oh, no, no can do.\p"
.string "You're practically a living legend.\n"
.string "I have no SITCKERS left to give.$"
gUnknown_81B25A7:: @ 81B25A7
FourIsland_House2_Text_WowLinkWinsLowest:: @ 81B25A7
.string "Oh, wow, you've had success\n"
.string "link battling?\p"
.string "You're pretty strong, yup!\n"
.string "I'll give you one of these.$"
gUnknown_81B2609:: @ 81B2609
FourIsland_House2_Text_WowLinkWinsLow:: @ 81B2609
.string "You've beaten your friends a lot\n"
.string "link battling, huh?\p"
.string "You're impressively strong, yup!\n"
.string "I'll give you one of these.$"
gUnknown_81B267B:: @ 81B267B
FourIsland_House2_Text_WowLinkWinsHigh:: @ 81B267B
.string "Whoa! You've beaten your friends\n"
.string "a frightful number of times.\p"
.string "Have you lost friends over this?\n"
.string "I'll give you one of these.$"
gUnknown_81B26F6:: @ 81B26F6
FourIsland_House2_Text_WowLinkWinsHighest:: @ 81B26F6
.string "Wh… Wickedly whoa!\n"
.string "You've won mind-blowingly often!\p"
.string "It just knocks me out thinking\n"
@@ -152,16 +152,16 @@ gUnknown_81B26F6:: @ 81B26F6
.string "You're the stuff of nightmares!\n"
.string "That's it, I have to give you this.$"
gUnknown_81B27A6:: @ 81B27A6
FourIsland_House2_Text_VictoryStickerApplied:: @ 81B27A6
.string "The VICTORY STICKER was applied\n"
.string "to the TRAINER CARD.$"
gUnknown_81B27DB:: @ 81B27DB
FourIsland_House2_Text_ComeBackWithBetterStoryLinkWins:: @ 81B27DB
.string "Hmm…\p"
.string "Come back with a better story next\n"
.string "time, okay?$"
gUnknown_81B280F:: @ 81B280F
FourIsland_House2_Text_LivingLegendLinkWins:: @ 81B280F
.string "Oh, no, no can do.\p"
.string "You're practically a living legend.\n"
.string "I have no SITCKERS left to give.$"
graphics/trainer_card/unk_83CC984.bin → graphics/trainer_card/back.bin
View File
graphics/trainer_card/unk_83CC8A8.bin → graphics/trainer_card/back_hoenn.bin
View File
graphics/trainer_card/unk_83CCEC8.bin → graphics/trainer_card/bg.bin
View File
graphics/trainer_card/unk_83CCE30.bin → graphics/trainer_card/bg_hoenn.bin
View File
graphics/trainer_card/unk_83CC6F0.bin → graphics/trainer_card/front.bin
View File
graphics/trainer_card/unk_83CC4DC.bin → graphics/trainer_card/front_hoenn.bin
View File
graphics/trainer_card/unk_83CCAB0.bin → graphics/trainer_card/front_hoenn_link.bin
View File
graphics/trainer_card/unk_83CCCA4.bin → graphics/trainer_card/front_link.bin
View File
graphics/trainer_card/unk_83CD300.pal → graphics/trainer_card/gold.pal
View File
include/constants/facility_trainer_classes.h
+4 -4
View File
@@ -133,10 +133,10 @@
#define FACILITY_CLASS_CRUSH_KIN 0x81
#define FACILITY_CLASS_SIS_AND_BRO_2 0x82
#define FACILITY_CLASS_PKMN_PROF 0x83
#define FACILITY_CLASS_PLAYER 0x84
#define FACILITY_CLASS_PLAYER_2 0x85
#define FACILITY_CLASS_PLAYER_3 0x86
#define FACILITY_CLASS_PLAYER_4 0x87
#define FACILITY_CLASS_BRENDAN 0x84
#define FACILITY_CLASS_MAY 0x85
#define FACILITY_CLASS_RED 0x86
#define FACILITY_CLASS_LEAF 0x87
#define FACILITY_CLASS_TEAM_ROCKET_2 0x88
#define FACILITY_CLASS_PSYCHIC_4 0x89
#define FACILITY_CLASS_CRUSH_GIRL 0x8A
include/constants/flags.h
+4 -1
View File
@@ -670,7 +670,7 @@
#define FLAG_SILPH_11F_DOOR 0x28D
#define FLAG_0x28E 0x28E
#define FLAG_0x28F 0x28F
#define FLAG_MET_STICKER_LADY 0x290
#define FLAG_MET_STICKER_MAN 0x290
#define FLAG_PALLET_LADY_NOT_BLOCKING_SIGN 0x291
#define FLAG_GOT_VS_SEEKER 0x292
#define FLAG_GOT_TM19_FROM_ERIKA 0x293
@@ -1327,6 +1327,7 @@
#define FLAG_0x808 (SYS_FLAGS + 0x8)
#define PERMA_SYS_FLAGS_START 0x820
#define FLAG_BADGE01_GET (SYS_FLAGS + 0x20)
#define FLAG_BADGE02_GET (SYS_FLAGS + 0x21)
#define FLAG_BADGE03_GET (SYS_FLAGS + 0x22)
@@ -1335,6 +1336,8 @@
#define FLAG_BADGE06_GET (SYS_FLAGS + 0x25)
#define FLAG_BADGE07_GET (SYS_FLAGS + 0x26)
#define FLAG_BADGE08_GET (SYS_FLAGS + 0x27)
#define NUM_BADGES (1 + FLAG_BADGE08_GET - FLAG_BADGE01_GET)
#define FLAG_SYS_POKEMON_GET (SYS_FLAGS + 0x28)
#define FLAG_SYS_POKEDEX_GET (SYS_FLAGS + 0x29)
#define FLAG_0x82A (SYS_FLAGS + 0x2A)
include/constants/trainer_card.h
+17
View File
@@ -0,0 +1,17 @@
#ifndef GUARD_CONSTANTS_TRAINER_CARD_H
#define GUARD_CONSTANTS_TRAINER_CARD_H
#define TRAINER_CARD_PROFILE_LENGTH 4
#define TRAINER_CARD_STICKER_TYPES 3
#define CARD_TYPE_FRLG 0
#define CARD_TYPE_RSE 1
#define MON_ICON_TINT_NORMAL 0
#define MON_ICON_TINT_BLACK 1
#define MON_ICON_TINT_PINK 2
#define MON_ICON_TINT_SEPIA 3
#define NUM_LINK_TRAINER_CARD_CLASSES 8
#endif // GUARD_CONSTANTS_TRAINER_CARD_H
include/graphics.h
+4 -4
View File
@@ -4845,10 +4845,10 @@ extern const u32 gBuyMenuFrame_Pal[];
extern const u16 gUnknown_8D2FBB4[];
// trainer card
extern const u16 gFireRedTrainerCard_Pal[];
extern const u32 gFireRedTrainerCard_Gfx[];
extern const u16 gEmeraldTrainerCard_Pal[];
extern const u32 gEmeraldTrainerCard_Gfx[];
extern const u16 gKantoTrainerCard_Pal[];
extern const u32 gKantoTrainerCard_Gfx[];
extern const u16 gHoennTrainerCard_Pal[];
extern const u32 gHoennTrainerCard_Gfx[];
// battle_interface
extern const u32 gFile_graphics_battle_interface_ball_status_bar_sheet[];
include/trainer_card.h
+9 -7
View File
@@ -1,6 +1,8 @@
#ifndef GUARD_TRAINER_CARD_H
#define GUARD_TRAINER_CARD_H
#include "constants/trainer_card.h"
struct TrainerCardRSE
{
/*0x00*/ u8 gender;
@@ -23,7 +25,7 @@ struct TrainerCardRSE
/*0x1E*/ u16 pokeblocksWithFriends;
/*0x20*/ u16 pokemonTrades;
/*0x24*/ u32 money;
/*0x28*/ u16 var_28[4];
/*0x28*/ u16 easyChatProfile[TRAINER_CARD_PROFILE_LENGTH];
/*0x30*/ u8 playerName[PLAYER_NAME_LENGTH + 1];
};
@@ -31,16 +33,16 @@ struct TrainerCard
{
/*0x00*/ struct TrainerCardRSE rse;
/*0x38*/ u8 version;
/*0x3A*/ u16 var_3A;
/*0x3A*/ bool16 hasAllFrontierSymbols;
/*0x3C*/ u32 berryCrushPoints;
/*0x40*/ u32 unionRoomNum;
/*0x44*/ u32 berriesPicked;
/*0x48*/ u32 jumpsInRow;
/*0x4C*/ bool8 var_4C;
/*0x48*/ u32 jumpsInRow;
/*0x4C*/ bool8 shouldDrawStickers;
/*0x4D*/ bool8 hasAllMons;
/*0x4E*/ u8 var_4E;
/*0x4F*/ u8 var_4F;
/*0x50*/ u8 var_50[4];
/*0x4E*/ u8 monIconTint;
/*0x4F*/ u8 facilityClass;
/*0x50*/ u8 stickers[TRAINER_CARD_STICKER_TYPES];
/*0x54*/ u16 monSpecies[PARTY_SIZE];
};
include/trainer_pokemon_sprites.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "global.h"
u16 sub_810C330(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId);
u16 CreateTrainerCardTrainerPicSprite(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId);
bool16 ResetAllPicSprites(void);
u16 sub_818D3E4(u16 species, u32 otId, u32 personality, u8 flags, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
u16 sub_818D7D8(u16 species, u32 otId, u32 personality, bool8 isFrontPic, s16 x, s16 y, u8 paletteSlot, u16 paletteTag);
src/battle_controller_link_opponent.c
+4 -4
View File
@@ -1127,11 +1127,11 @@ static void LinkOpponentHandleDrawTrainerPic(void)
}
else if (gLinkPlayers[GetBattlerMultiplayerId(gActiveBattler)].gender != MALE)
{
trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PLAYER_4];
trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_LEAF];
}
else
{
trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PLAYER_3];
trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RED];
}
}
else
@@ -1152,11 +1152,11 @@ static void LinkOpponentHandleDrawTrainerPic(void)
}
else if (gLinkPlayers[GetMultiplayerId() ^ BIT_SIDE].gender != MALE)
{
trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PLAYER_4];
trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_LEAF];
}
else
{
trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_PLAYER_3];
trainerPicId = gFacilityClassToPicIndex[FACILITY_CLASS_RED];
}
}
DecompressTrainerFrontPic(trainerPicId, gActiveBattler);
src/data/pokemon/trainer_class_lookups.h
+8 -8
View File
@@ -133,10 +133,10 @@ const u8 gFacilityClassToPicIndex[] =
[FACILITY_CLASS_CRUSH_KIN] = 130,
[FACILITY_CLASS_SIS_AND_BRO_2] = 131,
[FACILITY_CLASS_PKMN_PROF] = 132,
[FACILITY_CLASS_PLAYER] = 133,
[FACILITY_CLASS_PLAYER_2] = 134,
[FACILITY_CLASS_PLAYER_3] = 135,
[FACILITY_CLASS_PLAYER_4] = 136,
[FACILITY_CLASS_BRENDAN] = TRAINER_PIC_RS_BRENDAN_2,
[FACILITY_CLASS_MAY] = TRAINER_PIC_RS_MAY_2,
[FACILITY_CLASS_RED] = TRAINER_PIC_RED,
[FACILITY_CLASS_LEAF] = TRAINER_PIC_LEAF,
[FACILITY_CLASS_TEAM_ROCKET_2] = 137,
[FACILITY_CLASS_PSYCHIC_4] = 138,
[FACILITY_CLASS_CRUSH_GIRL] = 139,
@@ -287,10 +287,10 @@ const u8 gFacilityClassToTrainerClass[] =
[FACILITY_CLASS_CRUSH_KIN] = CLASS_CRUSH_KIN,
[FACILITY_CLASS_SIS_AND_BRO_2] = CLASS_SIS_AND_BRO_2,
[FACILITY_CLASS_PKMN_PROF] = CLASS_PKMN_PROF,
[FACILITY_CLASS_PLAYER] = CLASS_PLAYER,
[FACILITY_CLASS_PLAYER_2] = CLASS_PLAYER,
[FACILITY_CLASS_PLAYER_3] = CLASS_PLAYER,
[FACILITY_CLASS_PLAYER_4] = CLASS_PLAYER,
[FACILITY_CLASS_BRENDAN] = CLASS_PLAYER,
[FACILITY_CLASS_MAY] = CLASS_PLAYER,
[FACILITY_CLASS_RED] = CLASS_PLAYER,
[FACILITY_CLASS_LEAF] = CLASS_PLAYER,
[FACILITY_CLASS_TEAM_ROCKET_2] = CLASS_TEAM_ROCKET,
[FACILITY_CLASS_PSYCHIC_4] = CLASS_PSYCHIC_2,
[FACILITY_CLASS_CRUSH_GIRL] = CLASS_CRUSH_GIRL,
src/field_specials.c
+1 -1
View File
@@ -1695,7 +1695,7 @@ void Special_UpdateTrainerCardPhotoIcons(void)
VarSet(VAR_TRAINER_CARD_MON_ICON_TINT_IDX, gSpecialVar_0x8004);
}
u16 Special_StickerLadyGetBragFlags(void)
u16 StickerManGetBragFlags(void)
{
u16 result = 0;
u32 numEggs;
src/graphics.c
+4 -4
View File
@@ -1210,10 +1210,10 @@ const u32 gUnknown_8E990F8[] = INCBIN_U32("graphics/interface/naming_screen_8E99
const u8 gUnknown_8E99118[] = INCBIN_U8("graphics/tm_case/unk_8E99118.4bpp");
const u16 gFireRedTrainerCard_Pal[] = INCBIN_U16("graphics/trainer_card/0star.gbapal");
const u32 gFireRedTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card.4bpp.lz");
const u16 gEmeraldTrainerCard_Pal[] = INCBIN_U16("graphics/trainer_card/0star_em.gbapal");
const u32 gEmeraldTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card_em.4bpp.lz");
const u16 gKantoTrainerCard_Pal[] = INCBIN_U16("graphics/trainer_card/0star.gbapal");
const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card.4bpp.lz");
const u16 gHoennTrainerCard_Pal[] = INCBIN_U16("graphics/trainer_card/0star_em.gbapal");
const u32 gHoennTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card_em.4bpp.lz");
const u16 gUnknown_8E99D8C[] = INCBIN_U16("graphics/link_rfu/unk_8E99DAC.gbapal");
const u32 gUnknown_8E99DAC[] = INCBIN_U32("graphics/link_rfu/unk_8E99DAC.4bpp.lz");
src/trainer_card.c
+478 -440
View File
File diff suppressed because it is too large Load Diff
src/trainer_pokemon_sprites.c
+1 -1
View File
@@ -300,7 +300,7 @@ u16 sub_810C2FC(u16 species, bool8 isFrontPic, u8 paletteSlot, u8 windowId)
return sub_810C050(species, 0, 0, isFrontPic, paletteSlot, windowId, TRUE);
}
u16 sub_810C330(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId)
u16 CreateTrainerCardTrainerPicSprite(u16 species, bool8 isFrontPic, u16 destX, u16 destY, u8 paletteSlot, u8 windowId)
{
return sub_810C0C0(species, 0, 0, isFrontPic, destX, destY, paletteSlot, windowId, TRUE);
}
src/union_room.c
+3 -2
View File
@@ -46,6 +46,7 @@
#include "constants/cable_club.h"
#include "constants/field_weather.h"
#include "constants/species.h"
#include "constants/trainer_card.h"
#include "constants/union_room.h"
static EWRAM_DATA u8 sUnionRoomPlayerName[12] = {};
@@ -4727,9 +4728,9 @@ static void ViewURoomPartnerTrainerCard(u8 *unused, struct UnkStruct_URoom * uro
ConvertIntToDecimalStringN(uroom->trainerCardStrbufs[2], trainerCard->rse.pokemonTrades, STR_CONV_MODE_LEFT_ALIGN, 5);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(3, uroom->trainerCardStrbufs[2]);
for (i = 0; i < 4; i++)
for (i = 0; i < TRAINER_CARD_PROFILE_LENGTH; i++)
{
CopyEasyChatWord(uroom->trainerCardStrbufs[i + 3], trainerCard->rse.var_28[i]);
CopyEasyChatWord(uroom->trainerCardStrbufs[i + 3], trainerCard->rse.easyChatProfile[i]);
DynamicPlaceholderTextUtil_SetPlaceholderPtr(i + 4, uroom->trainerCardStrbufs[i + 3]);
}