diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-22 15:40:43 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-01-22 15:40:43 -0500 |
| commit | 3a7f518de4bbced15cbf5bb877a988055de7d063 (patch) | |
| tree | af3a8725138870cd9c3db4eaa29c56fb1422754c /mobile | |
| parent | 4d8528f90329e2ddfac16046ad8bf309ec1887f2 (diff) | |
wStatusFlags/2 bit constants
Diffstat (limited to 'mobile')
| -rw-r--r-- | mobile/mobile_40.asm | 12 | ||||
| -rwxr-xr-x | mobile/mobile_46.asm | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/mobile/mobile_40.asm b/mobile/mobile_40.asm index 48751e4fa..0a04453a0 100644 --- a/mobile/mobile_40.asm +++ b/mobile/mobile_40.asm @@ -7894,7 +7894,7 @@ Function1036f9: ; 1036f9 Function103700: ; 103700 ld c, $0a ld hl, wSwarmFlags - bit 4, [hl] + bit SWARMFLAGS_MOBILE_4_F, [hl] jr z, .asm_10370f farcall Function1008a6 @@ -7991,18 +7991,18 @@ Special_Function103780: ; 103780 Function10378c: ; 10378c ld c, 0 ld hl, wSwarmFlags - bit 4, [hl] + bit SWARMFLAGS_MOBILE_4_F, [hl] jr nz, .already_set - ld c, $01 + ld c, 1 ld hl, wSwarmFlags - set 4, [hl] + set SWARMFLAGS_MOBILE_4_F, [hl] .already_set push bc farcall Link_SaveGame pop bc jr c, .failed_to_save - ld a, $01 + ld a, 1 ld [ScriptVar], a ld a, c and a @@ -8017,7 +8017,7 @@ Function10378c: ; 10378c and a ret z ld hl, wSwarmFlags - res 4, [hl] + res SWARMFLAGS_MOBILE_4_F, [hl] ret ; 1037c2 diff --git a/mobile/mobile_46.asm b/mobile/mobile_46.asm index 98e896789..51ae92703 100755 --- a/mobile/mobile_46.asm +++ b/mobile/mobile_46.asm @@ -1199,15 +1199,15 @@ BattleTowerRoomMenu_PlacePickLevelMenu: ld a, $1 ld [rSVBK], a ld a, [wStatusFlags] - bit 6, a ; Hall Of Fame + bit STATUSFLAGS_HALL_OF_FAME_F, a jr nz, .asm_11896b - ld hl, Strings_Ll0ToL40 ; Address to list of strings with the choosable levels - ld a, 5 ; 4 levels to choose from, including 'Cancel'-option + ld hl, Strings_Ll0ToL40 ; Address to list of strings with the choosable levels + ld a, 5 ; 4 levels to choose from, including 'Cancel'-option jr .asm_118970 .asm_11896b - ld hl, Strings_L10ToL100 ; Address to list of strings with the choosable levels - ld a, 11 ; 10 levels to choose from, including 'Cancel'-option + ld hl, Strings_L10ToL100 ; Address to list of strings with the choosable levels + ld a, 11 ; 10 levels to choose from, including 'Cancel'-option .asm_118970 ld [wcd4a], a |