diff options
| -rw-r--r-- | data/map_header_banks.asm | 42 | ||||
| -rw-r--r-- | engine/bank3c.asm | 1 | ||||
| -rwxr-xr-x | main.asm | 9 | ||||
| -rwxr-xr-x | scripts/celadoncity.asm | 16 | ||||
| -rwxr-xr-x | scripts/vermilioncity2.asm | 2 | ||||
| -rwxr-xr-x | wram.asm | 4 |
6 files changed, 42 insertions, 32 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 207dc937..7e730780 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -105,19 +105,19 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $18 ; db BANK(SSAnne8_h) db $18 ; db BANK(SSAnne9_h) db $18 ; db BANK(SSAnne10_h) - db $1d ; db $1D ;unused - db $1d ; db $1D ;unused - db $1d ; db $1D ;unused + db $1d ; unused + db $1d ; unused + db $1d ; unused db $17 ; db BANK(VictoryRoad1_h) - db $1d ; db $1D ;unused - db $1d ; db $1D ;unused - db $1d ; db $1D ;unused - db $1d ; db $1D ;unused + db $1d ; unused + db $1d ; unused + db $1d ; unused + db $1d ; unused db $16 ; db BANK(Lance_h) - db $1d ; db $1D ;unused - db $1d ; db $1D ;unused - db $1d ; db $1D ;unused - db $1d ; db $1D ;unused + db $1d ; unused + db $1d ; unused + db $1d ; unused + db $1d ; unused db $16 ; db BANK(HallofFameRoom_h) db $18 ; db BANK(UndergroundPathNS_h) db $1d ; db BANK(Gary_h) @@ -204,9 +204,9 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $11 ; db BANK(RocketHideout3_h) db $11 ; db BANK(RocketHideout4_h) db $11 ; db BANK(RocketHideoutElevator_h) - db $01 ; db $01 - db $01 ; db $01 - db $01 ; db $01 + db $01 ; unused + db $01 ; unused + db $01 ; unused db $16 ; db BANK(SilphCo2_h) db $16 ; db BANK(SilphCo3_h) db $06 ; db BANK(SilphCo4_h) @@ -231,20 +231,20 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $1d ; db BANK(UnknownDungeon1_h) db $07 ; db BANK(NameRater_h) db $1d ; db BANK(CeruleanHouse2_h) - db $01 ; db $01 + db $01 ; unused db $11 ; db BANK(RockTunnel2_h) db $17 ; db BANK(SilphCo9_h) db $16 ; db BANK(SilphCo10_h) db $18 ; db BANK(SilphCo11_h) db $11 ; db BANK(SilphCoElevator_h) - db $11 ; db $11 - db $11 ; db $11 + db $11 ; unused + db $11 ; unused db BANK(TradeCenter_h) db BANK(Colosseum_h) - db $11 ; db $11 - db $11 ; db $11 - db $11 ; db $11 - db $11 ; db $11 + db $11 ; unused + db $11 ; unused + db $11 ; unused + db $11 ; unused db $1d ; db BANK(Lorelei_h) db $1d ; db BANK(Bruno_h) db $1d ; db BANK(Agatha_h) diff --git a/engine/bank3c.asm b/engine/bank3c.asm index 7cb6ae5d..35be938e 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -346,6 +346,7 @@ NurseChanseyText: INCLUDE "scripts/viridiancity2.asm" INCLUDE "scripts/vermilioncity2.asm" +INCLUDE "scripts/celadoncity2.asm" INCLUDE "scripts/route1_2.asm" dr $f1b27, $f220e @@ -261,7 +261,6 @@ CeruleanCityBlocks: INCBIN "maps/ceruleancity.blk" ; 18836 ; INCLUDE "data/mapObjects/fuchsiacity.asm" ; FuchsiaCityBlocks: INCBIN "maps/fuchsiacity.blk" - ; dr $18dee,$1902a ; map scripts INCLUDE "scripts/pallettown.asm" INCLUDE "scripts/viridiancity.asm" @@ -270,11 +269,9 @@ INCLUDE "scripts/ceruleancity.asm" dr $19841,$19a43 ; vermilion scripts ; INCLUDE "scripts/vermilioncity.asm" -; INCLUDE "scripts/celadoncity.asm" -CeladonCityScript: - dr $19a43,$19a5f -CeladonCityTextPointers: - dr $19a5f,$1a4ea +INCLUDE "scripts/celadoncity.asm" + + dr $19b2b,$1a4ea ; INCLUDE "scripts/fuchsiacity.asm" INCLUDE "engine/overworld/npc_movement.asm" diff --git a/scripts/celadoncity.asm b/scripts/celadoncity.asm index cfc8f197..233b38bd 100755 --- a/scripts/celadoncity.asm +++ b/scripts/celadoncity.asm @@ -1,5 +1,14 @@ -CeladonCityScript: ; 19956 (6:5956) +CeladonCityScript: ; 19a43 (6:5a43) call EnableAutoTextBoxDrawing + ld hl, CeladonCityScriptPointers + ld a, [W_CELADONCITYCURSCRIPT] + call JumpTable + ret + +CeladonCityScriptPointers: + dw CeladonCityScript1 + +CeladonCityScript1: ResetEvents EVENT_1B8, EVENT_1BF ResetEvent EVENT_67F ret @@ -99,8 +108,9 @@ CeladonCityText9: ; 199fe (6:59fe) db "@" CeladonCityText10: ; 19a03 (6:5a03) - TX_FAR _CeladonCityText10 - db "@" + TX_ASM + callba Func_f1ac6 + jp TextScriptEnd CeladonCityText11: ; 19a08 (6:5a08) TX_FAR _CeladonCityText11 diff --git a/scripts/vermilioncity2.asm b/scripts/vermilioncity2.asm index 4a068f88..7eee7b1f 100755 --- a/scripts/vermilioncity2.asm +++ b/scripts/vermilioncity2.asm @@ -65,4 +65,4 @@ OfficerJennyText5: TX_FAR _OfficerJennyText5 db "@" - dr $f1a8a,$f1ad2 + dr $f1a8a,$f1ac6 @@ -2852,7 +2852,9 @@ W_MANSION4CURSCRIPT:: ; d63e W_VICTORYROAD2CURSCRIPT:: ; d63f ds 1 W_VICTORYROAD3CURSCRIPT:: ; d640 - ds 2 + ds 1 +W_CELADONCITYCURSCRIPT:: + ds 1 W_FIGHTINGDOJOCURSCRIPT:: ; d642 ds 1 W_SILPHCO2CURSCRIPT:: ; d643 |