diff options
Diffstat (limited to 'engine/menu')
| -rwxr-xr-x | engine/menu/league_pc.asm | 17 | ||||
| -rwxr-xr-x | engine/menu/vending_machine.asm | 32 |
2 files changed, 25 insertions, 24 deletions
diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index 5b8ae7f0..21ee30b0 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -1,4 +1,4 @@ -PKMNLeaguePC: ; 0x7657e +PKMNLeaguePC: ; 75dfe (1d:5dfe) ld hl, AccessedHoFPCText call PrintText ld hl, wd730 @@ -10,7 +10,7 @@ PKMNLeaguePC: ; 0x7657e push af xor a ld [hTilesetType], a - ld [W_SPRITEFLIPPED], a + ld [wSpriteFlipped], a ld [wUpdateSpritesEnabled], a ld [wHoFTeamIndex2], a ld [wHoFTeamNo], a @@ -50,7 +50,7 @@ PKMNLeaguePC: ; 0x7657e call RunDefaultPaletteCommand jp GBPalNormal -LeaguePCShowTeam: ; 765e5 (1d:65e5) +LeaguePCShowTeam: ; 75e65 (1d:5e65) ld c, PARTY_LENGTH .loop push bc @@ -77,7 +77,7 @@ LeaguePCShowTeam: ; 765e5 (1d:65e5) scf ret -LeaguePCShowMon: ; 76610 (1d:6610) +LeaguePCShowMon: ; 75e90 (1d:5e90) call GBPalWhiteOutWithDelay3 call ClearScreen ld hl, wHallOfFame @@ -100,8 +100,7 @@ LeaguePCShowMon: ; 76610 (1d:6610) call LoadFrontSpriteByMonIndex call GBPalNormal coord hl, 0, 13 - ld b, 2 - ld c, $12 + lb bc, 2, 18 call TextBoxBorder coord hl, 1, 15 ld de, HallOfFameNoText @@ -110,11 +109,11 @@ LeaguePCShowMon: ; 76610 (1d:6610) ld de, wHoFTeamNo lb bc, 1, 3 call PrintNumber - jpba HoFDisplayMonInfo + jpba Func_7033f -HallOfFameNoText: ; 76670 (1d:6670) +HallOfFameNoText: ; 75eef (1d:5eef) db "HALL OF FAME No @" -AccessedHoFPCText: ; 76683 (1d:6683) +AccessedHoFPCText: ; 75f02 (1d:5f02) TX_FAR _AccessedHoFPCText db "@" diff --git a/engine/menu/vending_machine.asm b/engine/menu/vending_machine.asm index 8460889f..74a6aadb 100755 --- a/engine/menu/vending_machine.asm +++ b/engine/menu/vending_machine.asm @@ -1,4 +1,4 @@ -VendingMachineMenu: ; 74ee0 (1d:4ee0) +VendingMachineMenu: ; 74726 (1d:4726) ld hl, VendingMachineText1 call PrintText ld a, MONEY_BOX @@ -18,8 +18,7 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0) ld hl, wd730 set 6, [hl] coord hl, 0, 3 - ld b, 8 - ld c, 12 + lb bc, 8, 12 call TextBoxBorder call UpdateSprites coord hl, 2, 5 @@ -80,38 +79,38 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0) ld hl, VendingMachineText7 jp PrintText -VendingMachineText1: ; 74f99 (1d:4f99) +VendingMachineText1: ; 747de (1d:47de) TX_FAR _VendingMachineText1 db "@" -DrinkText: ; 74f9e (1d:4f9e) +DrinkText: ; 747e3 (1d:47e3) db "FRESH WATER" next "SODA POP" next "LEMONADE" next "CANCEL@" -DrinkPriceText: ; 74fc3 (1d:4fc3) +DrinkPriceText: ; 74808 (1d:4808) db "¥200" next "¥300" next "¥350",$4E,"@" -VendingMachineText4: ; 74fd3 (1d:4fd3) +VendingMachineText4: ; 74818 (1d:4818) TX_FAR _VendingMachineText4 db "@" -VendingMachineText5: ; 74fd8 (1d:4fd8) +VendingMachineText5: ; 7481d (1d:481d) TX_FAR _VendingMachineText5 db "@" -VendingMachineText6: ; 74fdd (1d:4fdd) +VendingMachineText6: ; 74822 (1d:4822) TX_FAR _VendingMachineText6 db "@" -VendingMachineText7: ; 74fe2 (1d:4fe2) +VendingMachineText7: ; 74827 (1d:4827) TX_FAR _VendingMachineText7 db "@" -LoadVendingMachineItem: ; 74fe7 (1d:4fe7) +LoadVendingMachineItem: ; 7482c (1d:482c) ld hl, VendingPrices ld a, [wCurrentMenuItem] add a @@ -129,7 +128,10 @@ LoadVendingMachineItem: ; 74fe7 (1d:4fe7) ld [hVendingMachinePrice + 2], a ret -VendingPrices: ; 75000 (1d:5000) - db FRESH_WATER,$00,$02,$00 - db SODA_POP, $00,$03,$00 - db LEMONADE, $00,$03,$50 +VendingPrices: ; 74845 (1d:4845) + db FRESH_WATER + money 200 + db SODA_POP + money 300 + db LEMONADE + money 350 |