thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-08 04:01:36 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use macros for predef calls/jumps instead of static ids.

Browse source
This commit is contained in:
yenatch 2014-06-16 13:57:26 -07:00
parent d10108a066
commit b36f793667
122 changed files with 360 additions and 719 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
engine/battle/1.asm
View file

@ -76,12 +76,9 @@ Func_7861: ; 7861 (1:7861)
xor a xor a
.asm_78aa .asm_78aa
ld [wListMenuID], a ; wListMenuID ld [wListMenuID], a ; wListMenuID
ld a, $48 predef UpdateHPBar2
call Predef predef Func_3cd60
ld a, $0 predef Func_3cdec
call Predef
ld a, $49
call Predef
callab ReadPlayerMonCurHPAndStatus callab ReadPlayerMonCurHPAndStatus
ld hl, SuckedHealthText ; $78dc ld hl, SuckedHealthText ; $78dc
ld a, [H_WHOSETURN] ; $fff3 ld a, [H_WHOSETURN] ; $fff3

15
engine/battle/15.asm
View file

@ -17,8 +17,7 @@ Func_5525f: ; 5525f (15:525f)
ld a, [wWhichPokemon] ld a, [wWhichPokemon]
ld c, a ld c, a
ld b, $2 ld b, $2
ld a, $10 ; FlagActionPredef predef FlagActionPredef
call Predef
ld a, c ld a, c
and a and a
pop hl pop hl
@ -245,14 +244,12 @@ Func_5525f: ; 5525f (15:525f)
ld [wcc49], a ld [wcc49], a
ld a, [wd0b5] ld a, [wd0b5]
ld [wd11e], a ld [wd11e], a
ld a, $1a predef Func_3af5b
call Predef
ld hl, wccd3 ld hl, wccd3
ld a, [wWhichPokemon] ; wWhichPokemon ld a, [wWhichPokemon] ; wWhichPokemon
ld c, a ld c, a
ld b, $1 ld b, $1
ld a, $10 ; FlagActionPredef predef FlagActionPredef
call Predef
pop hl pop hl
pop af pop af
ld [W_CURENEMYLVL], a ; W_CURENEMYLVL ld [W_CURENEMYLVL], a ; W_CURENEMYLVL
@ -277,14 +274,12 @@ Func_55436: ; 55436 (15:5436)
ld c, a ld c, a
ld b, $1 ld b, $1
push bc push bc
ld a, $10 ; FlagActionPredef predef FlagActionPredef
call Predef
ld hl, wccf5 ld hl, wccf5
xor a xor a
ld [hl], a ld [hl], a
pop bc pop bc
ld a, $10 ; FlagActionPredef predef_jump FlagActionPredef
jp Predef
Func_5546c: ; 5546c (15:546c) Func_5546c: ; 5546c (15:546c)
ld a, [wPartyAliveFlags] ld a, [wPartyAliveFlags]

3
engine/battle/4.asm
View file

@ -43,8 +43,7 @@ asm_128fb: ; 128fb (4:68fb)
ld d, a ld d, a
ld a, [wcfbb] ld a, [wcfbb]
ld e, a ld e, a
ld a, $26 predef HPBarLength
call Predef
ld a, $6 ld a, $6
ld d, a ld d, a
ld c, a ld c, a

9
engine/battle/4_2.asm
View file

@ -36,15 +36,13 @@ Func_137aa: ; 137aa (4:77aa)
jr z, .asm_1380a jr z, .asm_1380a
ld de, wPlayerMoney + 2 ; wd349 ld de, wPlayerMoney + 2 ; wd349
ld c, $3 ld c, $3
ld a, $b ; AddBCDPredef predef AddBCDPredef
call Predef
ld hl, PickUpPayDayMoneyText ld hl, PickUpPayDayMoneyText
call PrintText call PrintText
.asm_1380a .asm_1380a
xor a xor a
ld [wccd4], a ld [wccd4], a
ld a, $2a predef Func_3ad1c
call Predef
.asm_13813 .asm_13813
xor a xor a
ld [wd083], a ld [wd083], a
@ -263,8 +261,7 @@ RecoilEffect_: ; 1392c (4:792c)
xor a xor a
.asm_13990 .asm_13990
ld [wListMenuID], a ; wListMenuID ld [wListMenuID], a ; wListMenuID
ld a, $48 predef UpdateHPBar2
call Predef
ld hl, HitWithRecoilText ; $799e ld hl, HitWithRecoilText ; $799e
jp PrintText jp PrintText
HitWithRecoilText: ; 1399e (4:799e) HitWithRecoilText: ; 1399e (4:799e)

15
engine/battle/animations.asm
View file

@ -831,11 +831,9 @@ DoRockSlideSpecialEffects: ; 78fd9 (1e:4fd9)
; if the subaninmation counter is between 8 and 11, shake the screen horizontally and vertically ; if the subaninmation counter is between 8 and 11, shake the screen horizontally and vertically
.shakeScreen .shakeScreen
ld b,1 ld b,1
ld a,$24 predef Func_48125 ; shake horizontally
call Predef ; shake horizontally
ld b,1 ld b,1
ld a,$21 predef_jump Func_480ff ; shake vertically
jp Predef ; shake vertically
FlashScreenEveryEightFrameBlocks: ; 78ff7 (1e:4ff7) FlashScreenEveryEightFrameBlocks: ; 78ff7 (1e:4ff7)
ld a,[W_SUBANIMCOUNTER] ld a,[W_SUBANIMCOUNTER]
@ -1227,16 +1225,14 @@ Func_791fc: ; 791fc (1e:51fc)
ld b, $5 ld b, $5
Func_79209: ; 79209 (1e:5209) Func_79209: ; 79209 (1e:5209)
ld a, $21 predef_jump Func_480ff
jp Predef
AnimationShakeScreen: ; 7920e (1e:520e) AnimationShakeScreen: ; 7920e (1e:520e)
; Shakes the screen for a while. Used in Earthquake/Fissure/etc. animations. ; Shakes the screen for a while. Used in Earthquake/Fissure/etc. animations.
ld b, $8 ld b, $8
Func_79210: ; 79210 (1e:5210) Func_79210: ; 79210 (1e:5210)
ld a, $24 predef_jump Func_48125
jp Predef
AnimationWaterDropletsEverywhere: ; 79215 (1e:5215) AnimationWaterDropletsEverywhere: ; 79215 (1e:5215)
; Draws water droplets all over the screen and makes them ; Draws water droplets all over the screen and makes them
@ -2143,8 +2139,7 @@ Func_79793: ; 79793 (1e:5793)
ld [wBattleMonSpecies2], a ld [wBattleMonSpecies2], a
ld [wd0b5], a ld [wd0b5], a
call GetMonHeader call GetMonHeader
ld a, $4 predef LoadMonBackPic
call Predef
xor a xor a
call Func_79842 call Func_79842
call Func_79820 call Func_79820

3
engine/battle/b_2.asm
View file

@ -120,8 +120,7 @@ PayDayEffect_ ; 2feb8 (b:7eb8)
ld [hl], a ld [hl], a
ld de, wcce7 ld de, wcce7
ld c, $3 ld c, $3
ld a, $b ; AddBCDPredef predef AddBCDPredef
call Predef
ld hl, CoinsScatteredText ; $7f04 ld hl, CoinsScatteredText ; $7f04
jp PrintText jp PrintText

111
engine/battle/core.asm
View file

@ -173,8 +173,7 @@ Func_3c04c: ; 3c04c (f:404c)
ld [$ffe1], a ld [$ffe1], a
FuncCoord 1, 5 FuncCoord 1, 5
ld hl, Coord ld hl, Coord
ld a, $1 predef Func_3f0c6
call Predef
xor a xor a
ld [$ffb0], a ld [$ffb0], a
ld [rWY], a ; $ff4a ld [rWY], a ; $ff4a
@ -320,12 +319,10 @@ Func_3c1ad: ; 3c1ad (f:41ad)
ld b, $1 ld b, $1
push bc push bc
ld hl, wPartyAliveFlags ld hl, wPartyAliveFlags
ld a, $10 ; FlagActionPredef predef FlagActionPredef
call Predef
ld hl, wccf5 ld hl, wccf5
pop bc pop bc
ld a, $10 ; FlagActionPredef predef FlagActionPredef
call Predef
call Func_3cba6 call Func_3cba6
call LoadScreenTilesFromBuffer1 call LoadScreenTilesFromBuffer1
call Func_3cc91 call Func_3cc91
@ -751,8 +748,7 @@ UpdateCurMonHPBar: ; 3c4f6 (f:44f6)
.playersTurn .playersTurn
push bc push bc
ld [wListMenuID], a ; wListMenuID ld [wListMenuID], a ; wListMenuID
ld a, $48 predef UpdateHPBar2
call Predef
pop bc pop bc
ret ret
@ -996,8 +992,7 @@ TrainerBattleVictory: ; 3c696 (f:4696)
ld de, wPlayerMoney + 2 ; wd349 ld de, wPlayerMoney + 2 ; wd349
ld hl, wd07b ld hl, wd07b
ld c, $3 ld c, $3
ld a, $b ; AddBCDPredef predef_jump AddBCDPredef
jp Predef
MoneyForWinningText: ; 3c6e4 (f:46e4) MoneyForWinningText: ; 3c6e4 (f:46e4)
TX_FAR _MoneyForWinningText TX_FAR _MoneyForWinningText
@ -1053,8 +1048,7 @@ Func_3c741: ; 3c741 (f:4741)
ld c, a ld c, a
ld hl, wPartyAliveFlags ; clear fainted mon's alive flag ld hl, wPartyAliveFlags ; clear fainted mon's alive flag
ld b, $0 ld b, $0
ld a, $10 ; FlagActionPredef predef FlagActionPredef
call Predef
ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1 ld hl, W_ENEMYBATTSTATUS1 ; W_ENEMYBATTSTATUS1
res 2, [hl] ; reset "attacking multiple times" flag res 2, [hl] ; reset "attacking multiple times" flag
ld a, [wd083] ld a, [wd083]
@ -1153,12 +1147,10 @@ Func_3c7d8: ; 3c7d8 (f:47d8)
ld hl, wPartyAliveFlags ld hl, wPartyAliveFlags
ld b, $1 ld b, $1
push bc push bc
ld a, $10 ; FlagActionPredef predef FlagActionPredef
call Predef
pop bc pop bc
ld hl, wccf5 ld hl, wccf5
ld a, $10 ; FlagActionPredef predef FlagActionPredef
call Predef
call Func_3cba6 call Func_3cba6
call GBPalWhiteOut call GBPalWhiteOut
call Func_3ee5b call Func_3ee5b
@ -1317,14 +1309,12 @@ EnemySendOut: ; 3c90e (f:490e)
ld c,a ld c,a
ld b,1 ld b,1
push bc push bc
ld a,$10 predef FlagActionPredef
call Predef
ld hl,wccf5 ld hl,wccf5
xor a xor a
ld [hl],a ld [hl],a
pop bc pop bc
ld a,$10 predef FlagActionPredef
call Predef
Func_3c92a: ; 3c92a (f:492a) Func_3c92a: ; 3c92a (f:492a)
xor a xor a
ld hl,wd065 ld hl,wd065
@ -1468,8 +1458,7 @@ Func_3c92a: ; 3c92a (f:492a)
ld [$FFE1],a ld [$FFE1],a
FuncCoord 15, 6 FuncCoord 15, 6
ld hl,Coord ld hl,Coord
ld a,2 predef Func_3f073
call Predef
ld a,[wEnemyMonSpecies2] ld a,[wEnemyMonSpecies2]
call PlayCry call PlayCry
call Func_3cdec call Func_3cdec
@ -1759,8 +1748,7 @@ Func_3cc91: ; 3cc91 (f:4c91)
Func_3cca4: ; 3cca4 (f:4ca4) Func_3cca4: ; 3cca4 (f:4ca4)
call Func_3cd60 call Func_3cd60
ld a, $4 predef LoadMonBackPic
call Predef
xor a xor a
ld [$ffe1], a ld [$ffe1], a
ld hl, wcc2d ld hl, wcc2d
@ -1791,8 +1779,7 @@ Func_3cca4: ; 3cca4 (f:4ca4)
call PlayMoveAnimation call PlayMoveAnimation
FuncCoord 4, 11 FuncCoord 4, 11
ld hl, Coord ld hl, Coord
ld a, $2 predef Func_3f073
call Predef
ld a, [wcf91] ld a, [wcf91]
call PlayCry call PlayCry
call Func_3ee94 call Func_3ee94
@ -1809,8 +1796,7 @@ Func_3ccfa: ; 3ccfa (f:4cfa)
xor a xor a
ld [wcd6c], a ld [wcd6c], a
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
ld a, $5 predef Func_79aba
call Predef
ld c, $4 ld c, $4
call DelayFrames call DelayFrames
call Func_3cd3a call Func_3cd3a
@ -1821,8 +1807,7 @@ Func_3ccfa: ; 3ccfa (f:4cfa)
ld [wcd6c], a ld [wcd6c], a
xor a xor a
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
ld a, $5 predef Func_79aba
call Predef
call Delay3 call Delay3
call Func_3cd3a call Func_3cd3a
ld a, $4c ld a, $4c
@ -1889,8 +1874,7 @@ Func_3cd60: ; 3cd60 (f:4d60)
ld [wcf91], a ld [wcf91], a
FuncCoord 10, 9 FuncCoord 10, 9
ld hl, Coord ld hl, Coord
ld a, $5f predef DrawHP
call Predef
ld a, $1 ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
ld hl, wcf1d ld hl, wcf1d
@ -2384,10 +2368,8 @@ Func_3d119: ; 3d119 (f:5119)
ld [wcc49], a ld [wcc49], a
ld hl, wPartyMon1Species ; wPartyMon1Species (aliases: wPartyMon1) ld hl, wPartyMon1Species ; wPartyMon1Species (aliases: wPartyMon1)
call ClearSprites call ClearSprites
ld a, $36 predef StatusScreen
call Predef predef StatusScreen2
ld a, $37
call Predef
ld a, [W_ENEMYBATTSTATUS2] ; W_ENEMYBATTSTATUS2 ld a, [W_ENEMYBATTSTATUS2] ; W_ENEMYBATTSTATUS2
bit 4, a bit 4, a
ld hl, AnimationSubstitute ld hl, AnimationSubstitute
@ -2440,12 +2422,10 @@ Func_3d1ba: ; 3d1ba (f:51ba)
ld b, $1 ld b, $1
push bc push bc
ld hl, wPartyAliveFlags ld hl, wPartyAliveFlags
ld a, $10 ; FlagActionPredef predef FlagActionPredef
call Predef
pop bc pop bc
ld hl, wccf5 ld hl, wccf5
ld a, $10 ; FlagActionPredef predef FlagActionPredef
call Predef
call Func_3cba6 call Func_3cba6
call Func_3cc91 call Func_3cc91
call SaveScreenTilesToBuffer1 call SaveScreenTilesToBuffer1
@ -2922,8 +2902,7 @@ Func_3d4b6: ; 3d4b6 (f:54b6)
call GetCurrentMove call GetCurrentMove
FuncCoord 2, 10 FuncCoord 2, 10
ld hl, Coord ld hl, Coord
ld a, $5d predef Func_27d98
call Predef
.asm_3d54e .asm_3d54e
ld a, $1 ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@ -3872,8 +3851,7 @@ PrintMoveFailureText: ; 3dbe2 (f:5be2)
ld hl, KeptGoingAndCrashedText ; $5c47 ld hl, KeptGoingAndCrashedText ; $5c47
call PrintText call PrintText
ld b, $4 ld b, $4
ld a, $24 predef Func_48125
call Predef
ld a, [H_WHOSETURN] ; $fff3 ld a, [H_WHOSETURN] ; $fff3
and a and a
jr nz, .asm_3dc3f jr nz, .asm_3dc3f
@ -4799,8 +4777,7 @@ ApplyDamageToEnemyPokemon: ; 3e142 (f:6142)
ld hl,Coord ld hl,Coord
xor a xor a
ld [wListMenuID],a ld [wListMenuID],a
ld a,$48 predef UpdateHPBar2 ; animate the HP bar shortening
call Predef ; animate the HP bar shortening
ApplyAttackToEnemyPokemonDone: ; 3e19d (f:619d) ApplyAttackToEnemyPokemonDone: ; 3e19d (f:619d)
jp Func_3cd5a ; redraw pokemon names and HP bars jp Func_3cd5a ; redraw pokemon names and HP bars
@ -4919,8 +4896,7 @@ ApplyDamageToPlayerPokemon: ; 3e200 (f:6200)
ld hl,Coord ld hl,Coord
ld a,$01 ld a,$01
ld [wListMenuID],a ld [wListMenuID],a
ld a,$48 predef UpdateHPBar2 ; animate the HP bar shortening
call Predef ; animate the HP bar shortening
ApplyAttackToPlayerPokemonDone ApplyAttackToPlayerPokemonDone
jp Func_3cd5a ; redraw pokemon names and HP bars jp Func_3cd5a ; redraw pokemon names and HP bars
@ -6147,13 +6123,11 @@ Func_3eb01: ; 3eb01 (f:6b01)
dec de dec de
xor a xor a
ld [wHPBarMaxHP], a ld [wHPBarMaxHP], a
ld a, $3e predef WriteMonMoves
call Predef
.asm_3ebca .asm_3ebca
ld hl, wEnemyMonMoves ld hl, wEnemyMonMoves
ld de, wEnemyMonSpecial + 1 ld de, wEnemyMonSpecial + 1
ld a, $5e predef LoadMovePPs
call Predef
ld hl, W_MONHBASESTATS ld hl, W_MONHBASESTATS
ld de, wd002 ld de, wd002
ld b, $5 ld b, $5
@ -6178,15 +6152,13 @@ Func_3eb01: ; 3eb01 (f:6b01)
call CopyData call CopyData
ld a, [wEnemyMonSpecies2] ld a, [wEnemyMonSpecies2]
ld [wd11e], a ld [wd11e], a
ld a, $3a predef IndexToPokedex
call Predef
ld a, [wd11e] ld a, [wd11e]
dec a dec a
ld c, a ld c, a
ld b, $1 ld b, $1
ld hl, wPokedexSeen ; wd30a ld hl, wPokedexSeen ; wd30a
ld a, $10 ; FlagActionPredef predef FlagActionPredef
call Predef
ld hl, wEnemyMonLevel ; wEnemyMonLevel ld hl, wEnemyMonLevel ; wEnemyMonLevel
ld de, wcd23 ld de, wcd23
ld bc, $b ld bc, $b
@ -6212,8 +6184,7 @@ Func_3ec32: ; 3ec32 (f:6c32)
call ClearScreen call ClearScreen
.asm_3ec4d .asm_3ec4d
call DelayFrame call DelayFrame
ld a, $30 predef BattleTransition
call Predef
callab Func_3ee58 callab Func_3ee58
ld a, $1 ld a, $1
ld [H_AUTOBGTRANSFERENABLED], a ; $ffba ld [H_AUTOBGTRANSFERENABLED], a ; $ffba
@ -6255,8 +6226,7 @@ Func_3ec92: ; 3ec92 (f:6c92)
.asm_3ec9e .asm_3ec9e
ld a, BANK(RedPicBack) ld a, BANK(RedPicBack)
call UncompressSpriteFromDE call UncompressSpriteFromDE
ld a, $3 predef ScaleSpriteByTwo
call Predef
ld hl, wOAMBuffer ld hl, wOAMBuffer
xor a xor a
ld [H_DOWNARROWBLINKCNT1], a ; $ff8b ld [H_DOWNARROWBLINKCNT1], a ; $ff8b
@ -6306,8 +6276,7 @@ Func_3ec92: ; 3ec92 (f:6c92)
ld [$ffe1], a ld [$ffe1], a
FuncCoord 1, 5 FuncCoord 1, 5
ld hl, Coord ld hl, Coord
ld a, $1 predef_jump Func_3f0c6
jp Predef
Func_3ed02: ; 3ed02 (f:6d02) Func_3ed02: ; 3ed02 (f:6d02)
callab Func_39680 callab Func_39680
@ -6709,8 +6678,7 @@ asm_3ef3d: ; 3ef3d (f:6f3d)
ld [wAICount], a ; wccdf ld [wAICount], a ; wccdf
FuncCoord 12, 0 FuncCoord 12, 0
ld hl, Coord ld hl, Coord
ld a, $1 predef Func_3f0c6
call Predef
ld a, $ff ld a, $ff
ld [wEnemyMonPartyPos], a ld [wEnemyMonPartyPos], a
ld a, $2 ld a, $2
@ -6765,8 +6733,7 @@ InitWildBattle: ; 3ef8b (f:6f8b)
ld [$ffe1], a ld [$ffe1], a
FuncCoord 12, 0 FuncCoord 12, 0
ld hl, Coord ld hl, Coord
ld a, $1 predef Func_3f0c6
call Predef
Func_3efeb: ; 3efeb (f:6feb) Func_3efeb: ; 3efeb (f:6feb)
ld b, $0 ld b, $0
@ -6855,8 +6822,7 @@ Func_3f073: ; 3f073 (f:7073)
ld a, $1 ld a, $1
ld [wcd6c], a ld [wcd6c], a
ld bc, $303 ld bc, $303
ld a, $5 predef Func_79aba
call Predef
ld c, $4 ld c, $4
call DelayFrames call DelayFrames
ld bc, $ffd7 ld bc, $ffd7
@ -6864,8 +6830,7 @@ Func_3f073: ; 3f073 (f:7073)
xor a xor a
ld [wcd6c], a ld [wcd6c], a
ld bc, $505 ld bc, $505
ld a, $5 predef Func_79aba
call Predef
ld c, $5 ld c, $5
call DelayFrames call DelayFrames
ld bc, $ffd7 ld bc, $ffd7
@ -6942,8 +6907,7 @@ LoadMonBackPic:
call ClearScreenArea call ClearScreenArea
ld hl, W_MONHBACKSPRITE - W_MONHEADER ld hl, W_MONHBACKSPRITE - W_MONHEADER
call UncompressMonSprite call UncompressMonSprite
ld a, $3 predef ScaleSpriteByTwo
call Predef
ld de, vBackPic ld de, vBackPic
call InterlaceMergeSpriteBuffers ; combine the two buffers to a single 2bpp sprite call InterlaceMergeSpriteBuffers ; combine the two buffers to a single 2bpp sprite
ld hl, vSprites ld hl, vSprites
@ -8546,8 +8510,7 @@ Func_3fbbc: ; 3fbbc (f:7bbc)
push hl push hl
push de push de
push bc push bc
ld a, $8 predef MoveAnimation
call Predef
pop bc pop bc
pop de pop de
pop hl pop hl

