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

Merge pull request #685 from mid-kid/master

Browse Source 
Moshi moshi? minoru enhansumentsu desu
This commit is contained in:
mid-kid
2020-02-21 21:11:36 +01:00
committed by GitHub
parent 18013b468a 2a8c969bc7
commit 9a927c1b3e
108 changed files with 774 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/special_pointers.asm
View File

@@ -65,7 +65,7 @@ SpecialsPointers::
add_special ReloadSpritesNoPalettes ; bank 0 add_special ReloadSpritesNoPalettes ; bank 0
add_special ClearBGPalettes ; bank 0 add_special ClearBGPalettes ; bank 0
add_special UpdateTimePals ; bank 0 add_special UpdateTimePals ; bank 0
add_special ClearTileMap ; bank 0 add_special ClearTilemap ; bank 0
add_special UpdateSprites ; bank 0 add_special UpdateSprites ; bank 0
add_special ReplaceKrisSprite ; $38 ; bank 0 add_special ReplaceKrisSprite ; $38 ; bank 0
add_special GameCornerPrizeMonCheckDex add_special GameCornerPrizeMonCheckDex

2
engine/battle/battle_transition.asm
View File

@@ -585,7 +585,7 @@ StartTrainerBattle_LoadPokeBallGraphics:
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
inc b inc b
inc c inc c

112
engine/battle/core.asm
View File

