Apply most of pokecrystal PR 1105

engine/overworld/events.asm

@@ -27,111 +27,111 @@ OverworldLoop::
 
 DisableEvents:
 	xor a
-	ld [wScriptFlags2], a
+	ld [wEnabledPlayerEvents], a
 	ret
 
 EnableEvents::
 	ld a, $ff
-	ld [wScriptFlags2], a
+	ld [wEnabledPlayerEvents], a
 	ret
 
 DisableTileEvents:
-; DisableWarpsConnxns + DisableCoordEvents + DisableStepCount + DisableWildEncounters
+; DisableWarpsConnections + DisableCoordEvents + DisableStepCount + DisableWildEncounters
 	push af
-	ld hl, wScriptFlags2
+	ld hl, wEnabledPlayerEvents
 	ld a, [hl]
 	and ~((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3))
 	ld [hl], a
 	pop af
 	ret
 
-DisableWarpsConnxns: ; unreferenced
-	ld hl, wScriptFlags2
+DisableWarpsConnections: ; unreferenced
+	ld hl, wEnabledPlayerEvents
 	res 2, [hl]
 	ret
 
 DisableCoordEvents: ; unreferenced
-	ld hl, wScriptFlags2
+	ld hl, wEnabledPlayerEvents
 	res 1, [hl]
 	ret
 
 DisableStepCount: ; unreferenced
-	ld hl, wScriptFlags2
+	ld hl, wEnabledPlayerEvents
 	res 0, [hl]
 	ret
 
 DisableWildEncounters: ; unreferenced
-	ld hl, wScriptFlags2
+	ld hl, wEnabledPlayerEvents
 	res 3, [hl]
 	ret
 
 DisableSpaceEffects:
-	ld hl, wScriptFlags2
+	ld hl, wEnabledPlayerEvents
 	res 4, [hl]
 	ret
 
 DisableTrainerAndTalkerEvents: ; unreferenced
-	ld hl, wScriptFlags2
+	ld hl, wEnabledPlayerEvents
 	res 5, [hl]
 	ret
 
-EnableWarpsConnxns: ; unreferenced
-	ld hl, wScriptFlags2
+EnableWarpsConnections: ; unreferenced
+	ld hl, wEnabledPlayerEvents
 	set 2, [hl]
 	ret
 
 EnableCoordEvents: ; unreferenced
-	ld hl, wScriptFlags2
+	ld hl, wEnabledPlayerEvents
 	set 1, [hl]
 	ret
 
 EnableStepCount: ; unreferenced
-	ld hl, wScriptFlags2
+	ld hl, wEnabledPlayerEvents
 	set 0, [hl]
 	ret
 
 EnableWildEncounters:
-	ld hl, wScriptFlags2
+	ld hl, wEnabledPlayerEvents
 	set 3, [hl]
 	ret
 
 EnableSpaceEffects: ; unreferenced
-	ld hl, wScriptFlags2
+	ld hl, wEnabledPlayerEvents
 	set 4, [hl]
 	ret
 
 EnableTrainerAndTalkerEvents: ; unreferenced
-	ld hl, wScriptFlags2
+	ld hl, wEnabledPlayerEvents
 	set 5, [hl]
 	ret
 
-CheckWarpConnxnScriptFlag:
-	ld hl, wScriptFlags2
+CheckWarpConnectionsEnabled:
+	ld hl, wEnabledPlayerEvents
 	bit 2, [hl]
 	ret
 
-CheckCoordEventScriptFlag:
-	ld hl, wScriptFlags2
+CheckCoordEventsEnabled:
+	ld hl, wEnabledPlayerEvents
 	bit 1, [hl]
 	ret
 
-CheckStepCountScriptFlag:
-	ld hl, wScriptFlags2
+CheckStepCountEnabled:
+	ld hl, wEnabledPlayerEvents
 	bit 0, [hl]
 	ret
 
-CheckWildEncountersScriptFlag:
-	ld hl, wScriptFlags2
+CheckWildEncountersEnabled:
+	ld hl, wEnabledPlayerEvents
 	bit 3, [hl]
 	ret
 
 CheckSpaceEffectsScriptFlag:
-	ld hl, wScriptFlags2
+	ld hl, wEnabledPlayerEvents
 	bit 4, [hl]
 	ret
 
 CheckTrainerAndTalkerEvents:
-	ld hl, wScriptFlags2
+	ld hl, wEnabledPlayerEvents
 	bit 5, [hl]
 	ret
 
@@ -550,7 +550,7 @@ CheckTrainerOrTalkerEvent:
 CheckTileEvent:
 ; Check for warps, coord events, or wild battles.
 
-	call CheckWarpConnxnScriptFlag
+	call CheckWarpConnectionsEnabled
 	jr z, .connections_disabled
 
 	farcall CheckMovingOffEdgeOfMap
@@ -568,21 +568,21 @@ CheckTileEvent:
 	cp BOARDEVENT_VIEW_MAP_MODE
 	ret z ; nc
 
-	call CheckCoordEventScriptFlag
+	call CheckCoordEventsEnabled
 	jr z, .coord_events_disabled
 
 	call CheckCurrentMapCoordEvents
 	jr c, .coord_event
 
 .coord_events_disabled
-	call CheckStepCountScriptFlag
+	call CheckStepCountEnabled
 	jr z, .step_count_disabled
 
 	call CountStep
 	ret c
 
 .step_count_disabled
-	call CheckWildEncountersScriptFlag
+	call CheckWildEncountersEnabled
 	jr z, .ok
 
 	call RandomEncounter
