diff options
| author | YamaArashi <shadow962@live.com> | 2016-07-04 15:31:50 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-07-04 15:31:50 -0700 |
| commit | c2d5178fb85ff0f7fc97d42e534c5cf39de15e1c (patch) | |
| tree | af6a93270d4f955bc1f15ef64c3a201befd42566 /data/scripts/maps/RustboroCity_Mart.s | |
| parent | 4623aa30a961ce55ba7dd61bdae70d38d9451afb (diff) | |
some script incbins
Diffstat (limited to 'data/scripts/maps/RustboroCity_Mart.s')
| -rw-r--r-- | data/scripts/maps/RustboroCity_Mart.s | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/data/scripts/maps/RustboroCity_Mart.s b/data/scripts/maps/RustboroCity_Mart.s index 245d02056..39b4de4e8 100644 --- a/data/scripts/maps/RustboroCity_Mart.s +++ b/data/scripts/maps/RustboroCity_Mart.s @@ -13,14 +13,13 @@ RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4 end RustboroCity_Mart_EventScript_157BEF:: @ 8157BEF - pokemart RustboroCity_Mart_Pokemart_157C00 + pokemart RustboroCity_Mart_Items1 msgbox RustboroCity_Mart_Text_1A0C02, 4 release end - .incbin "baserom.gba", 0x157bfe, 0x2 - -RustboroCity_Mart_Pokemart_157C00:: @ 8157C00 + .align 2 +RustboroCity_Mart_Items1:: @ 8157C00 .2byte ITEM_POKE_BALL .2byte ITEM_POTION .2byte ITEM_SUPER_POTION @@ -36,14 +35,13 @@ RustboroCity_Mart_Pokemart_157C00:: @ 8157C00 end RustboroCity_Mart_EventScript_157C18:: @ 8157C18 - pokemart RustboroCity_Mart_Pokemart_157C28 + pokemart RustboroCity_Mart_Items2 msgbox RustboroCity_Mart_Text_1A0C02, 4 release end - .incbin "baserom.gba", 0x157c27, 0x1 - -RustboroCity_Mart_Pokemart_157C28:: @ 8157C28 + .align 2 +RustboroCity_Mart_Items2:: @ 8157C28 .2byte ITEM_POKE_BALL .2byte ITEM_TIMER_BALL .2byte ITEM_REPEAT_BALL |