@@ -46,12 +46,12 @@ DoBattle:
call DelayFrames call DelayFrames
.player_2 .player_2
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call CheckPlayerPartyForFitMon call CheckPlayerPartyForFitMon
ld a, d ld a, d
and a and a
jp z, LostBattle jp z, LostBattle
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
ld a, [wBattleType] ld a, [wBattleType]
cp BATTLETYPE_DEBUG cp BATTLETYPE_DEBUG
jp z, .tutorial_debug jp z, .tutorial_debug
@@ -82,7 +82,7 @@ DoBattle:
hlcoord 1, 5 hlcoord 1, 5
ld a, 9 ld a, 9
call SlideBattlePicOut call SlideBattlePicOut
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call ResetBattleParticipants call ResetBattleParticipants
call InitBattleMon call InitBattleMon
call ResetPlayerStatLevels call ResetPlayerStatLevels
@@ -91,7 +91,7 @@ DoBattle:
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call SetPlayerTurn call SetPlayerTurn
call SpikesDamage call SpikesDamage
ld a, [wLinkMode] ld a, [wLinkMode]
@@ -116,7 +116,7 @@ DoBattle:
jp BattleMenu jp BattleMenu
WildFled_EnemyFled_LinkBattleCanceled: WildFled_EnemyFled_LinkBattleCanceled:
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
ld a, [wBattleResult] ld a, [wBattleResult]
and BATTLERESULT_BITMASK and BATTLERESULT_BITMASK
add DRAW add DRAW
@@ -291,7 +291,7 @@ HandleBetweenTurnEffects:
call HandleStatBoostingHeldItems call HandleStatBoostingHeldItems
call HandleHealingItems call HandleHealingItems
call UpdateBattleMonInParty call UpdateBattleMonInParty
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
jp HandleEncore jp HandleEncore
CheckFaint_PlayerThenEnemy: CheckFaint_PlayerThenEnemy:
@@ -624,7 +624,7 @@ ParsePlayerAction:
ld [wFXAnimID], a ld [wFXAnimID], a
call MoveSelectionScreen call MoveSelectionScreen
push af push af
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
call UpdateBattleHuds call UpdateBattleHuds
ld a, [wCurPlayerMove] ld a, [wCurPlayerMove]
cp STRUGGLE cp STRUGGLE
@@ -862,7 +862,7 @@ GetMoveEffect:
ret ret
Battle_EnemyFirst: Battle_EnemyFirst:
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call TryEnemyFlee call TryEnemyFlee
jp c, WildFled_EnemyFled_LinkBattleCanceled jp c, WildFled_EnemyFled_LinkBattleCanceled
call SetEnemyTurn call SetEnemyTurn
@@ -930,7 +930,7 @@ Battle_PlayerFirst:
call RefreshBattleHuds call RefreshBattleHuds
pop af pop af
jr c, .switched_or_used_item jr c, .switched_or_used_item
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call TryEnemyFlee call TryEnemyFlee
jp c, WildFled_EnemyFled_LinkBattleCanceled jp c, WildFled_EnemyFled_LinkBattleCanceled
call EnemyTurn_EndOpponentProtectEndureDestinyBond call EnemyTurn_EndOpponentProtectEndureDestinyBond
@@ -1821,10 +1821,10 @@ SubtractHP:
GetSixteenthMaxHP: GetSixteenthMaxHP:
call GetQuarterMaxHP call GetQuarterMaxHP
; quarter result ; quarter result
srl c srl c
srl c srl c
; round up ; at least 1
ld a, c ld a, c
and a and a
jr nz, .ok jr nz, .ok
@@ -1838,7 +1838,7 @@ GetEighthMaxHP:
; assumes nothing can have 1024 or more hp ; assumes nothing can have 1024 or more hp
; halve result ; halve result
srl c srl c
; round up ; at least 1
ld a, c ld a, c
and a and a
jr nz, .end jr nz, .end
@@ -1857,7 +1857,7 @@ GetQuarterMaxHP:
rr c rr c
; assumes nothing can have 1024 or more hp ; assumes nothing can have 1024 or more hp
; round up ; at least 1
ld a, c ld a, c
and a and a
jr nz, .end jr nz, .end
@@ -1873,7 +1873,7 @@ GetHalfMaxHP:
srl b srl b
rr c rr c
; floor = 1 ; at least 1
ld a, c ld a, c
or b or b
jr nz, .end jr nz, .end
@@ -2082,7 +2082,7 @@ DoubleSwitch:
ld a, $1 ld a, $1
call EnemyPartyMonEntrance call EnemyPartyMonEntrance
call ClearSprites call ClearSprites
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
pop af pop af
ld [wCurPartyMon], a ld [wCurPartyMon], a
call PlayerPartyMonEntrance call PlayerPartyMonEntrance
@@ -2142,7 +2142,7 @@ UpdateBattleStateAndExperienceAfterEnemyFaint:
dec a dec a
call z, PlayVictoryMusic call z, PlayVictoryMusic
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
ld a, [wBattleResult] ld a, [wBattleResult]
and BATTLERESULT_BITMASK and BATTLERESULT_BITMASK
ld [wBattleResult], a ; WIN ld [wBattleResult], a ; WIN
@@ -2303,7 +2303,7 @@ HandleEnemySwitch:
cp BATTLEACTION_FORFEIT cp BATTLEACTION_FORFEIT
ret z ret z
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
.not_linked .not_linked
ld hl, wBattleMonHP ld hl, wBattleMonHP
@@ -2401,7 +2401,7 @@ WinTrainerBattle:
inc hl inc hl
or [hl] or [hl]
ret nz ret nz
call ClearTileMap call ClearTilemap
call ClearBGPalettes call ClearBGPalettes
ret ret
@@ -2682,7 +2682,7 @@ UpdateFaintedPlayerMon:
AskUseNextPokemon: AskUseNextPokemon:
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
; We don't need to be here if we're in a Trainer battle, ; We don't need to be here if we're in a Trainer battle,
; as that decision is made for us. ; as that decision is made for us.
ld a, [wBattleMode] ld a, [wBattleMode]
@@ -2735,7 +2735,7 @@ ForcePlayerMonChoice:
call ClearBGPalettes call ClearBGPalettes
call _LoadHPBar call _LoadHPBar
call ExitMenu call ExitMenu
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call WaitBGMap call WaitBGMap
call GetMemSGBLayout call GetMemSGBLayout
call SetPalettes call SetPalettes
@@ -2763,7 +2763,7 @@ ForcePlayerMonChoice:
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call SetPlayerTurn call SetPlayerTurn
call SpikesDamage call SpikesDamage
ld a, $1 ld a, $1
@@ -2784,7 +2784,7 @@ PlayerPartyMonEntrance:
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call SetPlayerTurn call SetPlayerTurn
jp SpikesDamage jp SpikesDamage
@@ -2942,7 +2942,7 @@ LostBattle:
ld c, BATTLETOWERTEXT_WIN_TEXT ld c, BATTLETOWERTEXT_WIN_TEXT
farcall BattleTowerText farcall BattleTowerText
call WaitPressAorB_BlinkCursor call WaitPressAorB_BlinkCursor
call ClearTileMap call ClearTilemap
call ClearBGPalettes call ClearBGPalettes
ret ret
@@ -3141,7 +3141,7 @@ EnemySwitch:
ld [wBattlePlayerAction], a ld [wBattlePlayerAction], a
inc a inc a
ld [wEnemyIsSwitching], a ld [wEnemyIsSwitching], a
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
jp PlayerSwitch jp PlayerSwitch
EnemySwitch_SetMode: EnemySwitch_SetMode:
@@ -3726,7 +3726,7 @@ TryToRunAwayFromBattle:
ldh [hEnemyMonSpeed + 0], a ldh [hEnemyMonSpeed + 0], a
ld a, [de] ld a, [de]
ldh [hEnemyMonSpeed + 1], a ldh [hEnemyMonSpeed + 1], a
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
ld de, hMultiplicand + 1 ld de, hMultiplicand + 1
ld hl, hEnemyMonSpeed ld hl, hEnemyMonSpeed
ld c, 2 ld c, 2
@@ -3791,7 +3791,7 @@ TryToRunAwayFromBattle:
call StdBattleTextbox call StdBattleTextbox
ld a, TRUE ld a, TRUE
ld [wFailedToFlee], a ld [wFailedToFlee], a
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
and a and a
ret ret
@@ -3800,7 +3800,7 @@ TryToRunAwayFromBattle:
and a and a
ld a, DRAW ld a, DRAW
jr z, .fled jr z, .fled
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
xor a ; BATTLEPLAYERACTION_USEMOVE xor a ; BATTLEPLAYERACTION_USEMOVE
ld [wBattlePlayerAction], a ld [wBattlePlayerAction], a
ld a, $f ld a, $f
@@ -3808,7 +3808,7 @@ TryToRunAwayFromBattle:
xor a xor a
ld [wCurPlayerMove], a ld [wCurPlayerMove], a
call LinkBattleSendReceiveAction call LinkBattleSendReceiveAction
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
call CheckMobileBattleError call CheckMobileBattleError
jr c, .mobile jr c, .mobile
@@ -3833,7 +3833,7 @@ TryToRunAwayFromBattle:
ld hl, BattleText_GotAwaySafely ld hl, BattleText_GotAwaySafely
call StdBattleTextbox call StdBattleTextbox
call WaitSFX call WaitSFX
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
scf scf
ret ret
@@ -3847,7 +3847,7 @@ TryToRunAwayFromBattle:
.skip_link_error .skip_link_error
call WaitSFX call WaitSFX
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
scf scf
ret ret
@@ -4001,7 +4001,7 @@ SwitchPlayerMon:
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
ld hl, wEnemyMonHP ld hl, wEnemyMonHP
ld a, [hli] ld a, [hli]
or [hl] or [hl]
@@ -4860,7 +4860,7 @@ ret_3e138:
BattleMenu: BattleMenu:
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
call LoadTempTileMapToTileMap call LoadTempTilemapToTilemap
ld a, [wBattleType] ld a, [wBattleType]
cp BATTLETYPE_DEBUG cp BATTLETYPE_DEBUG
@@ -4870,7 +4870,7 @@ BattleMenu:
call EmptyBattleTextbox call EmptyBattleTextbox
call UpdateBattleHuds call UpdateBattleHuds
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
.ok .ok
.loop .loop
@@ -4907,7 +4907,7 @@ BattleMenu:
BattleMenu_Fight: BattleMenu_Fight:
xor a xor a
ld [wNumFleeAttempts], a ld [wNumFleeAttempts], a
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
and a and a
ret ret
@@ -4984,7 +4984,7 @@ BattleMenu_Pack:
call ExitMenu call ExitMenu
call WaitBGMap call WaitBGMap
call FinishBattleAnim call FinishBattleAnim
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
jp BattleMenu jp BattleMenu
.ItemsCantBeUsed: .ItemsCantBeUsed:
@@ -5019,7 +5019,7 @@ BattleMenu_Pack:
call ExitMenu call ExitMenu
call UpdateBattleHUDs call UpdateBattleHUDs
call WaitBGMap call WaitBGMap
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call ClearWindowData call ClearWindowData
call FinishBattleAnim call FinishBattleAnim
and a and a
@@ -5080,7 +5080,7 @@ BattleMenuPKMN_Loop:
call DelayFrame call DelayFrame
call _LoadHPBar call _LoadHPBar
call CloseWindow call CloseWindow
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call GetMemSGBLayout call GetMemSGBLayout
call SetPalettes call SetPalettes
jp BattleMenu jp BattleMenu
@@ -5254,7 +5254,7 @@ BattleMonEntrance:
call BreakAttraction call BreakAttraction
call SendOutPlayerMon call SendOutPlayerMon
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call SetPlayerTurn call SetPlayerTurn
call SpikesDamage call SpikesDamage
ld a, $2 ld a, $2
@@ -5278,12 +5278,12 @@ PassedBattleMonEntrance:
call ApplyStatLevelMultiplierOnAllStats call ApplyStatLevelMultiplierOnAllStats
call SendOutPlayerMon call SendOutPlayerMon
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
call SetPlayerTurn call SetPlayerTurn
jp SpikesDamage jp SpikesDamage
BattleMenu_Run: BattleMenu_Run:
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
ld a, $3 ld a, $3
ld [wMenuCursorY], a ld [wMenuCursorY], a
ld hl, wBattleMonSpeed ld hl, wBattleMonSpeed
@@ -5508,7 +5508,7 @@ MoveSelectionScreen:
.place_textbox_start_over .place_textbox_start_over
call StdBattleTextbox call StdBattleTextbox
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
jp MoveSelectionScreen jp MoveSelectionScreen
.string_3e61c .string_3e61c
@@ -5771,11 +5771,11 @@ ParseEnemyAction:
and a and a
jr z, .not_linked jr z, .not_linked
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
ld a, [wBattlePlayerAction] ld a, [wBattlePlayerAction]
and a ; BATTLEPLAYERACTION_USEMOVE? and a ; BATTLEPLAYERACTION_USEMOVE?
call z, LinkBattleSendReceiveAction call z, LinkBattleSendReceiveAction
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
ld a, [wBattleAction] ld a, [wBattleAction]
cp BATTLEACTION_STRUGGLE cp BATTLEACTION_STRUGGLE
jp z, .struggle jp z, .struggle
@@ -7117,7 +7117,7 @@ GiveExperiencePoints:
pop bc pop bc
call AnimateExpBar call AnimateExpBar
push bc push bc
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
pop bc pop bc
ld hl, MON_EXP + 2 ld hl, MON_EXP + 2
add hl, bc add hl, bc
@@ -7270,7 +7270,7 @@ GiveExperiencePoints:
callfar BadgeStatBoosts callfar BadgeStatBoosts
callfar UpdatePlayerHUD callfar UpdatePlayerHUD
call EmptyBattleTextbox call EmptyBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
ld a, $1 ld a, $1
ldh [hBGMapMode], a ldh [hBGMapMode], a
@@ -7286,7 +7286,7 @@ GiveExperiencePoints:
call WaitSFX call WaitSFX
ld hl, BattleText_StringBuffer1GrewToLevel ld hl, BattleText_StringBuffer1GrewToLevel
call StdBattleTextbox call StdBattleTextbox
call LoadTileMapToTempTileMap call LoadTilemapToTempTilemap
.skip_exp_bar_animation .skip_exp_bar_animation
xor a ; PARTYMON xor a ; PARTYMON
@@ -7302,7 +7302,7 @@ GiveExperiencePoints:
ld c, 30 ld c, 30
call DelayFrames call DelayFrames
call WaitPressAorB_BlinkCursor call WaitPressAorB_BlinkCursor
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
xor a ; PARTYMON xor a ; PARTYMON
ld [wMonType], a ld [wMonType], a
ld a, [wCurSpecies] ld a, [wCurSpecies]
@@ -7799,7 +7799,7 @@ Unreferenced_HandleSafariAngerEatingStatus:
.finish .finish
push hl push hl
call Call_LoadTempTileMapToTileMap call SafeLoadTempTilemapToTilemap
pop hl pop hl
jp StdBattleTextbox jp StdBattleTextbox
@@ -8342,7 +8342,7 @@ CheckPayDay:
ld a, [wInBattleTowerBattle] ld a, [wInBattleTowerBattle]
bit 0, a bit 0, a
ret z ret z
call ClearTileMap call ClearTilemap
call ClearBGPalettes call ClearBGPalettes
ret ret
@@ -8354,7 +8354,7 @@ ShowLinkBattleParticipantsAfterEnd:
call GetPartyLocation call GetPartyLocation
ld a, [wEnemyMonStatus] ld a, [wEnemyMonStatus]
ld [hl], a ld [hl], a
call ClearTileMap call ClearTilemap
farcall _ShowLinkBattleParticipants farcall _ShowLinkBattleParticipants
ret ret
@@ -8409,13 +8409,13 @@ DisplayLinkBattleResult:
call IsMobileBattle2 call IsMobileBattle2
jr z, .mobile jr z, .mobile
call WaitPressAorB_BlinkCursor call WaitPressAorB_BlinkCursor
call ClearTileMap call ClearTilemap
ret ret
.mobile .mobile
ld c, 200 ld c, 200
call DelayFrames call DelayFrames
call ClearTileMap call ClearTilemap
ret ret
.Win: .Win:
@@ -8431,7 +8431,7 @@ DisplayLinkBattleResult:
call PlaceString call PlaceString
ld c, 200 ld c, 200
call DelayFrames call DelayFrames
call ClearTileMap call ClearTilemap
ret ret
.Invalid: .Invalid:
@@ -8449,7 +8449,7 @@ _DisplayLinkRecord:
call ReadAndPrintLinkBattleRecord call ReadAndPrintLinkBattleRecord
call CloseSRAM call CloseSRAM
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
xor a xor a
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill call ByteFill
@@ -8463,7 +8463,7 @@ _DisplayLinkRecord:
ret ret
ReadAndPrintLinkBattleRecord: ReadAndPrintLinkBattleRecord:
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
call .PrintBattleRecord call .PrintBattleRecord
hlcoord 0, 8 hlcoord 0, 8
@@ -8949,7 +8949,7 @@ InitBattleDisplay:
ldh [rSVBK], a ldh [rSVBK], a
ld hl, wDecompressScratch ld hl, wDecompressScratch
ld bc, wScratchAttrMap - wDecompressScratch ld bc, wScratchAttrmap - wDecompressScratch
ld a, " " ld a, " "
call ByteFill call ByteFill

