diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-30 09:47:14 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-30 09:47:14 -0400 |
| commit | 0cf9f485b14d7431ff2a976e7fac491b2369c726 (patch) | |
| tree | 56686057c13e76a35fa45195859e996daaee7e58 | |
| parent | 5d6f3ec1d4f24bb2598359402c361f2ec47546da (diff) | |
Guys we need to disassemble Misty
| -rw-r--r-- | data/map_header_banks.asm | 2 | ||||
| -rw-r--r-- | data/map_header_pointers.asm | 2 | ||||
| -rwxr-xr-x | main.asm | 8 | ||||
| -rwxr-xr-x | scripts/ceruleangym.asm | 3 |
4 files changed, 11 insertions, 4 deletions
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 65579280..9e0e0e20 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -65,7 +65,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(CeruleanHouseTrashed_h) db BANK(CeruleanHouse1_h) db BANK(CeruleanPokecenter_h) - db $17 ; db BANK(CeruleanGym_h) + db BANK(CeruleanGym_h) db $07 ; db BANK(BikeShop_h) db $17 ; db BANK(CeruleanMart_h) db $12 ; db BANK(MtMoonPokecenter_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index d80f85f5..599fecb2 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -65,7 +65,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw CeruleanHouseTrashed_h dw CeruleanHouse1_h dw CeruleanPokecenter_h - dw $4577 ; dw CeruleanGym_h + dw CeruleanGym_h dw $5038 ; dw BikeShop_h dw $4757 ; dw CeruleanMart_h dw $52a9 ; dw MtMoonPokecenter_h @@ -1160,7 +1160,13 @@ INCLUDE "data/mapObjects/ceruleanpokecenter.asm" CeruleanPokecenterBlocks: INCBIN "maps/ceruleanpokecenter.blk" - dr $5c577,$5d485 +INCLUDE "data/mapHeaders/ceruleangym.asm" +INCLUDE "scripts/ceruleangym.asm" +INCLUDE "data/mapObjects/ceruleangym.asm" +CeruleanGymBlocks: +INCBIN "maps/ceruleangym.blk" + + dr $5c757,$5d485 INCLUDE "data/mapHeaders/viridianforestexit.asm" INCLUDE "scripts/viridianforestexit.asm" diff --git a/scripts/ceruleangym.asm b/scripts/ceruleangym.asm index fe0faea0..f1ef4c43 100755 --- a/scripts/ceruleangym.asm +++ b/scripts/ceruleangym.asm @@ -55,6 +55,7 @@ CeruleanGymScript_5c70d: ; 5c70d (17:470d) call DisplayTextID SetEvent EVENT_GOT_TM11 jr .asm_5c736 + .BagFull ld a, $7 ld [hSpriteIndexOrTextID], a @@ -158,7 +159,7 @@ CeruleanGymText7: ; 5c7d3 (17:47d3) CeruleanGymText_5c7d8: ; 5c7d8 (17:47d8) TX_FAR _CeruleanGymText_5c7d8 - db $11, $6, "@" + db "@" CeruleanGymText2: ; 5c7df (17:47df) TX_ASM |