Remove original maps and object events (#1)

engine/overworld/cmd_queue.asm

@@ -158,7 +158,6 @@ CmdQueue_Null:
 	ret
 
 CmdQueue_Type1:
-	call SetXYCompareFlags
 	ret
 
 CmdQueue_Type4:

engine/overworld/events.asm

@@ -245,8 +245,6 @@ PlayerEvents:
 	and a
 	ret nz
 
-	call Dummy_CheckScriptFlags2Bit5 ; This is a waste of time
-
 	call CheckTrainerBattle_GetPlayerEvent
 	jr c, .ok
 
@@ -392,12 +390,6 @@ SetMinTwoStepWildEncounterCooldown:
 	ld [wWildEncounterCooldown], a
 	ret
 
-Dummy_CheckScriptFlags2Bit5:
-	call CheckBit5_ScriptFlags2
-	ret z
-	call SetXYCompareFlags
-	ret
-
 RunSceneScript:
 	ld a, [wCurMapSceneScriptCount]
 	and a
@@ -1279,25 +1271,23 @@ TryWildEncounter_BugContest:
 INCLUDE "data/wild/bug_contest_mons.asm"
 
 DoBikeStep::
-	nop
-	nop
 	; If the bike shop owner doesn't have our number, or
 	; if we've already gotten the call, we don't have to
 	; be here.
 	ld hl, wStatusFlags2
 	bit STATUSFLAGS2_BIKE_SHOP_CALL_F, [hl]
-	jr z, .NoCall
+	jr z, .dont_increment
 
 	; If we're not on the bike, we don't have to be here.
 	ld a, [wPlayerState]
 	cp PLAYER_BIKE
-	jr nz, .NoCall
+	jr nz, .dont_increment
 
 	; If we're not in an area of phone service, we don't
 	; have to be here.
 	call GetMapPhoneService
 	and a
-	jr nz, .NoCall
+	jr nz, .dont_increment
 
 	; Check the bike step count and check whether we've
 	; taken 65536 of them yet.
@@ -1318,29 +1308,6 @@ DoBikeStep::
 	ld [hl], d
 
 .dont_increment
-	; If we've taken at least 1024 steps, have the bike
-	;  shop owner try to call us.
-	ld a, d
-	cp HIGH(1024)
-	jr c, .NoCall
-
-	; If a call has already been queued, don't overwrite
-	; that call.
-	ld a, [wSpecialPhoneCallID]
-	and a
-	jr nz, .NoCall
-
-	; Queue the call.
-	ld a, SPECIALCALL_BIKESHOP
-	ld [wSpecialPhoneCallID], a
-	xor a
-	ld [wSpecialPhoneCallID + 1], a
-	ld hl, wStatusFlags2
-	res STATUSFLAGS2_BIKE_SHOP_CALL_F, [hl]
-	scf
-	ret
-
-.NoCall:
 	xor a
 	ret
 

engine/overworld/landmarks.asm

@@ -44,39 +44,3 @@ GetLandmarkName::
 	ret
 
 INCLUDE "data/maps/landmarks.asm"
-
-RegionCheck:
-; Checks if the player is in Kanto or Johto.
-; If in Johto, returns 0 in e.
-; If in Kanto, returns 1 in e.
-	ld a, [wMapGroup]
-	ld b, a
-	ld a, [wMapNumber]
-	ld c, a
-	call GetWorldMapLocation
-	cp LANDMARK_FAST_SHIP ; S.S. Aqua
-	jr z, .johto
-	cp LANDMARK_SPECIAL
-	jr nz, .checkagain
-
-; In a special map, get the backup map group / map id
-	ld a, [wBackupMapGroup]
-	ld b, a
-	ld a, [wBackupMapNumber]
-	ld c, a
-	call GetWorldMapLocation
-
-.checkagain
-	cp KANTO_LANDMARK
-	jr c, .johto
-
-; Victory Road area is considered to be Johto.
-	cp LANDMARK_VICTORY_ROAD
-	jr c, .kanto
-
-.johto
-	ld e, JOHTO_REGION
-	ret
-.kanto
-	ld e, KANTO_REGION
-	ret

engine/overworld/warp_connection.asm

@@ -172,19 +172,6 @@ EnterMapWarp:
 	call CheckIndoorMap
 	ret nz
 
-; MOUNT_MOON_SQUARE and TIN_TOWER_ROOF are outdoor maps within indoor maps.
-; Dig and Escape Rope should not take you to them.
-	ld a, [wPrevMapGroup]
-	cp GROUP_MOUNT_MOON_SQUARE
-	jr nz, .not_mt_moon_square_or_tin_tower_roof
-	assert GROUP_MOUNT_MOON_SQUARE == GROUP_TIN_TOWER_ROOF
-	ld a, [wPrevMapNumber]
-	cp MAP_MOUNT_MOON_SQUARE
-	ret z
-	cp MAP_TIN_TOWER_ROOF
-	ret z
-.not_mt_moon_square_or_tin_tower_roof
-
 	ld a, [wPrevWarp]
 	ld [wDigWarpNumber], a
 	ld a, [wPrevMapGroup]

engine/overworld/wildmons.asm

@@ -387,8 +387,6 @@ _GrassWildmonLookup:
 	call _SwarmWildmonCheck
 	ret c
 	ld hl, JohtoGrassWildMons
-	ld de, KantoGrassWildMons
-	call _JohtoWildmonCheck
 	ld bc, GRASS_WILDDATA_LENGTH
 	jr _NormalWildmonOK
 
@@ -398,19 +396,9 @@ _WaterWildmonLookup:
 	call _SwarmWildmonCheck
 	ret c
 	ld hl, JohtoWaterWildMons
-	ld de, KantoWaterWildMons
-	call _JohtoWildmonCheck
 	ld bc, WATER_WILDDATA_LENGTH
 	jr _NormalWildmonOK
 
-_JohtoWildmonCheck:
-	call IsInJohto
-	and a
-	ret z
-	ld h, d
-	ld l, e
-	ret
-
 _SwarmWildmonCheck:
 	call CopyCurrMapDE
 	push hl
@@ -505,15 +493,15 @@ InitRoamMons:
 	ld [wRoamMon2Level], a
 
 ; raikou starting map
-	ld a, GROUP_ROUTE_42
+	ld a, GROUP_N_A
 	ld [wRoamMon1MapGroup], a
-	ld a, MAP_ROUTE_42
+	ld a, MAP_N_A
 	ld [wRoamMon1MapNumber], a
 
 ; entei starting map
-	ld a, GROUP_ROUTE_37
+	ld a, GROUP_N_A
 	ld [wRoamMon2MapGroup], a
-	ld a, MAP_ROUTE_37
+	ld a, MAP_N_A
 	ld [wRoamMon2MapNumber], a
 
 ; hp