pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #562 from Rangi42/master

Browse Source 
Curr → Cur
This commit is contained in:
Rangi 2018-09-09 17:41:58 -04:00 committed by GitHub
commit 8c435054a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 316 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
constants/wram_constants.asm
View File

@ -1,7 +1,7 @@
; wInputType:: ; c2c7 ; wInputType:: ; c2c7
AUTO_INPUT EQU $ff AUTO_INPUT EQU $ff
; wCurrentDexMode:: ; c7d4 ; wCurDexMode:: ; c7d4
const_def const_def
const DEXMODE_NEW const DEXMODE_NEW
const DEXMODE_OLD const DEXMODE_OLD

2
engine/events/celebi.asm
View File

@ -32,7 +32,7 @@ CelebiShrineEvent:
inc d inc d
push de push de
ld a, 36 * SPRITEOAMSTRUCT_LENGTH ld a, 36 * SPRITEOAMSTRUCT_LENGTH
ld [wCurrSpriteOAMAddr], a ld [wCurSpriteOAMAddr], a
farcall DoNextFrameForAllSprites farcall DoNextFrameForAllSprites
call CelebiEvent_CountDown call CelebiEvent_CountDown
ld c, 2 ld c, 2

6
engine/events/checkforhiddenitems.asm
View File

@ -10,15 +10,15 @@ CheckForHiddenItems:
add SCREEN_HEIGHT / 4 add SCREEN_HEIGHT / 4
ld [wBuffer3], a ld [wBuffer3], a
; Get the pointer for the first bg_event in the map... ; Get the pointer for the first bg_event in the map...
ld hl, wCurrMapBGEventsPointer ld hl, wCurMapBGEventsPointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
; ... before even checking to see if there are any BG events on this map. ; ... before even checking to see if there are any BG events on this map.
ld a, [wCurrMapBGEventCount] ld a, [wCurMapBGEventCount]
and a and a
jr z, .nobgeventitems jr z, .nobgeventitems
; For i = 1:wCurrMapBGEventCount... ; For i = 1:wCurMapBGEventCount...
.loop .loop
; Store the counter in wBuffer2, and store the bg_event pointer in the stack. ; Store the counter in wBuffer2, and store the bg_event pointer in the stack.
ld [wBuffer2], a ld [wBuffer2], a

10
engine/events/field_moves.asm
View File

@ -38,7 +38,7 @@ ShakeHeadbuttTree:
add hl, bc add hl, bc
ld [hl], FIELDMOVE_TREE ld [hl], FIELDMOVE_TREE
ld a, 36 * SPRITEOAMSTRUCT_LENGTH ld a, 36 * SPRITEOAMSTRUCT_LENGTH
ld [wCurrSpriteOAMAddr], a ld [wCurSpriteOAMAddr], a
farcall DoNextFrameForAllSprites farcall DoNextFrameForAllSprites
call HideHeadbuttTree call HideHeadbuttTree
ld a, 32 ld a, 32
@ -53,7 +53,7 @@ ShakeHeadbuttTree:
jr z, .done jr z, .done
dec [hl] dec [hl]
ld a, 36 * SPRITEOAMSTRUCT_LENGTH ld a, 36 * SPRITEOAMSTRUCT_LENGTH
ld [wCurrSpriteOAMAddr], a ld [wCurSpriteOAMAddr], a
farcall DoNextFrameForAllSprites farcall DoNextFrameForAllSprites
call DelayFrame call DelayFrame
jr .loop jr .loop
@ -126,7 +126,7 @@ OWCutAnimation:
bit 7, a bit 7, a
jr nz, .finish jr nz, .finish
ld a, 36 * SPRITEOAMSTRUCT_LENGTH ld a, 36 * SPRITEOAMSTRUCT_LENGTH
ld [wCurrSpriteOAMAddr], a ld [wCurSpriteOAMAddr], a
callfar DoNextFrameForAllSprites callfar DoNextFrameForAllSprites
call OWCutJumptable call OWCutJumptable
call DelayFrame call DelayFrame
@ -328,7 +328,7 @@ FlyFromAnim:
bit 7, a bit 7, a
jr nz, .exit jr nz, .exit
ld a, 0 * SPRITEOAMSTRUCT_LENGTH ld a, 0 * SPRITEOAMSTRUCT_LENGTH
ld [wCurrSpriteOAMAddr], a ld [wCurSpriteOAMAddr], a
callfar DoNextFrameForAllSprites callfar DoNextFrameForAllSprites
call FlyFunction_FrameTimer call FlyFunction_FrameTimer
call DelayFrame call DelayFrame
@ -365,7 +365,7 @@ FlyToAnim:
bit 7, a bit 7, a
jr nz, .exit jr nz, .exit
ld a, 0 * SPRITEOAMSTRUCT_LENGTH ld a, 0 * SPRITEOAMSTRUCT_LENGTH
ld [wCurrSpriteOAMAddr], a ld [wCurSpriteOAMAddr], a
callfar DoNextFrameForAllSprites callfar DoNextFrameForAllSprites
call FlyFunction_FrameTimer call FlyFunction_FrameTimer
call DelayFrame call DelayFrame

18
engine/events/map_name_sign.asm
View File

@ -13,7 +13,7 @@ ReturnFromMapSetupScript::
ld a, [wMapNumber] ld a, [wMapNumber]
ld c, a ld c, a
call GetWorldMapLocation call GetWorldMapLocation
ld [wCurrentLandmark], a ld [wCurLandmark], a
call .CheckNationalParkGate call .CheckNationalParkGate
jr z, .nationalparkgate jr z, .nationalparkgate
@ -23,7 +23,7 @@ ReturnFromMapSetupScript::
.nationalparkgate .nationalparkgate
ld a, -1 ld a, -1
ld [wCurrentLandmark], a ld [wCurLandmark], a
.not_gate .not_gate
ld hl, wEnteredMapFromContinue ld hl, wEnteredMapFromContinue
@ -33,8 +33,8 @@ ReturnFromMapSetupScript::
call .CheckMovingWithinLandmark call .CheckMovingWithinLandmark
jr z, .dont_do_map_sign jr z, .dont_do_map_sign
ld a, [wCurrentLandmark] ld a, [wCurLandmark]
ld [wPreviousLandmark], a ld [wPrevLandmark], a
call .CheckSpecialMap call .CheckSpecialMap
jr z, .dont_do_map_sign jr z, .dont_do_map_sign
@ -48,8 +48,8 @@ ReturnFromMapSetupScript::
ret ret
.dont_do_map_sign .dont_do_map_sign
ld a, [wCurrentLandmark] ld a, [wCurLandmark]
ld [wPreviousLandmark], a ld [wPrevLandmark], a
ld a, $90 ld a, $90
ldh [rWY], a ldh [rWY], a
ldh [hWY], a ldh [hWY], a
@ -58,9 +58,9 @@ ReturnFromMapSetupScript::
ret ret
.CheckMovingWithinLandmark: .CheckMovingWithinLandmark:
ld a, [wCurrentLandmark] ld a, [wCurLandmark]
ld c, a ld c, a
ld a, [wPreviousLandmark] ld a, [wPrevLandmark]
cp c cp c
ret z ret z
cp SPECIAL_MAP cp SPECIAL_MAP
@ -140,7 +140,7 @@ InitMapNameFrame:
ret ret
PlaceMapNameCenterAlign: PlaceMapNameCenterAlign:
ld a, [wCurrentLandmark] ld a, [wCurLandmark]
ld e, a ld e, a
farcall GetLandmarkName farcall GetLandmarkName
call .GetNameLength call .GetNameLength

2
engine/events/mom_phone.asm
View File

@ -38,7 +38,7 @@ MomTriesToBuySomething::
inc [hl] inc [hl]
.ok .ok
ld a, PHONE_MOM ld a, PHONE_MOM
ld [wCurrentCaller], a ld [wCurCaller], a
ld bc, wEngineBuffer2 ld bc, wEngineBuffer2
ld hl, 0 ld hl, 0
add hl, bc add hl, bc

40
engine/games/slot_machine.asm
View File

@ -182,7 +182,7 @@ SlotsLoop:
call SlotsJumptable call SlotsJumptable
call Slots_SpinReels call Slots_SpinReels
xor a xor a
ld [wCurrSpriteOAMAddr], a ld [wCurSpriteOAMAddr], a
callfar DoNextFrameForFirst16Sprites callfar DoNextFrameForFirst16Sprites
call .PrintCoinsAndPayout call .PrintCoinsAndPayout
call .Stubbed_Function927d3 call .Stubbed_Function927d3
@ -778,9 +778,9 @@ Slots_UpdateReelPositionAndOAM:
ld hl, REEL_X_COORD ld hl, REEL_X_COORD
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
ld [wCurrReelXCoord], a ld [wCurReelXCoord], a
ld a, 10 * 8 ld a, 10 * 8
ld [wCurrReelYCoord], a ld [wCurReelYCoord], a
ld hl, REEL_POSITION ld hl, REEL_POSITION
add hl, bc add hl, bc
ld e, [hl] ld e, [hl]
@ -813,9 +813,9 @@ Slots_UpdateReelPositionAndOAM:
ld h, [hl] ld h, [hl]
ld l, a ld l, a
.loop .loop
ld a, [wCurrReelYCoord] ld a, [wCurReelYCoord]
ld [hli], a ; y ld [hli], a ; y
ld a, [wCurrReelXCoord] ld a, [wCurReelXCoord]
ld [hli], a ; x ld [hli], a ; x
ld a, [de] ld a, [de]
ld [hli], a ; tile id ld [hli], a ; tile id
@ -824,9 +824,9 @@ Slots_UpdateReelPositionAndOAM:
set OAM_PRIORITY, a set OAM_PRIORITY, a
ld [hli], a ; attributes ld [hli], a ; attributes
ld a, [wCurrReelYCoord] ld a, [wCurReelYCoord]
ld [hli], a ; y ld [hli], a ; y
ld a, [wCurrReelXCoord] ld a, [wCurReelXCoord]
add 1 * TILE_WIDTH add 1 * TILE_WIDTH
ld [hli], a ; x ld [hli], a ; x
ld a, [de] ld a, [de]
@ -838,9 +838,9 @@ Slots_UpdateReelPositionAndOAM:
set OAM_PRIORITY, a set OAM_PRIORITY, a
ld [hli], a ; attributes ld [hli], a ; attributes
inc de inc de
ld a, [wCurrReelYCoord] ld a, [wCurReelYCoord]
sub 2 * TILE_WIDTH sub 2 * TILE_WIDTH
ld [wCurrReelYCoord], a ld [wCurReelYCoord], a
cp 2 * TILE_WIDTH cp 2 * TILE_WIDTH
jr nz, .loop jr nz, .loop
ret ret
@ -1412,35 +1412,35 @@ Slots_CheckMatchedFirstTwoReels:
ret ret
.CheckBottomRow: .CheckBottomRow:
ld hl, wCurrReelStopped ld hl, wCurReelStopped
ld a, [wReel1Stopped] ld a, [wReel1Stopped]
cp [hl] cp [hl]
call z, .StoreResult call z, .StoreResult
ret ret
.CheckUpwardsDiag: .CheckUpwardsDiag:
ld hl, wCurrReelStopped + 1 ld hl, wCurReelStopped + 1
ld a, [wReel1Stopped] ld a, [wReel1Stopped]
cp [hl] cp [hl]
call z, .StoreResult call z, .StoreResult
ret ret
.CheckMiddleRow: .CheckMiddleRow:
ld hl, wCurrReelStopped + 1 ld hl, wCurReelStopped + 1
ld a, [wReel1Stopped + 1] ld a, [wReel1Stopped + 1]
cp [hl] cp [hl]
call z, .StoreResult call z, .StoreResult
ret ret
.CheckDownwardsDiag: .CheckDownwardsDiag:
ld hl, wCurrReelStopped + 1 ld hl, wCurReelStopped + 1
ld a, [wReel1Stopped + 2] ld a, [wReel1Stopped + 2]
cp [hl] cp [hl]
call z, .StoreResult call z, .StoreResult
ret ret
.CheckTopRow: .CheckTopRow:
ld hl, wCurrReelStopped + 2 ld hl, wCurReelStopped + 2
ld a, [wReel1Stopped + 2] ld a, [wReel1Stopped + 2]
cp [hl] cp [hl]
call z, .StoreResult call z, .StoreResult
@ -1509,7 +1509,7 @@ Slots_CheckMatchedAllThreeReels:
ret ret
.CheckBottomRow: .CheckBottomRow:
ld hl, wCurrReelStopped ld hl, wCurReelStopped
ld a, [wReel1Stopped] ld a, [wReel1Stopped]
cp [hl] cp [hl]
ret nz ret nz
@ -1519,7 +1519,7 @@ Slots_CheckMatchedAllThreeReels:
ret ret
.CheckUpwardsDiag: .CheckUpwardsDiag:
ld hl, wCurrReelStopped + 2 ld hl, wCurReelStopped + 2
ld a, [wReel1Stopped] ld a, [wReel1Stopped]
cp [hl] cp [hl]
ret nz ret nz
@ -1529,7 +1529,7 @@ Slots_CheckMatchedAllThreeReels:
ret ret
.CheckMiddleRow: .CheckMiddleRow:
ld hl, wCurrReelStopped + 1 ld hl, wCurReelStopped + 1
ld a, [wReel1Stopped + 1] ld a, [wReel1Stopped + 1]
cp [hl] cp [hl]
ret nz ret nz
@ -1539,7 +1539,7 @@ Slots_CheckMatchedAllThreeReels:
ret ret
.CheckDownwardsDiag: .CheckDownwardsDiag:
ld hl, wCurrReelStopped ld hl, wCurReelStopped
ld a, [wReel1Stopped + 2] ld a, [wReel1Stopped + 2]
cp [hl] cp [hl]
ret nz ret nz
@ -1549,7 +1549,7 @@ Slots_CheckMatchedAllThreeReels:
ret ret
.CheckTopRow: .CheckTopRow:
ld hl, wCurrReelStopped + 2 ld hl, wCurReelStopped + 2
ld a, [wReel1Stopped + 2] ld a, [wReel1Stopped + 2]
cp [hl] cp [hl]
ret nz ret nz
@ -1563,7 +1563,7 @@ Slots_CheckMatchedAllThreeReels:
ret ret
Slots_CopyReelState: Slots_CopyReelState:
ld de, wCurrReelStopped ld de, wCurReelStopped
ld a, [hli] ld a, [hli]
ld [de], a ld [de], a
inc de inc de

