16 files changed, 1716 insertions, 1972 deletions
diff --git a/data/credits/credits_order.asm b/data/credits/credits_order.asm
index 20b9137f..f8454e91 100755
--- a/data/credits/credits_order.asm
+++ b/data/credits/credits_order.asm
@@ -1,39 +1,40 @@
 CreditsOrder:
 ; subsequent credits elements will be displayed on separate lines.
-; $FF, $FE, $FD, $FC, $FB, and $FA are commands that are used
-; to go to the next set of credits texts.
-	db CRED_MON, CRED_VERSION, $FF
-	db CRED_DIRECTOR, CRED_TAJIRI, $FF
-	db CRED_PROGRAMMERS, CRED_TA_OOTA, CRED_MORIMOTO, $FD
-	db CRED_PROGRAMMERS, CRED_WATANABE, CRED_MASUDE, CRED_TAMADA, $FE
-	db CRED_CHAR_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, $FF
-	db CRED_MUSIC, CRED_MASUDE, $FD
-	db CRED_SOUND_EFFECTS, CRED_MASUDE, $FE
-	db CRED_GAME_DESIGN, CRED_TAJIRI, $FF
-	db CRED_MONSTER_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_FUZIWARA, $FD
-	db CRED_MONSTER_DESIGN, CRED_MORIMOTO, CRED_SA_OOTA, CRED_YOSHIKAWA, $FE
-	db CRED_GAME_SCENE, CRED_TAJIRI, $FD
-	db CRED_GAME_SCENE, CRED_TANIGUCHI, CRED_NONOMURA, CRED_ZINNAI, $FE
-	db CRED_PARAM, CRED_NISINO, CRED_TA_NAKAMURA, $FF
-	db CRED_MAP, CRED_TAJIRI, CRED_NISINO, $FD
-	db CRED_MAP, CRED_MATSUSIMA, CRED_NONOMURA, CRED_TANIGUCHI, $FE
-	db CRED_TEST, CRED_KAKEI, CRED_TSUCHIYA, $FD
-	db CRED_TEST, CRED_TA_NAKAMURA, CRED_YUDA, $FE
-	db CRED_SPECIAL, CRED_HISHIDA, CRED_SAKAI, $FD
-	db CRED_SPECIAL, CRED_YAMAGUCHI, CRED_YAMAMOTO, $FC
-	db CRED_SPECIAL, CRED_TOMISAWA, CRED_KAWAMOTO, CRED_TO_OOTA, $FE
-	db CRED_PRODUCERS, CRED_MIYAMOTO, $FD
-	db CRED_PRODUCERS, CRED_KAWAGUCHI, $FC
-	db CRED_PRODUCERS, CRED_ISHIHARA, $FE
-	db CRED_US_STAFF, $FD
-	db CRED_US_COORD, CRED_TILDEN, $FD
-	db CRED_US_COORD, CRED_KAWAKAMI, CRED_HI_NAKAMURA, $FC
-	db CRED_US_COORD, CRED_GIESE, CRED_OSBORNE, $FC
-	db CRED_TRANS, CRED_OGASAWARA, $FD
-	db CRED_PROGRAMMERS, CRED_MURAKAWA, CRED_FUKUI, $FD
-	db CRED_SPECIAL, CRED_IWATA, $FD
-	db CRED_SPECIAL, CRED_HARADA, $FC
-	db CRED_TEST, CRED_PAAD, CRED_CLUB, $FD
-	db CRED_PRODUCER, CRED_IZUSHI, $FD
-	db CRED_EXECUTIVE, CRED_YAMAUCHI, $FF
-	db $FB, $FF, $FA
+; CRED_TEXT, CRED_TEXT_FADE, CRED_TEXT_MON, and CRED_TEXT_FADE_MON are
+; commands that are used to go to the next set of credits texts.
+	db CRED_MON, CRED_VERSION, CRED_TEXT_FADE_MON
+	db CRED_DIRECTOR, CRED_TAJIRI, CRED_TEXT_FADE_MON
+	db CRED_PROGRAMMERS, CRED_TA_OOTA, CRED_MORIMOTO, CRED_TEXT_FADE
+	db CRED_PROGRAMMERS, CRED_WATANABE, CRED_MASUDE, CRED_TAMADA, CRED_TEXT_MON
+	db CRED_CHAR_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_TEXT_FADE_MON
+	db CRED_MUSIC, CRED_MASUDE, CRED_TEXT_FADE
+	db CRED_SOUND_EFFECTS, CRED_MASUDE, CRED_TEXT_MON
+	db CRED_GAME_DESIGN, CRED_TAJIRI, CRED_TEXT_FADE_MON
+	db CRED_MONSTER_DESIGN, CRED_SUGIMORI, CRED_NISHIDA, CRED_FUZIWARA, CRED_TEXT_FADE
+	db CRED_MONSTER_DESIGN, CRED_MORIMOTO, CRED_SA_OOTA, CRED_YOSHIKAWA, CRED_TEXT_MON
+	db CRED_GAME_SCENE, CRED_TAJIRI, CRED_TEXT_FADE
+	db CRED_GAME_SCENE, CRED_TANIGUCHI, CRED_NONOMURA, CRED_ZINNAI, CRED_TEXT_MON
+	db CRED_PARAM, CRED_NISINO, CRED_TA_NAKAMURA, CRED_TEXT_FADE_MON
+	db CRED_MAP, CRED_TAJIRI, CRED_NISINO, CRED_TEXT_FADE
+	db CRED_MAP, CRED_MATSUSIMA, CRED_NONOMURA, CRED_TANIGUCHI, CRED_TEXT_MON
+	db CRED_TEST, CRED_KAKEI, CRED_TSUCHIYA, CRED_TEXT_FADE
+	db CRED_TEST, CRED_TA_NAKAMURA, CRED_YUDA, CRED_TEXT_MON
+	db CRED_SPECIAL, CRED_HISHIDA, CRED_SAKAI, CRED_TEXT_FADE
+	db CRED_SPECIAL, CRED_YAMAGUCHI, CRED_YAMAMOTO, CRED_TEXT
+	db CRED_SPECIAL, CRED_TOMISAWA, CRED_KAWAMOTO, CRED_TO_OOTA, CRED_TEXT_MON
+	db CRED_PRODUCERS, CRED_MIYAMOTO, CRED_TEXT_FADE
+	db CRED_PRODUCERS, CRED_KAWAGUCHI, CRED_TEXT
+	db CRED_PRODUCERS, CRED_ISHIHARA, CRED_TEXT_MON
+	db CRED_US_STAFF, CRED_TEXT_FADE
+	db CRED_US_COORD, CRED_TILDEN, CRED_TEXT_FADE
+	db CRED_US_COORD, CRED_KAWAKAMI, CRED_HI_NAKAMURA, CRED_TEXT
+	db CRED_US_COORD, CRED_GIESE, CRED_OSBORNE, CRED_TEXT
+	db CRED_TRANS, CRED_OGASAWARA, CRED_TEXT_FADE
+	db CRED_PROGRAMMERS, CRED_MURAKAWA, CRED_FUKUI, CRED_TEXT_FADE
+	db CRED_SPECIAL, CRED_IWATA, CRED_TEXT_FADE
+	db CRED_SPECIAL, CRED_HARADA, CRED_TEXT
+	db CRED_TEST, CRED_PAAD, CRED_CLUB, CRED_TEXT_FADE
+	db CRED_PRODUCER, CRED_IZUSHI, CRED_TEXT_FADE
+	db CRED_EXECUTIVE, CRED_YAMAUCHI, CRED_TEXT_FADE_MON
+	db CRED_COPYRIGHT, CRED_TEXT_FADE_MON
+	db CRED_THE_END
diff --git a/data/events/hidden_objects.asm b/data/events/hidden_objects.asm
index 8fc539ef..ed30f81b 100755
--- a/data/events/hidden_objects.asm
+++ b/data/events/hidden_objects.asm
@@ -84,7 +84,7 @@ HiddenObjectMaps:
 	db VERMILION_CITY
 	db CERULEAN_CITY
 	db ROUTE_4
-	db $FF
+	db -1 ; end
 
 HiddenObjectPointers:
 ; each of these pointers is for the corresponding map in HiddenObjectMaps
@@ -174,680 +174,488 @@ HiddenObjectPointers:
 	dw CeruleanCityHiddenObjects
 	dw Route4HiddenObjects
 
-; format: y-coord, x-coord, text id/item id, object routine
+hidden_object: MACRO
+	db \2 ; y coord
+	db \1 ; x coord
+	db \3 ; item id
+	dba \4 ; object routine
+ENDM
+
+hidden_text_predef: MACRO
+	db \2 ; y coord
+	db \1 ; x coord
+	db_tx_pre \3 ; text id
+	dba \4 ; object routine
+ENDM
+
 TradeCenterHiddenObjects:
-	db $04,$05,$d0
-	db BANK(CableClubRightGameboy)
-	dw CableClubRightGameboy
-	db $04,$04,$d0
-	db BANK(CableClubLeftGameboy)
-	dw CableClubLeftGameboy
-	db $FF
+	hidden_object  5,  4, $d0, CableClubRightGameboy
+	hidden_object  4,  4, $d0, CableClubLeftGameboy
+	db -1 ; end
+
 ColosseumHiddenObjects:
-	db $04,$05,$d0
-	db BANK(CableClubRightGameboy)
-	dw CableClubRightGameboy
-	db $04,$04,$d0
-	db BANK(CableClubLeftGameboy)
-	dw CableClubLeftGameboy
-	db $FF
+	hidden_object  5,  4, $d0, CableClubRightGameboy
+	hidden_object  4,  4, $d0, CableClubLeftGameboy
+	db -1 ; end
+
 RedsHouse2FHiddenObjects:
-	db $01,$00,$04
-	dbw BANK(OpenRedsPC), OpenRedsPC
-	db $05,$03,$d0
-	dbw BANK(PrintRedSNESText), PrintRedSNESText
-	db $FF
+	hidden_object  0,  1, SPRITE_FACING_UP, OpenRedsPC
+	hidden_object  3,  5, $d0, PrintRedSNESText
+	db -1 ; end
+
 BluesHouseHiddenObjects:
-	db $01,$00,$04
-	db BANK(PrintBookcaseText)
-	dw PrintBookcaseText
-	db $01,$01,$04
-	db BANK(PrintBookcaseText)
-	dw PrintBookcaseText
-	db $01,$07,$04
-	db BANK(PrintBookcaseText)
-	dw PrintBookcaseText
-	db $FF
+	hidden_object  0,  1, SPRITE_FACING_UP, PrintBookcaseText
+	hidden_object  1,  1, SPRITE_FACING_UP, PrintBookcaseText
+	hidden_object  7,  1, SPRITE_FACING_UP, PrintBookcaseText
+	db -1 ; end
+
 OaksLabHiddenObjects:
-	db $00,$04,$04
-	db BANK(DisplayOakLabLeftPoster)
-	dw DisplayOakLabLeftPoster
-	db $00,$05,$04
-	db BANK(DisplayOakLabRightPoster)
-	dw DisplayOakLabRightPoster
-	db $01,$00,$04
-	db BANK(DisplayOakLabEmailText)
-	dw DisplayOakLabEmailText
-	db $01,$01,$04
-	db BANK(DisplayOakLabEmailText)
-	dw DisplayOakLabEmailText
-	db $FF
+	hidden_object  4,  0, SPRITE_FACING_UP, DisplayOakLabLeftPoster
+	hidden_object  5,  0, SPRITE_FACING_UP, DisplayOakLabRightPoster
+	hidden_object  0,  1, SPRITE_FACING_UP, DisplayOakLabEmailText
+	hidden_object  1,  1, SPRITE_FACING_UP, DisplayOakLabEmailText
+	db -1 ; end
+
 ViridianPokecenterHiddenObjects:
