pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-09-08 08:13:02 -07:00
Code Issues Packages Projects Releases Wiki Activity

Prefix engine_flags wram addresses with w

Browse Source
This commit is contained in:
xCrystal
2017-12-28 13:15:46 +01:00
parent e2b378f5e3
commit 9457679af8
53 changed files with 270 additions and 270 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/battle_tower_5c.asm
View File

@@ -110,7 +110,7 @@ Function170139: ; 170139
ld bc, NAME_LENGTH_JAPANESE - 1
call CopyBytes
ld bc, PlayerID
ld de, PlayerGender
ld de, wPlayerGender
farcall GetMobileOTTrainerClass
ld de, wBT_OTTempPkmn1CaughtGender
ld a, c

12
mobile/mobile_12.asm
View File

@@ -84,7 +84,7 @@ InitMobileProfile: ; 4802f (12:402f)
ld a, [wd002]
bit 6, a
jr nz, .asm_48113
ld a, [PlayerGender]
ld a, [wPlayerGender]
ld hl, Strings_484fb
call GetNthString
ld d, h
@@ -298,7 +298,7 @@ asm_4828d: ; 4828d (12:428d)
ld de, String_484ff
call PlaceString
call WaitBGMap
ld a, [PlayerGender]
ld a, [wPlayerGender]
inc a
ld [wMenuCursorBuffer], a
call StaticMenuJoypad
@@ -316,11 +316,11 @@ asm_4828d: ; 4828d (12:428d)
cp $50
jr nz, .asm_482e1
ld a, $1
ld [PlayerGender], a
ld [wPlayerGender], a
jr .asm_482f1
.asm_482ed
xor a
ld [PlayerGender], a
ld [wPlayerGender], a
.asm_482f1
ld d, h
ld e, l
@@ -804,10 +804,10 @@ Function4873c: ; 4873c (12:473c)
ld a, A_BUTTON
add B_BUTTON
ld [hli], a ; joypad filter
; ld a, [PlayerGender]
; ld a, [wPlayerGender]
; xor 1
; inc a
ld a, [PlayerGender]
ld a, [wPlayerGender]
and a
jr z, .male
ld a, 2

10
mobile/mobile_22.asm
View File

@@ -25,17 +25,17 @@ OpenSRAMBank4: ; 89160
Function89168: ; 89168 (22:5168)
ld hl, GameTimerPause
ld hl, wGameTimerPause
set 7, [hl]
ret
Function8916e: ; 8916e (22:516e)
ld hl, GameTimerPause
ld hl, wGameTimerPause
res 7, [hl]
ret
Function89174: ; 89174 (22:5174)
ld hl, GameTimerPause
ld hl, wGameTimerPause
bit 7, [hl]
ret
@@ -619,7 +619,7 @@ Function89481: ; 89481
Function89492: ; 89492 (22:5492)
ld d, 0
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
ret z
inc d
@@ -1269,7 +1269,7 @@ Function897d5: ; 897d5
Function89807: ; 89807 (22:5807)
ld hl, MobileAdapterGFX + $200
ld a, [PlayerGender]
ld a, [wPlayerGender]
bit 0, a
jr z, .asm_89814
ld hl, MobileAdapterGFX + $200 + $230

16
mobile/mobile_40.asm
View File

