pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Local labels starting with lowercase letters are no longer decorated with a trailing colon

Browse Source
This commit is contained in:
pikalaxalt 2016-04-10 15:01:49 -04:00
parent bf73772a56
commit 6be4cd4da9
99 changed files with 470 additions and 470 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
battle/ai/items.asm
View File

@ -416,7 +416,7 @@ AI_Items: ; 39196
jp .Use jp .Use
; 382ae ; 382ae
.asm_382ae: ; This appears to be unused .asm_382ae ; This appears to be unused
callab AICheckEnemyMaxHP callab AICheckEnemyMaxHP
jr c, .dont_use jr c, .dont_use
push bc push bc

4
battle/anims.asm
View File

@ -3550,7 +3550,7 @@ BattleAnim_CottonSpore: ; cae84
anim_obp0 $54 anim_obp0 $54
anim_1gfx ANIM_GFX_MISC anim_1gfx ANIM_GFX_MISC
anim_sound 0, 1, SFX_POWDER anim_sound 0, 1, SFX_POWDER
.loop: ; cae8b .loop ; cae8b
anim_obj ANIM_OBJ_81, -16, 4, 4, 0, $0 anim_obj ANIM_OBJ_81, -16, 4, 4, 0, $0
anim_wait 8 anim_wait 8
anim_loop 5, .loop anim_loop 5, .loop
@ -3592,7 +3592,7 @@ BattleAnim_Spite: ; caed6
BattleAnim_PowderSnow: ; caee2 BattleAnim_PowderSnow: ; caee2
anim_1gfx ANIM_GFX_ICE anim_1gfx ANIM_GFX_ICE
.loop: ; caee4 .loop ; caee4
anim_sound 6, 2, SFX_SHINE anim_sound 6, 2, SFX_SHINE
anim_obj ANIM_OBJ_8F, 8, 0, 11, 0, $23 anim_obj ANIM_OBJ_8F, 8, 0, 11, 0, $23
anim_wait 2 anim_wait 2

26
battle/bg_effects.asm
View File

@ -2218,7 +2218,7 @@ BattleBGEffect_VibrateMon: ; c8c61 (32:4c61)
dw .one dw .one
.zero: ; c8c68 (32:4c68) .zero ; c8c68 (32:4c68)
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, $43 ld a, $43
@ -2234,7 +2234,7 @@ BattleBGEffect_VibrateMon: ; c8c61 (32:4c61)
ld [hl], $20 ld [hl], $20
ret ret
.one: ; c8c85 (32:4c85) .one ; c8c85 (32:4c85)
ld hl, BG_EFFECT_STRUCT_03 ld hl, BG_EFFECT_STRUCT_03
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -2264,7 +2264,7 @@ BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2)
dw .two dw .two
.zero: ; c8cab (32:4cab) .zero ; c8cab (32:4cab)
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
call BattleBGEffects_ClearLYOverrides call BattleBGEffects_ClearLYOverrides
ld a, $43 ld a, $43
@ -2278,7 +2278,7 @@ BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2)
ld [hl], $0 ld [hl], $0
ret ret
.one: ; c8cc3 (32:4cc3) .one ; c8cc3 (32:4cc3)
ld hl, BG_EFFECT_STRUCT_03 ld hl, BG_EFFECT_STRUCT_03
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -2294,7 +2294,7 @@ BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2)
ld [hl], a ld [hl], a
ret ret
.two: ; c8cdd (32:4cdd) .two ; c8cdd (32:4cdd)
call BattleAnim_ResetLCDStatCustom call BattleAnim_ResetLCDStatCustom
ret ret
@ -2429,7 +2429,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
dw .two_dmg dw .two_dmg
.zero_dmg: ; c8d8b (32:4d8b) .zero_dmg ; c8d8b (32:4d8b)
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
ld a, $e4 ld a, $e4
call BattleBGEffects_SetLYOverrides call BattleBGEffects_SetLYOverrides
@ -2447,7 +2447,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
ld [hl], a ld [hl], a
ret ret
.one_dmg: ; c8daa (32:4daa) .one_dmg ; c8daa (32:4daa)
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -2472,7 +2472,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
dec [hl] dec [hl]
ret ret
.two_dmg: ; c8dc9 (32:4dc9) .two_dmg ; c8dc9 (32:4dc9)
call BattleBGEffects_ResetVideoHRAM call BattleBGEffects_ResetVideoHRAM
ld a, %11100100 ld a, %11100100
ld [rBGP], a ld [rBGP], a
@ -2494,7 +2494,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
dw .four_cgb dw .four_cgb
.zero_cgb: ; c8de7 (32:4de7) .zero_cgb ; c8de7 (32:4de7)
call BGEffect_CheckBattleTurn call BGEffect_CheckBattleTurn
jr nz, .player_turn_cgb jr nz, .player_turn_cgb
call BattleBGEffects_IncrementJumptable call BattleBGEffects_IncrementJumptable
@ -2510,7 +2510,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
ld [hl], a ld [hl], a
ret ret
.one_cgb: ; c8e02 (32:4e02) .one_cgb ; c8e02 (32:4e02)
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -2535,13 +2535,13 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
dec [hl] dec [hl]
ret ret
.two_cgb: ; c8e21 (32:4e21) .two_cgb ; c8e21 (32:4e21)
ld a, $e4 ld a, $e4
call BGEffects_LoadBGPal0_OBPal1 call BGEffects_LoadBGPal0_OBPal1
call EndBattleBGEffect call EndBattleBGEffect
ret ret
.three_cgb: ; c8e2a (32:4e2a) .three_cgb ; c8e2a (32:4e2a)
ld hl, BG_EFFECT_STRUCT_BATTLE_TURN ld hl, BG_EFFECT_STRUCT_BATTLE_TURN
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -2566,7 +2566,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77)
dec [hl] dec [hl]
ret ret
.four_cgb: ; c8e49 (32:4e49) .four_cgb ; c8e49 (32:4e49)
ld a, $e4 ld a, $e4
call BGEffects_LoadBGPal1_OBPal0 call BGEffects_LoadBGPal1_OBPal0
call EndBattleBGEffect call EndBattleBGEffect

2
battle/core.asm
View File

@ -565,7 +565,7 @@ DetermineMoveOrder: ; 3c314
ret ret
; 3c3f3 ; 3c3f3
.enemy_first: ; 3c3f3 .enemy_first ; 3c3f3
and a and a
ret ret
; 3c3f5 ; 3c3f5

12
battle/effect_commands.asm
View File

@ -3337,7 +3337,7 @@ BattleCommand_BeatUp: ; 35461
; 355b0 ; 355b0
.beatup_fail: ; 355b0 .beatup_fail ; 355b0
ld b, buildopponentrage_command ld b, buildopponentrage_command
jp SkipToBattleCommand jp SkipToBattleCommand
@ -5188,7 +5188,7 @@ BattleCommand_Poison: ; 35f2c
; 35fc0 ; 35fc0
.apply_poison: ; 35fc0 .apply_poison ; 35fc0
call AnimateCurrentMove call AnimateCurrentMove
call PoisonOpponent call PoisonOpponent
jp RefreshBattleHuds jp RefreshBattleHuds
@ -5196,7 +5196,7 @@ BattleCommand_Poison: ; 35f2c
; 35fc9 ; 35fc9
.check_toxic: ; 35fc9 .check_toxic ; 35fc9
ld a, BATTLE_VARS_SUBSTATUS5_OPP ld a, BATTLE_VARS_SUBSTATUS5_OPP
call GetBattleVarAddr call GetBattleVarAddr
ld a, [hBattleTurn] ld a, [hBattleTurn]
@ -5671,14 +5671,14 @@ CheckIfStatCanBeRaised: ; 361ef
; 3626e ; 3626e
.stats_already_max: ; 3626e .stats_already_max ; 3626e
pop hl pop hl
dec [hl] dec [hl]
; fallthrough ; fallthrough
; 36270 ; 36270
.cant_raise_stat: ; 36270 .cant_raise_stat ; 36270
ld a, $2 ld a, $2
ld [FailedMessage], a ld [FailedMessage], a
ld a, $1 ld a, $1
@ -5688,7 +5688,7 @@ CheckIfStatCanBeRaised: ; 361ef
; 3627b ; 3627b
.stat_raise_failed: ; 3627b .stat_raise_failed ; 3627b
ld a, $1 ld a, $1
ld [FailedMessage], a ld [FailedMessage], a
ret ret

10
battle/sliding_intro.asm
View File

@ -14,7 +14,7 @@ BattleIntroSlidingPics: ; 4e980
ret ret
; 4e998 ; 4e998
.subfunction1: ; 4e998 .subfunction1 ; 4e998
call .subfunction4 call .subfunction4
ld a, $90 ld a, $90
ld [hSCX], a ld [hSCX], a
@ -25,7 +25,7 @@ BattleIntroSlidingPics: ; 4e980
ret ret
; 4e9ab ; 4e9ab
.subfunction2: ; 4e9ab .subfunction2 ; 4e9ab
ld d, $90 ld d, $90
ld e, $72 ld e, $72
ld a, $48 ld a, $48
@ -61,7 +61,7 @@ endr
ret ret
; 4e9d6 ; 4e9d6
.subfunction3: ; 4e9d6 .subfunction3 ; 4e9d6
ld hl, Sprites + 1 ; x pixel ld hl, Sprites + 1 ; x pixel
ld c, $12 ; 18 ld c, $12 ; 18
ld de, $4 ld de, $4
@ -75,7 +75,7 @@ endr
ret ret
; 4e9e5 ; 4e9e5
.subfunction4: ; 4e9e5 .subfunction4 ; 4e9e5
ld hl, LYOverrides ld hl, LYOverrides
ld a, $90 ld a, $90
ld bc, SCREEN_HEIGHT_PX ld bc, SCREEN_HEIGHT_PX
@ -83,7 +83,7 @@ endr
ret ret
; 4e9f1 ; 4e9f1
.subfunction5: ; 4e9f1 .subfunction5 ; 4e9f1
ld hl, LYOverrides ld hl, LYOverrides
ld a, d ld a, d
ld c, $3e ; 62 ld c, $3e ; 62

2
battle/trainer_huds.asm
View File

@ -238,7 +238,7 @@ LoadBallIconGFX: ; 2c165
ret ret
; 2c172 ; 2c172
.gfx: ; 2c172 .gfx ; 2c172
INCBIN "gfx/battle/balls.2bpp" INCBIN "gfx/battle/balls.2bpp"
; 2c1b2 ; 2c1b2

36
engine/battle_start.asm
View File

@ -148,7 +148,7 @@ FlashyTransitionToBattle: ; 8c314
jumptable .dw, wJumptableIndex jumptable .dw, wJumptableIndex
; 8c323 ; 8c323
.dw: ; 8c323 (23:4323) .dw ; 8c323 (23:4323)
dw StartTrainerBattle_DetermineWhichAnimation ; 00 dw StartTrainerBattle_DetermineWhichAnimation ; 00
; Animation 1: cave ; Animation 1: cave
@ -279,7 +279,7 @@ StartTrainerBattle_Flash: ; 8c3ab (23:43ab)
ret ret
; 8c3db (23:43db) ; 8c3db (23:43db)
.pals: ; 8c3db .pals ; 8c3db
db %11111001 ; 3321 db %11111001 ; 3321
db %11111110 ; 3332 db %11111110 ; 3332
db %11111111 ; 3333 db %11111111 ; 3333
@ -411,7 +411,7 @@ endr
ret ret
; 8c490 (23:4490) ; 8c490 (23:4490)
.spintable: ; 8c490 .spintable ; 8c490
spintable_entry UPPER_LEFT, 1, 1, 6 spintable_entry UPPER_LEFT, 1, 1, 6
spintable_entry UPPER_LEFT, 2, 0, 3 spintable_entry UPPER_LEFT, 2, 0, 3
spintable_entry UPPER_LEFT, 3, 1, 0 spintable_entry UPPER_LEFT, 3, 1, 0
@ -435,7 +435,7 @@ endr
db -1 db -1
; 8c4f5 ; 8c4f5
.load: ; 8c4f5 (23:44f5) .load ; 8c4f5 (23:44f5)
ld a, [hli] ld a, [hli]
ld e, a ld e, a
ld a, [hli] ld a, [hli]
@ -489,11 +489,11 @@ endr
jr .loop jr .loop
; 8c538 (23:4538) ; 8c538 (23:4538)
.wedge1: db 2, 3, 5, 4, 9, -1 .wedge1 db 2, 3, 5, 4, 9, -1
.wedge2: db 1, 1, 2, 2, 4, 2, 4, 2, 3, -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 .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 .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 .wedge5 db 4, 0, 3, 0, 3, 0, 2, 0, 2, 0, 1, 0, 1, 0, 1, -1
; 8c578 ; 8c578
StartTrainerBattle_SetUpForRandomScatterOutro: ; 8c578 (23:4578) StartTrainerBattle_SetUpForRandomScatterOutro: ; 8c578 (23:4578)
@ -665,11 +665,11 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
call DelayFrame call DelayFrame
call BattleStart_LoadEDTile call BattleStart_LoadEDTile
.nextscene: ; 8c673 (23:4673) .nextscene ; 8c673 (23:4673)
call StartTrainerBattle_NextScene call StartTrainerBattle_NextScene
ret ret
.copypals: ; 8c677 (23:4677) .copypals ; 8c677 (23:4677)
ld de, UnknBGPals + 7 palettes ld de, UnknBGPals + 7 palettes
call .copy call .copy
ld de, BGPals + 7 palettes ld de, BGPals + 7 palettes
@ -682,7 +682,7 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
call .copy call .copy
ld de, OBPals + 7 palettes ld de, OBPals + 7 palettes
.copy: ; 8c698 (23:4698) .copy ; 8c698 (23:4698)
push hl push hl
ld bc, 1 palettes ld bc, 1 palettes
call CopyBytes call CopyBytes
@ -690,20 +690,20 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc)
ret ret
; 8c6a1 (23:46a1) ; 8c6a1 (23:46a1)
.daypals: ; 8c6a1 .daypals ; 8c6a1
RGB 31, 18, 29 RGB 31, 18, 29
RGB 31, 11, 15 RGB 31, 11, 15
RGB 31, 05, 05 RGB 31, 05, 05
RGB 07, 07, 07 RGB 07, 07, 07
; 8c6a9 ; 8c6a9
.nightpals: ; 8c6a9 .nightpals ; 8c6a9
RGB 31, 18, 29 RGB 31, 18, 29
RGB 31, 05, 05 RGB 31, 05, 05
RGB 31, 05, 05 RGB 31, 05, 05
RGB 31, 05, 05 RGB 31, 05, 05
.loadpokeballgfx: .loadpokeballgfx
ld a, [OtherTrainerClass] ld a, [OtherTrainerClass]
ld de, PokeBallTransition ld de, PokeBallTransition
ret ret
@ -742,7 +742,7 @@ WipeLYOverrides: ; 8c6d8
ret ret
; 8c6ef ; 8c6ef
.wipe: ; 8c6ef .wipe ; 8c6ef
xor a xor a
ld c, SCREEN_HEIGHT_PX ld c, SCREEN_HEIGHT_PX
.loop .loop
@ -792,7 +792,7 @@ StartTrainerBattle_DrawSineWave: ; 8c6f7 (23:46f7)
ret ret
; 8c728 (23:4728) ; 8c728 (23:4728)
.sinewave: ; 8c728 .sinewave ; 8c728
sine_wave $100 sine_wave $100
; 8c768 ; 8c768
@ -833,7 +833,7 @@ StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768)
ret ret
; 8c792 (23:4792) ; 8c792 (23:4792)
.boxes: ; 8c792 .boxes ; 8c792
zoombox 4, 2, 8, 8 zoombox 4, 2, 8, 8
zoombox 6, 4, 7, 7 zoombox 6, 4, 7, 7
zoombox 8, 6, 6, 6 zoombox 8, 6, 6, 6

24
engine/billspc.asm
View File

@ -419,14 +419,14 @@ endr
ld l, a ld l, a
jp [hl] jp [hl]
.dw: ; e2699 (38:6699) #mark .dw ; e2699 (38:6699) #mark
dw .withdraw ; Withdraw dw .withdraw ; Withdraw
dw .stats ; Stats dw .stats ; Stats
dw .release ; Release dw .release ; Release
dw .cancel ; Cancel dw .cancel ; Cancel
.withdraw: ; e26a1 (38:66a1) .withdraw ; e26a1 (38:66a1)
call BillsPC_CheckMail_PreventBlackout call BillsPC_CheckMail_PreventBlackout
jp c, .cancel jp c, .cancel
call TryWithdrawPokemon call TryWithdrawPokemon
@ -442,7 +442,7 @@ endr
call BillsPC_PlaceString call BillsPC_PlaceString
ret ret
.stats: ; e26c0 (38:66c0) .stats ; e26c0 (38:66c0)
call LoadStandardMenuDataHeader call LoadStandardMenuDataHeader
call BillsPC_StatsScreen call BillsPC_StatsScreen
call ExitMenu call ExitMenu
@ -453,7 +453,7 @@ endr
call BillsPC_ApplyPalettes call BillsPC_ApplyPalettes
ret ret
.release: ; e26d8 (38:66d8) .release ; e26d8 (38:66d8)
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
push af push af
call BillsPC_IsMonAnEgg call BillsPC_IsMonAnEgg
@ -490,7 +490,7 @@ endr
ld [wMenuCursorY], a ld [wMenuCursorY], a
ret ret
.cancel: ; e272b (38:672b) .cancel ; e272b (38:672b)
ld a, $0 ld a, $0
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret
@ -2021,7 +2021,7 @@ endr
jp [hl] jp [hl]
; e322a ; e322a
.dw_return: ; e322a .dw_return ; e322a
pop af pop af
ld e, a ld e, a
callba Function14ad5 callba Function14ad5
@ -2226,7 +2226,7 @@ endr
ret ret
; e33a6 (38:73a6) ; e33a6 (38:73a6)
.boxes: ; e33a6 .boxes ; e33a6
; bank, address ; bank, address
dba sBox1 dba sBox1
dba sBox2 dba sBox2
@ -2352,7 +2352,7 @@ _ChangeBox_menudataheader: ; 0xe35f1
db 1 ; default option db 1 ; default option
; 0xe35f9 ; 0xe35f9
.menudata2: ; 0xe35f9 .menudata2 ; 0xe35f9
db $22 ; flags db $22 ; flags
db 4, 0 db 4, 0
db 1 db 1
@ -2362,7 +2362,7 @@ _ChangeBox_menudataheader: ; 0xe35f1
dba BillsPC_PrintBoxCountAndCapacity dba BillsPC_PrintBoxCountAndCapacity
; e3609 ; e3609
.boxes: ; e3609 .boxes ; e3609
db NUM_BOXES db NUM_BOXES
x = 1 x = 1
rept NUM_BOXES rept NUM_BOXES
@ -2372,7 +2372,7 @@ endr
db -1 db -1
; e3619 ; e3619
.boxnames: ; e3619 .boxnames ; e3619
push de push de
ld a, [MenuSelection] ld a, [MenuSelection]
dec a dec a
@ -2416,7 +2416,7 @@ BillsPC_PrintBoxCountAndCapacity: ; e3632
db "#MON@" db "#MON@"
; e3668 ; e3668
.out_of_20: ; e3668 .out_of_20 ; e3668
; db "/20@" ; db "/20@"
db "/" db "/"
db "0" + MONS_PER_BOX / 10 ; "2" db "0" + MONS_PER_BOX / 10 ; "2"
@ -2466,7 +2466,7 @@ endr
ret ret
; e36a5 (38:76a5) ; e36a5 (38:76a5)
.boxbanks: ; e36a5 .boxbanks ; e36a5
dba sBox1 dba sBox1
dba sBox2 dba sBox2
dba sBox3 dba sBox3

