ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-27 13:53:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Document Littleroot scripts

Browse Source
This commit is contained in:
GriffinR 2019-11-08 02:03:45 -05:00
parent 1475c4d8da
commit bef24a45f0
15 changed files with 685 additions and 631 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/event_scripts.s
View File

@ -692,8 +692,8 @@ EverGrandeCity_HallOfFame_EventScript_27183F:: @ 827183F
return return
EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843 EverGrandeCity_HallOfFame_EventScript_271843:: @ 8271843
setvar VAR_LITTLEROOT_HOUSES_STATE, 3 setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 3
setvar VAR_LITTLEROOT_HOUSES_STATE_2, 3 setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 3
clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD clearflag FLAG_HIDE_PLAYERS_HOUSE_DAD
return return

22
data/maps/InsideOfTruck/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "InsideOfTruck_EventScript_23BF6C", "script": "InsideOfTruck_EventScript_MovingBox",
"flag": "0" "flag": "0"
}, },
{ {
@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "InsideOfTruck_EventScript_23BF6C", "script": "InsideOfTruck_EventScript_MovingBox",
"flag": "0" "flag": "0"
}, },
{ {
@ -50,7 +50,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "InsideOfTruck_EventScript_23BF6C", "script": "InsideOfTruck_EventScript_MovingBox",
"flag": "0" "flag": "0"
} }
], ],
@ -85,7 +85,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_INTRO_STATE", "var": "VAR_LITTLEROOT_INTRO_STATE",
"var_value": "0", "var_value": "0",
"script": "InsideOfTruck_EventScript_23BF04" "script": "InsideOfTruck_EventScript_SetIntroFlags"
}, },
{ {
"type": "trigger", "type": "trigger",
@ -94,7 +94,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_INTRO_STATE", "var": "VAR_LITTLEROOT_INTRO_STATE",
"var_value": "0", "var_value": "0",
"script": "InsideOfTruck_EventScript_23BF04" "script": "InsideOfTruck_EventScript_SetIntroFlags"
}, },
{ {
"type": "trigger", "type": "trigger",
@ -103,7 +103,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_INTRO_STATE", "var": "VAR_LITTLEROOT_INTRO_STATE",
"var_value": "0", "var_value": "0",
"script": "InsideOfTruck_EventScript_23BF04" "script": "InsideOfTruck_EventScript_SetIntroFlags"
} }
], ],
"bg_events": [ "bg_events": [
@ -113,7 +113,7 @@
"y": 0, "y": 0,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "InsideOfTruck_EventScript_23BF6C" "script": "InsideOfTruck_EventScript_MovingBox"
}, },
{ {
"type": "sign", "type": "sign",
@ -121,7 +121,7 @@
"y": 4, "y": 4,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "InsideOfTruck_EventScript_23BF6C" "script": "InsideOfTruck_EventScript_MovingBox"
}, },
{ {
"type": "sign", "type": "sign",
@ -129,7 +129,7 @@
"y": 3, "y": 3,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "InsideOfTruck_EventScript_23BF6C" "script": "InsideOfTruck_EventScript_MovingBox"
}, },
{ {
"type": "sign", "type": "sign",
@ -137,7 +137,7 @@
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "InsideOfTruck_EventScript_23BF6C" "script": "InsideOfTruck_EventScript_MovingBox"
}, },
{ {
"type": "sign", "type": "sign",
@ -145,7 +145,7 @@
"y": 2, "y": 2,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "InsideOfTruck_EventScript_23BF6C" "script": "InsideOfTruck_EventScript_MovingBox"
} }
] ]
} }

28
data/maps/InsideOfTruck/scripts.inc
View File

