diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle_transition.asm | 4 | ||||
| -rw-r--r-- | engine/color.asm | 6 | ||||
| -rw-r--r-- | engine/events_2.asm | 2 | ||||
| -rwxr-xr-x | engine/events_3.asm | 2 | ||||
| -rw-r--r-- | engine/map_setup.asm | 4 | ||||
| -rwxr-xr-x | engine/overworld.asm | 4 | ||||
| -rw-r--r-- | engine/phone/phone.asm | 2 | ||||
| -rw-r--r-- | engine/sgb_layouts.asm | 4 | ||||
| -rwxr-xr-x | engine/variables.asm | 2 | ||||
| -rwxr-xr-x | engine/warp_connection.asm | 8 |
10 files changed, 19 insertions, 19 deletions
diff --git a/engine/battle_transition.asm b/engine/battle_transition.asm index 194f7998b..2af113ddd 100644 --- a/engine/battle_transition.asm +++ b/engine/battle_transition.asm @@ -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 diff --git a/engine/color.asm b/engine/color.asm index e360f101d..ce9e1dfaa 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -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 diff --git a/engine/events_2.asm b/engine/events_2.asm index 6a2a79013..dfa3babdd 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -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 diff --git a/engine/events_3.asm b/engine/events_3.asm index 1b4a4f233..873c511ae 100755 --- a/engine/events_3.asm +++ b/engine/events_3.asm @@ -18,7 +18,7 @@ ReturnFromMapSetupScript:: ; b8000 call .CheckNationalParkGate jr z, .nationalparkgate - call GetMapPermission + call GetMapEnvironment cp GATE jr nz, .not_gate diff --git a/engine/map_setup.asm b/engine/map_setup.asm index 6360178e1..01f3d05d7 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -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 diff --git a/engine/overworld.asm b/engine/overworld.asm index 523021c32..a505ecd66 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -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 diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index e49d73c1a..9b451d04a 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -308,7 +308,7 @@ CheckSpecialPhoneCall:: ; 90136 (24:4136) ret SpecialCallOnlyWhenOutside: ; 90188 - ld a, [wPermission] + ld a, [wEnvironment] cp TOWN jr z, .outside cp ROUTE diff --git a/engine/sgb_layouts.asm b/engine/sgb_layouts.asm index e59fb19d8..36dbde84c 100644 --- a/engine/sgb_layouts.asm +++ b/engine/sgb_layouts.asm @@ -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 diff --git a/engine/variables.asm b/engine/variables.asm index edc12ac66..1b418ea3c 100755 --- a/engine/variables.asm +++ b/engine/variables.asm @@ -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 diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm index 6dec2ec78..e442aec8e 100755 --- a/engine/warp_connection.asm +++ b/engine/warp_connection.asm @@ -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] |