6
engine/battle/e.asm
View file

@ -855,8 +855,7 @@ ReadTrainer: ; 39c53 (e:5c53)
ld hl,wd047 ld hl,wd047
ld c,2 ld c,2
push bc push bc
ld a,$B predef AddBCDPredef
call Predef
pop bc pop bc
inc de inc de
inc de inc de
@ -1178,8 +1177,7 @@ Func_3a718: ; 3a718 (e:6718)
ld hl,Coord ld hl,Coord
xor a xor a
ld [wListMenuID],a ld [wListMenuID],a
ld a,$48 predef UpdateHPBar2
call Predef
jp DecrementAICount jp DecrementAICount
Func_3a72a: ; 3a72a (e:672a) Func_3a72a: ; 3a72a (e:672a)

3
engine/battle/e_2.asm
View file

@ -94,8 +94,7 @@ HealEffect_: ; 3b9ec (e:79ec)
xor a xor a
.asm_3ba83 .asm_3ba83
ld [wListMenuID], a ; wListMenuID ld [wListMenuID], a ; wListMenuID
ld a, $48 predef UpdateHPBar2
call Predef
ld hl, Func_3cd5a ; $4d5a ld hl, Func_3cd5a ; $4d5a
call BankswitchEtoF call BankswitchEtoF
ld hl, RegainedHealthText ; $7aac ld hl, RegainedHealthText ; $7aac

24
engine/cable_club.asm
View file

@ -273,10 +273,8 @@ Func_5345: ; 5345
call Delay3 call Delay3
ld hl, W_OPTIONS ; W_OPTIONS ld hl, W_OPTIONS ; W_OPTIONS
res 7, [hl] res 7, [hl]
ld a, $2c predef InitOpponent
call Predef predef HealParty
ld a, $7
call Predef
jp Func_577d jp Func_577d
.asm_5506 .asm_5506
ld c, BANK(Music_GameCorner) ld c, BANK(Music_GameCorner)
@ -610,10 +608,8 @@ Func_57c7:
Func_57d6: Func_57d6:
ld a, [wCurrentMenuItem] ld a, [wCurrentMenuItem]
ld [wWhichPokemon], a ld [wWhichPokemon], a
ld a, $36 predef StatusScreen
call Predef predef StatusScreen2
ld a, $37
call Predef
call GBPalNormal call GBPalNormal
call LoadTrainerInfoTextBoxTiles call LoadTrainerInfoTextBoxTiles
call Func_57f2 call Func_57f2
@ -827,12 +823,10 @@ TradeCenter_Trade:
ld a, [$ffaa] ld a, [$ffaa]
cp $1 cp $1
jr z, .asm_59d9 ; 0x59d0 $7 jr z, .asm_59d9 ; 0x59d0 $7
ld a, $38 predef Func_410e2
call Predef
jr .asm_59de ; 0x59d7 $5 jr .asm_59de ; 0x59d7 $5
.asm_59d9 .asm_59d9
ld a, $2f predef Func_410f3
call Predef
.asm_59de .asm_59de
callab Func_3ad0e callab Func_3ad0e
call ClearScreen call ClearScreen
@ -847,8 +841,7 @@ TradeCenter_Trade:
ld hl, wTileMap + $119 ld hl, wTileMap + $119
ld de, TradeCompleted ld de, TradeCompleted
call PlaceString call PlaceString
ld a, $50 predef SaveSAVtoSRAM2
call Predef
ld c, $32 ld c, $32
call DelayFrames call DelayFrames
xor a xor a
@ -885,8 +878,7 @@ Func_5a5f: ; 5a5f (1:5a5f)
jr z, .asm_5a75 jr z, .asm_5a75
cp $5 cp $5
ret nz ret nz
ld a, $4d predef Func_5aaf
call Predef
jp Init jp Init
.asm_5a75 .asm_5a75
call Func_5317 call Func_5317

15
engine/evos_moves.asm
View file

@ -152,8 +152,7 @@ Func_3ad71: ; 3ad71 (e:6d71)
push af push af
ld a, [wd0b5] ld a, [wd0b5]
ld [wd11e], a ld [wd11e], a
ld a, $3a predef IndexToPokedex
call Predef
ld a, [wd11e] ld a, [wd11e]
dec a dec a
ld hl, BaseStats ld hl, BaseStats
@ -205,13 +204,11 @@ Func_3ad71: ; 3ad71 (e:6d71)
ld [wcc49], a ld [wcc49], a
call Func_3af5b call Func_3af5b
pop hl pop hl
ld a, $42 predef SetPartyMonTypes
call Predef
ld a, [W_ISINBATTLE] ; W_ISINBATTLE ld a, [W_ISINBATTLE] ; W_ISINBATTLE
and a and a
call z, Func_3af52 call z, Func_3af52
ld a, $3a predef IndexToPokedex
call Predef
ld a, [wd11e] ld a, [wd11e]
dec a dec a
ld c, a ld c, a
@ -361,8 +358,7 @@ Func_3af5b: ; 3af5b (e:6f5b)
ld [wd11e], a ld [wd11e], a
call GetMoveName call GetMoveName
call CopyStringToCF4B call CopyStringToCF4B
ld a, $1b predef LearnMove
call Predef
.asm_3afb1 .asm_3afb1
ld a, [wcf91] ld a, [wcf91]
ld [wd11e], a ld [wd11e], a
@ -489,7 +485,6 @@ WriteMonMoves_ShiftMoveData: ; 3b04e (e:704e)
ret ret
Func_3b057: ; 3b057 (e:7057) Func_3b057: ; 3b057 (e:7057)
ld a, $10 ; FlagActionPredef predef_jump FlagActionPredef
jp Predef
INCLUDE "data/evos_moves.asm" INCLUDE "data/evos_moves.asm"

3
engine/game_corner_slots2.asm
View file

@ -3,8 +3,7 @@ AbleToPlaySlotsCheck ; 2ff09 (b:7f09)
and $8 and $8
jr z, .done ; not able jr z, .done ; not able
ld b, COIN_CASE ld b, COIN_CASE
ld a, $1c predef IsItemInBag_ ; IsItemInBag_
call Predef ; IsItemInBag_
ld a, b ld a, b
and a and a
ld b, $33 ; GameCornerCoinCaseText ld b, $33 ; GameCornerCoinCaseText

6
engine/give_pokemon.asm
View file

@ -52,15 +52,13 @@ SetPokedexOwnedFlag: ; 4fe11 (13:7e11)
ld a, [wcf91] ld a, [wcf91]
push af push af
ld [wd11e], a ld [wd11e], a
ld a, $3a predef IndexToPokedex
call Predef
ld a, [wd11e] ld a, [wd11e]
dec a dec a
ld c, a ld c, a
ld hl, wPokedexOwned ; wPokedexOwned ld hl, wPokedexOwned ; wPokedexOwned
ld b, $1 ld b, $1
ld a, $10 ; FlagActionPredef predef FlagActionPredef
call Predef
pop af pop af
ld [wd11e], a ld [wd11e], a
call GetMonName call GetMonName

15
engine/hall_of_fame.asm
View file

@ -117,8 +117,7 @@ Func_70278: ; 70278 (1c:4278)
ld hl, Coord ld hl, Coord
call GetMonHeader call GetMonHeader
call LoadFrontSpriteByMonIndex call LoadFrontSpriteByMonIndex
ld a, $4 predef LoadMonBackPic
call Predef
.asm_702ab .asm_702ab
ld b, $b ld b, $b
ld c, $0 ld c, $0
@ -179,8 +178,7 @@ Func_702f0: ; 702f0 (1c:42f0)
ld [wd0b5], a ld [wd0b5], a
FuncCoord 3, 9 FuncCoord 3, 9
ld hl, Coord ld hl, Coord
ld a, $4b predef Func_27d6b
call Predef
ld a, [wWhichTrade] ; wWhichTrade ld a, [wWhichTrade] ; wWhichTrade
jp PlayCry jp PlayCry
@ -202,8 +200,7 @@ Func_7033e: ; 7033e (1c:433e)
ld de, RedPicBack ; $7e0a ld de, RedPicBack ; $7e0a
ld a, BANK(RedPicBack) ld a, BANK(RedPicBack)
call UncompressSpriteFromDE call UncompressSpriteFromDE
ld a, $3 predef ScaleSpriteByTwo
call Predef
ld de, vBackPic ld de, vBackPic
call InterlaceMergeSpriteBuffers call InterlaceMergeSpriteBuffers
ld c, $1 ld c, $1
@ -212,14 +209,12 @@ Func_7036d: ; 7036d (1c:436d)
ld b, $0 ld b, $0
FuncCoord 12, 5 FuncCoord 12, 5
ld hl, Coord ld hl, Coord
ld a, $31 predef_jump Func_79dda
jp Predef
Func_70377: ; 70377 (1c:4377) Func_70377: ; 70377 (1c:4377)
ld hl, wd747 ld hl, wd747
set 3, [hl] set 3, [hl]
ld a, $56 predef DisplayDexRating
call Predef
FuncCoord 0, 4 FuncCoord 0, 4
ld hl, Coord ld hl, Coord
ld b, $6 ld b, $6

3
engine/hidden_object_functions17.asm
View file

@ -79,8 +79,7 @@ DisplayMonFrontSpriteInBox: ; 5dbd9 (17:5bd9)
ld [$ffe1], a ld [$ffe1], a
FuncCoord 10, 11 FuncCoord 10, 11
ld hl, Coord ld hl, Coord
ld a, $2 predef Func_3f073
call Predef
call WaitForTextScrollButtonPress call WaitForTextScrollButtonPress
call LoadScreenTilesFromBuffer1 call LoadScreenTilesFromBuffer1
call Delay3 call Delay3

