diff options
| -rw-r--r-- | maps/BlackthornGym2F.asm | 24 | ||||
| -rw-r--r-- | maps/IcePathB1F.asm | 2 | ||||
| -rw-r--r-- | maps/IcePathB2FMahoganySide.asm | 14 | ||||
| -rw-r--r-- | maps/TeamRocketBaseB2F.asm | 4 | ||||
| -rw-r--r-- | maps/TeamRocketBaseB3F.asm | 4 |
5 files changed, 24 insertions, 24 deletions
diff --git a/maps/BlackthornGym2F.asm b/maps/BlackthornGym2F.asm index 77f338e7b..2f23f7c9e 100644 --- a/maps/BlackthornGym2F.asm +++ b/maps/BlackthornGym2F.asm @@ -14,30 +14,30 @@ BlackthornGym2F_MapScriptHeader: .MapCallbacks: db 1 - callback MAPCALLBACK_CMDQUEUE, .Boulders + callback MAPCALLBACK_CMDQUEUE, .SetUpStoneTable -.Boulders: - writecmdqueue .BoulderCmdQueue +.SetUpStoneTable: + writecmdqueue .CommandQueue return -.BoulderCmdQueue: - cmdqueue CMDQUEUE_STONETABLE, .BoulderTable ; check if any stones are sitting on a warp +.CommandQueue: + cmdqueue CMDQUEUE_STONETABLE, .StoneTable ; check if any stones are sitting on a warp -.BoulderTable: - stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Disappear4 - stonetable 3, BLACKTHORNGYM2F_BOULDER2, .Disappear5 - stonetable 4, BLACKTHORNGYM2F_BOULDER3, .Disappear6 +.StoneTable: + stonetable 5, BLACKTHORNGYM2F_BOULDER1, .Boulder1 + stonetable 3, BLACKTHORNGYM2F_BOULDER2, .Boulder2 + stonetable 4, BLACKTHORNGYM2F_BOULDER3, .Boulder3 db -1 ; end -.Disappear4: +.Boulder1: disappear BLACKTHORNGYM2F_BOULDER1 jump .Fall -.Disappear5: +.Boulder2: disappear BLACKTHORNGYM2F_BOULDER2 jump .Fall -.Disappear6: +.Boulder3: disappear BLACKTHORNGYM2F_BOULDER3 jump .Fall diff --git a/maps/IcePathB1F.asm b/maps/IcePathB1F.asm index 7bb6d0406..2d1bd1aad 100644 --- a/maps/IcePathB1F.asm +++ b/maps/IcePathB1F.asm @@ -25,7 +25,7 @@ IcePathB1F_MapScriptHeader: stonetable 4, ICEPATHB1F_BOULDER2, .Boulder2 stonetable 5, ICEPATHB1F_BOULDER3, .Boulder3 stonetable 6, ICEPATHB1F_BOULDER4, .Boulder4 - db -1 + db -1 ; end .Boulder1: disappear ICEPATHB1F_BOULDER1 diff --git a/maps/IcePathB2FMahoganySide.asm b/maps/IcePathB2FMahoganySide.asm index c01252f98..915794dec 100644 --- a/maps/IcePathB2FMahoganySide.asm +++ b/maps/IcePathB2FMahoganySide.asm @@ -13,8 +13,8 @@ IcePathB2FMahoganySide_MapScriptHeader: .MapCallbacks: db 0 -BoulderScript_0x7e5a3: - jumptext UnknownText_0x7e5ad +IcePathB2FMahoganySideBoulder: + jumptext IcePathB2FMahoganySideBoulderText IcePathB2FMahoganySideFullHeal: itemball FULL_HEAL @@ -25,7 +25,7 @@ IcePathB2FMahoganySideMaxPotion: IcePathB2FMahoganySideHiddenCarbos: hiddenitem EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_HIDDEN_CARBOS, CARBOS -UnknownText_0x7e5ad: +IcePathB2FMahoganySideBoulderText: text "It's immovably" line "imbedded in ice." done @@ -52,9 +52,9 @@ IcePathB2FMahoganySide_MapEventHeader: .ObjectEvents: db 6 - object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_1A - object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_2A - object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_3A - object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BoulderScript_0x7e5a3, EVENT_BOULDER_IN_ICE_PATH_4A + object_event 11, 3, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_1A + object_event 4, 7, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_2A + object_event 3, 12, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_3A + object_event 12, 13, SPRITE_BOULDER, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IcePathB2FMahoganySideBoulder, EVENT_BOULDER_IN_ICE_PATH_4A object_event 8, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideFullHeal, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_FULL_HEAL object_event 0, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_ITEM_TREE, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, IcePathB2FMahoganySideMaxPotion, EVENT_ICE_PATH_B2F_MAHOGANY_SIDE_MAX_POTION diff --git a/maps/TeamRocketBaseB2F.asm b/maps/TeamRocketBaseB2F.asm index 0225d1e4d..555b7ef1b 100644 --- a/maps/TeamRocketBaseB2F.asm +++ b/maps/TeamRocketBaseB2F.asm @@ -44,7 +44,7 @@ TeamRocketBaseB2F_MapScriptHeader: return .Change: - changeblock 14, 12, $7 + changeblock 14, 12, $07 return UnknownScript_0x6cf95: @@ -330,7 +330,7 @@ UnknownScript_0x6d1e8: writetext UnknownText_0x6dd6b waitbutton playsound SFX_ENTER_DOOR - changeblock 14, 12, $7 + changeblock 14, 12, $07 reloadmappart closetext setevent EVENT_OPENED_DOOR_TO_ROCKET_HIDEOUT_TRANSMITTER diff --git a/maps/TeamRocketBaseB3F.asm b/maps/TeamRocketBaseB3F.asm index 4a110c4e3..38734063a 100644 --- a/maps/TeamRocketBaseB3F.asm +++ b/maps/TeamRocketBaseB3F.asm @@ -45,7 +45,7 @@ TeamRocketBaseB3F_MapScriptHeader: return .OpenSesame: - changeblock 10, 8, $7 + changeblock 10, 8, $07 return LanceGetPasswordScript: @@ -194,7 +194,7 @@ TeamRocketBaseB3FLockedDoor: writetext UnknownText_0x6e9a3 waitbutton playsound SFX_ENTER_DOOR - changeblock 10, 8, $7 + changeblock 10, 8, $07 reloadmappart closetext setevent EVENT_OPENED_DOOR_TO_GIOVANNIS_OFFICE |