diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-04-10 15:01:49 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-04-10 15:01:49 -0400 |
| commit | 6be4cd4da98093bf1b9362c946e693c89e4713ad (patch) | |
| tree | 88d23a4b4a79f318b918ceeb3ff24c4ef1700b59 | |
| parent | bf73772a560ddfdf0b404ba3f85eb26542031b7b (diff) | |
Local labels starting with lowercase letters are no longer decorated with a trailing colon
99 files changed, 470 insertions, 470 deletions
diff --git a/battle/ai/items.asm b/battle/ai/items.asm index 90bfb840d..16511de79 100644 --- a/battle/ai/items.asm +++ b/battle/ai/items.asm @@ -416,7 +416,7 @@ AI_Items: ; 39196 jp .Use ; 382ae -.asm_382ae: ; This appears to be unused +.asm_382ae ; This appears to be unused callab AICheckEnemyMaxHP jr c, .dont_use push bc diff --git a/battle/anims.asm b/battle/anims.asm index 3d7525ec5..7a4e8459c 100644 --- a/battle/anims.asm +++ b/battle/anims.asm @@ -3550,7 +3550,7 @@ BattleAnim_CottonSpore: ; cae84 anim_obp0 $54 anim_1gfx ANIM_GFX_MISC anim_sound 0, 1, SFX_POWDER -.loop: ; cae8b +.loop ; cae8b anim_obj ANIM_OBJ_81, -16, 4, 4, 0, $0 anim_wait 8 anim_loop 5, .loop @@ -3592,7 +3592,7 @@ BattleAnim_Spite: ; caed6 BattleAnim_PowderSnow: ; caee2 anim_1gfx ANIM_GFX_ICE -.loop: ; caee4 +.loop ; caee4 anim_sound 6, 2, SFX_SHINE anim_obj ANIM_OBJ_8F, 8, 0, 11, 0, $23 anim_wait 2 diff --git a/battle/bg_effects.asm b/battle/bg_effects.asm index f2ddde3e0..52917b61f 100644 --- a/battle/bg_effects.asm +++ b/battle/bg_effects.asm @@ -2218,7 +2218,7 @@ BattleBGEffect_VibrateMon: ; c8c61 (32:4c61) dw .one -.zero: ; c8c68 (32:4c68) +.zero ; c8c68 (32:4c68) call BattleBGEffects_IncrementJumptable call BattleBGEffects_ClearLYOverrides ld a, $43 @@ -2234,7 +2234,7 @@ BattleBGEffect_VibrateMon: ; c8c61 (32:4c61) ld [hl], $20 ret -.one: ; c8c85 (32:4c85) +.one ; c8c85 (32:4c85) ld hl, BG_EFFECT_STRUCT_03 add hl, bc ld a, [hl] @@ -2264,7 +2264,7 @@ BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2) dw .two -.zero: ; c8cab (32:4cab) +.zero ; c8cab (32:4cab) call BattleBGEffects_IncrementJumptable call BattleBGEffects_ClearLYOverrides ld a, $43 @@ -2278,7 +2278,7 @@ BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2) ld [hl], $0 ret -.one: ; c8cc3 (32:4cc3) +.one ; c8cc3 (32:4cc3) ld hl, BG_EFFECT_STRUCT_03 add hl, bc ld a, [hl] @@ -2294,7 +2294,7 @@ BattleBGEffect_WobbleMon: ; c8ca2 (32:4ca2) ld [hl], a ret -.two: ; c8cdd (32:4cdd) +.two ; c8cdd (32:4cdd) call BattleAnim_ResetLCDStatCustom ret @@ -2429,7 +2429,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) dw .two_dmg -.zero_dmg: ; c8d8b (32:4d8b) +.zero_dmg ; c8d8b (32:4d8b) call BattleBGEffects_IncrementJumptable ld a, $e4 call BattleBGEffects_SetLYOverrides @@ -2447,7 +2447,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) ld [hl], a ret -.one_dmg: ; c8daa (32:4daa) +.one_dmg ; c8daa (32:4daa) ld hl, BG_EFFECT_STRUCT_BATTLE_TURN add hl, bc ld a, [hl] @@ -2472,7 +2472,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) dec [hl] ret -.two_dmg: ; c8dc9 (32:4dc9) +.two_dmg ; c8dc9 (32:4dc9) call BattleBGEffects_ResetVideoHRAM ld a, %11100100 ld [rBGP], a @@ -2494,7 +2494,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) dw .four_cgb -.zero_cgb: ; c8de7 (32:4de7) +.zero_cgb ; c8de7 (32:4de7) call BGEffect_CheckBattleTurn jr nz, .player_turn_cgb call BattleBGEffects_IncrementJumptable @@ -2510,7 +2510,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) ld [hl], a ret -.one_cgb: ; c8e02 (32:4e02) +.one_cgb ; c8e02 (32:4e02) ld hl, BG_EFFECT_STRUCT_BATTLE_TURN add hl, bc ld a, [hl] @@ -2535,13 +2535,13 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) dec [hl] ret -.two_cgb: ; c8e21 (32:4e21) +.two_cgb ; c8e21 (32:4e21) ld a, $e4 call BGEffects_LoadBGPal0_OBPal1 call EndBattleBGEffect ret -.three_cgb: ; c8e2a (32:4e2a) +.three_cgb ; c8e2a (32:4e2a) ld hl, BG_EFFECT_STRUCT_BATTLE_TURN add hl, bc ld a, [hl] @@ -2566,7 +2566,7 @@ BGEffect_RapidCyclePals: ; c8d77 (32:4d77) dec [hl] ret -.four_cgb: ; c8e49 (32:4e49) +.four_cgb ; c8e49 (32:4e49) ld a, $e4 call BGEffects_LoadBGPal1_OBPal0 call EndBattleBGEffect diff --git a/battle/core.asm b/battle/core.asm index 4a8d37997..eb73f77a2 100644 --- a/battle/core.asm +++ b/battle/core.asm @@ -565,7 +565,7 @@ DetermineMoveOrder: ; 3c314 ret ; 3c3f3 -.enemy_first: ; 3c3f3 +.enemy_first ; 3c3f3 and a ret ; 3c3f5 diff --git a/battle/effect_commands.asm b/battle/effect_commands.asm index c791e9947..5c1214cb7 100644 --- a/battle/effect_commands.asm +++ b/battle/effect_commands.asm @@ -3337,7 +3337,7 @@ BattleCommand_BeatUp: ; 35461 ; 355b0 -.beatup_fail: ; 355b0 +.beatup_fail ; 355b0 ld b, buildopponentrage_command jp SkipToBattleCommand @@ -5188,7 +5188,7 @@ BattleCommand_Poison: ; 35f2c ; 35fc0 -.apply_poison: ; 35fc0 +.apply_poison ; 35fc0 call AnimateCurrentMove call PoisonOpponent jp RefreshBattleHuds @@ -5196,7 +5196,7 @@ BattleCommand_Poison: ; 35f2c ; 35fc9 -.check_toxic: ; 35fc9 +.check_toxic ; 35fc9 ld a, BATTLE_VARS_SUBSTATUS5_OPP call GetBattleVarAddr ld a, [hBattleTurn] @@ -5671,14 +5671,14 @@ CheckIfStatCanBeRaised: ; 361ef ; 3626e -.stats_already_max: ; 3626e +.stats_already_max ; 3626e pop hl dec [hl] ; fallthrough ; 36270 -.cant_raise_stat: ; 36270 +.cant_raise_stat ; 36270 ld a, $2 ld [FailedMessage], a ld a, $1 @@ -5688,7 +5688,7 @@ CheckIfStatCanBeRaised: ; 361ef ; 3627b -.stat_raise_failed: ; 3627b +.stat_raise_failed ; 3627b ld a, $1 ld [FailedMessage], a ret diff --git a/battle/sliding_intro.asm b/battle/sliding_intro.asm index 6361f7fa7..194a4cd1b 100755 --- a/battle/sliding_intro.asm +++ b/battle/sliding_intro.asm @@ -14,7 +14,7 @@ BattleIntroSlidingPics: ; 4e980 ret ; 4e998 -.subfunction1: ; 4e998 +.subfunction1 ; 4e998 call .subfunction4 ld a, $90 ld [hSCX], a @@ -25,7 +25,7 @@ BattleIntroSlidingPics: ; 4e980 ret ; 4e9ab -.subfunction2: ; 4e9ab +.subfunction2 ; 4e9ab ld d, $90 ld e, $72 ld a, $48 @@ -61,7 +61,7 @@ endr ret ; 4e9d6 -.subfunction3: ; 4e9d6 +.subfunction3 ; 4e9d6 ld hl, Sprites + 1 ; x pixel ld c, $12 ; 18 ld de, $4 @@ -75,7 +75,7 @@ endr ret ; 4e9e5 -.subfunction4: ; 4e9e5 +.subfunction4 ; 4e9e5 ld hl, LYOverrides ld a, $90 ld bc, SCREEN_HEIGHT_PX @@ -83,7 +83,7 @@ endr ret ; 4e9f1 -.subfunction5: ; 4e9f1 +.subfunction5 ; 4e9f1 ld hl, LYOverrides ld a, d ld c, $3e ; 62 diff --git a/battle/trainer_huds.asm b/battle/trainer_huds.asm index 7a5e17bdd..ad32df1cd 100755 --- a/battle/trainer_huds.asm +++ b/battle/trainer_huds.asm @@ -238,7 +238,7 @@ LoadBallIconGFX: ; 2c165 ret ; 2c172 -.gfx: ; 2c172 +.gfx ; 2c172 INCBIN "gfx/battle/balls.2bpp" ; 2c1b2 diff --git a/engine/battle_start.asm b/engine/battle_start.asm index 083469b0d..d2ead2757 100644 --- a/engine/battle_start.asm +++ b/engine/battle_start.asm @@ -148,7 +148,7 @@ FlashyTransitionToBattle: ; 8c314 jumptable .dw, wJumptableIndex ; 8c323 -.dw: ; 8c323 (23:4323) +.dw ; 8c323 (23:4323) dw StartTrainerBattle_DetermineWhichAnimation ; 00 ; Animation 1: cave @@ -279,7 +279,7 @@ StartTrainerBattle_Flash: ; 8c3ab (23:43ab) ret ; 8c3db (23:43db) -.pals: ; 8c3db +.pals ; 8c3db db %11111001 ; 3321 db %11111110 ; 3332 db %11111111 ; 3333 @@ -411,7 +411,7 @@ endr ret ; 8c490 (23:4490) -.spintable: ; 8c490 +.spintable ; 8c490 spintable_entry UPPER_LEFT, 1, 1, 6 spintable_entry UPPER_LEFT, 2, 0, 3 spintable_entry UPPER_LEFT, 3, 1, 0 @@ -435,7 +435,7 @@ endr db -1 ; 8c4f5 -.load: ; 8c4f5 (23:44f5) +.load ; 8c4f5 (23:44f5) ld a, [hli] ld e, a ld a, [hli] @@ -489,11 +489,11 @@ endr jr .loop ; 8c538 (23:4538) -.wedge1: db 2, 3, 5, 4, 9, -1 -.wedge2: db 1, 1, 2, 2, 4, 2, 4, 2, 3, -1 -.wedge3: db 2, 1, 3, 1, 4, 1, 4, 1, 4, 1, 3, 1, 2, 1, 1, 1, 1, -1 -.wedge4: db 4, 1, 4, 0, 3, 1, 3, 0, 2, 1, 2, 0, 1, -1 -.wedge5: db 4, 0, 3, 0, 3, 0, 2, 0, 2, 0, 1, 0, 1, 0, 1, -1 +.wedge1 db 2, 3, 5, 4, 9, -1 +.wedge2 db 1, 1, 2, 2, 4, 2, 4, 2, 3, -1 +.wedge3 db 2, 1, 3, 1, 4, 1, 4, 1, 4, 1, 3, 1, 2, 1, 1, 1, 1, -1 +.wedge4 db 4, 1, 4, 0, 3, 1, 3, 0, 2, 1, 2, 0, 1, -1 +.wedge5 db 4, 0, 3, 0, 3, 0, 2, 0, 2, 0, 1, 0, 1, 0, 1, -1 ; 8c578 StartTrainerBattle_SetUpForRandomScatterOutro: ; 8c578 (23:4578) @@ -665,11 +665,11 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc) call DelayFrame call BattleStart_LoadEDTile -.nextscene: ; 8c673 (23:4673) +.nextscene ; 8c673 (23:4673) call StartTrainerBattle_NextScene ret -.copypals: ; 8c677 (23:4677) +.copypals ; 8c677 (23:4677) ld de, UnknBGPals + 7 palettes call .copy ld de, BGPals + 7 palettes @@ -682,7 +682,7 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc) call .copy ld de, OBPals + 7 palettes -.copy: ; 8c698 (23:4698) +.copy ; 8c698 (23:4698) push hl ld bc, 1 palettes call CopyBytes @@ -690,20 +690,20 @@ StartTrainerBattle_LoadPokeBallGraphics: ; 8c5dc (23:45dc) ret ; 8c6a1 (23:46a1) -.daypals: ; 8c6a1 +.daypals ; 8c6a1 RGB 31, 18, 29 RGB 31, 11, 15 RGB 31, 05, 05 RGB 07, 07, 07 ; 8c6a9 -.nightpals: ; 8c6a9 +.nightpals ; 8c6a9 RGB 31, 18, 29 RGB 31, 05, 05 RGB 31, 05, 05 RGB 31, 05, 05 -.loadpokeballgfx: +.loadpokeballgfx ld a, [OtherTrainerClass] ld de, PokeBallTransition ret @@ -742,7 +742,7 @@ WipeLYOverrides: ; 8c6d8 ret ; 8c6ef -.wipe: ; 8c6ef +.wipe ; 8c6ef xor a ld c, SCREEN_HEIGHT_PX .loop @@ -792,7 +792,7 @@ StartTrainerBattle_DrawSineWave: ; 8c6f7 (23:46f7) ret ; 8c728 (23:4728) -.sinewave: ; 8c728 +.sinewave ; 8c728 sine_wave $100 ; 8c768 @@ -833,7 +833,7 @@ StartTrainerBattle_ZoomToBlack: ; 8c768 (23:4768) ret ; 8c792 (23:4792) -.boxes: ; 8c792 +.boxes ; 8c792 zoombox 4, 2, 8, 8 zoombox 6, 4, 7, 7 zoombox 8, 6, 6, 6 diff --git a/engine/billspc.asm b/engine/billspc.asm index 54f6a49f2..5e9e7393b 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -419,14 +419,14 @@ endr ld l, a jp [hl] -.dw: ; e2699 (38:6699) #mark +.dw ; e2699 (38:6699) #mark dw .withdraw ; Withdraw dw .stats ; Stats dw .release ; Release dw .cancel ; Cancel -.withdraw: ; e26a1 (38:66a1) +.withdraw ; e26a1 (38:66a1) call BillsPC_CheckMail_PreventBlackout jp c, .cancel call TryWithdrawPokemon @@ -442,7 +442,7 @@ endr call BillsPC_PlaceString ret -.stats: ; e26c0 (38:66c0) +.stats ; e26c0 (38:66c0) call LoadStandardMenuDataHeader call BillsPC_StatsScreen call ExitMenu @@ -453,7 +453,7 @@ endr call BillsPC_ApplyPalettes ret -.release: ; e26d8 (38:66d8) +.release ; e26d8 (38:66d8) ld a, [wMenuCursorY] push af call BillsPC_IsMonAnEgg @@ -490,7 +490,7 @@ endr ld [wMenuCursorY], a ret -.cancel: ; e272b (38:672b) +.cancel ; e272b (38:672b) ld a, $0 ld [wJumptableIndex], a ret @@ -2021,7 +2021,7 @@ endr jp [hl] ; e322a -.dw_return: ; e322a +.dw_return ; e322a pop af ld e, a callba Function14ad5 @@ -2226,7 +2226,7 @@ endr ret ; e33a6 (38:73a6) -.boxes: ; e33a6 +.boxes ; e33a6 ; bank, address dba sBox1 dba sBox2 @@ -2352,7 +2352,7 @@ _ChangeBox_menudataheader: ; 0xe35f1 db 1 ; default option ; 0xe35f9 -.menudata2: ; 0xe35f9 +.menudata2 ; 0xe35f9 db $22 ; flags db 4, 0 db 1 @@ -2362,7 +2362,7 @@ _ChangeBox_menudataheader: ; 0xe35f1 dba BillsPC_PrintBoxCountAndCapacity ; e3609 -.boxes: ; e3609 +.boxes ; e3609 db NUM_BOXES x = 1 rept NUM_BOXES @@ -2372,7 +2372,7 @@ endr db -1 ; e3619 -.boxnames: ; e3619 +.boxnames ; e3619 push de ld a, [MenuSelection] dec a @@ -2416,7 +2416,7 @@ BillsPC_PrintBoxCountAndCapacity: ; e3632 db "#MON@" ; e3668 -.out_of_20: ; e3668 +.out_of_20 ; e3668 ; db "/20@" db "/" db "0" + MONS_PER_BOX / 10 ; "2" @@ -2466,7 +2466,7 @@ endr ret ; e36a5 (38:76a5) -.boxbanks: ; e36a5 +.boxbanks ; e36a5 dba sBox1 dba sBox2 dba sBox3 diff --git a/engine/billspctop.asm b/engine/billspctop.asm index 038341ccc..115c90385 100755 --- a/engine/billspctop.asm +++ b/engine/billspctop.asm @@ -82,7 +82,7 @@ _BillsPC: ; e3fd dw PlaceMenuStrings dw .strings -.strings: ; e47f +.strings ; e47f db "WITHDRAW <PK><MN>@" db "DEPOSIT <PK><MN>@" db "CHANGE BOX@" @@ -96,7 +96,7 @@ _BillsPC: ; e3fd dw BillsPC_MovePKMNMenu dw BillsPC_SeeYa -.items: ; e4c4 +.items ; e4c4 db 5 db 0 ; WITHDRAW db 1; DEPOSIT diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm index 7a5dfcf7c..b6f41743e 100755 --- a/engine/breeding/egg.asm +++ b/engine/breeding/egg.asm @@ -215,7 +215,7 @@ HatchEggs: ; 16f70 (5:6f70) xor a ld [CurPartyMon], a -.loop: ; 16f7a (5:6f7a) +.loop ; 16f7a (5:6f7a) ld a, [de] inc de cp -1 @@ -348,7 +348,7 @@ HatchEggs: ; 16f70 (5:6f70) ld bc, PKMN_NAME_LENGTH call CopyBytes -.next: ; 1707d (5:707d) +.next ; 1707d (5:707d) ld hl, CurPartyMon inc [hl] pop hl @@ -357,7 +357,7 @@ HatchEggs: ; 16f70 (5:6f70) pop de jp .loop -.done: ; 1708a (5:708a) +.done ; 1708a (5:708a) ret ; 1708b (5:708b) @@ -989,7 +989,7 @@ DayCareMonPrintEmptyString: ; 174b5 ret ; 174b9 -.string: ; 174b9 +.string ; 174b9 db "@" ; 174ba diff --git a/engine/buena_phone_scripts.asm b/engine/buena_phone_scripts.asm index 0aad5e0ba..858ce5540 100644 --- a/engine/buena_phone_scripts.asm +++ b/engine/buena_phone_scripts.asm @@ -21,12 +21,12 @@ BuenaPhoneScript_CheckTimeOfDay1: buttonsound end -.morn: +.morn writetext UnknownText_0xa0c28 buttonsound end -.day: +.day writetext UnknownText_0xa0c72 buttonsound end @@ -46,12 +46,12 @@ BuenaPhoneScript_CheckTimeOfDay2: buttonsound end -.morn: +.morn writetext UnknownText_0xa0d96 buttonsound end -.day: +.day writetext UnknownText_0xa0dcf buttonsound end @@ -90,62 +90,62 @@ BuenaPhoneScript_Random2: if_equal 12, .twelve if_equal 13, .thirteen -.zero: +.zero writetext UnknownText_0xa0efb jump .finish -.one: +.one writetext UnknownText_0xa0fcf jump .finish -.two: +.two writetext UnknownText_0xa109d jump .finish -.three: +.three writetext UnknownText_0xa1143 jump .finish -.four: +.four writetext UnknownText_0xa1244 jump .finish -.five: +.five writetext UnknownText_0xa1318 jump .finish -.six: +.six writetext UnknownText_0xa13d8 jump .finish -.seven: +.seven writetext UnknownText_0xa1488 jump .finish -.eight: +.eight writetext UnknownText_0xa15de jump .finish -.nine: +.nine writetext UnknownText_0xa1717 jump .finish -.ten: +.ten writetext UnknownText_0xa183d jump .finish -.eleven: +.eleven writetext UnknownText_0xa19b1 jump .finish -.twelve: +.twelve writetext UnknownText_0xa1ac0 jump .finish -.thirteen: +.thirteen writetext UnknownText_0xa1bed -.finish: +.finish end BuenaPhoneScript_Random1: @@ -154,15 +154,15 @@ BuenaPhoneScript_Random1: if_equal 1, .one if_equal 2, .two -.zero: +.zero writetext UnknownText_0xa1c88 end -.one: +.one writetext UnknownText_0xa1d5f end -.two: +.two writetext UnknownText_0xa1e2f end ; a0c28 diff --git a/engine/card_flip.asm b/engine/card_flip.asm index fff4bde78..2c334fc25 100755 --- a/engine/card_flip.asm +++ b/engine/card_flip.asm @@ -1270,7 +1270,7 @@ ChooseCard_HandleJoypad: ; e089c ret ; e08b8 -.d_left: ; e08b8 +.d_left ; e08b8 ld hl, wCardFlipCursorX ld a, [wCardFlipCursorY] and a @@ -1309,7 +1309,7 @@ endr jp .play_sound ; e08ef -.d_right: ; e08ef +.d_right ; e08ef ld hl, wCardFlipCursorX ld a, [wCardFlipCursorY] and a @@ -1331,7 +1331,7 @@ rept 2 endr jr .play_sound -.d_up: ; e090a +.d_up ; e090a ld hl, wCardFlipCursorY ld a, [wCardFlipCursorX] and a @@ -1369,7 +1369,7 @@ endr ld [wCardFlipCursorX], a jr .play_sound -.d_down: ; e093d +.d_down ; e093d ld hl, wCardFlipCursorY ld a, [wCardFlipCursorX] and a @@ -1391,7 +1391,7 @@ rept 2 inc [hl] endr -.play_sound: ; e0959 +.play_sound ; e0959 ld de, SFX_POKEBALLS_PLACED_ON_TABLE call PlaySFX ret @@ -1684,7 +1684,7 @@ CardFlip_InitAttrPals: ; e0c37 (38:4c37) ret ; e0c93 (38:4c93) -.palettes: ; e0c93 +.palettes ; e0c93 RGB 31, 31, 31 RGB 17, 07, 31 RGB 06, 19, 08 diff --git a/engine/clock_reset.asm b/engine/clock_reset.asm index 20f46ce12..546cc8c13 100755 --- a/engine/clock_reset.asm +++ b/engine/clock_reset.asm @@ -220,7 +220,7 @@ RestartClock: ; 20021 (8:4021) ret ; 20160 (8:4160) -.unreferenced: ; 20160 +.unreferenced ; 20160 ld a, [Buffer3] ld b, a call Coord2Tile diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index 874cdf462..2be7a375e 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -129,7 +129,7 @@ endr jp [hl] ; e467f -.dw: ; e467f +.dw ; e467f dw PlaceGameFreakPresents_0 dw PlaceGameFreakPresents_1 dw PlaceGameFreakPresents_2 @@ -383,7 +383,7 @@ CrystalIntro: ; e48ac ld a, [hVBlank] push af call .InitRAMAddrs -.loop: ; e48bc +.loop ; e48bc call JoyTextDelay ld a, [hJoyLast] and BUTTONS @@ -1827,7 +1827,7 @@ endr ret ; e538d (39:538d) -.pal1: ; e538d +.pal1 ; e538d RGB 24, 12, 09 RGB 31, 31, 31 RGB 12, 00, 31 @@ -1835,7 +1835,7 @@ endr ; e5395 -.pal2: ; e5395 +.pal2 ; e5395 RGB 24, 12, 09 RGB 31, 31, 31 RGB 31, 31, 31 diff --git a/engine/debug.asm b/engine/debug.asm index d69cd254b..a02f536db 100755 --- a/engine/debug.asm +++ b/engine/debug.asm @@ -1365,7 +1365,7 @@ endr jp [hl] ; 82301 -.dw: ; 82301 +.dw ; 82301 dw Function82309 dw Function82339 dw Function8234b diff --git a/engine/decorations.asm b/engine/decorations.asm index 774a8589a..c69b51fbe 100755 --- a/engine/decorations.asm +++ b/engine/decorations.asm @@ -52,7 +52,7 @@ _KrisDecorationMenu: ; 0x2675c dw .pointers ; 0x267aa -.pointers: ; 267aa +.pointers ; 267aa dw DecoBedMenu, .bed dw DecoCarpetMenu, .carpet dw DecoPlantMenu, .plant @@ -127,7 +127,7 @@ _KrisDecorationMenu: ; 0x2675c ret ; 26855 (9:6855) -.dw: ; 26855 +.dw ; 26855 dwb FindOwnedBeds, 0 ; bed dwb FindOwnedCarpets, 1 ; carpet dwb FindOwnedPlants, 2 ; plant @@ -211,7 +211,7 @@ FindOwnedBeds: ; 268bd jp FindOwnedDecosInCategory ; 268c5 -.beds: ; 268c5 +.beds ; 268c5 db DECO_FEATHERY_BED ; 2 db DECO_PINK_BED ; 3 db DECO_POLKADOT_BED ; 4 @@ -232,7 +232,7 @@ FindOwnedCarpets: ; 268d2 jp FindOwnedDecosInCategory ; 268da -.carpets: ; 268da +.carpets ; 268da db DECO_RED_CARPET ; 7 db DECO_BLUE_CARPET ; 8 db DECO_YELLOW_CARPET ; 9 @@ -253,7 +253,7 @@ FindOwnedPlants: ; 268e7 jp FindOwnedDecosInCategory ; 268ef -.plants: ; 268ef +.plants ; 268ef db DECO_MAGNAPLANT ; c db DECO_TROPICPLANT ; d db DECO_JUMBOPLANT ; e @@ -273,7 +273,7 @@ FindOwnedPosters: ; 268fb jp FindOwnedDecosInCategory ; 26903 -.posters: ; 26903 +.posters ; 26903 db DECO_TOWN_MAP ; 10 db DECO_PIKACHU_POSTER ; 11 db DECO_CLEFAIRY_POSTER ; 12 @@ -294,7 +294,7 @@ FindOwnedConsoles: ; 26910 jp FindOwnedDecosInCategory ; 26918 -.consoles: ; 26918 +.consoles ; 26918 db DECO_FAMICOM ; 15 db DECO_SNES ; 16 db DECO_N64 ; 17 @@ -315,7 +315,7 @@ FindOwnedOrnaments: ; 26925 jp FindOwnedDecosInCategory ; 2692d -.ornaments: ; 2692d +.ornaments ; 2692d db DECO_PIKACHU_DOLL ; 1e db DECO_SURF_PIKACHU_DOLL ; 1f db DECO_CLEFAIRY_DOLL ; 20 @@ -355,7 +355,7 @@ FindOwnedBigDolls: ; 2694d jp FindOwnedDecosInCategory ; 26955 -.big_dolls: ; 26955 +.big_dolls ; 26955 db DECO_BIG_SNORLAX_DOLL ; 1a db DECO_BIG_ONIX_DOLL ; 1b db DECO_BIG_LAPRAS_DOLL ; 1c @@ -656,37 +656,37 @@ GetDecoName: ; 26c72 ; 26c8c -.invalid: ; 26c8c +.invalid ; 26c8c ret ; 26c8d -.plant: ; 26c8d +.plant ; 26c8d ld a, e jr .getdeconame -.bed: ; 26c90 +.bed ; 26c90 call .plant ld a, _BED jr .getdeconame -.carpet: ; 26c97 +.carpet ; 26c97 call .plant ld a, _CARPET jr .getdeconame -.poster: ; 26c9e +.poster ; 26c9e ld a, e call .getpokename ld a, _POSTER jr .getdeconame -.doll: ; 26ca6 +.doll ; 26ca6 ld a, e call .getpokename ld a, _DOLL jr .getdeconame -.bigdoll: ; 26cae +.bigdoll ; 26cae push de ld a, BIG_ call .getdeconame @@ -694,21 +694,21 @@ GetDecoName: ; 26c72 ld a, e jr .getpokename -.unused: ; 26cb8 +.unused ; 26cb8 push de call .getdeconame pop de ld a, e jr .getdeconame -.getpokename: ; 26cc0 +.getpokename ; 26cc0 push bc ld [wd265], a call GetPokemonName pop bc jr .copy -.getdeconame: ; 26cca +.getdeconame ; 26cca call ._getdeconame jr .copy @@ -721,7 +721,7 @@ GetDecoName: ; 26c72 pop bc ret -.copy: ; 26cda +.copy ; 26cda ld h, b ld l, c call CopyName2 @@ -957,7 +957,7 @@ DecoAction_SetItUp_Ornament: ; 26de3 ret ; 26e33 -.getwhichside: ; 26e33 +.getwhichside ; 26e33 ld a, [MenuSelection] ld b, a ld a, [wd1ed] diff --git a/engine/events.asm b/engine/events.asm index e10648d07..3bcac8925 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -994,7 +994,7 @@ CountStep: ; 96b79 ret ; 96bd3 -.unreferenced: ; 96bd3 +.unreferenced ; 96bd3 ld a, 7 scf ret diff --git a/engine/events_2.asm b/engine/events_2.asm index 8ae911bad..2e7c37c92 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -519,13 +519,13 @@ CmdQueue_Type4: ; 97ebc dw .one ; 97ec3 -.zero: ; 97ec3 +.zero ; 97ec3 ld a, [hSCY] ld hl, 4 add hl, bc ld [hl], a call CmdQueueAnonJT_Increment -.one: ; 97ecd +.one ; 97ecd ld hl, 1 add hl, bc ld a, [hl] @@ -566,11 +566,11 @@ CmdQueue_Type3: ; 97ef9 dw .two ; 97f02 -.zero: ; 97f02 +.zero ; 97f02 call .IsPlayerFacingDown jr z, .PlayerNotFacingDown call CmdQueueAnonJT_Increment -.one: ; 97f0a +.one ; 97f0a call .IsPlayerFacingDown jr z, .PlayerNotFacingDown call CmdQueueAnonJT_Increment @@ -582,7 +582,7 @@ CmdQueue_Type3: ; 97ef9 ret ; 97f1b -.two: ; 97f1b +.two ; 97f1b call .IsPlayerFacingDown jr z, .PlayerNotFacingDown call CmdQueueAnonJT_Decrement diff --git a/engine/events_3.asm b/engine/events_3.asm index 68e6e0d34..b1c142a27 100755 --- a/engine/events_3.asm +++ b/engine/events_3.asm @@ -8,7 +8,7 @@ ReturnFromMapSetupScript:: ; b8000 ret ; b800a -.inefficientcallba: ; b800a +.inefficientcallba ; b800a ld a, [MapGroup] ld b, a ld a, [MapNumber] diff --git a/engine/evolution_animation.asm b/engine/evolution_animation.asm index 1561c70fa..dc0ddd8f6 100755 --- a/engine/evolution_animation.asm +++ b/engine/evolution_animation.asm @@ -259,7 +259,7 @@ endr ret ; 4e794 -.check_statused: ; 4e794 +.check_statused ; 4e794 ld a, [CurPartyMon] ld hl, PartyMon1Species call GetPartyLocation @@ -296,7 +296,7 @@ endr ret ; 4e7cf -.balls_of_light: ; 4e7cf +.balls_of_light ; 4e7cf ld hl, wJumptableIndex ld a, [hl] cp 32 diff --git a/engine/healmachineanim.asm b/engine/healmachineanim.asm index b4e0be1cf..01ed6d652 100755 --- a/engine/healmachineanim.asm +++ b/engine/healmachineanim.asm @@ -122,7 +122,7 @@ endr ret ; 123db -.dummy_5: ; 123db +.dummy_5 ; 123db ret ; 123dc @@ -168,7 +168,7 @@ INCBIN "gfx/unknown/0123fc.2bpp" ret ; 12451 -.palettes: ; 12451 +.palettes ; 12451 RGB 31, 31, 31 RGB 31, 19, 10 RGB 31, 07, 01 diff --git a/engine/link_trade.asm b/engine/link_trade.asm index 395f1f3d3..4f0198549 100755 --- a/engine/link_trade.asm +++ b/engine/link_trade.asm @@ -75,7 +75,7 @@ _LinkTextbox: ; 16d61d ret ; 16d640 -.draw_border: ; 16d640 +.draw_border ; 16d640 push hl ld a, $30 ld [hli], a @@ -107,7 +107,7 @@ _LinkTextbox: ; 16d61d ret ; 16d66d -.fill_row: ; 16d66d +.fill_row ; 16d66d ld d, c .loop4 ld [hli], a diff --git a/engine/mart.asm b/engine/mart.asm index 3212ef384..f756d3bc2 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -651,7 +651,7 @@ MenuDataHeader_Buy: ; 0x15e18 db 1 ; default option ; 0x15e20 -.menudata2: ; 0x15e20 +.menudata2 ; 0x15e20 db $30 ; pointers db 4, 8 ; rows, columns db 1 ; horizontal spacing @@ -846,7 +846,7 @@ SellMenu: ; 15eb3 ret ; 15eee -.dw: ; 15eee +.dw ; 15eee dw .try_sell dw .cant_buy dw .cant_buy @@ -856,12 +856,12 @@ SellMenu: ; 15eb3 dw .try_sell ; 15efc -.cant_buy: ; 15efc +.cant_buy ; 15efc ret ; 15efd -.try_sell: ; 15efd +.try_sell ; 15efd callba _CheckTossableItem ld a, [wItemAttributeParamBuffer] and a @@ -936,7 +936,7 @@ MenuDataHeader_BuySell: ; 0x15f88 db 1 ; default option ; 0x15f90 -.menudata2: ; 0x15f90 +.menudata2 ; 0x15f90 db $80 ; strings db 3 ; items db "BUY@" diff --git a/engine/menu.asm b/engine/menu.asm index 39cbf0e2a..870ca89bf 100755 --- a/engine/menu.asm +++ b/engine/menu.asm @@ -414,7 +414,7 @@ _2DMenuInterpretJoypad: ; 24270 and a ret -.set_bit_7: ; 24299 +.set_bit_7 ; 24299 ld hl, w2DMenuFlags2 set 7, [hl] scf @@ -515,7 +515,7 @@ _2DMenuInterpretJoypad: ; 24270 ret ; 24318 -.a_b_start_select: ; 24318 +.a_b_start_select ; 24318 xor a ret ; 2431a @@ -654,7 +654,7 @@ _PushWindow:: ; 24374 ret ; 243cd -.copy: ; 243cd +.copy ; 243cd call GetMenuBoxDims inc b inc c @@ -681,7 +681,7 @@ _PushWindow:: ; 24374 ret ; 243e7 -.ret: ; 243e7 +.ret ; 243e7 ret ; 243e8 diff --git a/engine/mon_icons.asm b/engine/mon_icons.asm index 6a5c7484f..4b7f03bfb 100755 --- a/engine/mon_icons.asm +++ b/engine/mon_icons.asm @@ -202,7 +202,7 @@ SetPartyMonIconAnimSpeed: ; 8e936 (23:6936) ld [hl], a ret -.getspeed: ; 8e94c (23:694c) +.getspeed ; 8e94c (23:694c) callba PlacePartymonHPBar call GetHPPal ld e, d @@ -213,7 +213,7 @@ SetPartyMonIconAnimSpeed: ; 8e936 (23:6936) ret ; 8e95e (23:695e) -.speeds: ; 8e95e +.speeds ; 8e95e db $00, $40, $80 ; 8e961 diff --git a/engine/money.asm b/engine/money.asm index aa1d7b696..874821814 100755 --- a/engine/money.asm +++ b/engine/money.asm @@ -191,7 +191,7 @@ GiveCoins:: ; 1606f ret ; 1608d -.maxcoins: ; 1608d +.maxcoins ; 1608d bigdw 9999 ; 1608f diff --git a/engine/move_mon.asm b/engine/move_mon.asm index f52defcad..310eab8c2 100755 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -1032,7 +1032,7 @@ SentPkmnIntoBox: ; de6e ret ; df42 -.full: ; df42 +.full ; df42 call CloseSRAM and a ret diff --git a/engine/mysterygift.asm b/engine/mysterygift.asm index d7d3efafc..5e6d317ba 100755 --- a/engine/mysterygift.asm +++ b/engine/mysterygift.asm @@ -1350,7 +1350,7 @@ Function105153: ; 105153 (41:5153) .Load16GFX: ; 105236 (41:5236) ld b, 16 -.gfx_loop: ; 105238 (41:5238) +.gfx_loop ; 105238 (41:5238) ld [hli], a inc a dec b @@ -1368,7 +1368,7 @@ Function105153: ; 105153 (41:5153) .Load14Column: ; 105246 (41:5246) ld b, 14 -.col_loop: ; 105248 (41:5248) +.col_loop ; 105248 (41:5248) ld [hl], a ld de, SCREEN_WIDTH add hl, de @@ -1651,7 +1651,7 @@ Function1057d7: ; 1057d7 (41:57d7) .Load12Row: ; 1058ce (41:58ce) ld b, 12 -.row_loop: ; 1058d0 (41:58d0) +.row_loop ; 1058d0 (41:58d0) ld [hli], a inc a dec b @@ -1669,7 +1669,7 @@ Function1057d7: ; 1057d7 (41:57d7) .Load14Column: ; 1058de (41:58de) ld b, 14 -.column_loop: ; 1058e0 (41:58e0) +.column_loop ; 1058e0 (41:58e0) ld [hl], a ld de, SCREEN_WIDTH add hl, de diff --git a/engine/namingscreen.asm b/engine/namingscreen.asm index e65a2d54f..d9fe253fb 100755 --- a/engine/namingscreen.asm +++ b/engine/namingscreen.asm @@ -211,7 +211,7 @@ endr ; 11839 (4:5839) -.oTomodachi_no_namae_sutoringu: ; 11839 +.oTomodachi_no_namae_sutoringu ; 11839 db "おともだち の なまえは?@" ; 11847 @@ -1076,7 +1076,7 @@ _ComposeMailMessage: ; 11e75 (mail?) INCBIN "gfx/icon/mail2.2bpp" ; 11f74 -.initwNamingScreenMaxNameLength: ; 11f74 (4:5f74) +.initwNamingScreenMaxNameLength ; 11f74 (4:5f74) ld a, MAIL_MSG_LENGTH + 1 ld [wNamingScreenMaxNameLength], a ret @@ -1176,7 +1176,7 @@ endr dw .init_blinking_cursor dw .process_joypad -.init_blinking_cursor: ; 1201b (4:601b) +.init_blinking_cursor ; 1201b (4:601b) depixel 9, 2 ld a, SPRITE_ANIM_INDEX_09 call _InitSpriteAnimStruct @@ -1194,7 +1194,7 @@ endr inc [hl] ret -.process_joypad: ; 1203a (4:603a) +.process_joypad ; 1203a (4:603a) ld hl, hJoyPressed ; $ffa7 ld a, [hl] and A_BUTTON diff --git a/engine/pack.asm b/engine/pack.asm index 06e8089b2..ff80dce23 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -462,7 +462,7 @@ UseItem: ; 10311 ret ; 1031f -.dw: ; 1031f (4:431f) +.dw ; 1031f (4:431f) dw .Oak dw .Oak @@ -941,12 +941,12 @@ TMHMSubmenu: ; 105dc (4:45dc) jr z, .Oak cp $2 jr z, .didnt_use_item -.quit_run_script: ; 1067e (4:467e) +.quit_run_script ; 1067e (4:467e) ld a, 10 ld [wJumptableIndex], a ret -.didnt_use_item: ; 10684 (4:4684) +.didnt_use_item ; 10684 (4:4684) xor a ld [wItemEffectSucceeded], a ret @@ -1148,7 +1148,7 @@ TutorialPack: ; 107bb ; 107e1 -.dw: ; 107e1 (4:47e1) +.dw ; 107e1 (4:47e1) dw .Items dw .Balls @@ -1495,7 +1495,7 @@ DrawPocketName: ; 109bb ret ; 109e1 -.tilemap: ; 109e1 +.tilemap ; 109e1 db $00, $04, $04, $04, $01 ; top border db $06, $07, $08, $09, $0a ; Items db $02, $05, $05, $05, $03 ; bottom border diff --git a/engine/party_menu.asm b/engine/party_menu.asm index d6c8ae406..934e1458a 100644 --- a/engine/party_menu.asm +++ b/engine/party_menu.asm @@ -359,11 +359,11 @@ PlacePartyMonTMHMCompatibility: ; 501e0 ret ; 50221 -.string_able: ; 50221 +.string_able ; 50221 db "ABLE@" ; 50226 -.string_not_able: ; 50226 +.string_not_able ; 50226 db "NOT ABLE@" ; 5022f @@ -448,10 +448,10 @@ endr ret ; 502a3 -.string_able: ; 502a3 +.string_able ; 502a3 db "ABLE@" ; 502a8 -.string_not_able: ; 502a8 +.string_not_able ; 502a8 db "NOT ABLE@" ; 502b1 @@ -496,15 +496,15 @@ PlacePartyMonGender: ; 502b1 ret ; 502ee -.male: ; 502ee +.male ; 502ee db "♂…MALE@" ; 502f5 -.female: ; 502f5 +.female ; 502f5 db "♀…FEMALE@" ; 502fe -.unknown: ; 502fe +.unknown ; 502fe db "…UNKNOWN@" ; 50307 diff --git a/engine/phone.asm b/engine/phone.asm index 90d6217f4..7f96dd2c3 100644 --- a/engine/phone.asm +++ b/engine/phone.asm @@ -153,7 +153,7 @@ CheckPhoneCall:: ; 90074 (24:4074) xor a ret -.timecheck: ; 900a6 (24:40a6) +.timecheck ; 900a6 (24:40a6) callba CheckReceiveCallTimer ret @@ -293,7 +293,7 @@ endr ret ; 90173 (24:4173) -.script: ; 0x90173 +.script ; 0x90173 pause 30 jump Script_ReceivePhoneCall ; 0x90178 @@ -430,10 +430,10 @@ LoadCallerScript: ; 9020d (24:420d) WrongNumber: ; 90233 db TRAINER_NONE, PHONE_00 dba .script -.script: +.script writetext .text end -.text: +.text ; Huh? Sorry, wrong number! text_jump UnknownText_0x1c5565 db "@" @@ -718,12 +718,12 @@ NonTrainerCallerNames: ; 903d6 dw .elm dw .buena -.none: db "----------@" -.mom: db "MOM:@" -.bill: db "BILL:@" -.elm: db "PROF.ELM:@" -.bikeshop: db "BIKE SHOP:@" -.buena: db "BUENA:", $22, " DISC JOCKEY@" +.none db "----------@" +.mom db "MOM:@" +.bill db "BILL:@" +.elm db "PROF.ELM:@" +.bikeshop db "BIKE SHOP:@" +.buena db "BUENA:", $22, " DISC JOCKEY@" ; 90423 Phone_GetTrainerName: ; 90423 (24:4423) diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index bcfec65e0..f57404cb1 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -3137,7 +3137,7 @@ PhoneScript_MonFlavorText: .TooEnergetic: farjump .unnecessary -.unnecessary: +.unnecessary farwritetext UnknownText_0x1b522b buttonsound farjump PhoneScript_HangupText_Male diff --git a/engine/player_object.asm b/engine/player_object.asm index 2e94f0a6e..930d71b3e 100755 --- a/engine/player_object.asm +++ b/engine/player_object.asm @@ -281,7 +281,7 @@ InitializeVisibleSprites: ; 8177 jr nz, .loop ret -.ret: ; 81c9 +.ret ; 81c9 ret CheckObjectEnteringVisibleRange:: ; 81ca @@ -293,7 +293,7 @@ CheckObjectEnteringVisibleRange:: ; 81ca rst JumpTable ret -.dw: ; 81d6 +.dw ; 81d6 dw .Down dw .Up dw .Left diff --git a/engine/player_step.asm b/engine/player_step.asm index 15a01efea..48abcecbc 100755 --- a/engine/player_step.asm +++ b/engine/player_step.asm @@ -73,14 +73,14 @@ HandlePlayerStep: ; d4e5 (3:54e5) dw .fail1 dw .fail1 -.fail1: ; d508 (3:5508) +.fail1 ; d508 (3:5508) ret -.mobile: ; d509 (3:5509) +.mobile ; d509 (3:5509) callba MobileFn_10602e ret -.fail2: ; d510 (3:5510) +.fail2 ; d510 (3:5510) ret UpdatePlayerCoords: ; d511 (3:5511) diff --git a/engine/pokegear.asm b/engine/pokegear.asm index 93d5b6de4..c2e73180a 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -940,7 +940,7 @@ PokegearPhone_MakePhoneCall: ; 911eb (24:51eb) ; 9124c (24:524c) -.dotdotdot: ; 0x9124c +.dotdotdot ; 0x9124c ; text_jump UnknownText_0x1c5824 db "@" diff --git a/engine/scripting.asm b/engine/scripting.asm index c6a92c16e..078ce8931 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -1455,7 +1455,7 @@ Script_earthquake: ; 973c7 jp ScriptCall ; 973e6 -.script: ; 973e6 +.script ; 973e6 applymovement PLAYER, wd002 end ; 973eb diff --git a/engine/scrolling_menu.asm b/engine/scrolling_menu.asm index 001beb71b..08a718df1 100755 --- a/engine/scrolling_menu.asm +++ b/engine/scrolling_menu.asm @@ -22,7 +22,7 @@ _ScrollingMenu:: ; 245cb jr .loop ; 245d6 -.exit: ; 245d6 +.exit ; 245d6 call MenuClickSound ld [wMenuJoypad], a ld a, 0 @@ -30,7 +30,7 @@ _ScrollingMenu:: ; 245cb ret ; 245e1 -.zero: ; 245e1 +.zero ; 245e1 call ScrollingMenu_InitDisplay ld a, 1 ld [hBGMapMode], a @@ -84,13 +84,13 @@ ScrollingMenuJoyAction: ; 24609 jr .loop ; 24640 -.unreferenced: ; unreferenced +.unreferenced ; unreferenced ld a, -1 and a ret ; 24644 -.a_button: ; 24644 +.a_button ; 24644 call PlaceHollowCursor ld a, [wMenuCursorY] dec a @@ -111,13 +111,13 @@ ScrollingMenuJoyAction: ; 24609 ret ; 2466f -.b_button: ; 2466f +.b_button ; 2466f ld a, B_BUTTON scf ret ; 24673 -.select: ; 24673 +.select ; 24673 ld a, [wMenuData2Flags] bit 7, a jp z, xor_a_dec_a @@ -135,7 +135,7 @@ ScrollingMenuJoyAction: ; 24609 ret ; 24695 -.start: ; 24695 +.start ; 24695 ld a, [wMenuData2Flags] bit 6, a jp z, xor_a_dec_a @@ -144,7 +144,7 @@ ScrollingMenuJoyAction: ; 24609 ret ; 246a1 -.d_left: ; 246a1 +.d_left ; 246a1 ld hl, w2DMenuFlags2 bit 7, [hl] jp z, xor_a_dec_a @@ -156,7 +156,7 @@ ScrollingMenuJoyAction: ; 24609 ret ; 246b5 -.d_right: ; 246b5 +.d_right ; 246b5 ld hl, w2DMenuFlags2 bit 7, [hl] jp z, xor_a_dec_a @@ -168,7 +168,7 @@ ScrollingMenuJoyAction: ; 24609 ret ; 246c9 -.d_up: ; 246c9 +.d_up ; 246c9 ld hl, w2DMenuFlags2 bit 7, [hl] jp z, xor_a @@ -183,7 +183,7 @@ ScrollingMenuJoyAction: ; 24609 jp xor_a_dec_a ; 246df -.d_down: ; 246df +.d_down ; 246df ld hl, w2DMenuFlags2 bit 7, [hl] jp z, xor_a diff --git a/engine/sine.asm b/engine/sine.asm index b5da8059c..89a905d2e 100755 --- a/engine/sine.asm +++ b/engine/sine.asm @@ -44,7 +44,7 @@ _Sine:: ; 84d9 jr nz, .multiply ret -.sinewave: ; 850b +.sinewave ; 850b ; A $20-word table representing a sine wave. ; 90 degrees is index $10 at a base amplitude of $100. sine_wave $100 diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 3077677ee..c31dbd2b3 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -800,7 +800,7 @@ Function92bd4: ; 92bd4 (24:6bd4) ; 92be4 (24:6be4) -.dw: ; 92be4 +.dw ; 92be4 dw ReelAction_DoNothing ; 00 dw Slots_StopReelIgnoreJoypad ; 01 @@ -1330,18 +1330,18 @@ Slots_CheckMatchedFirstTwoReels: ; 92e94 dw .three ; 92ec5 -.three: ; 92ec5 +.three ; 92ec5 call .CheckUpwardsDiag call .CheckDownwardsDiag -.two: ; 92ecb +.two ; 92ecb call .CheckBottomRow call .CheckTopRow -.one: ; 92ed1 +.one ; 92ed1 call .CheckMiddleRow -.zero: ; 92ed4 +.zero ; 92ed4 ret ; 92ed5 @@ -1445,18 +1445,18 @@ Slots_CheckMatchedAllThreeReels: ; 92f1d dw .three ; 92f50 -.three: ; 92f50 +.three ; 92f50 call .CheckUpwardsDiag call .CheckDownwardsDiag -.two: ; 92f56 +.two ; 92f56 call .CheckBottomRow call .CheckTopRow -.one: ; 92f5c +.one ; 92f5c call .CheckMiddleRow -.zero: ; 92f5f +.zero ; 92f5f ret ; 92f60 @@ -1967,7 +1967,7 @@ SlotMachine_AnimateGolem: ; 9321d (24:721d) dw .roll -.init: ; 93233 (24:7233) +.init ; 93233 (24:7233) ld hl, SPRITEANIMSTRUCT_0E add hl, bc ld a, [hl] @@ -1992,7 +1992,7 @@ SlotMachine_AnimateGolem: ; 9321d (24:721d) add hl, bc ld [hl], $0 -.fall: ; 93259 (24:7259) +.fall ; 93259 (24:7259) ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] @@ -2021,7 +2021,7 @@ SlotMachine_AnimateGolem: ; 9321d (24:721d) call Slots_PlaySFX ret -.roll: ; 93289 (24:7289) +.roll ; 93289 (24:7289) ld hl, SPRITEANIMSTRUCT_XOFFSET add hl, bc ld a, [hl] @@ -2068,7 +2068,7 @@ Slots_AnimateChansey: ; 932ac (24:72ac) dw .two -.walk: ; 932c2 (24:72c2) +.walk ; 932c2 (24:72c2) ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc ld a, [hl] @@ -2088,7 +2088,7 @@ Slots_AnimateChansey: ; 932ac (24:72ac) ld a, $1 ld [wcf64], a -.one: ; 932e0 (24:72e0) +.one ; 932e0 (24:72e0) ld a, [wcf64] cp $2 jr z, .retain @@ -2106,7 +2106,7 @@ Slots_AnimateChansey: ; 932ac (24:72ac) ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld [hl], $8 -.two: ; 932fc (24:72fc) +.two ; 932fc (24:72fc) ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm index 8d75d0430..5addaad5d 100755 --- a/engine/sprite_anims.asm +++ b/engine/sprite_anims.asm @@ -54,7 +54,7 @@ DoAnimFrame: ; 8d24b .Null: ; 8d2a1 (23:52a1) ret -.one: ; 8d2a2 (23:52a2) +.one ; 8d2a2 (23:52a2) ld a, [wMenuCursorY] ld hl, SPRITEANIMSTRUCT_INDEX @@ -71,7 +71,7 @@ DoAnimFrame: ; 8d24b ld [hl], $0 ret -.two: ; 8d2b9 (23:52b9) +.two ; 8d2b9 (23:52b9) ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc ld [hl], 8 * 3 @@ -113,7 +113,7 @@ DoAnimFrame: ; 8d24b ld [hl], a ret -.three: ; 8d2ea (23:52ea) +.three ; 8d2ea (23:52ea) ld a, [wMenuCursorY] ld hl, SPRITEANIMSTRUCT_INDEX @@ -132,7 +132,7 @@ DoAnimFrame: ; 8d24b ld [hl], 8 * 3 ret -.four: ; 8d302 (23:5302) +.four ; 8d302 (23:5302) call .anonymous_dw jp [hl] ; 8d306 (23:5306) @@ -142,7 +142,7 @@ DoAnimFrame: ; 8d24b dw .four_one ; 8d30a -.four_zero: ; 8d30a +.four_zero ; 8d30a call .IncrementSpriteAnimStruct0B ld hl, SPRITEANIMSTRUCT_INDEX @@ -160,7 +160,7 @@ DoAnimFrame: ; 8d24b add hl, bc ld [hl], a -.four_one: ; 8d321 +.four_one ; 8d321 ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc ld a, [hl] @@ -203,7 +203,7 @@ DoAnimFrame: ; 8d24b ret ; 8d35a -.twentyfive: ; 8d35a (23:535a) +.twentyfive ; 8d35a (23:535a) ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] @@ -217,11 +217,11 @@ DoAnimFrame: ; 8d24b ld [hl], a ret -.namingscreencursor: ; 8d36c (23:536c) +.namingscreencursor ; 8d36c (23:536c) callab NamingScreen_AnimateCursor ret -.mailcompositioncursor: ; 8d373 (23:5373) +.mailcompositioncursor ; 8d373 (23:5373) callab ComposeMail_AnimateCursor ret @@ -229,7 +229,7 @@ DoAnimFrame: ; 8d24b callab GameFreakLogoJumper ret -.seven: ; 8d381 (23:5381) +.seven ; 8d381 (23:5381) ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] @@ -279,7 +279,7 @@ DoAnimFrame: ; 8d24b call DeinitializeSprite ret -.eight: ; 8d3c3 (23:53c3) +.eight ; 8d3c3 (23:53c3) ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hli] @@ -404,19 +404,19 @@ DoAnimFrame: ; 8d24b ld [hl], a ret -.thirteen: ; 8d46e (23:546e) +.thirteen ; 8d46e (23:546e) callab ret_e00ed ret -.fifteen: ; 8d475 (23:5475) +.fifteen ; 8d475 (23:5475) callab AnimatePokegearModeIndicatorArrow ret -.fourteen: ; 8d47c (23:547c) +.fourteen ; 8d47c (23:547c) callab DummyGame_InterpretJoypad_AnimateCursor ret -.sixteen: ; 8d483 (23:5483) +.sixteen ; 8d483 (23:5483) call .anonymous_dw jp [hl] ; 8d487 (23:5487) @@ -430,7 +430,7 @@ DoAnimFrame: ; 8d24b dw .sixteen_five ; 8d493 -.sixteen_zero: ; 8d493 +.sixteen_zero ; 8d493 ld a, $14 call _ReinitSpriteAnimFrame @@ -444,7 +444,7 @@ DoAnimFrame: ; 8d24b ret ; 8d4a5 -.sixteen_two: ; 8d4a5 +.sixteen_two ; 8d4a5 ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] @@ -460,7 +460,7 @@ DoAnimFrame: ; 8d24b add hl, bc ld [hl], $40 -.sixteen_three: ; 8d4b8 +.sixteen_three ; 8d4b8 ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] @@ -481,7 +481,7 @@ DoAnimFrame: ; 8d24b jr .sixteen_five ; 8d4d5 -.sixteen_one: ; 8d4d5 +.sixteen_one ; 8d4d5 ld hl, SPRITEANIMSTRUCT_0B add hl, bc ld [hl], $4 @@ -496,7 +496,7 @@ DoAnimFrame: ; 8d24b ret ; 8d4e8 -.sixteen_four: ; 8d4e8 +.sixteen_four ; 8d4e8 ld hl, SPRITEANIMSTRUCT_0D add hl, bc ld a, [hl] @@ -542,12 +542,12 @@ DoAnimFrame: ; 8d24b call .IncrementSpriteAnimStruct0B ret -.sixteen_five: ; 8d526 +.sixteen_five ; 8d526 call DeinitializeSprite ret ; 8d52a -.seventeen: ; 8d52a (23:552a) +.seventeen ; 8d52a (23:552a) ld hl, SPRITEANIMSTRUCT_XCOORD add hl, bc ld a, [hl] @@ -565,7 +565,7 @@ DoAnimFrame: ; 8d24b call DeinitializeSprite ret -.eighteen: ; 8d543 (23:5543) +.eighteen ; 8d543 (23:5543) callab Function29676 ret @@ -610,7 +610,7 @@ DoAnimFrame: ; 8d24b callab AnimateTuningKnob ret -.twentyone: ; 8d57f (23:557f) +.twentyone ; 8d57f (23:557f) ld hl, SPRITEANIMSTRUCT_0D add hl, bc ld e, [hl] @@ -749,15 +749,15 @@ endr ld [hl], a ret -.twentyseven: ; 8d630 (23:5630) +.twentyseven ; 8d630 (23:5630) callba Function108bc7 ret -.twentyeight: ; 8d637 (23:5637) +.twentyeight ; 8d637 (23:5637) callba Function108be0 ret -.twentynine: ; 8d63e (23:563e) +.twentynine ; 8d63e (23:563e) ld a, [wcf65] and a jr nz, .asm_8d645 @@ -784,7 +784,7 @@ endr call _ReinitSpriteAnimFrame ret -.thirty: ; 8d666 (23:5666) +.thirty ; 8d666 (23:5666) ld hl, SPRITEANIMSTRUCT_0C add hl, bc ld a, [hl] @@ -803,7 +803,7 @@ endr .asm_8d67f ret -.thirtytwo: ; 8d680 (23:5680) +.thirtytwo ; 8d680 (23:5680) ld hl, SPRITEANIMSTRUCT_0B add hl, bc ld d, [hl] @@ -830,7 +830,7 @@ endr ld [hl], a ret -.thirtythree: ; 8d6a2 (23:56a2) +.thirtythree ; 8d6a2 (23:56a2) ld a, [wcf64] cp $40 ret nz @@ -838,7 +838,7 @@ endr call _ReinitSpriteAnimFrame ret -.thirtyfour: ; 8d6ae (23:56ae) +.thirtyfour ; 8d6ae (23:56ae) ld hl, SPRITEANIMSTRUCT_YCOORD add hl, bc ld a, [hl] @@ -846,15 +846,15 @@ endr ld [hl], a ret -.twentysix: ; 8d6b7 (23:56b7) +.twentysix ; 8d6b7 (23:56b7) callba Function11d0b6 ret -.thirtyone: ; 8d6be (23:56be) +.thirtyone ; 8d6be (23:56be) callba UpdateCelebiPosition ret -.anonymous_dw: ; 8d6c5 (23:56c5) +.anonymous_dw ; 8d6c5 (23:56c5) ld hl, [sp+$0] ld e, [hl] inc hl diff --git a/engine/sprites.asm b/engine/sprites.asm index 1059803b3..5755c6d8f 100755 --- a/engine/sprites.asm +++ b/engine/sprites.asm @@ -649,7 +649,7 @@ Sprites_Sine: ; 8e72c ret ; 8e75d -.sinewave: ; 8e75d +.sinewave ; 8e75d sine_wave $100 diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index 5c44d667c..e3bc6069c 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -369,7 +369,7 @@ StatsScreen_JoypadAction: ; 4de54 (13:5e54) call StatsScreen_SetJumptableIndex ret -.b_button: ; 4dee4 (13:5ee4) +.b_button ; 4dee4 (13:5ee4) ld h, 7 call StatsScreen_SetJumptableIndex ret @@ -863,7 +863,7 @@ StatsScreen_PlaceFrontpic: ; 4e226 (13:6226) call .get_animation ret -.get_animation: ; 4e289 (13:6289) +.get_animation ; 4e289 (13:6289) ld a, [CurPartySpecies] call IsAPokemon ret c @@ -1101,7 +1101,7 @@ StatsScreen_LoadPageIndicators: ; 4e4cd (13:64cd) hlcoord 15, 5 jr z, .load_square hlcoord 17, 5 -.load_square: ; 4e4f7 (13:64f7) +.load_square ; 4e4f7 (13:64f7) push bc ld [hli], a inc a diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 278ada3ad..9c9542cf4 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -1807,7 +1807,7 @@ GameCornerCoinVendorScript: ; 0xbcdcd CoinVendor_IntroScript: ; 0xbcde0 farwritetext CoinVendor_IntroText -.loop: ; 0xbcde4 +.loop ; 0xbcde4 special Special_DisplayMoneyAndCoinBalance loadmenudata .MenuDataHeader verticalmenu diff --git a/engine/switch_items.asm b/engine/switch_items.asm index d1c8aa66c..0d4512876 100755 --- a/engine/switch_items.asm +++ b/engine/switch_items.asm @@ -242,7 +242,7 @@ endr ; 24a91 (9:4a91) -.spacing_dws: ; 24a91 +.spacing_dws ; 24a91 dw 0, 1, 2 ; 24a97 diff --git a/engine/tile_events.asm b/engine/tile_events.asm index 77f267b4f..c1ae93363 100755 --- a/engine/tile_events.asm +++ b/engine/tile_events.asm @@ -44,7 +44,7 @@ CheckWarpFacingDown: ; 149c6 ret ; 149d3 -.blocks: ; 149d3 +.blocks ; 149d3 db $71 ; door db $79 db $7a ; stairs @@ -65,7 +65,7 @@ CheckGrassCollision:: ; 149dd ret ; 149ea -.blocks: ; 149ea +.blocks ; 149ea db $08 db $18 ; tall grass db $14 ; tall grass @@ -87,7 +87,7 @@ CheckCutCollision: ; 149f5 ret ; 14a00 -.blocks: ; 14a00 +.blocks ; 14a00 db $12 ; cut tree db $1a ; cut tree db $10 ; tall grass diff --git a/engine/timeset.asm b/engine/timeset.asm index 50bc0d3c0..fd6b2de94 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -379,19 +379,19 @@ OakText_ResponseToSetTime: ; 0x908b8 ret ; 908ec (24:48ec) -.overslept: ; 0x908ec +.overslept ; 0x908ec ; ! I overslept! text_jump UnknownText_0x1bc326 db "@" ; 0x908f1 -.yikes: ; 0x908f1 +.yikes ; 0x908f1 ; ! Yikes! I over- slept! text_jump UnknownText_0x1bc336 db "@" ; 0x908f6 -.sodark: ; 0x908f6 +.sodark ; 0x908f6 ; ! No wonder it's so dark! text_jump UnknownText_0x1bc34f db "@" diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm index 36bf55357..b6fac7f7c 100755 --- a/engine/trainer_card.asm +++ b/engine/trainer_card.asm @@ -540,7 +540,7 @@ TrainerCard_Page2_3_OAMUpdate: ; 25448 (9:5448) ; 254a7 (9:54a7) -.facing1: ; 254a7 +.facing1 ; 254a7 ; y, x, tile, OAM attributes db 0, 0, 0, 0 db 0, 8, 1, 0 @@ -548,7 +548,7 @@ TrainerCard_Page2_3_OAMUpdate: ; 25448 (9:5448) db 8, 8, 3, 0 db -1 -.facing2: ; 254b8 +.facing2 ; 254b8 db 0, 0, 1, X_FLIP db 0, 8, 0, X_FLIP db 8, 0, 3, X_FLIP diff --git a/engine/variables.asm b/engine/variables.asm index 0f6cfc2c2..3ddfce8d6 100755 --- a/engine/variables.asm +++ b/engine/variables.asm @@ -28,7 +28,7 @@ endr call _de_ ret -.loadstringbuffer2: ; 8066c (20:466c) +.loadstringbuffer2 ; 8066c (20:466c) ld de, StringBuffer2 ld [de], a ret diff --git a/engine/warp_connection.asm b/engine/warp_connection.asm index 6d7e00181..9d1f35479 100755 --- a/engine/warp_connection.asm +++ b/engine/warp_connection.asm @@ -277,7 +277,7 @@ Function1047a3: ; 1047a3 (41:47a3) decoord 0, 0, AttrMap ld a, $1 ld [rVBK], a -.copy: +.copy hlbgcoord 0, 0 ld c, SCREEN_WIDTH ld b, SCREEN_HEIGHT diff --git a/event/battle_tower.asm b/event/battle_tower.asm index a938e34c7..091fe7fe1 100644 --- a/event/battle_tower.asm +++ b/event/battle_tower.asm @@ -300,7 +300,7 @@ VerifyUniqueness: ; 8b2e9 ret ; 8b31a -.nextmon: ; 8b31a +.nextmon ; 8b31a push bc ld bc, PARTYMON_STRUCT_LENGTH add hl, bc @@ -309,7 +309,7 @@ VerifyUniqueness: ; 8b2e9 ret ; 8b322 -.isegg: ; 8b322 +.isegg ; 8b322 push bc ld b, a ld a, [de] diff --git a/event/buena.asm b/event/buena.asm index 433ecf014..5cff72d53 100644 --- a/event/buena.asm +++ b/event/buena.asm @@ -236,7 +236,7 @@ Buena_PlacePrizeMenuBox: ; 8b0d6 ret ; 8b0dd -.menudataheader: ; 0x8b0dd +.menudataheader ; 0x8b0dd db $40 ; flags db 00, 00 ; start coords db 11, 17 ; end coords @@ -288,13 +288,13 @@ Buena_PrizeMenu: ; 8b0e2 dba .prizepoints ; 8b129 -.indices: ; 8b129 +.indices ; 8b129 db 9 db 1, 2, 3, 4, 5, 6, 7, 8, 9 db -1 ; 8b134 -.prizeitem: ; 8b134 +.prizeitem ; 8b134 ld a, [MenuSelection] call Buena_getprize ld a, [hl] @@ -306,7 +306,7 @@ Buena_PrizeMenu: ; 8b0e2 ret ; 8b147 -.prizepoints: ; 8b147 +.prizepoints ; 8b147 ld a, [MenuSelection] call Buena_getprize inc hl @@ -328,7 +328,7 @@ endr ret ; 8b15e -.prizes: ; 8b15e +.prizes ; 8b15e db ULTRA_BALL, 2 db FULL_RESTORE, 2 db NUGGET, 3 diff --git a/event/celebi.asm b/event/celebi.asm index 9048f7b38..c6d8346b0 100755 --- a/event/celebi.asm +++ b/event/celebi.asm @@ -279,7 +279,7 @@ endr ; 49b6e (12:5b6e) -.sinewave: ; 49b6e +.sinewave ; 49b6e sine_wave $100 ; 49bae diff --git a/event/field_moves.asm b/event/field_moves.asm index 658a21698..cf9e1bef0 100755 --- a/event/field_moves.asm +++ b/event/field_moves.asm @@ -174,7 +174,7 @@ endr ; 8ca1b -.dw: ; 8ca1b (23:4a1b) +.dw ; 8ca1b (23:4a1b) dw Cut_SpawnAnimateTree dw Cut_SpawnAnimateLeaves dw Cut_StartWaiting diff --git a/event/forced_movement.asm b/event/forced_movement.asm index b6e6091ff..aa0473803 100755 --- a/event/forced_movement.asm +++ b/event/forced_movement.asm @@ -7,22 +7,22 @@ Script_ForcedMovement:: ; 0x1253d end ; 0x12550 -.up: ; 0x12550 +.up ; 0x12550 applymovement PLAYER, .MovementData_up end ; 0x12555 -.down: ; 0x12555 +.down ; 0x12555 applymovement PLAYER, .MovementData_down end ; 0x1255a -.right: ; 0x1255a +.right ; 0x1255a applymovement PLAYER, .MovementData_right end ; 0x1255f -.left: ; 0x1255f +.left ; 0x1255f applymovement PLAYER, .MovementData_left end ; 0x12564 diff --git a/event/itemball.asm b/event/itemball.asm index 083d7efc2..ed0c6a9e0 100755 --- a/event/itemball.asm +++ b/event/itemball.asm @@ -11,7 +11,7 @@ FindItemInBallScript:: ; 0x122ce end ; 0x122e3 -.no_room: ; 0x122e3 +.no_room ; 0x122e3 opentext writetext .text_found waitbutton @@ -21,13 +21,13 @@ FindItemInBallScript:: ; 0x122ce end ; 0x122ee -.text_found: ; 0x122ee +.text_found ; 0x122ee ; found @ ! text_jump UnknownText_0x1c0a1c db "@" ; 0x122f3 -.text_bag_full: ; 0x122f3 +.text_bag_full ; 0x122f3 ; But can't carry any more items. text_jump UnknownText_0x1c0a2c db "@" diff --git a/event/magikarp.asm b/event/magikarp.asm index 4f8df1999..b9f73552c 100644 --- a/event/magikarp.asm +++ b/event/magikarp.asm @@ -86,7 +86,7 @@ Magikarp_LoadFeetInchesChars: ; fbbae ret ; fbbbb -.feetinchchars: ; fbbb +.feetinchchars ; fbbb INCBIN "gfx/unknown/0fbbbb.2bpp" ; fbbdb diff --git a/event/mom.asm b/event/mom.asm index 176fc85ee..d2b7d2a7c 100644 --- a/event/mom.asm +++ b/event/mom.asm @@ -32,7 +32,7 @@ endr jp [hl] ; 16242 -.dw: ; 16242 +.dw ; 16242 dw .CheckIfBankInitialized dw .InitializeBank @@ -534,7 +534,7 @@ Function16571: ; 16571 ret ; 165b9 -.dpadaction: ; 165b9 +.dpadaction ; 165b9 ld hl, hJoyLast ld a, [hl] and D_UP @@ -586,7 +586,7 @@ Function16571: ; 16571 ret ; 16607 -.getdigitquantity: ; 16607 +.getdigitquantity ; 16607 ld a, [wMomBankDigitCursorPosition] push de ld e, a diff --git a/event/overworld.asm b/event/overworld.asm index c1a68dc77..c9fe754fe 100755 --- a/event/overworld.asm +++ b/event/overworld.asm @@ -286,7 +286,7 @@ CutTreeBlockPointers: ; c862 dbw TILESET_ILEX_FOREST, .ilex db -1 -.johto1: ; Johto OW +.johto1 ; Johto OW ; Which meta tile are we facing, which should we replace it with, and which animation? db $03, $02, $01 ; grass db $5b, $3c, $00 ; tree @@ -295,11 +295,11 @@ CutTreeBlockPointers: ; c862 db $67, $3e, $00 ; tree db -1 -.johto2: ; Goldenrod area +.johto2 ; Goldenrod area db $03, $02, $01 ; grass db -1 -.kanto: ; Kanto OW +.kanto ; Kanto OW db $0b, $0a, $01 ; grass db $32, $6d, $00 ; tree db $33, $6c, $00 ; tree @@ -308,12 +308,12 @@ CutTreeBlockPointers: ; c862 db $60, $6e, $00 ; tree db -1 -.park: ; National Park +.park ; National Park db $13, $03, $01 ; grass db $03, $04, $01 ; grass db -1 -.ilex: ; Ilex Forest +.ilex ; Ilex Forest db $0f, $17, $00 db -1 @@ -321,7 +321,7 @@ WhirlpoolBlockPointers: ; c8a4 dbw TILESET_JOHTO_1, .johto db -1 -.johto: ; c8a8 +.johto ; c8a8 db $07, $36, $00 db -1 @@ -471,7 +471,7 @@ UsedSurfScript: ; c986 applymovement PLAYER, MovementBuffer ; PLAYER, MovementBuffer end -.empty_fn: ; c9a2 +.empty_fn ; c9a2 callba MobileFn_1060bb ; empty ret diff --git a/event/poisonstep.asm b/event/poisonstep.asm index c0f2e1b9c..1e81e188f 100755 --- a/event/poisonstep.asm +++ b/event/poisonstep.asm @@ -118,7 +118,7 @@ DoPoisonStep:: ; 505da end ; 50677 -.whiteout: ; 50677 +.whiteout ; 50677 farjump Script_OverworldWhiteout ; 5067b diff --git a/home/joypad.asm b/home/joypad.asm index 4c46111be..d66cdb662 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -408,7 +408,7 @@ ButtonSound:: ; aaf jp DelayFrames ; ac6 -.wait_input: ; ac6 +.wait_input ; ac6 ld a, [hOAMUpdate] push af ld a, $1 @@ -436,7 +436,7 @@ ButtonSound:: ; aaf ret ; af5 -.blink_cursor: ; af5 +.blink_cursor ; af5 ld a, [hVBlankCounter] and %00010000 ; bit 4, a jr z, .cursor_off diff --git a/home/menu.asm b/home/menu.asm index 4fecdfaa6..b7755de08 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -516,7 +516,7 @@ ClearWindowData:: ; 1fbf ret ; 1ff0 -.bytefill: ; 1ff0 +.bytefill ; 1ff0 ld bc, $0010 xor a call ByteFill diff --git a/home/tilemap.asm b/home/tilemap.asm index 152f75686..1d7998130 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -29,7 +29,7 @@ RestoreTileBackup:: ; 0x1c23 ret ; 0x1c30 -.copy: ; 0x1c30 +.copy ; 0x1c30 call GetMenuBoxDims inc b inc c diff --git a/items/item_effects.asm b/items/item_effects.asm index 1153727d8..ef05de8fd 100644 --- a/items/item_effects.asm +++ b/items/item_effects.asm @@ -1596,7 +1596,7 @@ GetItemHealingAction: ; f058 (3:7058) ret ; f071 (3:7071) -.healingactions: ; f071 +.healingactions ; f071 ; item, party menu action text, status db ANTIDOTE, PARTYMENUTEXT_HEAL_PSN, 1 << PSN db BURN_HEAL, PARTYMENUTEXT_HEAL_BRN, 1 << BRN @@ -1620,7 +1620,7 @@ StatusHealer_Jumptable: ; f09e (3:709e) rst JumpTable ret -.dw: ; f0a3 (3:70a3) +.dw ; f0a3 (3:70a3) dw StatusHealer_ClearPalettes dw StatusHealer_NoEffect dw StatusHealer_ExitMenu @@ -2360,7 +2360,7 @@ endr ret ; f504 -.x_item_table: ; f504 +.x_item_table ; f504 db X_ATTACK, ATTACK db X_DEFEND, DEFENSE db X_SPEED, SPEED @@ -2828,7 +2828,7 @@ OpenBox: ; f769 jp UseDisposableItem ; f778 -.text: ; 0xf778 +.text ; 0xf778 ; There was a trophy inside! text_jump UnknownText_0x1c5d03 db "@" diff --git a/lib/mobile/main.asm b/lib/mobile/main.asm index 7f489b18f..de1dc854b 100644 --- a/lib/mobile/main.asm +++ b/lib/mobile/main.asm @@ -117,7 +117,7 @@ Function110030:: ; 110030 (44:4030) ret ; indirectly jump to the function loaded from the dw, which returns to Function3e60. ; 110070 (44:4070) -.dw: ; 110070 +.dw ; 110070 dw Function110115 dw Function110236 dw Function110291 @@ -332,7 +332,7 @@ BugContest_SetCaughtContestMon: ; e6ce call PrintText ret -.generatestats: ; e6fd +.generatestats ; e6fd ld a, [TempEnemyMonSpecies] ld [CurSpecies], a ld [CurPartySpecies], a @@ -346,7 +346,7 @@ BugContest_SetCaughtContestMon: ; e6ce ld hl, wContestMon jp GeneratePartyMonStats -.caughttext: ; 0xe71d +.caughttext ; 0xe71d ; Caught @ ! text_jump UnknownText_0x1c10c0 db "@" @@ -454,7 +454,7 @@ RepelWoreOffScript:: ; 0x13619 closetext end -.text: ; 0x13620 +.text ; 0x13620 ; REPEL's effect wore off. text_jump UnknownText_0x1bd308 db "@" @@ -471,21 +471,21 @@ HiddenItemScript:: ; 0x13625 itemnotify jump .finish -.bag_full: ; 0x1363e +.bag_full ; 0x1363e buttonsound writetext .no_room_text waitbutton -.finish: ; 13643 +.finish ; 13643 closetext end -.found_text: ; 0x13645 +.found_text ; 0x13645 ; found @ ! text_jump UnknownText_0x1bd321 db "@" -.no_room_text: ; 0x1364a +.no_room_text ; 0x1364a ; But has no space left… text_jump UnknownText_0x1bd331 db "@" @@ -884,9 +884,9 @@ Function24b8f: ; 24b8f ld [Options], a ret -.slash_500: ; 24bcf +.slash_500 ; 24bcf db "/500@" -.booru_ko: ; 24bd4 +.booru_ko ; 24bd4 db "ボール こ@" StartMenu_DrawBugContestStatusBox: ; 24bdc @@ -985,7 +985,7 @@ FindApricornsInBag: ; 24c64 scf ret -.addtobuffer: ; 24c94 +.addtobuffer ; 24c94 push hl ld hl, Buffer1 inc [hl] @@ -2850,17 +2850,17 @@ _ResetClock: ; 4d3b1 call PrintText ret -.text_okay: ; 0x4d3fe +.text_okay ; 0x4d3fe ; Password OK. Select CONTINUE & reset settings. text_jump UnknownText_0x1c55db db "@" -.text_wrong: ; 0x4d403 +.text_wrong ; 0x4d403 ; Wrong password! text_jump UnknownText_0x1c560b db "@" -.text_askreset: ; 0x4d408 +.text_askreset ; 0x4d408 ; Reset the clock? text_jump UnknownText_0x1c561c db "@" @@ -2921,12 +2921,12 @@ ClockResetPassword: ; 4d41e scf ret -.pleaseenterpasswordtext: ; 0x4d463 +.pleaseenterpasswordtext ; 0x4d463 ; Please enter the password. text_jump UnknownText_0x1c562e db "@" -.updateIDdisplay: ; 4d468 +.updateIDdisplay ; 4d468 hlcoord 14, 15 ld de, StringBuffer2 ld c, 5 @@ -2949,7 +2949,7 @@ ClockResetPassword: ; 4d41e ld [hl], $61 ret -.dpadinput: ; 4d490 +.dpadinput ; 4d490 ld a, b and D_LEFT jr nz, .left @@ -3006,7 +3006,7 @@ ClockResetPassword: ; 4d41e ld [hl], 9 ret -.getcurrentdigit: ; 4d4d5 +.getcurrentdigit ; 4d4d5 ld a, [StringBuffer2 + 5] ld e, a ld d, $0 @@ -3880,7 +3880,7 @@ CatchTutorial:: ; 4e554 ld l, a jp [hl] -.dw: ; 4e564 (13:6564) +.dw ; 4e564 (13:6564) dw .DudeTutorial dw .DudeTutorial dw .DudeTutorial @@ -4751,7 +4751,7 @@ endr .done ret -.load_loop: ; 50cc9 +.load_loop ; 50cc9 ld [hli], a ld [hld], a add hl, de @@ -6566,7 +6566,7 @@ DrawPokedexSearchResultsWindow: ; 1de1d1 (77:61d1) call PlaceString ret -.esults_D: ; 1de23c +.esults_D ; 1de23c ; (SEARCH R) db "ESULTS<NEXT>" ; (### FOUN) diff --git a/maps/BattleTower1F.asm b/maps/BattleTower1F.asm index 10e8fa51a..38257a0be 100644 --- a/maps/BattleTower1F.asm +++ b/maps/BattleTower1F.asm @@ -33,7 +33,7 @@ BattleTower1F_MapScriptHeader: priorityjump Script_ResumeBattleTowerChallenge end -.priorityjump1: +.priorityjump1 priorityjump BattleTower_LeftWithoutSaving writebyte BATTLETOWERACTION_CHALLENGECANCELED special BattleTowerAction @@ -203,7 +203,7 @@ UnreferencedScript_0x9e4ea: writetext Text_CantBeRegistered_PreviousRecordDeleted jump continue -.zero: +.zero writetext Text_CantBeRegistered continue: yesorno diff --git a/maps/BattleTowerHallway.asm b/maps/BattleTowerHallway.asm index 6c4a45920..03424a977 100644 --- a/maps/BattleTowerHallway.asm +++ b/maps/BattleTowerHallway.asm @@ -24,7 +24,7 @@ BattleTowerHallway_MapScriptHeader: jump .WalkToChosenBattleRoom -.asm_load_battle_room: +.asm_load_battle_room ld a, [rSVBK] push af diff --git a/maps/BurnedTower1F.asm b/maps/BurnedTower1F.asm index b899ec3d7..d1170332c 100644 --- a/maps/BurnedTower1F.asm +++ b/maps/BurnedTower1F.asm @@ -79,7 +79,7 @@ BurnedTowerRivalBattleScript: reloadmapafterbattle jump .returnfrombattle -.totodile: +.totodile winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText setlasttalked BURNEDTOWER1F_SILVER loadtrainer RIVAL1, RIVAL1_7 @@ -88,7 +88,7 @@ BurnedTowerRivalBattleScript: reloadmapafterbattle jump .returnfrombattle -.chikorita: +.chikorita winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText setlasttalked BURNEDTOWER1F_SILVER loadtrainer RIVAL1, RIVAL1_8 @@ -97,7 +97,7 @@ BurnedTowerRivalBattleScript: reloadmapafterbattle jump .returnfrombattle -.returnfrombattle: +.returnfrombattle playmusic MUSIC_RIVAL_AFTER opentext writetext BurnedTowerSilver_AfterText1 diff --git a/maps/CeladonGameCornerPrizeRoom.asm b/maps/CeladonGameCornerPrizeRoom.asm index 1f2ca6ea3..4dd5de28b 100644 --- a/maps/CeladonGameCornerPrizeRoom.asm +++ b/maps/CeladonGameCornerPrizeRoom.asm @@ -33,7 +33,7 @@ CeladonPrizeRoom_tmcounterloop: if_equal $3, .hyperbeam jump CeladonPrizeRoom_cancel -.doubleteam: +.doubleteam checkcoins 1500 if_equal $2, CeladonPrizeRoom_notenoughcoins itemtotext TM_DOUBLE_TEAM, $0 @@ -44,7 +44,7 @@ CeladonPrizeRoom_tmcounterloop: takecoins 1500 jump CeladonPrizeRoom_purchased -.psychic: +.psychic checkcoins 3500 if_equal $2, CeladonPrizeRoom_notenoughcoins itemtotext TM_PSYCHIC, $0 @@ -55,7 +55,7 @@ CeladonPrizeRoom_tmcounterloop: takecoins 3500 jump CeladonPrizeRoom_purchased -.hyperbeam: +.hyperbeam checkcoins 7500 if_equal $2, CeladonPrizeRoom_notenoughcoins itemtotext TM_HYPER_BEAM, $0 @@ -126,7 +126,7 @@ GoldenrodGameCornerPokemonVendor: waitbutton checkitem COIN_CASE iffalse CeladonPrizeRoom_NoCoinCase -.loop: +.loop writetext CeladonPrizeRoom_AskWhichPrizeText special Special_DisplayCoinCaseBalance loadmenudata .MenuDataHeader @@ -137,7 +137,7 @@ GoldenrodGameCornerPokemonVendor: if_equal $3, .larvitar jump CeladonPrizeRoom_cancel -.pikachu: +.pikachu checkcoins 2222 if_equal $2, CeladonPrizeRoom_notenoughcoins checkcode VAR_PARTYCOUNT @@ -155,7 +155,7 @@ GoldenrodGameCornerPokemonVendor: takecoins 2222 jump .loop -.porygon: +.porygon checkcoins 5555 if_equal $2, CeladonPrizeRoom_notenoughcoins checkcode VAR_PARTYCOUNT @@ -173,7 +173,7 @@ GoldenrodGameCornerPokemonVendor: takecoins 5555 jump .loop -.larvitar: +.larvitar checkcoins 8888 if_equal $2, CeladonPrizeRoom_notenoughcoins checkcode VAR_PARTYCOUNT diff --git a/maps/CeruleanPokeCenter1F.asm b/maps/CeruleanPokeCenter1F.asm index 0e3aac84a..2705fc418 100644 --- a/maps/CeruleanPokeCenter1F.asm +++ b/maps/CeruleanPokeCenter1F.asm @@ -18,7 +18,7 @@ SuperNerdScript_0x188212: iftrue .mobile jumptextfaceplayer UnknownText_0x188221 -.mobile: +.mobile jumptextfaceplayer UnknownText_0x18828c GymGuyScript_0x18821e: diff --git a/maps/EcruteakPokeCenter1F.asm b/maps/EcruteakPokeCenter1F.asm index d595e83e2..b611e7df4 100644 --- a/maps/EcruteakPokeCenter1F.asm +++ b/maps/EcruteakPokeCenter1F.asm @@ -67,7 +67,7 @@ EcruteakPokeCenter1FPokefanMScript: iftrue .mobile jumptextfaceplayer EcruteakPokeCenter1FPokefanMText -.mobile: +.mobile jumptextfaceplayer EcruteakPokeCenter1FPokefanMTextMobile EcruteakPokeCenter1FCooltrainerFScript: diff --git a/maps/FastShipCabins_SW_SSW_NW.asm b/maps/FastShipCabins_SW_SSW_NW.asm index 13f0399c3..536515dd7 100644 --- a/maps/FastShipCabins_SW_SSW_NW.asm +++ b/maps/FastShipCabins_SW_SSW_NW.asm @@ -57,7 +57,7 @@ GuitaristClydeScript: closetext end -.mobile: +.mobile opentext writetext UnknownText_0x75cfe waitbutton diff --git a/maps/GoldenrodDeptStore5F.asm b/maps/GoldenrodDeptStore5F.asm index f146a5e52..b10f019ac 100644 --- a/maps/GoldenrodDeptStore5F.asm +++ b/maps/GoldenrodDeptStore5F.asm @@ -23,7 +23,7 @@ GoldenrodDeptStore5F_MapScriptHeader: disappear GOLDENRODDEPTSTORE5F_RECEPTIONIST return -.yes: +.yes appear GOLDENRODDEPTSTORE5F_RECEPTIONIST return @@ -36,27 +36,27 @@ ClerkScript_0x5609c: iftrue .onlyrocksmash jump .neither -.headbutt: +.headbutt checkevent EVENT_GOT_TM08_ROCK_SMASH iftrue .both jump .onlyheadbutt -.neither: +.neither pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_1 closetext end -.onlyheadbutt: +.onlyheadbutt pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_2 closetext end -.onlyrocksmash: +.onlyrocksmash pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_3 closetext end -.both: +.both pokemart MARTTYPE_STANDARD, MART_GOLDENROD_5F_4 closetext end diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index ed88df5a5..ee0ccecb0 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -176,7 +176,7 @@ GoldenrodGameCornerPrizeMonVendorScript: if_equal $3, .wobbuffet jump GoldenrodGameCornerPrizeVendor_CancelPurchaseScript -.abra: +.abra checkcoins 100 if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT @@ -194,7 +194,7 @@ GoldenrodGameCornerPrizeMonVendorScript: takecoins 100 jump .loop -.cubone: +.cubone checkcoins 800 if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT @@ -212,7 +212,7 @@ GoldenrodGameCornerPrizeMonVendorScript: takecoins 800 jump .loop -.wobbuffet: +.wobbuffet checkcoins 1500 if_equal $2, GoldenrodGameCornerPrizeVendor_NotEnoughCoinsScript checkcode VAR_PARTYCOUNT diff --git a/maps/GoldenrodPokeCenter1F.asm b/maps/GoldenrodPokeCenter1F.asm index b8c7b1b76..6cb9cc80d 100644 --- a/maps/GoldenrodPokeCenter1F.asm +++ b/maps/GoldenrodPokeCenter1F.asm @@ -21,7 +21,7 @@ GoldenrodPokeCenter1F_GSBallTriggerLeft: if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end -.gsball: +.gsball checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER iftrue .cancel playsound SFX_EXIT_BUILDING @@ -44,7 +44,7 @@ GoldenrodPokeCenter1F_GSBallTriggerLeft: special RestartMapMusic disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playsound SFX_EXIT_BUILDING -.cancel: +.cancel end GoldenrodPokeCenter1F_GSBallTriggerRight: @@ -53,7 +53,7 @@ GoldenrodPokeCenter1F_GSBallTriggerRight: if_equal MOBILE_EVENT_OBJECT_GS_BALL, .gsball end -.gsball: +.gsball checkevent EVENT_GOT_GS_BALL_FROM_POKECOM_CENTER iftrue .cancel playsound SFX_EXIT_BUILDING @@ -76,7 +76,7 @@ GoldenrodPokeCenter1F_GSBallTriggerRight: special RestartMapMusic disappear GOLDENRODPOKECENTER1F_LINK_RECEPTIONIST playsound SFX_EXIT_BUILDING -.cancel: +.cancel end GameboyKidScript_0x6101e: diff --git a/maps/ManiasHouse.asm b/maps/ManiasHouse.asm index 7c19eed47..f73aa3d8c 100644 --- a/maps/ManiasHouse.asm +++ b/maps/ManiasHouse.asm @@ -30,7 +30,7 @@ ManiaScript: setevent EVENT_GOT_SHUCKIE end -.alreadyhaveshuckie: +.alreadyhaveshuckie checkflag ENGINE_SHUCKLE_GIVEN iffalse .returnshuckie writetext ManiaText_TakeCareOfShuckle @@ -38,19 +38,19 @@ ManiaScript: closetext end -.partyfull: +.partyfull writetext ManiaText_PartyFull waitbutton closetext end -.refusetotakeshuckie: +.refusetotakeshuckie writetext ManiaText_IfHeComesBack waitbutton closetext end -.returnshuckie: +.returnshuckie writetext ManiaText_CanIHaveMyMonBack yesorno iffalse .refused @@ -65,32 +65,32 @@ ManiaScript: setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM end -.wrong: +.wrong writetext ManiaText_ShuckleNotThere waitbutton closetext end -.superhappy: +.superhappy writetext ManiaText_ShuckleLikesYou waitbutton closetext setevent EVENT_MANIA_TOOK_SHUCKIE_OR_LET_YOU_KEEP_HIM end -.refused: +.refused writetext ManiaText_SameAsBeingRobbed waitbutton closetext end -.nothingleft: +.nothingleft writetext ManiaText_ShuckleIsYourLastMon waitbutton closetext end -.default_postevent: +.default_postevent writetext ManiaText_HappinessSpeech waitbutton closetext diff --git a/maps/MobileBattleRoom.asm b/maps/MobileBattleRoom.asm index 5bd595210..109322ad6 100644 --- a/maps/MobileBattleRoom.asm +++ b/maps/MobileBattleRoom.asm @@ -31,7 +31,7 @@ MapMobileBattleRoomSignpost0Script: if_equal $2, .two_ jump .false -.one_: +.one_ writetext MobileBattleRoom_HealText pause 20 closetext @@ -42,18 +42,18 @@ MapMobileBattleRoomSignpost0Script: special FadeInPalettes special RestartMapMusic refreshscreen $0 -.two_: +.two_ special Mobile_HealParty special HealParty special Function10383c iftrue .false -.one: +.one special Function10387b writetext MobileBattleRoom_EstablishingCommsText waitbutton reloadmappart special Function101225 -.false: +.false closetext end diff --git a/maps/RadioTower1F.asm b/maps/RadioTower1F.asm index a1ca4cf64..efcfeb65f 100644 --- a/maps/RadioTower1F.asm +++ b/maps/RadioTower1F.asm @@ -37,7 +37,7 @@ GentlemanScript_0x5cd3d: special Special_CheckLuckyNumberShowFlag iffalse .skip special Special_ResetLuckyNumberShowFlag -.skip: +.skip special Special_PrintTodaysLuckyNumber checkflag ENGINE_LUCKY_NUMBER_SHOW iftrue .GameOver diff --git a/maps/Route29.asm b/maps/Route29.asm index b30675f4f..ab90ea757 100644 --- a/maps/Route29.asm +++ b/maps/Route29.asm @@ -159,13 +159,13 @@ CooltrainerMScript_0x1a1031: iftrue .day_morn checknite iftrue .nite -.day_morn: +.day_morn writetext Text_WaitingForNight waitbutton closetext end -.nite: +.nite writetext Text_WaitingForMorning waitbutton closetext diff --git a/maps/Route30.asm b/maps/Route30.asm index bd669fd6a..640a17742 100644 --- a/maps/Route30.asm +++ b/maps/Route30.asm @@ -135,7 +135,7 @@ TrainerYoungsterJoey: setevent EVENT_GOT_HP_UP_FROM_JOEY jump .NumberAccepted -.done: +.done end .GiveHPUp: diff --git a/maps/Route32.asm b/maps/Route32.asm index 8e73a7b7b..cb12060b5 100644 --- a/maps/Route32.asm +++ b/maps/Route32.asm @@ -142,7 +142,7 @@ _OfferToSellSlowpokeTail: closetext end -.refused: +.refused writetext Text_RefusedToBuySlowpokeTail waitbutton closetext diff --git a/maps/Route34.asm b/maps/Route34.asm index c9db5bcec..582b7fa3d 100644 --- a/maps/Route34.asm +++ b/maps/Route34.asm @@ -69,10 +69,10 @@ DayCareManScript_Outside: applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside playsound SFX_ENTER_DOOR disappear ROUTE34_GRAMPS -.end_fail: +.end_fail end -.walk_around_player: +.walk_around_player applymovement ROUTE34_GRAMPS, Route34MovementData_DayCareManWalksBackInside_WalkAroundPlayer playsound SFX_ENTER_DOOR disappear ROUTE34_GRAMPS diff --git a/maps/Route35Goldenrodgate.asm b/maps/Route35Goldenrodgate.asm index b50ccbd91..96d202f9d 100644 --- a/maps/Route35Goldenrodgate.asm +++ b/maps/Route35Goldenrodgate.asm @@ -33,34 +33,34 @@ OfficerScript_0x69d37: givepoke SPEAROW, 10, NO_ITEM, 1, GiftSpearowName, GiftSpearowOTName givepokeitem GiftSpearowMail setevent EVENT_GOT_KENYA -.alreadyhavekenya: +.alreadyhavekenya writetext UnknownText_0x69ed6 waitbutton closetext end -.partyfull: +.partyfull writetext UnknownText_0x69f56 waitbutton closetext end -.refused: +.refused writetext UnknownText_0x69f74 waitbutton closetext end -.questcomplete: +.questcomplete writetext UnknownText_0x69f8b buttonsound verbosegiveitem HP_UP iffalse .bagfull setevent EVENT_GOT_HP_UP_FROM_RANDY -.gothpup: +.gothpup writetext UnknownText_0x69fd9 waitbutton -.bagfull: +.bagfull closetext end @@ -85,7 +85,7 @@ PokefanFScript_0x69dc6: closetext end -.aftersudowoodo: +.aftersudowoodo writetext UnknownText_0x6a09a waitbutton closetext diff --git a/maps/Route38.asm b/maps/Route38.asm index 85ba2a1d8..2ef07dee0 100644 --- a/maps/Route38.asm +++ b/maps/Route38.asm @@ -17,7 +17,7 @@ Route38_MapScriptHeader: TrainerBird_keeperToby: trainer EVENT_BEAT_BIRD_KEEPER_TOBY, BIRD_KEEPER, TOBY, Bird_keeperTobySeenText, Bird_keeperTobyBeatenText, 0, .script -.script: +.script end_if_just_battled opentext writetext UnknownText_0x1a1f86 @@ -28,7 +28,7 @@ TrainerBird_keeperToby: TrainerSailorHarry: trainer EVENT_BEAT_SAILOR_HARRY, SAILOR, HARRY, SailorHarrySeenText, SailorHarryBeatenText, 0, .script -.script: +.script end_if_just_battled opentext writetext UnknownText_0x1a220c @@ -39,7 +39,7 @@ TrainerSailorHarry: TrainerLassDana1: trainer EVENT_BEAT_LASS_DANA, LASS, DANA1, LassDana1SeenText, LassDana1BeatenText, 0, .script -.script: +.script writecode VAR_CALLERID, PHONE_LASS_DANA end_if_just_battled opentext @@ -177,7 +177,7 @@ TrainerLassDana1: TrainerSchoolboyChad1: trainer EVENT_BEAT_SCHOOLBOY_CHAD, SCHOOLBOY, CHAD1, SchoolboyChad1SeenText, SchoolboyChad1BeatenText, 0, .script -.script: +.script writecode VAR_CALLERID, PHONE_SCHOOLBOY_CHAD end_if_just_battled opentext @@ -294,7 +294,7 @@ TrainerSchoolboyChad1: TrainerBeautyValerie: trainer EVENT_BEAT_BEAUTY_VALERIE, BEAUTY, VALERIE, BeautyValerieSeenText, BeautyValerieBeatenText, 0, .script -.script: +.script end_if_just_battled opentext writetext UnknownText_0x1a2185 @@ -305,7 +305,7 @@ TrainerBeautyValerie: TrainerBeautyOlivia: trainer EVENT_BEAT_BEAUTY_OLIVIA, BEAUTY, OLIVIA, BeautyOliviaSeenText, BeautyOliviaBeatenText, 0, .script -.script: +.script end_if_just_battled opentext writetext UnknownText_0x1a229a diff --git a/maps/Route40.asm b/maps/Route40.asm index e553ca735..a0bddde89 100644 --- a/maps/Route40.asm +++ b/maps/Route40.asm @@ -86,7 +86,7 @@ PokefanMScript_0x1a61c7: iftrue .mobile jumptextfaceplayer UnknownText_0x1a646a -.mobile: +.mobile jumptextfaceplayer UnknownText_0x1a649b LassScript_0x1a61d3: diff --git a/maps/SaffronPokeCenter1F.asm b/maps/SaffronPokeCenter1F.asm index 2b192dfd2..aecafd6b7 100644 --- a/maps/SaffronPokeCenter1F.asm +++ b/maps/SaffronPokeCenter1F.asm @@ -19,7 +19,7 @@ TeacherScript_0x18a480: iftrue .mobile jumptextfaceplayer UnknownText_0x18a4a3 -.mobile: +.mobile jumptextfaceplayer UnknownText_0x18a532 FisherScript_0x18a48c: diff --git a/maps/UndergroundPathSwitchRoomEntrances.asm b/maps/UndergroundPathSwitchRoomEntrances.asm index 967559b00..0fcff3c0e 100644 --- a/maps/UndergroundPathSwitchRoomEntrances.asm +++ b/maps/UndergroundPathSwitchRoomEntrances.asm @@ -68,52 +68,52 @@ UndergroundPathSwitchRoomEntrances_MapScriptHeader: checkevent EVENT_SWITCH_4 iffalse .false4 doorstate 1, OPEN1 -.false4: +.false4 checkevent EVENT_SWITCH_5 iffalse .false5 doorstate 2, OPEN1 -.false5: +.false5 checkevent EVENT_SWITCH_6 iffalse .false6 doorstate 3, OPEN1 -.false6: +.false6 checkevent EVENT_SWITCH_7 iffalse .false7 doorstate 4, OPEN1 -.false7: +.false7 checkevent EVENT_SWITCH_8 iffalse .false8 doorstate 5, OPEN1 -.false8: +.false8 checkevent EVENT_SWITCH_9 iffalse .false9 doorstate 6, OPEN1 -.false9: +.false9 checkevent EVENT_SWITCH_10 iffalse .false10 doorstate 7, CLOSED1 doorstate 8, OPEN1 -.false10: +.false10 checkevent EVENT_SWITCH_11 iffalse .false11 doorstate 9, CLOSED1 doorstate 10, OPEN1 -.false11: +.false11 checkevent EVENT_SWITCH_12 iffalse .false12 doorstate 11, CLOSED1 doorstate 12, OPEN1 -.false12: +.false12 checkevent EVENT_SWITCH_13 iffalse .false13 doorstate 13, CLOSED1 doorstate 14, OPEN1 -.false13: +.false13 checkevent EVENT_SWITCH_14 iffalse .false14 doorstate 15, CLOSED1 doorstate 16, OPEN1 -.false14: +.false14 return SuperNerdScript_0x7ca7a: diff --git a/maps/WarehouseEntrance.asm b/maps/WarehouseEntrance.asm index c53c02f2b..402e41294 100644 --- a/maps/WarehouseEntrance.asm +++ b/maps/WarehouseEntrance.asm @@ -213,25 +213,25 @@ OlderHaircutBrotherScript: if_equal $3, .three jump .else -.two: +.two setevent EVENT_GAVE_KURT_APRICORNS clearevent EVENT_RECEIVED_BALLS_FROM_KURT clearevent EVENT_DRAGON_SHRINE_QUESTION_2 jump .then -.three: +.three clearevent EVENT_GAVE_KURT_APRICORNS setevent EVENT_RECEIVED_BALLS_FROM_KURT clearevent EVENT_DRAGON_SHRINE_QUESTION_2 jump .then -.else: +.else clearevent EVENT_GAVE_KURT_APRICORNS clearevent EVENT_RECEIVED_BALLS_FROM_KURT setevent EVENT_DRAGON_SHRINE_QUESTION_2 jump .then -.then: +.then takemoney $0, 500 special PlaceMoneyTopRight writetext UnknownText_0x7c6b8 @@ -296,25 +296,25 @@ YoungerHaircutBrotherScript: if_equal $3, .three jump .else -.two: +.two setevent EVENT_GAVE_KURT_APRICORNS clearevent EVENT_RECEIVED_BALLS_FROM_KURT clearevent EVENT_DRAGON_SHRINE_QUESTION_2 jump .then -.three: +.three clearevent EVENT_GAVE_KURT_APRICORNS setevent EVENT_RECEIVED_BALLS_FROM_KURT clearevent EVENT_DRAGON_SHRINE_QUESTION_2 jump .then -.else: +.else clearevent EVENT_GAVE_KURT_APRICORNS clearevent EVENT_RECEIVED_BALLS_FROM_KURT setevent EVENT_DRAGON_SHRINE_QUESTION_2 jump .then -.then: +.then takemoney $0, 300 special PlaceMoneyTopRight writetext UnknownText_0x7c80e diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm index 149e8743a..fb441a3f8 100755 --- a/misc/battle_tower_5c.asm +++ b/misc/battle_tower_5c.asm @@ -212,7 +212,7 @@ _BattleTowerBattle: ; 17022c ret ; 17023a -.do_dw: ; 17023a +.do_dw ; 17023a ld a, [wBattleTowerBattleEnded] ld e, a ld d, 0 @@ -226,7 +226,7 @@ endr jp [hl] ; 170249 -.dw: ; 170249 +.dw ; 170249 dw RunBattleTowerTrainer dw SkipBattleTowerTrainer ; 17024d @@ -699,7 +699,7 @@ endr jp [hl] ; 17051f -.dw: ; 17051f +.dw ; 17051f dw .Jumptable_0 dw .Jumptable_1 dw .Jumptable_2 @@ -957,7 +957,7 @@ endr ; 170696 -.dw: ; 170696 (5c:4696) +.dw ; 170696 (5c:4696) dw Function17075f ; 0x00 dw Function170788 ; 0x01 dw Function170778 ; 0x02 diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm index 56cd52078..ed4160351 100755 --- a/misc/fixed_words.asm +++ b/misc/fixed_words.asm @@ -2523,21 +2523,21 @@ Function11d0b6: ; 11d0b6 (47:50b6) dw .ten -.zero: ; 11d0dd (47:50dd) +.zero ; 11d0dd (47:50dd) ld a, [wcd20] ; wcd20 (aliases: CreditsPos) sla a ld hl, Unknown_11d208 ld e, $1 jr .load -.one: ; 11d0e9 (47:50e9) +.one ; 11d0e9 (47:50e9) ld a, [wcd21] sla a ld hl, Unknown_11d21a ld e, $2 jr .load -.two: ; 11d0f5 (47:50f5) +.two ; 11d0f5 (47:50f5) ld hl, Unknown_11d2be ld a, [wcd22] ld e, a @@ -2551,14 +2551,14 @@ Function11d0b6: ; 11d0b6 (47:50b6) ld e, $4 jr .load -.three: ; 11d10f (47:510f) +.three ; 11d10f (47:510f) ld a, SPRITE_ANIM_FRAMESET_27 call ReinitSpriteAnimFrame ld a, [wcd25] sla a ld hl, Unknown_11d29e ld e, $8 -.load: ; 11d11e (47:511e) +.load ; 11d11e (47:511e) push de ld e, a ld d, $0 @@ -2577,7 +2577,7 @@ Function11d0b6: ; 11d0b6 (47:50b6) call Function11d2ee ret -.four: ; 11d134 (47:5134) +.four ; 11d134 (47:5134) ld a, SPRITE_ANIM_FRAMESET_27 call ReinitSpriteAnimFrame ld a, [wcd2a] @@ -2586,7 +2586,7 @@ Function11d0b6: ; 11d0b6 (47:50b6) ld e, $10 jr .load -.five: ; 11d145 (47:5145) +.five ; 11d145 (47:5145) ld a, SPRITE_ANIM_FRAMESET_27 call ReinitSpriteAnimFrame ld a, [wcd2c] @@ -2595,7 +2595,7 @@ Function11d0b6: ; 11d0b6 (47:50b6) ld e, $20 jr .load -.six: ; 11d156 (47:5156) +.six ; 11d156 (47:5156) ld a, SPRITE_ANIM_FRAMESET_2A call ReinitSpriteAnimFrame ld a, [wcd4a] @@ -2613,7 +2613,7 @@ Function11d0b6: ; 11d0b6 (47:50b6) call Function11d2ee ret -.seven: ; 11d175 (47:5175) +.seven ; 11d175 (47:5175) ld a, [wcd4d] cp $4 jr z, .asm_11d180 @@ -2666,15 +2666,15 @@ Function11d0b6: ; 11d0b6 (47:50b6) call Function11d2ee ret -.nine: ; 11d1d1 (47:51d1) +.nine ; 11d1d1 (47:51d1) ld d, -13 * 8 ld a, SPRITE_ANIM_FRAMESET_2C jr .eight_nine_load -.eight: ; 11d1d7 (47:51d7) +.eight ; 11d1d7 (47:51d7) ld d, 2 * 8 ld a, SPRITE_ANIM_FRAMESET_2B -.eight_nine_load: ; 11d1db (47:51db) +.eight_nine_load ; 11d1db (47:51db) push de call ReinitSpriteAnimFrame ld a, [wcd4a] @@ -2695,7 +2695,7 @@ Function11d0b6: ; 11d0b6 (47:50b6) call Function11d2ee ret -.ten: ; 11d1fc (47:51fc) +.ten ; 11d1fc (47:51fc) ld a, SPRITE_ANIM_FRAMESET_26 call ReinitSpriteAnimFrame ld a, $8 @@ -3289,84 +3289,84 @@ SortedPokemon: db -1 .o: db FERALIGATR, FURRET, OCTILLERY, PRIMEAPE, SENTRET, STANTLER, SPEAROW, FEAROW, OMASTAR, OMANYTE 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 -.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 -.ku_gu: db GLOOM, PINECO, GLIGAR, KRABBY, GRANBULL, CROBAT +.ku_gu db GLOOM, PINECO, GLIGAR, KRABBY, GRANBULL, CROBAT db -1 -.ke_ge: db ABRA, GENGAR, TAUROS +.ke_ge db ABRA, GENGAR, TAUROS 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 -.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 -.shi_ji: db SEADRA, SHELLDER, VAPOREON, DEWGONG +.shi_ji db SEADRA, SHELLDER, VAPOREON, DEWGONG db -1 -.su_zu: db SUICUNE, STARMIE, SCYTHER, ZUBAT, BEEDRILL, HYPNO, DROWZEE +.su_zu db SUICUNE, STARMIE, SCYTHER, ZUBAT, BEEDRILL, HYPNO, DROWZEE db -1 -.se_ze: db SQUIRTLE, CELEBI +.se_ze db SQUIRTLE, CELEBI db -1 -.so_zo: db WOBBUFFET +.so_zo db WOBBUFFET db -1 -.ta_da: db DUGTRIO, HORSEA, EXEGGCUTE +.ta_da db DUGTRIO, HORSEA, EXEGGCUTE db -1 -.chi_dhi: db CHIKORITA, CHINCHOU +.chi_dhi db CHIKORITA, CHINCHOU db -1 -.tsu_du: db SHUCKLE +.tsu_du db SHUCKLE db -1 -.te_de: db DIGLETT, REMORAID, DELIBIRD, HOUNDOUR, AMPHAROS +.te_de db DIGLETT, REMORAID, DELIBIRD, HOUNDOUR, AMPHAROS 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 -.na: db ODDISH, EXEGGUTOR +.na db ODDISH, EXEGGUTOR 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 -.nu: db QUAGSIRE +.nu db QUAGSIRE db -1 -.ne: db NATU, XATU +.ne db NATU, XATU db -1 -.no: db DUNSPARCE +.no db DUNSPARCE 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 -.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 -.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 -.he_be_pe: db BAYLEEF, GRIMER, MUK, HERACROSS, HOUNDOOM, PERSIAN, LICKITUNG +.he_be_pe db BAYLEEF, GRIMER, MUK, HERACROSS, HOUNDOOM, PERSIAN, LICKITUNG 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 -.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 -.mi: db DRATINI, MEW, MEWTWO, MILTANK +.mi db DRATINI, MEW, MEWTWO, MILTANK db -1 -.mu: db MISDREAVUS, SMOOCHUM +.mu db MISDREAVUS, SMOOCHUM db -1 -.me: db MEGANIUM, DITTO, TENTACOOL, MAREEP +.me db MEGANIUM, DITTO, TENTACOOL, MAREEP db -1 -.mo: db FLAAFFY, VENOMOTH, TANGELA +.mo db FLAAFFY, VENOMOTH, TANGELA db -1 -.ya: db SLOWKING, SLOWBRO, SLOWPOKE, MURKROW, YANMA +.ya db SLOWKING, SLOWBRO, SLOWPOKE, MURKROW, YANMA db -1 -.yu: db KADABRA +.yu db KADABRA db -1 -.yo: db LARVITAR, NOCTOWL +.yo db LARVITAR, NOCTOWL db -1 -.ra: db RAIKOU, RAICHU, CHANSEY, RATICATE, LAPRAS, VILEPLUME, LANTURN +.ra db RAIKOU, RAICHU, CHANSEY, RATICATE, LAPRAS, VILEPLUME, LANTURN db -1 -.ri: db CHARMELEON, CHARIZARD, URSARING +.ri db CHARMELEON, CHARIZARD, URSARING db -1 -.ru: db JYNX, LUGIA +.ru db JYNX, LUGIA db -1 -.re: db MAGNETON, LEDIAN, LEDYBA +.re db MAGNETON, LEDIAN, LEDYBA db -1 -.ro: db VULPIX +.ro db VULPIX db -1 -.wa: db JUMPLUFF, TOTODILE, MACHOP -.end: db -1 +.wa db JUMPLUFF, TOTODILE, MACHOP +.end db -1 ; 11d67e GFX_11d67e: diff --git a/misc/gfx_41.asm b/misc/gfx_41.asm index 44d2813c8..e1be09ef4 100755 --- a/misc/gfx_41.asm +++ b/misc/gfx_41.asm @@ -500,7 +500,7 @@ _Get1bpp:: ; 1042b2 jr .loop ; 1042d6 -.bankswitch: ; 1042d6 +.bankswitch ; 1042d6 ld a, [rSVBK] push af ld a, $6 diff --git a/misc/mobile_22_2.asm b/misc/mobile_22_2.asm index 4b2cb07ee..880ae460a 100644 --- a/misc/mobile_22_2.asm +++ b/misc/mobile_22_2.asm @@ -19,21 +19,21 @@ Function8b342:: ; 8b342 ret ; 8b354 -.dw: ; 8b354 +.dw ; 8b354 dw .zero dw .one dw .two ; 8b35a -.zero: ; 8b35a +.zero ; 8b35a mobile ; 8b35b -.one: ; 8b35b +.one ; 8b35b mobile ; 8b35c -.two: ; 8b35c +.two ; 8b35c mobile ; 8b35d diff --git a/misc/mobile_40.asm b/misc/mobile_40.asm index 430400c8d..c2a6c20b9 100644 --- a/misc/mobile_40.asm +++ b/misc/mobile_40.asm @@ -1998,7 +1998,7 @@ Function100c98: ; 100c98 ret ; 100cad -.attrs: ; 100cad +.attrs ; 100cad db 10, 1 db 255, 1 db $a0, $00 @@ -6880,7 +6880,7 @@ Function102e07: ; 102e07 ret ; 102e32 -.waiting: ; 102e32 +.waiting ; 102e32 db "Waiting...!@" ; 102e3e diff --git a/misc/mobile_41.asm b/misc/mobile_41.asm index 525bd7b80..44db58602 100755 --- a/misc/mobile_41.asm +++ b/misc/mobile_41.asm @@ -1095,5 +1095,5 @@ LoadOverworldFont:: ; 106594 ret ; 1065ad -.bgfont: +.bgfont INCBIN "gfx/unknown/1065ad.2bpp" diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index 461f03569..415ff7e38 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -4869,7 +4869,7 @@ Function17f6b7: ; 17f6b7 ret ; 17f6cd -.bcd_two_digits: ; 17f6cd +.bcd_two_digits ; 17f6cd ld c, a and $f0 swap a @@ -4877,7 +4877,7 @@ Function17f6b7: ; 17f6b7 ld a, c and $f -.bcd_digit: ; 17f6d8 +.bcd_digit ; 17f6d8 add "0" ld [hli], a ret diff --git a/predef/cgb.asm b/predef/cgb.asm index 7870b9cc1..addbcb0d5 100644 --- a/predef/cgb.asm +++ b/predef/cgb.asm @@ -32,7 +32,7 @@ Predef_LoadSGBLayoutCGB: ; 8d59 ret ; 8d7a -.dw: ; 8d7a +.dw ; 8d7a dw _CGB_BattleGrayscale dw _CGB_BattleColors dw _CGB_PokegearPals diff --git a/predef/crystal.asm b/predef/crystal.asm index 83e0fb0b3..c006a96e0 100755 --- a/predef/crystal.asm +++ b/predef/crystal.asm @@ -22,7 +22,7 @@ GetMysteryGift_MobileAdapterLayout: ; 4930f (mobile) ret ; 49330 (12:5330) -.dw: ; 49330 +.dw ; 49330 dw MG_Mobile_Layout00 dw MG_Mobile_Layout01 |