changed more labels

This commit is contained in:
JimB16 2015-09-10 01:27:07 +02:00
parent 0d4c2776d9
commit a7cb2a5e9b
27 changed files with 473 additions and 435 deletions

View File

@ -9,7 +9,7 @@ AI_SwitchOrTryItem: ; 38000
and a
ret nz
callba Function3e8d1
callba CheckSubstatus_RechargeChargedRampageBideRollout
ret nz
ld a, [PlayerSubStatus5]
@ -24,6 +24,7 @@ AI_SwitchOrTryItem: ; 38000
ld a, [InBattleTowerBattle] ; Load always the first TrainerClass for BattleTower-Trainers
and a
jr nz, .ok
ld a, [TrainerClass]
dec a
ld bc, 7
@ -787,17 +788,17 @@ Function38511: ; 38511
; 3851e
Function3851e: ; 3851e
ld [hMultiplier], a
ld [hDivisor], a
ld hl, EnemyMonMaxHP
ld a, [hli]
ld [hProduct], a
ld [hDividend + 0], a
ld a, [hl]
ld [hMultiplicand], a
ld [hDividend + 1], a
ld b, $2
call Divide
ld a, [$ffb6]
ld a, [hQuotient + 2]
ld c, a
ld a, [$ffb5]
ld a, [hQuotient + 1]
ld b, a
ld hl, EnemyMonHP + 1
ld a, [hld]

View File

@ -1783,8 +1783,8 @@ AI_Smart_PriorityHit: ; 38d5a
ld [hBattleTurn], a
push hl
callab EnemyAttackDamage
callab BattleCommand62
callab BattleCommand07
callab BattleCommand62_DamageCalcWithStats
callab BattleCommand07_CalcDamageTypeMultiplier
pop hl
ld a, [CurDamage + 1]
ld c, a
@ -3380,8 +3380,8 @@ AIDamageCalc: ; 393e7
.asm_39400
callab EnemyAttackDamage
callab BattleCommand62
callab BattleCommand07
callab BattleCommand62_DamageCalcWithStats
callab BattleCommand07_CalcDamageTypeMultiplier
ret
.ConstantDamageEffects

File diff suppressed because it is too large Load Diff

View File

@ -8,7 +8,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommand04 ; 34555
dw BattleCommand05 ; 34631
dw BattleCommand06 ; 352dc
dw BattleCommand07 ; 346d2
dw BattleCommand07_CalcDamageTypeMultiplier ; 346d2
dw BattleCommand08 ; 34cfd
dw BattleCommand09 ; 34d32
dw BattleCommand0a ; 34eee
@ -99,7 +99,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommand5f ; 377ce
dw BattleCommand60 ; 3784b
dw BattleCommand61 ; 37874
dw BattleCommand62 ; 35612
dw BattleCommand62_DamageCalcWithStats ; 35612
dw BattleCommand63 ; 3790e
dw BattleCommand64 ; 37939
dw BattleCommand65 ; 37972
@ -170,7 +170,7 @@ BattleCommandPointers: ; 3fd28
dw BattleCommanda6 ; 365af
dw BattleCommanda7 ; 365c3
dw BattleCommanda8 ; 355b5
dw BattleCommanda9 ; 355d5
dw BattleCommanda9_IfAttackMissedResetDamage ; 355d5
dw BattleCommandaa ; 37e80
dw BattleCommandab ; 34f57
dw BattleCommandac ; 3658f

View File

@ -539,7 +539,7 @@ CheckEnemyTurn: ; 3421f
ld hl, HurtItselfText
call StdBattleTextBox
call Function355dd
call BattleCommand62
call BattleCommand62_DamageCalcWithStats
call BattleCommand0a
xor a
ld [wcfca], a
@ -652,7 +652,7 @@ HitConfusion: ; 343a5
ld [CriticalHit], a
call Function355dd
call BattleCommand62
call BattleCommand62_DamageCalcWithStats
call BattleCommand0a
xor a
@ -1336,8 +1336,8 @@ BattleCommand4f: ; 346cd
; 346d2
BattleCommand07: ; 346d2
; stab
BattleCommand07_CalcDamageTypeMultiplier: ; 346d2
; STAB = Same Type Attack Bonus
ld a, BATTLE_VARS_MOVE_ANIM
call GetBattleVar
cp STRUGGLE
@ -1354,7 +1354,7 @@ BattleCommand07: ; 346d2
ld a, [hBattleTurn]
and a
jr z, .go
jr z, .go ; Who Attacks and who Defends
ld hl, EnemyMonType1
ld a, [hli]
@ -3932,6 +3932,7 @@ BattleCommanda8: ; 355b5
ld a, [wc72d]
and a
ret nz
jp PrintButItFailed
; 355bd
@ -3955,11 +3956,12 @@ Function355bd: ; 355bd
; 355d5
BattleCommanda9: ; 355d5
BattleCommanda9_IfAttackMissedResetDamage: ; 355d5
; clearmissdamage
ld a, [AttackMissed]
and a
ret z
jp ResetDamage
; 355dd
@ -4002,7 +4004,7 @@ endr
; 35612
BattleCommand62: ; 35612
BattleCommand62_DamageCalcWithStats: ; 35612
; damagecalc
; Return a damage value for move power d, player level e, enemy defense c and player attack b.
@ -4136,12 +4138,12 @@ endr
; Update CurDamage (capped at 997).
ld hl, CurDamage
ld b, [hl]
ld a, [$ffb6]
ld a, [hQuotient + 2]
add b
ld [$ffb6], a
jr nc, .asm_356a5
ld a, [$ffb5]
ld a, [hQuotient + 1]
inc a
ld [$ffb5], a
and a
@ -4395,22 +4397,22 @@ BattleCommand3f: ; 35726
ld a, [hBattleTurn]
and a
ld a, [hl]
jr nz, .asm_357f8
jr nz, .notPlayersTurn
ld hl, wPlayerMoveStruct + MOVE_POWER
ld [hl], a
push hl
call PlayerAttackDamage
jr .asm_35800
jr .notEnemysTurn
.asm_357f8
.notPlayersTurn
ld hl, wEnemyMoveStruct + MOVE_POWER
ld [hl], a
push hl
call EnemyAttackDamage
.asm_35800
call BattleCommand62
.notEnemysTurn
call BattleCommand62_DamageCalcWithStats
pop hl
ld [hl], 1
ret
@ -7200,7 +7202,7 @@ BattleCommand23: ; 3680f
ld a, [BattleType]
cp BATTLETYPE_SHINY
jp z, .asm_36969
cp $9
cp BATTLETYPE_TRAP
jp z, .asm_36969
cp BATTLETYPE_CELEBI
jp z, .asm_36969
@ -9498,7 +9500,7 @@ BattleCommand61: ; 37874
push de
.asm_3787d
call BattleCommand07
call BattleCommand07_CalcDamageTypeMultiplier
ld a, [InLinkBattle]
cp $3
@ -9746,7 +9748,7 @@ BattleCommand67: ; 379c9
call ClearBox
ld b, 1
call GetSGBLayout
call Function32f9
call SetPalettes
call BatonPass_LinkPlayerSwitch
; Mobile link battles handle entrances differently
@ -9787,7 +9789,7 @@ BattleCommand67: ; 379c9
call CallBattleCore
ld a, 1
ld [wd265], a
ld hl, Function3ecab
ld hl, ApplyStatLevelMultiplierOnAllStats
call CallBattleCore
ld hl, SpikesDamage