56
engine/gfx/sprites.asm
View File

@ -22,7 +22,7 @@ PlaySpriteAnimations:
push af push af
ld a, LOW(wVirtualOAM) ld a, LOW(wVirtualOAM)
ld [wCurrSpriteOAMAddr], a ld [wCurSpriteOAMAddr], a
call DoNextFrameForAllSprites call DoNextFrameForAllSprites
pop af pop af
@ -55,11 +55,11 @@ DoNextFrameForAllSprites:
dec e dec e
jr nz, .loop jr nz, .loop
ld a, [wCurrSpriteOAMAddr] ld a, [wCurSpriteOAMAddr]
ld l, a ld l, a
ld h, HIGH(wVirtualOAM) ld h, HIGH(wVirtualOAM)
.loop2 ; Clear (wVirtualOAM + [wCurrSpriteOAMAddr] --> wVirtualOAMEnd) .loop2 ; Clear (wVirtualOAM + [wCurSpriteOAMAddr] --> wVirtualOAMEnd)
ld a, l ld a, l
cp LOW(wVirtualOAMEnd) cp LOW(wVirtualOAMEnd)
jr nc, .done jr nc, .done
@ -94,11 +94,11 @@ DoNextFrameForFirst16Sprites:
dec e dec e
jr nz, .loop jr nz, .loop
ld a, [wCurrSpriteOAMAddr] ld a, [wCurSpriteOAMAddr]
ld l, a ld l, a
ld h, HIGH(wVirtualOAMSprite16) ld h, HIGH(wVirtualOAMSprite16)
.loop2 ; Clear (wVirtualOAM + [wCurrSpriteOAMAddr] --> Sprites + $40) .loop2 ; Clear (wVirtualOAM + [wCurSpriteOAMAddr] --> Sprites + $40)
ld a, l ld a, l
cp LOW(wVirtualOAMSprite16) cp LOW(wVirtualOAMSprite16)
jr nc, .done jr nc, .done
@ -233,27 +233,27 @@ UpdateAnimFrame:
cp -4 cp -4
jr z, .delete jr z, .delete
call GetFrameOAMPointer call GetFrameOAMPointer
; add byte to [wCurrAnimVTile] ; add byte to [wCurAnimVTile]
ld a, [wCurrAnimVTile] ld a, [wCurAnimVTile]
add [hl] add [hl]
ld [wCurrAnimVTile], a ld [wCurAnimVTile], a
inc hl inc hl
; load pointer into hl ; load pointer into hl
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
push bc push bc
ld a, [wCurrSpriteOAMAddr] ld a, [wCurSpriteOAMAddr]
ld e, a ld e, a
ld d, HIGH(wVirtualOAM) ld d, HIGH(wVirtualOAM)
ld a, [hli] ld a, [hli]
ld c, a ; number of objects ld c, a ; number of objects
.loop .loop
; first byte: y (px) ; first byte: y (px)
; [de] = [wCurrAnimYCoord] + [wCurrAnimYOffset] + [wGlobalAnimYOffset] + AddOrSubtractY([hl]) ; [de] = [wCurAnimYCoord] + [wCurAnimYOffset] + [wGlobalAnimYOffset] + AddOrSubtractY([hl])
ld a, [wCurrAnimYCoord] ld a, [wCurAnimYCoord]
ld b, a ld b, a
ld a, [wCurrAnimYOffset] ld a, [wCurAnimYOffset]
add b add b
ld b, a ld b, a
ld a, [wGlobalAnimYOffset] ld a, [wGlobalAnimYOffset]
@ -265,10 +265,10 @@ UpdateAnimFrame:
inc hl inc hl
inc de inc de
; second byte: x (px) ; second byte: x (px)
; [de] = [wCurrAnimXCoord] + [wCurrAnimXOffset] + [wGlobalAnimXOffset] + AddOrSubtractX([hl]) ; [de] = [wCurAnimXCoord] + [wCurAnimXOffset] + [wGlobalAnimXOffset] + AddOrSubtractX([hl])
ld a, [wCurrAnimXCoord] ld a, [wCurAnimXCoord]
ld b, a ld b, a
ld a, [wCurrAnimXOffset] ld a, [wCurAnimXOffset]
add b add b
ld b, a ld b, a
ld a, [wGlobalAnimXOffset] ld a, [wGlobalAnimXOffset]
@ -280,8 +280,8 @@ UpdateAnimFrame:
inc hl inc hl
inc de inc de
; third byte: vtile ; third byte: vtile
; [de] = [wCurrAnimVTile] + [hl] ; [de] = [wCurAnimVTile] + [hl]
ld a, [wCurrAnimVTile] ld a, [wCurAnimVTile]
add [hl] add [hl]
ld [de], a ld [de], a
inc hl inc hl
@ -293,7 +293,7 @@ UpdateAnimFrame:
inc hl inc hl
inc de inc de
ld a, e ld a, e
ld [wCurrSpriteOAMAddr], a ld [wCurSpriteOAMAddr], a
cp LOW(wVirtualOAMEnd) cp LOW(wVirtualOAMEnd)
jr nc, .reached_the_end jr nc, .reached_the_end
dec c dec c
@ -315,7 +315,7 @@ UpdateAnimFrame:
AddOrSubtractY: AddOrSubtractY:
push hl push hl
ld a, [hl] ld a, [hl]
ld hl, wCurrSpriteAddSubFlags ld hl, wCurSpriteAddSubFlags
bit 6, [hl] bit 6, [hl]
jr z, .ok jr z, .ok
; 8 - a ; 8 - a
@ -330,7 +330,7 @@ AddOrSubtractY:
AddOrSubtractX: AddOrSubtractX:
push hl push hl
ld a, [hl] ld a, [hl]
ld hl, wCurrSpriteAddSubFlags ld hl, wCurSpriteAddSubFlags
bit 5, [hl] ; x flip bit 5, [hl] ; x flip
jr z, .ok jr z, .ok
; 8 - a ; 8 - a
@ -343,7 +343,7 @@ AddOrSubtractX:
ret ret
GetSpriteOAMAttr: GetSpriteOAMAttr:
ld a, [wCurrSpriteAddSubFlags] ld a, [wCurSpriteAddSubFlags]
ld b, a ld b, a
ld a, [hl] ld a, [hl]
xor b xor b
@ -356,19 +356,19 @@ GetSpriteOAMAttr:
InitSpriteAnimBuffer: InitSpriteAnimBuffer:
xor a xor a
ld [wCurrSpriteAddSubFlags], a ld [wCurSpriteAddSubFlags], a
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld a, [hli] ld a, [hli]
ld [wCurrAnimVTile], a ld [wCurAnimVTile], a
ld a, [hli] ld a, [hli]
ld [wCurrAnimXCoord], a ld [wCurAnimXCoord], a
ld a, [hli] ld a, [hli]
ld [wCurrAnimYCoord], a ld [wCurAnimYCoord], a
ld a, [hli] ld a, [hli]
ld [wCurrAnimXOffset], a ld [wCurAnimXOffset], a
ld a, [hli] ld a, [hli]
ld [wCurrAnimYOffset], a ld [wCurAnimYOffset], a
ret ret
GetSpriteAnimVTile: GetSpriteAnimVTile:
@ -448,7 +448,7 @@ GetSpriteAnimFrame:
ld a, [hl] ld a, [hl]
and $c0 and $c0
srl a srl a
ld [wCurrSpriteAddSubFlags], a ld [wCurSpriteAddSubFlags], a
pop af pop af
ret ret

34
engine/items/pack.asm
View File

