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

Local labels starting with capital letters are now decorated with a trailing colon; remove trailing whitespace; globally correct line endings to UNIX style

Browse Source
This commit is contained in:
pikalaxalt 2016-04-10 14:42:14 -04:00
parent 46ead9b849
commit bf73772a56
537 changed files with 4562 additions and 4562 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
audio/engine.asm
View File

@ -233,7 +233,7 @@ UpdateChannels: ; e8125
jp [hl]
.ChannelFnPtrs
.ChannelFnPtrs:
dw .Channel1
dw .Channel2
dw .Channel3
@ -245,11 +245,11 @@ UpdateChannels: ; e8125
dw .Channel7
dw .Channel8
.Channel1
.Channel1:
ld a, [Danger]
bit 7, a
ret nz
.Channel5
.Channel5:
ld hl, Channel1NoteFlags - Channel1
add hl, bc
bit NOTE_UNKN_3, [hl]
@ -317,8 +317,8 @@ UpdateChannels: ; e8125
ld [rNR14], a
ret
.Channel2
.Channel6
.Channel2:
.Channel6:
ld hl, Channel1NoteFlags - Channel1
add hl, bc
bit NOTE_REST, [hl] ; rest
@ -377,8 +377,8 @@ UpdateChannels: ; e8125
ld [rNR24], a
ret
.Channel3
.Channel7
.Channel3:
.Channel7:
ld hl, Channel1NoteFlags - Channel1
add hl, bc
bit NOTE_REST, [hl] ; rest
@ -478,8 +478,8 @@ endr
ld [rNR32], a
ret
.Channel4
.Channel8
.Channel4:
.Channel8:
ld hl, Channel1NoteFlags - Channel1
add hl, bc
bit NOTE_REST, [hl] ; rest

8
battle/ai/items.asm
View File

@ -318,7 +318,7 @@ AI_Items: ; 39196
jp c, .Use
jp .DontUse
.StatusCheckContext
.StatusCheckContext:
ld a, [EnemySubStatus5]
bit SUBSTATUS_TOXIC, a
jr z, .FailToxicCheck
@ -328,7 +328,7 @@ AI_Items: ; 39196
call Random
cp 1 + 50 percent
jp c, .Use
.FailToxicCheck
.FailToxicCheck:
ld a, [EnemyMonStatus]
and 1 << FRZ | SLP
jp z, .DontUse
@ -344,7 +344,7 @@ AI_Items: ; 39196
call .Status
jp c, .DontUse
.UseFullRestore
.UseFullRestore:
call EnemyUsedFullRestore
jp .Use
; 38220
@ -676,7 +676,7 @@ AI_TrySwitch: ; 3844b
ld c, a
ld hl, OTPartyMon1HP
ld d, 0
.SwitchLoop
.SwitchLoop:
ld a, [hli]
ld b, a
ld a, [hld]

20
battle/ai/move.asm
View File

@ -31,24 +31,24 @@ endr
ld hl, EnemyMonMoves
ld c, 0
.CheckDisabledMove
.CheckDisabledMove:
cp [hl]
jr z, .ScoreDisabledMove
inc c
inc hl
jr .CheckDisabledMove
.ScoreDisabledMove
.ScoreDisabledMove:
ld hl, Buffer1
ld b, 0
add hl, bc
ld [hl], 80
; Don't pick moves with 0 PP.
.CheckPP
.CheckPP:
ld hl, Buffer1 - 1
ld de, EnemyMonPP
ld b, 0
.CheckMovePP
.CheckMovePP:
inc b
ld a, b
cp EnemyMonMovesEnd - EnemyMonMoves + 1
@ -63,7 +63,7 @@ endr
; Apply AI scoring layers depending on the trainer class.
.ApplyLayers
.ApplyLayers:
ld hl, TrainerClassAttributes + TRNATTR_AI_MOVE_WEIGHTS
; If we have a battle in BattleTower just load the Attributes of the first TrainerClass (Falkner)
@ -82,7 +82,7 @@ endr
push bc
push hl
.CheckLayer
.CheckLayer:
pop hl
pop bc
@ -119,12 +119,12 @@ endr
jr .CheckLayer
; Decrement the scores of all moves one by one until one reaches 0.
.DecrementScores
.DecrementScores:
ld hl, Buffer1
ld de, EnemyMonMoves
ld c, EnemyMonMovesEnd - EnemyMonMoves
.DecrementNextScore
.DecrementNextScore:
; If the enemy has no moves, this will infinite.
ld a, [de]
inc de
@ -145,7 +145,7 @@ endr
; In order to avoid bias towards the moves located first in memory, increment the scores
; that were decremented one more time than the rest (in case there was a tie).
; This means that the minimum score will be 1.
.PickLowestScoreMoves
.PickLowestScoreMoves:
ld a, c
.move_loop
@ -184,7 +184,7 @@ endr
jr nz, .loop2
; Randomly choose one of the moves with a score of 1
.ChooseMove
.ChooseMove:
ld hl, Buffer1
call Random
and 3

4
battle/ai/scoring.asm
View File

@ -2233,7 +2233,7 @@ AI_Smart_Sandstorm: ; 38f7a
inc [hl]
ret
.SandstormImmuneTypes
.SandstormImmuneTypes:
db ROCK
db GROUND
db STEEL
@ -3384,7 +3384,7 @@ AIDamageCalc: ; 393e7
callab BattleCommand_Stab
ret
.ConstantDamageEffects
.ConstantDamageEffects:
db EFFECT_SUPER_FANG
db EFFECT_STATIC_DAMAGE
db EFFECT_LEVEL_DAMAGE

22
battle/anims.asm
View File

@ -321,7 +321,7 @@ BattleAnim_ThrowPokeBall
anim_jump .Shake
; c92f2
.TheTrainerBlockedTheBall
.TheTrainerBlockedTheBall:
anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_HIT
anim_sound 6, 2, SFX_THROW_BALL
anim_obj ANIM_OBJ_16, 8, 0, 11, 4, $20
@ -331,7 +331,7 @@ BattleAnim_ThrowPokeBall
anim_ret
; c9305
.UltraBall
.UltraBall:
anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE
anim_sound 6, 2, SFX_THROW_BALL
anim_obj ANIM_OBJ_POKE_BALL, 8, 4, 11, 4, $40
@ -345,7 +345,7 @@ BattleAnim_ThrowPokeBall
anim_jump .Shake
; c9326
.GreatBall
.GreatBall:
anim_2gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE
anim_sound 6, 2, SFX_THROW_BALL
anim_obj ANIM_OBJ_POKE_BALL, 8, 4, 11, 4, $40
@ -359,7 +359,7 @@ BattleAnim_ThrowPokeBall
anim_jump .Shake
; c9347
.MasterBall
.MasterBall:
anim_3gfx ANIM_GFX_POKE_BALL, ANIM_GFX_SMOKE, ANIM_GFX_SPEED
anim_sound 6, 2, SFX_THROW_BALL
anim_obj ANIM_OBJ_POKE_BALL, 8, 0, 11, 4, $20
@ -380,7 +380,7 @@ BattleAnim_ThrowPokeBall
anim_obj ANIM_OBJ_2B, -15, 0, 7, 0, $36
anim_obj ANIM_OBJ_2B, -15, 0, 7, 0, $37
anim_wait 64
.Shake
.Shake:
anim_bgeffect ANIM_BG_RETURN_MON, $0, $0, $0
anim_wait 8
anim_incobj 2
@ -394,7 +394,7 @@ BattleAnim_ThrowPokeBall
anim_wait 32
anim_wait 8
anim_setvar $0
.Loop
.Loop:
anim_wait 48
anim_checkpokeball
anim_jumpvar $1, .Click
@ -404,12 +404,12 @@ BattleAnim_ThrowPokeBall
anim_jump .Loop
; c93bc
.Click
.Click:
anim_clearsprites
anim_ret
; c93be
.BreakFree
.BreakFree:
anim_setobj $1, $b
anim_sound 0, 1, SFX_BALL_POOF
anim_obj ANIM_OBJ_1C, -15, 0, 8, 0, $10
@ -434,7 +434,7 @@ BattleAnim_SendOutMon: ; c93d1
anim_call BattleAnim_ShowMon_0
anim_ret
.Unknown
.Unknown:
anim_1gfx ANIM_GFX_SMOKE
anim_call BattleAnim_FollowEnemyFeet_0
anim_bgeffect ANIM_BG_2A, $0, $1, $0
@ -449,7 +449,7 @@ BattleAnim_SendOutMon: ; c93d1
anim_call BattleAnim_ShowMon_0
anim_ret
.Shiny
.Shiny:
anim_1gfx ANIM_GFX_SPEED
anim_bgeffect ANIM_BG_FLASH_INVERTED, $0, $4, $3
anim_bgeffect ANIM_BG_06, $0, $2, $0
@ -479,7 +479,7 @@ BattleAnim_SendOutMon: ; c93d1
anim_wait 32
anim_ret
.Normal
.Normal:
anim_1gfx ANIM_GFX_SMOKE
anim_sound 0, 0, SFX_BALL_POOF
anim_obj ANIM_OBJ_1C, 5, 4, 12, 0, $0

86
battle/bg_effects.asm
View File

@ -236,7 +236,7 @@ BattleBGEffect_WhiteHues: ; c812d (32:412d)
call EndBattleBGEffect
ret
.Pals
.Pals:
db %11100100
db %11100000
db %11010000
@ -254,7 +254,7 @@ BattleBGEffect_BlackHues: ; c8141 (32:4141)
call EndBattleBGEffect
ret
.Pals
.Pals:
db %11100100
db %11110100
db %11111000
@ -273,7 +273,7 @@ BattleBGEffect_AlternateHues: ; c8155 (32:4155)
call EndBattleBGEffect
ret
.Pals
.Pals:
db %11100100
db %11111000
db %11111100
@ -298,12 +298,12 @@ BattleBGEffect_06: ; c8171 (32:4171)
ld [wOBP0], a
ret
.PalsCGB
.PalsCGB:
db %11100100
db %10010000
db -2
.PalsSGB
.PalsSGB:
db %11110000
db %11000000
db -2
@ -322,12 +322,12 @@ BattleBGEffect_07: ; c818b (32:418b)
ld [wOBP0], a
ret
.PalsCGB
.PalsCGB:
db %11100100
db %11011000
db -2
.PalsSGB
.PalsSGB:
db %11110000
db %11001100
db -2
@ -339,7 +339,7 @@ BattleBGEffect_08: ; c81a5 (32:41a5)
ld [wBGP], a
ret
.Pals
.Pals:
db %00011011
db %01100011
db %10000111
@ -405,10 +405,10 @@ BattleBGEffect_ShowMon: ; c81ea (32:41ea)
call BattleBGEffect_RunPicResizeScript
ret
.PlayerData
.PlayerData:
db 0, $31, 0
db -1
.EnemyData
.EnemyData:
db 3, $00, 3
db -1
; c8214
@ -670,12 +670,12 @@ BattleBGEffect_EnterMon: ; c837b (32:437b)
call BattleBGEffect_RunPicResizeScript
ret
.PlayerData
.PlayerData:
db 2, $31, 2
db 1, $31, 1
db 0, $31, 0
db -1
.EnemyData
.EnemyData:
db 5, $00, 5
db 4, $00, 4
db 3, $00, 3
@ -698,7 +698,7 @@ BattleBGEffect_ReturnMon: ; c83a8 (32:43a8)
call BattleBGEffect_RunPicResizeScript
ret
.PlayerData
.PlayerData:
db 0, $31, 0
db -2, $66, 0
db 1, $31, 1
@ -707,7 +707,7 @@ BattleBGEffect_ReturnMon: ; c83a8 (32:43a8)
db -2, $22, 2
db -3, $00, 0
db -1
.EnemyData
.EnemyData:
db 3, $00, 3
db -2, $77, 3
db 4, $00, 4
@ -773,7 +773,7 @@ endr
call EndBattleBGEffect
ret
.ClearBox
.ClearBox:
; get dims
push bc
inc hl
@ -798,7 +798,7 @@ endr
pop bc
ret
.PlaceGraphic
.PlaceGraphic:
; get dims
push bc
push hl
@ -858,7 +858,7 @@ endr
pop bc
ret
.Coords
.Coords:
dwcoord 2, 6
dwcoord 3, 8
dwcoord 4, 10
@ -866,7 +866,7 @@ endr
dwcoord 13, 2
dwcoord 14, 4
.BGSquares
.BGSquares:
bgsquare: MACRO
dn \1,\2
dw \3
@ -879,7 +879,7 @@ endm
bgsquare 5, 5, .FiveByFive
bgsquare 3, 3, .ThreeByThree
.SixBySix
.SixBySix:
db $00, $06, $0c, $12, $18, $1e
db $01, $07, $0d, $13, $19, $1f
db $02, $08, $0e, $14, $1a, $20
@ -887,17 +887,17 @@ endm
db $04, $0a, $10, $16, $1c, $22
db $05, $0b, $11, $17, $1d, $23
.FourByFour
.FourByFour:
db $00, $0c, $12, $1e
db $02, $0e, $14, $20
db $03, $0f, $15, $21
db $05, $11, $17, $23
.TwoByTwo
.TwoByTwo:
db $00, $1e
db $05, $23
.SevenBySeven
.SevenBySeven:
db $00, $07, $0e, $15, $1c, $23, $2a
db $01, $08, $0f, $16, $1d, $24, $2b
db $02, $09, $10, $17, $1e, $25, $2c
@ -906,14 +906,14 @@ endm
db $05, $0c, $13, $1a, $21, $28, $2f
db $06, $0d, $14, $1b, $22, $29, $30
.FiveByFive
.FiveByFive:
db $00, $07, $15, $23, $2a
db $01, $08, $16, $24, $2b
db $03, $0a, $18, $26, $2d
db $05, $0c, $1a, $28, $2f
db $06, $0d, $1b, $29, $30
.ThreeByThree
.ThreeByThree:
db $00, $15, $2a
db $03, $18, $2d
db $06, $1b, $30
@ -945,7 +945,7 @@ BattleBGEffect_Surf: ; c8545 (32:4545)
call BattleAnim_ResetLCDStatCustom
ret
.RotatewSurfWaveBGEffect
.RotatewSurfWaveBGEffect:
ld hl, wSurfWaveBGEffect
ld de, wSurfWaveBGEffect + 1
ld c, wSurfWaveBGEffectEnd - wSurfWaveBGEffect - 1
@ -1218,7 +1218,7 @@ BattleBGEffect_DoubleTeam: ; c8689 (32:4689)
.four
ret
.UpdateLYOverrides
.UpdateLYOverrides:
ld e, a
xor $ff
inc a
@ -1893,7 +1893,7 @@ BattleBGEffect_2a: ; c8a3a (32:4a3a)
call BattleBGEffects_IncrementJumptable
ret
.SetLYOverridesBackup
.SetLYOverridesBackup:
ld e, a
ld a, [hFFC7]
ld l, a
@ -1913,7 +1913,7 @@ BattleBGEffect_2a: ; c8a3a (32:4a3a)
call BattleBGEffects_ResetVideoHRAM
ret
.GetLYOverride
.GetLYOverride:
ld hl, BG_EFFECT_STRUCT_03
add hl, bc
ld a, [hl]
@ -2042,7 +2042,7 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
ld [wOBP1], a
ret
.DMG_LYOverrideLoads
.DMG_LYOverrideLoads:
ld hl, LYOverridesBackup
.loop1
ld [hl], d
@ -2061,7 +2061,7 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
call BatttleBGEffects_GetNamedJumptablePointer
jp [hl]
.Jumptable
.Jumptable:
dw .cgb_zero
dw .cgb_one
dw .cgb_two
@ -2118,12 +2118,12 @@ BattleBGEffect_1c: ; c8b00 (32:4b00)
call EndBattleBGEffect
ret
.CGB_DMGEnemyData
.CGB_DMGEnemyData:
db $e4, $e4
db $f8, $90
db $fc, $40
db $f8, $90
.DMG_PlayerData
.DMG_PlayerData:
db $e4, $e4
db $90, $f8
db $40, $fc
@ -2135,7 +2135,7 @@ BattleBGEffect_RapidFlash: ; c8be8 (32:4be8)
call BGEffect_RapidCyclePals
ret
.FlashPals
.FlashPals:
db $e4, $6c, $fe
; c8bf2
@ -2144,7 +2144,7 @@ BattleBGEffect_16: ; c8bf2 (32:4bf2)
call BGEffect_RapidCyclePals
ret
.Pals
.Pals:
db $e4, $90, $40, $ff
; c8bfd
@ -2153,7 +2153,7 @@ BattleBGEffect_17: ; c8bfd (32:4bfd)
call BGEffect_RapidCyclePals
ret
.Pals
.Pals:
db $e4, $f8, $fc, $ff
; c8c08
@ -2162,7 +2162,7 @@ BattleBGEffect_18: ; c8c08 (32:4c08)
call BGEffect_RapidCyclePals
ret
.Pals
.Pals:
db $e4, $90, $40, $90, $fe
; c8c14
@ -2171,7 +2171,7 @@ BattleBGEffect_19: ; c8c14 (32:4c14)
call BGEffect_RapidCyclePals
ret
.Pals
.Pals:
db $e4, $f8, $fc, $f8, $fe
; c8c20
@ -2180,7 +2180,7 @@ BattleBGEffect_1a: ; c8c20 (32:4c20)
call BGEffect_RapidCyclePals
ret
.Pals
.Pals:
db $e4, $f8, $fc, $f8, $e4, $90, $40, $90, $fe
; c8c30
@ -2189,7 +2189,7 @@ BattleBGEffect_1b: ; c8c30 (32:4c30)
call BGEffect_RapidCyclePals
ret
.Pals
.Pals:
db $e4, $fc, $e4, $00, $fe
; c8c3c
@ -2198,7 +2198,7 @@ BattleBGEffect_1d: ; c8c3c (32:4c3c)
call BGEffect_RapidCyclePals
ret
.Pals
.Pals:
db $e4, $90, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $90, $e4, $ff
; c8c55
@ -2207,7 +2207,7 @@ BattleBGEffect_1e: ; c8c55 (32:4c55)
call BGEffect_RapidCyclePals
ret
.Pals
.Pals:
db $00, $40, $90, $e4, $ff
; c8c61
@ -2423,7 +2423,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
pop de
jp [hl]
.Jumptable_DMG
.Jumptable_DMG:
dw .zero_dmg
dw .one_dmg
dw .two_dmg
@ -2836,7 +2836,7 @@ Functionc8f9a: ; c8f9a (32:4f9a)
and a
ret
.GetLYOverrideBackupAddrOffset
.GetLYOverrideBackupAddrOffset:
ld a, [hFFC7]
ld e, a
ld a, [wBattleAnimTemp0]

190
battle/core.asm
View File

@ -273,7 +273,7 @@ HandleBetweenTurnEffects: ; 3c1d6
ret c
jr .NoMoreFaintingConditions
.CheckEnemyFirst
.CheckEnemyFirst:
call CheckFaint_EnemyThenPlayer
ret c
call HandleFutureSight
@ -289,7 +289,7 @@ HandleBetweenTurnEffects: ; 3c1d6
call CheckFaint_EnemyThenPlayer
ret c
.NoMoreFaintingConditions
.NoMoreFaintingConditions:
call HandleLeftovers
call HandleMysteryberry
call HanleDefrost
@ -310,7 +310,7 @@ CheckFaint_PlayerThenEnemy: ; 3c23c
and a
jr nz, .BattleIsOver
.PlayerNotFainted
.PlayerNotFainted:
call HasEnemyFainted
jr nz, .BattleContinues
call HandleEnemyMonFaint
@ -318,11 +318,11 @@ CheckFaint_PlayerThenEnemy: ; 3c23c
and a
jr nz, .BattleIsOver
.BattleContinues
.BattleContinues:
and a
ret
.BattleIsOver
.BattleIsOver:
scf
ret
; 3c25c
@ -335,7 +335,7 @@ CheckFaint_EnemyThenPlayer: ; 3c25c
and a
jr nz, .BattleIsOver
.EnemyNotFainted
.EnemyNotFainted:
call HasPlayerFainted
jr nz, .BattleContinues
call HandlePlayerMonFaint
@ -343,11 +343,11 @@ CheckFaint_EnemyThenPlayer: ; 3c25c
and a
jr nz, .BattleIsOver
.BattleContinues
.BattleContinues:
and a
ret
.BattleIsOver
.BattleIsOver:
scf
ret
; 3c27c
@ -816,11 +816,11 @@ TryEnemyFlee: ; 3c543
call IsInArray
jr c, .Flee
.Stay
.Stay:
and a
ret
.Flee
.Flee:
scf
ret
; 3c59a
@ -1218,7 +1218,7 @@ HandlePerishSong: ; 3c801
call SetEnemyTurn
jp .do_it
.EnemyFirst
.EnemyFirst:
call SetEnemyTurn
call .do_it
call SetPlayerTurn
@ -1287,7 +1287,7 @@ HandleWrap: ; 3c874
call SetEnemyTurn
jp .do_it
.EnemyFirst
.EnemyFirst:
call SetEnemyTurn
call .do_it
call SetPlayerTurn
@ -1359,7 +1359,7 @@ HandleLeftovers: ; 3c8eb
call SetEnemyTurn
jp .do_it
.DoEnemyFirst
.DoEnemyFirst:
call SetEnemyTurn
call .do_it
call SetPlayerTurn
@ -1409,7 +1409,7 @@ HandleMysteryberry: ; 3c93c
call SetEnemyTurn
jp .do_it
.DoEnemyFirst
.DoEnemyFirst:
call SetEnemyTurn
call .do_it
call SetPlayerTurn
@ -1667,7 +1667,7 @@ HandleSafeguard: ; 3cafb
.player1
call .CheckEnemy
.CheckPlayer
.CheckPlayer:
ld a, [PlayerScreens]
bit SCREENS_SAFEGUARD, a
ret z
@ -1679,7 +1679,7 @@ HandleSafeguard: ; 3cafb
xor a
jr .print
.CheckEnemy
.CheckEnemy:
ld a, [EnemyScreens]
bit SCREENS_SAFEGUARD, a
ret z
@ -1703,10 +1703,10 @@ HandleScreens: ; 3cb36
call .CheckPlayer
jr .CheckEnemy
.Both
.Both:
call .CheckEnemy
.CheckPlayer
.CheckPlayer:
call SetPlayerTurn
ld de, .Your
call .Copy
@ -1714,28 +1714,28 @@ HandleScreens: ; 3cb36
ld de, PlayerLightScreenCount
jr .TickScreens
.CheckEnemy
.CheckEnemy:
call SetEnemyTurn
ld de, .Enemy
call .Copy
ld hl, EnemyScreens
ld de, EnemyLightScreenCount
.TickScreens
.TickScreens:
bit SCREENS_LIGHT_SCREEN, [hl]
call nz, .LightScreenTick
bit SCREENS_REFLECT, [hl]
call nz, .ReflectTick
ret
.Copy
.Copy:
ld hl, StringBuffer1
jp CopyName2
; 3cb75
.Your
.Your:
db "Your@"
.Enemy
.Enemy:
db "Enemy@"
; 3cb80
@ -1797,7 +1797,7 @@ HandleWeather: ; 3cb9e
call .SandstormDamage
call SetPlayerTurn
.SandstormDamage
.SandstormDamage:
ld a, BATTLE_VARS_SUBSTATUS3
call GetBattleVar
bit SUBSTATUS_UNDERGROUND, a
@ -1844,7 +1844,7 @@ HandleWeather: ; 3cb9e
ld [Weather], a
ret
.PrintWeatherMessage
.PrintWeatherMessage:
ld a, [Weather]
dec a
ld c, a
@ -1857,11 +1857,11 @@ HandleWeather: ; 3cb9e
jp StdBattleTextBox
; 3cc2d
.WeatherMessages
.WeatherMessages:
dw BattleText_RainContinuesToFall
dw BattleText_TheSunlightIsStrong
dw BattleText_TheSandstormRages
.WeatherEndedMessages
.WeatherEndedMessages:
dw BattleText_TheRainStopped
dw BattleText_TheSunlightFaded
dw BattleText_TheSandstormSubsided
@ -2525,7 +2525,7 @@ WinTrainerBattle: ; 3cfa4
call ClearBGPalettes
ret
.GiveMoney
.GiveMoney:
ld a, [wAmuletCoin]
and a
call nz, .DoubleReward
@ -2578,7 +2578,7 @@ WinTrainerBattle: ; 3cfa4
ld l, a
jp StdBattleTextBox
.KeepItAll
.KeepItAll:
ld hl, GotMoneyForWinningText
jp StdBattleTextBox
; 3d081
@ -3143,7 +3143,7 @@ LostBattle: ; 3d38e
call SetPalettes
jr .end
.LostLinkBattle
.LostLinkBattle:
call UpdateEnemyMonInParty
call CheckEnemyTrainerDefeated
jr nz, .not_tied
@ -3202,13 +3202,13 @@ MonFaintedAnimation: ; 3d444
ld [wcfbe], a
ld b, 7
.OuterLoop
.OuterLoop:
push bc
push de
push hl
ld b, 6
.InnerLoop
.InnerLoop:
push bc
push hl
push de
@ -3246,7 +3246,7 @@ MonFaintedAnimation: ; 3d444
ret
; 3d488
.Spaces
.Spaces:
db " @"
; 3d490
@ -4655,7 +4655,7 @@ UseHeldStatusHealingItem: ; 3dde9
ret
; 3de44
.Statuses ; 3de44
.Statuses: ; 3de44
db HELD_HEAL_POISON, 1 << PSN
db HELD_HEAL_FREEZE, 1 << FRZ
db HELD_HEAL_BURN, 1 << BRN
@ -4779,7 +4779,7 @@ HandleStatBoostingHeldItems: ; 3de97
ret
; 3defc
.StatUpItems
.StatUpItems:
dbw HELD_ATTACK_UP, BattleCommand_AttackUp
dbw HELD_DEFENSE_UP, BattleCommand_DefenseUp
dbw HELD_SPEED_UP, BattleCommand_SpeedUp
@ -5347,18 +5347,18 @@ BattleMenuPKMN_Loop:
jr z, .Cancel
jr .loop
.PressedB
.PressedB:
call CheckMobileBattleError
jr c, .Cancel
jr BattleMenuPKMN_Loop
.Stats
.Stats:
call Battle_StatsScreen
call CheckMobileBattleError
jr c, .Cancel
jp BattleMenuPKMN_ReturnFromStats
.Cancel
.Cancel:
call ClearSprites
call ClearPalettes
call DelayFrame
@ -5984,9 +5984,9 @@ MoveInfoBox: ; 3e6c8
ret
; 3e74f
.Disabled
.Disabled:
db "Disabled!@"
.Type
.Type:
db "TYPE/@"
; 3e75f
@ -6291,7 +6291,7 @@ LoadEnemyMon: ; 3e8eb
jr .UpdateItem
.WildItem
.WildItem:
; In a wild battle, we pull from the item slots in BaseData
; Force Item1
@ -6321,7 +6321,7 @@ LoadEnemyMon: ; 3e8eb
ld a, [BaseItems+1]
.UpdateItem
.UpdateItem:
ld [EnemyMonItem], a
@ -6347,7 +6347,7 @@ LoadEnemyMon: ; 3e8eb
jp .Happiness
.InitDVs
.InitDVs:
; Trainer DVs
@ -6403,7 +6403,7 @@ LoadEnemyMon: ; 3e8eb
jr .UpdateDVs
.NotRoaming
.NotRoaming:
; Register a contains BattleType
; Forced shiny battle type
@ -6415,14 +6415,14 @@ LoadEnemyMon: ; 3e8eb
ld c, SPDSPCDV_SHINY ; $aa
jr .UpdateDVs
.GenerateDVs
.GenerateDVs:
; Generate new random DVs
call BattleRandom
ld b, a
call BattleRandom
ld c, a
.UpdateDVs
.UpdateDVs:
; Input DVs in register bc
ld hl, EnemyMonDVs
ld a, b
@ -6453,7 +6453,7 @@ LoadEnemyMon: ; 3e8eb
jr c, .GenerateDVs ; try again
.Magikarp
.Magikarp:
; Skimming this part recommended
ld a, [TempEnemyMonSpecies]
@ -6488,7 +6488,7 @@ LoadEnemyMon: ; 3e8eb
cp a, $40
jr nc, .GenerateDVs
.CheckMagikarpArea
.CheckMagikarpArea:
; The z checks are supposed to be nz
; Instead, all maps in GROUP_LAKE_OF_RAGE (mahogany area)
; and routes 20 and 44 are treated as Lake of Rage
@ -6516,7 +6516,7 @@ LoadEnemyMon: ; 3e8eb
; Finally done with DVs
.Happiness
.Happiness:
; Set happiness
ld a, BASE_HAPPINESS
ld [EnemyMonHappiness], a
@ -6543,7 +6543,7 @@ LoadEnemyMon: ; 3e8eb
bit SUBSTATUS_TRANSFORMED, a
jp nz, .Moves
.TreeMon
.TreeMon:
; If we're headbutting trees, some monsters enter battle asleep
call CheckSleepingTreeMon
ld a, SLP ; Asleep for 7 turns
@ -6551,7 +6551,7 @@ LoadEnemyMon: ; 3e8eb
; Otherwise, no status
xor a
.UpdateStatus
.UpdateStatus:
ld hl, EnemyMonStatus
ld [hli], a
@ -6581,7 +6581,7 @@ LoadEnemyMon: ; 3e8eb
ld [EnemyMonHP + 1], a
jr .Moves
.InitRoamHP
.InitRoamHP:
; HP only uses the lo byte in the RoamMon struct since
; Raikou/Entei/Suicune will have < 256 hp at level 40
ld a, [EnemyMonHP + 1]
@ -6589,7 +6589,7 @@ LoadEnemyMon: ; 3e8eb
jr .Moves
.OpponentParty
.OpponentParty:
; Get HP from the party struct
ld hl, (OTPartyMon1HP + 1)
ld a, [CurPartyMon]
@ -6609,7 +6609,7 @@ LoadEnemyMon: ; 3e8eb
ld [EnemyMonStatus], a
.Moves
.Moves:
ld hl, BaseType1
ld de, EnemyMonType1
ld a, [hli]
@ -6632,7 +6632,7 @@ LoadEnemyMon: ; 3e8eb
call CopyBytes
jr .PP
.WildMoves
.WildMoves:
; Clear EnemyMonMoves
xor a
ld h, d
@ -6646,7 +6646,7 @@ endr
; Fill moves based on level
predef FillMoves
.PP
.PP:
; Trainer battle?
ld a, [wBattleMode]
cp a, TRAINER_BATTLE
@ -6658,7 +6658,7 @@ endr
predef FillPP
jr .Finish
.TrainerPP
.TrainerPP:
; Copy PP from the party struct
ld hl, OTPartyMon1PP
ld a, [CurPartyMon]
@ -6667,7 +6667,7 @@ endr
ld bc, NUM_MOVES
call CopyBytes
.Finish
.Finish:
; Only the first five base stats are copied..
ld hl, BaseStats
ld de, EnemyMonBaseStats
@ -6737,18 +6737,18 @@ CheckSleepingTreeMon: ; 3eb38
jr z, .Check
ld hl, .Nite
.Check
.Check:
ld a, [TempEnemyMonSpecies]
ld de, 1 ; length of species id
call IsInArray
; If it's a match, the opponent is asleep
ret c
.NotSleeping
.NotSleeping:
and a
ret
.Nite
.Nite:
db CATERPIE
db METAPOD
db BUTTERFREE
@ -6762,7 +6762,7 @@ CheckSleepingTreeMon: ; 3eb38
db AIPOM
db -1 ; end
.Day
.Day:
db VENONAT
db HOOTHOOT
db NOCTOWL
@ -6770,7 +6770,7 @@ CheckSleepingTreeMon: ; 3eb38
db HERACROSS
db -1 ; end
.Morn
.Morn:
db VENONAT
db HOOTHOOT
db NOCTOWL
@ -6827,22 +6827,22 @@ CheckUnownLetter: ; 3eb75
and a
ret
.LetterSets
.LetterSets:
dw .Set1
dw .Set2
dw .Set3
dw .Set4
.Set1
.Set1:
; A B C D E F G H I J K
db 01, 02, 03, 04, 05, 06, 07, 08, 09, 10, 11, $ff
.Set2
.Set2:
; L M N O P Q R
db 12, 13, 14, 15, 16, 17, 18, $ff
.Set3
.Set3:
; S T U V W
db 19, 20, 21, 22, 23, $ff
.Set4
.Set4:
; X Y Z
db 24, 25, 26, $ff
@ -7124,7 +7124,7 @@ ApplyStatLevelMultiplier: ; 3ecb7
ret
; 3ed2b
.StatLevelMultipliers
.StatLevelMultipliers:
; /
db 25, 100 ; 25%
db 28, 100 ; 28%
@ -7186,7 +7186,7 @@ BadgeStatBoosts: ; 3ed45
ld hl, BattleMonAttack
ld c, 4
.CheckBadge
.CheckBadge:
ld a, b
srl b
call c, BoostStat
@ -7754,7 +7754,7 @@ GiveExperiencePoints: ; 3ee3b
jp ResetBattleParticipants
; 3f0d4
.EvenlyDivideExpAmongParticipants
.EvenlyDivideExpAmongParticipants:
; count number of battle participants
ld a, [wBattleParticipantsNotFainted]
ld b, a
@ -7878,7 +7878,7 @@ AnimateExpBar: ; 3f136
ld [hli], a
ld [hl], a
.NoOverflow
.NoOverflow:
ld d, MAX_LEVEL
callab CalcExpAtLevel
ld a, [hProduct + 1]
@ -7902,7 +7902,7 @@ AnimateExpBar: ; 3f136
ld a, d
ld [hld], a
.AlreadyAtMaxExp
.AlreadyAtMaxExp:
callab CalcLevel
ld a, d
pop bc
@ -7913,7 +7913,7 @@ AnimateExpBar: ; 3f136
ld a, e
ld d, a
.LoopLevels
.LoopLevels:
ld a, e
cp MAX_LEVEL
jr nc, .FinishExpBar
@ -7944,7 +7944,7 @@ AnimateExpBar: ; 3f136
ld b, $0
jr .LoopLevels
.FinishExpBar
.FinishExpBar:
push bc
ld b, d
ld de, TempMonExp + 2
@ -7964,7 +7964,7 @@ AnimateExpBar: ; 3f136
pop bc
ret
.PlayExpBarSound
.PlayExpBarSound:
push bc
call WaitSFX
ld de, SFX_EXP_BAR
@ -7974,7 +7974,7 @@ AnimateExpBar: ; 3f136
pop bc
ret
.LoopBarAnimation
.LoopBarAnimation:
ld d, 3
dec b
.anim_loop
@ -8119,7 +8119,7 @@ WithdrawPkmnText: ; 3f2f4
ld hl, .WithdrawPkmnText
jp BattleTextBox
.WithdrawPkmnText
.WithdrawPkmnText:
text_jump Text_BattleMonNickComma
start_asm
; Print text to withdraw Pkmn
@ -8523,7 +8523,7 @@ LoadTrainerOrWildMonPic: ; 3f54e
ld a, [TempWildMonSpecies]
ld [CurPartySpecies], a
.Trainer
.Trainer:
ld [TempEnemyMonSpecies], a
ret
; 3f55e
@ -8873,11 +8873,11 @@ DetermineMobileBattleResult: ; 3f77c
ret
; 3f7f7
.Win
.Win:
db "YOU WIN@"
.Lose
.Lose:
db "YOU LOSE@"
.Draw
.Draw:
db " DRAW@"
; 3f80f
@ -8892,7 +8892,7 @@ DetermineMobileBattleResult: ; 3f77c
ret
; 3f821
.Invalid
.Invalid:
db "INVALID BATTLE@"
; 3f830
@ -8980,7 +8980,7 @@ ReadAndPrintLinkBattleRecord: ; 3f85f
call PrintNum
jr .next
.PrintFormatString
.PrintFormatString:
ld de, .Format
call PlaceString
.next
@ -8997,7 +8997,7 @@ ReadAndPrintLinkBattleRecord: ; 3f85f
jr nz, .loop
ret
.PrintBattleRecord
.PrintBattleRecord:
hlcoord 1, 0
ld de, .Record
call PlaceString
@ -9035,7 +9035,7 @@ ReadAndPrintLinkBattleRecord: ; 3f85f
.quit
ret
.PrintZerosIfNoSaveFileExists
.PrintZerosIfNoSaveFileExists:
ld a, [wSavedAtLeastOnce]
and a
ret nz
@ -9045,18 +9045,18 @@ ReadAndPrintLinkBattleRecord: ; 3f85f
ret
; 3f938
.Scores
.Scores:
db " 0 0 0@"
; 3f947
.Format ; 3f947
.Format: ; 3f947
db " --- <LNBRK>"
db " - - -@"
.Record ; 3f964
.Record: ; 3f964
db "<PLAYER>'s RECORD@"
.Result ; 3f96e
.Result: ; 3f96e
db "RESULT WIN LOSE DRAW@"
.Total ; 3f983
.Total: ; 3f983
db "TOTAL WIN LOSE DRAW@"
; 3f998
@ -9472,12 +9472,12 @@ GetTrainerBackpic: ; 3fbff
callba GetKrisBackpic
ret
.Chris
.Chris:
; It's a boy.
ld b, BANK(ChrisBackpic)
ld hl, ChrisBackpic
.Decompress
.Decompress:
ld de, VTiles2 tile $31
ld c, $31
predef DecompressPredef
@ -9603,7 +9603,7 @@ BattleStartMessage: ; 3fc8b
ld hl, HookedPokemonAttackedText
jr .PlaceBattleStartText
.NotFishing
.NotFishing:
ld hl, PokemonFellFromTreeText
cp BATTLETYPE_TREE
jr z, .PlaceBattleStartText
@ -9612,7 +9612,7 @@ BattleStartMessage: ; 3fc8b
jr z, .PlaceBattleStartText
ld hl, WildPokemonAppearedText
.PlaceBattleStartText
.PlaceBattleStartText:
push hl
callba BattleStart_TrainerHuds
pop hl