View File

@ -187,7 +187,7 @@ Function109847:: ; 109847
ld [hLCDStatCustom], a
call GetCreditsPalette
call Function32f9
call SetPalettes
ld a, [hVBlank]
push af
ld a, $5
@ -447,7 +447,7 @@ endr
xor a
ld [wcf64], a ; frame
call GetCreditsPalette
call Function32f9 ; update hw pal registers
call SetPalettes ; update hw pal registers
jr .loop
.clear

View File

@ -33,7 +33,7 @@ Function1dd709: ; 1dd709
call WaitBGMap
ld b, $8
call GetSGBLayout
call Function32f9
call SetPalettes
call DelayFrame
ret
; 1dd760

View File

@ -1021,12 +1021,14 @@ Function96bd3: ; 96bd3
; 96bd7
Function96bd7: ; 96bd7
ld a, [wdca1]
ld a, [RepelStepsLeft]
and a
ret z
dec a
ld [wdca1], a
ld [RepelStepsLeft], a
ret nz
ld a, BANK(RepelWoreOffScript)
ld hl, RepelWoreOffScript
call CallScript

View File

@ -278,7 +278,7 @@ Function97db5: ; 97db5
call GetMapHeaderPhoneServiceNybble
and a
jr nz, .NoCall
ld hl, wdca1 + 1
ld hl, wdca2
ld a, [hli]
ld d, a
ld e, [hl]

View File

@ -594,7 +594,7 @@ Function103fd: ; 103fd
callba WritePartyMenuTilemap
callba PrintPartyMenuText
call WaitBGMap
call Function32f9
call SetPalettes
call DelayFrame
callba PartyMenuSelect
jr c, .asm_10475
@ -1112,7 +1112,7 @@ Function107bb: ; 107bb
ld a, [InputType]
or a
jr z, .asm_107ca
callba Function1de28f
callba Start_DudeAutoInput_RightA
.asm_107ca
call Function107d7
@ -1507,7 +1507,7 @@ Function10a40: ; 10a40
call WaitBGMap
ld b, $14
call GetSGBLayout
call Function32f9
call SetPalettes
call DelayFrame
ret
; 10a4f

View File

@ -50,7 +50,7 @@ PredefPointers:: ; 856b
add_predef PrintMoveDesc
add_predef UpdatePlayerHUD
add_predef FillBox
add_predef Function3d873
add_predef CheckPlayerPartyForFitPkmn
add_predef UpdateEnemyHUD
add_predef StartBattle
add_predef FillInExpBar

View File

@ -70,6 +70,7 @@ Function2ebb:: ; 2ebb
ld a, [wc2cc]
bit 1, a
ret z
ld a, [hJoyDown]
bit 1, a ; B_BUTTON
ret
@ -212,7 +213,8 @@ HideSprites:: ; 3016
INCLUDE "home/copy2.asm"
Function309d:: ; 309d
LoadTileMapToTempTileMap:: ; 309d
; Load TileMap into TempTileMap
ld a, [rSVBK]
push af
ld a, BANK(w2_d000)
@ -226,16 +228,17 @@ Function309d:: ; 309d
ret
; 30b4
Function30b4:: ; 30b4
Call_LoadTempTileMapToTileMap:: ; 30b4
xor a
ld [hBGMapMode], a
call Function30bf
call LoadTempTileMapToTileMap
ld a, 1
ld [hBGMapMode], a
ret
; 30bf
Function30bf:: ; 30bf
LoadTempTileMapToTileMap:: ; 30bf
; Load TempTileMap into TileMap
ld a, [rSVBK]
push af
ld a, BANK(w2_d000)
@ -676,11 +679,12 @@ endr
; 32f9
Function32f9:: ; 32f9
SetPalettes:: ; 32f9
; Inits the Palettes
; depending on the system the monochromes palettes or color palettes
ld a, [hCGB]
and a
jr nz, .asm_3309
jr nz, .SetPalettesForGameBoyColor
ld a, $e4
ld [rBGP], a
ld a, $d0
@ -688,7 +692,7 @@ Function32f9:: ; 32f9
ld [rOBP1], a
ret
.asm_3309
.SetPalettesForGameBoyColor
push de
ld a, $e4
call DmgToCgbBGPals
@ -959,10 +963,10 @@ GetPokemonName:: ; 343b
ld h, 0
ld l, a
rept 2
add hl, hl
add hl, hl ; hl = hl * 4
endr
add hl, de
add hl, hl
add hl, de ; hl = (hl*4) + de
add hl, hl ; hl = (5*hl) + (5*hl)
ld de, PokemonNames
add hl, de
@ -1159,7 +1163,7 @@ Function3524:: ; 3524
ld hl, VramState
bit 0, [hl]
jp nz, UpdateTimePals
jp Function32f9
jp SetPalettes
; 352f
Function352f:: ; 352f
@ -1760,7 +1764,7 @@ Function383d:: ; 383d
Function3842:: ; 3842
ld [wd265], a
ld de, wd265
ld b, 1 << 6 + 1
ld b, 1 << 6 + 1 ; 65
jp PrintNum
; 384d

View File

@ -410,7 +410,7 @@ Functionac6:: ; ac6
ld a, [InputType]
or a
jr z, .asm_ad9
callba Function1de28a
callba Start_DudeAutoInput_A
.asm_ad9
call Functionaf5
call Functiona57

View File

@ -1967,14 +1967,14 @@ Function2b3c:: ; 2b3c
call WhiteBGMap
call Function2bae
call UpdateSprites
call Function1d7d
call Call_ExitMenu
call Functiond90
jr Function2b5c
; 2b4d
Function2b4d:: ; 2b4d
call WhiteBGMap
call Function1d7d
call Call_ExitMenu
call Function2bae
call UpdateSprites
call Functiond90

View File

@ -66,7 +66,7 @@ MenuDataHeader_0x1d75:: ; 1d75
db 1 ; default option
; 1d7d
Function1d7d:: ; 1d7d
Call_ExitMenu:: ; 1d7d
call ExitMenu
ret
; 1d81

View File

@ -273,15 +273,15 @@ Function83b:: ; 83b
; 862
Function862:: ; 862
call Function309d
call LoadTileMapToTempTileMap
callab Function4000
call Function87d
jp Function30b4
jp Call_LoadTempTileMapToTileMap
; 871
Function871:: ; 871
call Function309d
call LoadTileMapToTempTileMap
callab Function4000
jp Function87d
; 87d

View File

@ -73,7 +73,7 @@ hRandom EQU $ffe1
hRandomAdd EQU $ffe1
hRandomSub EQU $ffe2
hBattleTurn EQU $ffe4
hBattleTurn EQU $ffe4 ; Which trainers turn is it? 0: Player, 1: Opponent Trainer
hCGBPalUpdate EQU $ffe5
hCGB EQU $ffe6
hSGB EQU $ffe7

View File