4
engine/billspctop.asm
View File

@ -82,7 +82,7 @@ _BillsPC: ; e3fd
dw PlaceMenuStrings dw PlaceMenuStrings
dw .strings dw .strings
.strings: ; e47f .strings ; e47f
db "WITHDRAW <PK><MN>@" db "WITHDRAW <PK><MN>@"
db "DEPOSIT <PK><MN>@" db "DEPOSIT <PK><MN>@"
db "CHANGE BOX@" db "CHANGE BOX@"
@ -96,7 +96,7 @@ _BillsPC: ; e3fd
dw BillsPC_MovePKMNMenu dw BillsPC_MovePKMNMenu
dw BillsPC_SeeYa dw BillsPC_SeeYa
.items: ; e4c4 .items ; e4c4
db 5 db 5
db 0 ; WITHDRAW db 0 ; WITHDRAW
db 1; DEPOSIT db 1; DEPOSIT

8
engine/breeding/egg.asm
View File

@ -215,7 +215,7 @@ HatchEggs: ; 16f70 (5:6f70)
xor a xor a
ld [CurPartyMon], a ld [CurPartyMon], a
.loop: ; 16f7a (5:6f7a) .loop ; 16f7a (5:6f7a)
ld a, [de] ld a, [de]
inc de inc de
cp -1 cp -1
@ -348,7 +348,7 @@ HatchEggs: ; 16f70 (5:6f70)
ld bc, PKMN_NAME_LENGTH ld bc, PKMN_NAME_LENGTH
call CopyBytes call CopyBytes
.next: ; 1707d (5:707d) .next ; 1707d (5:707d)
ld hl, CurPartyMon ld hl, CurPartyMon
inc [hl] inc [hl]
pop hl pop hl
@ -357,7 +357,7 @@ HatchEggs: ; 16f70 (5:6f70)
pop de pop de
jp .loop jp .loop
.done: ; 1708a (5:708a) .done ; 1708a (5:708a)
ret ret
; 1708b (5:708b) ; 1708b (5:708b)
@ -989,7 +989,7 @@ DayCareMonPrintEmptyString: ; 174b5
ret ret
; 174b9 ; 174b9
.string: ; 174b9 .string ; 174b9
db "@" db "@"
; 174ba ; 174ba

44
engine/buena_phone_scripts.asm
View File

@ -21,12 +21,12 @@ BuenaPhoneScript_CheckTimeOfDay1:
buttonsound buttonsound
end end
.morn: .morn
writetext UnknownText_0xa0c28 writetext UnknownText_0xa0c28
buttonsound buttonsound
end end
.day: .day
writetext UnknownText_0xa0c72 writetext UnknownText_0xa0c72
buttonsound buttonsound
end end
@ -46,12 +46,12 @@ BuenaPhoneScript_CheckTimeOfDay2:
buttonsound buttonsound
end end
.morn: .morn
writetext UnknownText_0xa0d96 writetext UnknownText_0xa0d96
buttonsound buttonsound
end end
.day: .day
writetext UnknownText_0xa0dcf writetext UnknownText_0xa0dcf
buttonsound buttonsound
end end
@ -90,62 +90,62 @@ BuenaPhoneScript_Random2:
if_equal 12, .twelve if_equal 12, .twelve
if_equal 13, .thirteen if_equal 13, .thirteen
.zero: .zero
writetext UnknownText_0xa0efb writetext UnknownText_0xa0efb
jump .finish jump .finish
.one: .one
writetext UnknownText_0xa0fcf writetext UnknownText_0xa0fcf
jump .finish jump .finish
.two: .two
writetext UnknownText_0xa109d writetext UnknownText_0xa109d
jump .finish jump .finish
.three: .three
writetext UnknownText_0xa1143 writetext UnknownText_0xa1143
jump .finish jump .finish
.four: .four
writetext UnknownText_0xa1244 writetext UnknownText_0xa1244
jump .finish jump .finish
.five: .five
writetext UnknownText_0xa1318 writetext UnknownText_0xa1318
jump .finish jump .finish
.six: .six
writetext UnknownText_0xa13d8 writetext UnknownText_0xa13d8
jump .finish jump .finish
.seven: .seven
writetext UnknownText_0xa1488 writetext UnknownText_0xa1488
jump .finish jump .finish
.eight: .eight
writetext UnknownText_0xa15de writetext UnknownText_0xa15de
jump .finish jump .finish
.nine: .nine
writetext UnknownText_0xa1717 writetext UnknownText_0xa1717
jump .finish jump .finish
.ten: .ten
writetext UnknownText_0xa183d writetext UnknownText_0xa183d
jump .finish jump .finish
.eleven: .eleven
writetext UnknownText_0xa19b1 writetext UnknownText_0xa19b1
jump .finish jump .finish
.twelve: .twelve
writetext UnknownText_0xa1ac0 writetext UnknownText_0xa1ac0
jump .finish jump .finish
.thirteen: .thirteen
writetext UnknownText_0xa1bed writetext UnknownText_0xa1bed
.finish: .finish
end end
BuenaPhoneScript_Random1: BuenaPhoneScript_Random1:
@ -154,15 +154,15 @@ BuenaPhoneScript_Random1:
if_equal 1, .one if_equal 1, .one
if_equal 2, .two if_equal 2, .two
.zero: .zero
writetext UnknownText_0xa1c88 writetext UnknownText_0xa1c88
end end
.one: .one
writetext UnknownText_0xa1d5f writetext UnknownText_0xa1d5f
end end
.two: .two
writetext UnknownText_0xa1e2f writetext UnknownText_0xa1e2f
end end
; a0c28 ; a0c28

12
engine/card_flip.asm
View File

@ -1270,7 +1270,7 @@ ChooseCard_HandleJoypad: ; e089c
ret ret
; e08b8 ; e08b8
.d_left: ; e08b8 .d_left ; e08b8
ld hl, wCardFlipCursorX ld hl, wCardFlipCursorX
ld a, [wCardFlipCursorY] ld a, [wCardFlipCursorY]
and a and a
@ -1309,7 +1309,7 @@ endr
jp .play_sound jp .play_sound
; e08ef ; e08ef
.d_right: ; e08ef .d_right ; e08ef
ld hl, wCardFlipCursorX ld hl, wCardFlipCursorX
ld a, [wCardFlipCursorY] ld a, [wCardFlipCursorY]
and a and a
@ -1331,7 +1331,7 @@ rept 2
endr endr
jr .play_sound jr .play_sound
.d_up: ; e090a .d_up ; e090a
ld hl, wCardFlipCursorY ld hl, wCardFlipCursorY
ld a, [wCardFlipCursorX] ld a, [wCardFlipCursorX]
and a and a
@ -1369,7 +1369,7 @@ endr
ld [wCardFlipCursorX], a ld [wCardFlipCursorX], a
jr .play_sound jr .play_sound
.d_down: ; e093d .d_down ; e093d
ld hl, wCardFlipCursorY ld hl, wCardFlipCursorY
ld a, [wCardFlipCursorX] ld a, [wCardFlipCursorX]
and a and a
@ -1391,7 +1391,7 @@ rept 2
inc [hl] inc [hl]
endr endr
.play_sound: ; e0959 .play_sound ; e0959
ld de, SFX_POKEBALLS_PLACED_ON_TABLE ld de, SFX_POKEBALLS_PLACED_ON_TABLE
call PlaySFX call PlaySFX
ret ret
@ -1684,7 +1684,7 @@ CardFlip_InitAttrPals: ; e0c37 (38:4c37)
ret ret
; e0c93 (38:4c93) ; e0c93 (38:4c93)
.palettes: ; e0c93 .palettes ; e0c93
RGB 31, 31, 31 RGB 31, 31, 31
RGB 17, 07, 31 RGB 17, 07, 31
RGB 06, 19, 08 RGB 06, 19, 08

2
engine/clock_reset.asm
View File

@ -220,7 +220,7 @@ RestartClock: ; 20021 (8:4021)
ret ret
; 20160 (8:4160) ; 20160 (8:4160)
.unreferenced: ; 20160 .unreferenced ; 20160
ld a, [Buffer3] ld a, [Buffer3]
ld b, a ld b, a
call Coord2Tile call Coord2Tile

8
engine/crystal_intro.asm
View File

@ -129,7 +129,7 @@ endr
jp [hl] jp [hl]
; e467f ; e467f
.dw: ; e467f .dw ; e467f
dw PlaceGameFreakPresents_0 dw PlaceGameFreakPresents_0
dw PlaceGameFreakPresents_1 dw PlaceGameFreakPresents_1
dw PlaceGameFreakPresents_2 dw PlaceGameFreakPresents_2
@ -383,7 +383,7 @@ CrystalIntro: ; e48ac
ld a, [hVBlank] ld a, [hVBlank]
push af push af
call .InitRAMAddrs call .InitRAMAddrs
.loop: ; e48bc .loop ; e48bc
call JoyTextDelay call JoyTextDelay
ld a, [hJoyLast] ld a, [hJoyLast]
and BUTTONS and BUTTONS
@ -1827,7 +1827,7 @@ endr
ret ret
; e538d (39:538d) ; e538d (39:538d)
.pal1: ; e538d .pal1 ; e538d
RGB 24, 12, 09 RGB 24, 12, 09
RGB 31, 31, 31 RGB 31, 31, 31
RGB 12, 00, 31 RGB 12, 00, 31
@ -1835,7 +1835,7 @@ endr
; e5395 ; e5395
.pal2: ; e5395 .pal2 ; e5395
RGB 24, 12, 09 RGB 24, 12, 09
RGB 31, 31, 31 RGB 31, 31, 31
RGB 31, 31, 31 RGB 31, 31, 31

2
engine/debug.asm
View File

@ -1365,7 +1365,7 @@ endr
jp [hl] jp [hl]
; 82301 ; 82301
.dw: ; 82301 .dw ; 82301
dw Function82309 dw Function82309
dw Function82339 dw Function82339
dw Function8234b dw Function8234b

42
engine/decorations.asm
View File

@ -52,7 +52,7 @@ _KrisDecorationMenu: ; 0x2675c
dw .pointers dw .pointers
; 0x267aa ; 0x267aa
.pointers: ; 267aa .pointers ; 267aa
dw DecoBedMenu, .bed dw DecoBedMenu, .bed
dw DecoCarpetMenu, .carpet dw DecoCarpetMenu, .carpet
dw DecoPlantMenu, .plant dw DecoPlantMenu, .plant
@ -127,7 +127,7 @@ _KrisDecorationMenu: ; 0x2675c
ret ret
; 26855 (9:6855) ; 26855 (9:6855)
.dw: ; 26855 .dw ; 26855
dwb FindOwnedBeds, 0 ; bed dwb FindOwnedBeds, 0 ; bed
dwb FindOwnedCarpets, 1 ; carpet dwb FindOwnedCarpets, 1 ; carpet
dwb FindOwnedPlants, 2 ; plant dwb FindOwnedPlants, 2 ; plant
@ -211,7 +211,7 @@ FindOwnedBeds: ; 268bd
jp FindOwnedDecosInCategory jp FindOwnedDecosInCategory
; 268c5 ; 268c5
.beds: ; 268c5 .beds ; 268c5
db DECO_FEATHERY_BED ; 2 db DECO_FEATHERY_BED ; 2
db DECO_PINK_BED ; 3 db DECO_PINK_BED ; 3
db DECO_POLKADOT_BED ; 4 db DECO_POLKADOT_BED ; 4
@ -232,7 +232,7 @@ FindOwnedCarpets: ; 268d2
jp FindOwnedDecosInCategory jp FindOwnedDecosInCategory
; 268da ; 268da
.carpets: ; 268da .carpets ; 268da
db DECO_RED_CARPET ; 7 db DECO_RED_CARPET ; 7
db DECO_BLUE_CARPET ; 8 db DECO_BLUE_CARPET ; 8
db DECO_YELLOW_CARPET ; 9 db DECO_YELLOW_CARPET ; 9
@ -253,7 +253,7 @@ FindOwnedPlants: ; 268e7
jp FindOwnedDecosInCategory jp FindOwnedDecosInCategory
; 268ef ; 268ef
.plants: ; 268ef .plants ; 268ef
db DECO_MAGNAPLANT ; c db DECO_MAGNAPLANT ; c
db DECO_TROPICPLANT ; d db DECO_TROPICPLANT ; d
db DECO_JUMBOPLANT ; e db DECO_JUMBOPLANT ; e
@ -273,7 +273,7 @@ FindOwnedPosters: ; 268fb
jp FindOwnedDecosInCategory jp FindOwnedDecosInCategory
; 26903 ; 26903
.posters: ; 26903 .posters ; 26903
db DECO_TOWN_MAP ; 10 db DECO_TOWN_MAP ; 10
db DECO_PIKACHU_POSTER ; 11 db DECO_PIKACHU_POSTER ; 11
db DECO_CLEFAIRY_POSTER ; 12 db DECO_CLEFAIRY_POSTER ; 12
@ -294,7 +294,7 @@ FindOwnedConsoles: ; 26910
jp FindOwnedDecosInCategory jp FindOwnedDecosInCategory
; 26918 ; 26918
.consoles: ; 26918 .consoles ; 26918
db DECO_FAMICOM ; 15 db DECO_FAMICOM ; 15
db DECO_SNES ; 16 db DECO_SNES ; 16
db DECO_N64 ; 17 db DECO_N64 ; 17
@ -315,7 +315,7 @@ FindOwnedOrnaments: ; 26925
jp FindOwnedDecosInCategory jp FindOwnedDecosInCategory
; 2692d ; 2692d
.ornaments: ; 2692d .ornaments ; 2692d
db DECO_PIKACHU_DOLL ; 1e db DECO_PIKACHU_DOLL ; 1e
db DECO_SURF_PIKACHU_DOLL ; 1f db DECO_SURF_PIKACHU_DOLL ; 1f
db DECO_CLEFAIRY_DOLL ; 20 db DECO_CLEFAIRY_DOLL ; 20
@ -355,7 +355,7 @@ FindOwnedBigDolls: ; 2694d
jp FindOwnedDecosInCategory jp FindOwnedDecosInCategory
; 26955 ; 26955
.big_dolls: ; 26955 .big_dolls ; 26955
db DECO_BIG_SNORLAX_DOLL ; 1a db DECO_BIG_SNORLAX_DOLL ; 1a
db DECO_BIG_ONIX_DOLL ; 1b db DECO_BIG_ONIX_DOLL ; 1b
db DECO_BIG_LAPRAS_DOLL ; 1c db DECO_BIG_LAPRAS_DOLL ; 1c
@ -656,37 +656,37 @@ GetDecoName: ; 26c72
; 26c8c ; 26c8c
.invalid: ; 26c8c .invalid ; 26c8c
ret ret
; 26c8d ; 26c8d
.plant: ; 26c8d .plant ; 26c8d
ld a, e ld a, e
jr .getdeconame jr .getdeconame
.bed: ; 26c90 .bed ; 26c90
call .plant call .plant
ld a, _BED ld a, _BED
jr .getdeconame jr .getdeconame
.carpet: ; 26c97 .carpet ; 26c97
call .plant call .plant
ld a, _CARPET ld a, _CARPET
jr .getdeconame jr .getdeconame
.poster: ; 26c9e .poster ; 26c9e
ld a, e ld a, e
call .getpokename call .getpokename
ld a, _POSTER ld a, _POSTER
jr .getdeconame jr .getdeconame
.doll: ; 26ca6 .doll ; 26ca6
ld a, e ld a, e
call .getpokename call .getpokename
ld a, _DOLL ld a, _DOLL
jr .getdeconame jr .getdeconame
.bigdoll: ; 26cae .bigdoll ; 26cae
push de push de
ld a, BIG_ ld a, BIG_
call .getdeconame call .getdeconame
@ -694,21 +694,21 @@ GetDecoName: ; 26c72
ld a, e ld a, e
jr .getpokename jr .getpokename
.unused: ; 26cb8 .unused ; 26cb8
push de push de
call .getdeconame call .getdeconame
pop de pop de
ld a, e ld a, e
jr .getdeconame jr .getdeconame
.getpokename: ; 26cc0 .getpokename ; 26cc0
push bc push bc
ld [wd265], a ld [wd265], a
call GetPokemonName call GetPokemonName
pop bc pop bc
jr .copy jr .copy
.getdeconame: ; 26cca .getdeconame ; 26cca
call ._getdeconame call ._getdeconame
jr .copy jr .copy
@ -721,7 +721,7 @@ GetDecoName: ; 26c72
pop bc pop bc
ret ret
.copy: ; 26cda .copy ; 26cda
ld h, b ld h, b
ld l, c ld l, c
call CopyName2 call CopyName2
@ -957,7 +957,7 @@ DecoAction_SetItUp_Ornament: ; 26de3
ret ret
; 26e33 ; 26e33
.getwhichside: ; 26e33 .getwhichside ; 26e33
ld a, [MenuSelection] ld a, [MenuSelection]
ld b, a ld b, a
ld a, [wd1ed] ld a, [wd1ed]

