From f1c6d94d3974e896092b70137fed2f7e020da97e Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da < tyuki@adu.me > Date: Wed, 18 Jan 2012 00:17:00 -0600 Subject: Finalized Gary map hg-commit-id: e2ffb49499cc --- common.asm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'common.asm') diff --git a/common.asm b/common.asm index 3bbc7421..94edbfff 100644 --- a/common.asm +++ b/common.asm @@ -190,10 +190,10 @@ MapHeaderPointers: ; $01AE dw DayCareM_h dw Route6Gate_h dw UndergroundTunnelEntranceRoute6_h - dw $56e3 ; id=75 + dw $56e3 ; FREEZE id=75 dw Route7Gate_h dw UndergroundPathEntranceRoute7_h - dw $575d + dw $575d ;FREEZE dw Route8Gate_h dw UndergroundPathEntranceRoute8_h dw RockTunnelPokecenter_h @@ -235,7 +235,7 @@ MapHeaderPointers: ; $01AE dw Lance_h ; unused dw $6492 dw UndergroundPathNS_h - dw $5f11 + dw Gary_h dw UndergroundPathWE_h dw CeladonMart1_h dw CeladonMart2_h @@ -46780,7 +46780,16 @@ CopycatsHouseF1Object: ; 0x75ee3 (size=46) EVENT_DISP $4, $7, $3 EVENT_DISP $4, $1, $7 ; COPYCATS_HOUSE_2F -INCBIN "baserom.gbc",$75f11,$75f1d - $75f11 +;INCBIN "baserom.gbc",$75f11,$75f1d - $75f11 + +Gary_h: ;0x75f11 + +db $7 ;tileset +db $4, $4 ;Height, Width +dw GaryBlocks, GaryTexts, GaryScript +db $0 ;No Connections + +dw GaryObject GaryScript: ; 0x75f1d call $3c3c -- cgit v1.2.3 From 4e19891384e23e7c8018425cbbb5efd1f3d51e12 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da < tyuki@adu.me > Date: Wed, 18 Jan 2012 00:19:12 -0600 Subject: Connected Hall of fame room hg-commit-id: 644c9fedbc25 --- common.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common.asm') diff --git a/common.asm b/common.asm index 94edbfff..39f7edfe 100644 --- a/common.asm +++ b/common.asm @@ -233,7 +233,7 @@ MapHeaderPointers: ; $01AE dw Lance_h ; unused dw Lance_h ; unused dw Lance_h ; unused - dw $6492 + dw HallofFameRoom_h ;118 dw UndergroundPathNS_h dw Gary_h dw UndergroundPathWE_h -- cgit v1.2.3 From dcb93dc0e9f033d9dce504c9112ad183b7b55f16 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da < tyuki@adu.me > Date: Wed, 18 Jan 2012 00:20:01 -0600 Subject: Minor: prefixed 118 with id=118 hg-commit-id: 2ab07a3ca26c --- common.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common.asm') diff --git a/common.asm b/common.asm index 39f7edfe..37ec2fef 100644 --- a/common.asm +++ b/common.asm @@ -233,7 +233,7 @@ MapHeaderPointers: ; $01AE dw Lance_h ; unused dw Lance_h ; unused dw Lance_h ; unused - dw HallofFameRoom_h ;118 + dw HallofFameRoom_h ;id=118 dw UndergroundPathNS_h dw Gary_h dw UndergroundPathWE_h -- cgit v1.2.3 From f68dc609903b8b9e66adf1d2da1c11de0ade24a7 Mon Sep 17 00:00:00 2001 From: KuroiIeWa5Da < tyuki@adu.me > Date: Wed, 18 Jan 2012 00:26:51 -0600 Subject: synchroized MapBanks with MapHeaders hg-commit-id: fad82e1cb088 --- common.asm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'common.asm') diff --git a/common.asm b/common.asm index 37ec2fef..f2ae6bce 100644 --- a/common.asm +++ b/common.asm @@ -2965,7 +2965,7 @@ INCBIN "baserom.gbc",$C000,$C23D - $C000 ; see also MapHeaderPointers MapHeaderBanks: ; 423D - db BANK(PalletTown_h) + db BANK(PalletTown_h) ;PALLET_TOWN db BANK(ViridianCity_h) ; VIRIDIAN_CITY db BANK(PewterCity_h) ; PEWTER_CITY db BANK(CeruleanCity_h) ; CERULEAN_CITY @@ -2976,7 +2976,7 @@ MapHeaderBanks: ; 423D db BANK(CinnabarIsland_h) ; CINNABAR_ISLAND db BANK(IndigoPlateau_h) ; INDIGO_PLATEAU db BANK(SaffronCity_h) ; SAFFRON_CITY - db $01 ; unused + db $1 ; unused db BANK(Route1_h) ; ROUTE_1 db BANK(Route2_h) ; ROUTE_2 db BANK(Route3_h) ; ROUTE_3 @@ -3040,10 +3040,10 @@ MapHeaderBanks: ; 423D db BANK(DayCareM_h) db BANK(Route6Gate_h) db BANK(UndergroundTunnelEntranceRoute6_h) - db $17 + db $17 ;FREEZE db BANK(Route7Gate_h) db BANK(UndergroundPathEntranceRoute7_h) - db $17 + db $17 ;FREEZE db BANK(Route8Gate_h) db BANK(UndergroundPathEntranceRoute8_h) db BANK(RockTunnelPokecenter_h) @@ -3070,22 +3070,22 @@ MapHeaderBanks: ; 423D db BANK(SSAnne8_h) db BANK(SSAnne9_h) db BANK(SSAnne10_h) - db $1D - db $1D - db $1D + db $1D ;unused + db $1D ;unused + db $1D ;unused db BANK(VictoryRoad1_h) - db $1D - db $1D - db $1D - db $1D + db $1D ;unused + db $1D ;unused + db $1D ;unused + db $1D ;unused db BANK(Lance_h) - db $1D - db $1D - db $1D - db $1D - db $16 + db $1D ;unused + db $1D ;unused + db $1D ;unused + db $1D ;unused + db BANK(HallofFameRoom_h) db BANK(UndergroundPathNS_h) - db $1D + db BANK(Gary_h) db BANK(UndergroundPathWE_h) db BANK(CeladonMart1_h) db BANK(CeladonMart2_h) -- cgit v1.2.3 From 148534cc5c8522d2ba442dd4370b522adc60bef0 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Wed, 18 Jan 2012 00:09:22 -0700 Subject: Add where the pointers come from for freeze maps. hg-commit-id: 4eb10320bf19 --- common.asm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'common.asm') diff --git a/common.asm b/common.asm index f2ae6bce..7fd58cb5 100644 --- a/common.asm +++ b/common.asm @@ -190,7 +190,7 @@ MapHeaderPointers: ; $01AE dw DayCareM_h dw Route6Gate_h dw UndergroundTunnelEntranceRoute6_h - dw $56e3 ; FREEZE id=75 + dw UndergroundTunnelEntranceRoute6_h ; unused dw Route7Gate_h dw UndergroundPathEntranceRoute7_h dw $575d ;FREEZE @@ -288,7 +288,7 @@ MapHeaderPointers: ; $01AE dw Lab4_h dw CinnabarPokecenter_h dw CinnabarMart_h - dw $5e72 + dw CinnabarMart_h ; unused dw IndigoPlateauLobby_h dw CopycatsHouseF1_h dw CopycatsHouseF2_h @@ -319,9 +319,9 @@ MapHeaderPointers: ; $01AE dw RocketHideout3_h dw RocketHideout4_h dw RocketHideoutElevator_h - dw $5704 - dw $5704 - dw $5704 + dw RocketHideoutElevator_h ; unused + dw RocketHideoutElevator_h ; unused + dw RocketHideoutElevator_h ; unused dw SilphCo2_h dw SilphCo3_h ; id=208 dw SilphCo4_h @@ -346,20 +346,20 @@ MapHeaderPointers: ; $01AE dw UnknownDungeon1_h dw NameRater_h dw CeruleanHouse3_h - dw $56b2 + dw Route16GateMap_h ; unused dw RockTunnel2_h dw SilphCo9_h dw SilphCo10_h dw SilphCo11_h dw SilphCoElevator_h - dw $5ce5 - dw $5ce5 + dw SilphCo2_h ; unused + dw SilphCo2_h ; unused dw BattleCenterM_h dw TradeCenterM_h - dw $5CE5 - dw $5CE5 - dw $5CE5 - dw $5CE5 + dw SilphCo2_h ; unused + dw SilphCo2_h ; unused + dw SilphCo2_h ; unused + dw SilphCo2_h ; unused dw Lorelei_h dw Bruno_h dw Agatha_h -- cgit v1.2.3 From 5351f55c0e8cb5e631297dd7c351bb19c8a74637 Mon Sep 17 00:00:00 2001 From: IIMarckus Date: Wed, 18 Jan 2012 00:10:53 -0700 Subject: Strip redundant comments from map header pointers. hg-commit-id: d44d520e7b41 --- common.asm | 86 +++++++++++++++++++++++++++++++------------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) (limited to 'common.asm') diff --git a/common.asm b/common.asm index 7fd58cb5..01e7edd6 100644 --- a/common.asm +++ b/common.asm @@ -115,43 +115,43 @@ Start: INCBIN "baserom.gbc",$150,$1AE - $150 ; see also MapHeaderBanks MapHeaderPointers: ; $01AE - dw PalletTown_h ; PALLET_TOWN - dw ViridianCity_h ; VIRIDIAN_CITY - dw PewterCity_h ; PEWTER_CITY - dw CeruleanCity_h ; CERULEAN_CITY - dw LavenderTown_h ; LAVENDER_TOWN - dw VermilionCity_h ; VERMILION_CITY - dw CeladonCity_h ; CELADON_CITY - dw FuchsiaCity_h ; FUCHSIA_CITY - dw CinnabarIsland_h ; CINNABAR_ISLAND - dw IndigoPlateau_h ; INDIGO_PLATEAU - dw SaffronCity_h ; SAFFRON_CITY - dw SaffronCity_h ; unused - dw Route1_h ; ROUTE_1 - dw Route2_h ; ROUTE_2 - dw Route3_h ; ROUTE_3 - dw Route4_h ; ROUTE_4 - dw Route5_h ; ROUTE_5 - dw Route6_h ; ROUTE_6 - dw Route7_h ; ROUTE_7 - dw Route8_h ; ROUTE_8 - dw Route9_h ; ROUTE_9 - dw Route10_h ; ROUTE_10 - dw Route11_h ; ROUTE_11 - dw Route12_h ; ROUTE_12 - dw Route13_h ; ROUTE_13 - dw Route14_h ; ROUTE_14 - dw Route15_h ; ROUTE_15 - dw Route16_h ; ROUTE_16 - dw Route17_h ; ROUTE_17 - dw Route18_h ; ROUTE_18 - dw Route19_h ; ROUTE_19 - dw Route20_h ; ROUTE_20 - dw Route21_h ; ROUTE_21 - dw Route22_h ; ROUTE_22 - dw Route23_h ; ROUTE_23 - dw Route24_h ; ROUTE_24 - dw Route25_h ; ROUTE_25 + dw PalletTown_h + dw ViridianCity_h + dw PewterCity_h + dw CeruleanCity_h + dw LavenderTown_h + dw VermilionCity_h + dw CeladonCity_h + dw FuchsiaCity_h + dw CinnabarIsland_h + dw IndigoPlateau_h + dw SaffronCity_h + dw SaffronCity_h + dw Route1_h + dw Route2_h + dw Route3_h + dw Route4_h + dw Route5_h + dw Route6_h + dw Route7_h + dw Route8_h + dw Route9_h + dw Route10_h + dw Route11_h + dw Route12_h + dw Route13_h + dw Route14_h + dw Route15_h + dw Route16_h + dw Route17_h + dw Route18_h + dw Route19_h + dw Route20_h + dw Route21_h + dw Route22_h + dw Route23_h + dw Route24_h + dw Route25_h dw RedsHouse1F_h dw RedsHouse2F_h dw BluesHouse_h @@ -184,7 +184,7 @@ MapHeaderPointers: ; $01AE dw BikeShop_h dw CeruleanMart_h dw MtMoonPokecenter_h - dw CeruleanHouseTrashed_h ; copy of map 62 + dw CeruleanHouseTrashed_h ; copy dw Route5Gate_h dw UndergroundTunnelEntranceRoute5_h dw DayCareM_h @@ -193,7 +193,7 @@ MapHeaderPointers: ; $01AE dw UndergroundTunnelEntranceRoute6_h ; unused dw Route7Gate_h dw UndergroundPathEntranceRoute7_h - dw $575d ;FREEZE + dw $575d dw Route8Gate_h dw UndergroundPathEntranceRoute8_h dw RockTunnelPokecenter_h @@ -219,11 +219,11 @@ MapHeaderPointers: ; $01AE dw SSAnne7_h dw SSAnne8_h dw SSAnne9_h - dw SSAnne10_h ; id=104 + dw SSAnne10_h dw Lance_h ; unused dw Lance_h ; unused dw Lance_h ; unused - dw VictoryRoad1_h ; id=108 + dw VictoryRoad1_h dw Lance_h ; unused dw Lance_h ; unused dw Lance_h ; unused @@ -233,7 +233,7 @@ MapHeaderPointers: ; $01AE dw Lance_h ; unused dw Lance_h ; unused dw Lance_h ; unused - dw HallofFameRoom_h ;id=118 + dw HallofFameRoom_h dw UndergroundPathNS_h dw Gary_h dw UndergroundPathWE_h @@ -323,7 +323,7 @@ MapHeaderPointers: ; $01AE dw RocketHideoutElevator_h ; unused dw RocketHideoutElevator_h ; unused dw SilphCo2_h - dw SilphCo3_h ; id=208 + dw SilphCo3_h dw SilphCo4_h dw SilphCo5_h dw SilphCo6_h -- cgit v1.2.3