@ -26,7 +26,7 @@ Pack:
jr .loop jr .loop
.done .done
ld a, [wCurrPocket] ld a, [wCurPocket]
ld [wLastPocket], a ld [wLastPocket], a
ld hl, wOptions ld hl, wOptions
res NO_TEXT_SCROLL, [hl] res NO_TEXT_SCROLL, [hl]
@ -63,7 +63,7 @@ Pack:
.InitItemsPocket: .InitItemsPocket:
xor a ; ITEM_POCKET xor a ; ITEM_POCKET
ld [wCurrPocket], a ld [wCurPocket], a
call ClearPocketList call ClearPocketList
call DrawPocketName call DrawPocketName
call WaitBGMap_DrawPackGFX call WaitBGMap_DrawPackGFX
@ -91,7 +91,7 @@ Pack:
.InitKeyItemsPocket: .InitKeyItemsPocket:
ld a, KEY_ITEM_POCKET ld a, KEY_ITEM_POCKET
ld [wCurrPocket], a ld [wCurPocket], a
call ClearPocketList call ClearPocketList
call DrawPocketName call DrawPocketName
call WaitBGMap_DrawPackGFX call WaitBGMap_DrawPackGFX
@ -119,7 +119,7 @@ Pack:
.InitTMHMPocket: .InitTMHMPocket:
ld a, TM_HM_POCKET ld a, TM_HM_POCKET
ld [wCurrPocket], a ld [wCurPocket], a
call ClearPocketList call ClearPocketList
call DrawPocketName call DrawPocketName
xor a xor a
@ -213,7 +213,7 @@ Pack:
.InitBallsPocket: .InitBallsPocket:
ld a, BALL_POCKET ld a, BALL_POCKET
ld [wCurrPocket], a ld [wCurPocket], a
call ClearPocketList call ClearPocketList
call DrawPocketName call DrawPocketName
call WaitBGMap_DrawPackGFX call WaitBGMap_DrawPackGFX
@ -500,7 +500,7 @@ TossMenu:
ret ret
Unreferenced_ResetPocketCursorPositions: Unreferenced_ResetPocketCursorPositions:
ld a, [wCurrPocket] ld a, [wCurPocket]
and a ; ITEM_POCKET and a ; ITEM_POCKET
jr z, .items jr z, .items
dec a ; BALL_POCKET dec a ; BALL_POCKET
@ -532,7 +532,7 @@ RegisterItem:
ld a, [wItemAttributeParamBuffer] ld a, [wItemAttributeParamBuffer]
and a and a
jr nz, .cant_register jr nz, .cant_register
ld a, [wCurrPocket] ld a, [wCurPocket]
rrca rrca
rrca rrca
and REGISTERED_POCKET and REGISTERED_POCKET
@ -636,7 +636,7 @@ BattlePack:
jr .loop jr .loop
.end .end
ld a, [wCurrPocket] ld a, [wCurPocket]
ld [wLastPocket], a ld [wLastPocket], a
ld hl, wOptions ld hl, wOptions
res NO_TEXT_SCROLL, [hl] res NO_TEXT_SCROLL, [hl]
@ -673,7 +673,7 @@ BattlePack:
.InitItemsPocket: .InitItemsPocket:
xor a ; ITEM_POCKET xor a ; ITEM_POCKET
ld [wCurrPocket], a ld [wCurPocket], a
call ClearPocketList call ClearPocketList
call DrawPocketName call DrawPocketName
call WaitBGMap_DrawPackGFX call WaitBGMap_DrawPackGFX
@ -701,7 +701,7 @@ BattlePack:
.InitKeyItemsPocket: .InitKeyItemsPocket:
ld a, KEY_ITEM_POCKET ld a, KEY_ITEM_POCKET
ld [wCurrPocket], a ld [wCurPocket], a
call ClearPocketList call ClearPocketList
call DrawPocketName call DrawPocketName
call WaitBGMap_DrawPackGFX call WaitBGMap_DrawPackGFX
@ -729,7 +729,7 @@ BattlePack:
.InitTMHMPocket: .InitTMHMPocket:
ld a, TM_HM_POCKET ld a, TM_HM_POCKET
ld [wCurrPocket], a ld [wCurPocket], a
call ClearPocketList call ClearPocketList
call DrawPocketName call DrawPocketName
xor a xor a
@ -752,7 +752,7 @@ BattlePack:
.InitBallsPocket: .InitBallsPocket:
ld a, BALL_POCKET ld a, BALL_POCKET
ld [wCurrPocket], a ld [wCurPocket], a
call ClearPocketList call ClearPocketList
call DrawPocketName call DrawPocketName
call WaitBGMap_DrawPackGFX call WaitBGMap_DrawPackGFX
@ -903,7 +903,7 @@ InitPackBuffers:
; pocket id -> jumptable index ; pocket id -> jumptable index
ld a, [wLastPocket] ld a, [wLastPocket]
maskbits NUM_POCKETS maskbits NUM_POCKETS
ld [wCurrPocket], a ld [wCurPocket], a
inc a inc a
add a add a
dec a dec a
@ -919,7 +919,7 @@ DepositSellInitPackBuffers:
ldh [hBGMapMode], a ldh [hBGMapMode], a
ld [wJumptableIndex], a ; PACKSTATE_INITGFX ld [wJumptableIndex], a ; PACKSTATE_INITGFX
ld [wPackJumptableIndex], a ; PACKSTATE_INITGFX ld [wPackJumptableIndex], a ; PACKSTATE_INITGFX
ld [wCurrPocket], a ; ITEM_POCKET ld [wCurPocket], a ; ITEM_POCKET
ld [wPackUsedItem], a ld [wPackUsedItem], a
ld [wSwitchItem], a ld [wSwitchItem], a
call Pack_InitGFX call Pack_InitGFX
@ -1004,7 +1004,7 @@ DepositSellPack:
ret ret
InitPocket: InitPocket:
ld [wCurrPocket], a ld [wCurPocket], a
call ClearPocketList call ClearPocketList
call DrawPocketName call DrawPocketName
call WaitBGMap_DrawPackGFX call WaitBGMap_DrawPackGFX
@ -1209,7 +1209,7 @@ Pack_PrintTextNoScroll:
WaitBGMap_DrawPackGFX: WaitBGMap_DrawPackGFX:
call WaitBGMap call WaitBGMap
DrawPackGFX: DrawPackGFX:
ld a, [wCurrPocket] ld a, [wCurPocket]
maskbits NUM_POCKETS maskbits NUM_POCKETS
ld e, a ld e, a
ld d, 0 ld d, 0
@ -1381,7 +1381,7 @@ PlacePackGFX:
ret ret
DrawPocketName: DrawPocketName:
ld a, [wCurrPocket] ld a, [wCurPocket]
; * 15 ; * 15
ld d, a ld d, a
swap a swap a

8
engine/math/math.asm
View File

@ -4,7 +4,7 @@ _Multiply::
ld b, a ld b, a
xor a xor a
ldh [hProduct], a ldh [hMultiplicand - 1], a
ldh [hMathBuffer + 1], a ldh [hMathBuffer + 1], a
ldh [hMathBuffer + 2], a ldh [hMathBuffer + 2], a
ldh [hMathBuffer + 3], a ldh [hMathBuffer + 3], a
@ -36,7 +36,7 @@ _Multiply::
ldh a, [hMathBuffer + 1] ldh a, [hMathBuffer + 1]
ld c, a ld c, a
ldh a, [hProduct] ldh a, [hMultiplicand - 1]
adc c adc c
ldh [hMathBuffer + 1], a ldh [hMathBuffer + 1], a
@ -58,9 +58,9 @@ _Multiply::
rla rla
ldh [hMultiplicand + 0], a ldh [hMultiplicand + 0], a
ldh a, [hProduct] ldh a, [hMultiplicand - 1]
rla rla
ldh [hProduct], a ldh [hMultiplicand - 1], a
jr .loop jr .loop

2
engine/menus/intro_menu.asm
View File

@ -67,7 +67,7 @@ NewGame:
call OakSpeech call OakSpeech
call InitializeWorld call InitializeWorld
ld a, 1 ld a, 1
ld [wPreviousLandmark], a ld [wPrevLandmark], a
ld a, SPAWN_HOME ld a, SPAWN_HOME
ld [wDefaultSpawnpoint], a ld [wDefaultSpawnpoint], a

24
engine/menus/naming_screen.asm
View File

@ -672,7 +672,7 @@ NamingScreen_TryAddCharacter:
MailComposition_TryAddCharacter: MailComposition_TryAddCharacter:
ld a, [wNamingScreenMaxNameLength] ld a, [wNamingScreenMaxNameLength]
ld c, a ld c, a
ld a, [wNamingScreenCurrNameLength] ld a, [wNamingScreenCurNameLength]
cp c cp c
ret nc ret nc
@ -683,7 +683,7 @@ NamingScreen_LoadNextCharacter:
ld [hl], a ld [hl], a
NamingScreen_AdvanceCursor_CheckEndOfString: NamingScreen_AdvanceCursor_CheckEndOfString:
ld hl, wNamingScreenCurrNameLength ld hl, wNamingScreenCurNameLength
inc [hl] inc [hl]
call NamingScreen_GetTextCursorPosition call NamingScreen_GetTextCursorPosition
ld a, [hl] ld a, [hl]
@ -698,11 +698,11 @@ NamingScreen_AdvanceCursor_CheckEndOfString:
ret ret
; unused ; unused
ld a, [wNamingScreenCurrNameLength] ld a, [wNamingScreenCurNameLength]
and a and a
ret z ret z
push hl push hl
ld hl, wNamingScreenCurrNameLength ld hl, wNamingScreenCurNameLength
dec [hl] dec [hl]
call NamingScreen_GetTextCursorPosition call NamingScreen_GetTextCursorPosition
ld c, [hl] ld c, [hl]
@ -724,7 +724,7 @@ NamingScreen_AdvanceCursor_CheckEndOfString:
INCLUDE "data/text/unused_dakutens.asm" INCLUDE "data/text/unused_dakutens.asm"
NamingScreen_DeleteCharacter: NamingScreen_DeleteCharacter:
ld hl, wNamingScreenCurrNameLength ld hl, wNamingScreenCurNameLength
ld a, [hl] ld a, [hl]
and a and a
ret z ret z
@ -744,7 +744,7 @@ NamingScreen_GetTextCursorPosition:
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld a, [wNamingScreenCurrNameLength] ld a, [wNamingScreenCurNameLength]
ld e, a ld e, a
ld d, 0 ld d, 0
add hl, de add hl, de
@ -874,7 +874,7 @@ LoadNamingScreenGFX:
ld [wJumptableIndex], a ld [wJumptableIndex], a
ld [wNamingScreenLetterCase], a ld [wNamingScreenLetterCase], a
ldh [hBGMapMode], a ldh [hBGMapMode], a
ld [wNamingScreenCurrNameLength], a ld [wNamingScreenCurNameLength], a
ld a, $7 ld a, $7
ldh [hWX], a ldh [hWX], a
ret ret
@ -1109,7 +1109,7 @@ INCBIN "gfx/icons/mail_big.2bpp"
call NamingScreen_GetLastCharacter call NamingScreen_GetLastCharacter
call MailComposition_TryAddLastCharacter call MailComposition_TryAddLastCharacter
jr c, .start jr c, .start
ld hl, wNamingScreenCurrNameLength ld hl, wNamingScreenCurNameLength
ld a, [hl] ld a, [hl]
cp MAIL_LINE_LENGTH cp MAIL_LINE_LENGTH
ret nz ret nz
@ -1135,7 +1135,7 @@ INCBIN "gfx/icons/mail_big.2bpp"
.b .b
call NamingScreen_DeleteCharacter call NamingScreen_DeleteCharacter
ld hl, wNamingScreenCurrNameLength ld hl, wNamingScreenCurNameLength
ld a, [hl] ld a, [hl]
cp MAIL_LINE_LENGTH cp MAIL_LINE_LENGTH
ret nz ret nz
@ -1350,20 +1350,20 @@ MailComposition_TryAddLastCharacter:
jp MailComposition_TryAddCharacter jp MailComposition_TryAddCharacter
; unused ; unused
ld a, [wNamingScreenCurrNameLength] ld a, [wNamingScreenCurNameLength]
and a and a
ret z ret z
cp $11 cp $11
jr nz, .asm_121c3 jr nz, .asm_121c3
push hl push hl
ld hl, wNamingScreenCurrNameLength ld hl, wNamingScreenCurNameLength
dec [hl] dec [hl]
dec [hl] dec [hl]
jr .asm_121c8 jr .asm_121c8
.asm_121c3 .asm_121c3
push hl push hl
ld hl, wNamingScreenCurrNameLength ld hl, wNamingScreenCurNameLength
dec [hl] dec [hl]
.asm_121c8 .asm_121c8

24
engine/menus/save.asm
View File

@ -489,9 +489,9 @@ SavePlayerData:
ld de, sPlayerData ld de, sPlayerData
ld bc, wPlayerDataEnd - wPlayerData ld bc, wPlayerDataEnd - wPlayerData
call CopyBytes call CopyBytes
ld hl, wCurrMapData ld hl, wCurMapData
ld de, sCurrMapData ld de, sCurMapData
ld bc, wCurrMapDataEnd - wCurrMapData ld bc, wCurMapDataEnd - wCurMapData
call CopyBytes call CopyBytes
jp CloseSRAM jp CloseSRAM
@ -550,9 +550,9 @@ SaveBackupPlayerData:
ld de, sBackupPlayerData ld de, sBackupPlayerData
ld bc, wPlayerDataEnd - wPlayerData ld bc, wPlayerDataEnd - wPlayerData
call CopyBytes call CopyBytes
ld hl, wCurrMapData ld hl, wCurMapData
ld de, sBackupCurrMapData ld de, sBackupCurMapData
ld bc, wCurrMapDataEnd - wCurrMapData ld bc, wCurMapDataEnd - wCurMapData
call CopyBytes call CopyBytes
call CloseSRAM call CloseSRAM
ret ret
@ -724,9 +724,9 @@ LoadPlayerData:
ld de, wPlayerData ld de, wPlayerData
ld bc, wPlayerDataEnd - wPlayerData ld bc, wPlayerDataEnd - wPlayerData
call CopyBytes call CopyBytes
ld hl, sCurrMapData ld hl, sCurMapData
ld de, wCurrMapData ld de, wCurMapData
ld bc, wCurrMapDataEnd - wCurrMapData ld bc, wCurMapDataEnd - wCurMapData
call CopyBytes call CopyBytes
call CloseSRAM call CloseSRAM
ld a, BANK(sBattleTowerChallengeState) ld a, BANK(sBattleTowerChallengeState)
@ -779,9 +779,9 @@ LoadBackupPlayerData:
ld de, wPlayerData ld de, wPlayerData
ld bc, wPlayerDataEnd - wPlayerData ld bc, wPlayerDataEnd - wPlayerData
call CopyBytes call CopyBytes
ld hl, sBackupCurrMapData ld hl, sBackupCurMapData
ld de, wCurrMapData ld de, wCurMapData
ld bc, wCurrMapDataEnd - wCurrMapData ld bc, wCurMapDataEnd - wCurMapData
call CopyBytes call CopyBytes
call CloseSRAM call CloseSRAM
ret ret