@@ -2543,7 +2543,7 @@ Unknown_100ff3: ; 100ff3
dbwww $80, PlayerName, NAME_LENGTH, NULL
dbwww $80, PlayerID, 2, NULL
dbwww $80, wSecretID, 2, NULL
dbwww $80, PlayerGender, 1, NULL
dbwww $80, wPlayerGender, 1, NULL
dbwww $04, $a603, 8, NULL
dbwww $04, $a007, PARTYMON_STRUCT_LENGTH, NULL
db -1
@@ -2812,7 +2812,7 @@ Function1011f1: ; 1011f1
call CloseSRAM
ld hl, wdc41
res 4, [hl]
ld hl, GameTimerPause
ld hl, wGameTimerPause
bit 7, [hl]
jr z, .skip
ld hl, wdc41
@@ -4703,7 +4703,7 @@ Function101e98: ; 101e98
call ClearSprites
farcall Function8adb3
ret c
ld hl, GameTimerPause
ld hl, wGameTimerPause
set 7, [hl]
ld hl, wdc41
set 4, [hl]
@@ -4711,7 +4711,7 @@ Function101e98: ; 101e98
; 101ead
Function101ead: ; 101ead
ld hl, GameTimerPause
ld hl, wGameTimerPause
bit 7, [hl]
jr nz, .asm_101ec8
ld hl, wdc41
@@ -7896,7 +7896,7 @@ Function1036f9: ; 1036f9
Function103700: ; 103700
ld c, $0a
ld hl, SwarmFlags
ld hl, wSwarmFlags
bit 4, [hl]
jr z, .asm_10370f
farcall Function1008a6
@@ -7994,11 +7994,11 @@ Function103780: ; 103780
Function10378c: ; 10378c
ld c, 0
ld hl, SwarmFlags
ld hl, wSwarmFlags
bit 4, [hl]
jr nz, .already_set
ld c, $01
ld hl, SwarmFlags
ld hl, wSwarmFlags
set 4, [hl]
.already_set
@@ -8020,7 +8020,7 @@ Function10378c: ; 10378c
ld a, c
and a
ret z
ld hl, SwarmFlags
ld hl, wSwarmFlags
res 4, [hl]
ret
; 1037c2

22
mobile/mobile_45.asm
View File

@@ -4401,7 +4401,7 @@ Function11581e: ; 11581e
Function1158c2: ; 1158c2
ld a, e
ld [SwarmFlags], a
ld [wSwarmFlags], a
ld a, d
ld [$dc21], a
xor a
@@ -4422,7 +4422,7 @@ Function1158c2: ; 1158c2
ld l, c
ld h, b
xor a
ld [WeeklyFlags], a
ld [wWeeklyFlags], a
.asm_1158e5
ld b, $3
@@ -4447,7 +4447,7 @@ Function1158c2: ; 1158c2
push hl
dec hl
ld a, c
ld [WeeklyFlags], a
ld [wWeeklyFlags], a
.asm_115908
xor a
ld [hld], a
@@ -4468,7 +4468,7 @@ Function1158c2: ; 1158c2
ld [$dc1a], a
push de
push hl
ld hl, SwarmFlags
ld hl, wSwarmFlags
ld a, [hli]
ld h, [hl]
ld l, a
@@ -4562,7 +4562,7 @@ endr
ld a, $a
ld [hli], a
push hl
ld hl, SwarmFlags
ld hl, wSwarmFlags
ld a, [hli]
ld h, [hl]
ld l, a
@@ -4587,7 +4587,7 @@ endr
jp nz, .asm_1158e5
.asm_1159c4
ld a, [WeeklyFlags]
ld a, [wWeeklyFlags]
cp $0
jr z, .asm_1159d8
push hl
@@ -5061,9 +5061,9 @@ Function115bc8: ; 115bc8
Function115c49: ; 115c49
ld a, e
ld [WeeklyFlags], a
ld [wWeeklyFlags], a
ld a, d
ld [SwarmFlags], a
ld [wSwarmFlags], a
xor a
ld [de], a
inc de
@@ -5131,7 +5131,7 @@ endr
ld [$dc1a], a
push de
push hl
ld hl, WeeklyFlags
ld hl, wWeeklyFlags
ld a, [hli]
ld h, [hl]
ld l, a
@@ -5243,9 +5243,9 @@ Function115cfd: ; 115cfd
.asm_115d38
push de
push hl
ld a, [WeeklyFlags]
ld a, [wWeeklyFlags]
ld l, a
ld a, [SwarmFlags]
ld a, [wSwarmFlags]
ld h, a
ld e, [hl]
inc hl

2
mobile/mobile_46.asm
View File

@@ -1198,7 +1198,7 @@ BattleTowerRoomMenu_PlacePickLevelMenu:
ld [wcd4f], a
ld a, $1
ld [rSVBK], a
ld a, [StatusFlags]
ld a, [wStatusFlags]
bit 6, a ; Hall Of Fame
jr nz, .asm_11896b
ld hl, Strings_Ll0ToL40 ; Address to list of strings with the choosable levels