@ -705,7 +705,7 @@ endr
ld a, [BattleType]
cp BATTLETYPE_TUTORIAL
ret z
cp 2
cp BATTLETYPE_DEBUG
ret z
cp BATTLETYPE_CONTEST
jr z, .used_park_ball
@ -1880,7 +1880,7 @@ Functionf21c: ; f21c (3:721c)
callba WritePartyMenuTilemap
callba PrintPartyMenuText
call WaitBGMap
call Function32f9
call SetPalettes
call DelayFrame
callba PartyMenuSelect
ret
@ -1897,7 +1897,7 @@ Functionf24a: ; f24a (3:724a)
callba WritePartyMenuTilemap
callba Function50566
call WaitBGMap
call Function32f9
call SetPalettes
call DelayFrame
pop bc
pop de
@ -2254,18 +2254,19 @@ Repel: ; f46a
; f46c
Function_0xf46c: ; f46c
ld a, [wdca1]
ld a, [RepelStepsLeft]
and a
ld hl, UnknownText_0xf47d
ld hl, TextJump_RepelUsedEarlierIsStillInEffect
jp nz, PrintText
ld a, b
ld [wdca1], a
jp Functionf789
; f47d
UnknownText_0xf47d: ; 0xf47d
ld a, b
ld [RepelStepsLeft], a
jp Functionf789
TextJump_RepelUsedEarlierIsStillInEffect: ; 0xf47d
; The REPEL used earlier is still in effect.
text_jump UnknownText_0x1c5bcd
text_jump Text_RepelUsedEarlierIsStillInEffect
db "@"
; 0xf482

241
main.asm
View File