9
engine/hidden_object_functions7.asm
View file

@ -194,8 +194,7 @@ CinnabarQuizQuestionsText6: ; 1ea85 (7:6a85)
CinnabarGymQuiz_1ea8a: ; 1ea8a (7:6a8a) CinnabarGymQuiz_1ea8a: ; 1ea8a (7:6a8a)
ld hl, wd79c ld hl, wd79c
ld a, $10 ; FlagActionPredef predef_jump FlagActionPredef
jp Predef
CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92) CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92)
call YesNoChoice call YesNoChoice
@ -227,8 +226,7 @@ CinnabarGymQuiz_1ea92: ; 1ea92 (7:6a92)
ld c, a ld c, a
ld b, $2 ld b, $2
ld hl, wd79a ld hl, wd79a
ld a, $10 ; FlagActionPredef predef FlagActionPredef
call Predef
ld a, c ld a, c
and a and a
ret nz ret nz
@ -293,8 +291,7 @@ CinnabarGymQuiz_1eb0a: ; 1eb0a (7:6b0a)
.asm_1eb38 .asm_1eb38
pop bc pop bc
ld [wd09f], a ld [wd09f], a
ld a, $17 predef Func_ee9e
call Predef
ld hl, $ffdb ld hl, $ffdb
dec [hl] dec [hl]
jr nz, .asm_1eb0e jr nz, .asm_1eb0e

9
engine/in_game_trades.asm
View file

@ -39,8 +39,7 @@ Predef54: ; 71ad9 (1c:5ad9)
ld a,[wWhichTrade] ld a,[wWhichTrade]
ld c,a ld c,a
ld b,$2 ld b,$2
ld a,$10 predef FlagActionPredef
call Predef
ld a,c ld a,c
and a and a
ld a,$4 ld a,$4
@ -112,8 +111,7 @@ Func_71c07: ; 71c07 (1c:5c07)
ld a,[wWhichTrade] ld a,[wWhichTrade]
ld c,a ld c,a
ld b,$1 ld b,$1
ld a,$10 predef FlagActionPredef
call Predef
ld hl, ConnectCableText ld hl, ConnectCableText
call PrintText call PrintText
ld a,[wWhichPokemon] ld a,[wWhichPokemon]
@ -122,8 +120,7 @@ Func_71c07: ; 71c07 (1c:5c07)
push af push af
call LoadHpBarAndStatusTilePatterns call LoadHpBarAndStatusTilePatterns
call Func_71cc1 call Func_71cc1
ld a,$38 predef Func_410e2
call Predef
pop af pop af
ld [W_CURENEMYLVL],a ld [W_CURENEMYLVL],a
pop af pop af

6
engine/intro.asm
View file

@ -264,12 +264,10 @@ Func_4183f: ; 4183f (10:583f)
Func_41842: ; 41842 (10:5842) Func_41842: ; 41842 (10:5842)
ld c, $0 ld c, $0
ld a, $31 predef_jump Func_79dda
jp Predef
Func_41849: ; 41849 (10:5849) Func_41849: ; 41849 (10:5849)
ld a, $33 predef Func_79869
call Predef
ld a, b ld a, b
jp PlaySound jp PlaySound

3
engine/items/itemfinder.asm
View file

@ -11,8 +11,7 @@ HiddenItemNear: ; 7481f (1d:481f)
ld hl, wd6f0 ld hl, wd6f0
ld c, b ld c, b
ld b, $2 ld b, $2
ld a, $10 ; FlagActionPredef predef FlagActionPredef
call Predef
ld a, c ld a, c
pop hl pop hl
pop bc pop bc

60
engine/items/items.asm
View file

@ -326,8 +326,7 @@ ItemUseBall: ; d687 (3:5687)
push af push af
ld a,[wcf91] ld a,[wcf91]
push af push af
ld a,$08 ;probably animations predef MoveAnimation
call Predef
pop af pop af
ld [wcf91],a ld [wcf91],a
pop af pop af
@ -397,23 +396,20 @@ ItemUseBall: ; d687 (3:5687)
jr z,.printText1 jr z,.printText1
ld hl,ItemUseBallText05 ld hl,ItemUseBallText05
call PrintText call PrintText
ld a,$3a ;convert order: Internal->Dex predef IndexToPokedex
call Predef
ld a,[wd11e] ld a,[wd11e]
dec a dec a
ld c,a ld c,a
ld b,2 ld b,2
ld hl,wPokedexOwned ;Dex_own_flags (pokemon) ld hl,wPokedexOwned ;Dex_own_flags (pokemon)
ld a,$10 predef FlagActionPredef
call Predef ;check Dex flag (own already or not)
ld a,c ld a,c
push af push af
ld a,[wd11e] ld a,[wd11e]
dec a dec a
ld c,a ld c,a
ld b,1 ld b,1
ld a,$10 ;set Dex_own_flag? predef FlagActionPredef
call Predef
pop af pop af
and a and a
jr nz,.checkParty jr nz,.checkParty
@ -422,8 +418,7 @@ ItemUseBall: ; d687 (3:5687)
call ClearSprites call ClearSprites
ld a,[wEnemyMonSpecies] ;caught mon_ID ld a,[wEnemyMonSpecies] ;caught mon_ID
ld [wd11e],a ld [wd11e],a
ld a,$3d predef ShowPokedexData
call Predef
.checkParty ;$58f4 .checkParty ;$58f4
ld a,[wPartyCount] ld a,[wPartyCount]
cp a,6 ;is party full? cp a,6 ;is party full?
@ -627,8 +622,7 @@ SurfingNoPlaceToGetOffText: ; da51 (3:5a51)
db "@" db "@"
ItemUsePokedex: ; da56 (3:5a56) ItemUsePokedex: ; da56 (3:5a56)
ld a,$29 predef_jump ShowPokedexMenu
jp Predef
ItemUseEvoStone: ; da5b (3:5a5b) ItemUseEvoStone: ; da5b (3:5a5b)
ld a,[W_ISINBATTLE] ld a,[W_ISINBATTLE]
@ -783,8 +777,7 @@ ItemUseMedicine: ; dabb (3:5abb)
ld de,wBattleMonMaxHP ld de,wBattleMonMaxHP
ld bc,10 ld bc,10
call CopyData ; copy party stats to in-battle stat data call CopyData ; copy party stats to in-battle stat data
ld a,$28 predef Func_3ed02
call Predef
jp .doneHealing jp .doneHealing
.healHP .healHP
inc hl ; hl = address of current HP inc hl ; hl = address of current HP
@ -814,8 +807,7 @@ ItemUseMedicine: ; dabb (3:5abb)
ld c,a ld c,a
ld hl,wccf5 ld hl,wccf5
ld b,$02 ld b,$02
ld a,$10 predef FlagActionPredef
call Predef
ld a,c ld a,c
and a and a
jr z,.next jr z,.next
@ -823,8 +815,7 @@ ItemUseMedicine: ; dabb (3:5abb)
ld c,a ld c,a
ld hl,wPartyAliveFlags ld hl,wPartyAliveFlags
ld b,$01 ld b,$01
ld a,$10 predef FlagActionPredef
call Predef
.next .next
pop bc pop bc
pop de pop de
@ -934,8 +925,7 @@ ItemUseMedicine: ; dabb (3:5abb)
ld [$fff6],a ld [$fff6],a
ld a,$02 ld a,$02
ld [wListMenuID],a ld [wListMenuID],a
ld a,$48 predef UpdateHPBar2 ; animate HP bar decrease of pokemon that used Softboiled
call Predef ; animate HP bar decrease of pokemon that used Softboiled
ld a,[$fff6] ld a,[$fff6]
res 0,a res 0,a
ld [$fff6],a ld [$fff6],a
@ -1085,8 +1075,7 @@ ItemUseMedicine: ; dabb (3:5abb)
ld [$fff6],a ld [$fff6],a
ld a,$02 ld a,$02
ld [wListMenuID],a ld [wListMenuID],a
ld a,$48 predef UpdateHPBar2 ; animate the HP bar lengthening
call Predef ; animate the HP bar lengthening
ld a,[$fff6] ld a,[$fff6]
res 0,a res 0,a
ld [$fff6],a ld [$fff6],a
@ -1285,8 +1274,7 @@ ItemUseMedicine: ; dabb (3:5abb)
call WaitForTextScrollButtonPress ; wait for button press call WaitForTextScrollButtonPress ; wait for button press
xor a xor a
ld [wcc49],a ld [wcc49],a
ld a,$1a predef Func_3af5b ; learn level up move, if any
call Predef ; learn level up move, if any
xor a xor a
ld [wccd4],a ld [wccd4],a
callab Func_3ad0e ; evolve pokemon, if appropriate callab Func_3ad0e ; evolve pokemon, if appropriate
@ -1356,8 +1344,7 @@ BaitRockCommon: ; df7f (3:5f7f)
ld a,$ff ld a,$ff
.noCarry .noCarry
ld [hl],a ld [hl],a
ld a,$08 predef MoveAnimation ; do animation
call Predef ; do animation
ld c,70 ld c,70
jp DelayFrames jp DelayFrames
@ -2096,8 +2083,7 @@ ItemUseTMHM: ; e479 (3:6479)
.skipAdding .skipAdding
inc a inc a
ld [wd11e],a ld [wd11e],a
ld a,$44 predef TMToMove ; get move ID from TM/HM ID
call Predef ; get move ID from TM/HM ID
ld a,[wd11e] ld a,[wd11e]
ld [wd0e0],a ld [wd0e0],a
call GetMoveName call GetMoveName
@ -2152,8 +2138,7 @@ ItemUseTMHM: ; e479 (3:6479)
call GoPAL_SET_CF1C call GoPAL_SET_CF1C
jp LoadScreenTilesFromBuffer1 ; restore saved screen jp LoadScreenTilesFromBuffer1 ; restore saved screen
.checkIfAbleToLearnMove .checkIfAbleToLearnMove
ld a,$43 predef CanLearnTM ; check if the pokemon can learn the move
call Predef ; check if the pokemon can learn the move
push bc push bc
ld a,[wWhichPokemon] ld a,[wWhichPokemon]
ld hl,wPartyMonNicks ld hl,wPartyMonNicks
@ -2171,8 +2156,7 @@ ItemUseTMHM: ; e479 (3:6479)
.checkIfAlreadyLearnedMove .checkIfAlreadyLearnedMove
callab CheckIfMoveIsKnown ; check if the pokemon already knows the move callab CheckIfMoveIsKnown ; check if the pokemon already knows the move
jr c,.chooseMon jr c,.chooseMon
ld a,$1b predef LearnMove ; teach move
call Predef ; teach move
pop af pop af
ld [wcf91],a ld [wcf91],a
pop af pop af
@ -2232,8 +2216,7 @@ ThrowBallAtTrainerMon: ; e58b (3:658b)
call Delay3 call Delay3
ld a,TOSS_ANIM ld a,TOSS_ANIM
ld [W_ANIMATIONID],a ld [W_ANIMATIONID],a
ld a,$08 predef MoveAnimation ; do animation
call Predef ; do animation
ld hl,ThrowBallAtTrainerMonText1 ld hl,ThrowBallAtTrainerMonText1
call PrintText call PrintText
ld hl,ThrowBallAtTrainerMonText2 ld hl,ThrowBallAtTrainerMonText2
@ -2321,8 +2304,7 @@ RestoreBonusPP: ; e606 (3:6606)
call AddNTimes call AddNTimes
push hl push hl
ld de,wcd78 - 1 ld de,wcd78 - 1
ld a,$5e predef LoadMovePPs ; loads the normal max PP of each of the pokemon's moves to wcd78
call Predef ; loads the normal max PP of each of the pokemon's moves to wcd78
pop hl pop hl
ld c,21 ld c,21
ld b,0 ld b,0
@ -2574,8 +2556,7 @@ IsKeyItem_: ; e764 (3:6764)
ld c,a ld c,a
ld hl,wHPBarMaxHP ld hl,wHPBarMaxHP
ld b,$02 ; test bit ld b,$02 ; test bit
ld a,$10 predef FlagActionPredef ; bitfield operation function
call Predef ; bitfield operation function
ld a,c ld a,c
and a and a
ret nz ret nz
@ -2674,8 +2655,7 @@ Func_e7a4: ; e7a4 (3:67a4)
ld hl, wBoxMonNicks ld hl, wBoxMonNicks
ld a, $2 ld a, $2
ld [wd07d], a ld [wd07d], a
ld a, $4e predef AskName
call Predef
ld a, [W_NUMINBOX] ; wda80 ld a, [W_NUMINBOX] ; wda80
dec a dec a
jr z, .asm_e867 jr z, .asm_e867

3
engine/items/tms.asm
View file

@ -18,8 +18,7 @@ CanLearnTM: ; 1373e (4:773e)
.TMfoundLoop .TMfoundLoop
pop hl pop hl
ld b, $2 ; read corresponding bit from TM compatibility array ld b, $2 ; read corresponding bit from TM compatibility array
ld a, $10 ; FlagActionPredef predef_jump FlagActionPredef
jp Predef
; converts TM/HM number in wd11e into move number ; converts TM/HM number in wd11e into move number
; HMs start at 51 ; HMs start at 51

6
engine/menu/bills_pc.asm
View file

@ -466,10 +466,8 @@ Func_2174b: ; 2174b (8:574b)
ld a, $2 ld a, $2
.asm_217b0 .asm_217b0
ld [wcc49], a ld [wcc49], a
ld a, $36 predef StatusScreen
call Predef predef StatusScreen2
ld a, $37
call Predef
call LoadScreenTilesFromBuffer1 call LoadScreenTilesFromBuffer1
call ReloadTilesetTilePatterns call ReloadTilesetTilePatterns
call GoPAL_SET_CF1C call GoPAL_SET_CF1C

3
engine/menu/diploma.asm
View file

@ -14,8 +14,7 @@ DisplayDiploma: ; 566e2 (15:66e2)
call FarCopyData2 call FarCopyData2
ld hl, wTileMap ld hl, wTileMap
ld bc, $1012 ld bc, $1012
ld a, $27 predef Func_5ab0
call Predef
ld hl, DiplomaTextPointersAndCoords ; $6784 ld hl, DiplomaTextPointersAndCoords ; $6784
ld c, $5 ld c, $5
.asm_56715 .asm_56715

3
engine/menu/main_menu.asm
View file

@ -9,8 +9,7 @@ MainMenu: ; 5af2 (1:5af2)
jr nc,.next0 jr nc,.next0
; Predef 52 loads the save from SRAM to RAM ; Predef 52 loads the save from SRAM to RAM
ld a,$52 predef LoadSAV
call Predef
.next0 .next0
ld c,20 ld c,20

3
engine/menu/oaks_pc.asm
View file

@ -8,8 +8,7 @@ OpenOaksPC: ; 1e915 (7:6915)
ld a, [wCurrentMenuItem] ; wCurrentMenuItem ld a, [wCurrentMenuItem] ; wCurrentMenuItem
and a and a
jr nz, .asm_1e932 jr nz, .asm_1e932
ld a, $56 predef DisplayDexRating
call Predef
.asm_1e932 .asm_1e932
ld hl, ClosedOaksPCText ld hl, ClosedOaksPCText
call PrintText call PrintText

6
engine/menu/party_menu.asm
View file

@ -93,8 +93,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3)
set 0,a set 0,a
ld [$FFF6],a ld [$FFF6],a
add hl,bc add hl,bc
ld a,$60 predef Func_128f6 ; draw HP bar and prints current / max HP
call Predef ; draw HP bar and prints current / max HP
ld a,[$FFF6] ld a,[$FFF6]
res 0,a res 0,a
ld [$FFF6],a ld [$FFF6],a
@ -103,8 +102,7 @@ RedrawPartyMenu_: ; 12ce3 (4:6ce3)
jr .printLevel jr .printLevel
.teachMoveMenu .teachMoveMenu
push hl push hl
ld a,$43 predef CanLearnTM ; check if the pokemon can learn the move
call Predef ; check if the pokemon can learn the move
pop hl pop hl
ld de,.ableToLearnMoveText ld de,.ableToLearnMoveText
ld a,c ld a,c

