diff options
| -rw-r--r-- | engine/bank3c.asm | 6 | ||||
| -rwxr-xr-x | main.asm | 18 | ||||
| -rwxr-xr-x | scripts/route1.asm | 46 | ||||
| -rwxr-xr-x | scripts/route1_2.asm | 53 |
4 files changed, 80 insertions, 43 deletions
diff --git a/engine/bank3c.asm b/engine/bank3c.asm index e8121bb1..efb0c25f 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -345,7 +345,11 @@ NurseChanseyText: dr $f0f26, $f18bb INCLUDE "scripts/viridiancity2.asm" - dr $f1a0f, $f220e + dr $f1a0f, $f1ad2 + +INCLUDE "scripts/route1_2.asm" + + dr $f1b27, $f220e INCLUDE "data/mapHeaders/beach_house.asm" INCLUDE "scripts/beach_house.asm" @@ -236,10 +236,10 @@ INCLUDE "data/mapHeaders/celadoncity.asm" INCLUDE "data/mapObjects/celadoncity.asm" CeladonCityBlocks: INCBIN "maps/celadoncity.blk" - dr $182a1,$18357 ; headers, objects, blocks + dr $182a1,$182fd ; headers, objects, blocks ; INCLUDE "data/mapHeaders/pallettown.asm" ; INCLUDE "data/mapObjects/pallettown.asm" -; PalletTownBlocks: INCBIN "maps/pallettown.blk" +PalletTownBlocks: INCBIN "maps/pallettown.blk" INCLUDE "data/mapHeaders/viridiancity.asm" INCLUDE "data/mapObjects/viridiancity.asm" @@ -283,8 +283,14 @@ INCLUDE "engine/overworld/doors.asm" INCLUDE "engine/overworld/ledges.asm" SECTION "bank07",ROMX,BANK[$07] - - dr $1c000,$1c0fc ; headers, objects, blocks +; INCLUDE "data/mapHeaders/cinnabarisland.asm" +; INCLUDE "data/mapObjects/cinnabarisland.asm" + dr $1c000,$1c069 ; headers, objects, blocks +CinnabarIslandBlocks: +INCBIN "maps/cinnabarisland.blk" + +INCLUDE "data/mapHeaders/route1.asm" +INCLUDE "data/mapObjects/route1.asm" Route1Blocks: ; 1c0fc INCBIN "maps/route1.blk" dr $1c1b0,$1c21e ; headers, objects, blocks @@ -292,7 +298,9 @@ INCBIN "maps/route1.blk" INCLUDE "engine/clear_save.asm" INCLUDE "engine/predefs7.asm" - dr $1c2c2,$1e2ae ; map scripts + dr $1c2c2,$1c358 ; map scripts +INCLUDE "scripts/route1.asm" + dr $1c386,$1e2ae ; map scripts INCLUDE "engine/menu/oaks_pc.asm" diff --git a/scripts/route1.asm b/scripts/route1.asm index 926ffd20..8c7cc0e9 100755 --- a/scripts/route1.asm +++ b/scripts/route1.asm @@ -1,5 +1,6 @@ Route1Script: ; 1caaf (7:4aaf) - jp EnableAutoTextBoxDrawing + call EnableAutoTextBoxDrawing + ret Route1TextPointers: ; 1cab2 (7:4ab2) dw Route1Text1 @@ -8,44 +9,15 @@ Route1TextPointers: ; 1cab2 (7:4ab2) Route1Text1: ; 1cab8 (7:4ab8) TX_ASM - CheckAndSetEvent EVENT_GOT_POTION_SAMPLE - jr nz, .asm_1cada - ld hl, Route1ViridianMartSampleText - call PrintText - lb bc, POTION, 1 - call GiveItem - jr nc, .BagFull - ld hl, Route1Text_1cae8 - jr .asm_1cadd -.BagFull - ld hl, Route1Text_1caf3 - jr .asm_1cadd -.asm_1cada - ld hl, Route1Text_1caee -.asm_1cadd - call PrintText + callba Func_f1ad2 jp TextScriptEnd -Route1ViridianMartSampleText: ; 1cae3 (7:4ae3) - TX_FAR _Route1ViridianMartSampleText - db "@" - -Route1Text_1cae8: ; 1cae8 (7:4ae8) - TX_FAR _Route1Text_1cae8 - db $0b,"@" - -Route1Text_1caee: ; 1caee (7:4aee) - TX_FAR _Route1Text_1caee - db "@" - -Route1Text_1caf3: ; 1caf3 (7:4af3) - TX_FAR _Route1Text_1caf3 - db "@" - Route1Text2: ; 1caf8 (7:4af8) - TX_FAR _Route1Text2 - db "@" + TX_ASM + callba Func_f1b0f + jp TextScriptEnd Route1Text3: ; 1cafd (7:4afd) - TX_FAR _Route1Text3 - db "@" + TX_ASM + callba Func_f1b1b + jp TextScriptEnd diff --git a/scripts/route1_2.asm b/scripts/route1_2.asm new file mode 100755 index 00000000..35ffb137 --- /dev/null +++ b/scripts/route1_2.asm @@ -0,0 +1,53 @@ +Func_f1ad2: + CheckAndSetEvent EVENT_GOT_POTION_SAMPLE + jr nz, .asm_1cada + ld hl, Route1ViridianMartSampleText + call PrintText + lb bc, POTION, 1 + call GiveItem + jr nc, .BagFull + ld hl, Route1Text_f1aff + jr .asm_1cadd +.BagFull + ld hl, Route1Text_f1b0a + jr .asm_1cadd +.asm_1cada + ld hl, Route1Text_f1b05 +.asm_1cadd + call PrintText + ret + +Route1ViridianMartSampleText: ; 1cae3 (7:4ae3) + TX_FAR _Route1ViridianMartSampleText + db "@" + +Route1Text_f1aff: ; 1cae8 (7:4ae8) + TX_FAR _Route1Text_1cae8 + TX_SFX_ITEM + db "@" + +Route1Text_f1b05: ; 1caee (7:4aee) + TX_FAR _Route1Text_1caee + db "@" + +Route1Text_f1b0a: ; 1caf3 (7:4af3) + TX_FAR _Route1Text_1caf3 + db "@" + +Func_f1b0f: ; 1caf8 (7:4af8) + ld hl, Route1Text_f1b16 + call PrintText + ret + +Route1Text_f1b16: + TX_FAR _Route1Text2 + db "@" + +Func_f1b1b: ; 1cafd (7:4afd) + ld hl, Route1Text_f1b22 + call PrintText + ret + +Route1Text_f1b22: + TX_FAR _Route1Text3 + db "@" |