@ -1579,7 +1579,7 @@ Function64db: ; 64db
; 6508
LearnMove: ; 6508
call Function309d
call LoadTileMapToTempTileMap
ld a, [CurPartyMon]
ld hl, PartyMonNicknames
call GetNick
@ -1741,7 +1741,7 @@ ForgetMove: ; 65d3
ld [wcfa7], a
call Function1bc9
push af
call Function30b4
call Call_LoadTempTileMapToTileMap
pop af
pop hl
bit 1, a
@ -3177,7 +3177,7 @@ Function8000: ; 8000
ld a, $7
call ByteFill
call Function3200
call Function32f9
call SetPalettes
ret
; 8029
@ -9726,7 +9726,7 @@ Functione443: ; e443 (3:6443)
ld a, $1
.asm_e44b
ld [wcf88], a
call Function32f9
call SetPalettes
xor a
ld [wcf76], a
ld [hBGMapMode], a ; $ff00+$d4
@ -9946,7 +9946,7 @@ ClearPCItemScreen: ; e58b
ld bc, $0412
call TextBox
call Function3200
call Function32f9 ; load regular palettes?
call SetPalettes ; load regular palettes?
ret
; 0xe5bb
@ -10918,7 +10918,7 @@ Function116f8: ; 116f8
call Function1171d
call WaitBGMap
call WaitTop
call Function32f9
call SetPalettes
call Function11be0
ret
; 1171d
@ -12693,7 +12693,7 @@ Function124fa: ; 124fa
Function1250a: ; 1250a
ld b, $0
call GetSGBLayout
call Function32f9
call SetPalettes
ret
; 12513
@ -13004,7 +13004,7 @@ endr
.Clear ; 126b7
call WhiteBGMap
call Function1d7d
call Call_ExitMenu
call Function2bae
call .DrawMenuAccount_
call MenuFunc_1e7f
@ -13403,7 +13403,7 @@ StartMenu_Pokemon: ; 12976
callba WritePartyMenuTilemap
callba PrintPartyMenuText
call WaitBGMap
call Function32f9 ; load regular palettes?
call SetPalettes ; load regular palettes?
call DelayFrame
callba PartyMenuSelect
jr c, .return ; if cancelled or pressed B
@ -13625,7 +13625,7 @@ SwitchPartyMons: ; 12aec
call AddNTimes
ld [hl], "▷"
call WaitBGMap
call Function32f9
call SetPalettes
call DelayFrame
callba PartyMenuSelect
@ -14082,7 +14082,7 @@ OpenPartyStats: ; 12e00
call LowVolume
predef StatsScreenInit
call MaxVolume
call Function1d7d
call Call_ExitMenu
ld a, 0
ret
; 12e1b
@ -14253,19 +14253,19 @@ Function12f05: ; 12f05
ld a, PartyMon1MaxHP - PartyMon1
call GetPartyParamLocation
ld a, [hli]
ld [hProduct], a
ld [hDividend + 0], a
ld a, [hl]
ld [hMultiplicand], a
ld [hDividend + 1], a
ld a, $5
ld [hMultiplier], a
ld [hDivisor], a
ld b, $2
call Divide
ld a, PartyMon1HP + 1 - PartyMon1
call GetPartyParamLocation
ld a, [$ffb6]
ld a, [hQuotient + 2]
sub [hl]
dec hl
ld a, [$ffb5]
ld a, [hQuotient + 1]
sbc [hl]
ret
; 12f26
@ -14665,7 +14665,7 @@ Function131ef: ; 131ef
hlcoord 10, 4
predef Function50c50
call WaitBGMap
call Function32f9
call SetPalettes
ld a, [wd0eb]
inc a
ld [wcfa3], a
@ -21684,7 +21684,7 @@ Function16be4: ; 16be4
ld b, $1c
call GetSGBLayout
call Function32f9
call SetPalettes
.asm_16c6b
call Functiona57
@ -22592,7 +22592,7 @@ Function17254: ; 17254 (5:7254)
predef FillBox
pop af
call Function17363
call Function32f9
call SetPalettes
jp WaitBGMap
Function1727f: ; 1727f (5:727f)
@ -26001,7 +26001,7 @@ Function2513b: ; 2513b (9:513b)
call WaitBGMap
ld b, $15
call GetSGBLayout
call Function32f9
call SetPalettes
call WaitBGMap
ld hl, wcf63
xor a
@ -28283,7 +28283,7 @@ Function2715c: ; 2715c
call WriteBackup
call Function1d6e
call WaitBGMap
jp Function32f9
jp SetPalettes
; 27192
Function27192: ; 27192
@ -29743,7 +29743,7 @@ Function2891c: ; 2891c
; 28926
Function28926: ; 28926
call Function309d
call LoadTileMapToTempTileMap
ld a, [wcfa9]
push af
hlcoord 0, 15
@ -29784,7 +29784,7 @@ Function28926: ; 28926
.asm_28983
pop af
ld [wcfa9], a
call Function30b4
call Call_LoadTempTileMapToTileMap
jp Function2888b
.asm_2898d
@ -29822,7 +29822,7 @@ Function28926: ; 28926
ld [wd263], a
callab Function50db9
callba Function4d319
call Function30b4
call Call_LoadTempTileMapToTileMap
hlcoord 6, 1
ld bc, $0601
ld a, $7f
@ -30091,7 +30091,7 @@ Function28b87: ; 28b87
callba Function4d354
call Function1bd3
push af
call Function1d7d
call Call_ExitMenu
call Function3200
pop af
bit 1, a
@ -30404,7 +30404,7 @@ Function28ef8: ; 28ef8
Function28eff: ; 28eff
callba Function16d6a7
call Function32f9
call SetPalettes
ret
; 28f09
@ -32894,7 +32894,7 @@ endr
CheckRepelEffect:: ; 2a1df
; If there is no active Repel, there's no need to be here.
ld a, [wdca1]
ld a, [RepelStepsLeft]
and a
jr z, .encounter
; Get the first Pokemon in your party that isn't fainted.
@ -33663,13 +33663,13 @@ Function2b9a6: ; 2b9a6
jr z, .asm_2b9d7
dec hl
xor a
ld [hProduct], a
ld [hDividend + 0], a
ld a, [hli]
ld [hMultiplicand], a
ld [hDividend + 1], a
ld a, [hli]
ld [$ffb5], a
ld [hDividend + 2], a
xor a
ld [$ffb6], a
ld [hDividend + 3], a
ld a, [hli]
ld b, a
ld a, [hld]
@ -33677,13 +33677,13 @@ Function2b9a6: ; 2b9a6
rr a
srl b
rr a
ld [hMultiplier], a
ld [hDivisor], a
ld b, $4
call Divide
ld a, [$ffb6]
ld a, [hQuotient + 2]
add e
ld e, a
ld a, [$ffb5]
ld a, [hQuotient + 1]
adc d
ld d, a
dec hl
@ -34020,7 +34020,7 @@ Function2c1b2: ; 2c1b2
callba Function2c10d
ld b, $8
call GetSGBLayout
call Function32f9
call SetPalettes
ld a, $e4
ld [rOBP0], a
ret
@ -34559,7 +34559,7 @@ Function2c80a: ; 2c80a
callba WritePartyMenuTilemap
callba PrintPartyMenuText
call WaitBGMap
call Function32f9
call SetPalettes
call DelayFrame
callba PartyMenuSelect
push af
@ -36764,7 +36764,7 @@ AIChooseMove: ; 440ce
ret nz
; No use picking a move if there's no choice.
callba Function3e8d1
callba CheckSubstatus_RechargeChargedRampageBideRollout
ret nz
@ -37768,7 +37768,7 @@ Function4484a: ; 0x4484a
callba WritePartyMenuTilemap
callba PrintPartyMenuText
call WaitBGMap
call Function32f9
call SetPalettes
call DelayFrame
callba PartyMenuSelect
jr c, .asm_44939
@ -37987,7 +37987,7 @@ Function4802f: ; 4802f (12:402f)
call PlaceString
call Function48187
call Function3200
call Function32f9
call SetPalettes
call Function1bc9
ld hl, wcfa9
ld b, [hl]
@ -39673,11 +39673,11 @@ Function48d4a: ; 48d4a (12:4d4a)
Function48d94: ; 48d94 (12:4d94)
xor a
ld [hDividend + 0], a
ld [hQuotient], a ; $ff00+$b4 (aliases: hMultiplicand)
ld [hDividend + 1], a ; $ff00+$b4 (aliases: hMultiplicand)
ld a, [hli]
ld [hDividend + 0], a
ld a, [hl]
ld [hQuotient], a ; $ff00+$b4 (aliases: hMultiplicand)
ld [hDividend + 1], a ; $ff00+$b4 (aliases: hMultiplicand)
ld a, 100
ld [hDivisor], a ; $ff00+$b7 (aliases: hMultiplier)
ld b, 2
@ -39707,7 +39707,7 @@ Function48dcb: ; 48dcb (12:4dcb)
call Function48e47
call Function48e64
call Function3200
call Function32f9
call SetPalettes
ld hl, UnknownText_0x48e0f
call PrintText
ld hl, MenuDataHeader_0x48dfc
@ -40921,7 +40921,7 @@ MainMenu: ; 49cdc
call Function49ed0
ld b, $8
call GetSGBLayout
call Function32f9
call SetPalettes
ld hl, GameTimerPause
res 0, [hl]
call Function49da4
@ -41302,7 +41302,7 @@ Function49f16: ; 49f16
hlcoord 1, 14
call PlaceString
call Function3200
call Function32f9
call SetPalettes
call Function1bc9
ld hl, wcfa9
ld b, [hl]
@ -41449,7 +41449,7 @@ Function4a098: ; 4a098 (12:6098)
call WaitBGMap
call Function1d6e
callba Function89de0
call Function1d7d
call Call_ExitMenu
call Function49351
call Function4a485
pop bc
@ -41558,7 +41558,7 @@ Function4a149: ; 4a149 (12:6149)
hlcoord 1, 14
call PlaceString
callba Function104148
call Function32f9
call SetPalettes
call Function1bc9
ld hl, wcfa9
ld b, [hl]
@ -41696,7 +41696,7 @@ Function4a28a: ; 4a28a (12:628a)
.asm_4a2df
callba Function11765d
call WhiteBGMap
call Function1d7d
call Call_ExitMenu
call Functione5f
scf
ret
@ -41730,7 +41730,7 @@ Function4a28a: ; 4a28a (12:628a)
.asm_4a338
call ExitMenu
.asm_4a33b
call Function1d7d
call Call_ExitMenu
callba Function104148
xor a
ret
@ -41807,7 +41807,7 @@ Function4a39a: ; 4a39a
call Function4a485
call Function4a492
call Function4a3aa
call Function32f9
call SetPalettes
ret
; 4a3a7
@ -41987,7 +41987,7 @@ Function4a4c4: ; 4a4c4 (12:64c4)
hlcoord 1, 16
call PlaceString
call Function3200
call Function32f9
call SetPalettes
call Function1bc9
ld hl, wcfa9
ld b, [hl]
@ -42631,7 +42631,7 @@ Function4a94e: ; 4a94e
ld [wd019], a
ld b, $14
call GetSGBLayout
call Function32f9
call SetPalettes
call Function4aa22
jr c, .asm_4a985
jr z, .asm_4a9a1
@ -42762,7 +42762,7 @@ Function4aa34: ; 4aa34
callba PrintPartyMenuText
call Function4aab6
call WaitBGMap
call Function32f9
call SetPalettes
call DelayFrame
call Function4ab1a
jr z, .asm_4aa66
@ -45652,7 +45652,7 @@ Function4dfb6: ; 4dfb6 (13:5fb6)
ld hl, wcf64
bit 4, [hl]
jr nz, .asm_4dfd6
call Function32f9
call SetPalettes
ret
.asm_4dfd6
call Function4e226
@ -45965,14 +45965,14 @@ Function4e226: ; 4e226 (13:6226)
jr .asm_4e246
.asm_4e238
call Function4e271
call Function32f9
call SetPalettes
ret
.asm_4e23f
call Function4e253
call Function32f9
call SetPalettes
ret
.asm_4e246
call Function32f9
call SetPalettes
call Function4e253
ld a, [CurPartySpecies]
call PlayCry2
@ -46156,7 +46156,7 @@ EggStatsScreen: ; 4e33a
call PlaceString
ld hl, wcf64
set 5, [hl]
call Function32f9 ; pals
call SetPalettes ; pals
call DelayFrame
hlcoord 0, 0
call Function3786
@ -46799,7 +46799,7 @@ Function4e881: ; 4e881
ld hl, UnknownText_0x4e8bd
call PrintText
call Function3200
call Function32f9
call SetPalettes
ret
; 4e8bd
@ -46839,7 +46839,7 @@ Function4e8c2: ; 4e8c2
ld [hSCX], a
call EnableLCD
call Function3200
call Function32f9
call SetPalettes
ret
; 4e906
@ -47157,7 +47157,7 @@ SelectMonFromParty: ; 50000
call WhiteBGMap
call Function5003f
call WaitBGMap
call Function32f9
call SetPalettes
call DelayFrame
call PartyMenuSelect
call Function2b74
@ -47174,7 +47174,7 @@ Function5001d: ; 5001d
call WaitBGMap
ld b, $a
call GetSGBLayout
call Function32f9
call SetPalettes
call DelayFrame
call PartyMenuSelect
call Function2b74
@ -48230,7 +48230,7 @@ Function5067b: ; 5067b
ld a, [PartyCount]
cp [hl]
jr nz, .asm_50682
predef Function3d873
predef CheckPlayerPartyForFitPkmn
ld a, d
ld [ScriptVar], a
ret
@ -49385,15 +49385,15 @@ endr
ld a, [hli]
and $f
ld [hMultiplier], a
ld [hDivisor], a
ld b, $4
call Divide
ld a, [hMultiplicand + 0]
ld a, [hQuotient + 0]
push af
ld a, [hMultiplicand + 1]
ld a, [hQuotient + 1]
push af
ld a, [hMultiplicand + 2]
ld a, [hQuotient + 2]
push af
call Function50eed
@ -53774,11 +53774,11 @@ Function84560: ; 84560
ld [hl], $4
xor a
ld [hBGMapMode], a
call Function309d
call LoadTileMapToTempTileMap
callba Function16dac
ld a, $0
call Function84419
call Function30b4
call Call_LoadTempTileMapToTileMap
call Function84742
ld a, $9
ld [wcf65], a
@ -53806,7 +53806,7 @@ Function84560: ; 84560
pop af
ld [hVBlank], a
call Function84411
call Function30b4
call Call_LoadTempTileMapToTileMap
xor a
ld [rIF], a
pop af
@ -53939,13 +53939,13 @@ Function84688: ; 84688
call Function84411
ld c, $c
call DelayFrames
call Function309d
call LoadTileMapToTempTileMap
xor a
ld [hBGMapMode], a
callba Function1dd7ae
ld a, $3
call Function84419
call Function30b4
call Call_LoadTempTileMapToTileMap
call Function84742
ld a, $9
ld [wcf65], a
@ -54716,7 +54716,7 @@ endr
ld [hBGMapMode], a
ld b, $1a
call GetSGBLayout
call Function32f9
call SetPalettes
call Function86635
xor a
ld [wc2c6], a
@ -54854,7 +54854,7 @@ Function86692: ; 86692
call WaitBGMap
ld b, $1a
call GetSGBLayout
call Function32f9
call SetPalettes
decoord 6, 5
ld c, $6
predef Functiond066e
@ -55015,7 +55015,7 @@ Function86810: ; 86810
ld [CurPartySpecies], a
ld b, $1a
call GetSGBLayout
call Function32f9
call SetPalettes
call Function86635
xor a
ld [wc2c6], a
@ -55135,7 +55135,7 @@ Function88018: ; 88018
call Function88161
.asm_88051
call Function1d7d
call Call_ExitMenu
ret
; 88055
@ -56433,7 +56433,7 @@ Function894ca: ; 894ca (22:54ca)
call Function895c7
call Function8949c
call Function8a60d
call Function32f9
call SetPalettes
pop bc
ret
@ -57085,7 +57085,7 @@ Function89844: ; 89844
call Function897af
push bc
call Function3200
call Function32f9
call SetPalettes
pop bc
ret
; 89856
@ -57594,9 +57594,9 @@ Function89b28: ; 89b28 (22:5b28)
call Function891de
call WhiteBGMap
call Function893e2
call Function1d7d
call Call_ExitMenu
call Function891ab
call Function32f9
call SetPalettes
ret
Function89b3b: ; 89b3b (22:5b3b)
@ -57945,7 +57945,7 @@ Function89d0d: ; 89d0d (22:5d0d)
call CopyBytes
pop af
ld [rSVBK], a ; $ff00+$70
call Function32f9
call SetPalettes
callba Function845db
call Function89240
ld c, $18
@ -58151,7 +58151,7 @@ Function89e6f: ; 89e6f (22:5e6f)
hlcoord 10, 4, AttrMap
call Function8a5a3
call Function891ab
call Function32f9
call SetPalettes
jp Function89e36
Function89e9a: ; 89e9a (22:5e9a)
@ -58188,7 +58188,7 @@ Function89eb9: ; 89eb9 (22:5eb9)
hlcoord 10, 4, AttrMap
call Function8a5a3
call Function891ab
call Function32f9
call SetPalettes
jp Function89e36
Function89ee1: ; 89ee1 (22:5ee1)
@ -58369,7 +58369,7 @@ Function89fce: ; 89fce (22:5fce)
hlcoord 10, 4, AttrMap
call Function8a5a3
call Function89448
call Function32f9
call SetPalettes
call Function891ab
jp Function89e36
@ -58716,7 +58716,7 @@ Function8a241: ; 8a241 (22:6241)
.asm_8a254
call Function891de
call WhiteBGMap
call Function1d7d
call Call_ExitMenu
call Function891de
and a
ret
@ -58743,7 +58743,7 @@ Function8a262: ; 8a262 (22:6262)
call Function8b36c
call Function8b493
call Function891ab
call Function32f9
call SetPalettes
call Function8b5e7
ret
@ -58841,7 +58841,7 @@ Function8a31c: ; 8a31c (22:631c)
call Function8a4d3
call Function8a4fc
call Function891ab
call Function32f9
call SetPalettes
call Function8a383
jr c, .asm_8a370
jr z, .asm_8a34e
@ -61780,7 +61780,7 @@ Function8b677: ; 8b677
call Function8b6ed
call EnableLCD
call Function891ab
call Function32f9
call SetPalettes
ret
; 8b690
@ -69325,7 +69325,7 @@ Function909de: ; 909de
ld a, [wd002]
ld e, a
ld d, 0
ld hl, Unknown_909f2
ld hl, WeekdaysStrings
rept 2
add hl, de
endr
@ -69337,7 +69337,7 @@ endr
ret
; 909f2
Unknown_909f2: ; 909f2
WeekdaysStrings: ; 909f2
dw Sunday
dw Monday
dw Tuesday
@ -69397,13 +69397,13 @@ UnknownText_0x90a6c: ; 90a6c
ld c, a
decoord 1, 14
callba Function1dd6bb
ld hl, UnknownText_0x90a83
ld hl, TextJump_DSTIsThatOK
ret
; 90a83 (24:4a83)
UnknownText_0x90a83: ; 0x90a83
TextJump_DSTIsThatOK: ; 0x90a83
; DST, is that OK?
text_jump UnknownText_0x1c5fde
text_jump Text_DSTIsThatOK
db "@"
; 0x90a88
@ -69655,7 +69655,7 @@ Function90bea: ; 90bea (24:4bea)
call Function90da8
ld b, $2
call GetSGBLayout
call Function32f9
call SetPalettes
ld a, [hCGB]
and a
ret z
@ -71442,7 +71442,7 @@ Function9191c: ; 9191c
ld [wd005], a
ld b, $2
call GetSGBLayout
call Function32f9
call SetPalettes
ld a, [hCGB]
and a
jr z, .asm_9198b
@ -71696,7 +71696,7 @@ _FlyMap: ; 91af3
call Function91c8f
ld b, $2
call GetSGBLayout
call Function32f9
call SetPalettes
.loop
call Functiona57
ld hl, hJoyPressed
@ -72118,7 +72118,7 @@ Function91d11: ; 91d11
call TownMapBGUpdate
ld b, $2
call GetSGBLayout
call Function32f9
call SetPalettes
xor a
ld [hBGMapMode], a
xor a
@ -72628,7 +72628,7 @@ Function92311: ; 92311
ld [wd004], a
ld b, $2
call GetSGBLayout
call Function32f9
call SetPalettes
.loop
call Functiona57
ld hl, hJoyPressed
@ -75771,7 +75771,7 @@ Functionb9237: ; b9237
ld a, [wd1ec]
ld e, a
callba Function8cb4
call Function32f9
call SetPalettes
xor a
ld [hJoyPressed], a
call Functionb929a
@ -76979,7 +76979,7 @@ Functioncc000: ; cc000
call WaitBGMap
ld b, $8
call GetSGBLayout
call Function32f9
call SetPalettes
ret
; cc0a7
@ -83069,7 +83069,7 @@ _OptionsMenu: ; e41d0
call WaitBGMap
ld b, $8
call GetSGBLayout
call Function32f9
call SetPalettes
.asm_e4217
call Functiona57
ld a, [hJoyPressed]
@ -83636,7 +83636,7 @@ Functione4579: ; e4579
call WaitBGMap
ld b, $19
call GetSGBLayout
call Function32f9
call SetPalettes
ld c, 10
call DelayFrames
callab Copyright
@ -86753,7 +86753,7 @@ Functionfb8c8: ; fb8c8
ld [TempMonDVs + 1], a
ld b, $1c
call GetSGBLayout
call Function32f9
call SetPalettes
ret
; fb8f1
@ -89503,7 +89503,7 @@ DoMysteryGift: ; 1048ba (41:48ba)
call WaitBGMap
ld b, $8
call GetSGBLayout
call Function32f9
call SetPalettes
pop de
hlcoord 2, 8
ld a, d
@ -90803,7 +90803,7 @@ Function105153: ; 105153 (41:5153)
call WaitBGMap
ld b, $1d
call GetSGBLayout
call Function32f9
call SetPalettes
ret
Function10522e: ; 10522e (41:522e)
@ -90981,7 +90981,7 @@ Function105777: ; 105777 (41:5777)
call WaitBGMap
ld b, $8
call GetSGBLayout
call Function32f9
call SetPalettes
ret
Function10578c: ; 10578c (41:578c)
@ -91106,7 +91106,7 @@ Function1057d7: ; 1057d7 (41:57d7)
call WaitBGMap
ld b, $2
callba Function4930f
jp Function32f9
jp SetPalettes
Function1058c6: ; 1058c6 (41:58c6)
ld b, $6
@ -92241,10 +92241,11 @@ endr
ld [$ffbb], a
ret
Function1062f7
Function1062f7:
ld a, [$ffbc]
bit 7, a
ret z
ld [hl], $f6
ret
; 1062ff
@ -92950,7 +92951,7 @@ Function1dc381: ; 1dc381
call WaitBGMap
ld b, $3
call GetSGBLayout
call Function32f9
call SetPalettes
ret
; 1dc47b
@ -93002,7 +93003,7 @@ Function1dc47b: ; 1dc47b
call WaitBGMap
ld b, $3
call GetSGBLayout
call Function32f9
call SetPalettes
ret
; 1dc507
@ -93144,18 +93145,18 @@ Function1dd6bb: ; 1dd6bb (77:56bb)
ld bc, $8102
call PrintNum
pop bc
ld de, String_1dd6fc
ld de, String_AM
pop af
jr c, .asm_1dd6f7
ld de, String_1dd6ff
ld de, String_PM
.asm_1dd6f7
inc hl
call PlaceString
ret
; 1dd6fc (77:56fc)
String_1dd6fc: db "AM@"
String_1dd6ff: db "PM@"
String_AM: db "AM@" ; 1dd6fc
String_PM: db "PM@" ; 1dd6ff
; 1dd702
@ -93333,22 +93334,22 @@ Function1de27f: ; 1de27f
Function1de28a:: ; 1de28a
Start_DudeAutoInput_A:: ; 1de28a
ld hl, DudeAutoInput_A
jr Function1de299
jr CallStartAutoInput
; 1de28f
Function1de28f: ; 1de28f
Start_DudeAutoInput_RightA: ; 1de28f
ld hl, DudeAutoInput_RightA
jr Function1de299
jr CallStartAutoInput
; 1de294
Function1de294: ; 1de294
Start_DudeAutoInput_DownA: ; 1de294
ld hl, DudeAutoInput_DownA
jr Function1de299
jr CallStartAutoInput
; 1de299
Function1de299: ; 1de299
CallStartAutoInput: ; 1de299
ld a, BANK(DudeAutoInputs)
call StartAutoInput
ret

