Remove even more address comments

That should be all of them this time
This commit is contained in:
mid-kid
2018-06-25 02:10:37 +02:00
parent 0cbe04da44
commit 5efce10789
698 changed files with 2243 additions and 4185 deletions

View File

@@ -201,23 +201,20 @@ BuySell_DisplaySubtotal:
call WaitBGMap
ret
TossItem_MenuHeader: ; 0x250ed
TossItem_MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 15, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw ret_25097
db 0 ; default option
; 0x250f5
BuyItem_MenuHeader: ; 0x250f5
BuyItem_MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw DisplayPurchasePrice
db -1 ; default option
; 0x250fd
SellItem_MenuHeader: ; 0x250fd
SellItem_MenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 15, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1
dw DisplaySellingPrice
db 0 ; default option
; 0x25105

View File

@@ -1064,43 +1064,37 @@ LevelBallMultiplier:
; These two texts were carried over from gen 1.
; They are not used in gen 2, and are dummied out.
Text_RBY_CatchMarowak: ; 0xedab
Text_RBY_CatchMarowak:
; It dodged the thrown BALL! This #MON can't be caught!
text_jump UnknownText_0x1c5a5a
db "@"
; 0xedb0
Text_RBY_NoShake: ; 0xedb0
Text_RBY_NoShake:
; You missed the #MON!
text_jump UnknownText_0x1c5a90
db "@"
; 0xedb5
Text_NoShake: ; 0xedb5
Text_NoShake:
; Oh no! The #MON broke free!
text_jump UnknownText_0x1c5aa6
db "@"
; 0xedba
Text_OneShake: ; 0xedba
Text_OneShake:
; Aww! It appeared to be caught!
text_jump UnknownText_0x1c5ac3
db "@"
; 0xedbf
Text_TwoShakes: ; 0xedbf
Text_TwoShakes:
; Aargh! Almost had it!
text_jump UnknownText_0x1c5ae3
db "@"
; 0xedc4
Text_ThreeShakes: ; 0xedc4
Text_ThreeShakes:
; Shoot! It was so close too!
text_jump UnknownText_0x1c5afa
db "@"
; 0xedc9
Text_GotchaMonWasCaught: ; 0xedc9
Text_GotchaMonWasCaught:
; Gotcha! @ was caught!@ @
text_jump UnknownText_0x1c5b17
start_asm
@@ -1115,29 +1109,25 @@ Text_GotchaMonWasCaught: ; 0xedc9
ld hl, TextJump_Waitbutton
ret
TextJump_Waitbutton: ; 0xede6
TextJump_Waitbutton:
; @
text_jump Text_Waitbutton_2
db "@"
; 0xedeb
Text_SentToBillsPC: ; 0xedeb
Text_SentToBillsPC:
; was sent to BILL's PC.
text_jump UnknownText_0x1c5b38
db "@"
; 0xedf0
Text_AddedToPokedex: ; 0xedf0
Text_AddedToPokedex:
; 's data was newly added to the #DEX.@ @
text_jump UnknownText_0x1c5b53
db "@"
; 0xedf5
Text_AskNicknameNewlyCaughtMon: ; 0xedf5
Text_AskNicknameNewlyCaughtMon:
; Give a nickname to @ ?
text_jump UnknownText_0x1c5b7f
db "@"
; 0xedfa
ReturnToBattle_UseBall:
farcall _ReturnToBattle_UseBall
@@ -1251,11 +1241,10 @@ RareCandy_StatBooster_ExitMenu:
jp ClearPalettes
Text_StatRose: ; 0xeea6
Text_StatRose:
; 's @ rose.
text_jump UnknownText_0x1c5b9a
db "@"
; 0xeeab
StatStrings:
@@ -1309,7 +1298,6 @@ RareCandy_StatBooster_GetParameters:
ld hl, wPartyMonNicknames
call GetNick
ret
; 0xef14
RareCandyEffect:
@@ -2097,11 +2085,10 @@ Softboiled_MilkDrinkFunction:
pop bc
jr .loop
.Text_CantBeUsed: ; 0xf44a
.Text_CantBeUsed:
; That can't be used on this #MON.
text_jump UnknownText_0x1c5bac
db "@"
; 0xf44f
EscapeRopeEffect:
@@ -2137,11 +2124,10 @@ UseRepel:
jp UseItemText
TextJump_RepelUsedEarlierIsStillInEffect: ; 0xf47d
TextJump_RepelUsedEarlierIsStillInEffect:
; The REPEL used earlier is still in effect.
text_jump Text_RepelUsedEarlierIsStillInEffect
db "@"
; 0xf482
XAccuracyEffect:
@@ -2287,19 +2273,17 @@ PokeFluteEffect:
ret
.CatchyTune: ; 0xf56c
.CatchyTune:
; Played the # FLUTE. Now, that's a catchy tune!
text_jump UnknownText_0x1c5bf9
db "@"
; 0xf571
.AllSleepingMonWokeUp: ; 0xf571
.AllSleepingMonWokeUp:
; All sleeping #MON woke up.
text_jump UnknownText_0x1c5c28
db "@"
; 0xf576
.PlayedTheFlute: ; 0xf576
.PlayedTheFlute:
; played the # FLUTE.@ @
text_jump UnknownText_0x1c5c44
start_asm
@@ -2587,35 +2571,30 @@ RestorePP:
xor a
ret
TextJump_RaiseThePPOfWhichMove: ; 0xf725
TextJump_RaiseThePPOfWhichMove:
; Raise the PP of which move?
text_jump Text_RaiseThePPOfWhichMove
db "@"
; 0xf72a
TextJump_RestoreThePPOfWhichMove: ; 0xf72a
TextJump_RestoreThePPOfWhichMove:
; Restore the PP of which move?
text_jump Text_RestoreThePPOfWhichMove
db "@"
; 0xf72f
TextJump_PPIsMaxedOut: ; 0xf72f
TextJump_PPIsMaxedOut:
; 's PP is maxed out.
text_jump Text_PPIsMaxedOut
db "@"
; 0xf734
TextJump_PPsIncreased: ; 0xf734
TextJump_PPsIncreased:
; 's PP increased.
text_jump Text_PPsIncreased
db "@"
; 0xf739
UnknownText_0xf739: ; 0xf739
UnknownText_0xf739:
; PP was restored.
text_jump UnknownText_0x1c5cf1
db "@"
; 0xf73e
SquirtbottleEffect:
@@ -2656,11 +2635,10 @@ OpenBox:
jp UseDisposableItem
.text ; 0xf778
.text
; There was a trophy inside!
text_jump UnknownText_0x1c5d03
db "@"
; 0xf77d
NoEffect:
jp IsntTheTimeMessage
@@ -2753,83 +2731,70 @@ CantUseItemMessage:
ld [wItemEffectSucceeded], a
jp PrintText
LooksBitterText: ; 0xf80b
LooksBitterText:
; It looks bitter…
text_jump UnknownText_0x1c5d3e
db "@"
; 0xf810
CantUseOnEggText: ; 0xf810
CantUseOnEggText:
; That can't be used on an EGG.
text_jump UnknownText_0x1c5d50
db "@"
; 0xf815
IsntTheTimeText: ; 0xf815
IsntTheTimeText:
; OAK: ! This isn't the time to use that!
text_jump UnknownText_0x1c5d6e
db "@"
; 0xf81a
BelongsToSomeoneElseText: ; 0xf81a
BelongsToSomeoneElseText:
; That belongs to someone else!
text_jump UnknownText_0x1c5d97
db "@"
; 0xf81f
WontHaveAnyEffectText: ; 0xf81f
WontHaveAnyEffectText:
; It won't have any effect.
text_jump UnknownText_0x1c5db6
db "@"
; 0xf824
BlockedTheBallText: ; 0xf824
BlockedTheBallText:
; The trainer blocked the BALL!
text_jump UnknownText_0x1c5dd0
db "@"
; 0xf829
DontBeAThiefText: ; 0xf829
DontBeAThiefText:
; Don't be a thief!
text_jump UnknownText_0x1c5def
db "@"
; 0xf82e
CyclingIsntAllowedText: ; 0xf82e
CyclingIsntAllowedText:
; Cycling isn't allowed here.
text_jump UnknownText_0x1c5e01
db "@"
; 0xf833
CantGetOnYourBikeText: ; 0xf833
CantGetOnYourBikeText:
; Can't get on your @ now.
text_jump UnknownText_0x1c5e1d
db "@"
; 0xf838
Ball_BoxIsFullText: ; 0xf838
Ball_BoxIsFullText:
; The #MON BOX is full. That can't be used now.
text_jump UnknownText_0x1c5e3a
db "@"
; 0xf83d
UsedItemText: ; 0xf83d
UsedItemText:
; used the@ .
text_jump UnknownText_0x1c5e68
db "@"
; 0xf842
GotOnTheItemText: ; 0xf842
GotOnTheItemText:
; got on the@ .
text_jump UnknownText_0x1c5e7b
db "@"
; 0xf847
GotOffTheItemText: ; 0xf847
GotOffTheItemText:
; got off@ the @ .
text_jump UnknownText_0x1c5e90
db "@"
; 0xf84c
ApplyPPUp:

