diff options
Diffstat (limited to 'maps/MountMortar1FInside.asm')
| -rw-r--r-- | maps/MountMortar1FInside.asm | 133 |
1 files changed, 40 insertions, 93 deletions
diff --git a/maps/MountMortar1FInside.asm b/maps/MountMortar1FInside.asm index df9888595..2f8def0ae 100644 --- a/maps/MountMortar1FInside.asm +++ b/maps/MountMortar1FInside.asm @@ -1,119 +1,71 @@ -MountMortar1FInside_MapScriptHeader: ; 0x7de4f - ; trigger count +MountMortar1FInside_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 -; 0x7de51 -TrainerPokemaniacMiller: ; 0x7de51 - ; bit/flag number - dw $5c4 +TrainerPokemaniacMiller: + trainer EVENT_BEAT_POKEMANIAC_MILLER, POKEMANIAC, MILLER, PokemaniacMillerSeenText, PokemaniacMillerBeatenText, $0000, PokemaniacMillerScript - ; trainer group && trainer id - db POKEMANIAC, MILLER - - ; text when seen - dw PokemaniacMillerSeenText - - ; text when trainer beaten - dw PokemaniacMillerBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw PokemaniacMillerScript -; 0x7de5d - -PokemaniacMillerScript: ; 0x7de5d +PokemaniacMillerScript: talkaftercancel loadfont writetext UnknownText_0x7debd closetext loadmovesprites end -; 0x7de65 - -TrainerSupernerdMarkus: ; 0x7de65 - ; bit/flag number - dw $5c6 - - ; trainer group && trainer id - db SUPER_NERD, MARKUS - - ; text when seen - dw SupernerdMarkusSeenText - - ; text when trainer beaten - dw SupernerdMarkusBeatenText - - ; script when lost - dw $0000 - ; script when talk again - dw SupernerdMarkusScript -; 0x7de71 +TrainerSupernerdMarkus: + trainer EVENT_BEAT_SUPER_NERD_MARKUS, SUPER_NERD, MARKUS, SupernerdMarkusSeenText, SupernerdMarkusBeatenText, $0000, SupernerdMarkusScript -SupernerdMarkusScript: ; 0x7de71 +SupernerdMarkusScript: talkaftercancel loadfont writetext UnknownText_0x7df97 closetext loadmovesprites end -; 0x7de79 MountMortar1FBoulder: jumpstd strengthboulder -ItemFragment_0x7de7c: ; 0x7de7c +ItemFragment_0x7de7c: db ESCAPE_ROPE, 1 -; 0x7de7e -ItemFragment_0x7de7e: ; 0x7de7e +ItemFragment_0x7de7e: db MAX_REVIVE, 1 -; 0x7de80 -ItemFragment_0x7de80: ; 0x7de80 +ItemFragment_0x7de80: db HYPER_POTION, 1 -; 0x7de82 -ItemFragment_0x7de82: ; 0x7de82 +ItemFragment_0x7de82: db MAX_POTION, 1 -; 0x7de84 -ItemFragment_0x7de84: ; 0x7de84 +ItemFragment_0x7de84: db NUGGET, 1 -; 0x7de86 -ItemFragment_0x7de86: ; 0x7de86 +ItemFragment_0x7de86: db IRON, 1 -; 0x7de88 -ItemFragment_0x7de88: ; 0x7de88 +ItemFragment_0x7de88: db ULTRA_BALL, 1 -; 0x7de8a -MapMountMortar1FInsideSignpostItem0: ; 0x7de8a - dw $0091 - db MAX_REPEL +MapMountMortar1FInsideSignpostItem0: + dwb EVENT_MOUNT_MORTAR_1F_INSIDE_HIDDEN_MAX_REPEL, MAX_REPEL -; 0x7de8d -PokemaniacMillerSeenText: ; 0x7de8d +PokemaniacMillerSeenText: text "I'm not losing" line "this time!" done -; 0x7dea7 -PokemaniacMillerBeatenText: ; 0x7dea7 +PokemaniacMillerBeatenText: text "I lost to some" line "kid…?" done -; 0x7debd -UnknownText_0x7debd: ; 0x7debd +UnknownText_0x7debd: text "A while back, this" line "karate dude wanted" @@ -129,20 +81,17 @@ UnknownText_0x7debd: ; 0x7debd para "his training. I" line "wonder how he is?" done -; 0x7df6a -SupernerdMarkusSeenText: ; 0x7df6a +SupernerdMarkusSeenText: text "Hey! HUGH!" done -; 0x7df76 -SupernerdMarkusBeatenText: ; 0x7df76 +SupernerdMarkusBeatenText: text "I mistook you for" line "someone else…" done -; 0x7df97 -UnknownText_0x7df97: ; 0x7df97 +UnknownText_0x7df97: text "I came to explore" line "MT.MORTAR, but I" @@ -155,13 +104,12 @@ UnknownText_0x7df97: ; 0x7df97 para "SEADRA that knows" line "WATERFALL?" done -; 0x7e01d -MountMortar1FInside_MapEventHeader: ; 0x7e01d +MountMortar1FInside_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 6 warp_def $2f, $b, 5, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE warp_def $2f, $1d, 6, GROUP_MOUNT_MORTAR_1F_OUTSIDE, MAP_MOUNT_MORTAR_1F_OUTSIDE @@ -170,23 +118,22 @@ MountMortar1FInside_MapEventHeader: ; 0x7e01d warp_def $13, $3, 1, GROUP_MOUNT_MORTAR_B1F, MAP_MOUNT_MORTAR_B1F warp_def $9, $9, 2, GROUP_MOUNT_MORTAR_2F_INSIDE, MAP_MOUNT_MORTAR_2F_INSIDE - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 11, 30, $7, MapMountMortar1FInsideSignpostItem0 + signpost 11, 30, SIGNPOST_ITEM, MapMountMortar1FInsideSignpostItem0 - ; people-events +.PersonEvents: db 10 - person_event SPRITE_BOULDER, 47, 25, $19, $0, 255, 255, $0, 0, MountMortar1FBoulder, $ffff - person_event SPRITE_POKE_BALL, 42, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7c, $067d - person_event SPRITE_POKE_BALL, 14, 20, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de7e, $067e - person_event SPRITE_POKE_BALL, 31, 14, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de80, $067f - person_event SPRITE_POKE_BALL, 24, 26, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de82, $07a6 - person_event SPRITE_POKE_BALL, 23, 39, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de84, $07a7 - person_event SPRITE_SUPER_NERD, 47, 37, $8, $0, 255, 255, $92, 3, TrainerPokemaniacMiller, $ffff - person_event SPRITE_SUPER_NERD, 32, 28, $a, $0, 255, 255, $b2, 3, TrainerSupernerdMarkus, $ffff - person_event SPRITE_POKE_BALL, 20, 12, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de86, $07c8 - person_event SPRITE_POKE_BALL, 21, 21, $1, $0, 255, 255, $1, 0, ItemFragment_0x7de88, $07c9 -; 0x7e0c8 + person_event SPRITE_BOULDER, 47, 25, OW_LEFT | $11, $0, -1, -1, $0, 0, MountMortar1FBoulder, -1 + person_event SPRITE_POKE_BALL, 42, 39, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de7c, EVENT_MOUNT_MORTAR_1F_INSIDE_ESCAPE_ROPE + person_event SPRITE_POKE_BALL, 14, 20, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de7e, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_REVIVE + person_event SPRITE_POKE_BALL, 31, 14, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de80, EVENT_MOUNT_MORTAR_1F_INSIDE_HYPER_POTION + person_event SPRITE_POKE_BALL, 24, 26, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de82, EVENT_MOUNT_MORTAR_1F_INSIDE_MAX_POTION + person_event SPRITE_POKE_BALL, 23, 39, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de84, EVENT_MOUNT_MORTAR_1F_INSIDE_NUGGET + person_event SPRITE_SUPER_NERD, 47, 37, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BLUE << 4) | $82, 3, TrainerPokemaniacMiller, -1 + person_event SPRITE_SUPER_NERD, 32, 28, OW_LEFT | $2, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerSupernerdMarkus, -1 + person_event SPRITE_POKE_BALL, 20, 12, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de86, EVENT_MOUNT_MORTAR_1F_INSIDE_IRON + person_event SPRITE_POKE_BALL, 21, 21, OW_DOWN | $1, $0, -1, -1, $1, 0, ItemFragment_0x7de88, EVENT_MOUNT_MORTAR_1F_INSIDE_ULTRA_BALL |