@ -1,29 +1,29 @@
InsideOfTruck_MapScripts:: @ 823BEDA InsideOfTruck_MapScripts:: @ 823BEDA
map_script MAP_SCRIPT_ON_LOAD, InsideOfTruck_MapScript1_23BEE5 map_script MAP_SCRIPT_ON_LOAD, InsideOfTruck_OnLoad
map_script MAP_SCRIPT_ON_RESUME, InsideOfTruck_MapScript1_23BF01 map_script MAP_SCRIPT_ON_RESUME, InsideOfTruck_OnResume
.byte 0 .byte 0
InsideOfTruck_MapScript1_23BEE5: @ 823BEE5 InsideOfTruck_OnLoad: @ 823BEE5
setmetatile 4, 1, METATILE_InsideOfTruck_ExitLight_Top, 0 setmetatile 4, 1, METATILE_InsideOfTruck_ExitLight_Top, 0
setmetatile 4, 2, METATILE_InsideOfTruck_ExitLight_Mid, 0 setmetatile 4, 2, METATILE_InsideOfTruck_ExitLight_Mid, 0
setmetatile 4, 3, METATILE_InsideOfTruck_ExitLight_Bottom, 0 setmetatile 4, 3, METATILE_InsideOfTruck_ExitLight_Bottom, 0
end end
InsideOfTruck_MapScript1_23BF01: @ 823BF01 InsideOfTruck_OnResume: @ 823BF01
setstepcallback STEP_CB_TRUCK setstepcallback STEP_CB_TRUCK
end end
InsideOfTruck_EventScript_23BF04:: @ 823BF04 InsideOfTruck_EventScript_SetIntroFlags:: @ 823BF04
lockall lockall
setflag FLAG_HIDE_MAP_NAME_POPUP setflag FLAG_HIDE_MAP_NAME_POPUP
checkplayergender checkplayergender
compare VAR_RESULT, MALE compare VAR_RESULT, MALE
goto_if_eq InsideOfTruck_EventScript_23BF20 goto_if_eq InsideOfTruck_EventScript_SetIntroFlagsMale
compare VAR_RESULT, FEMALE compare VAR_RESULT, FEMALE
goto_if_eq InsideOfTruck_EventScript_23BF46 goto_if_eq InsideOfTruck_EventScript_SetIntroFlagsFemale
end end
InsideOfTruck_EventScript_23BF20:: @ 823BF20 InsideOfTruck_EventScript_SetIntroFlagsMale:: @ 823BF20
setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
setvar VAR_LITTLEROOT_INTRO_STATE, 1 setvar VAR_LITTLEROOT_INTRO_STATE, 1
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MOM
@ -31,12 +31,12 @@ InsideOfTruck_EventScript_23BF20:: @ 823BF20
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_MOM
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_SIBLING
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F_POKE_BALL
setvar VAR_LITTLEROOT_HOUSES_STATE_2, 1 setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 1
setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10
releaseall releaseall
end end
InsideOfTruck_EventScript_23BF46:: @ 823BF46 InsideOfTruck_EventScript_SetIntroFlagsFemale:: @ 823BF46
setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
setvar VAR_LITTLEROOT_INTRO_STATE, 2 setvar VAR_LITTLEROOT_INTRO_STATE, 2
setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_MOM
@ -44,16 +44,16 @@ InsideOfTruck_EventScript_23BF46:: @ 823BF46
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_MOM
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_SIBLING
setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_2F_POKE_BALL
setvar VAR_LITTLEROOT_HOUSES_STATE, 1 setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 1
setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10
releaseall releaseall
end end
InsideOfTruck_EventScript_23BF6C:: @ 823BF6C InsideOfTruck_EventScript_MovingBox:: @ 823BF6C
msgbox InsideOfTruck_Text_23BF75, MSGBOX_SIGN msgbox InsideOfTruck_Text_BoxPrintedWithMonLogo, MSGBOX_SIGN
end end
InsideOfTruck_Text_23BF75: @ 823BF75 InsideOfTruck_Text_BoxPrintedWithMonLogo: @ 823BF75
.string "The box is printed with a POKéMON logo.\p" .string "The box is printed with a POKéMON logo.\p"
.string "It's a POKéMON brand moving and\n" .string "It's a POKéMON brand moving and\n"
.string "delivery service.$" .string "delivery service.$"

34
data/maps/LittlerootTown/map.json
View File