2
engine/events.asm
View File

@ -994,7 +994,7 @@ CountStep: ; 96b79
ret ret
; 96bd3 ; 96bd3
.unreferenced: ; 96bd3 .unreferenced ; 96bd3
ld a, 7 ld a, 7
scf scf
ret ret

10
engine/events_2.asm
View File

@ -519,13 +519,13 @@ CmdQueue_Type4: ; 97ebc
dw .one dw .one
; 97ec3 ; 97ec3
.zero: ; 97ec3 .zero ; 97ec3
ld a, [hSCY] ld a, [hSCY]
ld hl, 4 ld hl, 4
add hl, bc add hl, bc
ld [hl], a ld [hl], a
call CmdQueueAnonJT_Increment call CmdQueueAnonJT_Increment
.one: ; 97ecd .one ; 97ecd
ld hl, 1 ld hl, 1
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -566,11 +566,11 @@ CmdQueue_Type3: ; 97ef9
dw .two dw .two
; 97f02 ; 97f02
.zero: ; 97f02 .zero ; 97f02
call .IsPlayerFacingDown call .IsPlayerFacingDown
jr z, .PlayerNotFacingDown jr z, .PlayerNotFacingDown
call CmdQueueAnonJT_Increment call CmdQueueAnonJT_Increment
.one: ; 97f0a .one ; 97f0a
call .IsPlayerFacingDown call .IsPlayerFacingDown
jr z, .PlayerNotFacingDown jr z, .PlayerNotFacingDown
call CmdQueueAnonJT_Increment call CmdQueueAnonJT_Increment
@ -582,7 +582,7 @@ CmdQueue_Type3: ; 97ef9
ret ret
; 97f1b ; 97f1b
.two: ; 97f1b .two ; 97f1b
call .IsPlayerFacingDown call .IsPlayerFacingDown
jr z, .PlayerNotFacingDown jr z, .PlayerNotFacingDown
call CmdQueueAnonJT_Decrement call CmdQueueAnonJT_Decrement

2
engine/events_3.asm
View File

@ -8,7 +8,7 @@ ReturnFromMapSetupScript:: ; b8000
ret ret
; b800a ; b800a
.inefficientcallba: ; b800a .inefficientcallba ; b800a
ld a, [MapGroup] ld a, [MapGroup]
ld b, a ld b, a
ld a, [MapNumber] ld a, [MapNumber]

4
engine/evolution_animation.asm
View File

@ -259,7 +259,7 @@ endr
ret ret
; 4e794 ; 4e794
.check_statused: ; 4e794 .check_statused ; 4e794
ld a, [CurPartyMon] ld a, [CurPartyMon]
ld hl, PartyMon1Species ld hl, PartyMon1Species
call GetPartyLocation call GetPartyLocation
@ -296,7 +296,7 @@ endr
ret ret
; 4e7cf ; 4e7cf
.balls_of_light: ; 4e7cf .balls_of_light ; 4e7cf
ld hl, wJumptableIndex ld hl, wJumptableIndex
ld a, [hl] ld a, [hl]
cp 32 cp 32

4
engine/healmachineanim.asm
View File

@ -122,7 +122,7 @@ endr
ret ret
; 123db ; 123db
.dummy_5: ; 123db .dummy_5 ; 123db
ret ret
; 123dc ; 123dc
@ -168,7 +168,7 @@ INCBIN "gfx/unknown/0123fc.2bpp"
ret ret
; 12451 ; 12451
.palettes: ; 12451 .palettes ; 12451
RGB 31, 31, 31 RGB 31, 31, 31
RGB 31, 19, 10 RGB 31, 19, 10
RGB 31, 07, 01 RGB 31, 07, 01

4
engine/link_trade.asm
View File

@ -75,7 +75,7 @@ _LinkTextbox: ; 16d61d
ret ret
; 16d640 ; 16d640
.draw_border: ; 16d640 .draw_border ; 16d640
push hl push hl
ld a, $30 ld a, $30
ld [hli], a ld [hli], a
@ -107,7 +107,7 @@ _LinkTextbox: ; 16d61d
ret ret
; 16d66d ; 16d66d
.fill_row: ; 16d66d .fill_row ; 16d66d
ld d, c ld d, c
.loop4 .loop4
ld [hli], a ld [hli], a

10
engine/mart.asm
View File

@ -651,7 +651,7 @@ MenuDataHeader_Buy: ; 0x15e18
db 1 ; default option db 1 ; default option
; 0x15e20 ; 0x15e20
.menudata2: ; 0x15e20 .menudata2 ; 0x15e20
db $30 ; pointers db $30 ; pointers
db 4, 8 ; rows, columns db 4, 8 ; rows, columns
db 1 ; horizontal spacing db 1 ; horizontal spacing
@ -846,7 +846,7 @@ SellMenu: ; 15eb3
ret ret
; 15eee ; 15eee
.dw: ; 15eee .dw ; 15eee
dw .try_sell dw .try_sell
dw .cant_buy dw .cant_buy
dw .cant_buy dw .cant_buy
@ -856,12 +856,12 @@ SellMenu: ; 15eb3
dw .try_sell dw .try_sell
; 15efc ; 15efc
.cant_buy: ; 15efc .cant_buy ; 15efc
ret ret
; 15efd ; 15efd
.try_sell: ; 15efd .try_sell ; 15efd
callba _CheckTossableItem callba _CheckTossableItem
ld a, [wItemAttributeParamBuffer] ld a, [wItemAttributeParamBuffer]
and a and a
@ -936,7 +936,7 @@ MenuDataHeader_BuySell: ; 0x15f88
db 1 ; default option db 1 ; default option
; 0x15f90 ; 0x15f90
.menudata2: ; 0x15f90 .menudata2 ; 0x15f90
db $80 ; strings db $80 ; strings
db 3 ; items db 3 ; items
db "BUY@" db "BUY@"

8
engine/menu.asm
View File

@ -414,7 +414,7 @@ _2DMenuInterpretJoypad: ; 24270
and a and a
ret ret
.set_bit_7: ; 24299 .set_bit_7 ; 24299
ld hl, w2DMenuFlags2 ld hl, w2DMenuFlags2
set 7, [hl] set 7, [hl]
scf scf
@ -515,7 +515,7 @@ _2DMenuInterpretJoypad: ; 24270
ret ret
; 24318 ; 24318
.a_b_start_select: ; 24318 .a_b_start_select ; 24318
xor a xor a
ret ret
; 2431a ; 2431a
@ -654,7 +654,7 @@ _PushWindow:: ; 24374
ret ret
; 243cd ; 243cd
.copy: ; 243cd .copy ; 243cd
call GetMenuBoxDims call GetMenuBoxDims
inc b inc b
inc c inc c
@ -681,7 +681,7 @@ _PushWindow:: ; 24374
ret ret
; 243e7 ; 243e7
.ret: ; 243e7 .ret ; 243e7
ret ret
; 243e8 ; 243e8

4
engine/mon_icons.asm
View File

@ -202,7 +202,7 @@ SetPartyMonIconAnimSpeed: ; 8e936 (23:6936)
ld [hl], a ld [hl], a
ret ret
.getspeed: ; 8e94c (23:694c) .getspeed ; 8e94c (23:694c)
callba PlacePartymonHPBar callba PlacePartymonHPBar
call GetHPPal call GetHPPal
ld e, d ld e, d
@ -213,7 +213,7 @@ SetPartyMonIconAnimSpeed: ; 8e936 (23:6936)
ret ret
; 8e95e (23:695e) ; 8e95e (23:695e)
.speeds: ; 8e95e .speeds ; 8e95e
db $00, $40, $80 db $00, $40, $80
; 8e961 ; 8e961

2
engine/money.asm
View File

@ -191,7 +191,7 @@ GiveCoins:: ; 1606f
ret ret
; 1608d ; 1608d
.maxcoins: ; 1608d .maxcoins ; 1608d
bigdw 9999 bigdw 9999
; 1608f ; 1608f

2
engine/move_mon.asm
View File

@ -1032,7 +1032,7 @@ SentPkmnIntoBox: ; de6e
ret ret
; df42 ; df42
.full: ; df42 .full ; df42
call CloseSRAM call CloseSRAM
and a and a
ret ret

8
engine/mysterygift.asm
View File

@ -1350,7 +1350,7 @@ Function105153: ; 105153 (41:5153)
.Load16GFX: ; 105236 (41:5236) .Load16GFX: ; 105236 (41:5236)
ld b, 16 ld b, 16
.gfx_loop: ; 105238 (41:5238) .gfx_loop ; 105238 (41:5238)
ld [hli], a ld [hli], a
inc a inc a
dec b dec b
@ -1368,7 +1368,7 @@ Function105153: ; 105153 (41:5153)
.Load14Column: ; 105246 (41:5246) .Load14Column: ; 105246 (41:5246)
ld b, 14 ld b, 14
.col_loop: ; 105248 (41:5248) .col_loop ; 105248 (41:5248)
ld [hl], a ld [hl], a
ld de, SCREEN_WIDTH ld de, SCREEN_WIDTH
add hl, de add hl, de
@ -1651,7 +1651,7 @@ Function1057d7: ; 1057d7 (41:57d7)
.Load12Row: ; 1058ce (41:58ce) .Load12Row: ; 1058ce (41:58ce)
ld b, 12 ld b, 12
.row_loop: ; 1058d0 (41:58d0) .row_loop ; 1058d0 (41:58d0)
ld [hli], a ld [hli], a
inc a inc a
dec b dec b
@ -1669,7 +1669,7 @@ Function1057d7: ; 1057d7 (41:57d7)
.Load14Column: ; 1058de (41:58de) .Load14Column: ; 1058de (41:58de)
ld b, 14 ld b, 14
.column_loop: ; 1058e0 (41:58e0) .column_loop ; 1058e0 (41:58e0)
ld [hl], a ld [hl], a
ld de, SCREEN_WIDTH ld de, SCREEN_WIDTH
add hl, de add hl, de

8
engine/namingscreen.asm
View File

@ -211,7 +211,7 @@ endr
; 11839 (4:5839) ; 11839 (4:5839)
.oTomodachi_no_namae_sutoringu: ; 11839 .oTomodachi_no_namae_sutoringu ; 11839
db "おともだち の なまえは?@" db "おともだち の なまえは?@"
; 11847 ; 11847
@ -1076,7 +1076,7 @@ _ComposeMailMessage: ; 11e75 (mail?)
INCBIN "gfx/icon/mail2.2bpp" INCBIN "gfx/icon/mail2.2bpp"
; 11f74 ; 11f74
.initwNamingScreenMaxNameLength: ; 11f74 (4:5f74) .initwNamingScreenMaxNameLength ; 11f74 (4:5f74)
ld a, MAIL_MSG_LENGTH + 1 ld a, MAIL_MSG_LENGTH + 1
ld [wNamingScreenMaxNameLength], a ld [wNamingScreenMaxNameLength], a
ret ret
@ -1176,7 +1176,7 @@ endr
dw .init_blinking_cursor dw .init_blinking_cursor
dw .process_joypad dw .process_joypad
.init_blinking_cursor: ; 1201b (4:601b) .init_blinking_cursor ; 1201b (4:601b)
depixel 9, 2 depixel 9, 2
ld a, SPRITE_ANIM_INDEX_09 ld a, SPRITE_ANIM_INDEX_09
call _InitSpriteAnimStruct call _InitSpriteAnimStruct
@ -1194,7 +1194,7 @@ endr
inc [hl] inc [hl]
ret ret
.process_joypad: ; 1203a (4:603a) .process_joypad ; 1203a (4:603a)
ld hl, hJoyPressed ; $ffa7 ld hl, hJoyPressed ; $ffa7
ld a, [hl] ld a, [hl]
and A_BUTTON and A_BUTTON

10
engine/pack.asm
View File

@ -462,7 +462,7 @@ UseItem: ; 10311
ret ret
; 1031f ; 1031f
.dw: ; 1031f (4:431f) .dw ; 1031f (4:431f)
dw .Oak dw .Oak
dw .Oak dw .Oak
@ -941,12 +941,12 @@ TMHMSubmenu: ; 105dc (4:45dc)
jr z, .Oak jr z, .Oak
cp $2 cp $2
jr z, .didnt_use_item jr z, .didnt_use_item
.quit_run_script: ; 1067e (4:467e) .quit_run_script ; 1067e (4:467e)
ld a, 10 ld a, 10
ld [wJumptableIndex], a ld [wJumptableIndex], a
ret ret
.didnt_use_item: ; 10684 (4:4684) .didnt_use_item ; 10684 (4:4684)
xor a xor a
ld [wItemEffectSucceeded], a ld [wItemEffectSucceeded], a
ret ret
@ -1148,7 +1148,7 @@ TutorialPack: ; 107bb
; 107e1 ; 107e1
.dw: ; 107e1 (4:47e1) .dw ; 107e1 (4:47e1)
dw .Items dw .Items
dw .Balls dw .Balls
@ -1495,7 +1495,7 @@ DrawPocketName: ; 109bb
ret ret
; 109e1 ; 109e1
.tilemap: ; 109e1 .tilemap ; 109e1
db $00, $04, $04, $04, $01 ; top border db $00, $04, $04, $04, $01 ; top border
db $06, $07, $08, $09, $0a ; Items db $06, $07, $08, $09, $0a ; Items
db $02, $05, $05, $05, $03 ; bottom border db $02, $05, $05, $05, $03 ; bottom border

14
engine/party_menu.asm
View File

@ -359,11 +359,11 @@ PlacePartyMonTMHMCompatibility: ; 501e0
ret ret
; 50221 ; 50221
.string_able: ; 50221 .string_able ; 50221
db "ABLE@" db "ABLE@"
; 50226 ; 50226
.string_not_able: ; 50226 .string_not_able ; 50226
db "NOT ABLE@" db "NOT ABLE@"
; 5022f ; 5022f
@ -448,10 +448,10 @@ endr
ret ret
; 502a3 ; 502a3
.string_able: ; 502a3 .string_able ; 502a3
db "ABLE@" db "ABLE@"
; 502a8 ; 502a8
.string_not_able: ; 502a8 .string_not_able ; 502a8
db "NOT ABLE@" db "NOT ABLE@"
; 502b1 ; 502b1
@ -496,15 +496,15 @@ PlacePartyMonGender: ; 502b1
ret ret
; 502ee ; 502ee
.male: ; 502ee .male ; 502ee
db "♂…MALE@" db "♂…MALE@"
; 502f5 ; 502f5
.female: ; 502f5 .female ; 502f5
db "♀…FEMALE@" db "♀…FEMALE@"
; 502fe ; 502fe
.unknown: ; 502fe .unknown ; 502fe
db "…UNKNOWN@" db "…UNKNOWN@"
; 50307 ; 50307

20
engine/phone.asm
View File

@ -153,7 +153,7 @@ CheckPhoneCall:: ; 90074 (24:4074)
xor a xor a
ret ret
.timecheck: ; 900a6 (24:40a6) .timecheck ; 900a6 (24:40a6)
callba CheckReceiveCallTimer callba CheckReceiveCallTimer
ret ret
@ -293,7 +293,7 @@ endr
ret ret
; 90173 (24:4173) ; 90173 (24:4173)
.script: ; 0x90173 .script ; 0x90173
pause 30 pause 30
jump Script_ReceivePhoneCall jump Script_ReceivePhoneCall
; 0x90178 ; 0x90178
@ -430,10 +430,10 @@ LoadCallerScript: ; 9020d (24:420d)
WrongNumber: ; 90233 WrongNumber: ; 90233
db TRAINER_NONE, PHONE_00 db TRAINER_NONE, PHONE_00
dba .script dba .script
.script: .script
writetext .text writetext .text
end end
.text: .text
; Huh? Sorry, wrong number! ; Huh? Sorry, wrong number!
text_jump UnknownText_0x1c5565 text_jump UnknownText_0x1c5565
db "@" db "@"
@ -718,12 +718,12 @@ NonTrainerCallerNames: ; 903d6
dw .elm dw .elm
dw .buena dw .buena
.none: db "----------@" .none db "----------@"
.mom: db "MOM:@" .mom db "MOM:@"
.bill: db "BILL:@" .bill db "BILL:@"
.elm: db "PROF.ELM:@" .elm db "PROF.ELM:@"
.bikeshop: db "BIKE SHOP:@" .bikeshop db "BIKE SHOP:@"
.buena: db "BUENA:", $22, " DISC JOCKEY@" .buena db "BUENA:", $22, " DISC JOCKEY@"
; 90423 ; 90423
Phone_GetTrainerName: ; 90423 (24:4423) Phone_GetTrainerName: ; 90423 (24:4423)

2
engine/phone_scripts.asm
View File

@ -3137,7 +3137,7 @@ PhoneScript_MonFlavorText:
.TooEnergetic: .TooEnergetic:
farjump .unnecessary farjump .unnecessary
.unnecessary: .unnecessary
farwritetext UnknownText_0x1b522b farwritetext UnknownText_0x1b522b
buttonsound buttonsound
farjump PhoneScript_HangupText_Male farjump PhoneScript_HangupText_Male

4
engine/player_object.asm
View File

@ -281,7 +281,7 @@ InitializeVisibleSprites: ; 8177
jr nz, .loop jr nz, .loop
ret ret
.ret: ; 81c9 .ret ; 81c9
ret ret
CheckObjectEnteringVisibleRange:: ; 81ca CheckObjectEnteringVisibleRange:: ; 81ca
@ -293,7 +293,7 @@ CheckObjectEnteringVisibleRange:: ; 81ca
rst JumpTable rst JumpTable
ret ret
.dw: ; 81d6 .dw ; 81d6
dw .Down dw .Down
dw .Up dw .Up
dw .Left dw .Left

6
engine/player_step.asm
View File

