From 689acb0e36fa7c41be3cb13c690db1a90bcbdacc Mon Sep 17 00:00:00 2001 From: Rangi Date: Sat, 20 Apr 2019 13:59:12 -0400 Subject: Try to identify more of maps/unused/Beta*.blk --- data/maps/blocks.asm | 56 +++++++++++++++--------------- maps/unused/BetaCapsuleHouse.blk | 1 + maps/unused/BetaCave.blk | 8 ----- maps/unused/BetaCave2.blk | 5 --- maps/unused/BetaCeladonMansion.blk | 1 - maps/unused/BetaCeladonMansion1F.blk | 1 + maps/unused/BetaCeladonMansion2F.blk | 1 + maps/unused/BetaEmptyHouse.blk | 15 -------- maps/unused/BetaHerosHouse.blk | 1 - maps/unused/BetaHouse2.blk | 1 - maps/unused/BetaIlexForest.blk | 1 - maps/unused/BetaPlayersHouse2F.blk | 1 + maps/unused/BetaPokecenter.blk | 1 + maps/unused/BetaPokecenterMainHouse.blk | 1 - maps/unused/BetaPokecenterTradeStation.blk | 1 - maps/unused/BetaRocketHideout1.blk | 5 --- maps/unused/BetaRocketHideout1F.blk | 15 ++++++++ maps/unused/BetaRocketHideout2.blk | 4 --- maps/unused/BetaRocketHideout3.blk | 5 --- maps/unused/BetaRocketHideoutB1F.blk | 4 +++ maps/unused/BetaRocketHideoutB2F.blk | 5 +++ maps/unused/BetaRocketHideoutB3F.blk | 5 +++ maps/unused/BetaRoute23.blk | 7 ++++ maps/unused/BetaRoute23EarlyVersion.blk | 7 ---- maps/unused/BetaSilverCaveOutside.blk | 1 + maps/unused/BetaSlowpokeWell1F.blk | 5 +++ maps/unused/BetaUnionCave.blk | 8 +++++ maps/unused/BetaUnknown.blk | 1 - maps/unused/BetaUnknownGym.blk | 1 + 29 files changed, 84 insertions(+), 84 deletions(-) create mode 100644 maps/unused/BetaCapsuleHouse.blk delete mode 100644 maps/unused/BetaCave.blk delete mode 100644 maps/unused/BetaCave2.blk delete mode 100644 maps/unused/BetaCeladonMansion.blk create mode 100644 maps/unused/BetaCeladonMansion1F.blk create mode 100644 maps/unused/BetaCeladonMansion2F.blk delete mode 100644 maps/unused/BetaEmptyHouse.blk delete mode 100644 maps/unused/BetaHerosHouse.blk delete mode 100644 maps/unused/BetaHouse2.blk delete mode 100644 maps/unused/BetaIlexForest.blk create mode 100644 maps/unused/BetaPlayersHouse2F.blk create mode 100644 maps/unused/BetaPokecenter.blk delete mode 100644 maps/unused/BetaPokecenterMainHouse.blk delete mode 100644 maps/unused/BetaPokecenterTradeStation.blk delete mode 100644 maps/unused/BetaRocketHideout1.blk create mode 100644 maps/unused/BetaRocketHideout1F.blk delete mode 100644 maps/unused/BetaRocketHideout2.blk delete mode 100644 maps/unused/BetaRocketHideout3.blk create mode 100644 maps/unused/BetaRocketHideoutB1F.blk create mode 100644 maps/unused/BetaRocketHideoutB2F.blk create mode 100644 maps/unused/BetaRocketHideoutB3F.blk create mode 100644 maps/unused/BetaRoute23.blk delete mode 100644 maps/unused/BetaRoute23EarlyVersion.blk create mode 100644 maps/unused/BetaSilverCaveOutside.blk create mode 100644 maps/unused/BetaSlowpokeWell1F.blk create mode 100644 maps/unused/BetaUnionCave.blk delete mode 100644 maps/unused/BetaUnknown.blk create mode 100644 maps/unused/BetaUnknownGym.blk diff --git a/data/maps/blocks.asm b/data/maps/blocks.asm index c4f180b8f..747bfefe4 100644 --- a/data/maps/blocks.asm +++ b/data/maps/blocks.asm @@ -15,8 +15,8 @@ Route44_Blocks: Route28_Blocks: INCBIN "maps/Route28.blk" -BetaHerosHouse_Blocks: - INCBIN "maps/unused/BetaHerosHouse.blk" +BetaPlayersHouse2F_Blocks: + INCBIN "maps/unused/BetaPlayersHouse2F.blk" CeladonCity_Blocks: INCBIN "maps/CeladonCity.blk" @@ -103,8 +103,8 @@ Route3_Blocks: PewterCity_Blocks: INCBIN "maps/PewterCity.blk" -BetaIlexForest_Blocks: - INCBIN "maps/unused/BetaIlexForest.blk" +BetaSilverCaveOutside_Blocks: + INCBIN "maps/unused/BetaSilverCaveOutside.blk" BetaSproutTower2_Blocks: INCBIN "maps/unused/BetaSproutTower2.blk" @@ -121,8 +121,8 @@ Route20_Blocks: BetaSproutTower6_Blocks: INCBIN "maps/unused/BetaSproutTower6.blk" -BetaPokecenterMainHouse_Blocks: - INCBIN "maps/unused/BetaPokecenterMainHouse.blk" +BetaPokecenter_Blocks: + INCBIN "maps/unused/BetaPokecenter.blk" Route30_Blocks: INCBIN "maps/Route30.blk" @@ -446,8 +446,8 @@ VioletNicknameSpeechHouse_Blocks: VioletKylesHouse_Blocks: INCBIN "maps/House2.blk" -BetaCave_Blocks: - INCBIN "maps/unused/BetaCave.blk" +BetaUnionCave_Blocks: + INCBIN "maps/unused/BetaUnionCave.blk" UnionCaveB1F_Blocks: INCBIN "maps/UnionCaveB1F.blk" @@ -466,8 +466,8 @@ Route5UndergroundPathEntrance_Blocks: Route6UndergroundPathEntrance_Blocks: INCBIN "maps/UndergroundPathEntrance.blk" -BetaPokecenterTradeStation_Blocks: - INCBIN "maps/unused/BetaPokecenterTradeStation.blk" +BetaCapsuleHouse_Blocks: + INCBIN "maps/unused/BetaCapsuleHouse.blk" KurtsHouse_Blocks: INCBIN "maps/KurtsHouse.blk" @@ -685,17 +685,17 @@ SilverCaveRoom2_Blocks: SilverCaveRoom3_Blocks: INCBIN "maps/SilverCaveRoom3.blk" -BetaRocketHideout1_Blocks: - INCBIN "maps/unused/BetaRocketHideout1.blk" +BetaRocketHideoutB2F_Blocks: + INCBIN "maps/unused/BetaRocketHideoutB2F.blk" -BetaRocketHideout2_Blocks: - INCBIN "maps/unused/BetaRocketHideout2.blk" +BetaRocketHideoutB1F_Blocks: + INCBIN "maps/unused/BetaRocketHideoutB1F.blk" -BetaEmptyHouse_Blocks: - INCBIN "maps/unused/BetaEmptyHouse.blk" +BetaRocketHideout1F_Blocks: + INCBIN "maps/unused/BetaRocketHideout1F.blk" -BetaRocketHideout3_Blocks: - INCBIN "maps/unused/BetaRocketHideout3.blk" +BetaRocketHideoutB3F_Blocks: + INCBIN "maps/unused/BetaRocketHideoutB3F.blk" MahoganyMart1F_Blocks: MountMoonGiftShop_Blocks: @@ -710,8 +710,8 @@ TeamRocketBaseB2F_Blocks: TeamRocketBaseB3F_Blocks: INCBIN "maps/TeamRocketBaseB3F.blk" -BetaRoute23EarlyVersion_Blocks: - INCBIN "maps/unused/BetaRoute23EarlyVersion.blk" +BetaRoute23_Blocks: + INCBIN "maps/unused/BetaRoute23.blk" IndigoPlateauPokecenter1F_Blocks: INCBIN "maps/IndigoPlateauPokecenter1F.blk" @@ -746,8 +746,8 @@ MahoganyGym_Blocks: OlivineGym_Blocks: INCBIN "maps/OlivineGym.blk" -BetaUnknown_Blocks: - INCBIN "maps/unused/BetaUnknown.blk" +BetaUnknownGym_Blocks: + INCBIN "maps/unused/BetaUnknownGym.blk" CianwoodGym_Blocks: INCBIN "maps/CianwoodGym.blk" @@ -779,8 +779,8 @@ OlivineLighthouse6F_Blocks: SECTION "Map Blocks 3", ROMX -BetaCave2_Blocks: - INCBIN "maps/unused/BetaCave2.blk" +BetaSlowpokeWell1F_Blocks: + INCBIN "maps/unused/BetaSlowpokeWell1F.blk" SlowpokeWellB1F_Blocks: INCBIN "maps/SlowpokeWellB1F.blk" @@ -913,14 +913,14 @@ PewterGym_Blocks: CeladonGym_Blocks: INCBIN "maps/CeladonGym.blk" -BetaHouse2_Blocks: - INCBIN "maps/unused/BetaHouse2.blk" +BetaCeladonMansion1F_Blocks: + INCBIN "maps/unused/BetaCeladonMansion1F.blk" CeladonCafe_Blocks: INCBIN "maps/CeladonCafe.blk" -BetaCeladonMansion_Blocks: - INCBIN "maps/unused/BetaCeladonMansion.blk" +BetaCeladonMansion2F_Blocks: + INCBIN "maps/unused/BetaCeladonMansion2F.blk" RockTunnel1F_Blocks: INCBIN "maps/RockTunnel1F.blk" diff --git a/maps/unused/BetaCapsuleHouse.blk b/maps/unused/BetaCapsuleHouse.blk new file mode 100644 index 000000000..555abfa07 --- /dev/null +++ b/maps/unused/BetaCapsuleHouse.blk @@ -0,0 +1 @@ +' \ No newline at end of file diff --git a/maps/unused/BetaCave.blk b/maps/unused/BetaCave.blk deleted file mode 100644 index b103c2532..000000000 --- a/maps/unused/BetaCave.blk +++ /dev/null @@ -1,8 +0,0 @@ -  - - - - - - -  \ No newline at end of file diff --git a/maps/unused/BetaCave2.blk b/maps/unused/BetaCave2.blk deleted file mode 100644 index a2722d010..000000000 --- a/maps/unused/BetaCave2.blk +++ /dev/null @@ -1,5 +0,0 @@ -  -(+ -)* - -   \ No newline at end of file diff --git a/maps/unused/BetaCeladonMansion.blk b/maps/unused/BetaCeladonMansion.blk deleted file mode 100644 index 8d3e219df..000000000 --- a/maps/unused/BetaCeladonMansion.blk +++ /dev/null @@ -1 +0,0 @@ -? +,/ \ No newline at end of file diff --git a/maps/unused/BetaCeladonMansion1F.blk b/maps/unused/BetaCeladonMansion1F.blk new file mode 100644 index 000000000..993ea3a8d --- /dev/null +++ b/maps/unused/BetaCeladonMansion1F.blk @@ -0,0 +1 @@ +?',9..',9 \ No newline at end of file diff --git a/maps/unused/BetaCeladonMansion2F.blk b/maps/unused/BetaCeladonMansion2F.blk new file mode 100644 index 000000000..8d3e219df --- /dev/null +++ b/maps/unused/BetaCeladonMansion2F.blk @@ -0,0 +1 @@ +? +,/ \ No newline at end of file diff --git a/maps/unused/BetaEmptyHouse.blk b/maps/unused/BetaEmptyHouse.blk deleted file mode 100644 index dcec62794..000000000 --- a/maps/unused/BetaEmptyHouse.blk +++ /dev/null @@ -1,15 +0,0 @@ -  -   -  - - - -   -  -   -   -   - - % - -   \ No newline at end of file diff --git a/maps/unused/BetaHerosHouse.blk b/maps/unused/BetaHerosHouse.blk deleted file mode 100644 index b5b53b4bd..000000000 --- a/maps/unused/BetaHerosHouse.blk +++ /dev/null @@ -1 +0,0 @@ - ! " \ No newline at end of file diff --git a/maps/unused/BetaHouse2.blk b/maps/unused/BetaHouse2.blk deleted file mode 100644 index 993ea3a8d..000000000 --- a/maps/unused/BetaHouse2.blk +++ /dev/null @@ -1 +0,0 @@ -?',9..',9 \ No newline at end of file diff --git a/maps/unused/BetaIlexForest.blk b/maps/unused/BetaIlexForest.blk deleted file mode 100644 index 3cde14007..000000000 --- a/maps/unused/BetaIlexForest.blk +++ /dev/null @@ -1 +0,0 @@ -hqqqqqihqqqqqilrrsm \ No newline at end of file diff --git a/maps/unused/BetaPlayersHouse2F.blk b/maps/unused/BetaPlayersHouse2F.blk new file mode 100644 index 000000000..b5b53b4bd --- /dev/null +++ b/maps/unused/BetaPlayersHouse2F.blk @@ -0,0 +1 @@ + ! " \ No newline at end of file diff --git a/maps/unused/BetaPokecenter.blk b/maps/unused/BetaPokecenter.blk new file mode 100644 index 000000000..261350738 --- /dev/null +++ b/maps/unused/BetaPokecenter.blk @@ -0,0 +1 @@ +  ' \ No newline at end of file diff --git a/maps/unused/BetaPokecenterMainHouse.blk b/maps/unused/BetaPokecenterMainHouse.blk deleted file mode 100644 index 261350738..000000000 --- a/maps/unused/BetaPokecenterMainHouse.blk +++ /dev/null @@ -1 +0,0 @@ -  ' \ No newline at end of file diff --git a/maps/unused/BetaPokecenterTradeStation.blk b/maps/unused/BetaPokecenterTradeStation.blk deleted file mode 100644 index 555abfa07..000000000 --- a/maps/unused/BetaPokecenterTradeStation.blk +++ /dev/null @@ -1 +0,0 @@ -' \ No newline at end of file diff --git a/maps/unused/BetaRocketHideout1.blk b/maps/unused/BetaRocketHideout1.blk deleted file mode 100644 index 988208073..000000000 --- a/maps/unused/BetaRocketHideout1.blk +++ /dev/null @@ -1,5 +0,0 @@ - - :?  > "! 89  *> *   89 :?:? )  ;?;? )  ? :)   ><) >>    )89      >>   8: ::?   ?< <>:) 5//////>89<)  -,/////- >>>> 1 8899///= - 5///->:?  1 = - >? ? ,/////-,////- \ No newline at end of file diff --git a/maps/unused/BetaRocketHideoutB1F.blk b/maps/unused/BetaRocketHideoutB1F.blk new file mode 100644 index 000000000..b17106cca --- /dev/null +++ b/maps/unused/BetaRocketHideoutB1F.blk @@ -0,0 +1,4 @@ + +   +  +  >:)   ><) >>    )89      >>   8: ::?   ?< <> "! 89  *> *   89 :?:? )  ;?;? )  ? >:) 5//////>89<)  +,/////- >>>> 1 8899///= + 5///->:?  1 = + >? ? ,/////-,////- \ No newline at end of file diff --git a/maps/unused/BetaRoute23.blk b/maps/unused/BetaRoute23.blk new file mode 100644 index 000000000..a62533dd4 --- /dev/null +++ b/maps/unused/BetaRoute23.blk @@ -0,0 +1,7 @@ + + ! + +ohi +omhi!nm7:~nm'nm'nm'nm'nm'nm'nm'nm +^ +noo !hihi \ No newline at end of file diff --git a/maps/unused/BetaRoute23EarlyVersion.blk b/maps/unused/BetaRoute23EarlyVersion.blk deleted file mode 100644 index a62533dd4..000000000 --- a/maps/unused/BetaRoute23EarlyVersion.blk +++ /dev/null @@ -1,7 +0,0 @@ - - ! - -ohi -omhi!nm7:~nm'nm'nm'nm'nm'nm'nm'nm -^ -noo !hihi \ No newline at end of file diff --git a/maps/unused/BetaSilverCaveOutside.blk b/maps/unused/BetaSilverCaveOutside.blk new file mode 100644 index 000000000..3cde14007 --- /dev/null +++ b/maps/unused/BetaSilverCaveOutside.blk @@ -0,0 +1 @@ +hqqqqqihqqqqqilrrsm \ No newline at end of file diff --git a/maps/unused/BetaSlowpokeWell1F.blk b/maps/unused/BetaSlowpokeWell1F.blk new file mode 100644 index 000000000..a2722d010 --- /dev/null +++ b/maps/unused/BetaSlowpokeWell1F.blk @@ -0,0 +1,5 @@ +  +(+ +)* + +   \ No newline at end of file diff --git a/maps/unused/BetaUnionCave.blk b/maps/unused/BetaUnionCave.blk new file mode 100644 index 000000000..b103c2532 --- /dev/null +++ b/maps/unused/BetaUnionCave.blk @@ -0,0 +1,8 @@ +  + + + + + + +  \ No newline at end of file diff --git a/maps/unused/BetaUnknown.blk b/maps/unused/BetaUnknown.blk deleted file mode 100644 index c3063adc7..000000000 --- a/maps/unused/BetaUnknown.blk +++ /dev/null @@ -1 +0,0 @@ -( \ No newline at end of file diff --git a/maps/unused/BetaUnknownGym.blk b/maps/unused/BetaUnknownGym.blk new file mode 100644 index 000000000..c3063adc7 --- /dev/null +++ b/maps/unused/BetaUnknownGym.blk @@ -0,0 +1 @@ +( \ No newline at end of file -- cgit v1.2.3