2
engine/battle/returntobattle_useball.asm
View File

@@ -1,6 +1,6 @@
_ReturnToBattle_UseBall: _ReturnToBattle_UseBall:
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
ld a, [wBattleType] ld a, [wBattleType]
cp BATTLETYPE_TUTORIAL cp BATTLETYPE_TUTORIAL
jr z, .gettutorialbackpic jr z, .gettutorialbackpic

4
engine/battle/start_battle.asm
View File

@@ -8,7 +8,7 @@ ShowLinkBattleParticipants:
farcall _ShowLinkBattleParticipants farcall _ShowLinkBattleParticipants
ld c, 150 ld c, 150
call DelayFrames call DelayFrames
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
ret ret
@@ -38,7 +38,7 @@ FindFirstAliveMonAndStartBattle:
ld a, 1 ld a, 1
ldh [hBGMapMode], a ldh [hBGMapMode], a
call ClearSprites call ClearSprites
call ClearTileMap call ClearTilemap
xor a xor a
ldh [hBGMapMode], a ldh [hBGMapMode], a
ldh [hWY], a ldh [hWY], a

2
engine/battle/used_move_text.asm
View File

@@ -41,7 +41,7 @@ UsedMoveText:
.grammar .grammar
call GetMoveGrammar ; convert move id to grammar index call GetMoveGrammar ; convert move id to grammar index
; everything except 'instead' made redundant in localization ; everything except 'CheckObedience' made redundant in localization
; check obedience ; check obedience
ld a, [wAlreadyDisobeyed] ld a, [wAlreadyDisobeyed]