@ -30,7 +30,7 @@
"movement_range_y": 2, "movement_range_y": 2,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LittlerootTown_EventScript_1E8034", "script": "LittlerootTown_EventScript_Twin",
"flag": "0" "flag": "0"
}, },
{ {
@ -43,7 +43,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LittlerootTown_EventScript_1E8022", "script": "LittlerootTown_EventScript_FatMan",
"flag": "FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN" "flag": "FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN"
}, },
{ {
@ -56,7 +56,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LittlerootTown_EventScript_1E802B", "script": "LittlerootTown_EventScript_Boy",
"flag": "0" "flag": "0"
}, },
{ {
@ -69,7 +69,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LittlerootTown_EventScript_1E863D", "script": "LittlerootTown_EventScript_Mom",
"flag": "FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE" "flag": "FLAG_HIDE_LITTLEROOT_TOWN_MOM_OUTSIDE"
}, },
{ {
@ -156,7 +156,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_TOWN_STATE", "var": "VAR_LITTLEROOT_TOWN_STATE",
"var_value": "0", "var_value": "0",
"script": "LittlerootTown_EventScript_1E8091" "script": "LittlerootTown_EventScript_NeedPokemonTriggerLeft"
}, },
{ {
"type": "trigger", "type": "trigger",
@ -165,7 +165,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_TOWN_STATE", "var": "VAR_LITTLEROOT_TOWN_STATE",
"var_value": "0", "var_value": "0",
"script": "LittlerootTown_EventScript_1E80EF" "script": "LittlerootTown_EventScript_NeedPokemonTriggerRight"
}, },
{ {
"type": "trigger", "type": "trigger",
@ -174,7 +174,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_TOWN_STATE", "var": "VAR_LITTLEROOT_TOWN_STATE",
"var_value": "1", "var_value": "1",
"script": "LittlerootTown_EventScript_1E811F" "script": "LittlerootTown_EventScript_GoSaveBirchTrigger"
}, },
{ {
"type": "trigger", "type": "trigger",
@ -183,7 +183,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_TOWN_STATE", "var": "VAR_LITTLEROOT_TOWN_STATE",
"var_value": "3", "var_value": "3",
"script": "LittlerootTown_EventScript_1E81F9" "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger4"
}, },
{ {
"type": "trigger", "type": "trigger",
@ -192,7 +192,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_TOWN_STATE", "var": "VAR_LITTLEROOT_TOWN_STATE",
"var_value": "3", "var_value": "3",
"script": "LittlerootTown_EventScript_1E8205" "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger5"
}, },
{ {
"type": "trigger", "type": "trigger",
@ -201,7 +201,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_TOWN_STATE", "var": "VAR_LITTLEROOT_TOWN_STATE",
"var_value": "3", "var_value": "3",
"script": "LittlerootTown_EventScript_1E81E1" "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger2"
}, },
{ {
"type": "trigger", "type": "trigger",
@ -210,7 +210,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_TOWN_STATE", "var": "VAR_LITTLEROOT_TOWN_STATE",
"var_value": "3", "var_value": "3",
"script": "LittlerootTown_EventScript_1E81ED" "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger3"
}, },
{ {
"type": "trigger", "type": "trigger",
@ -219,7 +219,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_TOWN_STATE", "var": "VAR_LITTLEROOT_TOWN_STATE",
"var_value": "3", "var_value": "3",
"script": "LittlerootTown_EventScript_1E81BB" "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger0"
}, },
{ {
"type": "trigger", "type": "trigger",
@ -228,7 +228,7 @@
"elevation": 3, "elevation": 3,
"var": "VAR_LITTLEROOT_TOWN_STATE", "var": "VAR_LITTLEROOT_TOWN_STATE",
"var_value": "3", "var_value": "3",
"script": "LittlerootTown_EventScript_1E81CE" "script": "LittlerootTown_EventScript_GiveRunningShoesTrigger1"
} }
], ],
"bg_events": [ "bg_events": [
@ -238,7 +238,7 @@
"y": 13, "y": 13,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LittlerootTown_EventScript_1E8151" "script": "LittlerootTown_EventScript_TownSign"
}, },
{ {
"type": "sign", "type": "sign",
@ -246,7 +246,7 @@
"y": 17, "y": 17,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LittlerootTown_EventScript_1E815A" "script": "LittlerootTown_EventScript_BirchsLabSign"
}, },
{ {
"type": "sign", "type": "sign",
@ -254,7 +254,7 @@
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LittlerootTown_EventScript_1E8163" "script": "LittlerootTown_EventScript_BrendansHouseSign"
}, },
{ {
"type": "sign", "type": "sign",
@ -262,7 +262,7 @@
"y": 8, "y": 8,
"elevation": 3, "elevation": 3,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LittlerootTown_EventScript_1E818F" "script": "LittlerootTown_EventScript_MaysHouseSign"
} }
] ]
} }

576
data/maps/LittlerootTown/scripts.inc
View File

File diff suppressed because it is too large Load Diff

7
data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc
View File