View File

@ -50,7 +50,7 @@ Function17a6a8: ; 17a6a8 (5e:66a8)
call Function17abcf
callba Function49409
callba Function49420
call Function32f9
call SetPalettes
call DelayFrame
ret

View File

@ -1615,6 +1615,7 @@ Function100a09: ; 100a09
ld a, [InLinkBattle]
cp $4
jr nz, .asm_100a2a
call Function100a87
call Function100da5
callba Function3ee27
@ -1941,15 +1942,15 @@ endr
ret
.asm_100c63
ld hl, BattleText_0x80c5b
ld hl, BattleText_TheMoveIsDisabled
jr .asm_100c6b
.asm_100c68
ld hl, BattleText_0x80c39
ld hl, BattleText_TheresNoPPLeftForThisMove
.asm_100c6b
call StdBattleTextBox
call Function30b4
call Call_LoadTempTileMapToTileMap
jp Function100bc2
; 100c74
@ -3015,7 +3016,7 @@ Function10138b: ; 10138b
Function1013aa: ; 1013aa
call WhiteBGMap
call Function1d7d
call Call_ExitMenu
call Function2bae
callba Function106464
call UpdateSprites
@ -6793,7 +6794,7 @@ Function102dec: ; 102dec
ld a, $5
call FarCopyWRAM
callba Function49742
call Function32f9
call SetPalettes
call DelayFrame
ret
; 102e07