2
engine/events/bug_contest/display_stats.asm
View File

@@ -1,6 +1,6 @@
DisplayCaughtContestMonStats: DisplayCaughtContestMonStats:
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
call LoadFontsBattleExtra call LoadFontsBattleExtra

4
engine/events/celebi.asm
View File

@@ -9,7 +9,7 @@ CelebiShrineEvent:
call LoadCelebiGFX call LoadCelebiGFX
depixel 0, 10, 7, 0 depixel 0, 10, 7, 0
ld a, SPRITE_ANIM_INDEX_CELEBI ld a, SPRITE_ANIM_INDEX_CELEBI
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], SPECIALCELEBIEVENT_CELEBI ld [hl], SPECIALCELEBIEVENT_CELEBI
@@ -107,7 +107,7 @@ CelebiEvent_SpawnLeaf:
ld d, a ld d, a
ld e, $0 ld e, $0
ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], $80 ld [hl], $80

2
engine/events/diploma.asm
View File

@@ -5,7 +5,7 @@ _Diploma:
PlaceDiplomaOnScreen: PlaceDiplomaOnScreen:
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
call DisableLCD call DisableLCD
ld hl, DiplomaGFX ld hl, DiplomaGFX

14
engine/events/field_moves.asm
View File

@@ -33,7 +33,7 @@ ShakeHeadbuttTree:
call Request2bpp call Request2bpp
call Cut_Headbutt_GetPixelFacing call Cut_Headbutt_GetPixelFacing
ld a, SPRITE_ANIM_INDEX_HEADBUTT ld a, SPRITE_ANIM_INDEX_HEADBUTT
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_TREE ld [hl], FIELDMOVE_TREE
@@ -92,7 +92,7 @@ HideHeadbuttTree:
ld h, [hl] ld h, [hl]
ld l, a ld l, a
ld a, $5 ld a, $05 ; grass block
ld [hli], a ld [hli], a
ld [hld], a ld [hld], a
ld bc, SCREEN_WIDTH ld bc, SCREEN_WIDTH
@@ -174,7 +174,7 @@ OWCutJumptable:
Cut_SpawnAnimateTree: Cut_SpawnAnimateTree:
call Cut_Headbutt_GetPixelFacing call Cut_Headbutt_GetPixelFacing
ld a, SPRITE_ANIM_INDEX_CUT_TREE ; cut tree ld a, SPRITE_ANIM_INDEX_CUT_TREE ; cut tree
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_TREE ld [hl], FIELDMOVE_TREE
@@ -227,7 +227,7 @@ Cut_SpawnLeaf:
push de push de
push af push af
ld a, SPRITE_ANIM_INDEX_LEAF ; leaf ld a, SPRITE_ANIM_INDEX_LEAF ; leaf
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_GRASS ld [hl], FIELDMOVE_GRASS
@@ -314,7 +314,7 @@ FlyFromAnim:
call FlyFunction_InitGFX call FlyFunction_InitGFX
depixel 10, 10, 4, 0 depixel 10, 10, 4, 0
ld a, SPRITE_ANIM_INDEX_RED_WALK ld a, SPRITE_ANIM_INDEX_RED_WALK
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_FLY ld [hl], FIELDMOVE_FLY
@@ -348,7 +348,7 @@ FlyToAnim:
call FlyFunction_InitGFX call FlyFunction_InitGFX
depixel 31, 10, 4, 0 depixel 31, 10, 4, 0
ld a, SPRITE_ANIM_INDEX_RED_WALK ld a, SPRITE_ANIM_INDEX_RED_WALK
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_FLY ld [hl], FIELDMOVE_FLY
@@ -447,7 +447,7 @@ FlyFunction_FrameTimer:
ld d, a ld d, a
ld e, $0 ld e, $0
ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land ld a, SPRITE_ANIM_INDEX_FLY_LEAF ; fly land
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], FIELDMOVE_GRASS ld [hl], FIELDMOVE_GRASS

