From 1d93d0da4b1c576a1ed155bc76991daca772966c Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 3 Jun 2016 18:19:38 -0400 Subject: Remaining maps in Bank 16 --- data/map_header_banks.asm | 6 +++--- data/map_header_pointers.asm | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'data') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 04bee42f..d605c3ea 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -207,8 +207,8 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $01 ; unused db $01 ; unused db $01 ; unused - db $16 ; db BANK(SilphCo2_h) - db $16 ; db BANK(SilphCo3_h) + db BANK(SilphCo2_h) + db BANK(SilphCo3_h) db $06 ; db BANK(SilphCo4_h) db $06 ; db BANK(SilphCo5_h) db $06 ; db BANK(SilphCo6_h) @@ -234,7 +234,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $01 ; unused db $11 ; db BANK(RockTunnel2_h) db $17 ; db BANK(SilphCo9_h) - db $16 ; db BANK(SilphCo10_h) + db BANK(SilphCo10_h) db $18 ; db BANK(SilphCo11_h) db $11 ; db BANK(SilphCoElevator_h) db $11 ; unused diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 501724af..6bb5806f 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -207,8 +207,8 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw RocketHideoutElevator_h ; unused dw RocketHideoutElevator_h ; unused dw RocketHideoutElevator_h ; unused - dw $5c80 ; dw SilphCo2_h - dw $5eea ; dw SilphCo3_h + dw SilphCo2_h + dw SilphCo3_h dw $5e09 ; dw SilphCo4_h dw $6035 ; dw SilphCo5_h ;210 dw $62a7 ; dw SilphCo6_h @@ -234,17 +234,17 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $5649 ; dw Route16Gate_h ; unused dw $624e ; dw RockTunnel2_h dw $56ba ; dw SilphCo9_h - dw $60c8 ; dw SilphCo10_h + dw SilphCo10_h dw $6105 ; dw SilphCo11_h dw $5a08 ; dw SilphCoElevator_h - dw $5c80 ; dw SilphCo2_h ; unused - dw $5c80 ; dw SilphCo2_h ; unused + dw SilphCo2_h ; unused + dw SilphCo2_h ; unused dw TradeCenter_h dw Colosseum_h - dw $5c80 ; dw SilphCo2_h ; unused - dw $5c80 ; dw SilphCo2_h ; unused - dw $5c80 ; dw SilphCo2_h ; unused - dw $5c80 ; dw SilphCo2_h ; unused + dw SilphCo2_h ; unused + dw SilphCo2_h ; unused + dw SilphCo2_h ; unused + dw SilphCo2_h ; unused dw $59ef ; dw Lorelei_h dw $5b4a ; dw Bruno_h dw $5ca1 ; dw Agatha_h ;247 -- cgit v1.3.1-sl0p From e1bc6849b844d819e13cc6b4fe246bc73cf7b5c2 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 3 Jun 2016 19:09:30 -0400 Subject: Remaining maps in Bank 06 --- data/map_header_banks.asm | 6 +++--- data/map_header_pointers.asm | 6 +++--- main.asm | 16 +++++++++++++++- 3 files changed, 21 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index d605c3ea..14c096dd 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -209,9 +209,9 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $01 ; unused db BANK(SilphCo2_h) db BANK(SilphCo3_h) - db $06 ; db BANK(SilphCo4_h) - db $06 ; db BANK(SilphCo5_h) - db $06 ; db BANK(SilphCo6_h) + db BANK(SilphCo4_h) + db BANK(SilphCo5_h) + db BANK(SilphCo6_h) db $14 ; db BANK(SilphCo7_h) db $15 ; db BANK(SilphCo8_h) db $14 ; db BANK(Mansion2_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 6bb5806f..672f8c75 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -209,9 +209,9 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw RocketHideoutElevator_h ; unused dw SilphCo2_h dw SilphCo3_h - dw $5e09 ; dw SilphCo4_h - dw $6035 ; dw SilphCo5_h ;210 - dw $62a7 ; dw SilphCo6_h + dw SilphCo4_h + dw SilphCo5_h ;210 + dw SilphCo6_h dw $5b97 ; dw SilphCo7_h dw $652a ; dw SilphCo8_h dw $5ff5 ; dw Mansion2_h diff --git a/main.asm b/main.asm index f3807631..bf650f4b 100755 --- a/main.asm +++ b/main.asm @@ -282,7 +282,21 @@ INCLUDE "data/mapHeaders/indigoplateaulobby.asm" INCLUDE "scripts/indigoplateaulobby.asm" INCLUDE "data/mapObjects/indigoplateaulobby.asm" IndigoPlateauLobbyBlocks: INCBIN "maps/indigoplateaulobby.blk" - dr $19e09,$1a4ea + +INCLUDE "data/mapHeaders/silphco4.asm" +INCLUDE "scripts/silphco4.asm" +INCLUDE "data/mapObjects/silphco4.asm" +SilphCo4Blocks: INCBIN "maps/silphco4.blk" + +INCLUDE "data/mapHeaders/silphco5.asm" +INCLUDE "scripts/silphco5.asm" +INCLUDE "data/mapObjects/silphco5.asm" +SilphCo5Blocks: INCBIN "maps/silphco5.blk" + +INCLUDE "data/mapHeaders/silphco6.asm" +INCLUDE "scripts/silphco6.asm" +INCLUDE "data/mapObjects/silphco6.asm" +SilphCo6Blocks: INCBIN "maps/silphco6.blk" INCLUDE "engine/overworld/npc_movement.asm" INCLUDE "engine/overworld/doors.asm" -- cgit v1.3.1-sl0p From 718ae4194bb53e50419f9cdbb8e40294bd568aaa Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 3 Jun 2016 19:25:57 -0400 Subject: Remaining maps in bank 14 --- data/map_header_banks.asm | 10 +++++----- data/map_header_pointers.asm | 10 +++++----- main.asm | 35 ++++++++++++++++++++++++++--------- scripts/silphco7.asm | 24 +++++------------------- 4 files changed, 41 insertions(+), 38 deletions(-) (limited to 'data') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 14c096dd..3f4e1298 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -212,11 +212,11 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(SilphCo4_h) db BANK(SilphCo5_h) db BANK(SilphCo6_h) - db $14 ; db BANK(SilphCo7_h) + db BANK(SilphCo7_h) db $15 ; db BANK(SilphCo8_h) - db $14 ; db BANK(Mansion2_h) - db $14 ; db BANK(Mansion3_h) - db $14 ; db BANK(Mansion4_h) + db BANK(Mansion2_h) + db BANK(Mansion3_h) + db BANK(Mansion4_h) db $11 ; db BANK(SafariZoneEast_h) db $11 ; db BANK(SafariZoneNorth_h) db $12 ; db BANK(SafariZoneWest_h) @@ -229,7 +229,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $11 ; db BANK(UnknownDungeon2_h) db $11 ; db BANK(UnknownDungeon3_h) db $1d ; db BANK(UnknownDungeon1_h) - db $07 ; db BANK(NameRater_h) + db BANK(NameRater_h) db $1d ; db BANK(CeruleanHouse2_h) db $01 ; unused db $11 ; db BANK(RockTunnel2_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 672f8c75..fde48bbc 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -212,11 +212,11 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw SilphCo4_h dw SilphCo5_h ;210 dw SilphCo6_h - dw $5b97 ; dw SilphCo7_h + dw SilphCo7_h dw $652a ; dw SilphCo8_h - dw $5ff5 ; dw Mansion2_h - dw $620b ; dw Mansion3_h - dw $63d6 ; dw Mansion4_h + dw Mansion2_h + dw Mansion3_h + dw Mansion4_h dw $5ab3 ; dw SafariZoneEast_h dw $5bf3 ; dw SafariZoneNorth_h dw $635a ; dw SafariZoneWest_h @@ -229,7 +229,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $6053 ; dw UnknownDungeon2_h dw $6141 ; dw UnknownDungeon3_h dw $453d ; dw UnknownDungeon1_h - dw $530e ; dw NameRater_h + dw NameRater_h dw $4643 ; dw CeruleanHouse2_h dw $5649 ; dw Route16Gate_h ; unused dw $624e ; dw RockTunnel2_h diff --git a/main.asm b/main.asm index bf650f4b..d9d4089e 100755 --- a/main.asm +++ b/main.asm @@ -323,7 +323,8 @@ LavenderHouse1Blocks: LavenderHouse2Blocks: SaffronHouse1Blocks: SaffronHouse2Blocks: -Route16HouseBlocks: INCBIN "maps/viridianhouse.blk" +Route16HouseBlocks: +NameRaterBlocks: INCBIN "maps/viridianhouse.blk" SchoolBlocks: CeladonMansion5Blocks: INCBIN "maps/school.blk" CeruleanHouseTrashedBlocks: INCBIN "maps/ceruleanhousetrashed.blk" @@ -382,7 +383,10 @@ INCLUDE "data/mapObjects/lavenderhouse1.asm" INCLUDE "data/mapHeaders/lavenderhouse2.asm" INCLUDE "scripts/lavenderhouse2.asm" INCLUDE "data/mapObjects/lavenderhouse2.asm" - dr $1d30e,$1d3f8 ; map scripts + +INCLUDE "data/mapHeaders/namerater.asm" +INCLUDE "scripts/namerater.asm" +INCLUDE "data/mapObjects/namerater.asm" INCLUDE "data/mapHeaders/vermilionhouse1.asm" INCLUDE "scripts/vermilionhouse1.asm" @@ -1248,13 +1252,26 @@ INCLUDE "scripts/mtmoon2.asm" INCLUDE "data/mapObjects/mtmoon2.asm" MtMoon2Blocks: INCBIN "maps/mtmoon2.blk" - dr $51b97,$52060 -Mansion2Script_Switches: - dr $52060,$522a3 -Mansion3Script_Switches: - dr $522a3,$52449 -Mansion4Script_Switches: - dr $52449,$525d8 +INCLUDE "data/mapHeaders/silphco7.asm" +INCLUDE "scripts/silphco7.asm" +INCLUDE "data/mapObjects/silphco7.asm" +SilphCo7Blocks: INCBIN "maps/silphco7.blk" + +INCLUDE "data/mapHeaders/mansion2.asm" +INCLUDE "scripts/mansion2.asm" +INCLUDE "data/mapObjects/mansion2.asm" +Mansion2Blocks: INCBIN "maps/mansion2.blk" + +INCLUDE "data/mapHeaders/mansion3.asm" +INCLUDE "scripts/mansion3.asm" +INCLUDE "data/mapObjects/mansion3.asm" +Mansion3Blocks: INCBIN "maps/mansion3.blk" + +INCLUDE "data/mapHeaders/mansion4.asm" +INCLUDE "scripts/mansion4.asm" +INCLUDE "data/mapObjects/mansion4.asm" +Mansion4Blocks: INCBIN "maps/mansion4.blk" + INCLUDE "engine/overworld/card_key.asm" INCLUDE "engine/menu/prize_menu.asm" diff --git a/scripts/silphco7.asm b/scripts/silphco7.asm index 0735d437..1634472b 100755 --- a/scripts/silphco7.asm +++ b/scripts/silphco7.asm @@ -130,9 +130,7 @@ SilphCo7Script0: ; 51c23 (14:5c23) ld [wJoyIgnore], a ld a, PLAYER_DIR_DOWN ld [wPlayerMovingDirection], a - ld a, $ff - ld [wNewSoundID], a - call PlaySound + call StopAllMusic ld c, BANK(Music_MeetRival) ld a, MUSIC_MEET_RIVAL call PlayMusic @@ -186,21 +184,11 @@ SilphCo7Script3: ; 51c82 (14:5c82) ld a, OPP_SONY2 ld [wCurOpponent], a ld a, [W_RIVALSTARTER] - cp STARTER2 - jr nz, .asm_51cb6 - ld a, $7 - jr .asm_51cc0 -.asm_51cb6 - cp STARTER3 - jr nz, .asm_51cbe - ld a, $8 - jr .asm_51cc0 -.asm_51cbe - ld a, $9 -.asm_51cc0 + add 4 ld [wTrainerNo], a ld a, $4 - jp SilphCo7Text_51c10 + call SilphCo7Text_51c10 + ret SilphCo7Script4: ; 51cc8 (14:5cc8) ld a, [wIsInBattle] @@ -219,9 +207,7 @@ SilphCo7Script4: ; 51cc8 (14:5cc8) ld a, $f ld [hSpriteIndexOrTextID], a call DisplayTextID - ld a, $ff - ld [wNewSoundID], a - call PlaySound + call StopAllMusic callba Music_RivalAlternateStart ld de, MovementData_51d1d ld a, [wcf0d] -- cgit v1.3.1-sl0p From a4aae63a38867c65473756a265b7808e497812cb Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 3 Jun 2016 19:31:07 -0400 Subject: Remaining map in bank 15 --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 3f4e1298..d0379b37 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -213,7 +213,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(SilphCo5_h) db BANK(SilphCo6_h) db BANK(SilphCo7_h) - db $15 ; db BANK(SilphCo8_h) + db BANK(SilphCo8_h) db BANK(Mansion2_h) db BANK(Mansion3_h) db BANK(Mansion4_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index fde48bbc..54e7dc96 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -213,7 +213,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw SilphCo5_h ;210 dw SilphCo6_h dw SilphCo7_h - dw $652a ; dw SilphCo8_h + dw SilphCo8_h dw Mansion2_h dw Mansion3_h dw Mansion4_h diff --git a/main.asm b/main.asm index d9d4089e..fb68b65a 100755 --- a/main.asm +++ b/main.asm @@ -1357,7 +1357,11 @@ INCLUDE "data/mapObjects/daycarem.asm" INCLUDE "data/mapHeaders/route12house.asm" INCLUDE "scripts/route12house.asm" INCLUDE "data/mapObjects/route12house.asm" - dr $5652a,$56714 + +INCLUDE "data/mapHeaders/silphco8.asm" +INCLUDE "scripts/silphco8.asm" +INCLUDE "data/mapObjects/silphco8.asm" +SilphCo8Blocks: INCBIN "maps/silphco8.blk" INCLUDE "engine/menu/diploma_1.asm" -- cgit v1.3.1-sl0p From 11e4037756a6eb9978a4fe8917552f08c4ee1b7a Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 3 Jun 2016 19:36:12 -0400 Subject: Remaining map in bank 17 --- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 9 +++++++-- maps/unusedblocks58d7d.blk | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) (limited to 'data') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index d0379b37..728b8675 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -233,7 +233,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db $1d ; db BANK(CeruleanHouse2_h) db $01 ; unused db $11 ; db BANK(RockTunnel2_h) - db $17 ; db BANK(SilphCo9_h) + db BANK(SilphCo9_h) db BANK(SilphCo10_h) db $18 ; db BANK(SilphCo11_h) db $11 ; db BANK(SilphCoElevator_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 54e7dc96..5b224ec3 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -233,7 +233,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw $4643 ; dw CeruleanHouse2_h dw $5649 ; dw Route16Gate_h ; unused dw $624e ; dw RockTunnel2_h - dw $56ba ; dw SilphCo9_h + dw SilphCo9_h dw SilphCo10_h dw $6105 ; dw SilphCo11_h dw $5a08 ; dw SilphCoElevator_h diff --git a/main.asm b/main.asm index fb68b65a..1aaf8e29 100755 --- a/main.asm +++ b/main.asm @@ -1401,7 +1401,8 @@ Route16Blocks: INCBIN "maps/route16.blk" ; 58b84 INCLUDE "data/mapHeaders/route18.asm" INCLUDE "data/mapObjects/route18.asm" Route18Blocks: INCBIN "maps/route18.blk" - dr $58d7d,$58d99 + +INCBIN "maps/unusedblocks58d7d.blk" INCLUDE "engine/experience.asm" @@ -1590,7 +1591,11 @@ INCLUDE "data/mapObjects/undergroundpathentranceroute7.asm" INCLUDE "data/mapHeaders/undergroundpathentranceroute7copy.asm" INCLUDE "scripts/undergroundpathentranceroute7copy.asm" INCLUDE "data/mapObjects/undergroundpathentranceroute7copy.asm" - dr $5d6ba,$5d909 + +INCLUDE "data/mapHeaders/silphco9.asm" +INCLUDE "scripts/silphco9.asm" +INCLUDE "data/mapObjects/silphco9.asm" +SilphCo9Blocks: INCBIN "maps/silphco9.blk" INCLUDE "data/mapHeaders/victoryroad1.asm" INCLUDE "scripts/victoryroad1.asm" diff --git a/maps/unusedblocks58d7d.blk b/maps/unusedblocks58d7d.blk index 9641efe4..dd54efd9 100755 --- a/maps/unusedblocks58d7d.blk +++ b/maps/unusedblocks58d7d.blk @@ -1,2 +1,2 @@ -  !"# +  '"#  \ No newline at end of file -- cgit v1.3.1-sl0p From 35cc755f663be0810576c9348d39b6d5e811e623 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 3 Jun 2016 21:16:31 -0400 Subject: Remaining maps in Bank 11 --- data/mapObjects/unknowndungeon2.asm | 9 +++--- data/mapObjects/unknowndungeon3.asm | 8 ++++-- data/map_header_banks.asm | 20 ++++++------- data/map_header_pointers.asm | 22 +++++++------- main.asm | 57 +++++++++++++++++++++++++++++++++++-- maps/unknowndungeon1.blk | 5 ++-- maps/unknowndungeon2.blk | 10 +++++-- maps/unknowndungeon3.blk | 3 +- scripts/unknowndungeon2.asm | 1 + scripts/unknowndungeon3.asm | 2 ++ 10 files changed, 101 insertions(+), 36 deletions(-) (limited to 'data') diff --git a/data/mapObjects/unknowndungeon2.asm b/data/mapObjects/unknowndungeon2.asm index e5ebca56..88cc6ba0 100755 --- a/data/mapObjects/unknowndungeon2.asm +++ b/data/mapObjects/unknowndungeon2.asm @@ -11,10 +11,11 @@ UnknownDungeon2Object: ; 0x45e14 (size=73) db $0 ; signs - db $3 ; objects - object SPRITE_BALL, $1d, $9, STAY, NONE, $1, PP_UP - object SPRITE_BALL, $4, $f, STAY, NONE, $2, ULTRA_BALL - object SPRITE_BALL, $d, $6, STAY, NONE, $3, FULL_RESTORE + db $4 ; objects + object SPRITE_BALL, $0, $b, STAY, NONE, $1, RARE_CANDY + object SPRITE_BALL, $10, $7, STAY, NONE, $2, ULTRA_BALL + object SPRITE_BALL, $13, $b, STAY, NONE, $3, MAX_REVIVE + object SPRITE_BALL, $1b, $9, STAY, NONE, $4, FULL_RESTORE ; warp-to EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $1d ; UNKNOWN_DUNGEON_1 diff --git a/data/mapObjects/unknowndungeon3.asm b/data/mapObjects/unknowndungeon3.asm index 8b733e6b..cb2d8f83 100755 --- a/data/mapObjects/unknowndungeon3.asm +++ b/data/mapObjects/unknowndungeon3.asm @@ -6,10 +6,12 @@ UnknownDungeon3Object: ; 0x45f36 (size=34) db $0 ; signs - db $3 ; objects + db $5 ; objects object SPRITE_SLOWBRO, $1b, $d, STAY, DOWN, $1, MEWTWO, 70 - object SPRITE_BALL, $10, $9, STAY, NONE, $2, ULTRA_BALL - object SPRITE_BALL, $12, $1, STAY, NONE, $3, MAX_REVIVE + object SPRITE_BALL, $1a, $1, STAY, NONE, $2, ULTRA_BALL + object SPRITE_BALL, $2, $d, STAY, NONE, $3, ULTRA_BALL + object SPRITE_BALL, $3, $d, STAY, NONE, $4, MAX_REVIVE + object SPRITE_BALL, $f, $3, STAY, NONE, $5, MAX_ELIXER ; warp-to EVENT_DISP UNKNOWN_DUNGEON_3_WIDTH, $6, $3 ; UNKNOWN_DUNGEON_1 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 728b8675..ab536b39 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -217,22 +217,22 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Mansion2_h) db BANK(Mansion3_h) db BANK(Mansion4_h) - db $11 ; db BANK(SafariZoneEast_h) - db $11 ; db BANK(SafariZoneNorth_h) + db BANK(SafariZoneEast_h) + db BANK(SafariZoneNorth_h) db $12 ; db BANK(SafariZoneWest_h) - db $11 ; db BANK(SafariZoneCenter_h) - db $11 ; db BANK(SafariZoneRestHouse1_h) + db BANK(SafariZoneCenter_h) + db BANK(SafariZoneRestHouse1_h) db $12 ; db BANK(SafariZoneSecretHouse_h) - db $11 ; db BANK(SafariZoneRestHouse2_h) - db $11 ; db BANK(SafariZoneRestHouse3_h) - db $11 ; db BANK(SafariZoneRestHouse4_h) - db $11 ; db BANK(UnknownDungeon2_h) - db $11 ; db BANK(UnknownDungeon3_h) + db BANK(SafariZoneRestHouse2_h) + db BANK(SafariZoneRestHouse3_h) + db BANK(SafariZoneRestHouse4_h) + db BANK(UnknownDungeon2_h) + db BANK(UnknownDungeon3_h) db $1d ; db BANK(UnknownDungeon1_h) db BANK(NameRater_h) db $1d ; db BANK(CeruleanHouse2_h) db $01 ; unused - db $11 ; db BANK(RockTunnel2_h) + db BANK(RockTunnel2_h) db BANK(SilphCo9_h) db BANK(SilphCo10_h) db $18 ; db BANK(SilphCo11_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 5b224ec3..d476cd56 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -217,22 +217,22 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Mansion2_h dw Mansion3_h dw Mansion4_h - dw $5ab3 ; dw SafariZoneEast_h - dw $5bf3 ; dw SafariZoneNorth_h + dw SafariZoneEast_h + dw SafariZoneNorth_h dw $635a ; dw SafariZoneWest_h - dw $5dfa ; dw SafariZoneCenter_h ;220 - dw $5f35 ; dw SafariZoneRestHouse1_h + dw SafariZoneCenter_h ;220 + dw SafariZoneRestHouse1_h dw $64bc ; dw SafariZoneSecretHouse_h - dw $5f72 ; dw SafariZoneRestHouse2_h - dw $5fbd ; dw SafariZoneRestHouse3_h - dw $6008 ; dw SafariZoneRestHouse4_h - dw $6053 ; dw UnknownDungeon2_h - dw $6141 ; dw UnknownDungeon3_h + dw SafariZoneRestHouse2_h + dw SafariZoneRestHouse3_h + dw SafariZoneRestHouse4_h + dw UnknownDungeon2_h + dw UnknownDungeon3_h dw $453d ; dw UnknownDungeon1_h dw NameRater_h dw $4643 ; dw CeruleanHouse2_h - dw $5649 ; dw Route16Gate_h ; unused - dw $624e ; dw RockTunnel2_h + dw Route16Gate_h ; unused + dw RockTunnel2_h dw SilphCo9_h dw SilphCo10_h dw $6105 ; dw SilphCo11_h diff --git a/main.asm b/main.asm index 1aaf8e29..9bf78bc9 100755 --- a/main.asm +++ b/main.asm @@ -858,7 +858,10 @@ INCLUDE "data/mapHeaders/lavendertown.asm" INCLUDE "data/mapObjects/lavendertown.asm" LavenderTownBlocks: INCBIN "maps/lavendertown.blk" ViridianPokecenterBlocks: INCBIN "maps/viridianpokecenter.blk" - dr $440fb,$4410b +SafariZoneRestHouse1Blocks: +SafariZoneRestHouse2Blocks: +SafariZoneRestHouse3Blocks: +SafariZoneRestHouse4Blocks: INCBIN "maps/safarizoneresthouse1.blk" INCLUDE "scripts/lavendertown.asm" @@ -922,7 +925,57 @@ INCLUDE "data/mapHeaders/rockethideoutelevator.asm" INCLUDE "scripts/rockethideoutelevator.asm" INCLUDE "data/mapObjects/rockethideoutelevator.asm" RocketHideoutElevatorBlocks: INCBIN "maps/rockethideoutelevator.blk" - dr $45a08,$46578 + +INCLUDE "data/mapHeaders/silphcoelevator.asm" +INCLUDE "scripts/silphcoelevator.asm" +INCLUDE "data/mapObjects/silphcoelevator.asm" +SilphCoElevatorBlocks: INCBIN "maps/silphcoelevator.blk" + +INCLUDE "data/mapHeaders/safarizoneeast.asm" +INCLUDE "scripts/safarizoneeast.asm" +INCLUDE "data/mapObjects/safarizoneeast.asm" +SafariZoneEastBlocks: INCBIN "maps/safarizoneeast.blk" + +INCLUDE "data/mapHeaders/safarizonenorth.asm" +INCLUDE "scripts/safarizonenorth.asm" +INCLUDE "data/mapObjects/safarizonenorth.asm" +SafariZoneNorthBlocks: INCBIN "maps/safarizonenorth.blk" + +INCLUDE "data/mapHeaders/safarizonecenter.asm" +INCLUDE "scripts/safarizonecenter.asm" +INCLUDE "data/mapObjects/safarizonecenter.asm" +SafariZoneCenterBlocks: INCBIN "maps/safarizonecenter.blk" + +INCLUDE "data/mapHeaders/safarizoneresthouse1.asm" +INCLUDE "scripts/safarizoneresthouse1.asm" +INCLUDE "data/mapObjects/safarizoneresthouse1.asm" + +INCLUDE "data/mapHeaders/safarizoneresthouse2.asm" +INCLUDE "scripts/safarizoneresthouse2.asm" +INCLUDE "data/mapObjects/safarizoneresthouse2.asm" + +INCLUDE "data/mapHeaders/safarizoneresthouse3.asm" +INCLUDE "scripts/safarizoneresthouse3.asm" +INCLUDE "data/mapObjects/safarizoneresthouse3.asm" + +INCLUDE "data/mapHeaders/safarizoneresthouse4.asm" +INCLUDE "scripts/safarizoneresthouse4.asm" +INCLUDE "data/mapObjects/safarizoneresthouse4.asm" + +INCLUDE "data/mapHeaders/unknowndungeon2.asm" +INCLUDE "scripts/unknowndungeon2.asm" +INCLUDE "data/mapObjects/unknowndungeon2.asm" +UnknownDungeon2Blocks: INCBIN "maps/unknowndungeon2.blk" + +INCLUDE "data/mapHeaders/unknowndungeon3.asm" +INCLUDE "scripts/unknowndungeon3.asm" +INCLUDE "data/mapObjects/unknowndungeon3.asm" +UnknownDungeon3Blocks: INCBIN "maps/unknowndungeon3.blk" + +INCLUDE "data/mapHeaders/rocktunnel2.asm" +INCLUDE "scripts/rocktunnel2.asm" +INCLUDE "data/mapObjects/rocktunnel2.asm" +RockTunnel2Blocks: INCBIN "maps/rocktunnel2.blk" INCLUDE "data/mapHeaders/seafoamislands2.asm" INCLUDE "scripts/seafoamislands2.asm" diff --git a/maps/unknowndungeon1.blk b/maps/unknowndungeon1.blk index 574613af..7cc9d4d5 100644 --- a/maps/unknowndungeon1.blk +++ b/maps/unknowndungeon1.blk @@ -1,2 +1,3 @@ - "||b -}f N_vvvvvvvv#vvvvr}|qvv,-Xv=,vtfvvvfvf+}_ "vv- - } "$ \ No newline at end of file + "b ^|bz qmf_fX +z'n  n>}MMt "__ ">nzr fvvv_r "  +^t "vv "_ "_Onnvvvvvvvvvvvv$L \ No newline at end of file diff --git a/maps/unknowndungeon2.blk b/maps/unknowndungeon2.blk index 6eb27eee..f82b5aed 100644 --- a/maps/unknowndungeon2.blk +++ b/maps/unknowndungeon2.blk @@ -1,3 +1,7 @@ -}( ((   -  -}( #  (      }    \ No newline at end of file +  ( ((   } +   (# }(  +  } +} + +  +  \ No newline at end of file diff --git a/maps/unknowndungeon3.blk b/maps/unknowndungeon3.blk index 858f0529..581ade79 100644 --- a/maps/unknowndungeon3.blk +++ b/maps/unknowndungeon3.blk @@ -1 +1,2 @@ -,--Nr02a}f D+,v "pfvvv} fXfvv^tvvtvv)   "vvvSvvvv \ No newline at end of file +  n z " rf- j[o  "nrfaX rO "} + Qmn } "__rv "m v}vvv) r "vvQr)Svvvvvvvvvvvvr \ No newline at end of file diff --git a/scripts/unknowndungeon2.asm b/scripts/unknowndungeon2.asm index f3cbb6a5..2bf9fdb4 100755 --- a/scripts/unknowndungeon2.asm +++ b/scripts/unknowndungeon2.asm @@ -5,3 +5,4 @@ UnknownDungeon2TextPointers: ; 45e0e (11:5e0e) dw PickUpItemText dw PickUpItemText dw PickUpItemText + dw PickUpItemText diff --git a/scripts/unknowndungeon3.asm b/scripts/unknowndungeon3.asm index 42459766..265df358 100755 --- a/scripts/unknowndungeon3.asm +++ b/scripts/unknowndungeon3.asm @@ -16,6 +16,8 @@ UnknownDungeon3TextPointers: ; 45f09 (11:5f09) dw UnknownDungeon3Text1 dw PickUpItemText dw PickUpItemText + dw PickUpItemText + dw PickUpItemText UnknownDungeon3TrainerHeaders: ; 45f0f (11:5f0f) UnknownDungeon3TrainerHeader0: ; 45f0f (11:5f0f) -- cgit v1.3.1-sl0p From 27e6f58c35072d279e6794064ce4b854df815797 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 3 Jun 2016 21:20:08 -0400 Subject: Remaining maps in Bank 12 --- data/map_header_banks.asm | 6 +++--- data/map_header_pointers.asm | 6 +++--- main.asm | 10 +++++++++- 3 files changed, 15 insertions(+), 7 deletions(-) (limited to 'data') diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index ab536b39..6de9bbcb 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -219,10 +219,10 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(Mansion4_h) db BANK(SafariZoneEast_h) db BANK(SafariZoneNorth_h) - db $12 ; db BANK(SafariZoneWest_h) + db BANK(SafariZoneWest_h) db BANK(SafariZoneCenter_h) db BANK(SafariZoneRestHouse1_h) - db $12 ; db BANK(SafariZoneSecretHouse_h) + db BANK(SafariZoneSecretHouse_h) db BANK(SafariZoneRestHouse2_h) db BANK(SafariZoneRestHouse3_h) db BANK(SafariZoneRestHouse4_h) @@ -236,7 +236,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(SilphCo9_h) db BANK(SilphCo10_h) db $18 ; db BANK(SilphCo11_h) - db $11 ; db BANK(SilphCoElevator_h) + db BANK(SilphCoElevator_h) db $11 ; unused db $11 ; unused db BANK(TradeCenter_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index d476cd56..6a4fc9f2 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -219,10 +219,10 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw Mansion4_h dw SafariZoneEast_h dw SafariZoneNorth_h - dw $635a ; dw SafariZoneWest_h + dw SafariZoneWest_h dw SafariZoneCenter_h ;220 dw SafariZoneRestHouse1_h - dw $64bc ; dw SafariZoneSecretHouse_h + dw SafariZoneSecretHouse_h dw SafariZoneRestHouse2_h dw SafariZoneRestHouse3_h dw SafariZoneRestHouse4_h @@ -236,7 +236,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw SilphCo9_h dw SilphCo10_h dw $6105 ; dw SilphCo11_h - dw $5a08 ; dw SilphCoElevator_h + dw SilphCoElevator_h dw SilphCo2_h ; unused dw SilphCo2_h ; unused dw TradeCenter_h diff --git a/main.asm b/main.asm index 9bf78bc9..bc659d85 100755 --- a/main.asm +++ b/main.asm @@ -1189,7 +1189,15 @@ MtMoon3Script_4a325: ; pikachu-related function? call Func_159b ret - dr $4a35a,$4a540 +INCLUDE "data/mapHeaders/safarizonewest.asm" +INCLUDE "scripts/safarizonewest.asm" +INCLUDE "data/mapObjects/safarizonewest.asm" +SafariZoneWestBlocks: INCBIN "maps/safarizonewest.blk" + +INCLUDE "data/mapHeaders/safarizonesecrethouse.asm" +INCLUDE "scripts/safarizonesecrethouse.asm" +INCLUDE "data/mapObjects/safarizonesecrethouse.asm" +SafariZoneSecretHouseBlocks: INCBIN "maps/safarizonesecrethouse.blk" SECTION "bank13",ROMX,BANK[$13] -- cgit v1.3.1-sl0p From b170bb4f1318e349ade1e8a208766b06afb2cad7 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 3 Jun 2016 23:06:52 -0400 Subject: Silph Co 11F --- constants/hide_show_constants.asm | 6 +- data/mapObjects/silphco11.asm | 5 +- data/map_header_banks.asm | 2 +- data/map_header_pointers.asm | 2 +- main.asm | 9 +- scripts/silphco11.asm | 566 +++++++++++++++++++++++++------------- scripts/silphco11_2.asm | 2 +- 7 files changed, 395 insertions(+), 197 deletions(-) (limited to 'data') diff --git a/constants/hide_show_constants.asm b/constants/hide_show_constants.asm index 4ca9e178..10cffac8 100755 --- a/constants/hide_show_constants.asm +++ b/constants/hide_show_constants.asm @@ -192,9 +192,9 @@ const HS_SILPH_CO_10F_ITEM_2 ; B9 const HS_SILPH_CO_10F_ITEM_3 ; BA const HS_SILPH_CO_11F_1 ; BB - const HS_SILPH_CO_11F_2 ; BC - const HS_SILPH_CO_11F_JESSIE ; BD - const HS_SILPH_CO_11F_JAMES ; BE + const HS_SILPH_CO_11F_JAMES ; BC + const HS_SILPH_CO_11F_2 ; BD + const HS_SILPH_CO_11F_JESSIE ; BE const HS_MAP_F4_1 ; BF const HS_MANSION_2_ITEM ; C0 const HS_MANSION_3_ITEM_1 ; C1 diff --git a/data/mapObjects/silphco11.asm b/data/mapObjects/silphco11.asm index 8cba618e..bae7eda5 100755 --- a/data/mapObjects/silphco11.asm +++ b/data/mapObjects/silphco11.asm @@ -9,12 +9,13 @@ SilphCo11Object: ; 0x62380 (size=72) db $0 ; signs - db $5 ; objects + db $6 ; objects object SPRITE_MR_MASTERBALL, $7, $5, STAY, DOWN, $1 ; person object SPRITE_FOULARD_WOMAN, $a, $5, STAY, DOWN, $2 ; person object SPRITE_GIOVANNI, $6, $9, STAY, DOWN, $3, OPP_GIOVANNI, $2 - object SPRITE_ROCKET, $3, $10, STAY, UP, $4, OPP_ROCKET, $29 + object SPRITE_JAMES, $2, $8, STAY, UP, $4 object SPRITE_ROCKET, $f, $9, STAY, UP, $5, OPP_ROCKET, $28 + object SPRITE_JESSIE, $3, $8, STAY, UP, $6 ; warp-to EVENT_DISP SILPH_CO_11F_WIDTH, $0, $9 ; SILPH_CO_10F diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 6de9bbcb..01d33040 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -235,7 +235,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(RockTunnel2_h) db BANK(SilphCo9_h) db BANK(SilphCo10_h) - db $18 ; db BANK(SilphCo11_h) + db BANK(SilphCo11_h) db BANK(SilphCoElevator_h) db $11 ; unused db $11 ; unused diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 6a4fc9f2..259ab1bd 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -235,7 +235,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw RockTunnel2_h dw SilphCo9_h dw SilphCo10_h - dw $6105 ; dw SilphCo11_h + dw SilphCo11_h dw SilphCoElevator_h dw SilphCo2_h ; unused dw SilphCo2_h ; unused diff --git a/main.asm b/main.asm index bc659d85..40549f9d 100755 --- a/main.asm +++ b/main.asm @@ -1686,7 +1686,8 @@ SECTION "bank18",ROMX,BANK[$18] ViridianForestBlocks: INCBIN "maps/viridianforest.blk" UndergroundPathNSBlocks: INCBIN "maps/undergroundpathns.blk" UndergroundPathWEBlocks: INCBIN "maps/undergroundpathwe.blk" - dr $60258,$603c0 + +INCBIN "maps/unusedblocks60258.blk" SSAnne9Blocks: SSAnne10Blocks: INCBIN "maps/ssanne9.blk" @@ -1789,7 +1790,11 @@ INCLUDE "data/mapHeaders/diglettscave.asm" INCLUDE "scripts/diglettscave.asm" INCLUDE "data/mapObjects/diglettscave.asm" DiglettsCaveBlocks: INCBIN "maps/diglettscave.blk" - dr $62105,$625e8 + +INCLUDE "data/mapHeaders/silphco11.asm" +INCLUDE "scripts/silphco11.asm" +INCLUDE "data/mapObjects/silphco11.asm" +SilphCo11Blocks: INCBIN "maps/silphco11.blk" INCLUDE "engine/hidden_object_functions18.asm" diff --git a/scripts/silphco11.asm b/scripts/silphco11.asm index 6cb2e7ed..a2354a69 100755 --- a/scripts/silphco11.asm +++ b/scripts/silphco11.asm @@ -1,5 +1,5 @@ -SilphCo11Script: ; 620fa (18:60fa) - call SilphCo11Script_62110 +SilphCo11Script: ; 62111 (18:60fa) + call SilphCo11Script_62127 call EnableAutoTextBoxDrawing ld hl, SilphCo11TrainerHeaders ld de, SilphCo11ScriptPointers @@ -8,26 +8,27 @@ SilphCo11Script: ; 620fa (18:60fa) ld [W_SILPHCO11CURSCRIPT], a ret -SilphCo11Script_62110: ; 62110 (18:6110) +SilphCo11Script_62127: ; 62127 (18:6110) ld hl, wd126 bit 5, [hl] res 5, [hl] ret z ld hl, SilphCo11GateCoords - call SilphCo11Script_62137 - call SilphCo11Script_62163 + call SilphCo11Script_6214f + call SilphCo11Script_6217b CheckEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR ret nz ld a, $20 ld [wNewTileBlockID], a lb bc, 6, 3 - predef_jump ReplaceTileBlock + predef ReplaceTileBlock + ret SilphCo11GateCoords: ; 62134 (18:6134) db $06,$03 db $FF -SilphCo11Script_62137: ; 62137 (18:6137) +SilphCo11Script_6214f: ; 6214f (18:6137) push hl ld hl, wCardKeyDoorY ld a, [hli] @@ -63,108 +64,48 @@ SilphCo11Script_62137: ; 62137 (18:6137) ld [$ffe0], a ret -SilphCo11Script_62163: ; 62163 (18:6163) +SilphCo11Script_6217b: ; 6217b (18:6163) ld a, [$ffe0] and a ret z SetEvent EVENT_SILPH_CO_11_UNLOCKED_DOOR ret -SilphCo11Script_6216d: ; 6216d (18:616d) - ld hl, MissableObjectIDs_6219b -.asm_62170 - ld a, [hli] - cp $ff - jr z, .asm_62181 - push hl - ld [wMissableObjectIndex], a - predef HideObject - pop hl - jr .asm_62170 -.asm_62181 - ld hl, MissableObjectIDs_62194 -.asm_62184 - ld a, [hli] - cp $ff - ret z - push hl - ld [wMissableObjectIndex], a - predef ShowObject - pop hl - jr .asm_62184 - -MissableObjectIDs_62194: ; 62194 (18:6194) - db HS_SAFFRON_CITY_8 - db HS_SAFFRON_CITY_9 - db HS_SAFFRON_CITY_A - db HS_SAFFRON_CITY_B - db HS_SAFFRON_CITY_C - db HS_SAFFRON_CITY_D - db $FF - -MissableObjectIDs_6219b: ; 6219b (18:619b) - db HS_SAFFRON_CITY_1 - db HS_SAFFRON_CITY_2 - db HS_SAFFRON_CITY_3 - db HS_SAFFRON_CITY_4 - db HS_SAFFRON_CITY_5 - db HS_SAFFRON_CITY_6 - db HS_SAFFRON_CITY_7 - db HS_SAFFRON_CITY_E - db HS_SAFFRON_CITY_F - db HS_SILPH_CO_2F_2 - db HS_SILPH_CO_2F_3 - db HS_SILPH_CO_2F_4 - db HS_SILPH_CO_2F_5 - db HS_SILPH_CO_3F_1 - db HS_SILPH_CO_3F_2 - db HS_SILPH_CO_4F_1 - db HS_SILPH_CO_4F_2 - db HS_SILPH_CO_4F_3 - db HS_SILPH_CO_5F_1 - db HS_SILPH_CO_5F_2 - db HS_SILPH_CO_5F_3 - db HS_SILPH_CO_5F_4 - db HS_SILPH_CO_6F_1 - db HS_SILPH_CO_6F_2 - db HS_SILPH_CO_6F_3 - db HS_SILPH_CO_7F_1 - db HS_SILPH_CO_7F_2 - db HS_SILPH_CO_7F_3 - db HS_SILPH_CO_7F_4 - db HS_SILPH_CO_8F_1 - db HS_SILPH_CO_8F_2 - db HS_SILPH_CO_8F_3 - db HS_SILPH_CO_9F_1 - db HS_SILPH_CO_9F_2 - db HS_SILPH_CO_9F_3 - db HS_SILPH_CO_10F_1 - db HS_SILPH_CO_10F_2 - db HS_SILPH_CO_11F_1 - db HS_SILPH_CO_11F_2 - db HS_SILPH_CO_11F_3 - db $FF - -SilphCo11Script_621c4: ; 621c4 (18:61c4) +SilphCo11Script_62185: ; 62185 (18:61c4) xor a ld [wJoyIgnore], a - -SilphCo11Script_621c8: ; 621c8 (18:61c8) +SilphCo11Script_62189: ; 62189 (18:61c8) ld [W_SILPHCO11CURSCRIPT], a ld [W_CURMAPSCRIPT], a ret -SilphCo11ScriptPointers: ; 621cf (18:61cf) - dw SilphCo11Script0 +SilphCo11ScriptPointers: ; 62190 (18:6190) + dw SilphCo11Script0 ; 61ae dw DisplayEnemyTrainerTextAndStartBattle dw EndTrainerBattle - dw SilphCo11Script3 - dw SilphCo11Script4 - dw SilphCo11Script5 + dw SilphCo11Script3 ; 620c + dw SilphCo11Script4 ; 6254 + dw SilphCo11Script5 ; 6318 + dw SilphCo11Script6 ; 633f + dw SilphCo11Script7 ; 634a + dw SilphCo11Script8 ; 6366 + dw SilphCo11Script9 ; 638d + dw SilphCo11Script10 ; 639d + dw SilphCo11Script11 ; 63bb + dw SilphCo11Script12 ; 63e1 + dw SilphCo11Script13 ; 6427 + dw SilphCo11Script14 ; 6448 SilphCo11Script0: ; 621db (18:61db) - CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI + CheckEvent EVENT_BEAT_SILPH_CO_11F_TRAINER_0 + call z, SilphCo11Script_6229c + CheckEvent EVENT_782 ret nz + CheckEvent EVENT_BEAT_SILPH_CO_GIOVANNI + call z, SilphCo11Script_621c5 + ret + +SilphCo11Script_621c5: ld hl, CoordsData_62211 call ArePlayerCoordsInArray jp nc, CheckFightingMapTrainers @@ -182,8 +123,9 @@ SilphCo11Script0: ; 621db (18:61db) call SetSpriteMovementBytesToFF ld de, MovementData_62216 call MoveSprite - ld a, $3 - jp SilphCo11Script_621c8 + ld a, $4 + call SilphCo11Script_62189 + ret CoordsData_62211: ; 62211 (18:6211) db $0D,$06 @@ -196,18 +138,18 @@ MovementData_62216: ; 62216 (18:6216) db NPC_MOVEMENT_DOWN db $FF -SilphCo11Script_6221a: ; 6221a (18:621a) +SilphCo11Script_621ff: ld [wPlayerMovingDirection], a - ld a, $3 - ld [H_SPRITEINDEX], a ld a, b - ld [hSpriteFacingDirection], a - jp SetSpriteFacingDirectionAndDelay + ld [wSpriteStateData1 + 3 * $10 + 9], a + ld a, $2 + ld [wSpriteStateData1 + 3 * $10 + 1], a + ret -SilphCo11Script5: ; 62227 (18:6227) +SilphCo11Script3: ; 62227 (18:6227) ld a, [wIsInBattle] cp $ff - jp z, SilphCo11Script_621c4 + jp z, SilphCo11Script_62185 ld a, [wcf0d] cp $1 jr z, .asm_6223c @@ -218,23 +160,23 @@ SilphCo11Script5: ; 62227 (18:6227) ld a, PLAYER_DIR_UP ld b, SPRITE_FACING_DOWN .asm_62240 - call SilphCo11Script_6221a + call SilphCo11Script_621ff ld a, $f0 ld [wJoyIgnore], a - ld a, $6 + ld a, $7 ld [hSpriteIndexOrTextID], a call DisplayTextID call GBFadeOutToBlack - call SilphCo11Script_6216d + callba Func_f25a0 call UpdateSprites call Delay3 call GBFadeInFromBlack SetEvent EVENT_BEAT_SILPH_CO_GIOVANNI xor a ld [wJoyIgnore], a - jp SilphCo11Script_621c8 + jp SilphCo11Script_62189 -SilphCo11Script3: ; 6226a (18:626a) +SilphCo11Script4: ; 62254 (18:626a) ld a, [wd730] bit 0, a ret nz @@ -251,155 +193,405 @@ SilphCo11Script3: ; 6226a (18:626a) ld a, PLAYER_DIR_UP ld b, SPRITE_FACING_DOWN .asm_62288 - call SilphCo11Script_6221a + call SilphCo11Script_621ff call Delay3 - ld a, $4 - jp SilphCo11Script_621c8 - -SilphCo11Script4: ; 62293 (18:6293) + xor a + ld [wJoyIgnore], a ld hl, wd72d set 6, [hl] set 7, [hl] - ld hl, SilphCo10Text_62330 - ld de, SilphCo10Text_62330 + ld hl, SilphCo10Text_62528 + ld de, SilphCo10Text_62528 call SaveEndBattleTextPointers ld a, [H_SPRITEINDEX] ld [wSpriteIndex], a call EngageMapTrainer call InitBattleEnemyParameters + ld a, $3 + jp SilphCo11Script_62189 + +SilphCo11Script_6229c: + ld a, [wYCoord] + cp $3 + ret nz + ld a, [wXCoord] + cp $4 + ret nc + ResetEvents EVENT_780, EVENT_781 + ld a, [wXCoord] + cp $3 + jr z, .asm_622c3 + SetEventReuseHL EVENT_780 + ld a, [wXCoord] + cp $2 + jr z, .asm_622c3 + ResetEventReuseHL EVENT_780 + SetEventReuseHL EVENT_781 +.asm_622c3 + call StopAllMusic + ld c, BANK(Music_JessieAndJames) + ld a, MUSIC_JESSIE_AND_JAMES + call PlayMusic + xor a + ld [hJoyHeld], a + ld a, $fc + ld [wJoyIgnore], a + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld a, $8 + ld [hSpriteIndexOrTextID], a + call DisplayTextID xor a + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld a, $ff ld [wJoyIgnore], a + SetEvent EVENT_782 ld a, $5 - jp SilphCo11Script_621c8 + call SilphCo11Script_62189 + ret +; 622f4 + +SilphCo11MovementData_622f5: + db $5 + db $5 + db $5 + db $5 + db $5 + db $ff + +SilphCo11MovementData_622fb: + db $5 + db $5 + db $5 + db $5 + db $ff + +SilphCo11MovementData_62300: + db $5 + db $5 + db $5 + db $5 + db $ff + +SilphCo11MovementData_62305: + db $5 + db $5 + db $5 + db $5 + db $5 + db $ff + +SilphCo11MovementData_6230b: + db $5 + db $5 + db $6 + db $5 + db $5 + db $ff + +SilphCo11MovementData_62311: + db $5 + db $5 + db $5 + db $6 + db $5 + db $5 + db $ff + +SilphCo11Script5: + ld de, SilphCo11MovementData_622f5 + CheckEitherEventSet EVENT_780, EVENT_781 + and a + jr z, .asm_6232d + ld de, SilphCo11MovementData_62300 + cp $1 + jr z, .asm_6232d + ld de, SilphCo11MovementData_6230b +.asm_6232d + ld a, $4 + ld [hSpriteIndexOrTextID], a + call MoveSprite + ld a, $ff + ld [wJoyIgnore], a + ld a, $6 + call SilphCo11Script_62189 + ret + +SilphCo11Script6: + ld a, $ff + ld [wJoyIgnore], a + ld a, [wd730] + bit 0, a + ret nz +SilphCo11Script7: + ld a, $2 + ld [wSpriteStateData1 + 4 * $10 + 1], a + ld hl, wSpriteStateData1 + 4 * $10 + 9 + ld [hl], SPRITE_FACING_RIGHT + CheckEitherEventSet EVENT_780, EVENT_781 + and a + jr z, .asm_6235e + ld [hl], SPRITE_FACING_UP +.asm_6235e + call Delay3 + ld a, $fc + ld [wJoyIgnore], a +SilphCo11Script8: + ld de, SilphCo11MovementData_622fb + CheckEitherEventSet EVENT_780, EVENT_781 + and a + jr z, .asm_6237b + ld de, SilphCo11MovementData_62305 + cp $1 + jr z, .asm_6237b + ld de, SilphCo11MovementData_62311 +.asm_6237b + ld a, $6 + ld [hSpriteIndexOrTextID], a + call MoveSprite + ld a, $ff + ld [wJoyIgnore], a + ld a, $9 + call SilphCo11Script_62189 + ret + +SilphCo11Script9: + ld a, $ff + ld [wJoyIgnore], a + ld a, [wd730] + bit 0, a + ret nz + ld a, $fc + ld [wJoyIgnore], a +SilphCo11Script10: + ld a, $2 + ld [wSpriteStateData1 + 6 * $10 + 1], a + ld hl, wSpriteStateData1 + 6 * $10 + 9 + ld [hl], SPRITE_FACING_UP + CheckEitherEventSet EVENT_780, EVENT_781 + and a + jr z, .asm_623b1 + ld [hl], SPRITE_FACING_LEFT +.asm_623b1 + call Delay3 + ld a, $9 + ld [hSpriteIndexOrTextID], a + call DisplayTextID +SilphCo11Script11: + ld hl, wd72d + set 6, [hl] + set 7, [hl] + ld hl, SilphCo11Text_624c2 + ld de, SilphCo11Text_624c2 + call SaveEndBattleTextPointers + ld a, OPP_ROCKET + ld [wCurOpponent], a + ld a, $2d + ld [wTrainerNo], a + xor a + ld [hJoyHeld], a + ld [wJoyIgnore], a + ld a, $c + call SilphCo11Script_62189 + ret + +SilphCo11Script12: + ld a, $ff + ld [wJoyIgnore], a + ld a, [wIsInBattle] + cp $ff + jp z, SilphCo11Script_62185 + ld a, $2 + ld [wSpriteStateData1 + 4 * $10 + 1], a + ld [wSpriteStateData1 + 6 * $10 + 1], a + xor a + ld [wSpriteStateData1 + 4 * $10 + 9], a + ld [wSpriteStateData1 + 6 * $10 + 9], a + ld a, $fc + ld [wJoyIgnore], a + ld a, $1 + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + ld a, $a + ld [hSpriteIndexOrTextID], a + call DisplayTextID + xor a + ld [wDoNotWaitForButtonPressAfterDisplayingText], a + call StopAllMusic + ld c, BANK(Music_JessieAndJames) + ld a, MUSIC_JESSIE_AND_JAMES + call PlayMusic + ld a, $ff + ld [wJoyIgnore], a + ld a, $d + call SilphCo11Script_62189 + ret + +SilphCo11Script13: + ld a, $ff + ld [wJoyIgnore], a + call GBFadeOutToBlack + ld a, HS_SILPH_CO_11F_JAMES + call SilphCo11Script_6246d + ld a, HS_SILPH_CO_11F_JESSIE + call SilphCo11Script_6246d + call UpdateSprites + call Delay3 + call GBFadeInFromBlack + ld a, $e + call SilphCo11Script_62189 + ret + +SilphCo11Script14: + call PlayDefaultMusic + xor a + ld [hJoyHeld], a + ld [wJoyIgnore], a + ResetEvent EVENT_782 + SetEventReuseHL EVENT_BEAT_SILPH_CO_11F_TRAINER_0 + ld a, $0 + call SilphCo11Script_62189 + ret + +SilphCo11Script_6245e: + ld [wMissableObjectIndex], a + predef ShowObject + call UpdateSprites + call Delay3 + ret -SilphCo11TextPointers: ; 622b7 (18:62b7) +SilphCo11Script_6246d: + ld [wMissableObjectIndex], a + predef HideObject + ret + +SilphCo11TextPointers: ; 62476 (18:62b7) dw SilphCo11Text1 dw SilphCo11Text2 dw SilphCo11Text3 dw SilphCo11Text4 dw SilphCo11Text5 dw SilphCo11Text6 + dw SilphCo11Text7 + dw SilphCo11Text8 + dw SilphCo11Text9 + dw SilphCo11Text10 -SilphCo11TrainerHeaders: ; 622c3 (18:62c3) -SilphCo11TrainerHeader0: ; 622c3 (18:62c3) - dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_0 - db ($4 << 4) ; trainer's view range - dwEventFlagAddress EVENT_BEAT_SILPH_CO_11F_TRAINER_0 - dw SilphCo11BattleText1 ; TextBeforeBattle - dw SilphCo11AfterBattleText1 ; TextAfterBattle - dw SilphCo11EndBattleText1 ; TextEndBattle - dw SilphCo11EndBattleText1 ; TextEndBattle - -SilphCo11TrainerHeader1: ; 622cf (18:62cf) +SilphCo11TrainerHeaders: ; 6248a +SilphCo11TrainerHeader0: ; 6248a dbEventFlagBit EVENT_BEAT_SILPH_CO_11F_TRAINER_1 - db ($3 << 4) ; trainer's view range + db ($3 << 4) dwEventFlagAddress EVENT_BEAT_SILPH_CO_11F_TRAINER_1 - dw SilphCo11BattleText2 ; TextBeforeBattle - dw SilphCo11AfterBattleText2 ; TextAfterBattle - dw SilphCo11EndBattleText2 ; TextEndBattle - dw SilphCo11EndBattleText2 ; TextEndBattle + dw SilphCo11Trainer1BattleText + dw SilphCo11Trainer1AfterBattleText + dw SilphCo11Trainer1EndBattleText + dw SilphCo11Trainer1EndBattleText - db $ff + db $ff ; no more trainers + +SilphCo11Text4: +SilphCo11Text6: +SilphCo11Text8: + TX_FAR _SilphCoJessieJamesText1 + TX_ASM + ld c, 10 + call DelayFrames + ld a, $4 + ld [wPlayerMovingDirection], a + ld a, $0 + ld [wEmotionBubbleSpriteIndex], a + ld a, $0 + ld [wWhichEmotionBubble], a + predef EmotionBubble + ld c, 20 + call DelayFrames + jp TextScriptEnd + +SilphCo11Text9: + TX_FAR _SilphCoJessieJamesText2 + db "@" + +SilphCo11Text_624c2: + TX_FAR _SilphCoJessieJamesText3 + db "@" + +SilphCo11Text10: + TX_FAR _SilphCoJessieJamesText4 + TX_ASM + ld c, 64 + call DelayFrames + jp TextScriptEnd -SilphCo11Text1: ; 622dc (18:62dc) +SilphCo11Text1: TX_ASM CheckEvent EVENT_GOT_MASTER_BALL - jp nz, .asm_62308 - ld hl, SilphCoPresidentText + jp nz, .asm_62500 + ld hl, SilphCo11Text_62509 call PrintText lb bc, MASTER_BALL, 1 call GiveItem - jr nc, .BagFull - ld hl, ReceivedSilphCoMasterBallText + jr nc, .asm_624f8 + ld hl, SilphCo11Text_6250e call PrintText SetEvent EVENT_GOT_MASTER_BALL - jr .asm_6230e -.BagFull - ld hl, SilphCoMasterBallNoRoomText + jr .asm_62506 +.asm_624f8 + ld hl, SilphCo11Text_62519 call PrintText - jr .asm_6230e -.asm_62308 - ld hl, SilphCo10Text_6231c + jr .asm_62506 + +.asm_62500 + ld hl, SilphCo11Text_62514 call PrintText -.asm_6230e +.asm_62506 jp TextScriptEnd -SilphCoPresidentText: ; 62311 (18:6311) +SilphCo11Text_62509: TX_FAR _SilphCoPresidentText db "@" -ReceivedSilphCoMasterBallText: ; 62316 (18:6316) +SilphCo11Text_6250e: TX_FAR _ReceivedSilphCoMasterBallText - db $11, "@" + TX_SFX_KEY_ITEM + db "@" -SilphCo10Text_6231c: ; 6231c (18:631c) +SilphCo11Text_62514: TX_FAR _SilphCo10Text_6231c db "@" -SilphCoMasterBallNoRoomText: ; 62321 (18:6321) +SilphCo11Text_62519: TX_FAR _SilphCoMasterBallNoRoomText db "@" -SilphCo11Text2: ; 62326 (18:6326) +SilphCo11Text2: TX_FAR _SilphCo11Text2 db "@" -SilphCo11Text3: ; 6232b (18:632b) +SilphCo11Text3: TX_FAR _SilphCo11Text3 db "@" -SilphCo10Text_62330: ; 62330 (18:6330) +SilphCo10Text_62528: TX_FAR _SilphCo10Text_62330 db "@" -SilphCo11Text6: ; 62335 (18:6335) +SilphCo11Text7: TX_FAR _SilphCo10Text_62335 db "@" -SilphCo11Text4: ; 6233a (18:633a) +SilphCo11Text5: TX_ASM ld hl, SilphCo11TrainerHeader0 call TalkToTrainer jp TextScriptEnd -SilphCo11BattleText1: ; 62344 (18:6344) - TX_FAR _SilphCo11BattleText1 - db "@" - -SilphCo11EndBattleText1: ; 62349 (18:6349) - TX_FAR _SilphCo11EndBattleText1 - db "@" - -SilphCo11AfterBattleText1: ; 6234e (18:634e) - TX_FAR _SilphCo11AfterBattleText1 - db "@" - -SilphCo11Text5: ; 62353 (18:6353) - TX_ASM - ld hl, SilphCo11TrainerHeader1 - call TalkToTrainer - jp TextScriptEnd - -SilphCo11BattleText2: ; 6235d (18:635d) +SilphCo11Trainer1BattleText: TX_FAR _SilphCo11BattleText2 db "@" -SilphCo11EndBattleText2: ; 62362 (18:6362) +SilphCo11Trainer1EndBattleText: TX_FAR _SilphCo11EndBattleText2 db "@" -SilphCo11AfterBattleText2: ; 62367 (18:6367) +SilphCo11Trainer1AfterBattleText: TX_FAR _SilphCo11AfterBattleText2 db "@" - -SilphCo10Text_6236c: ; 6236c (18:636c) - TX_ASM - ld hl, SilphCo10Text_6237b - call PrintText - ld a, PORYGON - call DisplayPokedex - jp TextScriptEnd - -SilphCo10Text_6237b: ; 6237b (18:637b) - TX_FAR _SilphCo10Text_6237b - db "@" diff --git a/scripts/silphco11_2.asm b/scripts/silphco11_2.asm index 22e19a02..419efe24 100755 --- a/scripts/silphco11_2.asm +++ b/scripts/silphco11_2.asm @@ -70,7 +70,7 @@ MissableObjects_f25ce db HS_SILPH_CO_10F_1 db HS_SILPH_CO_10F_2 db HS_SILPH_CO_11F_1 + db HS_SILPH_CO_11F_JAMES db HS_SILPH_CO_11F_2 db HS_SILPH_CO_11F_JESSIE - db HS_SILPH_CO_11F_JAMES db $ff \ No newline at end of file -- cgit v1.3.1-sl0p From 63123f9ad3fa18057811c29c7e3542ebf683d219 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Fri, 3 Jun 2016 23:25:35 -0400 Subject: Remaining maps in bank 1D (and the whole ROM) --- data/mapObjects/unknowndungeon1.asm | 9 +++++---- data/map_header_banks.asm | 10 +++++----- data/map_header_pointers.asm | 10 +++++----- main.asm | 27 ++++++++++++++++++++++++--- scripts/unknowndungeon1.asm | 1 + text/maps/agatha.asm | 2 +- text/maps/bruno.asm | 2 +- 7 files changed, 42 insertions(+), 19 deletions(-) (limited to 'data') diff --git a/data/mapObjects/unknowndungeon1.asm b/data/mapObjects/unknowndungeon1.asm index c55711b4..0635e9a7 100755 --- a/data/mapObjects/unknowndungeon1.asm +++ b/data/mapObjects/unknowndungeon1.asm @@ -14,10 +14,11 @@ UnknownDungeon1Object: ; 0x74d15 (size=97) db $0 ; signs - db $3 ; objects - object SPRITE_BALL, $7, $d, STAY, NONE, $1, FULL_RESTORE - object SPRITE_BALL, $13, $3, STAY, NONE, $2, MAX_ELIXER - object SPRITE_BALL, $5, $0, STAY, NONE, $3, NUGGET + db $4 ; objects + object SPRITE_BALL, $1d, $10, STAY, NONE, $1, RARE_CANDY + object SPRITE_BALL, $7, $b, STAY, NONE, $2, MAX_ELIXER + object SPRITE_BALL, $1d, $9, STAY, NONE, $3, MAX_REVIVE + object SPRITE_BALL, $12, $3, STAY, NONE, $4, ULTRA_BALL ; warp-to EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $18 diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm index 01d33040..eef36242 100644 --- a/data/map_header_banks.asm +++ b/data/map_header_banks.asm @@ -228,9 +228,9 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) db BANK(SafariZoneRestHouse4_h) db BANK(UnknownDungeon2_h) db BANK(UnknownDungeon3_h) - db $1d ; db BANK(UnknownDungeon1_h) + db BANK(UnknownDungeon1_h) db BANK(NameRater_h) - db $1d ; db BANK(CeruleanHouse2_h) + db BANK(CeruleanHouse2_h) db $01 ; unused db BANK(RockTunnel2_h) db BANK(SilphCo9_h) @@ -245,7 +245,7 @@ MapHeaderBanks:: ; fc3e4 (3f:43e4) 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) + db BANK(Lorelei_h) + db BANK(Bruno_h) + db BANK(Agatha_h) db BANK(BeachHouse_h) diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm index 259ab1bd..730038f3 100644 --- a/data/map_header_pointers.asm +++ b/data/map_header_pointers.asm @@ -228,9 +228,9 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw SafariZoneRestHouse4_h dw UnknownDungeon2_h dw UnknownDungeon3_h - dw $453d ; dw UnknownDungeon1_h + dw UnknownDungeon1_h dw NameRater_h - dw $4643 ; dw CeruleanHouse2_h + dw CeruleanHouse2_h dw Route16Gate_h ; unused dw RockTunnel2_h dw SilphCo9_h @@ -245,7 +245,7 @@ MapHeaderPointers:: ; fc1f2 (3f:41f2) dw SilphCo2_h ; unused dw SilphCo2_h ; unused dw SilphCo2_h ; unused - dw $59ef ; dw Lorelei_h - dw $5b4a ; dw Bruno_h - dw $5ca1 ; dw Agatha_h ;247 + dw Lorelei_h + dw Bruno_h + dw Agatha_h ;247 dw BeachHouse_h diff --git a/main.asm b/main.asm index 40549f9d..18c401aa 100755 --- a/main.asm +++ b/main.asm @@ -1876,7 +1876,7 @@ CinnabarMartBlocks: INCBIN "maps/pewtermart.blk" FuchsiaHouse1Blocks: INCBIN "maps/fuchsiahouse1.blk" FuchsiaPokecenterBlocks: CinnabarPokecenterBlocks: INCBIN "maps/fuchsiapokecenter.blk" - dr $7404c,$7405c +CeruleanHouse2Blocks: INCBIN "maps/ceruleanhouse2.blk" INCLUDE "engine/items/itemfinder.asm" INCLUDE "scripts/ceruleancity2.asm" @@ -1890,7 +1890,14 @@ INCLUDE "data/mapHeaders/pewtermart.asm" INCLUDE "scripts/pewtermart.asm" INCLUDE "data/mapObjects/pewtermart.asm" - dr $7453d,$74726 +INCLUDE "data/mapHeaders/unknowndungeon1.asm" +INCLUDE "scripts/unknowndungeon1.asm" +INCLUDE "data/mapObjects/unknowndungeon1.asm" +UnknownDungeon1Blocks: INCBIN "maps/unknowndungeon1.blk" + +INCLUDE "data/mapHeaders/ceruleanhouse2.asm" +INCLUDE "scripts/ceruleanhouse2.asm" +INCLUDE "data/mapObjects/ceruleanhouse2.asm" INCLUDE "engine/menu/vending_machine.asm" @@ -1982,7 +1989,21 @@ INCLUDE "data/mapHeaders/gary.asm" INCLUDE "scripts/gary.asm" INCLUDE "data/mapObjects/gary.asm" GaryBlocks: INCBIN "maps/gary.blk" - dr $759ef,$75dfe + +INCLUDE "data/mapHeaders/lorelei.asm" +INCLUDE "scripts/lorelei.asm" +INCLUDE "data/mapObjects/lorelei.asm" +LoreleiBlocks: INCBIN "maps/lorelei.blk" + +INCLUDE "data/mapHeaders/bruno.asm" +INCLUDE "scripts/bruno.asm" +INCLUDE "data/mapObjects/bruno.asm" +BrunoBlocks: INCBIN "maps/bruno.blk" + +INCLUDE "data/mapHeaders/agatha.asm" +INCLUDE "scripts/agatha.asm" +INCLUDE "data/mapObjects/agatha.asm" +AgathaBlocks: INCBIN "maps/agatha.blk" INCLUDE "engine/menu/league_pc.asm" diff --git a/scripts/unknowndungeon1.asm b/scripts/unknowndungeon1.asm index 696ddafa..9951dc52 100755 --- a/scripts/unknowndungeon1.asm +++ b/scripts/unknowndungeon1.asm @@ -5,3 +5,4 @@ UnknownDungeon1TextPointers: ; 74d0f (1d:4d0f) dw PickUpItemText dw PickUpItemText dw PickUpItemText + dw PickUpItemText diff --git a/text/maps/agatha.asm b/text/maps/agatha.asm index 7d1b97bb..95b455c8 100644 --- a/text/maps/agatha.asm +++ b/text/maps/agatha.asm @@ -38,7 +38,7 @@ _AgathaAfterBattleText:: cont "along now, child!" done -_AgathaText2:: +_AgathaDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done diff --git a/text/maps/bruno.asm b/text/maps/bruno.asm index dea3d201..ddcbdb59 100644 --- a/text/maps/bruno.asm +++ b/text/maps/bruno.asm @@ -31,7 +31,7 @@ _BrunoAfterBattleText:: cont "challenge!" done -_UnnamedText_763d2:: +_BrunoDontRunAwayText:: text "Someone's voice:" line "Don't run away!" done -- cgit v1.3.1-sl0p From 7445441edfb298f40cc186976f3721f4e1be81bd Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sat, 4 Jun 2016 09:03:51 -0400 Subject: Pikachu pics; town map entries --- data/town_map_entries.asm | 1 + engine/bank3c.asm | 8 +-- engine/printer.asm | 31 +++++++++++- engine/town_map.asm | 12 ++--- gfx/pikachu/unknown_e4000.png | Bin 0 -> 313 bytes gfx/pikachu/unknown_e40cc.png | Bin 0 -> 143 bytes gfx/pikachu/unknown_e411c.png | Bin 0 -> 296 bytes gfx/pikachu/unknown_e41d2.png | Bin 0 -> 210 bytes gfx/pikachu/unknown_e4272.png | Bin 0 -> 283 bytes gfx/pikachu/unknown_e4323.png | Bin 0 -> 127 bytes gfx/pikachu/unknown_e4383.png | Bin 0 -> 305 bytes gfx/pikachu/unknown_e444b.png | Bin 0 -> 299 bytes gfx/pikachu/unknown_e458b.png | Bin 0 -> 285 bytes gfx/pikachu/unknown_e463b.png | Bin 0 -> 113 bytes gfx/pikachu/unknown_e467b.png | Bin 0 -> 292 bytes gfx/pikachu/unknown_e472e.png | Bin 0 -> 122 bytes gfx/pikachu/unknown_e476e.png | Bin 0 -> 329 bytes gfx/pikachu/unknown_e4841.png | Bin 0 -> 297 bytes gfx/pikachu/unknown_e49d1.png | Bin 0 -> 308 bytes gfx/pikachu/unknown_e4a99.png | Bin 0 -> 199 bytes gfx/pikachu/unknown_e4b39.png | Bin 0 -> 279 bytes gfx/pikachu/unknown_e4bde.png | Bin 0 -> 152 bytes gfx/pikachu/unknown_e4c3e.png | Bin 0 -> 256 bytes gfx/pikachu/unknown_e4ce0.png | Bin 0 -> 302 bytes gfx/pikachu/unknown_e4e70.png | Bin 0 -> 304 bytes gfx/pikachu/unknown_e5000.png | Bin 0 -> 285 bytes gfx/pikachu/unknown_e50af.png | Bin 0 -> 279 bytes gfx/pikachu/unknown_e523f.png | Bin 0 -> 299 bytes gfx/pikachu/unknown_e52fe.png | Bin 0 -> 294 bytes gfx/pikachu/unknown_e548e.png | Bin 0 -> 293 bytes gfx/pikachu/unknown_e5541.png | Bin 0 -> 292 bytes gfx/pikachu/unknown_e56d1.png | Bin 0 -> 317 bytes gfx/pikachu/unknown_e5794.png | Bin 0 -> 333 bytes gfx/pikachu/unknown_e5924.png | Bin 0 -> 316 bytes gfx/pikachu/unknown_e59ed.png | Bin 0 -> 308 bytes gfx/pikachu/unknown_e5b7d.png | Bin 0 -> 325 bytes gfx/pikachu/unknown_e5c4d.png | Bin 0 -> 321 bytes gfx/pikachu/unknown_e5ddd.png | Bin 0 -> 286 bytes gfx/pikachu/unknown_e5e90.png | Bin 0 -> 281 bytes gfx/pikachu/unknown_e6020.png | Bin 0 -> 283 bytes gfx/pikachu/unknown_e61b0.png | Bin 0 -> 300 bytes gfx/pikachu/unknown_e6340.png | Bin 0 -> 303 bytes gfx/pikachu/unknown_e63f7.png | Bin 0 -> 313 bytes gfx/pikachu/unknown_e6587.png | Bin 0 -> 287 bytes gfx/pikachu/unknown_e6646.png | Bin 0 -> 340 bytes gfx/pikachu/unknown_e67d6.png | Bin 0 -> 177 bytes gfx/pikachu/unknown_e682f.png | Bin 0 -> 259 bytes gfx/pikachu/unknown_e69bf.png | Bin 0 -> 317 bytes gfx/pikachu/unknown_e6b4f.png | Bin 0 -> 281 bytes gfx/pikachu/unknown_e6cdf.png | Bin 0 -> 254 bytes gfx/pikachu/unknown_e6e6f.png | Bin 0 -> 226 bytes gfx/pikachu/unknown_e6fff.png | Bin 0 -> 235 bytes gfx/pikachu/unknown_e718f.png | Bin 0 -> 288 bytes gfx/pikachu/unknown_e731f.png | Bin 0 -> 285 bytes gfx/pikachu/unknown_e74af.png | Bin 0 -> 239 bytes gfx/pikachu/unknown_e763f.png | Bin 0 -> 259 bytes gfx/pikachu/unknown_e77cf.png | Bin 0 -> 251 bytes gfx/pikachu/unknown_e7863.png | Bin 0 -> 297 bytes gfx/pikachu/unknown_e79f3.png | Bin 0 -> 347 bytes gfx/pikachu/unknown_e7b83.png | Bin 0 -> 259 bytes gfx/pikachu/unknown_e7d13.png | Bin 0 -> 281 bytes gfx/pikachu/unknown_f0abf.png | Bin 0 -> 270 bytes gfx/pikachu/unknown_f0b64.png | Bin 0 -> 314 bytes gfx/pikachu/unknown_f0cf4.png | Bin 0 -> 243 bytes gfx/pikachu/unknown_f0d82.png | Bin 0 -> 230 bytes macros.asm | 4 +- main.asm | 114 +++++++++++++++++++++--------------------- text/map_names.asm | 2 +- 68 files changed, 100 insertions(+), 72 deletions(-) create mode 100644 gfx/pikachu/unknown_e4000.png create mode 100644 gfx/pikachu/unknown_e40cc.png create mode 100644 gfx/pikachu/unknown_e411c.png create mode 100644 gfx/pikachu/unknown_e41d2.png create mode 100644 gfx/pikachu/unknown_e4272.png create mode 100644 gfx/pikachu/unknown_e4323.png create mode 100644 gfx/pikachu/unknown_e4383.png create mode 100644 gfx/pikachu/unknown_e444b.png create mode 100644 gfx/pikachu/unknown_e458b.png create mode 100644 gfx/pikachu/unknown_e463b.png create mode 100644 gfx/pikachu/unknown_e467b.png create mode 100644 gfx/pikachu/unknown_e472e.png create mode 100644 gfx/pikachu/unknown_e476e.png create mode 100644 gfx/pikachu/unknown_e4841.png create mode 100644 gfx/pikachu/unknown_e49d1.png create mode 100644 gfx/pikachu/unknown_e4a99.png create mode 100644 gfx/pikachu/unknown_e4b39.png create mode 100644 gfx/pikachu/unknown_e4bde.png create mode 100644 gfx/pikachu/unknown_e4c3e.png create mode 100644 gfx/pikachu/unknown_e4ce0.png create mode 100644 gfx/pikachu/unknown_e4e70.png create mode 100644 gfx/pikachu/unknown_e5000.png create mode 100644 gfx/pikachu/unknown_e50af.png create mode 100644 gfx/pikachu/unknown_e523f.png create mode 100644 gfx/pikachu/unknown_e52fe.png create mode 100644 gfx/pikachu/unknown_e548e.png create mode 100644 gfx/pikachu/unknown_e5541.png create mode 100644 gfx/pikachu/unknown_e56d1.png create mode 100644 gfx/pikachu/unknown_e5794.png create mode 100644 gfx/pikachu/unknown_e5924.png create mode 100644 gfx/pikachu/unknown_e59ed.png create mode 100644 gfx/pikachu/unknown_e5b7d.png create mode 100644 gfx/pikachu/unknown_e5c4d.png create mode 100644 gfx/pikachu/unknown_e5ddd.png create mode 100644 gfx/pikachu/unknown_e5e90.png create mode 100644 gfx/pikachu/unknown_e6020.png create mode 100644 gfx/pikachu/unknown_e61b0.png create mode 100644 gfx/pikachu/unknown_e6340.png create mode 100644 gfx/pikachu/unknown_e63f7.png create mode 100644 gfx/pikachu/unknown_e6587.png create mode 100644 gfx/pikachu/unknown_e6646.png create mode 100644 gfx/pikachu/unknown_e67d6.png create mode 100644 gfx/pikachu/unknown_e682f.png create mode 100644 gfx/pikachu/unknown_e69bf.png create mode 100644 gfx/pikachu/unknown_e6b4f.png create mode 100644 gfx/pikachu/unknown_e6cdf.png create mode 100644 gfx/pikachu/unknown_e6e6f.png create mode 100644 gfx/pikachu/unknown_e6fff.png create mode 100644 gfx/pikachu/unknown_e718f.png create mode 100644 gfx/pikachu/unknown_e731f.png create mode 100644 gfx/pikachu/unknown_e74af.png create mode 100644 gfx/pikachu/unknown_e763f.png create mode 100644 gfx/pikachu/unknown_e77cf.png create mode 100644 gfx/pikachu/unknown_e7863.png create mode 100644 gfx/pikachu/unknown_e79f3.png create mode 100644 gfx/pikachu/unknown_e7b83.png create mode 100644 gfx/pikachu/unknown_e7d13.png create mode 100644 gfx/pikachu/unknown_f0abf.png create mode 100644 gfx/pikachu/unknown_f0b64.png create mode 100644 gfx/pikachu/unknown_f0cf4.png create mode 100644 gfx/pikachu/unknown_f0d82.png (limited to 'data') diff --git a/data/town_map_entries.asm b/data/town_map_entries.asm index 865f14d8..5223f435 100755 --- a/data/town_map_entries.asm +++ b/data/town_map_entries.asm @@ -98,4 +98,5 @@ InternalMapEntries: ; 7140b (1c:540b) IMAP ROCK_TUNNEL_2, $E,$3,RockTunnelName IMAP SILPH_CO_ELEVATOR, $A,$5,SilphCoName IMAP AGATHAS_ROOM, $0,$2,PokemonLeagueName + IMAP BEACH_HOUSE, $6,$F,Route19Name db $FF diff --git a/engine/bank3c.asm b/engine/bank3c.asm index e7ac2a4e..44382257 100644 --- a/engine/bank3c.asm +++ b/engine/bank3c.asm @@ -322,13 +322,13 @@ Func_f0a82: ; f0a82 ret Pic_f0abf: ; f0abf (3c:4abf) - dr $f0abf, $f0b64 +INCBIN "gfx/pikachu/unknown_f0abf.pic" GFX_f0b64: ; f0b64 (3c:4b64) - dr $f0b64, $f0cf4 +INCBIN "gfx/pikachu/unknown_f0b64.2bpp" Pic_f0cf4: ; f0cf4 (3c:4cf4) - dr $f0cf4, $f0d82 +INCBIN "gfx/pikachu/unknown_f0cf4.pic" GFX_f0d82: ; f0d82 (3c:4d82) - dr $f0d82, $f0f12 +INCBIN "gfx/pikachu/unknown_f0d82.2bpp" PokecenterChanseyText: ld hl, NurseChanseyText diff --git a/engine/printer.asm b/engine/printer.asm index 95f70087..d2e5c6e3 100755 --- a/engine/printer.asm +++ b/engine/printer.asm @@ -1162,8 +1162,35 @@ Func_e8f51: ; e8f51 (3a:4f51) ld [wcae0], a ret -Func_e8f82: ; e8f82 (3a:4f82) - dr $e8f82,$e8fb8 +Func_e8f82: + ld a, [wcae0] + and a + ret z + push af + xor a + ld [H_AUTOBGTRANSFERENABLED], a + coord hl, 0, 5 + lb bc, 10, 18 + call TextBoxBorder + pop af + ld e, a + ld d, $0 + ld hl, Table_e8fca + add hl, de + add hl, de + ld e, [hl] + inc hl + ld d, [hl] + coord hl, 1, 7 + call PlaceString + coord hl, 2, 15 + ld de, String_e8fb8 + call PlaceString + ld a, $1 + ld [H_AUTOBGTRANSFERENABLED], a + xor a + ld [wcae0], a + ret String_e8fb8: db "Press B to Cancel@" diff --git a/engine/town_map.asm b/engine/town_map.asm index aff126ee..2d4f0023 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -588,14 +588,14 @@ LoadTownMapEntry: ; 7137a (1c:537a) ld l, a ret -ExternalMapEntries: ; 7139c (1c:539c) - dr $7139c,$7140b -InternalMapEntries: ; 7140b (1c:540b) - dr $7140b,$7174b +; ExternalMapEntries: ; 7139c (1c:539c) + ; dr $7139c,$7140b +; InternalMapEntries: ; 7140b (1c:540b) + ; dr $7140b,$7174b -;INCLUDE "data/town_map_entries.asm" +INCLUDE "data/town_map_entries.asm" -;INCLUDE "text/map_names.asm" ; TODO: relabel addresses +INCLUDE "text/map_names.asm" ; TODO: relabel addresses MonNestIcon: ; 7174b (1c:574b) INCBIN "gfx/mon_nest_icon.1bpp" diff --git a/gfx/pikachu/unknown_e4000.png b/gfx/pikachu/unknown_e4000.png new file mode 100644 index 00000000..75a54919 Binary files /dev/null and b/gfx/pikachu/unknown_e4000.png differ diff --git a/gfx/pikachu/unknown_e40cc.png b/gfx/pikachu/unknown_e40cc.png new file mode 100644 index 00000000..adce99ad Binary files /dev/null and b/gfx/pikachu/unknown_e40cc.png differ diff --git a/gfx/pikachu/unknown_e411c.png b/gfx/pikachu/unknown_e411c.png new file mode 100644 index 00000000..40e3d336 Binary files /dev/null and b/gfx/pikachu/unknown_e411c.png differ diff --git a/gfx/pikachu/unknown_e41d2.png b/gfx/pikachu/unknown_e41d2.png new file mode 100644 index 00000000..34d71c02 Binary files /dev/null and b/gfx/pikachu/unknown_e41d2.png differ diff --git a/gfx/pikachu/unknown_e4272.png b/gfx/pikachu/unknown_e4272.png new file mode 100644 index 00000000..8b23b56e Binary files /dev/null and b/gfx/pikachu/unknown_e4272.png differ diff --git a/gfx/pikachu/unknown_e4323.png b/gfx/pikachu/unknown_e4323.png new file mode 100644 index 00000000..6d8d5c22 Binary files /dev/null and b/gfx/pikachu/unknown_e4323.png differ diff --git a/gfx/pikachu/unknown_e4383.png b/gfx/pikachu/unknown_e4383.png new file mode 100644 index 00000000..5ac60dc3 Binary files /dev/null and b/gfx/pikachu/unknown_e4383.png differ diff --git a/gfx/pikachu/unknown_e444b.png b/gfx/pikachu/unknown_e444b.png new file mode 100644 index 00000000..d0240c72 Binary files /dev/null and b/gfx/pikachu/unknown_e444b.png differ diff --git a/gfx/pikachu/unknown_e458b.png b/gfx/pikachu/unknown_e458b.png new file mode 100644 index 00000000..e374a571 Binary files /dev/null and b/gfx/pikachu/unknown_e458b.png differ diff --git a/gfx/pikachu/unknown_e463b.png b/gfx/pikachu/unknown_e463b.png new file mode 100644 index 00000000..2e31d6f6 Binary files /dev/null and b/gfx/pikachu/unknown_e463b.png differ diff --git a/gfx/pikachu/unknown_e467b.png b/gfx/pikachu/unknown_e467b.png new file mode 100644 index 00000000..d088d590 Binary files /dev/null and b/gfx/pikachu/unknown_e467b.png differ diff --git a/gfx/pikachu/unknown_e472e.png b/gfx/pikachu/unknown_e472e.png new file mode 100644 index 00000000..1a1ac334 Binary files /dev/null and b/gfx/pikachu/unknown_e472e.png differ diff --git a/gfx/pikachu/unknown_e476e.png b/gfx/pikachu/unknown_e476e.png new file mode 100644 index 00000000..2ca64b68 Binary files /dev/null and b/gfx/pikachu/unknown_e476e.png differ diff --git a/gfx/pikachu/unknown_e4841.png b/gfx/pikachu/unknown_e4841.png new file mode 100644 index 00000000..f3425637 Binary files /dev/null and b/gfx/pikachu/unknown_e4841.png differ diff --git a/gfx/pikachu/unknown_e49d1.png b/gfx/pikachu/unknown_e49d1.png new file mode 100644 index 00000000..1414cd6e Binary files /dev/null and b/gfx/pikachu/unknown_e49d1.png differ diff --git a/gfx/pikachu/unknown_e4a99.png b/gfx/pikachu/unknown_e4a99.png new file mode 100644 index 00000000..e97998c1 Binary files /dev/null and b/gfx/pikachu/unknown_e4a99.png differ diff --git a/gfx/pikachu/unknown_e4b39.png b/gfx/pikachu/unknown_e4b39.png new file mode 100644 index 00000000..948c46fe Binary files /dev/null and b/gfx/pikachu/unknown_e4b39.png differ diff --git a/gfx/pikachu/unknown_e4bde.png b/gfx/pikachu/unknown_e4bde.png new file mode 100644 index 00000000..18209284 Binary files /dev/null and b/gfx/pikachu/unknown_e4bde.png differ diff --git a/gfx/pikachu/unknown_e4c3e.png b/gfx/pikachu/unknown_e4c3e.png new file mode 100644 index 00000000..698c15e8 Binary files /dev/null and b/gfx/pikachu/unknown_e4c3e.png differ diff --git a/gfx/pikachu/unknown_e4ce0.png b/gfx/pikachu/unknown_e4ce0.png new file mode 100644 index 00000000..68a6832b Binary files /dev/null and b/gfx/pikachu/unknown_e4ce0.png differ diff --git a/gfx/pikachu/unknown_e4e70.png b/gfx/pikachu/unknown_e4e70.png new file mode 100644 index 00000000..ee849b32 Binary files /dev/null and b/gfx/pikachu/unknown_e4e70.png differ diff --git a/gfx/pikachu/unknown_e5000.png b/gfx/pikachu/unknown_e5000.png new file mode 100644 index 00000000..9b2685e4 Binary files /dev/null and b/gfx/pikachu/unknown_e5000.png differ diff --git a/gfx/pikachu/unknown_e50af.png b/gfx/pikachu/unknown_e50af.png new file mode 100644 index 00000000..04acf34f Binary files /dev/null and b/gfx/pikachu/unknown_e50af.png differ diff --git a/gfx/pikachu/unknown_e523f.png b/gfx/pikachu/unknown_e523f.png new file mode 100644 index 00000000..810c752a Binary files /dev/null and b/gfx/pikachu/unknown_e523f.png differ diff --git a/gfx/pikachu/unknown_e52fe.png b/gfx/pikachu/unknown_e52fe.png new file mode 100644 index 00000000..7a33deec Binary files /dev/null and b/gfx/pikachu/unknown_e52fe.png differ diff --git a/gfx/pikachu/unknown_e548e.png b/gfx/pikachu/unknown_e548e.png new file mode 100644 index 00000000..442025a2 Binary files /dev/null and b/gfx/pikachu/unknown_e548e.png differ diff --git a/gfx/pikachu/unknown_e5541.png b/gfx/pikachu/unknown_e5541.png new file mode 100644 index 00000000..889fa5f6 Binary files /dev/null and b/gfx/pikachu/unknown_e5541.png differ diff --git a/gfx/pikachu/unknown_e56d1.png b/gfx/pikachu/unknown_e56d1.png new file mode 100644 index 00000000..85f96a92 Binary files /dev/null and b/gfx/pikachu/unknown_e56d1.png differ diff --git a/gfx/pikachu/unknown_e5794.png b/gfx/pikachu/unknown_e5794.png new file mode 100644 index 00000000..4926e791 Binary files /dev/null and b/gfx/pikachu/unknown_e5794.png differ diff --git a/gfx/pikachu/unknown_e5924.png b/gfx/pikachu/unknown_e5924.png new file mode 100644 index 00000000..b4f15591 Binary files /dev/null and b/gfx/pikachu/unknown_e5924.png differ diff --git a/gfx/pikachu/unknown_e59ed.png b/gfx/pikachu/unknown_e59ed.png new file mode 100644 index 00000000..971075ab Binary files /dev/null and b/gfx/pikachu/unknown_e59ed.png differ diff --git a/gfx/pikachu/unknown_e5b7d.png b/gfx/pikachu/unknown_e5b7d.png new file mode 100644 index 00000000..2b141191 Binary files /dev/null and b/gfx/pikachu/unknown_e5b7d.png differ diff --git a/gfx/pikachu/unknown_e5c4d.png b/gfx/pikachu/unknown_e5c4d.png new file mode 100644 index 00000000..07f70a39 Binary files /dev/null and b/gfx/pikachu/unknown_e5c4d.png differ diff --git a/gfx/pikachu/unknown_e5ddd.png b/gfx/pikachu/unknown_e5ddd.png new file mode 100644 index 00000000..e95e11ba Binary files /dev/null and b/gfx/pikachu/unknown_e5ddd.png differ diff --git a/gfx/pikachu/unknown_e5e90.png b/gfx/pikachu/unknown_e5e90.png new file mode 100644 index 00000000..8e896836 Binary files /dev/null and b/gfx/pikachu/unknown_e5e90.png differ diff --git a/gfx/pikachu/unknown_e6020.png b/gfx/pikachu/unknown_e6020.png new file mode 100644 index 00000000..7b938b8d Binary files /dev/null and b/gfx/pikachu/unknown_e6020.png differ diff --git a/gfx/pikachu/unknown_e61b0.png b/gfx/pikachu/unknown_e61b0.png new file mode 100644 index 00000000..d0260da7 Binary files /dev/null and b/gfx/pikachu/unknown_e61b0.png differ diff --git a/gfx/pikachu/unknown_e6340.png b/gfx/pikachu/unknown_e6340.png new file mode 100644 index 00000000..1bb0b1d9 Binary files /dev/null and b/gfx/pikachu/unknown_e6340.png differ diff --git a/gfx/pikachu/unknown_e63f7.png b/gfx/pikachu/unknown_e63f7.png new file mode 100644 index 00000000..71ed5a1f Binary files /dev/null and b/gfx/pikachu/unknown_e63f7.png differ diff --git a/gfx/pikachu/unknown_e6587.png b/gfx/pikachu/unknown_e6587.png new file mode 100644 index 00000000..0ec65607 Binary files /dev/null and b/gfx/pikachu/unknown_e6587.png differ diff --git a/gfx/pikachu/unknown_e6646.png b/gfx/pikachu/unknown_e6646.png new file mode 100644 index 00000000..c45de678 Binary files /dev/null and b/gfx/pikachu/unknown_e6646.png differ diff --git a/gfx/pikachu/unknown_e67d6.png b/gfx/pikachu/unknown_e67d6.png new file mode 100644 index 00000000..ee5bdacf Binary files /dev/null and b/gfx/pikachu/unknown_e67d6.png differ diff --git a/gfx/pikachu/unknown_e682f.png b/gfx/pikachu/unknown_e682f.png new file mode 100644 index 00000000..d0f522dc Binary files /dev/null and b/gfx/pikachu/unknown_e682f.png differ diff --git a/gfx/pikachu/unknown_e69bf.png b/gfx/pikachu/unknown_e69bf.png new file mode 100644 index 00000000..ce8de250 Binary files /dev/null and b/gfx/pikachu/unknown_e69bf.png differ diff --git a/gfx/pikachu/unknown_e6b4f.png b/gfx/pikachu/unknown_e6b4f.png new file mode 100644 index 00000000..4ea34714 Binary files /dev/null and b/gfx/pikachu/unknown_e6b4f.png differ diff --git a/gfx/pikachu/unknown_e6cdf.png b/gfx/pikachu/unknown_e6cdf.png new file mode 100644 index 00000000..f0f96237 Binary files /dev/null and b/gfx/pikachu/unknown_e6cdf.png differ diff --git a/gfx/pikachu/unknown_e6e6f.png b/gfx/pikachu/unknown_e6e6f.png new file mode 100644 index 00000000..608af942 Binary files /dev/null and b/gfx/pikachu/unknown_e6e6f.png differ diff --git a/gfx/pikachu/unknown_e6fff.png b/gfx/pikachu/unknown_e6fff.png new file mode 100644 index 00000000..a722794a Binary files /dev/null and b/gfx/pikachu/unknown_e6fff.png differ diff --git a/gfx/pikachu/unknown_e718f.png b/gfx/pikachu/unknown_e718f.png new file mode 100644 index 00000000..1276764c Binary files /dev/null and b/gfx/pikachu/unknown_e718f.png differ diff --git a/gfx/pikachu/unknown_e731f.png b/gfx/pikachu/unknown_e731f.png new file mode 100644 index 00000000..2d6d6bdb Binary files /dev/null and b/gfx/pikachu/unknown_e731f.png differ diff --git a/gfx/pikachu/unknown_e74af.png b/gfx/pikachu/unknown_e74af.png new file mode 100644 index 00000000..0aa1592b Binary files /dev/null and b/gfx/pikachu/unknown_e74af.png differ diff --git a/gfx/pikachu/unknown_e763f.png b/gfx/pikachu/unknown_e763f.png new file mode 100644 index 00000000..72f9ef29 Binary files /dev/null and b/gfx/pikachu/unknown_e763f.png differ diff --git a/gfx/pikachu/unknown_e77cf.png b/gfx/pikachu/unknown_e77cf.png new file mode 100644 index 00000000..ad94af7a Binary files /dev/null and b/gfx/pikachu/unknown_e77cf.png differ diff --git a/gfx/pikachu/unknown_e7863.png b/gfx/pikachu/unknown_e7863.png new file mode 100644 index 00000000..cd02d18d Binary files /dev/null and b/gfx/pikachu/unknown_e7863.png differ diff --git a/gfx/pikachu/unknown_e79f3.png b/gfx/pikachu/unknown_e79f3.png new file mode 100644 index 00000000..07b8230d Binary files /dev/null and b/gfx/pikachu/unknown_e79f3.png differ diff --git a/gfx/pikachu/unknown_e7b83.png b/gfx/pikachu/unknown_e7b83.png new file mode 100644 index 00000000..8a835dfb Binary files /dev/null and b/gfx/pikachu/unknown_e7b83.png differ diff --git a/gfx/pikachu/unknown_e7d13.png b/gfx/pikachu/unknown_e7d13.png new file mode 100644 index 00000000..3204f702 Binary files /dev/null and b/gfx/pikachu/unknown_e7d13.png differ diff --git a/gfx/pikachu/unknown_f0abf.png b/gfx/pikachu/unknown_f0abf.png new file mode 100644 index 00000000..dd553a8a Binary files /dev/null and b/gfx/pikachu/unknown_f0abf.png differ diff --git a/gfx/pikachu/unknown_f0b64.png b/gfx/pikachu/unknown_f0b64.png new file mode 100644 index 00000000..6b0424a8 Binary files /dev/null and b/gfx/pikachu/unknown_f0b64.png differ diff --git a/gfx/pikachu/unknown_f0cf4.png b/gfx/pikachu/unknown_f0cf4.png new file mode 100644 index 00000000..a4a4e5f4 Binary files /dev/null and b/gfx/pikachu/unknown_f0cf4.png differ diff --git a/gfx/pikachu/unknown_f0d82.png b/gfx/pikachu/unknown_f0d82.png new file mode 100644 index 00000000..1af4b770 Binary files /dev/null and b/gfx/pikachu/unknown_f0d82.png differ diff --git a/macros.asm b/macros.asm index 6e1ebc9d..b0c38140 100644 --- a/macros.asm +++ b/macros.asm @@ -239,7 +239,7 @@ EMAP: MACRO ; emap x-coordinate,y-coordinate,textpointer ; nybble: y-coordinate ; nybble: x-coordinate ; word : pointer to map name - db (\1 + (\2 << 4)) + dn \2, \1 dw \3 ENDM @@ -251,7 +251,7 @@ IMAP: MACRO ; imap mapid_less_than,x-coordinate,y-coordinate,textpointer ; nybble: x-coordinate ; word : pointer to map name db \1 + 1 - db \2 + \3 << 4 + dn \3, \2 dw \4 ENDM diff --git a/main.asm b/main.asm index 18c401aa..e765cd79 100755 --- a/main.asm +++ b/main.asm @@ -2036,119 +2036,119 @@ SECTION "bank30",ROMX,BANK[$30] SECTION "bank39",ROMX,BANK[$39] Pic_e4000: ; e4000 - dr $e4000, $e40cc +INCBIN "gfx/pikachu/unknown_e4000.pic" GFX_e40cc: ; e40cc - dr $e40cc, $e411c +INCBIN "gfx/pikachu/unknown_e40cc.2bpp" Pic_e411c: ; e411c - dr $e411c, $e41d2 +INCBIN "gfx/pikachu/unknown_e411c.pic" GFX_e41d2: ; e41d2 - dr $e41d2, $e4272 +INCBIN "gfx/pikachu/unknown_e41d2.2bpp" Pic_e4272: ; e4272 - dr $e4272, $e4323 +INCBIN "gfx/pikachu/unknown_e4272.pic" GFX_e4323: ; e4323 - dr $e4323, $e4383 +INCBIN "gfx/pikachu/unknown_e4323.2bpp" Pic_e4383: ; e4383 - dr $e4383, $e444b +INCBIN "gfx/pikachu/unknown_e4383.pic" GFX_e444b: ; e444b - dr $e444b, $e458b +INCBIN "gfx/pikachu/unknown_e444b.2bpp" Pic_e458b: ; e458b - dr $e458b, $e463b +INCBIN "gfx/pikachu/unknown_e458b.pic" GFX_e463b: ; e463b - dr $e463b, $e467b +INCBIN "gfx/pikachu/unknown_e463b.2bpp" Pic_e467b: ; e467b - dr $e467b, $e472e +INCBIN "gfx/pikachu/unknown_e467b.pic" GFX_e472e: ; e472e - dr $e472e, $e476e +INCBIN "gfx/pikachu/unknown_e472e.2bpp" Pic_e476e: ; e476e - dr $e476e, $e4841 +INCBIN "gfx/pikachu/unknown_e476e.pic" GFX_e4841: ; e4841 - dr $e4841, $e49d1 +INCBIN "gfx/pikachu/unknown_e4841.2bpp" Pic_e49d1: ; e49d1 - dr $e49d1, $e4a99 +INCBIN "gfx/pikachu/unknown_e49d1.pic" GFX_e4a99: ; e4a99 - dr $e4a99, $e4b39 +INCBIN "gfx/pikachu/unknown_e4a99.2bpp" Pic_e4b39: ; e4b39 - dr $e4b39, $e4bde +INCBIN "gfx/pikachu/unknown_e4b39.pic" GFX_e4bde: ; e4bde - dr $e4bde, $e4c3e +INCBIN "gfx/pikachu/unknown_e4bde.2bpp" Pic_e4c3e: ; e4c3e - dr $e4c3e, $e4ce0 +INCBIN "gfx/pikachu/unknown_e4c3e.pic" GFX_e4ce0: ; e4ce0 - dr $e4ce0, $e4e70 +INCBIN "gfx/pikachu/unknown_e4ce0.2bpp" GFX_e4e70: ; e4e70 - dr $e4e70, $e5000 +INCBIN "gfx/pikachu/unknown_e4e70.2bpp" Pic_e5000: ; e5000 - dr $e5000, $e50af +INCBIN "gfx/pikachu/unknown_e5000.pic" GFX_e50af: ; e50af - dr $e50af, $e523f +INCBIN "gfx/pikachu/unknown_e50af.2bpp" Pic_e523f: ; e523f - dr $e523f, $e52fe +INCBIN "gfx/pikachu/unknown_e523f.pic" GFX_e52fe: ; e52fe - dr $e52fe, $e548e +INCBIN "gfx/pikachu/unknown_e52fe.2bpp" Pic_e548e: ; e548e - dr $e548e, $e5541 +INCBIN "gfx/pikachu/unknown_e548e.pic" GFX_e5541: ; e5541 - dr $e5541, $e56d1 +INCBIN "gfx/pikachu/unknown_e5541.2bpp" Pic_e56d1: ; e56d1 - dr $e56d1, $e5794 +INCBIN "gfx/pikachu/unknown_e56d1.pic" GFX_e5794: ; e5794 - dr $e5794, $e5924 +INCBIN "gfx/pikachu/unknown_e5794.2bpp" Pic_e5924: ; e5924 - dr $e5924, $e59ed +INCBIN "gfx/pikachu/unknown_e5924.pic" GFX_e59ed: ; e59ed - dr $e59ed, $e5b7d +INCBIN "gfx/pikachu/unknown_e59ed.2bpp" Pic_e5b7d: ; e5b7d - dr $e5b7d, $e5c4d +INCBIN "gfx/pikachu/unknown_e5b7d.pic" GFX_e5c4d: ; e5c4d - dr $e5c4d, $e5ddd +INCBIN "gfx/pikachu/unknown_e5c4d.2bpp" Pic_e5ddd: ; e5ddd - dr $e5ddd, $e5e90 +INCBIN "gfx/pikachu/unknown_e5ddd.pic" GFX_e5e90: ; e5e90 - dr $e5e90, $e6020 +INCBIN "gfx/pikachu/unknown_e5e90.2bpp" GFX_e6020: ; e6020 - dr $e6020, $e61b0 +INCBIN "gfx/pikachu/unknown_e6020.2bpp" GFX_e61b0: ; e61b0 - dr $e61b0, $e6340 +INCBIN "gfx/pikachu/unknown_e61b0.2bpp" Pic_e6340: ; e6340 - dr $e6340, $e63f7 +INCBIN "gfx/pikachu/unknown_e6340.pic" GFX_e63f7: ; e63f7 - dr $e63f7, $e6587 +INCBIN "gfx/pikachu/unknown_e63f7.2bpp" Pic_e6587: ; e6587 - dr $e6587, $e6646 +INCBIN "gfx/pikachu/unknown_e6587.pic" GFX_e6646: ; e6646 - dr $e6646, $e67d6 +INCBIN "gfx/pikachu/unknown_e6646.2bpp" Pic_e67d6: ; e67d6 - dr $e67d6, $e682f +INCBIN "gfx/pikachu/unknown_e67d6.pic" GFX_e682f: ; e682f - dr $e682f, $e69bf +INCBIN "gfx/pikachu/unknown_e682f.2bpp" GFX_e69bf: ; e69bf - dr $e69bf, $e6b4f +INCBIN "gfx/pikachu/unknown_e69bf.2bpp" GFX_e6b4f: ; e6b4f - dr $e6b4f, $e6cdf +INCBIN "gfx/pikachu/unknown_e6b4f.2bpp" GFX_e6cdf: ; e6cdf - dr $e6cdf, $e6e6f +INCBIN "gfx/pikachu/unknown_e6cdf.2bpp" GFX_e6e6f: ; e6e6f - dr $e6e6f, $e6fff +INCBIN "gfx/pikachu/unknown_e6e6f.2bpp" GFX_e6fff: ; e6fff - dr $e6fff, $e718f +INCBIN "gfx/pikachu/unknown_e6fff.2bpp" GFX_e718f: ; e718f - dr $e718f, $e731f +INCBIN "gfx/pikachu/unknown_e718f.2bpp" GFX_e731f: ; e731f - dr $e731f, $e74af +INCBIN "gfx/pikachu/unknown_e731f.2bpp" GFX_e74af: ; e74af - dr $e74af, $e763f +INCBIN "gfx/pikachu/unknown_e74af.2bpp" GFX_e763f: ; e763f - dr $e763f, $e77cf +INCBIN "gfx/pikachu/unknown_e763f.2bpp" Pic_e77cf: ; e77cf - dr $e77cf, $e7863 +INCBIN "gfx/pikachu/unknown_e77cf.pic" GFX_e7863: ; e7863 - dr $e7863, $e79f3 +INCBIN "gfx/pikachu/unknown_e7863.2bpp" GFX_e79f3: ; e79f3 - dr $e79f3, $e7b83 +INCBIN "gfx/pikachu/unknown_e79f3.2bpp" GFX_e7b83: ; e7b83 - dr $e7b83, $e7d13 +INCBIN "gfx/pikachu/unknown_e7b83.2bpp" GFX_e7d13: ; e7d13 - dr $e7d13, $e7ea3 +INCBIN "gfx/pikachu/unknown_e7d13.2bpp" SECTION "bank3A",ROMX,BANK[$3A] INCLUDE "text/monster_names.asm" diff --git a/text/map_names.asm b/text/map_names.asm index dd8592be..0338cba3 100755 --- a/text/map_names.asm +++ b/text/map_names.asm @@ -98,7 +98,7 @@ RocketHQName: ; 7167a (1c:567a) SilphCoName: ; 71684 (1c:5684) db "SILPH CO.@" PokemonMansionName: ; 7168e (1c:568e) - db $4a," MANSION@" + db " MANSION@" SafariZoneName: ; 71698 (1c:5698) db "SAFARI ZONE@" CeruleanCaveName: ; 716a4 (1c:56a4) -- cgit v1.3.1-sl0p From 8345c40dcf3d10b9b09acc50bd01754b9d18d3e5 Mon Sep 17 00:00:00 2001 From: pikalaxalt Date: Sat, 4 Jun 2016 10:18:03 -0400 Subject: Resolve incbinned sgb border --- data/sgb_border.asm | 94 ++++++++++++++++++++++++++++++++++++--------- gfx/tilemaps/sgbborder.map | Bin 1792 -> 1792 bytes 2 files changed, 76 insertions(+), 18 deletions(-) (limited to 'data') diff --git a/data/sgb_border.asm b/data/sgb_border.asm index 401a55e9..694f97b6 100755 --- a/data/sgb_border.asm +++ b/data/sgb_border.asm @@ -1,29 +1,87 @@ BorderPalettes: ; 72c39 (1c:6c39) - dr $72c39,$734b9 - ;INCBIN "gfx/tilemaps/sgbborder.map" + INCBIN "gfx/tilemaps/sgbborder.map" - ;ds $100 + ds $100 - ;RGB 30,29,29 ; PAL_SGB1 - ;RGB 25,22,25 - ;RGB 25,17,21 - ;RGB 24,14,12 + RGB 24, 6, 6 + RGB 31, 25, 9 + RGB 25, 10, 10 + RGB 0, 0, 0 - ;ds $18 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 - ;RGB 30,29,29 ; PAL_SGB2 - ;RGB 22,31,16 - ;RGB 27,20,6 - ;RGB 15,15,15 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 - ;ds $18 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 - ;RGB 30,29,29 ; PAL_SGB3 - ;RGB 31,31,17 - ;RGB 18,21,29 - ;RGB 15,15,15 + RGB 18, 24, 18 + RGB 25, 10, 10 + RGB 15, 25, 15 + RGB 0, 0, 0 - ;ds $18 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 18, 6, 31 + RGB 31, 25, 9 + RGB 15, 25, 15 + RGB 0, 0, 0 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 12, 31, 6 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 + RGB 31, 31, 25 SGBBorderGraphics: ; 734b9 (1c:74b9) INCBIN "gfx/pokemon_yellow.t6.2bpp" diff --git a/gfx/tilemaps/sgbborder.map b/gfx/tilemaps/sgbborder.map index 4077ed8e..9c97c339 100644 Binary files a/gfx/tilemaps/sgbborder.map and b/gfx/tilemaps/sgbborder.map differ -- cgit v1.3.1-sl0p