-	db $04,$00,$08
-	db BANK(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
+	hidden_object  0,  4, SPRITE_FACING_LEFT, PrintBenchGuyText
+	hidden_object 13,  3, SPRITE_FACING_UP, OpenPokemonCenterPC
+	db -1 ; end
+
 ViridianMartHiddenObjects:
-	db $FF
+	db -1 ; end
+
 ViridianSchoolHiddenObjects:
-	db $04,$03,(ViridianSchoolNotebook_id - TextPredefs) / 2 + 1
-	db BANK(PrintNotebookText)
-	dw PrintNotebookText
-	db $00,$03,(ViridianSchoolBlackboard_id - TextPredefs) / 2 + 1
-	db BANK(PrintBlackboardLinkCableText)
-	dw PrintBlackboardLinkCableText
-	db $FF
+	hidden_text_predef  3,  4, ViridianSchoolNotebook, PrintNotebookText
+	hidden_text_predef  3,  0, ViridianSchoolBlackboard, PrintBlackboardLinkCableText
+	db -1 ; end
+
 ViridianGymHiddenObjects:
-	db $0f,$0f,$04
-	dbw BANK(GymStatues),GymStatues
-	db $0f,$12,$04
-	dbw BANK(GymStatues),GymStatues
-	db $FF
+	hidden_object 15, 15, SPRITE_FACING_UP, GymStatues
+	hidden_object 18, 15, SPRITE_FACING_UP, GymStatues
+	db -1 ; end
+
 Museum1FHiddenObjects:
-	db $03,$02,$04
-	dbw BANK(AerodactylFossil), AerodactylFossil
-	db $06,$02,$04
-	dbw BANK(KabutopsFossil), KabutopsFossil
-	db $FF
+	hidden_object  2,  3, SPRITE_FACING_UP, AerodactylFossil
+	hidden_object  2,  6, SPRITE_FACING_UP, KabutopsFossil
+	db -1 ; end
+
 PewterGymHiddenObjects:
-	db $0a,$03,$04
-	dbw BANK(GymStatues),GymStatues
-	db $0a,$06,$04
-	dbw BANK(GymStatues),GymStatues
-	db $FF
+	hidden_object  3, 10, SPRITE_FACING_UP, GymStatues
+	hidden_object  6, 10, SPRITE_FACING_UP, GymStatues
+	db -1 ; end
+
 PewterMartHiddenObjects:
-	db $FF
+	db -1 ; end
+
 PewterPokecenterHiddenObjects:
-	db $04,$00,$08
-	db BANK(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
+	hidden_object  0,  4, SPRITE_FACING_LEFT, PrintBenchGuyText
+	hidden_object 13,  3, SPRITE_FACING_UP, OpenPokemonCenterPC
+	db -1 ; end
+
 CeruleanPokecenterHiddenObjects:
-	db $04,$00,$08
-	db BANK(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
+	hidden_object  0,  4, SPRITE_FACING_LEFT, PrintBenchGuyText
+	hidden_object 13,  3, SPRITE_FACING_UP, OpenPokemonCenterPC
+	db -1 ; end
+
 CeruleanGymHiddenObjects:
-	db $0b,$03,$04
-	dbw BANK(GymStatues),GymStatues
-	db $0b,$06,$04
-	dbw BANK(GymStatues),GymStatues
-	db $FF
+	hidden_object  3, 11, SPRITE_FACING_UP, GymStatues
+	hidden_object  6, 11, SPRITE_FACING_UP, GymStatues
+	db -1 ; end
+
 CeruleanMartHiddenObjects:
-	db $FF
+	db -1 ; end
+
 LavenderPokecenterHiddenObjects:
-	db $04,$00,$08
-	db BANK(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
+	hidden_object  0,  4, SPRITE_FACING_LEFT, PrintBenchGuyText
+	hidden_object 13,  3, SPRITE_FACING_UP, OpenPokemonCenterPC
+	db -1 ; end
+
 VermilionPokecenterHiddenObjects:
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $04,$00,$04
-	db BANK(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $FF
+	hidden_object 13,  3, SPRITE_FACING_UP, OpenPokemonCenterPC
+	hidden_object  0,  4, SPRITE_FACING_UP, PrintBenchGuyText
+	db -1 ; end
+
 VermilionGymHiddenObjects:
-	db $0e,$03,$04
-	dbw BANK(GymStatues), GymStatues
-	db $0e,$06,$04
-	dbw BANK(GymStatues), GymStatues
-	db $01,$06,$00
-	dbw BANK(PrintTrashText), PrintTrashText
-	db $07,$01,$00
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $09,$01,$01
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $0b,$01,$02
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $07,$03,$03
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $09,$03,$04
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $0b,$03,$05
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $07,$05,$06
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $09,$05,$07
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $0b,$05,$08
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $07,$07,$09
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $09,$07,$0a
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $0b,$07,$0b
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $07,$09,$0c
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $09,$09,$0d
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $0b,$09,$0e
-	dbw BANK(GymTrashScript), GymTrashScript
-	db $FF
+	hidden_object  3, 14, SPRITE_FACING_UP, GymStatues
+	hidden_object  6, 14, SPRITE_FACING_UP, GymStatues
+	hidden_object  6,  1, SPRITE_FACING_DOWN, PrintTrashText
+	hidden_object  1,  7, 0, GymTrashScript
+	hidden_object  1,  9, 1, GymTrashScript
+	hidden_object  1, 11, 2, GymTrashScript
+	hidden_object  3,  7, 3, GymTrashScript
+	hidden_object  3,  9, 4, GymTrashScript
+	hidden_object  3, 11, 5, GymTrashScript
+	hidden_object  5,  7, 6, GymTrashScript
+	hidden_object  5,  9, 7, GymTrashScript
+	hidden_object  5, 11, 8, GymTrashScript
+	hidden_object  7,  7, 9, GymTrashScript
+	hidden_object  7,  9, 10, GymTrashScript
+	hidden_object  7, 11, 11, GymTrashScript
+	hidden_object  9,  7, 12, GymTrashScript
+	hidden_object  9,  9, 13, GymTrashScript
+	hidden_object  9, 11, 14, GymTrashScript
+	db -1 ; end
+
 CeladonMansion2HiddenObjects:
-	db $05,$00,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
+	hidden_object  0,  5, SPRITE_FACING_UP, OpenPokemonCenterPC
+	db -1 ; end
+
 CeladonPokecenterHiddenObjects:
-	db $04,$00,$08
-	db BANK(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
+	hidden_object  0,  4, SPRITE_FACING_LEFT, PrintBenchGuyText
+	hidden_object 13,  3, SPRITE_FACING_UP, OpenPokemonCenterPC
+	db -1 ; end
+
 CeladonGymHiddenObjects:
-	db $0f,$03,$04
-	dbw BANK(GymStatues),GymStatues
-	db $0f,$06,$04
-	dbw BANK(GymStatues),GymStatues
-	db $FF
+	hidden_object  3, 15, SPRITE_FACING_UP, GymStatues
+	hidden_object  6, 15, SPRITE_FACING_UP, GymStatues
+	db -1 ; end
+
 GameCornerHiddenObjects:
-	db $0f,$12,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0e,$12,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0d,$12,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0c,$12,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0b,$12,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0a,$12,$ff ; "Someone's Keys"
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0a,$0d,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0b,$0d,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0c,$0d,$fe ; "Out To Lunch"
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0d,$0d,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0e,$0d,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0f,$0d,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0f,$0c,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0e,$0c,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0d,$0c,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0c,$0c,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0b,$0c,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0a,$0c,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0a,$07,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0b,$07,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0c,$07,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0d,$07,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0e,$07,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0f,$07,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0f,$06,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0e,$06,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0d,$06,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0c,$06,$fd ; "Out Of Order"
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0b,$06,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0a,$06,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0a,$01,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0b,$01,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0c,$01,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0d,$01,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0e,$01,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $0f,$01,$d0
-	dbw BANK(StartSlotMachine), StartSlotMachine
-	db $08,$00,COIN+10
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $10,$01,COIN+10
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $0b,$03,COIN+20
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $0e,$03,COIN+10
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $0c,$04,COIN+10
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $0c,$09,COIN+20
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $0f,$09,COIN+10
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $0e,$10,COIN+10
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $10,$0a,COIN+10
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $07,$0b,COIN+40
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $08,$0f,COIN+100
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $0f,$0c,COIN+10
-	dbw BANK(HiddenCoins),HiddenCoins
-	db $FF
+	hidden_object 18, 15, $d0, StartSlotMachine
+	hidden_object 18, 14, $d0, StartSlotMachine
+	hidden_object 18, 13, $d0, StartSlotMachine
+	hidden_object 18, 12, $d0, StartSlotMachine
+	hidden_object 18, 11, $d0, StartSlotMachine
+	hidden_object 18, 10, $ff, StartSlotMachine ; "Someone's Keys"
+	hidden_object 13, 10, $d0, StartSlotMachine
+	hidden_object 13, 11, $d0, StartSlotMachine
+	hidden_object 13, 12, $fe, StartSlotMachine ; "Out To Lunch"
+	hidden_object 13, 13, $d0, StartSlotMachine
+	hidden_object 13, 14, $d0, StartSlotMachine
+	hidden_object 13, 15, $d0, StartSlotMachine
+	hidden_object 12, 15, $d0, StartSlotMachine
+	hidden_object 12, 14, $d0, StartSlotMachine
+	hidden_object 12, 13, $d0, StartSlotMachine
+	hidden_object 12, 12, $d0, StartSlotMachine
+	hidden_object 12, 11, $d0, StartSlotMachine
+	hidden_object 12, 10, $d0, StartSlotMachine
+	hidden_object  7, 10, $d0, StartSlotMachine
+	hidden_object  7, 11, $d0, StartSlotMachine
+	hidden_object  7, 12, $d0, StartSlotMachine
+	hidden_object  7, 13, $d0, StartSlotMachine
+	hidden_object  7, 14, $d0, StartSlotMachine
+	hidden_object  7, 15, $d0, StartSlotMachine
+	hidden_object  6, 15, $d0, StartSlotMachine
+	hidden_object  6, 14, $d0, StartSlotMachine
+	hidden_object  6, 13, $d0, StartSlotMachine
+	hidden_object  6, 12, $fd, StartSlotMachine ; "Out Of Order"
+	hidden_object  6, 11, $d0, StartSlotMachine
+	hidden_object  6, 10, $d0, StartSlotMachine
+	hidden_object  1, 10, $d0, StartSlotMachine
+	hidden_object  1, 11, $d0, StartSlotMachine
+	hidden_object  1, 12, $d0, StartSlotMachine
+	hidden_object  1, 13, $d0, StartSlotMachine
+	hidden_object  1, 14, $d0, StartSlotMachine
+	hidden_object  1, 15, $d0, StartSlotMachine
+	hidden_object  0,  8, COIN+10, HiddenCoins
+	hidden_object  1, 16, COIN+10, HiddenCoins
+	hidden_object  3, 11, COIN+20, HiddenCoins
+	hidden_object  3, 14, COIN+10, HiddenCoins
+	hidden_object  4, 12, COIN+10, HiddenCoins
+	hidden_object  9, 12, COIN+20, HiddenCoins
+	hidden_object  9, 15, COIN+10, HiddenCoins
+	hidden_object 16, 14, COIN+10, HiddenCoins
+	hidden_object 10, 16, COIN+10, HiddenCoins
+	hidden_object 11,  7, COIN+40, HiddenCoins
+	hidden_object 15,  8, COIN+100, HiddenCoins
+	hidden_object 12, 15, COIN+10, HiddenCoins
+	db -1 ; end
+
 CeladonHotelHiddenObjects:
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $04,$00,$08
-	db BANK(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $FF
+	hidden_object 13,  3, SPRITE_FACING_UP, OpenPokemonCenterPC
+	hidden_object  0,  4, SPRITE_FACING_LEFT, PrintBenchGuyText
+	db -1 ; end
+
 FuchsiaPokecenterHiddenObjects:
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $04,$00,$04
-	db BANK(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $FF
+	hidden_object 13,  3, SPRITE_FACING_UP, OpenPokemonCenterPC
+	hidden_object  0,  4, SPRITE_FACING_UP, PrintBenchGuyText
+	db -1 ; end
+
 FuchsiaGymHiddenObjects:
-	db $0f,$03,$04
-	dbw BANK(GymStatues),GymStatues
-	db $0f,$06,$04
-	dbw BANK(GymStatues),GymStatues
-	db $FF
+	hidden_object  3, 15, SPRITE_FACING_UP, GymStatues
+	hidden_object  6, 15, SPRITE_FACING_UP, GymStatues
+	db -1 ; end
+
 CinnabarGymHiddenObjects:
-	db $0d,$11,$04
-	dbw BANK(GymStatues),GymStatues
-	db $07,$0f,$01
-	db BANK(PrintCinnabarQuiz)
-	dw PrintCinnabarQuiz
-	db $01,$0a,$12
-	db BANK(PrintCinnabarQuiz)
-	dw PrintCinnabarQuiz
-	db $07,$09,$13
-	db BANK(PrintCinnabarQuiz)
-	dw PrintCinnabarQuiz
-	db $0d,$09,$14
-	db BANK(PrintCinnabarQuiz)
-	dw PrintCinnabarQuiz
-	db $0d,$01,$05
-	db BANK(PrintCinnabarQuiz)
-	dw PrintCinnabarQuiz
-	db $07,$01,$16
-	db BANK(PrintCinnabarQuiz)
-	dw PrintCinnabarQuiz
-	db $FF
+	hidden_object 17, 13, SPRITE_FACING_UP, GymStatues
+	hidden_object 15,  7, (0 << 4) | 1, PrintCinnabarQuiz
+	hidden_object 10,  1, (1 << 4) | 2, PrintCinnabarQuiz
+	hidden_object  9,  7, (1 << 4) | 3, PrintCinnabarQuiz
+	hidden_object  9, 13, (1 << 4) | 4, PrintCinnabarQuiz
+	hidden_object  1, 13, (0 << 4) | 5, PrintCinnabarQuiz
+	hidden_object  1,  7, (1 << 4) | 6, PrintCinnabarQuiz
+	db -1 ; end
+
 CinnabarPokecenterHiddenObjects:
-	db $04,$00,$04
-	db BANK(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
+	hidden_object  0,  4, SPRITE_FACING_UP, PrintBenchGuyText
+	hidden_object 13,  3, SPRITE_FACING_UP, OpenPokemonCenterPC
+	db -1 ; end
+
 SaffronGymHiddenObjects:
-	db $0f,$09,$04
-	dbw BANK(GymStatues),GymStatues
-	db $FF
+	hidden_object  9, 15, SPRITE_FACING_UP, GymStatues
+	db -1 ; end
+
 MtMoonPokecenterHiddenObjects:
-	db $04,$00,$08
-	db BANK(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
+	hidden_object  0,  4, SPRITE_FACING_LEFT, PrintBenchGuyText
+	hidden_object 13,  3, SPRITE_FACING_UP, OpenPokemonCenterPC
+	db -1 ; end
+
 RockTunnelPokecenterHiddenObjects:
-	db $04,$00,$08
-	db BANK(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
+	hidden_object  0,  4, SPRITE_FACING_LEFT, PrintBenchGuyText
+	hidden_object 13,  3, SPRITE_FACING_UP, OpenPokemonCenterPC
+	db -1 ; end
+
 ViridianForestHiddenObjects:
-	db $12,$01,POTION
-	dbw BANK(HiddenItems),HiddenItems
-	db $2a,$10,ANTIDOTE
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object  1, 18, POTION, HiddenItems
+	hidden_object 16, 42, ANTIDOTE, HiddenItems
+	db -1 ; end
+
 MtMoon3HiddenObjects:
-	db $0c,$12,MOON_STONE
-	dbw BANK(HiddenItems),HiddenItems
-	db $09,$21,ETHER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 18, 12, MOON_STONE, HiddenItems
+	hidden_object 33,  9, ETHER, HiddenItems
+	db -1 ; end
+
 IndigoPlateauHiddenObjects:
-	db $0d,$08,$ff
-	db BANK(PrintIndigoPlateauHQText)
-	dw PrintIndigoPlateauHQText
-	db $0d,$0b,$00
-	db BANK(PrintIndigoPlateauHQText)
-	dw PrintIndigoPlateauHQText
-	db $FF
+	hidden_object  8, 13, $ff, PrintIndigoPlateauHQText
+	hidden_object 11, 13, SPRITE_FACING_DOWN, PrintIndigoPlateauHQText
+	db -1 ; end
+
 Route25HiddenObjects:
-	db $03,$26,ETHER
-	dbw BANK(HiddenItems),HiddenItems
-	db $01,$0a,ELIXER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 38,  3, ETHER, HiddenItems
+	hidden_object 10,  1, ELIXER, HiddenItems
+	db -1 ; end
+
 Route9HiddenObjects:
-	db $07,$0e,ETHER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 14,  7, ETHER, HiddenItems
+	db -1 ; end
+
 SSAnne6HiddenObjects:
-	db $05,$0d,$00
-	dbw BANK(PrintTrashText), PrintTrashText
-	db $07,$0d,$00
-	dbw BANK(PrintTrashText), PrintTrashText
-	db $09,$0d,GREAT_BALL
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 13,  5, SPRITE_FACING_DOWN, PrintTrashText
+	hidden_object 13,  7, SPRITE_FACING_DOWN, PrintTrashText
+	hidden_object 13,  9, GREAT_BALL, HiddenItems
+	db -1 ; end
+
 SSAnne10HiddenObjects:
-	db $01,$03,HYPER_POTION
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object  3,  1, HYPER_POTION, HiddenItems
+	db -1 ; end
+
 Route10HiddenObjects:
-	db $11,$09,SUPER_POTION
-	dbw BANK(HiddenItems),HiddenItems
-	db $35,$10,MAX_ETHER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object  9, 17, SUPER_POTION, HiddenItems
+	hidden_object 16, 53, MAX_ETHER, HiddenItems
+	db -1 ; end
+
 RocketHideout1HiddenObjects:
-	db $0f,$15,PP_UP
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 21, 15, PP_UP, HiddenItems
+	db -1 ; end
+
 RocketHideout3HiddenObjects:
-	db $11,$1b,NUGGET
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 27, 17, NUGGET, HiddenItems
+	db -1 ; end
+
 RocketHideout4HiddenObjects:
-	db $01,$19,SUPER_POTION
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 25,  1, SUPER_POTION, HiddenItems
+	db -1 ; end
+
 SaffronPokecenterHiddenObjects:
-	db $04,$00,$04
-	db BANK(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
+	hidden_object  0,  4, SPRITE_FACING_UP, PrintBenchGuyText
+	hidden_object 13,  3, SPRITE_FACING_UP, OpenPokemonCenterPC
+	db -1 ; end
+
 PokemonTower5HiddenObjects:
-	db $0c,$04,ELIXER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object  4, 12, ELIXER, HiddenItems
+	db -1 ; end
+
 Route13HiddenObjects:
-	db $0e,$01,PP_UP
-	dbw BANK(HiddenItems),HiddenItems
-	db $0d,$10,CALCIUM
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object  1, 14, PP_UP, HiddenItems
+	hidden_object 16, 13, CALCIUM, HiddenItems
+	db -1 ; end
+
 SafariZoneEntranceHiddenObjects:
-	db $01,$0a,NUGGET
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 10,  1, NUGGET, HiddenItems
+	db -1 ; end
+
 SafariZoneWestHiddenObjects:
-	db $05,$06,REVIVE
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object  6,  5, REVIVE, HiddenItems
+	db -1 ; end
+
 SilphCo5FHiddenObjects:
-	db $03,$0c,ELIXER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 12,  3, ELIXER, HiddenItems
+	db -1 ; end
+
 SilphCo9FHiddenObjects:
-	db $0f,$02,MAX_POTION
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object  2, 15, MAX_POTION, HiddenItems
+	db -1 ; end
+
 CopycatsHouse2FHiddenObjects:
-	db $01,$01,NUGGET
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object  1,  1, NUGGET, HiddenItems
+	db -1 ; end
+
 CeruleanCave1HiddenObjects:
-	db $0b,$0e,RARE_CANDY
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 14, 11, RARE_CANDY, HiddenItems
+	db -1 ; end
+
 CeruleanCave3HiddenObjects:
-	db $03,$1b,ULTRA_BALL
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 27,  3, ULTRA_BALL, HiddenItems
+	db -1 ; end
+
 PowerPlantHiddenObjects:
-	db $10,$11,MAX_ELIXER
-	dbw BANK(HiddenItems),HiddenItems
-	db $01,$0c,PP_UP
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 17, 16, MAX_ELIXER, HiddenItems
+	hidden_object 12,  1, PP_UP, HiddenItems
+	db -1 ; end
+
 SeafoamIslands3HiddenObjects:
-	db $0f,$0f,NUGGET
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 15, 15, NUGGET, HiddenItems
+	db -1 ; end
+
 SeafoamIslands5HiddenObjects:
-	db $11,$19,ULTRA_BALL
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 25, 17, ULTRA_BALL, HiddenItems
+	db -1 ; end
+
 Mansion1HiddenObjects:
-	db $10,$08,MOON_STONE
-	dbw BANK(HiddenItems),HiddenItems
-	db $05,$02,$04
-	db BANK(Mansion1Script_Switches)
-	dw Mansion1Script_Switches
-	db $FF
+	hidden_object  8, 16, MOON_STONE, HiddenItems
+	hidden_object  2,  5, SPRITE_FACING_UP, Mansion1Script_Switches
+	db -1 ; end
+
 Mansion2HiddenObjects:
-	db $0b,$02,$04
-	db BANK(Mansion2Script_Switches)
-	dw Mansion2Script_Switches
-	db $FF
+	hidden_object  2, 11, SPRITE_FACING_UP, Mansion2Script_Switches
+	db -1 ; end
+
 Mansion3HiddenObjects:
-	db $09,$01,MAX_REVIVE
-	dbw BANK(HiddenItems),HiddenItems
-	db $05,$0a,$04
-	db BANK(Mansion3Script_Switches)
-	dw Mansion3Script_Switches
-	db $FF
+	hidden_object  1,  9, MAX_REVIVE, HiddenItems
+	hidden_object 10,  5, SPRITE_FACING_UP, Mansion3Script_Switches
+	db -1 ; end
+
 Mansion4HiddenObjects:
-	db $09,$01,RARE_CANDY
-	dbw BANK(HiddenItems),HiddenItems
-	db $03,$14,$04
-	db BANK(Mansion4Script_Switches)
-	dw Mansion4Script_Switches
-	db $19,$12,$04
-	db BANK(Mansion4Script_Switches)
-	dw Mansion4Script_Switches
-	db $FF
+	hidden_object  1,  9, RARE_CANDY, HiddenItems
+	hidden_object 20,  3, SPRITE_FACING_UP, Mansion4Script_Switches
+	hidden_object 18, 25, SPRITE_FACING_UP, Mansion4Script_Switches
+	db -1 ; end
+
 Route23HiddenObjects:
-	db $2c,$09,FULL_RESTORE
-	dbw BANK(HiddenItems),HiddenItems
-	db $46,$13,ULTRA_BALL
-	dbw BANK(HiddenItems),HiddenItems
-	db $5a,$08,MAX_ETHER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object  9, 44, FULL_RESTORE, HiddenItems
+	hidden_object 19, 70, ULTRA_BALL, HiddenItems
+	hidden_object  8, 90, MAX_ETHER, HiddenItems
+	db -1 ; end
+
 VictoryRoad2HiddenObjects:
-	db $02,$05,ULTRA_BALL
-	dbw BANK(HiddenItems),HiddenItems
-	db $07,$1a,FULL_RESTORE
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object  5,  2, ULTRA_BALL, HiddenItems
+	hidden_object 26,  7, FULL_RESTORE, HiddenItems
+	db -1 ; end
+
 Unused6FHiddenObjects:
-	db $0b,$0e,MAX_ELIXER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 14, 11, MAX_ELIXER, HiddenItems
+	db -1 ; end
+
 BillsHouseHiddenObjects:
-	db $04,$01,$04
-	dbw BANK(BillsHousePC), BillsHousePC
-	db $FF
+	hidden_object  1,  4, SPRITE_FACING_UP, BillsHousePC
+	db -1 ; end
+
 ViridianCityHiddenObjects:
-	db $04,$0e,POTION
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 14,  4, POTION, HiddenItems
+	db -1 ; end
+
 SafariZoneRestHouse2HiddenObjects:
-	db $04,$00,$08
-	db BANK(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
+	hidden_object  0,  4, SPRITE_FACING_LEFT, PrintBenchGuyText
+	hidden_object 13,  3, SPRITE_FACING_UP, OpenPokemonCenterPC
+	db -1 ; end
+
 SafariZoneRestHouse3HiddenObjects:
-	db $04,$00,$08
-	db BANK(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
+	hidden_object  0,  4, SPRITE_FACING_LEFT, PrintBenchGuyText
+	hidden_object 13,  3, SPRITE_FACING_UP, OpenPokemonCenterPC
+	db -1 ; end
+
 SafariZoneRestHouse4HiddenObjects:
-	db $04,$00,$08
-	db BANK(PrintBenchGuyText)
-	dw PrintBenchGuyText
-	db $03,$0d,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
+	hidden_object  0,  4, SPRITE_FACING_LEFT, PrintBenchGuyText
+	hidden_object 13,  3, SPRITE_FACING_UP, OpenPokemonCenterPC
+	db -1 ; end
+
 Route15GateUpstairsHiddenObjects:
-	db $02,$01,$04
-	db BANK(Route15GateLeftBinoculars)
-	dw Route15GateLeftBinoculars
-	db $FF
+	hidden_object  1,  2, SPRITE_FACING_UP, Route15GateLeftBinoculars
+	db -1 ; end
+
 LavenderHouse1HiddenObjects:
-	db $01,$00,$00
-	db BANK(PrintMagazinesText)
-	dw PrintMagazinesText
-	db $01,$01,$00
-	db BANK(PrintMagazinesText)
-	dw PrintMagazinesText
-	db $01,$07,$00
-	db BANK(PrintMagazinesText)
-	dw PrintMagazinesText
-	db $FF
+	hidden_object  0,  1, SPRITE_FACING_DOWN, PrintMagazinesText
+	hidden_object  1,  1, SPRITE_FACING_DOWN, PrintMagazinesText
+	hidden_object  7,  1, SPRITE_FACING_DOWN, PrintMagazinesText
+	db -1 ; end
+
 CeladonMansion5HiddenObjects:
-	db $00,$03,(LinkCableHelp_id - TextPredefs) / 2 + 1
-	db BANK(PrintBlackboardLinkCableText)
-	dw PrintBlackboardLinkCableText
-	db $00,$04,(LinkCableHelp_id - TextPredefs) / 2 + 1
-	db BANK(PrintBlackboardLinkCableText)
-	dw PrintBlackboardLinkCableText
-	db $04,$03,(TMNotebook_id - TextPredefs) / 2 + 1
-	db BANK(PrintNotebookText)
-	dw PrintNotebookText
-	db $FF
+	hidden_text_predef  3,  0, LinkCableHelp, PrintBlackboardLinkCableText
+	hidden_text_predef  4,  0, LinkCableHelp, PrintBlackboardLinkCableText
+	hidden_text_predef  3,  4, TMNotebook, PrintNotebookText
+	db -1 ; end
+
 FightingDojoHiddenObjects:
-	db $09,$03,$04
-	db BANK(PrintFightingDojoText)
-	dw PrintFightingDojoText
-	db $09,$06,$04
-	db BANK(PrintFightingDojoText)
-	dw PrintFightingDojoText
-	db $00,$04,$04
-	db BANK(PrintFightingDojoText2)
-	dw PrintFightingDojoText2
-	db $00,$05,$04
-	db BANK(PrintFightingDojoText3)
-	dw PrintFightingDojoText3
-	db $FF
+	hidden_object  3,  9, SPRITE_FACING_UP, PrintFightingDojoText
+	hidden_object  6,  9, SPRITE_FACING_UP, PrintFightingDojoText
+	hidden_object  4,  0, SPRITE_FACING_UP, PrintFightingDojoText2
+	hidden_object  5,  0, SPRITE_FACING_UP, PrintFightingDojoText3
+	db -1 ; end
+
 IndigoPlateauLobbyHiddenObjects:
-	db $07,$0f,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
+	hidden_object 15,  7, SPRITE_FACING_UP, OpenPokemonCenterPC
+	db -1 ; end
+
 CinnabarLab4HiddenObjects:
-	db $04,$00,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $04,$02,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
+	hidden_object  0,  4, SPRITE_FACING_UP, OpenPokemonCenterPC
+	hidden_object  2,  4, SPRITE_FACING_UP, OpenPokemonCenterPC
+	db -1 ; end
+
 BikeShopHiddenObjects:
-	db $00,$01,$d0
-	dbw BANK(PrintNewBikeText), PrintNewBikeText
-	db $01,$02,$d0
-	dbw BANK(PrintNewBikeText), PrintNewBikeText
-	db $02,$01,$d0
-	dbw BANK(PrintNewBikeText), PrintNewBikeText
-	db $02,$03,$d0
-	dbw BANK(PrintNewBikeText), PrintNewBikeText
-	db $04,$00,$d0
-	dbw BANK(PrintNewBikeText), PrintNewBikeText
-	db $05,$01,$d0
-	dbw BANK(PrintNewBikeText), PrintNewBikeText
-	db $FF
+	hidden_object  1,  0, $d0, PrintNewBikeText
+	hidden_object  2,  1, $d0, PrintNewBikeText
+	hidden_object  1,  2, $d0, PrintNewBikeText
+	hidden_object  3,  2, $d0, PrintNewBikeText
+	hidden_object  0,  4, $d0, PrintNewBikeText
+	hidden_object  1,  5, $d0, PrintNewBikeText
+	db -1 ; end
+
 Route11HiddenObjects:
-	db $05,$30,ESCAPE_ROPE
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 48,  5, ESCAPE_ROPE, HiddenItems
+	db -1 ; end
+
 Route12HiddenObjects:
-	db $3f,$02,HYPER_POTION
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object  2, 63, HYPER_POTION, HiddenItems
+	db -1 ; end
+
 SilphCo11FHiddenObjects:
-	db $0c,$0a,$04
-	db BANK(OpenPokemonCenterPC)
-	dw OpenPokemonCenterPC
-	db $FF
+	hidden_object 10, 12, SPRITE_FACING_UP, OpenPokemonCenterPC
+	db -1 ; end
+
 Route17HiddenObjects:
-	db $0e,$0f,RARE_CANDY
-	dbw BANK(HiddenItems),HiddenItems
-	db $2d,$08,FULL_RESTORE
-	dbw BANK(HiddenItems),HiddenItems
-	db $48,$11,PP_UP
-	dbw BANK(HiddenItems),HiddenItems
-	db $5b,$04,MAX_REVIVE
-	dbw BANK(HiddenItems),HiddenItems
-	db $79,$08,MAX_ELIXER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 15,  14, RARE_CANDY, HiddenItems
+	hidden_object  8,  45, FULL_RESTORE, HiddenItems
+	hidden_object 17,  72, PP_UP, HiddenItems
+	hidden_object  4,  91, MAX_REVIVE, HiddenItems
+	hidden_object  8, 121, MAX_ELIXER, HiddenItems
+	db -1 ; end
+
 UndergroundPathNsHiddenObjects:
-	db $04,$03,FULL_RESTORE
-	dbw BANK(HiddenItems),HiddenItems
-	db $22,$04,X_SPECIAL
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object  3,  4, FULL_RESTORE, HiddenItems
+	hidden_object  4, 34, X_SPECIAL, HiddenItems
+	db -1 ; end
+
 UndergroundPathWeHiddenObjects:
-	db $02,$0c,NUGGET
-	dbw BANK(HiddenItems),HiddenItems
-	db $05,$15,ELIXER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 12,  2, NUGGET, HiddenItems
+	hidden_object 21,  5, ELIXER, HiddenItems
+	db -1 ; end
+
 CeladonCityHiddenObjects:
-	db $0f,$30,PP_UP
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 48, 15, PP_UP, HiddenItems
+	db -1 ; end
+
 SeafoamIslands4HiddenObjects:
-	db $10,$09,MAX_ELIXER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object  9, 16, MAX_ELIXER, HiddenItems
+	db -1 ; end
+
 VermilionCityHiddenObjects:
-	db $0b,$0e,MAX_ETHER
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 14, 11, MAX_ETHER, HiddenItems
+	db -1 ; end
+
 CeruleanCityHiddenObjects:
-	db $08,$0f,RARE_CANDY
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 15,  8, RARE_CANDY, HiddenItems
+	db -1 ; end
+
 Route4HiddenObjects:
-	db $03,$28,GREAT_BALL
-	dbw BANK(HiddenItems),HiddenItems
-	db $FF
+	hidden_object 40,  3, GREAT_BALL, HiddenItems
+	db -1 ; end
diff --git a/data/items/marts.asm b/data/items/marts.asm
index 35ae2e9d..3d7677a0 100755
--- a/data/items/marts.asm
+++ b/data/items/marts.asm
@@ -3,62 +3,62 @@
 
 ; Viridian
 ViridianCashierText::
-	TX_MART POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL
+	script_mart POKE_BALL, ANTIDOTE, PARLYZ_HEAL, BURN_HEAL
 
 ; Pewter
 PewterCashierText::
-	TX_MART POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
+	script_mart POKE_BALL, POTION, ESCAPE_ROPE, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
 
 ; Cerulean
 CeruleanCashierText::
-	TX_MART POKE_BALL, POTION, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
+	script_mart POKE_BALL, POTION, REPEL, ANTIDOTE, BURN_HEAL, AWAKENING, PARLYZ_HEAL
 
 ; Bike shop
-	TX_MART BICYCLE
+	script_mart BICYCLE
 
 ; Vermilion
 VermilionCashierText::
-	TX_MART POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL
+	script_mart POKE_BALL, SUPER_POTION, ICE_HEAL, AWAKENING, PARLYZ_HEAL, REPEL
 
 ; Lavender
 LavenderCashierText::
-	TX_MART GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL
+	script_mart GREAT_BALL, SUPER_POTION, REVIVE, ESCAPE_ROPE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, PARLYZ_HEAL
 
 ; Celadon Dept. Store 2F (1)
 CeladonMart2Clerk1Text::
-	TX_MART GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL
+	script_mart GREAT_BALL, SUPER_POTION, REVIVE, SUPER_REPEL, ANTIDOTE, BURN_HEAL, ICE_HEAL, AWAKENING, PARLYZ_HEAL
 
 ; Celadon Dept. Store 2F (2)
 CeladonMart2Clerk2Text::
-	TX_MART TM_32, TM_33, TM_02, TM_07, TM_37, TM_01, TM_05, TM_09, TM_17
+	script_mart TM_32, TM_33, TM_02, TM_07, TM_37, TM_01, TM_05, TM_09, TM_17
 
 ; Celadon Dept. Store 4F
 CeladonMart4ClerkText::
-	TX_MART POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE
+	script_mart POKE_DOLL, FIRE_STONE, THUNDER_STONE, WATER_STONE, LEAF_STONE
 
 ; Celadon Dept. Store 5F (1)
 CeladonMart5Clerk1Text::
-	TX_MART X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL
+	script_mart X_ACCURACY, GUARD_SPEC, DIRE_HIT, X_ATTACK, X_DEFEND, X_SPEED, X_SPECIAL
 
 ; Celadon Dept. Store 5F (2)
 CeladonMart5Clerk2Text::
-	TX_MART HP_UP, PROTEIN, IRON, CARBOS, CALCIUM
+	script_mart HP_UP, PROTEIN, IRON, CARBOS, CALCIUM
 
 ; Fuchsia
 FuchsiaCashierText::
-	TX_MART ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL
+	script_mart ULTRA_BALL, GREAT_BALL, SUPER_POTION, REVIVE, FULL_HEAL, SUPER_REPEL
 
 ; unused?
-	TX_MART GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE
+	script_mart GREAT_BALL, HYPER_POTION, SUPER_POTION, FULL_HEAL, REVIVE
 
 ; Cinnabar
 CinnabarCashierText::
-	TX_MART ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
+	script_mart ULTRA_BALL, GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
 
 ; Saffron
 SaffronCashierText::
-	TX_MART GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
+	script_mart GREAT_BALL, HYPER_POTION, MAX_REPEL, ESCAPE_ROPE, FULL_HEAL, REVIVE
 
 ; Indigo
 IndigoCashierText::
-	TX_MART ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL
+	script_mart ULTRA_BALL, GREAT_BALL, FULL_RESTORE, MAX_POTION, FULL_HEAL, REVIVE, MAX_REPEL
diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm
index bc89d600..4203e90a 100755
--- a/data/maps/hide_show_data.asm
+++ b/data/maps/hide_show_data.asm
@@ -1,577 +1,564 @@
-; data for default hidden/shown
-; objects for each map ($00-$F8)
+; default hidden/shown objects for each map
 
-; Table of 2-Byte pointers, one pointer per map,
-; goes up to Map_F7, ends with -1.
-; points to table listing all missable object in the area
 MapHSPointers:
-	dw MapHS00
-	dw MapHS01
-	dw MapHS02
-	dw MapHS03
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS0A
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS0D
-	dw MapHSXX
-	dw MapHS0F
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS14
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS17
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS1A
-	dw MapHS1B
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS21
-	dw MapHSXX
-	dw MapHS23
-	dw MapHS24
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS27
-	dw MapHS28
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS2D
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS33
-	dw MapHS34
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS3B
-	dw MapHSXX
-	dw MapHS3D
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS53
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS58
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS60
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS66
-	dw MapHS67
-	dw MapHS68
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS6C
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS78
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS84
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS87
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS8F
-	dw MapHS90
-	dw MapHS91
-	dw MapHS92
-	dw MapHS93
-	dw MapHS94
-	dw MapHS95
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS9B
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHS9F
-	dw MapHSA0
-	dw MapHSA1
-	dw MapHSA2
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSA5
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSB1
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSB5
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSC0
-	dw MapHSXX
-	dw MapHSC2
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSC6
-	dw MapHSC7
-	dw MapHSC8
-	dw MapHSC9
-	dw MapHSCA
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSCF
-	dw MapHSD0
-	dw MapHSD1
-	dw MapHSD2
-	dw MapHSD3
-	dw MapHSD4
-	dw MapHSD5
-	dw MapHSD6
-	dw MapHSD7
-	dw MapHSD8
-	dw MapHSD9
-	dw MapHSDA
-	dw MapHSDB
-	dw MapHSDC
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSE2
-	dw MapHSE3
-	dw MapHSE4
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSE9
-	dw MapHSEA
-	dw MapHSEB
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSF4
-	dw MapHSXX
-	dw MapHSXX
-	dw MapHSXX
+; entries correspond to map ids
+	dw PalletTownHS
+	dw ViridianCityHS
+	dw PewterCityHS
+	dw CeruleanCityHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw SaffronCityHS
+	dw NoHS
+	dw NoHS
+	dw Route2HS
+	dw NoHS
+	dw Route4HS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw Route9HS
+	dw NoHS
+	dw NoHS
+	dw Route12HS
+	dw NoHS
+	dw NoHS
+	dw Route15HS
+	dw Rout16eHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw Route22HS
+	dw NoHS
+	dw Route24HS
+	dw Route25HS
+	dw NoHS
+	dw NoHS
+	dw BluesHouseHS
+	dw OaksLabHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw ViridianGymHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw ViridianForestHS
+	dw Museum1FHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw MtMoon1FHS
+	dw NoHS
+	dw MtMoonB2FHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw PowerPlantHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw BillsHouseHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw SSAnne2FHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw SSAnne1FRoomsHS
+	dw SSAnne2FRoomsHS
+	dw SSAnneB1FRoomsHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw VictoryRoad1FHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw ChampionsRoomHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw CeladonMansionRoofHouseHS
+	dw NoHS
+	dw NoHS
+	dw GameCornerHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw PokemonTower2FHS
+	dw PokemonTower3FHS
+	dw PokemonTower4FHS
+	dw PokemonTower5FHS
+	dw PokemonTower6FHS
+	dw PokemonTower7FHS
+	dw MrFujisHouseHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw WardensHouseHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw SeafoamIslandsB1FHS
+	dw SeafoamIslandsB2FHS
+	dw SeafoamIslandsB3FHS
+	dw SeafoamIslandsB4FHS
+	dw NoHS
+	dw NoHS
+	dw PokemonMansion1FHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw FightingDojoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw SilphCo1FHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw SeafoamIslands1FHS
+	dw NoHS
+	dw VictoryRoad2FHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw VictoryRoad3FHS
+	dw RocketHideoutB1FHS
+	dw RocketHideoutB2FHS
+	dw RocketHideoutB3FHS
+	dw RocketHideoutB4FHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw SilphCo2FHS
+	dw SilphCo3FHS
+	dw SilphCo4FHS
+	dw SilphCo5FHS
+	dw SilphCo6FHS
+	dw SilphCo7FHS
+	dw SilphCo8FHS
+	dw PokemonMansion2FHS
+	dw PokemonMansion3FHS
+	dw PokemonMansionB1FHS
+	dw SafariZoneEastHS
+	dw SafariZoneNorthHS
+	dw SafariZoneWestHS
+	dw SafariZoneCenterHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw CeruleanCave2FHS
+	dw CeruleanCaveB1FHS
+	dw CeruleanCaveHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw SilphCo9FHS
+	dw SilphCo10FHS
+	dw SilphCo11FHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw NoHS
+	dw UnusedMapF4HS
+	dw NoHS
+	dw NoHS
+	dw NoHS
 	dw -1 ; end
 
-; Structure:
-; 3 bytes per object
-; [Map_ID][Object_ID][H/S]
-;
-; Program stops reading when either:
-; a) Map_ID = $FF
-; b) Map_ID ≠ currentMapID
-;
-; This Data is loaded into RAM at wd5ce-$D5F?. (wMissableObjectList)
+NoHS:
+	db $FF, $FF, $FF
 
-; These constants come from the bytes for Predef functions:
-Hide equ $11
-Show equ $15
+MissableObjects:
+; entries correspond to HS_* constants
+; format: map id, object id, HIDE/SHOW
 
-MapHSXX:
-	db $FF,$FF,$FF
-MapHS00:
-	db PALLET_TOWN,$01,Hide
-MapHS01:
-	db VIRIDIAN_CITY,$05,Show
-	db VIRIDIAN_CITY,$07,Hide
-MapHS02:
-	db PEWTER_CITY,$03,Show
-	db PEWTER_CITY,$05,Show
-MapHS03:
-	db CERULEAN_CITY,$01,Hide
-	db CERULEAN_CITY,$02,Show
-	db CERULEAN_CITY,$06,Hide
-	db CERULEAN_CITY,$0A,Show
-	db CERULEAN_CITY,$0B,Show
-MapHS0A:
-	db SAFFRON_CITY,$01,Show
-	db SAFFRON_CITY,$02,Show
-	db SAFFRON_CITY,$03,Show
-	db SAFFRON_CITY,$04,Show
-	db SAFFRON_CITY,$05,Show
-	db SAFFRON_CITY,$06,Show
-	db SAFFRON_CITY,$07,Show
-	db SAFFRON_CITY,$08,Hide
-	db SAFFRON_CITY,$09,Hide
-	db SAFFRON_CITY,$0A,Hide
-	db SAFFRON_CITY,$0B,Hide
-	db SAFFRON_CITY,$0C,Hide
-	db SAFFRON_CITY,$0D,Hide
-	db SAFFRON_CITY,$0E,Show
-	db SAFFRON_CITY,$0F,Hide
-MapHS0D:
-	db ROUTE_2,$01,Show
-	db ROUTE_2,$02,Show
-MapHS0F:
-	db ROUTE_4,$03,Show
-MapHS14:
-	db ROUTE_9,$0A,Show
-MapHS17:
-	db ROUTE_12,$01,Show
-	db ROUTE_12,$09,Show
-	db ROUTE_12,$0A,Show
-MapHS1A:
-	db ROUTE_15,$0B,Show
-MapHS1B:
-	db ROUTE_16,$07,Show
-MapHS21:
-	db ROUTE_22,$01,Hide
-	db ROUTE_22,$02,Hide
-MapHS23:
-	db ROUTE_24,$01,Show
-	db ROUTE_24,$08,Show
-MapHS24:
-	db ROUTE_25,$0A,Show
-MapHS27:
-	db BLUES_HOUSE,$01,Show
-	db BLUES_HOUSE,$02,Hide
-	db BLUES_HOUSE,$03,Show
-MapHS28:
-	db OAKS_LAB,$01,Show
-	db OAKS_LAB,$02,Show
-	db OAKS_LAB,$03,Show
-	db OAKS_LAB,$04,Show
-	db OAKS_LAB,$05,Hide
-	db OAKS_LAB,$06,Show
-	db OAKS_LAB,$07,Show
-	db OAKS_LAB,$08,Hide
-MapHS2D:
-	db VIRIDIAN_GYM,$01,Show
-	db VIRIDIAN_GYM,$0B,Show
-MapHS34:
-	db MUSEUM_1F,$05,Show
-MapHSE4:
-	db CERULEAN_CAVE_1F,$01,Show
-	db CERULEAN_CAVE_1F,$02,Show
-	db CERULEAN_CAVE_1F,$03,Show
-MapHS8F:
-	db POKEMON_TOWER_2F,$01,Show
-MapHS90:
-	db POKEMON_TOWER_3F,$04,Show
-MapHS91:
-	db POKEMON_TOWER_4F,$04,Show
-	db POKEMON_TOWER_4F,$05,Show
-	db POKEMON_TOWER_4F,$06,Show
-MapHS92:
-	db POKEMON_TOWER_5F,$06,Show
-MapHS93:
-	db POKEMON_TOWER_6F,$04,Show
-	db POKEMON_TOWER_6F,$05,Show
-MapHS94:
-	db POKEMON_TOWER_7F,$01,Show
-	db POKEMON_TOWER_7F,$02,Show
-	db POKEMON_TOWER_7F,$03,Show
-	db POKEMON_TOWER_7F,$04,Show
-MapHS95:
-	db MR_FUJIS_HOUSE,$05,Hide
-MapHS84:
-	db CELADON_MANSION_ROOF_HOUSE,$02,Show
-MapHS87:
-	db GAME_CORNER,$0B,Show
-MapHS9B:
-	db WARDENS_HOUSE,$02,Show
-MapHSA5:
-	db POKEMON_MANSION_1F,$02,Show
-	db POKEMON_MANSION_1F,$03,Show
-MapHSB1:
-	db FIGHTING_DOJO,$06,Show
-	db FIGHTING_DOJO,$07,Show
-MapHSB5:
-	db SILPH_CO_1F,$01,Hide
-MapHS53:
-	db POWER_PLANT,$01,Show
-	db POWER_PLANT,$02,Show
-	db POWER_PLANT,$03,Show
-	db POWER_PLANT,$04,Show
-	db POWER_PLANT,$05,Show
-	db POWER_PLANT,$06,Show
-	db POWER_PLANT,$07,Show
-	db POWER_PLANT,$08,Show
-	db POWER_PLANT,$09,Show
-	db POWER_PLANT,$0A,Show
-	db POWER_PLANT,$0B,Show
-	db POWER_PLANT,$0C,Show
-	db POWER_PLANT,$0D,Show
-	db POWER_PLANT,$0E,Show
-MapHSC2:
-	db VICTORY_ROAD_2F,$06,Show
-	db VICTORY_ROAD_2F,$07,Show
-	db VICTORY_ROAD_2F,$08,Show
-	db VICTORY_ROAD_2F,$09,Show
-	db VICTORY_ROAD_2F,$0A,Show
-	db VICTORY_ROAD_2F,$0D,Show
-MapHS58:
-	db BILLS_HOUSE,$01,Show
-	db BILLS_HOUSE,$02,Hide
-	db BILLS_HOUSE,$03,Hide
-MapHS33:
-	db VIRIDIAN_FOREST,$05,Show
-	db VIRIDIAN_FOREST,$06,Show
-	db VIRIDIAN_FOREST,$07,Show
-MapHS3B:
-	db MT_MOON_1F,$08,Show
-	db MT_MOON_1F,$09,Show
-	db MT_MOON_1F,$0A,Show
-	db MT_MOON_1F,$0B,Show
-	db MT_MOON_1F,$0C,Show
-	db MT_MOON_1F,$0D,Show
-MapHS3D:
-	db MT_MOON_B2F,$06,Show
-	db MT_MOON_B2F,$07,Show
-	db MT_MOON_B2F,$08,Show
-	db MT_MOON_B2F,$09,Show
-MapHS60:
-	db SS_ANNE_2F,$02,Hide
-MapHS66:
-	db SS_ANNE_1F_ROOMS,$0A,Show
-MapHS67:
-	db SS_ANNE_2F_ROOMS,$06,Show
-	db SS_ANNE_2F_ROOMS,$09,Show
-MapHS68:
-	db SS_ANNE_B1F_ROOMS,$09,Show
-	db SS_ANNE_B1F_ROOMS,$0A,Show
-	db SS_ANNE_B1F_ROOMS,$0B,Show
-MapHSC6:
-	db VICTORY_ROAD_3F,$05,Show
-	db VICTORY_ROAD_3F,$06,Show
-	db VICTORY_ROAD_3F,$0A,Show
-MapHSC7:
-	db ROCKET_HIDEOUT_B1F,$06,Show
-	db ROCKET_HIDEOUT_B1F,$07,Show
-MapHSC8:
-	db ROCKET_HIDEOUT_B2F,$02,Show
-	db ROCKET_HIDEOUT_B2F,$03,Show
-	db ROCKET_HIDEOUT_B2F,$04,Show
-	db ROCKET_HIDEOUT_B2F,$05,Show
-MapHSC9:
-	db ROCKET_HIDEOUT_B3F,$03,Show
-	db ROCKET_HIDEOUT_B3F,$04,Show
-MapHSCA:
-	db ROCKET_HIDEOUT_B4F,$01,Show
-	db ROCKET_HIDEOUT_B4F,$05,Show
-	db ROCKET_HIDEOUT_B4F,$06,Show
-	db ROCKET_HIDEOUT_B4F,$07,Show
-	db ROCKET_HIDEOUT_B4F,$08,Hide
-	db ROCKET_HIDEOUT_B4F,$09,Hide
-MapHSCF:
-	db SILPH_CO_2F,$01,Show
-	db SILPH_CO_2F,$02,Show
-	db SILPH_CO_2F,$03,Show
-	db SILPH_CO_2F,$04,Show
-	db SILPH_CO_2F,$05,Show
-MapHSD0:
-	db SILPH_CO_3F,$02,Show
-	db SILPH_CO_3F,$03,Show
-	db SILPH_CO_3F,$04,Show
-MapHSD1:
-	db SILPH_CO_4F,$02,Show
-	db SILPH_CO_4F,$03,Show
-	db SILPH_CO_4F,$04,Show
-	db SILPH_CO_4F,$05,Show
-	db SILPH_CO_4F,$06,Show
-	db SILPH_CO_4F,$07,Show
-MapHSD2:
-	db SILPH_CO_5F,$02,Show
-	db SILPH_CO_5F,$03,Show
-	db SILPH_CO_5F,$04,Show
-	db SILPH_CO_5F,$05,Show
-	db SILPH_CO_5F,$06,Show
-	db SILPH_CO_5F,$07,Show
-	db SILPH_CO_5F,$08,Show
-MapHSD3:
-	db SILPH_CO_6F,$06,Show
-	db SILPH_CO_6F,$07,Show
-	db SILPH_CO_6F,$08,Show
-	db SILPH_CO_6F,$09,Show
-	db SILPH_CO_6F,$0A,Show
-MapHSD4:
-	db SILPH_CO_7F,$05,Show
-	db SILPH_CO_7F,$06,Show
-	db SILPH_CO_7F,$07,Show
-	db SILPH_CO_7F,$08,Show
-	db SILPH_CO_7F,$09,Show
-	db SILPH_CO_7F,$0A,Show
-	db SILPH_CO_7F,$0B,Show
-	db SILPH_CO_7F,$0C,Show
-MapHSD5:
-	db SILPH_CO_8F,$02,Show
-	db SILPH_CO_8F,$03,Show
-	db SILPH_CO_8F,$04,Show
-MapHSE9:
-	db SILPH_CO_9F,$02,Show
-	db SILPH_CO_9F,$03,Show
-	db SILPH_CO_9F,$04,Show
-MapHSEA:
-	db SILPH_CO_10F,$01,Show
-	db SILPH_CO_10F,$02,Show
-	db SILPH_CO_10F,$03,Show
-	db SILPH_CO_10F,$04,Show
-	db SILPH_CO_10F,$05,Show
-	db SILPH_CO_10F,$06,Show
-MapHSEB:
-	db SILPH_CO_11F,$03,Show
-	db SILPH_CO_11F,$04,Show
-	db SILPH_CO_11F,$05,Show
-MapHSF4:
-	db UNUSED_MAP_F4,$02,Show
-MapHSD6:
-	db POKEMON_MANSION_2F,$02,Show
-MapHSD7:
-	db POKEMON_MANSION_3F,$03,Show
-	db POKEMON_MANSION_3F,$04,Show
-MapHSD8:
-	db POKEMON_MANSION_B1F,$03,Show
-	db POKEMON_MANSION_B1F,$04,Show
-	db POKEMON_MANSION_B1F,$05,Show
-	db POKEMON_MANSION_B1F,$06,Show
-	db POKEMON_MANSION_B1F,$08,Show
-MapHSD9:
-	db SAFARI_ZONE_EAST,$01,Show
-	db SAFARI_ZONE_EAST,$02,Show
-	db SAFARI_ZONE_EAST,$03,Show
-	db SAFARI_ZONE_EAST,$04,Show
-MapHSDA:
-	db SAFARI_ZONE_NORTH,$01,Show
-	db SAFARI_ZONE_NORTH,$02,Show
-MapHSDB:
-	db SAFARI_ZONE_WEST,$01,Show
-	db SAFARI_ZONE_WEST,$02,Show
-	db SAFARI_ZONE_WEST,$03,Show
-	db SAFARI_ZONE_WEST,$04,Show
-MapHSDC:
-	db SAFARI_ZONE_CENTER,$01,Show
-MapHSE2:
-	db CERULEAN_CAVE_2F,$01,Show
-	db CERULEAN_CAVE_2F,$02,Show
-	db CERULEAN_CAVE_2F,$03,Show
-MapHSE3:
-	db CERULEAN_CAVE_B1F,$01,Show
-	db CERULEAN_CAVE_B1F,$02,Show
-	db CERULEAN_CAVE_B1F,$03,Show
-MapHS6C:
-	db VICTORY_ROAD_1F,$03,Show
-	db VICTORY_ROAD_1F,$04,Show
-MapHS78:
-	db CHAMPIONS_ROOM,$02,Hide
-MapHSC0:
-	db SEAFOAM_ISLANDS_1F,$01,Show
-	db SEAFOAM_ISLANDS_1F,$02,Show
-MapHS9F:
-	db SEAFOAM_ISLANDS_B1F,$01,Hide
-	db SEAFOAM_ISLANDS_B1F,$02,Hide
-MapHSA0:
-	db SEAFOAM_ISLANDS_B2F,$01,Hide
-	db SEAFOAM_ISLANDS_B2F,$02,Hide
-MapHSA1:
-	db SEAFOAM_ISLANDS_B3F,$02,Show
-	db SEAFOAM_ISLANDS_B3F,$03,Show
-	db SEAFOAM_ISLANDS_B3F,$05,Hide
-	db SEAFOAM_ISLANDS_B3F,$06,Hide
-MapHSA2:
-	db SEAFOAM_ISLANDS_B4F,$01,Hide
-	db SEAFOAM_ISLANDS_B4F,$02,Hide
-	db SEAFOAM_ISLANDS_B4F,$03,Show
-
-	db $FF,$01,Show
+PalletTownHS:
+	db PALLET_TOWN, $01, HIDE
+ViridianCityHS:
+	db VIRIDIAN_CITY, $05, SHOW
+	db VIRIDIAN_CITY, $07, HIDE
+PewterCityHS:
+	db PEWTER_CITY, $03, SHOW
+	db PEWTER_CITY, $05, SHOW
+CeruleanCityHS:
+	db CERULEAN_CITY, $01, HIDE
+	db CERULEAN_CITY, $02, SHOW
+	db CERULEAN_CITY, $06, HIDE
+	db CERULEAN_CITY, $0A, SHOW
+	db CERULEAN_CITY, $0B, SHOW
+SaffronCityHS:
+	db SAFFRON_CITY, $01, SHOW
+	db SAFFRON_CITY, $02, SHOW
+	db SAFFRON_CITY, $03, SHOW
+	db SAFFRON_CITY, $04, SHOW
+	db SAFFRON_CITY, $05, SHOW
+	db SAFFRON_CITY, $06, SHOW
+	db SAFFRON_CITY, $07, SHOW
+	db SAFFRON_CITY, $08, HIDE
+	db SAFFRON_CITY, $09, HIDE
+	db SAFFRON_CITY, $0A, HIDE
+	db SAFFRON_CITY, $0B, HIDE
+	db SAFFRON_CITY, $0C, HIDE
+	db SAFFRON_CITY, $0D, HIDE
+	db SAFFRON_CITY, $0E, SHOW
+	db SAFFRON_CITY, $0F, HIDE
+Route2HS:
+	db ROUTE_2, $01, SHOW
+	db ROUTE_2, $02, SHOW
+Route4HS:
+	db ROUTE_4, $03, SHOW
+Route9HS:
+	db ROUTE_9, $0A, SHOW
+Route12HS:
+	db ROUTE_12, $01, SHOW
+	db ROUTE_12, $09, SHOW
+	db ROUTE_12, $0A, SHOW
+Route15HS:
+	db ROUTE_15, $0B, SHOW
+Rout16eHS:
+	db ROUTE_16, $07, SHOW
+Route22HS:
+	db ROUTE_22, $01, HIDE
+	db ROUTE_22, $02, HIDE
+Route24HS:
+	db ROUTE_24, $01, SHOW
+	db ROUTE_24, $08, SHOW
+Route25HS:
+	db ROUTE_25, $0A, SHOW
+BluesHouseHS:
+	db BLUES_HOUSE, $01, SHOW
+	db BLUES_HOUSE, $02, HIDE
+	db BLUES_HOUSE, $03, SHOW
+OaksLabHS:
+	db OAKS_LAB, $01, SHOW
+	db OAKS_LAB, $02, SHOW
+	db OAKS_LAB, $03, SHOW
+	db OAKS_LAB, $04, SHOW
+	db OAKS_LAB, $05, HIDE
+	db OAKS_LAB, $06, SHOW
+	db OAKS_LAB, $07, SHOW
+	db OAKS_LAB, $08, HIDE
+ViridianGymHS:
+	db VIRIDIAN_GYM, $01, SHOW
+	db VIRIDIAN_GYM, $0B, SHOW
+Museum1FHS:
+	db MUSEUM_1F, $05, SHOW
+CeruleanCaveHS:
+	db CERULEAN_CAVE_1F, $01, SHOW
+	db CERULEAN_CAVE_1F, $02, SHOW
+	db CERULEAN_CAVE_1F, $03, SHOW
+PokemonTower2FHS:
+	db POKEMON_TOWER_2F, $01, SHOW
+PokemonTower3FHS:
+	db POKEMON_TOWER_3F, $04, SHOW
+PokemonTower4FHS:
+	db POKEMON_TOWER_4F, $04, SHOW
+	db POKEMON_TOWER_4F, $05, SHOW
+	db POKEMON_TOWER_4F, $06, SHOW
+PokemonTower5FHS:
+	db POKEMON_TOWER_5F, $06, SHOW
+PokemonTower6FHS:
+	db POKEMON_TOWER_6F, $04, SHOW
+	db POKEMON_TOWER_6F, $05, SHOW
+PokemonTower7FHS:
+	db POKEMON_TOWER_7F, $01, SHOW
+	db POKEMON_TOWER_7F, $02, SHOW
+	db POKEMON_TOWER_7F, $03, SHOW
+	db POKEMON_TOWER_7F, $04, SHOW
+MrFujisHouseHS:
+	db MR_FUJIS_HOUSE, $05, HIDE
+CeladonMansionRoofHouseHS:
+	db CELADON_MANSION_ROOF_HOUSE, $02, SHOW
+GameCornerHS:
+	db GAME_CORNER, $0B, SHOW
+WardensHouseHS:
+	db WARDENS_HOUSE, $02, SHOW
+PokemonMansion1FHS:
+	db POKEMON_MANSION_1F, $02, SHOW
+	db POKEMON_MANSION_1F, $03, SHOW
+FightingDojoHS:
+	db FIGHTING_DOJO, $06, SHOW
+	db FIGHTING_DOJO, $07, SHOW
+SilphCo1FHS:
+	db SILPH_CO_1F, $01, HIDE
+PowerPlantHS:
+	db POWER_PLANT, $01, SHOW
+	db POWER_PLANT, $02, SHOW
+	db POWER_PLANT, $03, SHOW
+	db POWER_PLANT, $04, SHOW
+	db POWER_PLANT, $05, SHOW
+	db POWER_PLANT, $06, SHOW
+	db POWER_PLANT, $07, SHOW
+	db POWER_PLANT, $08, SHOW
+	db POWER_PLANT, $09, SHOW
+	db POWER_PLANT, $0A, SHOW
+	db POWER_PLANT, $0B, SHOW
+	db POWER_PLANT, $0C, SHOW
+	db POWER_PLANT, $0D, SHOW
+	db POWER_PLANT, $0E, SHOW
+VictoryRoad2FHS:
+	db VICTORY_ROAD_2F, $06, SHOW
+	db VICTORY_ROAD_2F, $07, SHOW
+	db VICTORY_ROAD_2F, $08, SHOW
+	db VICTORY_ROAD_2F, $09, SHOW
+	db VICTORY_ROAD_2F, $0A, SHOW
+	db VICTORY_ROAD_2F, $0D, SHOW
+BillsHouseHS:
+	db BILLS_HOUSE, $01, SHOW
+	db BILLS_HOUSE, $02, HIDE
+	db BILLS_HOUSE, $03, HIDE
+ViridianForestHS:
+	db VIRIDIAN_FOREST, $05, SHOW
+	db VIRIDIAN_FOREST, $06, SHOW
+	db VIRIDIAN_FOREST, $07, SHOW
+MtMoon1FHS:
+	db MT_MOON_1F, $08, SHOW
+	db MT_MOON_1F, $09, SHOW
+	db MT_MOON_1F, $0A, SHOW
+	db MT_MOON_1F, $0B, SHOW
+	db MT_MOON_1F, $0C, SHOW
+	db MT_MOON_1F, $0D, SHOW
+MtMoonB2FHS:
+	db MT_MOON_B2F, $06, SHOW
+	db MT_MOON_B2F, $07, SHOW
+	db MT_MOON_B2F, $08, SHOW
+	db MT_MOON_B2F, $09, SHOW
+SSAnne2FHS:
+	db SS_ANNE_2F, $02, HIDE
+SSAnne1FRoomsHS:
+	db SS_ANNE_1F_ROOMS, $0A, SHOW
+SSAnne2FRoomsHS:
+	db SS_ANNE_2F_ROOMS, $06, SHOW
+	db SS_ANNE_2F_ROOMS, $09, SHOW
+SSAnneB1FRoomsHS:
+	db SS_ANNE_B1F_ROOMS, $09, SHOW
+	db SS_ANNE_B1F_ROOMS, $0A, SHOW
+	db SS_ANNE_B1F_ROOMS, $0B, SHOW
+VictoryRoad3FHS:
+	db VICTORY_ROAD_3F, $05, SHOW
+	db VICTORY_ROAD_3F, $06, SHOW
+	db VICTORY_ROAD_3F, $0A, SHOW
+RocketHideoutB1FHS:
+	db ROCKET_HIDEOUT_B1F, $06, SHOW
+	db ROCKET_HIDEOUT_B1F, $07, SHOW
+RocketHideoutB2FHS:
+	db ROCKET_HIDEOUT_B2F, $02, SHOW
+	db ROCKET_HIDEOUT_B2F, $03, SHOW
+	db ROCKET_HIDEOUT_B2F, $04, SHOW
+	db ROCKET_HIDEOUT_B2F, $05, SHOW
+RocketHideoutB3FHS:
+	db ROCKET_HIDEOUT_B3F, $03, SHOW
+	db ROCKET_HIDEOUT_B3F, $04, SHOW
+RocketHideoutB4FHS:
+	db ROCKET_HIDEOUT_B4F, $01, SHOW
+	db ROCKET_HIDEOUT_B4F, $05, SHOW
+	db ROCKET_HIDEOUT_B4F, $06, SHOW
+	db ROCKET_HIDEOUT_B4F, $07, SHOW
+	db ROCKET_HIDEOUT_B4F, $08, HIDE
+	db ROCKET_HIDEOUT_B4F, $09, HIDE
+SilphCo2FHS:
+	db SILPH_CO_2F, $01, SHOW
+	db SILPH_CO_2F, $02, SHOW
+	db SILPH_CO_2F, $03, SHOW
+	db SILPH_CO_2F, $04, SHOW
+	db SILPH_CO_2F, $05, SHOW
+SilphCo3FHS:
+	db SILPH_CO_3F, $02, SHOW
+	db SILPH_CO_3F, $03, SHOW
+	db SILPH_CO_3F, $04, SHOW
+SilphCo4FHS:
+	db SILPH_CO_4F, $02, SHOW
+	db SILPH_CO_4F, $03, SHOW
+	db SILPH_CO_4F, $04, SHOW
+	db SILPH_CO_4F, $05, SHOW
+	db SILPH_CO_4F, $06, SHOW
+	db SILPH_CO_4F, $07, SHOW
+SilphCo5FHS:
+	db SILPH_CO_5F, $02, SHOW
+	db SILPH_CO_5F, $03, SHOW
+	db SILPH_CO_5F, $04, SHOW
+	db SILPH_CO_5F, $05, SHOW
+	db SILPH_CO_5F, $06, SHOW
+	db SILPH_CO_5F, $07, SHOW
+	db SILPH_CO_5F, $08, SHOW
+SilphCo6FHS:
+	db SILPH_CO_6F, $06, SHOW
+	db SILPH_CO_6F, $07, SHOW
+	db SILPH_CO_6F, $08, SHOW
+	db SILPH_CO_6F, $09, SHOW
+	db SILPH_CO_6F, $0A, SHOW
+SilphCo7FHS:
+	db SILPH_CO_7F, $05, SHOW
+	db SILPH_CO_7F, $06, SHOW
+	db SILPH_CO_7F, $07, SHOW
+	db SILPH_CO_7F, $08, SHOW
+	db SILPH_CO_7F, $09, SHOW
+	db SILPH_CO_7F, $0A, SHOW
+	db SILPH_CO_7F, $0B, SHOW
+	db SILPH_CO_7F, $0C, SHOW
+SilphCo8FHS:
+	db SILPH_CO_8F, $02, SHOW
+	db SILPH_CO_8F, $03, SHOW
+	db SILPH_CO_8F, $04, SHOW
+SilphCo9FHS:
+	db SILPH_CO_9F, $02, SHOW
+	db SILPH_CO_9F, $03, SHOW
+	db SILPH_CO_9F, $04, SHOW
+SilphCo10FHS:
+	db SILPH_CO_10F, $01, SHOW
+	db SILPH_CO_10F, $02, SHOW
+	db SILPH_CO_10F, $03, SHOW
+	db SILPH_CO_10F, $04, SHOW
+	db SILPH_CO_10F, $05, SHOW
+	db SILPH_CO_10F, $06, SHOW
+SilphCo11FHS:
+	db SILPH_CO_11F, $03, SHOW
+	db SILPH_CO_11F, $04, SHOW
+	db SILPH_CO_11F, $05, SHOW
+UnusedMapF4HS:
+	db UNUSED_MAP_F4, $02, SHOW
+PokemonMansion2FHS:
+	db POKEMON_MANSION_2F, $02, SHOW
+PokemonMansion3FHS:
+	db POKEMON_MANSION_3F, $03, SHOW
+	db POKEMON_MANSION_3F, $04, SHOW
+PokemonMansionB1FHS:
+	db POKEMON_MANSION_B1F, $03, SHOW
+	db POKEMON_MANSION_B1F, $04, SHOW
+	db POKEMON_MANSION_B1F, $05, SHOW
+	db POKEMON_MANSION_B1F, $06, SHOW
+	db POKEMON_MANSION_B1F, $08, SHOW
+SafariZoneEastHS:
+	db SAFARI_ZONE_EAST, $01, SHOW
+	db SAFARI_ZONE_EAST, $02, SHOW
+	db SAFARI_ZONE_EAST, $03, SHOW
+	db SAFARI_ZONE_EAST, $04, SHOW
+SafariZoneNorthHS:
+	db SAFARI_ZONE_NORTH, $01, SHOW
+	db SAFARI_ZONE_NORTH, $02, SHOW
+SafariZoneWestHS:
+	db SAFARI_ZONE_WEST, $01, SHOW
+	db SAFARI_ZONE_WEST, $02, SHOW
+	db SAFARI_ZONE_WEST, $03, SHOW
+	db SAFARI_ZONE_WEST, $04, SHOW
+SafariZoneCenterHS:
+	db SAFARI_ZONE_CENTER, $01, SHOW
+CeruleanCave2FHS:
+	db CERULEAN_CAVE_2F, $01, SHOW
+	db CERULEAN_CAVE_2F, $02, SHOW
+	db CERULEAN_CAVE_2F, $03, SHOW
+CeruleanCaveB1FHS:
+	db CERULEAN_CAVE_B1F, $01, SHOW
+	db CERULEAN_CAVE_B1F, $02, SHOW
+	db CERULEAN_CAVE_B1F, $03, SHOW
+VictoryRoad1FHS:
+	db VICTORY_ROAD_1F, $03, SHOW
+	db VICTORY_ROAD_1F, $04, SHOW
+ChampionsRoomHS:
+	db CHAMPIONS_ROOM, $02, HIDE
+SeafoamIslands1FHS:
+	db SEAFOAM_ISLANDS_1F, $01, SHOW
+	db SEAFOAM_ISLANDS_1F, $02, SHOW
+SeafoamIslandsB1FHS:
+	db SEAFOAM_ISLANDS_B1F, $01, HIDE
+	db SEAFOAM_ISLANDS_B1F, $02, HIDE
+SeafoamIslandsB2FHS:
+	db SEAFOAM_ISLANDS_B2F, $01, HIDE
+	db SEAFOAM_ISLANDS_B2F, $02, HIDE
+SeafoamIslandsB3FHS:
+	db SEAFOAM_ISLANDS_B3F, $02, SHOW
+	db SEAFOAM_ISLANDS_B3F, $03, SHOW
+	db SEAFOAM_ISLANDS_B3F, $05, HIDE
+	db SEAFOAM_ISLANDS_B3F, $06, HIDE
+SeafoamIslandsB4FHS:
+	db SEAFOAM_ISLANDS_B4F, $01, HIDE
+	db SEAFOAM_ISLANDS_B4F, $02, HIDE
+	db SEAFOAM_ISLANDS_B4F, $03, SHOW
+	db $FF, $01, SHOW ; end
diff --git a/data/maps/names.asm b/data/maps/names.asm
index c2642942..493f3936 100755
--- a/data/maps/names.asm
+++ b/data/maps/names.asm
@@ -98,7 +98,7 @@ RocketHQName:
 SilphCoName:
 	db "SILPH CO.@"
 PokemonMansionName:
-	db "<pkmn> MANSION@"
+	db "<PKMN> MANSION@"
 SafariZoneName:
 	db "SAFARI ZONE@"
 CeruleanCaveName:
diff --git a/data/pokemon/dex_entries.asm b/data/pokemon/dex_entries.asm
index 495a8e33..c8dc12a7 100755
--- a/data/pokemon/dex_entries.asm
+++ b/data/pokemon/dex_entries.asm
@@ -199,1061 +199,1061 @@ RhydonDexEntry:
 	db "DRILL@"
 	db 6,3
 	dw 2650
-	TX_FAR _RhydonDexEntry
-	db "@"
+	text_far _RhydonDexEntry
+	text_end
 
 KangaskhanDexEntry:
 	db "PARENT@"
 	db 7,3
 	dw 1760
-	TX_FAR _KangaskhanDexEntry
-	db "@"
+	text_far _KangaskhanDexEntry
+	text_end
 
 NidoranMDexEntry:
 	db "POISON PIN@"
 	db 1,8
 	dw 200
-	TX_FAR _NidoranMDexEntry
-	db "@"
+	text_far _NidoranMDexEntry
+	text_end
 
 ClefairyDexEntry:
 	db "FAIRY@"
 	db 2,0
 	dw 170
-	TX_FAR _ClefairyDexEntry
-	db "@"
+	text_far _ClefairyDexEntry
+	text_end
 
 SpearowDexEntry:
 	db "TINY BIRD@"
 	db 1,0
 	dw 40
-	TX_FAR _SpearowDexEntry
-	db "@"
+	text_far _SpearowDexEntry
+	text_end
 
 VoltorbDexEntry:
 	db "BALL@"
 	db 1,8
 	dw 230
-	TX_FAR _VoltorbDexEntry
-	db "@"
+	text_far _VoltorbDexEntry
+	text_end
 
 NidokingDexEntry:
 	db "DRILL@"
 	db 4,7
 	dw 1370
-	TX_FAR _NidokingDexEntry
-	db "@"
+	text_far _NidokingDexEntry
+	text_end
 
 SlowbroDexEntry:
 	db "HERMITCRAB@"
 	db 5,3
 	dw 1730
-	TX_FAR _SlowbroDexEntry
-	db "@"
+	text_far _SlowbroDexEntry
+	text_end
 
 IvysaurDexEntry:
 	db "SEED@"
 	db 3,3
 	dw 290
-	TX_FAR _IvysaurDexEntry
-	db "@"
+	text_far _IvysaurDexEntry
+	text_end
 
 ExeggutorDexEntry:
 	db "COCONUT@"
 	db 6,7
 	dw 2650
-	TX_FAR _ExeggutorDexEntry
-	db "@"
+	text_far _ExeggutorDexEntry
+	text_end
 
 LickitungDexEntry:
 	db "LICKING@"
 	db 3,11
 	dw 1440
-	TX_FAR _LickitungDexEntry
-	db "@"
+	text_far _LickitungDexEntry
+	text_end
 
 ExeggcuteDexEntry:
 	db "EGG@"
 	db 1,4
 	dw 60
-	TX_FAR _ExeggcuteDexEntry
-	db "@"
+	text_far _ExeggcuteDexEntry
+	text_end
 
 GrimerDexEntry:
 	db "SLUDGE@"
 	db 2,11
 	dw 660
-	TX_FAR _GrimerDexEntry
-	db "@"
+	text_far _GrimerDexEntry
+	text_end
 
 GengarDexEntry:
 	db "SHADOW@"
 	db 4,11
 	dw 890
-	TX_FAR _GengarDexEntry
-	db "@"
+	text_far _GengarDexEntry
+	text_end
 
 NidoranFDexEntry:
 	db "POISON PIN@"
 	db 1,4
 	dw 150
-	TX_FAR _NidoranFDexEntry
-	db "@"
+	text_far _NidoranFDexEntry
+	text_end
 
 NidoqueenDexEntry:
 	db "DRILL@"
 	db 4,3
 	dw 1320
-	TX_FAR _NidoqueenDexEntry
-	db "@"
+	text_far _NidoqueenDexEntry
+	text_end
 
 CuboneDexEntry:
 	db "LONELY@"
 	db 1,4
 	dw 140
-	TX_FAR _CuboneDexEntry
-	db "@"
+	text_far _CuboneDexEntry
+	text_end
 
 RhyhornDexEntry:
 	db "SPIKES@"
 	db 3,3
 	dw 2540
-	TX_FAR _RhyhornDexEntry
-	db "@"
+	text_far _RhyhornDexEntry
+	text_end
 
 LaprasDexEntry:
 	db "TRANSPORT@"
 	db 8,2
 	dw 4850
-	TX_FAR _LaprasDexEntry
-	db "@"
+	text_far _LaprasDexEntry
+	text_end
 
 ArcanineDexEntry:
 	db "LEGENDARY@"
 	db 6,3
 	dw 3420
-	TX_FAR _ArcanineDexEntry
-	db "@"
+	text_far _ArcanineDexEntry
+	text_end
 
 MewDexEntry:
 	db "NEW SPECIE@"
 	db 1,4
 	dw 90
-	TX_FAR _MewDexEntry
-	db "@"
+	text_far _MewDexEntry
+	text_end
 
 GyaradosDexEntry:
 	db "ATROCIOUS@"
 	db 21,4
 	dw 5180
-	TX_FAR _GyaradosDexEntry
-	db "@"
+	text_far _GyaradosDexEntry
+	text_end
 
 ShellderDexEntry:
 	db "BIVALVE@"
 	db 1,0
 	dw 90
-	TX_FAR _ShellderDexEntry
-	db "@"
+	text_far _ShellderDexEntry
+	text_end
 
 TentacoolDexEntry:
 	db "JELLYFISH@"
 	db 2,11
 	dw 1000
-	TX_FAR _TentacoolDexEntry
-	db "@"
+	text_far _TentacoolDexEntry
+	text_end
 
 GastlyDexEntry:
 	db "GAS@"
 	db 4,3
 	dw 2
-	TX_FAR _GastlyDexEntry
-	db "@"
+	text_far _GastlyDexEntry
+	text_end
 
 ScytherDexEntry:
 	db "MANTIS@"
 	db 4,11
 	dw 1230
-	TX_FAR _ScytherDexEntry
-	db "@"
+	text_far _ScytherDexEntry
+	text_end
 
 StaryuDexEntry:
 	db "STARSHAPE@"
 	db 2,7
 	dw 760
-	TX_FAR _StaryuDexEntry
-	db "@"
+	text_far _StaryuDexEntry
+	text_end
 
 BlastoiseDexEntry:
 	db "SHELLFISH@"
 	db 5,3
 	dw 1890
-	TX_FAR _BlastoiseDexEntry
-	db "@"
+	text_far _BlastoiseDexEntry
+	text_end
 
 PinsirDexEntry:
 	db "STAGBEETLE@"
 	db 4,11
 	dw 1210
-	TX_FAR _PinsirDexEntry
-	db "@"
+	text_far _PinsirDexEntry
+	text_end
 
 TangelaDexEntry:
 	db "VINE@"
 	db 3,3
 	dw 770
-	TX_FAR _TangelaDexEntry
-	db "@"
+	text_far _TangelaDexEntry
+	text_end
 
 GrowlitheDexEntry:
 	db "PUPPY@"
 	db 2,4
 	dw 420
-	TX_FAR _GrowlitheDexEntry
-	db "@"
+	text_far _GrowlitheDexEntry
+	text_end
 
 OnixDexEntry:
 	db "ROCK SNAKE@"
 	db 28,10
 	dw 4630
-	TX_FAR _OnixDexEntry
-	db "@"
+	text_far _OnixDexEntry
+	text_end
 
 FearowDexEntry:
 	db "BEAK@"
 	db 3,11
 	dw 840
-	TX_FAR _FearowDexEntry
-	db "@"
+	text_far _FearowDexEntry
+	text_end
 
 PidgeyDexEntry:
 	db "TINY BIRD@"
 	db 1,0
 	dw 40
-	TX_FAR _PidgeyDexEntry
-	db "@"
+	text_far _PidgeyDexEntry
+	text_end
 
 SlowpokeDexEntry:
 	db "DOPEY@"
 	db 3,11
 	dw 790
-	TX_FAR _SlowpokeDexEntry
-	db "@"
+	text_far _SlowpokeDexEntry
+	text_end
 
 KadabraDexEntry:
 	db "PSI@"
 	db 4,3
 	dw 1250
-	TX_FAR _KadabraDexEntry
-	db "@"
+	text_far _KadabraDexEntry
+	text_end
 
 GravelerDexEntry:
 	db "ROCK@"
 	db 3,3
 	dw 2320
-	TX_FAR _GravelerDexEntry
-	db "@"
+	text_far _GravelerDexEntry
+	text_end
 
 ChanseyDexEntry:
 	db "EGG@"
 	db 3,7
 	dw 760
-	TX_FAR _ChanseyDexEntry
-	db "@"
+	text_far _ChanseyDexEntry
+	text_end
 
 MachokeDexEntry:
 	db "SUPERPOWER@"
 	db 4,11
 	dw 1550
-	TX_FAR _MachokeDexEntry
-	db "@"
+	text_far _MachokeDexEntry
+	text_end
 
 MrMimeDexEntry:
 	db "BARRIER@"
 	db 4,3
 	dw 1200
-	TX_FAR _MrMimeDexEntry
-	db "@"
+	text_far _MrMimeDexEntry
+	text_end
 
 HitmonleeDexEntry:
 	db "KICKING@"
 	db 4,11
 	dw 1100
-	TX_FAR _HitmonleeDexEntry
-	db "@"
+	text_far _HitmonleeDexEntry
+	text_end
 
 HitmonchanDexEntry:
 	db "PUNCHING@"
 	db 4,7
 	dw 1110
-	TX_FAR _HitmonchanDexEntry
-	db "@"
+	text_far _HitmonchanDexEntry
+	text_end
 
 ArbokDexEntry:
 	db "COBRA@"
 	db 11,6
 	dw 1430
-	TX_FAR _ArbokDexEntry
-	db "@"
+	text_far _ArbokDexEntry
+	text_end
 
 ParasectDexEntry:
 	db "MUSHROOM@"
 	db 3,3
 	dw 650
-	TX_FAR _ParasectDexEntry
-	db "@"
+	text_far _ParasectDexEntry
+	text_end
 
 PsyduckDexEntry:
 	db "DUCK@"
 	db 2,7
 	dw 430
-	TX_FAR _PsyduckDexEntry
-	db "@"
+	text_far _PsyduckDexEntry
+	text_end
 
 DrowzeeDexEntry:
 	db "HYPNOSIS@"
 	db 3,3
 	dw 710
-	TX_FAR _DrowzeeDexEntry
-	db "@"
+	text_far _DrowzeeDexEntry
+	text_end
 
 GolemDexEntry:
 	db "MEGATON@"
 	db 4,7
 	dw 6620
-	TX_FAR _GolemDexEntry
-	db "@"
+	text_far _GolemDexEntry
+	text_end
 
 MagmarDexEntry:
 	db "SPITFIRE@"
 	db 4,3
 	dw 980
-	TX_FAR _MagmarDexEntry
-	db "@"
+	text_far _MagmarDexEntry
+	text_end
 
 ElectabuzzDexEntry:
 	db "ELECTRIC@"
 	db 3,7
 	dw 660
-	TX_FAR _ElectabuzzDexEntry
-	db "@"
+	text_far _ElectabuzzDexEntry
+	text_end
 
 MagnetonDexEntry:
 	db "MAGNET@"
 	db 3,3
 	dw 1320
-	TX_FAR _MagnetonDexEntry
-	db "@"
+	text_far _MagnetonDexEntry
+	text_end
 
 KoffingDexEntry:
 	db "POISON GAS@"
 	db 2,0
 	dw 20
-	TX_FAR _KoffingDexEntry
-	db "@"
+	text_far _KoffingDexEntry
+	text_end
 
 MankeyDexEntry:
 	db "PIG MONKEY@"
 	db 1,8
 	dw 620
-	TX_FAR _MankeyDexEntry
-	db "@"
+	text_far _MankeyDexEntry
+	text_end
 
 SeelDexEntry:
 	db "SEA LION@"
 	db 3,7
 	dw 1980
-	TX_FAR _SeelDexEntry
-	db "@"
+	text_far _SeelDexEntry
+	text_end
 
 DiglettDexEntry:
 	db "MOLE@"
 	db 0,8
 	dw 20
-	TX_FAR _DiglettDexEntry
-	db "@"
+	text_far _DiglettDexEntry
+	text_end
 
 TaurosDexEntry:
 	db "WILD BULL@"
 	db 4,7
 	dw 1950
-	TX_FAR _TaurosDexEntry
-	db "@"
+	text_far _TaurosDexEntry
+	text_end
 
 FarfetchdDexEntry:
 	db "WILD DUCK@"
 	db 2,7
 	dw 330
-	TX_FAR _FarfetchdDexEntry
-	db "@"
+	text_far _FarfetchdDexEntry
+	text_end
 
 VenonatDexEntry:
 	db "INSECT@"
 	db 3,3
 	dw 660
-	TX_FAR _VenonatDexEntry
-	db "@"
+	text_far _VenonatDexEntry
+	text_end
 
 DragoniteDexEntry:
 	db "DRAGON@"
 	db 7,3
 	dw 4630
-	TX_FAR _DragoniteDexEntry
-	db "@"
+	text_far _DragoniteDexEntry
+	text_end
 
 DoduoDexEntry:
 	db "TWIN BIRD@"
 	db 4,7
 	dw 860
-	TX_FAR _DoduoDexEntry
-	db "@"
+	text_far _DoduoDexEntry
+	text_end
 
 PoliwagDexEntry:
 	db "TADPOLE@"
 	db 2,0
 	dw 270
-	TX_FAR _PoliwagDexEntry
-	db "@"
+	text_far _PoliwagDexEntry
+	text_end
 
 JynxDexEntry:
 	db "HUMANSHAPE@"
 	db 4,7
 	dw 900
-	TX_FAR _JynxDexEntry
-	db "@"
+	text_far _JynxDexEntry
+	text_end
 
 MoltresDexEntry:
 	db "FLAME@"
 	db 6,7
 	dw 1320
-	TX_FAR _MoltresDexEntry
-	db "@"
+	text_far _MoltresDexEntry
+	text_end
 
 ArticunoDexEntry:
 	db "FREEZE@"
 	db 5,7
 	dw 1220
-	TX_FAR _ArticunoDexEntry
-	db "@"
+	text_far _ArticunoDexEntry
+	text_end
 
 ZapdosDexEntry:
 	db "ELECTRIC@"
 	db 5,3
 	dw 1160
-	TX_FAR _ZapdosDexEntry
-	db "@"
+	text_far _ZapdosDexEntry
+	text_end
 
 DittoDexEntry:
 	db "TRANSFORM@"
 	db 1,0
 	dw 90
-	TX_FAR _DittoDexEntry
-	db "@"
+	text_far _DittoDexEntry
+	text_end
 
 MeowthDexEntry:
 	db "SCRATCHCAT@"
 	db 1,4
 	dw 90
-	TX_FAR _MeowthDexEntry
-	db "@"
+	text_far _MeowthDexEntry
+	text_end
 
 KrabbyDexEntry:
 	db "RIVER CRAB@"
 	db 1,4
 	dw 140
-	TX_FAR _KrabbyDexEntry
-	db "@"
+	text_far _KrabbyDexEntry
+	text_end
 
 VulpixDexEntry:
 	db "FOX@"
 	db 2,0
 	dw 220
-	TX_FAR _VulpixDexEntry
-	db "@"
+	text_far _VulpixDexEntry
+	text_end
 
 NinetalesDexEntry:
 	db "FOX@"
 	db 3,7
 	dw 440
-	TX_FAR _NinetalesDexEntry
-	db "@"
+	text_far _NinetalesDexEntry
+	text_end
 
 PikachuDexEntry:
 	db "MOUSE@"
 	db 1,4
 	dw 130
-	TX_FAR _PikachuDexEntry
-	db "@"
+	text_far _PikachuDexEntry
+	text_end
 
 RaichuDexEntry:
 	db "MOUSE@"
 	db 2,7
 	dw 660
-	TX_FAR _RaichuDexEntry
-	db "@"
+	text_far _RaichuDexEntry
+	text_end
 
 DratiniDexEntry:
 	db "DRAGON@"
 	db 5,11
 	dw 70
-	TX_FAR _DratiniDexEntry
-	db "@"
+	text_far _DratiniDexEntry
+	text_end
 
 DragonairDexEntry:
 	db "DRAGON@"
 	db 13,1
 	dw 360
-	TX_FAR _DragonairDexEntry
-	db "@"
+	text_far _DragonairDexEntry
+	text_end
 
 KabutoDexEntry:
 	db "SHELLFISH@"
 	db 1,8
 	dw 250
-	TX_FAR _KabutoDexEntry
-	db "@"
+	text_far _KabutoDexEntry
+	text_end
 
 KabutopsDexEntry:
 	db "SHELLFISH@"
 	db 4,3
 	dw 890
-	TX_FAR _KabutopsDexEntry
-	db "@"
+	text_far _KabutopsDexEntry
+	text_end
 
 HorseaDexEntry:
 	db "DRAGON@"
 	db 1,4
 	dw 180
-	TX_FAR _HorseaDexEntry
-	db "@"
+	text_far _HorseaDexEntry
+	text_end
 
 SeadraDexEntry:
 	db "DRAGON@"
 	db 3,11
 	dw 550
-	TX_FAR _SeadraDexEntry
-	db "@"
+	text_far _SeadraDexEntry
+	text_end
 
 SandshrewDexEntry:
 	db "MOUSE@"
 	db 2,0
 	dw 260
-	TX_FAR _SandshrewDexEntry
-	db "@"
+	text_far _SandshrewDexEntry
+	text_end
 
 SandslashDexEntry:
 	db "MOUSE@"
 	db 3,3
 	dw 650
-	TX_FAR _SandslashDexEntry
-	db "@"
+	text_far _SandslashDexEntry
+	text_end
 
 OmanyteDexEntry:
 	db "SPIRAL@"
 	db 1,4
 	dw 170
-	TX_FAR _OmanyteDexEntry
-	db "@"
+	text_far _OmanyteDexEntry
+	text_end
 
 OmastarDexEntry:
 	db "SPIRAL@"
 	db 3,3
 	dw 770
-	TX_FAR _OmastarDexEntry
-	db "@"
+	text_far _OmastarDexEntry
+	text_end
 
 JigglypuffDexEntry:
 	db "BALLOON@"
 	db 1,8
 	dw 120
-	TX_FAR _JigglypuffDexEntry
-	db "@"
+	text_far _JigglypuffDexEntry
+	text_end
 
 WigglytuffDexEntry:
 	db "BALLOON@"
 	db 3,3
 	dw 260
-	TX_FAR _WigglytuffDexEntry
-	db "@"
+	text_far _WigglytuffDexEntry
+	text_end
 
 EeveeDexEntry:
 	db "EVOLUTION@"
 	db 1,0
 	dw 140
-	TX_FAR _EeveeDexEntry
-	db "@"
+	text_far _EeveeDexEntry
+	text_end
 
 FlareonDexEntry:
 	db "FLAME@"
 	db 2,11
 	dw 550
-	TX_FAR _FlareonDexEntry
-	db "@"
+	text_far _FlareonDexEntry
+	text_end
 
 JolteonDexEntry:
 	db "LIGHTNING@"
 	db 2,7
 	dw 540
-	TX_FAR _JolteonDexEntry
-	db "@"
+	text_far _JolteonDexEntry
+	text_end
 
 VaporeonDexEntry:
 	db "BUBBLE JET@"
 	db 3,3
 	dw 640
-	TX_FAR _VaporeonDexEntry
-	db "@"
+	text_far _VaporeonDexEntry
+	text_end
 
 MachopDexEntry:
 	db "SUPERPOWER@"
 	db 2,7
 	dw 430
-	TX_FAR _MachopDexEntry
-	db "@"
+	text_far _MachopDexEntry
+	text_end
 
 ZubatDexEntry:
 	db "BAT@"
 	db 2,7
 	dw 170
-	TX_FAR _ZubatDexEntry
-	db "@"
+	text_far _ZubatDexEntry
+	text_end
 
 EkansDexEntry:
 	db "SNAKE@"
 	db 6,7
 	dw 150
-	TX_FAR _EkansDexEntry
-	db "@"
+	text_far _EkansDexEntry
+	text_end
 
 ParasDexEntry:
 	db "MUSHROOM@"
 	db 1,0
 	dw 120
-	TX_FAR _ParasDexEntry
-	db "@"
+	text_far _ParasDexEntry
+	text_end
 
 PoliwhirlDexEntry:
 	db "TADPOLE@"
 	db 3,3
 	dw 440
-	TX_FAR _PoliwhirlDexEntry
-	db "@"
+	text_far _PoliwhirlDexEntry
+	text_end
 
 PoliwrathDexEntry:
 	db "TADPOLE@"
 	db 4,3
 	dw 1190
-	TX_FAR _PoliwrathDexEntry
-	db "@"
+	text_far _PoliwrathDexEntry
+	text_end
 
 WeedleDexEntry:
 	db "HAIRY BUG@"
 	db 1,0
 	dw 70
-	TX_FAR _WeedleDexEntry
-	db "@"
+	text_far _WeedleDexEntry
+	text_end
 
 KakunaDexEntry:
 	db "COCOON@"
 	db 2,0
 	dw 220
-	TX_FAR _KakunaDexEntry
-	db "@"
+	text_far _KakunaDexEntry
+	text_end
 
 BeedrillDexEntry:
 	db "POISON BEE@"
 	db 3,3
 	dw 650
-	TX_FAR _BeedrillDexEntry
-	db "@"
+	text_far _BeedrillDexEntry
+	text_end
 
 DodrioDexEntry:
 	db "TRIPLEBIRD@"
 	db 5,11
 	dw 1880
-	TX_FAR _DodrioDexEntry
-	db "@"
+	text_far _DodrioDexEntry
+	text_end
 
 PrimeapeDexEntry:
 	db "PIG MONKEY@"
 	db 3,3
 	dw 710
-	TX_FAR _PrimeapeDexEntry
-	db "@"
+	text_far _PrimeapeDexEntry
+	text_end
 
 DugtrioDexEntry:
 	db "MOLE@"
 	db 2,4
 	dw 730
-	TX_FAR _DugtrioDexEntry
-	db "@"
+	text_far _DugtrioDexEntry
+	text_end
 
 VenomothDexEntry:
 	db "POISONMOTH@"
 	db 4,11
 	dw 280
-	TX_FAR _VenomothDexEntry
-	db "@"
+	text_far _VenomothDexEntry
+	text_end
 
 DewgongDexEntry:
 	db "SEA LION@"
 	db 5,7
 	dw 2650
-	TX_FAR _DewgongDexEntry
-	db "@"
+	text_far _DewgongDexEntry
+	text_end
 
 CaterpieDexEntry:
 	db "WORM@"
 	db 1,0
 	dw 60
-	TX_FAR _CaterpieDexEntry
-	db "@"
+	text_far _CaterpieDexEntry
+	text_end
 
 MetapodDexEntry:
 	db "COCOON@"
 	db 2,4
 	dw 220
-	TX_FAR _MetapodDexEntry
-	db "@"
+	text_far _MetapodDexEntry
+	text_end
 
 ButterfreeDexEntry:
 	db "BUTTERFLY@"
 	db 3,7
 	dw 710
-	TX_FAR _ButterfreeDexEntry
-	db "@"
+	text_far _ButterfreeDexEntry
+	text_end
 
 MachampDexEntry:
 	db "SUPERPOWER@"
 	db 5,3
 	dw 2870
-	TX_FAR _MachampDexEntry
-	db "@"
+	text_far _MachampDexEntry
+	text_end
 
 GolduckDexEntry:
 	db "DUCK@"
 	db 5,7
 	dw 1690
-	TX_FAR _GolduckDexEntry
-	db "@"
+	text_far _GolduckDexEntry
+	text_end
 
 HypnoDexEntry:
 	db "HYPNOSIS@"
 	db 5,3
 	dw 1670
-	TX_FAR _HypnoDexEntry
-	db "@"
+	text_far _HypnoDexEntry
+	text_end
 
 GolbatDexEntry:
 	db "BAT@"
 	db 5,3
 	dw 1210
-	TX_FAR _GolbatDexEntry
-	db "@"
+	text_far _GolbatDexEntry
+	text_end
 
 MewtwoDexEntry:
 	db "GENETIC@"
 	db 6,7
 	dw 2690
-	TX_FAR _MewtwoDexEntry
-	db "@"
+	text_far _MewtwoDexEntry
+	text_end
 
 SnorlaxDexEntry:
 	db "SLEEPING@"
 	db 6,11
 	dw 10140
-	TX_FAR _SnorlaxDexEntry
-	db "@"
+	text_far _SnorlaxDexEntry
+	text_end
 
 MagikarpDexEntry:
 	db "FISH@"
 	db 2,11
 	dw 220
-	TX_FAR _MagikarpDexEntry
-	db "@"
+	text_far _MagikarpDexEntry
+	text_end
 
 MukDexEntry:
 	db "SLUDGE@"
 	db 3,11
 	dw 660
-	TX_FAR _MukDexEntry
-	db "@"
+	text_far _MukDexEntry
+	text_end
 
 KinglerDexEntry:
 	db "PINCER@"
 	db 4,3
 	dw 1320
-	TX_FAR _KinglerDexEntry
-	db "@"
+	text_far _KinglerDexEntry
+	text_end
 
 CloysterDexEntry:
 	db "BIVALVE@"
 	db 4,11
 	dw 2920
-	TX_FAR _CloysterDexEntry
-	db "@"
+	text_far _CloysterDexEntry
+	text_end
 
 ElectrodeDexEntry:
 	db "BALL@"
 	db 3,11
 	dw 1470
-	TX_FAR _ElectrodeDexEntry
-	db "@"
+	text_far _ElectrodeDexEntry
+	text_end
 
 ClefableDexEntry:
 	db "FAIRY@"
 	db 4,3
 	dw 880
-	TX_FAR _ClefableDexEntry
-	db "@"
+	text_far _ClefableDexEntry
+	text_end
 
 WeezingDexEntry:
 	db "POISON GAS@"
 	db 3,11
 	dw 210
-	TX_FAR _WeezingDexEntry
-	db "@"
+	text_far _WeezingDexEntry
+	text_end
 
 PersianDexEntry:
 	db "CLASSY CAT@"
 	db 3,3
 	dw 710
-	TX_FAR _PersianDexEntry
-	db "@"
+	text_far _PersianDexEntry
+	text_end
 
 MarowakDexEntry:
 	db "BONEKEEPER@"
 	db 3,3
 	dw 990
-	TX_FAR _MarowakDexEntry
-	db "@"
+	text_far _MarowakDexEntry
+	text_end
 
 HaunterDexEntry:
 	db "GAS@"
 	db 5,3
 	dw 2
-	TX_FAR _HaunterDexEntry
-	db "@"
+	text_far _HaunterDexEntry
+	text_end
 
 AbraDexEntry:
 	db "PSI@"
 	db 2,11
 	dw 430
-	TX_FAR _AbraDexEntry
-	db "@"
+	text_far _AbraDexEntry
+	text_end
 
 AlakazamDexEntry:
 	db "PSI@"
 	db 4,11
 	dw 1060
-	TX_FAR _AlakazamDexEntry
-	db "@"
+	text_far _AlakazamDexEntry
+	text_end
 
 PidgeottoDexEntry:
 	db "BIRD@"
 	db 3,7
 	dw 660
-	TX_FAR _PidgeottoDexEntry
-	db "@"
+	text_far _PidgeottoDexEntry
+	text_end
 
 PidgeotDexEntry:
 	db "BIRD@"
 	db 4,11
 	dw 870
-	TX_FAR _PidgeotDexEntry
-	db "@"
+	text_far _PidgeotDexEntry
+	text_end
 
 StarmieDexEntry:
 	db "MYSTERIOUS@"
 	db 3,7
 	dw 1760
-	TX_FAR _StarmieDexEntry
-	db "@"
+	text_far _StarmieDexEntry
+	text_end
 
 BulbasaurDexEntry:
 	db "SEED@"
 	db 2,4
 	dw 150
-	TX_FAR _BulbasaurDexEntry
-	db "@"
+	text_far _BulbasaurDexEntry
+	text_end
 
 VenusaurDexEntry:
 	db "SEED@"
 	db 6,7
 	dw 2210
-	TX_FAR _VenusaurDexEntry
-	db "@"
+	text_far _VenusaurDexEntry
+	text_end
 
 TentacruelDexEntry:
 	db "JELLYFISH@"
 	db 5,3
 	dw 1210
-	TX_FAR _TentacruelDexEntry
-	db "@"
+	text_far _TentacruelDexEntry
+	text_end
 
 GoldeenDexEntry:
 	db "GOLDFISH@"
 	db 2,0
 	dw 330
-	TX_FAR _GoldeenDexEntry
-	db "@"
+	text_far _GoldeenDexEntry
+	text_end
 
 SeakingDexEntry:
 	db "GOLDFISH@"
 	db 4,3
 	dw 860
-	TX_FAR _SeakingDexEntry
-	db "@"
+	text_far _SeakingDexEntry
+	text_end
 
 PonytaDexEntry:
 	db "FIRE HORSE@"
 	db 3,3
 	dw 660
-	TX_FAR _PonytaDexEntry
-	db "@"
+	text_far _PonytaDexEntry
+	text_end
 
 RapidashDexEntry:
 	db "FIRE HORSE@"
 	db 5,7
 	dw 2090
-	TX_FAR _RapidashDexEntry
-	db "@"
+	text_far _RapidashDexEntry
+	text_end
 
 RattataDexEntry:
 	db "RAT@"
 	db 1,0
 	dw 80
-	TX_FAR _RattataDexEntry
-	db "@"
+	text_far _RattataDexEntry
+	text_end
 
 RaticateDexEntry:
 	db "RAT@"
 	db 2,4
 	dw 410
-	TX_FAR _RaticateDexEntry
-	db "@"
+	text_far _RaticateDexEntry
+	text_end
 
 NidorinoDexEntry:
 	db "POISON PIN@"
 	db 2,11
 	dw 430
-	TX_FAR _NidorinoDexEntry
-	db "@"
+	text_far _NidorinoDexEntry
+	text_end
 
 NidorinaDexEntry:
 	db "POISON PIN@"
 	db 2,7
 	dw 440
-	TX_FAR _NidorinaDexEntry
-	db "@"
+	text_far _NidorinaDexEntry
+	text_end
 
 GeodudeDexEntry:
 	db "ROCK@"
 	db 1,4
 	dw 440
-	TX_FAR _GeodudeDexEntry
-	db "@"
+	text_far _GeodudeDexEntry
+	text_end
 
 PorygonDexEntry:
 	db "VIRTUAL@"
 	db 2,7
 	dw 800
-	TX_FAR _PorygonDexEntry
-	db "@"
+	text_far _PorygonDexEntry
+	text_end
 
 AerodactylDexEntry:
 	db "FOSSIL@"
 	db 5,11
 	dw 1300
-	TX_FAR _AerodactylDexEntry
-	db "@"
+	text_far _AerodactylDexEntry
+	text_end
 
 MagnemiteDexEntry:
 	db "MAGNET@"
 	db 1,0
 	dw 130
-	TX_FAR _MagnemiteDexEntry
-	db "@"
+	text_far _MagnemiteDexEntry
+	text_end
 
 CharmanderDexEntry:
 	db "LIZARD@"
 	db 2,0
 	dw 190
-	TX_FAR _CharmanderDexEntry
-	db "@"
+	text_far _CharmanderDexEntry
+	text_end
 
 SquirtleDexEntry:
 	db "TINYTURTLE@"
 	db 1,8
 	dw 200
-	TX_FAR _SquirtleDexEntry
-	db "@"
+	text_far _SquirtleDexEntry
+	text_end
 
 CharmeleonDexEntry:
 	db "FLAME@"
 	db 3,7
 	dw 420
-	TX_FAR _CharmeleonDexEntry
-	db "@"
+	text_far _CharmeleonDexEntry
+	text_end
 
 WartortleDexEntry:
 	db "TURTLE@"
 	db 3,3
 	dw 500
-	TX_FAR _WartortleDexEntry
-	db "@"
+	text_far _WartortleDexEntry
+	text_end
 
 CharizardDexEntry:
 	db "FLAME@"
 	db 5,7
 	dw 2000
-	TX_FAR _CharizardDexEntry
-	db "@"
+	text_far _CharizardDexEntry
+	text_end
 
 OddishDexEntry:
 	db "WEED@"
 	db 1,8
 	dw 120
-	TX_FAR _OddishDexEntry
-	db "@"
+	text_far _OddishDexEntry
+	text_end
 
 GloomDexEntry:
 	db "WEED@"
 	db 2,7
 	dw 190
-	TX_FAR _GloomDexEntry
-	db "@"
+	text_far _GloomDexEntry
+	text_end
 
 VileplumeDexEntry:
 	db "FLOWER@"
 	db 3,11
 	dw 410
-	TX_FAR _VileplumeDexEntry
-	db "@"
+	text_far _VileplumeDexEntry
+	text_end
 
 BellsproutDexEntry:
 	db "FLOWER@"
 	db 2,4
 	dw 90
-	TX_FAR _BellsproutDexEntry
-	db "@"
+	text_far _BellsproutDexEntry
+	text_end
 
 WeepinbellDexEntry:
 	db "FLYCATCHER@"
 	db 3,3
 	dw 140
-	TX_FAR _WeepinbellDexEntry
-	db "@"
+	text_far _WeepinbellDexEntry
+	text_end
 
 VictreebelDexEntry:
 	db "FLYCATCHER@"
 	db 5,7
 	dw 340
-	TX_FAR _VictreebelDexEntry
-	db "@"
+	text_far _VictreebelDexEntry
+	text_end
 
 MissingNoDexEntry:
 	db "???@"
 	db 10 ; 1.0 m
 	db 100 ; 10.0 kg
-	text "コメント さくせいちゅう@" ; コメント作成中 (Comment to be written)
+	text "コメント　さくせいちゅう@" ; コメント作成中 (Comment to be written)
diff --git a/data/sgb/sgb_palettes.asm b/data/sgb/sgb_palettes.asm
index 97f1d8ec..056ac8b9 100755
--- a/data/sgb/sgb_palettes.asm
+++ b/data/sgb/sgb_palettes.asm
@@ -1,174 +1,50 @@
-; palettes for overworlds, title screen, monsters
 SuperPalettes:
-	RGB 31,29,31 ; PAL_ROUTE
-	RGB 21,28,11
-	RGB 20,26,31
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_PALLET
-	RGB 25,28,27
-	RGB 20,26,31
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_VIRIDIAN
-	RGB 17,26,3
-	RGB 20,26,31
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_PEWTER
-	RGB 23,25,16
-	RGB 20,26,31
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_CERULEAN
-	RGB 17,20,30
-	RGB 20,26,31
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_LAVENDER
-	RGB 27,20,27
-	RGB 20,26,31
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_VERMILION
-	RGB 30,18,0
-	RGB 20,26,31
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_CELADON
-	RGB 16,30,22
-	RGB 20,26,31
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_FUCHSIA
-	RGB 31,15,22
-	RGB 20,26,31
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_CINNABAR
-	RGB 26,10,6
-	RGB 20,26,31
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_INDIGO
-	RGB 22,14,24
-	RGB 20,26,31
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_SAFFRON
-	RGB 27,27,3
-	RGB 20,26,31
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_TOWNMAP
-	RGB 20,26,31
-	RGB 17,23,10
-	RGB 3,2,2
+	RGB 31,29,31, 21,28,11, 20,26,31, 03,02,02 ; PAL_ROUTE
+	RGB 31,29,31, 25,28,27, 20,26,31, 03,02,02 ; PAL_PALLET
+	RGB 31,29,31, 17,26,03, 20,26,31, 03,02,02 ; PAL_VIRIDIAN
+	RGB 31,29,31, 23,25,16, 20,26,31, 03,02,02 ; PAL_PEWTER
+	RGB 31,29,31, 17,20,30, 20,26,31, 03,02,02 ; PAL_CERULEAN
+	RGB 31,29,31, 27,20,27, 20,26,31, 03,02,02 ; PAL_LAVENDER
+	RGB 31,29,31, 30,18,00, 20,26,31, 03,02,02 ; PAL_VERMILION
+	RGB 31,29,31, 16,30,22, 20,26,31, 03,02,02 ; PAL_CELADON
+	RGB 31,29,31, 31,15,22, 20,26,31, 03,02,02 ; PAL_FUCHSIA
+	RGB 31,29,31, 26,10,06, 20,26,31, 03,02,02 ; PAL_CINNABAR
+	RGB 31,29,31, 22,14,24, 20,26,31, 03,02,02 ; PAL_INDIGO
+	RGB 31,29,31, 27,27,03, 20,26,31, 03,02,02 ; PAL_SAFFRON
+	RGB 31,29,31, 20,26,31, 17,23,10, 03,02,02 ; PAL_TOWNMAP
 IF DEF(_RED)
-	RGB 31,29,31 ; PAL_LOGO1
-	RGB 30,30,17
-	RGB 17,23,10
-	RGB 21,0,4
+	RGB 31,29,31, 30,30,17, 17,23,10, 21,00,04 ; PAL_LOGO1
 ENDC
 IF DEF(_BLUE)
-	RGB 31,29,31 ; PAL_LOGO1
-	RGB 30,30,17
-	RGB 21,0,4
-	RGB 14,19,29
-ENDC
-	RGB 31,29,31 ; PAL_LOGO2
-	RGB 30,30,17
-	RGB 18,18,24
-	RGB 7,7,16
-	RGB 31,29,31 ; PAL_0F
-	RGB 24,20,30
-	RGB 11,20,30
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_MEWMON
-	RGB 30,22,17
-	RGB 16,14,19
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_BLUEMON
-	RGB 18,20,27
-	RGB 11,15,23
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_REDMON
-	RGB 31,20,10
-	RGB 26,10,6
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_CYANMON
-	RGB 21,25,29
-	RGB 14,19,25
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_PURPLEMON
-	RGB 27,22,24
-	RGB 21,15,23
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_BROWNMON
-	RGB 28,20,15
-	RGB 21,14,9
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_GREENMON
-	RGB 20,26,16
-	RGB 9,20,11
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_PINKMON
-	RGB 30,22,24
-	RGB 28,15,21
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_YELLOWMON
-	RGB 31,28,14
-	RGB 26,20,0
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_GREYMON
-	RGB 26,21,22
-	RGB 15,15,18
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_SLOTS1
-	RGB 26,21,22
-	RGB 27,20,6
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_SLOTS2
-	RGB 31,31,17
-IF DEF(_RED)
-	RGB 25,17,21
-ENDC
-IF DEF(_BLUE)
-	RGB 16,19,29
-ENDC
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_SLOTS3
-	RGB 22,31,16
+	RGB 31,29,31, 30,30,17, 21,00,04, 14,19,29 ; PAL_LOGO1
+ENDC
+	RGB 31,29,31, 30,30,17, 18,18,24, 07,07,16 ; PAL_LOGO2
+	RGB 31,29,31, 24,20,30, 11,20,30, 03,02,02 ; PAL_0F
+	RGB 31,29,31, 30,22,17, 16,14,19, 03,02,02 ; PAL_MEWMON
+	RGB 31,29,31, 18,20,27, 11,15,23, 03,02,02 ; PAL_BLUEMON
+	RGB 31,29,31, 31,20,10, 26,10,06, 03,02,02 ; PAL_REDMON
+	RGB 31,29,31, 21,25,29, 14,19,25, 03,02,02 ; PAL_CYANMON
+	RGB 31,29,31, 27,22,24, 21,15,23, 03,02,02 ; PAL_PURPLEMON
+	RGB 31,29,31, 28,20,15, 21,14,09, 03,02,02 ; PAL_BROWNMON
+	RGB 31,29,31, 20,26,16, 09,20,11, 03,02,02 ; PAL_GREENMON
+	RGB 31,29,31, 30,22,24, 28,15,21, 03,02,02 ; PAL_PINKMON
+	RGB 31,29,31, 31,28,14, 26,20,00, 03,02,02 ; PAL_YELLOWMON
+	RGB 31,29,31, 26,21,22, 15,15,18, 03,02,02 ; PAL_GREYMON
+	RGB 31,29,31, 26,21,22, 27,20,06, 03,02,02 ; PAL_SLOTS1
 IF DEF(_RED)
-	RGB 25,17,21
+	RGB 31,29,31, 31,31,17, 25,17,21, 03,02,02 ; PAL_SLOTS2
+	RGB 31,29,31, 22,31,16, 25,17,21, 03,02,02 ; PAL_SLOTS3
+	RGB 31,29,31, 16,19,29, 25,17,21, 03,02,02 ; PAL_SLOTS4
 ENDC
 IF DEF(_BLUE)
-	RGB 16,19,29
-ENDC
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_SLOTS4
-IF DEF(_RED)
-	RGB 16,19,29
-	RGB 25,17,21
-ENDC
-IF DEF(_BLUE)
-	RGB 25,17,21
-	RGB 16,19,29
-ENDC
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_BLACK
-	RGB 7,7,7
-	RGB 2,3,3
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_GREENBAR
-	RGB 30,26,15
-	RGB 9,20,11
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_YELLOWBAR
-	RGB 30,26,15
-	RGB 26,20,0
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_REDBAR
-	RGB 30,26,15
-	RGB 26,10,6
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_BADGE
-	RGB 30,22,17
-	RGB 11,15,23
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_CAVE
-	RGB 21,14,9
-	RGB 18,24,22
-	RGB 3,2,2
-	RGB 31,29,31 ; PAL_GAMEFREAK
-	RGB 31,28,14
-	RGB 24,20,10
-	RGB 3,2,2
+	RGB 31,29,31, 31,31,17, 16,19,29, 03,02,02 ; PAL_SLOTS2
+	RGB 31,29,31, 22,31,16, 16,19,29, 03,02,02 ; PAL_SLOTS3
+	RGB 31,29,31, 25,17,21, 16,19,29, 03,02,02 ; PAL_SLOTS4
+ENDC
+	RGB 31,29,31, 07,07,07, 02,03,03, 03,02,02 ; PAL_BLACK
+	RGB 31,29,31, 30,26,15, 09,20,11, 03,02,02 ; PAL_GREENBAR
+	RGB 31,29,31, 30,26,15, 26,20,00, 03,02,02 ; PAL_YELLOWBAR
+	RGB 31,29,31, 30,26,15, 26,10,06, 03,02,02 ; PAL_REDBAR
+	RGB 31,29,31, 30,22,17, 11,15,23, 03,02,02 ; PAL_BADGE
+	RGB 31,29,31, 21,14,09, 18,24,22, 03,02,02 ; PAL_CAVE
+	RGB 31,29,31, 31,28,14, 24,20,10, 03,02,02 ; PAL_GAMEFREAK
diff --git a/data/text/alphabets.asm b/data/text/alphabets.asm
index 9799a7e6..07e6cf96 100644
--- a/data/text/alphabets.asm
+++ b/data/text/alphabets.asm
@@ -1,5 +1,15 @@
 LowerCaseAlphabet:
-	db "abcdefghijklmnopqrstuvwxyz ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥UPPER CASE@"
+	db "abcdefghi"
+	db "jklmnopqr"
+	db "stuvwxyz "
+	db "×():;[]<PK><MN>"
+	db "-?!♂♀/<DOT>,<ED>"
+	db "UPPER CASE@"
 
 UpperCaseAlphabet:
-	db "ABCDEFGHIJKLMNOPQRSTUVWXYZ ×():;[]",$e1,$e2,"-?!♂♀/⠄,¥lower case@"
+	db "ABCDEFGHI"
+	db "JKLMNOPQR"
+	db "STUVWXYZ "
+	db "×():;[]<PK><MN>"
+	db "-?!♂♀/<DOT>,<ED>"
+	db "lower case@"
diff --git a/data/text/dakutens.asm b/data/text/dakutens.asm
index f3bf4854..7a53c71f 100644
--- a/data/text/dakutens.asm
+++ b/data/text/dakutens.asm
@@ -7,9 +7,9 @@ Dakutens:
 	db "サザ", "シジ", "スズ", "セゼ", "ソゾ"
 	db "タダ", "チヂ", "ツヅ", "テデ", "トド"
 	db "ハバ", "ヒビ", "フブ", "へべ", "ホボ"
-	db $ff
+	db -1 ; end
 
 Handakutens:
 	db "はぱ", "ひぴ", "ふぷ", "へぺ", "ほぽ"
 	db "ハパ", "ヒピ", "フプ", "へぺ", "ホポ"
-	db $ff
+	db -1 ; end
diff --git a/data/text/text_1.asm b/data/text/text_1.asm
index 1ab54da3..af1d3827 100644
--- a/data/text/text_1.asm
+++ b/data/text/text_1.asm
@@ -1,8 +1,9 @@
 _CardKeySuccessText1::
-	text "Bingo!@@"
+	text "Bingo!@"
+	text_end
 
 _CardKeySuccessText2::
-	text ""
+	text_start
 	line "The CARD KEY"
 	cont "opened the door!"
 	done
@@ -13,8 +14,9 @@ _CardKeyFailText::
 	done
 
 _TrainerNameText::
-	TX_RAM wcd6d
-	text ": @@"
+	text_ram wcd6d
+	text ": @"
+	text_end
 
 _NoNibbleText::
 	text "Not even a nibble!"
@@ -58,8 +60,9 @@ _PokeCenterSignText::
 _FoundItemText::
 	text "<PLAYER> found"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _NoMoreRoomForItemText::
 	text "No more room for"
@@ -72,19 +75,19 @@ _OaksAideHiText::
 	cont "AIDE!"
 
 	para "If you caught @"
-	TX_NUM hOaksAideRequirement, 1, 3
-	text ""
+	text_decimal hOaksAideRequirement, 1, 3
+	text_start
 	line "kinds of #MON,"
 	cont "I'm supposed to"
 	cont "give you an"
 	cont "@"
-	TX_RAM wOaksAideRewardItemName
+	text_ram wOaksAideRewardItemName
 	text "!"
 
 	para "So, <PLAYER>! Have"
 	line "you caught at"
 	cont "least @"
-	TX_NUM hOaksAideRequirement, 1, 3
+	text_decimal hOaksAideRequirement, 1, 3
 	text " kinds of"
 	cont "#MON?"
 	done
@@ -93,16 +96,16 @@ _OaksAideUhOhText::
 	text "Let's see..."
 	line "Uh-oh! You have"
 	cont "caught only @"
-	TX_NUM hOaksAideNumMonsOwned, 1, 3
-	text ""
+	text_decimal hOaksAideNumMonsOwned, 1, 3
+	text_start
 	cont "kinds of #MON!"
 
 	para "You need @"
-	TX_NUM hOaksAideRequirement, 1, 3
+	text_decimal hOaksAideRequirement, 1, 3
 	text " kinds"
 	line "if you want the"
 	cont "@"
-	TX_RAM wOaksAideRewardItemName
+	text_ram wOaksAideRewardItemName
 	text "."
 	done
 
@@ -110,18 +113,18 @@ _OaksAideComeBackText::
 	text "Oh. I see."
 
 	para "When you get @"
-	TX_NUM hOaksAideRequirement, 1, 3
-	text ""
+	text_decimal hOaksAideRequirement, 1, 3
+	text_start
 	line "kinds, come back"
 	cont "for @"
-	TX_RAM wOaksAideRewardItemName
+	text_ram wOaksAideRewardItemName
 	text "."
 	done
 
 _OaksAideHereYouGoText::
 	text "Great! You have"
 	line "caught @"
-	TX_NUM hOaksAideNumMonsOwned, 1, 3
+	text_decimal hOaksAideNumMonsOwned, 1, 3
 	text " kinds "
 	cont "of #MON!"
 	cont "Congratulations!"
@@ -132,14 +135,15 @@ _OaksAideHereYouGoText::
 _OaksAideGotItemText::
 	text "<PLAYER> got the"
 	line "@"
-	TX_RAM wOaksAideRewardItemName
-	text "!@@"
+	text_ram wOaksAideRewardItemName
+	text "!@"
+	text_end
 
 _OaksAideNoRoomText::
 	text "Oh! I see you"
 	line "don't have any"
 	cont "room for the"
 	cont "@"
-	TX_RAM wOaksAideRewardItemName
+	text_ram wOaksAideRewardItemName
 	text "."
 	done
diff --git a/data/text/text_2.asm b/data/text/text_2.asm
index 01e8641b..5e620fbb 100644
--- a/data/text/text_2.asm
+++ b/data/text/text_2.asm
@@ -1,53 +1,53 @@
 _AIBattleWithdrawText::
-	TX_RAM wTrainerName
+	text_ram wTrainerName
 	text " with-"
 	line "drew @"
-	TX_RAM wEnemyMonNick
+	text_ram wEnemyMonNick
 	text "!"
 	prompt
 
 _AIBattleUseItemText::
-	TX_RAM wTrainerName
-	text ""
+	text_ram wTrainerName
+	text_start
 	line "used @"
-	TX_RAM wcd6d
-	text ""
+	text_ram wcd6d
+	text_start
 	cont "on @"
-	TX_RAM wEnemyMonNick
+	text_ram wEnemyMonNick
 	text "!"
 	prompt
 
 _TradeWentToText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " went"
 	line "to @"
-	TX_RAM wLinkEnemyTrainerName
+	text_ram wLinkEnemyTrainerName
 	text "."
 	done
 
 _TradeForText::
 	text "For <PLAYER>'s"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text ","
 	done
 
 _TradeSendsText::
-	TX_RAM wLinkEnemyTrainerName
+	text_ram wLinkEnemyTrainerName
 	text " sends"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "."
 	done
 
 _TradeWavesFarewellText::
-	TX_RAM wLinkEnemyTrainerName
+	text_ram wLinkEnemyTrainerName
 	text " waves"
 	line "farewell as"
 	done
 
 _TradeTransferredText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " is"
 	line "transferred."
 	done
@@ -55,22 +55,22 @@ _TradeTransferredText::
 _TradeTakeCareText::
 	text "Take good care of"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "."
 	done
 
 _TradeWillTradeText::
-	TX_RAM wLinkEnemyTrainerName
+	text_ram wLinkEnemyTrainerName
 	text " will"
 	line "trade @"
-	TX_RAM wcd6d
-	text ""
+	text_ram wcd6d
+	text_start
 	done
 
 _TradeforText::
 	text "for <PLAYER>'s"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "."
 	done
 
@@ -106,7 +106,7 @@ _OneMoreGoSlotMachineText::
 _LinedUpText::
 	text " lined up!"
 	line "Scored @"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " coins!"
 	done
 
@@ -115,39 +115,40 @@ _NotThisTimeText::
 	prompt
 
 _YeahText::
-	text "Yeah!@@"
+	text "Yeah!@"
+	text_end
 
 _DexSeenOwnedText::
 	text "#DEX   Seen:@"
-	TX_NUM wDexRatingNumMonsSeen, 1, 3
-	text ""
+	text_decimal wDexRatingNumMonsSeen, 1, 3
+	text_start
 	line "         Owned:@"
-	TX_NUM wDexRatingNumMonsOwned, 1, 3
-	db "@"
+	text_decimal wDexRatingNumMonsOwned, 1, 3
+	text_end
 
 _DexRatingText::
-	text "#DEX Rating", $6d
+	text "#DEX Rating<COLON>"
 	done
 
 _GymStatueText1::
-	TX_RAM wGymCityName
-	text ""
+	text_ram wGymCityName
+	text_start
 	line "#MON GYM"
 	cont "LEADER: @"
-	TX_RAM wGymLeaderName
-	text ""
+	text_ram wGymLeaderName
+	text_start
 
 	para "WINNING TRAINERS:"
 	line "<RIVAL>"
 	done
 
 _GymStatueText2::
-	TX_RAM wGymCityName
-	text ""
+	text_ram wGymCityName
+	text_start
 	line "#MON GYM"
 	cont "LEADER: @"
-	TX_RAM wGymLeaderName
-	text ""
+	text_ram wGymLeaderName
+	text_start
 
 	para "WINNING TRAINERS:"
 	line "<RIVAL>"
@@ -375,7 +376,8 @@ _CinnabarGymQuizCorrectText::
 	text "You're absolutely"
 	line "correct!"
 
-	para "Go on through!@@"
+	para "Go on through!@"
+	text_end
 
 _CinnabarGymQuizIncorrectText::
 	text "Sorry! Bad call!"
@@ -398,7 +400,8 @@ _BillsHouseMonitorText::
 _BillsHouseInitiatedText::
 	text "<PLAYER> initiated"
 	line "TELEPORTER's Cell"
-	cont "Separator!@@"
+	cont "Separator!@"
+	text_end
 
 _BillsHousePokemonListText1::
 	text "BILL's favorite"
@@ -479,7 +482,8 @@ TMNotebookText::
 	line "HMs that can be"
 	cont "used repeatedly."
 
-	para "SILPH CO.@@"
+	para "SILPH CO.@"
+	text_end
 
 _TurnPageText::
 	text "Turn the page?"
@@ -487,7 +491,8 @@ _TurnPageText::
 
 _ViridianSchoolNotebookText5::
 	text "GIRL: Hey! Don't"
-	line "look at my notes!@@"
+	line "look at my notes!@"
+	text_end
 
 _ViridianSchoolNotebookText1::
 	text "Looked at the"
@@ -718,7 +723,8 @@ _VermilionGymTrashSuccessText1::
 	cont "Turn it on!"
 
 	para "The 1st electric"
-	line "lock opened!@@"
+	line "lock opened!@"
+	text_end
 
 _VermilionGymTrashSuccessText2::
 	text "Hey! There's"
@@ -732,19 +738,22 @@ _VermilionGymTrashSuccessText3::
 	line "lock opened!"
 
 	para "The motorized door"
-	line "opened!@@"
+	line "opened!@"
+	text_end
 
 _VermilionGymTrashFailText::
 	text "Nope! There's"
 	line "only trash here."
 	cont "Hey! The electric"
-	cont "locks were reset!@@"
+	cont "locks were reset!@"
+	text_end
 
 _FoundHiddenItemText::
 	text "<PLAYER> found"
 	line "@"
-	TX_RAM wcd6d
-	text "!@@"
+	text_ram wcd6d
+	text "!@"
+	text_end
 
 _HiddenItemBagFullText::
 	text "But, <PLAYER> has"
@@ -755,17 +764,19 @@ _HiddenItemBagFullText::
 _FoundHiddenCoinsText::
 	text "<PLAYER> found"
 	line "@"
-	TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
-	text " coins!@@"
+	text_bcd hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
+	text " coins!@"
+	text_end
 
 _FoundHiddenCoins2Text::
 	text "<PLAYER> found"
 	line "@"
-	TX_BCD hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
-	text " coins!@@"
+	text_bcd hCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
+	text " coins!@"
+	text_end
 
 _DroppedHiddenCoinsText::
-	text ""
+	text_start
 	para "Oops! Dropped"
 	line "some coins!"
 	done
@@ -802,7 +813,8 @@ _ElevatorText::
 	done
 
 _TownMapText::
-	text "A TOWN MAP.@@"
+	text "A TOWN MAP.@"
+	text_end
 
 _PokemonStuffText::
 	text "Wow! Tons of"
@@ -818,15 +830,15 @@ _OutOfSafariBallsText::
 
 _WildRanText::
 	text "Wild @"
-	TX_RAM wEnemyMonNick
-	text ""
+	text_ram wEnemyMonNick
+	text_start
 	line "ran!"
 	prompt
 
 _EnemyRanText::
 	text "Enemy @"
-	TX_RAM wEnemyMonNick
-	text ""
+	text_ram wEnemyMonNick
+	text_start
 	line "ran!"
 	prompt
 
@@ -847,28 +859,28 @@ _HurtByLeechSeedText::
 
 _EnemyMonFaintedText::
 	text "Enemy @"
-	TX_RAM wEnemyMonNick
-	text ""
+	text_ram wEnemyMonNick
+	text_start
 	line "fainted!"
 	prompt
 
 _MoneyForWinningText::
 	text "<PLAYER> got ¥@"
-	TX_BCD wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN
-	text ""
+	text_bcd wAmountMoneyWon, 3 | LEADING_ZEROES | LEFT_ALIGN
+	text_start
 	line "for winning!"
 	prompt
 
 _TrainerDefeatedText::
 	text "<PLAYER> defeated"
 	line "@"
-	TX_RAM wTrainerName
+	text_ram wTrainerName
 	text "!"
 	prompt
 
 _PlayerMonFaintedText::
-	TX_RAM wBattleMonNick
-	text ""
+	text_ram wBattleMonNick
+	text_start
 	line "fainted!"
 	prompt
 
@@ -892,16 +904,16 @@ _PlayerBlackedOutText2::
 _LinkBattleLostText::
 	text "<PLAYER> lost to"
 	line "@"
-	TX_RAM wTrainerName
+	text_ram wTrainerName
 	text "!"
 	prompt
 
 _TrainerAboutToUseText::
-	TX_RAM wTrainerName
+	text_ram wTrainerName
 	text " is"
 	line "about to use"
 	cont"@"
-	TX_RAM wEnemyMonNick
+	text_ram wEnemyMonNick
 	text "!"
 
 	para "Will <PLAYER>"
@@ -909,10 +921,10 @@ _TrainerAboutToUseText::
 	done
 
 _TrainerSentOutText::
-	TX_RAM wTrainerName
+	text_ram wTrainerName
 	text " sent"
 	line "out @"
-	TX_RAM wEnemyMonNick
+	text_ram wEnemyMonNick
 	text "!"
 	done
 
@@ -941,7 +953,7 @@ _ItemsCantBeUsedHereText::
 	prompt
 
 _AlreadyOutText::
-	TX_RAM wBattleMonNick
+	text_ram wBattleMonNick
 	text " is"
 	line "already out!"
 	prompt
@@ -957,7 +969,7 @@ _MoveDisabledText::
 	prompt
 
 _NoMovesLeftText::
-	TX_RAM wBattleMonNick
+	text_ram wBattleMonNick
 	text " has no"
 	line "moves left!"
 	done
@@ -965,12 +977,12 @@ _NoMovesLeftText::
 _MultiHitText::
 	text "Hit the enemy"
 	line "@"
-	TX_NUM wPlayerNumHits,1,1
+	text_decimal wPlayerNumHits, 1, 1
 	text " times!"
 	prompt
 
 _ScaredText::
-	TX_RAM wBattleMonNick
+	text_ram wBattleMonNick
 	text " is too"
 	line "scared to move!"
 	prompt
@@ -1058,28 +1070,32 @@ _CantMoveText::
 _MoveIsDisabledText::
 	text "<USER>'s"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " is"
 	cont "disabled!"
 	prompt
 
 _MonName1Text::
-	text "<USER>@@"
+	text "<USER>@"
+	text_end
 
 _Used1Text::
-	text ""
-	line "used @@"
+	text_start
+	line "used @"
+	text_end
 
 _Used2Text::
-	text ""
-	line "used @@"
+	text_start
+	line "used @"
+	text_end
 
 _InsteadText::
 	text "instead,"
-	cont "@@"
+	cont "@"
+	text_end
 
 _CF4BText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "@"
 
 _ExclamationPoint1Text::
@@ -1132,32 +1148,32 @@ _OHKOText::
 	prompt
 
 _LoafingAroundText::
-	TX_RAM wBattleMonNick
+	text_ram wBattleMonNick
 	text " is"
 	line "loafing around."
 	prompt
 
 _BeganToNapText::
-	TX_RAM wBattleMonNick
+	text_ram wBattleMonNick
 	text " began"
 	line "to nap!"
 	prompt
 
 _WontObeyText::
-	TX_RAM wBattleMonNick
+	text_ram wBattleMonNick
 	text " won't"
 	line "obey!"
 	prompt
 
 _TurnedAwayText::
-	TX_RAM wBattleMonNick
+	text_ram wBattleMonNick
 	text " turned"
 	line "away!"
 	prompt
 
 _IgnoredOrdersText::
-	TX_RAM wBattleMonNick
-	text ""
+	text_ram wBattleMonNick
+	text_start
 	line "ignored orders!"
 	prompt
 
@@ -1184,58 +1200,62 @@ _MirrorMoveFailedText::
 
 _HitXTimesText::
 	text "Hit @"
-	TX_NUM wEnemyNumHits, 1, 1
+	text_decimal wEnemyNumHits, 1, 1
 	text " times!"
 	prompt
 
 _GainedText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " gained"
-	line "@@"
+	line "@"
+	text_end
 
 _WithExpAllText::
 	text "with EXP.ALL,"
-	cont "@@"
+	cont "@"
+	text_end
 
 _BoostedText::
 	text "a boosted"
-	cont "@@"
+	cont "@"
+	text_end
 
 _ExpPointsText::
-	TX_NUM wExpAmountGained, 2, 4
+	text_decimal wExpAmountGained, 2, 4
 	text " EXP. Points!"
 	prompt
 
 _GrewLevelText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " grew"
 	line "to level @"
-	TX_NUM wCurEnemyLVL, 1, 3
-	text "!@@"
+	text_decimal wCurEnemyLVL, 1, 3
+	text "!@"
+	text_end
 
 _WildMonAppearedText::
 	text "Wild @"
-	TX_RAM wEnemyMonNick
-	text ""
+	text_ram wEnemyMonNick
+	text_start
 	line "appeared!"
 	prompt
 
 _HookedMonAttackedText::
 	text "The hooked"
 	line "@"
-	TX_RAM wEnemyMonNick
-	text ""
+	text_ram wEnemyMonNick
+	text_start
 	cont "attacked!"
 	prompt
 
 _EnemyAppearedText::
-	TX_RAM wEnemyMonNick
-	text ""
+	text_ram wEnemyMonNick
+	text_start
 	line "appeared!"
 	prompt
 
 _TrainerWantsToFightText::
-	TX_RAM wTrainerName
+	text_ram wTrainerName
 	text " wants"
 	line "to fight!"
 	prompt
@@ -1252,38 +1272,46 @@ _GhostCantBeIDdText::
 	prompt
 
 _GoText::
-	text "Go! @@"
+	text "Go! @"
+	text_end
 
 _DoItText::
-	text "Do it! @@"
+	text "Do it! @"
+	text_end
 
 _GetmText::
-	text "Get'm! @@"
+	text "Get'm! @"
+	text_end
 
 _EnemysWeakText::
 	text "The enemy's weak!"
-	line "Get'm! @@"
+	line "Get'm! @"
+	text_end
 
 _PlayerMon1Text::
-	TX_RAM wBattleMonNick
+	text_ram wBattleMonNick
 	text "!"
 	done
 
 _PlayerMon2Text::
-	TX_RAM wBattleMonNick
-	text " @@"
+	text_ram wBattleMonNick
+	text " @"
+	text_end
 
 _EnoughText::
-	text "enough!@@"
+	text "enough!@"
+	text_end
 
 _OKExclamationText::
-	text "OK!@@"
+	text "OK!@"
+	text_end
 
 _GoodText::
-	text "good!@@"
+	text "good!@"
+	text_end
 
 _ComeBackText::
-	text ""
+	text_start
 	line "Come back!"
 	done
 
@@ -1299,15 +1327,15 @@ _NotVeryEffectiveText::
 
 _SafariZoneEatingText::
 	text "Wild @"
-	TX_RAM wEnemyMonNick
-	text ""
+	text_ram wEnemyMonNick
+	text_start
 	line "is eating!"
 	prompt
 
 _SafariZoneAngryText::
 	text "Wild @"
-	TX_RAM wEnemyMonNick
-	text ""
+	text_ram wEnemyMonNick
+	text_start
 	line "is angry!"
 	prompt
 
@@ -1315,7 +1343,7 @@ _SafariZoneAngryText::
 _PickUpPayDayMoneyText::
 	text "<PLAYER> picked up"
 	line "¥@"
-	TX_BCD wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
+	text_bcd wTotalPayDayMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
 	text "!"
 	prompt
 
@@ -1354,61 +1382,62 @@ _PartyMenuSwapMonText::
 	done
 
 _PotionText::
-	TX_RAM wcd6d
-	text ""
+	text_ram wcd6d
+	text_start
 	line "recovered by @"
-	TX_NUM wHPBarHPDifference, 2, 3
+	text_decimal wHPBarHPDifference, 2, 3
 	text "!"
 	done
 
 _AntidoteText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " was"
 	line "cured of poison!"
 	done
 
 _ParlyzHealText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "'s"
 	line "rid of paralysis!"
 	done
 
 _BurnHealText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "'s"
 	line "burn was healed!"
 	done
 
 _IceHealText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " was"
 	line "defrosted!"
 	done
 
 _AwakeningText::
-	TX_RAM wcd6d
-	text ""
+	text_ram wcd6d
+	text_start
 	line "woke up!"
 	done
 
 _FullHealText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "'s"
 	line "health returned!"
 	done
 
 _ReviveText::
-	TX_RAM wcd6d
-	text ""
+	text_ram wcd6d
+	text_start
 	line "is revitalized!"
 	done
 
 _RareCandyText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " grew"
 	line "to level @"
-	TX_NUM wCurEnemyLVL, 1, 3
-	text "!@@"
+	text_decimal wCurEnemyLVL, 1, 3
+	text "!@"
+	text_end
 
 _TurnedOnPC1Text::
 	text "<PLAYER> turned on"
@@ -1458,7 +1487,7 @@ _DepositHowManyText::
 	done
 
 _ItemWasStoredText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " was"
 	line "stored via PC."
 	prompt
@@ -1485,7 +1514,7 @@ _WithdrawHowManyText::
 _WithdrewItemText::
 	text "Withdrew"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "."
 	prompt
 
@@ -1530,10 +1559,10 @@ _DepositWhichMonText::
 	done
 
 _MonWasStoredText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " was"
 	line "stored in Box @"
-	TX_RAM wBoxNumString
+	text_ram wBoxNumString
 	text "."
 	prompt
 
@@ -1548,11 +1577,11 @@ _BoxFullText::
 	prompt
 
 _MonIsTakenOutText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " is"
 	line "taken out."
 	cont "Got @"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "."
 	prompt
 
@@ -1577,25 +1606,26 @@ _ReleaseWhichMonText::
 _OnceReleasedText::
 	text "Once released,"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " is"
 	cont "gone forever. OK?"
 	done
 
 _MonWasReleasedText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " was"
 	line "released outside."
 	cont "Bye @"
 
 _CF4BExclamationText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "!"
 	prompt
 
 _RequireCoinCaseText::
 	text "A COIN CASE is"
-	line "required!@@"
+	line "required!@"
+	text_end
 
 _ExchangeCoinsForPrizesText::
 	text "We exchange your"
@@ -1608,25 +1638,29 @@ _WhichPrizeText::
 	done
 
 _HereYouGoText::
-	text "Here you go!@@"
+	text "Here you go!@"
+	text_end
 
 _SoYouWantPrizeText::
 	text "So, you want"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "?"
 	done
 
 _SorryNeedMoreCoinsText::
 	text "Sorry, you need"
-	line "more coins.@@"
+	line "more coins.@"
+	text_end
 
 _OopsYouDontHaveEnoughRoomText::
 	text "Oops! You don't"
-	line "have enough room.@@"
+	line "have enough room.@"
+	text_end
 
 _OhFineThenText::
-	text "Oh, fine then.@@"
+	text "Oh, fine then.@"
+	text_end
 
 _GetDexRatedText::
 	text "Want to get your"
@@ -1635,7 +1669,8 @@ _GetDexRatedText::
 
 _ClosedOaksPCText::
 	text "Closed link to"
-	line "PROF.OAK's PC.@@"
+	line "PROF.OAK's PC.@"
+	text_end
 
 _AccessedOaksPCText::
 	text "Accessed PROF."
@@ -1674,10 +1709,13 @@ _OakSpeechText2A::
 	text "This world is"
 	line "inhabited by"
 	cont "creatures called"
-	cont "#MON!@@"
+	cont "#MON!@"
+	text_end
 
 _OakSpeechText2B::
-	text $51,"For some people,"
+	text_start
+
+	para "For some people,"
 	line "#MON are"
 	cont "pets. Others use"
 	cont "them for fights."
@@ -1720,7 +1758,7 @@ _DoYouWantToNicknameText::
 	text "Do you want to"
 	line "give a nickname"
 	cont "to @"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "?"
 	done
 
@@ -1736,18 +1774,19 @@ _HisNameIsText::
 	prompt
 
 _WillBeTradedText::
-	TX_RAM wNameOfPlayerMonToBeTraded
+	text_ram wNameOfPlayerMonToBeTraded
 	text " and"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " will"
 	cont "be traded."
 	done
 
-_Char00Text::
-	TX_NUM hSpriteIndexOrTextID,1,2
+_TextIDErrorText::
+	text_decimal hSpriteIndexOrTextID, 1, 2
 	text " ERROR."
 	done
 
-_Char55Text::
-	text $4B,"@@"
+_ContCharText::
+	text "<_CONT>@"
+	text_end
diff --git a/data/text/text_3.asm b/data/text/text_3.asm
index 3b2ff787..6407dce7 100644
--- a/data/text/text_3.asm
+++ b/data/text/text_3.asm
@@ -29,31 +29,32 @@ _WhenYouChangeBoxText::
 
 _ChooseABoxText::
 	text "Choose a"
-	line "<pkmn> BOX.@@"
+	line "<PKMN> BOX.@"
+	text_end
 
 _EvolvedText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " evolved"
 	done
 
 _IntoText::
-	text ""
+	text_start
 	line "into @"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "!"
 	done
 
 _StoppedEvolvingText::
 	text "Huh? @"
-	TX_RAM wcf4b
-	text ""
+	text_ram wcf4b
+	text_start
 	line "stopped evolving!"
 	prompt
 
 _IsEvolvingText::
 	text "What? @"
-	TX_RAM wcf4b
-	text ""
+	text_ram wcf4b
+	text_start
 	line "is evolving!"
 	done
 
@@ -95,11 +96,13 @@ _FireDefrostedText::
 _MonsStatsRoseText::
 	text "<USER>'s"
 	line "@"
-	TX_RAM wcf4b
-	text "@@"
+	text_ram wcf4b
+	text "@"
+	text_end
 
 _GreatlyRoseText::
-	text $4c, "greatly@@"
+	text "<SCROLL>greatly@"
+	text_end
 
 _RoseText::
 	text " rose!"
@@ -108,11 +111,13 @@ _RoseText::
 _MonsStatsFellText::
 	text "<TARGET>'s"
 	line "@"
-	TX_RAM wcf4b
-	text "@@"
+	text_ram wcf4b
+	text "@"
+	text_end
 
 _GreatlyFellText::
-	text $4c, "greatly@@"
+	text "<SCROLL>greatly@"
+	text_end
 
 _FellText::
 	text " fell!"
@@ -134,35 +139,36 @@ _WasBlownAwayText::
 	prompt
 
 _ChargeMoveEffectText::
-	text "<USER>@@"
+	text "<USER>@"
+	text_end
 
 _MadeWhirlwindText::
-	text ""
+	text_start
 	line "made a whirlwind!"
 	prompt
 
 _TookInSunlightText::
-	text ""
+	text_start
 	line "took in sunlight!"
 	prompt
 
 _LoweredItsHeadText::
-	text ""
+	text_start
 	line "lowered its head!"
 	prompt
 
 _SkyAttackGlowingText::
-	text ""
+	text_start
 	line "is glowing!"
 	prompt
 
 _FlewUpHighText::
-	text ""
+	text_start
 	line "flew up high!"
 	prompt
 
 _DugAHoleText::
-	text ""
+	text_start
 	line "dug a hole!"
 	prompt
 
@@ -175,14 +181,14 @@ _MimicLearnedMoveText::
 	text "<USER>"
 	line "learned"
 	cont "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "!"
 	prompt
 
 _MoveWasDisabledText::
 	text "<TARGET>'s"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " was"
 	cont "disabled!"
 	prompt
@@ -285,7 +291,7 @@ _TransformedText::
 	text "<USER>"
 	line "transformed into"
 	cont "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "!"
 	prompt
 
diff --git a/data/text/text_4.asm b/data/text/text_4.asm
index 6ec22680..4c01b5f4 100644
--- a/data/text/text_4.asm
+++ b/data/text/text_4.asm
@@ -4,8 +4,8 @@ _PokemartGreetingText::
 	done
 
 _PokemonFaintedText::
-	TX_RAM wcd6d
-	text ""
+	text_ram wcd6d
+	text_start
 	line "fainted!"
 	done
 
@@ -27,11 +27,11 @@ _PokemartBuyingGreetingText::
 	done
 
 _PokemartTellBuyPriceText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "?"
 	line "That will be"
 	cont "¥@"
-	TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
+	text_bcd hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
 	text ". OK?"
 	done
 
@@ -58,7 +58,7 @@ _PokemonSellingGreetingText::
 _PokemartTellSellPriceText::
 	text "I can pay you"
 	line "¥@"
-	TX_BCD hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
+	text_bcd hMoney, 3 | LEADING_ZEROES | LEFT_ALIGN
 	text " for that."
 	done
 
@@ -82,11 +82,12 @@ _PokemartAnythingElseText::
 	done
 
 _LearnedMove1Text::
-	TX_RAM wLearnMoveMonName
+	text_ram wLearnMoveMonName
 	text " learned"
 	line "@"
-	TX_RAM wcf4b
-	text "!@@"
+	text_ram wcf4b
+	text "!@"
+	text_end
 
 _WhichMoveToForgetText::
 	text "Which move should"
@@ -96,53 +97,55 @@ _WhichMoveToForgetText::
 _AbandonLearningText::
 	text "Abandon learning"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "?"
 	done
 
 _DidNotLearnText::
-	TX_RAM wLearnMoveMonName
-	text ""
+	text_ram wLearnMoveMonName
+	text_start
 	line "did not learn"
 	cont "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "!"
 	prompt
 
 _TryingToLearnText::
-	TX_RAM wLearnMoveMonName
+	text_ram wLearnMoveMonName
 	text " is"
 	line "trying to learn"
 	cont "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "!"
 
 	para "But, @"
-	TX_RAM wLearnMoveMonName
-	text ""
+	text_ram wLearnMoveMonName
+	text_start
 	line "can't learn more"
 	cont "than 4 moves!"
 
 	para "Delete an older"
 	line "move to make room"
 	cont "for @"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "?"
 	done
 
 _OneTwoAndText::
-	text "1, 2 and...@@"
+	text "1, 2 and...@"
+	text_end
 
 _PoofText::
-	text " Poof!@@"
+	text " Poof!@"
+	text_end
 
 _ForgotAndText::
-	text ""
+	text_start
 	para "@"
-	TX_RAM wLearnMoveMonName
+	text_ram wLearnMoveMonName
 	text " forgot"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "!"
 
 	para "And..."
@@ -204,7 +207,8 @@ _CableClubNPCPleaseApplyHereHaveToSaveText::
 	done
 
 _CableClubNPCPleaseWaitText::
-	text "Please wait.@@"
+	text "Please wait.@"
+	text_end
 
 _CableClubNPCLinkClosedBecauseOfInactivityText::
 	text "The link has been"
diff --git a/data/text/text_5.asm b/data/text/text_5.asm
index 26a11a40..ae7151cc 100644
--- a/data/text/text_5.asm
+++ b/data/text/text_5.asm
@@ -9,12 +9,13 @@ _CableClubNPCMakingPreparationsText::
 	done
 
 _UsedStrengthText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " used"
-	line "STRENGTH.@@"
+	line "STRENGTH.@"
+	text_end
 
 _CanMoveBouldersText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " can"
 	line "move boulders."
 	prompt
@@ -40,13 +41,13 @@ _WarpToLastPokemonCenterText::
 	done
 
 _CannotUseTeleportNowText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " can't"
 	line "use TELEPORT now."
 	prompt
 
 _CannotFlyHereText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " can't"
 	line "FLY here."
 	prompt
@@ -74,18 +75,19 @@ _CannotGetOffHereText::
 _GotMonText::
 	text "<PLAYER> got"
 	line "@"
-	TX_RAM wcd6d
-	text "!@@"
+	text_ram wcd6d
+	text "!@"
+	text_end
 
 _SentToBoxText::
 	text "There's no more"
 	line "room for #MON!"
 	cont "@"
-	TX_RAM wBoxMonNicks
+	text_ram wBoxMonNicks
 	text " was"
 	cont "sent to #MON"
 	cont "BOX @"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " on PC!"
 	done
 
diff --git a/data/text/text_6.asm b/data/text/text_6.asm
index 45c553cd..39eb22ea 100644
--- a/data/text/text_6.asm
+++ b/data/text/text_6.asm
@@ -29,19 +29,20 @@ _ItemUseBallText04::
 _ItemUseBallText05::
 	text "All right!"
 	line "@"
-	TX_RAM wEnemyMonNick
+	text_ram wEnemyMonNick
 	text " was"
-	cont "caught!@@"
+	cont "caught!@"
+	text_end
 
 _ItemUseBallText07::
-	TX_RAM wBoxMonNicks
+	text_ram wBoxMonNicks
 	text " was"
 	line "transferred to"
 	cont "BILL's PC!"
 	prompt
 
 _ItemUseBallText08::
-	TX_RAM wBoxMonNicks
+	text_ram wBoxMonNicks
 	text " was"
 	line "transferred to"
 	cont "someone's PC!"
@@ -51,13 +52,14 @@ _ItemUseBallText06::
 	text "New #DEX data"
 	line "will be added for"
 	cont "@"
-	TX_RAM wEnemyMonNick
-	text "!@@"
+	text_ram wEnemyMonNick
+	text "!@"
+	text_end
 
 _SurfingGotOnText::
 	text "<PLAYER> got on"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "!"
 	prompt
 
@@ -67,10 +69,10 @@ _SurfingNoPlaceToGetOffText::
 	prompt
 
 _VitaminStatRoseText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "'s"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text " rose."
 	prompt
 
@@ -104,12 +106,13 @@ _FluteWokeUpText::
 
 _PlayedFluteHadEffectText::
 	text "<PLAYER> played the"
-	line "# FLUTE.@@"
+	line "# FLUTE.@"
+	text_end
 
 _CoinCaseNumCoinsText::
 	text "Coins"
 	line "@"
-	TX_BCD wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
+	text_bcd wPlayerCoins, 2 | LEADING_ZEROES | LEFT_ALIGN
 	text " "
 	prompt
 
@@ -135,13 +138,13 @@ _RestorePPWhichTechniqueText::
 	done
 
 _PPMaxedOutText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "'s PP"
 	line "is maxed out."
 	prompt
 
 _PPIncreasedText::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "'s PP"
 	line "increased."
 	prompt
@@ -161,26 +164,26 @@ _BootedUpHMText::
 _TeachMachineMoveText::
 	text "It contained"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "!"
 
 	para "Teach @"
-	TX_RAM wcf4b
-	text ""
+	text_ram wcf4b
+	text_start
 	line "to a #MON?"
 	done
 
 _MonCannotLearnMachineMoveText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " is not"
 	line "compatible with"
 	cont "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "."
 
 	para "It can't learn"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "."
 	prompt
 
@@ -217,7 +220,7 @@ _NoCyclingAllowedHereText::
 _NoSurfingHereText::
 	text "No SURFing on"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " here!"
 	prompt
 
diff --git a/data/text/text_7.asm b/data/text/text_7.asm
index e836fc8e..34f070bd 100644
--- a/data/text/text_7.asm
+++ b/data/text/text_7.asm
@@ -1,39 +1,42 @@
 _ItemUseText001::
-	text "<PLAYER> used@@"
+	text "<PLAYER> used@"
+	text_end
 
 _ItemUseText002::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "!"
 	done
 
 _GotOnBicycleText1::
-	text "<PLAYER> got on the@@"
+	text "<PLAYER> got on the@"
+	text_end
 
 _GotOnBicycleText2::
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "!"
 	prompt
 
 _GotOffBicycleText1::
-	text "<PLAYER> got off@@"
+	text "<PLAYER> got off@"
+	text_end
 
 _GotOffBicycleText2::
 	text "the @"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "."
 	prompt
 
 _ThrewAwayItemText::
 	text "Threw away"
 	line "@"
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text "."
 	prompt
 
 _IsItOKToTossItemText::
 	text "Is it OK to toss"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "?"
 	prompt
 
@@ -43,10 +46,10 @@ _TooImportantToTossText::
 	prompt
 
 _AlreadyKnowsText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " knows"
 	line "@"
-	TX_RAM wcf4b
+	text_ram wcf4b
 	text "!"
 	prompt
 
@@ -58,21 +61,22 @@ _ConnectCableText::
 _TradedForText::
 	text "<PLAYER> traded"
 	line "@"
-	TX_RAM wInGameTradeGiveMonName
+	text_ram wInGameTradeGiveMonName
 	text " for"
 	cont "@"
-	TX_RAM wInGameTradeReceiveMonName
-	text "!@@"
+	text_ram wInGameTradeReceiveMonName
+	text "!@"
+	text_end
 
 _WannaTrade1Text::
 	text "I'm looking for"
 	line "@"
-	TX_RAM wInGameTradeGiveMonName
+	text_ram wInGameTradeGiveMonName
 	text "! Wanna"
 
 	para "trade one for"
 	line "@"
-	TX_RAM wInGameTradeReceiveMonName
+	text_ram wInGameTradeReceiveMonName
 	text "? "
 	done
 
@@ -84,7 +88,7 @@ _NoTrade1Text::
 _WrongMon1Text::
 	text "What? That's not"
 	line "@"
-	TX_RAM wInGameTradeGiveMonName
+	text_ram wInGameTradeGiveMonName
 	text "!"
 
 	para "If you get one,"
@@ -98,7 +102,7 @@ _Thanks1Text::
 _AfterTrade1Text::
 	text "Isn't my old"
 	line "@"
-	TX_RAM wInGameTradeReceiveMonName
+	text_ram wInGameTradeReceiveMonName
 	text " great?"
 	done
 
@@ -107,10 +111,10 @@ _WannaTrade2Text::
 	line "you want to trade"
 
 	para "your @"
-	TX_RAM wInGameTradeGiveMonName
-	text ""
+	text_ram wInGameTradeGiveMonName
+	text_start
 	line "for @"
-	TX_RAM wInGameTradeReceiveMonName
+	text_ram wInGameTradeReceiveMonName
 	text "?"
 	done
 
@@ -122,7 +126,7 @@ _NoTrade2Text::
 _WrongMon2Text::
 	text "Hmmm? This isn't"
 	line "@"
-	TX_RAM wInGameTradeGiveMonName
+	text_ram wInGameTradeGiveMonName
 	text "."
 
 	para "Think of me when"
@@ -135,7 +139,7 @@ _Thanks2Text::
 
 _AfterTrade2Text::
 	text "The @"
-	TX_RAM wInGameTradeGiveMonName
+	text_ram wInGameTradeGiveMonName
 	text " you"
 	line "traded to me"
 
@@ -145,12 +149,12 @@ _AfterTrade2Text::
 _WannaTrade3Text::
 	text "Hi! Do you have"
 	line "@"
-	TX_RAM wInGameTradeGiveMonName
+	text_ram wInGameTradeGiveMonName
 	text "?"
 
 	para "Want to trade it"
 	line "for @"
-	TX_RAM wInGameTradeReceiveMonName
+	text_ram wInGameTradeReceiveMonName
 	text "?"
 	done
 
@@ -161,7 +165,7 @@ _NoTrade3Text::
 _WrongMon3Text::
 	text "...This is no"
 	line "@"
-	TX_RAM wInGameTradeGiveMonName
+	text_ram wInGameTradeGiveMonName
 	text "."
 
 	para "If you get one,"
@@ -175,11 +179,11 @@ _Thanks3Text::
 _AfterTrade3Text::
 	text "How is my old"
 	line "@"
-	TX_RAM wInGameTradeReceiveMonName
+	text_ram wInGameTradeReceiveMonName
 	text "?"
 
 	para "My @"
-	TX_RAM wInGameTradeGiveMonName
+	text_ram wInGameTradeGiveMonName
 	text " is"
 	line "doing great!"
 	done
@@ -190,7 +194,7 @@ _NothingToCutText::
 	prompt
 
 _UsedCutText::
-	TX_RAM wcd6d
+	text_ram wcd6d
 	text " hacked"
 	line "away with CUT!"
 	prompt