11
engine/events/misc_scripts_2.asm → engine/events/hidden_item.asm
View File

@@ -1,14 +1,3 @@
RepelWoreOffScript::
opentext
writetext .RepelWoreOffText
waitbutton
closetext
end
.RepelWoreOffText:
text_far _RepelWoreOffText
text_end
HiddenItemScript:: HiddenItemScript::
opentext opentext
readmem wHiddenItemID readmem wHiddenItemID

4
engine/events/magnet_train.asm
View File

@@ -70,7 +70,7 @@ MagnetTrain:
ld [wRequested2bppDest], a ld [wRequested2bppDest], a
ld [wRequested2bppDest + 1], a ld [wRequested2bppDest + 1], a
ld [wRequested2bpp], a ld [wRequested2bpp], a
call ClearTileMap call ClearTilemap
pop af pop af
ldh [hSCY], a ldh [hSCY], a
@@ -313,7 +313,7 @@ MagnetTrain_Jumptable:
pop af pop af
ldh [rSVBK], a ldh [rSVBK], a
ld a, b ld a, b
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_TILE_ID ld hl, SPRITEANIMSTRUCT_TILE_ID
add hl, bc add hl, bc
ld [hl], 0 ld [hl], 0

6
engine/events/map_name_sign.asm
View File

