You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
Local labels starting with lowercase letters are no longer decorated with a trailing colon
This commit is contained in:
pikalaxalt
@@ -416,7 +416,7 @@ AI_Items: ; 39196
|
||||
jp .Use
|
||||
; 382ae
|
||||
|
||||
.asm_382ae: ; This appears to be unused
|
||||
.asm_382ae ; This appears to be unused
|
||||
callab AICheckEnemyMaxHP
|
||||
jr c, .dont_use
|
||||
push bc
|
||||
|
||||
@@ -3550,7 +3550,7 @@ BattleAnim_CottonSpore: ; cae84
|
||||
anim_obp0 $54
|
||||
anim_1gfx ANIM_GFX_MISC
|
||||
anim_sound 0, 1, SFX_POWDER
|
||||
.loop: ; cae8b
|
||||
.loop ; cae8b
|
||||
anim_obj ANIM_OBJ_81, -16, 4, 4, 0, $0
|
||||
anim_wait 8
|
||||
anim_loop 5, .loop
|
||||
@@ -3592,7 +3592,7 @@ BattleAnim_Spite: ; caed6
|
||||
|
||||
BattleAnim_PowderSnow: ; caee2
|
||||
anim_1gfx ANIM_GFX_ICE
|
||||
.loop: ; caee4
|
||||
.loop ; caee4
|
||||
anim_sound 6, 2, SFX_SHINE
|
||||
anim_obj ANIM_OBJ_8F, 8, 0, 11, 0, $23
|
||||
anim_wait 2
|
||||
|
||||
@@ -2218,7 +2218,7 @@ BattleBGEffect_VibrateMon: ; c8c61 (32:4c61)
|
||||
dw .one
|
||||
|
||||
|
||||
.zero: ; c8c68 (32:4c68)
|
||||
.zero ; c8c68 (32:4c68)
|
||||
call BattleBGEffects_IncrementJumptable
|
||||
call BattleBGEffects_ClearLYOverrides
|
||||
ld a, $43
|
||||
@@ -2234,7 +2234,7 @@ BattleBGEffect_VibrateMon: ; c8c61 (32:4c61)
|
||||
ld [hl], $20
|
||||
ret
|
||||
|
||||
.one: ; c8c85 (32:4c85)
|
||||
.one ; c8c85 (32:4c85)
|
||||
ld hl, BG_EFFECT_STRUCT_03
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
@@ -2264,7 +2264,7 @@ BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2)
|
||||
dw .two
|
||||
|
||||
|
||||
.zero: ; c8cab (32:4cab)
|
||||
.zero ; c8cab (32:4cab)
|
||||
call BattleBGEffects_IncrementJumptable
|
||||
call BattleBGEffects_ClearLYOverrides
|
||||
ld a, $43
|
||||
@@ -2278,7 +2278,7 @@ BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2)
|
||||
ld [hl], $0
|
||||
ret
|
||||
|
||||
.one: ; c8cc3 (32:4cc3)
|
||||
.one ; c8cc3 (32:4cc3)
|
||||
ld hl, BG_EFFECT_STRUCT_03
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
@@ -2294,7 +2294,7 @@ BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2)
|
||||
ld [hl], a
|
||||
ret
|
||||
|
||||
.two: ; c8cdd (32:4cdd)
|
||||
.two ; c8cdd (32:4cdd)
|
||||
call BattleAnim_ResetLCDStatCustom
|
||||
ret
|
||||
|
||||
@@ -2429,7 +2429,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
|
||||
dw .two_dmg
|
||||
|
||||
|
||||
.zero_dmg: ; c8d8b (32:4d8b)
|
||||
.zero_dmg ; c8d8b (32:4d8b)
|
||||
call BattleBGEffects_IncrementJumptable
|
||||
ld a, $e4
|
||||
call BattleBGEffects_SetLYOverrides
|
||||
@@ -2447,7 +2447,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
|
||||
ld [hl], a
|
||||
ret
|
||||
|
||||
.one_dmg: ; c8daa (32:4daa)
|
||||
.one_dmg ; c8daa (32:4daa)
|
||||
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
@@ -2472,7 +2472,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
|
||||
dec [hl]
|
||||
ret
|
||||
|
||||
.two_dmg: ; c8dc9 (32:4dc9)
|
||||
.two_dmg ; c8dc9 (32:4dc9)
|
||||
call BattleBGEffects_ResetVideoHRAM
|
||||
ld a, %11100100
|
||||
ld [rBGP], a
|
||||
@@ -2494,7 +2494,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
|
||||
dw .four_cgb
|
||||
|
||||
|
||||
.zero_cgb: ; c8de7 (32:4de7)
|
||||
.zero_cgb ; c8de7 (32:4de7)
|
||||
call BGEffect_CheckBattleTurn
|
||||
jr nz, .player_turn_cgb
|
||||
call BattleBGEffects_IncrementJumptable
|
||||
@@ -2510,7 +2510,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
|
||||
ld [hl], a
|
||||
ret
|
||||
|
||||
.one_cgb: ; c8e02 (32:4e02)
|
||||
.one_cgb ; c8e02 (32:4e02)
|
||||
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
@@ -2535,13 +2535,13 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
|
||||
dec [hl]
|
||||
ret
|
||||
|
||||
.two_cgb: ; c8e21 (32:4e21)
|
||||
.two_cgb ; c8e21 (32:4e21)
|
||||
ld a, $e4
|
||||
call BGEffects_LoadBGPal0_OBPal1
|
||||
call EndBattleBGEffect
|
||||
ret
|
||||
|
||||
.three_cgb: ; c8e2a (32:4e2a)
|
||||
.three_cgb ; c8e2a (32:4e2a)
|
||||
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
@@ -2566,7 +2566,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
|
||||
dec [hl]
|
||||
ret
|
||||
|
||||
.four_cgb: ; c8e49 (32:4e49)
|
||||
.four_cgb ; c8e49 (32:4e49)
|
||||
ld a, $e4
|
||||
call BGEffects_LoadBGPal1_OBPal0
|
||||
call EndBattleBGEffect
|
||||
|
||||
@@ -565,7 +565,7 @@ DetermineMoveOrder: ; 3c314
|
||||
ret
|
||||
; 3c3f3
|
||||
|
||||
.enemy_first: ; 3c3f3
|
||||
.enemy_first ; 3c3f3
|
||||
and a
|
||||
ret
|
||||
; 3c3f5
|
||||
|
||||
@@ -3337,7 +3337,7 @@ BattleCommand_BeatUp: ; 35461
|
||||
; 355b0
|
||||
|
||||
|
||||
.beatup_fail: ; 355b0
|
||||
.beatup_fail ; 355b0
|
||||
ld b, buildopponentrage_command
|
||||
jp SkipToBattleCommand
|
||||
|
||||
@@ -5188,7 +5188,7 @@ BattleCommand_Poison: ; 35f2c
|
||||
; 35fc0
|
||||
|
||||
|
||||
.apply_poison: ; 35fc0
|
||||
.apply_poison ; 35fc0
|
||||
call AnimateCurrentMove
|
||||
call PoisonOpponent
|
||||
jp RefreshBattleHuds
|
||||
@@ -5196,7 +5196,7 @@ BattleCommand_Poison: ; 35f2c
|
||||
; 35fc9
|
||||
|
||||
|
||||
.check_toxic: ; 35fc9
|
||||
.check_toxic ; 35fc9
|
||||
ld a, BATTLE_VARS_SUBSTATUS5_OPP
|
||||
call GetBattleVarAddr
|
||||
ld a, [hBattleTurn]
|
||||
@@ -5671,14 +5671,14 @@ CheckIfStatCanBeRaised: ; 361ef
|
||||
; 3626e
|
||||
|
||||
|
||||
.stats_already_max: ; 3626e
|
||||
.stats_already_max ; 3626e
|
||||
pop hl
|
||||
dec [hl]
|
||||
; fallthrough
|
||||
; 36270
|
||||
|
||||
|
||||
.cant_raise_stat: ; 36270
|
||||
.cant_raise_stat ; 36270
|
||||
ld a, $2
|
||||
ld [FailedMessage], a
|
||||
ld a, $1
|
||||
@@ -5688,7 +5688,7 @@ CheckIfStatCanBeRaised: ; 361ef
|
||||
; 3627b
|
||||
|
||||
|
||||
.stat_raise_failed: ; 3627b
|
||||
.stat_raise_failed ; 3627b
|
||||
ld a, $1
|
||||
ld [FailedMessage], a
|
||||
ret
|
||||
|
||||
@@ -14,7 +14,7 @@ BattleIntroSlidingPics: ; 4e980
|
||||
ret
|
||||
; 4e998
|
||||
|
||||
.subfunction1: ; 4e998
|
||||
.subfunction1 ; 4e998
|
||||
call .subfunction4
|
||||
ld a, $90
|
||||
ld [hSCX], a
|
||||
@@ -25,7 +25,7 @@ BattleIntroSlidingPics: ; 4e980
|
||||
ret
|
||||
; 4e9ab
|
||||
|
||||
.subfunction2: ; 4e9ab
|
||||
.subfunction2 ; 4e9ab
|
||||
ld d, $90
|
||||
ld e, $72
|
||||
ld a, $48
|
||||
@@ -61,7 +61,7 @@ endr
|
||||
ret
|
||||
; 4e9d6
|
||||
|
||||
.subfunction3: ; 4e9d6
|
||||
.subfunction3 ; 4e9d6
|
||||
ld hl, Sprites + 1 ; x pixel
|
||||
ld c, $12 ; 18
|
||||
ld de, $4
|
||||
@@ -75,7 +75,7 @@ endr
|
||||
ret
|
||||
; 4e9e5
|
||||
|
||||
.subfunction4: ; 4e9e5
|
||||
.subfunction4 ; 4e9e5
|
||||
ld hl, LYOverrides
|
||||
ld a, $90
|
||||
ld bc, SCREEN_HEIGHT_PX
|
||||
@@ -83,7 +83,7 @@ endr
|
||||
ret
|
||||
; 4e9f1
|
||||
|
||||
.subfunction5: ; 4e9f1
|
||||
.subfunction5 ; 4e9f1
|
||||
ld hl, LYOverrides
|
||||
ld a, d
|
||||
ld c, $3e ; 62
|
||||
|
||||
@@ -238,7 +238,7 @@ LoadBallIconGFX: ; 2c165
|
||||
ret
|
||||
; 2c172
|
||||
|
||||
.gfx: ; 2c172
|
||||
.gfx ; 2c172
|
||||
INCBIN "gfx/battle/balls.2bpp"
|
||||
; 2c1b2
|
||||
|
||||
|
||||
@@ -148,7 +148,7 @@ FlashyTransitionToBattle: ; 8c314
|
||||
jumptable .dw, wJumptableIndex
|
||||
; 8c323
|
||||
|
||||
.dw: ; 8c323 (23:4323)
|
||||
.dw ; 8c323 (23:4323)
|
||||
dw StartTrainerBattle_DetermineWhichAnimation ; 00
|
||||
|
||||
; Animation 1: cave
|
||||
@@ -279,7 +279,7 @@ StartTrainerBattle_Flash: ; 8c3ab (23:43ab)
|
||||
ret
|
||||
; 8c3db (23:43db)
|
||||
|
||||
.pals: ; 8c3db
|
||||
.pals ; 8c3db
|
||||
db %11111001 ; 3321
|
||||
db %11111110 ; 3332
|
||||
db %11111111 ; 3333
|
||||
@@ -411,7 +411,7 @@ endr
|
||||
ret
|
||||
; 8c490 (23:4490)
|
||||
|
||||
.spintable: ; 8c490
|
||||
.spintable ; 8c490
|
||||
spintable_entry UPPER_LEFT, 1, 1, 6
|
||||
spintable_entry UPPER_LEFT, 2, 0, 3
|
||||
spintable_entry UPPER_LEFT, 3, 1, 0
|
||||
@@ -435,7 +435,7 @@ endr
|
||||
db -1
|
||||
; 8c4f5
|
||||
|
||||
.load: ; 8c4f5 (23:44f5)
|
||||
.load ; 8c4f5 (23:44f5)
|
||||
ld a, [hli]
|
||||
ld e, a
|
||||
ld a, [hli]
|
||||
@@ -489,11 +489,11 @@ endr
|
||||
jr .loop
|
||||
; 8c538 (23:4538)
|
||||
|
||||
.wedge1: db 2, 3, 5, 4, 9, -1
|
||||
.wedge2: db 1, 1, 2, 2, 4, 2, 4, 2, 3, -1
|
||||
.wedge3: db 2, 1, 3, 1, 4, 1, 4, 1, 4, 1, 3, 1, 2, 1, 1, 1, 1, -1
|
||||
.wedge4: db 4, 1, 4, 0, 3, 1, 3, 0, 2, 1, 2, 0, 1, -1
|
||||
.wedge5: db 4, 0, 3, 0, 3, 0, 2, 0, 2, 0, 1, 0, 1, 0, 1, -1
|
||||
.wedge1 db 2, 3, 5, 4, 9, -1
|
||||
.wedge2 db 1, 1, 2, 2, 4, 2, 4, 2, 3, -1
|
||||
.wedge3 db 2, 1, 3, 1, 4, 1, 4, 1, 4, 1, 3, 1, 2, 1, 1, 1, 1, -1
|
||||
.wedge4 db 4, 1, 4, 0, 3, 1, 3, 0, 2, 1, 2, 0, 1, -1
|
||||
.wedge5 db 4, 0, 3, 0, 3, 0, 2, 0, 2, 0, 1, 0, 1, 0, 1, -1
|
||||
; 8c578
|
||||
|
||||
StartTrainerBattle_SetUpForRandomScatterOutro: ; 8c578 (23:4578)
|
||||
@@ -665,11 +665,11 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
|
||||
call DelayFrame
|
||||
call BattleStart_LoadEDTile
|
||||
|
||||
.nextscene: ; 8c673 (23:4673)
|
||||
.nextscene ; 8c673 (23:4673)
|
||||
call StartTrainerBattle_NextScene
|
||||
ret
|
||||
|
||||
.copypals: ; 8c677 (23:4677)
|
||||
.copypals ; 8c677 (23:4677)
|
||||
ld de, UnknBGPals + 7 palettes
|
||||
call .copy
|
||||
ld de, BGPals + 7 palettes
|
||||
@@ -682,7 +682,7 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
|
||||
call .copy
|
||||
ld de, OBPals + 7 palettes
|
||||
|
||||
.copy: ; 8c698 (23:4698)
|
||||
.copy ; 8c698 (23:4698)
|
||||
push hl
|
||||
ld bc, 1 palettes
|
||||
call CopyBytes
|
||||
@@ -690,20 +690,20 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
|
||||
ret
|
||||
; 8c6a1 (23:46a1)
|
||||
|
||||
.daypals: ; 8c6a1
|
||||
.daypals ; 8c6a1
|
||||
RGB 31, 18, 29
|
||||
RGB 31, 11, 15
|
||||
RGB 31, 05, 05
|
||||
RGB 07, 07, 07
|
||||
; 8c6a9
|
||||
|
||||
.nightpals: ; 8c6a9
|
||||
.nightpals ; 8c6a9
|
||||
RGB 31, 18, 29
|
||||
RGB 31, 05, 05
|
||||
RGB 31, 05, 05
|
||||
RGB 31, 05, 05
|
||||
|
||||
.loadpokeballgfx:
|
||||
.loadpokeballgfx
|
||||
ld a, [OtherTrainerClass]
|
||||
ld de, PokeBallTransition
|
||||
ret
|
||||
@@ -742,7 +742,7 @@ WipeLYOverrides: ; 8c6d8
|
||||
ret
|
||||
; 8c6ef
|
||||
|
||||
.wipe: ; 8c6ef
|
||||
.wipe ; 8c6ef
|
||||
xor a
|
||||
ld c, SCREEN_HEIGHT_PX
|
||||
.loop
|
||||
@@ -792,7 +792,7 @@ StartTrainerBattle_DrawSineWave: ; 8c6f7 (23:46f7)
|
||||
ret
|
||||
; 8c728 (23:4728)
|
||||
|
||||
.sinewave: ; 8c728
|
||||
.sinewave ; 8c728
|
||||
sine_wave $100
|
||||
; 8c768
|
||||
|
||||
@@ -833,7 +833,7 @@ StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)
|
||||
ret
|
||||
; 8c792 (23:4792)
|
||||
|
||||
.boxes: ; 8c792
|
||||
.boxes ; 8c792
|
||||
zoombox 4, 2, 8, 8
|
||||
zoombox 6, 4, 7, 7
|
||||
zoombox 8, 6, 6, 6
|
||||
|
||||
@@ -419,14 +419,14 @@ endr
|
||||
ld l, a
|
||||
jp [hl]
|
||||
|
||||
.dw: ; e2699 (38:6699) #mark
|
||||
.dw ; e2699 (38:6699) #mark
|
||||
dw .withdraw ; Withdraw
|
||||
dw .stats ; Stats
|
||||
dw .release ; Release
|
||||
dw .cancel ; Cancel
|
||||
|
||||
|
||||
.withdraw: ; e26a1 (38:66a1)
|
||||
.withdraw ; e26a1 (38:66a1)
|
||||
call BillsPC_CheckMail_PreventBlackout
|
||||
jp c, .cancel
|
||||
call TryWithdrawPokemon
|
||||
@@ -442,7 +442,7 @@ endr
|
||||
call BillsPC_PlaceString
|
||||
ret
|
||||
|
||||
.stats: ; e26c0 (38:66c0)
|
||||
.stats ; e26c0 (38:66c0)
|
||||
call LoadStandardMenuDataHeader
|
||||
call BillsPC_StatsScreen
|
||||
call ExitMenu
|
||||
@@ -453,7 +453,7 @@ endr
|
||||
call BillsPC_ApplyPalettes
|
||||
ret
|
||||
|
||||
.release: ; e26d8 (38:66d8)
|
||||
.release ; e26d8 (38:66d8)
|
||||
ld a, [wMenuCursorY]
|
||||
push af
|
||||
call BillsPC_IsMonAnEgg
|
||||
@@ -490,7 +490,7 @@ endr
|
||||
ld [wMenuCursorY], a
|
||||
ret
|
||||
|
||||
.cancel: ; e272b (38:672b)
|
||||
.cancel ; e272b (38:672b)
|
||||
ld a, $0
|
||||
ld [wJumptableIndex], a
|
||||
ret
|
||||
@@ -2021,7 +2021,7 @@ endr
|
||||
jp [hl]
|
||||
; e322a
|
||||
|
||||
.dw_return: ; e322a
|
||||
.dw_return ; e322a
|
||||
pop af
|
||||
ld e, a
|
||||
callba Function14ad5
|
||||
@@ -2226,7 +2226,7 @@ endr
|
||||
ret
|
||||
; e33a6 (38:73a6)
|
||||
|
||||
.boxes: ; e33a6
|
||||
.boxes ; e33a6
|
||||
; bank, address
|
||||
dba sBox1
|
||||
dba sBox2
|
||||
@@ -2352,7 +2352,7 @@ _ChangeBox_menudataheader: ; 0xe35f1
|
||||
db 1 ; default option
|
||||
; 0xe35f9
|
||||
|
||||
.menudata2: ; 0xe35f9
|
||||
.menudata2 ; 0xe35f9
|
||||
db $22 ; flags
|
||||
db 4, 0
|
||||
db 1
|
||||
@@ -2362,7 +2362,7 @@ _ChangeBox_menudataheader: ; 0xe35f1
|
||||
dba BillsPC_PrintBoxCountAndCapacity
|
||||
; e3609
|
||||
|
||||
.boxes: ; e3609
|
||||
.boxes ; e3609
|
||||
db NUM_BOXES
|
||||
x = 1
|
||||
rept NUM_BOXES
|
||||
@@ -2372,7 +2372,7 @@ endr
|
||||
db -1
|
||||
; e3619
|
||||
|
||||
.boxnames: ; e3619
|
||||
.boxnames ; e3619
|
||||
push de
|
||||
ld a, [MenuSelection]
|
||||
dec a
|
||||
@@ -2416,7 +2416,7 @@ BillsPC_PrintBoxCountAndCapacity: ; e3632
|
||||
db "#MON@"
|
||||
; e3668
|
||||
|
||||
.out_of_20: ; e3668
|
||||
.out_of_20 ; e3668
|
||||
; db "/20@"
|
||||
db "/"
|
||||
db "0" + MONS_PER_BOX / 10 ; "2"
|
||||
@@ -2466,7 +2466,7 @@ endr
|
||||
ret
|
||||
; e36a5 (38:76a5)
|
||||
|
||||
.boxbanks: ; e36a5
|
||||
.boxbanks ; e36a5
|
||||
dba sBox1
|
||||
dba sBox2
|
||||
dba sBox3
|
||||
|
||||
@@ -82,7 +82,7 @@ _BillsPC: ; e3fd
|
||||
dw PlaceMenuStrings
|
||||
dw .strings
|
||||
|
||||
.strings: ; e47f
|
||||
.strings ; e47f
|
||||
db "WITHDRAW <PK><MN>@"
|
||||
db "DEPOSIT <PK><MN>@"
|
||||
db "CHANGE BOX@"
|
||||
@@ -96,7 +96,7 @@ _BillsPC: ; e3fd
|
||||
dw BillsPC_MovePKMNMenu
|
||||
dw BillsPC_SeeYa
|
||||
|
||||
.items: ; e4c4
|
||||
.items ; e4c4
|
||||
db 5
|
||||
db 0 ; WITHDRAW
|
||||
db 1; DEPOSIT
|
||||
|
||||
@@ -215,7 +215,7 @@ HatchEggs: ; 16f70 (5:6f70)
|
||||
xor a
|
||||
ld [CurPartyMon], a
|
||||
|
||||
.loop: ; 16f7a (5:6f7a)
|
||||
.loop ; 16f7a (5:6f7a)
|
||||
ld a, [de]
|
||||
inc de
|
||||
cp -1
|
||||
@@ -348,7 +348,7 @@ HatchEggs: ; 16f70 (5:6f70)
|
||||
ld bc, PKMN_NAME_LENGTH
|
||||
call CopyBytes
|
||||
|
||||
.next: ; 1707d (5:707d)
|
||||
.next ; 1707d (5:707d)
|
||||
ld hl, CurPartyMon
|
||||
inc [hl]
|
||||
pop hl
|
||||
@@ -357,7 +357,7 @@ HatchEggs: ; 16f70 (5:6f70)
|
||||
pop de
|
||||
jp .loop
|
||||
|
||||
.done: ; 1708a (5:708a)
|
||||
.done ; 1708a (5:708a)
|
||||
ret
|
||||
; 1708b (5:708b)
|
||||
|
||||
@@ -989,7 +989,7 @@ DayCareMonPrintEmptyString: ; 174b5
|
||||
ret
|
||||
; 174b9
|
||||
|
||||
.string: ; 174b9
|
||||
.string ; 174b9
|
||||
db "@"
|
||||
; 174ba
|
||||
|
||||
|
||||
@@ -21,12 +21,12 @@ BuenaPhoneScript_CheckTimeOfDay1:
|
||||
buttonsound
|
||||
end
|
||||
|
||||
.morn:
|
||||
.morn
|
||||
writetext UnknownText_0xa0c28
|
||||
buttonsound
|
||||
end
|
||||
|
||||
.day:
|
||||
.day
|
||||
writetext UnknownText_0xa0c72
|
||||
buttonsound
|
||||
end
|
||||
@@ -46,12 +46,12 @@ BuenaPhoneScript_CheckTimeOfDay2:
|
||||
buttonsound
|
||||
end
|
||||
|
||||
.morn:
|
||||
.morn
|
||||
writetext UnknownText_0xa0d96
|
||||
buttonsound
|
||||
end
|
||||
|
||||
.day:
|
||||
.day
|
||||
writetext UnknownText_0xa0dcf
|
||||
buttonsound
|
||||
end
|
||||
@@ -90,62 +90,62 @@ BuenaPhoneScript_Random2:
|
||||
if_equal 12, .twelve
|
||||
if_equal 13, .thirteen
|
||||
|
||||
.zero:
|
||||
.zero
|
||||
writetext UnknownText_0xa0efb
|
||||
jump .finish
|
||||
|
||||
.one:
|
||||
.one
|
||||
writetext UnknownText_0xa0fcf
|
||||
jump .finish
|
||||
|
||||
.two:
|
||||
.two
|
||||
writetext UnknownText_0xa109d
|
||||
jump .finish
|
||||
|
||||
.three:
|
||||
.three
|
||||
writetext UnknownText_0xa1143
|
||||
jump .finish
|
||||
|
||||
.four:
|
||||
.four
|
||||
writetext UnknownText_0xa1244
|
||||
jump .finish
|
||||
|
||||
.five:
|
||||
.five
|
||||
writetext UnknownText_0xa1318
|
||||
jump .finish
|
||||
|
||||
.six:
|
||||
.six
|
||||
writetext UnknownText_0xa13d8
|
||||
jump .finish
|
||||
|
||||
.seven:
|
||||
.seven
|
||||
writetext UnknownText_0xa1488
|
||||
jump .finish
|
||||
|
||||
.eight:
|
||||
.eight
|
||||
writetext UnknownText_0xa15de
|
||||
jump .finish
|
||||
|
||||
.nine:
|
||||
.nine
|
||||
writetext UnknownText_0xa1717
|
||||
jump .finish
|
||||
|
||||
.ten:
|
||||
.ten
|
||||
writetext UnknownText_0xa183d
|
||||
jump .finish
|
||||
|
||||
.eleven:
|
||||
.eleven
|
||||
writetext UnknownText_0xa19b1
|
||||
jump .finish
|
||||
|
||||
.twelve:
|
||||
.twelve
|
||||
writetext UnknownText_0xa1ac0
|
||||
jump .finish
|
||||
|
||||
.thirteen:
|
||||
.thirteen
|
||||
writetext UnknownText_0xa1bed
|
||||
|
||||
.finish:
|
||||
.finish
|
||||
end
|
||||
|
||||
BuenaPhoneScript_Random1:
|
||||
@@ -154,15 +154,15 @@ BuenaPhoneScript_Random1:
|
||||
if_equal 1, .one
|
||||
if_equal 2, .two
|
||||
|
||||
.zero:
|
||||
.zero
|
||||
writetext UnknownText_0xa1c88
|
||||
end
|
||||
|
||||
.one:
|
||||
.one
|
||||
writetext UnknownText_0xa1d5f
|
||||
end
|
||||
|
||||
.two:
|
||||
.two
|
||||
writetext UnknownText_0xa1e2f
|
||||
end
|
||||
; a0c28
|
||||
|
||||
@@ -1270,7 +1270,7 @@ ChooseCard_HandleJoypad: ; e089c
|
||||
ret
|
||||
; e08b8
|
||||
|
||||
.d_left: ; e08b8
|
||||
.d_left ; e08b8
|
||||
ld hl, wCardFlipCursorX
|
||||
ld a, [wCardFlipCursorY]
|
||||
and a
|
||||
@@ -1309,7 +1309,7 @@ endr
|
||||
jp .play_sound
|
||||
; e08ef
|
||||
|
||||
.d_right: ; e08ef
|
||||
.d_right ; e08ef
|
||||
ld hl, wCardFlipCursorX
|
||||
ld a, [wCardFlipCursorY]
|
||||
and a
|
||||
@@ -1331,7 +1331,7 @@ rept 2
|
||||
endr
|
||||
jr .play_sound
|
||||
|
||||
.d_up: ; e090a
|
||||
.d_up ; e090a
|
||||
ld hl, wCardFlipCursorY
|
||||
ld a, [wCardFlipCursorX]
|
||||
and a
|
||||
@@ -1369,7 +1369,7 @@ endr
|
||||
ld [wCardFlipCursorX], a
|
||||
jr .play_sound
|
||||
|
||||
.d_down: ; e093d
|
||||
.d_down ; e093d
|
||||
ld hl, wCardFlipCursorY
|
||||
ld a, [wCardFlipCursorX]
|
||||
and a
|
||||
@@ -1391,7 +1391,7 @@ rept 2
|
||||
inc [hl]
|
||||
endr
|
||||
|
||||
.play_sound: ; e0959
|
||||
.play_sound ; e0959
|
||||
ld de, SFX_POKEBALLS_PLACED_ON_TABLE
|
||||
call PlaySFX
|
||||
ret
|
||||
@@ -1684,7 +1684,7 @@ CardFlip_InitAttrPals: ; e0c37 (38:4c37)
|
||||
ret
|
||||
; e0c93 (38:4c93)
|
||||
|
||||
.palettes: ; e0c93
|
||||
.palettes ; e0c93
|
||||
RGB 31, 31, 31
|
||||
RGB 17, 07, 31
|
||||
RGB 06, 19, 08
|
||||
|
||||
@@ -220,7 +220,7 @@ RestartClock: ; 20021 (8:4021)
|
||||
ret
|
||||
; 20160 (8:4160)
|
||||
|
||||
.unreferenced: ; 20160
|
||||
.unreferenced ; 20160
|
||||
ld a, [Buffer3]
|
||||
ld b, a
|
||||
call Coord2Tile
|
||||
|
||||
@@ -129,7 +129,7 @@ endr
|
||||
jp [hl]
|
||||
; e467f
|
||||
|
||||
.dw: ; e467f
|
||||
.dw ; e467f
|
||||
dw PlaceGameFreakPresents_0
|
||||
dw PlaceGameFreakPresents_1
|
||||
dw PlaceGameFreakPresents_2
|
||||
@@ -383,7 +383,7 @@ CrystalIntro: ; e48ac
|
||||
ld a, [hVBlank]
|
||||
push af
|
||||
call .InitRAMAddrs
|
||||
.loop: ; e48bc
|
||||
.loop ; e48bc
|
||||
call JoyTextDelay
|
||||
ld a, [hJoyLast]
|
||||
and BUTTONS
|
||||
@@ -1827,7 +1827,7 @@ endr
|
||||
ret
|
||||
; e538d (39:538d)
|
||||
|
||||
.pal1: ; e538d
|
||||
.pal1 ; e538d
|
||||
RGB 24, 12, 09
|
||||
RGB 31, 31, 31
|
||||
RGB 12, 00, 31
|
||||
@@ -1835,7 +1835,7 @@ endr
|
||||
|
||||
; e5395
|
||||
|
||||
.pal2: ; e5395
|
||||
.pal2 ; e5395
|
||||
RGB 24, 12, 09
|
||||
RGB 31, 31, 31
|
||||
RGB 31, 31, 31
|
||||
|
||||
@@ -1365,7 +1365,7 @@ endr
|
||||
jp [hl]
|
||||
; 82301
|
||||
|
||||
.dw: ; 82301
|
||||
.dw ; 82301
|
||||
dw Function82309
|
||||
dw Function82339
|
||||
dw Function8234b
|
||||
|
||||
@@ -52,7 +52,7 @@ _KrisDecorationMenu: ; 0x2675c
|
||||
dw .pointers
|
||||
; 0x267aa
|
||||
|
||||
.pointers: ; 267aa
|
||||
.pointers ; 267aa
|
||||
dw DecoBedMenu, .bed
|
||||
dw DecoCarpetMenu, .carpet
|
||||
dw DecoPlantMenu, .plant
|
||||
@@ -127,7 +127,7 @@ _KrisDecorationMenu: ; 0x2675c
|
||||
ret
|
||||
; 26855 (9:6855)
|
||||
|
||||
.dw: ; 26855
|
||||
.dw ; 26855
|
||||
dwb FindOwnedBeds, 0 ; bed
|
||||
dwb FindOwnedCarpets, 1 ; carpet
|
||||
dwb FindOwnedPlants, 2 ; plant
|
||||
@@ -211,7 +211,7 @@ FindOwnedBeds: ; 268bd
|
||||
jp FindOwnedDecosInCategory
|
||||
; 268c5
|
||||
|
||||
.beds: ; 268c5
|
||||
.beds ; 268c5
|
||||
db DECO_FEATHERY_BED ; 2
|
||||
db DECO_PINK_BED ; 3
|
||||
db DECO_POLKADOT_BED ; 4
|
||||
@@ -232,7 +232,7 @@ FindOwnedCarpets: ; 268d2
|
||||
jp FindOwnedDecosInCategory
|
||||
; 268da
|
||||
|
||||
.carpets: ; 268da
|
||||
.carpets ; 268da
|
||||
db DECO_RED_CARPET ; 7
|
||||
db DECO_BLUE_CARPET ; 8
|
||||
db DECO_YELLOW_CARPET ; 9
|
||||
@@ -253,7 +253,7 @@ FindOwnedPlants: ; 268e7
|
||||
jp FindOwnedDecosInCategory
|
||||
; 268ef
|
||||
|
||||
.plants: ; 268ef
|
||||
.plants ; 268ef
|
||||
db DECO_MAGNAPLANT ; c
|
||||
db DECO_TROPICPLANT ; d
|
||||
db DECO_JUMBOPLANT ; e
|
||||
@@ -273,7 +273,7 @@ FindOwnedPosters: ; 268fb
|
||||
jp FindOwnedDecosInCategory
|
||||
; 26903
|
||||
|
||||
.posters: ; 26903
|
||||
.posters ; 26903
|
||||
db DECO_TOWN_MAP ; 10
|
||||
db DECO_PIKACHU_POSTER ; 11
|
||||
db DECO_CLEFAIRY_POSTER ; 12
|
||||
@@ -294,7 +294,7 @@ FindOwnedConsoles: ; 26910
|
||||
jp FindOwnedDecosInCategory
|
||||
; 26918
|
||||
|
||||
.consoles: ; 26918
|
||||
.consoles ; 26918
|
||||
db DECO_FAMICOM ; 15
|
||||
db DECO_SNES ; 16
|
||||
db DECO_N64 ; 17
|
||||
@@ -315,7 +315,7 @@ FindOwnedOrnaments: ; 26925
|
||||
jp FindOwnedDecosInCategory
|
||||
; 2692d
|
||||
|
||||
.ornaments: ; 2692d
|
||||
.ornaments ; 2692d
|
||||
db DECO_PIKACHU_DOLL ; 1e
|
||||
db DECO_SURF_PIKACHU_DOLL ; 1f
|
||||
db DECO_CLEFAIRY_DOLL ; 20
|
||||
@@ -355,7 +355,7 @@ FindOwnedBigDolls: ; 2694d
|
||||
jp FindOwnedDecosInCategory
|
||||
; 26955
|
||||
|
||||
.big_dolls: ; 26955
|
||||
.big_dolls ; 26955
|
||||
db DECO_BIG_SNORLAX_DOLL ; 1a
|
||||
db DECO_BIG_ONIX_DOLL ; 1b
|
||||
db DECO_BIG_LAPRAS_DOLL ; 1c
|
||||
@@ -656,37 +656,37 @@ GetDecoName: ; 26c72
|
||||
; 26c8c
|
||||
|
||||
|
||||
.invalid: ; 26c8c
|
||||
.invalid ; 26c8c
|
||||
ret
|
||||
; 26c8d
|
||||
|
||||
.plant: ; 26c8d
|
||||
.plant ; 26c8d
|
||||
ld a, e
|
||||
jr .getdeconame
|
||||
|
||||
.bed: ; 26c90
|
||||
.bed ; 26c90
|
||||
call .plant
|
||||
ld a, _BED
|
||||
jr .getdeconame
|
||||
|
||||
.carpet: ; 26c97
|
||||
.carpet ; 26c97
|
||||
call .plant
|
||||
ld a, _CARPET
|
||||
jr .getdeconame
|
||||
|
||||
.poster: ; 26c9e
|
||||
.poster ; 26c9e
|
||||
ld a, e
|
||||
call .getpokename
|
||||
ld a, _POSTER
|
||||
jr .getdeconame
|
||||
|
||||
.doll: ; 26ca6
|
||||
.doll ; 26ca6
|
||||
ld a, e
|
||||
call .getpokename
|
||||
ld a, _DOLL
|
||||
jr .getdeconame
|
||||
|
||||
.bigdoll: ; 26cae
|
||||
.bigdoll ; 26cae
|
||||
push de
|
||||
ld a, BIG_
|
||||
call .getdeconame
|
||||
@@ -694,21 +694,21 @@ GetDecoName: ; 26c72
|
||||
ld a, e
|
||||
jr .getpokename
|
||||
|
||||
.unused: ; 26cb8
|
||||
.unused ; 26cb8
|
||||
push de
|
||||
call .getdeconame
|
||||
pop de
|
||||
ld a, e
|
||||
jr .getdeconame
|
||||
|
||||
.getpokename: ; 26cc0
|
||||
.getpokename ; 26cc0
|
||||
push bc
|
||||
ld [wd265], a
|
||||
call GetPokemonName
|
||||
pop bc
|
||||
jr .copy
|
||||
|
||||
.getdeconame: ; 26cca
|
||||
.getdeconame ; 26cca
|
||||
call ._getdeconame
|
||||
jr .copy
|
||||
|
||||
@@ -721,7 +721,7 @@ GetDecoName: ; 26c72
|
||||
pop bc
|
||||
ret
|
||||
|
||||
.copy: ; 26cda
|
||||
.copy ; 26cda
|
||||
ld h, b
|
||||
ld l, c
|
||||
call CopyName2
|
||||
@@ -957,7 +957,7 @@ DecoAction_SetItUp_Ornament: ; 26de3
|
||||
ret
|
||||
; 26e33
|
||||
|
||||
.getwhichside: ; 26e33
|
||||
.getwhichside ; 26e33
|
||||
ld a, [MenuSelection]
|
||||
ld b, a
|
||||
ld a, [wd1ed]
|
||||
|
||||
@@ -994,7 +994,7 @@ CountStep: ; 96b79
|
||||
ret
|
||||
; 96bd3
|
||||
|
||||
.unreferenced: ; 96bd3
|
||||
.unreferenced ; 96bd3
|
||||
ld a, 7
|
||||
scf
|
||||
ret
|
||||
|
||||
@@ -519,13 +519,13 @@ CmdQueue_Type4: ; 97ebc
|
||||
dw .one
|
||||
; 97ec3
|
||||
|
||||
.zero: ; 97ec3
|
||||
.zero ; 97ec3
|
||||
ld a, [hSCY]
|
||||
ld hl, 4
|
||||
add hl, bc
|
||||
ld [hl], a
|
||||
call CmdQueueAnonJT_Increment
|
||||
.one: ; 97ecd
|
||||
.one ; 97ecd
|
||||
ld hl, 1
|
||||
add hl, bc
|
||||
ld a, [hl]
|
||||
@@ -566,11 +566,11 @@ CmdQueue_Type3: ; 97ef9
|
||||
dw .two
|
||||
; 97f02
|
||||
|
||||
.zero: ; 97f02
|
||||
.zero ; 97f02
|
||||
call .IsPlayerFacingDown
|
||||
jr z, .PlayerNotFacingDown
|
||||
call CmdQueueAnonJT_Increment
|
||||
.one: ; 97f0a
|
||||
.one ; 97f0a
|
||||
call .IsPlayerFacingDown
|
||||
jr z, .PlayerNotFacingDown
|
||||
call CmdQueueAnonJT_Increment
|
||||
@@ -582,7 +582,7 @@ CmdQueue_Type3: ; 97ef9
|
||||
ret
|
||||
; 97f1b
|
||||
|
||||
.two: ; 97f1b
|
||||
.two ; 97f1b
|
||||
call .IsPlayerFacingDown
|
||||
jr z, .PlayerNotFacingDown
|
||||
call CmdQueueAnonJT_Decrement
|
||||
|
||||
@@ -8,7 +8,7 @@ ReturnFromMapSetupScript:: ; b8000
|
||||
ret
|
||||
; b800a
|
||||
|
||||
.inefficientcallba: ; b800a
|
||||
.inefficientcallba ; b800a
|
||||
ld a, [MapGroup]
|
||||
ld b, a
|
||||
ld a, [MapNumber]
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user