184
battle/effect_commands.asm
View File

@ -58,7 +58,7 @@ DoMove: ; 3402c
ld de, BattleScriptBuffer
.GetMoveEffect
.GetMoveEffect:
ld a, BANK(MoveEffects)
call GetFarByte
inc hl
@ -74,7 +74,7 @@ DoMove: ; 3402c
ld a, h
ld [BattleScriptBufferLoc + 1], a
.ReadMoveEffectCommand
.ReadMoveEffectCommand:
; ld a, [BattleScriptBufferLoc++]
ld a, [BattleScriptBufferLoc]
@ -112,7 +112,7 @@ DoMove: ; 3402c
jr .ReadMoveEffectCommand
.DoMoveEffectCommand
.DoMoveEffectCommand:
jp [hl]
; 34084
@ -830,7 +830,7 @@ BattleCommand_CheckObedience: ; 343db
jp .EndDisobedience
.Nap
.Nap:
call BattleRandom
add a
swap a
@ -843,7 +843,7 @@ BattleCommand_CheckObedience: ; 343db
jr .Print
.DoNothing
.DoNothing:
call BattleRandom
and 3
@ -861,12 +861,12 @@ BattleCommand_CheckObedience: ; 343db
ld hl, IgnoredOrdersText
.Print
.Print:
call StdBattleTextBox
jp .EndDisobedience
.UseInstead
.UseInstead:
; Can't use another move if the monster only has one!
ld a, [BattleMonMoves + 1]
@ -884,7 +884,7 @@ BattleCommand_CheckObedience: ; 343db
ld b, 0
ld c, NUM_MOVES
.GetTotalPP
.GetTotalPP:
ld a, [hli]
and $3f ; exclude pp up
add b
@ -900,7 +900,7 @@ BattleCommand_CheckObedience: ; 343db
jr nz, .GetTotalPP
.CheckMovePP
.CheckMovePP:
ld hl, BattleMonPP
ld a, [CurMoveNum]
ld e, a
@ -927,7 +927,7 @@ BattleCommand_CheckObedience: ; 343db
push af
.RandomMove
.RandomMove:
call BattleRandom
and 3 ; TODO NUM_MOVES
@ -968,7 +968,7 @@ BattleCommand_CheckObedience: ; 343db
ld [CurMoveNum], a
.EndDisobedience
.EndDisobedience:
xor a
ld [LastPlayerMove], a
ld [LastEnemyCounterMove], a
@ -996,7 +996,7 @@ IgnoreSleepOnly: ; 3451f
and a
ret
.CheckSleep
.CheckSleep:
ld a, BATTLE_VARS_STATUS
call GetBattleVar
and SLP
@ -1229,7 +1229,7 @@ BattleCommand_Critical: ; 34631
ld hl, BattleMonItem
ld a, [BattleMonSpecies]
.Item
.Item:
ld c, 0
cp CHANSEY
@ -1242,7 +1242,7 @@ BattleCommand_Critical: ; 34631
ld c, 2
jr .Tally
.Farfetchd
.Farfetchd:
cp FARFETCH_D
jr nz, .FocusEnergy
ld a, [hl]
@ -1253,7 +1253,7 @@ BattleCommand_Critical: ; 34631
ld c, 2
jr .Tally
.FocusEnergy
.FocusEnergy:
ld a, BATTLE_VARS_SUBSTATUS4
call GetBattleVar
bit SUBSTATUS_FOCUS_ENERGY, a
@ -1262,7 +1262,7 @@ BattleCommand_Critical: ; 34631
; +1 critical level
inc c
.CheckCritical
.CheckCritical:
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
ld de, 1
@ -1276,7 +1276,7 @@ BattleCommand_Critical: ; 34631
inc c
inc c
.ScopeLens
.ScopeLens:
push bc
call GetUserItem
ld a, b
@ -1287,7 +1287,7 @@ BattleCommand_Critical: ; 34631
; +1 critical level
inc c
.Tally
.Tally:
ld hl, .Chances
ld b, 0
add hl, bc
@ -1298,9 +1298,9 @@ BattleCommand_Critical: ; 34631
ld [CriticalHit], a
ret
.Criticals
.Criticals:
db KARATE_CHOP, RAZOR_WIND, RAZOR_LEAF, CRABHAMMER, SLASH, AEROBLAST, CROSS_CHOP, $ff
.Chances
.Chances:
; 6.25% 12.1% 24.6% 33.2% 49.6% 49.6% 49.6%
db $11, $20, $40, $55, $80, $80, $80
; 0 1 2 3 4 5 6
@ -1424,13 +1424,13 @@ BattleCommand_Stab: ; 346d2
ld hl, TypeModifier
set 7, [hl]
.SkipStab
.SkipStab:
ld a, BATTLE_VARS_MOVE_TYPE
call GetBattleVar
ld b, a
ld hl, TypeMatchup
.TypesLoop
.TypesLoop:
ld a, [hli]
cp $ff
@ -1446,7 +1446,7 @@ BattleCommand_Stab: ; 346d2
jr .TypesLoop
.SkipForesightCheck
.SkipForesightCheck:
cp b
jr nz, .SkipType
ld a, [hl]
@ -1456,7 +1456,7 @@ BattleCommand_Stab: ; 346d2
jr z, .GotMatchup
jr .SkipType
.GotMatchup
.GotMatchup:
push hl
push bc
inc hl
@ -1470,7 +1470,7 @@ BattleCommand_Stab: ; 346d2
inc a
ld [AttackMissed], a
xor a
.NotImmune
.NotImmune:
ld [hMultiplier], a
add b
ld [TypeModifier], a
@ -1517,7 +1517,7 @@ BattleCommand_Stab: ; 346d2
pop bc
pop hl
.SkipType
.SkipType:
inc hl
inc hl
jr .TypesLoop
@ -1559,7 +1559,7 @@ CheckTypeMatchup: ; 347d3
ld a, 10 ; 1.0
ld [wTypeMatchup], a
ld hl, TypeMatchup
.TypesLoop
.TypesLoop:
ld a, [hli]
cp $ff
jr z, .End
@ -1571,7 +1571,7 @@ CheckTypeMatchup: ; 347d3
jr nz, .End
jr .TypesLoop
.Next
.Next:
cp d
jr nz, .Nope
ld a, [hli]
@ -1581,13 +1581,13 @@ CheckTypeMatchup: ; 347d3
jr z, .Yup
jr .Nope2
.Nope
.Nope:
inc hl
.Nope2
.Nope2:
inc hl
jr .TypesLoop
.Yup
.Yup:
xor a
ld [hDividend + 0], a
ld [hMultiplicand + 0], a
@ -1607,7 +1607,7 @@ CheckTypeMatchup: ; 347d3
ld [wTypeMatchup], a
jr .TypesLoop
.End
.End:
pop bc
pop de
pop hl
@ -1740,7 +1740,7 @@ BattleCommand_CheckHit: ; 34d32
ld a, [wEnemyMoveStruct + MOVE_ACC]
ld b, a
.BrightPowder
.BrightPowder:
push bc
call GetOpponentItem
ld a, b
@ -1765,11 +1765,11 @@ BattleCommand_CheckHit: ; 34d32
cp b
jr nc, .Miss
.Hit
.Hit:
ret
.Miss
.Miss:
; Keep the damage value intact if we're using (Hi) Jump Kick.
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar
@ -1777,13 +1777,13 @@ BattleCommand_CheckHit: ; 34d32
jr z, .Missed
call ResetDamage
.Missed
.Missed:
ld a, 1
ld [AttackMissed], a
ret
.DreamEater
.DreamEater:
; Return z if we're trying to eat the dream of
; a monster that isn't sleeping.
ld a, BATTLE_VARS_MOVE_EFFECT
@ -1797,7 +1797,7 @@ BattleCommand_CheckHit: ; 34d32
ret
.Protect
.Protect:
; Return nz if the opponent is protected.
ld a, BATTLE_VARS_SUBSTATUS1_OPP
call GetBattleVar
@ -1819,7 +1819,7 @@ BattleCommand_CheckHit: ; 34d32
ret
.LockOn
.LockOn:
; Return nz if we are locked-on and aren't trying to use Earthquake,
; Fissure or Magnitude on a monster that is flying.
ld a, BATTLE_VARS_SUBSTATUS5_OPP
@ -1843,13 +1843,13 @@ BattleCommand_CheckHit: ; 34d32
cp MAGNITUDE
ret z
.LockedOn
.LockedOn:
ld a, 1
and a
ret
.DrainSub
.DrainSub:
; Return z if using an HP drain move on a substitute.
call CheckSubstituteOpp
jr z, .not_draining_sub
@ -1868,7 +1868,7 @@ BattleCommand_CheckHit: ; 34d32
ret
.FlyDigMoves
.FlyDigMoves:
; Check for moves that can hit underground/flying opponents.
; Return z if the current move can hit the opponent.
@ -1892,7 +1892,7 @@ BattleCommand_CheckHit: ; 34d32
cp TWISTER
ret
.DigMoves
.DigMoves:
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
@ -1904,7 +1904,7 @@ BattleCommand_CheckHit: ; 34d32
ret
.ThunderRain
.ThunderRain:
; Return z if the current move always hits in rain, and it is raining.
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar
@ -1916,14 +1916,14 @@ BattleCommand_CheckHit: ; 34d32
ret
.XAccuracy
.XAccuracy:
ld a, BATTLE_VARS_SUBSTATUS4
call GetBattleVar
bit SUBSTATUS_X_ACCURACY, a
ret
.StatModifiers
.StatModifiers:
ld a, [hBattleTurn]
and a
@ -2015,7 +2015,7 @@ BattleCommand_CheckHit: ; 34d32
ld [hl], a
ret
.AccProb
.AccProb:
db 33, 100 ; 33% -6
db 36, 100 ; 36% -5
db 43, 100 ; 43% -4
@ -2112,7 +2112,7 @@ BattleCommand_LowerSub: ; 34eee
call BattleCommand_LowerSubNoAnim
jp BattleCommand_MoveDelay
.Rampage
.Rampage:
ld a, BATTLE_VARS_MOVE_EFFECT
call GetBattleVar
cp EFFECT_ROLLOUT
@ -2764,7 +2764,7 @@ DittoMetalPowder: ; 352b1
jr nz, .Ditto
ld a, [TempEnemyMonSpecies]
.Ditto
.Ditto:
cp DITTO
ret nz
@ -3048,7 +3048,7 @@ SpeciesItemBoost: ; 353d1
ld a, [hl]
jr z, .CompareSpecies
ld a, [TempEnemyMonSpecies]
.CompareSpecies
.CompareSpecies:
pop hl
cp b
@ -3056,7 +3056,7 @@ SpeciesItemBoost: ; 353d1
cp c
ret nz
.GetItemHeldEffect
.GetItemHeldEffect:
push hl
call GetUserItem
ld a, [hl]
@ -3110,7 +3110,7 @@ EnemyAttackDamage: ; 353f6
ld hl, EnemyStats
jr .thickclub
.Special
.Special:
ld hl, BattleMonSpclDef
ld a, [hli]
ld b, a
@ -3517,7 +3517,7 @@ BattleCommand_DamageCalc: ; 35612
ld hl, TypeBoostItems
.NextItem
.NextItem:
ld a, [hli]
cp $ff
jr z, .DoneItem
@ -3545,7 +3545,7 @@ BattleCommand_DamageCalc: ; 35612
ld [hDivisor], a
ld b, 4
call Divide
.DoneItem
.DoneItem:
; Critical hits
call .CriticalMultiplier
@ -3609,7 +3609,7 @@ BattleCommand_DamageCalc: ; 35612
cp 998 % $100
jr c, .dont_cap_3
.Cap
.Cap:
ld a, 997 / $100
ld [hli], a
ld a, 997 % $100
@ -3631,7 +3631,7 @@ BattleCommand_DamageCalc: ; 35612
ret
.CriticalMultiplier
.CriticalMultiplier:
ld a, [CriticalHit]
and a
ret z
@ -3837,7 +3837,7 @@ BattleCommand_ConstantDamage: ; 35726
ld [hl], 1
ret
.FlailPower
.FlailPower:
; px, bp
db 1, 200
db 4, 150
@ -4070,7 +4070,7 @@ BattleCommand_PainSplit: ; 35926
ld hl, SharedPainText
jp StdBattleTextBox
.PlayerShareHP
.PlayerShareHP:
ld a, [hld]
ld [Buffer1], a
ld a, [hld]
@ -4127,7 +4127,7 @@ endr
; 359cd
.ButItFailed
.ButItFailed:
jp PrintDidntAffect2
; 359d0
@ -5807,7 +5807,7 @@ BattleCommand_StatDown: ; 362e3
jr z, .GetStatLevel
ld hl, PlayerStatLevels
.GetStatLevel
.GetStatLevel:
; Attempt to lower the stat.
ld a, [LoweredStat]
and $f
@ -5826,7 +5826,7 @@ BattleCommand_StatDown: ; 362e3
jr nz, .ComputerMiss
inc b
.ComputerMiss
.ComputerMiss:
; Computer opponents have a 1/4 chance of failing.
ld a, [hBattleTurn]
and a
@ -5855,7 +5855,7 @@ BattleCommand_StatDown: ; 362e3
cp $40
jr c, .Failed
.DidntMiss
.DidntMiss:
call CheckSubstituteOpp
jr nz, .Failed
@ -5889,27 +5889,27 @@ BattleCommand_StatDown: ; 362e3
pop hl
jr z, .CouldntLower
.Hit
.Hit:
xor a
ld [FailedMessage], a
ret
.CouldntLower
.CouldntLower:
inc [hl]
.CantLower
.CantLower:
ld a, 3
ld [FailedMessage], a
ld a, 1
ld [AttackMissed], a
ret
.Failed
.Failed:
ld a, 1
ld [FailedMessage], a
ld [AttackMissed], a
ret
.Mist
.Mist:
ld a, 2
ld [FailedMessage], a
ld a, 1
@ -6046,7 +6046,7 @@ TryLowerStat: ; 3641a
call BattleCommand_SwitchTurn
jr .end
.Player
.Player:
call BattleCommand_SwitchTurn
call CalcEnemyStats
call BattleCommand_SwitchTurn
@ -6106,16 +6106,16 @@ BattleCommand_StatDownFailText: ; 3646a
GetStatName: ; 3648f
ld hl, .names
ld c, "@"
.CheckName
.CheckName:
dec b
jr z, .Copy
.GetName
.GetName:
ld a, [hli]
cp c
jr z, .CheckName
jr .GetName
.Copy
.Copy:
ld de, StringBuffer2
ld bc, StringBuffer3 - StringBuffer2
jp CopyBytes
@ -6301,7 +6301,7 @@ BattleCommand_RaiseSubNoAnim: ; 365af
and a
jr z, .PlayerTurn
ld hl, GetMonFrontpic
.PlayerTurn
.PlayerTurn:
xor a
ld [hBGMapMode], a
call CallBattleCore
@ -6316,7 +6316,7 @@ BattleCommand_LowerSubNoAnim: ; 365c3
and a
jr z, .PlayerTurn
ld hl, DropEnemySub
.PlayerTurn
.PlayerTurn:
xor a
ld [hBGMapMode], a
call CallBattleCore
@ -7353,7 +7353,7 @@ BattleCommand_Charge: ; 36b4d
jp z, SkipToBattleCommand
jp EndMoveEffect
.UsedText
.UsedText:
text_jump UnknownText_0x1c0d0e ; "[USER]"
start_asm
ld a, BATTLE_VARS_MOVE_ANIM
@ -7384,32 +7384,32 @@ BattleCommand_Charge: ; 36b4d
.done
ret
.RazorWind
.RazorWind:
; 'made a whirlwind!'
text_jump UnknownText_0x1c0d12
db "@"
.Solarbeam
.Solarbeam:
; 'took in sunlight!'
text_jump UnknownText_0x1c0d26
db "@"
.SkullBash
.SkullBash:
; 'lowered its head!'
text_jump UnknownText_0x1c0d3a
db "@"
.SkyAttack
.SkyAttack:
; 'is glowing!'
text_jump UnknownText_0x1c0d4e
db "@"
.Fly
.Fly:
; 'flew up high!'
text_jump UnknownText_0x1c0d5c
db "@"
.Dig
.Dig:
; 'dug a hole!'
text_jump UnknownText_0x1c0d6c
db "@"
@ -7471,7 +7471,7 @@ endr
ld l, a
jp StdBattleTextBox
.Traps
.Traps:
dbw BIND, UsedBindText ; 'used BIND on'
dbw WRAP, WrappedByText ; 'was WRAPPED by'
dbw FIRE_SPIN, FireSpinTrapText ; 'was trapped!'
@ -8311,7 +8311,7 @@ BattleCommand_ResetStats: ; 3710e
ld hl, EliminatedStatsText
jp StdBattleTextBox
.Fill
.Fill:
ld b, PlayerStatLevelsEnd - PlayerStatLevels
.next
ld [hli], a
@ -8492,7 +8492,7 @@ BattleCommand_Screen: ; 372fc
ld hl, LightScreenEffectText
jr .good
.Reflect
.Reflect:
bit SCREENS_REFLECT, [hl]
jr nz, .failed
set SCREENS_REFLECT, [hl]
@ -8993,7 +8993,7 @@ BattleCommand_GetMagnitude: ; 37991
pop bc
ret
.Magnitudes
.Magnitudes:
; /255, BP, magnitude
db 13, 10, 4
db 38, 30, 5
@ -9053,7 +9053,7 @@ BattleCommand_BatonPass: ; 379c9
ret
.Enemy
.Enemy:
; Wildmons don't have anything to switch to
ld a, [wBattleMode]
@ -9368,7 +9368,7 @@ BattleCommand_TimeBasedHealContinue: ; 37b7e
jr z, .Weather
dec c ; double
.Weather
.Weather:
ld a, [Weather]
and a
jr z, .Heal
@ -9381,7 +9381,7 @@ BattleCommand_TimeBasedHealContinue: ; 37b7e
dec c
dec c
.Heal
.Heal:
ld b, 0
ld hl, .Multipliers
add hl, bc
@ -9405,14 +9405,14 @@ BattleCommand_TimeBasedHealContinue: ; 37b7e
ld hl, RegainedHealthText
jp StdBattleTextBox
.Full
.Full:
call AnimateFailedMove
; 'hp is full!'
ld hl, HPIsFullText
jp StdBattleTextBox
.Multipliers
.Multipliers:
dw GetEighthMaxHP
dw GetQuarterMaxHP
dw GetHalfMaxHP
@ -9691,13 +9691,13 @@ BattleCommand_FutureSight: ; 37d34
ld a, BATTLE_VARS_LAST_MOVE
call GetBattleVarAddr
ld [hl], b
.AlreadyChargingFutureSight
.AlreadyChargingFutureSight:
ld hl, wPlayerFutureSightCount
ld a, [hBattleTurn]
and a
jr z, .GotFutureSightCount
ld hl, wEnemyFutureSightCount
.GotFutureSightCount
.GotFutureSightCount:
ld a, [hl]
and a
jr nz, .failed
@ -9713,7 +9713,7 @@ BattleCommand_FutureSight: ; 37d34
and a
jr z, .StoreDamage
ld de, wEnemyFutureSightDamage
.StoreDamage
.StoreDamage:
ld hl, CurDamage
ld a, [hl]
ld [de], a

2
battle/effects/metronome.asm
View File

@ -14,7 +14,7 @@ BattleCommand_Metronome: ; 37418
.asm_3742b
call LoadMoveAnim
.GetMove
.GetMove:
call BattleRandom
; No invalid moves.

2
battle/effects/present.asm
View File

@ -85,7 +85,7 @@ BattleCommand_Present: ; 37874
.do_animation
jp EndMoveEffect
.PresentPower
.PresentPower:
db 40 percent, 40
db 70 percent + 1, 80
db 80 percent, 120

26
battle/misc.asm
View File

@ -58,7 +58,7 @@ DoWeatherModifiers: ; fbda4
ld a, [wd265] ; move type
ld c, a
.CheckWeatherType
.CheckWeatherType:
ld a, [de]
inc de
cp $ff
@ -71,7 +71,7 @@ DoWeatherModifiers: ; fbda4
cp c
jr z, .ApplyModifier
.NextWeatherType
.NextWeatherType:
rept 2
inc de
endr
@ -85,7 +85,7 @@ endr
call GetBattleVar
ld c, a
.CheckWeatherMove
.CheckWeatherMove:
ld a, [de]
inc de
cp $ff
@ -98,13 +98,13 @@ endr
cp c
jr z, .ApplyModifier
.NextWeatherMove
.NextWeatherMove:
rept 2
inc de
endr
jr .CheckWeatherMove
.ApplyModifier
.ApplyModifier:
xor a
ld [hMultiplicand + 0], a
ld hl, CurDamage
@ -138,7 +138,7 @@ endr
ld bc, 1
.Update
.Update:
ld a, b
ld [CurDamage], a
ld a, c
@ -147,14 +147,14 @@ endr
.done
ret
.WeatherTypeModifiers
.WeatherTypeModifiers:
db WEATHER_RAIN, WATER, 15
db WEATHER_RAIN, FIRE, 05
db WEATHER_SUN, FIRE, 15
db WEATHER_SUN, WATER, 05
db $ff
.WeatherMoveModifiers
.WeatherMoveModifiers:
db WEATHER_RAIN, EFFECT_SOLARBEAM, 05
db $ff
; fbe24
@ -183,7 +183,7 @@ DoBadgeTypeBoosts: ; fbe24
ld a, [JohtoBadges]
ld c, a
.CheckBadge
.CheckBadge:
ld a, [hl]
cp $ff
jr z, .done
@ -196,11 +196,11 @@ DoBadgeTypeBoosts: ; fbe24
cp [hl]
jr z, .ApplyBoost
.NextBadge
.NextBadge:
inc hl
jr .CheckBadge
.ApplyBoost
.ApplyBoost:
ld a, [CurDamage]
ld h, a
ld d, a
@ -226,7 +226,7 @@ DoBadgeTypeBoosts: ; fbe24
ld hl, $ffff
.Update
.Update:
ld a, h
ld [CurDamage], a
ld a, l
@ -237,7 +237,7 @@ DoBadgeTypeBoosts: ; fbe24
pop de
ret
.BadgeTypes
.BadgeTypes:
db FLYING ; zephyrbadge
db BUG ; hivebadge
db NORMAL ; plainbadge

370
battle/objects/framesets.asm
View File

File diff suppressed because it is too large Load Diff

8
battle/objects/functions.asm
View File

@ -12,7 +12,7 @@ DoBattleAnimFrame: ; ccfbe
jp [hl]
; ccfce
.Jumptable
.Jumptable:
dw BattleAnimFunction_00 ; 00
dw BattleAnimFunction_01 ; 01
dw BattleAnimFunction_02 ; 02
@ -425,7 +425,7 @@ GetBallAnimPal: ; cd249 (33:5249)
ld e, a
pop af
ld [rSVBK], a
.IsInArray
.IsInArray:
ld a, [hli]
cp -1
jr z, .load
@ -634,7 +634,7 @@ BattleAnimFunction_08: ; cd306 (33:5306)
call .SetCoords
ret
.SetCoords
.SetCoords:
ld hl, BATTLEANIMSTRUCT_0B
add hl, bc
ld a, [hl]
@ -4100,7 +4100,7 @@ BattleAnim_Sine: ; ce734 (33:6734)
inc a
ret
.ApplySineWave
.ApplySineWave:
ld e, a
ld a, d
ld d, 0

168
battle/objects/oam.asm
View File

