diff options
Diffstat (limited to 'engine/intro_menu.asm')
| -rwxr-xr-x | engine/intro_menu.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 77d1af6f9..5e38589aa 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -193,8 +193,8 @@ _ResetWRAM: ; 5bae xor a ld [MonType], a - ld [JohtoBadges], a - ld [KantoBadges], a + ld [wJohtoBadges], a + ld [wKantoBadges], a ld [Coins], a ld [Coins + 1], a @@ -483,7 +483,7 @@ FinishContinueFunction: ; 5e5d xor a ld [wDontPlayMapMusicOnReload], a ld [wLinkMode], a - ld hl, GameTimerPause + ld hl, wGameTimerPause set 0, [hl] res 7, [hl] ld hl, wEnteredMapFromContinue @@ -540,7 +540,7 @@ Continue_LoadMenuHeader: ; 5ebf xor a ld [hBGMapMode], a ld hl, .MenuDataHeader_Dex - ld a, [StatusFlags] + ld a, [wStatusFlags] bit 0, a ; pokedex jr nz, .pokedex_header ld hl, .MenuDataHeader_NoDex @@ -631,7 +631,7 @@ Continue_UnknownGameTime: ; 5f48 Continue_DisplayBadgeCount: ; 5f58 push hl - ld hl, JohtoBadges + ld hl, wJohtoBadges ld b, 2 call CountSetBits pop hl @@ -641,7 +641,7 @@ Continue_DisplayBadgeCount: ; 5f58 ; 5f6b Continue_DisplayPokedexNumCaught: ; 5f6b - ld a, [StatusFlags] + ld a, [wStatusFlags] bit 0, a ; Pokedex ret z push hl @@ -813,7 +813,7 @@ NamePlayer: ; 0x6074 ld hl, PlayerName ld de, .Chris - ld a, [PlayerGender] + ld a, [wPlayerGender] bit 0, a jr z, .Male ld de, .Kris @@ -942,7 +942,7 @@ Intro_WipeInFrontpic: ; 6182 ; 619c Intro_PrepTrainerPic: ; 619c - ld de, VTiles2 + ld de, vTiles2 farcall GetTrainerPic xor a ld [hGraphicStartTile], a @@ -953,7 +953,7 @@ Intro_PrepTrainerPic: ; 619c ; 61b4 ShrinkFrame: ; 61b4 - ld de, VTiles2 + ld de, vTiles2 ld c, $31 predef DecompressPredef xor a @@ -968,7 +968,7 @@ Intro_PlacePlayerSprite: ; 61cd farcall GetPlayerIcon ld c, $c - ld hl, VTiles0 + ld hl, vTiles0 call Request2bpp ld hl, Sprites @@ -989,7 +989,7 @@ Intro_PlacePlayerSprite: ; 61cd ld [hli], a ld b, 0 - ld a, [PlayerGender] + ld a, [wPlayerGender] bit 0, a jr z, .male ld b, 1 @@ -1376,7 +1376,7 @@ Copyright: ; 63e2 call ClearTileMap call LoadFontsExtra ld de, CopyrightGFX - ld hl, VTiles2 tile $60 + ld hl, vTiles2 tile $60 lb bc, BANK(CopyrightGFX), $1d call Request2bpp hlcoord 2, 7 @@ -1405,9 +1405,9 @@ GameInit:: ; 642e call ClearWindowData call ClearBGPalettes call ClearTileMap - ld a, HIGH(VBGMap0) + ld a, HIGH(vBGMap0) ld [hBGMapAddress + 1], a - xor a ; LOW(VBGMap0) + xor a ; LOW(vBGMap0) ld [hBGMapAddress], a ld [hJoyDown], a ld [hSCX], a |