diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 14:25:37 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-31 14:25:37 -0400 |
| commit | 170d64252d483590d49063c0e72b52e3f5fb9bb3 (patch) | |
| tree | 6f5e0fef2ca7294e1b67e88489c4e5aaeaa3dbd4 | |
| parent | 39d56456103403d9a224908eafb2ecb08c1f2b9f (diff) | |
Lance's room and its clones
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 24 | ||||
| -rwxr-xr-x | main.asm | 9 | ||||
| -rwxr-xr-x | scripts/lance.asm | 13 |
4 files changed, 27 insertions, 21 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 2e75a0f1..92d75610 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -113,7 +113,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $1d ; unused db $1d ; unused db $1d ; unused - db $16 ; db BANK(Lance_h) + db BANK(Lance_h) db $1d ; unused db $1d ; unused db $1d ; unused diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 8997bdb4..81753ba0 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -105,19 +105,19 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw SSAnne8_h dw SSAnne9_h dw SSAnne10_h - dw $623d ; dw Lance_h ; unused - dw $623d ; dw Lance_h ; unused - dw $623d ; dw Lance_h ; unused + dw Lance_h ; unused + dw Lance_h ; unused + dw Lance_h ; unused dw VictoryRoad1_h - dw $623d ; dw Lance_h ; unused - dw $623d ; dw Lance_h ; unused ;id=110 - dw $623d ; dw Lance_h ; unused - dw $623d ; dw Lance_h ; unused - dw $623d ; dw Lance_h - dw $623d ; dw Lance_h ; unused - dw $623d ; dw Lance_h ; unused - dw $623d ; dw Lance_h ; unused - dw $623d ; dw Lance_h ; unused + dw Lance_h ; unused + dw Lance_h ; unused ;id=110 + dw Lance_h ; unused + dw Lance_h ; unused + dw Lance_h + dw Lance_h ; unused + dw Lance_h ; unused + dw Lance_h ; unused + dw Lance_h ; unused dw $642d ; dw HallofFameRoom_h dw $5f31 ; dw UndergroundPathNS_h dw $57a0 ; dw Gary_h ;id=120 @@ -1224,7 +1224,14 @@ INCLUDE "scripts/fanclub.asm" INCLUDE "data/mapObjects/fanclub.asm" FanClubBlocks: INCBIN "maps/fanclub.blk" - dr $59c80,$5a53a + dr $59c80,$5a23d + +INCLUDE "data/mapHeaders/lance.asm" +INCLUDE "scripts/lance.asm" +INCLUDE "data/mapObjects/lance.asm" +LanceBlocks: +INCBIN "maps/lance.blk" + dr $5a42d,$5a53a INCLUDE "engine/overworld/saffron_guards.asm" diff --git a/scripts/lance.asm b/scripts/lance.asm index 4d9d393c..564e7ef1 100755 --- a/scripts/lance.asm +++ b/scripts/lance.asm @@ -17,22 +17,21 @@ LanceScript_5a2c4: ; 5a2c4 (16:62c4) jr nz, .asm_5a2da ld a, $31 ld b, $32 - jp LanceScript_5a2de + jp .asm_5a2de + .asm_5a2da ld a, $72 ld b, $73 - -LanceScript_5a2de: ; 5a2de (16:62de) +.asm_5a2de push bc ld [wNewTileBlockID], a lb bc, 6, 2 - call LanceScript_5a2f0 + call .asm_5a2f0 pop bc ld a, b ld [wNewTileBlockID], a lb bc, 6, 3 - -LanceScript_5a2f0: ; 5a2f0 (16:62f0) +.asm_5a2f0 predef_jump ReplaceTileBlock LanceScript_5a2f5: ; 5a2f5 (16:62f5) @@ -107,7 +106,7 @@ LanceScript_5a35b: ; 5a35b (16:635b) ret RLEList_5a379: ; 5a379 (16:6379) - db D_UP, $0C + db D_UP, $0D db D_LEFT, $0C db D_DOWN, $07 db D_LEFT, $06 |