@ -218,27 +218,27 @@ BattleAnimOAMData: ; ceeae
dbbw $00, 14, .OAMData_d6 ; d6
dbbw $00, 12, .OAMData_d7 ; d7
.OAMData_11
.OAMData_11:
dsprite -1, 0, -1, 4, $00, $00
dsprite 0, 0, -1, 4, $01, $00
.OAMData_56
.OAMData_56:
dsprite -1, 4, -1, 0, $00, $00
dsprite -1, 4, 0, 0, $01, $00
.OAMData_03
.OAMData_03:
dsprite -1, 0, -1, 0, $00, $00
dsprite -1, 0, 0, 0, $01, $00
dsprite 0, 0, -1, 0, $02, $00
dsprite 0, 0, 0, 0, $03, $00
.OAMData_02
.OAMData_02:
dsprite -1, 0, -1, 0, $00, $00
dsprite -1, 0, 0, 0, $00, $20
dsprite 0, 0, -1, 0, $00, $40
dsprite 0, 0, 0, 0, $00, $60
.OAMData_c3
.OAMData_c3:
dsprite -2, 4, -2, 4, $00, $00
dsprite -2, 4, -1, 4, $01, $00
dsprite -2, 4, 0, 4, $02, $00
@ -249,7 +249,7 @@ BattleAnimOAMData: ; ceeae
dsprite 0, 4, -1, 4, $07, $00
dsprite 0, 4, 0, 4, $08, $00
.OAMData_01
.OAMData_01:
dsprite -2, 4, -2, 4, $00, $00
dsprite -2, 4, -1, 4, $01, $00
dsprite -2, 4, 0, 4, $00, $20
@ -260,7 +260,7 @@ BattleAnimOAMData: ; ceeae
dsprite 0, 4, -1, 4, $01, $60
dsprite 0, 4, 0, 4, $00, $60
.OAMData_cf
.OAMData_cf:
dsprite -2, 0, -2, 4, $00, $00
dsprite -2, 0, -1, 4, $01, $00
dsprite -2, 0, 0, 4, $02, $00
@ -274,7 +274,7 @@ BattleAnimOAMData: ; ceeae
dsprite 1, 0, -1, 4, $01, $60
dsprite 1, 0, 0, 4, $00, $60
.OAMData_1c
.OAMData_1c:
dsprite -2, 0, -2, 0, $00, $00
dsprite -2, 0, -1, 0, $01, $00
dsprite -2, 0, 0, 0, $02, $00
@ -292,7 +292,7 @@ BattleAnimOAMData: ; ceeae
dsprite 1, 0, 0, 0, $0e, $00
dsprite 1, 0, 1, 0, $0f, $00
.OAMData_00
.OAMData_00:
dsprite -2, 0, -2, 0, $00, $00
dsprite -2, 0, -1, 0, $01, $00
dsprite -1, 0, -2, 0, $02, $00
@ -310,7 +310,7 @@ BattleAnimOAMData: ; ceeae
dsprite 1, 0, 0, 0, $01, $60
dsprite 1, 0, 1, 0, $00, $60
.OAMData_09
.OAMData_09:
dsprite -3, 4, -3, 4, $00, $00
dsprite -3, 4, -2, 4, $01, $00
dsprite -2, 4, -3, 4, $02, $00
@ -328,33 +328,33 @@ BattleAnimOAMData: ; ceeae
dsprite 1, 4, 0, 4, $01, $60
dsprite 1, 4, 1, 4, $00, $60
.OAMData_0c
.OAMData_0c:
dsprite -1, 4, -1, 0, $00, $00
dsprite -1, 4, 0, 0, $00, $20
.OAMData_6a
.OAMData_6a:
dsprite 0, 0, -1, 0, $00, $00
dsprite 0, 0, 0, 0, $00, $20
.OAMData_04
.OAMData_04:
dsprite -1, 0, -1, 0, $00, $00
dsprite -1, 0, 0, 0, $00, $20
dsprite 0, 0, -1, 0, $01, $00
dsprite 0, 0, 0, 0, $01, $20
.OAMData_5d
.OAMData_5d:
dsprite -1, 0, -1, 0, $00, $00
dsprite -1, 0, 0, 0, $01, $00
dsprite 0, 0, -1, 0, $00, $40
dsprite 0, 0, 0, 0, $01, $40
.OAMData_13
.OAMData_13:
dsprite -1, 2, -1, 0, $02, $00
dsprite 0, 2, -1, 0, $03, $00
dsprite -2, 6, 0, 0, $02, $00
dsprite -1, 6, 0, 0, $03, $00
.OAMData_22
.OAMData_22:
dsprite 1, 0, -11, 0, $01, $00
dsprite 0, 0, -10, 0, $02, $00
dsprite 0, 0, -9, 0, $03, $00
@ -378,14 +378,14 @@ BattleAnimOAMData: ; ceeae
dsprite -1, 0, 9, 0, $01, $00
dsprite -2, 0, 10, 0, $02, $00
.OAMData_2a
.OAMData_2a:
dsprite -3, 4, -1, 0, $00, $00
dsprite -3, 4, 0, 0, $00, $20
dsprite -2, 4, -1, 0, $01, $00
dsprite -2, 4, 0, 0, $01, $20
dsprite -1, 4, -1, 4, $02, $00
.OAMData_2b
.OAMData_2b:
dsprite -4, 4, -1, 0, $00, $00
dsprite -4, 4, 0, 0, $00, $20
dsprite -3, 4, -1, 0, $01, $00
@ -393,7 +393,7 @@ BattleAnimOAMData: ; ceeae
dsprite -2, 4, -1, 4, $02, $00
dsprite -1, 4, -1, 4, $02, $00
.OAMData_2c
.OAMData_2c:
dsprite -5, 4, -1, 0, $00, $00
dsprite -5, 4, 0, 0, $00, $20
dsprite -4, 4, -1, 0, $01, $00
@ -402,7 +402,7 @@ BattleAnimOAMData: ; ceeae
dsprite -2, 4, -1, 4, $02, $00
dsprite -1, 4, -1, 4, $02, $00
.OAMData_2d
.OAMData_2d:
dsprite -6, 4, -1, 0, $00, $00
dsprite -6, 4, 0, 0, $00, $20
dsprite -5, 4, -1, 0, $01, $00
@ -412,7 +412,7 @@ BattleAnimOAMData: ; ceeae
dsprite -2, 4, -1, 4, $02, $00
dsprite -1, 4, -1, 4, $02, $00
.OAMData_2e
.OAMData_2e:
dsprite -7, 4, -1, 0, $00, $00
dsprite -7, 4, 0, 0, $00, $20
dsprite -6, 4, -1, 0, $01, $00
@ -423,19 +423,19 @@ BattleAnimOAMData: ; ceeae
dsprite -2, 4, -1, 4, $02, $00
dsprite -1, 4, -1, 4, $02, $00
.OAMData_2f
.OAMData_2f:
dsprite -1, 0, -1, 0, $00, $00
dsprite -1, 0, 0, 0, $00, $20
dsprite 0, 0, -1, 0, $01, $00
dsprite 0, 0, 0, 0, $00, $60
.OAMData_30
.OAMData_30:
dsprite -1, 0, -1, 0, $00, $00
dsprite -1, 0, 0, 0, $01, $00
dsprite 0, 0, -1, 0, $01, $60
dsprite 0, 0, 0, 0, $00, $60
.OAMData_31
.OAMData_31:
dsprite -2, 4, -1, 0, $00, $00
dsprite -2, 4, 0, 0, $01, $00
dsprite -1, 4, -1, 0, $02, $00
@ -443,11 +443,11 @@ BattleAnimOAMData: ; ceeae
dsprite 0, 4, -1, 0, $04, $00
dsprite 0, 4, 0, 0, $05, $00
.OAMData_76
.OAMData_76:
dsprite -1, 5, -1, 0, $00, $00
dsprite -1, 1, 0, 0, $00, $00
.OAMData_32
.OAMData_32:
dsprite -1, 0, -2, 4, $00, $00
dsprite -1, 0, 0, 4, $00, $00
dsprite -3, 0, -2, 4, $00, $00
@ -463,7 +463,7 @@ BattleAnimOAMData: ; ceeae
dsprite -1, 0, 1, 4, $01, $00
dsprite -1, 0, 2, 4, $00, $00
.OAMData_33
.OAMData_33:
dsprite -2, 0, -2, 4, $00, $00
dsprite -2, 0, 0, 4, $00, $00
dsprite -1, 0, -3, 4, $00, $00
@ -486,7 +486,7 @@ BattleAnimOAMData: ; ceeae
dsprite -1, 0, -4, 4, $01, $00
dsprite -1, 0, 2, 4, $01, $00
.OAMData_36
.OAMData_36:
dsprite -7, 4, -1, 0, $00, $00
dsprite -7, 4, 0, 0, $01, $00
dsprite -6, 4, -1, 0, $02, $00
@ -502,7 +502,7 @@ BattleAnimOAMData: ; ceeae
dsprite -1, 4, -1, 0, $0c, $00
dsprite -1, 4, 0, 0, $0d, $00
.OAMData_3a
.OAMData_3a:
dsprite -7, 4, -1, 0, $0c, $00
dsprite -7, 4, 0, 0, $0d, $00
dsprite -6, 4, -1, 0, $08, $00
@ -518,7 +518,7 @@ BattleAnimOAMData: ; ceeae
dsprite -1, 4, 0, 0, $0a, $00
dsprite -1, 4, 1, 0, $0b, $00
.OAMData_3e
.OAMData_3e:
dsprite 1, 4, -2, 0, $00, $40
dsprite 1, 4, -1, 0, $02, $40
dsprite 1, 4, 0, 0, $02, $60
@ -546,7 +546,7 @@ BattleAnimOAMData: ; ceeae
dsprite -2, 4, 1, 0, $02, $00
dsprite -2, 4, 2, 0, $03, $00
.OAMData_41
.OAMData_41:
dsprite -3, 4, -2, 0, $00, $00
dsprite -3, 4, -1, 0, $02, $00
dsprite -3, 4, 0, 0, $02, $20
@ -574,7 +574,7 @@ BattleAnimOAMData: ; ceeae
dsprite 1, 4, 0, 0, $02, $60
dsprite 1, 4, 1, 0, $00, $60
.OAMData_42
.OAMData_42:
dsprite -3, 0, -1, 4, $02, $00
dsprite 2, 0, -1, 4, $02, $60
dsprite -1, 4, -3, 0, $01, $00
@ -584,7 +584,7 @@ BattleAnimOAMData: ; ceeae
dsprite -1, 4, -4, 0, $01, $00
dsprite -1, 4, 3, 0, $01, $60
.OAMData_44
.OAMData_44:
dsprite -3, 5, -3, 5, $00, $20
dsprite -3, 5, 1, 3, $00, $00
dsprite 1, 3, -3, 5, $00, $60
@ -594,19 +594,19 @@ BattleAnimOAMData: ; ceeae
dsprite 2, 3, -4, 5, $00, $60
dsprite 2, 3, 2, 3, $00, $40
.OAMData_46
.OAMData_46:
dsprite -3, 4, -1, 4, $02, $00
dsprite 1, 4, -1, 4, $02, $60
dsprite -1, 4, -3, 4, $01, $00
dsprite -1, 4, 1, 4, $01, $60
.OAMData_47
.OAMData_47:
dsprite -2, 0, -2, 0, $00, $20
dsprite -2, 0, 1, 0, $00, $00
dsprite 1, 0, -2, 0, $00, $60
dsprite 1, 0, 1, 0, $00, $40
.OAMData_48
.OAMData_48:
dsprite -3, 0, -1, 4, $00, $00
dsprite -2, 0, -1, 2, $00, $00
dsprite -1, 0, -1, 0, $00, $00
@ -614,24 +614,24 @@ BattleAnimOAMData: ; ceeae
dsprite 1, 0, -1, 2, $00, $00
dsprite 2, 0, -1, 4, $00, $00
.OAMData_49
.OAMData_49:
dsprite -1, 4, -2, 0, $00, $20
dsprite -1, 2, -1, 0, $00, $20
dsprite -1, 2, 0, 0, $00, $00
dsprite -1, 4, 1, 0, $00, $00
.OAMData_4a
.OAMData_4a:
dsprite -1, 4, -1, 0, $00, $60
dsprite -1, 4, 0, 0, $00, $40
.OAMData_0f
.OAMData_0f:
dsprite -1, 4, -1, 4, $00, $00
dsprite -1, 4, -2, 4, $01, $00
dsprite -1, 4, -1, 4, $01, $20
dsprite 0, 4, -2, 4, $01, $40
dsprite 0, 4, -1, 4, $01, $60
.OAMData_4c
.OAMData_4c:
dsprite -1, 4, -1, 4, $00, $00
dsprite 0, 2, -2, 6, $00, $00
dsprite 0, 2, -3, 6, $01, $00
@ -639,7 +639,7 @@ BattleAnimOAMData: ; ceeae
dsprite 1, 2, -3, 6, $01, $40
dsprite 1, 2, -2, 6, $01, $60
.OAMData_4d
.OAMData_4d:
dsprite -1, 4, -1, 4, $00, $00
dsprite 0, 2, -2, 6, $00, $00
dsprite 1, 0, -2, 0, $00, $00
@ -648,7 +648,7 @@ BattleAnimOAMData: ; ceeae
dsprite 2, 0, -3, 0, $01, $40
dsprite 2, 0, -2, 0, $01, $60
.OAMData_4f
.OAMData_4f:
dsprite -1, 4, -1, 4, $00, $00
dsprite 0, 2, -2, 6, $00, $00
dsprite 1, 0, -2, 0, $00, $00
@ -658,7 +658,7 @@ BattleAnimOAMData: ; ceeae
dsprite 2, 6, -4, 2, $01, $40
dsprite 2, 6, -3, 2, $01, $60
.OAMData_50
.OAMData_50:
dsprite -1, 4, -1, 4, $00, $00
dsprite 0, 2, -2, 6, $00, $00
dsprite 1, 0, -2, 0, $00, $00
@ -669,7 +669,7 @@ BattleAnimOAMData: ; ceeae
dsprite 3, 4, -5, 4, $01, $40
dsprite 3, 4, -4, 4, $01, $60
.OAMData_51
.OAMData_51:
dsprite -1, 4, -1, 4, $00, $00
dsprite 0, 2, -2, 6, $00, $00
dsprite 1, 0, -2, 0, $00, $00
@ -681,25 +681,25 @@ BattleAnimOAMData: ; ceeae
dsprite 4, 2, -6, 6, $01, $40
dsprite 4, 2, -5, 6, $01, $60
.OAMData_59
.OAMData_59:
dsprite -1, 4, -2, 0, $00, $00
dsprite -1, 4, -1, 0, $01, $00
dsprite -1, 4, 0, 0, $01, $20
dsprite -1, 4, 1, 0, $00, $20
.OAMData_5a
.OAMData_5a:
dsprite -1, 4, -2, 0, $02, $00
dsprite -1, 4, -1, 0, $01, $00
dsprite -1, 4, 0, 0, $01, $20
dsprite -1, 4, 1, 0, $02, $20
.OAMData_60
.OAMData_60:
dsprite -1, 0, -1, 4, $00, $00
.OAMData_69
.OAMData_69:
dsprite 0, 0, -1, 4, $00, $00
.OAMData_61
.OAMData_61:
dsprite -1, 4, -4, 4, $00, $00
dsprite -1, 4, -3, 4, $01, $00
dsprite -1, 4, -2, 4, $02, $00
@ -710,7 +710,7 @@ BattleAnimOAMData: ; ceeae
dsprite -2, 4, 1, 4, $07, $00
dsprite -2, 4, 2, 4, $08, $00
.OAMData_65
.OAMData_65:
dsprite -2, 4, -4, 4, $08, $20
dsprite -2, 4, -3, 4, $07, $20
dsprite -1, 4, -4, 4, $06, $20
@ -721,7 +721,7 @@ BattleAnimOAMData: ; ceeae
dsprite -1, 4, 1, 4, $01, $20
dsprite -1, 4, 2, 4, $00, $20
.OAMData_d4
.OAMData_d4:
dsprite 0, 0, -4, 4, $00, $10
dsprite 0, 0, -3, 4, $01, $10
dsprite 0, 0, -2, 4, $02, $10
@ -730,7 +730,7 @@ BattleAnimOAMData: ; ceeae
dsprite 0, 0, 1, 4, $05, $10
dsprite 0, 0, 2, 4, $06, $10
.OAMData_d6
.OAMData_d6:
dsprite -1, 0, -4, 4, $00, $10
dsprite 0, 0, -4, 4, $01, $10
dsprite -1, 0, -3, 4, $02, $10
@ -746,7 +746,7 @@ BattleAnimOAMData: ; ceeae
dsprite -1, 0, 2, 4, $0c, $10
dsprite 0, 0, 2, 4, $0d, $10
.OAMData_d5
.OAMData_d5:
dsprite 0, 0, -3, 0, $00, $11
dsprite 0, 0, -2, 0, $01, $11
dsprite 0, 0, -1, 0, $02, $11
@ -754,7 +754,7 @@ BattleAnimOAMData: ; ceeae
dsprite 0, 0, 1, 0, $04, $11
dsprite 0, 0, 2, 0, $05, $11
.OAMData_d7
.OAMData_d7:
dsprite 0, 0, -3, 0, $00, $11
dsprite 1, 0, -3, 0, $01, $11
dsprite 0, 0, -2, 0, $02, $11
@ -768,27 +768,27 @@ BattleAnimOAMData: ; ceeae
dsprite 0, 0, 2, 0, $0a, $11
dsprite 1, 0, 2, 0, $0b, $11
.OAMData_6e
.OAMData_6e:
dsprite -2, 4, 0, 4, $00, $00
dsprite -1, 4, -2, 4, $01, $00
dsprite -1, 4, -1, 4, $02, $00
dsprite -1, 4, 0, 4, $03, $00
dsprite 0, 4, -2, 4, $04, $00
.OAMData_6f
.OAMData_6f:
dsprite -1, 4, -2, 4, $00, $00
dsprite -1, 4, -1, 4, $01, $00
dsprite -1, 4, 0, 4, $02, $00
.OAMData_77
.OAMData_77:
dsprite -4, 4, 1, 4, $01, $60
.OAMData_78
.OAMData_78:
dsprite -4, 4, 1, 4, $00, $00
dsprite -4, 4, 0, 4, $01, $60
dsprite -3, 4, 1, 4, $01, $60
.OAMData_79
.OAMData_79:
dsprite -4, 4, 1, 4, $01, $00
dsprite -4, 4, 0, 4, $00, $00
dsprite -4, 4, -1, 4, $01, $60
@ -796,7 +796,7 @@ BattleAnimOAMData: ; ceeae
dsprite -3, 4, 0, 4, $01, $60
dsprite -2, 4, 1, 4, $01, $60
.OAMData_7a
.OAMData_7a:
dsprite -4, 4, -2, 4, $01, $60
dsprite -4, 4, -1, 4, $00, $00
dsprite -4, 4, 0, 4, $01, $00
@ -807,7 +807,7 @@ BattleAnimOAMData: ; ceeae
dsprite -2, 4, 1, 4, $00, $00
dsprite -1, 4, 1, 4, $01, $60
.OAMData_7b
.OAMData_7b:
dsprite -4, 4, -3, 4, $01, $60
dsprite -4, 4, -2, 4, $00, $00
dsprite -4, 4, -1, 4, $01, $00
@ -821,7 +821,7 @@ BattleAnimOAMData: ; ceeae
dsprite -1, 4, 1, 4, $00, $00
dsprite 0, 4, 1, 4, $01, $60
.OAMData_7c
.OAMData_7c:
dsprite -4, 4, -3, 4, $00, $00
dsprite -4, 4, -2, 4, $01, $00
dsprite -3, 4, -3, 4, $01, $60
@ -837,7 +837,7 @@ BattleAnimOAMData: ; ceeae
dsprite 0, 4, 1, 4, $00, $00
dsprite 1, 4, 1, 4, $01, $60
.OAMData_7d
.OAMData_7d:
dsprite -4, 4, -3, 4, $01, $00
dsprite -3, 4, -3, 4, $00, $00
dsprite -3, 4, -2, 4, $01, $00
@ -854,7 +854,7 @@ BattleAnimOAMData: ; ceeae
dsprite 1, 4, 1, 4, $00, $00
dsprite 2, 4, 1, 4, $01, $60
.OAMData_70
.OAMData_70:
dsprite -2, 0, -1, 0, $00, $00
dsprite -1, 0, -1, 0, $01, $00
dsprite -2, 0, 0, 0, $00, $20
@ -864,13 +864,13 @@ BattleAnimOAMData: ; ceeae
dsprite 0, 0, 0, 0, $01, $60
dsprite 1, 0, 0, 0, $00, $60
.OAMData_81
.OAMData_81:
dsprite -1, 0, -1, 0, $00, $00
dsprite -1, 0, 0, 0, $01, $00
dsprite 0, 0, -1, 0, $01, $60
dsprite 0, 0, 0, 0, $00, $60
.OAMData_87
.OAMData_87:
dsprite -2, 4, -1, 0, $00, $00
dsprite -2, 4, 0, 0, $01, $00
dsprite -1, 4, -1, 0, $02, $00
@ -888,7 +888,7 @@ BattleAnimOAMData: ; ceeae
dsprite 1, 4, -1, 0, $02, $00
dsprite 1, 4, 0, 0, $03, $00
.OAMData_88
.OAMData_88:
dsprite -2, 0, -1, 0, $00, $00
dsprite -2, 0, 0, 0, $01, $00
dsprite -1, 0, -1, 0, $02, $00
@ -902,7 +902,7 @@ BattleAnimOAMData: ; ceeae
dsprite 1, 0, -1, 0, $02, $00
dsprite 1, 0, 0, 0, $03, $00
.OAMData_8a
.OAMData_8a:
dsprite -1, 4, -1, 4, $00, $00
dsprite -1, 0, 0, 4, $00, $00
dsprite -2, 4, 1, 4, $00, $00
@ -912,20 +912,20 @@ BattleAnimOAMData: ; ceeae
dsprite -4, 0, 5, 4, $00, $00
dsprite -5, 4, 6, 4, $00, $00
.OAMData_8e
.OAMData_8e:
dsprite -3, 4, -1, 4, $00, $00
dsprite -2, 4, -1, 4, $01, $00
dsprite -1, 4, -1, 4, $02, $00
dsprite 0, 4, -1, 4, $01, $40
dsprite 1, 4, -1, 4, $00, $40
.OAMData_8f
.OAMData_8f:
dsprite -1, 4, -2, 0, $00, $00
dsprite -1, 4, -1, 0, $01, $00
dsprite -1, 4, 0, 0, $02, $00
dsprite -1, 4, 1, 0, $03, $00
.OAMData_93
.OAMData_93:
dsprite -1, 0, -2, 4, $00, $00
dsprite -1, 0, -1, 4, $01, $00
dsprite -1, 0, 0, 4, $02, $00
@ -933,13 +933,13 @@ BattleAnimOAMData: ; ceeae
dsprite 0, 0, -1, 4, $04, $00
dsprite 0, 0, 0, 4, $05, $00
.OAMData_99
.OAMData_99:
dsprite -1, 0, -1, 0, $00, $00
dsprite -1, 0, 0, 0, $05, $00
dsprite 0, 0, -1, 0, $01, $00
dsprite 0, 0, 0, 0, $05, $00
.OAMData_9b
.OAMData_9b:
dsprite -4, 4, 1, 0, $00, $00
dsprite -4, 4, 2, 0, $01, $00
dsprite -3, 4, -1, 0, $02, $00
@ -977,7 +977,7 @@ BattleAnimOAMData: ; ceeae
dsprite 1, 4, 1, 0, $22, $00
dsprite 2, 4, 0, 0, $23, $00
.OAMData_9c
.OAMData_9c:
dsprite 0, 4, -1, 0, $02, $00
dsprite 0, 4, 0, 0, $03, $00
dsprite -1, 4, -1, 0, $01, $00
@ -985,7 +985,7 @@ BattleAnimOAMData: ; ceeae
dsprite -2, 4, -1, 0, $00, $00
dsprite -2, 4, 0, 0, $00, $20
.OAMData_9f
.OAMData_9f:
dsprite -1, 0, -2, 0, $00, $00
dsprite -1, 0, -1, 0, $01, $00
dsprite -1, 0, 0, 0, $02, $00
@ -995,7 +995,7 @@ BattleAnimOAMData: ; ceeae
dsprite 0, 0, 0, 0, $06, $00
dsprite 0, 0, 1, 0, $07, $00
.OAMData_a0
.OAMData_a0:
dsprite -2, 4, -1, 4, $00, $00
dsprite -1, 4, -1, 4, $00, $00
dsprite 0, 4, -1, 4, $00, $00
@ -1004,7 +1004,7 @@ BattleAnimOAMData: ; ceeae
dsprite -4, 4, -1, 4, $00, $00
dsprite 2, 4, -1, 4, $00, $00
.OAMData_a4
.OAMData_a4:
dsprite -2, 4, -2, 4, $00, $00
dsprite -2, 4, -1, 4, $01, $00
dsprite -2, 4, 0, 4, $02, $00
@ -1015,13 +1015,13 @@ BattleAnimOAMData: ; ceeae
dsprite 0, 4, -1, 4, $01, $40
dsprite 0, 4, 0, 4, $02, $40
.OAMData_ac
.OAMData_ac:
dsprite -1, 4, -2, 0, $00, $00
dsprite -1, 4, -1, 0, $01, $00
dsprite -1, 4, 0, 0, $01, $20
dsprite -1, 4, 1, 0, $00, $20
.OAMData_bc
.OAMData_bc:
dsprite -1, 4, -3, 0, $00, $00
dsprite -1, 4, -2, 0, $01, $00
dsprite -1, 4, -1, 0, $02, $00
@ -1029,7 +1029,7 @@ BattleAnimOAMData: ; ceeae
dsprite -1, 4, 1, 0, $01, $20
dsprite -1, 4, 2, 0, $00, $20
.OAMData_c1
.OAMData_c1:
dsprite -2, 0, -2, 0, $00, $00
dsprite -2, 0, -1, 0, $01, $00
dsprite -2, 0, 0, 0, $02, $00
@ -1047,7 +1047,7 @@ BattleAnimOAMData: ; ceeae
dsprite 1, 0, 0, 0, $01, $60
dsprite 1, 0, 1, 0, $00, $60
.OAMData_c2
.OAMData_c2:
dsprite -1, 0, -2, 0, $00, $00
dsprite -1, 0, -1, 0, $01, $00
dsprite -1, 0, 0, 0, $00, $60
@ -1055,7 +1055,7 @@ BattleAnimOAMData: ; ceeae
dsprite 0, 0, 0, 0, $01, $00
dsprite 0, 0, 1, 0, $00, $60
.OAMData_c8
.OAMData_c8:
dsprite -1, 0, 1, 4, $00, $00
dsprite -1, 0, 2, 4, $01, $00
dsprite 0, 0, -1, 4, $02, $00
@ -1063,13 +1063,13 @@ BattleAnimOAMData: ; ceeae
dsprite 0, 0, 1, 4, $04, $00
dsprite 0, 0, 2, 4, $05, $00
.OAMData_ca
.OAMData_ca:
dsprite -1, 0, -1, 0, $00, $00
dsprite -1, 0, 0, 0, $01, $60
dsprite 0, 0, -1, 0, $01, $00
dsprite 0, 0, 0, 0, $01, $20
.OAMData_cc
.OAMData_cc:
dsprite -2, 0, -13, 4, $00, $00
dsprite -4, 0, -11, 4, $00, $00
dsprite -1, 0, -9, 4, $00, $00

4
battle/used_move_text.asm
View File

@ -82,10 +82,10 @@ UsedMoveText_CheckObedience: ; 105e10
ret
; 105e1a
.UsedInsteadText
.UsedInsteadText:
text_jump _UsedInsteadText
start_asm
.GetMoveNameText
.GetMoveNameText:
ld hl, MoveNameText
ret
; 105e23

2
data/battle_tower.asm
View File

@ -97,7 +97,7 @@ Function_LoadRandomBattleTowerPkmn: ; 1f8081
ld a, BANK(sBTPkmnPrevTrainer1)
call GetSRAMBank
.FindARandomBattleTowerPkmn
.FindARandomBattleTowerPkmn:
; From Which LevelGroup are the Pkmn loaded
; a = 1..10
ld a, [wBTChoiceOfLvlGroup] ; [$d800]

4
data/odd_eggs.asm
View File

@ -91,10 +91,10 @@ GiveOddEgg: ; 1fb4b6
ret
; 1fb546
.Odd
.Odd:
db "ODD@@@@@@@@@"
.Probabilities
.Probabilities:
prob: MACRO
prob_total = prob_total + (\1)

150
data/sprite_engine.asm
View File

