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

Fix comment/style issues caused from w-izing.

Browse Source
This commit is contained in:
luckytyphlosion
2018-01-30 14:05:25 -05:00
parent a1951cefc0
commit 3203ad7d50
13 changed files with 138 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/battle/ai/items.asm
View File

@@ -21,7 +21,7 @@ AI_SwitchOrTryItem: ; 38000
jr nz, DontSwitch
ld hl, TrainerClassAttributes + TRNATTR_AI_ITEM_SWITCH
ld a, [wInBattleTowerBattle] ; Load always the first wTrainerClass for BattleTower-Trainers
ld a, [wInBattleTowerBattle] ; always load the first trainer class in wTrainerClass for BattleTower-Trainers
and a
jr nz, .ok

2
engine/battle/ai/move.asm
View File

@@ -66,7 +66,7 @@ AIChooseMove: ; 440ce
.ApplyLayers:
ld hl, TrainerClassAttributes + TRNATTR_AI_MOVE_WEIGHTS
; If we have a battle in BattleTower just load the Attributes of the first wTrainerClass (Falkner)
; If we have a battle in BattleTower just load the Attributes of the first trainer class in wTrainerClass (Falkner)
; so we have always the same AI, regardless of the loaded class of trainer
ld a, [wInBattleTowerBattle]
bit 0, a

5
engine/battle/core.asm
View File

@@ -6133,7 +6133,7 @@ LoadEnemyMon: ; 3e8eb
; Notes:
; BattleRandom is used to ensure sync between Game Boys
; Clear the whole wEnemyMon struct
; Clear the whole enemy mon struct (wEnemyMon)
xor a
ld hl, wEnemyMonSpecies
ld bc, wEnemyMonEnd - wEnemyMon
@@ -6989,7 +6989,8 @@ ApplyStatLevelMultiplier: ; 3ecb7
; 3ed45
BadgeStatBoosts: ; 3ed45
; Raise wBattleMon stats depending on which badges have been obtained.
; Raise the stats of the battle mon in wBattleMon
; depending on which badges have been obtained.
; Every other badge boosts a stat, starting from the first.

2
engine/color.asm
View File

@@ -602,7 +602,7 @@ ApplyPals:
ld hl, wBGPals1
ld de, wBGPals2
ld bc, 16 palettes
ld a, BANK(wPals)
ld a, BANK(wGBCPalettes)
call FarCopyWRAM
ret

2
engine/credits.asm
View File

@@ -13,7 +13,7 @@ Credits:: ; 109847
ld a, [rSVBK]
push af
ld a, BANK(wPals)
ld a, BANK(wGBCPalettes)
ld [rSVBK], a
call ClearBGPalettes

2
engine/crystal_intro.asm
View File

@@ -352,7 +352,7 @@ INCBIN "gfx/splash/logo2.1bpp"
CrystalIntro: ; e48ac
ld a, [rSVBK]
push af
ld a, BANK(wPals)
ld a, BANK(wGBCPalettes)
ld [rSVBK], a
ld a, [hInMenu]
push af

2
engine/pic_animation.asm
View File

@@ -326,7 +326,7 @@ PokeAnim_InitPicAttributes: ; d01d6
ld [wPokeAnimPointer], a
ld a, b
ld [wPokeAnimPointer + 1], a
; hl contains wTileMap coords
; hl contains tilemap coords
ld a, l
ld [wPokeAnimCoord], a
ld a, h

2
engine/pokegear.asm
View File

@@ -247,7 +247,7 @@ InitPokegearTilemap: ; 90da8 (24:4da8)
xor a
ld [hBGMapMode], a
hlcoord 0, 0
ld bc, wTileMapEnd - wTileMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, $4f
call ByteFill
ld a, [wPokegearCard]

24
engine/variables.asm
View File

@@ -39,26 +39,26 @@ _GetVarAction:: ; 80648 (20:4648)
; RETVAR_STRBUF2: copy [de] to wStringBuffer2
; RETVAR_ADDR_DE: return address in de
; RETVAR_EXECUTE: call function
dwb wStringBuffer2, RETVAR_STRBUF2
dwb wPartyCount, RETVAR_STRBUF2
dwb wStringBuffer2, RETVAR_STRBUF2
dwb wPartyCount, RETVAR_STRBUF2
dwb .BattleResult, RETVAR_EXECUTE
dwb wBattleType, RETVAR_ADDR_DE
dwb wTimeOfDay, RETVAR_STRBUF2
dwb wBattleType, RETVAR_ADDR_DE
dwb wTimeOfDay, RETVAR_STRBUF2
dwb .CountCaughtMons, RETVAR_EXECUTE
dwb .CountSeenMons, RETVAR_EXECUTE
dwb .CountBadges, RETVAR_EXECUTE
dwb wPlayerState, RETVAR_ADDR_DE
dwb .wPlayerFacing, RETVAR_EXECUTE
dwb wPlayerState, RETVAR_ADDR_DE
dwb .PlayerFacing, RETVAR_EXECUTE
dwb hHours, RETVAR_STRBUF2
dwb .DayOfWeek, RETVAR_EXECUTE
dwb wMapGroup, RETVAR_STRBUF2
dwb wMapNumber, RETVAR_STRBUF2
dwb wMapGroup, RETVAR_STRBUF2
dwb wMapNumber, RETVAR_STRBUF2
dwb .UnownCaught, RETVAR_EXECUTE
dwb wEnvironment, RETVAR_STRBUF2
dwb wEnvironment, RETVAR_STRBUF2
dwb .BoxFreeSpace, RETVAR_EXECUTE
dwb wBugContestMinsRemaining, RETVAR_STRBUF2
dwb wXCoord, RETVAR_STRBUF2
dwb wYCoord, RETVAR_STRBUF2
dwb wXCoord, RETVAR_STRBUF2
dwb wYCoord, RETVAR_STRBUF2
dwb wSpecialPhoneCallID, RETVAR_STRBUF2
dwb wNrOfBeatenBattleTowerTrainers, RETVAR_STRBUF2
dwb wKurtApricornQuantity, RETVAR_STRBUF2
@@ -96,7 +96,7 @@ _GetVarAction:: ; 80648 (20:4648)
jp .loadstringbuffer2
; 806ef
.wPlayerFacing: ; 806ef
.PlayerFacing: ; 806ef
; The direction the player is facing.
ld a, [wPlayerDirection]
and $c