diff options
| author | xCrystal <rgr.crystal@gmail.com> | 2017-12-28 13:15:46 +0100 |
|---|---|---|
| committer | xCrystal <rgr.crystal@gmail.com> | 2017-12-28 13:15:46 +0100 |
| commit | 9457679af8d36a140db7b8832df595e8310e6bb4 (patch) | |
| tree | d3bf8b1b424582f66add4f2b8d95f409cfafecb2 /engine/intro_menu.asm | |
| parent | e2b378f5e32ea1416fbc9ac5e96d23be244e4a6b (diff) | |
Prefix engine_flags wram addresses with w
Diffstat (limited to 'engine/intro_menu.asm')
| -rwxr-xr-x | engine/intro_menu.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 77d1af6f9..94deb1112 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 @@ -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 |