@ -73,14 +73,14 @@ HandlePlayerStep: ; d4e5 (3:54e5)
dw .fail1 dw .fail1
dw .fail1 dw .fail1
.fail1: ; d508 (3:5508) .fail1 ; d508 (3:5508)
ret ret
.mobile: ; d509 (3:5509) .mobile ; d509 (3:5509)
callba MobileFn_10602e callba MobileFn_10602e
ret ret
.fail2: ; d510 (3:5510) .fail2 ; d510 (3:5510)
ret ret
UpdatePlayerCoords: ; d511 (3:5511) UpdatePlayerCoords: ; d511 (3:5511)

2
engine/pokegear.asm
View File

@ -940,7 +940,7 @@ PokegearPhone_MakePhoneCall: ; 911eb (24:51eb)
; 9124c (24:524c) ; 9124c (24:524c)
.dotdotdot: ; 0x9124c .dotdotdot ; 0x9124c
; ;
text_jump UnknownText_0x1c5824 text_jump UnknownText_0x1c5824
db "@" db "@"

2
engine/scripting.asm
View File

@ -1455,7 +1455,7 @@ Script_earthquake: ; 973c7
jp ScriptCall jp ScriptCall
; 973e6 ; 973e6
.script: ; 973e6 .script ; 973e6
applymovement PLAYER, wd002 applymovement PLAYER, wd002
end end
; 973eb ; 973eb

22
engine/scrolling_menu.asm
View File

@ -22,7 +22,7 @@ _ScrollingMenu:: ; 245cb
jr .loop jr .loop
; 245d6 ; 245d6
.exit: ; 245d6 .exit ; 245d6
call MenuClickSound call MenuClickSound
ld [wMenuJoypad], a ld [wMenuJoypad], a
ld a, 0 ld a, 0
@ -30,7 +30,7 @@ _ScrollingMenu:: ; 245cb
ret ret
; 245e1 ; 245e1
.zero: ; 245e1 .zero ; 245e1
call ScrollingMenu_InitDisplay call ScrollingMenu_InitDisplay
ld a, 1 ld a, 1
ld [hBGMapMode], a ld [hBGMapMode], a
@ -84,13 +84,13 @@ ScrollingMenuJoyAction: ; 24609
jr .loop jr .loop
; 24640 ; 24640
.unreferenced: ; unreferenced .unreferenced ; unreferenced
ld a, -1 ld a, -1
and a and a
ret ret
; 24644 ; 24644
.a_button: ; 24644 .a_button ; 24644
call PlaceHollowCursor call PlaceHollowCursor
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
dec a dec a
@ -111,13 +111,13 @@ ScrollingMenuJoyAction: ; 24609
ret ret
; 2466f ; 2466f
.b_button: ; 2466f .b_button ; 2466f
ld a, B_BUTTON ld a, B_BUTTON
scf scf
ret ret
; 24673 ; 24673
.select: ; 24673 .select ; 24673
ld a, [wMenuData2Flags] ld a, [wMenuData2Flags]
bit 7, a bit 7, a
jp z, xor_a_dec_a jp z, xor_a_dec_a
@ -135,7 +135,7 @@ ScrollingMenuJoyAction: ; 24609
ret ret
; 24695 ; 24695
.start: ; 24695 .start ; 24695
ld a, [wMenuData2Flags] ld a, [wMenuData2Flags]
bit 6, a bit 6, a
jp z, xor_a_dec_a jp z, xor_a_dec_a
@ -144,7 +144,7 @@ ScrollingMenuJoyAction: ; 24609
ret ret
; 246a1 ; 246a1
.d_left: ; 246a1 .d_left ; 246a1
ld hl, w2DMenuFlags2 ld hl, w2DMenuFlags2
bit 7, [hl] bit 7, [hl]
jp z, xor_a_dec_a jp z, xor_a_dec_a
@ -156,7 +156,7 @@ ScrollingMenuJoyAction: ; 24609
ret ret
; 246b5 ; 246b5
.d_right: ; 246b5 .d_right ; 246b5
ld hl, w2DMenuFlags2 ld hl, w2DMenuFlags2
bit 7, [hl] bit 7, [hl]
jp z, xor_a_dec_a jp z, xor_a_dec_a
@ -168,7 +168,7 @@ ScrollingMenuJoyAction: ; 24609
ret ret
; 246c9 ; 246c9
.d_up: ; 246c9 .d_up ; 246c9
ld hl, w2DMenuFlags2 ld hl, w2DMenuFlags2
bit 7, [hl] bit 7, [hl]
jp z, xor_a jp z, xor_a
@ -183,7 +183,7 @@ ScrollingMenuJoyAction: ; 24609
jp xor_a_dec_a jp xor_a_dec_a
; 246df ; 246df
.d_down: ; 246df .d_down ; 246df
ld hl, w2DMenuFlags2 ld hl, w2DMenuFlags2
bit 7, [hl] bit 7, [hl]
jp z, xor_a jp z, xor_a

2
engine/sine.asm
View File

@ -44,7 +44,7 @@ _Sine:: ; 84d9
jr nz, .multiply jr nz, .multiply
ret ret
.sinewave: ; 850b .sinewave ; 850b
; A $20-word table representing a sine wave. ; A $20-word table representing a sine wave.
; 90 degrees is index $10 at a base amplitude of $100. ; 90 degrees is index $10 at a base amplitude of $100.
sine_wave $100 sine_wave $100

30
engine/slot_machine.asm
View File

@ -800,7 +800,7 @@ Function92bd4: ; 92bd4 (24:6bd4)
; 92be4 (24:6be4) ; 92be4 (24:6be4)
.dw: ; 92be4 .dw ; 92be4
dw ReelAction_DoNothing ; 00 dw ReelAction_DoNothing ; 00
dw Slots_StopReelIgnoreJoypad ; 01 dw Slots_StopReelIgnoreJoypad ; 01
@ -1330,18 +1330,18 @@ Slots_CheckMatchedFirstTwoReels: ; 92e94
dw .three dw .three
; 92ec5 ; 92ec5
.three: ; 92ec5 .three ; 92ec5
call .CheckUpwardsDiag call .CheckUpwardsDiag
call .CheckDownwardsDiag call .CheckDownwardsDiag
.two: ; 92ecb .two ; 92ecb
call .CheckBottomRow call .CheckBottomRow
call .CheckTopRow call .CheckTopRow
.one: ; 92ed1 .one ; 92ed1
call .CheckMiddleRow call .CheckMiddleRow
.zero: ; 92ed4 .zero ; 92ed4
ret ret
; 92ed5 ; 92ed5
@ -1445,18 +1445,18 @@ Slots_CheckMatchedAllThreeReels: ; 92f1d
dw .three dw .three
; 92f50 ; 92f50
.three: ; 92f50 .three ; 92f50
call .CheckUpwardsDiag call .CheckUpwardsDiag
call .CheckDownwardsDiag call .CheckDownwardsDiag
.two: ; 92f56 .two ; 92f56
call .CheckBottomRow call .CheckBottomRow
call .CheckTopRow call .CheckTopRow
.one: ; 92f5c .one ; 92f5c
call .CheckMiddleRow call .CheckMiddleRow
.zero: ; 92f5f .zero ; 92f5f
ret ret
; 92f60 ; 92f60
@ -1967,7 +1967,7 @@ SlotMachine_AnimateGolem: ; 9321d (24:721d)
dw .roll dw .roll
.init: ; 93233 (24:7233) .init ; 93233 (24:7233)
ld hl, SPRITEANIMSTRUCT_0E ld hl, SPRITEANIMSTRUCT_0E
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -1992,7 +1992,7 @@ SlotMachine_AnimateGolem: ; 9321d (24:721d)
add hl, bc add hl, bc
ld [hl], $0 ld [hl], $0
.fall: ; 93259 (24:7259) .fall ; 93259 (24:7259)
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -2021,7 +2021,7 @@ SlotMachine_AnimateGolem: ; 9321d (24:721d)
call Slots_PlaySFX call Slots_PlaySFX
ret ret
.roll: ; 93289 (24:7289) .roll ; 93289 (24:7289)
ld hl, SPRITEANIMSTRUCT_XOFFSET ld hl, SPRITEANIMSTRUCT_XOFFSET
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -2068,7 +2068,7 @@ Slots_AnimateChansey: ; 932ac (24:72ac)
dw .two dw .two
.walk: ; 932c2 (24:72c2) .walk ; 932c2 (24:72c2)
ld hl, SPRITEANIMSTRUCT_XCOORD ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -2088,7 +2088,7 @@ Slots_AnimateChansey: ; 932ac (24:72ac)
ld a, $1 ld a, $1
ld [wcf64], a ld [wcf64], a
.one: ; 932e0 (24:72e0) .one ; 932e0 (24:72e0)
ld a, [wcf64] ld a, [wcf64]
cp $2 cp $2
jr z, .retain jr z, .retain
@ -2106,7 +2106,7 @@ Slots_AnimateChansey: ; 932ac (24:72ac)
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld [hl], $8 ld [hl], $8
.two: ; 932fc (24:72fc) .two ; 932fc (24:72fc)
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]

68
engine/sprite_anims.asm
View File

@ -54,7 +54,7 @@ DoAnimFrame: ; 8d24b
.Null: ; 8d2a1 (23:52a1) .Null: ; 8d2a1 (23:52a1)
ret ret
.one: ; 8d2a2 (23:52a2) .one ; 8d2a2 (23:52a2)
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
ld hl, SPRITEANIMSTRUCT_INDEX ld hl, SPRITEANIMSTRUCT_INDEX
@ -71,7 +71,7 @@ DoAnimFrame: ; 8d24b
ld [hl], $0 ld [hl], $0
ret ret
.two: ; 8d2b9 (23:52b9) .two ; 8d2b9 (23:52b9)
ld hl, SPRITEANIMSTRUCT_XCOORD ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc add hl, bc
ld [hl], 8 * 3 ld [hl], 8 * 3
@ -113,7 +113,7 @@ DoAnimFrame: ; 8d24b
ld [hl], a ld [hl], a
ret ret
.three: ; 8d2ea (23:52ea) .three ; 8d2ea (23:52ea)
ld a, [wMenuCursorY] ld a, [wMenuCursorY]
ld hl, SPRITEANIMSTRUCT_INDEX ld hl, SPRITEANIMSTRUCT_INDEX
@ -132,7 +132,7 @@ DoAnimFrame: ; 8d24b
ld [hl], 8 * 3 ld [hl], 8 * 3
ret ret
.four: ; 8d302 (23:5302) .four ; 8d302 (23:5302)
call .anonymous_dw call .anonymous_dw
jp [hl] jp [hl]
; 8d306 (23:5306) ; 8d306 (23:5306)
@ -142,7 +142,7 @@ DoAnimFrame: ; 8d24b
dw .four_one dw .four_one
; 8d30a ; 8d30a
.four_zero: ; 8d30a .four_zero ; 8d30a
call .IncrementSpriteAnimStruct0B call .IncrementSpriteAnimStruct0B
ld hl, SPRITEANIMSTRUCT_INDEX ld hl, SPRITEANIMSTRUCT_INDEX
@ -160,7 +160,7 @@ DoAnimFrame: ; 8d24b
add hl, bc add hl, bc
ld [hl], a ld [hl], a
.four_one: ; 8d321 .four_one ; 8d321
ld hl, SPRITEANIMSTRUCT_XCOORD ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -203,7 +203,7 @@ DoAnimFrame: ; 8d24b
ret ret
; 8d35a ; 8d35a
.twentyfive: ; 8d35a (23:535a) .twentyfive ; 8d35a (23:535a)
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -217,11 +217,11 @@ DoAnimFrame: ; 8d24b
ld [hl], a ld [hl], a
ret ret
.namingscreencursor: ; 8d36c (23:536c) .namingscreencursor ; 8d36c (23:536c)
callab NamingScreen_AnimateCursor callab NamingScreen_AnimateCursor
ret ret
.mailcompositioncursor: ; 8d373 (23:5373) .mailcompositioncursor ; 8d373 (23:5373)
callab ComposeMail_AnimateCursor callab ComposeMail_AnimateCursor
ret ret
@ -229,7 +229,7 @@ DoAnimFrame: ; 8d24b
callab GameFreakLogoJumper callab GameFreakLogoJumper
ret ret
.seven: ; 8d381 (23:5381) .seven ; 8d381 (23:5381)
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -279,7 +279,7 @@ DoAnimFrame: ; 8d24b
call DeinitializeSprite call DeinitializeSprite
ret ret
.eight: ; 8d3c3 (23:53c3) .eight ; 8d3c3 (23:53c3)
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, [hli] ld a, [hli]
@ -404,19 +404,19 @@ DoAnimFrame: ; 8d24b
ld [hl], a ld [hl], a
ret ret
.thirteen: ; 8d46e (23:546e) .thirteen ; 8d46e (23:546e)
callab ret_e00ed callab ret_e00ed
ret ret
.fifteen: ; 8d475 (23:5475) .fifteen ; 8d475 (23:5475)
callab AnimatePokegearModeIndicatorArrow callab AnimatePokegearModeIndicatorArrow
ret ret
.fourteen: ; 8d47c (23:547c) .fourteen ; 8d47c (23:547c)
callab DummyGame_InterpretJoypad_AnimateCursor callab DummyGame_InterpretJoypad_AnimateCursor
ret ret
.sixteen: ; 8d483 (23:5483) .sixteen ; 8d483 (23:5483)
call .anonymous_dw call .anonymous_dw
jp [hl] jp [hl]
; 8d487 (23:5487) ; 8d487 (23:5487)
@ -430,7 +430,7 @@ DoAnimFrame: ; 8d24b
dw .sixteen_five dw .sixteen_five
; 8d493 ; 8d493
.sixteen_zero: ; 8d493 .sixteen_zero ; 8d493
ld a, $14 ld a, $14
call _ReinitSpriteAnimFrame call _ReinitSpriteAnimFrame
@ -444,7 +444,7 @@ DoAnimFrame: ; 8d24b
ret ret
; 8d4a5 ; 8d4a5
.sixteen_two: ; 8d4a5 .sixteen_two ; 8d4a5
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -460,7 +460,7 @@ DoAnimFrame: ; 8d24b
add hl, bc add hl, bc
ld [hl], $40 ld [hl], $40
.sixteen_three: ; 8d4b8 .sixteen_three ; 8d4b8
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -481,7 +481,7 @@ DoAnimFrame: ; 8d24b
jr .sixteen_five jr .sixteen_five
; 8d4d5 ; 8d4d5
.sixteen_one: ; 8d4d5 .sixteen_one ; 8d4d5
ld hl, SPRITEANIMSTRUCT_0B ld hl, SPRITEANIMSTRUCT_0B
add hl, bc add hl, bc
ld [hl], $4 ld [hl], $4
@ -496,7 +496,7 @@ DoAnimFrame: ; 8d24b
ret ret
; 8d4e8 ; 8d4e8
.sixteen_four: ; 8d4e8 .sixteen_four ; 8d4e8
ld hl, SPRITEANIMSTRUCT_0D ld hl, SPRITEANIMSTRUCT_0D
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -542,12 +542,12 @@ DoAnimFrame: ; 8d24b
call .IncrementSpriteAnimStruct0B call .IncrementSpriteAnimStruct0B
ret ret
.sixteen_five: ; 8d526 .sixteen_five ; 8d526
call DeinitializeSprite call DeinitializeSprite
ret ret
; 8d52a ; 8d52a
.seventeen: ; 8d52a (23:552a) .seventeen ; 8d52a (23:552a)
ld hl, SPRITEANIMSTRUCT_XCOORD ld hl, SPRITEANIMSTRUCT_XCOORD
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -565,7 +565,7 @@ DoAnimFrame: ; 8d24b
call DeinitializeSprite call DeinitializeSprite
ret ret
.eighteen: ; 8d543 (23:5543) .eighteen ; 8d543 (23:5543)
callab Function29676 callab Function29676
ret ret
@ -610,7 +610,7 @@ DoAnimFrame: ; 8d24b
callab AnimateTuningKnob callab AnimateTuningKnob
ret ret
.twentyone: ; 8d57f (23:557f) .twentyone ; 8d57f (23:557f)
ld hl, SPRITEANIMSTRUCT_0D ld hl, SPRITEANIMSTRUCT_0D
add hl, bc add hl, bc
ld e, [hl] ld e, [hl]
@ -749,15 +749,15 @@ endr
ld [hl], a ld [hl], a
ret ret
.twentyseven: ; 8d630 (23:5630) .twentyseven ; 8d630 (23:5630)
callba Function108bc7 callba Function108bc7
ret ret
.twentyeight: ; 8d637 (23:5637) .twentyeight ; 8d637 (23:5637)
callba Function108be0 callba Function108be0
ret ret
.twentynine: ; 8d63e (23:563e) .twentynine ; 8d63e (23:563e)
ld a, [wcf65] ld a, [wcf65]
and a and a
jr nz, .asm_8d645 jr nz, .asm_8d645
@ -784,7 +784,7 @@ endr
call _ReinitSpriteAnimFrame call _ReinitSpriteAnimFrame
ret ret
.thirty: ; 8d666 (23:5666) .thirty ; 8d666 (23:5666)
ld hl, SPRITEANIMSTRUCT_0C ld hl, SPRITEANIMSTRUCT_0C
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -803,7 +803,7 @@ endr
.asm_8d67f .asm_8d67f
ret ret
.thirtytwo: ; 8d680 (23:5680) .thirtytwo ; 8d680 (23:5680)
ld hl, SPRITEANIMSTRUCT_0B ld hl, SPRITEANIMSTRUCT_0B
add hl, bc add hl, bc
ld d, [hl] ld d, [hl]
@ -830,7 +830,7 @@ endr
ld [hl], a ld [hl], a
ret ret
.thirtythree: ; 8d6a2 (23:56a2) .thirtythree ; 8d6a2 (23:56a2)
ld a, [wcf64] ld a, [wcf64]
cp $40 cp $40
ret nz ret nz
@ -838,7 +838,7 @@ endr
call _ReinitSpriteAnimFrame call _ReinitSpriteAnimFrame
ret ret
.thirtyfour: ; 8d6ae (23:56ae) .thirtyfour ; 8d6ae (23:56ae)
ld hl, SPRITEANIMSTRUCT_YCOORD ld hl, SPRITEANIMSTRUCT_YCOORD
add hl, bc add hl, bc
ld a, [hl] ld a, [hl]
@ -846,15 +846,15 @@ endr
ld [hl], a ld [hl], a
ret ret
.twentysix: ; 8d6b7 (23:56b7) .twentysix ; 8d6b7 (23:56b7)
callba Function11d0b6 callba Function11d0b6
ret ret
.thirtyone: ; 8d6be (23:56be) .thirtyone ; 8d6be (23:56be)
callba UpdateCelebiPosition callba UpdateCelebiPosition
ret ret
.anonymous_dw: ; 8d6c5 (23:56c5) .anonymous_dw ; 8d6c5 (23:56c5)
ld hl, [sp+$0] ld hl, [sp+$0]
ld e, [hl] ld e, [hl]
inc hl inc hl