View File

@ -5789,7 +5789,7 @@ Function116294: ; 116294
ld de, Unkn1Pals + 8 * 7
ld bc, $0008
call CopyBytes
call Function32f9
call SetPalettes
pop af
ld [rSVBK], a
ld a, $30
@ -5810,7 +5810,7 @@ Function1162cb: ; 1162cb
ld de, wd050
ld bc, $0030
call CopyBytes
call Function32f9
call SetPalettes
pop af
ld [rSVBK], a
ret
@ -5917,7 +5917,7 @@ Function11636e: ; 11636e
call CopyBytes
pop af
ld [rSVBK], a
call Function32f9
call SetPalettes
ld a, [rSVBK]
push af
ld a, $1
@ -5967,7 +5967,7 @@ Function1163c0: ; 1163c0
call CopyBytes
pop af
ld [rSVBK], a
call Function32f9
call SetPalettes
call DelayFrame
ld a, $90
ld [hWY], a
@ -14155,7 +14155,7 @@ Function11a9c0: ; 11a9c0
Function11a9ce: ; 11a9ce
call WhiteBGMap
call Function2bae
call Function1d7d
call Call_ExitMenu
callba Function106462
callba Function106464
call Functiond90
@ -14937,7 +14937,7 @@ Function11b082: ; 11b082
call Function11b099
call Function11b295
call Function11b275
call Function32f9
call SetPalettes
jp Function11ad8a
; 11b099
@ -16875,7 +16875,7 @@ Function11c1ca: ; 11c1ca
call ClearSprites
call ClearScreen
call Function11d323
call Function32f9
call SetPalettes
call DisableLCD
ld hl, GFX_11d67e
ld de, VTiles2
@ -21659,7 +21659,7 @@ endr
cp $8
jr nz, .asm_16c969
callba Function96a4
call Function32f9
call SetPalettes
ld a, [rSVBK]
push af
ld a, $1
@ -21762,7 +21762,7 @@ endr
cp $8
jr nz, .asm_16ca28
callba Function96a4
call Function32f9
call SetPalettes
ld a, [rSVBK]
push af
ld a, $1
@ -22185,10 +22185,10 @@ Function16d43b: ; 16d43b
callba Function16d42e
ld b, $8
call GetSGBLayout
call Function32f9
call SetPalettes
call WaitBGMap
call Functiona36
call Function1d7d
call Call_ExitMenu
ret
; 16d465
@ -22330,7 +22330,7 @@ Function16d6ce: ; 16d6ce
call Function1d6e
call Function16d6e1
callba Function87d
call Function1d7d
call Call_ExitMenu
call Function3200
ret
; 16d6e1
@ -23293,7 +23293,7 @@ Function170525: ; 170525
Function170571:
call Function32f9
call SetPalettes
call Function1705b2
@ -24906,7 +24906,7 @@ Function171ccd: ; 171ccd (5c:5ccd)
ld [hli], a
ld a, $7f
ld [hl], a
call Function32f9
call SetPalettes
pop af
ld [rSVBK], a ; $ff00+$70
ret
@ -25068,7 +25068,7 @@ Function172eb9:
ld de, BGPals
ld bc, $40
call CopyBytes
call Function32f9
call SetPalettes
pop af
ld [rSVBK], a ; $ff00+$70
ret

