diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-12 20:15:15 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-12 20:15:15 -0500 |
| commit | 78d489733c8da46b901ecb47e82e2fc45498b387 (patch) | |
| tree | 83cdb195c9d4ed6c6b39e17f97c56ade442d82d4 /main.asm | |
| parent | 93c32e35806af6c0a8b731c5322ee5df58c797f9 (diff) | |
| parent | 05ac706f6052ade04a0d258862a705d3f41283bf (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 15 |
1 files changed, 3 insertions, 12 deletions
@@ -506,7 +506,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 @@ -527,16 +527,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 @@ -1950,7 +1941,7 @@ ScrollBGMapPalettes:: ; 4c03f INCLUDE "tilesets/palette_maps.asm" -INCLUDE "tilesets/collision.asm" +INCLUDE "data/collision_permissions.asm" EmptyAllSRAMBanks: ; 4cf1f ld a, $0 |