2
engine/sprites.asm
View File

@ -649,7 +649,7 @@ Sprites_Sine: ; 8e72c
ret ret
; 8e75d ; 8e75d
.sinewave: ; 8e75d .sinewave ; 8e75d
sine_wave $100 sine_wave $100

6
engine/stats_screen.asm
View File

@ -369,7 +369,7 @@ StatsScreen_JoypadAction: ; 4de54 (13:5e54)
call StatsScreen_SetJumptableIndex call StatsScreen_SetJumptableIndex
ret ret
.b_button: ; 4dee4 (13:5ee4) .b_button ; 4dee4 (13:5ee4)
ld h, 7 ld h, 7
call StatsScreen_SetJumptableIndex call StatsScreen_SetJumptableIndex
ret ret
@ -863,7 +863,7 @@ StatsScreen_PlaceFrontpic: ; 4e226 (13:6226)
call .get_animation call .get_animation
ret ret
.get_animation: ; 4e289 (13:6289) .get_animation ; 4e289 (13:6289)
ld a, [CurPartySpecies] ld a, [CurPartySpecies]
call IsAPokemon call IsAPokemon
ret c ret c
@ -1101,7 +1101,7 @@ StatsScreen_LoadPageIndicators: ; 4e4cd (13:64cd)
hlcoord 15, 5 hlcoord 15, 5
jr z, .load_square jr z, .load_square
hlcoord 17, 5 hlcoord 17, 5
.load_square: ; 4e4f7 (13:64f7) .load_square ; 4e4f7 (13:64f7)
push bc push bc
ld [hli], a ld [hli], a
inc a inc a

2
engine/std_scripts.asm
View File

@ -1807,7 +1807,7 @@ GameCornerCoinVendorScript: ; 0xbcdcd
CoinVendor_IntroScript: ; 0xbcde0 CoinVendor_IntroScript: ; 0xbcde0
farwritetext CoinVendor_IntroText farwritetext CoinVendor_IntroText
.loop: ; 0xbcde4 .loop ; 0xbcde4
special Special_DisplayMoneyAndCoinBalance special Special_DisplayMoneyAndCoinBalance
loadmenudata .MenuDataHeader loadmenudata .MenuDataHeader
verticalmenu verticalmenu

2
engine/switch_items.asm
View File

@ -242,7 +242,7 @@ endr
; 24a91 (9:4a91) ; 24a91 (9:4a91)
.spacing_dws: ; 24a91 .spacing_dws ; 24a91
dw 0, 1, 2 dw 0, 1, 2
; 24a97 ; 24a97

6
engine/tile_events.asm
View File

@ -44,7 +44,7 @@ CheckWarpFacingDown: ; 149c6
ret ret
; 149d3 ; 149d3
.blocks: ; 149d3 .blocks ; 149d3
db $71 ; door db $71 ; door
db $79 db $79
db $7a ; stairs db $7a ; stairs
@ -65,7 +65,7 @@ CheckGrassCollision:: ; 149dd
ret ret
; 149ea ; 149ea
.blocks: ; 149ea .blocks ; 149ea
db $08 db $08
db $18 ; tall grass db $18 ; tall grass
db $14 ; tall grass db $14 ; tall grass
@ -87,7 +87,7 @@ CheckCutCollision: ; 149f5
ret ret
; 14a00 ; 14a00
.blocks: ; 14a00 .blocks ; 14a00
db $12 ; cut tree db $12 ; cut tree
db $1a ; cut tree db $1a ; cut tree
db $10 ; tall grass db $10 ; tall grass

6
engine/timeset.asm
View File

@ -379,19 +379,19 @@ OakText_ResponseToSetTime: ; 0x908b8
ret ret
; 908ec (24:48ec) ; 908ec (24:48ec)
.overslept: ; 0x908ec .overslept ; 0x908ec
; ! I overslept! ; ! I overslept!
text_jump UnknownText_0x1bc326 text_jump UnknownText_0x1bc326
db "@" db "@"
; 0x908f1 ; 0x908f1
.yikes: ; 0x908f1 .yikes ; 0x908f1
; ! Yikes! I over- slept! ; ! Yikes! I over- slept!
text_jump UnknownText_0x1bc336 text_jump UnknownText_0x1bc336
db "@" db "@"
; 0x908f6 ; 0x908f6
.sodark: ; 0x908f6 .sodark ; 0x908f6
; ! No wonder it's so dark! ; ! No wonder it's so dark!
text_jump UnknownText_0x1bc34f text_jump UnknownText_0x1bc34f
db "@" db "@"

4
engine/trainer_card.asm
View File

@ -540,7 +540,7 @@ TrainerCard_Page2_3_OAMUpdate: ; 25448 (9:5448)
; 254a7 (9:54a7) ; 254a7 (9:54a7)
.facing1: ; 254a7 .facing1 ; 254a7
; y, x, tile, OAM attributes ; y, x, tile, OAM attributes
db 0, 0, 0, 0 db 0, 0, 0, 0
db 0, 8, 1, 0 db 0, 8, 1, 0
@ -548,7 +548,7 @@ TrainerCard_Page2_3_OAMUpdate: ; 25448 (9:5448)
db 8, 8, 3, 0 db 8, 8, 3, 0
db -1 db -1
.facing2: ; 254b8 .facing2 ; 254b8
db 0, 0, 1, X_FLIP db 0, 0, 1, X_FLIP
db 0, 8, 0, X_FLIP db 0, 8, 0, X_FLIP
db 8, 0, 3, X_FLIP db 8, 0, 3, X_FLIP

2
engine/variables.asm
View File

@ -28,7 +28,7 @@ endr
call _de_ call _de_
ret ret
.loadstringbuffer2: ; 8066c (20:466c) .loadstringbuffer2 ; 8066c (20:466c)
ld de, StringBuffer2 ld de, StringBuffer2
ld [de], a ld [de], a
ret ret

2
engine/warp_connection.asm
View File

@ -277,7 +277,7 @@ Function1047a3: ; 1047a3 (41:47a3)
decoord 0, 0, AttrMap decoord 0, 0, AttrMap
ld a, $1 ld a, $1
ld [rVBK], a ld [rVBK], a
.copy: .copy
hlbgcoord 0, 0 hlbgcoord 0, 0
ld c, SCREEN_WIDTH ld c, SCREEN_WIDTH
ld b, SCREEN_HEIGHT ld b, SCREEN_HEIGHT

4
event/battle_tower.asm
View File

@ -300,7 +300,7 @@ VerifyUniqueness: ; 8b2e9
ret ret
; 8b31a ; 8b31a
.nextmon: ; 8b31a .nextmon ; 8b31a
push bc push bc
ld bc, PARTYMON_STRUCT_LENGTH ld bc, PARTYMON_STRUCT_LENGTH
add hl, bc add hl, bc
@ -309,7 +309,7 @@ VerifyUniqueness: ; 8b2e9
ret ret
; 8b322 ; 8b322
.isegg: ; 8b322 .isegg ; 8b322
push bc push bc
ld b, a ld b, a
ld a, [de] ld a, [de]

10
event/buena.asm
View File

@ -236,7 +236,7 @@ Buena_PlacePrizeMenuBox: ; 8b0d6
ret ret
; 8b0dd ; 8b0dd
.menudataheader: ; 0x8b0dd .menudataheader ; 0x8b0dd
db $40 ; flags db $40 ; flags
db 00, 00 ; start coords db 00, 00 ; start coords
db 11, 17 ; end coords db 11, 17 ; end coords
@ -288,13 +288,13 @@ Buena_PrizeMenu: ; 8b0e2
dba .prizepoints dba .prizepoints
; 8b129 ; 8b129
.indices: ; 8b129 .indices ; 8b129
db 9 db 9
db 1, 2, 3, 4, 5, 6, 7, 8, 9 db 1, 2, 3, 4, 5, 6, 7, 8, 9
db -1 db -1
; 8b134 ; 8b134
.prizeitem: ; 8b134 .prizeitem ; 8b134
ld a, [MenuSelection] ld a, [MenuSelection]
call Buena_getprize call Buena_getprize
ld a, [hl] ld a, [hl]
@ -306,7 +306,7 @@ Buena_PrizeMenu: ; 8b0e2
ret ret
; 8b147 ; 8b147
.prizepoints: ; 8b147 .prizepoints ; 8b147
ld a, [MenuSelection] ld a, [MenuSelection]
call Buena_getprize call Buena_getprize
inc hl inc hl
@ -328,7 +328,7 @@ endr
ret ret
; 8b15e ; 8b15e
.prizes: ; 8b15e .prizes ; 8b15e
db ULTRA_BALL, 2 db ULTRA_BALL, 2
db FULL_RESTORE, 2 db FULL_RESTORE, 2
db NUGGET, 3 db NUGGET, 3

2
event/celebi.asm
View File

@ -279,7 +279,7 @@ endr
; 49b6e (12:5b6e) ; 49b6e (12:5b6e)
.sinewave: ; 49b6e .sinewave ; 49b6e
sine_wave $100 sine_wave $100
; 49bae ; 49bae

2
event/field_moves.asm
View File

@ -174,7 +174,7 @@ endr
; 8ca1b ; 8ca1b
.dw: ; 8ca1b (23:4a1b) .dw ; 8ca1b (23:4a1b)
dw Cut_SpawnAnimateTree dw Cut_SpawnAnimateTree
dw Cut_SpawnAnimateLeaves dw Cut_SpawnAnimateLeaves
dw Cut_StartWaiting dw Cut_StartWaiting

8
event/forced_movement.asm
View File

@ -7,22 +7,22 @@ Script_ForcedMovement:: ; 0x1253d
end end
; 0x12550 ; 0x12550
.up: ; 0x12550 .up ; 0x12550
applymovement PLAYER, .MovementData_up applymovement PLAYER, .MovementData_up
end end
; 0x12555 ; 0x12555
.down: ; 0x12555 .down ; 0x12555
applymovement PLAYER, .MovementData_down applymovement PLAYER, .MovementData_down
end end
; 0x1255a ; 0x1255a
.right: ; 0x1255a .right ; 0x1255a
applymovement PLAYER, .MovementData_right applymovement PLAYER, .MovementData_right
end end
; 0x1255f ; 0x1255f
.left: ; 0x1255f .left ; 0x1255f
applymovement PLAYER, .MovementData_left applymovement PLAYER, .MovementData_left
end end
; 0x12564 ; 0x12564

6
event/itemball.asm
View File

@ -11,7 +11,7 @@ FindItemInBallScript:: ; 0x122ce
end end
; 0x122e3 ; 0x122e3
.no_room: ; 0x122e3 .no_room ; 0x122e3
opentext opentext
writetext .text_found writetext .text_found
waitbutton waitbutton
@ -21,13 +21,13 @@ FindItemInBallScript:: ; 0x122ce
end end
; 0x122ee ; 0x122ee
.text_found: ; 0x122ee .text_found ; 0x122ee
; found @ ! ; found @ !
text_jump UnknownText_0x1c0a1c text_jump UnknownText_0x1c0a1c
db "@" db "@"
; 0x122f3 ; 0x122f3
.text_bag_full: ; 0x122f3 .text_bag_full ; 0x122f3
; But can't carry any more items. ; But can't carry any more items.
text_jump UnknownText_0x1c0a2c text_jump UnknownText_0x1c0a2c
db "@" db "@"

2
event/magikarp.asm
View File

@ -86,7 +86,7 @@ Magikarp_LoadFeetInchesChars: ; fbbae
ret ret
; fbbbb ; fbbbb
.feetinchchars: ; fbbb .feetinchchars ; fbbb
INCBIN "gfx/unknown/0fbbbb.2bpp" INCBIN "gfx/unknown/0fbbbb.2bpp"
; fbbdb ; fbbdb

6
event/mom.asm
View File

@ -32,7 +32,7 @@ endr
jp [hl] jp [hl]
; 16242 ; 16242
.dw: ; 16242 .dw ; 16242
dw .CheckIfBankInitialized dw .CheckIfBankInitialized
dw .InitializeBank dw .InitializeBank
@ -534,7 +534,7 @@ Function16571: ; 16571
ret ret
; 165b9 ; 165b9
.dpadaction: ; 165b9 .dpadaction ; 165b9
ld hl, hJoyLast ld hl, hJoyLast
ld a, [hl] ld a, [hl]
and D_UP and D_UP
@ -586,7 +586,7 @@ Function16571: ; 16571
ret ret
; 16607 ; 16607
.getdigitquantity: ; 16607 .getdigitquantity ; 16607
ld a, [wMomBankDigitCursorPosition] ld a, [wMomBankDigitCursorPosition]
push de push de
ld e, a ld e, a

14
event/overworld.asm
View File

@ -286,7 +286,7 @@ CutTreeBlockPointers: ; c862
dbw TILESET_ILEX_FOREST, .ilex dbw TILESET_ILEX_FOREST, .ilex
db -1 db -1
.johto1: ; Johto OW .johto1 ; Johto OW
; Which meta tile are we facing, which should we replace it with, and which animation? ; Which meta tile are we facing, which should we replace it with, and which animation?
db $03, $02, $01 ; grass db $03, $02, $01 ; grass
db $5b, $3c, $00 ; tree db $5b, $3c, $00 ; tree
@ -295,11 +295,11 @@ CutTreeBlockPointers: ; c862
db $67, $3e, $00 ; tree db $67, $3e, $00 ; tree
db -1 db -1
.johto2: ; Goldenrod area .johto2 ; Goldenrod area
db $03, $02, $01 ; grass db $03, $02, $01 ; grass
db -1 db -1
.kanto: ; Kanto OW .kanto ; Kanto OW
db $0b, $0a, $01 ; grass db $0b, $0a, $01 ; grass
db $32, $6d, $00 ; tree db $32, $6d, $00 ; tree
db $33, $6c, $00 ; tree db $33, $6c, $00 ; tree
@ -308,12 +308,12 @@ CutTreeBlockPointers: ; c862
db $60, $6e, $00 ; tree db $60, $6e, $00 ; tree
db -1 db -1
.park: ; National Park .park ; National Park
db $13, $03, $01 ; grass db $13, $03, $01 ; grass
db $03, $04, $01 ; grass db $03, $04, $01 ; grass
db -1 db -1
.ilex: ; Ilex Forest .ilex ; Ilex Forest
db $0f, $17, $00 db $0f, $17, $00
db -1 db -1
@ -321,7 +321,7 @@ WhirlpoolBlockPointers: ; c8a4
dbw TILESET_JOHTO_1, .johto dbw TILESET_JOHTO_1, .johto
db -1 db -1
.johto: ; c8a8 .johto ; c8a8
db $07, $36, $00 db $07, $36, $00
db -1 db -1
@ -471,7 +471,7 @@ UsedSurfScript: ; c986
applymovement PLAYER, MovementBuffer ; PLAYER, MovementBuffer applymovement PLAYER, MovementBuffer ; PLAYER, MovementBuffer
end end
.empty_fn: ; c9a2 .empty_fn ; c9a2
callba MobileFn_1060bb ; empty callba MobileFn_1060bb ; empty
ret ret

2
event/poisonstep.asm
View File

@ -118,7 +118,7 @@ DoPoisonStep:: ; 505da
end end
; 50677 ; 50677
.whiteout: ; 50677 .whiteout ; 50677
farjump Script_OverworldWhiteout farjump Script_OverworldWhiteout
; 5067b ; 5067b

4
home/joypad.asm
View File

@ -408,7 +408,7 @@ ButtonSound:: ; aaf
jp DelayFrames jp DelayFrames
; ac6 ; ac6
.wait_input: ; ac6 .wait_input ; ac6
ld a, [hOAMUpdate] ld a, [hOAMUpdate]
push af push af
ld a, $1 ld a, $1
@ -436,7 +436,7 @@ ButtonSound:: ; aaf
ret ret
; af5 ; af5
.blink_cursor: ; af5 .blink_cursor ; af5
ld a, [hVBlankCounter] ld a, [hVBlankCounter]
and %00010000 ; bit 4, a and %00010000 ; bit 4, a
jr z, .cursor_off jr z, .cursor_off

2
home/menu.asm
View File

@ -516,7 +516,7 @@ ClearWindowData:: ; 1fbf
ret ret
; 1ff0 ; 1ff0
.bytefill: ; 1ff0 .bytefill ; 1ff0
ld bc, $0010 ld bc, $0010
xor a xor a
call ByteFill call ByteFill

2
home/tilemap.asm
View File

@ -29,7 +29,7 @@ RestoreTileBackup:: ; 0x1c23
ret ret
; 0x1c30 ; 0x1c30
.copy: ; 0x1c30 .copy ; 0x1c30
call GetMenuBoxDims call GetMenuBoxDims
inc b inc b
inc c inc c

8
items/item_effects.asm
View File

