diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/battle_transitions.asm | 28 | ||||
| -rw-r--r-- | engine/battle/common_text.asm | 4 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 4 | ||||
| -rw-r--r-- | engine/battle/init_battle_variables.asm | 2 | ||||
| -rwxr-xr-x | engine/hidden_object_functions7.asm | 4 | ||||
| -rwxr-xr-x | engine/items/items.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/field_move_messages.asm | 2 | ||||
| -rwxr-xr-x | engine/overworld/npc_movement.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/player_state.asm | 12 | ||||
| -rw-r--r-- | engine/overworld/set_blackout_map.asm | 6 | ||||
| -rwxr-xr-x | engine/palettes.asm | 2 |
11 files changed, 35 insertions, 35 deletions
diff --git a/engine/battle/battle_transitions.asm b/engine/battle/battle_transitions.asm index 985a1eb2..1967d33b 100644 --- a/engine/battle/battle_transitions.asm +++ b/engine/battle/battle_transitions.asm @@ -118,8 +118,8 @@ GetBattleTransitionID_CompareLevels: ld [wBattleTransitionSpiralDirection], a ret -; fails to recognize VICTORY_ROAD_2, VICTORY_ROAD_3, all ROCKET_HIDEOUT maps, -; MANSION_1, SEAFOAM_ISLANDS_[2-5], POWER_PLANT, DIGLETTS_CAVE +; fails to recognize VICTORY_ROAD_2F, VICTORY_ROAD_3F, all ROCKET_HIDEOUT maps, +; POKEMON_MANSION_1F, SEAFOAM_ISLANDS_[B1F-B4F], POWER_PLANT, DIGLETTS_CAVE ; and SILPH_CO_[9-11]F as dungeon maps GetBattleTransitionID_IsDungeonMap: ld a, [wCurMap] @@ -155,30 +155,30 @@ GetBattleTransitionID_IsDungeonMap: ; is equal to one of these maps DungeonMaps1: db VIRIDIAN_FOREST - db ROCK_TUNNEL_1 - db SEAFOAM_ISLANDS_1 - db ROCK_TUNNEL_2 + db ROCK_TUNNEL_1F + db SEAFOAM_ISLANDS_1F + db ROCK_TUNNEL_B1F db $FF ; GetBattleTransitionID_IsDungeonMap checks if wCurMap ; is in between or equal to each pair of maps DungeonMaps2: ; all MT_MOON maps - db MT_MOON_1 - db MT_MOON_3 + db MT_MOON_1F + db MT_MOON_B2F - ; all SS_ANNE maps, VICTORY_ROAD_1, LANCES_ROOM, and HALL_OF_FAME - db SS_ANNE_1 + ; all SS_ANNE maps, VICTORY_ROAD_1F, LANCES_ROOM, and HALL_OF_FAME + db SS_ANNE_1F db HALL_OF_FAME - ; all POKEMONTOWER maps and Lavender Town buildings + ; all POKEMON_TOWER maps and Lavender Town buildings db LAVENDER_POKECENTER - db LAVENDER_HOUSE_2 + db LAVENDER_CUBONE_HOUSE - ; SILPH_CO_[2-8]F, MANSION[2-4], SAFARI_ZONE, and UNKNOWN_DUNGEON maps, - ; except for SILPH_CO_1F + ; SILPH_CO_[2-8]F, POKEMON_MANSION[2F-B1F], SAFARI_ZONE, and + ; CERULEAN_CAVE maps, except for SILPH_CO_1F db SILPH_CO_2F - db UNKNOWN_DUNGEON_1 + db CERULEAN_CAVE_1F db $FF LoadBattleTransitionTile: diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 3d46c947..4a138048 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -3,9 +3,9 @@ PrintBeginningBattleText: dec a jr nz, .trainerBattle ld a, [wCurMap] - cp POKEMONTOWER_3 + cp POKEMON_TOWER_3F jr c, .notPokemonTower - cp LAVENDER_HOUSE_1 + cp MR_FUJIS_HOUSE jr c, .pokemonTower .notPokemonTower ld a, [wEnemyMonSpecies2] diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 9265503d..056a9588 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3371,9 +3371,9 @@ IsGhostBattle: dec a ret nz ld a, [wCurMap] - cp POKEMONTOWER_1 + cp POKEMON_TOWER_1F jr c, .next - cp LAVENDER_HOUSE_1 + cp MR_FUJIS_HOUSE jr nc, .next ld b, SILPH_SCOPE call IsItemInBag diff --git a/engine/battle/init_battle_variables.asm b/engine/battle/init_battle_variables.asm index bdd5d8f4..7bc912d2 100644 --- a/engine/battle/init_battle_variables.asm +++ b/engine/battle/init_battle_variables.asm @@ -30,7 +30,7 @@ InitBattleVariables: ld a, [wCurMap] cp SAFARI_ZONE_EAST jr c, .notSafariBattle - cp SAFARI_ZONE_REST_HOUSE_1 + cp SAFARI_ZONE_CENTER_REST_HOUSE jr nc, .notSafariBattle ld a, BATTLE_TYPE_SAFARI ld [wBattleType], a diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm index f04c1deb..491be861 100755 --- a/engine/hidden_object_functions7.asm +++ b/engine/hidden_object_functions7.asm @@ -79,12 +79,12 @@ SafariZoneGameOver: call DisplayTextID xor a ld [wPlayerMovingDirection], a - ld a, SAFARI_ZONE_ENTRANCE + ld a, SAFARI_ZONE_GATE ld [hWarpDestinationMap], a ld a, $3 ld [wDestinationWarpID], a ld a, $5 - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a SetEvent EVENT_SAFARI_GAME_OVER ld a, 1 ld [wSafariZoneGameOver], a diff --git a/engine/items/items.asm b/engine/items/items.asm index 3bb2ec9e..38e8a704 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -166,7 +166,7 @@ ItemUseBall: ; If the player is fighting the ghost Marowak, set the value that indicates the ; Pokémon can't be caught and skip the capture calculations. ld a, [wCurMap] - cp POKEMONTOWER_6 + cp POKEMON_TOWER_6F jr nz, .loop ld a, [wEnemyMonSpecies2] cp MAROWAK @@ -1511,7 +1511,7 @@ ItemUseEscapeRope: ResetEvent EVENT_IN_SAFARI_ZONE xor a ld [wNumSafariBalls], a - ld [wSafariZoneEntranceCurScript], a + ld [wSafariZoneGateCurScript], a inc a ld [wEscapedFromBattle], a ld [wActionResultOrTookBattleTurn], a ; item used diff --git a/engine/overworld/field_move_messages.asm b/engine/overworld/field_move_messages.asm index 69914bfc..b1506742 100644 --- a/engine/overworld/field_move_messages.asm +++ b/engine/overworld/field_move_messages.asm @@ -28,7 +28,7 @@ IsSurfingAllowed: bit 5, a jr nz, .forcedToRideBike ld a, [wCurMap] - cp SEAFOAM_ISLANDS_5 + cp SEAFOAM_ISLANDS_B4F ret nz CheckBothEventsSet EVENT_SEAFOAM4_BOULDER1_DOWN_HOLE, EVENT_SEAFOAM4_BOULDER2_DOWN_HOLE ret z diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 2c75b9d8..968615f0 100755 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -268,7 +268,7 @@ RLEList_PewterGymGuy: FreezeEnemyTrainerSprite: ld a, [wCurMap] - cp POKEMONTOWER_7 + cp POKEMON_TOWER_7F ret z ; the Rockets on Pokemon Tower 7F leave after battling, so don't freeze them ld hl, RivalIDs ld a, [wEngagedTrainerClass] diff --git a/engine/overworld/player_state.asm b/engine/overworld/player_state.asm index b8d734f2..73c55da2 100644 --- a/engine/overworld/player_state.asm +++ b/engine/overworld/player_state.asm @@ -55,14 +55,14 @@ CheckForceBikeOrSurf: cp c ;compare x-coord jr nz, .loop ; incorrect x-coord, check next item ld a, [wCurMap] - cp SEAFOAM_ISLANDS_4 + cp SEAFOAM_ISLANDS_B3F ld a, $2 - ld [wSeafoamIslands4CurScript], a + ld [wSeafoamIslandsB3FCurScript], a jr z, .forceSurfing ld a, [wCurMap] - cp SEAFOAM_ISLANDS_5 + cp SEAFOAM_ISLANDS_B4F ld a, $2 - ld [wSeafoamIslands5CurScript], a + ld [wSeafoamIslandsB4FCurScript], a jr z, .forceSurfing ;force bike riding ld hl, wd732 @@ -156,7 +156,7 @@ IsWarpTileInFrontOfPlayer: push bc call _GetTileAndCoordsInFrontOfPlayer ld a, [wCurMap] - cp SS_ANNE_5 + cp SS_ANNE_BOW jr z, .ssAnne5 ld a, [wSpriteStateData1 + 9] ; player sprite's facing direction srl a @@ -237,7 +237,7 @@ PrintSafariZoneSteps: ld a, [wCurMap] cp SAFARI_ZONE_EAST ret c - cp UNKNOWN_DUNGEON_2 + cp CERULEAN_CAVE_2F ret nc coord hl, 0, 0 ld b, 3 diff --git a/engine/overworld/set_blackout_map.asm b/engine/overworld/set_blackout_map.asm index 9bfe82bd..bac2f0ca 100644 --- a/engine/overworld/set_blackout_map.asm +++ b/engine/overworld/set_blackout_map.asm @@ -23,7 +23,7 @@ SetLastBlackoutMap: ret SafariZoneRestHouses: - db SAFARI_ZONE_REST_HOUSE_2 - db SAFARI_ZONE_REST_HOUSE_3 - db SAFARI_ZONE_REST_HOUSE_4 + db SAFARI_ZONE_WEST_REST_HOUSE + db SAFARI_ZONE_EAST_REST_HOUSE + db SAFARI_ZONE_NORTH_REST_HOUSE db -1 diff --git a/engine/palettes.asm b/engine/palettes.asm index 4808776e..4ab83f36 100755 --- a/engine/palettes.asm +++ b/engine/palettes.asm @@ -147,7 +147,7 @@ SetPal_Overworld: ld a, [wCurMap] cp REDS_HOUSE_1F jr c, .townOrRoute - cp UNKNOWN_DUNGEON_2 + cp CERULEAN_CAVE_2F jr c, .normalDungeonOrBuilding cp NAME_RATERS_HOUSE jr c, .caveOrBruno |