@@ -135,7 +135,7 @@ InitMapNameFrame:
hlcoord 0, 0 hlcoord 0, 0
ld b, 2 ld b, 2
ld c, 18 ld c, 18
call InitMapSignAttrMap call InitMapSignAttrmap
call PlaceMapNameFrame call PlaceMapNameFrame
ret ret
@@ -171,8 +171,8 @@ PlaceMapNameCenterAlign:
pop hl pop hl
ret ret
InitMapSignAttrMap: InitMapSignAttrmap:
ld de, wAttrMap - wTileMap ld de, wAttrmap - wTilemap
add hl, de add hl, de
inc b inc b
inc b inc b

2
engine/events/overworld.asm
View File

@@ -273,7 +273,7 @@ CheckOverworldTileArrays:
INCLUDE "data/events/field_move_blocks.asm" INCLUDE "data/events/field_move_blocks.asm"
OWFlash: FlashFunction:
call .CheckUseFlash call .CheckUseFlash
and $7f and $7f
ld [wFieldMoveSucceeded], a ld [wFieldMoveSucceeded], a

2
engine/events/print_unown.asm
View File

@@ -15,7 +15,7 @@ _UnownPrinter:
set NO_TEXT_SCROLL, a set NO_TEXT_SCROLL, a
ld [wOptions], a ld [wOptions], a
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
ld de, UnownDexATile ld de, UnownDexATile
ld hl, vTiles0 tile UNOWNSTAMP_BOLD_A ld hl, vTiles0 tile UNOWNSTAMP_BOLD_A