4
engine/overworld/events.asm
View File

@ -401,7 +401,7 @@ Dummy_CheckScriptFlags3Bit5:
ret ret
RunSceneScript: RunSceneScript:
ld a, [wCurrMapSceneScriptCount] ld a, [wCurMapSceneScriptCount]
and a and a
jr z, .nope jr z, .nope
@ -412,7 +412,7 @@ RunSceneScript:
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, wCurrMapSceneScriptsPointer ld hl, wCurMapSceneScriptsPointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a

2
engine/overworld/variables.asm
View File

@ -61,7 +61,7 @@ _GetVarAction::
dwb wSpecialPhoneCallID, RETVAR_STRBUF2 dwb wSpecialPhoneCallID, RETVAR_STRBUF2
dwb wNrOfBeatenBattleTowerTrainers, RETVAR_STRBUF2 dwb wNrOfBeatenBattleTowerTrainers, RETVAR_STRBUF2
dwb wKurtApricornQuantity, RETVAR_STRBUF2 dwb wKurtApricornQuantity, RETVAR_STRBUF2
dwb wCurrentCaller, RETVAR_ADDR_DE dwb wCurCaller, RETVAR_ADDR_DE
dwb wBlueCardBalance, RETVAR_ADDR_DE dwb wBlueCardBalance, RETVAR_ADDR_DE
dwb wBuenasPassword, RETVAR_ADDR_DE dwb wBuenasPassword, RETVAR_ADDR_DE
dwb wKenjiBreakTimer, RETVAR_STRBUF2 dwb wKenjiBreakTimer, RETVAR_STRBUF2

8
engine/overworld/wildmons.asm
View File

@ -738,14 +738,14 @@ JumpRoamMon:
ret ret
_BackUpMapIndices: _BackUpMapIndices:
ld a, [wRoamMons_CurrentMapNumber] ld a, [wRoamMons_CurMapNumber]
ld [wRoamMons_LastMapNumber], a ld [wRoamMons_LastMapNumber], a
ld a, [wRoamMons_CurrentMapGroup] ld a, [wRoamMons_CurMapGroup]
ld [wRoamMons_LastMapGroup], a ld [wRoamMons_LastMapGroup], a
ld a, [wMapNumber] ld a, [wMapNumber]
ld [wRoamMons_CurrentMapNumber], a ld [wRoamMons_CurMapNumber], a
ld a, [wMapGroup] ld a, [wMapGroup]
ld [wRoamMons_CurrentMapGroup], a ld [wRoamMons_CurMapGroup], a
ret ret
INCLUDE "data/wild/roammon_maps.asm" INCLUDE "data/wild/roammon_maps.asm"

10
engine/phone/phone.asm
View File

@ -321,7 +321,7 @@ Function90199:
jr nz, .OutOfArea jr nz, .OutOfArea
; If the person can't take a call at that time, don't do the call ; If the person can't take a call at that time, don't do the call
ld a, b ld a, b
ld [wCurrentCaller], a ld [wCurCaller], a
ld hl, PhoneContacts ld hl, PhoneContacts
ld bc, PHONE_TABLE_WIDTH ld bc, PHONE_TABLE_WIDTH
call AddNTimes call AddNTimes
@ -389,7 +389,7 @@ LoadCallerScript:
nop nop
nop nop
ld a, e ld a, e
ld [wCurrentCaller], a ld [wCurCaller], a
and a and a
jr nz, .actualcaller jr nz, .actualcaller
ld a, BANK(WrongNumber) ld a, BANK(WrongNumber)
@ -463,7 +463,7 @@ RingTwice_StartCall:
ret ret
Phone_CallerTextboxWithName: Phone_CallerTextboxWithName:
ld a, [wCurrentCaller] ld a, [wCurCaller]
ld b, a ld b, a
call Function90363 call Function90363
ret ret
@ -680,12 +680,12 @@ Phone_GetTrainerClassName:
ret ret
GetCallerLocation: GetCallerLocation:
ld a, [wCurrentCaller] ld a, [wCurCaller]
call GetCallerTrainerClass call GetCallerTrainerClass
ld d, c ld d, c
ld e, b ld e, b
push de push de
ld a, [wCurrentCaller] ld a, [wCurCaller]
ld hl, PhoneContacts + PHONE_CONTACT_MAP_GROUP ld hl, PhoneContacts + PHONE_CONTACT_MAP_GROUP
ld bc, PHONE_TABLE_WIDTH ld bc, PHONE_TABLE_WIDTH
call AddNTimes call AddNTimes

36
engine/pokedex/pokedex.asm
View File

@ -58,7 +58,7 @@ Pokedex:
call PlaySFX call PlaySFX
call WaitSFX call WaitSFX
call ClearSprites call ClearSprites
ld a, [wCurrentDexMode] ld a, [wCurDexMode]
ld [wLastDexMode], a ld [wLastDexMode], a
pop af pop af
@ -96,7 +96,7 @@ InitPokedex:
call Pokedex_CheckUnlockedUnownMode call Pokedex_CheckUnlockedUnownMode
ld a, [wLastDexMode] ld a, [wLastDexMode]
ld [wCurrentDexMode], a ld [wCurDexMode], a
call Pokedex_OrderMonsByMode call Pokedex_OrderMonsByMode
call Pokedex_InitCursorPosition call Pokedex_InitCursorPosition
@ -178,7 +178,7 @@ Pokedex_GetLandmark:
call GetWorldMapLocation call GetWorldMapLocation
.load .load
ld [wDexCurrentLocation], a ld [wDexCurLocation], a
ret ret
Pokedex_RunJumptable: Pokedex_RunJumptable:
@ -235,7 +235,7 @@ Pokedex_InitMainScreen:
ld a, POKEDEX_SCX ld a, POKEDEX_SCX
ldh [hSCX], a ldh [hSCX], a
ld a, [wCurrentDexMode] ld a, [wCurDexMode]
cp DEXMODE_OLD cp DEXMODE_OLD
ld a, $4a ld a, $4a
jr z, .okay jr z, .okay
@ -442,7 +442,7 @@ DexEntryScreen_MenuActionJumptable:
ld a, $90 ld a, $90
ldh [hWY], a ldh [hWY], a
call Pokedex_GetSelectedMon call Pokedex_GetSelectedMon
ld a, [wDexCurrentLocation] ld a, [wDexCurLocation]
ld e, a ld e, a
predef Pokedex_GetArea predef Pokedex_GetArea
call Pokedex_BlackOutBG call Pokedex_BlackOutBG
@ -513,7 +513,7 @@ Pokedex_InitOptionScreen:
call ClearSprites call ClearSprites
call Pokedex_DrawOptionScreenBG call Pokedex_DrawOptionScreenBG
call Pokedex_InitArrowCursor call Pokedex_InitArrowCursor
ld a, [wCurrentDexMode] ; Index of the topmost visible item in a scrolling menu ??? ld a, [wCurDexMode] ; Index of the topmost visible item in a scrolling menu ???
ld [wDexArrowCursorPosIndex], a ld [wDexArrowCursorPosIndex], a
call Pokedex_DisplayModeDescription call Pokedex_DisplayModeDescription
call WaitBGMap call WaitBGMap
@ -585,12 +585,12 @@ Pokedex_UpdateOptionScreen:
ld b, DEXMODE_ABC ld b, DEXMODE_ABC
.ChangeMode: .ChangeMode:
ld a, [wCurrentDexMode] ld a, [wCurDexMode]
cp b cp b
jr z, .skip_changing_mode ; Skip if new mode is same as current. jr z, .skip_changing_mode ; Skip if new mode is same as current.
ld a, b ld a, b
ld [wCurrentDexMode], a ld [wCurDexMode], a
call Pokedex_OrderMonsByMode call Pokedex_OrderMonsByMode
call Pokedex_DisplayChangingModesMessage call Pokedex_DisplayChangingModesMessage
xor a xor a
@ -799,7 +799,7 @@ Pokedex_InitUnownMode:
call Pokedex_LoadUnownFont call Pokedex_LoadUnownFont
call Pokedex_DrawUnownModeBG call Pokedex_DrawUnownModeBG
xor a xor a
ld [wDexCurrentUnownIndex], a ld [wDexCurUnownIndex], a
call Pokedex_LoadUnownFrontpicTiles call Pokedex_LoadUnownFrontpicTiles
call Pokedex_UnownModePlaceCursor call Pokedex_UnownModePlaceCursor
farcall PrintUnownWord farcall PrintUnownWord
@ -849,7 +849,7 @@ Pokedex_UnownModeHandleDPadInput:
.right .right
ld a, [wDexUnownCount] ld a, [wDexUnownCount]
ld e, a ld e, a
ld hl, wDexCurrentUnownIndex ld hl, wDexCurUnownIndex
ld a, [hl] ld a, [hl]
inc a inc a
cp e cp e
@ -859,7 +859,7 @@ Pokedex_UnownModeHandleDPadInput:
jr .update jr .update
.left .left
ld hl, wDexCurrentUnownIndex ld hl, wDexCurUnownIndex
ld a, [hl] ld a, [hl]
and a and a
ret z ret z
@ -886,7 +886,7 @@ Pokedex_UnownModeEraseCursor:
jr Pokedex_UnownModeUpdateCursorGfx jr Pokedex_UnownModeUpdateCursorGfx
Pokedex_UnownModePlaceCursor: Pokedex_UnownModePlaceCursor:
ld a, [wDexCurrentUnownIndex] ld a, [wDexCurUnownIndex]
ld c, $5a ; diamond cursor ld c, $5a ; diamond cursor
Pokedex_UnownModeUpdateCursorGfx: Pokedex_UnownModeUpdateCursorGfx:
@ -1460,7 +1460,7 @@ Pokedex_PrintListing:
; Prints the list of Pokémon on the main Pokédex screen. ; Prints the list of Pokémon on the main Pokédex screen.
; This check is completely useless. ; This check is completely useless.
ld a, [wCurrentDexMode] ld a, [wCurDexMode]
cp DEXMODE_OLD cp DEXMODE_OLD
jr z, .okay jr z, .okay
ld c, 11 ld c, 11
@ -1522,7 +1522,7 @@ Pokedex_PrintListing:
ret ret
Pokedex_PrintNumberIfOldMode: Pokedex_PrintNumberIfOldMode:
ld a, [wCurrentDexMode] ld a, [wCurDexMode]
cp DEXMODE_OLD cp DEXMODE_OLD
jr z, .printnum jr z, .printnum
ret ret
@ -1613,7 +1613,7 @@ Pokedex_OrderMonsByMode:
ld bc, wPokedexOrderEnd - wPokedexOrder ld bc, wPokedexOrderEnd - wPokedexOrder
xor a xor a
call ByteFill call ByteFill
ld a, [wCurrentDexMode] ld a, [wCurDexMode]
ld hl, .Jumptable ld hl, .Jumptable
call Pokedex_LoadPointer call Pokedex_LoadPointer
jp hl jp hl
@ -1968,7 +1968,7 @@ Pokedex_DisplayTypeNotFoundMessage:
next "was not found.@" next "was not found.@"
Pokedex_UpdateCursorOAM: Pokedex_UpdateCursorOAM:
ld a, [wCurrentDexMode] ld a, [wCurDexMode]
cp DEXMODE_OLD cp DEXMODE_OLD
jp z, Pokedex_PutOldModeCursorOAM jp z, Pokedex_PutOldModeCursorOAM
call Pokedex_PutNewModeABCModeCursorOAM call Pokedex_PutNewModeABCModeCursorOAM
@ -2070,7 +2070,7 @@ Pokedex_PutNewModeABCModeCursorOAM:
db -1 db -1
Pokedex_UpdateSearchResultsCursorOAM: Pokedex_UpdateSearchResultsCursorOAM:
ld a, [wCurrentDexMode] ld a, [wCurDexMode]
cp DEXMODE_OLD cp DEXMODE_OLD
jp z, Pokedex_PutOldModeCursorOAM jp z, Pokedex_PutOldModeCursorOAM
ld hl, .CursorOAM ld hl, .CursorOAM
@ -2498,7 +2498,7 @@ Pokedex_LoadUnownFont:
Pokedex_LoadUnownFrontpicTiles: Pokedex_LoadUnownFrontpicTiles:
ld a, [wUnownLetter] ld a, [wUnownLetter]
push af push af
ld a, [wDexCurrentUnownIndex] ld a, [wDexCurUnownIndex]
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, wUnownDex ld hl, wUnownDex

