diff options
Diffstat (limited to 'maps/GoldenrodDeptStoreRoof.asm')
| -rw-r--r-- | maps/GoldenrodDeptStoreRoof.asm | 66 |
1 files changed, 31 insertions, 35 deletions
diff --git a/maps/GoldenrodDeptStoreRoof.asm b/maps/GoldenrodDeptStoreRoof.asm index d3cb7af76..f60970e64 100644 --- a/maps/GoldenrodDeptStoreRoof.asm +++ b/maps/GoldenrodDeptStoreRoof.asm @@ -9,16 +9,12 @@ const_value set 2 const GOLDENRODDEPTSTOREROOF_BUG_CATCHER GoldenrodDeptStoreRoof_MapScriptHeader: -.MapTriggers: +.SceneScripts: db 0 .MapCallbacks: db 2 - - ; callbacks - dbw MAPCALLBACK_TILES, .CheckSaleChangeBlock - dbw MAPCALLBACK_OBJECTS, .CheckSaleChangeClerk .CheckSaleChangeBlock: @@ -49,8 +45,8 @@ ClerkScript_0x5673f: closetext end -PokefanFScript_0x56746: - jumptextfaceplayer UnknownText_0x5677f +GoldenrodDeptStoreRoofPokefanFScript: + jumptextfaceplayer GoldenrodDeptStoreRoofPokefanFText FisherScript_0x56749: faceplayer @@ -61,8 +57,8 @@ FisherScript_0x56749: spriteface GOLDENRODDEPTSTOREROOF_FISHER, UP end -TwinScript_0x56754: - jumptextfaceplayer UnknownText_0x56839 +GoldenrodDeptStoreRoofTwinScript: + jumptextfaceplayer GoldenrodDeptStoreRoofTwinText SuperNerdScript_0x56757: opentext @@ -77,14 +73,14 @@ SuperNerdScript_0x56757: spriteface GOLDENRODDEPTSTOREROOF_SUPER_NERD, RIGHT end -PokefanMScript_0x5676a: - jumptextfaceplayer UnknownText_0x5688e +GoldenrodDeptStoreRoofPokefanMScript: + jumptextfaceplayer GoldenrodDeptStoreRoofPokefanMText -TeacherScript_0x5676d: - jumptextfaceplayer UnknownText_0x56901 +GoldenrodDeptStoreRoofTeacherScript: + jumptextfaceplayer GoldenrodDeptStoreRoofTeacherText -BugCatcherScript_0x56770: - jumptextfaceplayer UnknownText_0x56942 +GoldenrodDeptStoreRoofBugCatcherScript: + jumptextfaceplayer GoldenrodDeptStoreRoofBugCatcherText Binoculars1: jumptext Binoculars1Text @@ -98,7 +94,7 @@ Binoculars3: PokeDollVendingMachine: jumptext PokeDollVendingMachineText -UnknownText_0x5677f: +GoldenrodDeptStoreRoofPokefanFText: text "Whew, I'm tired." para "I sometimes come" @@ -120,7 +116,7 @@ UnknownText_0x567d2: line "dolls!" done -UnknownText_0x56839: +GoldenrodDeptStoreRoofTwinText: text "They have bargain" line "sales here every" cont "so often." @@ -135,7 +131,7 @@ UnknownText_0x56871: line "bothering me?" done -UnknownText_0x5688e: +GoldenrodDeptStoreRoofPokefanMText: text "There's something" line "I really want, but" @@ -147,7 +143,7 @@ UnknownText_0x5688e: cont "I've collected…" done -UnknownText_0x56901: +GoldenrodDeptStoreRoofTeacherText: text "Oh, everything is" line "so cheap!" @@ -155,7 +151,7 @@ UnknownText_0x56901: line "my PACK's crammed!" done -UnknownText_0x56942: +GoldenrodDeptStoreRoofBugCatcherText: text "My #MON always" line "get paralyzed or" @@ -223,23 +219,23 @@ GoldenrodDeptStoreRoof_MapEventHeader: db 1 warp_def $1, $d, 3, GOLDENROD_DEPT_STORE_6F -.XYTriggers: +.CoordEvents: db 0 -.Signposts: +.BGEvents: db 4 - signpost 3, 15, SIGNPOST_RIGHT, Binoculars1 - signpost 5, 15, SIGNPOST_RIGHT, Binoculars2 - signpost 6, 15, SIGNPOST_RIGHT, Binoculars3 - signpost 0, 3, SIGNPOST_UP, PokeDollVendingMachine + bg_event 3, 15, BGEVENT_RIGHT, Binoculars1 + bg_event 5, 15, BGEVENT_RIGHT, Binoculars2 + bg_event 6, 15, BGEVENT_RIGHT, Binoculars3 + bg_event 0, 3, BGEVENT_UP, PokeDollVendingMachine -.PersonEvents: +.ObjectEvents: db 8 - person_event SPRITE_CLERK, 4, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, PERSONTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF - person_event SPRITE_POKEFAN_F, 3, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, PokefanFScript_0x56746, -1 - person_event SPRITE_FISHER, 1, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_BLUE, PERSONTYPE_SCRIPT, 0, FisherScript_0x56749, -1 - person_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TwinScript_0x56754, EVENT_GOLDENROD_SALE_ON - person_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON - person_event SPRITE_POKEFAN_M, 0, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, PERSONTYPE_SCRIPT, 0, PokefanMScript_0x5676a, EVENT_GOLDENROD_SALE_OFF - person_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, (1 << 3) | PAL_OW_GREEN, PERSONTYPE_SCRIPT, 0, TeacherScript_0x5676d, EVENT_GOLDENROD_SALE_OFF - person_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, (1 << 3) | PAL_OW_RED, PERSONTYPE_SCRIPT, 0, BugCatcherScript_0x56770, EVENT_GOLDENROD_SALE_OFF + object_event SPRITE_CLERK, 4, 1, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ClerkScript_0x5673f, EVENT_GOLDENROD_SALE_OFF + object_event SPRITE_POKEFAN_F, 3, 10, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanFScript, -1 + object_event SPRITE_FISHER, 1, 2, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FisherScript_0x56749, -1 + object_event SPRITE_TWIN, 4, 3, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTwinScript, EVENT_GOLDENROD_SALE_ON + object_event SPRITE_SUPER_NERD, 6, 14, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, SuperNerdScript_0x56757, EVENT_GOLDENROD_SALE_ON + object_event SPRITE_POKEFAN_M, 0, 7, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofPokefanMScript, EVENT_GOLDENROD_SALE_OFF + object_event SPRITE_TEACHER, 3, 5, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofTeacherScript, EVENT_GOLDENROD_SALE_OFF + object_event SPRITE_BUG_CATCHER, 6, 1, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodDeptStoreRoofBugCatcherScript, EVENT_GOLDENROD_SALE_OFF |