From b006415371330881ed50aadbe62aa4675c92f9b4 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Tue, 12 Dec 2017 16:15:58 -0500
Subject: Define constants for collision types

---
 main.asm | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 0ba778fb3..845800e28 100644
--- a/main.asm
+++ b/main.asm
@@ -508,7 +508,7 @@ CheckFacingTileForStd:: ; 1365b
 ; Checks to see if the tile you're facing has a std script associated with it.  If so, executes the script and returns carry.
 	ld a, c
 	ld de, 3
-	ld hl, .table1
+	ld hl, TileCollisionStdScripts
 	call IsInArray
 	jr nc, .notintable
 
@@ -529,16 +529,7 @@ CheckFacingTileForStd:: ; 1365b
 	xor a
 	ret
 
-.table1
-	dbw $91, magazinebookshelf
-	dbw $93, pcscript
-	dbw $94, radio1
-	dbw $95, townmap
-	dbw $96, merchandiseshelf
-	dbw $97, tv
-	dbw $9d, window
-	dbw $9f, incenseburner
-	db   -1 ; end
+INCLUDE "data/collision_stdscripts.asm"
 
 Script_JumpStdFromRAM: ; 0x1369a
 	jump wJumpStdScriptBuffer
@@ -1952,7 +1943,7 @@ ScrollBGMapPalettes:: ; 4c03f
 
 INCLUDE "tilesets/palette_maps.asm"
 
-INCLUDE "tilesets/collision.asm"
+INCLUDE "data/collision_permissions.asm"
 
 EmptyAllSRAMBanks: ; 4cf1f
 	ld a, $0
-- 
cgit v1.2.3


From 93c32e35806af6c0a8b731c5322ee5df58c797f9 Mon Sep 17 00:00:00 2001
From: Remy Oukaour <remy.oukaour@gmail.com>
Date: Tue, 12 Dec 2017 20:15:07 -0500
Subject: Document bugs and glitches

---
 main.asm | 2 --
 1 file changed, 2 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 0ba778fb3..46fdc6bb7 100644
--- a/main.asm
+++ b/main.asm
@@ -236,8 +236,6 @@ CheckNickErrors:: ; 669f
 	db -1 ; end
 
 INCLUDE "engine/math.asm"
-
-ItemAttributes: ; 67c1
 INCLUDE "items/item_attributes.asm"
 INCLUDE "engine/npc_movement.asm"
 INCLUDE "event/happiness_egg.asm"
-- 
cgit v1.2.3