@ -50,12 +50,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_MoveMomToDoor:: @ 81F77DE
return return
@ Many of the below scripts have no gender check because they assume youre in the correct house @ Many of the below scripts have no gender check because they assume youre in the correct house
@ The below SS Ticket script uses Mays house state by accident(?), but theyre both set identically after the intro
LittlerootTown_BrendansHouse_1F_OnFrame: @ 81F77EA LittlerootTown_BrendansHouse_1F_OnFrame: @ 81F77EA
map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_EnterHouseMovingIn map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_EnterHouseMovingIn
map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock
map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_PetalburgGymReport map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_PetalburgGymReport
map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor map_script_2 VAR_LITTLEROOT_HOUSES_STATE_MAY, 1, LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor
map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV map_script_2 VAR_LITTLEROOT_HOUSES_STATE_MAY, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV
.2byte 0 .2byte 0
LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F7814 LittlerootTown_BrendansHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F7814
@ -101,7 +102,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_YoureNewNeighbor:: @ 81F785E
special GetRivalSonDaughterString special GetRivalSonDaughterString
msgbox RivalsHouse_1F_Text_OhYoureTheNewNeighbor, MSGBOX_DEFAULT msgbox RivalsHouse_1F_Text_OhYoureTheNewNeighbor, MSGBOX_DEFAULT
setflag FLAG_MET_RIVAL_MOM setflag FLAG_MET_RIVAL_MOM
setvar VAR_LITTLEROOT_HOUSES_STATE, 2 setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 2
releaseall releaseall
end end

6
data/maps/LittlerootTown_MaysHouse_1F/scripts.inc
View File

@ -54,8 +54,8 @@ LittlerootTown_MaysHouse_1F_OnFrame: @ 81F893A
map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_EnterHouseMovingIn
map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock
map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_PetalburgGymReport
map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor map_script_2 VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 1, LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor
map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV map_script_2 VAR_LITTLEROOT_HOUSES_STATE_MAY, 3, PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV
.2byte 0 .2byte 0
LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F8964 LittlerootTown_MaysHouse_1F_EventScript_GoUpstairsToSetClock:: @ 81F8964
@ -101,7 +101,7 @@ LittlerootTown_MaysHouse_1F_EventScript_YoureNewNeighbor:: @ 81F89AE
special GetRivalSonDaughterString special GetRivalSonDaughterString
msgbox RivalsHouse_1F_Text_OhYoureTheNewNeighbor, MSGBOX_DEFAULT msgbox RivalsHouse_1F_Text_OhYoureTheNewNeighbor, MSGBOX_DEFAULT
setflag FLAG_MET_RIVAL_MOM setflag FLAG_MET_RIVAL_MOM
setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2 setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 2
releaseall releaseall
end end

42
data/maps/LittlerootTown_ProfessorBirchsLab/map.json
View File

@ -24,7 +24,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Aide",
"flag": "0" "flag": "0"
}, },
{ {
@ -37,7 +37,7 @@
"movement_range_y": 0, "movement_range_y": 0,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Birch",
"flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH" "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_BIRCH"
}, },
{ {
@ -50,7 +50,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3EC", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Rival",
"flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL" "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL"
}, },
{ {
@ -63,7 +63,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FBB", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Cyndaquil",
"flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL" "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CYNDAQUIL"
}, },
{ {
@ -76,7 +76,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1F9FEF", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Totodile",
"flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE" "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_TOTODILE"
}, },
{ {
@ -89,7 +89,7 @@
"movement_range_y": 1, "movement_range_y": 1,
"trainer_type": "0", "trainer_type": "0",
"trainer_sight_or_berry_tree_id": "0", "trainer_sight_or_berry_tree_id": "0",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA023", "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Chikorita",
"flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA" "flag": "FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_POKEBALL_CHIKORITA"
} }
], ],
@ -117,7 +117,7 @@
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3" "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Machine"
}, },
{ {
"type": "sign", "type": "sign",
@ -125,7 +125,7 @@
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH", "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA3E3" "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Machine"
}, },
{ {
"type": "sign", "type": "sign",
@ -133,7 +133,7 @@
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD" "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Book"
}, },
{ {
"type": "sign", "type": "sign",
@ -141,7 +141,7 @@
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4CD" "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Book"
}, },
{ {
"type": "sign", "type": "sign",
@ -149,7 +149,7 @@
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf"
}, },
{ {
"type": "sign", "type": "sign",
@ -157,7 +157,7 @@
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf"
}, },
{ {
"type": "sign", "type": "sign",
@ -165,7 +165,7 @@
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf"
}, },
{ {
"type": "sign", "type": "sign",
@ -173,7 +173,7 @@
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf"
}, },
{ {
"type": "sign", "type": "sign",
@ -181,7 +181,7 @@
"y": 7, "y": 7,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4C4" "script": "LittlerootTown_ProfessorBirchsLab_EventScript_Bookshelf"
}, },
{ {
"type": "sign", "type": "sign",
@ -189,7 +189,7 @@
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC"
}, },
{ {
"type": "sign", "type": "sign",
@ -197,7 +197,7 @@
"y": 1, "y": 1,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC"
}, },
{ {
"type": "sign", "type": "sign",
@ -205,7 +205,7 @@
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC"
}, },
{ {
"type": "sign", "type": "sign",
@ -213,7 +213,7 @@
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC"
}, },
{ {
"type": "sign", "type": "sign",
@ -221,7 +221,7 @@
"y": 10, "y": 10,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC"
}, },
{ {
"type": "sign", "type": "sign",
@ -229,7 +229,7 @@
"y": 9, "y": 9,
"elevation": 0, "elevation": 0,
"player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY", "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
"script": "LittlerootTown_ProfessorBirchsLab_EventScript_1FA4BB" "script": "LittlerootTown_ProfessorBirchsLab_EventScript_PC"
} }
] ]
} }