@ -622,39 +622,39 @@ SpriteAnimOAMData: ; 8d94d
dbw $04, .OAMData_84 ; 8a
dbw $00, .OAMData_84 ; 8b
.OAMData_02
.OAMData_02:
db 1
dsprite -1, 4, -1, 4, $00, $00
.OAMData_04
.OAMData_04:
db 4
dsprite -1, 0, -1, 0, $00, $00
dsprite -1, 0, 0, 0, $01, $00
dsprite 0, 0, -1, 0, $10, $00
dsprite 0, 0, 0, 0, $11, $00
.OAMData_23
.OAMData_23:
db 4
dsprite -1, 0, -1, 0, $00, $00
dsprite -1, 0, 0, 0, $00, $20
dsprite 0, 0, -1, 0, $01, $00
dsprite 0, 0, 0, 0, $01, $20
.OAMData_30
.OAMData_30:
db 4
dsprite -1, 0, -1, 0, $00, $80
dsprite -1, 0, 0, 0, $00, $a0
dsprite 0, 0, -1, 0, $01, $80
dsprite 0, 0, 0, 0, $01, $a0
.OAMData_18
.OAMData_18:
db 4
dsprite -1, 0, -1, 0, $00, $00
dsprite -1, 0, 0, 0, $00, $20
dsprite 0, 0, -1, 0, $00, $40
dsprite 0, 0, 0, 0, $00, $60
.OAMData_35
.OAMData_35:
db 4
dsprite -1, 0, -1, 0, $00, $07
dsprite -1, 0, 0, 0, $00, $27
@ -669,7 +669,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 0, -1, 0, $00, $c0
dsprite 0, 0, 0, 0, $00, $e0
.OAMData_19
.OAMData_19:
db 16
dsprite -2, 0, -2, 0, $00, $00
dsprite -2, 0, -1, 0, $01, $00
@ -688,7 +688,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 1, 0, 0, 0, $01, $60
dsprite 1, 0, 1, 0, $00, $60
.OAMData_1a
.OAMData_1a:
db 36
dsprite -3, 0, -3, 0, $00, $00
dsprite -3, 0, -2, 0, $01, $00
@ -727,7 +727,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 2, 0, 1, 0, $01, $60
dsprite 2, 0, 2, 0, $00, $60
.OAMData_43
.OAMData_43:
db 9
dsprite -2, 4, -2, 4, $00, $00
dsprite -2, 4, -1, 4, $01, $00
@ -739,7 +739,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 4, -1, 4, $21, $00
dsprite 0, 4, 0, 4, $22, $00
.OAMData_0e
.OAMData_0e:
db 16
dsprite -2, 0, -2, 0, $00, $00
dsprite -2, 0, -1, 0, $01, $00
@ -758,7 +758,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 1, 0, 0, 0, $32, $00
dsprite 1, 0, 1, 0, $33, $00
.OAMData_1b
.OAMData_1b:
db 25
dsprite -3, 4, -3, 4, $00, $00
dsprite -2, 4, -3, 4, $01, $00
@ -826,7 +826,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 2, 0, 1, 0, $22, $00
dsprite 2, 0, 2, 0, $23, $00
.OAMData_00
.OAMData_00:
; party menu icons
db 4
dsprite -1, 0, -1, 0, $00, $00
@ -834,14 +834,14 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 0, -1, 0, $02, $00
dsprite 0, 0, 0, 0, $03, $00
.OAMData_31
.OAMData_31:
db 4
dsprite -1, 0, -1, 0, $00, $80
dsprite -1, 0, 0, 0, $01, $80
dsprite 0, 0, -1, 0, $02, $80
dsprite 0, 0, 0, 0, $03, $80
.OAMData_3d
.OAMData_3d:
; party menu icon with mail, frame 1
db 4
dsprite -1, 0, -1, 0, $00, $00
@ -849,7 +849,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 0, -1, 0, $08, $00
dsprite 0, 0, 0, 0, $03, $00
.OAMData_3e
.OAMData_3e:
; party menu icon with mail, frame 2
db 4
dsprite -1, 0, -1, 0, $04, $00
@ -857,7 +857,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 0, -1, 0, $08, $00
dsprite 0, 0, 0, 0, $07, $00
.OAMData_3f
.OAMData_3f:
; party menu icon with item, frame 1
db 4
dsprite -1, 0, -1, 0, $00, $00
@ -865,7 +865,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 0, -1, 0, $09, $00
dsprite 0, 0, 0, 0, $03, $00
.OAMData_40
.OAMData_40:
; party menu icon with item, frame 2
db 4
dsprite -1, 0, -1, 0, $04, $00
@ -873,7 +873,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 0, -1, 0, $09, $00
dsprite 0, 0, 0, 0, $07, $00
.OAMData_06
.OAMData_06:
db 6
dsprite -1, 0, -2, 4, $00, $01
dsprite -1, 0, -1, 4, $01, $01
@ -882,7 +882,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 0, -1, 4, $11, $01
dsprite 0, 0, 0, 4, $12, $01
.OAMData_08
.OAMData_08:
db 29
dsprite -3, 0, -3, 0, $00, $00
dsprite -3, 0, -2, 0, $01, $00
@ -914,12 +914,12 @@ SpriteAnimOAMData: ; 8d94d
dsprite 2, 0, 1, 0, $54, $80
dsprite 2, 0, 2, 0, $55, $80
.OAMData_0c
.OAMData_0c:
db 2
dsprite -1, 0, -1, 4, $00, $00
dsprite 0, 0, -1, 4, $10, $00
.OAMData_15
.OAMData_15:
db 5
dsprite -2, 0, 3, 0, $00, $00
dsprite -2, 0, 4, 0, $01, $00
@ -927,25 +927,25 @@ SpriteAnimOAMData: ; 8d94d
dsprite -1, 0, 3, 0, $03, $00
dsprite 0, 0, 2, 0, $04, $00
.OAMData_4f
.OAMData_4f:
db 1
dsprite -1, 4, -1, 4, $00, $06
.OAMData_50
.OAMData_50:
db 4
dsprite -1, 0, -1, 0, $00, $06
dsprite -1, 0, 0, 0, $01, $06
dsprite 0, 0, -1, 0, $02, $06
dsprite 0, 0, 0, 0, $03, $06
.OAMData_20
.OAMData_20:
db 4
dsprite -1, 7, -1, 7, $00, $00
dsprite -1, 7, 0, 0, $00, $20
dsprite 0, 0, -1, 7, $00, $40
dsprite 0, 0, 0, 0, $00, $60
.OAMData_21
.OAMData_21:
db 10
dsprite -1, 7, 0, 0, $00, $00
dsprite -1, 7, 1, 0, $01, $00
@ -958,7 +958,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 0, 3, 0, $01, $40
dsprite 0, 0, 4, 0, $00, $60
.OAMData_22
.OAMData_22:
db 15
dsprite -3, 4, -2, 4, $00, $11
dsprite -3, 4, -1, 4, $01, $11
@ -976,7 +976,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 1, 4, -1, 4, $0d, $11
dsprite 1, 4, 0, 4, $0e, $11
.OAMData_27
.OAMData_27:
db 6
dsprite -2, 4, -2, 4, $00, $15
dsprite -2, 4, -1, 4, $02, $15
@ -985,7 +985,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 4, -1, 4, $06, $15
dsprite 0, 4, 0, 4, $04, $35
.OAMData_29
.OAMData_29:
db 6
dsprite -2, 4, -2, 4, $00, $16
dsprite -2, 4, -1, 4, $02, $16
@ -994,7 +994,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 4, -1, 4, $08, $16
dsprite 0, 4, 0, 4, $0a, $16
.OAMData_2a
.OAMData_2a:
db 6
dsprite -2, 4, -2, 4, $00, $16
dsprite -2, 4, -1, 4, $02, $16
@ -1003,7 +1003,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 4, -1, 4, $0e, $16
dsprite 0, 4, 0, 4, $10, $16
.OAMData_2b
.OAMData_2b:
db 6
dsprite -2, 4, -2, 4, $00, $16
dsprite -2, 4, -1, 4, $02, $16
@ -1012,7 +1012,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 4, -1, 4, $14, $16
dsprite 0, 4, 0, 4, $16, $16
.OAMData_2c
.OAMData_2c:
db 6
dsprite -2, 4, -2, 4, $00, $16
dsprite -2, 4, -1, 4, $02, $16
@ -1021,7 +1021,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 4, -1, 4, $1a, $16
dsprite 0, 4, 0, 4, $1c, $16
.OAMData_2d
.OAMData_2d:
db 6
dsprite -2, 4, -2, 4, $1e, $16
dsprite -2, 4, -1, 4, $20, $16
@ -1030,13 +1030,13 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 4, -1, 4, $26, $16
dsprite 0, 4, 0, 4, $28, $16
.OAMData_3c
.OAMData_3c:
db 3
dsprite -2, 4, -1, 4, $00, $10
dsprite -1, 4, -1, 4, $00, $10
dsprite 0, 4, -1, 4, $00, $10
.OAMData_4b
.OAMData_4b:
db 6
dsprite 0, 0, 0, 0, $00, $00
dsprite 0, 0, 1, 0, $01, $00
@ -1045,35 +1045,35 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 0, 4, 0, $02, $00
dsprite 0, 0, 5, 0, $03, $00
.OAMData_4c
.OAMData_4c:
db 4
dsprite 0, 0, 0, 0, $00, $00
dsprite 0, 0, 1, 0, $01, $00
dsprite 0, 0, 2, 0, $02, $00
dsprite 0, 0, 3, 0, $03, $00
.OAMData_51
.OAMData_51:
db 4
dsprite -1, 0, -2, 6, $00, $06
dsprite -1, 0, 0, 2, $01, $06
dsprite 0, 0, -2, 6, $02, $06
dsprite 0, 0, 0, 2, $03, $06
.OAMData_52
.OAMData_52:
db 4
dsprite -1, 0, -2, 4, $00, $06
dsprite -1, 0, 0, 4, $01, $06
dsprite 0, 0, -2, 4, $02, $06
dsprite 0, 0, 0, 4, $03, $06
.OAMData_53
.OAMData_53:
db 4
dsprite -1, 0, -2, 0, $00, $06
dsprite -1, 0, 1, 0, $01, $06
dsprite 0, 0, -2, 0, $02, $06
dsprite 0, 0, 1, 0, $03, $06
.OAMData_56
.OAMData_56:
db 19
dsprite -1, 0, -4, 0, $00, $00
dsprite -2, 0, -3, 0, $02, $00
@ -1095,7 +1095,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite -2, 0, 3, 0, $22, $00
dsprite 0, 0, 3, 0, $24, $00
.OAMData_57
.OAMData_57:
db 16
dsprite -1, 0, -4, 0, $00, $00
dsprite -2, 0, -3, 0, $02, $00
@ -1114,7 +1114,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite -2, 0, 3, 0, $22, $00
dsprite 0, 0, 3, 0, $24, $00
.OAMData_58
.OAMData_58:
db 15
dsprite -1, 0, -4, 0, $00, $00
dsprite -2, 0, -3, 0, $02, $00
@ -1132,7 +1132,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite -2, 0, 3, 0, $22, $00
dsprite 0, 0, 3, 0, $24, $00
.OAMData_59
.OAMData_59:
db 17
dsprite -1, 0, -4, 0, $00, $00
dsprite -2, 0, -3, 0, $02, $00
@ -1152,7 +1152,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite -2, 0, 3, 0, $22, $00
dsprite 0, 0, 3, 0, $24, $00
.OAMData_5a
.OAMData_5a:
db 17
dsprite -1, 0, -4, 0, $00, $00
dsprite -2, 0, -3, 0, $02, $00
@ -1172,11 +1172,11 @@ SpriteAnimOAMData: ; 8d94d
dsprite -2, 0, 3, 0, $22, $00
dsprite 0, 0, 3, 0, $24, $00
.OAMData_1e
.OAMData_1e:
db 1
dsprite -1, 4, -1, 4, $00, $11
.OAMData_5c
.OAMData_5c:
db 12
dsprite 0, 0, 0, 0, $30, $00
dsprite 0, 0, 1, 0, $31, $00
@ -1191,18 +1191,18 @@ SpriteAnimOAMData: ; 8d94d
dsprite 1, 0, 4, 0, $34, $00
dsprite 1, 0, 5, 0, $35, $00
.OAMData_5d
.OAMData_5d:
db 1
dsprite 0, 0, 0, 0, $ed, $00
.OAMData_5e
.OAMData_5e:
db 4
dsprite -1, 7, -1, 7, $30, $00
dsprite -1, 7, 0, 1, $32, $00
dsprite 0, 1, -1, 7, $33, $00
dsprite 0, 1, 0, 1, $35, $00
.OAMData_5f
.OAMData_5f:
db 8
dsprite -1, 7, -1, 7, $30, $00
dsprite -1, 7, 0, 4, $31, $00
@ -1213,60 +1213,60 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 1, 1, 4, $34, $00
dsprite 0, 1, 2, 1, $35, $00
.OAMData_60
.OAMData_60:
db 1
dsprite 0, 0, 0, 0, $34, $00
.OAMData_61
.OAMData_61:
db 2
dsprite 0, 0, 0, 0, $30, $00
dsprite 1, 0, 0, 0, $33, $00
.OAMData_62
.OAMData_62:
db 2
dsprite 0, 0, 0, 0, $32, $00
dsprite 1, 0, 0, 0, $35, $00
.OAMData_63
.OAMData_63:
db 4
dsprite -1, 0, -1, 0, $00, $01
dsprite -1, 0, 0, 0, $01, $01
dsprite 0, 0, -1, 0, $02, $01
dsprite 0, 0, 0, 0, $03, $01
.OAMData_65
.OAMData_65:
db 4
dsprite -1, 0, -1, 0, $00, $81
dsprite -1, 0, 0, 0, $01, $81
dsprite 0, 0, -1, 0, $02, $81
dsprite 0, 0, 0, 0, $03, $81
.OAMData_67
.OAMData_67:
db 1
dsprite -1, 4, -1, 4, $00, $02
.OAMData_6c
.OAMData_6c:
db 4
dsprite -2, 0, -1, 4, $00, $03
dsprite -1, 0, -1, 4, $01, $03
dsprite 0, 0, -1, 4, $02, $03
dsprite 1, 0, -1, 4, $03, $03
.OAMData_6d
.OAMData_6d:
db 4
dsprite -2, 0, -1, 4, $03, $44
dsprite -1, 0, -1, 4, $02, $44
dsprite 0, 0, -1, 4, $01, $44
dsprite 1, 0, -1, 4, $00, $44
.OAMData_69
.OAMData_69:
db 4
dsprite -1, 0, -1, 0, $00, $01
dsprite -1, 0, 0, 0, $00, $21
dsprite 0, 0, -1, 0, $00, $41
dsprite 0, 0, 0, 0, $00, $61
.OAMData_6a
.OAMData_6a:
db 8
dsprite -2, 4, -2, 4, $00, $01
dsprite -2, 4, -1, 4, $01, $01
@ -1277,7 +1277,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 4, -1, 4, $01, $41
dsprite 0, 4, 0, 4, $00, $61
.OAMData_6b
.OAMData_6b:
db 12
dsprite -2, 0, -2, 0, $00, $01
dsprite -2, 0, -1, 0, $01, $01
@ -1292,7 +1292,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 1, 0, 0, 0, $01, $61
dsprite 1, 0, 1, 0, $00, $61
.OAMData_6e
.OAMData_6e:
db 36
dsprite -3, 0, 1, 0, $05, $00
dsprite -3, 0, 2, 0, $06, $00
@ -1331,7 +1331,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 2, 0, -3, 0, $51, $00
dsprite 2, 0, 3, 0, $57, $00
.OAMData_6f
.OAMData_6f:
db 28
dsprite -3, 0, 0, 0, $04, $00
dsprite -3, 0, 1, 0, $05, $00
@ -1362,7 +1362,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 2, 0, 0, 0, $54, $00
dsprite 2, 0, 1, 0, $55, $00
.OAMData_70
.OAMData_70:
db 30
dsprite -3, 0, 0, 0, $04, $00
dsprite -3, 0, 1, 0, $05, $00
@ -1395,7 +1395,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 2, 0, 0, 0, $54, $00
dsprite 2, 0, 1, 0, $55, $00
.OAMData_71
.OAMData_71:
db 31
dsprite -2, 0, -3, 0, $11, $00
dsprite -2, 0, -2, 0, $12, $00
@ -1429,7 +1429,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 2, 0, 0, 0, $54, $00
dsprite 2, 0, 1, 0, $55, $00
.OAMData_72
.OAMData_72:
db 25
dsprite -3, 4, -3, 4, $00, $09
dsprite -3, 4, -2, 4, $01, $09
@ -1457,7 +1457,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 1, 4, 0, 4, $43, $09
dsprite 1, 4, 1, 4, $44, $09
.OAMData_75
.OAMData_75:
db 16
dsprite -2, 0, -3, 4, $00, $0a
dsprite -2, 0, -2, 4, $01, $0a
@ -1476,17 +1476,17 @@ SpriteAnimOAMData: ; 8d94d
dsprite 1, 0, -1, 4, $0e, $0a
dsprite 1, 0, 0, 4, $0f, $0a
.OAMData_76
.OAMData_76:
db 1
dsprite -1, 4, -1, 4, $00, $00
.OAMData_77
.OAMData_77:
db 3
dsprite 0, 0, -1, 0, $00, $00
dsprite -1, 0, -1, 0, $01, $00
dsprite -1, 0, 0, 0, $02, $00
.OAMData_78
.OAMData_78:
db 7
dsprite 1, 0, -2, 0, $00, $00
dsprite 0, 0, -2, 0, $01, $00
@ -1496,7 +1496,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite -2, 0, 0, 0, $05, $00
dsprite -2, 0, 1, 0, $06, $00
.OAMData_7a
.OAMData_7a:
db 8
dsprite -1, 0, -2, 0, $00, $00
dsprite -1, 0, -1, 0, $01, $00
@ -1507,7 +1507,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 0, 0, 0, $01, $60
dsprite 0, 0, 1, 0, $00, $60
.OAMData_7b
.OAMData_7b:
db 12
dsprite -3, 0, -1, 0, $00, $00
dsprite -2, 0, -1, 0, $01, $00
@ -1522,7 +1522,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 1, 0, 0, 0, $01, $60
dsprite 2, 0, 0, 0, $00, $60
.OAMData_7c
.OAMData_7c:
db 20
dsprite -3, 4, -2, 0, $00, $00
dsprite -3, 4, -1, 0, $01, $00
@ -1545,7 +1545,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 1, 4, 0, 0, $12, $00
dsprite 1, 4, 1, 0, $13, $00
.OAMData_7e
.OAMData_7e:
db 20
dsprite 0, 0, 1, 0, $00, $81
dsprite 1, 0, 2, 0, $00, $81
@ -1568,14 +1568,14 @@ SpriteAnimOAMData: ; 8d94d
dsprite 2, 0, -13, 0, $00, $81
dsprite 3, 0, -12, 0, $00, $81
.OAMData_7f
.OAMData_7f:
db 4
dsprite -1, 0, -1, 0, $00, $02
dsprite -1, 0, 0, 0, $01, $02
dsprite 0, 0, -1, 0, $02, $02
dsprite 0, 0, 0, 0, $03, $02
.OAMData_81
.OAMData_81:
db 9
dsprite -2, 0, -2, 4, $00, $01
dsprite -2, 0, -1, 4, $01, $01
@ -1587,7 +1587,7 @@ SpriteAnimOAMData: ; 8d94d
dsprite 0, 0, -1, 4, $21, $01
dsprite 0, 0, 0, 4, $22, $01
.OAMData_84
.OAMData_84:
db 24
dsprite -5, 0, -2, 4, $00, $01
dsprite -5, 0, -1, 4, $01, $01

6
engine/anim_hp_bar.asm
View File

@ -2,7 +2,7 @@ _AnimateHPBar: ; d627
call .IsMaximumMoreThan48Pixels
jr c, .MoreThan48Pixels
call .ComputePixels
.ShortAnimLoop
.ShortAnimLoop:
push bc
push hl
call ShortAnim_UpdateVariables
@ -19,9 +19,9 @@ _AnimateHPBar: ; d627
jr nc, .ShortAnimLoop
ret
.MoreThan48Pixels
.MoreThan48Pixels:
call .ComputePixels
.LongAnimLoop
.LongAnimLoop:
push bc
push hl
call LongAnim_UpdateVariables

24
engine/billspc.asm
View File

@ -437,7 +437,7 @@ endr
ld [wBillsPC_CursorPosition], a
ld [wBillsPC_ScrollPosition], a
ret
.FailedWithdraw
.FailedWithdraw:
ld de, PCString_WhatsUp
call BillsPC_PlaceString
ret
@ -483,7 +483,7 @@ endr
ld [wBillsPC_ScrollPosition], a
pop af
ret
.FailedRelease
.FailedRelease:
ld de, PCString_WhatsUp
call BillsPC_PlaceString
pop af
@ -1664,21 +1664,21 @@ BillsPC_CheckMail_PreventBlackout: ; e2f18 (38:6f18)
ld a, [wBillsPC_MonHasMail]
and a
jr nz, .HasMail
.Okay
.Okay:
and a
ret
.HasMail
.HasMail:
ld de, PCString_RemoveMail
jr .NotOkay
.AllOthersFainted
.AllOthersFainted:
ld de, PCString_NoMoreUsablePKMN
jr .NotOkay
.ItsYourLastPokemon
.ItsYourLastPokemon:
ld de, PCString_ItsYourLastPKMN
.NotOkay
.NotOkay:
call BillsPC_PlaceString
ld de, SFX_WRONG
call WaitPlaySFX
@ -1918,7 +1918,7 @@ TryWithdrawPokemon: ; e30fa (38:70fa)
and a
ret
.PartyFull
.PartyFull:
ld de, PCString_PartyFull
call BillsPC_PlaceString
ld de, SFX_WRONG
@ -2519,7 +2519,7 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
and a
ret
.Print
.Print:
call GetBoxCount
and a
jr z, .EmptyBox
@ -2533,12 +2533,12 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
and a
ret
.EmptyBox
.EmptyBox:
call BillsPC_PlaceEmptyBoxString_SFX
and a
ret
.Switch
.Switch:
ld a, [MenuSelection]
dec a
ld e, a
@ -2548,7 +2548,7 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9)
callba ChangeBoxSaveGame
ret
.Name
.Name:
ld b, $4 ; box
ld de, wd002
callba NamingScreen

4
engine/breeding/egg.asm
View File

@ -166,11 +166,11 @@ CheckBreedmonCompatibility: ; 16e1d
cp c
jr z, .Compatible
.Incompatible
.Incompatible:
and a
ret
.Compatible
.Compatible:
scf
ret
; 16f3e

12
engine/card_flip.asm
View File

@ -50,7 +50,7 @@ _CardFlip: ; e00ee (38:40ee)
ld [wCardFlipCursorX], a
ld de, MUSIC_GAME_CORNER
call PlayMusic
.MasterLoop
.MasterLoop:
ld a, [wJumptableIndex]
bit 7, a
jr nz, .leavethegame
@ -107,7 +107,7 @@ endr
call .Increment
ret
.SaidNo
.SaidNo:
ld a, 7
ld [wJumptableIndex], a
ret
@ -311,7 +311,7 @@ endr
call .Increment
ret
.Continue
.Continue:
ld a, [wCardFlipNumCardsPlayed]
inc a
ld [wCardFlipNumCardsPlayed], a
@ -325,10 +325,10 @@ endr
call PrintText
jr .LoopAround
.KeepTheCurrentDeck
.KeepTheCurrentDeck:
call CardFlip_BlankDiscardedCardSlot
.LoopAround
.LoopAround:
ld a, 1
ld [wJumptableIndex], a
ret
@ -401,7 +401,7 @@ GetCoordsOfChosenCard: ; e03ac
bcpixel 2, 3
jr .done
.BottomCard
.BottomCard:
hlcoord 2, 6
bcpixel 8, 3

32
engine/color.asm
View File

@ -36,11 +36,11 @@ CheckShininess:
cp SHINY_SPC_VAL
jr nz, .NotShiny
.Shiny
.Shiny:
scf
ret
.NotShiny
.NotShiny:
and a
ret
@ -70,11 +70,11 @@ CheckContestMon:
cp 10
jr c, .Bad
.Good
.Good:
scf
ret
.Bad
.Bad:
and a
ret
@ -155,13 +155,13 @@ Function8b07:
ld [hCGBPalUpdate], a
ret
.BGPal
.BGPal:
RGB 31, 31, 31
RGB 18, 23, 31
RGB 15, 20, 31
RGB 00, 00, 00
.OBPal
.OBPal:
RGB 31, 31, 31
RGB 31, 31, 12
RGB 08, 16, 28
@ -337,11 +337,11 @@ ApplyHPBarPals:
jr z, .PartyMenu
ret
.Enemy
.Enemy:
ld de, BGPals + 2 palettes + 2
jr .okay
.Player
.Player:
ld de, BGPals + 3 palettes + 2
.okay
@ -358,7 +358,7 @@ ApplyHPBarPals:
ld [hCGBPalUpdate], a
ret
.PartyMenu
.PartyMenu:
ld e, c
inc e
hlcoord 11, 1, AttrMap
@ -665,7 +665,7 @@ ApplyAttrMap:
ld [hBGMapMode], a
ret
.UpdateVBank1
.UpdateVBank1:
hlcoord 0, 0, AttrMap
debgcoord 0, 0
ld b, SCREEN_HEIGHT
@ -998,7 +998,7 @@ Function9890::
ld [rSVBK], a
ret
.LoadWhitePals
.LoadWhitePals:
ld c, 4 * 16
.loop
ld a, $7fff % $100
@ -1960,7 +1960,7 @@ endr
call FarCopyWRAM
ret
.TilesetColorsPointers
.TilesetColorsPointers:
dw .OutdoorColors ; unused
dw .OutdoorColors ; TOWN
dw .OutdoorColors ; ROUTE
@ -1971,25 +1971,25 @@ endr
dw .DungeonColors ; DUNGEON
; Valid indices: $00 - $29
.OutdoorColors
.OutdoorColors:
db $00, $01, $02, $28, $04, $05, $06, $07 ; morn
db $08, $09, $0a, $28, $0c, $0d, $0e, $0f ; day
db $10, $11, $12, $29, $14, $15, $16, $17 ; nite
db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f ; dark
.IndoorColors
.IndoorColors:
db $20, $21, $22, $23, $24, $25, $26, $07 ; morn
db $20, $21, $22, $23, $24, $25, $26, $07 ; day
db $10, $11, $12, $13, $14, $15, $16, $07 ; nite
db $18, $19, $1a, $1b, $1c, $1d, $1e, $07 ; dark
.DungeonColors
.DungeonColors:
db $00, $01, $02, $03, $04, $05, $06, $07 ; morn
db $08, $09, $0a, $0b, $0c, $0d, $0e, $0f ; day
db $10, $11, $12, $13, $14, $15, $16, $17 ; nite
db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f ; dark
.Perm5Colors
.Perm5Colors:
db $00, $01, $02, $03, $04, $05, $06, $07 ; morn
db $08, $09, $0a, $0b, $0c, $0d, $0e, $0f ; day
db $10, $11, $12, $13, $14, $15, $16, $17 ; nite

4
engine/credits.asm
View File

@ -621,7 +621,7 @@ GetCreditsPalette: ; 109b2c
pop hl
ret
.GetPalAddress
.GetPalAddress:
; Each set of palette data is 24 bytes long.
ld a, [wCreditsBorderMon] ; scene
and 3
@ -636,7 +636,7 @@ GetCreditsPalette: ; 109b2c
add hl, de
ret
.UpdatePals
.UpdatePals:
; Update the first three colors in both palette buffers.
push af

20
engine/crystal_intro.asm
View File

@ -154,7 +154,7 @@ PlaceGameFreakPresents_1: ; e468d
inc [hl]
ret
.PlaceGameFreak
.PlaceGameFreak:
ld [hl], 0
ld hl, .GAME_FREAK
decoord 5, 10
@ -166,7 +166,7 @@ PlaceGameFreakPresents_1: ; e468d
ret
; e46af
.GAME_FREAK
.GAME_FREAK:
; G A M E _ F R E A K
db 0, 1, 2, 3, 13, 4, 5, 3, 1, 6
.end
@ -396,7 +396,7 @@ CrystalIntro: ; e48ac
call DelayFrame
jp .loop
.ShutOffMusic
.ShutOffMusic:
ld de, MUSIC_NONE
call PlayMusic
@ -547,7 +547,7 @@ IntroScene2: ; e49d6 (39:49d6)
ld de, SFX_INTRO_UNOWN_1
call PlaySFX
pop af
.DontPlaySound
.DontPlaySound:
ld [wcf65], a
xor a
call CrystalIntro_UnownFade
@ -686,27 +686,27 @@ IntroScene6: ; e4af7 (39:4af7)
jr z, .FirstUnown
jr .NoUnown
.FirstUnown
.FirstUnown:
push af
depixel 7, 15
call CrystalIntro_InitUnownAnim
ld de, SFX_INTRO_UNOWN_2
call PlaySFX
pop af
.NoUnown
.NoUnown:
ld [wcf65], a
xor a
call CrystalIntro_UnownFade
ret
.SecondUnown
.SecondUnown:
push af
depixel 14, 6
call CrystalIntro_InitUnownAnim
ld de, SFX_INTRO_UNOWN_1
call PlaySFX
pop af
.StopUnown
.StopUnown:
ld [wcf65], a
ld a, $1
call CrystalIntro_UnownFade
@ -1347,7 +1347,7 @@ IntroScene20: ; e5019 (39:5019)
ld [hSCY], a
ret
.AppearUnown
.AppearUnown:
sub $18
ld c, a
and $3
@ -1952,7 +1952,7 @@ Intro_Scene16_AnimateSuicune: ; e5441 (39:5441)
jr z, .PrepareForSuicuneSwap
ret
.PrepareForSuicuneSwap
.PrepareForSuicuneSwap:
xor a
ld [hBGMapMode], a
ret

32
engine/dummy_game.asm
View File

@ -6,7 +6,7 @@ _DummyGame: ; e1e5b (38:5e5b)
jr nc, .loop
ret
.LoadGFXAndPals
.LoadGFXAndPals:
call DisableLCD
ld b, SCGB_08
call GetSGBLayout
@ -42,7 +42,7 @@ _DummyGame: ; e1e5b (38:5e5b)
call DmgToCgbObjPal0
ret
.JumptableLoop
.JumptableLoop:
ld a, [wJumptableIndex]
bit 7, a
jr nz, .quit
@ -56,10 +56,10 @@ _DummyGame: ; e1e5b (38:5e5b)
scf
ret
.ExecuteJumptable
.ExecuteJumptable:
jumptable .Jumptable, wJumptableIndex
.Jumptable
.Jumptable:
dw .RestartGame
dw .ResetBoard
dw .InitBoardTilemapAndCursorObject
@ -70,13 +70,13 @@ _DummyGame: ; e1e5b (38:5e5b)
dw .RevealAll
dw .AskPlayAgain
.RestartGame
.RestartGame:
call DummyGame_InitStrings
ld hl, wJumptableIndex
inc [hl]
ret
.ResetBoard
.ResetBoard:
call ret_e00ed
jr nc, .proceed
ld hl, wJumptableIndex
@ -95,7 +95,7 @@ rept 4
endr
ld [hl], a
ld [wDummyGameNumCardsMatched], a
.InitBoardTilemapAndCursorObject
.InitBoardTilemapAndCursorObject:
ld hl, wDummyGameCounter
ld a, [hl]
cp 45
@ -117,7 +117,7 @@ endr
inc [hl]
ret
.CheckTriesRemaining
.CheckTriesRemaining:
ld a, [wDummyGameNumberTriesRemaining]
hlcoord 17, 0
add "0"
@ -136,7 +136,7 @@ endr
ld [wcf64], a
ld hl, wJumptableIndex
inc [hl]
.PickCard1
.PickCard1:
ld a, [wcf64]
and a
ret z
@ -160,7 +160,7 @@ endr
inc [hl]
ret
.PickCard2
.PickCard2:
ld a, [wcf64]
and a
ret z
@ -185,7 +185,7 @@ endr
ld [wDummyGameCounter], a
ld hl, wJumptableIndex
inc [hl]
.DelayPickAgain
.DelayPickAgain:
ld hl, wDummyGameCounter
ld a, [hl]
and a
@ -193,19 +193,19 @@ endr
dec [hl]
ret
.PickAgain
.PickAgain:
call DummyGame_CheckMatch
ld a, $3
ld [wJumptableIndex], a
ret
.RevealAll
.RevealAll:
ld a, [hJoypadPressed]
and A_BUTTON
ret z
xor a
ld [wDummyGameCounter], a
.RevelationLoop
.RevelationLoop:
ld hl, wDummyGameCounter
ld a, [hl]
cp 45
@ -231,7 +231,7 @@ endr
call WaitPressAorB_BlinkCursor
ld hl, wJumptableIndex
inc [hl]
.AskPlayAgain
.AskPlayAgain:
call ret_e00ed
jr nc, .restart
ld hl, wJumptableIndex
@ -310,7 +310,7 @@ DummyGame_CheckMatch: ; e2010
call PrintText
ret
.VictoryText
.VictoryText:
start_asm
push bc
hlcoord 2, 13

16
engine/events.asm
View File

@ -541,11 +541,11 @@ OWPlayerInput: ; 96974
call CheckMenuOW
jr c, .Action
.NoAction
.NoAction:
xor a
ret
.Action
.Action:
push af
callba Function80422
pop af
@ -581,7 +581,7 @@ TryObjectEvent: ; 969b5
xor a
ret
.IsObject
.IsObject:
call PlayTalkObject
ld a, [hObjectStructIndexBuffer]
call GetObjectStruct
@ -687,7 +687,7 @@ TryReadSign: ; 96a38
xor a
ret
.IsSign
.IsSign:
ld a, [EngineBuffer3]
ld hl, .signs
rst JumpTable
@ -887,11 +887,11 @@ CheckMenuOW: ; 96b30
scf
ret
.NoMenu
.NoMenu:
xor a
ret
.Select
.Select:
call PlayTalkObject
ld a, BANK(SelectMenuScript)
ld hl, SelectMenuScript
@ -918,11 +918,11 @@ SelectMenuCallback: ; 96b66
end
; 96b72
.Script ; 96b72
.Script: ; 96b72
ptjump wQueuedScriptBank
; 96b75
.Asm ; 96b75
.Asm: ; 96b75
ptcallasm wQueuedScriptBank
end
; 96b79

10
engine/events_2.asm
View File

@ -191,13 +191,13 @@ ChooseWildEncounter_BugContest:: ; 97d31
ld hl, ContestMons
ld de, 4
.CheckMon
.CheckMon:
sub [hl]
jr c, .GotMon
add hl, de
jr .CheckMon
.GotMon
.GotMon:
inc hl
; Species
@ -218,7 +218,7 @@ ChooseWildEncounter_BugContest:: ; 97d31
ld a, d
jr .GotLevel
.RandomLevel
.RandomLevel:
; Get a random level between the min and max.
ld c, a
inc c
@ -227,7 +227,7 @@ ChooseWildEncounter_BugContest:: ; 97d31
call SimpleDivide
add d
.GotLevel
.GotLevel:
ld [CurPartyLevel], a
xor a
@ -330,7 +330,7 @@ DoBikeStep:: ; 97db3
scf
ret
.NoCall
.NoCall:
xor a
ret
; 97df9

20
engine/evolve.asm
View File

@ -336,7 +336,7 @@ endr
; XXX
pop hl
.ReturnToMap
.ReturnToMap:
pop de
pop bc
pop hl
@ -514,17 +514,17 @@ FillMoves: ; 424e1
ld a, [hli]
ld h, [hl]
ld l, a
.GoToAttacks
.GoToAttacks:
ld a, [hli]
and a
jr nz, .GoToAttacks
jr .GetLevel
.NextMove
.NextMove:
pop de
.GetMove
.GetMove:
inc hl
.GetLevel
.GetLevel:
ld a, [hli]
and a
jp z, .done
@ -539,10 +539,10 @@ FillMoves: ; 424e1
cp b
jr nc, .GetMove
.CheckMove
.CheckMove:
push de
ld c, NUM_MOVES
.CheckRepeat
.CheckRepeat:
ld a, [de]
inc de
cp [hl]
@ -552,7 +552,7 @@ FillMoves: ; 424e1
pop de
push de
ld c, NUM_MOVES
.CheckSlot
.CheckSlot:
ld a, [de]
and a
jr z, .LearnMove
@ -576,10 +576,10 @@ FillMoves: ; 424e1
call ShiftMoves
pop de
.ShiftedMove
.ShiftedMove:
pop hl
.LearnMove
.LearnMove:
ld a, [hl]
ld [de], a
ld a, [Buffer1]

42
engine/intro_menu.asm
View File

@ -30,7 +30,7 @@ PrintDayOfWeek: ; 5b05
ret
; 5b1c
.Days ; 5b1c
.Days: ; 5b1c
db "SUN@"
db "MON@"
db "TUES@"
@ -40,7 +40,7 @@ PrintDayOfWeek: ; 5b05
db "SATUR@"
; 5b40
.Day ; 5b40
.Day: ; 5b40
db "DAY@"
; 5b44
@ -270,7 +270,7 @@ SetDefaultBoxNames: ; 5ca6
jr c, .loop
ret
.Box
.Box:
db "BOX@"
; 5cd3
@ -285,7 +285,7 @@ InitializeMagikarpHouse: ; 5cd3
ret
; 5ce3
.Ralph ; 5ce3
.Ralph: ; 5ce3
db "RALPH@"
; 5ce9
@ -305,15 +305,15 @@ InitializeNPCNames: ; 5ce9
ld hl, .Green
ld de, GreensName
.Copy
.Copy:
ld bc, NAME_LENGTH
call CopyBytes
ret
.Rival db "???@"
.Red db "RED@"
.Green db "GREEN@"
.Mom db "MOM@"
.Rival: db "???@"
.Red: db "RED@"
.Green: db "GREEN@"
.Mom: db "MOM@"
; 5d23
InitializeWorld: ; 5d23
@ -365,13 +365,13 @@ Continue: ; 5d65
call CloseWindow
jr .FailToLoad
.Check1Pass
.Check1Pass:
call Continue_CheckRTC_RestartClock
jr nc, .Check2Pass
call CloseWindow
jr .FailToLoad
.Check2Pass
.Check2Pass:
ld a, $8
ld [MusicFade], a
ld a, MUSIC_NONE % $100
@ -394,10 +394,10 @@ Continue: ; 5d65
ld [hMapEntryMethod], a
jp FinishContinueFunction
.FailToLoad
.FailToLoad:
ret
.SpawnAfterE4
.SpawnAfterE4:
ld a, SPAWN_NEW_BARK
ld [DefaultSpawnpoint], a
call PostCreditsSpawn
@ -460,7 +460,7 @@ ConfirmContinue: ; 5e34
scf
ret
.PressA
.PressA:
ret
; 5e48
@ -496,7 +496,7 @@ FinishContinueFunction: ; 5e5d
jr z, .AfterRed
jp Reset
.AfterRed
.AfterRed:
call SpawnAfterRed
jr .loop
; 5e85
@ -609,7 +609,7 @@ Continue_DisplayBadgesDexPlayerName: ; 5f1c
pop hl
ret
.Player
.Player:
db "<PLAYER>@"
; 5f40
@ -794,7 +794,7 @@ NamePlayer: ; 0x6074
callba MovePlayerPicLeft
ret
.NewName
.NewName:
ld b, 1
ld de, PlayerName
callba NamingScreen
@ -819,13 +819,13 @@ NamePlayer: ; 0x6074
bit 0, a
jr z, .Male
ld de, .Kris
.Male
.Male:
call InitName
ret
.Chris
.Chris:
db "CHRIS@@@@@@"
.Kris
.Kris:
db "KRIS@@@@@@@"
; 60e9
@ -1127,7 +1127,7 @@ TitleScreenScene: ; 62a3
dw TitleScreenEnd
; 62b7
.NextScene ; Unreferenced
.NextScene: ; Unreferenced
ld hl, wJumptableIndex
inc [hl]
ret

20
engine/items.asm
View File