10
engine/events/repel.asm Normal file
View File

@@ -0,0 +1,10 @@
RepelWoreOffScript::
opentext
writetext .RepelWoreOffText
waitbutton
closetext
end
.RepelWoreOffText:
text_far _RepelWoreOffText
text_end

2
engine/events/unown_walls.asm
View File

@@ -139,7 +139,7 @@ DisplayUnownWords:
jr nz, .loop2 jr nz, .loop2
.copy .copy
call _DisplayUnownWords_CopyWord call _DisplayUnownWords_CopyWord
ld bc, wAttrMap - wTileMap ld bc, wAttrmap - wTilemap
add hl, bc add hl, bc
call _DisplayUnownWords_FillAttr call _DisplayUnownWords_FillAttr
call WaitBGMap2 call WaitBGMap2

16
engine/games/card_flip.asm
View File

@@ -14,7 +14,7 @@ _CardFlip:
ld hl, wOptions ld hl, wOptions
set NO_TEXT_SCROLL, [hl] set NO_TEXT_SCROLL, [hl]
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
ld de, MUSIC_NONE ld de, MUSIC_NONE
call PlayMusic call PlayMusic
@@ -457,7 +457,7 @@ CardFlip_DisplayCardFaceUp:
ret z ret z
; Set the attributes ; Set the attributes
ld de, wAttrMap - wTileMap ld de, wAttrmap - wTilemap
add hl, de add hl, de
ld a, [wCardFlipFaceUpCard] ld a, [wCardFlipFaceUpCard]
and 3 and 3
@@ -1558,32 +1558,32 @@ CardFlip_InitAttrPals:
and a and a
ret z ret z
hlcoord 0, 0, wAttrMap hlcoord 0, 0, wAttrmap
ld bc, SCREEN_HEIGHT * SCREEN_WIDTH ld bc, SCREEN_HEIGHT * SCREEN_WIDTH
xor a xor a
call ByteFill call ByteFill
hlcoord 12, 1, wAttrMap hlcoord 12, 1, wAttrmap
lb bc, 2, 2 lb bc, 2, 2
ld a, $1 ld a, $1
call CardFlip_FillBox call CardFlip_FillBox
hlcoord 14, 1, wAttrMap hlcoord 14, 1, wAttrmap
lb bc, 2, 2 lb bc, 2, 2
ld a, $2 ld a, $2
call CardFlip_FillBox call CardFlip_FillBox
hlcoord 16, 1, wAttrMap hlcoord 16, 1, wAttrmap
lb bc, 2, 2 lb bc, 2, 2
ld a, $3 ld a, $3
call CardFlip_FillBox call CardFlip_FillBox
hlcoord 18, 1, wAttrMap hlcoord 18, 1, wAttrmap
lb bc, 2, 2 lb bc, 2, 2
ld a, $4 ld a, $4
call CardFlip_FillBox call CardFlip_FillBox
hlcoord 9, 0, wAttrMap hlcoord 9, 0, wAttrmap
lb bc, 12, 1 lb bc, 12, 1
ld a, $1 ld a, $1
call CardFlip_FillBox call CardFlip_FillBox