@@ -1536,7 +1536,7 @@ RandomEncounter::
 
 	call CheckWildEncounterCooldown
 	jr c, .nope
-	call CanEncounterWildMonInThisTile
+	call CanEncounterWildMon
 	jr nc, .nope
 	ld hl, wStatusFlags2
 	bit STATUSFLAGS2_BUG_CONTEST_TIMER_F, [hl]
@@ -1576,7 +1576,7 @@ WildBattleScript:
 	reloadmapafterbattle
 	end
 
-CanEncounterWildMonInThisTile::
+CanEncounterWildMon::
 	ld hl, wStatusFlags
 	bit STATUSFLAGS_NO_WILD_ENCOUNTERS_F, [hl]
 	jr nz, .no

engine/overworld/init_map.asm

@@ -29,11 +29,11 @@ ReanchorBGMap_NoOAMUpdate::
 	; draw screen at wTilemap and wAttrmap and then transfer it.
 	ld a, $90
 	ldh [hWY], a
-	call LoadScreenTilemapAndAttrmapPals
+	call LoadOverworldTilemapAndAttrmapPals
 	call LoadWindowHUD
 	ld a, HIGH(vBGMap1)
 	call .LoadBGMapAddrIntoHRAM
-	call HDMATransferTilemapAndAttrmap_OpenAndCloseMenu
+	call HDMATransferTilemapAndAttrmap_Menu
 	farcall ApplyPals
 	ld a, TRUE
 	ldh [hCGBPalUpdate], a

engine/overworld/load_overworld_tilemap.asm

@@ -1,4 +1,4 @@
-_LoadScreenTilemap::
+_LoadOverworldTilemap::
 	ld hl, wSurroundingTiles
 	ld a, [wPlayerMetatileY]
 	and a

engine/overworld/player_object.asm

@@ -13,7 +13,7 @@ BlankScreen:
 	ld a, $7
 	call ByteFill
 	call WaitBGMap2
-	call SetPalettes
+	call SetDefaultBGPAndOBP
 	ret
 
 SpawnPlayer:

engine/overworld/player_step.asm

@@ -144,25 +144,25 @@ UpdateOverworldMap:
 
 .step_down
 	call .ScrollOverworldMapDown
-	call LoadScreenTilemap
+	call LoadOverworldTilemap
 	call ScrollMapDown
 	ret
 
 .step_up
 	call .ScrollOverworldMapUp
-	call LoadScreenTilemap
+	call LoadOverworldTilemap
 	call ScrollMapUp
 	ret
 
 .step_left
 	call .ScrollOverworldMapLeft
-	call LoadScreenTilemap
+	call LoadOverworldTilemap
 	call ScrollMapLeft
 	ret
 
 .step_right
 	call .ScrollOverworldMapRight
-	call LoadScreenTilemap
+	call LoadOverworldTilemap
 	call ScrollMapRight
 	ret
 

engine/overworld/scripting.asm

@@ -136,7 +136,7 @@ ScriptCommandTable:
 	dw Script_itemnotify                   ; 45
 	dw Script_pocketisfull                 ; 46
 	dw Script_opentext                     ; 47
-	dw Script_refreshscreen                ; 48
+	dw Script_reanchormap                  ; 48
 	dw Script_closetext                    ; 49
 	dw Script_writeunusedbyte              ; 4a
 	dw Script_farwritetext                 ; 4b
@@ -188,7 +188,7 @@ ScriptCommandTable:
 	dw Script_changemapblocks              ; 79
 	dw Script_changeblock                  ; 7a
 	dw Script_reloadmap                    ; 7b
-	dw Script_reloadmappart                ; 7c
+	dw Script_refreshmap                   ; 7c
 	dw Script_writecmdqueue                ; 7d
 	dw Script_delcmdqueue                  ; 7e
 	dw Script_playmusic                    ; 7f
@@ -953,7 +953,7 @@ ApplyObjectFacing:
 	ret
 
 .DisableTextTiles:
-	call LoadScreenTilemap
+	call LoadOverworldTilemap
 	hlcoord 0, 0
 	ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
 .loop
@@ -2287,12 +2287,12 @@ Script_changeblock:
 	call BufferScreen
 	ret
 
-Script_reloadmappart::
+Script_refreshmap::
 	xor a
 	ldh [hBGMapMode], a
-	call LoadScreenTilemapAndAttrmapPals
+	call LoadOverworldTilemapAndAttrmapPals
 	call GetMovementPermissions
-	farcall HDMATransferTilemapAndAttrmap_OverworldEffect
+	farcall HDMATransferTilemapAndAttrmap_Overworld
 	call UpdateSprites
 	ret
 
@@ -2322,7 +2322,7 @@ Script_opentext:
 	call OpenText2bpp
 	ret
 
-Script_refreshscreen:
+Script_reanchormap:
 	call RefreshScreen
 	call GetScriptByte
 	ret
@@ -2332,7 +2332,7 @@ Script_writeunusedbyte:
 	ret
 
 Script_closetext:
-	call HDMATransferTilemapAndAttrmap_OpenAndCloseMenu
+	call HDMATransferTilemapAndAttrmap_Menu
 	call CloseText
 	ret
 

engine/overworld/warp_connection.asm

@@ -219,7 +219,7 @@ LoadMapTimeOfDay:
 	ld [wSpriteUpdatesEnabled], a
 	farcall ReplaceTimeOfDayPals
 	farcall UpdateTimeOfDayPal
-	call LoadScreenTilemapAndAttrmapPals
+	call LoadOverworldTilemapAndAttrmapPals
 	call .ClearBGMap
 	call .PushAttrmap
 	ret