@ -50,17 +50,17 @@ _TossItem:: ; d20d
rst JumpTable
ret
.Pockets
.Pockets:
dw .Item
dw .KeyItem
dw .Ball
dw .TMHM
.Ball ; d228
.Ball: ; d228
ld hl, NumBalls
jp RemoveItemFromPocket
.TMHM ; d22e
.TMHM: ; d22e
ld h, d
ld l, e
ld a, [CurItem]
@ -68,12 +68,12 @@ _TossItem:: ; d20d
call GetTMHMNumber
jp TossTMHM
.KeyItem ; d23a
.KeyItem: ; d23a
ld h, d
ld l, e
jp TossKeyItem
.Item ; d23f
.Item: ; d23f
ld h, d
ld l, e
@ -92,17 +92,17 @@ _CheckItem:: ; d244
rst JumpTable
ret
.Pockets
.Pockets:
dw .Item
dw .KeyItem
dw .Ball
dw .TMHM
.Ball ; d25f
.Ball: ; d25f
ld hl, NumBalls
jp CheckTheItem
.TMHM ; d265
.TMHM: ; d265
ld h, d
ld l, e
ld a, [CurItem]
@ -110,12 +110,12 @@ _CheckItem:: ; d244
call GetTMHMNumber
jp CheckTMHM
.KeyItem ; d271
.KeyItem: ; d271
ld h, d
ld l, e
jp CheckKeyItems
.Item ; d276
.Item: ; d276
ld h, d
ld l, e

2
engine/learn.asm
View File

@ -243,7 +243,7 @@ Text_1_2_and_Poof: ; 6684
ld hl, .PoofForgot
ret
.PoofForgot
.PoofForgot:
; Poof! <MON> forgot <MOVE>. And…
text_jump UnknownText_0x1c574e
db "@"

4
engine/link.asm
View File

@ -204,7 +204,7 @@ Gen2ToGen2LinkComms: ; 28177
ld a, $81
ld [rSC], a
.Player1
.Player1:
ld de, MUSIC_NONE
call PlayMusic
ld c, 3
@ -1127,7 +1127,7 @@ TimeCapsule_ReplaceTeruSama: ; 28771
pop hl
ret
.TimeCapsuleAlt ; 28785
.TimeCapsuleAlt: ; 28785
; Pokémon traded from RBY do not have held items, so GSC usually interprets the
; catch rate as an item. However, if the catch rate appears in this table, the
; item associated with the table entry is used instead.

28
engine/mail.asm
View File

@ -322,7 +322,7 @@ _KrisMailBoxMenu: ; 0x447a0
jp MenuTextBoxBackup
; 0x447b4
.EmptyMailboxText ; 0x447b4
.EmptyMailboxText: ; 0x447b4
text_jump _EmptyMailboxText
db "@"
@ -431,13 +431,13 @@ MailboxPC: ; 0x44806
ret
; 0x44861
.JumpTable
.JumpTable:
dw .ReadMail
dw .PutInPack
dw .AttachMail
dw .Cancel
.ReadMail ; 0x44869
.ReadMail: ; 0x44869
call FadeToMenu
ld a, [MenuSelection]
dec a
@ -446,7 +446,7 @@ MailboxPC: ; 0x44806
jp CloseSubmenu
; 0x44877
.PutInPack ; 0x44877
.PutInPack: ; 0x44877
ld hl, .MessageLostText
call MenuTextBox
call YesNoBox
@ -472,15 +472,15 @@ MailboxPC: ; 0x44806
jp MenuTextBoxBackup
; 0x448ac
.PutAwayText ; 0x448ac
.PutAwayText: ; 0x448ac
text_jump ClearedMailPutAwayText
db "@"
.PackFullText ; 0x448b1
.PackFullText: ; 0x448b1
text_jump MailPackFullText
db "@"
.MessageLostText ; 0x448b6
.MessageLostText: ; 0x448b6
text_jump MailMessageLostText
db "@"
@ -497,7 +497,7 @@ MailboxPC: ; 0x44806
jp CloseSRAM
; 0x448d2
.AttachMail ; 0x448d2
.AttachMail: ; 0x448d2
call FadeToMenu
xor a
ld [PartyMenuActionText], a
@ -542,19 +542,19 @@ MailboxPC: ; 0x44806
jp CloseSubmenu
; 0x4493c
.HoldingMailText ; 0x4493c
.HoldingMailText: ; 0x4493c
text_jump MailAlreadyHoldingItemText
db "@"
.EggText ; 0x44941
.EggText: ; 0x44941
text_jump MailEggText
db "@"
.MailMovedText ; 0x44946
.MailMovedText: ; 0x44946
text_jump MailMovedFromBoxText
db "@"
.Cancel
.Cancel:
ret
.TopMenuDataHeader: ; 0x4494c
@ -564,7 +564,7 @@ MailboxPC: ; 0x44806
dw .TopMenuData2
db 1 ; default option
.TopMenuData2
.TopMenuData2:
db %00010000 ; flags
db 4, 0 ; rows/columns?
db 1 ; horizontal spacing?
@ -580,7 +580,7 @@ MailboxPC: ; 0x44806
dw .SubMenuData2
db 1 ; default option
.SubMenuData2
.SubMenuData2:
db %10000000 ; flags
db 4 ; items
db "READ MAIL@"

10
engine/main_menu.asm
View File

@ -250,7 +250,7 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
call TextBox
ret
.TimeFail
.TimeFail:
call SpeechTextBox
ret
; 49e3d
@ -291,11 +291,11 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
ret
; 49e7f
.TimeNotSet ; 49e7f
.TimeNotSet: ; 49e7f
db "TIME NOT SET@"
; 49e8c
.UnusedText ; 49e8c
.UnusedText: ; 49e8c
; Clock time unknown
text_jump UnknownText_0x1c5182
db "@"
@ -317,7 +317,7 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
ret
; 49ea8
.Days
.Days:
db "SUN@"
db "MON@"
db "TUES@"
@ -325,7 +325,7 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09
db "THURS@"
db "FRI@"
db "SATUR@"
.Day
.Day:
db "DAY@"
; 49ed0

2
engine/map_object_action.asm
View File

@ -191,7 +191,7 @@ Function453f: ; 453f
ret
; 456a
.Directions ; 456a
.Directions: ; 456a
db OW_DOWN, OW_RIGHT, OW_UP, OW_LEFT
; 456e

164
engine/map_objects.asm
View File

@ -37,7 +37,7 @@ Function437b: ; 437b
call .HandleObjectAction
ret
.CheckObjectStillVisible
.CheckObjectStillVisible:
ld hl, OBJECT_FLAGS2
add hl, bc
res 6, [hl]
@ -107,7 +107,7 @@ Function437b: ; 437b
and a
ret
.HandleStepType
.HandleStepType:
ld hl, OBJECT_STEP_TYPE
add hl, bc
ld a, [hl]
@ -144,7 +144,7 @@ Function437b: ; 437b
.bit5
ret
.HandleObjectAction
.HandleObjectAction:
ld hl, OBJECT_FLAGS1
add hl, bc
bit INVISIBLE, [hl]
@ -534,7 +534,7 @@ MapObjectMovementPattern: ; 47dd
rst JumpTable
ret
.Pointers ; 47e9
.Pointers: ; 47e9
dw .Null_00 ; 00
dw .RandomWalkY ; 01
dw .RandomWalkX ; 02
@ -564,29 +564,29 @@ MapObjectMovementPattern: ; 47dd
dw .MovementBoulderDust ; 1a
dw .MovementShakingGrass ; 1b
.Null_00
.Null_00:
ret
.RandomWalkY
.RandomWalkY:
call Random
ld a, [hRandomAdd]
and %00000001
jp .RandomWalkContinue
.RandomWalkX
.RandomWalkX:
call Random
ld a, [hRandomAdd]
and %00000001
or %00000010
jp .RandomWalkContinue
.RandomWalkXY
.RandomWalkXY:
call Random
ld a, [hRandomAdd]
and %00000011
jp .RandomWalkContinue
.RandomSpin1
.RandomSpin1:
call Random
ld a, [hRandomAdd]
and %00001100
@ -595,7 +595,7 @@ MapObjectMovementPattern: ; 47dd
ld [hl], a
jp RandomStepDuration_Slow
.RandomSpin2
.RandomSpin2:
ld hl, OBJECT_FACING
add hl, bc
ld a, [hl]
@ -611,7 +611,7 @@ MapObjectMovementPattern: ; 47dd
ld [hl], a
jp RandomStepDuration_Fast
.Standing
.Standing:
call Function462a
call EndSpriteMovement
ld hl, OBJECT_ACTION
@ -622,48 +622,48 @@ MapObjectMovementPattern: ; 47dd
ld [hl], STEP_TYPE_05
ret
.ObeyDPad
.ObeyDPad:
ld hl, Function5000
jp HandleMovementData
.Movement08
.Movement08:
ld hl, Function5015
jp HandleMovementData
.Movement09
.Movement09:
ld hl, Function5026
jp HandleMovementData
.Movement0a
.Movement0a:
jp _GetMovementPerson
.Movement0b
.Movement0b:
jp _GetMovementPerson
.Movement0c
.Movement0c:
jp _GetMovementPerson
.Movement0d
.Movement0d:
ld hl, Function5000
jp HandleMovementData
.Movement0e
.Movement0e:
jp _GetMovementPerson
.Follow
.Follow:
ld hl, GetFollowerNextMovementByte
jp HandleMovementData
.Script
.Script:
ld hl, GetMovementByte
jp HandleMovementData
.Strength
.Strength:
call MovementAnonymousJumptable
dw .Strength_Start
dw .Strength_Stop
.Strength_Start
.Strength_Start:
ld hl, OBJECT_NEXT_TILE
add hl, bc
ld a, [hl]
@ -701,13 +701,13 @@ MapObjectMovementPattern: ; 47dd
.on_pit
call IncrementObjectMovementByteIndex
.Strength_Stop
.Strength_Stop:
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
ld [hl], STANDING
ret
.FollowNotExact
.FollowNotExact:
ld hl, OBJECT_NEXT_MAP_X
add hl, bc
ld d, [hl]
@ -769,7 +769,7 @@ MapObjectMovementPattern: ; 47dd
ld [hl], PERSON_ACTION_STAND
ret
.MovementBigStanding
.MovementBigStanding:
call EndSpriteMovement
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
@ -782,7 +782,7 @@ MapObjectMovementPattern: ; 47dd
ld [hl], STEP_TYPE_04
ret
.MovementBouncing
.MovementBouncing:
call EndSpriteMovement
ld hl, OBJECT_DIRECTION_WALKING
add hl, bc
@ -795,22 +795,22 @@ MapObjectMovementPattern: ; 47dd
ld [hl], STEP_TYPE_04
ret
.MovementSpinCounterclockwise
.MovementSpinCounterclockwise:
call MovementAnonymousJumptable
dw .MovementSpinInit
dw .MovementSpinRepeat
dw .MovementSpinTurnLeft
.MovementSpinClockwise
.MovementSpinClockwise:
call MovementAnonymousJumptable
dw .MovementSpinInit
dw .MovementSpinRepeat
dw .MovementSpinTurnRight
.MovementSpinInit
.MovementSpinInit:
call EndSpriteMovement
call IncrementObjectMovementByteIndex
.MovementSpinRepeat
.MovementSpinRepeat:
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_STAND
@ -827,23 +827,23 @@ MapObjectMovementPattern: ; 47dd
call IncrementObjectMovementByteIndex
ret
.MovementSpinTurnLeft
.MovementSpinTurnLeft:
ld de, .DirectionData_Counterclockwise
call .MovementSpinNextFacing
jr .MovementSpinCounterclockwise
.DirectionData_Counterclockwise ; 49c0
.DirectionData_Counterclockwise: ; 49c0
db OW_RIGHT, OW_LEFT, OW_DOWN, OW_UP
.MovementSpinTurnRight
.MovementSpinTurnRight:
ld de, .DirectionData_Clockwise
call .MovementSpinNextFacing
jr .MovementSpinClockwise
.DirectionData_Clockwise ; 49cc
.DirectionData_Clockwise: ; 49cc
db OW_LEFT, OW_RIGHT, OW_UP, OW_DOWN
.MovementSpinNextFacing
.MovementSpinNextFacing:
ld hl, OBJECT_FACING
add hl, bc
ld a, [hl]
@ -860,7 +860,7 @@ MapObjectMovementPattern: ; 47dd
call DecrementObjectMovementByteIndex
ret
.MovementShadow
.MovementShadow:
call ._MovementShadow_Grass_Emote_BoulderDust
ld hl, OBJECT_ACTION
add hl, bc
@ -896,7 +896,7 @@ MapObjectMovementPattern: ; 47dd
ld [hl], STEP_TYPE_TRACKING_OBJECT
ret
.MovementEmote
.MovementEmote:
call EndSpriteMovement
call ._MovementShadow_Grass_Emote_BoulderDust
ld hl, OBJECT_ACTION
@ -916,7 +916,7 @@ MapObjectMovementPattern: ; 47dd
ld [hl], STEP_TYPE_TRACKING_OBJECT
ret
.MovementBoulderDust
.MovementBoulderDust:
call EndSpriteMovement
call ._MovementShadow_Grass_Emote_BoulderDust
ld hl, OBJECT_ACTION
@ -960,7 +960,7 @@ MapObjectMovementPattern: ; 47dd
db 6, 2
db -6, 2
.MovementShakingGrass
.MovementShakingGrass:
call EndSpriteMovement
call ._MovementShadow_Grass_Emote_BoulderDust
ld hl, OBJECT_ACTION
@ -994,7 +994,7 @@ MapObjectMovementPattern: ; 47dd
ld [hl], d
ret
.MovementScreenShake
.MovementScreenShake:
call EndSpriteMovement
ld hl, OBJECT_ACTION
add hl, bc
@ -1031,7 +1031,7 @@ MapObjectMovementPattern: ; 47dd
add a
jr .loop
.RandomWalkContinue
.RandomWalkContinue:
call InitStep
call Function6ec1 ; check whether the object can move in that direction
jr c, .NewDuration
@ -1054,7 +1054,7 @@ MapObjectMovementPattern: ; 47dd
ld [hl], STEP_TYPE_PLAYER_WALK
ret
.NewDuration
.NewDuration:
call EndSpriteMovement
call Function462a
RandomStepDuration_Slow: ; 4b1d
@ -1131,7 +1131,7 @@ NPCJump: ; 4b86
dw .Jump
dw .Land
.Jump
.Jump:
call AddStepVector
call UpdateJumpPosition
ld hl, OBJECT_STEP_DURATION
@ -1146,7 +1146,7 @@ NPCJump: ; 4b86
call IncrementObjectStructField28
ret
.Land
.Land:
call AddStepVector
call UpdateJumpPosition
ld hl, OBJECT_STEP_DURATION
@ -1219,7 +1219,7 @@ TeleportFrom: ; 4c18
dw .DoSpinRise
; 4c23
.InitSpin
.InitSpin:
ld hl, OBJECT_STEP_FRAME
add hl, bc
ld [hl], 0
@ -1227,7 +1227,7 @@ TeleportFrom: ; 4c18
add hl, bc
ld [hl], 16
call IncrementObjectStructField28
.DoSpin
.DoSpin:
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_SPIN
@ -1238,7 +1238,7 @@ TeleportFrom: ; 4c18
call IncrementObjectStructField28
ret
.InitSpinRise
.InitSpinRise:
ld hl, OBJECT_STEP_FRAME
add hl, bc
ld [hl], 0
@ -1252,7 +1252,7 @@ TeleportFrom: ; 4c18
add hl, bc
res 3, [hl]
call IncrementObjectStructField28
.DoSpinRise
.DoSpinRise:
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_SPIN
@ -1292,7 +1292,7 @@ TeleportTo: ; 4c89
dw .FinishStep
; 4c9a
.InitWait
.InitWait:
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_00
@ -1303,13 +1303,13 @@ TeleportTo: ; 4c89
ret
; 4caa
.DoWait
.DoWait:
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
ret nz
call IncrementObjectStructField28
.InitDescent
.InitDescent:
ld hl, OBJECT_STEP_FRAME
add hl, bc
ld [hl], 0
@ -1323,7 +1323,7 @@ TeleportTo: ; 4c89
ret
; 4cc9
.DoDescent
.DoDescent:
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_SPIN
@ -1343,7 +1343,7 @@ TeleportTo: ; 4c89
dec [hl]
ret nz
call IncrementObjectStructField28
.InitFinalSpin
.InitFinalSpin:
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], 16
@ -1351,7 +1351,7 @@ TeleportTo: ; 4c89
ret
; 4cf5
.DoFinalSpin
.DoFinalSpin:
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_SPIN
@ -1359,7 +1359,7 @@ TeleportTo: ; 4c89
add hl, bc
dec [hl]
ret nz
.FinishStep
.FinishStep:
ld hl, OBJECT_STEP_FRAME
add hl, bc
ld [hl], 0
@ -1381,7 +1381,7 @@ Skyfall: ; 4d14
dw .Finish
; 4d1f
.Init
.Init:
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_00
@ -1389,7 +1389,7 @@ Skyfall: ; 4d14
add hl, bc
ld [hl], 16
call IncrementObjectStructField28
.Step
.Step:
ld hl, OBJECT_STEP_DURATION
add hl, bc
dec [hl]
@ -1407,7 +1407,7 @@ Skyfall: ; 4d14
add hl, bc
ld [hl], 16
call IncrementObjectStructField28
.Fall
.Fall:
ld hl, OBJECT_31
add hl, bc
inc [hl]
@ -1424,7 +1424,7 @@ Skyfall: ; 4d14
dec [hl]
ret nz
call IncrementObjectStructField28
.Finish
.Finish:
ld hl, OBJECT_STEP_FRAME
add hl, bc
ld [hl], 0
@ -1444,7 +1444,7 @@ GotBiteStep: ; 4d7e
dw .Run
; 4d85
.Init
.Init:
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld [hl], 8
@ -1452,7 +1452,7 @@ GotBiteStep: ; 4d7e
add hl, bc
ld [hl], 0
call IncrementObjectStructField28
.Run
.Run:
ld hl, OBJECT_SPRITE_Y_OFFSET
add hl, bc
ld a, [hl]
@ -1476,7 +1476,7 @@ RockSmashStep: ; 4daf
jp WaitStep_InPlace
; 4db5
.Step
.Step:
ld hl, OBJECT_STEP_DURATION
add hl, bc
ld a, [hl]
@ -1548,7 +1548,7 @@ StepType05: ; 4e0c
dw .Reset
dw StepType04
.Reset
.Reset:
call RestoreDefaultMovement
call GetInitialFacing
ld hl, OBJECT_FACING
@ -1740,13 +1740,13 @@ StepType15: ; 4f33
dw .Init
dw .Run
.Init
.Init:
xor a
ld hl, OBJECT_29
add hl, bc
ld [hl], a
call IncrementObjectStructField28
.Run
.Run:
ld hl, OBJECT_29
add hl, bc
ld d, [hl]
@ -1772,7 +1772,7 @@ StepType15: ; 4f33
call DeleteMapObject
ret
.GetSign
.GetSign:
ld hl, OBJECT_30
add hl, bc
and 1
@ -1801,7 +1801,7 @@ SkyfallTop: ; 4f83
dw .Init
dw .Run
.Init
.Init:
ld hl, OBJECT_ACTION
add hl, bc
ld [hl], PERSON_ACTION_10
@ -1942,7 +1942,7 @@ HandleMovementData: ; 5041
jr nz, .loop
ret
.StorePointer
.StorePointer:
ld a, l
ld [wMovementPointer], a
ld a, h
@ -2037,7 +2037,7 @@ GetFollowerNextMovementByte: ; 54e6
ld a, movement_step_sleep_1
ret
.CancelFollowIfLeaderMissing
.CancelFollowIfLeaderMissing:
ld a, [wObjectFollow_Leader]
cp -1
jr z, .nope
@ -2068,7 +2068,7 @@ SpawnShadow: ; 5529
pop bc
ret
.ShadowObject
.ShadowObject:
; vtile, palette, movement
db $00, PAL_OW_SILVER, SPRITEMOVEDATA_SHADOW
; 5538
@ -2080,7 +2080,7 @@ SpawnStrengthBoulderDust: ; 5538
pop bc
ret
.BoulderDustObject
.BoulderDustObject:
db $00, PAL_OW_SILVER, SPRITEMOVEDATA_BOULDERDUST
; 5547
SpawnEmote: ; 5547
@ -2091,7 +2091,7 @@ SpawnEmote: ; 5547
pop bc
ret
.EmoteObject
.EmoteObject:
db $00, PAL_OW_SILVER, SPRITEMOVEDATA_EMOTE
; 5556
ShakeGrass: ; 5556
@ -2116,7 +2116,7 @@ ShakeScreen: ; 5565
pop bc
ret
.ScreenShakeObject
.ScreenShakeObject:
db $00, PAL_OW_SILVER, SPRITEMOVEDATA_SCREENSHAKE
; 5579
DespawnEmote: ; 5579
@ -2127,7 +2127,7 @@ DespawnEmote: ; 5579
pop bc
ret
.DeleteEmote
.DeleteEmote:
ld de, ObjectStructs
ld a, NUM_OBJECT_STRUCTS
.loop
@ -2475,7 +2475,7 @@ HandleNPCStep:: ; 576a
call .DoStepsForAllObjects
ret
.ResetStepVector
.ResetStepVector:
xor a
ld [wPlayerStepVectorX], a
ld [wPlayerStepVectorY], a
@ -2484,7 +2484,7 @@ HandleNPCStep:: ; 576a
ld [wPlayerStepDirection], a
ret
.DoStepsForAllObjects
.DoStepsForAllObjects:
ld bc, ObjectStructs
xor a
.loop
@ -2871,7 +2871,7 @@ PRIORITY_HIGH EQU $30
call .InitSpritesByPriority
ret
.DeterminePriorities
.DeterminePriorities:
xor a
ld hl, wMovementPointer
ld bc, NUM_OBJECT_STRUCTS
@ -2924,7 +2924,7 @@ PRIORITY_HIGH EQU $30
jr nz, .loop
ret
.InitSpritesByPriority
.InitSpritesByPriority:
ld hl, wMovementPointer
.next_sprite
ld a, [hli]
@ -2943,7 +2943,7 @@ PRIORITY_HIGH EQU $30
pop bc
jr .next_sprite
.InitSprite
.InitSprite:
ld hl, OBJECT_SPRITE_TILE
add hl, bc
ld a, [hl]
@ -3069,7 +3069,7 @@ PRIORITY_HIGH EQU $30
scf
ret
.GetObjectStructPointer
.GetObjectStructPointer:
ld c, a
ld b, 0
ld hl, .Addresses
@ -3080,7 +3080,7 @@ PRIORITY_HIGH EQU $30
ld b, [hl]
ret
.Addresses ; 5ace
.Addresses: ; 5ace
dw PlayerStruct
dw Object1Struct
dw Object2Struct

14
engine/mart.asm
View File

@ -143,7 +143,7 @@ GetMart: ; 15b31
ld de, DefaultMart
ret
.IsAMart
.IsAMart:
ld hl, Marts
rept 2
add hl, de
@ -165,7 +165,7 @@ StandardMart: ; 15b47
jr nz, .loop
ret
.MartFunctions
.MartFunctions:
dw .HowMayIHelpYou
dw .TopMenu
dw .Buy
@ -241,7 +241,7 @@ FarReadMart: ; 15bbb
ld h, [hl]
ld l, a
ld de, CurMart
.CopyMart
.CopyMart:
ld a, [MartPointerBank]
call GetFarByte
ld [de], a
@ -251,7 +251,7 @@ FarReadMart: ; 15bbb
jr nz, .CopyMart
ld hl, wMartItem1BCD
ld de, CurMart + 1
.ReadMartItem
.ReadMartItem:
ld a, [de]
inc de
cp -1
@ -299,7 +299,7 @@ GetMartPrice: ; 15bf0
ret
; 15c1a
.CharToNybble ; 15c1a
.CharToNybble: ; 15c1a
ld a, [de]
inc de
cp " "
@ -427,7 +427,7 @@ endr
ret
; 15cb0
.MartTextFunctionPointers ; 15cb0
.MartTextFunctionPointers: ; 15cb0
dwb .StandardMartPointers, 0
dwb .HerbShopPointers, 0
dwb .BargainShopPointers, 1
@ -592,7 +592,7 @@ endr
and a
ret
.SoldOut
.SoldOut:
ld a, MARTTEXT_SOLD_OUT
call LoadBuyMenuText
call JoyWaitAorB

2
engine/menu.asm
View File

@ -763,7 +763,7 @@ Error_Cant_ExitMenu: ; 2445d
ld hl, .Text_NoWindowsAvailableForPopping
call PrintText
call WaitBGMap
.InfiniteLoop
.InfiniteLoop:
jr .InfiniteLoop
; 24468

2
engine/mon_menu.asm
View File

@ -148,7 +148,7 @@ GetMonMenuString: ; 24db0
call GetMoveName
ret
.NotMove
.NotMove:
inc hl
ld a, [hl]
dec a

12
engine/move_mon.asm
View File

@ -655,7 +655,7 @@ SentGetPkmnIntoFromBox: ; db3f
dec a
ld b, a
call Functiondcb6
.CloseSRAM_And_ClearCarryFlag
.CloseSRAM_And_ClearCarryFlag:
call CloseSRAM
and a
ret
@ -1481,30 +1481,30 @@ endr
pop bc
jr .GotDV
.Attack
.Attack:
ld a, [hl]
swap a
and $f
jr .GotDV
.Defense
.Defense:
ld a, [hl]
and $f
jr .GotDV
.Speed
.Speed:
inc hl
ld a, [hl]
swap a
and $f
jr .GotDV
.Special
.Special:
inc hl
ld a, [hl]
and $f
.GotDV
.GotDV:
ld d, 0
add e
ld e, a

4
engine/mysterygift.asm
View File

@ -198,9 +198,9 @@ DoMysteryGift: ; 1048ba (41:48ba)
inc hl
dec d
jr .loop
.Yes
.Yes:
scf
.No
.No:
jp CloseSRAM
.AddMysteryGiftPartnerID: ; 104a56 (41:4a56)

132
engine/options_menu.asm
View File

@ -52,7 +52,7 @@ _OptionsMenu: ; e41d0
call DelayFrames
jr .joypad_loop
.ExitOptions
.ExitOptions:
ld de, SFX_TRANSACTION
call PlaySFX
call WaitSFX
@ -94,7 +94,7 @@ endr
jp [hl] ; jump to the code of the current highlighted item
; e42e5
.Pointers
.Pointers:
dw Options_TextSpeed
dw Options_BattleScene
dw Options_BattleStyle
@ -118,29 +118,29 @@ Options_TextSpeed: ; e42f5
jr c, .Increase
ld c, FAST_TEXT +- 1
.Increase
.Increase:
inc c
ld a, e
jr .Save
.LeftPressed
.LeftPressed:
ld a, c
and a
jr nz, .Decrease
ld c, SLOW_TEXT + 1
.Decrease
.Decrease:
dec c
ld a, d
.Save
.Save:
ld b, a
ld a, [Options]
and $f0
or b
ld [Options], a
.NonePressed
.NonePressed:
ld b, 0
ld hl, .Strings
rept 2
@ -155,16 +155,16 @@ endr
ret
; e4331
.Strings
.Strings:
dw .Fast
dw .Mid
dw .Slow
.Fast
.Fast:
db "FAST@"
.Mid
.Mid:
db "MID @"
.Slow
.Slow:
db "SLOW@"
; e4346
@ -203,35 +203,35 @@ Options_BattleScene: ; e4365
jr nz, .ToggleOn
jr .ToggleOff
.LeftPressed
.LeftPressed:
bit BATTLE_SCENE, [hl]
jr z, .ToggleOff
jr .ToggleOn
.NonePressed
.NonePressed:
bit BATTLE_SCENE, [hl]
jr z, .ToggleOn
jr .ToggleOff
.ToggleOn
.ToggleOn:
res BATTLE_SCENE, [hl]
ld de, .On
jr .Display
.ToggleOff
.ToggleOff:
set BATTLE_SCENE, [hl]
ld de, .Off
.Display
.Display:
hlcoord 11, 5
call PlaceString
and a
ret
; e4398
.On
.On:
db "ON @"
.Off
.Off:
db "OFF@"
; e43a0
@ -247,34 +247,34 @@ Options_BattleStyle: ; e43a0
jr nz, .ToggleShift
jr .ToggleSet
.LeftPressed
.LeftPressed:
bit BATTLE_SHIFT, [hl]
jr z, .ToggleSet
jr .ToggleShift
.NonePressed
.NonePressed:
bit BATTLE_SHIFT, [hl]
jr nz, .ToggleSet
.ToggleShift
.ToggleShift:
res BATTLE_SHIFT, [hl]
ld de, .Shift
jr .Display
.ToggleSet
.ToggleSet:
set BATTLE_SHIFT, [hl]
ld de, .Set
.Display
.Display:
hlcoord 11, 7
call PlaceString
and a
ret
; e43d1
.Shift
.Shift:
db "SHIFT@"
.Set
.Set:
db "SET @"
; e43dd
@ -290,41 +290,41 @@ Options_Sound: ; e43dd
jr nz, .SetMono
jr .SetStereo
.LeftPressed
.LeftPressed:
bit STEREO, [hl]
jr z, .SetStereo
jr .SetMono
.NonePressed
.NonePressed:
bit STEREO, [hl]
jr nz, .ToggleStereo
jr .ToggleMono
.SetMono
.SetMono:
res STEREO, [hl]
call RestartMapMusic
.ToggleMono
.ToggleMono:
ld de, .Mono
jr .Display
.SetStereo
.SetStereo:
set STEREO, [hl]
call RestartMapMusic
.ToggleStereo
.ToggleStereo:
ld de, .Stereo
.Display
.Display:
hlcoord 11, 9
call PlaceString
and a
ret
; e4416
.Mono
.Mono:
db "MONO @"
.Stereo
.Stereo:
db "STEREO@"
; e4424
@ -341,26 +341,26 @@ Options_Print: ; e4424
jr c, .Increase
ld c, -1
.Increase
.Increase:
inc c
ld a, e
jr .Save
.LeftPressed
.LeftPressed:
ld a, c
and a
jr nz, .Decrease
ld c, 5
.Decrease
.Decrease:
dec c
ld a, d
.Save
.Save:
ld b, a
ld [GBPrinter], a
.NonePressed
.NonePressed:
ld b, $0
ld hl, .Strings
rept 2
@ -375,22 +375,22 @@ endr
ret
; e445a
.Strings
.Strings:
dw .Lightest
dw .Lighter
dw .Normal
dw .Darker
dw .Darkest
.Lightest
.Lightest:
db "LIGHTEST@"
.Lighter
.Lighter:
db "LIGHTER @"
.Normal
.Normal:
db "NORMAL @"
.Darker
.Darker:
db "DARKER @"
.Darkest
.Darkest:
db "DARKEST @"
; e4491
@ -409,22 +409,22 @@ GetPrinterSetting: ; e4491
lb de, PRINT_LIGHTER, PRINT_DARKER ; the 2 values next to this setting
ret
.IsLightest
.IsLightest:
ld c, 0
lb de, PRINT_DARKEST, PRINT_LIGHTER ; the 2 values next to this setting
ret
.IsLight
.IsLight:
ld c, 1
lb de, PRINT_LIGHTEST, PRINT_NORMAL ; the 2 values next to this setting
ret
.IsDark
.IsDark:
ld c, 3
lb de, PRINT_NORMAL, PRINT_DARKEST ; the 2 values next to this setting
ret
.IsDarkest
.IsDarkest:
ld c, 4
lb de, PRINT_DARKER, PRINT_LIGHTEST ; the 2 values next to this setting
ret
@ -441,34 +441,34 @@ Options_MenuAccount: ; e44c1
jr nz, .ToggleOff
jr .ToggleOn
.LeftPressed
.LeftPressed:
bit MENU_ACCOUNT, [hl]
jr z, .ToggleOn
jr .ToggleOff
.NonePressed
.NonePressed:
bit MENU_ACCOUNT, [hl]
jr nz, .ToggleOn
.ToggleOff
.ToggleOff:
res MENU_ACCOUNT, [hl]
ld de, .Off
jr .Display
.ToggleOn
.ToggleOn:
set MENU_ACCOUNT, [hl]
ld de, .On
.Display
.Display:
hlcoord 11, 13
call PlaceString
and a
ret
; e44f2
.Off
.Off:
db "OFF@"
.On
.On:
db "ON @"
; e44fa
@ -483,16 +483,16 @@ Options_Frame: ; e44fa
and a
ret
.RightPressed
.RightPressed:
ld a, [hl]
inc a
jr .Save
.LeftPressed
.LeftPressed:
ld a, [hl]
dec a
.Save
.Save:
and $7
ld [hl], a
UpdateFrame: ; e4512
@ -512,7 +512,7 @@ Options_Cancel: ; e4520
and a
ret
.Exit
.Exit:
scf
ret
; e452a
@ -527,7 +527,7 @@ OptionsControl: ; e452a
and a
ret
.DownPressed
.DownPressed:
ld a, [hl] ; load the cursor position to a
cp $7 ; maximum number of items in option menu
jr nz, .CheckFive
@ -535,17 +535,17 @@ OptionsControl: ; e452a
scf
ret
.CheckFive ; I have no idea why this exists...
.CheckFive: ; I have no idea why this exists...
cp $5
jr nz, .Increase
ld [hl], $5
.Increase
.Increase:
inc [hl]
scf
ret
.UpPressed
.UpPressed:
ld a, [hl]
cp $6
jr nz, .NotSix
@ -553,12 +553,12 @@ OptionsControl: ; e452a
scf
ret
.NotSix
.NotSix:
and a
jr nz, .Decrease
ld [hl], $8 ; number of option items +1
.Decrease
.Decrease:
dec [hl]
scf
ret