2
engine/games/dummy_game.asm
View File

@@ -110,7 +110,7 @@ endr
.spawn_object .spawn_object
depixel 6, 3, 4, 4 depixel 6, 3, 4, 4
ld a, SPRITE_ANIM_INDEX_DUMMY_GAME ld a, SPRITE_ANIM_INDEX_DUMMY_GAME
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld a, 5 ld a, 5
ld [wDummyGameNumberTriesRemaining], a ld [wDummyGameNumberTriesRemaining], a
ld hl, wJumptableIndex ld hl, wJumptableIndex

8
engine/games/slot_machine.asm
View File

@@ -96,7 +96,7 @@ _SlotMachine:
.InitGFX: .InitGFX:
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTilemap
call ClearSprites call ClearSprites
ld de, MUSIC_NONE ld de, MUSIC_NONE
call PlayMusic call PlayMusic
@@ -1139,7 +1139,7 @@ ReelAction_InitGolem:
push af push af
depixel 12, 13 depixel 12, 13
ld a, SPRITE_ANIM_INDEX_SLOTS_GOLEM ld a, SPRITE_ANIM_INDEX_SLOTS_GOLEM
call _InitSpriteAnimStruct call InitSpriteAnimStruct
ld hl, SPRITEANIMSTRUCT_0E ld hl, SPRITEANIMSTRUCT_0E
add hl, bc add hl, bc
pop af pop af
@@ -1200,7 +1200,7 @@ ReelAction_InitChansey:
push bc push bc
depixel 12, 0 depixel 12, 0
ld a, SPRITE_ANIM_INDEX_SLOTS_CHANSEY ld a, SPRITE_ANIM_INDEX_SLOTS_CHANSEY
call _InitSpriteAnimStruct call InitSpriteAnimStruct
pop bc pop bc
xor a xor a
ld [wSlotsDelay], a ld [wSlotsDelay], a
@@ -2120,7 +2120,7 @@ Slots_AnimateChansey:
push bc push bc
depixel 12, 13, 0, 4 depixel 12, 13, 0, 4
ld a, SPRITE_ANIM_INDEX_SLOTS_EGG ld a, SPRITE_ANIM_INDEX_SLOTS_EGG
call _InitSpriteAnimStruct call InitSpriteAnimStruct
pop bc pop bc
ret ret

Some files were not shown because too many files have changed in this diff Show More