ref: 77e300927be6ca69529862d926bb78bcc6314787
parent: a02c3279102dca60deee70141c31af9fcfa1ff75
author: U-Fish-PC\Daniel <corrnondacqb@yahoo.com>
date: Wed May 21 15:08:32 EDT 2014
Name hidden object routines
--- a/data/hidden_objects.asm
+++ b/data/hidden_objects.asm
@@ -63,7 +63,7 @@
db SAFARI_ZONE_REST_HOUSE_2
db SAFARI_ZONE_REST_HOUSE_3
db SAFARI_ZONE_REST_HOUSE_4
- db $B9
+ db ROUTE_15_GATE_2F
db LAVENDER_HOUSE_1
db CELADON_MANSION_5
db FIGHTING_DOJO
@@ -152,7 +152,7 @@
dw SafariZoneRestHouse2HiddenObjects
dw SafariZoneRestHouse3HiddenObjects
dw SafariZoneRestHouse4HiddenObjects
- dw UnusedB9HiddenObjects
+ dw Route15GateUpstairsHiddenObjects
dw LavenderHouse1HiddenObjects
dw CeladonMansion5HiddenObjects
dw FightingDojoHiddenObjects
@@ -174,235 +174,262 @@
dw CeruleanCityHiddenObjects
dw Route4HiddenObjects
+; format: y-coord, x-coord, text id/item id, object routine
BattleCenterHiddenObjects: ; 46b40 (11:6b40)
- db $04,$05,$d0 ; XXX, y, x
- dbw Bank(Func_21845), Func_21845
- db $04,$04,$d0 ; XXX, y, x
- dbw Bank(Func_21825), Func_21825
+ db $04,$05,$d0
+ db BANK(PrintJustAMomentText2)
+ dw PrintJustAMomentText2
+ db $04,$04,$d0
+ db BANK(PrintJustAMomentText1)
+ dw PrintJustAMomentText1
db $FF
TradeCenterHiddenObjects: ; 46b4d (11:6b4d)
- db $04,$05,$d0 ; XXX, y, x
- dbw Bank(Func_21845), Func_21845
- db $04,$04,$d0 ; XXX, y, x
- dbw Bank(Func_21825), Func_21825
+ db $04,$05,$d0
+ db BANK(PrintJustAMomentText2)
+ dw PrintJustAMomentText2
+ db $04,$04,$d0
+ db BANK(PrintJustAMomentText1)
+ dw PrintJustAMomentText1
db $FF
RedsHouse2FHiddenObjects: ; 46b5a (11:6b5a)
- db $01,$00,$04 ; XXX, y, x
- dbw Bank(Func_5db86), Func_5db86
- db $05,$03,$d0 ; XXX, y, x
- dbw Bank(Func_5db79), Func_5db79
+ db $01,$00,$04
+ dbw BANK(OpenRedsPC), OpenRedsPC
+ db $05,$03,$d0
+ dbw BANK(PrintRedsNESText), PrintRedsNESText
db $FF
BluesHouseHiddenObjects: ; 46b67 (11:6b67)
- db $01,$00,$04 ; XXX, y, x
- dbw Bank(Func_62509), Func_62509
- db $01,$01,$04 ; XXX, y, x
- dbw Bank(Func_62509), Func_62509
- db $01,$07,$04 ; XXX, y, x
- dbw Bank(Func_62509), Func_62509
+ 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
OaksLabHiddenObjects: ; 46b7a (11:6b7a)
- db $00,$04,$04 ; XXX, y, x
- dbw Bank(Func_1e958), Func_1e958
- db $00,$05,$04 ; XXX, y, x
- dbw Bank(Func_1e965), Func_1e965
- db $01,$00,$04 ; XXX, y, x
- dbw Bank(Func_1ecaf), Func_1ecaf
- db $01,$01,$04 ; XXX, y, x
- dbw Bank(Func_1ecaf), Func_1ecaf
+ 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
ViridianPokecenterHiddenObjects: ; 46b93 (11:6b93)
- db $04,$00,$08 ; XXX, y, x
- dbw Bank(Func_6245d), Func_6245d
- db $03,$0d,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
+ db $04,$00,$08
+ db Bank(PrintBenchGuyText)
+ dw PrintBenchGuyText
+ db $03,$0d,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
db $FF
ViridianMartHiddenObjects: ; 46ba0 (11:6ba0)
db $FF
ViridianSchoolHiddenObjects: ; 46ba1 (11:6ba1)
- db $04,$03,$20 ; XXX, y, x
- dbw Bank(Func_52996), Func_52996
- db $00,$03,$21 ; XXX, y, x
- dbw Bank(Func_5dc1a), Func_5dc1a
+ db $04,$03,$20 ; ViridianSchoolNotebook
+ db Bank(PrintNotebookText)
+ dw PrintNotebookText
+ db $00,$03,$21 ; ViridianSchoolBlackboard
+ db BANK(PrintBlackboardLinkCableText)
+ dw PrintBlackboardLinkCableText
db $FF
ViridianGymHiddenObjects: ; 46bae (11:6bae)
- db $0f,$0f,$04 ; XXX, y, x
+ db $0f,$0f,$04
dbw BANK(GymStatues),GymStatues
- db $0f,$12,$04 ; XXX, y, x
+ db $0f,$12,$04
dbw BANK(GymStatues),GymStatues
db $FF
Museum1FHiddenObjects: ; 46bbb (11:6bbb)
- db $03,$02,$04 ; XXX, y, x
- dbw Bank(AerodactylFossil), AerodactylFossil
- db $06,$02,$04 ; XXX, y, x
- dbw Bank(KabutopsFossil), KabutopsFossil
+ db $03,$02,$04
+ dbw BANK(AerodactylFossil), AerodactylFossil
+ db $06,$02,$04
+ dbw BANK(KabutopsFossil), KabutopsFossil
db $FF
PewterGymHiddenObjects: ; 46bc8 (11:6bc8)
- db $0a,$03,$04 ; XXX, y, x
+ db $0a,$03,$04
dbw BANK(GymStatues),GymStatues
- db $0a,$06,$04 ; XXX, y, x
+ db $0a,$06,$04
dbw BANK(GymStatues),GymStatues
db $FF
PewterMartHiddenObjects: ; 46bd5 (11:6bd5)
db $FF
PewterPokecenterHiddenObjects: ; 46bd6 (11:6bd6)
- db $04,$00,$08 ; XXX, y, x
- dbw Bank(Func_6245d), Func_6245d
- db $03,$0d,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
+ db $04,$00,$08
+ db Bank(PrintBenchGuyText)
+ dw PrintBenchGuyText
+ db $03,$0d,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
db $FF
CeruleanPokecenterHiddenObjects: ; 46be3 (11:6be3)
- db $04,$00,$08 ; XXX, y, x
- dbw Bank(Func_6245d), Func_6245d
- db $03,$0d,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
+ db $04,$00,$08
+ db Bank(PrintBenchGuyText)
+ dw PrintBenchGuyText
+ db $03,$0d,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
db $FF
CeruleanGymHiddenObjects: ; 46bf0 (11:6bf0)
- db $0b,$03,$04 ; XXX, y, x
+ db $0b,$03,$04
dbw BANK(GymStatues),GymStatues
- db $0b,$06,$04 ; XXX, y, x
+ db $0b,$06,$04
dbw BANK(GymStatues),GymStatues
db $FF
CeruleanMartHiddenObjects: ; 46bfd (11:6bfd)
db $FF
LavenderPokecenterHiddenObjects: ; 46bfe (11:6bfe)
- db $04,$00,$08 ; XXX, y, x
- dbw Bank(Func_6245d), Func_6245d
- db $03,$0d,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
+ db $04,$00,$08
+ db Bank(PrintBenchGuyText)
+ dw PrintBenchGuyText
+ db $03,$0d,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
db $FF
VermilionPokecenterHiddenObjects: ; 46c0b (11:6c0b)
- db $03,$0d,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
- db $04,$00,$04 ; XXX, y, x
- dbw Bank(Func_6245d), Func_6245d
+ db $03,$0d,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
+ db $04,$00,$04
+ db Bank(PrintBenchGuyText)
+ dw PrintBenchGuyText
db $FF
VermilionGymHiddenObjects: ; 46c18 (11:6c18)
- db $0e,$03,$04 ; XXX, y, x
+ db $0e,$03,$04
dbw BANK(GymStatues), GymStatues
- db $0e,$06,$04 ; XXX, y, x
+ db $0e,$06,$04
dbw BANK(GymStatues), GymStatues
- db $01,$06,$00 ; XXX, y, x
- dbw Bank(Func_5ddef), Func_5ddef
- db $07,$01,$00 ; XXX, y, x
- dbw Bank(GymTrashScript), GymTrashScript
- db $09,$01,$01 ; XXX, y, x
- dbw Bank(GymTrashScript), GymTrashScript
- db $0b,$01,$02 ; XXX, y, x
- dbw Bank(GymTrashScript), GymTrashScript
- db $07,$03,$03 ; XXX, y, x
- dbw Bank(GymTrashScript), GymTrashScript
- db $09,$03,$04 ; XXX, y, x
- dbw Bank(GymTrashScript), GymTrashScript
- db $0b,$03,$05 ; XXX, y, x
- dbw Bank(GymTrashScript), GymTrashScript
- db $07,$05,$06 ; XXX, y, x
- dbw Bank(GymTrashScript), GymTrashScript
- db $09,$05,$07 ; XXX, y, x
- dbw Bank(GymTrashScript), GymTrashScript
- db $0b,$05,$08 ; XXX, y, x
- dbw Bank(GymTrashScript), GymTrashScript
- db $07,$07,$09 ; XXX, y, x
- dbw Bank(GymTrashScript), GymTrashScript
- db $09,$07,$0a ; XXX, y, x
- dbw Bank(GymTrashScript), GymTrashScript
- db $0b,$07,$0b ; XXX, y, x
- dbw Bank(GymTrashScript), GymTrashScript
- db $07,$09,$0c ; XXX, y, x
- dbw Bank(GymTrashScript), GymTrashScript
- db $09,$09,$0d ; XXX, y, x
- dbw Bank(GymTrashScript), GymTrashScript
- db $0b,$09,$0e ; XXX, y, x
- dbw Bank(GymTrashScript), GymTrashScript
+ 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
CeladonMansion2HiddenObjects: ; 46c85 (11:6c85)
- db $05,$00,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
+ db $05,$00,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
db $FF
CeladonPokecenterHiddenObjects: ; 46c8c (11:6c8c)
- db $04,$00,$08 ; XXX, y, x
- dbw Bank(Func_6245d), Func_6245d
- db $03,$0d,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
+ db $04,$00,$08
+ db Bank(PrintBenchGuyText)
+ dw PrintBenchGuyText
+ db $03,$0d,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
db $FF
CeladonGymHiddenObjects: ; 46c99 (11:6c99)
- db $0f,$03,$04 ; XXX, y, x
+ db $0f,$03,$04
dbw BANK(GymStatues),GymStatues
- db $0f,$06,$04 ; XXX, y, x
+ db $0f,$06,$04
dbw BANK(GymStatues),GymStatues
db $FF
GameCornerHiddenObjects: ; 46ca6 (11:6ca6)
- db $0f,$12,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0e,$12,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0d,$12,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0c,$12,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0b,$12,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0a,$12,$ff ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0a,$0d,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0b,$0d,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0c,$0d,$fe ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0d,$0d,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0e,$0d,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0f,$0d,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0f,$0c,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0e,$0c,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0d,$0c,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0c,$0c,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0b,$0c,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0a,$0c,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0a,$07,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0b,$07,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0c,$07,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0d,$07,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0e,$07,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0f,$07,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0f,$06,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0e,$06,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0d,$06,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0c,$06,$fd ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0b,$06,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0a,$06,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0a,$01,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0b,$01,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0c,$01,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0d,$01,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0e,$01,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
- db $0f,$01,$d0 ; XXX, y, x
- dbw Bank(Func_37e2d), Func_37e2d
+ 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
@@ -429,60 +456,76 @@
dbw BANK(HiddenCoins),HiddenCoins
db $FF
CeladonHotelHiddenObjects: ; 46dc7 (11:6dc7)
- db $03,$0d,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
- db $04,$00,$08 ; XXX, y, x
- dbw Bank(Func_6245d), Func_6245d
+ db $03,$0d,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
+ db $04,$00,$08
+ db Bank(PrintBenchGuyText)
+ dw PrintBenchGuyText
db $FF
FuchsiaPokecenterHiddenObjects: ; 46dd4 (11:6dd4)
- db $03,$0d,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
- db $04,$00,$04 ; XXX, y, x
- dbw Bank(Func_6245d), Func_6245d
+ db $03,$0d,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
+ db $04,$00,$04
+ db Bank(PrintBenchGuyText)
+ dw PrintBenchGuyText
db $FF
FuchsiaGymHiddenObjects: ; 46de1 (11:6de1)
- db $0f,$03,$04 ; XXX, y, x
+ db $0f,$03,$04
dbw BANK(GymStatues),GymStatues
- db $0f,$06,$04 ; XXX, y, x
+ db $0f,$06,$04
dbw BANK(GymStatues),GymStatues
db $FF
CinnabarGymHiddenObjects: ; 46dee (11:6dee)
- db $0d,$11,$04 ; XXX, y, x
+ db $0d,$11,$04
dbw BANK(GymStatues),GymStatues
- db $07,$0f,$01 ; XXX, y, x
- dbw Bank(Func_1eaa17), Func_1eaa17
- db $01,$0a,$12 ; XXX, y, x
- dbw Bank(Func_1eaa17), Func_1eaa17
- db $07,$09,$13 ; XXX, y, x
- dbw Bank(Func_1eaa17), Func_1eaa17
- db $0d,$09,$14 ; XXX, y, x
- dbw Bank(Func_1eaa17), Func_1eaa17
- db $0d,$01,$05 ; XXX, y, x
- dbw Bank(Func_1eaa17), Func_1eaa17
- db $07,$01,$16 ; XXX, y, x
- dbw Bank(Func_1eaa17), Func_1eaa17
+ 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
CinnabarPokecenterHiddenObjects: ; 46e19 (11:6e19)
- db $04,$00,$04 ; XXX, y, x
- dbw Bank(Func_6245d), Func_6245d
- db $03,$0d,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
+ db $04,$00,$04
+ db Bank(PrintBenchGuyText)
+ dw PrintBenchGuyText
+ db $03,$0d,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
db $FF
SaffronGymHiddenObjects: ; 46e26 (11:6e26)
- db $0f,$09,$04 ; XXX, y, x
+ db $0f,$09,$04
dbw BANK(GymStatues),GymStatues
db $FF
MtMoonPokecenterHiddenObjects: ; 46e2d (11:6e2d)
- db $04,$00,$08 ; XXX, y, x
- dbw Bank(Func_6245d), Func_6245d
- db $03,$0d,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
+ db $04,$00,$08
+ db Bank(PrintBenchGuyText)
+ dw PrintBenchGuyText
+ db $03,$0d,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
db $FF
RockTunnelPokecenterHiddenObjects: ; 46e3a (11:6e3a)
- db $04,$00,$08 ; XXX, y, x
- dbw Bank(Func_6245d), Func_6245d
- db $03,$0d,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
+ db $04,$00,$08
+ db Bank(PrintBenchGuyText)
+ dw PrintBenchGuyText
+ db $03,$0d,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
db $FF
ViridianForestHiddenObjects: ; 46e47 (11:6e47)
db $12,$01,POTION
@@ -497,10 +540,12 @@
dbw BANK(HiddenItems),HiddenItems
db $FF
IndigoPlateauHiddenObjects: ; 46e61 (11:6e61)
- db $0d,$08,$ff ; XXX, y, x
- dbw Bank(Func_52a2f), Func_52a2f
- db $0d,$0b,$00 ; XXX, y, x
- dbw Bank(Func_52a2f), Func_52a2f
+ db $0d,$08,$ff
+ db BANK(PrintIndigoPlateauHQText)
+ dw PrintIndigoPlateauHQText
+ db $0d,$0b,$00
+ db BANK(PrintIndigoPlateauHQText)
+ dw PrintIndigoPlateauHQText
db $FF
Route25HiddenObjects: ; 46e6e (11:6e6e)
db $03,$26,ETHER
@@ -513,10 +558,10 @@
dbw BANK(HiddenItems),HiddenItems
db $FF
SSAnne6HiddenObjects: ; 46e82 (11:6e82)
- db $05,$0d,$00 ; XXX, y, x
- dbw Bank(Func_5ddef), Func_5ddef
- db $07,$0d,$00 ; XXX, y, x
- dbw Bank(Func_5ddef), Func_5ddef
+ 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
@@ -543,10 +588,12 @@
dbw BANK(HiddenItems),HiddenItems
db $FF
SaffronPokecenterHiddenObjects: ; 46ebe (11:6ebe)
- db $04,$00,$04 ; XXX, y, x
- dbw Bank(Func_6245d), Func_6245d
- db $03,$0d,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
+ db $04,$00,$04
+ db Bank(PrintBenchGuyText)
+ dw PrintBenchGuyText
+ db $03,$0d,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
db $FF
PokemonTower5HiddenObjects: ; 46ecb (11:6ecb)
db $0c,$04,ELIXER
@@ -603,27 +650,31 @@
Mansion1HiddenObjects: ; 46f2b (11:6f2b)
db $10,$08,MOON_STONE
dbw BANK(HiddenItems),HiddenItems
- db $05,$02,$04 ; XXX, y, x
- dbw BANK(Func_44316),Func_44316
+ db $05,$02,$04
+ db BANK(Mansion1Script_Switches)
+ dw Mansion1Script_Switches
db $FF
Mansion2HiddenObjects: ; 46f38 (11:6f38)
- db $0b,$02,$04 ; XXX, y, x
- db Bank(Mansion2Script_52037)
- dw Mansion2Script_52037
+ db $0b,$02,$04
+ db BANK(Mansion2Script_Switches)
+ dw Mansion2Script_Switches
db $FF
Mansion3HiddenObjects: ; 46f3f (11:6f3f)
db $09,$01,MAX_REVIVE
dbw BANK(HiddenItems),HiddenItems
- db $05,$0a,$04 ; XXX, y, x
- dbw Bank(Func_5227a), Func_5227a
+ db $05,$0a,$04
+ db BANK(Mansion3Script_Switches)
+ dw Mansion3Script_Switches
db $FF
Mansion4HiddenObjects: ; 46f4c (11:6f4c)
db $09,$01,RARE_CANDY
dbw BANK(HiddenItems),HiddenItems
- db $03,$14,$04 ; XXX, y, x
- dbw Bank(Func_52420), Func_52420
- db $19,$12,$04 ; XXX, y, x
- dbw Bank(Func_52420), Func_52420
+ db $03,$14,$04
+ db BANK(Mansion4Script_Switches)
+ dw Mansion4Script_Switches
+ db $19,$12,$04
+ db BANK(Mansion4Script_Switches)
+ dw Mansion4Script_Switches
db $FF
Route23HiddenObjects: ; 46f5f (11:6f5f)
db $2c,$09,FULL_RESTORE
@@ -644,8 +695,8 @@
dbw BANK(HiddenItems),HiddenItems
db $FF
BillsHouseHiddenObjects: ; 46f86 (11:6f86)
- db $04,$01,$04 ; XXX, y, x
- dbw Bank(Func_1eb6e), Func_1eb6e
+ db $04,$01,$04
+ dbw BANK(BillsHousePC), BillsHousePC
db $FF
ViridianCityHiddenObjects: ; 46f8d (11:6f8d)
db $04,$0e,POTION
@@ -652,76 +703,96 @@
dbw BANK(HiddenItems),HiddenItems
db $FF
SafariZoneRestHouse2HiddenObjects: ; 46f94 (11:6f94)
- db $04,$00,$08 ; XXX, y, x
- dbw Bank(Func_6245d), Func_6245d
- db $03,$0d,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
+ db $04,$00,$08
+ db Bank(PrintBenchGuyText)
+ dw PrintBenchGuyText
+ db $03,$0d,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
db $FF
SafariZoneRestHouse3HiddenObjects: ; 46fa1 (11:6fa1)
- db $04,$00,$08 ; XXX, y, x
- dbw Bank(Func_6245d), Func_6245d
- db $03,$0d,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
+ db $04,$00,$08
+ db Bank(PrintBenchGuyText)
+ dw PrintBenchGuyText
+ db $03,$0d,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
db $FF
SafariZoneRestHouse4HiddenObjects: ; 46fae (11:6fae)
- db $04,$00,$08 ; XXX, y, x
- dbw Bank(Func_6245d), Func_6245d
- db $03,$0d,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
+ db $04,$00,$08
+ db Bank(PrintBenchGuyText)
+ dw PrintBenchGuyText
+ db $03,$0d,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
db $FF
-UnusedB9HiddenObjects: ; 46fbb (11:6fbb)
- db $02,$01,$04 ; XXX, y, x
- dbw Bank(Func_5db8f), Func_5db8f
+Route15GateUpstairsHiddenObjects: ; 46fbb (11:6fbb)
+ db $02,$01,$04
+ db BANK(Route15GateLeftBinoculars)
+ dw Route15GateLeftBinoculars
db $FF
LavenderHouse1HiddenObjects: ; 46fc2 (11:6fc2)
- db $01,$00,$00 ; XXX, y, x
- dbw Bank(Func_1eb60), Func_1eb60
- db $01,$01,$00 ; XXX, y, x
- dbw Bank(Func_1eb60), Func_1eb60
- db $01,$07,$00 ; XXX, y, x
- dbw Bank(Func_1eb60), Func_1eb60
+ 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
CeladonMansion5HiddenObjects: ; 46fd5 (11:6fd5)
- db $00,$03,$34 ; XXX, y, x
- dbw Bank(Func_5dc1a), Func_5dc1a
- db $00,$04,$34 ; XXX, y, x
- dbw Bank(Func_5dc1a), Func_5dc1a
- db $04,$03,$35 ; XXX, y, x
- dbw Bank(Func_52996), Func_52996
+ db $00,$03,$34 ; LinkCableHelp
+ db BANK(PrintBlackboardLinkCableText)
+ dw PrintBlackboardLinkCableText
+ db $00,$04,$34 ; LinkCableHelp
+ db BANK(PrintBlackboardLinkCableText)
+ dw PrintBlackboardLinkCableText
+ db $04,$03,$35 ; TMNotebook
+ db Bank(PrintNotebookText)
+ dw PrintNotebookText
db $FF
FightingDojoHiddenObjects: ; 46fe8 (11:6fe8)
- db $09,$03,$04 ; XXX, y, x
- dbw Bank(Func_52a22), Func_52a22
- db $09,$06,$04 ; XXX, y, x
- dbw Bank(Func_52a22), Func_52a22
- db $00,$04,$04 ; XXX, y, x
- dbw Bank(Func_52a08), Func_52a08
- db $00,$05,$04 ; XXX, y, x
- dbw Bank(Func_52a15), Func_52a15
+ 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
IndigoPlateauLobbyHiddenObjects: ; 47001 (11:7001)
- db $07,$0f,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
+ db $07,$0f,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
db $FF
CinnabarLab4HiddenObjects: ; 47008 (11:7008)
- db $04,$00,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
- db $04,$02,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
+ db $04,$00,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
+ db $04,$02,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
db $FF
BikeShopHiddenObjects: ; 47015 (11:7015)
- db $00,$01,$d0 ; XXX, y, x
- dbw Bank(Func_1e94b), Func_1e94b
- db $01,$02,$d0 ; XXX, y, x
- dbw Bank(Func_1e94b), Func_1e94b
- db $02,$01,$d0 ; XXX, y, x
- dbw Bank(Func_1e94b), Func_1e94b
- db $02,$03,$d0 ; XXX, y, x
- dbw Bank(Func_1e94b), Func_1e94b
- db $04,$00,$d0 ; XXX, y, x
- dbw Bank(Func_1e94b), Func_1e94b
- db $05,$01,$d0 ; XXX, y, x
- dbw Bank(Func_1e94b), Func_1e94b
+ 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
Route11HiddenObjects: ; 4703a (11:703a)
db $05,$30,ESCAPE_ROPE
@@ -732,8 +803,9 @@
dbw BANK(HiddenItems),HiddenItems
db $FF
SilphCo11FHiddenObjects: ; 47048 (11:7048)
- db $0c,$0a,$04 ; XXX, y, x
- dbw Bank(Func_62516), Func_62516
+ db $0c,$0a,$04
+ db BANK(OpenPokemonCenterPC)
+ dw OpenPokemonCenterPC
db $FF
Route17HiddenObjects: ; 4704f (11:704f)
db $0e,$0f,RARE_CANDY
--- a/main.asm
+++ b/main.asm
@@ -10398,7 +10398,7 @@
PointerTable_3f22:: ; 3f22 (0:3f22)
dw CardKeySuccessText ; id = 01
dw CardKeyFailText ; id = 02
- dw Route15UpstairsLeftBinoculars ; id = 03
+ dw RedBedroomPC ; id = 03
dw RedBedroomSNESText ; id = 04
dw PushStartText ; id = 05
dw SaveOptionText ; id = 06
@@ -10422,9 +10422,9 @@
dw SaffronCityPokecenterBenchGuyText ; id = 18
dw MtMoonPokecenterBenchGuyText ; id = 19
dw RockTunnelPokecenterBenchGuyText ; id = 1A
- dw UnnamedText_624c1 ; id = 1B
- dw UnnamedText_624c6 ; id = 1C
- dw UnnamedText_624cb ; id = 1D
+ dw UnusedBenchGuyText1 ; id = 1B
+ dw UnusedBenchGuyText2 ; id = 1C
+ dw UnusedBenchGuyText3 ; id = 1D
dw TerminatorText_62508 ; id = 1E
dw PredefText1f ; id = 1F
dw ViridianSchoolNotebook ; id = 20
@@ -10450,8 +10450,8 @@
dw LinkCableHelp ; id = 34
dw TMNotebook ; id = 35
dw FightingDojoText ; id = 36
- dw UnnamedText_52a10 ; id = 37
- dw UnnamedText_52a1d ; id = 38
+ dw FightingDojoText_52a10 ; id = 37
+ dw FightingDojoText_52a1d ; id = 38
dw NewBicycleText ; id = 39
dw IndigoPlateauStatues ; id = 3A
dw VermilionGymTrashSuccesText1 ; id = 3B
@@ -28392,7 +28392,7 @@
TX_FAR _AccessedOaksPCText
db "@"
-Func_1e94b: ; 1e94b (7:694b)
+PrintNewBikeText: ; 1e94b (7:694b)
call EnableAutoTextBoxDrawing
ld a, $39
jp PrintPredefTextID
@@ -28401,9 +28401,9 @@
TX_FAR _NewBicycleText
db "@"
-Func_1e958: ; 1e958 (7:6958)
+DisplayOakLabLeftPoster: ; 1e958 (7:6958)
call EnableAutoTextBoxDrawing
- ld a, $05
+ ld a, $05 ; PushStartText
jp PrintPredefTextID
PushStartText: ; 1e960 (7:6960)
@@ -28410,7 +28410,7 @@
TX_FAR _PushStartText
db "@"
-Func_1e965: ; 1e965 (7:6965)
+DisplayOakLabRightPoster: ; 1e965 (7:6965)
call EnableAutoTextBoxDrawing
ld hl, wPokedexOwned
ld b, wPokedexOwnedEnd - wPokedexOwned
@@ -28417,9 +28417,9 @@
call CountSetBits
ld a, [$d11e]
cp $2
- ld a, $6
+ ld a, $6 ; SaveOptionText
jr c, .asm_1e97b
- ld a, $7
+ ld a, $7 ; StrengthsAndWeaknessesText
.asm_1e97b
jp PrintPredefTextID
@@ -28512,7 +28512,7 @@
TX_FAR _GameOverText
db "@"
-Func_1eaa17: ; 1ea17 (7:6a17)
+PrintCinnabarQuiz: ; 1ea17 (7:6a17)
ld a, [$c109]
cp $4
ret nz
@@ -28704,7 +28704,7 @@
db $02,$06,$54,$00
db $02,$03,$54,$00
-Func_1eb60: ; 1eb60 (7:6b60)
+PrintMagazinesText: ; 1eb60 (7:6b60)
call EnableAutoTextBoxDrawing
ld a, $30
call PrintPredefTextID
@@ -28714,7 +28714,7 @@
TX_FAR _MagazinesText
db "@"
-Func_1eb6e: ; 1eb6e (7:6b6e)
+BillsHousePC: ; 1eb6e (7:6b6e)
call EnableAutoTextBoxDrawing
ld a, [$c109]
cp $4
@@ -28854,12 +28854,12 @@
TX_FAR _BillsHousePokemonListText2
db "@"
-Func_1ecaf: ; 1ecaf (7:6caf)
+DisplayOakLabEmailText: ; 1ecaf (7:6caf)
ld a, [$c109]
cp $4
ret nz
call EnableAutoTextBoxDrawing
- ld a, $8
+ ld a, $8 ; OakLabEmailText
jp PrintPredefTextID
OakLabEmailText: ; 1ecbd (7:6cbd)
@@ -31261,7 +31261,7 @@
ld [H_DIVIDEND], a ; $ff95 (aliases: H_PRODUCT, H_PASTLEADINGZEROES, H_QUOTIENT)
ret
-Func_37e2d: ; 37e2d (d:7e2d)
+StartSlotMachine: ; 37e2d (d:7e2d)
ld a, [wTrainerSpriteOffset]
cp $fd
jr z, .asm_37e66
@@ -46114,7 +46114,7 @@
INCLUDE "data/prize_mon_levels.asm"
-Func_52996: ; 52996 (14:6996)
+PrintNotebookText: ; 52996 (14:6996)
call EnableAutoTextBoxDrawing
ld a, $1
ld [$cc3c], a
@@ -46180,25 +46180,25 @@
TX_FAR _ViridianSchoolNotebookText4
db "@"
-Func_52a08: ; 52a08 (14:6a08)
+PrintFightingDojoText2: ; 52a08 (14:6a08)
call EnableAutoTextBoxDrawing
ld a, $37
jp PrintPredefTextID
-UnnamedText_52a10: ; 52a10 (14:6a10)
- TX_FAR _UnnamedText_52a10
+FightingDojoText_52a10: ; 52a10 (14:6a10)
+ TX_FAR _FightingDojoText_52a10
db "@"
-Func_52a15: ; 52a15 (14:6a15)
+PrintFightingDojoText3: ; 52a15 (14:6a15)
call EnableAutoTextBoxDrawing
ld a, $38
jp PrintPredefTextID
-UnnamedText_52a1d: ; 52a1d (14:6a1d)
- TX_FAR _UnnamedText_52a1d
+FightingDojoText_52a1d: ; 52a1d (14:6a1d)
+ TX_FAR _FightingDojoText_52a1d
db "@"
-Func_52a22: ; 52a22 (14:6a22)
+PrintFightingDojoText: ; 52a22 (14:6a22)
call EnableAutoTextBoxDrawing
ld a, $36
jp PrintPredefTextID
@@ -46207,7 +46207,7 @@
TX_FAR _FightingDojoText
db "@"
-Func_52a2f: ; 52a2f (14:6a2f)
+PrintIndigoPlateauHQText: ; 52a2f (14:6a2f)
ld a, [$c109]
cp $4
ret nz
@@ -48058,9 +48058,9 @@
ld [hl], a
ret
-Func_5db79: ; 5db79 (17:5b79)
+PrintRedsNESText: ; 5db79 (17:5b79)
call EnableAutoTextBoxDrawing
- ld a, $4
+ ld a, $4 ; RedBedroomSNESText
jp PrintPredefTextID
RedBedroomSNESText: ; 5db81 (17:5b81)
@@ -48067,14 +48067,15 @@
TX_FAR _RedBedroomSNESText
db "@"
-Func_5db86: ; 5db86 (17:5b86)
+OpenRedsPC: ; 5db86 (17:5b86)
call EnableAutoTextBoxDrawing
ld a, $3
jp PrintPredefTextID
-Route15UpstairsLeftBinoculars: ; 5db8e (17:5b8e)
- db $fc
-Func_5db8f: ; 5db8f (17:5b8f)
+RedBedroomPC: ; 5db8e (17:5b8e)
+ db $fc ; FuncTX_ItemStoragePC
+
+Route15GateLeftBinoculars: ; 5db8f (17:5b8f)
ld a, [$c109]
cp $4 ; i
ret nz
@@ -48147,7 +48148,7 @@
ld [$ffb0], a
ret
-Func_5dc1a: ; 5dc1a (17:5c1a)
+PrintBlackboardLinkCableText: ; 5dc1a (17:5c1a)
call EnableAutoTextBoxDrawing
ld a, $1
ld [$cc3c], a
@@ -48366,7 +48367,7 @@
TX_FAR _ViridianBlackboardFrozenText
db "@"
-Func_5ddef: ; 5ddef (17:5def)
+PrintTrashText: ; 5ddef (17:5def)
call EnableAutoTextBoxDrawing
ld a, $26
jp PrintPredefTextID
@@ -48903,7 +48904,7 @@
TX_FAR _GymStatueText2
db "@"
-Func_6245d: ; 6245d (18:645d)
+PrintBenchGuyText: ; 6245d (18:645d)
call EnableAutoTextBoxDrawing
ld hl, PokeCenterMapIDList
ld a, [W_CURMAP]
@@ -48966,16 +48967,16 @@
TX_FAR _RockTunnelPokecenterGuyText
db "@"
-UnnamedText_624c1: ; 624c1 (18:64c1)
- TX_FAR _UnnamedText_624c1
+UnusedBenchGuyText1: ; 624c1 (18:64c1)
+ TX_FAR _UnusedBenchGuyText1
db "@"
-UnnamedText_624c6: ; 624c6 (18:64c6)
- TX_FAR _UnnamedText_624c6
+UnusedBenchGuyText2: ; 624c6 (18:64c6)
+ TX_FAR _UnusedBenchGuyText2
db "@"
-UnnamedText_624cb: ; 624cb (18:64cb)
- TX_FAR _UnnamedText_624cb
+UnusedBenchGuyText3: ; 624cb (18:64cb)
+ TX_FAR _UnusedBenchGuyText3
db "@"
VermilionCityPokecenterBenchGuyText: ; 624d0 (18:64d0)
@@ -49022,9 +49023,9 @@
TerminatorText_62508: ; 62508 (18:6508)
db "@"
-Func_62509: ; 6509 (18:6509)
+PrintBookcaseText: ; 6509 (18:6509)
call EnableAutoTextBoxDrawing
- ld a, $e
+ ld a, $e ; BookcaseText
jp PrintPredefTextID
BookcaseText: ; 62511 (18:6511)
@@ -49031,7 +49032,7 @@
TX_FAR _BookcaseText
db "@"
-Func_62516: ; 62516 (18:6516)
+OpenPokemonCenterPC: ; 62516 (18:6516)
ld a, [$c109]
cp $4 ; check to see if player is facing up
ret nz
@@ -49038,11 +49039,11 @@
call EnableAutoTextBoxDrawing
ld a, $1
ld [$cf0c], a
- ld a, $1f
+ ld a, $1f ; PredefText1f
jp PrintPredefTextID
PredefText1f: ; 62529 (18:6529)
- db $F9
+ db $F9 ; FuncTX_PokemonCenterPC
SECTION "bank19",ROMX,BANK[$19]
--- a/menu/pc.asm
+++ b/menu/pc.asm
@@ -534,7 +534,7 @@
TX_FAR _MonWasReleasedText
db "@"
-Func_21825:: ; 5824 (8:5825)
+PrintJustAMomentText1:: ; 5824 (8:5825)
ld a, [$ffaa]
cp $1
ret z
@@ -552,7 +552,7 @@
ld a, $22
jp PrintPredefTextID
-Func_21845:: ; 5845 (8:5845)
+PrintJustAMomentText2:: ; 5845 (8:5845)
ld a, [$ffaa]
cp $2
ret z
@@ -582,5 +582,5 @@
jp PrintPredefTextID
PredefText23:: ; 21878 (8:5878)
- db $FD
+ db $FD ; FuncTX_BillsPC
--- a/scripts/mansion1.asm
+++ b/scripts/mansion1.asm
@@ -47,7 +47,7 @@
call Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
ret
-Func_44316: ; 44316 (11:4316)
+Mansion1Script_Switches: ; 44316 (11:4316)
ld a, [$c109]
cp $4
ret nz
--- a/scripts/mansion2.asm
+++ b/scripts/mansion2.asm
@@ -43,7 +43,7 @@
ld a, $17
jp Predef ; indirect jump to Func_ee9e (ee9e (3:6e9e))
-Mansion2Script_52037: ; 52037 (14:6037)
+Mansion2Script_Switches: ; 52037 (14:6037)
ld a, [$c109]
cp $4
ret nz
--- a/scripts/mansion3.asm
+++ b/scripts/mansion3.asm
@@ -73,7 +73,7 @@
set 4, [hl]
ret
-Func_5227a: ; 5227a (14:627a)
+Mansion3Script_Switches: ; 5227a (14:627a)
ld a, [$c109]
cp $4
ret nz
--- a/scripts/mansion4.asm
+++ b/scripts/mansion4.asm
@@ -44,7 +44,7 @@
call Mansion2Script_5202f
ret
-Func_52420: ; 52420 (14:6420)
+Mansion4Script_Switches: ; 52420 (14:6420)
ld a, [$c109]
cp $4
ret nz
--- a/text.asm
+++ b/text.asm
@@ -438,17 +438,17 @@
cont "LAVENDER TOWN!"
done
-_UnnamedText_624c1:: ; 88426 (22:4426)
+_UnusedBenchGuyText1:: ; 88426 (22:4426)
text "I wish I could"
line "catch #MON."
done
-_UnnamedText_624c6:: ; 88442 (22:4442)
+_UnusedBenchGuyText2:: ; 88442 (22:4442)
text "I'm tired from"
line "all the fun..."
done
-_UnnamedText_624cb:: ; 88460 (22:4460)
+_UnusedBenchGuyText3:: ; 88460 (22:4460)
text "SILPH's manager"
line "is hiding in the"
cont "SAFARI ZONE."
@@ -787,12 +787,12 @@
line "#MON LEAGUE!"
prompt
-_UnnamedText_52a10:: ; 88ec1 (22:4ec1)
+_FightingDojoText_52a10:: ; 88ec1 (22:4ec1)
text "Enemies on every"
line "side!"
done
-_UnnamedText_52a1d:: ; 88ed9 (22:4ed9)
+_FightingDojoText_52a1d:: ; 88ed9 (22:4ed9)
text "What goes around"
line "comes around!"
done