34
engine/overworld.asm
View File

@ -95,14 +95,14 @@ GetPlayerSprite: ; 14183
ld [PlayerObjectSprite], a
ret
.Chris
.Chris:
db PLAYER_NORMAL, SPRITE_CHRIS
db PLAYER_BIKE, SPRITE_CHRIS_BIKE
db PLAYER_SURF, SPRITE_SURF
db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU
db $ff
.Kris
.Kris:
db PLAYER_NORMAL, SPRITE_KRIS
db PLAYER_BIKE, SPRITE_KRIS_BIKE
db PLAYER_SURF, SPRITE_SURF
@ -241,11 +241,11 @@ GetMonSprite: ; 14259
jr nc, .Variable
jr .Icon
.Normal
.Normal:
and a
ret
.Icon
.Icon:
sub SPRITE_POKEMON
ld e, a
ld d, 0
@ -261,7 +261,7 @@ GetMonSprite: ; 14259
.wBreedMon2
ld a, [wBreedMon2Species]
.Mon
.Mon:
ld e, a
and a
jr z, .NoBreedmon
@ -273,7 +273,7 @@ GetMonSprite: ; 14259
scf
ret
.Variable
.Variable:
sub SPRITE_VARS
ld e, a
ld d, 0
@ -283,7 +283,7 @@ GetMonSprite: ; 14259
and a
jp nz, GetMonSprite
.NoBreedmon
.NoBreedmon:
ld a, 1
ld l, 1
ld h, 0
@ -410,7 +410,7 @@ LoadSpriteGFX: ; 14306
.done
ret
.LoadSprite
.LoadSprite:
call GetSprite
ld a, l
ret
@ -424,7 +424,7 @@ SortUsedSprites: ; 1431e
ld c, SPRITE_GFX_LIST_CAPACITY
ld de, UsedSprites + (SPRITE_GFX_LIST_CAPACITY - 1) * 2
.FindLastSprite
.FindLastSprite:
ld a, [de]
and a
jr nz, .FoundLastSprite
@ -433,7 +433,7 @@ rept 2
endr
dec c
jr nz, .FindLastSprite
.FoundLastSprite
.FoundLastSprite:
dec c
jr z, .quit
@ -443,12 +443,12 @@ endr
inc de
ld hl, UsedSprites + 1
.CheckSprite
.CheckSprite:
push bc
push de
push hl
.CheckFollowing
.CheckFollowing:
ld a, [de]
cp [hl]
jr nc, .loop
@ -499,7 +499,7 @@ ArrangeUsedSprites: ; 14355
ld hl, UsedSprites
ld c, SPRITE_GFX_LIST_CAPACITY
ld b, 0
.FirstTableLength
.FirstTableLength:
; Keep going until the end of the list.
ld a, [hli]
and a
@ -523,11 +523,11 @@ ArrangeUsedSprites: ; 14355
dec c
jr nz, .FirstTableLength
.SecondTable
.SecondTable:
; The second tile table starts at tile $80.
ld b, $80
dec hl
.SecondTableLength
.SecondTableLength:
; Keep going until the end of the list.
ld a, [hli]
and a
@ -565,11 +565,11 @@ GetSpriteLength: ; 14386
ld a, 12
ret
.AnyDirection
.AnyDirection:
ld a, 12
ret
.OneDirection
.OneDirection:
ld a, 4
ret
; 1439b

4
engine/pack.asm
View File

@ -494,7 +494,7 @@ UseItem: ; 10311
call Pack_InitColors
ret
.NoPokemon
.NoPokemon:
ld hl, TextJump_YouDontHaveAPkmn
call Pack_PrintTextNoScroll
ret
@ -833,7 +833,7 @@ TMHMSubmenu: ; 105dc (4:45dc)
ld de, .UsableJumptable
jr .proceed
.NoUse
.NoUse:
ld hl, .UnusableMenuDataHeader
ld de, .UnusableJumptable
.proceed

2
engine/party_menu.asm
View File

@ -263,7 +263,7 @@ PlacePartyMonLevel: ; 50176
ld [hli], a
lb bc, PRINTNUM_RIGHTALIGN | 1, 2
; jr .okay
.ThreeDigits
.ThreeDigits:
lb bc, PRINTNUM_RIGHTALIGN | 1, 3
; .okay
call PrintNum

18
engine/phone.asm
View File

@ -60,7 +60,7 @@ Phone_FindOpenSlot: ; 9002d
xor a
ret
.FoundOpenSpace
.FoundOpenSpace:
dec hl
scf
ret
@ -196,7 +196,7 @@ ChooseRandomCaller: ; 900bf (24:40bf)
scf
ret
.NothingToSample
.NothingToSample:
xor a
ret
@ -288,7 +288,7 @@ endr
call CallScript
scf
ret
.NoPhoneCall
.NoPhoneCall:
xor a
ret
; 90173 (24:4173)
@ -363,7 +363,7 @@ Function90199: ; 90199 (24:4199)
ld hl, PhoneScript_JustTalkToThem
jr .DoPhoneCall
.GetPhoneScript
.GetPhoneScript:
ld hl, PHONE_CONTACT_SCRIPT1_BANK
add hl, de
ld b, [hl]
@ -374,13 +374,13 @@ Function90199: ; 90199 (24:4199)
ld l, a
jr .DoPhoneCall
.OutOfArea
.OutOfArea:
ld b, BANK(UnknownScript_0x90209)
ld de, UnknownScript_0x90209
call ExecuteCallbackScript
ret
.DoPhoneCall
.DoPhoneCall:
ld a, b
ld [wd002], a
ld a, l
@ -454,7 +454,7 @@ Script_SpecialBillCall:: ; 0x90255
callasm .LoadBillScript
jump Script_ReceivePhoneCall
.LoadBillScript
.LoadBillScript:
ld e, PHONE_BILL
jp LoadCallerScript
; 90261
@ -464,7 +464,7 @@ UnknownScript_0x90261: ; 0x90261
pause 30
jump Script_ReceivePhoneCall
.LoadElmScript
.LoadElmScript:
ld e, PHONE_ELM
jp LoadCallerScript
; 9026f
@ -694,7 +694,7 @@ GetCallerName: ; 903a9 (24:43a9)
call PlaceString
ret
.NotTrainer
.NotTrainer:
push hl
ld c, b
ld b, 0

54
engine/player_movement.asm
View File

@ -11,7 +11,7 @@ DoPlayerMovement:: ; 80000
ld [wPlayerNextMovement], a
ret
.GetDPad
.GetDPad:
ld a, [hJoyDown]
ld [CurInput], a
@ -32,7 +32,7 @@ DoPlayerMovement:: ; 80000
ret
; 8002d
.TranslateIntoMovement
.TranslateIntoMovement:
ld a, [PlayerState]
cp PLAYER_NORMAL
jr z, .Normal
@ -45,7 +45,7 @@ DoPlayerMovement:: ; 80000
cp PLAYER_SLIP
jr z, .Ice
.Normal
.Normal:
call .CheckForced
call .GetAction
call .CheckTile
@ -60,7 +60,7 @@ DoPlayerMovement:: ; 80000
ret c
jr .NotMoving
.Surf
.Surf:
call .CheckForced
call .GetAction
call .CheckTile
@ -71,7 +71,7 @@ DoPlayerMovement:: ; 80000
ret c
jr .NotMoving
.Ice
.Ice:
call .CheckForced
call .GetAction
call .CheckTile
@ -88,12 +88,12 @@ DoPlayerMovement:: ; 80000
cp STANDING
jr z, .HitWall
call .BumpSound
.HitWall
.HitWall:
call .StandInPlace
xor a
ret
.NotMoving
.NotMoving:
ld a, [WalkingDirection]
cp STANDING
jr z, .Standing
@ -103,12 +103,12 @@ DoPlayerMovement:: ; 80000
and a
jr nz, .CantMove
call .BumpSound
.CantMove
.CantMove:
call ._WalkInPlace
xor a
ret
.Standing
.Standing:
call .StandInPlace
xor a
ret
@ -347,7 +347,7 @@ DoPlayerMovement:: ; 80000
scf
ret
.ExitWater
.ExitWater:
call .GetOutOfWater
call PlayMapMusic
ld a, STEP_WALK
@ -386,7 +386,7 @@ DoPlayerMovement:: ; 80000
scf
ret
.DontJump
.DontJump:
xor a
ret
@ -442,11 +442,11 @@ DoPlayerMovement:: ; 80000
xor a
ret
.EdgeWarps
.EdgeWarps:
db $70, $78, $76, $7e
; 8025f
.DoStep
.DoStep:
ld e, a
ld d, 0
ld hl, .Steps
@ -473,7 +473,7 @@ DoPlayerMovement:: ; 80000
ld a, 4
ret
.Steps
.Steps:
dw .SlowStep
dw .NormalStep
dw .FastStep
@ -483,42 +483,42 @@ DoPlayerMovement:: ; 80000
dw .BackJumpStep
dw .InPlace
.SlowStep
.SlowStep:
slow_step_down
slow_step_up
slow_step_left
slow_step_right
.NormalStep
.NormalStep:
step_down
step_up
step_left
step_right
.FastStep
.FastStep:
big_step_down
big_step_up
big_step_left
big_step_right
.JumpStep
.JumpStep:
jump_step_down
jump_step_up
jump_step_left
jump_step_right
.SlideStep
.SlideStep:
fast_slide_step_down
fast_slide_step_up
fast_slide_step_left
fast_slide_step_right
.BackJumpStep
.BackJumpStep:
jump_step_up
jump_step_down
jump_step_right
jump_step_left
.TurningStep
.TurningStep:
turn_step_down
turn_step_up
turn_step_left
turn_step_right
.InPlace
.InPlace:
db $80 + movement_turn_head_down
db $80 + movement_turn_head_up
db $80 + movement_turn_head_left
@ -719,7 +719,7 @@ DoPlayerMovement:: ; 80000
xor a
ret
.NotWalkable
.NotWalkable:
scf
ret
; 803b4
@ -741,7 +741,7 @@ DoPlayerMovement:: ; 80000
and a
ret
.NotSurfable
.NotSurfable:
scf
ret
; 803ca
@ -779,16 +779,16 @@ DoPlayerMovement:: ; 80000
jr .Neither
.Water
.Water:
xor a
ret
.Land
.Land:
ld a, 1
and a
ret
.Neither
.Neither:
scf
ret
; 803ee

4
engine/player_object.asm
View File

@ -528,7 +528,7 @@ TrainerWalkToPlayer: ; 831e
call .GetPathToPlayer
call DecrementMovementBufferCount
.TerminateStep
.TerminateStep:
ld a, movement_step_end
call AppendToMovementBuffer
ret
@ -809,7 +809,7 @@ QueueFollowerFirstStep: ; 848a
ld [wFollowerMovementQueueLength], a
ret
.QueueFirstStep
.QueueFirstStep:
ld a, [wObjectFollow_Leader]
call GetObjectStruct
ld hl, OBJECT_NEXT_MAP_X

70
engine/pokecenter_pc.asm
View File

@ -26,21 +26,21 @@ PokemonCenterPC: ; 1559a
call CloseWindow
ret
.TopMenu
.TopMenu:
db $48 ; flags
db 00, 00 ; start coords
db 12, 15 ; end coords
dw .MenuData2
db 1 ; default option
.MenuData2
.MenuData2:
db $a0 ; flags
db 0 ; items
dw .WhichPC
dw PlaceNthMenuStrings
dw .JumpTable
.JumpTable
.JumpTable:
dw PlayersPC, .String_PlayersPC
dw BillsPC, .String_BillsPC
dw OaksPC, .String_OaksPC
@ -53,7 +53,7 @@ PokemonCenterPC: ; 1559a
.String_HallOfFame: db "HALL OF FAME@"
.String_TurnOff: db "TURN OFF@"
.WhichPC
.WhichPC:
; before pokedex
db 3 ; items
db 1, 0, 4 ; bill's, player's, turn off
@ -69,7 +69,7 @@ PokemonCenterPC: ; 1559a
db 1, 0, 2, 3, 4 ; bill's, player's, oak's, hall of fame, turn off
db -1
.ChooseWhichPCListToUse
.ChooseWhichPCListToUse:
call CheckReceivedDex
jr nz, .got_dex
ld a, $0
@ -95,7 +95,7 @@ PC_CheckPartyForPokemon: ; 15650
scf
ret
.MustHavePokemonToUse
.MustHavePokemonToUse:
; Bzzzzt! You must have a #MON to use this!
text_jump UnknownText_0x1c1328
db "@"
@ -238,14 +238,14 @@ KrissPCMenuData: ; 0x15736
dw .KrissPCMenuData2
db 1 ; default selected option
.KrissPCMenuData2
.KrissPCMenuData2:
db %10100000 ; bit7
db 0 ; # items?
dw .KrissPCMenuList1
dw PlaceNthMenuStrings
dw .KrissPCMenuPointers
.KrissPCMenuPointers ; 0x15746
.KrissPCMenuPointers: ; 0x15746
dw KrisWithdrawItemMenu, .WithdrawItem
dw KrisDepositItemMenu, .DepositItem
dw KrisTossItemMenu, .TossItem
@ -254,13 +254,13 @@ KrissPCMenuData: ; 0x15736
dw KrisLogOffMenu, .LogOff
dw KrisLogOffMenu, .TurnOff
.WithdrawItem db "WITHDRAW ITEM@"
.DepositItem db "DEPOSIT ITEM@"
.TossItem db "TOSS ITEM@"
.MailBox db "MAIL BOX@"
.Decoration db "DECORATION@"
.TurnOff db "TURN OFF@"
.LogOff db "LOG OFF@"
.WithdrawItem: db "WITHDRAW ITEM@"
.DepositItem: db "DEPOSIT ITEM@"
.TossItem: db "TOSS ITEM@"
.MailBox: db "MAIL BOX@"
.Decoration: db "DECORATION@"
.TurnOff: db "TURN OFF@"
.LogOff: db "LOG OFF@"
WITHDRAW_ITEM EQU 0
DEPOSIT_ITEM EQU 1
@ -270,7 +270,7 @@ DECORATION EQU 4
TURN_OFF EQU 5
LOG_OFF EQU 6
.KrissPCMenuList1
.KrissPCMenuList1:
db 5
db WITHDRAW_ITEM
db DEPOSIT_ITEM
@ -279,7 +279,7 @@ LOG_OFF EQU 6
db TURN_OFF
db -1
.KrissPCMenuList2
.KrissPCMenuList2:
db 6
db WITHDRAW_ITEM
db DEPOSIT_ITEM
@ -320,7 +320,7 @@ KrisWithdrawItemMenu: ; 0x157d1
xor a
ret
.Submenu
.Submenu:
; check if the item has a quantity
callba _CheckTossableItem
ld a, [wItemAttributeParamBuffer]
@ -362,7 +362,7 @@ KrisWithdrawItemMenu: ; 0x157d1
call ExitMenu
ret
.PackFull
.PackFull:
ld hl, .NoRoomText
call MenuTextBoxBackup
ret
@ -370,15 +370,15 @@ KrisWithdrawItemMenu: ; 0x157d1
.done
ret
.HowManyText ; 0x15850
.HowManyText: ; 0x15850
text_jump _KrissPCHowManyWithdrawText
db "@"
.WithdrewText ; 0x15855
.WithdrewText: ; 0x15855
text_jump _KrissPCWithdrewItemsText
db "@"
.NoRoomText ; 0x1585a
.NoRoomText: ; 0x1585a
text_jump _KrissPCNoRoomWithdrawText
db "@"
@ -435,7 +435,7 @@ KrisDepositItemMenu: ; 0x1588b
xor a
ret
.CheckItemsInBag
.CheckItemsInBag:
callba HasNoItems
ret nc
ld hl, .NoItemsInBag
@ -443,12 +443,12 @@ KrisDepositItemMenu: ; 0x1588b
scf
ret
.NoItemsInBag
.NoItemsInBag:
; No items here!
text_jump UnknownText_0x1c13df
db "@"
.TryDepositItem
.TryDepositItem:
ld a, [wSpriteUpdatesEnabled]
push af
ld a, $0
@ -485,7 +485,7 @@ KrisDepositItemMenu: ; 0x1588b
ld [Buffer1], a
ret
.DepositItem_
.DepositItem_:
callba _CheckTossableItem
ld a, [wItemAttributeParamBuffer]
and a
@ -494,7 +494,7 @@ KrisDepositItemMenu: ; 0x1588b
ld [wItemQuantityChangeBuffer], a
jr .DepositItem
.AskQuantity
.AskQuantity:
ld hl, .HowManyText
call MenuTextBox
callba SelectQuantityToToss
@ -504,7 +504,7 @@ KrisDepositItemMenu: ; 0x1588b
pop af
jr c, .DeclinedToDeposit
.DepositItem
.DepositItem:
ld a, [wItemQuantityChangeBuffer]
ld [Buffer1], a
ld a, [CurItemQuantity]
@ -523,24 +523,24 @@ KrisDepositItemMenu: ; 0x1588b
call PrintText
ret
.NoRoomInPC
.NoRoomInPC:
ld hl, .NoRoomText
call PrintText
ret
.DeclinedToDeposit
.DeclinedToDeposit:
and a
ret
.HowManyText ; 0x1596e
.HowManyText: ; 0x1596e
text_jump _KrissPCHowManyDepositText
db "@"
.DepositText ; 0x15973
.DepositText: ; 0x15973
text_jump _KrissPCDepositItemsText
db "@"
.NoRoomText ; 0x15978
.NoRoomText: ; 0x15978
text_jump _KrissPCNoRoomDepositText
db "@"
@ -619,14 +619,14 @@ PCItemsJoypad: ; 0x15985
scf
ret
.PCItemsMenuData
.PCItemsMenuData:
db %01000000
db 1, 4 ; start coords
db 10, 18 ; end coords
dw .MenuData2
db 1 ; default option
.MenuData2
.MenuData2:
db %10110000
db 4, 8 ; rows/cols?
db 2 ; horizontal spacing?

8
engine/pokedex.asm
View File

@ -2407,7 +2407,7 @@ Pokedex_LoadSelectedMonTiles: ; 4143b
predef GetFrontpic
ret
.QuestionMark
.QuestionMark:
ld a, BANK(sScratch)
call GetSRAMBank
callba LoadQuestionMarkPic
@ -2481,12 +2481,12 @@ Pokedex_LoadGFX: ; 414b7
callba LoadSGBPokedexGFX
jr .LoadPokedexSlowpokeLZ
.LoadPokedexLZ
.LoadPokedexLZ:
ld hl, PokedexLZ
ld de, VTiles2 tile $31
call Decompress
.LoadPokedexSlowpokeLZ
.LoadPokedexSlowpokeLZ:
ld hl, PokedexSlowpokeLZ
ld de, VTiles0
call Decompress
@ -2614,7 +2614,7 @@ Pokedex_SetBGMapMode_3ifDMG_4ifCGB: ; 41aeb (10:5aeb)
and a
jr z, .DMG
call Pokedex_SetBGMapMode4
.DMG
.DMG:
call Pokedex_SetBGMapMode3
ret

58
engine/pokegear.asm
View File

@ -198,12 +198,12 @@ TownMap_InitCursorAndPlayerIconPositions: ; 90d70 (24:4d70)
ld a, [BackupMapNumber]
ld c, a
call GetWorldMapLocation
.LoadLandmark
.LoadLandmark:
ld [wPokegearMapPlayerIconLandmark], a
ld [wPokegearMapCursorLandmark], a
ret
.FastShip
.FastShip:
ld [wPokegearMapPlayerIconLandmark], a
ld a, NEW_BARK_TOWN
ld [wPokegearMapCursorLandmark], a
@ -1240,7 +1240,7 @@ PokegearPhoneContactSubmenu: ; 91342 (24:5342)
ld hl, PokegearText_WhomToCall
call PrintText
call WaitBGMap
.CancelDelete
.CancelDelete:
scf
ret
@ -1525,7 +1525,7 @@ RadioChannels:
dbw 80, .EvolutionRadio
db -1
.PkmnTalkAndPokedexShow
.PkmnTalkAndPokedexShow:
; Pokédex Show in the morning
; Oak's Pokémon Talk in the afternoon and evening
@ -1536,28 +1536,28 @@ RadioChannels:
jp z, LoadStation_PokedexShow
jp LoadStation_OaksPokemonTalk
.PokemonMusic
.PokemonMusic:
call .InJohto
jr nc, .NoSignal
jp LoadStation_PokemonMusic
.LuckyChannel
.LuckyChannel:
call .InJohto
jr nc, .NoSignal
jp LoadStation_LuckyChannel
.BuenasPassword
.BuenasPassword:
call .InJohto
jr nc, .NoSignal
jp LoadStation_BuenasPassword
.RuinsOfAlphRadio
.RuinsOfAlphRadio:
ld a, [wPokegearMapPlayerIconLandmark]
cp RUINS_OF_ALPH
jr nz, .NoSignal
jp LoadStation_UnownRadio
.PlacesAndPeople
.PlacesAndPeople:
call .InJohto
jr c, .NoSignal
ld a, [wPokegearFlags]
@ -1565,7 +1565,7 @@ RadioChannels:
jr z, .NoSignal
jp LoadStation_PlacesAndPeople
.LetsAllSing
.LetsAllSing:
call .InJohto
jr c, .NoSignal
ld a, [wPokegearFlags]
@ -1573,7 +1573,7 @@ RadioChannels:
jr z, .NoSignal
jp LoadStation_LetsAllSing
.PokeFluteRadio
.PokeFluteRadio:
call .InJohto
jr c, .NoSignal
ld a, [wPokegearFlags]
@ -1581,7 +1581,7 @@ RadioChannels:
jr z, .NoSignal
jp LoadStation_PokeFluteRadio
.EvolutionRadio
.EvolutionRadio:
; This station airs in the Lake of Rage area when Rocket are still in Mahogany.
ld a, [StatusFlags]
bit 4, a
@ -1596,11 +1596,11 @@ RadioChannels:
.ok
jp LoadStation_EvolutionRadio
.NoSignal
.NoSignal:
call NoRadioStation
ret
.InJohto
.InJohto:
; if in Johto or on the S.S. Aqua, set carry
; otherwise clear carry
@ -2185,7 +2185,7 @@ FlyMapScroll: ; 91b73
jr nz, .ScrollPrev
ret
.ScrollNext
.ScrollNext:
ld hl, wd002
ld a, [hl]
cp d
@ -2193,13 +2193,13 @@ FlyMapScroll: ; 91b73
ld a, e
dec a
ld [hl], a
.NotAtEndYet
.NotAtEndYet:
inc [hl]
call CheckIfVisitedFlypoint
jr z, .ScrollNext
jr .Finally
.ScrollPrev
.ScrollPrev:
ld hl, wd002
ld a, [hl]
cp e
@ -2207,11 +2207,11 @@ FlyMapScroll: ; 91b73
ld a, d
inc a
ld [hl], a
.NotAtStartYet
.NotAtStartYet:
dec [hl]
call CheckIfVisitedFlypoint
jr z, .ScrollPrev
.Finally
.Finally:
call TownMapBubble
call WaitBGMap
xor a
@ -2264,10 +2264,10 @@ TownMapBubble: ; 91bb5
ld [hl], $34
ret
.Where
.Where:
db "Where?@"
.Name
.Name:
; We need the map location of the default flypoint
ld a, [wd002]
ld l, a
@ -2398,11 +2398,11 @@ FlyMap: ; 91c90
ld a, [BackupMapNumber]
ld c, a
call GetWorldMapLocation
.CheckRegion
.CheckRegion:
; The first 46 locations are part of Johto. The rest are in Kanto
cp KANTO_LANDMARK
jr nc, .KantoFlyMap
.JohtoFlyMap
.JohtoFlyMap:
; Note that .NoKanto should be modified in tandem with this branch
push af
; Start from New Bark Town
@ -2420,7 +2420,7 @@ FlyMap: ; 91c90
call TownMapPlayerIcon
ret
.KantoFlyMap
.KantoFlyMap:
; The event that there are no flypoints enabled in a map is not
; accounted for. As a result, if you attempt to select a flypoint
@ -2457,7 +2457,7 @@ FlyMap: ; 91c90
call TownMapPlayerIcon
ret
.NoKanto
.NoKanto:
; If Indigo Plateau hasn't been visited, we use Johto's map instead
; Start from New Bark Town
@ -2470,7 +2470,7 @@ FlyMap: ; 91c90
ld [EndFlypoint], a
call FillJohtoMap
pop af
.MapHud
.MapHud:
call TownMapBubble
call TownMapPals
hlbgcoord 0, 0 ; BG Map 0
@ -2685,7 +2685,7 @@ _Area: ; 91d11
ld b, d
ld de, .PlayerOAM
ld hl, Sprites
.ShowPlayerLoop
.ShowPlayerLoop:
ld a, [de]
cp $80
jr z, .clear_oam
@ -2770,7 +2770,7 @@ _Area: ; 91d11
callba GetPlayerIcon
ret
.FastShip
.FastShip:
ld de, FastShipGFX
ld b, BANK(FastShipGFX)
ret
@ -2878,7 +2878,7 @@ TownMapPals: ; 91f13
jr nz, .loop
ret
.PalMap
.PalMap:
townmappals: MACRO
rept _NARG / 2
dn \2, \1

32
engine/radio.asm
View File

@ -372,7 +372,7 @@ OaksPkmnTalk8:
ld a, OAKS_POKEMON_TALK_9
jp NextRadioLine
.Descriptors
.Descriptors:
dw .sweetadorably
dw .wigglyslickly
dw .aptlynamed
@ -492,7 +492,7 @@ OaksPkmnTalk9:
.ok
jp NextRadioLine
.Descriptors
.Descriptors:
dw .cute
dw .weird
dw .pleasant
@ -896,7 +896,7 @@ BenFernMusic5:
ld hl, BenFernText2A
jr z, .SunTueThurSun
ld hl, BenFernText2B
.SunTueThurSun
.SunTueThurSun:
ld a, POKEMON_MUSIC_6
jp NextRadioLine
@ -906,7 +906,7 @@ BenFernMusic6:
ld hl, BenFernText3A
jr z, .SunTueThurSun
ld hl, BenFernText3B
.SunTueThurSun
.SunTueThurSun:
ld a, POKEMON_MUSIC_7
jp NextRadioLine
@ -921,7 +921,7 @@ StartPokemonMusicChannel:
and 1
jr z, .SunTueThurSun
ld de, MUSIC_POKEMON_LULLABY
.SunTueThurSun
.SunTueThurSun:
callab RadioMusicRestartDE
ret
@ -1235,7 +1235,7 @@ PeoplePlaces5:
.ok
jp NextRadioLine
.Descriptors
.Descriptors:
dw PnP_cute
dw PnP_lazy
dw PnP_happy
@ -1352,7 +1352,7 @@ PeoplePlaces6: ; Places
ld a, PLACES_AND_PEOPLE_7
jp NextRadioLine
.Maps
.Maps:
map PALLET_TOWN
map ROUTE_22
map PEWTER_CITY
@ -1392,7 +1392,7 @@ PeoplePlaces7:
.ok
jp PrintRadioLine
.Descriptors
.Descriptors:
dw PnP_cute
dw PnP_lazy
dw PnP_happy
@ -1538,7 +1538,7 @@ BuenasPassword1:
jp z, BuenasPassword20
jp BuenasPassword8
.PlayPassword
.PlayPassword:
call StartRadioStation
ld a, [hBGMapMode]
push af
@ -1594,7 +1594,7 @@ BuenasPassword4:
; Set the flag so that we don't generate a new password this week.
ld hl, WeeklyFlags
set 7, [hl]
.AlreadyGotIt
.AlreadyGotIt:
ld c, a
call GetBuenasPassword
ld hl, BuenaRadioText4
@ -1638,29 +1638,29 @@ GetBuenasPassword:
ld c, [hl]
ret
.StringFunctionJumpTable
.StringFunctionJumpTable:
dw .Mon
dw .Item
dw .Move
dw .RawString
.Mon
.Mon:
call .GetTheIndex
call GetPokemonName
ret
.Item
.Item:
call .GetTheIndex
call GetItemName
ret
.Move
.Move:
call .GetTheIndex
call GetMoveName
ret
.GetTheIndex
.GetTheIndex:
ld h, 0
ld l, c
add hl, de
@ -1668,7 +1668,7 @@ GetBuenasPassword:
ld [wNamedObjectIndexBuffer], a
ret
.RawString
.RawString:
; Get the string from the table...
ld a, c
and a

16
engine/scripting.asm
View File

@ -582,7 +582,7 @@ GiveItemScript: ; 96f77
itemnotify
end
.Full
.Full:
buttonsound
pocketisfull
end
@ -681,19 +681,19 @@ GetPocketName: ; 96ffe
call CopyName2
ret
.Pockets
.Pockets:
dw .Item
dw .Key
dw .Ball
dw .TM
.Item
.Item:
db "ITEM POCKET@"
.Key
.Key:
db "KEY POCKET@"
.Ball
.Ball:
db "BALL POCKET@"
.TM
.TM:
db "TM POCKET@"
; 97051
@ -1425,12 +1425,12 @@ ShowEmoteScript: ; 973b6
applymovement2 .Hide
end
.Show
.Show:
show_emote
step_sleep_1
step_end
.Hide
.Hide:
hide_emote
step_sleep_1
step_end

34
engine/selectmenu.asm
View File

@ -4,7 +4,7 @@ SelectMenu:: ; 13327
jr c, .NotRegistered
jp UseRegisteredItem
.NotRegistered
.NotRegistered:
call OpenText
ld b, BANK(ItemMayBeRegisteredText)
ld hl, ItemMayBeRegisteredText
@ -32,13 +32,13 @@ CheckRegisteredItem: ; 13345
rst JumpTable
ret
.Pockets
.Pockets:
dw .CheckItem
dw .CheckBall
dw .CheckKeyItem
dw .CheckTMHM
.CheckItem
.CheckItem:
ld hl, NumItems
call .CheckRegisteredNo
jr c, .NoRegisteredItem
@ -53,7 +53,7 @@ endr
and a
ret
.CheckKeyItem
.CheckKeyItem:
ld a, [RegisteredItem]
ld hl, KeyItems
ld de, 1
@ -64,7 +64,7 @@ endr
and a
ret
.CheckBall
.CheckBall:
ld hl, NumBalls
call .CheckRegisteredNo
jr nc, .NoRegisteredItem
@ -78,10 +78,10 @@ endr
jr c, .NoRegisteredItem
ret
.CheckTMHM
.CheckTMHM:
jr .NoRegisteredItem
.NoRegisteredItem
.NoRegisteredItem:
xor a
ld [WhichRegisteredItem], a
ld [RegisteredItem], a
@ -90,7 +90,7 @@ endr
; 133a6
.CheckRegisteredNo ; 133a6
.CheckRegisteredNo: ; 133a6
ld a, [WhichRegisteredItem]
and REGISTERED_NUMBER
dec a
@ -100,13 +100,13 @@ endr
and a
ret
.NotEnoughItems
.NotEnoughItems:
scf
ret
; 133b6
.IsSameItem ; 133b6
.IsSameItem: ; 133b6
ld a, [RegisteredItem]
cp [hl]
jr nz, .NotSameItem
@ -114,7 +114,7 @@ endr
and a
ret
.NotSameItem
.NotSameItem:
scf
ret
; 133c3
@ -128,7 +128,7 @@ UseRegisteredItem: ; 133c3
rst JumpTable
ret
.SwitchTo
.SwitchTo:
dw .CantUse
dw .NoFunction
dw .NoFunction
@ -138,7 +138,7 @@ UseRegisteredItem: ; 133c3
dw .Overworld
; 133df
.NoFunction ; 133df
.NoFunction: ; 133df
call OpenText
call CantUseItem
call CloseText
@ -146,7 +146,7 @@ UseRegisteredItem: ; 133c3
ret
; 133ea
.Current ; 133ea
.Current: ; 133ea
call OpenText
call DoItemEffect
call CloseText
@ -154,7 +154,7 @@ UseRegisteredItem: ; 133c3
ret
; 133f5
.Party ; 133f5
.Party: ; 133f5
call RefreshScreen
call FadeToMenu
call DoItemEffect
@ -164,7 +164,7 @@ UseRegisteredItem: ; 133c3
ret
; 13406
.Overworld ; 13406
.Overworld: ; 13406
call RefreshScreen
ld a, 1
ld [wUsingItemWithSelect], a
@ -180,7 +180,7 @@ UseRegisteredItem: ; 133c3
ret
; 13422
.CantUse ; 13422
.CantUse: ; 13422
call RefreshScreen
._cantuse

