pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename "map permissions" to "map environment" (fix #396)

Browse Source
This commit is contained in:
Remy Oukaour
2017-12-24 13:08:38 -05:00
parent 10a1e6c860
commit 20d6c1d876
20 changed files with 70 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
engine/battle_transition.asm
View File

@@ -208,10 +208,10 @@ StartTrainerBattle_DetermineWhichAnimation: ; 8c365 (23:4365)
jr nc, .okay
set 0, e
.okay
ld a, [wPermission]
ld a, [wEnvironment]
cp CAVE
jr z, .okay2
cp PERM_5
cp ENVIRONMENT_5
jr z, .okay2
cp DUNGEON
jr z, .okay2

6
engine/color.asm
View File

@@ -1310,7 +1310,7 @@ LoadMapPals:
jr c, .got_pals
; Which palette group is based on whether we're outside or inside
ld a, [wPermission]
ld a, [wEnvironment]
and 7
ld e, a
ld d, 0
@@ -1377,7 +1377,7 @@ LoadMapPals:
ld a, BANK(UnknOBPals)
call FarCopyWRAM
ld a, [wPermission]
ld a, [wEnvironment]
cp TOWN
jr z, .outside
cp ROUTE
@@ -1411,7 +1411,7 @@ endr
dw .OutdoorColors ; ROUTE
dw .IndoorColors ; INDOOR
dw .DungeonColors ; CAVE
dw .Perm5Colors ; PERM_5
dw .Perm5Colors ; ENVIRONMENT_5
dw .IndoorColors ; GATE
dw .DungeonColors ; DUNGEON

2
engine/events_2.asm
View File

@@ -152,7 +152,7 @@ CanUseSweetScent:: ; 97cfd
ld hl, StatusFlags
bit 5, [hl]
jr nz, .no
ld a, [wPermission]
ld a, [wEnvironment]
cp CAVE
jr z, .ice_check
cp DUNGEON

2
engine/events_3.asm
View File

@@ -18,7 +18,7 @@ ReturnFromMapSetupScript:: ; b8000
call .CheckNationalParkGate
jr z, .nationalparkgate
call GetMapPermission
call GetMapEnvironment
cp GATE
jr nz, .not_gate

4
engine/map_setup.asm
View File

@@ -362,10 +362,10 @@ CheckReplaceKrisSprite: ; 154f7
jr z, .surfing
cp PLAYER_SURF_PIKA
jr z, .surfing
call GetMapPermission
call GetMapEnvironment
cp INDOOR
jr z, .checkbiking
cp PERM_5
cp ENVIRONMENT_5
jr z, .checkbiking
cp DUNGEON
jr z, .checkbiking

4
engine/overworld.asm
View File

@@ -112,7 +112,7 @@ GetPlayerSprite: ; 14183
AddMapSprites: ; 141c9
call GetMapPermission
call GetMapEnvironment
call CheckOutdoorMap
jr z, .outdoor
call AddIndoorSprites
@@ -179,7 +179,7 @@ MapCallbackSprites_LoadUsedSpritesGFX: ; 14209
ld c, EMOTE_SHADOW
farcall LoadEmote
call GetMapPermission
call GetMapEnvironment
call CheckOutdoorMap
ld c, EMOTE_GRASS_RUSTLE
jr z, .outdoor

2
engine/phone/phone.asm
View File

@@ -308,7 +308,7 @@ CheckSpecialPhoneCall:: ; 90136 (24:4136)
ret
SpecialCallOnlyWhenOutside: ; 90188
ld a, [wPermission]
ld a, [wEnvironment]
cp TOWN
jr z, .outside
cp ROUTE

4
engine/sgb_layouts.asm
View File

@@ -562,14 +562,14 @@ endr
ret
.morn_day
ld a, [wPermission]
ld a, [wEnvironment]
cp ROUTE
jr z, .route
cp CAVE
jr z, .cave
cp DUNGEON
jr z, .cave
cp PERM_5
cp ENVIRONMENT_5
jr z, .perm5
cp GATE
jr z, .gate

2
engine/variables.asm
View File

@@ -53,7 +53,7 @@ _GetVarAction:: ; 80648 (20:4648)
dwb MapGroup, RETVAR_STRBUF2
dwb MapNumber, RETVAR_STRBUF2
dwb .UnownCaught, RETVAR_EXECUTE
dwb wPermission, RETVAR_STRBUF2
dwb wEnvironment, RETVAR_STRBUF2
dwb .BoxFreeSpace, RETVAR_EXECUTE
dwb wBugContestMinsRemaining, RETVAR_STRBUF2
dwb XCoord, RETVAR_STRBUF2

8
engine/warp_connection.asm
View File

@@ -164,14 +164,14 @@ LoadWarpData: ; 1046c6
ret
.SaveDigWarp: ; 1046df (41:46df)
call GetMapPermission
call GetMapEnvironment
call CheckOutdoorMap
ret nz
ld a, [wNextMapGroup]
ld b, a
ld a, [wNextMapNumber]
ld c, a
call GetAnyMapPermission
call GetAnyMapEnvironment
call CheckIndoorMap
ret nz
ld a, [wPrevMapGroup]
@@ -192,14 +192,14 @@ LoadWarpData: ; 1046c6
ret
.SetSpawn: ; 104718 (41:4718)
call GetMapPermission
call GetMapEnvironment
call CheckOutdoorMap
ret nz
ld a, [wNextMapGroup]
ld b, a
ld a, [wNextMapNumber]
ld c, a
call GetAnyMapPermission
call GetAnyMapEnvironment
call CheckIndoorMap
ret nz
ld a, [wNextMapGroup]