6
engine/menu/pokedex.asm
View file

@ -145,8 +145,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d)
call PlaySound ; play sound call PlaySound ; play sound
jr .handleMenuInput jr .handleMenuInput
.choseArea .choseArea
ld a,$4a predef LoadTownMap_Nest ; display pokemon areas
call Predef ; display pokemon areas
ld b,0 ld b,0
jr .exitSideMenu jr .exitSideMenu
@ -392,8 +391,7 @@ IsPokemonBitSet: ; 402c2 (10:42c2)
dec a dec a
ld c,a ld c,a
ld b,2 ld b,2
ld a,$10 predef FlagActionPredef
call Predef
ld a,c ld a,c
and a and a
ret ret

3
engine/menu/prize_menu.asm
View file

@ -257,8 +257,7 @@ HandlePrizeChoice: ; 528c6 (14:68c6)
ld hl,$FFA1 ld hl,$FFA1
ld de,wPlayerCoins + 1 ld de,wPlayerCoins + 1
ld c,$02 ; how many bytes ld c,$02 ; how many bytes
ld a,$0C predef SubBCDPredef ; subtract coins (BCD daa operations)
call Predef ; subtract coins (BCD daa operations)
jp PrintPrizePrice jp PrintPrizePrice
.BagFull .BagFull
ld hl,PrizeRoomBagIsFullTextPtr ld hl,PrizeRoomBagIsFullTextPtr

24
engine/menu/start_sub_menus.asm
View file

@ -1,6 +1,5 @@
StartMenu_Pokedex: ; 13095 (4:7095) StartMenu_Pokedex: ; 13095 (4:7095)
ld a,$29 predef ShowPokedexMenu
call Predef
call LoadScreenTilesFromBuffer2 ; restore saved screen call LoadScreenTilesFromBuffer2 ; restore saved screen
call Delay3 call Delay3
call LoadGBPal call LoadGBPal
@ -98,10 +97,8 @@ StartMenu_Pokemon: ; 130a9 (4:70a9)
call ClearSprites call ClearSprites
xor a xor a
ld [wcc49],a ld [wcc49],a
ld a,$36 predef StatusScreen
call Predef predef StatusScreen2
ld a,$37
call Predef
call ReloadMapData call ReloadMapData
jp StartMenu_Pokemon jp StartMenu_Pokemon
.choseOutOfBattleMove .choseOutOfBattleMove
@ -155,8 +152,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9)
.cut .cut
bit 1,a ; does the player have the Cascade Badge? bit 1,a ; does the player have the Cascade Badge?
jp z,.newBadgeRequired jp z,.newBadgeRequired
ld a,$3c predef UsedCut
call Predef
ld a,[wcd6a] ld a,[wcd6a]
and a and a
jp z,.loop jp z,.loop
@ -181,8 +177,7 @@ StartMenu_Pokemon: ; 130a9 (4:70a9)
.strength .strength
bit 3,a ; does the player have the Rainbow Badge? bit 3,a ; does the player have the Rainbow Badge?
jp z,.newBadgeRequired jp z,.newBadgeRequired
ld a,$5b predef PrintStrengthTxt
call Predef
call GBPalWhiteOutWithDelay3 call GBPalWhiteOutWithDelay3
jp .goBackToMap jp .goBackToMap
.flash .flash
@ -515,8 +510,7 @@ StartMenu_TrainerInfo: ; 13460 (4:7460)
xor a xor a
ld [$ffd7],a ld [$ffd7],a
call DrawTrainerInfo call DrawTrainerInfo
ld a,$2e predef DrawBadges ; draw badges
call Predef ; draw badges
ld b,$0d ld b,$0d
call GoPAL_SET call GoPAL_SET
call GBPalNormal call GBPalNormal
@ -535,8 +529,7 @@ StartMenu_TrainerInfo: ; 13460 (4:7460)
DrawTrainerInfo: ; 1349a (4:749a) DrawTrainerInfo: ; 1349a (4:749a)
ld de,RedPicFront ld de,RedPicFront
ld bc,(BANK(RedPicFront) << 8) | $01 ld bc,(BANK(RedPicFront) << 8) | $01
ld a,$3b predef Predef3B
call Predef
call DisableLCD call DisableLCD
FuncCoord 0,2 FuncCoord 0,2
ld hl,Coord ld hl,Coord
@ -711,8 +704,7 @@ StartMenu_SaveReset: ; 135e3 (4:75e3)
ld a,[wd72e] ld a,[wd72e]
bit 6,a ; is the player using the link feature? bit 6,a ; is the player using the link feature?
jp nz,Init jp nz,Init
ld a,$3f predef SaveSAV ; save the game
call Predef ; save the game
call LoadScreenTilesFromBuffer2 ; restore saved screen call LoadScreenTilesFromBuffer2 ; restore saved screen
jp HoldTextDisplayOpen jp HoldTextDisplayOpen

6
engine/menu/status_screen.asm
View file

@ -84,8 +84,7 @@ StatusScreen: ; 12953 (4:6953)
ld a, [W_MONHDEXNUM] ld a, [W_MONHDEXNUM]
ld [wd11e], a ld [wd11e], a
ld [wd0b5], a ld [wd0b5], a
ld a, $3a predef IndexToPokedex
call Predef
FuncCoord 3,7 FuncCoord 3,7
ld hl, Coord ld hl, Coord
ld de, wd11e ld de, wd11e
@ -93,8 +92,7 @@ StatusScreen: ; 12953 (4:6953)
call PrintNumber ; Pokémon no. call PrintNumber ; Pokémon no.
FuncCoord 11,10 FuncCoord 11,10
ld hl, Coord ld hl, Coord
ld a, $4b predef Func_27d6b ; Prints the type (?)
call Predef ; Prints the type (?)
ld hl, NamePointers2 ; $6a9d ld hl, NamePointers2 ; $6a9d
call .unk_12a7e call .unk_12a7e
ld d, h ld d, h

3
engine/menu/vending_machine.asm
View file

@ -71,8 +71,7 @@ VendingMachineMenu: ; 74ee0 (1d:4ee0)
ld hl, $ffde ld hl, $ffde
ld de, wPlayerMoney + 2 ; wd349 ld de, wPlayerMoney + 2 ; wd349
ld c, $3 ld c, $3
ld a, $c ; SubBCDPredef predef SubBCDPredef
call Predef
ld a, $13 ld a, $13
ld [wd125], a ld [wd125], a
jp DisplayTextBoxID jp DisplayTextBoxID

3
engine/mon_party_sprites.asm
View file

@ -377,8 +377,7 @@ Func_718c3: ; 718c3 (1c:58c3)
GetPartyMonSpriteID: ; 718e9 (1c:58e9) GetPartyMonSpriteID: ; 718e9 (1c:58e9)
ld [wd11e], a ld [wd11e], a
ld a, $3a predef IndexToPokedex
call Predef
ld a, [wd11e] ld a, [wd11e]
ld c, a ld c, a
dec a dec a

6
engine/oak_speech.asm
View file

@ -41,8 +41,7 @@ OakSpeech: ; 6115 (1:6115)
call ClearScreen call ClearScreen
call LoadTextBoxTilePatterns call LoadTextBoxTilePatterns
call SetDefaultNames call SetDefaultNames
ld a,$18 predef InitPlayerData2
call Predef
ld hl,wNumBoxItems ld hl,wNumBoxItems
ld a,POTION ld a,POTION
ld [wcf91],a ld [wcf91],a
@ -234,5 +233,4 @@ IntroPredef3B: ; 62a4 (1:62a4)
.next .next
xor a xor a
ld [$FFE1],a ld [$FFE1],a
ld a,1 predef_jump Func_3f0c6
jp Predef

6
engine/overworld/card_key.asm
View file

@ -8,8 +8,7 @@ PrintCardKeyText: ; 52673 (14:6673)
ret z ret z
cp b cp b
jr nz, .asm_5267a jr nz, .asm_5267a
ld a, $35 predef Func_c586
call Predef
ld a, [wcfc6] ld a, [wcfc6]
cp $18 cp $18
jr z, .asm_5269c jr z, .asm_5269c
@ -49,8 +48,7 @@ PrintCardKeyText: ; 52673 (14:6673)
ld a, $e ld a, $e
.asm_526ca .asm_526ca
ld [wd09f], a ld [wd09f], a
ld a, $17 predef Func_ee9e
call Predef
ld hl, wd126 ld hl, wd126
set 5, [hl] set 5, [hl]
ld a, (SFX_1f_57 - SFX_Headers_1f) / 3 ld a, (SFX_1f_57 - SFX_Headers_1f) / 3

18
engine/overworld/hidden_items.asm
View file

@ -6,8 +6,7 @@ HiddenItems: ; 76688 (1d:6688)
ld a, [wTrainerScreenX] ld a, [wTrainerScreenX]
ld c, a ld c, a
ld b, $2 ld b, $2
ld a, $10 predef FlagActionPredef
call Predef
ld a, c ld a, c
and a and a
ret nz ret nz
@ -35,8 +34,7 @@ FoundHiddenItemText: ; 7675b (1d:675b)
ld a, [wTrainerScreenX] ld a, [wTrainerScreenX]
ld c, a ld c, a
ld b, $1 ld b, $1
ld a, $10 predef FlagActionPredef
call Predef
ld a, (SFX_02_3b - SFX_Headers_02) / 3 ld a, (SFX_02_3b - SFX_Headers_02) / 3
call PlaySoundWaitForCurrent ; play sound call PlaySoundWaitForCurrent ; play sound
call WaitForSoundToFinish ; wait for sound to finish playing call WaitForSoundToFinish ; wait for sound to finish playing
@ -55,8 +53,7 @@ HiddenItemBagFullText: ; 76794 (1d:6794)
HiddenCoins: ; 76799 (1d:6799) HiddenCoins: ; 76799 (1d:6799)
ld b, COIN_CASE ld b, COIN_CASE
ld a, $1c predef IsItemInBag_
call Predef
ld a, b ld a, b
and a and a
ret z ret z
@ -67,8 +64,7 @@ HiddenCoins: ; 76799 (1d:6799)
ld a, [wTrainerScreenX] ld a, [wTrainerScreenX]
ld c, a ld c, a
ld b, $2 ld b, $2
ld a, $10 predef FlagActionPredef
call Predef
ld a, c ld a, c
and a and a
ret nz ret nz
@ -104,14 +100,12 @@ HiddenCoins: ; 76799 (1d:6799)
ld de, wPlayerCoins + 1 ld de, wPlayerCoins + 1
ld hl, $ffa1 ld hl, $ffa1
ld c, $2 ld c, $2
ld a, $b ; AddBCDPredef predef AddBCDPredef
call Predef
ld hl, wd6fe ld hl, wd6fe
ld a, [wTrainerScreenX] ld a, [wTrainerScreenX]
ld c, a ld c, a
ld b, $1 ld b, $1
ld a, $10 predef FlagActionPredef
call Predef
call EnableAutoTextBoxDrawing call EnableAutoTextBoxDrawing
ld a, [wPlayerCoins] ld a, [wPlayerCoins]
cp $99 cp $99

3
engine/overworld/item.asm
View file

@ -32,8 +32,7 @@ PickupItem:
ld a, [$ffdb] ld a, [$ffdb]
ld [wcc4d], a ld [wcc4d], a
ld a, $11 ; HideObject predef HideObject
call Predef
ld a, 1 ld a, 1
ld [wcc3c], a ld [wcc3c], a
ld hl, FoundItemText ld hl, FoundItemText

3
engine/overworld/ledges.asm
View file

@ -5,8 +5,7 @@ HandleLedges: ; 1a672 (6:6672)
ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET ld a, [W_CURMAPTILESET] ; W_CURMAPTILESET
and a ; OVERWORLD and a ; OVERWORLD
ret nz ret nz
ld a, $35 predef Func_c586
call Predef
ld a, [wSpriteStateData1 + 9] ld a, [wSpriteStateData1 + 9]
ld b, a ld b, a
FuncCoord 8, 9 FuncCoord 8, 9

3
engine/overworld/movement.asm
View file

@ -458,8 +458,7 @@ InitializeSpriteScreenPosition: ; 50bd (1:50bd)
; tests if sprite is off screen or otherwise unable to do anything ; tests if sprite is off screen or otherwise unable to do anything
CheckSpriteAvailability: ; 50dc (1:50dc) CheckSpriteAvailability: ; 50dc (1:50dc)
ld a, $12 predef IsObjectHidden
call Predef
ld a, [$ffe5] ld a, [$ffe5]
and a and a
jp nz, .spriteInvisible jp nz, .spriteInvisible

12
engine/overworld/npc_movement.asm
View file

@ -86,8 +86,7 @@ Func_1a485: ; 1a485 (6:6485)
ld a, [wcca1] ld a, [wcca1]
ld [wcd38], a ld [wcd38], a
ld [$ff95], a ld [$ff95], a
ld a, $23 predef Func_f9a0
call Predef
call Func_3486 call Func_3486
ld a, $2 ld a, $2
ld [wcf10], a ld [wcf10], a
@ -145,8 +144,7 @@ Func_1a4f4: ; 1a4f4 (6:64f4)
ret nz ret nz
ld a, $0 ld a, $0
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld hl, wd730 ld hl, wd730
res 7, [hl] res 7, [hl]
ld hl, wd72e ld hl, wd72e
@ -175,8 +173,7 @@ Func_1a514: ; 1a514 (6:6514)
ld [wcd38], a ld [wcd38], a
xor a xor a
ld [wd12f], a ld [wd12f], a
ld a, $4f predef PewterGuys
call Predef
ld hl, wcc97 ld hl, wcc97
ld de, RLEList_PewterMuseumGuy ld de, RLEList_PewterMuseumGuy
call DecodeRLEList call DecodeRLEList
@ -233,8 +230,7 @@ Func_1a581: ; 1a581 (6:6581)
ld [wcd38], a ld [wcd38], a
ld a, $1 ld a, $1
ld [wd12f], a ld [wd12f], a
ld a, $4f predef PewterGuys
call Predef
ld hl, wcc97 ld hl, wcc97
ld de, RLEList_PewterGymGuy ld de, RLEList_PewterGymGuy
call DecodeRLEList call DecodeRLEList

3
engine/overworld/player_animations.asm
View file

@ -421,8 +421,7 @@ Func_707b6: ; 707b6 (1c:47b6)
xor a xor a
ld [hli], a ld [hli], a
ld [hl], a ld [hl], a
ld a, $4c predef EmotionBubble
call Predef
ld a, [wSpriteStateData1 + 2] ld a, [wSpriteStateData1 + 2]
cp $4 cp $4
jr nz, .asm_70833 jr nz, .asm_70833

3
engine/palettes.asm
View file

@ -268,8 +268,7 @@ DeterminePaletteIDOutOfBattle: ; 71f9d (1c:5f9d)
and a and a
jr z, .idZero jr z, .idZero
push bc push bc
ld a, $3A predef IndexToPokedex ; turn Pokemon ID number into Pokedex number
call Predef ; turn Pokemon ID number into Pokedex number
pop bc pop bc
ld a, [wd11e] ld a, [wd11e]
.idZero .idZero

2
engine/predefs.asm
View file

@ -49,7 +49,7 @@ GetPredefPointer:
ret ret
PredefPointers: ; 4fe79 (13:7e79) PredefPointers:: ; 4fe79 (13:7e79)
; these are pointers to ASM routines. ; these are pointers to ASM routines.
; they appear to be used in overworld map scripts. ; they appear to be used in overworld map scripts.
add_predef Func_3cd60 add_predef Func_3cd60

3
engine/predefs17.asm
View file

@ -3,8 +3,7 @@
StarterDex: ; 5c0dc (17:40dc) StarterDex: ; 5c0dc (17:40dc)
ld a, %01001011 ; set starter flags ld a, %01001011 ; set starter flags
ld [wPokedexOwned], a ; wPokedexOwned ld [wPokedexOwned], a ; wPokedexOwned
ld a, $3d predef ShowPokedexData
call Predef
xor a ; unset starter flags xor a ; unset starter flags
ld [wPokedexOwned], a ; wPokedexOwned ld [wPokedexOwned], a ; wPokedexOwned
ret ret

