diff options
| author | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-20 17:40:25 -0500 |
|---|---|---|
| committer | Daniel Harding <corrnondacqb@yahoo.com> | 2015-07-20 17:40:25 -0500 |
| commit | 13e28b0ece7c7888cba792cc6f7219b384213427 (patch) | |
| tree | 4dcd58e0fe7ac33bf38817f423754dc758cb902f /engine/menu | |
| parent | 64b4cf624fe2175e2c7539b91bc41b6dae28a00e (diff) | |
| parent | db7d941d22d89cf8d6d13cbf768208c5cf2ac2c2 (diff) | |
Merge pull request #106 from YamaArashi/master
jpab/jpba macros
Diffstat (limited to 'engine/menu')
| -rwxr-xr-x | engine/menu/league_pc.asm | 4 | ||||
| -rwxr-xr-x | engine/menu/main_menu.asm | 4 | ||||
| -rwxr-xr-x | engine/menu/naming_screen.asm | 4 | ||||
| -rwxr-xr-x | engine/menu/pokedex.asm | 2 | ||||
| -rwxr-xr-x | engine/menu/prize_menu.asm | 2 |
5 files changed, 6 insertions, 10 deletions
diff --git a/engine/menu/league_pc.asm b/engine/menu/league_pc.asm index 06a7894c..1f5cf8e0 100755 --- a/engine/menu/league_pc.asm +++ b/engine/menu/league_pc.asm @@ -110,9 +110,7 @@ LeaguePCShowMon: ; 76610 (1d:6610) ld de, wHoFTeamNo ld bc, $0103 call PrintNumber - ld b, BANK(HoFDisplayMonInfo) - ld hl, HoFDisplayMonInfo - jp Bankswitch + jpba HoFDisplayMonInfo HallOfFameNoText: ; 76670 (1d:6670) db "HALL OF FAME No @" diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm index eeaa4594..3ed2f443 100755 --- a/engine/menu/main_menu.asm +++ b/engine/menu/main_menu.asm @@ -107,8 +107,8 @@ MainMenu: ; 5af2 (1:5af2) .pressedA call GBPalWhiteOutWithDelay3 call ClearScreen - ld a,4 - ld [wd52a],a + ld a,PLAYER_DIR_DOWN + ld [wPlayerDirection],a ld c,10 call DelayFrames ld a,[wNumHoFTeams] diff --git a/engine/menu/naming_screen.asm b/engine/menu/naming_screen.asm index 9a608491..6037329e 100755 --- a/engine/menu/naming_screen.asm +++ b/engine/menu/naming_screen.asm @@ -172,9 +172,7 @@ DisplayNamingScreen: ; 6596 (1:6596) ld a, [W_ISINBATTLE] and a jp z, LoadTextBoxTilePatterns - ld hl, LoadHudTilePatterns - ld b, BANK(LoadHudTilePatterns) - jp Bankswitch + jpab LoadHudTilePatterns .namingScreenButtonFunctions dw .dPadReturnPoint diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm index 4e173bc0..2f22f78e 100755 --- a/engine/menu/pokedex.asm +++ b/engine/menu/pokedex.asm @@ -379,7 +379,7 @@ IsPokemonBitSet: ; 402c2 (10:42c2) ld a,[wd11e] dec a ld c,a - ld b,2 + ld b,FLAG_TEST predef FlagActionPredef ld a,c and a diff --git a/engine/menu/prize_menu.asm b/engine/menu/prize_menu.asm index b1b751b9..f2f2a794 100755 --- a/engine/menu/prize_menu.asm +++ b/engine/menu/prize_menu.asm @@ -179,7 +179,7 @@ LoadCoinsToSubtract: ; 528b1 (14:68b1) ld hl,wd141 ; first prize's price add hl,de ; get selected prize's price xor a - ld [hCoins - 1],a + ld [hUnusedCoinsByte],a ld a,[hli] ld [hCoins],a ld a,[hl] |