View File

@@ -572,26 +572,23 @@ RooftopSaleAskPurchaseQuantity:
ret
Text_Mart_HowMany: ; 0x15e0e
Text_Mart_HowMany:
; How many?
text_jump UnknownText_0x1c4bfd
db "@"
; 0x15e13
Text_Mart_CostsThisMuch: ; 0x15e13
Text_Mart_CostsThisMuch:
; @ (S) will be ¥@ .
text_jump UnknownText_0x1c4c08
db "@"
; 0x15e18
MenuHeader_Buy: ; 0x15e18
MenuHeader_Buy:
db MENU_BACKUP_TILES ; flags
menu_coords 1, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
; 0x15e20
.MenuData ; 0x15e20
.MenuData
db SCROLLINGMENU_DISPLAY_ARROWS | SCROLLINGMENU_ENABLE_FUNCTION3 ; flags
db 4, 8 ; rows, columns
db 1 ; horizontal spacing
@@ -618,131 +615,110 @@ MenuHeader_Buy: ; 0x15e18
call PrintBCDNumber
ret
Text_HerbShop_Intro: ; 0x15e4a
Text_HerbShop_Intro:
; Hello, dear. I sell inexpensive herbal medicine. They're good, but a trifle bitter. Your #MON may not like them. Hehehehe…
text_jump UnknownText_0x1c4c28
db "@"
; 0x15e4f
Text_HerbShop_HowMany: ; 0x15e4f
Text_HerbShop_HowMany:
; How many?
text_jump UnknownText_0x1c4ca3
db "@"
; 0x15e54
Text_HerbShop_CostsThisMuch: ; 0x15e54
Text_HerbShop_CostsThisMuch:
; @ (S) will be ¥@ .
text_jump UnknownText_0x1c4cae
db "@"
; 0x15e59
Text_HerbShop_HereYouGo: ; 0x15e59
Text_HerbShop_HereYouGo:
; Thank you, dear. Hehehehe…
text_jump UnknownText_0x1c4cce
db "@"
; 0x15e5e
Text_HerbShop_BagFull: ; 0x15e5e
Text_HerbShop_BagFull:
; Oh? Your PACK is full, dear.
text_jump UnknownText_0x1c4cea
db "@"
; 0x15e63
Text_HerbShop_InsufficientFunds: ; 0x15e63
Text_HerbShop_InsufficientFunds:
; Hehehe… You don't have the money.
text_jump UnknownText_0x1c4d08
db "@"
; 0x15e68
Text_HerbShop_ComeAgain: ; 0x15e68
Text_HerbShop_ComeAgain:
; Come again, dear. Hehehehe…
text_jump UnknownText_0x1c4d2a
db "@"
; 0x15e6d
Text_BargainShop_Intro: ; 0x15e6d
Text_BargainShop_Intro:
; Hiya! Care to see some bargains? I sell rare items that nobody else carries--but only one of each item.
text_jump UnknownText_0x1c4d47
db "@"
; 0x15e72
Text_BargainShop_CostsThisMuch: ; 0x15e72
Text_BargainShop_CostsThisMuch:
; costs ¥@ . Want it?
text_jump UnknownText_0x1c4db0
db "@"
; 0x15e77
Text_BargainShop_HereYouGo: ; 0x15e77
Text_BargainShop_HereYouGo:
; Thanks.
text_jump UnknownText_0x1c4dcd
db "@"
; 0x15e7c
Text_BargainShop_BagFull: ; 0x15e7c
Text_BargainShop_BagFull:
; Uh-oh, your PACK is chock-full.
text_jump UnknownText_0x1c4dd6
db "@"
; 0x15e81
Text_BargainShop_SoldOut: ; 0x15e81
Text_BargainShop_SoldOut:
; You bought that already. I'm all sold out of it.
text_jump UnknownText_0x1c4df7
db "@"
; 0x15e86
Text_BargainShop_InsufficientFunds: ; 0x15e86
Text_BargainShop_InsufficientFunds:
; Uh-oh, you're short on funds.
text_jump UnknownText_0x1c4e28
db "@"
; 0x15e8b
Text_BargainShop_ComeAgain: ; 0x15e8b
Text_BargainShop_ComeAgain:
; Come by again sometime.
text_jump UnknownText_0x1c4e46
db "@"
; 0x15e90
Text_Pharmacist_Intro: ; 0x15e90
Text_Pharmacist_Intro:
; What's up? Need some medicine?
text_jump UnknownText_0x1c4e5f
db "@"
; 0x15e95
Text_Pharmacy_HowMany: ; 0x15e95
Text_Pharmacy_HowMany:
; How many?
text_jump UnknownText_0x1c4e7e
db "@"
; 0x15e9a
Text_Pharmacy_CostsThisMuch: ; 0x15e9a
Text_Pharmacy_CostsThisMuch:
; @ (S) will cost ¥@ .
text_jump UnknownText_0x1c4e89
db "@"
; 0x15e9f
Text_Pharmacy_HereYouGo: ; 0x15e9f
Text_Pharmacy_HereYouGo:
; Thanks much!
text_jump UnknownText_0x1c4eab
db "@"
; 0x15ea4
Text_Pharmacy_BagFull: ; 0x15ea4
Text_Pharmacy_BagFull:
; You don't have any more space.
text_jump UnknownText_0x1c4eb9
db "@"
; 0x15ea9
Text_Pharmacy_InsufficientFunds: ; 0x15ea9
Text_Pharmacy_InsufficientFunds:
; Huh? That's not enough money.
text_jump UnknownText_0x1c4ed8
db "@"
; 0x15eae
Text_Pharmacist_ComeAgain: ; 0x15eae
Text_Pharmacist_ComeAgain:
; All right. See you around.
text_jump UnknownText_0x1c4ef6
db "@"
; 0x15eb3
SellMenu:
@@ -767,11 +743,10 @@ SellMenu:
and a
ret
.NothingToSellText: ; 0x15edb
.NothingToSellText:
; You don't have anything to sell.
text_jump UnknownText_0x1c4f12
db "@"
; 0x15ee0
.TryToSellItem:
@@ -839,81 +814,69 @@ SellMenu:
and a
ret
Text_Mart_SellHowMany: ; 0x15f73
Text_Mart_SellHowMany:
; How many?
text_jump UnknownText_0x1c4f33
db "@"
; 0x15f78
Text_Mart_ICanPayThisMuch: ; 0x15f78
Text_Mart_ICanPayThisMuch:
; I can pay you ¥@ . Is that OK?
text_jump UnknownText_0x1c4f3e
db "@"
; 0x15f7d
.UnusedString15f7d:
db "!ダミー!@"
Text_Mart_HowMayIHelpYou: ; 0x15f83
Text_Mart_HowMayIHelpYou:
; Welcome! How may I help you?
text_jump UnknownText_0x1c4f62
db "@"
; 0x15f88
MenuHeader_BuySell: ; 0x15f88
MenuHeader_BuySell:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 7, 8
dw .MenuData
db 1 ; default option
; 0x15f90
.MenuData ; 0x15f90
.MenuData
db STATICMENU_CURSOR ; strings
db 3 ; items
db "BUY@"
db "SELL@"
db "QUIT@"
; 0x15f96
Text_Mart_HereYouGo: ; 0x15fa0
Text_Mart_HereYouGo:
; Here you are. Thank you!
text_jump UnknownText_0x1c4f80
db "@"
; 0x15fa5
Text_Mart_InsufficientFunds: ; 0x15fa5
Text_Mart_InsufficientFunds:
; You don't have enough money.
text_jump UnknownText_0x1c4f9a
db "@"
; 0x15faa
Text_Mart_BagFull: ; 0x15faa
Text_Mart_BagFull:
; You can't carry any more items.
text_jump UnknownText_0x1c4fb7
db "@"
; 0x15faf
TextMart_CantBuyFromYou: ; 0x15faf
TextMart_CantBuyFromYou:
; Sorry, I can't buy that from you.
text_jump UnknownText_0x1c4fd7
db "@"
; 0x15fb4
Text_Mart_ComeAgain: ; 0x15fb4
Text_Mart_ComeAgain:
; Please come again!
text_jump UnknownText_0x1c4ff9
db "@"
; 0x15fb9
Text_Mart_AnythingElse: ; 0x15fb9
Text_Mart_AnythingElse:
text_jump UnknownText_0x1c500d
db "@"
; 0x15fbe
Text_Mart_SoldForAmount: ; 0x15fbe
Text_Mart_SoldForAmount:
text_jump UnknownText_0x1c502e
db "@"
; 0x15fc3
PlayTransactionSound:
call WaitSFX

