diff options
Diffstat (limited to 'maps/UndergroundWarehouse.asm')
| -rw-r--r-- | maps/UndergroundWarehouse.asm | 83 |
1 files changed, 29 insertions, 54 deletions
diff --git a/maps/UndergroundWarehouse.asm b/maps/UndergroundWarehouse.asm index faec5b41e..08b5a4214 100644 --- a/maps/UndergroundWarehouse.asm +++ b/maps/UndergroundWarehouse.asm @@ -1,4 +1,4 @@ -UndergroundWarehouse_MapScriptHeader: ; 0x7d94b +UndergroundWarehouse_MapScriptHeader: ; trigger count db 0 @@ -8,9 +8,8 @@ UndergroundWarehouse_MapScriptHeader: ; 0x7d94b ; callbacks dbw 5, UnknownScript_0x7d950 -; 0x7d950 -UnknownScript_0x7d950: ; 0x7d950 +UnknownScript_0x7d950: clearevent EVENT_SWITCH_1 clearevent EVENT_SWITCH_2 clearevent EVENT_SWITCH_3 @@ -29,11 +28,10 @@ UnknownScript_0x7d950: ; 0x7d950 writebyte $0 copyvartobyte UndergroundSwitchPositions return -; 0x7d983 -TrainerGruntM24: ; 0x7d983 +TrainerGruntM24: ; bit/flag number - dw $508 + dw EVENT_BEAT_ROCKET_GRUNTM_19 ; trainer group && trainer id db GRUNTM, 24 @@ -49,20 +47,18 @@ TrainerGruntM24: ; 0x7d983 ; script when talk again dw GruntM24Script -; 0x7d98f -GruntM24Script: ; 0x7d98f +GruntM24Script: talkaftercancel loadfont writetext UnknownText_0x7da48 closetext loadmovesprites end -; 0x7d997 -TrainerGruntM14: ; 0x7d997 +TrainerGruntM14: ; bit/flag number - dw $4fe + dw EVENT_BEAT_ROCKET_GRUNTM_13 ; trainer group && trainer id db GRUNTM, 14 @@ -78,20 +74,18 @@ TrainerGruntM14: ; 0x7d997 ; script when talk again dw GruntM14Script -; 0x7d9a3 -GruntM14Script: ; 0x7d9a3 +GruntM14Script: talkaftercancel loadfont writetext UnknownText_0x7db01 closetext loadmovesprites end -; 0x7d9ab -TrainerGruntM15: ; 0x7d9ab +TrainerGruntM15: ; bit/flag number - dw $4ff + dw EVENT_BEAT_ROCKET_GRUNTM_14 ; trainer group && trainer id db GRUNTM, 15 @@ -107,18 +101,16 @@ TrainerGruntM15: ; 0x7d9ab ; script when talk again dw GruntM15Script -; 0x7d9b7 -GruntM15Script: ; 0x7d9b7 +GruntM15Script: talkaftercancel loadfont writetext UnknownText_0x7db8e closetext loadmovesprites end -; 0x7d9bf -GentlemanScript_0x7d9bf: ; 0x7d9bf +GentlemanScript_0x7d9bf: faceplayer loadfont checkevent $004a @@ -132,26 +124,22 @@ GentlemanScript_0x7d9bf: ; 0x7d9bf clearevent $0306 writetext UnknownText_0x7dc5b keeptextopen -UnknownScript_0x7d9de: ; 0x7d9de +UnknownScript_0x7d9de: writetext UnknownText_0x7dc8d closetext loadmovesprites end -; 0x7d9e4 -ItemFragment_0x7d9e4: ; 0x7d9e4 +ItemFragment_0x7d9e4: db MAX_ETHER, 1 -; 0x7d9e6 -ItemFragment_0x7d9e6: ; 0x7d9e6 +ItemFragment_0x7d9e6: db TM_SLEEP_TALK, 1 -; 0x7d9e8 -ItemFragment_0x7d9e8: ; 0x7d9e8 +ItemFragment_0x7d9e8: db ULTRA_BALL, 1 -; 0x7d9ea -GruntM24SeenText: ; 0x7d9ea +GruntM24SeenText: text "How did you get" line "this far?" @@ -159,14 +147,12 @@ GruntM24SeenText: ; 0x7d9ea line "be helped. I'll" cont "dispose of you." done -; 0x7da34 -GruntM24BeatenText: ; 0x7da34 +GruntM24BeatenText: text "I got disposed of…" done -; 0x7da48 -UnknownText_0x7da48: ; 0x7da48 +UnknownText_0x7da48: text "TEAM ROCKET will" line "keep going, wait-" cont "ing for the return" @@ -175,9 +161,8 @@ UnknownText_0x7da48: ; 0x7da48 para "We'll do whatever" line "it takes." done -; 0x7daa7 -GruntM14SeenText: ; 0x7daa7 +GruntM14SeenText: text "You're not going" line "any farther!" @@ -185,44 +170,38 @@ GruntM14SeenText: ; 0x7daa7 line "to my enemies, not" cont "even brats!" done -; 0x7daf6 -GruntM14BeatenText: ; 0x7daf6 +GruntM14BeatenText: text "Blast it!" done -; 0x7db01 -UnknownText_0x7db01: ; 0x7db01 +UnknownText_0x7db01: text "I lost…" para "Please forgive me," line "GIOVANNI!" done -; 0x7db27 -GruntM15SeenText: ; 0x7db27 +GruntM15SeenText: text "Hyuck-hyuck-hyuck!" line "I remember you!" para "You got me good" line "at our hideout!" done -; 0x7db6b -GruntM15BeatenText: ; 0x7db6b +GruntM15BeatenText: text "Hyuck-hyuck-hyuck!" line "So, that's how?" done -; 0x7db8e -UnknownText_0x7db8e: ; 0x7db8e +UnknownText_0x7db8e: text "Hyuck-hyuck-hyuck!" line "That was a blast!" cont "I'll remember you!" done -; 0x7dbc6 -UnknownText_0x7dbc6: ; 0x7dbc6 +UnknownText_0x7dbc6: text "DIRECTOR: Who?" line "What? You came to" cont "rescue me?" @@ -240,16 +219,14 @@ UnknownText_0x7dbc6: ; 0x7dbc6 para "Here. Take this" line "CARD KEY." done -; 0x7dc5b -UnknownText_0x7dc5b: ; 0x7dc5b +UnknownText_0x7dc5b: text "DIRECTOR: Use that" line "to open the shut-" cont "ters on 3F." done -; 0x7dc8d -UnknownText_0x7dc8d: ; 0x7dc8d +UnknownText_0x7dc8d: text "I'm begging you to" line "help." @@ -274,9 +251,8 @@ UnknownText_0x7dc8d: ; 0x7dc8d para "And all the #-" line "MON nationwide!" done -; 0x7dd84 -UndergroundWarehouse_MapEventHeader: ; 0x7dd84 +UndergroundWarehouse_MapEventHeader: ; filler db 0, 0 @@ -301,4 +277,3 @@ UndergroundWarehouse_MapEventHeader: ; 0x7dd84 person_event SPRITE_POKE_BALL, 19, 22, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e4, $0679 person_event SPRITE_POKE_BALL, 13, 17, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e6, $067a person_event SPRITE_POKE_BALL, 5, 6, $1, $0, 255, 255, $1, 0, ItemFragment_0x7d9e8, $0655 -; 0x7ddf4 |