24
engine/slot_machine.asm
View File

@ -213,7 +213,7 @@ endr
SlotsJumptable: ; 92844 (24:6844)
jumptable .Jumptable, wJumptableIndex
.Jumptable
.Jumptable:
dw Slots_Init ; 00
dw Slots_BetAndStart ; 01
dw Slots_WaitStart ; 02
@ -358,7 +358,7 @@ Slots_FlashIfWin: ; 92955 (24:6955)
call Slots_Next
ret
.GotIt
.GotIt:
call Slots_Next
ld a, 16
ld [wcf64], a
@ -893,7 +893,7 @@ Slots_StopReelIgnoreJoypad: ; 92c4c
dec [hl]
ret
.EndReel
.EndReel:
ld hl, wReel1ReelAction - wReel1
add hl, bc
ld a, $0
@ -914,7 +914,7 @@ ReelAction_StopReel1: ; 92c5e
dec [hl]
call .CheckForBias
ret nz
.NoBias
.NoBias:
call Slots_StopReel
ret
@ -955,7 +955,7 @@ ReelAction_StopReel2: ; 92c86
dec [hl]
ret
.NoBias
.NoBias:
call Slots_StopReel
ret
@ -975,7 +975,7 @@ ReelAction_StopReel3: ; 92ca9
dec [hl]
ret
.NoMatch
.NoMatch:
ld a, [wSlotBias]
cp SLOTS_NOMATCH
jr z, .NoBias
@ -987,7 +987,7 @@ ReelAction_StopReel3: ; 92ca9
dec [hl]
ret
.NoBias
.NoBias:
call Slots_StopReel
ret
@ -1177,7 +1177,7 @@ ReelAction_DropReel: ; 92dca
call Slots_StopReel
ret
.EggAgain
.EggAgain:
ld hl, wReel1SpinRate - wReel1
add hl, bc
ld [hl], $0
@ -1234,7 +1234,7 @@ ReelAction_WaitDropReel: ; 92e31
dec [hl]
ret
.DropReel
.DropReel:
ld hl, wReel1ReelAction - wReel1
add hl, bc
dec [hl]
@ -1706,7 +1706,7 @@ Slots_AskBet: ; 9307c (24:707c)
call PrintText
jr .loop
.Start
.Start:
ld hl, Coins + 1
ld a, [hl]
sub c
@ -1815,7 +1815,7 @@ SlotGetPayout: ; 93124 (24:7124)
callba MobileFn_105fe3
ret
.PayoutTable
.PayoutTable:
dw 300
dw 50
dw 6
@ -1839,7 +1839,7 @@ SlotPayoutText: ; 93158 (24:7158)
callba MobileFn_105fd0
ret
.MatchedSomething
.MatchedSomething:
srl a
ld e, a
ld d, 0

2
engine/specials.asm
View File

@ -578,7 +578,7 @@ SpecialSnorlaxAwake: ; 0xc43d
ld [ScriptVar], a
ret
.ProximityCoords
.ProximityCoords:
; x, y
db 33, 8 ; left
db 34, 10 ; below

160
engine/startmenu.asm
View File

@ -12,7 +12,7 @@ StartMenu:: ; 125cd
ld hl, .MenuDataHeader
jr z, .GotMenuData
ld hl, .ContestMenuDataHeader
.GotMenuData
.GotMenuData:
call LoadMenuDataHeader
call .SetUpMenuItems
@ -28,14 +28,14 @@ StartMenu:: ; 125cd
call UpdateTimePals
jr .Select
.Reopen
.Reopen:
call UpdateSprites
call UpdateTimePals
call .SetUpMenuItems
ld a, [wd0d2]
ld [wMenuCursorBuffer], a
.Select
.Select:
call .GetInput
jr c, .Exit
call .DrawMenuAccount
@ -57,7 +57,7 @@ StartMenu:: ; 125cd
ld l, a
jp [hl]
.MenuReturns
.MenuReturns:
dw .Reopen
dw .Exit
dw .ExitMenuCallFuncCloseText
@ -66,7 +66,7 @@ StartMenu:: ; 125cd
dw .ReturnEnd
dw .ReturnRedraw
.Exit
.Exit:
ld a, [hOAMUpdate]
push af
ld a, 1
@ -74,14 +74,14 @@ StartMenu:: ; 125cd
call LoadFontsExtra
pop af
ld [hOAMUpdate], a
.ReturnEnd
.ReturnEnd:
call ExitMenu
.ReturnEnd2
.ReturnEnd2:
call CloseText
call UpdateTimePals
ret
.GetInput
.GetInput:
; Return carry on exit, and no-carry on selection.
xor a
ld [hBGMapMode], a
@ -107,21 +107,21 @@ StartMenu:: ; 125cd
ret
; 12691
.ExitMenuRunScript ; 12691
.ExitMenuRunScript: ; 12691
call ExitMenu
ld a, HMENURETURN_SCRIPT
ld [hMenuReturn], a
ret
; 12699
.ExitMenuRunScriptCloseText ; 12699
.ExitMenuRunScriptCloseText: ; 12699
call ExitMenu
ld a, HMENURETURN_SCRIPT
ld [hMenuReturn], a
jr .ReturnEnd2
; 126a2
.ExitMenuCallFuncCloseText ; 126a2
.ExitMenuCallFuncCloseText: ; 126a2
call ExitMenu
ld hl, wQueuedScriptAddr
ld a, [hli]
@ -132,12 +132,12 @@ StartMenu:: ; 125cd
jr .ReturnEnd2
; 126b1
.ReturnRedraw ; 126b1
.ReturnRedraw: ; 126b1
call .Clear
jp .Reopen
; 126b7
.Clear ; 126b7
.Clear: ; 126b7
call ClearBGPalettes
call Call_ExitMenu
call ReloadTilesetAndPalettes
@ -151,28 +151,28 @@ StartMenu:: ; 125cd
; 126d3
.MenuDataHeader
.MenuDataHeader:
db $40 ; tile backup
db 0, 10 ; start coords
db 17, 19 ; end coords
dw .MenuData
db 1 ; default selection
.ContestMenuDataHeader
.ContestMenuDataHeader:
db $40 ; tile backup
db 2, 10 ; start coords
db 17, 19 ; end coords
dw .MenuData
db 1 ; default selection
.MenuData
.MenuData:
db %10101000 ; x padding, wrap around, start can close
dn 0, 0 ; rows, columns
dw MenuItemsList
dw .MenuString
dw .Items
.Items
.Items:
dw StartMenu_Pokedex, .PokedexString, .PokedexDesc
dw StartMenu_Pokemon, .PartyString, .PartyDesc
dw StartMenu_Pack, .PackString, .PackDesc
@ -183,45 +183,45 @@ StartMenu:: ; 125cd
dw StartMenu_Pokegear, .PokegearString, .PokegearDesc
dw StartMenu_Quit, .QuitString, .QuitDesc
.PokedexString db "#DEX@"
.PartyString db "#MON@"
.PackString db "PACK@"
.StatusString db "<PLAYER>@"
.SaveString db "SAVE@"
.OptionString db "OPTION@"
.ExitString db "EXIT@"
.PokegearString db $24, "GEAR@"
.QuitString db "QUIT@"
.PokedexString: db "#DEX@"
.PartyString: db "#MON@"
.PackString: db "PACK@"
.StatusString: db "<PLAYER>@"
.SaveString: db "SAVE@"
.OptionString: db "OPTION@"
.ExitString: db "EXIT@"
.PokegearString: db $24, "GEAR@"
.QuitString: db "QUIT@"
.PokedexDesc db "#MON"
.PokedexDesc: db "#MON"
next "database@"
.PartyDesc db "Party ", $4a
.PartyDesc: db "Party ", $4a
next "status@"
.PackDesc db "Contains"
.PackDesc: db "Contains"
next "items@"
.PokegearDesc db "Trainer's"
.PokegearDesc: db "Trainer's"
next "key device@"
.StatusDesc db "Your own"
.StatusDesc: db "Your own"
next "status@"
.SaveDesc db "Save your"
.SaveDesc: db "Save your"
next "progress@"
.OptionDesc db "Change"
.OptionDesc: db "Change"
next "settings@"
.ExitDesc db "Close this"
.ExitDesc: db "Close this"
next "menu@"
.QuitDesc db "Quit and"
.QuitDesc: db "Quit and"
next "be judged.@"
.OpenMenu ; 127e5
.OpenMenu: ; 127e5
ld a, [MenuSelection]
call .GetMenuAccountTextPointer
ld a, [hli]
@ -230,7 +230,7 @@ StartMenu:: ; 125cd
jp [hl]
; 127ef
.MenuString ; 127ef
.MenuString: ; 127ef
push de
ld a, [MenuSelection]
call .GetMenuAccountTextPointer
@ -244,7 +244,7 @@ StartMenu:: ; 125cd
ret
; 12800
.MenuDesc ; 12800
.MenuDesc: ; 12800
push de
ld a, [MenuSelection]
cp $ff
@ -265,7 +265,7 @@ endr
; 12819
.GetMenuAccountTextPointer ; 12819
.GetMenuAccountTextPointer: ; 12819
ld e, a
ld d, 0
ld hl, wMenuData2PointerTableAddr
@ -279,7 +279,7 @@ endr
; 12829
.SetUpMenuItems ; 12829
.SetUpMenuItems: ; 12829
xor a
ld [wWhichIndexSet], a
call .FillMenuList
@ -340,7 +340,7 @@ endr
; 1288d
.FillMenuList ; 1288d
.FillMenuList: ; 1288d
xor a
ld hl, MenuItemsList
ld [hli], a
@ -352,18 +352,18 @@ endr
ret
; 128a0
.AppendMenuList ; 128a0
.AppendMenuList: ; 128a0
ld [de], a
inc de
inc c
ret
; 128a4
.DrawMenuAccount_ ; 128a4
.DrawMenuAccount_: ; 128a4
jp .DrawMenuAccount
; 128a7
.PrintMenuAccount ; 128a7
.PrintMenuAccount: ; 128a7
call .IsMenuAccountOn
ret z
call .DrawMenuAccount
@ -371,7 +371,7 @@ endr
jp .MenuDesc
; 128b4
.DrawMenuAccount ; 128b4
.DrawMenuAccount: ; 128b4
call .IsMenuAccountOn
ret z
hlcoord 0, 13
@ -383,13 +383,13 @@ endr
jp TextBoxPalette
; 128cb
.IsMenuAccountOn ; 128cb
.IsMenuAccountOn: ; 128cb
ld a, [Options2]
and 1
ret
; 128d1
.DrawBugContestStatusBox ; 128d1
.DrawBugContestStatusBox: ; 128d1
ld hl, StatusFlags2
bit 2, [hl] ; bug catching contest
ret z
@ -397,7 +397,7 @@ endr
ret
; 128de
.DrawBugContestStatus ; 128de
.DrawBugContestStatus: ; 128de
ld hl, StatusFlags2
bit 2, [hl] ; bug catching contest
jr nz, .contest
@ -428,11 +428,11 @@ StartMenu_Quit: ; 128f0
ld a, 4
ret
.DontEndContest
.DontEndContest:
ld a, 0
ret
.EndTheContestText
.EndTheContestText:
text_jump UnknownText_0x1c1a6c
db "@"
; 1290b
@ -630,27 +630,27 @@ TossItemFromPC: ; 129f4
scf
ret
.TossHowMany
.TossHowMany:
; Toss out how many @ (S)?
text_jump UnknownText_0x1c1a90
db "@"
.ConfirmToss
.ConfirmToss:
; Throw away @ @ (S)?
text_jump UnknownText_0x1c1aad
db "@"
.TossedThisMany
.TossedThisMany:
; Discarded @ (S).
text_jump UnknownText_0x1c1aca
db "@"
.CantToss
.CantToss:
ld hl, .TooImportantToToss
call MenuTextBoxBackup
ret
.TooImportantToToss
.TooImportantToToss:
; That's too impor- tant to toss out!
text_jump UnknownText_0x1c1adf
db "@"
@ -707,7 +707,7 @@ PokemonActionSubmenu: ; 12a88
ld a, 0
ret
.Actions
.Actions:
dbw MONMENU_CUT, MonMenu_Cut ; Cut
dbw MONMENU_FLY, MonMenu_Fly ; Fly
dbw MONMENU_SURF, MonMenu_Surf ; Surf
@ -776,7 +776,7 @@ SwitchPartyMons: ; 12aec
ld a, 1
ret
.DontSwitch
.DontSwitch:
xor a
ld [PartyMenuActionText], a
call CancelPokemonAction
@ -826,7 +826,7 @@ GiveTakePartyMonItem: ; 12b60
; 12ba9
.GiveItem
.GiveItem:
callba DepositSellInitPackBuffers
@ -982,7 +982,7 @@ GiveTakeItemMenuData: ; 12c9b
dw .Items
db 1 ; default option
.Items
.Items:
db %10000000 ; x padding
db 2 ; # items
db "GIVE@"
@ -1132,12 +1132,12 @@ MonMailAction: ; 12d45
call MenuTextBoxBackup
jr .done
.MailboxFull
.MailboxFull:
ld hl, .mailboxfulltext
call MenuTextBoxBackup
jr .done
.RemoveMailToBag
.RemoveMailToBag:
ld hl, .mailwilllosemessagetext
call StartMenuYesNo
jr c, .done
@ -1153,7 +1153,7 @@ MonMailAction: ; 12d45
call MenuTextBoxBackup
jr .done
.BagIsFull
.BagIsFull:
ld hl, .bagfulltext
call MenuTextBoxBackup
jr .done
@ -1164,7 +1164,7 @@ MonMailAction: ; 12d45
; 12dc9
.MenuDataHeader
.MenuDataHeader:
db $40 ; flags
db 10, 12 ; start coords
db 17, 19 ; end coords
@ -1172,7 +1172,7 @@ MonMailAction: ; 12d45
db 1 ; default option
; 0x12dd1
.MenuData2
.MenuData2:
db $80 ; flags
db 3 ; items
db "READ@"
@ -1242,7 +1242,7 @@ MonMenu_Cut: ; 12e1b
ld a, $2
ret
.Fail
.Fail:
ld a, $3
ret
; 12e30
@ -1260,15 +1260,15 @@ MonMenu_Fly: ; 12e30
ld a, $2
ret
.Fail
.Fail:
ld a, $3
ret
.Error
.Error:
ld a, $0
ret
.Unused
.Unused:
ld a, $1
ret
; 12e55
@ -1282,7 +1282,7 @@ MonMenu_Flash: ; 12e55
ld a, $2
ret
.Fail
.Fail:
ld a, $3
ret
; 12e6a
@ -1296,7 +1296,7 @@ MonMenu_Strength: ; 12e6a
ld a, $2
ret
.Fail
.Fail:
ld a, $3
ret
; 12e7f
@ -1310,7 +1310,7 @@ MonMenu_Whirlpool: ; 12e7f
ld a, $2
ret
.Fail
.Fail:
ld a, $3
ret
; 12e94
@ -1324,7 +1324,7 @@ MonMenu_Waterfall: ; 12e94
ld a, $2
ret
.Fail
.Fail:
ld a, $3
ret
; 12ea9
@ -1338,7 +1338,7 @@ MonMenu_Teleport: ; 12ea9
ld a, $2
ret
.Fail
.Fail:
ld a, $3
ret
; 12ebd
@ -1352,7 +1352,7 @@ MonMenu_Surf: ; 12ebd
ld a, $2
ret
.Fail
.Fail:
ld a, $3
ret
; 12ed1
@ -1366,7 +1366,7 @@ MonMenu_Dig: ; 12ed1
ld a, $2
ret
.Fail
.Fail:
ld a, $3
ret
; 12ee6
@ -1377,7 +1377,7 @@ MonMenu_Softboiled_MilkDrink: ; 12ee6
callba Softboiled_MilkDrinkFunction
jr .finish
.NotEnoughHP
.NotEnoughHP:
ld hl, .Text_NotEnoughHP
call PrintText
@ -1388,13 +1388,13 @@ MonMenu_Softboiled_MilkDrink: ; 12ee6
ret
; 12f00
.Text_NotEnoughHP
.Text_NotEnoughHP:
; Not enough HP!
text_jump UnknownText_0x1c1ce3
db "@"
; 0x12f05
.CheckMonHasEnoughHP
.CheckMonHasEnoughHP:
; Need to have at least (MaxHP / 5) HP left.
ld a, MON_MAXHP
call GetPartyParamLocation
@ -1425,7 +1425,7 @@ MonMenu_Headbutt: ; 12f26
ld a, $2
ret
.Fail
.Fail:
ld a, $3
ret
; 12f3b
@ -1439,7 +1439,7 @@ MonMenu_RockSmash: ; 12f3b
ld a, $2
ret
.Fail
.Fail:
ld a, $3
ret
; 12f50

12
engine/stats_screen.asm
View File

@ -559,7 +559,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
jr z, .NotImmuneToPkrs
hlcoord 8, 8
ld [hl], "."
.NotImmuneToPkrs
.NotImmuneToPkrs:
ld a, [MonType]
cp BOXMON
jr z, .StatusOK
@ -570,12 +570,12 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
pop hl
jr nz, .done_status
jr .StatusOK
.HasPokerus
.HasPokerus:
ld de, .PkrsStr
hlcoord 1, 13
call PlaceString
jr .done_status
.StatusOK
.StatusOK:
ld de, .OK_str
call PlaceString
.done_status
@ -628,7 +628,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6)
jr z, .AtMaxLevel
inc a
ld [TempMonLevel], a
.AtMaxLevel
.AtMaxLevel:
call PrintLevel
pop af
ld [TempMonLevel], a
@ -657,7 +657,7 @@ endr
ld [Buffer1], a ; wd1ea (aliases: MagikarpLength)
ret
.AlreadyAtMaxLevel
.AlreadyAtMaxLevel:
ld hl, Buffer1 ; wd1ea (aliases: MagikarpLength)
xor a
rept 2
@ -747,7 +747,7 @@ endr
ld de, SCREEN_WIDTH
ld b, 10
ld a, $31
.BluePageVerticalDivider
.BluePageVerticalDivider:
ld [hl], a
add hl, de
dec b

426
engine/std_scripts.asm
View File

File diff suppressed because it is too large Load Diff

6
engine/time.asm
View File

@ -30,7 +30,7 @@ NextCallReceiveDelay: ; 113e9
jp RestartReceiveCallDelay
; 113fd
.ReceiveCallDelays
.ReceiveCallDelays:
db 20, 10, 5, 3
; 11401
@ -124,9 +124,9 @@ endr
jr z, .RestartKenjiBreakCountdown
dec [hl]
jr nz, .DontRestartKenjiBreakCountdown
.RestartKenjiBreakCountdown
.RestartKenjiBreakCountdown:
call Special_SampleKenjiBreakCountdown
.DontRestartKenjiBreakCountdown
.DontRestartKenjiBreakCountdown:
jr RestartDailyResetTimer
; 11485

14
engine/timeofdaypals.asm
View File

@ -215,7 +215,7 @@ ReplaceTimeOfDayPals: ; 8c0e5
ld [wTimeOfDayPalset], a
ret
.DarkCave
.DarkCave:
ld a, [StatusFlags]
bit 2, a ; Flash
jr nz, .UsedFlash
@ -223,7 +223,7 @@ ReplaceTimeOfDayPals: ; 8c0e5
ld [wTimeOfDayPalset], a
ret
.UsedFlash
.UsedFlash:
ld a, %10101010 ; 2, 2, 2, 2
ld [wTimeOfDayPalset], a
ret
@ -254,31 +254,31 @@ endr
jp [hl]
; 8c126
.TimePalettes
.TimePalettes:
dw .MorningPalette
dw .DayPalette
dw .NitePalette
dw .DarknessPalette
.MorningPalette
.MorningPalette:
ld a, [wTimeOfDayPalset]
and %00000011 ; 0
ret
.DayPalette
.DayPalette:
ld a, [wTimeOfDayPalset]
and %00001100 ; 1
srl a
srl a
ret
.NitePalette
.NitePalette:
ld a, [wTimeOfDayPalset]
and %00110000 ; 2
swap a
ret
.DarknessPalette
.DarknessPalette:
ld a, [wTimeOfDayPalset]
and %11000000 ; 3
rlca

20
engine/timeset.asm
View File

@ -63,7 +63,7 @@ InitClock: ; 90672 (24:4672)
ld c, 10
call DelayFrames
.SetHourLoop
.SetHourLoop:
call JoyTextDelay
call SetHour
jr nc, .SetHourLoop
@ -78,7 +78,7 @@ InitClock: ; 90672 (24:4672)
call .ClearScreen
jr .loop
.HourIsSet
.HourIsSet:
ld hl, Text_HowManyMinutes
call PrintText
hlcoord 11, 7
@ -93,7 +93,7 @@ InitClock: ; 90672 (24:4672)
ld c, 10
call DelayFrames
.SetMinutesLoop
.SetMinutesLoop:
call JoyTextDelay
call SetMinutes
jr nc, .SetMinutesLoop
@ -108,7 +108,7 @@ InitClock: ; 90672 (24:4672)
call .ClearScreen
jr .HourIsSet
.MinutesAreSet
.MinutesAreSet:
call SetTimeOfDay
ld hl, OakText_ResponseToSetTime
call PrintText
@ -150,7 +150,7 @@ SetHour: ; 90795 (24:4795)
and a
jr nz, .DecreaseThroughMidnight
ld a, 23 + 1
.DecreaseThroughMidnight
.DecreaseThroughMidnight:
dec a
ld [hl], a
jr .okay
@ -161,7 +161,7 @@ SetHour: ; 90795 (24:4795)
cp 23
jr c, .AdvanceThroughMidnight
ld a, -1
.AdvanceThroughMidnight
.AdvanceThroughMidnight:
inc a
ld [hl], a
@ -176,7 +176,7 @@ SetHour: ; 90795 (24:4795)
and a
ret
.Confirm
.Confirm:
scf
ret
@ -368,13 +368,13 @@ OakText_ResponseToSetTime: ; 0x908b8
jr c, .MORN
cp 18
jr c, .DAY
.NITE
.NITE:
ld hl, .sodark
ret
.MORN
.MORN:
ld hl, .overslept
ret
.DAY
.DAY:
ld hl, .yikes
ret
; 908ec (24:48ec)

8
engine/tmhm2.asm
View File

@ -59,12 +59,12 @@ AskTeachTMHM: ; 2c7bf (b:47bf)
cp HM01
jr c, .TM
ld hl, Text_BootedHM ; Booted up an HM
.TM
.TM:
call PrintText
ld hl, Text_ItContained
call PrintText
call YesNoBox
.NotTMHM
.NotTMHM:
pop bc
ld a, b
ld [Options], a
@ -374,7 +374,7 @@ TMHM_DisplayPocketItems: ; 2c9e2 (b:49e2)
call PrintNum
jr .okay
.HM
.HM:
push af
sub NUM_TMS
ld [wd265], a
@ -421,7 +421,7 @@ TMHM_DisplayPocketItems: ; 2c9e2 (b:49e2)
jr nz, .loop2
jr .done
.NotTMHM
.NotTMHM:
call TMHMPocket_GetCurrentLineCoord
rept 3
inc hl

2
engine/trade/animation.asm
View File

@ -155,7 +155,7 @@ RunTradeAnimSequence: ; 28fa1
ld a, $0
ld [rVBK], a
.NotCGB
.NotCGB:
hlbgcoord 0, 0
ld bc, sScratch - VBGMap0
ld a, " "

10
engine/trainer_card.asm
View File

@ -118,7 +118,7 @@ TrainerCard_Page1_Joypad: ; 251d7 (9:51d7)
ld [wJumptableIndex], a
ret
.KantoCheck
.KantoCheck:
; unreferenced
ld a, [KantoBadges]
and a
@ -164,7 +164,7 @@ TrainerCard_Page2_Joypad: ; 25221 (9:5221)
ld [wJumptableIndex], a
ret
.KantoCheck
.KantoCheck:
; unreferenced
ld a, [KantoBadges]
and a
@ -173,7 +173,7 @@ TrainerCard_Page2_Joypad: ; 25221 (9:5221)
ld [wJumptableIndex], a
ret
.Quit
.Quit:
ld a, $6
ld [wJumptableIndex], a
ret
@ -289,11 +289,11 @@ TrainerCard_Page1_PrintDexCaught_GameTime: ; 2530a (9:530a)
call ClearBox
ret
.Dex_PlayTime
.Dex_PlayTime:
db "#DEX"
next "PLAY TIME@@"
.Badges
.Badges:
db " BADGES▶@"
.StatusTilemap: ; 25366

4
engine/unown_puzzle.asm
View File

@ -321,7 +321,7 @@ UnownPuzzle_A: ; e1376
ld [wHoldingUnownPuzzlePiece], a
ret
.TryPlacePiece
.TryPlacePiece:
call UnownPuzzle_CheckCurrentTileOccupancy
and a
jr nz, UnownPuzzle_InvalidAction
@ -546,7 +546,7 @@ RedrawUnownPuzzlePieces: ; e14d9
ld hl, .OAM_HoldingPiece
jr .load
.NoPiece
.NoPiece:
ld hl, .OAM_NotHoldingPiece
.load

24
engine/wildmons.asm
View File

@ -103,7 +103,7 @@ endr
.SearchMapForMon: ; 2a088
inc hl
.ScanMapLoop
.ScanMapLoop:
push af
ld a, [wNamedObjectIndexBuffer]
cp [hl]
@ -128,7 +128,7 @@ endr
ld c, a
hlcoord 0, 0
ld de, SCREEN_WIDTH * SCREEN_HEIGHT
.AppendNestLoop
.AppendNestLoop:
ld a, [hli]
cp c
jr z, .found_nest
@ -459,7 +459,7 @@ _SwarmWildmonCheck
scf
ret
.CheckYanma
.CheckYanma:
push hl
ld hl, SwarmFlags
bit 3, [hl]
@ -611,7 +611,7 @@ endr
scf
ret
.DontEncounterRoamMon
.DontEncounterRoamMon:
pop hl
and a
ret
@ -631,7 +631,7 @@ UpdateRoamMons: ; 2a30d
ld a, c
ld [wRoamMon1MapNumber], a
.SkipRaikou
.SkipRaikou:
ld a, [wRoamMon2MapGroup]
cp GROUP_N_A
jr z, .SkipEntei
@ -644,7 +644,7 @@ UpdateRoamMons: ; 2a30d
ld a, c
ld [wRoamMon2MapNumber], a
.SkipEntei
.SkipEntei:
ld a, [wRoamMon3MapGroup]
cp GROUP_N_A
jr z, .SkipSuicune
@ -657,7 +657,7 @@ UpdateRoamMons: ; 2a30d
ld a, c
ld [wRoamMon3MapNumber], a
.SkipSuicune
.SkipSuicune:
jp _BackUpMapIndices
; 2a355
@ -729,7 +729,7 @@ JumpRoamMons: ; 2a394
ld [wRoamMon1MapGroup], a
ld a, c
ld [wRoamMon1MapNumber], a
.SkipRaikou
.SkipRaikou:
ld a, [wRoamMon2MapGroup]
cp GROUP_N_A
@ -739,7 +739,7 @@ JumpRoamMons: ; 2a394
ld [wRoamMon2MapGroup], a
ld a, c
ld [wRoamMon2MapNumber], a
.SkipEntei
.SkipEntei:
ld a, [wRoamMon3MapGroup]
cp GROUP_N_A
@ -749,7 +749,7 @@ JumpRoamMons: ; 2a394
ld [wRoamMon3MapGroup], a
ld a, c
ld [wRoamMon3MapNumber], a
.SkipSuicune
.SkipSuicune:
jp _BackUpMapIndices
@ -852,7 +852,7 @@ RandomPhoneRareWildMon: ; 2a4ab
call LookUpWildmonsForMapDE
jr nc, .done
.GetGrassmon
.GetGrassmon:
push hl
ld bc, 5 + 4 * 2 ; Location of the level of the 5th wild Pokemon in that map
add hl, bc
@ -908,7 +908,7 @@ endr
ld [ScriptVar], a
ret
.SawRareMonText
.SawRareMonText:
; I just saw some rare @ in @ . I'll call you if I see another rare #MON, OK?
text_jump UnknownText_0x1bd34b
db "@"

8
event/buena.asm
View File

@ -121,15 +121,15 @@ SpecialBuenaPrize: ; 8afd4
call PrintBlueCardBalance
jr .Purchase
.InsufficientBalance
.InsufficientBalance:
ld hl, .Text_NotEnoughPoints
jr .print
.BagFull
.BagFull:
ld hl, .Text_NoRoom
jr .print
.Purchase
.Purchase:
ld de, SFX_TRANSACTION
call PlaySFX
ld hl, .Text_HereYouGo
@ -160,7 +160,7 @@ SpecialBuenaPrize: ; 8afd4
db "@"
; 0x8b07c
.Text_HereYouGo ; Here you go!
.Text_HereYouGo: ; Here you go!
text_jump UnknownText_0x1c58d1
db "@"
; 0x8b081

14
event/celebi.asm
View File

@ -53,7 +53,7 @@ Special_CelebiShrineEvent: ; 4989a
ld hl, Sprites + 2
xor a
ld c, $4
.OAMloop
.OAMloop:
ld [hli], a
rept 3
inc hl
@ -171,7 +171,7 @@ UpdateCelebiPosition: ; 49aa2 (12:5aa2)
jr nc, .ShiftY
cp 8 * 8 + 4
jr nc, .ReinitSpriteAnimFrame
.ShiftY
.ShiftY:
pop af
push af
cp d
@ -203,7 +203,7 @@ UpdateCelebiPosition: ; 49aa2 (12:5aa2)
ld a, [hl]
add $1
ld [hl], a
.ReinitSpriteAnimFrame
.ReinitSpriteAnimFrame:
pop af
ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc
@ -306,22 +306,22 @@ GetCelebiSpriteTile: ; 49bae
jr .restart
.Frame1
.Frame1:
ld a, $84
jr .load_tile
.Frame2
.Frame2:
ld a, $88
jr .load_tile
.Frame3
.Frame3:
ld a, $8c
jr .load_tile
.Frame4
.Frame4:
ld a, $90
.load_tile

36
event/daycare.asm
View File

@ -37,7 +37,7 @@ Special_DayCareMan: ; 166d6
call DayCare_InitBreeding
ret
.AskWithdrawMon
.AskWithdrawMon:
callba GetBreedMon1LevelGrowth
ld hl, wBreedMon1Nick
call GetPriceToRetrieveBreedmon
@ -76,7 +76,7 @@ Special_DayCareLady: ; 1672a
call DayCare_InitBreeding
ret
.AskWithdrawMon
.AskWithdrawMon:
callba GetBreedMon2LevelGrowth
ld hl, wBreedMon2Nick
call GetPriceToRetrieveBreedmon
@ -144,27 +144,27 @@ DayCareAskDepositPokemon: ; 16798
and a
ret
.Declined
.Declined:
ld a, DAYCARETEXT_COME_AGAIN
scf
ret
.Egg
.Egg:
ld a, DAYCARETEXT_CANT_BREED_EGG
scf
ret
.OnlyOneMon
.OnlyOneMon:
ld a, DAYCARETEXT_LAST_MON
scf
ret
.OutOfUsableMons
.OutOfUsableMons:
ld a, DAYCARETEXT_LAST_ALIVE_MON
scf
ret
.HoldingMail
.HoldingMail:
ld a, DAYCARETEXT_REMOVE_MAIL
scf
ret
@ -227,7 +227,7 @@ DayCare_AskWithdrawBreedMon: ; 16807
scf
ret
.PartyFull
.PartyFull:
ld a, DAYCARETEXT_NOT_ENOUGH_MONEY
scf
ret
@ -460,16 +460,16 @@ Special_DayCareManOutside: ; 16936
ld hl, .TakeGoodCareOfItText
jr .Load0
.Declined
.Declined:
ld hl, .IllKeepItThanksText
.Load0
.Load0:
call PrintText
xor a
ld [ScriptVar], a
ret
.PartyFull
.PartyFull:
ld hl, .PartyFullText
call PrintText
ld a, $1
@ -575,7 +575,7 @@ DayCare_GiveEgg: ; 169ac
and a
ret
.PartyFull
.PartyFull:
scf
ret
; 16a31
@ -644,14 +644,14 @@ DayCare_InitBreeding: ; 16a3b
jr z, .LoadWhichBreedmonIsTheMother
inc a
.LoadWhichBreedmonIsTheMother
.LoadWhichBreedmonIsTheMother:
ld [wBreedMotherOrNonDitto], a
and a
ld a, [wBreedMon1Species]
jr z, .GotMother
ld a, [wBreedMon2Species]
.GotMother
.GotMother:
ld [CurPartySpecies], a
callab GetPreEvolution
callab GetPreEvolution
@ -666,7 +666,7 @@ DayCare_InitBreeding: ; 16a3b
ld a, NIDORAN_F
jr c, .GotEggSpecies
ld a, NIDORAN_M
.GotEggSpecies
.GotEggSpecies:
ld [CurPartySpecies], a
ld [CurSpecies], a
ld [wEggMonSpecies], a
@ -739,14 +739,14 @@ DayCare_InitBreeding: ; 16a3b
ld e, c
jr .GotDVs
.ParentCheck2
.ParentCheck2:
ld a, [wBreedMotherOrNonDitto]
and a
jr nz, .GotDVs
ld d, b
ld e, c
.GotDVs
.GotDVs:
ld a, [de]
inc de
and $f
@ -763,7 +763,7 @@ DayCare_InitBreeding: ; 16a3b
add b
ld [hl], a
.SkipDVs
.SkipDVs:
ld hl, StringBuffer1
ld de, wMonOrItemNameBuffer
ld bc, NAME_LENGTH