9
engine/slot_machine.asm
View file

@ -17,8 +17,7 @@ PromptUserToPlaySlots: ; 3730e (d:730e)
xor a xor a
ld [hli], a ld [hli], a
ld [hl], $2 ld [hl], $2
ld a, $4c predef EmotionBubble
call Predef
call GBPalWhiteOutWithDelay3 call GBPalWhiteOutWithDelay3
call LoadSlotMachineTiles call LoadSlotMachineTiles
call LoadFontTilePatterns call LoadFontTilePatterns
@ -618,8 +617,7 @@ SlotMachine_37741: ; 37741 (d:7741)
ld [hli], a ld [hli], a
ld de, wPlayerCoins + 1 ld de, wPlayerCoins + 1
ld c, $2 ld c, $2
ld a, $c ; SubBCDPredef predef SubBCDPredef
call Predef
SlotMachine_37754: ; 37754 (d:7754) SlotMachine_37754: ; 37754 (d:7754)
ld hl, wTileMap + $19 ld hl, wTileMap + $19
@ -660,8 +658,7 @@ SlotMachine_3776b: ; 3776b (d:776b)
ld hl, wcd47 ld hl, wcd47
ld de, wPlayerCoins + 1 ld de, wPlayerCoins + 1
ld c, $2 ld c, $2
ld a, $b ; AddBCDPredef predef AddBCDPredef
call Predef
call SlotMachine_37754 call SlotMachine_37754
call SlotMachine_3775f call SlotMachine_3775f
ld a, (SFX_1f_65 - SFX_Headers_1f) / 3 ld a, (SFX_1f_65 - SFX_Headers_1f) / 3

3
engine/trade.asm
View file

@ -766,5 +766,4 @@ Func_41676: ; 41676 (10:5676)
ld [W_ANIMATIONID], a ; W_ANIMATIONID ld [W_ANIMATIONID], a ; W_ANIMATIONID
xor a xor a
ld [wcc5b], a ld [wcc5b], a
ld a, $8 predef_jump MoveAnimation
jp Predef

6
engine/trade2.asm
View file

@ -5,8 +5,7 @@ Func_42769: ; 42769 (10:6769)
call PlaceString call PlaceString
ld a,[wWhichTrade] ld a,[wWhichTrade]
ld [wd11e],a ld [wd11e],a
ld a,$3A predef IndexToPokedex
call Predef
FuncCoord 9, 0 FuncCoord 9, 0
ld hl,Coord ld hl,Coord
ld de,wd11e ld de,wd11e
@ -33,8 +32,7 @@ Func_427a7: ; 427a7 (10:67a7)
call PlaceString call PlaceString
ld a,[wTrainerEngageDistance] ld a,[wTrainerEngageDistance]
ld [wd11e],a ld [wd11e],a
ld a,$3A predef IndexToPokedex
call Predef
FuncCoord 9, 10 FuncCoord 9, 10
ld hl,Coord ld hl,Coord
ld de,wd11e ld de,wd11e

39
home.asm
View file

@ -275,8 +275,7 @@ LoadFrontSpriteByMonIndex:: ; 1389 (0:1389)
push af push af
ld a, [wcf91] ld a, [wcf91]
ld [wd11e], a ld [wd11e], a
ld a, $3a predef IndexToPokedex
call Predef
ld hl, wd11e ld hl, wd11e
ld a, [hl] ld a, [hl]
pop bc pop bc
@ -576,8 +575,7 @@ GetMonHeader:: ; 1537 (0:1537)
jr z,.specialID jr z,.specialID
cp a,MEW cp a,MEW
jr z,.mew jr z,.mew
ld a,$3a predef IndexToPokedex ; convert pokemon ID in [wd11e] to pokedex number
call Predef ; convert pokemon ID in [wd11e] to pokedex number
ld a,[wd11e] ld a,[wd11e]
dec a dec a
ld bc,28 ld bc,28
@ -1509,8 +1507,7 @@ PokeCenterSignText:: ; 24ef (0:24ef)
Predef5CText:: ; 24f4 (0:24f4) Predef5CText:: ; 24f4 (0:24f4)
; XXX better label (what does predef $5C do?) ; XXX better label (what does predef $5C do?)
db $08 ; asm db $08 ; asm
ld a, $5c predef PickupItem
call Predef
jp TextScriptEnd jp TextScriptEnd
@ -1862,8 +1859,7 @@ AddAmountSoldToMoney:: ; 2b9e (0:2b9e)
ld de,wPlayerMoney + 2 ld de,wPlayerMoney + 2
ld hl,$ffa1 ; total price of items ld hl,$ffa1 ; total price of items
ld c,3 ; length of money in bytes ld c,3 ; length of money in bytes
ld a,$0b predef AddBCDPredef ; add total price to money
call Predef ; add total price to money
ld a,$13 ld a,$13
ld [wd125],a ld [wd125],a
call DisplayTextBoxID ; redraw money text box call DisplayTextBoxID ; redraw money text box
@ -2182,8 +2178,7 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57)
ld de,$ffa1 ld de,$ffa1
ld hl,$ff8d ld hl,$ff8d
push bc push bc
ld a,$0b predef AddBCDPredef ; add the individual price to the current sum
call Predef ; add the individual price to the current sum
pop bc pop bc
dec b dec b
jr nz,.addLoop jr nz,.addLoop
@ -2195,8 +2190,7 @@ DisplayChooseQuantityMenu:: ; 2d57 (0:2d57)
ld [$ffa3],a ld [$ffa3],a
ld a,$02 ld a,$02
ld [$ffa4],a ld [$ffa4],a
ld a,$0d predef DivideBCDPredef3 ; halves the price
call Predef ; halves the price
; store the halved price ; store the halved price
ld a,[$ffa2] ld a,[$ffa2]
ld [$ff9f],a ld [$ff9f],a
@ -2843,8 +2837,7 @@ ReadTrainerHeaderInfo:: ; 3193 (0:3193)
ret ret
TrainerFlagAction:: TrainerFlagAction::
ld a, $10 ; FlagActionPredef predef_jump FlagActionPredef
jp Predef
; direct talking to a trainer (rather than getting seen by one) ; direct talking to a trainer (rather than getting seen by one)
TalkToTrainer:: ; 31cc (0:31cc) TalkToTrainer:: ; 31cc (0:31cc)
@ -2900,8 +2893,7 @@ CheckFightingMapTrainers:: ; 3219 (0:3219)
ld [wcd4f], a ld [wcd4f], a
xor a xor a
ld [wcd50], a ld [wcd50], a
ld a, $4c predef EmotionBubble
call Predef
ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN ld a, D_RIGHT | D_LEFT | D_UP | D_DOWN
ld [wJoyIgnore], a ld [wJoyIgnore], a
xor a xor a
@ -2960,8 +2952,7 @@ EndTrainerBattle:: ; 3275 (0:3275)
inc hl inc hl
ld a, [hl] ld a, [hl]
ld [wcc4d], a ; load corresponding missable object index and remove it ld [wcc4d], a ; load corresponding missable object index and remove it
ld a, $11 predef HideObject
call Predef
.skipRemoveSprite .skipRemoveSprite
ld hl, wd730 ld hl, wd730
bit 4, [hl] bit 4, [hl]
@ -3048,8 +3039,7 @@ CheckForEngagingTrainers:: ; 3306 (0:3306)
ld a, [wcf13] ld a, [wcf13]
swap a swap a
ld [wTrainerSpriteOffset], a ; wWhichTrade ld [wTrainerSpriteOffset], a ; wWhichTrade
ld a, $39 predef TrainerEngage
call Predef
pop de pop de
pop hl pop hl
ld a, [wTrainerSpriteOffset] ; wWhichTrade ld a, [wTrainerSpriteOffset] ; wWhichTrade
@ -3258,8 +3248,7 @@ IsItemInBag:: ; 3493 (0:3493)
; set zero flag if item isn't in player's bag ; set zero flag if item isn't in player's bag
; else reset zero flag ; else reset zero flag
; related to Pokémon Tower and ghosts ; related to Pokémon Tower and ghosts
ld a,$1C predef IsItemInBag_
call Predef
ld a,b ld a,b
and a and a
ret ret
@ -4011,8 +4000,7 @@ WaitForTextScrollButtonPress:: ; 3865 (0:3865)
call HandleDownArrowBlinkTiming call HandleDownArrowBlinkTiming
pop hl pop hl
call JoypadLowSensitivity call JoypadLowSensitivity
ld a, $2d predef Func_5a5f
call Predef
ld a, [$ffb5] ld a, [$ffb5]
and A_BUTTON | B_BUTTON and A_BUTTON | B_BUTTON
jr z, .asm_3872 jr z, .asm_3872
@ -5079,8 +5067,7 @@ GoPAL_SET:: ; 3def (0:3def)
ld a,[wcf1b] ld a,[wcf1b]
and a and a
ret z ret z
ld a,$45 predef_jump Func_71ddf
jp Predef
GetHealthBarColor:: GetHealthBarColor::
; Return at hl the palette of ; Return at hl the palette of

27
home/overworld.asm
View file

@ -98,8 +98,7 @@ OverworldLoopLessDelay::
and a and a
jp z,OverworldLoop jp z,OverworldLoop
.displayDialogue .displayDialogue
ld a,$35 predef Func_c586 ; check what is in front of the player
call Predef ; check what is in front of the player
call UpdateSprites ; move sprites call UpdateSprites ; move sprites
ld a,[wFlags_0xcd60] ld a,[wFlags_0xcd60]
bit 2,a bit 2,a
@ -117,8 +116,7 @@ OverworldLoopLessDelay::
ld a,$00 ld a,$00
ld [wcc47],a ld [wcc47],a
jr z,.changeMap jr z,.changeMap
ld a,$52 predef LoadSAV
call Predef
ld a,[W_CURMAP] ld a,[W_CURMAP]
ld [wd71a],a ld [wd71a],a
call Func_62ce call Func_62ce
@ -301,8 +299,7 @@ OverworldLoopLessDelay::
ld a,[W_ISINBATTLE] ld a,[W_ISINBATTLE]
and a and a
jp nz,CheckWarpsNoCollision jp nz,CheckWarpsNoCollision
ld a,$13 predef Func_c69c ; decrement HP of poisoned pokemon
call Predef ; decrement HP of poisoned pokemon
ld a,[wd12d] ld a,[wd12d]
and a and a
jp nz,HandleBlackOut ; if all pokemon fainted jp nz,HandleBlackOut ; if all pokemon fainted
@ -1070,8 +1067,7 @@ IsSpriteOrSignInFrontOfPlayer:: ; 0b23 (0:0b23)
and a and a
jr z,.extendRangeOverCounter jr z,.extendRangeOverCounter
; if there are signs ; if there are signs
ld a,$35 predef Func_c586 ; get the coordinates in front of the player in de
call Predef ; get the coordinates in front of the player in de
ld hl,wd4b1 ; start of sign coordinates ld hl,wd4b1 ; start of sign coordinates
ld a,[wd4b0] ; number of signs in the map ld a,[wd4b0] ; number of signs in the map
ld b,a ld b,a
@ -1105,8 +1101,7 @@ IsSpriteOrSignInFrontOfPlayer:: ; 0b23 (0:0b23)
jr nz,.signLoop jr nz,.signLoop
; check if the player is front of a counter in a pokemon center, pokemart, etc. and if so, extend the range at which he can talk to the NPC ; check if the player is front of a counter in a pokemon center, pokemart, etc. and if so, extend the range at which he can talk to the NPC
.extendRangeOverCounter .extendRangeOverCounter
ld a,$35 predef Func_c586 ; get the tile in front of the player in c
call Predef ; get the tile in front of the player in c
ld hl,W_TILESETTALKINGOVERTILES ; list of tiles that extend talking range (counter tiles) ld hl,W_TILESETTALKINGOVERTILES ; list of tiles that extend talking range (counter tiles)
ld b,$03 ld b,$03
ld d,$20 ; talking range in pixels (long range) ld d,$20 ; talking range in pixels (long range)
@ -1246,8 +1241,7 @@ CollisionCheckOnLand:: ; 0bd1 (0:0bd1)
; function that checks if the tile in front of the player is passable ; function that checks if the tile in front of the player is passable
; clears carry if it is, sets carry if not ; clears carry if it is, sets carry if not
CheckTilePassable:: ; 0c10 (0:0c10) CheckTilePassable:: ; 0c10 (0:0c10)
ld a,$35 predef Func_c586 ; get tile in front of player
call Predef ; get tile in front of player
ld a,[wcfc6] ; tile in front of player ld a,[wcfc6] ; tile in front of player
ld c,a ld c,a
ld hl,W_TILESETCOLLISIONPTR ; pointer to list of passable tiles ld hl,W_TILESETCOLLISIONPTR ; pointer to list of passable tiles
@ -1271,8 +1265,7 @@ CheckTilePassable:: ; 0c10 (0:0c10)
; sets carry if there is a collision and unsets carry if not ; sets carry if there is a collision and unsets carry if not
CheckForJumpingAndTilePairCollisions:: ; 0c2a (0:0c2a) CheckForJumpingAndTilePairCollisions:: ; 0c2a (0:0c2a)
push hl push hl
ld a,$35 predef Func_c586 ; get the tile in front of the player
call Predef ; get the tile in front of the player
push de push de
push bc push bc
callba HandleLedges ; check if the player is trying to jump a ledge callba HandleLedges ; check if the player is trying to jump a ledge
@ -1920,8 +1913,7 @@ CollisionCheckOnWater:: ; 0fb7 (0:0fb7)
ld hl,TilePairCollisionsWater ld hl,TilePairCollisionsWater
call CheckForJumpingAndTilePairCollisions call CheckForJumpingAndTilePairCollisions
jr c,.collision jr c,.collision
ld a,$35 predef Func_c586 ; get tile in front of player (puts it in c and [wcfc6])
call Predef ; get tile in front of player (puts it in c and [wcfc6])
ld a,[wcfc6] ; tile in front of player ld a,[wcfc6] ; tile in front of player
cp a,$14 ; water tile cp a,$14 ; water tile
jr z,.noCollision ; keep surfing if it's a water tile jr z,.noCollision ; keep surfing if it's a water tile
@ -2274,8 +2266,7 @@ LoadMapHeader:: ; 107c (0:107c)
dec b dec b
jp nz,.loadSpriteLoop jp nz,.loadSpriteLoop
.finishUp .finishUp
ld a,$19 predef Func_c754 ; load tileset data
call Predef ; load tileset data
callab LoadWildData ; load wild pokemon data callab LoadWildData ; load wild pokemon data
pop hl ; restore hl from before going to the warp/sign/sprite data (this value was saved for seemingly no purpose) pop hl ; restore hl from before going to the warp/sign/sprite data (this value was saved for seemingly no purpose)
ld a,[W_CURMAPHEIGHT] ; map height in 4x4 tile blocks ld a,[W_CURMAPHEIGHT] ; map height in 4x4 tile blocks

45
main.asm
View file