View File

@@ -158,39 +158,35 @@ Pack:
call Pack_GetJumptablePointer
jp hl
.MenuHeader1: ; 0x10124
.MenuHeader1:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData_1
db 1 ; default option
; 0x1012c
.MenuData_1: ; 0x1012c
.MenuData_1:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 2 ; items
db "USE@"
db "QUIT@"
; 0x10137
.Jumptable1:
dw .UseItem
dw QuitItemSubmenu
.MenuHeader2: ; 0x1013b
.MenuHeader2:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData_2
db 1 ; default option
; 0x10143
.MenuData_2: ; 0x10143
.MenuData_2:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 3 ; items
db "USE@"
db "GIVE@"
db "QUIT@"
; 0x10153
.Jumptable2:
dw .UseItem
@@ -314,14 +310,13 @@ Pack:
call Pack_GetJumptablePointer
jp hl
MenuHeader_UsableKeyItem: ; 0x10249
MenuHeader_UsableKeyItem:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
; 0x10251
.MenuData: ; 0x10251
.MenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 5 ; items
db "USE@"
@@ -329,7 +324,6 @@ MenuHeader_UsableKeyItem: ; 0x10249
db "TOSS@"
db "SEL@"
db "QUIT@"
; 0x1026a
Jumptable_UseGiveTossRegisterQuit:
dw UseItem
@@ -338,21 +332,19 @@ Jumptable_UseGiveTossRegisterQuit:
dw RegisterItem
dw QuitItemSubmenu
MenuHeader_UsableItem: ; 0x10274
MenuHeader_UsableItem:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
; 0x1027c
.MenuData: ; 0x1027c
.MenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 4 ; items
db "USE@"
db "GIVE@"
db "TOSS@"
db "QUIT@"
; 0x10291
Jumptable_UseGiveTossQuit:
dw UseItem
@@ -360,59 +352,53 @@ Jumptable_UseGiveTossQuit:
dw TossMenu
dw QuitItemSubmenu
MenuHeader_UnusableItem: ; 0x10299
MenuHeader_UnusableItem:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
; 0x102a1
.MenuData: ; 0x102a1
.MenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 2 ; items
db "USE@"
db "QUIT@"
; 0x102ac
Jumptable_UseQuit:
dw UseItem
dw QuitItemSubmenu
MenuHeader_UnusableKeyItem: ; 0x102b0
MenuHeader_UnusableKeyItem:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
; 0x102b8
.MenuData: ; 0x102b8
.MenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 3 ; items
db "USE@"
db "SEL@"
db "QUIT@"
; 0x102c7
Jumptable_UseRegisterQuit:
dw UseItem
dw RegisterItem
dw QuitItemSubmenu
MenuHeader_HoldableKeyItem: ; 0x102cd
MenuHeader_HoldableKeyItem:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 3, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
; 0x102d5
.MenuData: ; 0x102d5
.MenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 4 ; items
db "GIVE@"
db "TOSS@"
db "SEL@"
db "QUIT@"
; 0x102ea
Jumptable_GiveTossRegisterQuit:
dw GiveItem
@@ -420,20 +406,18 @@ Jumptable_GiveTossRegisterQuit:
dw RegisterItem
dw QuitItemSubmenu
MenuHeader_HoldableItem: ; 0x102f2
MenuHeader_HoldableItem:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 5, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
; 0x102fa
.MenuData: ; 0x102fa
.MenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 3 ; items
db "GIVE@"
db "TOSS@"
db "QUIT@"
; 0x1030b
Jumptable_GiveTossQuit:
dw GiveItem
@@ -633,11 +617,10 @@ GiveItem:
ld hl, TextJump_YouDontHaveAMon
call Pack_PrintTextNoScroll
ret
.Egg: ; 0x1048d
.Egg:
; An EGG can't hold an item.
text_jump Text_AnEGGCantHoldAnItem
db "@"
; 0x10492
QuitItemSubmenu:
ret
@@ -824,36 +807,32 @@ TMHMSubmenu:
call Pack_GetJumptablePointer
jp hl
.UsableMenuHeader: ; 0x10601
.UsableMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .UsableMenuData
db 1 ; default option
; 0x10609
.UsableMenuData: ; 0x10609
.UsableMenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 2 ; items
db "USE@"
db "QUIT@"
; 0x10614
.UsableJumptable:
dw .Use
dw .Quit
.UnusableMenuHeader: ; 0x10618
.UnusableMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 13, 9, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .UnusableMenuData
db 1 ; default option
; 0x10620
.UnusableMenuData: ; 0x10620
.UnusableMenuData:
db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
db 1 ; items
db "QUIT@"
; 0x10627
.UnusableJumptable:
dw .Quit
@@ -1122,14 +1101,13 @@ TutorialPack:
ld hl, .ItemsMenuHeader
jr .DisplayPocket
.ItemsMenuHeader: ; 0x107ef
.ItemsMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .ItemsMenuData
db 1 ; default option
; 0x107f7
.ItemsMenuData: ; 0x107f7
.ItemsMenuData:
db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
db 5, 8 ; rows, columns
db 2 ; horizontal spacing
@@ -1143,14 +1121,13 @@ TutorialPack:
ld hl, .KeyItemsMenuHeader
jr .DisplayPocket
.KeyItemsMenuHeader: ; 0x1080e
.KeyItemsMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .KeyItemsMenuData
db 1 ; default option
; 0x10816
.KeyItemsMenuData: ; 0x10816
.KeyItemsMenuData:
db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
db 5, 8 ; rows, columns
db 1 ; horizontal spacing
@@ -1173,14 +1150,13 @@ TutorialPack:
ld hl, .BallsMenuHeader
jr .DisplayPocket
.BallsMenuHeader: ; 0x10842
.BallsMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .BallsMenuData
db 1 ; default option
; 0x1084a
.BallsMenuData: ; 0x1084a
.BallsMenuData:
db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
db 5, 8 ; rows, columns
db 2 ; horizontal spacing
@@ -1486,14 +1462,13 @@ Pack_InitColors:
call DelayFrame
ret
ItemsPocketMenuHeader: ; 0x10a4f
ItemsPocketMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
; 0x10a57
.MenuData: ; 0x10a57
.MenuData:
db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
db 5, 8 ; rows, columns
db 2 ; horizontal spacing
@@ -1502,14 +1477,13 @@ ItemsPocketMenuHeader: ; 0x10a4f
dba PlaceMenuItemQuantity
dba UpdateItemDescription
PC_Mart_ItemsPocketMenuHeader: ; 0x10a67
PC_Mart_ItemsPocketMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
; 0x10a6f
.MenuData: ; 0x10a6f
.MenuData:
db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags
db 5, 8 ; rows, columns
db 2 ; horizontal spacing
@@ -1518,14 +1492,13 @@ PC_Mart_ItemsPocketMenuHeader: ; 0x10a67
dba PlaceMenuItemQuantity
dba UpdateItemDescription
KeyItemsPocketMenuHeader: ; 0x10a7f
KeyItemsPocketMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
; 0x10a87
.MenuData: ; 0x10a87
.MenuData:
db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
db 5, 8 ; rows, columns
db 1 ; horizontal spacing
@@ -1534,14 +1507,13 @@ KeyItemsPocketMenuHeader: ; 0x10a7f
dba PlaceMenuItemQuantity
dba UpdateItemDescription
PC_Mart_KeyItemsPocketMenuHeader: ; 0x10a97
PC_Mart_KeyItemsPocketMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
; 0x10a9f
.MenuData: ; 0x10a9f
.MenuData:
db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags
db 5, 8 ; rows, columns
db 1 ; horizontal spacing
@@ -1550,14 +1522,13 @@ PC_Mart_KeyItemsPocketMenuHeader: ; 0x10a97
dba PlaceMenuItemQuantity
dba UpdateItemDescription
BallsPocketMenuHeader: ; 0x10aaf
BallsPocketMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
; 0x10ab7
.MenuData: ; 0x10ab7
.MenuData:
db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP | STATICMENU_CURSOR ; flags
db 5, 8 ; rows, columns
db 2 ; horizontal spacing
@@ -1566,14 +1537,13 @@ BallsPocketMenuHeader: ; 0x10aaf
dba PlaceMenuItemQuantity
dba UpdateItemDescription
PC_Mart_BallsPocketMenuHeader: ; 0x10ac7
PC_Mart_BallsPocketMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 7, 1, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
dw .MenuData
db 1 ; default option
; 0x10acf
.MenuData: ; 0x10acf
.MenuData:
db STATICMENU_ENABLE_SELECT | STATICMENU_ENABLE_LEFT_RIGHT | STATICMENU_ENABLE_START | STATICMENU_WRAP ; flags
db 5, 8 ; rows, columns
db 2 ; horizontal spacing
@@ -1582,72 +1552,61 @@ PC_Mart_BallsPocketMenuHeader: ; 0x10ac7
dba PlaceMenuItemQuantity
dba UpdateItemDescription
Text_PackNoItems: ; 0x10adf
Text_PackNoItems:
; No items.
text_jump UnknownText_0x1c0b9a
db "@"
; 0x10ae4
Text_ThrowAwayHowMany: ; 0x10ae4
Text_ThrowAwayHowMany:
; Throw away how many?
text_jump UnknownText_0x1c0ba5
db "@"
; 0x10ae9
Text_ConfirmThrowAway: ; 0x10ae9
Text_ConfirmThrowAway:
; Throw away @ @ (S)?
text_jump UnknownText_0x1c0bbb
db "@"
; 0x10aee
Text_ThrewAway: ; 0x10aee
Text_ThrewAway:
; Threw away @ (S).
text_jump UnknownText_0x1c0bd8
db "@"
; 0x10af3
Text_ThisIsntTheTime: ; 0x10af3
Text_ThisIsntTheTime:
; OAK: ! This isn't the time to use that!
text_jump UnknownText_0x1c0bee
db "@"
; 0x10af8
TextJump_YouDontHaveAMon: ; 0x10af8
TextJump_YouDontHaveAMon:
; You don't have a #MON!
text_jump Text_YouDontHaveAMon
db "@"
; 0x10afd
Text_RegisteredItem: ; 0x10afd
Text_RegisteredItem:
; Registered the @ .
text_jump UnknownText_0x1c0c2e
db "@"
; 0x10b02
Text_CantRegister: ; 0x10b02
Text_CantRegister:
; You can't register that item.
text_jump UnknownText_0x1c0c45
db "@"
; 0x10b07
Text_MoveItemWhere: ; 0x10b07
Text_MoveItemWhere:
; Where should this be moved to?
text_jump UnknownText_0x1c0c63
db "@"
; 0x10b0c
Text_PackEmptyString: ; 0x10b0c
Text_PackEmptyString:
;
text_jump UnknownText_0x1c0c83
db "@"
; 0x10b11
TextJump_YouCantUseItInABattle: ; 0x10b11
TextJump_YouCantUseItInABattle:
; Doesn't seem to be used anywhere
; "You can't use it in a battle."
text_jump Text_YouCantUseItInABattle
db "@"
; 0x10b16
PackMenuGFX:
INCBIN "gfx/pack/pack_menu.2bpp"