14
event/dratini.asm
View File

@ -13,7 +13,7 @@ SpecialDratini: ; 0x8b170
ld a, [bc]
ld c, a
ld de, PARTYMON_STRUCT_LENGTH
.CheckForDratini
.CheckForDratini:
; start at the end of the party and search backwards for a Dratini
ld a, [hl]
cp DRATINI
@ -28,7 +28,7 @@ SpecialDratini: ; 0x8b170
jr nz, .CheckForDratini
ret
.GiveMoveset
.GiveMoveset:
push hl
ld a, [ScriptVar]
ld hl, .Movesets
@ -41,7 +41,7 @@ rept 2
inc de
endr
.GiveMoves
.GiveMoves:
ld a, [hl]
and a ; is the move 00?
ret z ; if so, we're done here
@ -69,15 +69,15 @@ endr
inc hl
jr .GiveMoves
.Movesets
.Moveset0
.Movesets:
.Moveset0:
; Dratini does not normally learn Extremespeed. This is a special gift.
db WRAP
db THUNDER_WAVE
db TWISTER
db EXTREMESPEED
db 0
.Moveset1
.Moveset1:
; This is the normal moveset of a level 15 Dratini
db WRAP
db LEER
@ -107,7 +107,7 @@ endr
jr nz, .loop
ret
.EmptyParty
.EmptyParty:
scf
ret
; 8b1e1

8
event/halloffame.asm
View File

@ -310,7 +310,7 @@ _HallOfFamePC: ; 86650
call LoadFontsBattleExtra
xor a
ld [wJumptableIndex], a
.MasterLoop
.MasterLoop:
call LoadHOFTeam
ret c
call .DisplayTeam
@ -319,7 +319,7 @@ _HallOfFamePC: ; 86650
inc [hl]
jr .MasterLoop
.DisplayTeam
.DisplayTeam:
xor a
ld [wcf64], a
.next
@ -353,7 +353,7 @@ _HallOfFamePC: ; 86650
and a
ret
.DisplayMonAndStrings
.DisplayMonAndStrings:
; Print the number of times the player has entered the Hall of Fame.
; If that number is above 200, print "HOF Master!" instead.
ld a, [wcf64]
@ -616,7 +616,7 @@ HOF_AnimatePlayerPic: ; 86810
ret
; 868ed
.PlayTime
.PlayTime:
db "PLAY TIME@"
; 868f7

2
event/happiness_egg.asm
View File

@ -102,7 +102,7 @@ endr
ld [BattleMonHappiness], a
ret
.Actions
.Actions:
db +5, +3, +2 ; Gained a level
db +5, +3, +2 ; Vitamin
db +1, +1, +0 ; X Item

2
event/kurt.asm
View File

@ -315,7 +315,7 @@ Kurt_GiveUpSelectedQuantityOfSelectedApricorn: ; 88161
cp -1
jr nz, .loop2
.OnlyOne
.OnlyOne:
ld hl, wApricorns
.loop4
ld a, [hl]

12
event/magnet_train.asm
View File

@ -7,7 +7,7 @@ Special_MagnetTrain: ; 8cc04
lb de, (11 * 8) - (11 * 8 + 4), -$60
jr .continue
.ToGoldenrod
.ToGoldenrod:
ld a, -1 ; backwards
lb bc, -$40, -$60
lb de, (11 * 8) + (11 * 8 + 4), $60
@ -187,7 +187,7 @@ DrawMagnetTrain: ; 8cd27
ret
; 8cd65
.FillLine ; 8cd65
.FillLine: ; 8cd65
ld a, [de]
inc de
ld [hli], a
@ -196,7 +196,7 @@ DrawMagnetTrain: ; 8cd27
ret
; 8cd6c
.FillAlt ; 8cd6c
.FillAlt: ; 8cd6c
ld [hl], e
inc hl
ld [hl], d
@ -367,7 +367,7 @@ endr
ld [hl], a
ret
.PrepareToHoldTrain
.PrepareToHoldTrain:
call .Next
ld a, $80
ld [wcf66], a
@ -382,7 +382,7 @@ endr
dec [hl]
ret
.DoneWaiting
.DoneWaiting:
call .Next
ret
; 8ce7a
@ -414,7 +414,7 @@ endr
ret
.PrepareToFinishAnim
.PrepareToFinishAnim:
call .Next
ret
; 8cea2

28
event/mom.asm
View File

@ -72,7 +72,7 @@ endr
ld a, %10000001
jr .done_1
.DontSaveMoney
.DontSaveMoney:
ld a, %10000000
.done_1
@ -188,17 +188,17 @@ endr
ld a, $8
jr .done_4
.DontHaveThatMuchToDeposit
.DontHaveThatMuchToDeposit:
ld hl, UnknownText_0x1667b
call PrintText
ret
.CantDepositThatMuch
.CantDepositThatMuch:
ld hl, UnknownText_0x16680
call PrintText
ret
.CancelDeposit
.CancelDeposit:
ld a, $7
.done_4
@ -256,17 +256,17 @@ endr
ld a, $8
jr .done_5
.InsufficientFundsInBank
.InsufficientFundsInBank:
ld hl, UnknownText_0x16671
call PrintText
ret
.NotEnoughRoomInWallet
.NotEnoughRoomInWallet:
ld hl, UnknownText_0x16676
call PrintText
ret
.CancelWithdraw
.CancelWithdraw:
ld a, $7
.done_5
@ -287,7 +287,7 @@ endr
ld [wJumptableIndex], a
ret
.StopSavingMoney
.StopSavingMoney:
ld a, $80
ld [wMomSavingMoney], a
ld a, $7
@ -315,12 +315,12 @@ DSTChecks: ; 16439
jr z, .LostBooklet
jr .loop
.NotDST
.NotDST:
cp 23 ; within one hour of 23:00?
jr nz, .loop
; fallthrough
.LostBooklet
.LostBooklet:
call .ClearBox
bccoord 1, 14
ld hl, .Text_AdjustClock
@ -353,7 +353,7 @@ DSTChecks: ; 16439
call PlaceWholeStringInBoxAtOnce
ret
.SetDST
.SetDST:
ld hl, .Text_SwitchToDST
call PlaceWholeStringInBoxAtOnce
call YesNoBox
@ -375,7 +375,7 @@ DSTChecks: ; 16439
sub 24
jr nc, .DontLoopHourForward
add 24
.DontLoopHourForward
.DontLoopHourForward:
ld [StartHour], a
ccf
ld a, [StartDay]
@ -389,13 +389,13 @@ DSTChecks: ; 16439
sub 1
jr nc, .DontLoopHourBack
add 24
.DontLoopHourBack
.DontLoopHourBack:
ld [StartHour], a
ld a, [StartDay]
sbc 0
jr nc, .DontLoopDayBack
add 7
.DontLoopDayBack
.DontLoopDayBack:
ld [StartDay], a
ret
; 164ea

4
event/mom_phone.asm
View File

@ -103,7 +103,7 @@ CheckBalance_MomItem2: ; fd044
scf
ret
.AddMoney
.AddMoney:
ld de, MomItemTriggerBalance
ld bc, hMoneyTemp
callba AddMoney
@ -198,7 +198,7 @@ GetItemFromMom: ; fd117
.ok
ld de, MomItems_2
.GetFromList1
.GetFromList1:
ld l, a
ld h, 0
rept 3 ; multiply hl by 8

14
event/overworld.asm
View File

@ -529,7 +529,7 @@ CheckDirection: ; c9cb
scf
ret
.Directions
.Directions:
db FACE_DOWN
db FACE_UP
db FACE_LEFT
@ -605,7 +605,7 @@ FlyFunction: ; ca3b
ld [wFieldMoveSucceeded], a
ret
.Jumptable
.Jumptable:
dw .TryFly
dw .DoFly
dw .FailFly
@ -954,7 +954,7 @@ TeleportFunction: ; cc61
jr z, .CheckIfSpawnPoint
jr .nope
.CheckIfSpawnPoint
.CheckIfSpawnPoint:
ld a, [wLastSpawnMapGroup]
ld d, a
ld a, [wLastSpawnMapNumber]
@ -1708,7 +1708,7 @@ BikeFunction: ; d0b3
jr z, .GetOffBike
jr .CannotUseBike
.GetOnBike
.GetOnBike:
ld hl, Script_GetOnBike
ld de, Script_GetOnBike_Register
call .CheckIfRegistered
@ -1726,7 +1726,7 @@ BikeFunction: ; d0b3
ld a, $1
ret
.GetOffBike
.GetOffBike:
ld hl, BikeFlags
bit 1, [hl]
jr nz, .CantGetOffBike
@ -1736,11 +1736,11 @@ BikeFunction: ; d0b3
ld a, BANK(Script_GetOffBike)
jr .done
.CantGetOffBike
.CantGetOffBike:
ld hl, Script_CantGetOffBike
jr .done
.CannotUseBike
.CannotUseBike:
ld a, $0
ret

2
event/poke_seer.asm
View File

@ -248,7 +248,7 @@ GetCaughtLocation: ; 4f20a
and a
ret
.Unknown
.Unknown:
ld de, wSeerCaughtLocation
jp UnknownCaughtData

8
event/special.asm
View File

@ -60,7 +60,7 @@ SpecialGiveShuckle: ; 7305
ld [ScriptVar], a
ret
.NotGiven
.NotGiven:
xor a
ld [ScriptVar], a
ret
@ -96,7 +96,7 @@ SpecialReturnShuckle: ; 737e
ld hl, PartyMonOT
call SkipNames
ld de, SpecialShuckleOT
.CheckOT
.CheckOT:
ld a, [de]
cp [hl]
jr nz, .DontReturn
@ -121,7 +121,7 @@ SpecialReturnShuckle: ; 737e
ld [wPokemonWithdrawDepositParameter], a
callab RemoveMonFromPartyOrBox
ld a, $2
.HappyToStayWithYou
.HappyToStayWithYou:
ld [ScriptVar], a
ret
@ -130,7 +130,7 @@ SpecialReturnShuckle: ; 737e
ld [ScriptVar], a
ret
.DontReturn
.DontReturn:
xor a
ld [ScriptVar], a
ret

2
gfx/load_pics.asm
View File

@ -454,7 +454,7 @@ Function512ab: ; 512ab
call .Fill
ret
.Fill
.Fill:
ld [hli], a
dec c
jr nz, .Fill

62
home.asm
View File

@ -135,15 +135,15 @@ IsInJohto:: ; 2f17
ld c, a
call GetWorldMapLocation
.CheckRegion
.CheckRegion:
cp KANTO_LANDMARK
jr nc, .Kanto
.Johto
.Johto:
xor a
ret
.Kanto
.Kanto:
ld a, 1
ret
; 2f3e
@ -267,11 +267,11 @@ IsInArray:: ; 30e1
add hl, de
jr .loop
.NotInArray
.NotInArray:
and a
ret
.InArray
.InArray:
scf
ret
; 30f4
@ -497,7 +497,7 @@ CompareLong:: ; 31e4
scf
ret
.Diff
.Diff:
and a
ret
; 31f3
@ -574,7 +574,7 @@ LoadEDTile:: ; 323d
ret
; 3246
.LoadEDTile ; 3246
.LoadEDTile: ; 3246
ld a, [hBGMapMode]
push af
xor a
@ -613,7 +613,7 @@ LoadEDTile:: ; 323d
ret
; 327b
.StackPointerMagic ; 327b
.StackPointerMagic: ; 327b
; Copy all tiles to VBGMap
ld [hSPBuffer], sp
ld sp, hl
@ -668,7 +668,7 @@ SetPalettes:: ; 32f9
ld [rOBP1], a
ret
.SetPalettesForGameBoyColor
.SetPalettesForGameBoyColor:
push de
ld a, %11100100
call DmgToCgbBGPals
@ -828,7 +828,7 @@ GetName:: ; 33c3
ld d, h
jr .done
.NotPokeName
.NotPokeName:
ld a, [wNamedObjectTypeBuffer]
dec a
ld e, a
@ -963,9 +963,9 @@ GetItemName:: ; 3468
ld [wNamedObjectTypeBuffer], a
call GetName
jr .Copied
.TM
.TM:
call GetTMHMName
.Copied
.Copied:
ld de, StringBuffer1
pop bc
pop hl
@ -990,7 +990,7 @@ GetTMHMName:: ; 3487
ld bc, .HMTextEnd - .HMText
jr .asm_34a1
.TM
.TM:
ld hl, .TMText
ld bc, .TMTextEnd - .TMText
@ -1044,14 +1044,14 @@ GetTMHMName:: ; 3487
pop hl
ret
.TMText
.TMText:
db "TM"
.TMTextEnd
.TMTextEnd:
db "@"
.HMText
.HMText:
db "HM"
.HMTextEnd
.HMTextEnd:
db "@"
; 34df
@ -1060,7 +1060,7 @@ IsHM:: ; 34df
jr c, .NotHM
scf
ret
.NotHM
.NotHM:
and a
ret
; 34e7
@ -1070,7 +1070,7 @@ IsHMMove:: ; 34e7
ld de, 1
jp IsInArray
.HMMoves
.HMMoves:
db CUT
db FLY
db SURF
@ -1116,7 +1116,7 @@ ScrollingMenu:: ; 350c
ret
; 3524
.UpdatePalettes ; 3524
.UpdatePalettes: ; 3524
ld hl, VramState
bit 0, [hl]
jp nz, UpdateTimePals
@ -1176,7 +1176,7 @@ HandleStoneQueue:: ; 3567
ret
; 3574
.WarpAction ; 3574
.WarpAction: ; 3574
ld hl, OBJECT_MAP_OBJECT_INDEX
add hl, de
ld a, [hl]
@ -1202,7 +1202,7 @@ HandleStoneQueue:: ; 3567
ret
; 3599
.IsPersonOnWarp ; 3599
.IsPersonOnWarp: ; 3599
push de
ld hl, OBJECT_NEXT_MAP_X
@ -1269,7 +1269,7 @@ HandleStoneQueue:: ; 3567
ret
; 35de
.IsObjectInStoneTable ; 35de
.IsObjectInStoneTable: ; 35de
inc e
ld hl, CMDQUEUE_ADDR
add hl, bc
@ -1473,7 +1473,7 @@ FacingPlayerDistance:: ; 36ad
and a
ret
.CheckY
.CheckY:
ld a, [PlayerStandingMapY]
sub e
jr z, .NotFacing
@ -1486,12 +1486,12 @@ FacingPlayerDistance:: ; 36ad
ld e, OW_UP
jr .CheckFacing
.Above
.Above:
ld d, a
ld e, OW_DOWN
jr .CheckFacing
.CheckX
.CheckX:
ld a, [PlayerStandingMapX]
sub d
jr z, .NotFacing
@ -1504,18 +1504,18 @@ FacingPlayerDistance:: ; 36ad
ld e, OW_LEFT
jr .CheckFacing
.Left
.Left:
ld d, a
ld e, OW_RIGHT
.CheckFacing
.CheckFacing:
call GetSpriteDirection
cp e
jr nz, .NotFacing
scf
ret
.NotFacing
.NotFacing:
and a
ret
; 36f5
@ -1581,11 +1581,11 @@ IsAPokemon:: ; 3741
cp NUM_POKEMON + 1
jr c, .Pokemon
.NotAPokemon
.NotAPokemon:
scf
ret
.Pokemon
.Pokemon:
and a
ret
; 3750

4
home/copy.asm
View File

@ -246,7 +246,7 @@ Request2bpp:: ; eba
ld a, $6
ld [hTilesPerCycle], a
.NotMobile
.NotMobile:
ld a, e
ld [Requested2bppSource], a
ld a, d
@ -322,7 +322,7 @@ Request1bpp:: ; f1e
ld a, $6
ld [hTilesPerCycle], a
.NotMobile
.NotMobile:
ld a, e
ld [Requested1bppSource], a
ld a, d

10
home/copy2.asm
View File

@ -3,11 +3,11 @@ CopyBytes:: ; 0x3026
inc b ; we bail the moment b hits 0, so include the last run
inc c ; same thing; include last byte
jr .HandleLoop
.CopyByte
.CopyByte:
ld a, [hli]
ld [de], a
inc de
.HandleLoop
.HandleLoop:
dec c
jr nz, .CopyByte
dec b
@ -16,7 +16,7 @@ CopyBytes:: ; 0x3026
SwapBytes:: ; 0x3034
; swap bc bytes between hl and de
.Loop
.Loop:
; stash [hl] away on the stack
ld a, [hl]
push af
@ -42,9 +42,9 @@ ByteFill:: ; 0x3041
inc b ; we bail the moment b hits 0, so include the last run
inc c ; same thing; include last byte
jr .HandleLoop
.PutByte
.PutByte:
ld [hli], a
.HandleLoop
.HandleLoop:
dec c
jr nz, .PutByte
dec b

16
home/decompress.asm
View File

@ -79,7 +79,7 @@ LZ_LONG_HI EQU %00000011
ld a, d
ld [wLZAddress + 1], a
.Main
.Main:
ld a, [hl]
cp LZ_END
ret z
@ -145,7 +145,7 @@ LZ_LONG_HI EQU %00000011
jr z, .Zero
.Literal
.Literal:
; Read literal data for bc bytes.
.lloop
dec c
@ -160,7 +160,7 @@ LZ_LONG_HI EQU %00000011
jr .lloop
.Iter
.Iter:
; Write the same byte for bc bytes.
ld a, [hli]
@ -176,7 +176,7 @@ LZ_LONG_HI EQU %00000011
jr .iloop
.Alt
.Alt:
; Alternate two bytes for bc bytes.
dec c
jr nz, .anext1
@ -206,7 +206,7 @@ LZ_LONG_HI EQU %00000011
jr .Main
.Zero
.Zero:
; Write 0 for bc bytes.
xor a
@ -276,7 +276,7 @@ LZ_LONG_HI EQU %00000011
; For now, it defaults to LZ_REPEAT.
.Repeat
.Repeat:
; Copy decompressed data for bc bytes.
dec c
jr nz, .rnext
@ -290,7 +290,7 @@ LZ_LONG_HI EQU %00000011
jr .Repeat
.Flip
.Flip:
; Copy bitflipped decompressed data for bc bytes.
dec c
jr nz, .fnext
@ -316,7 +316,7 @@ LZ_LONG_HI EQU %00000011
jr .Flip
.Reverse
.Reverse:
; Copy reversed decompressed data for bc bytes.
dec c
jr nz, .rvnext

2
home/init.asm
View File

@ -71,7 +71,7 @@ Init:: ; 17d
; Clear WRAM bank 0
ld hl, wc000
ld bc, wd000 - wc000
.ByteFill
.ByteFill:
ld [hl], 0
inc hl
dec bc

34
home/map.asm
View File

@ -255,7 +255,7 @@ GetDestinationWarpNumber:: ; 2252
ret
; 2266
.GetDestinationWarpNumber ; 2266
.GetDestinationWarpNumber: ; 2266
ld a, [PlayerStandingMapY]
sub $4
ld e, a
@ -307,7 +307,7 @@ GetDestinationWarpNumber:: ; 2252
scf
ret
.IncreaseHLTwice
.IncreaseHLTwice:
inc hl
inc hl
scf
@ -327,7 +327,7 @@ CopyWarpData:: ; 22a7
ret
; 22b4
.CopyWarpData ; 22b4
.CopyWarpData: ; 22b4
push bc
ld hl, wCurrMapWarpHeaderPointer
ld a, [hli]
@ -815,7 +815,7 @@ FillMapConnections:: ; 2524
ld [hConnectedMapWidth], a
call FillNorthConnectionStrip
.South
.South:
ld a, [SouthConnectedMapGroup]
cp $ff
jr z, .West
@ -838,7 +838,7 @@ FillMapConnections:: ; 2524
ld [hConnectedMapWidth], a
call FillSouthConnectionStrip
.West
.West:
ld a, [WestConnectedMapGroup]
cp $ff
jr z, .East
@ -861,7 +861,7 @@ FillMapConnections:: ; 2524
ld [hConnectionStripLength], a
call FillWestConnectionStrip
.East
.East:
ld a, [EastConnectedMapGroup]
cp $ff
jr z, .Done
@ -884,7 +884,7 @@ FillMapConnections:: ; 2524
ld [hConnectionStripLength], a
call FillEastConnectionStrip
.Done
.Done:
ret
; 25d3
@ -1592,7 +1592,7 @@ GetMovementPermissions:: ; 2914
ret
; 2945
.MovementPermissionsData ; 2945
.MovementPermissionsData: ; 2945
db 1 << DOWN
db 1 << UP
db 1 << LEFT
@ -1603,7 +1603,7 @@ GetMovementPermissions:: ; 2914
db (1 << UP) | (1 << LEFT)
; 294d
.UpDown
.UpDown:
ld a, [PlayerStandingMapX]
ld d, a
ld a, [PlayerStandingMapY]
@ -1623,7 +1623,7 @@ GetMovementPermissions:: ; 2914
ret
; 296c
.LeftRight
.LeftRight:
ld a, [PlayerStandingMapX]
ld d, a
ld a, [PlayerStandingMapY]
@ -1643,7 +1643,7 @@ GetMovementPermissions:: ; 2914
ret
; 298b
.Down
.Down:
call .CheckHiNybble
ret nz
ld a, [TileDown]
@ -1662,7 +1662,7 @@ GetMovementPermissions:: ; 2914
ret
; 29a8
.Up
.Up:
call .CheckHiNybble
ret nz
ld a, [TileUp]
@ -1681,7 +1681,7 @@ GetMovementPermissions:: ; 2914
ret
; 29c5
.Right
.Right:
call .CheckHiNybble
ret nz
ld a, [TileRight]
@ -1700,7 +1700,7 @@ GetMovementPermissions:: ; 2914
ret
; 29e2
.Left
.Left:
call .CheckHiNybble
ret nz
ld a, [TileLeft]
@ -1719,7 +1719,7 @@ GetMovementPermissions:: ; 2914
ret
; 29ff
.CheckHiNybble
.CheckHiNybble:
and $f0
cp $b0
ret z
@ -1760,7 +1760,7 @@ GetFacingTileCoord:: ; 2a07
ld a, [hl]
ret
.Directions
.Directions:
; x, y
db 0, 1
dw TileDown
@ -1919,7 +1919,7 @@ CheckCurrentMapXYTriggers:: ; 2ad4
rst Bankswitch
ret
.TriggerCheck
.TriggerCheck:
; Checks to see if you are standing on an xy-trigger. If yes, copies the trigger to EngineBuffer1 and sets carry.
ld hl, wCurrentMapXYTriggerHeaderPointer
ld a, [hli]

6
home/map_objects.asm
View File

@ -276,7 +276,7 @@ CheckObjectTime:: ; 18f5
and a
ret
.TimeOfDayValues_191e
.TimeOfDayValues_191e:
db 1 << MORN ; 1
db 1 << DAY ; 2
db 1 << NITE ; 4
@ -351,7 +351,7 @@ ApplyDeletionToMapObject:: ; 1967
callba DeleteMapObject
ret
.CheckStopFollow
.CheckStopFollow:
ld hl, wObjectFollow_Leader
cp [hl]
jr z, .ok
@ -530,7 +530,7 @@ CopySpriteMovementData:: ; 1a61
ret
; 1a71
.CopyData ; 1a71
.CopyData: ; 1a71
ld hl, OBJECT_MOVEMENTTYPE
add hl, de
ld [hl], a

6
home/menu.asm
View File

@ -39,7 +39,7 @@ LoadMenuTextBox:: ; 1d58
ret
; 1d5f
.MenuDataHeader ; 1d5f
.MenuDataHeader: ; 1d5f
db $40 ; tile backup
db 12, 0 ; start coords
db 17, 19 ; end coords
@ -59,7 +59,7 @@ LoadStandardMenuDataHeader:: ; 1d6e
ret
; 1d75
.MenuDataHeader ; 1d75
.MenuDataHeader: ; 1d75
db $40 ; tile backup
db 0, 0 ; start coords
db 17, 19 ; end coords
@ -190,7 +190,7 @@ YesNoMenuDataHeader:: ; 1e1d
db 1 ; default option
; 1e25
.MenuData2 ; 1e25
.MenuData2: ; 1e25
db $c0 ; flags
db 2
db "YES@"

12
home/mobile.asm
View File

@ -221,7 +221,7 @@ MobileHome_PlaceBox: ; 3f47
push bc
call .FillTop
pop bc
.RowLoop
.RowLoop:
push bc
call .FillMiddle
pop bc
@ -231,28 +231,28 @@ MobileHome_PlaceBox: ; 3f47
ret
; 3f58
.FillTop
.FillTop:
ld a, $63
ld d, $62
ld e, $64
jr .FillRow
.FillBottom
.FillBottom:
ld a, $68
ld d, $67
ld e, $69
jr .FillRow
.FillMiddle
.FillMiddle:
ld a, $7f
ld d, $65
ld e, $66
.FillRow
.FillRow:
push hl
ld [hl], d
inc hl
.FillLoop
.FillLoop:
ld [hli], a
dec c
jr nz, .FillLoop

2
home/movement.asm
View File

@ -121,7 +121,7 @@ endr
ret
; 1ba5
.MovementData
.MovementData:
slow_step_down
slow_step_up
slow_step_left

2
home/predef.asm
View File

@ -33,7 +33,7 @@ Predef:: ; 2d83
ld l, a
ret
.Return
.Return:
; Clean up after the Predef call
ld a, h

2
home/serial.asm
View File

@ -366,7 +366,7 @@ LinkTransfer:: ; 8c1
ret
; 8f3
.Receive ; 8f3
.Receive: ; 8f3
ld a, [hSerialReceive]
ld [wOtherPlayerLinkMode], a
and $f0

18
home/text.asm
View File

@ -1153,7 +1153,7 @@ endr
pop hl
ret
.Days ; 15a2
.Days: ; 15a2
dw .Sun
dw .Mon
dw .Tues
@ -1162,12 +1162,12 @@ endr
dw .Fri
dw .Satur
.Sun db "SUN@"
.Mon db "MON@"
.Tues db "TUES@"
.Wednes db "WEDNES@"
.Thurs db "THURS@"
.Fri db "FRI@"
.Satur db "SATUR@"
.Day db "DAY@"
.Sun: db "SUN@"
.Mon: db "MON@"
.Tues: db "TUES@"
.Wednes: db "WEDNES@"
.Thurs: db "THURS@"
.Fri: db "FRI@"
.Satur: db "SATUR@"
.Day: db "DAY@"
; 15d8

2
home/time.asm
View File

@ -217,7 +217,7 @@ PanicResetClock:: ; 67e
ret
; 685
.ClearhRTC ; 685
.ClearhRTC: ; 685
xor a
ld [hRTCSeconds], a
ld [hRTCMinutes], a

2
home/vblank.asm
View File

@ -37,7 +37,7 @@ endr
reti
; 2a1
.VBlanks ; 2a1
.VBlanks: ; 2a1
dw VBlank0
dw VBlank1
dw VBlank2

4
home/video.asm
View File

@ -164,7 +164,7 @@ UpdateBGMap:: ; 164c
ret
.Attr
.Attr:
ld a, 1
ld [rVBK], a
@ -176,7 +176,7 @@ UpdateBGMap:: ; 164c
ret
.Tiles
.Tiles:
hlcoord 0, 0

2
home/window.asm
View File

@ -31,7 +31,7 @@ CloseText:: ; 2dcf
ret
; 2de2
.CloseText ; 2de2
.CloseText: ; 2de2
call ClearWindowData
xor a
ld [hBGMapMode], a

36
items/item_effects.asm
View File

@ -504,7 +504,7 @@ endr
ld de, EnemyMonPP
ld bc, NUM_MOVES
call CopyBytes
.Transformed
.Transformed:
ld a, [EnemyMonSpecies]
ld [wWildMon], a
@ -580,7 +580,7 @@ endr
ld a, FRIEND_BALL_HAPPINESS
ld [hl], a
.SkipPartyMonFriendBall
.SkipPartyMonFriendBall:
ld hl, Text_AskNicknameNewlyCaughtMon
call PrintText
@ -617,7 +617,7 @@ endr
jp .return_from_capture
.SendToPC
.SendToPC:
call ClearSprites
predef SentPkmnIntoBox
@ -632,14 +632,14 @@ endr
jr nz, .BoxNotFullYet
ld hl, wBattleResult
set 7, [hl]
.BoxNotFullYet
.BoxNotFullYet:
ld a, [CurItem]
cp FRIEND_BALL
jr nz, .SkipBoxMonFriendBall
; Bug: overwrites the happiness of the first mon in the box!
ld a, FRIEND_BALL_HAPPINESS
ld [sBoxMon1Happiness], a
.SkipBoxMonFriendBall
.SkipBoxMonFriendBall:
call CloseSRAM
ld hl, Text_AskNicknameNewlyCaughtMon
@ -674,7 +674,7 @@ endr
call CloseSRAM
.SkipBoxMonNickname
.SkipBoxMonNickname:
ld a, BANK(sBoxMonNicknames)
call GetSRAMBank
@ -696,7 +696,7 @@ endr
callba BugContest_SetCaughtContestMon
jr .return_from_capture
.FinishTutorial
.FinishTutorial:
ld hl, Text_GotchaMonWasCaught
.shake_and_break_free
@ -782,7 +782,7 @@ GetPokedexEntryBank:
pop hl
ret
.PokedexEntryBanks
.PokedexEntryBanks:
GLOBAL PokedexEntries1
GLOBAL PokedexEntries2
@ -811,7 +811,7 @@ endr
ld a, BANK(PokedexDataPointerTable)
call GetFarHalfword
.SkipText
.SkipText:
call GetPokedexEntryBank
call GetFarByte
inc hl
@ -890,7 +890,7 @@ endr
ld b, $1
ret
.WeightsTable
.WeightsTable:
; weight factor, boost
db 2048 >> 8, 0
db 3072 >> 8, 20
@ -1217,10 +1217,10 @@ SunStone: ; ee0f
jp UseDisposableItem
.NoEffect
.NoEffect:
call WontHaveAnyEffectMessage
.DecidedNotToUse
.DecidedNotToUse:
xor a
ld [wItemEffectSucceeded], a
ret
@ -1717,7 +1717,7 @@ FullRestore: ; f128
jp FullyHealStatus
.NotAtFullHealth
.NotAtFullHealth:
call .FullRestore
jp StatusHealer_Jumptable
; f144
@ -2132,7 +2132,7 @@ rept 2
endr
jr .next
.NotFound
.NotFound:
scf
.done
ld e, [hl]
@ -2413,7 +2413,7 @@ PokeFlute: ; f50c
jp PrintText
.CureSleep
.CureSleep:
ld de, PARTYMON_STRUCT_LENGTH
ld c, PARTY_LENGTH
@ -2581,7 +2581,7 @@ Mysteryberry: ; f5bf
cp 3 << 6 ; have 3 PP Ups already been used?
jr c, .do_ppup
.CantUsePPUpOnSketch
.CantUsePPUpOnSketch:
.pp_is_maxed_out
ld hl, TextJump_PPIsMaxedOut
call PrintText
@ -2624,7 +2624,7 @@ BattleRestorePP: ; f652
call PrintText
jr FinishPPRestore
.UpdateBattleMonPP
.UpdateBattleMonPP:
ld a, [CurPartyMon]
ld hl, PartyMon1Moves
ld bc, PARTYMON_STRUCT_LENGTH
@ -3184,7 +3184,7 @@ ComputeMaxPP: ; f881
dec c
jr nz, .loop
.NoPPUp
.NoPPUp:
ld [hl], b
pop bc
ret

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