@ -49,8 +49,7 @@ Func_40b0::
ld [$ffa3], a ld [$ffa3], a
ld a, 2 ld a, 2
ld [$ffa4], a ld [$ffa4], a
ld a, $d ; DivideBCDPredef predef DivideBCDPredef3
call Predef
ld a, [$ffa2] ld a, [$ffa2]
ld [wPlayerMoney], a ld [wPlayerMoney], a
ld a, [$ffa2 + 1] ld a, [$ffa2 + 1]
@ -65,8 +64,7 @@ Func_40b0::
set 6, [hl] set 6, [hl]
ld a, %11111111 ld a, %11111111
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, $7 ; HealParty predef_jump HealParty
jp Predef
MewPicFront:: INCBIN "pic/bmon/mew.pic" MewPicFront:: INCBIN "pic/bmon/mew.pic"
@ -520,8 +518,7 @@ INCLUDE "engine/oak_speech.asm"
Func_62ce: ; 62ce (1:62ce) Func_62ce: ; 62ce (1:62ce)
call Func_62ff call Func_62ff
ld a,$19 predef Func_c754
call Predef
ld hl,wd732 ld hl,wd732
bit 2,[hl] bit 2,[hl]
res 2,[hl] res 2,[hl]
@ -714,8 +711,7 @@ SubtractAmountPaidFromMoney_: ; 6b21 (1:6b21)
ld de,wPlayerMoney + 2 ld de,wPlayerMoney + 2
ld hl,$ffa1 ; total price of items ld hl,$ffa1 ; total price of items
ld c,3 ; length of money in bytes ld c,3 ; length of money in bytes
ld a,$0c predef SubBCDPredef ; subtract total price from money
call Predef ; subtract total price from money
ld a,$13 ld a,$13
ld [wd125],a ld [wd125],a
call DisplayTextBoxID ; redraw money text box call DisplayTextBoxID ; redraw money text box
@ -1927,22 +1923,19 @@ _RemovePokemon: ; 7b68 (1:7b68)
Func_7c18: ; 7c18 (1:7c18) Func_7c18: ; 7c18 (1:7c18)
ld hl, wd730 ld hl, wd730
set 6, [hl] set 6, [hl]
ld a, $3d predef ShowPokedexData
call Predef
ld hl, wd730 ld hl, wd730
res 6, [hl] res 6, [hl]
call ReloadMapData call ReloadMapData
ld c, $a ld c, $a
call DelayFrames call DelayFrames
ld a, $3a predef IndexToPokedex
call Predef
ld a, [wd11e] ld a, [wd11e]
dec a dec a
ld c, a ld c, a
ld b, $1 ld b, $1
ld hl, wPokedexSeen ld hl, wPokedexSeen
ld a, $10 predef FlagActionPredef
call Predef
ld a, $1 ld a, $1
ld [wcc3c], a ld [wcc3c], a
ret ret
@ -2531,13 +2524,11 @@ Func_c69c: ; c69c (3:469c)
and a and a
jr z, .asm_c733 jr z, .asm_c733
ld b, $2 ld b, $2
ld a, $1f predef Func_480eb
call Predef
ld a, (SFX_02_43 - SFX_Headers_02) / 3 ld a, (SFX_02_43 - SFX_Headers_02) / 3
call PlaySound call PlaySound
.asm_c733 .asm_c733
ld a, $14 predef AnyPartyAlive
call Predef
ld a, d ld a, d
and a and a
jr nz, .asm_c74f jr nz, .asm_c74f
@ -3137,8 +3128,7 @@ Func_f113: ; f113 (3:7113)
ld c, a ld c, a
ld b, $1 ld b, $1
ld hl, W_TOWNVISITEDFLAG ; mark town as visited (for flying) ld hl, W_TOWNVISITEDFLAG ; mark town as visited (for flying)
ld a, $10 ; FlagActionPredef predef FlagActionPredef
call Predef
.notInTown .notInTown
ld hl, MapHSPointers ld hl, MapHSPointers
ld a, [W_CURMAP] ; W_CURMAP ld a, [W_CURMAP] ; W_CURMAP
@ -3378,8 +3368,7 @@ Func_f225: ; f225 (3:7225)
ld a, [hJoyHeld] ld a, [hJoyHeld]
and $f0 and $f0
ret z ret z
ld a, $5a predef Func_c60b
call Predef
ld a, [wd71c] ld a, [wd71c]
and a and a
jp nz, Func_f2dd jp nz, Func_f2dd
@ -3499,8 +3488,7 @@ _AddPartyMon: ; f2e5 (3:72e5)
call SkipFixedLengthTextEntries call SkipFixedLengthTextEntries
ld a, $2 ld a, $2
ld [wd07d], a ld [wd07d], a
ld a, $4e predef AskName
call Predef
.asm_f33f .asm_f33f
ld hl, wPartyMons ld hl, wPartyMons
ld a, [wcc49] ld a, [wcc49]
@ -3532,8 +3520,7 @@ _AddPartyMon: ; f2e5 (3:72e5)
ld a, [wcf91] ld a, [wcf91]
ld [wd11e], a ld [wd11e], a
push de push de
ld a, $3a predef IndexToPokedex
call Predef
pop de pop de
ld a, [wd11e] ld a, [wd11e]
dec a dec a
@ -3635,8 +3622,7 @@ _AddPartyMon: ; f2e5 (3:72e5)
dec de dec de
xor a xor a
ld [wHPBarMaxHP], a ld [wHPBarMaxHP], a
ld a, $3e predef WriteMonMoves
call Predef
pop de pop de
ld a, [wPlayerID] ; set trainer ID to player ID ld a, [wPlayerID] ; set trainer ID to player ID
inc de inc de
@ -3770,8 +3756,7 @@ _AddEnemyMonToPlayerParty: ; f49d (3:749d)
call CopyData ; write new mon's nickname (from an enemy mon) call CopyData ; write new mon's nickname (from an enemy mon)
ld a, [wcf91] ld a, [wcf91]
ld [wd11e], a ld [wd11e], a
ld a, $3a predef IndexToPokedex
call Predef
ld a, [wd11e] ld a, [wd11e]
dec a dec a
ld c, a ld c, a

3
scripts/agatha.asm
View file

@ -24,8 +24,7 @@ AgathaScript_76443: ; 76443 (1d:6443)
AgathaScript_76459: ; 76459 (1d:6459) AgathaScript_76459: ; 76459 (1d:6459)
ld [wd09f], a ld [wd09f], a
ld bc, $2 ld bc, $2
ld a, $17 predef_jump Func_ee9e
jp Predef
AgathaScript_76464: ; 76464 (1d:6464) AgathaScript_76464: ; 76464 (1d:6464)
xor a xor a

12
scripts/billshouse.asm
View file

@ -41,8 +41,7 @@ BillsHouseScript2: ; 1e7a6 (7:67a6)
ret nz ret nz
ld a, $61 ld a, $61
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld hl, wd7f2 ld hl, wd7f2
set 6, [hl] set 6, [hl]
xor a xor a
@ -70,8 +69,7 @@ BillsHouseScript3: ; 1e7c5 (7:67c5)
call Func_32f9 call Func_32f9
ld a, $62 ld a, $62
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef ShowObject
call Predef
ld c, $8 ld c, $8
call DelayFrames call DelayFrames
ld a, $2 ld a, $2
@ -165,12 +163,10 @@ BillsHouseText2: ; 1e874 (7:6874)
set 4, [hl] set 4, [hl]
ld a, $7 ld a, $7
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef ShowObject
call Predef
ld a, $9 ld a, $9
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
.asm_5491f ; 0x1e8a9 .asm_5491f ; 0x1e8a9
ld hl, BillsHouseText_1e8cb ld hl, BillsHouseText_1e8cb
call PrintText call PrintText

3
scripts/blueshouse.asm
View file

@ -44,8 +44,7 @@ BluesHouseText1: ; 19b5d (6:5b5d)
jr nc, .BagFull jr nc, .BagFull
ld a,$29 ld a,$29
ld [wcc4d],a ld [wcc4d],a
ld a,$11 predef HideObject ; hide table map object
call Predef ; hide table map object
ld hl,GotMapText ld hl,GotMapText
call PrintText call PrintText
ld hl,wd74a ld hl,wd74a

3
scripts/bruno.asm
View file

@ -24,8 +24,7 @@ BrunoScript_762ec: ; 762ec (1d:62ec)
BrunoScript_76302: ; 76302 (1d:6302) BrunoScript_76302: ; 76302 (1d:6302)
ld [wd09f], a ld [wd09f], a
ld bc, $2 ld bc, $2
ld a, $17 predef_jump Func_ee9e
jp Predef
BrunoScript_7630d: ; 7630d (1d:630d) BrunoScript_7630d: ; 7630d (1d:630d)
xor a xor a

24
scripts/celadongamecorner.asm
View file

@ -34,8 +34,7 @@ CeladonGameCornerScript_48bec: ; 48bec (12:4bec)
ld a, $2a ld a, $2a
ld [wd09f], a ld [wd09f], a
ld bc, $0208 ld bc, $0208
ld a, $17 predef_jump Func_ee9e
jp Predef
CeladonGameCornerScript_48c07: ; 48c07 (12:4c07) CeladonGameCornerScript_48c07: ; 48c07 (12:4c07)
xor a xor a
@ -97,8 +96,7 @@ CeladonGameCornerScript2: ; 48c69 (12:4c69)
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, $46 ld a, $46
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld hl, wd126 ld hl, wd126
set 5, [hl] set 5, [hl]
set 6, [hl] set 6, [hl]
@ -157,8 +155,7 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9)
ld hl, $ffa1 ld hl, $ffa1
ld de, wPlayerMoney + 2 ld de, wPlayerMoney + 2
ld c, $3 ld c, $3
ld a, $c ; SubBCDPredef predef SubBCDPredef
call Predef
xor a xor a
ldh [$9f], a ldh [$9f], a
ldh [$a0], a ldh [$a0], a
@ -167,8 +164,7 @@ CeladonGameCornerText2: ; 48ca9 (12:4ca9)
ld de, wPlayerCoins + 1 ld de, wPlayerCoins + 1
ld hl, $ffa1 ld hl, $ffa1
ld c, $2 ld c, $2
ld a, $b ; AddBCDPredef predef AddBCDPredef
call Predef
call CeladonGameCornerScript_48f1e call CeladonGameCornerScript_48f1e
ld hl, CeladonGameCornerText_48d27 ld hl, CeladonGameCornerText_48d27
jr .asm_e2afd ; 0x48d0d jr .asm_e2afd ; 0x48d0d
@ -236,8 +232,7 @@ CeladonGameCornerText5: ; 48d4a (12:4d4a)
ld de, wPlayerCoins + 1 ld de, wPlayerCoins + 1
ld hl, $ffa1 ld hl, $ffa1
ld c, $2 ld c, $2
ld a, $b ; AddBCDPredef predef AddBCDPredef
call Predef
ld hl, wd77e ld hl, wd77e
set 2, [hl] set 2, [hl]
ld a, $1 ld a, $1
@ -319,8 +314,7 @@ CeladonGameCornerText9: ; 48dd9 (12:4dd9)
ld de, wPlayerCoins + 1 ld de, wPlayerCoins + 1
ld hl, $ffa1 ld hl, $ffa1
ld c, $2 ld c, $2
ld a, $b ; AddBCDPredef predef AddBCDPredef
call Predef
ld hl, wd77e ld hl, wd77e
set 4, [hl] set 4, [hl]
ld hl, Received20CoinsText ld hl, Received20CoinsText
@ -373,8 +367,7 @@ CeladonGameCornerText10: ; 48e3b (12:4e3b)
ld de, wPlayerCoins + 1 ld de, wPlayerCoins + 1
ld hl, $ffa1 ld hl, $ffa1
ld c, $2 ld c, $2
ld a, $b ; AddBCDPredef predef AddBCDPredef
call Predef
ld hl, wd77e ld hl, wd77e
set 3, [hl] set 3, [hl]
ld hl, CeladonGameCornerText_48e8d ld hl, CeladonGameCornerText_48e8d
@ -456,8 +449,7 @@ CeladonGameCornerText12: ; 48edd (12:4edd)
ld a, $43 ld a, $43
ld [wd09f], a ld [wd09f], a
ld bc, $0208 ld bc, $0208
ld a, $17 predef Func_ee9e
call Predef
jp TextScriptEnd jp TextScriptEnd
CeladonGameCornerText_48f09: ; 48f09 (12:4f09) CeladonGameCornerText_48f09: ; 48f09 (12:4f09)

3
scripts/celadonmansion5.asm
View file

@ -16,7 +16,6 @@ CeladonMansion5Text2: ; 1dd46 (7:5d46)
jr nc, .asm_24365 ; 0x1dd4d jr nc, .asm_24365 ; 0x1dd4d
ld a, $45 ld a, $45
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
.asm_24365 ; 0x1dd59 .asm_24365 ; 0x1dd59
jp TextScriptEnd jp TextScriptEnd

3
scripts/celadonmartelevator.asm
View file

@ -66,6 +66,5 @@ CeladonMartElevatorText1: ; 4865e (12:465e)
db $08 ; asm db $08 ; asm
call CeladonMartElevatorScript_48631 call CeladonMartElevatorScript_48631
ld hl, CeldaonMartElevatorWarpMaps ; $464a ld hl, CeldaonMartElevatorWarpMaps ; $464a
ld a, $61 predef Func_1c9c6
call Predef
jp TextScriptEnd jp TextScriptEnd

3
scripts/celadonmartroof.asm
View file

@ -14,8 +14,7 @@ CeladonMartRoofScript_483d8: ; 483d8 (12:43d8)
push de push de
ld [wd11e], a ld [wd11e], a
ld b, a ld b, a
ld a, $1c predef IsItemInBag_
call Predef
pop de pop de
pop hl pop hl
ld a, b ld a, b

9
scripts/ceruleancity.asm
View file

@ -10,8 +10,7 @@ CeruleanCityScript_1948c: ; 1948c (6:548c)
ld [W_CERULEANCITYCURSCRIPT], a ld [W_CERULEANCITYCURSCRIPT], a
ld a, $5 ld a, $5
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef_jump HideObject
jp Predef
CeruleanCityScriptPointers: ; 1949d (6:549d) CeruleanCityScriptPointers: ; 1949d (6:549d)
dw CeruleanCityScript0 dw CeruleanCityScript0
@ -91,8 +90,7 @@ CeruleanCityScript0: ; 194c8 (6:54c8)
.asm_19535 .asm_19535
ld a, $5 ld a, $5
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef ShowObject
call Predef
ld de, CeruleanCityMovement1 ld de, CeruleanCityMovement1
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
@ -208,8 +206,7 @@ CeruleanCityScript3: ; 19610 (6:5610)
ret nz ret nz
ld a, $5 ld a, $5
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
call Func_2307 call Func_2307

9
scripts/ceruleancity2.asm
View file

@ -5,15 +5,12 @@ Func_74872: ; 74872 (1d:4872)
call GBFadeIn1 call GBFadeIn1
ld a, $07 ld a, $07
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef ShowObject
call Predef
ld a, $09 ld a, $09
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, $06 ld a, $06
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
call GBFadeOut1 call GBFadeOut1
ret ret

3
scripts/ceruleanhouse1.asm
View file

@ -13,6 +13,5 @@ CeruleanHouse1Text2: ; 1d702 (7:5702)
db $08 ; asm db $08 ; asm
ld a, $6 ld a, $6
ld [wWhichTrade], a ld [wWhichTrade], a
ld a, $54 predef Predef54
call Predef
jp TextScriptEnd jp TextScriptEnd

3
scripts/ceruleanhousetrashed.asm
View file

@ -10,8 +10,7 @@ CeruleanHouseTrashedTextPointers: ; 1d689 (7:5689)
CeruleanHouseTrashedText1: ; 1d68f (7:568f) CeruleanHouseTrashedText1: ; 1d68f (7:568f)
db $08 ; asm db $08 ; asm
ld b, $e4 ld b, $e4
ld a, $1c predef IsItemInBag_
call Predef
and b and b
jr z, .asm_f8734 ; 0x1d698 jr z, .asm_f8734 ; 0x1d698
ld hl, CeruleanHouseTrashedText_1d6b0 ld hl, CeruleanHouseTrashedText_1d6b0

3
scripts/cinnabargym.asm
View file

@ -87,8 +87,7 @@ CinnabarGymScript1: ; 757dc (1d:57dc)
jp DisplayTextID jp DisplayTextID
CinnabarGymScript_757f1: ; 757f1 (1d:57f1) CinnabarGymScript_757f1: ; 757f1 (1d:57f1)
ld a, $10 ; FlagActionPredef predef_jump FlagActionPredef
jp Predef
CinnabarGymScript2: ; 757f6 (1d:57f6) CinnabarGymScript2: ; 757f6 (1d:57f6)
ld a, [W_ISINBATTLE] ld a, [W_ISINBATTLE]

9
scripts/daycarem.asm
View file