574
data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc
View File

File diff suppressed because it is too large Load Diff

8
data/scripts/players_house.inc
View File

@ -305,9 +305,9 @@ PlayersHouse_1F_Movement_MomReturnToSeatFemale: @ 82929C1
PlayersHouse_1F_EventScript_Mom:: @ 82929C5 PlayersHouse_1F_EventScript_Mom:: @ 82929C5
lock lock
faceplayer faceplayer
compare VAR_LITTLEROOT_HOUSES_STATE, 4 compare VAR_LITTLEROOT_HOUSES_STATE_MAY, 4
goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard
compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 compare VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4
goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard
goto_if_set FLAG_HAS_MATCH_CALL, PlayersHouse_1F_EventScript_TryRegisterMom goto_if_set FLAG_HAS_MATCH_CALL, PlayersHouse_1F_EventScript_TryRegisterMom
goto_if_set FLAG_RESCUED_BIRCH, PlayersHouse_1F_EventScript_MomHealsParty goto_if_set FLAG_RESCUED_BIRCH, PlayersHouse_1F_EventScript_MomHealsParty
@ -502,8 +502,8 @@ PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 8292AF2
copyvar VAR_ROAMER_POKEMON, VAR_RESULT copyvar VAR_ROAMER_POKEMON, VAR_RESULT
msgbox PlayersHouse_1F_Text_StillUnknownPokemon, MSGBOX_DEFAULT msgbox PlayersHouse_1F_Text_StillUnknownPokemon, MSGBOX_DEFAULT
closemessage closemessage
setvar VAR_LITTLEROOT_HOUSES_STATE, 4 setvar VAR_LITTLEROOT_HOUSES_STATE_MAY, 4
setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4 setvar VAR_LITTLEROOT_HOUSES_STATE_BRENDAN, 4
releaseall releaseall
end end

5
data/text/match_call.inc
View File

@ -2831,7 +2831,7 @@ gText_Steven_Pokenav_2B5ED9:: @ 82B5ED9
.string "I hope we can meet again\n" .string "I hope we can meet again\n"
.string "somewhere!$" .string "somewhere!$"
Route101_Text_2B5F52: @ 82B5F52 MatchCall_Text_BirchRegisterCall: @ 82B5F52
.string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n" .string "PROF. BIRCH: Oh, {PLAYER}{KUN}!\n"
.string "I've already heard about you!\p" .string "I've already heard about you!\p"
.string "It seems your POKéNAV's been\n" .string "It seems your POKéNAV's been\n"
@ -2842,10 +2842,11 @@ Route101_Text_2B5F52: @ 82B5F52
.string "out in the field.\p" .string "out in the field.\p"
.string "… … … … … …$" .string "… … … … … …$"
Route101_Text_2B603A: @ 82B603A MatchCall_Text_RegisteredBirch: @ 82B603A
.string "Registered PROF. BIRCH\n" .string "Registered PROF. BIRCH\n"
.string "in the POKéNAV.$" .string "in the POKéNAV.$"
MatchCall_Text_UnusedProfBirch:
.string "PROF. BIRCH: When one has both\n" .string "PROF. BIRCH: When one has both\n"
.string "the POKéDEX and POKéNAV, studying\l" .string "the POKéDEX and POKéNAV, studying\l"
.string "POKéMON becomes more fun, eh?$" .string "POKéMON becomes more fun, eh?$"

