diff options
| -rwxr-xr-x | data/mapObjects/route22gate.asm | 2 | ||||
| -rwxr-xr-x | data/mapObjects/seafoamislands1.asm | 4 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 4 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 4 | ||||
| -rwxr-xr-x | main.asm | 12 | ||||
| -rwxr-xr-x | scripts/route22gate.asm | 10 |
6 files changed, 22 insertions, 14 deletions
diff --git a/data/mapObjects/route22gate.asm b/data/mapObjects/route22gate.asm index 604a8730..02f11d58 100755 --- a/data/mapObjects/route22gate.asm +++ b/data/mapObjects/route22gate.asm @@ -5,7 +5,7 @@ Route22GateObject: ; 0x1e720 (size=42) db $7, $4, $0, $ff db $7, $5, $0, $ff db $0, $4, $0, $ff - db $0, $5, $1, $ff + db $0, $5, $0, $ff db $0 ; signs diff --git a/data/mapObjects/seafoamislands1.asm b/data/mapObjects/seafoamislands1.asm index 287f67ce..3b3d4f7a 100755 --- a/data/mapObjects/seafoamislands1.asm +++ b/data/mapObjects/seafoamislands1.asm @@ -24,7 +24,3 @@ SeafoamIslands1Object: ; 0x4484f (size=72) EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $5, $7 ; SEAFOAM_ISLANDS_2 EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_2 EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $f, $17 ; SEAFOAM_ISLANDS_2 - - ; holes - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $6, $11 - EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $6, $18 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 52f4b49f..00d29a22 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -192,8 +192,8 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route12House_h) db BANK(Route18Gate_h) db BANK(Route18GateUpstairs_h) - db $11 ; db BANK(SeafoamIslands1_h) - db $07 ; db BANK(Route22Gate_h) + db BANK(SeafoamIslands1_h) + db BANK(Route22Gate_h) db $14 ; db BANK(VictoryRoad2_h) db $12 ; db BANK(Route12GateUpstairs_h) db $06 ; db BANK(VermilionHouse3_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 0177e164..63b135da 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -192,8 +192,8 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route12House_h dw Route18Gate_h ;id=190 dw Route18GateUpstairs_h - dw $487e ; dw SeafoamIslands1_h - dw $5f81 ; dw Route22Gate_h + dw SeafoamIslands1_h + dw Route22Gate_h dw $57cc ; dw VictoryRoad2_h dw $54eb ; dw Route12GateUpstairs_h dw $5d05 ; dw VermilionHouse3_h @@ -436,7 +436,11 @@ INCLUDE "data/mapObjects/diglettscaveroute11.asm" INCLUDE "data/mapHeaders/route16house.asm" INCLUDE "scripts/route16house.asm" INCLUDE "data/mapObjects/route16house.asm" - dr $1df81,$1e06e ; map scripts + +INCLUDE "data/mapHeaders/route22gate.asm" +INCLUDE "scripts/route22gate.asm" +INCLUDE "data/mapObjects/route22gate.asm" +Route22GateBlocks: INCBIN "maps/route22gate.blk" INCLUDE "data/mapHeaders/billshouse.asm" INCLUDE "scripts/billshouse.asm" @@ -856,7 +860,11 @@ INCLUDE "data/mapHeaders/rocktunnel1.asm" INCLUDE "scripts/rocktunnel1.asm" INCLUDE "data/mapObjects/rocktunnel1.asm" RockTunnel1Blocks: INCBIN "maps/rocktunnel1.blk" - dr $4487e,$449bf + +INCLUDE "data/mapHeaders/seafoamislands1.asm" +INCLUDE "scripts/seafoamislands1.asm" +INCLUDE "data/mapObjects/seafoamislands1.asm" +SeafoamIslands1Blocks: INCBIN "maps/seafoamislands1.blk" INCLUDE "data/mapHeaders/ssanne3.asm" INCLUDE "scripts/ssanne3.asm" diff --git a/scripts/route22gate.asm b/scripts/route22gate.asm index 5fdd70c8..c957e4a6 100755 --- a/scripts/route22gate.asm +++ b/scripts/route22gate.asm @@ -23,9 +23,12 @@ Route22GateScript0: ; 1e6a4 (7:66a4) ret nc xor a ld [hJoyHeld], a + ld a, SPRITE_FACING_LEFT + ld [wSpriteStateData1 + 1 * $10 + 9], a ld a, $1 ld [hSpriteIndexOrTextID], a - jp DisplayTextID + call DisplayTextID + ret Route22GateScriptCoords: ; 1e6b5 (7:66b5) db 2,4 @@ -59,7 +62,7 @@ Route22GateTextPointers: ; 1e6df (7:66df) Route22GateText1: ; 1e6e1 (7:66e1) TX_ASM ld a, [wObtainedBadges] - bit 0, a + bit 0, a ; BOULDERBADGE jr nz, .asm_1e6f6 ld hl, Route22GateText_1e704 call PrintText @@ -89,4 +92,5 @@ Route22GateText_1e715: ; 1e715 (7:6715) Route22GateText_1e71a: ; 1e71a (7:671a) TX_FAR _Route22GateText_1e71a - db $0B, "@" + TX_SFX_ITEM + db "@" |