summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2020-03-16 07:59:43 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2020-03-16 07:59:43 -0400
commit160df58342d150af791b22126af0994810e309d9 (patch)
tree9e4f03bde1138472d893b36835bf5f2f5a316e90 /include
parent923129a948eff063003c30fc6337a009a84653ab (diff)
parent2c7387951ba78349712d891ca71b55db4d0ec96e (diff)
Merge branch 'master' of github.com:pret/pokefirered into pokemon_storage_system
Diffstat (limited to 'include')
-rw-r--r--include/global.fieldmap.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 514bebb95..6e92ddd06 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -43,8 +43,8 @@ struct MapLayout
/*0x0c*/ u16 *map;
/*0x10*/ struct Tileset *primaryTileset;
/*0x14*/ struct Tileset *secondaryTileset;
- /*0x18*/ u8 unk18;
- /*0x19*/ u8 unk19;
+ /*0x18*/ u8 borderWidth;
+ /*0x19*/ u8 borderHeight;
};
struct BackupMapLayout