2
engine/pokedex/pokedex_3.asm
View File

@ -43,7 +43,7 @@ DrawPokedexListWindow:
ld [hl], $3f ld [hl], $3f
hlcoord 5, 16 hlcoord 5, 16
ld [hl], $40 ld [hl], $40
ld a, [wCurrentDexMode] ld a, [wCurDexMode]
cp DEXMODE_OLD cp DEXMODE_OLD
jr z, .OldMode jr z, .OldMode
; scroll bar ; scroll bar

2
engine/pokedex/unown_dex.asm
View File

@ -23,7 +23,7 @@ PrintUnownWord:
ld bc, 12 ld bc, 12
ld a, " " ld a, " "
call ByteFill call ByteFill
ld a, [wDexCurrentUnownIndex] ld a, [wDexCurUnownIndex]
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, wUnownDex ld hl, wUnownDex

22
engine/pokegear/pokegear.asm
View File

@ -1573,7 +1573,7 @@ RadioChannels:
LoadStation_OaksPokemonTalk: LoadStation_OaksPokemonTalk:
xor a ; OAKS_POKEMON_TALK xor a ; OAKS_POKEMON_TALK
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
ld [wNumRadioLinesPrinted], a ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow) ld a, BANK(PlayRadioShow)
ld hl, PlayRadioShow ld hl, PlayRadioShow
@ -1583,7 +1583,7 @@ LoadStation_OaksPokemonTalk:
LoadStation_PokedexShow: LoadStation_PokedexShow:
ld a, POKEDEX_SHOW ld a, POKEDEX_SHOW
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
xor a xor a
ld [wNumRadioLinesPrinted], a ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow) ld a, BANK(PlayRadioShow)
@ -1594,7 +1594,7 @@ LoadStation_PokedexShow:
LoadStation_PokemonMusic: LoadStation_PokemonMusic:
ld a, POKEMON_MUSIC ld a, POKEMON_MUSIC
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
xor a xor a
ld [wNumRadioLinesPrinted], a ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow) ld a, BANK(PlayRadioShow)
@ -1605,7 +1605,7 @@ LoadStation_PokemonMusic:
LoadStation_LuckyChannel: LoadStation_LuckyChannel:
ld a, LUCKY_CHANNEL ld a, LUCKY_CHANNEL
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
xor a xor a
ld [wNumRadioLinesPrinted], a ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow) ld a, BANK(PlayRadioShow)
@ -1616,7 +1616,7 @@ LoadStation_LuckyChannel:
LoadStation_BuenasPassword: LoadStation_BuenasPassword:
ld a, BUENAS_PASSWORD ld a, BUENAS_PASSWORD
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
xor a xor a
ld [wNumRadioLinesPrinted], a ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow) ld a, BANK(PlayRadioShow)
@ -1634,7 +1634,7 @@ NotBuenasPasswordName: db "@"
LoadStation_UnownRadio: LoadStation_UnownRadio:
ld a, UNOWN_RADIO ld a, UNOWN_RADIO
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
xor a xor a
ld [wNumRadioLinesPrinted], a ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow) ld a, BANK(PlayRadioShow)
@ -1645,7 +1645,7 @@ LoadStation_UnownRadio:
LoadStation_PlacesAndPeople: LoadStation_PlacesAndPeople:
ld a, PLACES_AND_PEOPLE ld a, PLACES_AND_PEOPLE
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
xor a xor a
ld [wNumRadioLinesPrinted], a ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow) ld a, BANK(PlayRadioShow)
@ -1656,7 +1656,7 @@ LoadStation_PlacesAndPeople:
LoadStation_LetsAllSing: LoadStation_LetsAllSing:
ld a, LETS_ALL_SING ld a, LETS_ALL_SING
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
xor a xor a
ld [wNumRadioLinesPrinted], a ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow) ld a, BANK(PlayRadioShow)
@ -1667,7 +1667,7 @@ LoadStation_LetsAllSing:
LoadStation_RocketRadio: LoadStation_RocketRadio:
ld a, ROCKET_RADIO ld a, ROCKET_RADIO
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
xor a xor a
ld [wNumRadioLinesPrinted], a ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow) ld a, BANK(PlayRadioShow)
@ -1678,7 +1678,7 @@ LoadStation_RocketRadio:
LoadStation_PokeFluteRadio: LoadStation_PokeFluteRadio:
ld a, POKE_FLUTE_RADIO ld a, POKE_FLUTE_RADIO
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
xor a xor a
ld [wNumRadioLinesPrinted], a ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow) ld a, BANK(PlayRadioShow)
@ -1689,7 +1689,7 @@ LoadStation_PokeFluteRadio:
LoadStation_EvolutionRadio: LoadStation_EvolutionRadio:
ld a, EVOLUTION_RADIO ld a, EVOLUTION_RADIO
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
xor a xor a
ld [wNumRadioLinesPrinted], a ld [wNumRadioLinesPrinted], a
ld a, BANK(PlayRadioShow) ld a, BANK(PlayRadioShow)

24
engine/pokegear/radio.asm
View File

@ -1,6 +1,6 @@
PlayRadioShow: PlayRadioShow:
; If we're already in the radio program proper, we don't need to be here. ; If we're already in the radio program proper, we don't need to be here.
ld a, [wCurrentRadioLine] ld a, [wCurRadioLine]
cp POKE_FLUTE_RADIO cp POKE_FLUTE_RADIO
jr nc, .ok jr nc, .ok
; If Team Rocket is not occupying the radio tower, we don't need to be here. ; If Team Rocket is not occupying the radio tower, we don't need to be here.
@ -13,10 +13,10 @@ PlayRadioShow:
jr nz, .ok jr nz, .ok
; Team Rocket broadcasts on all stations. ; Team Rocket broadcasts on all stations.
ld a, ROCKET_RADIO ld a, ROCKET_RADIO
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
.ok .ok
; Jump to the currently loaded station. The index to which we need to jump is in wCurrentRadioLine. ; Jump to the currently loaded station. The index to which we need to jump is in wCurRadioLine.
ld a, [wCurrentRadioLine] ld a, [wCurRadioLine]
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, RadioJumptable ld hl, RadioJumptable
@ -145,7 +145,7 @@ PrintRadioLine:
call PrintTextBoxText call PrintTextBoxText
.skip .skip
ld a, RADIO_SCROLL ld a, RADIO_SCROLL
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
ld a, 100 ld a, 100
ld [wRadioTextDelay], a ld [wRadioTextDelay], a
ret ret
@ -175,7 +175,7 @@ RadioScroll:
ret ret
.proceed .proceed
ld a, [wNextRadioLine] ld a, [wNextRadioLine]
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
ld a, [wNumRadioLinesPrinted] ld a, [wNumRadioLinesPrinted]
cp 1 cp 1
call nz, CopyBottomLineToTopLine call nz, CopyBottomLineToTopLine
@ -592,7 +592,7 @@ OaksPKMNTalk10:
ld hl, OPT_PokemonChannelText ld hl, OPT_PokemonChannelText
call PrintText call PrintText
ld a, OAKS_POKEMON_TALK_11 ld a, OAKS_POKEMON_TALK_11
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
ld a, 100 ld a, 100
ld [wRadioTextDelay], a ld [wRadioTextDelay], a
ret ret
@ -654,7 +654,7 @@ OaksPKMNTalk14:
xor a xor a
ld [wNumRadioLinesPrinted], a ld [wNumRadioLinesPrinted], a
ld a, RADIO_SCROLL ld a, RADIO_SCROLL
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
ld a, 10 ld a, 10
ld [wRadioTextDelay], a ld [wRadioTextDelay], a
ret ret
@ -663,7 +663,7 @@ OaksPKMNTalk14:
db "@" db "@"
PlaceRadioString: PlaceRadioString:
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
ld a, 100 ld a, 100
ld [wRadioTextDelay], a ld [wRadioTextDelay], a
jp PlaceString jp PlaceString
@ -1779,7 +1779,7 @@ BuenasPassword20:
ld hl, wDailyFlags2 ld hl, wDailyFlags2
res DAILYFLAGS2_BUENAS_PASSWORD_F, [hl] res DAILYFLAGS2_BUENAS_PASSWORD_F, [hl]
ld a, BUENAS_PASSWORD ld a, BUENAS_PASSWORD
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
xor a xor a
ld [wNumRadioLinesPrinted], a ld [wNumRadioLinesPrinted], a
ld hl, BuenaOffTheAirText ld hl, BuenaOffTheAirText
@ -1788,7 +1788,7 @@ BuenasPassword20:
BuenasPassword21: BuenasPassword21:
ld a, BUENAS_PASSWORD ld a, BUENAS_PASSWORD
ld [wCurrentRadioLine], a ld [wCurRadioLine], a
xor a xor a
ld [wNumRadioLinesPrinted], a ld [wNumRadioLinesPrinted], a
call BuenasPasswordCheckTime call BuenasPasswordCheckTime
@ -1911,7 +1911,7 @@ StartRadioStation:
call RadioTerminator call RadioTerminator
call PrintText call PrintText
ld hl, RadioChannelSongs ld hl, RadioChannelSongs
ld a, [wCurrentRadioLine] ld a, [wCurRadioLine]
ld c, a ld c, a
ld b, 0 ld b, 0
add hl, bc add hl, bc

82
home/map.asm
View File