@ -1596,7 +1596,7 @@ GetItemHealingAction: ; f058 (3:7058)
ret ret
; f071 (3:7071) ; f071 (3:7071)
.healingactions: ; f071 .healingactions ; f071
; item, party menu action text, status ; item, party menu action text, status
db ANTIDOTE, PARTYMENUTEXT_HEAL_PSN, 1 << PSN db ANTIDOTE, PARTYMENUTEXT_HEAL_PSN, 1 << PSN
db BURN_HEAL, PARTYMENUTEXT_HEAL_BRN, 1 << BRN db BURN_HEAL, PARTYMENUTEXT_HEAL_BRN, 1 << BRN
@ -1620,7 +1620,7 @@ StatusHealer_Jumptable: ; f09e (3:709e)
rst JumpTable rst JumpTable
ret ret
.dw: ; f0a3 (3:70a3) .dw ; f0a3 (3:70a3)
dw StatusHealer_ClearPalettes dw StatusHealer_ClearPalettes
dw StatusHealer_NoEffect dw StatusHealer_NoEffect
dw StatusHealer_ExitMenu dw StatusHealer_ExitMenu
@ -2360,7 +2360,7 @@ endr
ret ret
; f504 ; f504
.x_item_table: ; f504 .x_item_table ; f504
db X_ATTACK, ATTACK db X_ATTACK, ATTACK
db X_DEFEND, DEFENSE db X_DEFEND, DEFENSE
db X_SPEED, SPEED db X_SPEED, SPEED
@ -2828,7 +2828,7 @@ OpenBox: ; f769
jp UseDisposableItem jp UseDisposableItem
; f778 ; f778
.text: ; 0xf778 .text ; 0xf778
; There was a trophy inside! ; There was a trophy inside!
text_jump UnknownText_0x1c5d03 text_jump UnknownText_0x1c5d03
db "@" db "@"

2
lib/mobile/main.asm
View File

@ -117,7 +117,7 @@ Function110030:: ; 110030 (44:4030)
ret ; indirectly jump to the function loaded from the dw, which returns to Function3e60. ret ; indirectly jump to the function loaded from the dw, which returns to Function3e60.
; 110070 (44:4070) ; 110070 (44:4070)
.dw: ; 110070 .dw ; 110070
dw Function110115 dw Function110115
dw Function110236 dw Function110236
dw Function110291 dw Function110291

40
main.asm
View File