@ -120,8 +120,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
push hl push hl
push de push de
push bc push bc
ld a, $b ; AddBCDPredef predef AddBCDPredef
call Predef
pop bc pop bc
pop de pop de
pop hl pop hl
@ -156,8 +155,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
inc hl inc hl
ld de, wPlayerMoney + 2 ld de, wPlayerMoney + 2
ld c, $3 ld c, $3
ld a, $c ; SubBCDPredef predef SubBCDPredef
call Predef
ld a, (SFX_02_5a - SFX_Headers_02) / 3 ld a, (SFX_02_5a - SFX_Headers_02) / 3
call PlaySoundWaitForCurrent call PlaySoundWaitForCurrent
ld a, $13 ld a, $13
@ -181,8 +179,7 @@ DayCareMScript_562e1: ; 562e1 (15:62e1)
ld e, l ld e, l
ld a, $1 ld a, $1
ld [wHPBarMaxHP], a ld [wHPBarMaxHP], a
ld a, $3e predef WriteMonMoves
call Predef
pop bc pop bc
pop af pop af
ld hl, wPartyMon1HP ld hl, wPartyMon1HP

6
scripts/fightingdojo.asm
View file

@ -281,8 +281,7 @@ FightingDojoText6: ; 5cf06 (17:4f06)
; once Poké Ball is taken, hide sprite ; once Poké Ball is taken, hide sprite
ld a, $4a ld a, $4a
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld hl, wd7b1 ld hl, wd7b1
set 6, [hl] set 6, [hl]
set 0, [hl] set 0, [hl]
@ -323,8 +322,7 @@ FightingDojoText7: ; 5cf4e (17:4f4e)
; once Poké Ball is taken, hide sprite ; once Poké Ball is taken, hide sprite
ld a, $4b ld a, $4b
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
.done .done
jp TextScriptEnd jp TextScriptEnd

6
scripts/gary.asm
View file

@ -122,8 +122,7 @@ GaryScript4: ; 75fe4 (1d:5fe4)
call MoveSprite call MoveSprite
ld a, $d6 ld a, $d6
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef ShowObject
call Predef
ld a, $5 ld a, $5
ld [W_GARYCURSCRIPT], a ld [W_GARYCURSCRIPT], a
ret ret
@ -193,8 +192,7 @@ GaryScript8: ; 76083 (1d:6083)
ret nz ret nz
ld a, $d6 ld a, $d6
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, $9 ld a, $9
ld [W_GARYCURSCRIPT], a ld [W_GARYCURSCRIPT], a
ret ret

6
scripts/halloffameroom.asm
View file

@ -25,8 +25,7 @@ HallofFameRoomScript2: ; 5a4bb (16:64bb)
push af push af
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, $55 predef HallOfFamePC
call Predef
pop af pop af
ld [wd358], a ld [wd358], a
ld hl, W_FLAGS_D733 ld hl, W_FLAGS_D733
@ -101,8 +100,7 @@ HallofFameRoomScript1: ; 5a52b (16:652b)
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, $8 ld a, $8
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, $2 ld a, $2
ld [W_HALLOFFAMEROOMCURSCRIPT], a ld [W_HALLOFFAMEROOMCURSCRIPT], a
ret ret

3
scripts/lab2.asm
View file

@ -21,6 +21,5 @@ Lab2Text3: ; 75c37 (1d:5c37)
ld a, $8 ld a, $8
ld [wWhichTrade], a ld [wWhichTrade], a
asm_78552: ; 75c3d (1d:5c3d) asm_78552: ; 75c3d (1d:5c3d)
ld a, $54 predef Predef54
call Predef
jp TextScriptEnd jp TextScriptEnd

6
scripts/lab4.asm
View file

@ -18,8 +18,7 @@ Lab4Script_75d38: ; 75d38 (1d:5d38)
push de push de
ld [wd11e], a ld [wd11e], a
ld b, a ld b, a
ld a, $1c predef IsItemInBag_
call Predef
pop de pop de
pop hl pop hl
ld a, b ld a, b
@ -105,8 +104,7 @@ Lab4Text2: ; 75dda (1d:5dda)
db $08 ; asm db $08 ; asm
ld a, $3 ld a, $3
ld [wWhichTrade], a ld [wWhichTrade], a
ld a, $54 predef Predef54
call Predef
jp TextScriptEnd jp TextScriptEnd
LoadFossilItemAndMonNameBank1D: ; 75de8 (1d:5de8) LoadFossilItemAndMonNameBank1D: ; 75de8 (1d:5de8)

3
scripts/lance.asm
View file

@ -34,8 +34,7 @@ LanceScript_5a2de: ; 5a2de (16:62de)
ld bc, $603 ld bc, $603
LanceScript_5a2f0: ; 5a2f0 (16:62f0) LanceScript_5a2f0: ; 5a2f0 (16:62f0)
ld a, $17 predef_jump Func_ee9e
jp Predef
LanceScript_5a2f5: ; 5a2f5 (16:62f5) LanceScript_5a2f5: ; 5a2f5 (16:62f5)
xor a xor a

3
scripts/lorelei.asm
View file

@ -25,8 +25,7 @@ LoreleiScript_76191: ; 76191 (1d:6191)
.asm_761ab .asm_761ab
ld [wd09f], a ld [wd09f], a
ld bc, $2 ld bc, $2
ld a, $17 predef_jump Func_ee9e
jp Predef
LoreleiScript_761b6: ; 761b6 (1d:61b6) LoreleiScript_761b6: ; 761b6 (1d:61b6)
xor a xor a

3
scripts/mansion1.asm
View file

@ -43,8 +43,7 @@ Mansion1Script_4430b: ; 4430b (11:430b)
ld a, $e ld a, $e
ld [wd09f], a ld [wd09f], a
asm_44310: ; 44310 (11:4310) asm_44310: ; 44310 (11:4310)
ld a, $17 predef Func_ee9e
call Predef
ret ret
Mansion1Script_Switches: ; 44316 (11:4316) Mansion1Script_Switches: ; 44316 (11:4316)

3
scripts/mansion2.asm
View file

@ -40,8 +40,7 @@ Mansion2Script_51fee: ; 51fee (14:5fee)
Mansion2Script_5202f: ; 5202f (14:602f) Mansion2Script_5202f: ; 5202f (14:602f)
ld [wd09f], a ld [wd09f], a
ld a, $17 predef_jump Func_ee9e
jp Predef
Mansion2Script_Switches: ; 52037 (14:6037) Mansion2Script_Switches: ; 52037 (14:6037)
ld a, [wSpriteStateData1 + 9] ld a, [wSpriteStateData1 + 9]

9
scripts/mtmoon3.asm
View file

@ -151,8 +151,7 @@ MtMoon3Script5: ; 49dfb (12:5dfb)
ld a, $6d ld a, $6d
.asm_49e1f .asm_49e1f
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, $0 ld a, $0
@ -284,8 +283,7 @@ MtMoon3Text6: ; 49ee9 (12:5ee9)
call MtMoon3Script_49f69 call MtMoon3Script_49f69
ld a, $6d ld a, $6d
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld hl, wd7f6 ld hl, wd7f6
set 6, [hl] set 6, [hl]
ld a, $4 ld a, $4
@ -314,8 +312,7 @@ MtMoon3Text7: ; 49f29 (12:5f29)
call MtMoon3Script_49f69 call MtMoon3Script_49f69
ld a, $6e ld a, $6e
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld hl, wd7f6 ld hl, wd7f6
set 7, [hl] set 7, [hl]
ld a, $4 ld a, $4

3
scripts/mtmoonpokecenter.asm
View file

@ -55,8 +55,7 @@ MtMoonPokecenterText4: ; 492ec (12:52ec)
ld hl, wTrainerFacingDirection ld hl, wTrainerFacingDirection
ld de, wPlayerMoney + 2 ld de, wPlayerMoney + 2
ld c, $3 ld c, $3
ld a, $c ; SubBCDPredef predef SubBCDPredef
call Predef
ld a, $13 ld a, $13
ld [wd125], a ld [wd125], a
call DisplayTextBoxID call DisplayTextBoxID

6
scripts/museum1f.asm
View file

@ -103,8 +103,7 @@ Museum1FText1: ; 5c135 (17:4135)
ld hl, wTrainerFacingDirection ld hl, wTrainerFacingDirection
ld de, wPlayerMoney + 2 ld de, wPlayerMoney + 2
ld c, $3 ld c, $3
ld a, $c ; SubBCDPredef predef SubBCDPredef
call Predef
ld a, $13 ld a, $13
ld [wd125], a ld [wd125], a
call DisplayTextBoxID call DisplayTextBoxID
@ -203,8 +202,7 @@ Museum1FText3: ; 5c256 (17:4256)
set 1, [hl] set 1, [hl]
ld a, $34 ld a, $34
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld hl, ReceivedOldAmberText ld hl, ReceivedOldAmberText
jr .asm_52e0f ; 0x5c27e jr .asm_52e0f ; 0x5c27e
.BagFull .BagFull

54
scripts/oakslab.asm
View file

@ -40,8 +40,7 @@ OaksLabScript0: ; 1cb4e (7:4b4e)
ret nz ret nz
ld a, $31 ld a, $31
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef ShowObject
call Predef
ld hl, wd72e ld hl, wd72e
res 4, [hl] res 4, [hl]
@ -68,12 +67,10 @@ OaksLabScript2: ; 1cb82 (7:4b82)
ret nz ret nz
ld a, $31 ld a, $31
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, $2e ld a, $2e
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef ShowObject
call Predef
ld a, $3 ld a, $3
ld [W_OAKSLABCURSCRIPT], a ld [W_OAKSLABCURSCRIPT], a
@ -294,8 +291,7 @@ OaksLabScript9: ; 1cd00 (7:4d00)
ld a, $2d ld a, $2d
.asm_1cd32 .asm_1cd32
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
call Delay3 call Delay3
ld a, [wWhichTrade] ld a, [wWhichTrade]
ld [W_RIVALSTARTER], a ld [W_RIVALSTARTER], a
@ -341,13 +337,11 @@ OaksLabScript10: ; 1cd6d (7:4d6d)
ld a, $1 ld a, $1
swap a swap a
ld [$ff95], a ld [$ff95], a
ld a, $22 predef Func_f929
call Predef
ld a, [$ff95] ld a, [$ff95]
dec a dec a
ld [$ff95], a ld [$ff95], a
ld a, $20 predef Func_f8ba
call Predef
ld de, wcc97 ld de, wcc97
ld a, $1 ld a, $1
ld [$ff8c], a ld [$ff8c], a
@ -410,8 +404,7 @@ OaksLabScript12: ; 1ce03 (7:4e03)
xor a xor a
ld [$ff8d], a ld [$ff8d], a
call Func_34a6 ; face object call Func_34a6 ; face object
ld a, $7 predef HealParty
call Predef
ld hl, wd74b ld hl, wd74b
set 3, [hl] set 3, [hl]
@ -454,8 +447,7 @@ OaksLabScript14: ; 1ce6d (7:4e6d)
jr nz, .asm_1ce8c ; 0x1ce72 $18 jr nz, .asm_1ce8c ; 0x1ce72 $18
ld a, $2a ld a, $2a
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
call Func_2307 ; reset to map music call Func_2307 ; reset to map music
@ -498,8 +490,7 @@ OaksLabScript15: ; 1ceb0 (7:4eb0)
call OaksLabScript_1d02b call OaksLabScript_1d02b
ld a, $2a ld a, $2a
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef ShowObject
call Predef
ld a, [wcd37] ld a, [wcd37]
ld [wd157], a ld [wd157], a
ld b, $0 ld b, $0
@ -558,12 +549,10 @@ OaksLabScript16: ; 1cf12 (7:4f12)
call Delay3 call Delay3
ld a, $2f ld a, $2f
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, $30 ld a, $30
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
call OaksLabScript_1cefd call OaksLabScript_1cefd
ld a, $1a ld a, $1a
ld [$ff8c], a ld [$ff8c], a
@ -583,12 +572,10 @@ OaksLabScript16: ; 1cf12 (7:4f12)
set 0, [hl] set 0, [hl]
ld a, $1 ld a, $1
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, $2 ld a, $2
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef ShowObject
call Predef
ld a, [wd157] ld a, [wd157]
ld b, $0 ld b, $0
ld c, a ld c, a
@ -616,16 +603,14 @@ OaksLabScript17: ; 1cfd4 (7:4fd4)
call Func_2307 call Func_2307
ld a, $2a ld a, $2a
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld hl, wd7eb ld hl, wd7eb
set 0, [hl] set 0, [hl]
res 1, [hl] res 1, [hl]
set 7, [hl] set 7, [hl]
ld a, $22 ld a, $22
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef ShowObject
call Predef
ld a, $5 ld a, $5
ld [W_PALLETTOWNCURSCRIPT], a ld [W_PALLETTOWNCURSCRIPT], a
xor a xor a
@ -846,8 +831,7 @@ OaksLabScript_1d157: ; 1d157 (7:5157)
ld [hl], $c ld [hl], $c
ld hl, wd730 ld hl, wd730
set 6, [hl] set 6, [hl]
ld a, $46 predef StarterDex ; StarterDex
call Predef ; StarterDex
ld hl, wd730 ld hl, wd730
res 6, [hl] res 6, [hl]
call ReloadMapData call ReloadMapData
@ -907,8 +891,7 @@ asm_1d1e3: ; 1d1e3 (7:51e3)
ld a, $2d ld a, $2d
asm_1d1e5: ; 1d1e5 (7:51e5) asm_1d1e5: ; 1d1e5 (7:51e5)
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, $1 ld a, $1
ld [wcc3c], a ld [wcc3c], a
ld hl, OaksLabMonEnergeticText ld hl, OaksLabMonEnergeticText
@ -974,8 +957,7 @@ OaksLabText5: ; 1d248 (7:5248)
call PrintText call PrintText
ld a, $1 ld a, $1
ld [wcc3c], a ld [wcc3c], a
ld a, $56 predef DisplayDexRating
call Predef
jp .asm_0f042 jp .asm_0f042
.asm_b28b0 ; 0x1d279 .asm_b28b0 ; 0x1d279
ld b,POKE_BALL ld b,POKE_BALL

18
scripts/pallettown.asm
View file

@ -56,8 +56,7 @@ PalletTownScript1: ; 18eb2 (6:4eb2)
ld [wJoyIgnore],a ld [wJoyIgnore],a
ld a,0 ld a,0
ld [wcc4d],a ld [wcc4d],a
ld a,$15 predef ShowObject
call Predef
; trigger the next script ; trigger the next script
ld a,2 ld a,2
@ -78,12 +77,10 @@ PalletTownScript2: ; 18ed2 (6:4ed2)
ld a,1 ld a,1
swap a swap a
ld [$FF95],a ld [$FF95],a
ld a,$22 predef Func_f929
call Predef
ld hl,$FF95 ld hl,$FF95
dec [hl] dec [hl]
ld a,$20 predef Func_f8ba ; load Oak’s movement into wcc97
call Predef ; load Oak’s movement into wcc97
ld de,wcc97 ld de,wcc97
ld a,1 ; oak ld a,1 ; oak
ld [$FF8C],a ld [$FF8C],a
@ -146,12 +143,10 @@ PalletTownScript5: ; 18f56 (6:4f56)
set 2,[hl] set 2,[hl]
ld a,$27 ld a,$27
ld [wcc4d],a ld [wcc4d],a
ld a,$11 predef HideObject
call Predef
ld a,$28 ld a,$28
ld [wcc4d],a ld [wcc4d],a
ld a,$15 predef_jump ShowObject
jp Predef
.next .next
ld a,[wd74b] ld a,[wd74b]
bit 4,a bit 4,a
@ -193,8 +188,7 @@ OakAppearsText: ; 18fb0 (6:4fb0)
xor a xor a
ld [wcd4f],a ld [wcd4f],a
ld [wcd50],a ld [wcd50],a
ld a,$4C predef EmotionBubble ; display ! over head
call Predef ; display ! over head
ld a,4 ld a,4
ld [wd528],a ld [wd528],a
jp TextScriptEnd jp TextScriptEnd

12
scripts/pewtercity.asm
View file

