diff options
Diffstat (limited to 'maps/MahoganyMart1F.asm')
| -rw-r--r-- | maps/MahoganyMart1F.asm | 105 |
1 files changed, 39 insertions, 66 deletions
diff --git a/maps/MahoganyMart1F.asm b/maps/MahoganyMart1F.asm index 2dc7e3356..9a725f422 100644 --- a/maps/MahoganyMart1F.asm +++ b/maps/MahoganyMart1F.asm @@ -1,40 +1,35 @@ -MahoganyMart1F_MapScriptHeader: ; 0x6c349 - ; trigger count +MahoganyMart1F_MapScriptHeader: +.MapTriggers: db 2 ; triggers dw UnknownScript_0x6c356, $0000 dw UnknownScript_0x6c357, $0000 - ; callback count +.MapCallbacks: db 1 ; callbacks dbw 1, UnknownScript_0x6c35b -; 0x6c356 -UnknownScript_0x6c356: ; 0x6c356 +UnknownScript_0x6c356: end -; 0x6c357 -UnknownScript_0x6c357: ; 0x6c357 +UnknownScript_0x6c357: priorityjump UnknownScript_0x6c38f end -; 0x6c35b -UnknownScript_0x6c35b: ; 0x6c35b +UnknownScript_0x6c35b: checkevent EVENT_UNCOVERED_STAIRCASE_IN_MAHOGANY_MART iftrue UnknownScript_0x6c362 return -; 0x6c362 -UnknownScript_0x6c362: ; 0x6c362 +UnknownScript_0x6c362: changeblock $6, $2, $1e return -; 0x6c367 -PharmacistScript_0x6c367: ; 0x6c367 +PharmacistScript_0x6c367: faceplayer loadfont checkevent EVENT_DECIDED_TO_HELP_LANCE @@ -42,16 +37,14 @@ PharmacistScript_0x6c367: ; 0x6c367 pokemart $0, $000f loadmovesprites end -; 0x6c375 -UnknownScript_0x6c375: ; 0x6c375 +UnknownScript_0x6c375: writetext UnknownText_0x6c46b closetext loadmovesprites end -; 0x6c37b -BlackBeltScript_0x6c37b: ; 0x6c37b +BlackBeltScript_0x6c37b: faceplayer loadfont checkevent EVENT_DECIDED_TO_HELP_LANCE @@ -60,16 +53,14 @@ BlackBeltScript_0x6c37b: ; 0x6c37b closetext loadmovesprites end -; 0x6c389 -UnknownScript_0x6c389: ; 0x6c389 +UnknownScript_0x6c389: writetext UnknownText_0x6c501 closetext loadmovesprites end -; 0x6c38f -UnknownScript_0x6c38f: ; 0x6c38f +UnknownScript_0x6c38f: pause 15 loadfont writetext UnknownText_0x6c52a @@ -94,7 +85,7 @@ UnknownScript_0x6c38f: ; 0x6c38f loadfont writetext UnknownText_0x6c59e closetext - showemote $0, $2, 10 + showemote EMOTE_SHOCK, $2, 10 playsound SFX_UNKNOWN_2A changeblock $6, $2, $1e reloadmappart @@ -111,25 +102,22 @@ UnknownScript_0x6c38f: ; 0x6c38f dotrigger $0 waitbutton end -; 0x6c3ee -GrannyScript_0x6c3ee: ; 0x6c3ee +GrannyScript_0x6c3ee: faceplayer loadfont pokemart $0, $0010 loadmovesprites end -; 0x6c3f6 -MovementData_0x6c3f6: ; 0x6c3f6 +MovementData_0x6c3f6: fix_facing big_step_left big_step_right remove_fixed_facing step_end -; 0x6c3fb -MovementData_0x6c3fb: ; 0x6c3fb +MovementData_0x6c3fb: fix_facing big_step_left remove_fixed_facing @@ -138,41 +126,35 @@ MovementData_0x6c3fb: ; 0x6c3fb turn_head_up turn_head_right step_end -; 0x6c403 -MovementData_0x6c403: ; 0x6c403 +MovementData_0x6c403: fix_facing big_step_left remove_fixed_facing step_end -; 0x6c407 -MovementData_0x6c407: ; 0x6c407 +MovementData_0x6c407: slow_step_left turn_head_down step_end -; 0x6c40a -MovementData_0x6c40a: ; 0x6c40a +MovementData_0x6c40a: slow_step_right slow_step_up slow_step_up step_end -; 0x6c40e -MovementData_0x6c40e: ; 0x6c40e +MovementData_0x6c40e: slow_step_up slow_step_right slow_step_right step_end -; 0x6c412 -MovementData_0x6c412: ; 0x6c412 +MovementData_0x6c412: slow_step_right step_end -; 0x6c414 -UnknownText_0x6c414: ; 0x6c414 +UnknownText_0x6c414: text "Hello, kiddo!" para "How would you like" @@ -181,16 +163,14 @@ UnknownText_0x6c414: ; 0x6c414 para "It's the thing to" line "eat in MAHOGANY!" done -; 0x6c46b -UnknownText_0x6c46b: ; 0x6c46b +UnknownText_0x6c46b: text "Arrgh… You found" line "the secret stair-" cont "way…" done -; 0x6c494 -UnknownText_0x6c494: ; 0x6c494 +UnknownText_0x6c494: text "Heheh! The experi-" line "ment worked like a" cont "charm." @@ -201,23 +181,20 @@ UnknownText_0x6c494: ; 0x6c494 para "GYARADOS are big" line "moneymakers." done -; 0x6c501 -UnknownText_0x6c501: ; 0x6c501 +UnknownText_0x6c501: text "Urrgh…" para "That guy's dragon" line "#MON are tough…" done -; 0x6c52a -UnknownText_0x6c52a: ; 0x6c52a +UnknownText_0x6c52a: text "LANCE: DRAGONITE," line "HYPER BEAM." done -; 0x6c549 -UnknownText_0x6c549: ; 0x6c549 +UnknownText_0x6c549: text "What took you," line "<PLAY_G>?" @@ -227,44 +204,40 @@ UnknownText_0x6c549: ; 0x6c549 para "signal is coming" line "from here." done -; 0x6c59e -UnknownText_0x6c59e: ; 0x6c59e +UnknownText_0x6c59e: text "The stairs are" line "right here." done -; 0x6c5ba -UnknownText_0x6c5ba: ; 0x6c5ba +UnknownText_0x6c5ba: text "LANCE: <PLAY_G>, we" line "should split up to" para "check this place." line "I'll go first." done -; 0x6c5fb -MahoganyMart1F_MapEventHeader: ; 0x6c5fb +MahoganyMart1F_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 3 warp_def $7, $3, 1, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN warp_def $7, $4, 1, GROUP_MAHOGANY_TOWN, MAP_MAHOGANY_TOWN warp_def $3, $7, 1, GROUP_TEAM_ROCKET_BASE_B1F, MAP_TEAM_ROCKET_BASE_B1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 0 - ; people-events +.PersonEvents: db 5 - person_event SPRITE_PHARMACIST, 7, 8, $6, $0, 255, 255, $0, 0, PharmacistScript_0x6c367, $06da - person_event SPRITE_BLACK_BELT, 10, 5, $3, $0, 255, 255, $0, 0, BlackBeltScript_0x6c37b, $06da - person_event SPRITE_LANCE, 10, 8, $8, $0, 255, 255, $0, 0, ObjectEvent, $06d5 - person_event SPRITE_DRAGON, 10, 7, $8, $0, 255, 255, $0, 0, ObjectEvent, $06d5 - person_event SPRITE_GRANNY, 7, 5, $9, $0, 255, 255, $0, 0, GrannyScript_0x6c3ee, $0736 -; 0x6c651 + person_event SPRITE_PHARMACIST, 7, 8, OW_UP | $2, $0, -1, -1, $0, 0, PharmacistScript_0x6c367, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_BLACK_BELT, 10, 5, OW_DOWN | $3, $0, -1, -1, $0, 0, BlackBeltScript_0x6c37b, EVENT_TEAM_ROCKET_BASE_POPULATION + person_event SPRITE_LANCE, 10, 8, OW_LEFT | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + person_event SPRITE_DRAGON, 10, 7, OW_LEFT | $0, $0, -1, -1, $0, 0, ObjectEvent, EVENT_MAHOGANY_MART_LANCE_AND_DRAGONITE + person_event SPRITE_GRANNY, 7, 5, OW_LEFT | $1, $0, -1, -1, $0, 0, GrannyScript_0x6c3ee, EVENT_MAHOGANY_MART_OWNERS |