diff options
| -rw-r--r-- | data/map_header_banks.asm | 8 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 8 | ||||
| -rwxr-xr-x | main.asm | 22 | ||||
| -rwxr-xr-x | scripts/seafoamislands5.asm | 3 |
4 files changed, 31 insertions, 10 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 4ae6db8a..aa40d21b 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -159,10 +159,10 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(SafariZoneEntrance_h) db BANK(FuchsiaGym_h) db BANK(FuchsiaMeetingRoom_h) - db $11 ; db BANK(SeafoamIslands2_h) - db $11 ; db BANK(SeafoamIslands3_h) - db $11 ; db BANK(SeafoamIslands4_h) - db $11 ; db BANK(SeafoamIslands5_h) + db BANK(SeafoamIslands2_h) + db BANK(SeafoamIslands3_h) + db BANK(SeafoamIslands4_h) + db BANK(SeafoamIslands5_h) db $15 ; db BANK(VermilionHouse2_h) db $15 ; db BANK(FuchsiaHouse3_h) db $11 ; db BANK(Mansion1_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index f1ca177b..66dbf886 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -159,10 +159,10 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw SafariZoneEntrance_h dw FuchsiaGym_h dw FuchsiaMeetingRoom_h - dw $6578 ; dw SeafoamIslands2_h - dw $66b4 ; dw SeafoamIslands3_h ;id=160 - dw $67f0 ; dw SeafoamIslands4_h - dw $69fc ; dw SeafoamIslands5_h + dw SeafoamIslands2_h + dw SeafoamIslands3_h ;id=160 + dw SeafoamIslands4_h + dw SeafoamIslands5_h dw $6054 ; dw VermilionHouse2_h dw $6160 ; dw FuchsiaHouse3_h dw $4344 ; dw Mansion1_h @@ -852,7 +852,27 @@ SSAnne3Blocks: INCBIN "maps/ssanne3.blk" dr $44a0d,$45077 LoadSpinnerArrowTiles: ; 45077 (11:5077) - dr $45077,$46bf3 + dr $45077,$46578 + +INCLUDE "data/mapHeaders/seafoamislands2.asm" +INCLUDE "scripts/seafoamislands2.asm" +INCLUDE "data/mapObjects/seafoamislands2.asm" +SeafoamIslands2Blocks: INCBIN "maps/seafoamislands2.blk" + +INCLUDE "data/mapHeaders/seafoamislands3.asm" +INCLUDE "scripts/seafoamislands3.asm" +INCLUDE "data/mapObjects/seafoamislands3.asm" +SeafoamIslands3Blocks: INCBIN "maps/seafoamislands3.blk" + +INCLUDE "data/mapHeaders/seafoamislands4.asm" +INCLUDE "scripts/seafoamislands4.asm" +INCLUDE "data/mapObjects/seafoamislands4.asm" +SeafoamIslands4Blocks: INCBIN "maps/seafoamislands4.blk" + +INCLUDE "data/mapHeaders/seafoamislands5.asm" +INCLUDE "scripts/seafoamislands5.asm" +INCLUDE "data/mapObjects/seafoamislands5.asm" +SeafoamIslands5Blocks: INCBIN "maps/seafoamislands5.blk" INCLUDE "engine/overworld/dungeon_warps.asm" diff --git a/scripts/seafoamislands5.asm b/scripts/seafoamislands5.asm index f8b7aed7..5901c5ca 100755 --- a/scripts/seafoamislands5.asm +++ b/scripts/seafoamislands5.asm @@ -6,8 +6,9 @@ SeafoamIslands5Script: ; 46799 (11:6799) SeafoamIslands5Script_467a5: ; 467a5 (11:67a5) xor a - ld [wSeafoamIslands5CurScript], a ld [wJoyIgnore], a + ld [wSeafoamIslands5CurScript], a + ld [W_CURMAPSCRIPT], a ret SeafoamIslands5ScriptPointers: ; 467ad (11:67ad) |