@ -332,7 +332,7 @@ BugContest_SetCaughtContestMon: ; e6ce
call PrintText call PrintText
ret ret
.generatestats: ; e6fd .generatestats ; e6fd
ld a, [TempEnemyMonSpecies] ld a, [TempEnemyMonSpecies]
ld [CurSpecies], a ld [CurSpecies], a
ld [CurPartySpecies], a ld [CurPartySpecies], a
@ -346,7 +346,7 @@ BugContest_SetCaughtContestMon: ; e6ce
ld hl, wContestMon ld hl, wContestMon
jp GeneratePartyMonStats jp GeneratePartyMonStats
.caughttext: ; 0xe71d .caughttext ; 0xe71d
; Caught @ ! ; Caught @ !
text_jump UnknownText_0x1c10c0 text_jump UnknownText_0x1c10c0
db "@" db "@"
@ -454,7 +454,7 @@ RepelWoreOffScript:: ; 0x13619
closetext closetext
end end
.text: ; 0x13620 .text ; 0x13620
; REPEL's effect wore off. ; REPEL's effect wore off.
text_jump UnknownText_0x1bd308 text_jump UnknownText_0x1bd308
db "@" db "@"
@ -471,21 +471,21 @@ HiddenItemScript:: ; 0x13625
itemnotify itemnotify
jump .finish jump .finish
.bag_full: ; 0x1363e .bag_full ; 0x1363e
buttonsound buttonsound
writetext .no_room_text writetext .no_room_text
waitbutton waitbutton
.finish: ; 13643 .finish ; 13643
closetext closetext
end end
.found_text: ; 0x13645 .found_text ; 0x13645
; found @ ! ; found @ !
text_jump UnknownText_0x1bd321 text_jump UnknownText_0x1bd321
db "@" db "@"
.no_room_text: ; 0x1364a .no_room_text ; 0x1364a
; But has no space left… ; But has no space left…
text_jump UnknownText_0x1bd331 text_jump UnknownText_0x1bd331
db "@" db "@"
@ -884,9 +884,9 @@ Function24b8f: ; 24b8f
ld [Options], a ld [Options], a
ret ret
.slash_500: ; 24bcf .slash_500 ; 24bcf
db "/500@" db "/500@"
.booru_ko: ; 24bd4 .booru_ko ; 24bd4
db "ボール こ@" db "ボール こ@"
StartMenu_DrawBugContestStatusBox: ; 24bdc StartMenu_DrawBugContestStatusBox: ; 24bdc
@ -985,7 +985,7 @@ FindApricornsInBag: ; 24c64
scf scf
ret ret
.addtobuffer: ; 24c94 .addtobuffer ; 24c94
push hl push hl
ld hl, Buffer1 ld hl, Buffer1
inc [hl] inc [hl]
@ -2850,17 +2850,17 @@ _ResetClock: ; 4d3b1
call PrintText call PrintText
ret ret
.text_okay: ; 0x4d3fe .text_okay ; 0x4d3fe
; Password OK. Select CONTINUE & reset settings. ; Password OK. Select CONTINUE & reset settings.
text_jump UnknownText_0x1c55db text_jump UnknownText_0x1c55db
db "@" db "@"
.text_wrong: ; 0x4d403 .text_wrong ; 0x4d403
; Wrong password! ; Wrong password!
text_jump UnknownText_0x1c560b text_jump UnknownText_0x1c560b
db "@" db "@"
.text_askreset: ; 0x4d408 .text_askreset ; 0x4d408
; Reset the clock? ; Reset the clock?
text_jump UnknownText_0x1c561c text_jump UnknownText_0x1c561c
db "@" db "@"
@ -2921,12 +2921,12 @@ ClockResetPassword: ; 4d41e
scf scf
ret ret
.pleaseenterpasswordtext: ; 0x4d463 .pleaseenterpasswordtext ; 0x4d463
; Please enter the password. ; Please enter the password.
text_jump UnknownText_0x1c562e text_jump UnknownText_0x1c562e
db "@" db "@"
.updateIDdisplay: ; 4d468 .updateIDdisplay ; 4d468
hlcoord 14, 15 hlcoord 14, 15
ld de, StringBuffer2 ld de, StringBuffer2
ld c, 5 ld c, 5
@ -2949,7 +2949,7 @@ ClockResetPassword: ; 4d41e
ld [hl], $61 ld [hl], $61
ret ret
.dpadinput: ; 4d490 .dpadinput ; 4d490
ld a, b ld a, b
and D_LEFT and D_LEFT
jr nz, .left jr nz, .left
@ -3006,7 +3006,7 @@ ClockResetPassword: ; 4d41e
ld [hl], 9 ld [hl], 9
ret ret
.getcurrentdigit: ; 4d4d5 .getcurrentdigit ; 4d4d5
ld a, [StringBuffer2 + 5] ld a, [StringBuffer2 + 5]
ld e, a ld e, a
ld d, $0 ld d, $0
@ -3880,7 +3880,7 @@ CatchTutorial:: ; 4e554
ld l, a ld l, a
jp [hl] jp [hl]
.dw: ; 4e564 (13:6564) .dw ; 4e564 (13:6564)
dw .DudeTutorial dw .DudeTutorial
dw .DudeTutorial dw .DudeTutorial
dw .DudeTutorial dw .DudeTutorial
@ -4751,7 +4751,7 @@ endr
.done .done
ret ret
.load_loop: ; 50cc9 .load_loop ; 50cc9
ld [hli], a ld [hli], a
ld [hld], a ld [hld], a
add hl, de add hl, de
@ -6566,7 +6566,7 @@ DrawPokedexSearchResultsWindow: ; 1de1d1 (77:61d1)
call PlaceString call PlaceString
ret ret
.esults_D: ; 1de23c .esults_D ; 1de23c
; (SEARCH R) ; (SEARCH R)
db "ESULTS<NEXT>" db "ESULTS<NEXT>"
; (### FOUN) ; (### FOUN)

4
maps/BattleTower1F.asm
View File

@ -33,7 +33,7 @@ BattleTower1F_MapScriptHeader:
priorityjump Script_ResumeBattleTowerChallenge priorityjump Script_ResumeBattleTowerChallenge
end end
.priorityjump1: .priorityjump1
priorityjump BattleTower_LeftWithoutSaving priorityjump BattleTower_LeftWithoutSaving
writebyte BATTLETOWERACTION_CHALLENGECANCELED writebyte BATTLETOWERACTION_CHALLENGECANCELED
special BattleTowerAction special BattleTowerAction
@ -203,7 +203,7 @@ UnreferencedScript_0x9e4ea:
writetext Text_CantBeRegistered_PreviousRecordDeleted writetext Text_CantBeRegistered_PreviousRecordDeleted
jump continue jump continue
.zero: .zero
writetext Text_CantBeRegistered writetext Text_CantBeRegistered
continue: continue:
yesorno yesorno

2
maps/BattleTowerHallway.asm
View File

@ -24,7 +24,7 @@ BattleTowerHallway_MapScriptHeader:
jump .WalkToChosenBattleRoom jump .WalkToChosenBattleRoom
.asm_load_battle_room: .asm_load_battle_room
ld a, [rSVBK] ld a, [rSVBK]
push af push af

6
maps/BurnedTower1F.asm
View File

@ -79,7 +79,7 @@ BurnedTowerRivalBattleScript:
reloadmapafterbattle reloadmapafterbattle
jump .returnfrombattle jump .returnfrombattle
.totodile: .totodile
winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText
setlasttalked BURNEDTOWER1F_SILVER setlasttalked BURNEDTOWER1F_SILVER
loadtrainer RIVAL1, RIVAL1_7 loadtrainer RIVAL1, RIVAL1_7
@ -88,7 +88,7 @@ BurnedTowerRivalBattleScript:
reloadmapafterbattle reloadmapafterbattle
jump .returnfrombattle jump .returnfrombattle
.chikorita: .chikorita
winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText
setlasttalked BURNEDTOWER1F_SILVER setlasttalked BURNEDTOWER1F_SILVER
loadtrainer RIVAL1, RIVAL1_8 loadtrainer RIVAL1, RIVAL1_8
@ -97,7 +97,7 @@ BurnedTowerRivalBattleScript:
reloadmapafterbattle reloadmapafterbattle
jump .returnfrombattle jump .returnfrombattle
.returnfrombattle: .returnfrombattle
playmusic MUSIC_RIVAL_AFTER playmusic MUSIC_RIVAL_AFTER
opentext opentext
writetext BurnedTowerSilver_AfterText1 writetext BurnedTowerSilver_AfterText1

14
maps/CeladonGameCornerPrizeRoom.asm
View File

@ -33,7 +33,7 @@ CeladonPrizeRoom_tmcounterloop:
if_equal $3, .hyperbeam if_equal $3, .hyperbeam
jump CeladonPrizeRoom_cancel jump CeladonPrizeRoom_cancel
.doubleteam: .doubleteam
checkcoins 1500 checkcoins 1500
if_equal $2, CeladonPrizeRoom_notenoughcoins if_equal $2, CeladonPrizeRoom_notenoughcoins
itemtotext TM_DOUBLE_TEAM, $0 itemtotext TM_DOUBLE_TEAM, $0
@ -44,7 +44,7 @@ CeladonPrizeRoom_tmcounterloop:
takecoins 1500 takecoins 1500
jump CeladonPrizeRoom_purchased jump CeladonPrizeRoom_purchased
.psychic: .psychic
checkcoins 3500 checkcoins 3500
if_equal $2, CeladonPrizeRoom_notenoughcoins if_equal $2, CeladonPrizeRoom_notenoughcoins
itemtotext TM_PSYCHIC, $0 itemtotext TM_PSYCHIC, $0
@ -55,7 +55,7 @@ CeladonPrizeRoom_tmcounterloop:
takecoins 3500 takecoins 3500
jump CeladonPrizeRoom_purchased jump CeladonPrizeRoom_purchased
.hyperbeam: .hyperbeam
checkcoins 7500 checkcoins 7500
if_equal $2, CeladonPrizeRoom_notenoughcoins if_equal $2, CeladonPrizeRoom_notenoughcoins
itemtotext TM_HYPER_BEAM, $0 itemtotext TM_HYPER_BEAM, $0
@ -126,7 +126,7 @@ GoldenrodGameCornerPokemonVendor:
waitbutton waitbutton
checkitem COIN_CASE checkitem COIN_CASE
iffalse CeladonPrizeRoom_NoCoinCase iffalse CeladonPrizeRoom_NoCoinCase
.loop: .loop
writetext CeladonPrizeRoom_AskWhichPrizeText writetext CeladonPrizeRoom_AskWhichPrizeText
special Special_DisplayCoinCaseBalance special Special_DisplayCoinCaseBalance
loadmenudata .MenuDataHeader loadmenudata .MenuDataHeader
@ -137,7 +137,7 @@ GoldenrodGameCornerPokemonVendor:
if_equal $3, .larvitar if_equal $3, .larvitar
jump CeladonPrizeRoom_cancel jump CeladonPrizeRoom_cancel
.pikachu: .pikachu
checkcoins 2222 checkcoins 2222
if_equal $2, CeladonPrizeRoom_notenoughcoins if_equal $2, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT checkcode VAR_PARTYCOUNT
@ -155,7 +155,7 @@ GoldenrodGameCornerPokemonVendor:
takecoins 2222 takecoins 2222
jump .loop jump .loop
.porygon: .porygon
checkcoins 5555 checkcoins 5555
if_equal $2, CeladonPrizeRoom_notenoughcoins if_equal $2, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT checkcode VAR_PARTYCOUNT
@ -173,7 +173,7 @@ GoldenrodGameCornerPokemonVendor:
takecoins 5555 takecoins 5555
jump .loop jump .loop
.larvitar: .larvitar
checkcoins 8888 checkcoins 8888
if_equal $2, CeladonPrizeRoom_notenoughcoins if_equal $2, CeladonPrizeRoom_notenoughcoins
checkcode VAR_PARTYCOUNT checkcode VAR_PARTYCOUNT

2
maps/CeruleanPokeCenter1F.asm
View File

@ -18,7 +18,7 @@ SuperNerdScript_0x188212:
iftrue .mobile iftrue .mobile
jumptextfaceplayer UnknownText_0x188221 jumptextfaceplayer UnknownText_0x188221
.mobile: .mobile
jumptextfaceplayer UnknownText_0x18828c jumptextfaceplayer UnknownText_0x18828c
GymGuyScript_0x18821e: GymGuyScript_0x18821e:

2
maps/EcruteakPokeCenter1F.asm
View File

@ -67,7 +67,7 @@ EcruteakPokeCenter1FPokefanMScript:
iftrue .mobile iftrue .mobile
jumptextfaceplayer EcruteakPokeCenter1FPokefanMText jumptextfaceplayer EcruteakPokeCenter1FPokefanMText
.mobile: .mobile
jumptextfaceplayer EcruteakPokeCenter1FPokefanMTextMobile jumptextfaceplayer EcruteakPokeCenter1FPokefanMTextMobile
EcruteakPokeCenter1FCooltrainerFScript: EcruteakPokeCenter1FCooltrainerFScript:

2
maps/FastShipCabins_SW_SSW_NW.asm
View File

@ -57,7 +57,7 @@ GuitaristClydeScript:
closetext closetext
end end
.mobile: .mobile
opentext opentext
writetext UnknownText_0x75cfe writetext UnknownText_0x75cfe
waitbutton waitbutton

12
maps/GoldenrodDeptStore5F.asm
View File

@ -23,7 +23,7 @@ GoldenrodDeptStore5F_MapScriptHeader:
disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST
return return
.yes: .yes
appear GOLDENRODDEPTSTORE5F_RECEPTIONIST appear GOLDENRODDEPTSTORE5F_RECEPTIONIST
return return
@ -36,27 +36,27 @@ ClerkScript_0x5609c:
iftrue .onlyrocksmash iftrue .onlyrocksmash
jump .neither jump .neither
.headbutt: .headbutt
checkevent EVENT_GOT_TM08_ROCK_SMASH checkevent EVENT_GOT_TM08_ROCK_SMASH
iftrue .both iftrue .both
jump .onlyheadbutt jump .onlyheadbutt
.neither: .neither
pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_1 pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_1
closetext closetext
end end
.onlyheadbutt: .onlyheadbutt
pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_2 pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_2
closetext closetext
end end
.onlyrocksmash: .onlyrocksmash
pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_3 pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_3
closetext closetext
end end
.both: .both
pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_4 pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_4
closetext closetext
end end

6
maps/GoldenrodGameCorner.asm
View File

@ -176,7 +176,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
if_equal $3, .wobbuffet if_equal $3, .wobbuffet
jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript
.abra: .abra
checkcoins 100 checkcoins 100
if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT checkcode VAR_PARTYCOUNT
@ -194,7 +194,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
takecoins 100 takecoins 100
jump .loop jump .loop
.cubone: .cubone
checkcoins 800 checkcoins 800
if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT checkcode VAR_PARTYCOUNT
@ -212,7 +212,7 @@ GoldenrodGameCornerPrizeMonVendorScript:
takecoins 800 takecoins 800
jump .loop jump .loop
.wobbuffet: .wobbuffet
checkcoins 1500 checkcoins 1500
if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript
checkcode VAR_PARTYCOUNT checkcode VAR_PARTYCOUNT

8
maps/GoldenrodPokeCenter1F.asm
View File

@ -21,7 +21,7 @@ GoldenrodPokeCenter1F_GSBallTriggerLeft:
if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
end end
.gsball: .gsball
checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
iftrue .cancel iftrue .cancel
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
@ -44,7 +44,7 @@ GoldenrodPokeCenter1F_GSBallTriggerLeft:
special RestartMapMusic special RestartMapMusic
disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
.cancel: .cancel
end end
GoldenrodPokeCenter1F_GSBallTriggerRight: GoldenrodPokeCenter1F_GSBallTriggerRight:
@ -53,7 +53,7 @@ GoldenrodPokeCenter1F_GSBallTriggerRight:
if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball
end end
.gsball: .gsball
checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER
iftrue .cancel iftrue .cancel
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
@ -76,7 +76,7 @@ GoldenrodPokeCenter1F_GSBallTriggerRight:
special RestartMapMusic special RestartMapMusic
disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST
playsound SFX_EXIT_BUILDING playsound SFX_EXIT_BUILDING
.cancel: .cancel
end end
GameboyKidScript_0x6101e: GameboyKidScript_0x6101e:

18
maps/ManiasHouse.asm
View File

@ -30,7 +30,7 @@ ManiaScript:
setevent EVENT_GOT_SHUCKIE setevent EVENT_GOT_SHUCKIE
end end
.alreadyhaveshuckie: .alreadyhaveshuckie
checkflag ENGINE_SHUCKLE_GIVEN checkflag ENGINE_SHUCKLE_GIVEN
iffalse .returnshuckie iffalse .returnshuckie
writetext ManiaText_TakeCareOfShuckle writetext ManiaText_TakeCareOfShuckle
@ -38,19 +38,19 @@ ManiaScript:
closetext closetext
end end
.partyfull: .partyfull
writetext ManiaText_PartyFull writetext ManiaText_PartyFull
waitbutton waitbutton
closetext closetext
end end
.refusetotakeshuckie: .refusetotakeshuckie
writetext ManiaText_IfHeComesBack writetext ManiaText_IfHeComesBack
waitbutton waitbutton
closetext closetext
end end
.returnshuckie: .returnshuckie
writetext ManiaText_CanIHaveMyMonBack writetext ManiaText_CanIHaveMyMonBack
yesorno yesorno
iffalse .refused iffalse .refused
@ -65,32 +65,32 @@ ManiaScript:
setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
end end
.wrong: .wrong
writetext ManiaText_ShuckleNotThere writetext ManiaText_ShuckleNotThere
waitbutton waitbutton
closetext closetext
end end
.superhappy: .superhappy
writetext ManiaText_ShuckleLikesYou writetext ManiaText_ShuckleLikesYou
waitbutton waitbutton
closetext closetext
setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM
end end
.refused: .refused
writetext ManiaText_SameAsBeingRobbed writetext ManiaText_SameAsBeingRobbed
waitbutton waitbutton
closetext closetext
end end
.nothingleft: .nothingleft
writetext ManiaText_ShuckleIsYourLastMon writetext ManiaText_ShuckleIsYourLastMon
waitbutton waitbutton
closetext closetext
end end
.default_postevent: .default_postevent
writetext ManiaText_HappinessSpeech writetext ManiaText_HappinessSpeech
waitbutton waitbutton
closetext closetext

8
maps/MobileBattleRoom.asm
View File

@ -31,7 +31,7 @@ MapMobileBattleRoomSignpost0Script:
if_equal $2, .two_ if_equal $2, .two_
jump .false jump .false
.one_: .one_
writetext MobileBattleRoom_HealText writetext MobileBattleRoom_HealText
pause 20 pause 20
closetext closetext
@ -42,18 +42,18 @@ MapMobileBattleRoomSignpost0Script:
special FadeInPalettes special FadeInPalettes
special RestartMapMusic special RestartMapMusic
refreshscreen $0 refreshscreen $0
.two_: .two_
special Mobile_HealParty special Mobile_HealParty
special HealParty special HealParty
special Function10383c special Function10383c
iftrue .false iftrue .false
.one: .one
special Function10387b special Function10387b
writetext MobileBattleRoom_EstablishingCommsText writetext MobileBattleRoom_EstablishingCommsText
waitbutton waitbutton
reloadmappart reloadmappart
special Function101225 special Function101225
.false: .false
closetext closetext
end end

2
maps/RadioTower1F.asm
View File

@ -37,7 +37,7 @@ GentlemanScript_0x5cd3d:
special Special_CheckLuckyNumberShowFlag special Special_CheckLuckyNumberShowFlag
iffalse .skip iffalse .skip
special Special_ResetLuckyNumberShowFlag special Special_ResetLuckyNumberShowFlag
.skip: .skip
special Special_PrintTodaysLuckyNumber special Special_PrintTodaysLuckyNumber
checkflag ENGINE_LUCKY_NUMBER_SHOW checkflag ENGINE_LUCKY_NUMBER_SHOW
iftrue .GameOver iftrue .GameOver

4
maps/Route29.asm
View File

@ -159,13 +159,13 @@ CooltrainerMScript_0x1a1031:
iftrue .day_morn iftrue .day_morn
checknite checknite
iftrue .nite iftrue .nite
.day_morn: .day_morn
writetext Text_WaitingForNight writetext Text_WaitingForNight
waitbutton waitbutton
closetext closetext
end end
.nite: .nite
writetext Text_WaitingForMorning writetext Text_WaitingForMorning
waitbutton waitbutton
closetext closetext

2
maps/Route30.asm
View File

@ -135,7 +135,7 @@ TrainerYoungsterJoey:
setevent EVENT_GOT_HP_UP_FROM_JOEY setevent EVENT_GOT_HP_UP_FROM_JOEY
jump .NumberAccepted jump .NumberAccepted
.done: .done
end end
.GiveHPUp: .GiveHPUp:

2
maps/Route32.asm
View File

@ -142,7 +142,7 @@ _OfferToSellSlowpokeTail:
closetext closetext
end end
.refused: .refused
writetext Text_RefusedToBuySlowpokeTail writetext Text_RefusedToBuySlowpokeTail
waitbutton waitbutton
closetext closetext

4
maps/Route34.asm
View File

@ -69,10 +69,10 @@ DayCareManScript_Outside:
applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside
playsound SFX_ENTER_DOOR playsound SFX_ENTER_DOOR
disappear ROUTE34_GRAMPS disappear ROUTE34_GRAMPS
.end_fail: .end_fail
end end
.walk_around_player: .walk_around_player
applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside_WalkAroundPlayer applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside_WalkAroundPlayer
playsound SFX_ENTER_DOOR playsound SFX_ENTER_DOOR
disappear ROUTE34_GRAMPS disappear ROUTE34_GRAMPS

14
maps/Route35Goldenrodgate.asm
View File

@ -33,34 +33,34 @@ OfficerScript_0x69d37:
givepoke SPEAROW, 10, NO_ITEM, 1, GiftSpearowName, GiftSpearowOTName givepoke SPEAROW, 10, NO_ITEM, 1, GiftSpearowName, GiftSpearowOTName
givepokeitem GiftSpearowMail givepokeitem GiftSpearowMail
setevent EVENT_GOT_KENYA setevent EVENT_GOT_KENYA
.alreadyhavekenya: .alreadyhavekenya
writetext UnknownText_0x69ed6 writetext UnknownText_0x69ed6
waitbutton waitbutton
closetext closetext
end end
.partyfull: .partyfull
writetext UnknownText_0x69f56 writetext UnknownText_0x69f56
waitbutton waitbutton
closetext closetext
end end
.refused: .refused
writetext UnknownText_0x69f74 writetext UnknownText_0x69f74
waitbutton waitbutton
closetext closetext
end end
.questcomplete: .questcomplete
writetext UnknownText_0x69f8b writetext UnknownText_0x69f8b
buttonsound buttonsound
verbosegiveitem HP_UP verbosegiveitem HP_UP
iffalse .bagfull iffalse .bagfull
setevent EVENT_GOT_HP_UP_FROM_RANDY setevent EVENT_GOT_HP_UP_FROM_RANDY
.gothpup: .gothpup
writetext UnknownText_0x69fd9 writetext UnknownText_0x69fd9
waitbutton waitbutton
.bagfull: .bagfull
closetext closetext
end end
@ -85,7 +85,7 @@ PokefanFScript_0x69dc6:
closetext closetext
end end
.aftersudowoodo: .aftersudowoodo
writetext UnknownText_0x6a09a writetext UnknownText_0x6a09a
waitbutton waitbutton
closetext closetext

12
maps/Route38.asm
View File

@ -17,7 +17,7 @@ Route38_MapScriptHeader:
TrainerBird_keeperToby: TrainerBird_keeperToby:
trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, 0, .script trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, 0, .script
.script: .script
end_if_just_battled end_if_just_battled
opentext opentext
writetext UnknownText_0x1a1f86 writetext UnknownText_0x1a1f86
@ -28,7 +28,7 @@ TrainerBird_keeperToby:
TrainerSailorHarry: TrainerSailorHarry:
trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .script trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .script
.script: .script
end_if_just_battled end_if_just_battled
opentext opentext
writetext UnknownText_0x1a220c writetext UnknownText_0x1a220c
@ -39,7 +39,7 @@ TrainerSailorHarry:
TrainerLassDana1: TrainerLassDana1:
trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, .script trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, .script
.script: .script
writecode VAR_CALLERID, PHONE_LASS_DANA writecode VAR_CALLERID, PHONE_LASS_DANA
end_if_just_battled end_if_just_battled
opentext opentext
@ -177,7 +177,7 @@ TrainerLassDana1:
TrainerSchoolboyChad1: TrainerSchoolboyChad1:
trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .script trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .script
.script: .script
writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD
end_if_just_battled end_if_just_battled
opentext opentext
@ -294,7 +294,7 @@ TrainerSchoolboyChad1:
TrainerBeautyValerie: TrainerBeautyValerie:
trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .script trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .script
.script: .script
end_if_just_battled end_if_just_battled
opentext opentext
writetext UnknownText_0x1a2185 writetext UnknownText_0x1a2185
@ -305,7 +305,7 @@ TrainerBeautyValerie:
TrainerBeautyOlivia: TrainerBeautyOlivia:
trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .script trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .script
.script: .script
end_if_just_battled end_if_just_battled
opentext opentext
writetext UnknownText_0x1a229a writetext UnknownText_0x1a229a

2
maps/Route40.asm
View File

@ -86,7 +86,7 @@ PokefanMScript_0x1a61c7:
iftrue .mobile iftrue .mobile
jumptextfaceplayer UnknownText_0x1a646a jumptextfaceplayer UnknownText_0x1a646a
.mobile: .mobile
jumptextfaceplayer UnknownText_0x1a649b jumptextfaceplayer UnknownText_0x1a649b
LassScript_0x1a61d3: LassScript_0x1a61d3:

2
maps/SaffronPokeCenter1F.asm
View File

@ -19,7 +19,7 @@ TeacherScript_0x18a480:
iftrue .mobile iftrue .mobile
jumptextfaceplayer UnknownText_0x18a4a3 jumptextfaceplayer UnknownText_0x18a4a3
.mobile: .mobile
jumptextfaceplayer UnknownText_0x18a532 jumptextfaceplayer UnknownText_0x18a532
FisherScript_0x18a48c: FisherScript_0x18a48c:

22
maps/UndergroundPathSwitchRoomEntrances.asm
View File

@ -68,52 +68,52 @@ UndergroundPathSwitchRoomEntrances_MapScriptHeader:
checkevent EVENT_SWITCH_4 checkevent EVENT_SWITCH_4
iffalse .false4 iffalse .false4
doorstate 1, OPEN1 doorstate 1, OPEN1
.false4: .false4
checkevent EVENT_SWITCH_5 checkevent EVENT_SWITCH_5
iffalse .false5 iffalse .false5
doorstate 2, OPEN1 doorstate 2, OPEN1
.false5: .false5
checkevent EVENT_SWITCH_6 checkevent EVENT_SWITCH_6
iffalse .false6 iffalse .false6
doorstate 3, OPEN1 doorstate 3, OPEN1
.false6: .false6
checkevent EVENT_SWITCH_7 checkevent EVENT_SWITCH_7
iffalse .false7 iffalse .false7
doorstate 4, OPEN1 doorstate 4, OPEN1
.false7: .false7
checkevent EVENT_SWITCH_8 checkevent EVENT_SWITCH_8
iffalse .false8 iffalse .false8
doorstate 5, OPEN1 doorstate 5, OPEN1
.false8: .false8
checkevent EVENT_SWITCH_9 checkevent EVENT_SWITCH_9
iffalse .false9 iffalse .false9
doorstate 6, OPEN1 doorstate 6, OPEN1
.false9: .false9
checkevent EVENT_SWITCH_10 checkevent EVENT_SWITCH_10
iffalse .false10 iffalse .false10
doorstate 7, CLOSED1 doorstate 7, CLOSED1
doorstate 8, OPEN1 doorstate 8, OPEN1
.false10: .false10
checkevent EVENT_SWITCH_11 checkevent EVENT_SWITCH_11
iffalse .false11 iffalse .false11
doorstate 9, CLOSED1 doorstate 9, CLOSED1
doorstate 10, OPEN1 doorstate 10, OPEN1
.false11: .false11
checkevent EVENT_SWITCH_12 checkevent EVENT_SWITCH_12
iffalse .false12 iffalse .false12
doorstate 11, CLOSED1 doorstate 11, CLOSED1
doorstate 12, OPEN1 doorstate 12, OPEN1
.false12: .false12
checkevent EVENT_SWITCH_13 checkevent EVENT_SWITCH_13
iffalse .false13 iffalse .false13
doorstate 13, CLOSED1 doorstate 13, CLOSED1
doorstate 14, OPEN1 doorstate 14, OPEN1
.false13: .false13
checkevent EVENT_SWITCH_14 checkevent EVENT_SWITCH_14
iffalse .false14 iffalse .false14
doorstate 15, CLOSED1 doorstate 15, CLOSED1
doorstate 16, OPEN1 doorstate 16, OPEN1
.false14: .false14
return return
SuperNerdScript_0x7ca7a: SuperNerdScript_0x7ca7a:

16
maps/WarehouseEntrance.asm
View File

@ -213,25 +213,25 @@ OlderHaircutBrotherScript:
if_equal $3, .three if_equal $3, .three
jump .else jump .else
.two: .two
setevent EVENT_GAVE_KURT_APRICORNS setevent EVENT_GAVE_KURT_APRICORNS
clearevent EVENT_RECEIVED_BALLS_FROM_KURT clearevent EVENT_RECEIVED_BALLS_FROM_KURT
clearevent EVENT_DRAGON_SHRINE_QUESTION_2 clearevent EVENT_DRAGON_SHRINE_QUESTION_2
jump .then jump .then
.three: .three
clearevent EVENT_GAVE_KURT_APRICORNS clearevent EVENT_GAVE_KURT_APRICORNS
setevent EVENT_RECEIVED_BALLS_FROM_KURT setevent EVENT_RECEIVED_BALLS_FROM_KURT
clearevent EVENT_DRAGON_SHRINE_QUESTION_2 clearevent EVENT_DRAGON_SHRINE_QUESTION_2
jump .then jump .then
.else: .else
clearevent EVENT_GAVE_KURT_APRICORNS clearevent EVENT_GAVE_KURT_APRICORNS
clearevent EVENT_RECEIVED_BALLS_FROM_KURT clearevent EVENT_RECEIVED_BALLS_FROM_KURT
setevent EVENT_DRAGON_SHRINE_QUESTION_2 setevent EVENT_DRAGON_SHRINE_QUESTION_2
jump .then jump .then
.then: .then
takemoney $0, 500 takemoney $0, 500
special PlaceMoneyTopRight special PlaceMoneyTopRight
writetext UnknownText_0x7c6b8 writetext UnknownText_0x7c6b8
@ -296,25 +296,25 @@ YoungerHaircutBrotherScript:
if_equal $3, .three if_equal $3, .three
jump .else jump .else
.two: .two
setevent EVENT_GAVE_KURT_APRICORNS setevent EVENT_GAVE_KURT_APRICORNS
clearevent EVENT_RECEIVED_BALLS_FROM_KURT clearevent EVENT_RECEIVED_BALLS_FROM_KURT
clearevent EVENT_DRAGON_SHRINE_QUESTION_2 clearevent EVENT_DRAGON_SHRINE_QUESTION_2
jump .then jump .then
.three: .three
clearevent EVENT_GAVE_KURT_APRICORNS clearevent EVENT_GAVE_KURT_APRICORNS
setevent EVENT_RECEIVED_BALLS_FROM_KURT setevent EVENT_RECEIVED_BALLS_FROM_KURT
clearevent EVENT_DRAGON_SHRINE_QUESTION_2 clearevent EVENT_DRAGON_SHRINE_QUESTION_2
jump .then jump .then
.else: .else
clearevent EVENT_GAVE_KURT_APRICORNS clearevent EVENT_GAVE_KURT_APRICORNS
clearevent EVENT_RECEIVED_BALLS_FROM_KURT clearevent EVENT_RECEIVED_BALLS_FROM_KURT
setevent EVENT_DRAGON_SHRINE_QUESTION_2 setevent EVENT_DRAGON_SHRINE_QUESTION_2
jump .then jump .then
.then: .then
takemoney $0, 300 takemoney $0, 300
special PlaceMoneyTopRight special PlaceMoneyTopRight
writetext UnknownText_0x7c80e writetext UnknownText_0x7c80e

8
misc/battle_tower_5c.asm
View File

@ -212,7 +212,7 @@ _BattleTowerBattle: ; 17022c
ret ret
; 17023a ; 17023a
.do_dw: ; 17023a .do_dw ; 17023a
ld a, [wBattleTowerBattleEnded] ld a, [wBattleTowerBattleEnded]
ld e, a ld e, a
ld d, 0 ld d, 0
@ -226,7 +226,7 @@ endr
jp [hl] jp [hl]
; 170249 ; 170249
.dw: ; 170249 .dw ; 170249
dw RunBattleTowerTrainer dw RunBattleTowerTrainer
dw SkipBattleTowerTrainer dw SkipBattleTowerTrainer
; 17024d ; 17024d
@ -699,7 +699,7 @@ endr
jp [hl] jp [hl]
; 17051f ; 17051f
.dw: ; 17051f .dw ; 17051f
dw .Jumptable_0 dw .Jumptable_0
dw .Jumptable_1 dw .Jumptable_1
dw .Jumptable_2 dw .Jumptable_2
@ -957,7 +957,7 @@ endr
; 170696 ; 170696
.dw: ; 170696 (5c:4696) .dw ; 170696 (5c:4696)
dw Function17075f ; 0x00 dw Function17075f ; 0x00
dw Function170788 ; 0x01 dw Function170788 ; 0x01
dw Function170778 ; 0x02 dw Function170778 ; 0x02

106
misc/fixed_words.asm
View File

@ -2523,21 +2523,21 @@ Function11d0b6: ; 11d0b6 (47:50b6)
dw .ten dw .ten
.zero: ; 11d0dd (47:50dd) .zero ; 11d0dd (47:50dd)
ld a, [wcd20] ; wcd20 (aliases: CreditsPos) ld a, [wcd20] ; wcd20 (aliases: CreditsPos)
sla a sla a
ld hl, Unknown_11d208 ld hl, Unknown_11d208
ld e, $1 ld e, $1
jr .load jr .load
.one: ; 11d0e9 (47:50e9) .one ; 11d0e9 (47:50e9)
ld a, [wcd21] ld a, [wcd21]
sla a sla a
ld hl, Unknown_11d21a ld hl, Unknown_11d21a
ld e, $2 ld e, $2
jr .load jr .load
.two: ; 11d0f5 (47:50f5) .two ; 11d0f5 (47:50f5)
ld hl, Unknown_11d2be ld hl, Unknown_11d2be
ld a, [wcd22] ld a, [wcd22]
ld e, a ld e, a
@ -2551,14 +2551,14 @@ Function11d0b6: ; 11d0b6 (47:50b6)
ld e, $4 ld e, $4
jr .load jr .load
.three: ; 11d10f (47:510f) .three ; 11d10f (47:510f)
ld a, SPRITE_ANIM_FRAMESET_27 ld a, SPRITE_ANIM_FRAMESET_27
call ReinitSpriteAnimFrame call ReinitSpriteAnimFrame
ld a, [wcd25] ld a, [wcd25]
sla a sla a
ld hl, Unknown_11d29e ld hl, Unknown_11d29e
ld e, $8 ld e, $8
.load: ; 11d11e (47:511e) .load ; 11d11e (47:511e)
push de push de
ld e, a ld e, a
ld d, $0 ld d, $0
@ -2577,7 +2577,7 @@ Function11d0b6: ; 11d0b6 (47:50b6)
call Function11d2ee call Function11d2ee
ret ret
.four: ; 11d134 (47:5134) .four ; 11d134 (47:5134)
ld a, SPRITE_ANIM_FRAMESET_27 ld a, SPRITE_ANIM_FRAMESET_27
call ReinitSpriteAnimFrame call ReinitSpriteAnimFrame
ld a, [wcd2a] ld a, [wcd2a]
@ -2586,7 +2586,7 @@ Function11d0b6: ; 11d0b6 (47:50b6)
ld e, $10 ld e, $10
jr .load jr .load
.five: ; 11d145 (47:5145) .five ; 11d145 (47:5145)
ld a, SPRITE_ANIM_FRAMESET_27 ld a, SPRITE_ANIM_FRAMESET_27
call ReinitSpriteAnimFrame call ReinitSpriteAnimFrame
ld a, [wcd2c] ld a, [wcd2c]
@ -2595,7 +2595,7 @@ Function11d0b6: ; 11d0b6 (47:50b6)
ld e, $20 ld e, $20
jr .load jr .load
.six: ; 11d156 (47:5156) .six ; 11d156 (47:5156)
ld a, SPRITE_ANIM_FRAMESET_2A ld a, SPRITE_ANIM_FRAMESET_2A
call ReinitSpriteAnimFrame call ReinitSpriteAnimFrame
ld a, [wcd4a] ld a, [wcd4a]
@ -2613,7 +2613,7 @@ Function11d0b6: ; 11d0b6 (47:50b6)
call Function11d2ee call Function11d2ee
ret ret
.seven: ; 11d175 (47:5175) .seven ; 11d175 (47:5175)
ld a, [wcd4d] ld a, [wcd4d]
cp $4 cp $4
jr z, .asm_11d180 jr z, .asm_11d180
@ -2666,15 +2666,15 @@ Function11d0b6: ; 11d0b6 (47:50b6)
call Function11d2ee call Function11d2ee
ret ret
.nine: ; 11d1d1 (47:51d1) .nine ; 11d1d1 (47:51d1)
ld d, -13 * 8 ld d, -13 * 8
ld a, SPRITE_ANIM_FRAMESET_2C ld a, SPRITE_ANIM_FRAMESET_2C
jr .eight_nine_load jr .eight_nine_load
.eight: ; 11d1d7 (47:51d7) .eight ; 11d1d7 (47:51d7)
ld d, 2 * 8 ld d, 2 * 8
ld a, SPRITE_ANIM_FRAMESET_2B ld a, SPRITE_ANIM_FRAMESET_2B
.eight_nine_load: ; 11d1db (47:51db) .eight_nine_load ; 11d1db (47:51db)
push de push de
call ReinitSpriteAnimFrame call ReinitSpriteAnimFrame
ld a, [wcd4a] ld a, [wcd4a]
@ -2695,7 +2695,7 @@ Function11d0b6: ; 11d0b6 (47:50b6)
call Function11d2ee call Function11d2ee
ret ret
.ten: ; 11d1fc (47:51fc) .ten ; 11d1fc (47:51fc)
ld a, SPRITE_ANIM_FRAMESET_26 ld a, SPRITE_ANIM_FRAMESET_26
call ReinitSpriteAnimFrame call ReinitSpriteAnimFrame
ld a, $8 ld a, $8
@ -3289,84 +3289,84 @@ SortedPokemon:
db -1 db -1
.o: db FERALIGATR, FURRET, OCTILLERY, PRIMEAPE, SENTRET, STANTLER, SPEAROW, FEAROW, OMASTAR, OMANYTE .o: db FERALIGATR, FURRET, OCTILLERY, PRIMEAPE, SENTRET, STANTLER, SPEAROW, FEAROW, OMASTAR, OMANYTE
db -1 db -1
.ka_ga: db GROWLITHE, MACHAMP, DRAGONITE, PINSIR, SNORLAX, KABUTO, KABUTOPS, HITMONTOP, WARTORTLE, BLASTOISE, FARFETCH_D, CUBONE, MAROWAK, KANGASKHAN .ka_ga db GROWLITHE, MACHAMP, DRAGONITE, PINSIR, SNORLAX, KABUTO, KABUTOPS, HITMONTOP, WARTORTLE, BLASTOISE, FARFETCH_D, CUBONE, MAROWAK, KANGASKHAN
db -1 db -1
.ki_gi: db SUNFLORA, CATERPIE, GYARADOS, RAPIDASH, NINETALES, GIRAFARIG, BELLOSSOM, KINGDRA, KINGLER .ki_gi db SUNFLORA, CATERPIE, GYARADOS, RAPIDASH, NINETALES, GIRAFARIG, BELLOSSOM, KINGDRA, KINGLER
db -1 db -1
.ku_gu: db GLOOM, PINECO, GLIGAR, KRABBY, GRANBULL, CROBAT .ku_gu db GLOOM, PINECO, GLIGAR, KRABBY, GRANBULL, CROBAT
db -1 db -1
.ke_ge: db ABRA, GENGAR, TAUROS .ke_ge db ABRA, GENGAR, TAUROS
db -1 db -1
.ko_go: db MAGIKARP, MAGNEMITE, GASTLY, HAUNTER, MACHOKE, KAKUNA, PSYDUCK, PHANPY, RATTATA, GOLDUCK, GOLBAT, GOLEM, GRAVELER, VENONAT .ko_go db MAGIKARP, MAGNEMITE, GASTLY, HAUNTER, MACHOKE, KAKUNA, PSYDUCK, PHANPY, RATTATA, GOLDUCK, GOLBAT, GOLEM, GRAVELER, VENONAT
db -1 db -1
.sa_za: db RHYHORN, PUPITAR, CORSOLA, HITMONLEE, ZAPDOS, JOLTEON, SANDSHREW, SANDSLASH ; RHYDON should lead this list .sa_za db RHYHORN, PUPITAR, CORSOLA, HITMONLEE, ZAPDOS, JOLTEON, SANDSHREW, SANDSLASH ; RHYDON should lead this list
db -1 db -1
.shi_ji: db SEADRA, SHELLDER, VAPOREON, DEWGONG .shi_ji db SEADRA, SHELLDER, VAPOREON, DEWGONG
db -1 db -1
.su_zu: db SUICUNE, STARMIE, SCYTHER, ZUBAT, BEEDRILL, HYPNO, DROWZEE .su_zu db SUICUNE, STARMIE, SCYTHER, ZUBAT, BEEDRILL, HYPNO, DROWZEE
db -1 db -1
.se_ze: db SQUIRTLE, CELEBI .se_ze db SQUIRTLE, CELEBI
db -1 db -1
.so_zo: db WOBBUFFET .so_zo db WOBBUFFET
db -1 db -1
.ta_da: db DUGTRIO, HORSEA, EXEGGCUTE .ta_da db DUGTRIO, HORSEA, EXEGGCUTE
db -1 db -1
.chi_dhi: db CHIKORITA, CHINCHOU .chi_dhi db CHIKORITA, CHINCHOU
db -1 db -1
.tsu_du: db SHUCKLE .tsu_du db SHUCKLE
db -1 db -1
.te_de: db DIGLETT, REMORAID, DELIBIRD, HOUNDOUR, AMPHAROS .te_de db DIGLETT, REMORAID, DELIBIRD, HOUNDOUR, AMPHAROS
db -1 db -1
.to_do: db DODUO, DODRIO, SMEARGLE, KOFFING, TENTACRUEL, TOGETIC, TOGEPI, GOLDEEN, METAPOD, DONPHAN .to_do db DODUO, DODRIO, SMEARGLE, KOFFING, TENTACRUEL, TOGETIC, TOGEPI, GOLDEEN, METAPOD, DONPHAN
db -1 db -1
.na: db ODDISH, EXEGGUTOR .na db ODDISH, EXEGGUTOR
db -1 db -1
.ni: db NIDOKING, NIDOQUEEN, NIDORAN_M, NIDORAN_F, NIDORINA, NIDORINO, MEOWTH, SNEASEL, POLIWHIRL, POLITOED, POLIWRATH, POLIWAG .ni db NIDOKING, NIDOQUEEN, NIDORAN_M, NIDORAN_F, NIDORINA, NIDORINO, MEOWTH, SNEASEL, POLIWHIRL, POLITOED, POLIWRATH, POLIWAG
db -1 db -1
.nu: db QUAGSIRE .nu db QUAGSIRE
db -1 db -1
.ne: db NATU, XATU .ne db NATU, XATU
db -1 db -1
.no: db DUNSPARCE .no db DUNSPARCE
db -1 db -1
.ha_ba_pa: db SEEL, STEELIX, TYPHLOSION, DRAGONAIR, BUTTERFREE, SCIZOR, HOPPIP, BLISSEY, PARAS, PARASECT, QWILFISH, MR__MIME, TYROGUE, CLOYSTER, TYRANITAR .ha_ba_pa db SEEL, STEELIX, TYPHLOSION, DRAGONAIR, BUTTERFREE, SCIZOR, HOPPIP, BLISSEY, PARAS, PARASECT, QWILFISH, MR__MIME, TYROGUE, CLOYSTER, TYRANITAR
db -1 db -1
.hi_bi_pi: db CLEFFA, WEEDLE, PIKACHU, CLEFABLE, PIDGEOT, PIDGEOTTO, PICHU, CLEFAIRY, CHARMANDER, STARYU, CYNDAQUIL, SUNKERN, TEDDIURSA, VOLTORB .hi_bi_pi db CLEFFA, WEEDLE, PIKACHU, CLEFABLE, PIDGEOT, PIDGEOTTO, PICHU, CLEFAIRY, CHARMANDER, STARYU, CYNDAQUIL, SUNKERN, TEDDIURSA, VOLTORB
db -1 db -1
.fu_bu_pu: db MOLTRES, FLAREON, ALAKAZAM, MAGMAR, FORRETRESS, WIGGLYTUFF, IVYSAUR, BULBASAUR, VENUSAUR, AERODACTYL, MAGBY, IGGLYBUFF, UMBREON, ARTICUNO, JIGGLYPUFF, SNUBBULL .fu_bu_pu db MOLTRES, FLAREON, ALAKAZAM, MAGMAR, FORRETRESS, WIGGLYTUFF, IVYSAUR, BULBASAUR, VENUSAUR, AERODACTYL, MAGBY, IGGLYBUFF, UMBREON, ARTICUNO, JIGGLYPUFF, SNUBBULL
db -1 db -1
.he_be_pe: db BAYLEEF, GRIMER, MUK, HERACROSS, HOUNDOOM, PERSIAN, LICKITUNG .he_be_pe db BAYLEEF, GRIMER, MUK, HERACROSS, HOUNDOOM, PERSIAN, LICKITUNG
db -1 db -1
.ho_bo_po: db HO_OH, HOOTHOOT, PIDGEY, PONYTA, SKIPLOOM, PORYGON, PORYGON2 .ho_bo_po db HO_OH, HOOTHOOT, PIDGEY, PONYTA, SKIPLOOM, PORYGON, PORYGON2
db -1 db -1
.ma: db MAGCARGO, SLUGMA, QUILAVA, BELLSPROUT, WEEZING, MARILL, AZUMARILL, ELECTRODE, MANKEY, MANTINE .ma db MAGCARGO, SLUGMA, QUILAVA, BELLSPROUT, WEEZING, MARILL, AZUMARILL, ELECTRODE, MANKEY, MANTINE
db -1 db -1
.mi: db DRATINI, MEW, MEWTWO, MILTANK .mi db DRATINI, MEW, MEWTWO, MILTANK
db -1 db -1
.mu: db MISDREAVUS, SMOOCHUM .mu db MISDREAVUS, SMOOCHUM
db -1 db -1
.me: db MEGANIUM, DITTO, TENTACOOL, MAREEP .me db MEGANIUM, DITTO, TENTACOOL, MAREEP
db -1 db -1
.mo: db FLAAFFY, VENOMOTH, TANGELA .mo db FLAAFFY, VENOMOTH, TANGELA
db -1 db -1
.ya: db SLOWKING, SLOWBRO, SLOWPOKE, MURKROW, YANMA .ya db SLOWKING, SLOWBRO, SLOWPOKE, MURKROW, YANMA
db -1 db -1
.yu: db KADABRA .yu db KADABRA
db -1 db -1
.yo: db LARVITAR, NOCTOWL .yo db LARVITAR, NOCTOWL
db -1 db -1
.ra: db RAIKOU, RAICHU, CHANSEY, RATICATE, LAPRAS, VILEPLUME, LANTURN .ra db RAIKOU, RAICHU, CHANSEY, RATICATE, LAPRAS, VILEPLUME, LANTURN
db -1 db -1
.ri: db CHARMELEON, CHARIZARD, URSARING .ri db CHARMELEON, CHARIZARD, URSARING
db -1 db -1
.ru: db JYNX, LUGIA .ru db JYNX, LUGIA
db -1 db -1
.re: db MAGNETON, LEDIAN, LEDYBA .re db MAGNETON, LEDIAN, LEDYBA
db -1 db -1
.ro: db VULPIX .ro db VULPIX
db -1 db -1
.wa: db JUMPLUFF, TOTODILE, MACHOP .wa db JUMPLUFF, TOTODILE, MACHOP
.end: db -1 .end db -1
; 11d67e ; 11d67e
GFX_11d67e: GFX_11d67e:

2
misc/gfx_41.asm
View File

@ -500,7 +500,7 @@ _Get1bpp:: ; 1042b2
jr .loop jr .loop
; 1042d6 ; 1042d6
.bankswitch: ; 1042d6 .bankswitch ; 1042d6
ld a, [rSVBK] ld a, [rSVBK]
push af push af
ld a, $6 ld a, $6

8
misc/mobile_22_2.asm
View File

@ -19,21 +19,21 @@ Function8b342:: ; 8b342
ret ret
; 8b354 ; 8b354
.dw: ; 8b354 .dw ; 8b354
dw .zero dw .zero
dw .one dw .one
dw .two dw .two
; 8b35a ; 8b35a
.zero: ; 8b35a .zero ; 8b35a
mobile mobile
; 8b35b ; 8b35b
.one: ; 8b35b .one ; 8b35b
mobile mobile
; 8b35c ; 8b35c
.two: ; 8b35c .two ; 8b35c
mobile mobile
; 8b35d ; 8b35d

4
misc/mobile_40.asm
View File

@ -1998,7 +1998,7 @@ Function100c98: ; 100c98
ret ret
; 100cad ; 100cad
.attrs: ; 100cad .attrs ; 100cad
db 10, 1 db 10, 1
db 255, 1 db 255, 1
db $a0, $00 db $a0, $00
@ -6880,7 +6880,7 @@ Function102e07: ; 102e07
ret ret
; 102e32 ; 102e32
.waiting: ; 102e32 .waiting ; 102e32
db "Waiting...!@" db "Waiting...!@"
; 102e3e ; 102e3e

2
misc/mobile_41.asm
View File

@ -1095,5 +1095,5 @@ LoadOverworldFont:: ; 106594
ret ret
; 1065ad ; 1065ad
.bgfont: .bgfont
INCBIN "gfx/unknown/1065ad.2bpp" INCBIN "gfx/unknown/1065ad.2bpp"

4
misc/mobile_5f.asm
View File

@ -4869,7 +4869,7 @@ Function17f6b7: ; 17f6b7
ret ret
; 17f6cd ; 17f6cd
.bcd_two_digits: ; 17f6cd .bcd_two_digits ; 17f6cd
ld c, a ld c, a
and $f0 and $f0
swap a swap a
@ -4877,7 +4877,7 @@ Function17f6b7: ; 17f6b7
ld a, c ld a, c
and $f and $f
.bcd_digit: ; 17f6d8 .bcd_digit ; 17f6d8
add "0" add "0"
ld [hli], a ld [hli], a
ret ret

2
predef/cgb.asm
View File

@ -32,7 +32,7 @@ Predef_LoadSGBLayoutCGB: ; 8d59
ret ret
; 8d7a ; 8d7a
.dw: ; 8d7a .dw ; 8d7a
dw _CGB_BattleGrayscale dw _CGB_BattleGrayscale
dw _CGB_BattleColors dw _CGB_BattleColors
dw _CGB_PokegearPals dw _CGB_PokegearPals

2
predef/crystal.asm
View File

@ -22,7 +22,7 @@ GetMysteryGift_MobileAdapterLayout: ; 4930f (mobile)
ret ret
; 49330 (12:5330) ; 49330 (12:5330)
.dw: ; 49330 .dw ; 49330
dw MG_Mobile_Layout00 dw MG_Mobile_Layout00
dw MG_Mobile_Layout01 dw MG_Mobile_Layout01