View File

@ -706,7 +706,7 @@ Function17d405:
ld de, Unkn1Pals
ld bc, $0040
call CopyBytes
call Function32f9
call SetPalettes
pop af
ld [rSVBK], a
ret
@ -938,7 +938,7 @@ endr
; 17d5be
Function17d5be: ; 17d5be
call Function32f9
call SetPalettes
call Function17e438
Function17d5c4:
@ -1508,7 +1508,7 @@ Function17d93a: ; 17d93a
ld a, [wc70c]
ld e, a
callba Function8bc6
call Function32f9
call SetPalettes
ld a, [wc708]
ld l, a
ld a, [wc709]
@ -1544,7 +1544,7 @@ Function17d98b: ; 17d98b
ld a, [wc70b]
ld e, a
callba Function8bbd
call Function32f9
call SetPalettes
ld a, [wc708]
ld e, a
ld a, [wc709]
@ -4764,7 +4764,7 @@ Function17f5c3: ; 17f5c3
Function17f5d2: ; 17f5d2
call Function17f5e4
callba Function104000
call Function32f9
call SetPalettes
ld a, $1
ld [wc303], a
ret

View File

@ -1,4 +1,4 @@
BattleText_0x80730: ; 0x80730
BattleText_PlayerPickuedUpPayDayMoney: ; 0x80730
text "<PLAYER> picked up"
line "¥@"
deciram wPayDayMoney, $36
@ -307,7 +307,7 @@ BattleText_GotAwaySafely: ; 0x80b77
text "Got away safely!"
prompt
BattleText_0x80b89: ; 0x80b89
BattleText_UserFledUsingAStringBuffer1: ; 0x80b89
text "<USER>"
line "fled using a"
cont "@"
@ -321,7 +321,7 @@ BattleText_CantEscape: ; 0x80ba0
prompt
; 0x80bae
BattleText_0x80bae: ; 0x80bae
BattleText_UserHurtBySpikes: ; 0x80bae
text "<USER>'s"
line "hurt by SPIKES!"
prompt
@ -336,7 +336,7 @@ RecoveredUsingText: ; 0x80bc2
prompt
; 0x80bde
BattleText_0x80bde: ; 0x80bde
BattleText_UsersStringBuffer1Activated: ; 0x80bde
text "<USER>'s"
line "@"
text_from_ram StringBuffer1
@ -345,52 +345,52 @@ BattleText_0x80bde: ; 0x80bde
prompt
; 0x80bf3
BattleText_0x80bf3: ; 0x80bf3
BattleText_ItemsCantBeUsedHere: ; 0x80bf3
text "Items can't be"
line "used here."
prompt
; 0x80c0d
BattleText_0x80c0d: ; 0x80c0d
BattleText_PkmnIsAlreadyOut: ; 0x80c0d
text_from_ram BattleMonNick
text ""
line "is already out."
prompt
; 0x80c22
BattleText_0x80c22: ; 0x80c22
BattleText_PkmnCantBeRecalled: ; 0x80c22
text_from_ram BattleMonNick
text ""
line "can't be recalled!"
prompt
; 0x80c39
BattleText_0x80c39: ; 0x80c39
BattleText_TheresNoPPLeftForThisMove: ; 0x80c39
text "There's no PP left"
line "for this move!"
prompt
; 0x80c5b
BattleText_0x80c5b: ; 0x80c5b
BattleText_TheMoveIsDisabled: ; 0x80c5b
text "The move is"
line "DISABLED!"
prompt
; 0x80c72
BattleText_0x80c72: ; 0x80c72
BattleText_PkmnHasNoMovesLeft: ; 0x80c72
text_from_ram BattleMonNick
text ""
line "has no moves left!"
done
; 0x80c8a
BattleText_0x80c8a: ; 0x80c8a
BattleText_TargetsEncoreEnded: ; 0x80c8a
text "<TARGET>'s"
line "ENCORE ended!"
prompt
; 0x80c9c
BattleText_0x80c9c: ; 0x80c9c
BattleText_StringBuffer1GrewToLevel: ; 0x80c9c
text_from_ram StringBuffer1
text " grew to"
line "level @"
@ -404,7 +404,7 @@ BattleText_0x80cb9: ; 0x80cb9
db "@"
; 0x80cba
BattleText_0x80cba: ; 0x80cba
BattleText_WildPkmnIsEating: ; 0x80cba
text "Wild @"
text_from_ram EnemyMonNick
text ""
@ -412,7 +412,7 @@ BattleText_0x80cba: ; 0x80cba
prompt
; 0x80cd1
BattleText_0x80cd1: ; 0x80cd1
BattleText_WildPkmnIsAngry: ; 0x80cd1
text "Wild @"
text_from_ram EnemyMonNick
text ""
@ -495,7 +495,7 @@ AlreadyConfusedText: ; 0x80dcc
prompt
; 0x80de2
BattleText_0x80de2: ; 0x80de2
BattleText_UsersHurtByStringBuffer1: ; 0x80de2
text "<USER>'s"
line "hurt by"
cont "@"
@ -504,7 +504,7 @@ BattleText_0x80de2: ; 0x80de2
prompt
; 0x80df5
BattleText_0x80df5: ; 0x80df5
BattleText_UserWasReleasedFromStringBuffer1: ; 0x80df5
text "<USER>"
line "was released from"
cont "@"