@ -8,9 +8,9 @@ Clearwc7e8::
ret ret
CheckScenes:: CheckScenes::
; Checks wCurrMapSceneScriptPointer. If it's empty, returns -1 in a. Otherwise, returns the active scene ID in a. ; Checks wCurMapSceneScriptPointer. If it's empty, returns -1 in a. Otherwise, returns the active scene ID in a.
push hl push hl
ld hl, wCurrMapSceneScriptPointer ld hl, wCurMapSceneScriptPointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@ -24,24 +24,24 @@ CheckScenes::
ret ret
GetCurrentMapSceneID:: GetCurrentMapSceneID::
; Grabs the wram map scene script pointer for the current map and loads it into wCurrMapSceneScriptPointer. ; Grabs the wram map scene script pointer for the current map and loads it into wCurMapSceneScriptPointer.
; If there is no scene, both bytes of wCurrMapSceneScriptPointer are wiped clean. ; If there is no scene, both bytes of wCurMapSceneScriptPointer are wiped clean.
; Copy the current map group and number into bc. This is needed for GetMapSceneID. ; Copy the current map group and number into bc. This is needed for GetMapSceneID.
ld a, [wMapGroup] ld a, [wMapGroup]
ld b, a ld b, a
ld a, [wMapNumber] ld a, [wMapNumber]
ld c, a ld c, a
; Blank out wCurrMapSceneScriptPointer; this is the default scenario. ; Blank out wCurMapSceneScriptPointer; this is the default scenario.
xor a xor a
ld [wCurrMapSceneScriptPointer], a ld [wCurMapSceneScriptPointer], a
ld [wCurrMapSceneScriptPointer + 1], a ld [wCurMapSceneScriptPointer + 1], a
call GetMapSceneID call GetMapSceneID
ret c ; The map is not in the scene script table ret c ; The map is not in the scene script table
; Load the scene script pointer from de into wCurrMapSceneScriptPointer ; Load the scene script pointer from de into wCurMapSceneScriptPointer
ld a, e ld a, e
ld [wCurrMapSceneScriptPointer], a ld [wCurMapSceneScriptPointer], a
ld a, d ld a, d
ld [wCurrMapSceneScriptPointer + 1], a ld [wCurMapSceneScriptPointer + 1], a
xor a xor a
ret ret
@ -254,12 +254,12 @@ GetDestinationWarpNumber::
ld a, [wPlayerStandingMapX] ld a, [wPlayerStandingMapX]
sub 4 sub 4
ld d, a ld d, a
ld a, [wCurrMapWarpCount] ld a, [wCurMapWarpCount]
and a and a
ret z ret z
ld c, a ld c, a
ld hl, wCurrMapWarpsPointer ld hl, wCurMapWarpsPointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@ -292,7 +292,7 @@ GetDestinationWarpNumber::
call .IncreaseHLTwice call .IncreaseHLTwice
ret nc ; never encountered ret nc ; never encountered
ld a, [wCurrMapWarpCount] ld a, [wCurMapWarpCount]
inc a inc a
sub c sub c
ld c, a ld c, a
@ -319,7 +319,7 @@ CopyWarpData::
.CopyWarpData: .CopyWarpData:
push bc push bc
ld hl, wCurrMapWarpsPointer ld hl, wCurMapWarpsPointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@ -489,11 +489,11 @@ GetMapConnection::
ReadMapSceneScripts:: ReadMapSceneScripts::
ld a, [hli] ; scene script count ld a, [hli] ; scene script count
ld c, a ld c, a
ld [wCurrMapSceneScriptCount], a ; current map scene script count ld [wCurMapSceneScriptCount], a
ld a, l ld a, l
ld [wCurrMapSceneScriptsPointer], a ; map scene script pointer ld [wCurMapSceneScriptsPointer], a
ld a, h ld a, h
ld [wCurrMapSceneScriptsPointer + 1], a ld [wCurMapSceneScriptsPointer + 1], a
ld a, c ld a, c
and a and a
ret z ret z
@ -505,11 +505,11 @@ ReadMapSceneScripts::
ReadMapCallbacks:: ReadMapCallbacks::
ld a, [hli] ld a, [hli]
ld c, a ld c, a
ld [wCurrMapCallbackCount], a ld [wCurMapCallbackCount], a
ld a, l ld a, l
ld [wCurrMapCallbacksPointer], a ld [wCurMapCallbacksPointer], a
ld a, h ld a, h
ld [wCurrMapCallbacksPointer + 1], a ld [wCurMapCallbacksPointer + 1], a
ld a, c ld a, c
and a and a
ret z ret z
@ -521,11 +521,11 @@ ReadMapCallbacks::
ReadWarps:: ReadWarps::
ld a, [hli] ld a, [hli]
ld c, a ld c, a
ld [wCurrMapWarpCount], a ld [wCurMapWarpCount], a
ld a, l ld a, l
ld [wCurrMapWarpsPointer], a ld [wCurMapWarpsPointer], a
ld a, h ld a, h
ld [wCurrMapWarpsPointer + 1], a ld [wCurMapWarpsPointer + 1], a
ld a, c ld a, c
and a and a
ret z ret z
@ -536,11 +536,11 @@ ReadWarps::
ReadCoordEvents:: ReadCoordEvents::
ld a, [hli] ld a, [hli]
ld c, a ld c, a
ld [wCurrMapCoordEventCount], a ld [wCurMapCoordEventCount], a
ld a, l ld a, l
ld [wCurrMapCoordEventsPointer], a ld [wCurMapCoordEventsPointer], a
ld a, h ld a, h
ld [wCurrMapCoordEventsPointer + 1], a ld [wCurMapCoordEventsPointer + 1], a
ld a, c ld a, c
and a and a
@ -553,11 +553,11 @@ ReadCoordEvents::
ReadBGEvents:: ReadBGEvents::
ld a, [hli] ld a, [hli]
ld c, a ld c, a
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ld a, l ld a, l
ld [wCurrMapBGEventsPointer], a ld [wCurMapBGEventsPointer], a
ld a, h ld a, h
ld [wCurrMapBGEventsPointer + 1], a ld [wCurMapBGEventsPointer + 1], a
ld a, c ld a, c
and a and a
@ -574,17 +574,17 @@ ReadObjectEvents::
ld hl, wMap1Object ld hl, wMap1Object
ld a, [de] ld a, [de]
inc de inc de
ld [wCurrMapObjectEventCount], a ld [wCurMapObjectEventCount], a
ld a, e ld a, e
ld [wCurrMapObjectEventsPointer], a ld [wCurMapObjectEventsPointer], a
ld a, d ld a, d
ld [wCurrMapObjectEventsPointer + 1], a ld [wCurMapObjectEventsPointer + 1], a
ld a, [wCurrMapObjectEventCount] ld a, [wCurMapObjectEventCount]
call CopyMapObjectEvents call CopyMapObjectEvents
; get NUM_OBJECTS - [wCurrMapObjectEventCount] ; get NUM_OBJECTS - [wCurMapObjectEventCount]
ld a, [wCurrMapObjectEventCount] ld a, [wCurMapObjectEventCount]
ld c, a ld c, a
ld a, NUM_OBJECTS ; - 1 ld a, NUM_OBJECTS ; - 1
sub c sub c
@ -971,11 +971,11 @@ RunMapCallback::
ret ret
.FindCallback: .FindCallback:
ld a, [wCurrMapCallbackCount] ld a, [wCurMapCallbackCount]
ld c, a ld c, a
and a and a
ret z ret z
ld hl, wCurrMapCallbacksPointer ld hl, wCurMapCallbacksPointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@ -1767,7 +1767,7 @@ CheckFacingBGEvent::
sub 4 sub 4
ld e, a ld e, a
; If there are no BG events, we don't need to be here. ; If there are no BG events, we don't need to be here.
ld a, [wCurrMapBGEventCount] ld a, [wCurMapBGEventCount]
and a and a
ret z ret z
@ -1783,7 +1783,7 @@ CheckFacingBGEvent::
CheckIfFacingTileCoordIsBGEvent:: CheckIfFacingTileCoordIsBGEvent::
; Checks to see if you are facing a BG event. If so, copies it into wEngineBuffer1 and sets carry. ; Checks to see if you are facing a BG event. If so, copies it into wEngineBuffer1 and sets carry.
ld hl, wCurrMapBGEventsPointer ld hl, wCurMapBGEventsPointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
@ -1821,7 +1821,7 @@ CheckIfFacingTileCoordIsBGEvent::
CheckCurrentMapCoordEvents:: CheckCurrentMapCoordEvents::
; If there are no coord events, we don't need to be here. ; If there are no coord events, we don't need to be here.
ld a, [wCurrMapCoordEventCount] ld a, [wCurMapCoordEventCount]
and a and a
ret z ret z
; Copy the coord event count into c. ; Copy the coord event count into c.
@ -1837,7 +1837,7 @@ CheckCurrentMapCoordEvents::
.CoordEventCheck: .CoordEventCheck:
; Checks to see if you are standing on a coord event. If yes, copies the event to wEngineBuffer1 and sets carry. ; Checks to see if you are standing on a coord event. If yes, copies the event to wEngineBuffer1 and sets carry.
ld hl, wCurrMapCoordEventsPointer ld hl, wCurMapCoordEventsPointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a

6
home/stone_queue.asm
View File

@ -56,11 +56,11 @@ HandleStoneQueue::
ret ret
.check_on_warp .check_on_warp
ld hl, wCurrMapWarpsPointer ld hl, wCurMapWarpsPointer
ld a, [hli] ld a, [hli]
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld a, [wCurrMapWarpCount] ld a, [wCurMapWarpCount]
and a and a
jr z, .nope2 jr z, .nope2
@ -94,7 +94,7 @@ HandleStoneQueue::
.found_warp .found_warp
pop af pop af
ld d, a ld d, a
ld a, [wCurrMapWarpCount] ld a, [wCurMapWarpCount]
sub d sub d
inc a inc a
scf scf

128
mobile/mobile_45.asm
View File

