diff options
Diffstat (limited to 'maps')
| -rw-r--r-- | maps/BattleTower1F.asm | 16 | ||||
| -rw-r--r-- | maps/PewterPokeCenter2FBeta.asm (renamed from maps/PewterPokeCEnter2FBeta.asm) | 4 | ||||
| -rw-r--r-- | maps/blockdata_1.asm | 2 | ||||
| -rw-r--r-- | maps/map_headers.asm | 2 | ||||
| -rw-r--r-- | maps/second_map_headers.asm | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 5d8809b10..1ee2c8163 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -20,7 +20,7 @@ BattleTower1F_MapScriptHeader: writebyte BATTLETOWERACTION_CHECKSAVEFILEISYOURS special BattleTowerAction iffalse .SkipEverything - writebyte BATTLETOWERACTION_02 ; copybytetovar sBattleTowerChallengeState + writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState special BattleTowerAction if_equal $0, .SkipEverything if_equal $2, .priorityjump1 @@ -56,13 +56,13 @@ UnknownScript_0x9e3e0: end ReceptionistScript_0x9e3e2: - writebyte BATTLETOWERACTION_02 ; copybytetovar sBattleTowerChallengeState + writebyte BATTLETOWERACTION_GET_CHALLENGE_STATE ; copybytetovar sBattleTowerChallengeState special BattleTowerAction if_equal $3, Script_BeatenAllTrainers2 ; maps/BattleTowerBattleRoom.asm opentext writetext Text_BattleTowerWelcomesYou buttonsound - writebyte BATTLETOWERACTION_00 ; if new save file: bit 1, [s1_be4f] + writebyte BATTLETOWERACTION_CHECK_EXPLANATION_READ ; if new save file: bit 1, [s1_be4f] special BattleTowerAction if_not_equal $0, Script_Menu_ChallengeExplanationCancel jump Script_BattleTowerIntroductionYesNo @@ -87,7 +87,7 @@ Script_ChoseChallenge: ; 0x9e40f special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel dotrigger $1 - writebyte BATTLETOWERACTION_01 ; set 1, [s1_be4f] + writebyte BATTLETOWERACTION_SET_EXPLANATION_READ ; set 1, [s1_be4f] special BattleTowerAction special Function1700b0 if_equal $a, Script_Menu_ChallengeExplanationCancel @@ -148,7 +148,7 @@ Script_BattleTowerIntroductionYesNo: ; 0x9e49e Script_BattleTowerExplanation: ; 0x9e4a5 writetext Text_BattleTowerIntroduction_2 Script_BattleTowerSkipExplanation: - writebyte BATTLETOWERACTION_01 + writebyte BATTLETOWERACTION_SET_EXPLANATION_READ special BattleTowerAction jump Script_Menu_ChallengeExplanationCancel @@ -174,7 +174,7 @@ UnreferencedScript_0x9e4be: iffalse Script_Menu_ChallengeExplanationCancel special Special_TryQuickSave iffalse Script_Menu_ChallengeExplanationCancel - writebyte BATTLETOWERACTION_01 + writebyte BATTLETOWERACTION_SET_EXPLANATION_READ special BattleTowerAction special Function1700ba if_equal $a, Script_Menu_ChallengeExplanationCancel @@ -188,10 +188,10 @@ UnreferencedScript_0x9e4be: end UnreferencedScript_0x9e4ea: - writebyte BATTLETOWERACTION_18 + writebyte BATTLETOWERACTION_LEVEL_CHECK special BattleTowerAction if_not_equal $0, Script_APkmnLevelExceeds - writebyte BATTLETOWERACTION_19 + writebyte BATTLETOWERACTION_UBERS_CHECK special BattleTowerAction if_not_equal $0, Script_MayNotEnterABattleRoomUnderL70 special SpecialCheckForBattleTowerRules diff --git a/maps/PewterPokeCEnter2FBeta.asm b/maps/PewterPokeCenter2FBeta.asm index 74bd290ff..b2530ed8b 100644 --- a/maps/PewterPokeCEnter2FBeta.asm +++ b/maps/PewterPokeCenter2FBeta.asm @@ -1,11 +1,11 @@ -PewterPokeCEnter2FBeta_MapScriptHeader: +PewterPokeCenter2FBeta_MapScriptHeader: .MapTriggers: db 0 .MapCallbacks: db 0 -PewterPokeCEnter2FBeta_MapEventHeader: +PewterPokeCenter2FBeta_MapEventHeader: ; filler db 0, 0 diff --git a/maps/blockdata_1.asm b/maps/blockdata_1.asm index 0a8fa0a8b..be9abbcc1 100644 --- a/maps/blockdata_1.asm +++ b/maps/blockdata_1.asm @@ -57,7 +57,7 @@ CinnabarPokeCenter2FBeta_BlockData: CeruleanPokeCenter2FBeta_BlockData: Route10PokeCenter2FBeta_BlockData: VermilionPokeCenter2FBeta_BlockData: -PewterPokeCEnter2FBeta_BlockData: +PewterPokeCenter2FBeta_BlockData: FuchsiaPokeCenter2FBeta_BlockData: LavenderPokeCenter2FBeta_BlockData: CeladonPokeCenter2FBeta_BlockData: diff --git a/maps/map_headers.asm b/maps/map_headers.asm index 32be86ac0..95909baa8 100644 --- a/maps/map_headers.asm +++ b/maps/map_headers.asm @@ -303,7 +303,7 @@ MapGroup14: map_header PewterGym, TILESET_SPROUT_TOWER, INDOOR, PEWTER_CITY, MUSIC_GYM, 1, PALETTE_DAY, FISHGROUP_SHORE map_header PewterMart, TILESET_MART, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header PewterPokeCenter1F, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_POKEMON_CENTER, 0, PALETTE_DAY, FISHGROUP_SHORE - map_header PewterPokeCEnter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE + map_header PewterPokeCenter2FBeta, TILESET_POKECENTER, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE map_header PewterSnoozeSpeechHouse, TILESET_HOUSE_1, INDOOR, PEWTER_CITY, MUSIC_VIRIDIAN_CITY, 0, PALETTE_DAY, FISHGROUP_SHORE diff --git a/maps/second_map_headers.asm b/maps/second_map_headers.asm index 895f99dae..1bf8b80a2 100644 --- a/maps/second_map_headers.asm +++ b/maps/second_map_headers.asm @@ -474,7 +474,7 @@ map_header_2 PewterGym, PEWTER_GYM, $0, 0 map_header_2 PewterMart, PEWTER_MART, $0, 0 map_header_2 PewterPokeCenter1F, PEWTER_POKECENTER_1F, $0, 0 - map_header_2 PewterPokeCEnter2FBeta, PEWTER_POKECENTER_2F_BETA, $0, 0 + map_header_2 PewterPokeCenter2FBeta, PEWTER_POKECENTER_2F_BETA, $0, 0 map_header_2 PewterSnoozeSpeechHouse, PEWTER_SNOOZE_SPEECH_HOUSE, $0, 0 map_header_2 OlivinePort, OLIVINE_PORT, $a, 0 map_header_2 VermilionPort, VERMILION_PORT, $a, 0 |