View File

@ -106,13 +106,13 @@ UnknownText_0x1c0272: ; 1c0272
prompt
; 1c029c
UnknownText_0x1c029c: ; 1c029c
Text_Gained: ; 1c029c
text_from_ram StringBuffer1
text " gained@"
db "@"
; 1c02a9
UnknownText_0x1c02a9: ; 1c02a9
Text_ABoostedStringBuffer2ExpPoints: ; 1c02a9
text ""
line "a boosted"
cont "@"
@ -121,7 +121,7 @@ UnknownText_0x1c02a9: ; 1c02a9
prompt
; 1c02c9
UnknownText_0x1c02c9: ; 1c02c9
Text_StringBuffer2ExpPoints: ; 1c02c9
text ""
line "@"
deciram StringBuffer2, $24
@ -157,31 +157,31 @@ Text_BattleMonNick01: ; 1c0317
done
; 1c031d
UnknownText_0x1c031d: ; 1c031d
Text_BattleMonNickComma: ; 1c031d
text_from_ram BattleMonNick
text ",@"
db "@"
; 1c0324
UnknownText_0x1c0324: ; 1c0324
Text_ThatsEnoughComeBack: ; 1c0324
text " that's"
line "enough! Come back!@"
db "@"
; 1c0340
UnknownText_0x1c0340: ; 1c0340
Text_OKComeBack: ; 1c0340
text " OK!"
line "Come back!@"
db "@"
; 1c0352
UnknownText_0x1c0352: ; 1c0352
Text_GoodComeBack: ; 1c0352
text " good!"
line "Come back!@"
db "@"
; 1c0366
UnknownText_0x1c0366: ; 1c0366
Text_ComeBack: ; 1c0366
text " come"
line "back!"
done

View File

@ -1428,7 +1428,7 @@ UnknownText_0x1c5bac: ; 0x1c5bac
prompt
; 0x1c5bcd
UnknownText_0x1c5bcd: ; 0x1c5bcd
Text_RepelUsedEarlierIsStillInEffect: ; 0x1c5bcd
text "The REPEL used"
line "earlier is still"
cont "in effect."
@ -1674,7 +1674,7 @@ UnknownText_0x1c5fd1: ; 0x1c5fd1
prompt
; 0x1c5fde
UnknownText_0x1c5fde: ; 0x1c5fde
Text_DSTIsThatOK: ; 0x1c5fde
text " DST,"
line "is that OK?"
done

View File

@ -819,13 +819,13 @@ LastEnemyMove:: ; c71c
wc71d:: ds 1
wc71e:: ds 1
wc71f:: ds 1
wc720:: ds 4
wc720:: ds 4 ; copy from/to EnemyMonBaseStats, length=7
wc724:: ds 3
wc727:: ds 2
wc729:: ds 2
wc72b:: ds 1
wc72c:: ds 1
wc72d:: ds 1
wc72d:: ds 1 ; if 0 then PrintButItFailed
wc72e:: ds 1
wc72f:: ds 1
wc730:: ds 1
@ -887,17 +887,17 @@ wc7e8:: ds 24
RSSET 0 ; Offsets for wBT_OTTempCopy:: @ $c608
wBT_OTTempCopy_0 RB $A ; $c608
wBT_OTTempCopy_TrainerClass RB $1 ; $c608 + $a = $c612
wBT_OTTempCopy_Pkmn1 RB $30 ; $c608 + $b = $c613
wBT_OTTempCopy_Pkmn1Name RB $A ; $c608 + $3b = $c643
wBT_OTTempCopy_45 RB $1 ; $c608 + $45 = $c64d
wBT_OTTempCopy_Pkmn2 RB $30 ; $c608 + $46 = $c64e
wBT_OTTempCopy_Pkmn2Name RB $A ; $c608 + $76 = $c67e
wBT_OTTempCopy_80 RB $1 ; $c608 + $80 = $c688
wBT_OTTempCopy_Pkmn3 RB $30 ; $c608 + $81 = $c689
wBT_OTTempCopy_Pkmn3Name RB $A ; $c608 + $b1 = $c6b9
wBT_OTTempCopy_BB RB $1 ; $c608 + $bb = $c6c3
wBT_OTTempCopy_0 RB $A ; $c608
wBT_OTTempCopy_TrainerClass RB $1 ; $c608 + $a = $c612
wBT_OTTempCopy_Pkmn1 RB $30 ; $c608 + $b = $c613
wBT_OTTempCopy_Pkmn1Name RB $A ; $c608 + $3b = $c643
wBT_OTTempCopy_45 RB $1 ; $c608 + $45 = $c64d
wBT_OTTempCopy_Pkmn2 RB $30 ; $c608 + $46 = $c64e
wBT_OTTempCopy_Pkmn2Name RB $A ; $c608 + $76 = $c67e
wBT_OTTempCopy_80 RB $1 ; $c608 + $80 = $c688
wBT_OTTempCopy_Pkmn3 RB $30 ; $c608 + $81 = $c689
wBT_OTTempCopy_Pkmn3Name RB $A ; $c608 + $b1 = $c6b9
wBT_OTTempCopy_BB RB $1 ; $c608 + $bb = $c6c3
GLOBAL wBT_OTTempCopy_TrainerClass, wBT_OTTempCopy_Pkmn1, wBT_OTTempCopy_Pkmn1Name, wBT_OTTempCopy_45, wBT_OTTempCopy_Pkmn2, wBT_OTTempCopy_Pkmn2Name, wBT_OTTempCopy_80, wBT_OTTempCopy_Pkmn3, wBT_OTTempCopy_Pkmn3Name, wBT_OTTempCopy_BB
@ -1758,17 +1758,17 @@ OtherTrainerClass:: ; d22f
BattleType:: ; d230
; $00 normal
; $01
; $02
; $03 dude
; $01 can lose
; $02 debug
; $03 dude/tutorial
; $04 fishing
; $05 roaming
; $06
; $06 contest
; $07 shiny
; $08 headbutt/rock smash
; $09
; $09 trap
; $0a force Item1
; $0b
; $0b celebi
; $0c suicune
ds 1
@ -2421,7 +2421,9 @@ wdc7c:: ds 33
wdc9d:: ds 2
wdc9f:: ds 1
wdca0:: ds 1
wdca1:: ds 3
RepelStepsLeft:: ; If a Repel is in use, it contains the nr of steps it's still active
ds 1
wdca2:: ds 2
wdca4:: ds 1
wPlayerDataEnd::
@ -2586,7 +2588,9 @@ wPokemonDataEnd::
SECTION "Pic Animations", WRAMX, BANK [2]
w2_d000:: ds $168
w2_d000::
; 20x18 grid of 8x8 tiles
ds SCREEN_WIDTH * SCREEN_HEIGHT ; $168 = 360
w2_d168:: ds 1
w2_d169:: ds 1