@ -416,7 +416,7 @@ Function1143b7:
pop hl pop hl
push af push af
ld a, [hli] ld a, [hli]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, [hli] ld a, [hli]
@ -658,7 +658,7 @@ Function1144d1:
.asm_11451c .asm_11451c
pop hl pop hl
ld a, [hli] ld a, [hli]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
@ -675,7 +675,7 @@ Function1144d1:
.asm_114537 .asm_114537
ld hl, $dc06 ld hl, $dc06
ld a, [hl] ld a, [hl]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld hl, $dc09 ld hl, $dc09
@ -686,7 +686,7 @@ Function1144d1:
ld a, d ld a, d
or e or e
jr z, .asm_114559 jr z, .asm_114559
ld hl, wCurrMapSceneScriptCount ld hl, wCurMapSceneScriptCount
ld e, [hl] ld e, [hl]
inc hl inc hl
ld d, [hl] ld d, [hl]
@ -1229,7 +1229,7 @@ Function114843:
Function114867: Function114867:
ld hl, $dc06 ld hl, $dc06
ld a, [hli] ld a, [hli]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
@ -1257,7 +1257,7 @@ Function114867:
inc e inc e
call z, Function1148b9 call z, Function1148b9
ld hl, $dc06 ld hl, $dc06
ld a, [wCurrMapBGEventCount] ld a, [wCurMapBGEventCount]
ld [hli], a ld [hli], a
ld [hl], e ld [hl], e
inc hl inc hl
@ -1286,7 +1286,7 @@ Function114867:
Function1148b9: Function1148b9:
push bc push bc
ld bc, wCurrMapBGEventCount ld bc, wCurMapBGEventCount
call Function115d80 call Function115d80
pop bc pop bc
ret ret
@ -1294,7 +1294,7 @@ Function1148b9:
Function1148c2: Function1148c2:
ld hl, $dc06 ld hl, $dc06
ld a, [hli] ld a, [hli]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
@ -1347,7 +1347,7 @@ Function1148c2:
inc e inc e
call z, Function114944 call z, Function114944
ld hl, $dc06 ld hl, $dc06
ld a, [wCurrMapBGEventCount] ld a, [wCurMapBGEventCount]
ld [hli], a ld [hli], a
ld [hl], e ld [hl], e
inc hl inc hl
@ -1384,7 +1384,7 @@ Function1148c2:
Function114944: Function114944:
push bc push bc
ld bc, wCurrMapBGEventCount ld bc, wCurMapBGEventCount
call Function115d80 call Function115d80
pop bc pop bc
ret ret
@ -1392,7 +1392,7 @@ Function114944:
Function11494d: Function11494d:
ld hl, $dc06 ld hl, $dc06
ld a, [hli] ld a, [hli]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
@ -1437,7 +1437,7 @@ Function11494d:
inc e inc e
call z, Function1149c3 call z, Function1149c3
ld hl, $dc06 ld hl, $dc06
ld a, [wCurrMapBGEventCount] ld a, [wCurMapBGEventCount]
ld [hli], a ld [hli], a
ld [hl], e ld [hl], e
inc hl inc hl
@ -1474,7 +1474,7 @@ Function11494d:
Function1149c3: Function1149c3:
push bc push bc
ld bc, wCurrMapBGEventCount ld bc, wCurMapBGEventCount
call Function115d80 call Function115d80
pop bc pop bc
ret ret
@ -1482,7 +1482,7 @@ Function1149c3:
Function1149cc: Function1149cc:
ld hl, $dc06 ld hl, $dc06
ld a, [hl] ld a, [hl]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
push de push de
@ -1501,7 +1501,7 @@ Function1149cc:
ld [hl], d ld [hl], d
dec hl dec hl
ld [hl], e ld [hl], e
ld hl, wCurrMapSceneScriptCount ld hl, wCurMapSceneScriptCount
ld e, [hl] ld e, [hl]
inc hl inc hl
ld d, [hl] ld d, [hl]
@ -1514,7 +1514,7 @@ Function1149cc:
inc e inc e
call z, Function114a0f call z, Function114a0f
ld hl, $dc06 ld hl, $dc06
ld a, [wCurrMapBGEventCount] ld a, [wCurMapBGEventCount]
ld [hli], a ld [hli], a
ld [hl], e ld [hl], e
inc hl inc hl
@ -1530,7 +1530,7 @@ Function1149cc:
Function114a0f: Function114a0f:
push bc push bc
ld bc, wCurrMapBGEventCount ld bc, wCurMapBGEventCount
call Function115d80 call Function115d80
pop bc pop bc
ret ret
@ -1829,7 +1829,7 @@ endr
.asm_114b96 .asm_114b96
ld hl, $dc06 ld hl, $dc06
ld a, [hli] ld a, [hli]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
@ -1878,7 +1878,7 @@ Function114bbc:
jr z, .asm_114bff jr z, .asm_114bff
pop hl pop hl
ld a, [hli] ld a, [hli]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, [hli] ld a, [hli]
@ -2103,7 +2103,7 @@ endr
.asm_114d11 .asm_114d11
pop hl pop hl
ld a, [hli] ld a, [hli]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, [hli] ld a, [hli]
@ -2401,7 +2401,7 @@ Function114e62:
Function114ea0: Function114ea0:
ld hl, $dc06 ld hl, $dc06
ld a, [hli] ld a, [hli]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, [hli] ld a, [hli]
@ -2426,7 +2426,7 @@ Function114ea0:
inc e inc e
call z, Function114ee0 call z, Function114ee0
ld hl, $dc06 ld hl, $dc06
ld a, [wCurrMapBGEventCount] ld a, [wCurMapBGEventCount]
ld [hli], a ld [hli], a
ld a, e ld a, e
ld [hli], a ld [hli], a
@ -2446,7 +2446,7 @@ Function114ea0:
Function114ee0: Function114ee0:
push bc push bc
ld bc, wCurrMapBGEventCount ld bc, wCurMapBGEventCount
call Function115d80 call Function115d80
pop bc pop bc
ret ret
@ -2679,7 +2679,7 @@ Function115020:
push hl push hl
ld hl, $dc06 ld hl, $dc06
ld a, [hli] ld a, [hli]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, [hli] ld a, [hli]
@ -2706,7 +2706,7 @@ Function115020:
.asm_115046 .asm_115046
ld hl, $dc06 ld hl, $dc06
ld a, [wCurrMapBGEventCount] ld a, [wCurMapBGEventCount]
ld [hli], a ld [hli], a
ld a, e ld a, e
ld [hli], a ld [hli], a
@ -2724,7 +2724,7 @@ Function115020:
Function115059: Function115059:
push bc push bc
ld bc, wCurrMapBGEventCount ld bc, wCurMapBGEventCount
call Function115d80 call Function115d80
pop bc pop bc
ret ret
@ -2887,7 +2887,7 @@ Function1150b3:
Function115136: Function115136:
ld hl, $dc06 ld hl, $dc06
ld a, [hli] ld a, [hli]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, [hli] ld a, [hli]
@ -2914,7 +2914,7 @@ Function115136:
.asm_11515d .asm_11515d
ld hl, $dc06 ld hl, $dc06
ld a, [wCurrMapBGEventCount] ld a, [wCurMapBGEventCount]
ld [hli], a ld [hli], a
ld a, e ld a, e
ld [hli], a ld [hli], a
@ -2932,7 +2932,7 @@ Function115136:
Function115170: Function115170:
push bc push bc
ld bc, wCurrMapBGEventCount ld bc, wCurMapBGEventCount
call Function115d80 call Function115d80
pop bc pop bc
ret ret
@ -2940,7 +2940,7 @@ Function115170:
Function115179: Function115179:
ld hl, $dc06 ld hl, $dc06
ld a, [hli] ld a, [hli]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, [hli] ld a, [hli]
@ -3035,7 +3035,7 @@ Function115179:
inc e inc e
call z, Function11520e call z, Function11520e
ld hl, $dc06 ld hl, $dc06
ld a, [wCurrMapBGEventCount] ld a, [wCurMapBGEventCount]
ld [hli], a ld [hli], a
ld a, e ld a, e
ld [hli], a ld [hli], a
@ -3049,7 +3049,7 @@ Function115179:
Function11520e: Function11520e:
push bc push bc
ld bc, wCurrMapBGEventCount ld bc, wCurMapBGEventCount
call Function115d80 call Function115d80
pop bc pop bc
ret ret
@ -3058,7 +3058,7 @@ Function115217:
push hl push hl
ld hl, $dc06 ld hl, $dc06
ld a, [hli] ld a, [hli]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld a, [hli] ld a, [hli]
@ -3097,7 +3097,7 @@ Function115217:
.asm_115252 .asm_115252
ld hl, $dc06 ld hl, $dc06
ld a, [wCurrMapBGEventCount] ld a, [wCurMapBGEventCount]
ld [hli], a ld [hli], a
ld a, e ld a, e
ld [hli], a ld [hli], a
@ -3141,7 +3141,7 @@ Function115217:
Function115286: Function115286:
push bc push bc
ld bc, wCurrMapBGEventCount ld bc, wCurMapBGEventCount
call Function115d80 call Function115d80
pop bc pop bc
ret ret
@ -3534,7 +3534,7 @@ Function1153d2:
ld [de], a ld [de], a
ld hl, wDecoRightOrnament ld hl, wDecoRightOrnament
ld a, [hli] ld a, [hli]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
@ -3543,7 +3543,7 @@ Function1153d2:
ld hl, $ddc8 ld hl, $ddc8
call Function115d6a call Function115d6a
ld hl, wDecoRightOrnament ld hl, wDecoRightOrnament
ld a, [wCurrMapBGEventCount] ld a, [wCurMapBGEventCount]
ld [hli], a ld [hli], a
ld [hl], e ld [hl], e
inc hl inc hl
@ -3765,7 +3765,7 @@ Function1155d1:
Function11560a: Function11560a:
ld a, [$dc06] ld a, [$dc06]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ld a, [$dc17] ld a, [$dc17]
ld [$dc00], a ld [$dc00], a
ldh [hFF8C], a ldh [hFF8C], a
@ -3774,7 +3774,7 @@ Function11560a:
ld c, [hl] ld c, [hl]
inc hl inc hl
ld b, [hl] ld b, [hl]
ld a, [wCurrMapCallbackCount] ld a, [wCurMapCallbackCount]
cp b cp b
jp c, .asm_1156b1 jp c, .asm_1156b1
jr nz, .asm_115631 jr nz, .asm_115631
@ -3788,7 +3788,7 @@ Function11560a:
jr z, .asm_1156a9 jr z, .asm_1156a9
ld a, [$dc09] ld a, [$dc09]
ld l, a ld l, a
ld a, [wCurrMapCallbackCount] ld a, [wCurMapCallbackCount]
ld h, a ld h, a
ld a, c ld a, c
cpl cpl
@ -3801,7 +3801,7 @@ Function11560a:
ld a, l ld a, l
ld [$dc09], a ld [$dc09], a
ld a, h ld a, h
ld [wCurrMapCallbackCount], a ld [wCurMapCallbackCount], a
.asm_11564d .asm_11564d
ld a, $3 ld a, $3
cp b cp b
@ -3840,16 +3840,16 @@ Function11560a:
inc hl inc hl
ld [hl], d ld [hl], d
pop bc pop bc
ld a, [wCurrMapBGEventCount] ld a, [wCurMapBGEventCount]
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld hl, wCurrMapSceneScriptCount ld hl, wCurMapSceneScriptCount
ld e, [hl] ld e, [hl]
inc hl inc hl
ld d, [hl] ld d, [hl]
ld hl, $dc24 ld hl, $dc24
call Function115d6a call Function115d6a
ld hl, wCurrMapSceneScriptCount ld hl, wCurMapSceneScriptCount
ld [hl], e ld [hl], e
inc hl inc hl
ld [hl], d ld [hl], d
@ -3862,7 +3862,7 @@ Function11560a:
jr nz, .asm_11564d jr nz, .asm_11564d
.asm_1156a9 .asm_1156a9
ld a, [wCurrMapBGEventCount] ld a, [wCurMapBGEventCount]
ld [$dc06], a ld [$dc06], a
xor a xor a
ret ret
@ -3930,7 +3930,7 @@ Function1156cc:
jp Function11425c jp Function11425c
.asm_115716 .asm_115716
ld hl, wCurrMapCallbackCount ld hl, wCurMapCallbackCount
ld a, [hli] ld a, [hli]
cpl cpl
ld e, a ld e, a
@ -4171,9 +4171,9 @@ Function11581e:
ld b, [hl] ld b, [hl]
inc hl inc hl
push hl push hl
ld a, [wCurrMapCallbackCount] ld a, [wCurMapCallbackCount]
ld l, a ld l, a
ld a, [wCurrMapCallbacksPointer] ld a, [wCurMapCallbacksPointer]
ld h, a ld h, a
cp b cp b
jr c, .asm_1158bb jr c, .asm_1158bb
@ -4193,14 +4193,14 @@ Function11581e:
inc bc inc bc
add hl, bc add hl, bc
ld a, l ld a, l
ld [wCurrMapCallbackCount], a ld [wCurMapCallbackCount], a
ld a, h ld a, h
ld [wCurrMapCallbacksPointer], a ld [wCurMapCallbacksPointer], a
pop bc pop bc
pop hl pop hl
ld hl, wCurrMapSceneScriptCount ld hl, wCurMapSceneScriptCount
ld a, [hli] ld a, [hli]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
@ -4208,8 +4208,8 @@ Function11581e:
ld d, [hl] ld d, [hl]
ld hl, wPartyMon5Speed ld hl, wPartyMon5Speed
call Function115d6a call Function115d6a
ld hl, wCurrMapSceneScriptCount ld hl, wCurMapSceneScriptCount
ld a, [wCurrMapBGEventCount] ld a, [wCurMapBGEventCount]
ld [hli], a ld [hli], a
ld a, e ld a, e
ld [hli], a ld [hli], a
@ -4519,7 +4519,7 @@ Function1159fb:
jp Function11425c jp Function11425c
.asm_115a45 .asm_115a45
ld hl, wCurrMapCallbackCount ld hl, wCurMapCallbackCount
ld a, [hli] ld a, [hli]
cpl cpl
ld e, a ld e, a
@ -4726,9 +4726,9 @@ Function115b00:
ld b, [hl] ld b, [hl]
inc hl inc hl
push hl push hl
ld a, [wCurrMapCallbackCount] ld a, [wCurMapCallbackCount]
ld l, a ld l, a
ld a, [wCurrMapCallbacksPointer] ld a, [wCurMapCallbacksPointer]
ld h, a ld h, a
cp b cp b
jr c, .asm_115b36 jr c, .asm_115b36
@ -4748,14 +4748,14 @@ Function115b00:
inc bc inc bc
add hl, bc add hl, bc
ld a, l ld a, l
ld [wCurrMapCallbackCount], a ld [wCurMapCallbackCount], a
ld a, h ld a, h
ld [wCurrMapCallbacksPointer], a ld [wCurMapCallbacksPointer], a
pop bc pop bc
pop hl pop hl
ld hl, wCurrMapSceneScriptCount ld hl, wCurMapSceneScriptCount
ld a, [hli] ld a, [hli]
ld [wCurrMapBGEventCount], a ld [wCurMapBGEventCount], a
ldh [hFF8C], a ldh [hFF8C], a
ld [MBC3SRamBank], a ld [MBC3SRamBank], a
ld e, [hl] ld e, [hl]
@ -4763,8 +4763,8 @@ Function115b00:
ld d, [hl] ld d, [hl]
ld hl, $dc26 ld hl, $dc26
call Function115d6a call Function115d6a
ld hl, wCurrMapSceneScriptCount ld hl, wCurMapSceneScriptCount
ld a, [wCurrMapBGEventCount] ld a, [wCurMapBGEventCount]
ld [hli], a ld [hli], a
ld a, e ld a, e
ld [hli], a ld [hli], a
@ -5130,7 +5130,7 @@ Function115d6a:
Function115d77: Function115d77:
push bc push bc
ld bc, wCurrMapBGEventCount ld bc, wCurMapBGEventCount
call Function115d80 call Function115d80
pop bc pop bc
ret ret