@ -87,8 +87,7 @@ PewterCityScript2: ; 192d3 (6:52d3)
ret nz ret nz
ld a, $3 ld a, $3
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, $3 ld a, $3
ld [W_PEWTERCITYCURSCRIPT], a ld [W_PEWTERCITYCURSCRIPT], a
ret ret
@ -99,8 +98,7 @@ PewterCityScript3: ; 192e9 (6:52e9)
call Func_32fe call Func_32fe
ld a, $3 ld a, $3
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef ShowObject
call Predef
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, $0 ld a, $0
@ -153,8 +151,7 @@ PewterCityScript5: ; 19359 (6:5359)
ret nz ret nz
ld a, $4 ld a, $4
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, $6 ld a, $6
ld [W_PEWTERCITYCURSCRIPT], a ld [W_PEWTERCITYCURSCRIPT], a
ret ret
@ -165,8 +162,7 @@ PewterCityScript6: ; 1936f (6:536f)
call Func_32fe call Func_32fe
ld a, $4 ld a, $4
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef ShowObject
call Predef
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, $0 ld a, $0

6
scripts/pewtergym.asm
View file

@ -69,12 +69,10 @@ PewterGymScript_5c3df: ; 5c3df (17:43df)
ld a, $4 ld a, $4
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, $22 ld a, $22
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld hl, wd7eb ld hl, wd7eb
res 0, [hl] res 0, [hl]

3
scripts/pokemontower2.asm
View file

@ -101,8 +101,7 @@ PokemonTower2Script2: ; 605bb (18:45bb)
ret nz ret nz
ld a, $38 ld a, $38
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
call Func_2307 call Func_2307

3
scripts/pokemontower5.asm
View file

@ -32,8 +32,7 @@ PokemonTower5Script0: ; 6094b (18:494b)
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld hl, wd72e ld hl, wd72e
set 4, [hl] set 4, [hl]
ld a, $7 predef HealParty
call Predef
call GBFadeOut2 call GBFadeOut2
call Delay3 call Delay3
call Delay3 call Delay3

15
scripts/pokemontower7.asm
View file

@ -52,8 +52,7 @@ PokemonTower7Script3: ; 60d56 (18:4d56)
ld a, [hli] ld a, [hli]
jr nz, .missableObjectsListLoop jr nz, .missableObjectsListLoop
ld [wcc4d], a ; remove missable object ld [wcc4d], a ; remove missable object
ld a, $11 predef HideObject
call Predef
xor a xor a
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld [wcf13], a ld [wcf13], a
@ -69,8 +68,7 @@ PokemonTower7Script4: ; 60d86 (18:4d86)
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, $43 ld a, $43
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, $4 ld a, $4
ld [wSpriteStateData1 + 9], a ld [wSpriteStateData1 + 9], a
ld a, $95 ld a, $95
@ -226,16 +224,13 @@ PokemonTower7Text4: ; 60e8a (18:4e8a)
set 7, [hl] set 7, [hl]
ld a, $44 ld a, $44
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef ShowObject
call Predef
ld a, $17 ld a, $17
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, $18 ld a, $18
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef ShowObject
call Predef
ld a, $4 ld a, $4
ld [W_POKEMONTOWER7CURSCRIPT], a ld [W_POKEMONTOWER7CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a

3
scripts/rockethideout1.asm
View file

@ -30,8 +30,7 @@ RocketHideout1Script_44be0: ; 44be0 (11:4be0)
.asm_44c03 .asm_44c03
ld [wd09f], a ld [wd09f], a
ld bc, $080c ld bc, $080c
ld a, $17 predef_jump Func_ee9e
jp Predef
RocketHideout1ScriptPointers: ; 44c0e (11:4c0e) RocketHideout1ScriptPointers: ; 44c0e (11:4c0e)
dw CheckFightingMapTrainers dw CheckFightingMapTrainers

12
scripts/rockethideout4.asm
View file

@ -31,8 +31,7 @@ RocketHideout4Script_45473: ; 45473 (11:5473)
.asm_45498 .asm_45498
ld [wd09f], a ld [wd09f], a
ld bc, $050c ld bc, $050c
ld a, $17 predef_jump Func_ee9e
jp Predef
RocketHideout4Script_454a3: ; 454a3 (11:54a3) RocketHideout4Script_454a3: ; 454a3 (11:54a3)
xor a xor a
@ -62,12 +61,10 @@ RocketHideout4Script3: ; 454b6 (11:54b6)
call GBFadeIn1 call GBFadeIn1
ld a, $83 ld a, $83
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, $87 ld a, $87
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef ShowObject
call Predef
call UpdateSprites call UpdateSprites
call GBFadeOut1 call GBFadeOut1
xor a xor a
@ -222,8 +219,7 @@ RocketHideout4AfterBattleText4: ; 455cf (11:55cf)
jr nz, .asm_455e9 ; 0x455dd $a jr nz, .asm_455e9 ; 0x455dd $a
ld a, $88 ld a, $88
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef ShowObject
call Predef
.asm_455e9 .asm_455e9
jp TextScriptEnd jp TextScriptEnd

3
scripts/rockethideoutelevator.asm
View file

@ -68,8 +68,7 @@ RocketHideoutElevatorText1: ; 4576d (11:576d)
jr z, .asm_8d8f0 ; 0x45773 jr z, .asm_8d8f0 ; 0x45773
call RocketHideoutElevatorScript_45741 call RocketHideoutElevatorScript_45741
ld hl, RocketHideoutElevatorWarpMaps ; $5759 ld hl, RocketHideoutElevatorWarpMaps ; $5759
ld a, $61 predef Func_1c9c6
call Predef
jr .asm_46c43 ; 0x45780 jr .asm_46c43 ; 0x45780
.asm_8d8f0 ; 0x45782 .asm_8d8f0 ; 0x45782
ld hl, RocketHideoutElevatorText_4578b ld hl, RocketHideoutElevatorText_4578b

6
scripts/route11gateupstairs.asm
View file

@ -11,8 +11,7 @@ Route11GateUpstairsText1: ; 4945f (12:545f)
db $08 ; asm db $08 ; asm
xor a xor a
ld [wWhichTrade], a ld [wWhichTrade], a
ld a, $54 predef Predef54
call Predef
asm_49469: ; 49469 (12:5469) asm_49469: ; 49469 (12:5469)
jp TextScriptEnd jp TextScriptEnd
@ -32,8 +31,7 @@ Route11GateUpstairsText2: ; 4946c (12:546c)
ld de, wcc5b ld de, wcc5b
ld bc, $000d ld bc, $000d
call CopyData call CopyData
ld a, $62 predef OaksAideScript ; call oak's aide script
call Predef ; call oak's aide script
ld a, [$ffdb] ld a, [$ffdb]
dec a dec a
jr nz, .asm_494a1 ; 0x49494 $b jr nz, .asm_494a1 ; 0x49494 $b

3
scripts/route12.asm
View file

@ -36,8 +36,7 @@ Route12Script0: ; 59619 (16:5619)
ld [W_CURENEMYLVL], a ; W_CURENEMYLVL ld [W_CURENEMYLVL], a ; W_CURENEMYLVL
ld a, $1d ld a, $1d
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, $3 ld a, $3
ld [W_ROUTE12CURSCRIPT], a ld [W_ROUTE12CURSCRIPT], a
ld [W_CURMAPSCRIPT], a ld [W_CURMAPSCRIPT], a

3
scripts/route15gateupstairs.asm
View file

@ -20,8 +20,7 @@ Route15GateUpstairsText1: ; 49651 (12:5651)
ld de, wcc5b ld de, wcc5b
ld bc, $000d ld bc, $000d
call CopyData call CopyData
ld a, $62 predef OaksAideScript ; call oak's aide script
call Predef ; call oak's aide script
ld a, [$ffdb] ld a, [$ffdb]
cp $1 cp $1
jr nz, .asm_49689 ; 0x4967c $b jr nz, .asm_49689 ; 0x4967c $b

3
scripts/route16.asm
View file

@ -36,8 +36,7 @@ Route16Script0: ; 59959 (16:5959)
ld [W_CURENEMYLVL], a ; W_CURENEMYLVL ld [W_CURENEMYLVL], a ; W_CURENEMYLVL
ld a, $21 ld a, $21
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
call UpdateSprites call UpdateSprites
ld a, $3 ld a, $3
ld [W_ROUTE16CURSCRIPT], a ld [W_ROUTE16CURSCRIPT], a

3
scripts/route18gateupstairs.asm
View file

@ -10,8 +10,7 @@ Route18GateUpstairsText1: ; 4997e (12:597e)
db $08 ; asm db $08 ; asm
ld a, $5 ld a, $5
ld [wWhichTrade], a ld [wWhichTrade], a
ld a, $54 predef Predef54
call Predef
jp TextScriptEnd jp TextScriptEnd
Route18GateUpstairsText2: ; 4998c (12:598c) Route18GateUpstairsText2: ; 4998c (12:598c)

6
scripts/route20.asm
View file

@ -50,13 +50,11 @@ Route20Script_50cc6: ; 50cc6 (14:4cc6)
Route20Script_50d0c: ; 50d0c (14:4d0c) Route20Script_50d0c: ; 50d0c (14:4d0c)
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef_jump ShowObject
jp Predef
Route20Script_50d14: ; 50d14 (14:4d14) Route20Script_50d14: ; 50d14 (14:4d14)
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef_jump HideObject
jp Predef
Route20ScriptPointers: ; 50d1c (14:4d1c) Route20ScriptPointers: ; 50d1c (14:4d1c)
dw CheckFightingMapTrainers dw CheckFightingMapTrainers

12
scripts/route22.asm
View file

@ -82,8 +82,7 @@ Route22Script0: ; 50f00 (14:4f00)
ld [wcd4f], a ld [wcd4f], a
xor a xor a
ld [wcd50], a ld [wcd50], a
ld a, $4c predef EmotionBubble
call Predef
ld a, [wd700] ld a, [wd700]
and a and a
jr z, .asm_50f4e ; 0x50f44 $8 jr z, .asm_50f4e ; 0x50f44 $8
@ -208,8 +207,7 @@ Route22Script3: ; 5102a (14:502a)
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, $22 ld a, $22
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
call Func_2307 call Func_2307
ld hl, wd7eb ld hl, wd7eb
res 0, [hl] res 0, [hl]
@ -223,8 +221,7 @@ Route22Script_5104e: ; 5104e (14:504e)
ld [wcd4f], a ld [wcd4f], a
xor a xor a
ld [wcd50], a ld [wcd50], a
ld a, $4c predef EmotionBubble
call Predef
ld a, [wd700] ld a, [wd700]
and a and a
jr z, .skipYVisibilityTesta jr z, .skipYVisibilityTesta
@ -355,8 +352,7 @@ Route22Script6: ; 51151 (14:5151)
ld [wJoyIgnore], a ld [wJoyIgnore], a
ld a, $23 ld a, $23
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
call Func_2307 call Func_2307
ld hl, wd7eb ld hl, wd7eb
res 1, [hl] res 1, [hl]

15
scripts/route23.asm
View file

@ -18,12 +18,10 @@ Route23Script_511e9: ; 511e9 (14:51e9)
res 6, [hl] res 6, [hl]
ld a, $7a ld a, $7a
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef ShowObject
call Predef
ld a, $60 ld a, $60
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef_jump HideObject
jp Predef
Route23ScriptPointers: ; 51213 (14:5213) Route23ScriptPointers: ; 51213 (14:5213)
dw Route23Script0 dw Route23Script0
@ -56,8 +54,7 @@ Route23Script0: ; 51219 (14:5219)
ld [wWhichTrade], a ld [wWhichTrade], a
ld b, $2 ld b, $2
ld hl, wd7ed ld hl, wd7ed
ld a, $10 predef FlagActionPredef
call Predef
ld a, c ld a, c
and a and a
ret nz ret nz
@ -198,8 +195,7 @@ Route23Script_51346: ; 51346 (14:5346)
ld c, a ld c, a
ld b, $2 ld b, $2
ld hl, W_OBTAINEDBADGES ld hl, W_OBTAINEDBADGES
ld a, $10 ; FlagActionPredef predef FlagActionPredef
call Predef
ld a, c ld a, c
and a and a
jr nz, .asm_5136e jr nz, .asm_5136e
@ -216,8 +212,7 @@ Route23Script_51346: ; 51346 (14:5346)
ld c, a ld c, a
ld b, $1 ld b, $1
ld hl, wd7ed ld hl, wd7ed
ld a, $10 ; FlagActionPredef predef FlagActionPredef
call Predef
ld a, $2 ld a, $2
ld [W_ROUTE23CURSCRIPT], a ld [W_ROUTE23CURSCRIPT], a
ret ret

12
scripts/route25.asm
View file

@ -21,24 +21,20 @@ Route25Script_515e1: ; 515e1 (14:55e1)
res 6, [hl] res 6, [hl]
ld a, $61 ld a, $61
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef_jump ShowObject
jp Predef
.asm_515ff .asm_515ff
bit 4, [hl] bit 4, [hl]
ret z ret z
set 7, [hl] set 7, [hl]
ld a, $24 ld a, $24
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, $62 ld a, $62
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, $63 ld a, $63
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef_jump ShowObject
jp Predef
Route25ScriptPointers: ; 51622 (14:5622) Route25ScriptPointers: ; 51622 (14:5622)
dw CheckFightingMapTrainers dw CheckFightingMapTrainers

3
scripts/route2gate.asm
View file

@ -20,8 +20,7 @@ Route2GateText1: ; 5d5db (17:55db)
ld de, wcc5b ld de, wcc5b
ld bc, $000d ld bc, $000d
call CopyData call CopyData
ld a, $62 predef OaksAideScript ; call oak's aide script
call Predef ; call oak's aide script
ldh a, [$db] ldh a, [$db]
cp $1 cp $1
jr nz, .asm_ad646 ; 0x5d606 jr nz, .asm_ad646 ; 0x5d606

3
scripts/route2house.asm
View file

@ -13,6 +13,5 @@ Route2HouseText2: ; 1def9 (7:5ef9)
db $08 ; asm db $08 ; asm
ld a, $1 ld a, $1
ld [wWhichTrade], a ld [wWhichTrade], a
ld a, $54 predef Predef54
call Predef
jp TextScriptEnd jp TextScriptEnd

3
scripts/safarizoneentrance.asm
View file

@ -176,8 +176,7 @@ SafariZoneEntranceText4: ; 752ca (1d:52ca)
ld hl, wTrainerFacingDirection ld hl, wTrainerFacingDirection
ld de, wPlayerMoney + 2 ld de, wPlayerMoney + 2
ld c, $3 ld c, $3
ld a, $c ; SubBCDPredef predef SubBCDPredef
call Predef
ld a, $13 ld a, $13
ld [wd125], a ld [wd125], a
call DisplayTextBoxID call DisplayTextBoxID

6
scripts/seafoamislands1.asm
View file

@ -28,12 +28,10 @@ SeafoamIslands1Script: ; 447e9 (11:47e9)
.asm_44825 .asm_44825
ld a, [wd079] ld a, [wd079]
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, [wd07a] ld a, [wd07a]
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef_jump ShowObject
jp Predef
.asm_4483b .asm_4483b
ld a, $9f ld a, $9f
ld [wd71d], a ld [wd71d], a

6
scripts/seafoamislands2.asm
View file

@ -26,12 +26,10 @@ SeafoamIslands2Script: ; 46315 (11:6315)
.asm_4634c .asm_4634c
ld a, [wd079] ld a, [wd079]
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, [wd07a] ld a, [wd07a]
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef_jump ShowObject
jp Predef
.asm_46362 .asm_46362
ld a, $a0 ld a, $a0
ld [wd71d], a ld [wd71d], a

6
scripts/seafoamislands3.asm
View file

@ -26,12 +26,10 @@ SeafoamIslands3Script: ; 46451 (11:6451)
.asm_46488 .asm_46488
ld a, [wd079] ld a, [wd079]
ld [wcc4d], a ld [wcc4d], a
ld a, $11 predef HideObject
call Predef
ld a, [wd07a] ld a, [wd07a]
ld [wcc4d], a ld [wcc4d], a
ld a, $15 predef_jump ShowObject
jp Predef
.asm_4649e .asm_4649e
ld a, $a1 ld a, $a1
ld [wd71d], a ld [wd71d], a

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