You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
Move effects; no more reloadmapmusic, returnafterbattle
This commit is contained in:
PikalaxALT
@@ -202,7 +202,7 @@ Functiond6f5: ; d6f5
|
||||
Functiond730: ; d730
|
||||
call Functiond784
|
||||
ld d, $6
|
||||
ld a, [wd10a]
|
||||
ld a, [wWhichHPBar]
|
||||
and $1
|
||||
ld b, a
|
||||
ld a, [wd1f1]
|
||||
@@ -228,7 +228,7 @@ Functiond749: ; d749
|
||||
call ComputeHPBarPixels
|
||||
ld c, e
|
||||
ld d, $6
|
||||
ld a, [wd10a]
|
||||
ld a, [wWhichHPBar]
|
||||
and $1
|
||||
ld b, a
|
||||
push de
|
||||
@@ -239,7 +239,7 @@ Functiond749: ; d749
|
||||
; d771
|
||||
|
||||
Functiond771: ; d771
|
||||
ld a, [wd10a]
|
||||
ld a, [wWhichHPBar]
|
||||
cp $2
|
||||
jr nz, .skip
|
||||
ld a, $28
|
||||
@@ -254,7 +254,7 @@ Functiond771: ; d771
|
||||
; d784
|
||||
|
||||
Functiond784: ; d784
|
||||
ld a, [wd10a]
|
||||
ld a, [wWhichHPBar]
|
||||
and a
|
||||
ret z
|
||||
cp $1
|
||||
@@ -292,7 +292,7 @@ Functiond7b4: ; d7b4
|
||||
call SetHPPal
|
||||
ld a, [wd1f0]
|
||||
ld c, a
|
||||
callba Function8c43
|
||||
callba ApplyHPBarPals
|
||||
ret
|
||||
; d7c9
|
||||
|
||||
@@ -305,7 +305,7 @@ Functiond7c9: ; d7c9
|
||||
ret
|
||||
|
||||
.cgb
|
||||
ld a, [wd10a]
|
||||
ld a, [wWhichHPBar]
|
||||
and a
|
||||
jr z, .load_0
|
||||
cp $1
|
||||
|
||||
@@ -324,21 +324,21 @@ Function8bec: ; 8bec
|
||||
ret
|
||||
; 8c1d
|
||||
|
||||
Function8c1d: ; 8c1d
|
||||
ApplyMonOrTrainerPals: ; 8c1d
|
||||
call CheckCGB
|
||||
ret z
|
||||
ld a, e
|
||||
and a
|
||||
jr z, .asm_8c2d
|
||||
jr z, .get_trainer
|
||||
ld a, [CurPartySpecies]
|
||||
call GetMonPalettePointer_
|
||||
jr .asm_8c33
|
||||
jr .load_palettes
|
||||
|
||||
.asm_8c2d
|
||||
.get_trainer
|
||||
ld a, [TrainerClass]
|
||||
call GetTrainerPalettePointer
|
||||
|
||||
.asm_8c33
|
||||
.load_palettes
|
||||
ld de, UnknBGPals
|
||||
call LoadPalette_White_Col1_Col2_Black
|
||||
call WipeAttrMap
|
||||
@@ -347,24 +347,24 @@ Function8c1d: ; 8c1d
|
||||
ret
|
||||
; 8c43
|
||||
|
||||
Function8c43: ; 8c43
|
||||
ld a, [wd10a]
|
||||
ApplyHPBarPals: ; 8c43
|
||||
ld a, [wWhichHPBar]
|
||||
and a
|
||||
jr z, .asm_8c52
|
||||
jr z, .Enemy
|
||||
cp $1
|
||||
jr z, .asm_8c57
|
||||
jr z, .Player
|
||||
cp $2
|
||||
jr z, .asm_8c70
|
||||
jr z, .PartyMenu
|
||||
ret
|
||||
|
||||
.asm_8c52
|
||||
.Enemy
|
||||
ld de, BGPals + 2 palettes + 2
|
||||
jr .asm_8c5a
|
||||
jr .okay
|
||||
|
||||
.asm_8c57
|
||||
.Player
|
||||
ld de, BGPals + 3 palettes + 2
|
||||
|
||||
.asm_8c5a
|
||||
.okay
|
||||
ld l, c
|
||||
ld h, $0
|
||||
rept 2
|
||||
@@ -372,27 +372,27 @@ rept 2
|
||||
endr
|
||||
ld bc, Palettes_a8be
|
||||
add hl, bc
|
||||
ld bc, $4
|
||||
ld bc, 4
|
||||
ld a, $5
|
||||
call FarCopyWRAM
|
||||
ld a, $1
|
||||
ld [hCGBPalUpdate], a
|
||||
ret
|
||||
|
||||
.asm_8c70
|
||||
.PartyMenu
|
||||
ld e, c
|
||||
inc e
|
||||
hlcoord 11, 1, AttrMap
|
||||
ld bc, $28
|
||||
ld bc, 2 * SCREEN_WIDTH
|
||||
ld a, [CurPartyMon]
|
||||
.asm_8c7b
|
||||
.loop
|
||||
and a
|
||||
jr z, .asm_8c82
|
||||
jr z, .done
|
||||
add hl, bc
|
||||
dec a
|
||||
jr .asm_8c7b
|
||||
jr .loop
|
||||
|
||||
.asm_8c82
|
||||
.done
|
||||
lb bc, 2, 8
|
||||
ld a, e
|
||||
call FillBoxCGB
|
||||
@@ -2088,7 +2088,7 @@ TilesetColors4: ; b289
|
||||
db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f
|
||||
; b309
|
||||
|
||||
Palette_b309: ; b309
|
||||
Palette_b309: ; b309 mobile
|
||||
RGB 31, 31, 31
|
||||
RGB 31, 19, 24
|
||||
RGB 30, 10, 06
|
||||
@@ -2096,7 +2096,7 @@ Palette_b309: ; b309
|
||||
|
||||
; b311
|
||||
|
||||
Palette_b311: ; b311
|
||||
Palette_b311: ; b311 not mobile
|
||||
RGB 31, 31, 31
|
||||
RGB 17, 19, 31
|
||||
RGB 14, 16, 31
|
||||
|
||||
@@ -144,7 +144,7 @@ RandomEncounter:: ; 97cc0
|
||||
WildBattleScript: ; 97cf9
|
||||
randomwildmon
|
||||
startbattle
|
||||
returnafterbattle
|
||||
reloadmapafterbattle
|
||||
end
|
||||
; 97cfd
|
||||
|
||||
|
||||
@@ -68,7 +68,7 @@ OptionsMenu: ; 5b64
|
||||
|
||||
NewGame: ; 5b6b
|
||||
xor a
|
||||
ld [wc2cc], a
|
||||
ld [wMonStatusFlags], a
|
||||
call ResetWRAM
|
||||
call NewGame_ClearTileMapEtc
|
||||
call AreYouABoyOrAreYouAGirl
|
||||
@@ -86,7 +86,7 @@ NewGame: ; 5b6b
|
||||
; 5b8f
|
||||
|
||||
AreYouABoyOrAreYouAGirl: ; 5b8f
|
||||
callba Function10632f ; some mobile stuff
|
||||
callba Mobile_AlwaysReturnNotCarry ; some mobile stuff
|
||||
jr c, .ok
|
||||
callba InitGender
|
||||
ret
|
||||
@@ -211,9 +211,9 @@ ENDC
|
||||
ld [Money + 2], a
|
||||
|
||||
xor a
|
||||
ld [wdc17], a
|
||||
ld [wWhichMomItem], a
|
||||
|
||||
ld hl, wdc19
|
||||
ld hl, MomItemTriggerBalance
|
||||
ld [hl], 2300 / $10000
|
||||
inc hl
|
||||
ld [hl], 2300 / $100 % $100
|
||||
@@ -385,7 +385,7 @@ Continue: ; 5d65
|
||||
ld c, 20
|
||||
call DelayFrames
|
||||
callba JumpRoamMons
|
||||
callba Function105091 ; Mystery Gift
|
||||
callba MysteryGift_CopyReceivedDecosToPC ; Mystery Gift
|
||||
callba Function140ae ; time-related
|
||||
ld a, [wSpawnAfterChampion]
|
||||
cp SPAWN_LANCE
|
||||
@@ -399,14 +399,14 @@ Continue: ; 5d65
|
||||
|
||||
.SpawnAfterE4
|
||||
ld a, SPAWN_NEW_BARK
|
||||
ld [wd001], a
|
||||
ld [DefaultSpawnpoint], a
|
||||
call PostCreditsSpawn
|
||||
jp FinishContinueFunction
|
||||
; 5de2
|
||||
|
||||
SpawnAfterRed: ; 5de2
|
||||
ld a, SPAWN_MT_SILVER
|
||||
ld [wd001], a
|
||||
ld [DefaultSpawnpoint], a
|
||||
; 5de7
|
||||
|
||||
PostCreditsSpawn: ; 5de7
|
||||
@@ -418,8 +418,11 @@ PostCreditsSpawn: ; 5de7
|
||||
; 5df0
|
||||
|
||||
Continue_MobileAdapterMenu: ; 5df0
|
||||
callba Function10632f ; mobile check
|
||||
callba Mobile_AlwaysReturnNotCarry ; mobile check
|
||||
ret nc
|
||||
|
||||
; the rest of this stuff is never reached because
|
||||
; the previous function returns with carry not set
|
||||
ld hl, wd479
|
||||
bit 1, [hl]
|
||||
ret nz
|
||||
@@ -480,7 +483,7 @@ Continue_CheckRTC_RestartClock: ; 5e48
|
||||
FinishContinueFunction: ; 5e5d
|
||||
.loop
|
||||
xor a
|
||||
ld [wc2c1], a
|
||||
ld [wDontPlayMapMusicOnReload], a
|
||||
ld [wLinkMode], a
|
||||
ld hl, GameTimerPause
|
||||
set 0, [hl]
|
||||
@@ -641,7 +644,7 @@ Continue_DisplayBadgeCount: ; 5f58
|
||||
|
||||
Continue_DisplayPokedexNumCaught: ; 5f6b
|
||||
ld a, [StatusFlags]
|
||||
bit 0, a
|
||||
bit 0, a ; Pokedex
|
||||
ret z
|
||||
push hl
|
||||
ld hl, PokedexCaught
|
||||
@@ -787,7 +790,7 @@ NamePlayer: ; 0x6074
|
||||
dec a
|
||||
jr z, .NewName
|
||||
call StorePlayerName
|
||||
callba Function8c1d
|
||||
callba ApplyMonOrTrainerPals
|
||||
callba MovePlayerPicLeft
|
||||
ret
|
||||
|
||||
@@ -1024,7 +1027,7 @@ StartTitleScreen: ; 6219
|
||||
call .TitleScreen
|
||||
call DelayFrame
|
||||
.loop
|
||||
call Function627b
|
||||
call RunTitleScreen
|
||||
jr nc, .loop
|
||||
|
||||
call ClearSprites
|
||||
@@ -1079,7 +1082,7 @@ endr
|
||||
ret
|
||||
; 627b
|
||||
|
||||
Function627b: ; 627b
|
||||
RunTitleScreen: ; 627b
|
||||
ld a, [wJumptableIndex]
|
||||
bit 7, a
|
||||
jr nz, .done_title
|
||||
@@ -1126,7 +1129,7 @@ endr
|
||||
dw TitleScreenEnd
|
||||
; 62b7
|
||||
|
||||
Function62b7: ; Unreferenced
|
||||
.NextScene ; Unreferenced
|
||||
ld hl, wJumptableIndex
|
||||
inc [hl]
|
||||
ret
|
||||
@@ -1152,7 +1155,7 @@ TitleScreenEntrance: ; 62bc
|
||||
; Reversed signage for every other line's position.
|
||||
; This is responsible for the interlaced effect.
|
||||
ld a, e
|
||||
xor -1
|
||||
xor $ff
|
||||
inc a
|
||||
|
||||
ld b, 8 * 10 / 2 ; logo height / 2
|
||||
@@ -1191,7 +1194,7 @@ TitleScreenTimer: ; 62f6
|
||||
|
||||
; Start a timer
|
||||
ld hl, wcf65
|
||||
ld de, $1140 ; 73.6 seconds
|
||||
ld de, 73 * 60 + 36
|
||||
ld [hl], e
|
||||
inc hl
|
||||
ld [hl], d
|
||||
@@ -1225,7 +1228,7 @@ TitleScreenMain: ; 6304
|
||||
; To bring up the clock reset dialog:
|
||||
|
||||
; Hold Down + B + Select to initiate the sequence.
|
||||
ld a, [$ffeb]
|
||||
ld a, [hClockResetTrigger]
|
||||
cp $34
|
||||
jr z, .check_clock_reset
|
||||
|
||||
@@ -1235,17 +1238,17 @@ TitleScreenMain: ; 6304
|
||||
jr nz, .check_start
|
||||
|
||||
ld a, $34
|
||||
ld [$ffeb], a
|
||||
ld [hClockResetTrigger], a
|
||||
jr .check_start
|
||||
|
||||
; Keep Select pressed, and hold Left + Up.
|
||||
; Then let go of Select.
|
||||
.check_clock_reset
|
||||
bit 2, [hl] ; SELECT
|
||||
bit SELECT_F, [hl]
|
||||
jr nz, .check_start
|
||||
|
||||
xor a
|
||||
ld [$ffeb], a
|
||||
ld [hClockResetTrigger], a
|
||||
|
||||
ld a, [hl]
|
||||
and D_LEFT + D_UP
|
||||
@@ -1368,12 +1371,12 @@ endr
|
||||
|
||||
Data63ca: ; 63ca
|
||||
; frame 0 y, x; frame 1 y, x
|
||||
db $5c, $50, $00, $00
|
||||
db $5c, $68, $5c, $58
|
||||
db $5c, $68, $5c, $78
|
||||
db $5c, $88, $5c, $78
|
||||
db $00, $00, $5c, $78
|
||||
db $00, $00, $5c, $58
|
||||
db 11 * 8 + 4, 10 * 8, 0 * 8, 0 * 8
|
||||
db 11 * 8 + 4, 13 * 8, 11 * 8 + 4, 11 * 8
|
||||
db 11 * 8 + 4, 13 * 8, 11 * 8 + 4, 15 * 8
|
||||
db 11 * 8 + 4, 17 * 8, 11 * 8 + 4, 15 * 8
|
||||
db 0 * 8, 0 * 8, 11 * 8 + 4, 15 * 8
|
||||
db 0 * 8, 0 * 8, 11 * 8 + 4, 11 * 8
|
||||
; 63e2
|
||||
|
||||
Copyright: ; 63e2
|
||||
@@ -1390,20 +1393,16 @@ Copyright: ; 63e2
|
||||
|
||||
CopyrightString: ; 63fd
|
||||
; ©1995-2001 Nintendo
|
||||
db $60, $61, $62, $63, $64, $65, $66
|
||||
db $67, $68, $69, $6a, $6b, $6c
|
||||
|
||||
db $4e
|
||||
db $60, $61, $62, $63, $64, $65, $66
|
||||
db $67, $68, $69, $6a, $6b, $6c
|
||||
|
||||
; ©1995-2001 Creatures inc.
|
||||
db $60, $61, $62, $63, $64, $65, $66, $6d
|
||||
db $6e, $6f, $70, $71, $72, $7a, $7b, $7c
|
||||
|
||||
db $4e
|
||||
next $60, $61, $62, $63, $64, $65, $66
|
||||
db $6d, $6e, $6f, $70, $71, $72, $7a, $7b, $7c
|
||||
|
||||
; ©1995-2001 GAME FREAK inc.
|
||||
db $60, $61, $62, $63, $64, $65, $66, $73, $74
|
||||
db $75, $76, $77, $78, $79, $7a, $7b, $7c
|
||||
next $60, $61, $62, $63, $64, $65, $66
|
||||
db $73, $74, $75, $76, $77, $78, $79, $7a, $7b, $7c
|
||||
|
||||
db "@"
|
||||
; 642e
|
||||
|
||||
@@ -16,7 +16,7 @@ TryAddMonToParty: ; d88c
|
||||
; Increase the party count
|
||||
ld [de], a
|
||||
ld a, [de] ; Why are we doing this?
|
||||
ld [$ffae], a ; HRAM backup
|
||||
ld [hMoveMon], a ; HRAM backup
|
||||
add e
|
||||
ld e, a
|
||||
jr nc, .loadspecies
|
||||
@@ -39,7 +39,7 @@ TryAddMonToParty: ; d88c
|
||||
ld hl, OTPartyMonOT
|
||||
|
||||
.loadOTname
|
||||
ld a, [$ffae] ; Restore index from backup
|
||||
ld a, [hMoveMon] ; Restore index from backup
|
||||
dec a
|
||||
call SkipNames
|
||||
ld d, h
|
||||
@@ -54,7 +54,7 @@ TryAddMonToParty: ; d88c
|
||||
ld [wd265], a
|
||||
call GetPokemonName
|
||||
ld hl, PartyMonNicknames
|
||||
ld a, [$ffae]
|
||||
ld a, [hMoveMon]
|
||||
dec a
|
||||
call SkipNames
|
||||
ld d, h
|
||||
@@ -71,7 +71,7 @@ TryAddMonToParty: ; d88c
|
||||
ld hl, OTPartyMon1Species
|
||||
|
||||
.initializeStats
|
||||
ld a, [$ffae]
|
||||
ld a, [hMoveMon]
|
||||
dec a
|
||||
ld bc, PARTYMON_STRUCT_LENGTH
|
||||
call AddNTimes
|
||||
@@ -1168,7 +1168,7 @@ GiveEgg:: ; df8c
|
||||
ld hl, PartyMon1Happiness
|
||||
ld bc, PARTYMON_STRUCT_LENGTH
|
||||
call AddNTimes
|
||||
ld a, [wc2cc]
|
||||
ld a, [wMonStatusFlags]
|
||||
bit 1, a
|
||||
ld a, 1
|
||||
jr nz, .got_init_happiness
|
||||
|
||||
@@ -51,7 +51,7 @@ DoMysteryGift: ; 1048ba (41:48ba)
|
||||
ld a, [wMysteryGiftPlayerBackupItem]
|
||||
and a
|
||||
jp nz, .GiftWaiting
|
||||
ld a, [wc912]
|
||||
ld a, [wMysteryGiftPartnerBackupItem]
|
||||
and a
|
||||
jp nz, .FriendNotReady
|
||||
ld a, [wc900]
|
||||
@@ -73,7 +73,7 @@ DoMysteryGift: ; 1048ba (41:48ba)
|
||||
ld c, a
|
||||
callba MysteryGiftGetDecoration
|
||||
push bc
|
||||
call Function105069
|
||||
call MysteryGift_CheckAndSetDecorationAlreadyReceived
|
||||
pop bc
|
||||
jr nz, .item
|
||||
callab GetDecorationName_c
|
||||
@@ -680,24 +680,24 @@ Function104db7: ; 104db7 (41:4db7)
|
||||
Function104dc5: ; 104dc5 (41:4dc5)
|
||||
ld a, $c1
|
||||
ld [$ff00+c], a
|
||||
.asm_104dc8
|
||||
.wait
|
||||
dec d
|
||||
ret z
|
||||
xor a
|
||||
ld [rIF], a
|
||||
halt
|
||||
jr .asm_104dc8
|
||||
jr .wait
|
||||
|
||||
Function104dd1: ; 104dd1 (41:4dd1)
|
||||
ld a, $c0
|
||||
ld [$ff00+c], a
|
||||
.asm_104dd4
|
||||
.wait
|
||||
dec d
|
||||
ret z
|
||||
xor a
|
||||
ld [rIF], a
|
||||
halt
|
||||
jr .asm_104dd4
|
||||
jr .wait
|
||||
|
||||
Function104ddd: ; 104ddd (41:4ddd)
|
||||
ld d, $0
|
||||
@@ -763,7 +763,7 @@ asm_104e3a: ; 104e3a (41:4e3a)
|
||||
Function104e46: ; 104e46 (41:4e46)
|
||||
ld a, $2
|
||||
ld [hPrintNum9], a
|
||||
ld c, $56
|
||||
ld c, rRP % $100
|
||||
ld d, $0
|
||||
ld e, d
|
||||
ld d, $3d
|
||||
@@ -800,14 +800,14 @@ Function104e8c: ; 104e8c (41:4e8c)
|
||||
|
||||
Function104e93: ; 104e93 (41:4e93)
|
||||
xor a
|
||||
ld [hDivisor], a
|
||||
ld [hMathBuffer], a
|
||||
ld [hPrintNum5], a
|
||||
ld [hPrintNum6], a
|
||||
push hl
|
||||
push bc
|
||||
ld c, $56
|
||||
ld c, rRP % $100
|
||||
ld d, $3d
|
||||
call Function104dd1
|
||||
ld hl, hQuotient ; $ffb4 (aliases: hMultiplicand)
|
||||
ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
|
||||
ld a, $5a
|
||||
ld [hli], a
|
||||
ld [hl], b
|
||||
@@ -817,26 +817,26 @@ Function104e93: ; 104e93 (41:4e93)
|
||||
pop bc
|
||||
pop hl
|
||||
call Function104ed6
|
||||
ld a, [hDivisor]
|
||||
ld [hQuotient], a
|
||||
ld a, [hMathBuffer]
|
||||
ld [$ffb5], a
|
||||
ld a, [hPrintNum5]
|
||||
ld [hPrintNum2], a
|
||||
ld a, [hPrintNum6]
|
||||
ld [hPrintNum3], a
|
||||
push hl
|
||||
ld hl, hQuotient ; $ffb4 (aliases: hMultiplicand)
|
||||
ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
|
||||
ld b, $2
|
||||
call Function104ed6
|
||||
ld hl, hPrintNum10
|
||||
ld b, $1
|
||||
call Function104faf
|
||||
ld a, [hQuotient]
|
||||
ld [hDivisor], a
|
||||
ld a, [$ffb5]
|
||||
ld [hMathBuffer], a
|
||||
ld a, [hPrintNum2]
|
||||
ld [hPrintNum5], a
|
||||
ld a, [hPrintNum3]
|
||||
ld [hPrintNum6], a
|
||||
pop hl
|
||||
ret
|
||||
|
||||
Function104ed6: ; 104ed6 (41:4ed6)
|
||||
ld c, $56
|
||||
ld c, rRP % $100
|
||||
ld d, $5
|
||||
call Function104dd1
|
||||
ld d, $5
|
||||
@@ -852,15 +852,15 @@ Function104ed6: ; 104ed6 (41:4ed6)
|
||||
inc b
|
||||
jr z, .asm_104f2e
|
||||
ld a, $8
|
||||
ld [$ffb6], a
|
||||
ld [hPrintNum4], a
|
||||
ld a, [hli]
|
||||
ld e, a
|
||||
ld a, [hDivisor]
|
||||
ld a, [hPrintNum5]
|
||||
add e
|
||||
ld [hDivisor], a
|
||||
ld a, [hMathBuffer]
|
||||
ld [hPrintNum5], a
|
||||
ld a, [hPrintNum6]
|
||||
adc $0
|
||||
ld [hMathBuffer], a
|
||||
ld [hPrintNum6], a
|
||||
.asm_104f02
|
||||
xor a
|
||||
ld [rIF], a
|
||||
@@ -885,10 +885,10 @@ Function104ed6: ; 104ed6 (41:4ed6)
|
||||
ld [rIF], a
|
||||
halt
|
||||
.asm_104f25
|
||||
ld a, [$ffb6]
|
||||
ld a, [hPrintNum4]
|
||||
dec a
|
||||
jr z, .asm_104eee
|
||||
ld [$ffb6], a
|
||||
ld [hPrintNum4], a
|
||||
jr .asm_104f02
|
||||
.asm_104f2e
|
||||
ld a, $fe
|
||||
@@ -922,35 +922,35 @@ Function104f50: ; 104f50 (41:4f50)
|
||||
|
||||
Function104f57: ; 104f57 (41:4f57)
|
||||
xor a
|
||||
ld [hDivisor], a
|
||||
ld [hMathBuffer], a
|
||||
ld [hPrintNum5], a
|
||||
ld [hPrintNum6], a
|
||||
push bc
|
||||
push hl
|
||||
ld hl, hQuotient ; $ffb4 (aliases: hMultiplicand)
|
||||
ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
|
||||
ld b, $2
|
||||
call Function104faf
|
||||
ld a, [$ffb5]
|
||||
ld [$ffba], a
|
||||
ld a, [hPrintNum3]
|
||||
ld [hPrintNum8], a
|
||||
ld b, a
|
||||
pop hl
|
||||
pop af
|
||||
cp b
|
||||
jp c, Function104f50
|
||||
ld a, [hQuotient]
|
||||
ld a, [hPrintNum2]
|
||||
cp $5a
|
||||
jp nz, Function104f50
|
||||
call Function104faf
|
||||
ld a, [hDivisor]
|
||||
ld a, [hPrintNum5]
|
||||
ld d, a
|
||||
ld a, [hMathBuffer]
|
||||
ld a, [hPrintNum6]
|
||||
ld e, a
|
||||
push hl
|
||||
push de
|
||||
ld hl, hQuotient ; $ffb4 (aliases: hMultiplicand)
|
||||
ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
|
||||
ld b, $2
|
||||
call Function104faf
|
||||
pop de
|
||||
ld hl, hQuotient ; $ffb4 (aliases: hMultiplicand)
|
||||
ld hl, hPrintNum2 ; $ffb4 (aliases: hMultiplicand)
|
||||
ld a, [hli]
|
||||
xor d
|
||||
ld b, a
|
||||
@@ -967,9 +967,9 @@ Function104f57: ; 104f57 (41:4f57)
|
||||
pop de
|
||||
pop hl
|
||||
ld a, d
|
||||
ld [hDivisor], a
|
||||
ld [hPrintNum5], a
|
||||
ld a, e
|
||||
ld [hMathBuffer], a
|
||||
ld [hPrintNum6], a
|
||||
ret
|
||||
|
||||
Function104faf: ; 104faf (41:4faf)
|
||||
@@ -993,7 +993,7 @@ Function104faf: ; 104faf (41:4faf)
|
||||
inc b
|
||||
jr z, .asm_10501a
|
||||
ld a, $8
|
||||
ld [$ffb6], a
|
||||
ld [hPrintNum4], a
|
||||
.asm_104fd9
|
||||
ld d, $0
|
||||
.asm_104fdb
|
||||
@@ -1022,9 +1022,9 @@ Function104faf: ; 104faf (41:4faf)
|
||||
.asm_104ffd
|
||||
res 0, e
|
||||
.asm_104fff
|
||||
ld a, [$ffb6]
|
||||
ld a, [hPrintNum4]
|
||||
dec a
|
||||
ld [$ffb6], a
|
||||
ld [hPrintNum4], a
|
||||
jr z, .asm_10500b
|
||||
ld a, e
|
||||
rlca
|
||||
@@ -1033,12 +1033,12 @@ Function104faf: ; 104faf (41:4faf)
|
||||
.asm_10500b
|
||||
ld a, e
|
||||
ld [hli], a
|
||||
ld a, [hDivisor]
|
||||
ld a, [hPrintNum5]
|
||||
add e
|
||||
ld [hDivisor], a
|
||||
ld a, [hMathBuffer]
|
||||
ld [hPrintNum5], a
|
||||
ld a, [hPrintNum6]
|
||||
adc $0
|
||||
ld [hMathBuffer], a
|
||||
ld [hPrintNum6], a
|
||||
jr .asm_104fd2
|
||||
.asm_10501a
|
||||
call Function104d74
|
||||
@@ -1088,7 +1088,7 @@ endr
|
||||
ld [rJOYP], a
|
||||
ret
|
||||
|
||||
Function105069: ; 105069 (41:5069)
|
||||
MysteryGift_CheckAndSetDecorationAlreadyReceived: ; 105069 (41:5069)
|
||||
call GetMysteryGiftBank
|
||||
ld d, $0
|
||||
ld b, CHECK_FLAG
|
||||
@@ -1110,7 +1110,7 @@ Function105069: ; 105069 (41:5069)
|
||||
xor a
|
||||
ret
|
||||
|
||||
Function105091: ; 105091 (41:5091)
|
||||
MysteryGift_CopyReceivedDecosToPC: ; 105091 (41:5091)
|
||||
call GetMysteryGiftBank
|
||||
ld c, $0
|
||||
.loop
|
||||
|
||||
@@ -168,7 +168,7 @@ ENDC
|
||||
dw Script_loadwildmon ; 5d
|
||||
dw Script_loadtrainer ; 5e
|
||||
dw Script_startbattle ; 5f
|
||||
dw Script_returnafterbattle ; 60
|
||||
dw Script_reloadmapafterbattle ; 60
|
||||
dw Script_catchtutorial ; 61
|
||||
dw Script_trainertext ; 62
|
||||
dw Script_trainerflagaction ; 63
|
||||
@@ -203,7 +203,7 @@ ENDC
|
||||
dw Script_encountermusic ; 80
|
||||
dw Script_musicfadeout ; 81
|
||||
dw Script_playmapmusic ; 82
|
||||
dw Script_reloadmapmusic ; 83
|
||||
dw Script_dontrestartmapmusic ; 83
|
||||
dw Script_cry ; 84
|
||||
dw Script_playsound ; 85
|
||||
dw Script_waitsfx ; 86
|
||||
@@ -1555,7 +1555,7 @@ Script_catchtutorial: ; 97447
|
||||
jp Script_reloadmap
|
||||
; 97459
|
||||
|
||||
Script_returnafterbattle: ; 97459
|
||||
Script_reloadmapafterbattle: ; 97459
|
||||
; script command 0x60
|
||||
|
||||
ld hl, wBattleScriptFlags
|
||||
@@ -2905,11 +2905,11 @@ Script_blackoutmod: ; 97a78
|
||||
ret
|
||||
; 97a85
|
||||
|
||||
Script_reloadmapmusic: ; 97a85
|
||||
Script_dontrestartmapmusic: ; 97a85
|
||||
; script command 0x83
|
||||
|
||||
ld a, 1
|
||||
ld [wc2c1], a
|
||||
ld [wDontPlayMapMusicOnReload], a
|
||||
ret
|
||||
; 97a8b
|
||||
|
||||
|
||||
@@ -94,13 +94,13 @@ endr
|
||||
add hl, bc
|
||||
ld a, d
|
||||
and $10 ; bit 4
|
||||
jr z, .load_Null
|
||||
jr z, .load_zero
|
||||
ld a, e
|
||||
and a
|
||||
jr z, .load_minus_two
|
||||
cp $1
|
||||
jr z, .load_minus_one
|
||||
.load_Null
|
||||
.load_zero
|
||||
xor a
|
||||
ld [hl], a
|
||||
ret
|
||||
@@ -140,11 +140,11 @@ endr
|
||||
; 8d306 (23:5306)
|
||||
|
||||
; Anonymous jumptable (see .anonymous_jumptable)
|
||||
dw .four_Null
|
||||
dw .four_zero
|
||||
dw .four_one
|
||||
; 8d30a
|
||||
|
||||
.four_Null: ; 8d30a
|
||||
.four_zero: ; 8d30a
|
||||
call .IncrementSpriteAnimStruct0B
|
||||
|
||||
ld hl, SPRITEANIMSTRUCT_INDEX
|
||||
@@ -425,7 +425,7 @@ endr
|
||||
; 8d487 (23:5487)
|
||||
|
||||
; Anonymous jumptable (see .anonymous_jumptable)
|
||||
dw .sixteen_Null
|
||||
dw .sixteen_zero
|
||||
dw .sixteen_one
|
||||
dw .sixteen_two
|
||||
dw .sixteen_three
|
||||
@@ -433,7 +433,7 @@ endr
|
||||
dw .sixteen_five
|
||||
; 8d493
|
||||
|
||||
.sixteen_Null: ; 8d493
|
||||
.sixteen_zero: ; 8d493
|
||||
ld a, $14
|
||||
call _ReinitSpriteAnimFrame
|
||||
|
||||
|
||||
Reference in New Issue
Block a user