diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-13 19:55:03 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-13 19:55:03 -0500 |
| commit | 4b36a9d2e1d6b6ac823fbb14e8f0ba750b0eecc2 (patch) | |
| tree | fcbbd0247503a200c4c1d8df690a676b49a09efd /main.asm | |
| parent | e3ee39f3344107f666099448401d28b04c983cd6 (diff) | |
| parent | a6656a986bf9dde51561cab090648e0117b173ad (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'main.asm')
| -rw-r--r-- | main.asm | 17 |
1 files changed, 3 insertions, 14 deletions
@@ -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" @@ -508,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 @@ -529,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 @@ -1952,7 +1941,7 @@ ScrollBGMapPalettes:: ; 4c03f INCLUDE "tilesets/palette_maps.asm" -INCLUDE "tilesets/collision.asm" +INCLUDE "data/collision_permissions.asm" EmptyAllSRAMBanks: ; 4cf1f ld a, $0 |