4
include/constants/vars.h
View File

@ -144,7 +144,7 @@
#define VAR_ROUTE132_STATE 0x407F // Unused Var #define VAR_ROUTE132_STATE 0x407F // Unused Var
#define VAR_ROUTE133_STATE 0x4080 // Unused Var #define VAR_ROUTE133_STATE 0x4080 // Unused Var
#define VAR_ROUTE134_STATE 0x4081 // Unused Var #define VAR_ROUTE134_STATE 0x4081 // Unused Var
#define VAR_LITTLEROOT_HOUSES_STATE 0x4082 #define VAR_LITTLEROOT_HOUSES_STATE_MAY 0x4082
#define VAR_UNUSED_0x4083 0x4083 // Unused Var #define VAR_UNUSED_0x4083 0x4083 // Unused Var
#define VAR_BIRCH_LAB_STATE 0x4084 #define VAR_BIRCH_LAB_STATE 0x4084
#define VAR_PETALBURG_GYM_STATE 0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman #define VAR_PETALBURG_GYM_STATE 0x4085 // 0-1: Wally tutorial, 2-6: 0-4 badges, 7: Defeated Norman, 8: Rematch Norman
@ -154,7 +154,7 @@
#define VAR_SECRET_BASE_INITIALIZED 0x4089 #define VAR_SECRET_BASE_INITIALIZED 0x4089
#define VAR_CONTEST_PRIZE_PICKUP 0x408A #define VAR_CONTEST_PRIZE_PICKUP 0x408A
#define VAR_UNUSED_0x408B 0x408B // Unused Var #define VAR_UNUSED_0x408B 0x408B // Unused Var
#define VAR_LITTLEROOT_HOUSES_STATE_2 0x408C #define VAR_LITTLEROOT_HOUSES_STATE_BRENDAN 0x408C
#define VAR_LITTLEROOT_RIVAL_STATE 0x408D #define VAR_LITTLEROOT_RIVAL_STATE 0x408D
#define VAR_BOARD_BRINEY_BOAT_STATE 0x408E #define VAR_BOARD_BRINEY_BOAT_STATE 0x408E
#define VAR_DEVON_CORP_3F_STATE 0x408F #define VAR_DEVON_CORP_3F_STATE 0x408F

2
include/event_scripts.h
View File

@ -554,7 +554,7 @@ extern const u8 UnusualWeather_EventScript_EndEventAndCleanup_1[];
extern const u8 IslandCave_EventScript_OpenRegiEntrance[]; extern const u8 IslandCave_EventScript_OpenRegiEntrance[];
extern const u8 MauvilleCity_EventScript_1DF7BA[]; extern const u8 MauvilleCity_EventScript_1DF7BA[];
extern const u8 Route119_EventScript_1F49EC[]; extern const u8 Route119_EventScript_1F49EC[];
extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6[]; extern const u8 LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall[];
extern const u8 RustboroCity_Gym_EventScript_RegisterRoxanne[]; extern const u8 RustboroCity_Gym_EventScript_RegisterRoxanne[];
extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall[]; extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall[];
extern const u8 SSTidalCorridor_EventScript_23C050[]; extern const u8 SSTidalCorridor_EventScript_23C050[];

2
src/field_control_avatar.c
View File

@ -578,7 +578,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior)
} }
if (ShouldDoScottCall() == TRUE) if (ShouldDoScottCall() == TRUE)
{ {
ScriptContext1_SetupScript(LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6); ScriptContext1_SetupScript(LittlerootTown_ProfessorBirchsLab_EventScript_ScottAboardSSTidalCall);
return TRUE; return TRUE;
} }
if (ShouldDoRoxanneCall() == TRUE) if (ShouldDoRoxanneCall() == TRUE)

2
src/save_location.c
View File

@ -118,6 +118,8 @@ void TrySetMapSaveWarpStatus(void)
sub_81AFD5C(); sub_81AFD5C();
} }
// Called when receiving the Pokedex
// Only place field_A8 is written (aside from clearing on new game), never read
void sub_81AFDA0(void) void sub_81AFDA0(void)
{ {
gSaveBlock2Ptr->field_A8 |= 0x8000; gSaveBlock2Ptr->field_A8 |= 0x8000;