diff options
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rw-r--r-- | macros.asm | 3 | ||||
| -rwxr-xr-x | scripts/celadonprizeroom.asm | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 8e5dea1e..e32354f1 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -137,7 +137,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeladonGym_h) db BANK(CeladonGameCorner_h) db BANK(CeladonMart5_h) - db $12 ; db BANK(CeladonPrizeRoom_h) + db BANK(CeladonPrizeRoom_h) db $12 ; db BANK(CeladonDiner_h) db $12 ; db BANK(CeladonHouse_h) db $12 ; db BANK(CeladonHotel_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 2f51f36e..62179537 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -137,7 +137,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeladonGym_h dw CeladonGameCorner_h dw CeladonMart5_h - dw $5107 ; dw CeladonPrizeRoom_h + dw CeladonPrizeRoom_h dw $5168 ; dw CeladonDiner_h dw $51e8 ; dw CeladonHouse_h dw $5243 ; dw CeladonHotel_h ;id=140 @@ -352,7 +352,8 @@ TX_FAR: MACRO TX_CABLE_CLUB_RECEPTIONIST EQUS "db $f6" -TX_POKECENTER_NURSE EQUS "db $ff" +TX_PRIZE_VENDOR EQUS "db $f7" +TX_POKECENTER_NURSE EQUS "db $ff" ; Predef macro. predef_const: MACRO diff --git a/scripts/celadonprizeroom.asm b/scripts/celadonprizeroom.asm index 2cfd01d0..980778fe 100755 --- a/scripts/celadonprizeroom.asm +++ b/scripts/celadonprizeroom.asm @@ -17,4 +17,4 @@ CeladonPrizeRoomText2: ; 49102 (12:5102) db "@" CeladonPrizeRoomText3: ; 49107 (12:5107) - db $f7 + TX_PRIZE_VENDOR |