mirror of
https://github.com/pret/poketcg.git
synced 2026-04-26 00:12:05 -05:00
Fix typos
This commit is contained in:
dannye
parent
d5262b8b07
commit
3e36b5fd9d
|
|
@ -132,7 +132,7 @@ Each deck AI lists some Pokémon card IDs that have an associated score for retr
|
|||
db $00
|
||||
```
|
||||
|
||||
However, the game never actually stores the pointer to these lists (a notable expection being the Legendary Moltres deck), so the AI cannot access these score modifiers.
|
||||
However, the game never actually stores the pointer to these lists (a notable exception being the Legendary Moltres deck), so the AI cannot access these score modifiers.
|
||||
|
||||
**Fix:** Edit all applicable decks in `src/engine/ai/decks/`, uncommenting the following line:
|
||||
```diff
|
||||
|
|
|
|||
|
|
@ -128,7 +128,7 @@ PointerTable_AttackAnimation:
|
|||
dw AttackAnimation_PoisonFang ; ATK_ANIM_104
|
||||
dw AttackAnimation_558c ; ATK_ANIM_105
|
||||
dw AttackAnimation_FriendshipSong ; ATK_ANIM_FRIENDSHIP_SONG
|
||||
dw AttackAnimation_Schrunch ; ATK_ANIM_SCRUNCH
|
||||
dw AttackAnimation_Scrunch ; ATK_ANIM_SCRUNCH
|
||||
dw AttackAnimation_CatPunch ; ATK_ANIM_CAT_PUNCH
|
||||
dw AttackAnimation_MagneticStorm ; ATK_ANIM_MAGNETIC_STORM
|
||||
dw AttackAnimation_PoisonWhip ; ATK_ANIM_POISON_WHIP
|
||||
|
|
@ -715,7 +715,7 @@ AttackAnimation_FriendshipSong:
|
|||
anim_player DUEL_ANIM_SING
|
||||
anim_end
|
||||
|
||||
AttackAnimation_Schrunch:
|
||||
AttackAnimation_Scrunch:
|
||||
anim_player DUEL_ANIM_GLOW
|
||||
anim_player DUEL_ANIM_EXPAND
|
||||
anim_end
|
||||
|
|
|
|||
|
|
@ -3749,8 +3749,8 @@ FiltersCardSelectionParams: ; 9667 (2:5667)
|
|||
db 0 ; y spacing
|
||||
db 2 ; x spacing
|
||||
db NUM_FILTERS ; num entries
|
||||
db SYM_CURSOR_D ; visible cusor tile
|
||||
db SYM_SPACE ; invisible cusor tile
|
||||
db SYM_CURSOR_D ; visible cursor tile
|
||||
db SYM_SPACE ; invisible cursor tile
|
||||
dw NULL ; wCardListHandlerFunction
|
||||
|
||||
FilteredCardListSelectionParams: ; 9670 (2:5670)
|
||||
|
|
@ -4133,7 +4133,7 @@ AppendOwnedCardCountAndStorageCountNumbers: ; 9880 (2:5880)
|
|||
push bc
|
||||
push de
|
||||
push hl
|
||||
; count how many bytes untill $00
|
||||
; count how many bytes until $00
|
||||
.loop
|
||||
ld a, [hl]
|
||||
or a
|
||||
|
|
|
|||
|
|
@ -2549,7 +2549,7 @@ ScriptCommand_PickNextMan1RequestedCard: ; cfd4 (3:4fd4)
|
|||
jr nz, .shift_loop
|
||||
.skip_shift
|
||||
ld a, e
|
||||
and b ; has this card already been chosed before?
|
||||
and b ; has this card already been chosen before?
|
||||
pop bc
|
||||
jr nz, .choose_again
|
||||
ld a, e
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ _PauseMenu_Status: ; 10059 (4:4059)
|
|||
push af
|
||||
call Func_10000
|
||||
xor a
|
||||
ld [wMedalScreenYOffeset], a
|
||||
ld [wMedalScreenYOffset], a
|
||||
call LoadCollectedMedalTilemaps
|
||||
lb de, 0, 0
|
||||
lb bc, 20, 8
|
||||
|
|
@ -139,13 +139,13 @@ LoadCollectedMedalTilemaps: ; 1010c (4:410c)
|
|||
xor a
|
||||
ld [wd291], a
|
||||
lb de, 0, 8
|
||||
ld a, [wMedalScreenYOffeset]
|
||||
ld a, [wMedalScreenYOffset]
|
||||
add e
|
||||
ld e, a
|
||||
lb bc, 20, 10
|
||||
call DrawRegularTextBox
|
||||
lb de, 6, 9
|
||||
ld a, [wMedalScreenYOffeset]
|
||||
ld a, [wMedalScreenYOffset]
|
||||
add e
|
||||
ld e, a
|
||||
call AdjustCoordinatesForBGScroll
|
||||
|
|
@ -166,7 +166,7 @@ LoadCollectedMedalTilemaps: ; 1010c (4:410c)
|
|||
jr z, .asm_10157
|
||||
ld b, [hl]
|
||||
inc hl
|
||||
ld a, [wMedalScreenYOffeset]
|
||||
ld a, [wMedalScreenYOffset]
|
||||
add [hl]
|
||||
ld c, a
|
||||
inc hl
|
||||
|
|
@ -220,7 +220,7 @@ Func_10197: ; 10197 (4:4197)
|
|||
add hl, bc
|
||||
ld b, [hl]
|
||||
inc hl
|
||||
ld a, [wMedalScreenYOffeset]
|
||||
ld a, [wMedalScreenYOffset]
|
||||
add [hl]
|
||||
ld c, a
|
||||
ld a, [wd116]
|
||||
|
|
@ -380,7 +380,7 @@ Medal_1029e: ; 1029e (4:429e)
|
|||
call DisableLCD
|
||||
call Func_10000
|
||||
ld a, -6
|
||||
ld [wMedalScreenYOffeset], a
|
||||
ld [wMedalScreenYOffset], a
|
||||
call LoadCollectedMedalTilemaps
|
||||
pop bc
|
||||
ld a, c
|
||||
|
|
@ -799,9 +799,9 @@ _PauseMenu_Config: ; 10548 (4:4548)
|
|||
call Func_111b3
|
||||
call Func_105cd
|
||||
ld a, 0
|
||||
call ShowRighArrowCursor
|
||||
call ShowRightArrowCursor
|
||||
ld a, 1
|
||||
call ShowRighArrowCursor
|
||||
call ShowRightArrowCursor
|
||||
xor a
|
||||
ld [wCursorBlinkTimer], a
|
||||
call FlashWhiteScreen
|
||||
|
|
@ -933,12 +933,12 @@ Func_10649: ; 10649 (4:4649)
|
|||
and $10
|
||||
jr z, .asm_10654
|
||||
pop af
|
||||
jr HideRighArrowCursor
|
||||
jr HideRightArrowCursor
|
||||
.asm_10654
|
||||
pop af
|
||||
jr ShowRighArrowCursor
|
||||
jr ShowRightArrowCursor
|
||||
|
||||
ShowRighArrowCursor: ; 10657 (4:4657)
|
||||
ShowRightArrowCursor: ; 10657 (4:4657)
|
||||
push bc
|
||||
ld c, a
|
||||
ld a, SYM_CURSOR_R
|
||||
|
|
@ -946,7 +946,7 @@ ShowRighArrowCursor: ; 10657 (4:4657)
|
|||
pop bc
|
||||
ret
|
||||
|
||||
HideRighArrowCursor: ; 10660 (4:4660)
|
||||
HideRightArrowCursor: ; 10660 (4:4660)
|
||||
push bc
|
||||
ld c, a
|
||||
ld a, SYM_SPACE
|
||||
|
|
@ -1031,11 +1031,11 @@ ConfigScreenDPadDown: ; 106c2 (4:46c2)
|
|||
ld a, [wConfigCursorYPos]
|
||||
cp 2
|
||||
jr z, .hide_cursor
|
||||
call ShowRighArrowCursor
|
||||
call ShowRightArrowCursor
|
||||
jr .skip
|
||||
.hide_cursor
|
||||
; hide "exit settings" cursor if leaving bottom row
|
||||
call HideRighArrowCursor
|
||||
call HideRightArrowCursor
|
||||
.skip
|
||||
ld a, [wConfigCursorYPos]
|
||||
ld b, a
|
||||
|
|
@ -1077,11 +1077,11 @@ ConfigScreenDPadLeft: ; 10706 (4:4706)
|
|||
.left_or_right
|
||||
push af
|
||||
ld a, [wConfigCursorYPos]
|
||||
call HideRighArrowCursor
|
||||
call HideRightArrowCursor
|
||||
pop af
|
||||
call Func_1071e
|
||||
ld a, [wConfigCursorYPos]
|
||||
call ShowRighArrowCursor
|
||||
call ShowRightArrowCursor
|
||||
xor a
|
||||
ld [wCursorBlinkTimer], a
|
||||
ret
|
||||
|
|
@ -2777,7 +2777,7 @@ OverworldMap_InitNextPlayerVelocity: ; 110a6 (4:50a6)
|
|||
.positive2
|
||||
; if the absolute value of wOverworldMapPlayerPathVerticalMovement is larger than
|
||||
; the absolute value of wOverworldMapPlayerPathHorizontalMovement, this is dominantly
|
||||
; a north/south movement. otherswise, an east/west movement
|
||||
; a north/south movement. otherwise, an east/west movement
|
||||
ld a, b
|
||||
cp c
|
||||
jr c, .north_south
|
||||
|
|
@ -3469,7 +3469,7 @@ wram_sram_map: MACRO
|
|||
ENDM
|
||||
|
||||
; maps WRAM addresses to SRAM addresses in order
|
||||
; to save and subsequently retreive them on game load
|
||||
; to save and subsequently retrieve them on game load
|
||||
; also works as a test in order check whether
|
||||
; the saved values is SRAM are legal, within the given value range
|
||||
WRAMToSRAMMapper: ; 11498 (4:5498)
|
||||
|
|
@ -6925,7 +6925,7 @@ ChallengeMachine_Start: ; 131d3 (4:71d3)
|
|||
jr z, .resume_challenge
|
||||
|
||||
; new challenge
|
||||
call ChallengeMachine_PickOpponentSequnce
|
||||
call ChallengeMachine_PickOpponentSequence
|
||||
call ChallengeMachine_DrawScoreScreen
|
||||
call FlashWhiteScreen
|
||||
ldtx hl, PlayTheChallengeMachineText
|
||||
|
|
@ -7592,7 +7592,7 @@ ChallengeMachine_DrMasonText: ; 13674 (4:7674)
|
|||
text "Dr. Mason", TX_END, TX_END, TX_END, TX_END, TX_END, TX_END
|
||||
|
||||
; pick the next opponent sequence and clear challenge vars
|
||||
ChallengeMachine_PickOpponentSequnce: ; 13684 (4:7684)
|
||||
ChallengeMachine_PickOpponentSequence: ; 13684 (4:7684)
|
||||
call EnableSRAM
|
||||
|
||||
; pick first opponent
|
||||
|
|
|
|||
|
|
@ -1827,7 +1827,7 @@ RequestCloseIRCommunication: ; 19865 (6:5865)
|
|||
call TransmitIRDataBuffer
|
||||
; fallthrough
|
||||
|
||||
; calls CloseIRCommunications while perserving af
|
||||
; calls CloseIRCommunications while preserving af
|
||||
SafelyCloseIRCommunications: ; 19870 (6:5870)
|
||||
push af
|
||||
call CloseIRCommunications
|
||||
|
|
@ -2148,7 +2148,7 @@ LoadLinkConnectingScene: ; 19a1f (6:5a1f)
|
|||
|
||||
; shows Link Not Connected scene
|
||||
; then asks the player whether they want to try again
|
||||
; if the player selectes "no", return carry
|
||||
; if the player selects "no", return carry
|
||||
; input:
|
||||
; - hl = text ID
|
||||
LoadLinkNotConnectedSceneAndAskWhetherToTryAgain: ; 19a33 (6:5a33)
|
||||
|
|
@ -2313,7 +2313,7 @@ SetIRCommunicationErrorCode_NoError: ; 19b0d (6:5b0d)
|
|||
|
||||
; makes device receptive to receive data from other device
|
||||
; to write in wDuelTempList (either list of cards or a deck configuration)
|
||||
; returns carry if some error occured
|
||||
; returns carry if some error occurred
|
||||
TryReceiveCardOrDeckConfigurationThroughIR: ; 19b20 (6:5b20)
|
||||
call InitIRCommunications
|
||||
.loop_receive_request
|
||||
|
|
@ -2732,7 +2732,7 @@ DecideCardToReceiveFromCardPop: ; 19d92 (6:5d92)
|
|||
; depending on the values obtained from the hashes,
|
||||
; determine which rarity card to give to the player
|
||||
; along with the song to play with each rarity
|
||||
; the probabilites of each possibility can be calculated
|
||||
; the probabilities of each possibility can be calculated
|
||||
; as follows (given 2 random player names):
|
||||
; 101/256 ~ 39% for Circle
|
||||
; 90/256 ~ 35% for Diamond
|
||||
|
|
@ -2876,7 +2876,7 @@ _PreparePrinterConnection: ; 19e42 (6:5e42)
|
|||
ld a, [hl]
|
||||
cp $ff
|
||||
jr z, ShowPrinterIsNotConnected
|
||||
; falltrough
|
||||
; fallthrough
|
||||
|
||||
; shows message on screen depending on wPrinterStatus
|
||||
; also shows SCENE_GAMEBOY_PRINTER_NOT_CONNECTED.
|
||||
|
|
|
|||
|
|
@ -1329,7 +1329,7 @@ LoadDuelAnimationToBuffer: ; 1ca31 (7:4a31)
|
|||
ret
|
||||
|
||||
; loads the animations from wDuelAnimBuffer
|
||||
; in acending order, starting at wDuelAnimBufferCurPos
|
||||
; in ascending order, starting at wDuelAnimBufferCurPos
|
||||
PlayBufferedDuelAnimations: ; 1ca6e (7:4a6e)
|
||||
push hl
|
||||
push bc
|
||||
|
|
@ -1878,7 +1878,7 @@ WhiteFlashScreen: ; 1cd76 (7:4d76)
|
|||
ld a, [wScreenAnimDuration]
|
||||
or a
|
||||
ret nz
|
||||
; retreive the previous background pals
|
||||
; retrieve the previous background pals
|
||||
ld hl, wTempBackgroundPalettesCGB
|
||||
ld de, wBackgroundPalettesCGB
|
||||
ld bc, 8 palettes
|
||||
|
|
|
|||
|
|
@ -784,7 +784,7 @@ LoadPaletteData: ; 80418 (20:4418)
|
|||
cp $01
|
||||
jr z, .obp1
|
||||
|
||||
ld a, [hli] ; pallete for OBP0
|
||||
ld a, [hli] ; palette for OBP0
|
||||
push hl
|
||||
push bc
|
||||
call SetOBP0
|
||||
|
|
@ -794,7 +794,7 @@ LoadPaletteData: ; 80418 (20:4418)
|
|||
jr z, .check_palette_size
|
||||
|
||||
.obp1
|
||||
ld a, [hli] ; pallete for OBP1
|
||||
ld a, [hli] ; palette for OBP1
|
||||
push hl
|
||||
push bc
|
||||
call SetOBP1
|
||||
|
|
@ -1300,7 +1300,7 @@ Func_80baa: ; 80baa (20:4baa)
|
|||
Func_80c64: ; 80c64 (20:4c64)
|
||||
ld a, [wLineSeparation]
|
||||
push af
|
||||
ld a, $01 ; no line separatior
|
||||
ld a, $01 ; no line separator
|
||||
ld [wLineSeparation], a
|
||||
; load opponent's name
|
||||
ld a, [wOpponentName]
|
||||
|
|
|
|||
|
|
@ -1534,7 +1534,7 @@ UpdateRNGSources: ; 089b (0:089b)
|
|||
pop hl
|
||||
ret
|
||||
|
||||
; initilizes variables used to decompress data in DecompressData
|
||||
; initializes variables used to decompress data in DecompressData
|
||||
; de = source of compressed data
|
||||
; b = HIGH byte of secondary buffer ($100 bytes of buffer space)
|
||||
; also clears this $100 byte space
|
||||
|
|
|
|||
|
|
@ -468,7 +468,7 @@ ENDU
|
|||
|
||||
ds $1d
|
||||
|
||||
; signals what error, if any, occured
|
||||
; signals what error, if any, occurred
|
||||
; during IR communications
|
||||
; 0 means there was no error
|
||||
wIRCommunicationErrorCode:: ; c5ea
|
||||
|
|
@ -651,7 +651,7 @@ wDecompRepeatModeToggle:: ; cada
|
|||
; stores in both nybbles the length of the
|
||||
; sequences to copy in decompression
|
||||
; the high nybble is used first, then the low nybble
|
||||
; for a subsequent sequence repition
|
||||
; for a subsequent sequence repetition
|
||||
wDecompRepeatLengths:: ; cadb
|
||||
ds $1
|
||||
|
||||
|
|
@ -1898,7 +1898,7 @@ wPrinterNumCardTypes:: ; ce97
|
|||
ds $1
|
||||
|
||||
; related to printer functions
|
||||
; only wrtten to but never read
|
||||
; only written to but never read
|
||||
wce98:: ; ce98
|
||||
ds $1
|
||||
|
||||
|
|
@ -2396,7 +2396,7 @@ wd112:: ; d112
|
|||
wMatchStartTheme:: ; d113
|
||||
ds $1
|
||||
|
||||
wMedalScreenYOffeset:: ; d114
|
||||
wMedalScreenYOffset:: ; d114
|
||||
ds $1
|
||||
|
||||
wd115:: ; d115
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user