mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2024-11-16 11:27:33 -08:00
Sync some files with pokegold
This commit is contained in:
parent
8bf76af5a7
commit
dc18e188b2
@ -1729,7 +1729,7 @@ Most of the NPCs in [maps/NationalParkBugContest.asm](https://github.com/pret/po
|
|||||||
```diff
|
```diff
|
||||||
.CheckWarp:
|
.CheckWarp:
|
||||||
-; Bug: Since no case is made for STANDING here, it will check
|
-; Bug: Since no case is made for STANDING here, it will check
|
||||||
-; [.edgewarps + $ff]. This resolves to $3e at $8035a.
|
-; [.EdgeWarps + $ff]. This resolves to $3e.
|
||||||
-; This causes wWalkingIntoEdgeWarp to be nonzero when standing on tile $3e,
|
-; This causes wWalkingIntoEdgeWarp to be nonzero when standing on tile $3e,
|
||||||
-; making bumps silent.
|
-; making bumps silent.
|
||||||
-
|
-
|
||||||
|
@ -2746,9 +2746,9 @@ _UpdateSprites::
|
|||||||
.fill
|
.fill
|
||||||
ld a, [wVramState]
|
ld a, [wVramState]
|
||||||
bit 1, a
|
bit 1, a
|
||||||
ld b, OBJECT_LENGTH * SPRITEOAMSTRUCT_LENGTH
|
ld b, NUM_SPRITE_OAM_STRUCTS * SPRITEOAMSTRUCT_LENGTH
|
||||||
jr z, .ok
|
jr z, .ok
|
||||||
ld b, 28 * SPRITEOAMSTRUCT_LENGTH
|
ld b, (NUM_SPRITE_OAM_STRUCTS - 12) * SPRITEOAMSTRUCT_LENGTH
|
||||||
.ok
|
.ok
|
||||||
ldh a, [hUsedSpriteIndex]
|
ldh a, [hUsedSpriteIndex]
|
||||||
cp b
|
cp b
|
||||||
|
@ -392,7 +392,7 @@ DoPlayerMovement::
|
|||||||
|
|
||||||
.CheckWarp:
|
.CheckWarp:
|
||||||
; Bug: Since no case is made for STANDING here, it will check
|
; Bug: Since no case is made for STANDING here, it will check
|
||||||
; [.edgewarps + $ff]. This resolves to $3e at $8035a.
|
; [.EdgeWarps + $ff]. This resolves to $3e.
|
||||||
; This causes wWalkingIntoEdgeWarp to be nonzero when standing on tile $3e,
|
; This causes wWalkingIntoEdgeWarp to be nonzero when standing on tile $3e,
|
||||||
; making bumps silent.
|
; making bumps silent.
|
||||||
|
|
||||||
|
@ -2360,5 +2360,5 @@ Script_checkver_duplicate: ; unreferenced
|
|||||||
ld [wScriptVar], a
|
ld [wScriptVar], a
|
||||||
ret
|
ret
|
||||||
|
|
||||||
.gs_version
|
.gs_version:
|
||||||
db GS_VERSION
|
db GS_VERSION
|
||||||
|
@ -1718,6 +1718,7 @@ Radio_BackUpFarCallParams:
|
|||||||
NoRadioStation:
|
NoRadioStation:
|
||||||
call NoRadioMusic
|
call NoRadioMusic
|
||||||
call NoRadioName
|
call NoRadioName
|
||||||
|
; no radio channel
|
||||||
xor a
|
xor a
|
||||||
ld [wPokegearRadioChannelBank], a
|
ld [wPokegearRadioChannelBank], a
|
||||||
ld [wPokegearRadioChannelAddr], a
|
ld [wPokegearRadioChannelAddr], a
|
||||||
@ -2739,7 +2740,7 @@ TownMapPlayerIcon:
|
|||||||
ld c, 4 ; # tiles
|
ld c, 4 ; # tiles
|
||||||
call Request2bpp
|
call Request2bpp
|
||||||
; Walking icon
|
; Walking icon
|
||||||
ld hl, $c0
|
ld hl, 12 tiles
|
||||||
add hl, de
|
add hl, de
|
||||||
ld d, h
|
ld d, h
|
||||||
ld e, l
|
ld e, l
|
||||||
|
@ -41,7 +41,7 @@ MonMenuLoop:
|
|||||||
.loop
|
.loop
|
||||||
ld a, MENU_UNUSED_3 | MENU_BACKUP_TILES_2 ; flags
|
ld a, MENU_UNUSED_3 | MENU_BACKUP_TILES_2 ; flags
|
||||||
ld [wMenuDataFlags], a
|
ld [wMenuDataFlags], a
|
||||||
ld a, [wMonSubmenuCount] ; items
|
ld a, [wMonSubmenuCount]
|
||||||
ld [wMenuDataItems], a
|
ld [wMenuDataItems], a
|
||||||
call InitVerticalMenuCursor
|
call InitVerticalMenuCursor
|
||||||
ld hl, w2DMenuFlags1
|
ld hl, w2DMenuFlags1
|
||||||
|
@ -71,7 +71,7 @@ PrintDexEntry:
|
|||||||
ld hl, hVBlank
|
ld hl, hVBlank
|
||||||
ld a, [hl]
|
ld a, [hl]
|
||||||
push af
|
push af
|
||||||
ld [hl], 4
|
ld [hl], 4 ; vblank mode that calls AskSerial
|
||||||
|
|
||||||
ld a, 8 ; 16 rows
|
ld a, 8 ; 16 rows
|
||||||
ld [wPrinterQueueLength], a
|
ld [wPrinterQueueLength], a
|
||||||
@ -146,7 +146,7 @@ PrintPCBox:
|
|||||||
ld hl, hVBlank
|
ld hl, hVBlank
|
||||||
ld a, [hl]
|
ld a, [hl]
|
||||||
push af
|
push af
|
||||||
ld [hl], $4
|
ld [hl], 4 ; vblank mode that calls AskSerial
|
||||||
|
|
||||||
xor a
|
xor a
|
||||||
ldh [hBGMapMode], a
|
ldh [hBGMapMode], a
|
||||||
@ -212,19 +212,23 @@ Printer_ResetRegistersAndStartDataSend:
|
|||||||
PrintUnownStamp:
|
PrintUnownStamp:
|
||||||
ld a, [wPrinterQueueLength]
|
ld a, [wPrinterQueueLength]
|
||||||
push af
|
push af
|
||||||
|
|
||||||
xor a
|
xor a
|
||||||
ldh [hPrinter], a
|
ldh [hPrinter], a
|
||||||
call Printer_PlayMusic
|
call Printer_PlayMusic
|
||||||
|
|
||||||
ldh a, [rIE]
|
ldh a, [rIE]
|
||||||
push af
|
push af
|
||||||
xor a
|
xor a
|
||||||
ldh [rIF], a
|
ldh [rIF], a
|
||||||
ld a, (1 << SERIAL) | (1 << VBLANK)
|
ld a, (1 << SERIAL) | (1 << VBLANK)
|
||||||
ldh [rIE], a
|
ldh [rIE], a
|
||||||
|
|
||||||
ld hl, hVBlank
|
ld hl, hVBlank
|
||||||
ld a, [hl]
|
ld a, [hl]
|
||||||
push af
|
push af
|
||||||
ld [hl], $4
|
ld [hl], 4 ; vblank mode that calls AskSerial
|
||||||
|
|
||||||
xor a
|
xor a
|
||||||
ldh [hBGMapMode], a
|
ldh [hBGMapMode], a
|
||||||
call LoadTilemapToTempTilemap
|
call LoadTilemapToTempTilemap
|
||||||
@ -233,6 +237,7 @@ PrintUnownStamp:
|
|||||||
call Printer_PrepareTilemapForPrint
|
call Printer_PrepareTilemapForPrint
|
||||||
call SafeLoadTempTilemapToTilemap
|
call SafeLoadTempTilemapToTilemap
|
||||||
call Printer_ResetJoypadRegisters
|
call Printer_ResetJoypadRegisters
|
||||||
|
|
||||||
ld a, 18 / 2
|
ld a, 18 / 2
|
||||||
ld [wPrinterQueueLength], a
|
ld [wPrinterQueueLength], a
|
||||||
.loop
|
.loop
|
||||||
@ -260,10 +265,12 @@ PrintUnownStamp:
|
|||||||
ldh [hVBlank], a
|
ldh [hVBlank], a
|
||||||
call Printer_CleanUpAfterSend
|
call Printer_CleanUpAfterSend
|
||||||
call SafeLoadTempTilemapToTilemap
|
call SafeLoadTempTilemapToTilemap
|
||||||
|
|
||||||
xor a
|
xor a
|
||||||
ldh [rIF], a
|
ldh [rIF], a
|
||||||
pop af
|
pop af
|
||||||
ldh [rIE], a
|
ldh [rIE], a
|
||||||
|
|
||||||
pop af
|
pop af
|
||||||
ld [wPrinterQueueLength], a
|
ld [wPrinterQueueLength], a
|
||||||
ret
|
ret
|
||||||
@ -295,7 +302,7 @@ PrintMail:
|
|||||||
ld hl, hVBlank
|
ld hl, hVBlank
|
||||||
ld a, [hl]
|
ld a, [hl]
|
||||||
push af
|
push af
|
||||||
ld [hl], $4
|
ld [hl], 4 ; vblank mode that calls AskSerial
|
||||||
|
|
||||||
ld a, 18 / 2
|
ld a, 18 / 2
|
||||||
ld [wPrinterQueueLength], a
|
ld [wPrinterQueueLength], a
|
||||||
@ -338,7 +345,7 @@ PrintPartymon:
|
|||||||
ld hl, hVBlank
|
ld hl, hVBlank
|
||||||
ld a, [hl]
|
ld a, [hl]
|
||||||
push af
|
push af
|
||||||
ld [hl], $4
|
ld [hl], 4 ; vblank mode that calls AskSerial
|
||||||
|
|
||||||
ld a, 16 / 2
|
ld a, 16 / 2
|
||||||
ld [wPrinterQueueLength], a
|
ld [wPrinterQueueLength], a
|
||||||
@ -396,7 +403,7 @@ _PrintDiploma:
|
|||||||
ld hl, hVBlank
|
ld hl, hVBlank
|
||||||
ld a, [hl]
|
ld a, [hl]
|
||||||
push af
|
push af
|
||||||
ld [hl], $4
|
ld [hl], 4 ; vblank mode that calls AskSerial
|
||||||
|
|
||||||
ln a, 1, 0 ; to be loaded to wPrinterMargins
|
ln a, 1, 0 ; to be loaded to wPrinterMargins
|
||||||
call Printer_PrepareTilemapForPrint
|
call Printer_PrepareTilemapForPrint
|
||||||
|
@ -93,7 +93,7 @@ TilesetJohtoAnim:
|
|||||||
dw NULL, DoneTileAnimation
|
dw NULL, DoneTileAnimation
|
||||||
|
|
||||||
UnusedTilesetAnim1: ; unreferenced
|
UnusedTilesetAnim1: ; unreferenced
|
||||||
; Scrolls tile $03 like water, but also has the standard $03 flower tile.
|
; Scrolls tile $03 like cave water, but also has the standard $03 flower tile.
|
||||||
dw vTiles2 tile $03, ReadTileToAnimBuffer
|
dw vTiles2 tile $03, ReadTileToAnimBuffer
|
||||||
dw wTileAnimBuffer, ScrollTileRightLeft
|
dw wTileAnimBuffer, ScrollTileRightLeft
|
||||||
dw vTiles2 tile $03, WriteTileFromAnimBuffer
|
dw vTiles2 tile $03, WriteTileFromAnimBuffer
|
||||||
|
Loading…
Reference in New Issue
Block a user