2
mobile/mobile_46.asm
View File

@ -5544,7 +5544,7 @@ Function11ac51:
call Function11acb7 call Function11acb7
call Function11ad6e call Function11ad6e
ld a, 30 * SPRITEOAMSTRUCT_LENGTH ld a, 30 * SPRITEOAMSTRUCT_LENGTH
ld [wCurrSpriteOAMAddr], a ld [wCurSpriteOAMAddr], a
farcall DoNextFrameForAllSprites farcall DoNextFrameForAllSprites
farcall ReloadMapPart farcall ReloadMapPart
jr .loop jr .loop

4
sram.asm
View File

@ -83,7 +83,7 @@ sBackupCheckValue1:: db ; loaded with SAVE_CHECK_VALUE_1, used to check save cor
sBackupGameData:: ; b209 sBackupGameData:: ; b209
sBackupPlayerData:: ds wPlayerDataEnd - wPlayerData sBackupPlayerData:: ds wPlayerDataEnd - wPlayerData
sBackupCurrMapData:: ds wCurrMapDataEnd - wCurrMapData sBackupCurMapData:: ds wCurMapDataEnd - wCurMapData
sBackupPokemonData:: ds wPokemonDataEnd - wPokemonData sBackupPokemonData:: ds wPokemonDataEnd - wPokemonData
sBackupGameDataEnd:: sBackupGameDataEnd::
@ -106,7 +106,7 @@ sCheckValue1:: db ; loaded with SAVE_CHECK_VALUE_1, used to check save corruptio
sGameData:: ; a009 sGameData:: ; a009
sPlayerData:: ds wPlayerDataEnd - wPlayerData sPlayerData:: ds wPlayerDataEnd - wPlayerData
sCurrMapData:: ds wCurrMapDataEnd - wCurrMapData sCurMapData:: ds wCurMapDataEnd - wCurMapData
sPokemonData:: ds wPokemonDataEnd - wPokemonData sPokemonData:: ds wPokemonDataEnd - wPokemonData
sGameDataEnd:: sGameDataEnd::

72
wram.asm
View File

@ -155,8 +155,8 @@ wPrinterConnectionOpen:: db
wPrinterOpcode:: db wPrinterOpcode:: db
wPrevDexEntry:: db wPrevDexEntry:: db
wDisableTextAcceleration:: db wDisableTextAcceleration:: db
wPreviousLandmark:: db wPrevLandmark:: db
wCurrentLandmark:: db wCurLandmark:: db
wLandmarkSignTimer:: dw wLandmarkSignTimer:: dw
wLinkMode:: wLinkMode::
@ -256,20 +256,20 @@ wc3ac:: ds 8
ENDU ; c3b4 ENDU ; c3b4
wSpriteAnimCount:: db wSpriteAnimCount:: db
wCurrSpriteOAMAddr:: db wCurSpriteOAMAddr:: db
wCurIcon:: db ; c3b6 wCurIcon:: db ; c3b6
wCurIconTile:: db wCurIconTile:: db
wSpriteAnimAddrBackup:: wSpriteAnimAddrBackup::
wSpriteAnimIDBuffer:: wSpriteAnimIDBuffer::
wCurrSpriteAddSubFlags:: wCurSpriteAddSubFlags::
dw dw
wCurrAnimVTile:: db wCurAnimVTile:: db
wCurrAnimXCoord:: db wCurAnimXCoord:: db
wCurrAnimYCoord:: db wCurAnimYCoord:: db
wCurrAnimXOffset:: db wCurAnimXOffset:: db
wCurrAnimYOffset:: db wCurAnimYOffset:: db
wGlobalAnimYOffset:: db wGlobalAnimYOffset:: db
wGlobalAnimXOffset:: db wGlobalAnimXOffset:: db
wSpriteAnimsEnd:: wSpriteAnimsEnd::
@ -757,7 +757,7 @@ wLinkTradeGetmonSpecies:: db
NEXTU ; c6d0 NEXTU ; c6d0
; naming screen ; naming screen
wNamingScreenDestinationPointer:: dw ; c6d0 wNamingScreenDestinationPointer:: dw ; c6d0
wNamingScreenCurrNameLength:: db ; c6d2 wNamingScreenCurNameLength:: db ; c6d2
wNamingScreenMaxNameLength:: db ; c6d3 wNamingScreenMaxNameLength:: db ; c6d3
wNamingScreenType:: db ; c6d4 wNamingScreenType:: db ; c6d4
wNamingScreenCursorObjectPointer:: dw ; c6d5 wNamingScreenCursorObjectPointer:: dw ; c6d5
@ -793,10 +793,10 @@ wSlotBet:: db
wFirstTwoReelsMatching:: db wFirstTwoReelsMatching:: db
wFirstTwoReelsMatchingSevens:: db wFirstTwoReelsMatchingSevens:: db
wSlotMatched:: db wSlotMatched:: db
wCurrReelStopped:: ds 3 wCurReelStopped:: ds 3
wPayout:: dw wPayout:: dw
wCurrReelXCoord:: db wCurReelXCoord:: db
wCurrReelYCoord:: db wCurReelYCoord:: db
ds 2 ds 2
wSlotBuildingMatch:: db wSlotBuildingMatch:: db
wSlotsDataEnd:: wSlotsDataEnd::
@ -846,7 +846,7 @@ wDexListingScrollOffset:: db ; offset of the first displayed entry from the star
wDexListingCursor:: db ; Dex cursor wDexListingCursor:: db ; Dex cursor
wDexListingEnd:: db ; Last mon to display wDexListingEnd:: db ; Last mon to display
wDexListingHeight:: db ; number of entries displayed at once in the dex listing wDexListingHeight:: db ; number of entries displayed at once in the dex listing
wCurrentDexMode:: db ; Pokedex Mode wCurDexMode:: db ; Pokedex Mode
wDexSearchMonType1:: db ; first type to search wDexSearchMonType1:: db ; first type to search
wDexSearchMonType2:: db ; second type to search wDexSearchMonType2:: db ; second type to search
wDexSearchResultCount:: db wDexSearchResultCount:: db
@ -855,14 +855,14 @@ wDexArrowCursorDelayCounter:: db
wDexArrowCursorBlinkCounter:: db wDexArrowCursorBlinkCounter:: db
wDexSearchSlowpokeFrame:: db wDexSearchSlowpokeFrame:: db
wUnlockedUnownMode:: db wUnlockedUnownMode:: db
wDexCurrentUnownIndex:: db wDexCurUnownIndex:: db
wDexUnownCount:: db wDexUnownCount:: db
wDexConvertedMonType:: db ; mon type converted from dex search mon type wDexConvertedMonType:: db ; mon type converted from dex search mon type
wDexListingScrollOffsetBackup:: db wDexListingScrollOffsetBackup:: db
wDexListingCursorBackup:: db wDexListingCursorBackup:: db
wBackupDexListingCursor:: db wBackupDexListingCursor:: db
wBackupDexListingPage:: db wBackupDexListingPage:: db
wDexCurrentLocation:: db wDexCurLocation:: db
if DEF(_CRYSTAL11) if DEF(_CRYSTAL11)
wPokedexStatus:: db wPokedexStatus:: db
wPokedexDataEnd:: wPokedexDataEnd::
@ -1366,7 +1366,7 @@ wPokegearMapRegion:: db
NEXTU ; cf64 NEXTU ; cf64
; pack ; pack
wPackJumptableIndex:: db wPackJumptableIndex:: db
wCurrPocket:: db wCurPocket:: db
wPackUsedItem:: db wPackUsedItem:: db
NEXTU ; cf64 NEXTU ; cf64
@ -1659,7 +1659,7 @@ wPhoneCaller:: dw
NEXTU ; d002 NEXTU ; d002
; radio data ; radio data
wCurrentRadioLine:: db wCurRadioLine:: db
wNextRadioLine:: db wNextRadioLine:: db
wRadioTextDelay:: db wRadioTextDelay:: db
wNumRadioLinesPrinted:: db wNumRadioLinesPrinted:: db
@ -2677,21 +2677,21 @@ wBikeFlags:: ; dbf5
db db
ds 1 ; cleared along with wBikeFlags by ResetBikeFlags ds 1 ; cleared along with wBikeFlags by ResetBikeFlags
wCurrMapSceneScriptPointer:: dw ; dbf7 wCurMapSceneScriptPointer:: dw ; dbf7
wCurrentCaller:: dw ; dbf9 wCurCaller:: dw ; dbf9
wCurrMapWarpCount:: db ; dbfb wCurMapWarpCount:: db ; dbfb
wCurrMapWarpsPointer:: dw ; dbfc wCurMapWarpsPointer:: dw ; dbfc
wCurrMapCoordEventCount:: db ; dbfe wCurMapCoordEventCount:: db ; dbfe
wCurrMapCoordEventsPointer:: dw ; dbff wCurMapCoordEventsPointer:: dw ; dbff
wCurrMapBGEventCount:: db ; dc01 wCurMapBGEventCount:: db ; dc01
wCurrMapBGEventsPointer:: dw ; dc02 wCurMapBGEventsPointer:: dw ; dc02
wCurrMapObjectEventCount:: db ; dc04 wCurMapObjectEventCount:: db ; dc04
wCurrMapObjectEventsPointer:: dw ; dc05 wCurMapObjectEventsPointer:: dw ; dc05
wCurrMapSceneScriptCount:: db ; dc07 wCurMapSceneScriptCount:: db ; dc07
wCurrMapSceneScriptsPointer:: dw ; dc08 wCurMapSceneScriptsPointer:: dw ; dc08
wCurrMapCallbackCount:: db ; dc0a wCurMapCallbackCount:: db ; dc0a
wCurrMapCallbacksPointer:: dw ; dc0b wCurMapCallbacksPointer:: dw ; dc0b
ds 2 ds 2
@ -2770,7 +2770,7 @@ wKurtApricornQuantity:: db
wPlayerDataEnd:: wPlayerDataEnd::
wCurrMapData:: wCurMapData::
wVisitedSpawns:: flag_array NUM_SPAWNS ; dca5 wVisitedSpawns:: flag_array NUM_SPAWNS ; dca5
@ -2796,7 +2796,7 @@ wYCoord:: db ; dcb7 ; current y coordinate relative to top-left corner of curren
wXCoord:: db ; dcb8 ; current x coordinate relative to top-left corner of current map wXCoord:: db ; dcb8 ; current x coordinate relative to top-left corner of current map
wScreenSave:: ds SCREEN_META_WIDTH * SCREEN_META_HEIGHT wScreenSave:: ds SCREEN_META_WIDTH * SCREEN_META_HEIGHT
wCurrMapDataEnd:: wCurMapDataEnd::
SECTION "Party", WRAMX SECTION "Party", WRAMX
@ -2876,8 +2876,8 @@ wRoamMon1:: roam_struct wRoamMon1 ; dfcf
wRoamMon2:: roam_struct wRoamMon2 ; dfd6 wRoamMon2:: roam_struct wRoamMon2 ; dfd6
wRoamMon3:: roam_struct wRoamMon3 ; dfdd wRoamMon3:: roam_struct wRoamMon3 ; dfdd
wRoamMons_CurrentMapNumber:: db wRoamMons_CurMapNumber:: db
wRoamMons_CurrentMapGroup:: db wRoamMons_CurMapGroup:: db
wRoamMons_LastMapNumber:: db wRoamMons_LastMapNumber:: db
wRoamMons_LastMapGroup:: db wRoamMons_LastMapGroup:: db