View File

@@ -1,4 +1,4 @@
PrintItemDescription: ; 0x1c8955
PrintItemDescription:
; Print the description for item [wCurSpecies] at de.
ld a, [wCurSpecies]
@@ -28,4 +28,3 @@ PrintItemDescription: ; 0x1c8955
ld d, [hl]
pop hl
jp PlaceString
; 0x1c8987

View File

@@ -166,29 +166,25 @@ TeachTMHM:
scf
ret
Text_BootedTM: ; 0x2c8bf
Text_BootedTM:
; Booted up a TM.
text_jump UnknownText_0x1c0373
db "@"
; 0x2c8c4
Text_BootedHM: ; 0x2c8c4
Text_BootedHM:
; Booted up an HM.
text_jump UnknownText_0x1c0384
db "@"
; 0x2c8c9
Text_ItContained: ; 0x2c8c9
Text_ItContained:
; It contained @ . Teach @ to a #MON?
text_jump UnknownText_0x1c0396
db "@"
; 0x2c8ce
Text_TMHMNotCompatible: ; 0x2c8ce
Text_TMHMNotCompatible:
; is not compatible with @ . It can't learn @ .
text_jump UnknownText_0x1c03c2
db "@"
; 0x2c8d3
TMHM_PocketLoop:
xor a
@@ -501,17 +497,15 @@ Unreferenced_Function2cadf:
.print
jp PrintText
.NoRoomText: ; 0x2caf0
.NoRoomText:
; You have no room for any more @ S.
text_jump UnknownText_0x1c03fa
db "@"
; 0x2caf5
.ReceivedText: ; 0x2caf5
.ReceivedText:
; You received @ !
text_jump UnknownText_0x1c0421
db "@"
; 0x2cafa
.CheckHaveRoomForTMHM:
ld a, [wd265]

View File

@@ -1,4 +1,4 @@
UpdateItemDescription: ; 0x244c3
UpdateItemDescription:
ld a, [wMenuSelection]
ld [wCurSpecies], a
hlcoord 0, 12