thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename map files, labels, and constants to be consistent and work with Polished Map

Browse source
This commit is contained in:
Rangi 2019-01-01 15:06:23 -05:00
parent 90430e6dee
commit c779602459
1398 changed files with 6631 additions and 6166 deletions
Download patch file Download diff file Expand all files Collapse all files

28
engine/battle/battle_transitions.asm
View file

@ -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:

4
engine/battle/common_text.asm
View file

@ -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]

4
engine/battle/core.asm
View file

@ -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

2
engine/battle/init_battle_variables.asm
View file

@ -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

4
engine/hidden_object_functions7.asm
View file

@ -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

4
engine/items/items.asm
View file

@ -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

2
engine/overworld/field_move_messages.asm
View file

@ -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

2
engine/overworld/npc_movement.asm
View file

@ -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]

12
engine/overworld/player_state.asm
View file

@ -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

6
engine/overworld/set_blackout_map.asm
View file

@ -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

2
engine/palettes.asm
View file

@ -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