diff options
| -rwxr-xr-x | data/mapObjects/route6.asm | 4 | ||||
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 6 | ||||
| -rwxr-xr-x | scripts/route6.asm | 6 |
5 files changed, 13 insertions, 7 deletions
diff --git a/data/mapObjects/route6.asm b/data/mapObjects/route6.asm index 19ac2a8a..c854c91f 100755 --- a/data/mapObjects/route6.asm +++ b/data/mapObjects/route6.asm @@ -11,8 +11,8 @@ Route6Object: ; 0x58022 (size=87) db $f, $13, $7 ; Route6Text7 db $6 ; objects - object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR_TRAINER_M, $4 - object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR_TRAINER_F, $2 + object SPRITE_BLACK_HAIR_BOY_1, $a, $15, STAY, RIGHT, $1, OPP_JR_TRAINER_M, $a + object SPRITE_LASS, $b, $15, STAY, LEFT, $2, OPP_JR_TRAINER_F, $19 object SPRITE_BUG_CATCHER, $0, $f, STAY, RIGHT, $3, OPP_BUG_CATCHER, $a object SPRITE_BLACK_HAIR_BOY_1, $b, $1f, STAY, LEFT, $4, OPP_JR_TRAINER_M, $5 object SPRITE_LASS, $b, $1e, STAY, LEFT, $5, OPP_JR_TRAINER_F, $3 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 2ad544fb..1dd37cd6 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -17,7 +17,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Route3_h) ; ROUTE_3 db BANK(Route4_h) ; ROUTE_4 db BANK(Route5_h) ; ROUTE_5 - db $16 ; db BANK(Route6_h) ; ROUTE_6 + db BANK(Route6_h) ; ROUTE_6 db BANK(Route7_h) ; ROUTE_7 db $16 ; db BANK(Route8_h) ; ROUTE_8 db $15 ; db BANK(Route9_h) ; ROUTE_9 diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index bd644214..7aed33ae 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -17,7 +17,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Route3_h dw Route4_h dw Route5_h - dw $4000 ; dw Route6_h + dw Route6_h dw Route7_h dw $412d ; dw Route8_h dw $468e ; dw Route9_h @@ -873,7 +873,8 @@ INCLUDE "engine/overworld/trainers.asm" SECTION "bank16",ROMX,BANK[$16] - dr $58000,$58079 +INCLUDE "data/mapHeaders/route6.asm" +INCLUDE "data/mapObjects/route6.asm" Route6Blocks: ; 58079 INCBIN "maps/route6.blk" dr $5812d,$581c6 @@ -893,7 +894,8 @@ INCLUDE "engine/status_ailments.asm" INCLUDE "engine/overworld/oaks_aide.asm" - dr $58f47,$5a53a +INCLUDE "scripts/route6.asm" + dr $59052,$5a53a INCLUDE "engine/overworld/saffron_guards.asm" diff --git a/scripts/route6.asm b/scripts/route6.asm index e748fed1..8ef32a42 100755 --- a/scripts/route6.asm +++ b/scripts/route6.asm @@ -36,7 +36,7 @@ Route6TrainerHeader1: ; 590e3 (16:50e3) db ($0 << 4) ; trainer's view range dwEventFlagAddress EVENT_BEAT_ROUTE_6_TRAINER_1 dw Route6BattleText2 ; TextBeforeBattle - dw Route6AfterBattleText1 ; TextAfterBattle + dw Route6AfterBattleText2 ; TextAfterBattle dw Route6EndBattleText2 ; TextEndBattle dw Route6EndBattleText2 ; TextEndBattle @@ -110,6 +110,10 @@ Route6EndBattleText2: ; 59148 (16:5148) TX_FAR _Route6EndBattleText2 db "@" +Route6AfterBattleText2: + TX_FAR _Route6AfterBattleText2 + db "@" + Route6Text3: ; 5914d (16:514d) TX_ASM ld hl, Route6TrainerHeader2 |