diff options
Diffstat (limited to 'engine')
55 files changed, 965 insertions, 965 deletions
diff --git a/engine/anim_hp_bar.asm b/engine/anim_hp_bar.asm index 404e6cbc3..c8a543ba1 100755 --- a/engine/anim_hp_bar.asm +++ b/engine/anim_hp_bar.asm @@ -2,7 +2,7 @@ _AnimateHPBar: ; d627 call .IsMaximumMoreThan48Pixels jr c, .MoreThan48Pixels call .ComputePixels -.ShortAnimLoop +.ShortAnimLoop: push bc push hl call ShortAnim_UpdateVariables @@ -19,9 +19,9 @@ _AnimateHPBar: ; d627 jr nc, .ShortAnimLoop ret -.MoreThan48Pixels +.MoreThan48Pixels: call .ComputePixels -.LongAnimLoop +.LongAnimLoop: push bc push hl call LongAnim_UpdateVariables diff --git a/engine/billspc.asm b/engine/billspc.asm index 3090ca0c2..54f6a49f2 100755 --- a/engine/billspc.asm +++ b/engine/billspc.asm @@ -42,7 +42,7 @@ _DepositPKMN: ; e2391 (38:6391) jp [hl] .Jumptable: ; e23df (38:63df) - + dw .Init dw .HandleJoypad dw .WhatsUp @@ -151,7 +151,7 @@ endr jp [hl] BillsPCDepositJumptable: ; e24a1 (38:64a1) - + dw BillsPCDepositFuncDeposit ; Deposit Pokemon dw BillsPCDepositFuncStats ; Pokemon Stats dw BillsPCDepositFuncRelease ; Release Pokemon @@ -310,7 +310,7 @@ _WithdrawPKMN: ; e2583 (38:6583) jp [hl] .Jumptable: ; e25d2 (38:65d2) - + dw .Init dw .Joypad dw .PrepSubmenu @@ -437,7 +437,7 @@ endr ld [wBillsPC_CursorPosition], a ld [wBillsPC_ScrollPosition], a ret -.FailedWithdraw +.FailedWithdraw: ld de, PCString_WhatsUp call BillsPC_PlaceString ret @@ -483,7 +483,7 @@ endr ld [wBillsPC_ScrollPosition], a pop af ret -.FailedRelease +.FailedRelease: ld de, PCString_WhatsUp call BillsPC_PlaceString pop af @@ -562,7 +562,7 @@ _MovePKMNWithoutMail: ; e2759 ; e27ac .Jumptable: ; e27ac - + dw .Init dw .Joypad dw .PrepSubmenu @@ -1664,21 +1664,21 @@ BillsPC_CheckMail_PreventBlackout: ; e2f18 (38:6f18) ld a, [wBillsPC_MonHasMail] and a jr nz, .HasMail -.Okay +.Okay: and a ret -.HasMail +.HasMail: ld de, PCString_RemoveMail jr .NotOkay -.AllOthersFainted +.AllOthersFainted: ld de, PCString_NoMoreUsablePKMN jr .NotOkay -.ItsYourLastPokemon +.ItsYourLastPokemon: ld de, PCString_ItsYourLastPKMN -.NotOkay +.NotOkay: call BillsPC_PlaceString ld de, SFX_WRONG call WaitPlaySFX @@ -1918,7 +1918,7 @@ TryWithdrawPokemon: ; e30fa (38:70fa) and a ret -.PartyFull +.PartyFull: ld de, PCString_PartyFull call BillsPC_PlaceString ld de, SFX_WRONG @@ -2033,7 +2033,7 @@ endr ; e3245 .Jumptable: ; e3245 - + dw .BoxToBox dw .PartyToBox dw .BoxToParty @@ -2519,7 +2519,7 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9) and a ret -.Print +.Print: call GetBoxCount and a jr z, .EmptyBox @@ -2533,12 +2533,12 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9) and a ret -.EmptyBox +.EmptyBox: call BillsPC_PlaceEmptyBoxString_SFX and a ret -.Switch +.Switch: ld a, [MenuSelection] dec a ld e, a @@ -2548,7 +2548,7 @@ BillsPC_ChangeBoxSubmenu: ; e36f9 (38:76f9) callba ChangeBoxSaveGame ret -.Name +.Name: ld b, $4 ; box ld de, wd002 callba NamingScreen diff --git a/engine/breeding/egg.asm b/engine/breeding/egg.asm index cfe4d9a1c..7a5dfcf7c 100755 --- a/engine/breeding/egg.asm +++ b/engine/breeding/egg.asm @@ -166,11 +166,11 @@ CheckBreedmonCompatibility: ; 16e1d cp c jr z, .Compatible -.Incompatible +.Incompatible: and a ret -.Compatible +.Compatible: scf ret ; 16f3e diff --git a/engine/card_flip.asm b/engine/card_flip.asm index 9aeb94aec..fff4bde78 100755 --- a/engine/card_flip.asm +++ b/engine/card_flip.asm @@ -50,7 +50,7 @@ _CardFlip: ; e00ee (38:40ee) ld [wCardFlipCursorX], a ld de, MUSIC_GAME_CORNER call PlayMusic -.MasterLoop +.MasterLoop: ld a, [wJumptableIndex] bit 7, a jr nz, .leavethegame @@ -81,7 +81,7 @@ endr ; e01a0 (38:41a0) .Jumptable: ; e01a0 - + dw .AskPlayWithThree dw .DeductCoins dw .ChooseACard @@ -107,7 +107,7 @@ endr call .Increment ret -.SaidNo +.SaidNo: ld a, 7 ld [wJumptableIndex], a ret @@ -311,7 +311,7 @@ endr call .Increment ret -.Continue +.Continue: ld a, [wCardFlipNumCardsPlayed] inc a ld [wCardFlipNumCardsPlayed], a @@ -325,10 +325,10 @@ endr call PrintText jr .LoopAround -.KeepTheCurrentDeck +.KeepTheCurrentDeck: call CardFlip_BlankDiscardedCardSlot -.LoopAround +.LoopAround: ld a, 1 ld [wJumptableIndex], a ret @@ -401,7 +401,7 @@ GetCoordsOfChosenCard: ; e03ac bcpixel 2, 3 jr .done -.BottomCard +.BottomCard: hlcoord 2, 6 bcpixel 8, 3 @@ -659,7 +659,7 @@ CardFlip_BlankDiscardedCardSlot: ; e0534 ; e0553 .Jumptable: ; e0553 - + dw .Level1 dw .Level2 dw .Level3 @@ -848,7 +848,7 @@ CardFlip_CheckWinCondition: ; e0637 ; e0643 .Jumptable: ; e0643 - + dw .Impossible dw .Impossible dw .PikaJiggly diff --git a/engine/color.asm b/engine/color.asm index 435f0e57b..faf102867 100644 --- a/engine/color.asm +++ b/engine/color.asm @@ -36,11 +36,11 @@ CheckShininess: cp SHINY_SPC_VAL jr nz, .NotShiny -.Shiny +.Shiny: scf ret -.NotShiny +.NotShiny: and a ret @@ -70,11 +70,11 @@ CheckContestMon: cp 10 jr c, .Bad -.Good +.Good: scf ret -.Bad +.Bad: and a ret @@ -155,13 +155,13 @@ Function8b07: ld [hCGBPalUpdate], a ret -.BGPal +.BGPal: RGB 31, 31, 31 RGB 18, 23, 31 RGB 15, 20, 31 RGB 00, 00, 00 -.OBPal +.OBPal: RGB 31, 31, 31 RGB 31, 31, 12 RGB 08, 16, 28 @@ -337,11 +337,11 @@ ApplyHPBarPals: jr z, .PartyMenu ret -.Enemy +.Enemy: ld de, BGPals + 2 palettes + 2 jr .okay -.Player +.Player: ld de, BGPals + 3 palettes + 2 .okay @@ -358,7 +358,7 @@ ApplyHPBarPals: ld [hCGBPalUpdate], a ret -.PartyMenu +.PartyMenu: ld e, c inc e hlcoord 11, 1, AttrMap @@ -665,7 +665,7 @@ ApplyAttrMap: ld [hBGMapMode], a ret -.UpdateVBank1 +.UpdateVBank1: hlcoord 0, 0, AttrMap debgcoord 0, 0 ld b, SCREEN_HEIGHT @@ -998,7 +998,7 @@ Function9890:: ld [rSVBK], a ret -.LoadWhitePals +.LoadWhitePals: ld c, 4 * 16 .loop ld a, $7fff % $100 @@ -1960,7 +1960,7 @@ endr call FarCopyWRAM ret -.TilesetColorsPointers +.TilesetColorsPointers: dw .OutdoorColors ; unused dw .OutdoorColors ; TOWN dw .OutdoorColors ; ROUTE @@ -1971,25 +1971,25 @@ endr dw .DungeonColors ; DUNGEON ; Valid indices: $00 - $29 -.OutdoorColors +.OutdoorColors: db $00, $01, $02, $28, $04, $05, $06, $07 ; morn db $08, $09, $0a, $28, $0c, $0d, $0e, $0f ; day db $10, $11, $12, $29, $14, $15, $16, $17 ; nite db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f ; dark -.IndoorColors +.IndoorColors: db $20, $21, $22, $23, $24, $25, $26, $07 ; morn db $20, $21, $22, $23, $24, $25, $26, $07 ; day db $10, $11, $12, $13, $14, $15, $16, $07 ; nite db $18, $19, $1a, $1b, $1c, $1d, $1e, $07 ; dark -.DungeonColors +.DungeonColors: db $00, $01, $02, $03, $04, $05, $06, $07 ; morn db $08, $09, $0a, $0b, $0c, $0d, $0e, $0f ; day db $10, $11, $12, $13, $14, $15, $16, $17 ; nite db $18, $19, $1a, $1b, $1c, $1d, $1e, $1f ; dark -.Perm5Colors +.Perm5Colors: db $00, $01, $02, $03, $04, $05, $06, $07 ; morn db $08, $09, $0a, $0b, $0c, $0d, $0e, $0f ; day db $10, $11, $12, $13, $14, $15, $16, $17 ; nite diff --git a/engine/credits.asm b/engine/credits.asm index fc5fb8818..9074b9c65 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -269,7 +269,7 @@ endr .Jumptable: ; 109937 (42:5937) - + dw ParseCredits dw Credits_Next dw Credits_Next @@ -350,17 +350,17 @@ ParseCredits: ; 1099aa ld hl, wJumptableIndex bit 7, [hl] jp nz, .done - + ; Wait until the timer has run out to parse the next command. ld hl, CreditsTimer ld a, [hl] and a jr z, .parse - + ; One tick has passed. dec [hl] jp .done - + .parse ; First, let's clear the current text display, ; starting from line 5. @@ -370,12 +370,12 @@ ParseCredits: ; 1099aa ld bc, 20 * 12 ld a, " " call ByteFill - + ; Then read the script. - + .loop call .get - + ; Commands: cp CREDITS_END jp z, .end @@ -391,9 +391,9 @@ ParseCredits: ; 1099aa jr z, .wait2 cp CREDITS_THEEND jr z, .theend - + ; If it's not a command, it's a string identifier. - + push af ld e, a ld d, 0 @@ -405,27 +405,27 @@ endr ld d, [hl] ld e, a pop af - + ; Strings spanning multiple lines have special cases. - + cp COPYRIGHT jr z, .copyright - + cp STAFF jr c, .staff - + ; The rest start from line 6. hlcoord 0, 6 jr .print - + .copyright hlcoord 2, 6 jr .print - + .staff hlcoord 0, 6 - + .print ; Print strings spaced every two lines. call .get @@ -433,12 +433,12 @@ endr call AddNTimes call PlaceString jr .loop - + .theend ; Display "The End" graphic. call Credits_TheEnd jr .loop - + .scene ; Update the scene number and corresponding palette. call .get @@ -448,13 +448,13 @@ endr call GetCreditsPalette call SetPalettes ; update hw pal registers jr .loop - + .clear ; Clear the banner. ld a, $ff ld [wCreditsBorderFrame], a ; frame jr .loop - + .music ; Play the credits music. ld de, MUSIC_CREDITS @@ -465,26 +465,26 @@ endr pop de call PlayMusic jp .loop - + .wait2 ; Wait for some amount of ticks. call .get ld [CreditsTimer], a jr .done - + .wait ; Wait for some amount of ticks, and do something else. call .get ld [CreditsTimer], a - + xor a ld [hBGMapThird], a ld a, 1 ld [hBGMapMode], a - + .done jp Credits_Next - + .end ; Stop execution. ld hl, wJumptableIndex @@ -507,7 +507,7 @@ endr ld d, a ld hl, CreditsScript add hl, de - + inc de ld a, e ld [CreditsPos], a @@ -614,14 +614,14 @@ endr GetCreditsPalette: ; 109b2c call .GetPalAddress - + push hl ld a, 0 call .UpdatePals pop hl ret - -.GetPalAddress + +.GetPalAddress: ; Each set of palette data is 24 bytes long. ld a, [wCreditsBorderMon] ; scene and 3 @@ -635,10 +635,10 @@ GetCreditsPalette: ; 109b2c add hl, de ; * 3 add hl, de ret - -.UpdatePals + +.UpdatePals: ; Update the first three colors in both palette buffers. - + push af push hl add UnknBGPals % $100 @@ -648,7 +648,7 @@ GetCreditsPalette: ; 109b2c ld d, a ld bc, 24 call CopyBytes - + pop hl pop af add BGPals % $100 diff --git a/engine/crystal_intro.asm b/engine/crystal_intro.asm index df3b297a3..874cdf462 100755 --- a/engine/crystal_intro.asm +++ b/engine/crystal_intro.asm @@ -154,7 +154,7 @@ PlaceGameFreakPresents_1: ; e468d inc [hl] ret -.PlaceGameFreak +.PlaceGameFreak: ld [hl], 0 ld hl, .GAME_FREAK decoord 5, 10 @@ -166,7 +166,7 @@ PlaceGameFreakPresents_1: ; e468d ret ; e46af -.GAME_FREAK +.GAME_FREAK: ; G A M E _ F R E A K db 0, 1, 2, 3, 13, 4, 5, 3, 1, 6 .end @@ -396,7 +396,7 @@ CrystalIntro: ; e48ac call DelayFrame jp .loop -.ShutOffMusic +.ShutOffMusic: ld de, MUSIC_NONE call PlayMusic @@ -547,7 +547,7 @@ IntroScene2: ; e49d6 (39:49d6) ld de, SFX_INTRO_UNOWN_1 call PlaySFX pop af -.DontPlaySound +.DontPlaySound: ld [wcf65], a xor a call CrystalIntro_UnownFade @@ -686,27 +686,27 @@ IntroScene6: ; e4af7 (39:4af7) jr z, .FirstUnown jr .NoUnown -.FirstUnown +.FirstUnown: push af depixel 7, 15 call CrystalIntro_InitUnownAnim ld de, SFX_INTRO_UNOWN_2 call PlaySFX pop af -.NoUnown +.NoUnown: ld [wcf65], a xor a call CrystalIntro_UnownFade ret -.SecondUnown +.SecondUnown: push af depixel 14, 6 call CrystalIntro_InitUnownAnim ld de, SFX_INTRO_UNOWN_1 call PlaySFX pop af -.StopUnown +.StopUnown: ld [wcf65], a ld a, $1 call CrystalIntro_UnownFade @@ -1347,7 +1347,7 @@ IntroScene20: ; e5019 (39:5019) ld [hSCY], a ret -.AppearUnown +.AppearUnown: sub $18 ld c, a and $3 @@ -1952,7 +1952,7 @@ Intro_Scene16_AnimateSuicune: ; e5441 (39:5441) jr z, .PrepareForSuicuneSwap ret -.PrepareForSuicuneSwap +.PrepareForSuicuneSwap: xor a ld [hBGMapMode], a ret diff --git a/engine/dummy_game.asm b/engine/dummy_game.asm index 116ad9439..bb5377d8f 100755 --- a/engine/dummy_game.asm +++ b/engine/dummy_game.asm @@ -6,7 +6,7 @@ _DummyGame: ; e1e5b (38:5e5b) jr nc, .loop ret -.LoadGFXAndPals +.LoadGFXAndPals: call DisableLCD ld b, SCGB_08 call GetSGBLayout @@ -42,7 +42,7 @@ _DummyGame: ; e1e5b (38:5e5b) call DmgToCgbObjPal0 ret -.JumptableLoop +.JumptableLoop: ld a, [wJumptableIndex] bit 7, a jr nz, .quit @@ -56,10 +56,10 @@ _DummyGame: ; e1e5b (38:5e5b) scf ret -.ExecuteJumptable +.ExecuteJumptable: jumptable .Jumptable, wJumptableIndex -.Jumptable +.Jumptable: dw .RestartGame dw .ResetBoard dw .InitBoardTilemapAndCursorObject @@ -70,13 +70,13 @@ _DummyGame: ; e1e5b (38:5e5b) dw .RevealAll dw .AskPlayAgain -.RestartGame +.RestartGame: call DummyGame_InitStrings ld hl, wJumptableIndex inc [hl] ret -.ResetBoard +.ResetBoard: call ret_e00ed jr nc, .proceed ld hl, wJumptableIndex @@ -95,7 +95,7 @@ rept 4 endr ld [hl], a ld [wDummyGameNumCardsMatched], a -.InitBoardTilemapAndCursorObject +.InitBoardTilemapAndCursorObject: ld hl, wDummyGameCounter ld a, [hl] cp 45 @@ -117,7 +117,7 @@ endr inc [hl] ret -.CheckTriesRemaining +.CheckTriesRemaining: ld a, [wDummyGameNumberTriesRemaining] hlcoord 17, 0 add "0" @@ -136,7 +136,7 @@ endr ld [wcf64], a ld hl, wJumptableIndex inc [hl] -.PickCard1 +.PickCard1: ld a, [wcf64] and a ret z @@ -160,7 +160,7 @@ endr inc [hl] ret -.PickCard2 +.PickCard2: ld a, [wcf64] and a ret z @@ -185,7 +185,7 @@ endr ld [wDummyGameCounter], a ld hl, wJumptableIndex inc [hl] -.DelayPickAgain +.DelayPickAgain: ld hl, wDummyGameCounter ld a, [hl] and a @@ -193,19 +193,19 @@ endr dec [hl] ret -.PickAgain +.PickAgain: call DummyGame_CheckMatch ld a, $3 ld [wJumptableIndex], a ret -.RevealAll +.RevealAll: ld a, [hJoypadPressed] and A_BUTTON ret z xor a ld [wDummyGameCounter], a -.RevelationLoop +.RevelationLoop: ld hl, wDummyGameCounter ld a, [hl] cp 45 @@ -231,7 +231,7 @@ endr call WaitPressAorB_BlinkCursor ld hl, wJumptableIndex inc [hl] -.AskPlayAgain +.AskPlayAgain: call ret_e00ed jr nc, .restart ld hl, wJumptableIndex @@ -310,7 +310,7 @@ DummyGame_CheckMatch: ; e2010 call PrintText ret -.VictoryText +.VictoryText: start_asm push bc hlcoord 2, 13 diff --git a/engine/events.asm b/engine/events.asm index 9b701be8a..e10648d07 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -456,7 +456,7 @@ DoMapTrigger: ; 968ec rept 4 add hl, de endr - + call GetMapScriptHeaderBank call GetFarHalfword call GetMapScriptHeaderBank @@ -541,11 +541,11 @@ OWPlayerInput: ; 96974 call CheckMenuOW jr c, .Action -.NoAction +.NoAction: xor a ret -.Action +.Action: push af callba Function80422 pop af @@ -581,7 +581,7 @@ TryObjectEvent: ; 969b5 xor a ret -.IsObject +.IsObject: call PlayTalkObject ld a, [hObjectStructIndexBuffer] call GetObjectStruct @@ -687,7 +687,7 @@ TryReadSign: ; 96a38 xor a ret -.IsSign +.IsSign: ld a, [EngineBuffer3] ld hl, .signs rst JumpTable @@ -887,11 +887,11 @@ CheckMenuOW: ; 96b30 scf ret -.NoMenu +.NoMenu: xor a ret -.Select +.Select: call PlayTalkObject ld a, BANK(SelectMenuScript) ld hl, SelectMenuScript @@ -918,11 +918,11 @@ SelectMenuCallback: ; 96b66 end ; 96b72 -.Script ; 96b72 +.Script: ; 96b72 ptjump wQueuedScriptBank ; 96b75 -.Asm ; 96b75 +.Asm: ; 96b75 ptcallasm wQueuedScriptBank end ; 96b79 diff --git a/engine/events_2.asm b/engine/events_2.asm index ec5026e40..8ae911bad 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -191,13 +191,13 @@ ChooseWildEncounter_BugContest:: ; 97d31 ld hl, ContestMons ld de, 4 -.CheckMon +.CheckMon: sub [hl] jr c, .GotMon add hl, de jr .CheckMon -.GotMon +.GotMon: inc hl ; Species @@ -218,7 +218,7 @@ ChooseWildEncounter_BugContest:: ; 97d31 ld a, d jr .GotLevel -.RandomLevel +.RandomLevel: ; Get a random level between the min and max. ld c, a inc c @@ -227,7 +227,7 @@ ChooseWildEncounter_BugContest:: ; 97d31 call SimpleDivide add d -.GotLevel +.GotLevel: ld [CurPartyLevel], a xor a @@ -330,7 +330,7 @@ DoBikeStep:: ; 97db3 scf ret -.NoCall +.NoCall: xor a ret ; 97df9 diff --git a/engine/evolve.asm b/engine/evolve.asm index b04a245e0..db7d7e946 100755 --- a/engine/evolve.asm +++ b/engine/evolve.asm @@ -336,7 +336,7 @@ endr ; XXX pop hl -.ReturnToMap +.ReturnToMap: pop de pop bc pop hl @@ -514,17 +514,17 @@ FillMoves: ; 424e1 ld a, [hli] ld h, [hl] ld l, a -.GoToAttacks +.GoToAttacks: ld a, [hli] and a jr nz, .GoToAttacks jr .GetLevel -.NextMove +.NextMove: pop de -.GetMove +.GetMove: inc hl -.GetLevel +.GetLevel: ld a, [hli] and a jp z, .done @@ -539,10 +539,10 @@ FillMoves: ; 424e1 cp b jr nc, .GetMove -.CheckMove +.CheckMove: push de ld c, NUM_MOVES -.CheckRepeat +.CheckRepeat: ld a, [de] inc de cp [hl] @@ -552,7 +552,7 @@ FillMoves: ; 424e1 pop de push de ld c, NUM_MOVES -.CheckSlot +.CheckSlot: ld a, [de] and a jr z, .LearnMove @@ -576,10 +576,10 @@ FillMoves: ; 424e1 call ShiftMoves pop de -.ShiftedMove +.ShiftedMove: pop hl -.LearnMove +.LearnMove: ld a, [hl] ld [de], a ld a, [Buffer1] diff --git a/engine/intro_menu.asm b/engine/intro_menu.asm index 6ece8e384..ea5c9296a 100755 --- a/engine/intro_menu.asm +++ b/engine/intro_menu.asm @@ -30,7 +30,7 @@ PrintDayOfWeek: ; 5b05 ret ; 5b1c -.Days ; 5b1c +.Days: ; 5b1c db "SUN@" db "MON@" db "TUES@" @@ -40,7 +40,7 @@ PrintDayOfWeek: ; 5b05 db "SATUR@" ; 5b40 -.Day ; 5b40 +.Day: ; 5b40 db "DAY@" ; 5b44 @@ -270,7 +270,7 @@ SetDefaultBoxNames: ; 5ca6 jr c, .loop ret -.Box +.Box: db "BOX@" ; 5cd3 @@ -285,7 +285,7 @@ InitializeMagikarpHouse: ; 5cd3 ret ; 5ce3 -.Ralph ; 5ce3 +.Ralph: ; 5ce3 db "RALPH@" ; 5ce9 @@ -305,15 +305,15 @@ InitializeNPCNames: ; 5ce9 ld hl, .Green ld de, GreensName -.Copy +.Copy: ld bc, NAME_LENGTH call CopyBytes ret -.Rival db "???@" -.Red db "RED@" -.Green db "GREEN@" -.Mom db "MOM@" +.Rival: db "???@" +.Red: db "RED@" +.Green: db "GREEN@" +.Mom: db "MOM@" ; 5d23 InitializeWorld: ; 5d23 @@ -365,13 +365,13 @@ Continue: ; 5d65 call CloseWindow jr .FailToLoad -.Check1Pass +.Check1Pass: call Continue_CheckRTC_RestartClock jr nc, .Check2Pass call CloseWindow jr .FailToLoad -.Check2Pass +.Check2Pass: ld a, $8 ld [MusicFade], a ld a, MUSIC_NONE % $100 @@ -394,10 +394,10 @@ Continue: ; 5d65 ld [hMapEntryMethod], a jp FinishContinueFunction -.FailToLoad +.FailToLoad: ret -.SpawnAfterE4 +.SpawnAfterE4: ld a, SPAWN_NEW_BARK ld [DefaultSpawnpoint], a call PostCreditsSpawn @@ -460,7 +460,7 @@ ConfirmContinue: ; 5e34 scf ret -.PressA +.PressA: ret ; 5e48 @@ -496,7 +496,7 @@ FinishContinueFunction: ; 5e5d jr z, .AfterRed jp Reset -.AfterRed +.AfterRed: call SpawnAfterRed jr .loop ; 5e85 @@ -609,7 +609,7 @@ Continue_DisplayBadgesDexPlayerName: ; 5f1c pop hl ret -.Player +.Player: db "<PLAYER>@" ; 5f40 @@ -794,7 +794,7 @@ NamePlayer: ; 0x6074 callba MovePlayerPicLeft ret -.NewName +.NewName: ld b, 1 ld de, PlayerName callba NamingScreen @@ -819,13 +819,13 @@ NamePlayer: ; 0x6074 bit 0, a jr z, .Male ld de, .Kris -.Male +.Male: call InitName ret -.Chris +.Chris: db "CHRIS@@@@@@" -.Kris +.Kris: db "KRIS@@@@@@@" ; 60e9 @@ -1127,7 +1127,7 @@ TitleScreenScene: ; 62a3 dw TitleScreenEnd ; 62b7 -.NextScene ; Unreferenced +.NextScene: ; Unreferenced ld hl, wJumptableIndex inc [hl] ret diff --git a/engine/items.asm b/engine/items.asm index ede8e4f73..81c080dda 100755 --- a/engine/items.asm +++ b/engine/items.asm @@ -50,17 +50,17 @@ _TossItem:: ; d20d rst JumpTable ret -.Pockets +.Pockets: dw .Item dw .KeyItem dw .Ball dw .TMHM -.Ball ; d228 +.Ball: ; d228 ld hl, NumBalls jp RemoveItemFromPocket -.TMHM ; d22e +.TMHM: ; d22e ld h, d ld l, e ld a, [CurItem] @@ -68,12 +68,12 @@ _TossItem:: ; d20d call GetTMHMNumber jp TossTMHM -.KeyItem ; d23a +.KeyItem: ; d23a ld h, d ld l, e jp TossKeyItem -.Item ; d23f +.Item: ; d23f ld h, d ld l, e @@ -92,17 +92,17 @@ _CheckItem:: ; d244 rst JumpTable ret -.Pockets +.Pockets: dw .Item dw .KeyItem dw .Ball dw .TMHM -.Ball ; d25f +.Ball: ; d25f ld hl, NumBalls jp CheckTheItem -.TMHM ; d265 +.TMHM: ; d265 ld h, d ld l, e ld a, [CurItem] @@ -110,12 +110,12 @@ _CheckItem:: ; d244 call GetTMHMNumber jp CheckTMHM -.KeyItem ; d271 +.KeyItem: ; d271 ld h, d ld l, e jp CheckKeyItems -.Item ; d276 +.Item: ; d276 ld h, d ld l, e diff --git a/engine/learn.asm b/engine/learn.asm index 64e73c910..d2751235f 100755 --- a/engine/learn.asm +++ b/engine/learn.asm @@ -243,7 +243,7 @@ Text_1_2_and_Poof: ; 6684 ld hl, .PoofForgot ret -.PoofForgot +.PoofForgot: ; Poof! <MON> forgot <MOVE>. And… text_jump UnknownText_0x1c574e db "@" diff --git a/engine/link.asm b/engine/link.asm index e425ce4d8..14c9c2f4d 100755 --- a/engine/link.asm +++ b/engine/link.asm @@ -204,7 +204,7 @@ Gen2ToGen2LinkComms: ; 28177 ld a, $81 ld [rSC], a -.Player1 +.Player1: ld de, MUSIC_NONE call PlayMusic ld c, 3 @@ -1127,7 +1127,7 @@ TimeCapsule_ReplaceTeruSama: ; 28771 pop hl ret -.TimeCapsuleAlt ; 28785 +.TimeCapsuleAlt: ; 28785 ; Pokémon traded from RBY do not have held items, so GSC usually interprets the ; catch rate as an item. However, if the catch rate appears in this table, the ; item associated with the table entry is used instead. diff --git a/engine/mail.asm b/engine/mail.asm index 133a2976e..840e0a925 100755 --- a/engine/mail.asm +++ b/engine/mail.asm @@ -322,7 +322,7 @@ _KrisMailBoxMenu: ; 0x447a0 jp MenuTextBoxBackup ; 0x447b4 -.EmptyMailboxText ; 0x447b4 +.EmptyMailboxText: ; 0x447b4 text_jump _EmptyMailboxText db "@" @@ -431,13 +431,13 @@ MailboxPC: ; 0x44806 ret ; 0x44861 -.JumpTable +.JumpTable: dw .ReadMail dw .PutInPack dw .AttachMail dw .Cancel -.ReadMail ; 0x44869 +.ReadMail: ; 0x44869 call FadeToMenu ld a, [MenuSelection] dec a @@ -446,7 +446,7 @@ MailboxPC: ; 0x44806 jp CloseSubmenu ; 0x44877 -.PutInPack ; 0x44877 +.PutInPack: ; 0x44877 ld hl, .MessageLostText call MenuTextBox call YesNoBox @@ -472,15 +472,15 @@ MailboxPC: ; 0x44806 jp MenuTextBoxBackup ; 0x448ac -.PutAwayText ; 0x448ac +.PutAwayText: ; 0x448ac text_jump ClearedMailPutAwayText db "@" -.PackFullText ; 0x448b1 +.PackFullText: ; 0x448b1 text_jump MailPackFullText db "@" -.MessageLostText ; 0x448b6 +.MessageLostText: ; 0x448b6 text_jump MailMessageLostText db "@" @@ -497,7 +497,7 @@ MailboxPC: ; 0x44806 jp CloseSRAM ; 0x448d2 -.AttachMail ; 0x448d2 +.AttachMail: ; 0x448d2 call FadeToMenu xor a ld [PartyMenuActionText], a @@ -542,19 +542,19 @@ MailboxPC: ; 0x44806 jp CloseSubmenu ; 0x4493c -.HoldingMailText ; 0x4493c +.HoldingMailText: ; 0x4493c text_jump MailAlreadyHoldingItemText db "@" -.EggText ; 0x44941 +.EggText: ; 0x44941 text_jump MailEggText db "@" -.MailMovedText ; 0x44946 +.MailMovedText: ; 0x44946 text_jump MailMovedFromBoxText db "@" -.Cancel +.Cancel: ret .TopMenuDataHeader: ; 0x4494c @@ -564,7 +564,7 @@ MailboxPC: ; 0x44806 dw .TopMenuData2 db 1 ; default option -.TopMenuData2 +.TopMenuData2: db %00010000 ; flags db 4, 0 ; rows/columns? db 1 ; horizontal spacing? @@ -580,7 +580,7 @@ MailboxPC: ; 0x44806 dw .SubMenuData2 db 1 ; default option -.SubMenuData2 +.SubMenuData2: db %10000000 ; flags db 4 ; items db "READ MAIL@" diff --git a/engine/main_menu.asm b/engine/main_menu.asm index 2c9afcc07..bad1682c7 100755 --- a/engine/main_menu.asm +++ b/engine/main_menu.asm @@ -54,7 +54,7 @@ MainMenu: ; 49cdc db "MOBILE STUDIUM@" .Jumptable: ; 0x49d60 - + dw MainMenu_Continue dw MainMenu_NewGame dw MainMenu_Options @@ -250,7 +250,7 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09 call TextBox ret -.TimeFail +.TimeFail: call SpeechTextBox ret ; 49e3d @@ -291,11 +291,11 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09 ret ; 49e7f -.TimeNotSet ; 49e7f +.TimeNotSet: ; 49e7f db "TIME NOT SET@" ; 49e8c -.UnusedText ; 49e8c +.UnusedText: ; 49e8c ; Clock time unknown text_jump UnknownText_0x1c5182 db "@" @@ -317,7 +317,7 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09 ret ; 49ea8 -.Days +.Days: db "SUN@" db "MON@" db "TUES@" @@ -325,7 +325,7 @@ MainMenu_PrintCurrentTimeAndDay: ; 49e09 db "THURS@" db "FRI@" db "SATUR@" -.Day +.Day: db "DAY@" ; 49ed0 diff --git a/engine/map_object_action.asm b/engine/map_object_action.asm index b7f98e8d7..63748ce6a 100755 --- a/engine/map_object_action.asm +++ b/engine/map_object_action.asm @@ -191,7 +191,7 @@ Function453f: ; 453f ret ; 456a -.Directions ; 456a +.Directions: ; 456a db OW_DOWN, OW_RIGHT, OW_UP, OW_LEFT ; 456e diff --git a/engine/map_objects.asm b/engine/map_objects.asm index a0ae8bcf2..5d5a7f4e8 100644 --- a/engine/map_objects.asm +++ b/engine/map_objects.asm @@ -37,7 +37,7 @@ Function437b: ; 437b call .HandleObjectAction ret -.CheckObjectStillVisible +.CheckObjectStillVisible: ld hl, OBJECT_FLAGS2 add hl, bc res 6, [hl] @@ -107,7 +107,7 @@ Function437b: ; 437b and a ret -.HandleStepType +.HandleStepType: ld hl, OBJECT_STEP_TYPE add hl, bc ld a, [hl] @@ -144,7 +144,7 @@ Function437b: ; 437b .bit5 ret -.HandleObjectAction +.HandleObjectAction: ld hl, OBJECT_FLAGS1 add hl, bc bit INVISIBLE, [hl] @@ -534,7 +534,7 @@ MapObjectMovementPattern: ; 47dd rst JumpTable ret -.Pointers ; 47e9 +.Pointers: ; 47e9 dw .Null_00 ; 00 dw .RandomWalkY ; 01 dw .RandomWalkX ; 02 @@ -564,29 +564,29 @@ MapObjectMovementPattern: ; 47dd dw .MovementBoulderDust ; 1a dw .MovementShakingGrass ; 1b -.Null_00 +.Null_00: ret -.RandomWalkY +.RandomWalkY: call Random ld a, [hRandomAdd] and %00000001 jp .RandomWalkContinue -.RandomWalkX +.RandomWalkX: call Random ld a, [hRandomAdd] and %00000001 or %00000010 jp .RandomWalkContinue -.RandomWalkXY +.RandomWalkXY: call Random ld a, [hRandomAdd] and %00000011 jp .RandomWalkContinue -.RandomSpin1 +.RandomSpin1: call Random ld a, [hRandomAdd] and %00001100 @@ -595,7 +595,7 @@ MapObjectMovementPattern: ; 47dd ld [hl], a jp RandomStepDuration_Slow -.RandomSpin2 +.RandomSpin2: ld hl, OBJECT_FACING add hl, bc ld a, [hl] @@ -611,7 +611,7 @@ MapObjectMovementPattern: ; 47dd ld [hl], a jp RandomStepDuration_Fast -.Standing +.Standing: call Function462a call EndSpriteMovement ld hl, OBJECT_ACTION @@ -622,48 +622,48 @@ MapObjectMovementPattern: ; 47dd ld [hl], STEP_TYPE_05 ret -.ObeyDPad +.ObeyDPad: ld hl, Function5000 jp HandleMovementData -.Movement08 +.Movement08: ld hl, Function5015 jp HandleMovementData -.Movement09 +.Movement09: ld hl, Function5026 jp HandleMovementData -.Movement0a +.Movement0a: jp _GetMovementPerson -.Movement0b +.Movement0b: jp _GetMovementPerson -.Movement0c +.Movement0c: jp _GetMovementPerson -.Movement0d +.Movement0d: ld hl, Function5000 jp HandleMovementData -.Movement0e +.Movement0e: jp _GetMovementPerson -.Follow +.Follow: ld hl, GetFollowerNextMovementByte jp HandleMovementData -.Script +.Script: ld hl, GetMovementByte jp HandleMovementData -.Strength +.Strength: call MovementAnonymousJumptable dw .Strength_Start dw .Strength_Stop -.Strength_Start +.Strength_Start: ld hl, OBJECT_NEXT_TILE add hl, bc ld a, [hl] @@ -701,13 +701,13 @@ MapObjectMovementPattern: ; 47dd .on_pit call IncrementObjectMovementByteIndex -.Strength_Stop +.Strength_Stop: ld hl, OBJECT_DIRECTION_WALKING add hl, bc ld [hl], STANDING ret -.FollowNotExact +.FollowNotExact: ld hl, OBJECT_NEXT_MAP_X add hl, bc ld d, [hl] @@ -769,7 +769,7 @@ MapObjectMovementPattern: ; 47dd ld [hl], PERSON_ACTION_STAND ret -.MovementBigStanding +.MovementBigStanding: call EndSpriteMovement ld hl, OBJECT_DIRECTION_WALKING add hl, bc @@ -782,7 +782,7 @@ MapObjectMovementPattern: ; 47dd ld [hl], STEP_TYPE_04 ret -.MovementBouncing +.MovementBouncing: call EndSpriteMovement ld hl, OBJECT_DIRECTION_WALKING add hl, bc @@ -795,22 +795,22 @@ MapObjectMovementPattern: ; 47dd ld [hl], STEP_TYPE_04 ret -.MovementSpinCounterclockwise +.MovementSpinCounterclockwise: call MovementAnonymousJumptable dw .MovementSpinInit dw .MovementSpinRepeat dw .MovementSpinTurnLeft -.MovementSpinClockwise +.MovementSpinClockwise: call MovementAnonymousJumptable dw .MovementSpinInit dw .MovementSpinRepeat dw .MovementSpinTurnRight -.MovementSpinInit +.MovementSpinInit: call EndSpriteMovement call IncrementObjectMovementByteIndex -.MovementSpinRepeat +.MovementSpinRepeat: ld hl, OBJECT_ACTION add hl, bc ld [hl], PERSON_ACTION_STAND @@ -827,23 +827,23 @@ MapObjectMovementPattern: ; 47dd call IncrementObjectMovementByteIndex ret -.MovementSpinTurnLeft +.MovementSpinTurnLeft: ld de, .DirectionData_Counterclockwise call .MovementSpinNextFacing jr .MovementSpinCounterclockwise -.DirectionData_Counterclockwise ; 49c0 +.DirectionData_Counterclockwise: ; 49c0 db OW_RIGHT, OW_LEFT, OW_DOWN, OW_UP -.MovementSpinTurnRight +.MovementSpinTurnRight: ld de, .DirectionData_Clockwise call .MovementSpinNextFacing jr .MovementSpinClockwise -.DirectionData_Clockwise ; 49cc +.DirectionData_Clockwise: ; 49cc db OW_LEFT, OW_RIGHT, OW_UP, OW_DOWN -.MovementSpinNextFacing +.MovementSpinNextFacing: ld hl, OBJECT_FACING add hl, bc ld a, [hl] @@ -860,7 +860,7 @@ MapObjectMovementPattern: ; 47dd call DecrementObjectMovementByteIndex ret -.MovementShadow +.MovementShadow: call ._MovementShadow_Grass_Emote_BoulderDust ld hl, OBJECT_ACTION add hl, bc @@ -896,7 +896,7 @@ MapObjectMovementPattern: ; 47dd ld [hl], STEP_TYPE_TRACKING_OBJECT ret -.MovementEmote +.MovementEmote: call EndSpriteMovement call ._MovementShadow_Grass_Emote_BoulderDust ld hl, OBJECT_ACTION @@ -916,7 +916,7 @@ MapObjectMovementPattern: ; 47dd ld [hl], STEP_TYPE_TRACKING_OBJECT ret -.MovementBoulderDust +.MovementBoulderDust: call EndSpriteMovement call ._MovementShadow_Grass_Emote_BoulderDust ld hl, OBJECT_ACTION @@ -960,7 +960,7 @@ MapObjectMovementPattern: ; 47dd db 6, 2 db -6, 2 -.MovementShakingGrass +.MovementShakingGrass: call EndSpriteMovement call ._MovementShadow_Grass_Emote_BoulderDust ld hl, OBJECT_ACTION @@ -994,7 +994,7 @@ MapObjectMovementPattern: ; 47dd ld [hl], d ret -.MovementScreenShake +.MovementScreenShake: call EndSpriteMovement ld hl, OBJECT_ACTION add hl, bc @@ -1031,7 +1031,7 @@ MapObjectMovementPattern: ; 47dd add a jr .loop -.RandomWalkContinue +.RandomWalkContinue: call InitStep call Function6ec1 ; check whether the object can move in that direction jr c, .NewDuration @@ -1054,7 +1054,7 @@ MapObjectMovementPattern: ; 47dd ld [hl], STEP_TYPE_PLAYER_WALK ret -.NewDuration +.NewDuration: call EndSpriteMovement call Function462a RandomStepDuration_Slow: ; 4b1d @@ -1131,7 +1131,7 @@ NPCJump: ; 4b86 dw .Jump dw .Land -.Jump +.Jump: call AddStepVector call UpdateJumpPosition ld hl, OBJECT_STEP_DURATION @@ -1146,7 +1146,7 @@ NPCJump: ; 4b86 call IncrementObjectStructField28 ret -.Land +.Land: call AddStepVector call UpdateJumpPosition ld hl, OBJECT_STEP_DURATION @@ -1219,7 +1219,7 @@ TeleportFrom: ; 4c18 dw .DoSpinRise ; 4c23 -.InitSpin +.InitSpin: ld hl, OBJECT_STEP_FRAME add hl, bc ld [hl], 0 @@ -1227,7 +1227,7 @@ TeleportFrom: ; 4c18 add hl, bc ld [hl], 16 call IncrementObjectStructField28 -.DoSpin +.DoSpin: ld hl, OBJECT_ACTION add hl, bc ld [hl], PERSON_ACTION_SPIN @@ -1238,7 +1238,7 @@ TeleportFrom: ; 4c18 call IncrementObjectStructField28 ret -.InitSpinRise +.InitSpinRise: ld hl, OBJECT_STEP_FRAME add hl, bc ld [hl], 0 @@ -1252,7 +1252,7 @@ TeleportFrom: ; 4c18 add hl, bc res 3, [hl] call IncrementObjectStructField28 -.DoSpinRise +.DoSpinRise: ld hl, OBJECT_ACTION add hl, bc ld [hl], PERSON_ACTION_SPIN @@ -1292,7 +1292,7 @@ TeleportTo: ; 4c89 dw .FinishStep ; 4c9a -.InitWait +.InitWait: ld hl, OBJECT_ACTION add hl, bc ld [hl], PERSON_ACTION_00 @@ -1303,13 +1303,13 @@ TeleportTo: ; 4c89 ret ; 4caa -.DoWait +.DoWait: ld hl, OBJECT_STEP_DURATION add hl, bc dec [hl] ret nz call IncrementObjectStructField28 -.InitDescent +.InitDescent: ld hl, OBJECT_STEP_FRAME add hl, bc ld [hl], 0 @@ -1323,7 +1323,7 @@ TeleportTo: ; 4c89 ret ; 4cc9 -.DoDescent +.DoDescent: ld hl, OBJECT_ACTION add hl, bc ld [hl], PERSON_ACTION_SPIN @@ -1343,7 +1343,7 @@ TeleportTo: ; 4c89 dec [hl] ret nz call IncrementObjectStructField28 -.InitFinalSpin +.InitFinalSpin: ld hl, OBJECT_STEP_DURATION add hl, bc ld [hl], 16 @@ -1351,7 +1351,7 @@ TeleportTo: ; 4c89 ret ; 4cf5 -.DoFinalSpin +.DoFinalSpin: ld hl, OBJECT_ACTION add hl, bc ld [hl], PERSON_ACTION_SPIN @@ -1359,7 +1359,7 @@ TeleportTo: ; 4c89 add hl, bc dec [hl] ret nz -.FinishStep +.FinishStep: ld hl, OBJECT_STEP_FRAME add hl, bc ld [hl], 0 @@ -1381,7 +1381,7 @@ Skyfall: ; 4d14 dw .Finish ; 4d1f -.Init +.Init: ld hl, OBJECT_ACTION add hl, bc ld [hl], PERSON_ACTION_00 @@ -1389,7 +1389,7 @@ Skyfall: ; 4d14 add hl, bc ld [hl], 16 call IncrementObjectStructField28 -.Step +.Step: ld hl, OBJECT_STEP_DURATION add hl, bc dec [hl] @@ -1407,7 +1407,7 @@ Skyfall: ; 4d14 add hl, bc ld [hl], 16 call IncrementObjectStructField28 -.Fall +.Fall: ld hl, OBJECT_31 add hl, bc inc [hl] @@ -1424,7 +1424,7 @@ Skyfall: ; 4d14 dec [hl] ret nz call IncrementObjectStructField28 -.Finish +.Finish: ld hl, OBJECT_STEP_FRAME add hl, bc ld [hl], 0 @@ -1444,7 +1444,7 @@ GotBiteStep: ; 4d7e dw .Run ; 4d85 -.Init +.Init: ld hl, OBJECT_STEP_DURATION add hl, bc ld [hl], 8 @@ -1452,7 +1452,7 @@ GotBiteStep: ; 4d7e add hl, bc ld [hl], 0 call IncrementObjectStructField28 -.Run +.Run: ld hl, OBJECT_SPRITE_Y_OFFSET add hl, bc ld a, [hl] @@ -1476,7 +1476,7 @@ RockSmashStep: ; 4daf jp WaitStep_InPlace ; 4db5 -.Step +.Step: ld hl, OBJECT_STEP_DURATION add hl, bc ld a, [hl] @@ -1548,7 +1548,7 @@ StepType05: ; 4e0c dw .Reset dw StepType04 -.Reset +.Reset: call RestoreDefaultMovement call GetInitialFacing ld hl, OBJECT_FACING @@ -1740,13 +1740,13 @@ StepType15: ; 4f33 dw .Init dw .Run -.Init +.Init: xor a ld hl, OBJECT_29 add hl, bc ld [hl], a call IncrementObjectStructField28 -.Run +.Run: ld hl, OBJECT_29 add hl, bc ld d, [hl] @@ -1772,7 +1772,7 @@ StepType15: ; 4f33 call DeleteMapObject ret -.GetSign +.GetSign: ld hl, OBJECT_30 add hl, bc and 1 @@ -1801,7 +1801,7 @@ SkyfallTop: ; 4f83 dw .Init dw .Run -.Init +.Init: ld hl, OBJECT_ACTION add hl, bc ld [hl], PERSON_ACTION_10 @@ -1942,7 +1942,7 @@ HandleMovementData: ; 5041 jr nz, .loop ret -.StorePointer +.StorePointer: ld a, l ld [wMovementPointer], a ld a, h @@ -2037,7 +2037,7 @@ GetFollowerNextMovementByte: ; 54e6 ld a, movement_step_sleep_1 ret -.CancelFollowIfLeaderMissing +.CancelFollowIfLeaderMissing: ld a, [wObjectFollow_Leader] cp -1 jr z, .nope @@ -2068,7 +2068,7 @@ SpawnShadow: ; 5529 pop bc ret -.ShadowObject +.ShadowObject: ; vtile, palette, movement db $00, PAL_OW_SILVER, SPRITEMOVEDATA_SHADOW ; 5538 @@ -2080,7 +2080,7 @@ SpawnStrengthBoulderDust: ; 5538 pop bc ret -.BoulderDustObject +.BoulderDustObject: db $00, PAL_OW_SILVER, SPRITEMOVEDATA_BOULDERDUST ; 5547 SpawnEmote: ; 5547 @@ -2091,7 +2091,7 @@ SpawnEmote: ; 5547 pop bc ret -.EmoteObject +.EmoteObject: db $00, PAL_OW_SILVER, SPRITEMOVEDATA_EMOTE ; 5556 ShakeGrass: ; 5556 @@ -2116,7 +2116,7 @@ ShakeScreen: ; 5565 pop bc ret -.ScreenShakeObject +.ScreenShakeObject: db $00, PAL_OW_SILVER, SPRITEMOVEDATA_SCREENSHAKE ; 5579 DespawnEmote: ; 5579 @@ -2127,7 +2127,7 @@ DespawnEmote: ; 5579 pop bc ret -.DeleteEmote +.DeleteEmote: ld de, ObjectStructs ld a, NUM_OBJECT_STRUCTS .loop @@ -2475,7 +2475,7 @@ HandleNPCStep:: ; 576a call .DoStepsForAllObjects ret -.ResetStepVector +.ResetStepVector: xor a ld [wPlayerStepVectorX], a ld [wPlayerStepVectorY], a @@ -2484,7 +2484,7 @@ HandleNPCStep:: ; 576a ld [wPlayerStepDirection], a ret -.DoStepsForAllObjects +.DoStepsForAllObjects: ld bc, ObjectStructs xor a .loop @@ -2871,7 +2871,7 @@ PRIORITY_HIGH EQU $30 call .InitSpritesByPriority ret -.DeterminePriorities +.DeterminePriorities: xor a ld hl, wMovementPointer ld bc, NUM_OBJECT_STRUCTS @@ -2924,7 +2924,7 @@ PRIORITY_HIGH EQU $30 jr nz, .loop ret -.InitSpritesByPriority +.InitSpritesByPriority: ld hl, wMovementPointer .next_sprite ld a, [hli] @@ -2943,7 +2943,7 @@ PRIORITY_HIGH EQU $30 pop bc jr .next_sprite -.InitSprite +.InitSprite: ld hl, OBJECT_SPRITE_TILE add hl, bc ld a, [hl] @@ -3069,7 +3069,7 @@ PRIORITY_HIGH EQU $30 scf ret -.GetObjectStructPointer +.GetObjectStructPointer: ld c, a ld b, 0 ld hl, .Addresses @@ -3080,7 +3080,7 @@ PRIORITY_HIGH EQU $30 ld b, [hl] ret -.Addresses ; 5ace +.Addresses: ; 5ace dw PlayerStruct dw Object1Struct dw Object2Struct diff --git a/engine/mart.asm b/engine/mart.asm index 5ee700951..3212ef384 100755 --- a/engine/mart.asm +++ b/engine/mart.asm @@ -143,7 +143,7 @@ GetMart: ; 15b31 ld de, DefaultMart ret -.IsAMart +.IsAMart: ld hl, Marts rept 2 add hl, de @@ -165,7 +165,7 @@ StandardMart: ; 15b47 jr nz, .loop ret -.MartFunctions +.MartFunctions: dw .HowMayIHelpYou dw .TopMenu dw .Buy @@ -241,7 +241,7 @@ FarReadMart: ; 15bbb ld h, [hl] ld l, a ld de, CurMart -.CopyMart +.CopyMart: ld a, [MartPointerBank] call GetFarByte ld [de], a @@ -251,7 +251,7 @@ FarReadMart: ; 15bbb jr nz, .CopyMart ld hl, wMartItem1BCD ld de, CurMart + 1 -.ReadMartItem +.ReadMartItem: ld a, [de] inc de cp -1 @@ -299,7 +299,7 @@ GetMartPrice: ; 15bf0 ret ; 15c1a -.CharToNybble ; 15c1a +.CharToNybble: ; 15c1a ld a, [de] inc de cp " " @@ -427,7 +427,7 @@ endr ret ; 15cb0 -.MartTextFunctionPointers ; 15cb0 +.MartTextFunctionPointers: ; 15cb0 dwb .StandardMartPointers, 0 dwb .HerbShopPointers, 0 dwb .BargainShopPointers, 1 @@ -592,7 +592,7 @@ endr and a ret -.SoldOut +.SoldOut: ld a, MARTTEXT_SOLD_OUT call LoadBuyMenuText call JoyWaitAorB diff --git a/engine/menu.asm b/engine/menu.asm index 074b2a28c..39cbf0e2a 100755 --- a/engine/menu.asm +++ b/engine/menu.asm @@ -763,7 +763,7 @@ Error_Cant_ExitMenu: ; 2445d ld hl, .Text_NoWindowsAvailableForPopping call PrintText call WaitBGMap -.InfiniteLoop +.InfiniteLoop: jr .InfiniteLoop ; 24468 diff --git a/engine/mon_menu.asm b/engine/mon_menu.asm index f560b1b15..a6dcf0eb7 100755 --- a/engine/mon_menu.asm +++ b/engine/mon_menu.asm @@ -148,7 +148,7 @@ GetMonMenuString: ; 24db0 call GetMoveName ret -.NotMove +.NotMove: inc hl ld a, [hl] dec a diff --git a/engine/move_mon.asm b/engine/move_mon.asm index 0a8c340ed..f52defcad 100755 --- a/engine/move_mon.asm +++ b/engine/move_mon.asm @@ -655,7 +655,7 @@ SentGetPkmnIntoFromBox: ; db3f dec a ld b, a call Functiondcb6 -.CloseSRAM_And_ClearCarryFlag +.CloseSRAM_And_ClearCarryFlag: call CloseSRAM and a ret @@ -1481,30 +1481,30 @@ endr pop bc jr .GotDV -.Attack +.Attack: ld a, [hl] swap a and $f jr .GotDV -.Defense +.Defense: ld a, [hl] and $f jr .GotDV -.Speed +.Speed: inc hl ld a, [hl] swap a and $f jr .GotDV -.Special +.Special: inc hl ld a, [hl] and $f -.GotDV +.GotDV: ld d, 0 add e ld e, a diff --git a/engine/mysterygift.asm b/engine/mysterygift.asm index 0360bc74f..d7d3efafc 100755 --- a/engine/mysterygift.asm +++ b/engine/mysterygift.asm @@ -198,9 +198,9 @@ DoMysteryGift: ; 1048ba (41:48ba) inc hl dec d jr .loop -.Yes +.Yes: scf -.No +.No: jp CloseSRAM .AddMysteryGiftPartnerID: ; 104a56 (41:4a56) diff --git a/engine/options_menu.asm b/engine/options_menu.asm index f6d8392d9..00799395a 100755 --- a/engine/options_menu.asm +++ b/engine/options_menu.asm @@ -52,7 +52,7 @@ _OptionsMenu: ; e41d0 call DelayFrames jr .joypad_loop -.ExitOptions +.ExitOptions: ld de, SFX_TRANSACTION call PlaySFX call WaitSFX @@ -94,7 +94,7 @@ endr jp [hl] ; jump to the code of the current highlighted item ; e42e5 -.Pointers +.Pointers: dw Options_TextSpeed dw Options_BattleScene dw Options_BattleStyle @@ -118,29 +118,29 @@ Options_TextSpeed: ; e42f5 jr c, .Increase ld c, FAST_TEXT +- 1 -.Increase +.Increase: inc c ld a, e jr .Save -.LeftPressed +.LeftPressed: ld a, c and a jr nz, .Decrease ld c, SLOW_TEXT + 1 -.Decrease +.Decrease: dec c ld a, d -.Save +.Save: ld b, a ld a, [Options] and $f0 or b ld [Options], a -.NonePressed +.NonePressed: ld b, 0 ld hl, .Strings rept 2 @@ -155,16 +155,16 @@ endr ret ; e4331 -.Strings +.Strings: dw .Fast dw .Mid dw .Slow -.Fast +.Fast: db "FAST@" -.Mid +.Mid: db "MID @" -.Slow +.Slow: db "SLOW@" ; e4346 @@ -203,35 +203,35 @@ Options_BattleScene: ; e4365 jr nz, .ToggleOn jr .ToggleOff -.LeftPressed +.LeftPressed: bit BATTLE_SCENE, [hl] jr z, .ToggleOff jr .ToggleOn -.NonePressed +.NonePressed: bit BATTLE_SCENE, [hl] jr z, .ToggleOn jr .ToggleOff -.ToggleOn +.ToggleOn: res BATTLE_SCENE, [hl] ld de, .On jr .Display -.ToggleOff +.ToggleOff: set BATTLE_SCENE, [hl] ld de, .Off -.Display +.Display: hlcoord 11, 5 call PlaceString and a ret ; e4398 -.On +.On: db "ON @" -.Off +.Off: db "OFF@" ; e43a0 @@ -247,34 +247,34 @@ Options_BattleStyle: ; e43a0 jr nz, .ToggleShift jr .ToggleSet -.LeftPressed +.LeftPressed: bit BATTLE_SHIFT, [hl] jr z, .ToggleSet jr .ToggleShift -.NonePressed +.NonePressed: bit BATTLE_SHIFT, [hl] jr nz, .ToggleSet -.ToggleShift +.ToggleShift: res BATTLE_SHIFT, [hl] ld de, .Shift jr .Display -.ToggleSet +.ToggleSet: set BATTLE_SHIFT, [hl] ld de, .Set -.Display +.Display: hlcoord 11, 7 call PlaceString and a ret ; e43d1 -.Shift +.Shift: db "SHIFT@" -.Set +.Set: db "SET @" ; e43dd @@ -290,41 +290,41 @@ Options_Sound: ; e43dd jr nz, .SetMono jr .SetStereo -.LeftPressed +.LeftPressed: bit STEREO, [hl] jr z, .SetStereo jr .SetMono -.NonePressed +.NonePressed: bit STEREO, [hl] jr nz, .ToggleStereo jr .ToggleMono -.SetMono +.SetMono: res STEREO, [hl] call RestartMapMusic -.ToggleMono +.ToggleMono: ld de, .Mono jr .Display -.SetStereo +.SetStereo: set STEREO, [hl] call RestartMapMusic -.ToggleStereo +.ToggleStereo: ld de, .Stereo -.Display +.Display: hlcoord 11, 9 call PlaceString and a ret ; e4416 -.Mono +.Mono: db "MONO @" -.Stereo +.Stereo: db "STEREO@" ; e4424 @@ -341,26 +341,26 @@ Options_Print: ; e4424 jr c, .Increase ld c, -1 -.Increase +.Increase: inc c ld a, e jr .Save -.LeftPressed +.LeftPressed: ld a, c and a jr nz, .Decrease ld c, 5 -.Decrease +.Decrease: dec c ld a, d -.Save +.Save: ld b, a ld [GBPrinter], a -.NonePressed +.NonePressed: ld b, $0 ld hl, .Strings rept 2 @@ -375,22 +375,22 @@ endr ret ; e445a -.Strings +.Strings: dw .Lightest dw .Lighter dw .Normal dw .Darker dw .Darkest -.Lightest +.Lightest: db "LIGHTEST@" -.Lighter +.Lighter: db "LIGHTER @" -.Normal +.Normal: db "NORMAL @" -.Darker +.Darker: db "DARKER @" -.Darkest +.Darkest: db "DARKEST @" ; e4491 @@ -409,22 +409,22 @@ GetPrinterSetting: ; e4491 lb de, PRINT_LIGHTER, PRINT_DARKER ; the 2 values next to this setting ret -.IsLightest +.IsLightest: ld c, 0 lb de, PRINT_DARKEST, PRINT_LIGHTER ; the 2 values next to this setting ret -.IsLight +.IsLight: ld c, 1 lb de, PRINT_LIGHTEST, PRINT_NORMAL ; the 2 values next to this setting ret -.IsDark +.IsDark: ld c, 3 lb de, PRINT_NORMAL, PRINT_DARKEST ; the 2 values next to this setting ret -.IsDarkest +.IsDarkest: ld c, 4 lb de, PRINT_DARKER, PRINT_LIGHTEST ; the 2 values next to this setting ret @@ -441,34 +441,34 @@ Options_MenuAccount: ; e44c1 jr nz, .ToggleOff jr .ToggleOn -.LeftPressed +.LeftPressed: bit MENU_ACCOUNT, [hl] jr z, .ToggleOn jr .ToggleOff -.NonePressed +.NonePressed: bit MENU_ACCOUNT, [hl] jr nz, .ToggleOn -.ToggleOff +.ToggleOff: res MENU_ACCOUNT, [hl] ld de, .Off jr .Display -.ToggleOn +.ToggleOn: set MENU_ACCOUNT, [hl] ld de, .On -.Display +.Display: hlcoord 11, 13 call PlaceString and a ret ; e44f2 -.Off +.Off: db "OFF@" -.On +.On: db "ON @" ; e44fa @@ -483,16 +483,16 @@ Options_Frame: ; e44fa and a ret -.RightPressed +.RightPressed: ld a, [hl] inc a jr .Save -.LeftPressed +.LeftPressed: ld a, [hl] dec a -.Save +.Save: and $7 ld [hl], a UpdateFrame: ; e4512 @@ -512,7 +512,7 @@ Options_Cancel: ; e4520 and a ret -.Exit +.Exit: scf ret ; e452a @@ -527,7 +527,7 @@ OptionsControl: ; e452a and a ret -.DownPressed +.DownPressed: ld a, [hl] ; load the cursor position to a cp $7 ; maximum number of items in option menu jr nz, .CheckFive @@ -535,17 +535,17 @@ OptionsControl: ; e452a scf ret -.CheckFive ; I have no idea why this exists... +.CheckFive: ; I have no idea why this exists... cp $5 jr nz, .Increase ld [hl], $5 -.Increase +.Increase: inc [hl] scf ret -.UpPressed +.UpPressed: ld a, [hl] cp $6 jr nz, .NotSix @@ -553,12 +553,12 @@ OptionsControl: ; e452a scf ret -.NotSix +.NotSix: and a jr nz, .Decrease ld [hl], $8 ; number of option items +1 -.Decrease +.Decrease: dec [hl] scf ret diff --git a/engine/overworld.asm b/engine/overworld.asm index e1d50d0b8..5e12b09a2 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -95,14 +95,14 @@ GetPlayerSprite: ; 14183 ld [PlayerObjectSprite], a ret -.Chris +.Chris: db PLAYER_NORMAL, SPRITE_CHRIS db PLAYER_BIKE, SPRITE_CHRIS_BIKE db PLAYER_SURF, SPRITE_SURF db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU db $ff -.Kris +.Kris: db PLAYER_NORMAL, SPRITE_KRIS db PLAYER_BIKE, SPRITE_KRIS_BIKE db PLAYER_SURF, SPRITE_SURF @@ -241,11 +241,11 @@ GetMonSprite: ; 14259 jr nc, .Variable jr .Icon -.Normal +.Normal: and a ret -.Icon +.Icon: sub SPRITE_POKEMON ld e, a ld d, 0 @@ -261,7 +261,7 @@ GetMonSprite: ; 14259 .wBreedMon2 ld a, [wBreedMon2Species] -.Mon +.Mon: ld e, a and a jr z, .NoBreedmon @@ -273,7 +273,7 @@ GetMonSprite: ; 14259 scf ret -.Variable +.Variable: sub SPRITE_VARS ld e, a ld d, 0 @@ -283,7 +283,7 @@ GetMonSprite: ; 14259 and a jp nz, GetMonSprite -.NoBreedmon +.NoBreedmon: ld a, 1 ld l, 1 ld h, 0 @@ -410,7 +410,7 @@ LoadSpriteGFX: ; 14306 .done ret -.LoadSprite +.LoadSprite: call GetSprite ld a, l ret @@ -424,7 +424,7 @@ SortUsedSprites: ; 1431e ld c, SPRITE_GFX_LIST_CAPACITY ld de, UsedSprites + (SPRITE_GFX_LIST_CAPACITY - 1) * 2 -.FindLastSprite +.FindLastSprite: ld a, [de] and a jr nz, .FoundLastSprite @@ -433,7 +433,7 @@ rept 2 endr dec c jr nz, .FindLastSprite -.FoundLastSprite +.FoundLastSprite: dec c jr z, .quit @@ -443,12 +443,12 @@ endr inc de ld hl, UsedSprites + 1 -.CheckSprite +.CheckSprite: push bc push de push hl -.CheckFollowing +.CheckFollowing: ld a, [de] cp [hl] jr nc, .loop @@ -499,7 +499,7 @@ ArrangeUsedSprites: ; 14355 ld hl, UsedSprites ld c, SPRITE_GFX_LIST_CAPACITY ld b, 0 -.FirstTableLength +.FirstTableLength: ; Keep going until the end of the list. ld a, [hli] and a @@ -523,11 +523,11 @@ ArrangeUsedSprites: ; 14355 dec c jr nz, .FirstTableLength -.SecondTable +.SecondTable: ; The second tile table starts at tile $80. ld b, $80 dec hl -.SecondTableLength +.SecondTableLength: ; Keep going until the end of the list. ld a, [hli] and a @@ -565,11 +565,11 @@ GetSpriteLength: ; 14386 ld a, 12 ret -.AnyDirection +.AnyDirection: ld a, 12 ret -.OneDirection +.OneDirection: ld a, 4 ret ; 1439b diff --git a/engine/pack.asm b/engine/pack.asm index 8d1b63232..06e8089b2 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -28,7 +28,7 @@ Pack: ; 10000 ; 10030 .Jumptable: ; 10030 (4:4030) - + dw .InitGFX ; 0 dw .InitItemsPocket ; 1 dw .ItemsPocketMenu ; 2 @@ -163,7 +163,7 @@ Pack: ; 10000 ; 0x10137 .Jumptable1: ; 10137 - + dw .UseItem dw QuitItemSubmenu @@ -328,7 +328,7 @@ MenuDataHeader_UsableKeyItem: ; 0x10249 ; 0x1026a Jumptable_UseGiveTossRegisterQuit: ; 1026a - + dw UseItem dw GiveItem dw TossMenu @@ -354,7 +354,7 @@ MenuDataHeader_UsableItem: ; 0x10274 ; 0x10291 Jumptable_UseGiveTossQuit: ; 10291 - + dw UseItem dw GiveItem dw TossMenu @@ -377,7 +377,7 @@ MenuDataHeader_UnusableItem: ; 0x10299 ; 0x102ac Jumptable_UseQuit: ; 102ac - + dw UseItem dw QuitItemSubmenu ; 102b0 @@ -399,7 +399,7 @@ MenuDataHeader_UnusableKeyItem: ; 0x102b0 ; 0x102c7 Jumptable_UseRegisterQuit: ; 102c7 - + dw UseItem dw RegisterItem dw QuitItemSubmenu @@ -423,7 +423,7 @@ MenuDataHeader_HoldableKeyItem: ; 0x102cd ; 0x102ea Jumptable_GiveTossRegisterQuit: ; 102ea - + dw GiveItem dw TossMenu dw RegisterItem @@ -447,7 +447,7 @@ MenuDataHeader_HoldableItem: ; 0x102f2 ; 0x1030b Jumptable_GiveTossQuit: ; 1030b - + dw GiveItem dw TossMenu dw QuitItemSubmenu @@ -463,7 +463,7 @@ UseItem: ; 10311 ; 1031f .dw: ; 1031f (4:431f) - + dw .Oak dw .Oak dw .Oak @@ -494,7 +494,7 @@ UseItem: ; 10311 call Pack_InitColors ret -.NoPokemon +.NoPokemon: ld hl, TextJump_YouDontHaveAPkmn call Pack_PrintTextNoScroll ret @@ -694,7 +694,7 @@ BattlePack: ; 10493 ; 104c3 .Jumptable: ; 104c3 (4:44c3) - + dw .InitGFX ; 0 dw .InitItemsPocket ; 1 dw .ItemsPocketMenu ; 2 @@ -833,7 +833,7 @@ TMHMSubmenu: ; 105dc (4:45dc) ld de, .UsableJumptable jr .proceed -.NoUse +.NoUse: ld hl, .UnusableMenuDataHeader ld de, .UnusableJumptable .proceed @@ -865,7 +865,7 @@ TMHMSubmenu: ; 105dc (4:45dc) ; 0x10614 .UsableJumptable: ; 10614 - + dw .Use dw .Quit ; 10618 @@ -885,7 +885,7 @@ TMHMSubmenu: ; 105dc (4:45dc) ; 0x10627 .UnusableJumptable: ; 10627 - + dw .Quit ; 10629 @@ -897,7 +897,7 @@ TMHMSubmenu: ; 105dc (4:45dc) ret .ItemFunctionJumptable: ; 10637 (4:4637) - + dw .Oak dw .Oak dw .Oak @@ -1002,7 +1002,7 @@ DepositSellPack: ; 106be ; 106d1 .Jumptable: ; 106d1 (4:46d1) - + dw .ItemsPocket dw .BallsPocket dw .KeyItemsPocket @@ -1149,7 +1149,7 @@ TutorialPack: ; 107bb ; 107e1 .dw: ; 107e1 (4:47e1) - + dw .Items dw .Balls dw .KeyItems diff --git a/engine/party_menu.asm b/engine/party_menu.asm index 9bf02351e..d6c8ae406 100644 --- a/engine/party_menu.asm +++ b/engine/party_menu.asm @@ -263,7 +263,7 @@ PlacePartyMonLevel: ; 50176 ld [hli], a lb bc, PRINTNUM_RIGHTALIGN | 1, 2 ; jr .okay -.ThreeDigits +.ThreeDigits: lb bc, PRINTNUM_RIGHTALIGN | 1, 3 ; .okay call PrintNum diff --git a/engine/phone.asm b/engine/phone.asm index ac21c1565..90d6217f4 100644 --- a/engine/phone.asm +++ b/engine/phone.asm @@ -60,7 +60,7 @@ Phone_FindOpenSlot: ; 9002d xor a ret -.FoundOpenSpace +.FoundOpenSpace: dec hl scf ret @@ -196,7 +196,7 @@ ChooseRandomCaller: ; 900bf (24:40bf) scf ret -.NothingToSample +.NothingToSample: xor a ret @@ -288,7 +288,7 @@ endr call CallScript scf ret -.NoPhoneCall +.NoPhoneCall: xor a ret ; 90173 (24:4173) @@ -363,7 +363,7 @@ Function90199: ; 90199 (24:4199) ld hl, PhoneScript_JustTalkToThem jr .DoPhoneCall -.GetPhoneScript +.GetPhoneScript: ld hl, PHONE_CONTACT_SCRIPT1_BANK add hl, de ld b, [hl] @@ -374,13 +374,13 @@ Function90199: ; 90199 (24:4199) ld l, a jr .DoPhoneCall -.OutOfArea +.OutOfArea: ld b, BANK(UnknownScript_0x90209) ld de, UnknownScript_0x90209 call ExecuteCallbackScript ret -.DoPhoneCall +.DoPhoneCall: ld a, b ld [wd002], a ld a, l @@ -454,7 +454,7 @@ Script_SpecialBillCall:: ; 0x90255 callasm .LoadBillScript jump Script_ReceivePhoneCall -.LoadBillScript +.LoadBillScript: ld e, PHONE_BILL jp LoadCallerScript ; 90261 @@ -464,7 +464,7 @@ UnknownScript_0x90261: ; 0x90261 pause 30 jump Script_ReceivePhoneCall -.LoadElmScript +.LoadElmScript: ld e, PHONE_ELM jp LoadCallerScript ; 9026f @@ -694,7 +694,7 @@ GetCallerName: ; 903a9 (24:43a9) call PlaceString ret -.NotTrainer +.NotTrainer: push hl ld c, b ld b, 0 diff --git a/engine/player_movement.asm b/engine/player_movement.asm index 6ab121f61..d02d1e5b2 100755 --- a/engine/player_movement.asm +++ b/engine/player_movement.asm @@ -11,7 +11,7 @@ DoPlayerMovement:: ; 80000 ld [wPlayerNextMovement], a ret -.GetDPad +.GetDPad: ld a, [hJoyDown] ld [CurInput], a @@ -32,7 +32,7 @@ DoPlayerMovement:: ; 80000 ret ; 8002d -.TranslateIntoMovement +.TranslateIntoMovement: ld a, [PlayerState] cp PLAYER_NORMAL jr z, .Normal @@ -45,7 +45,7 @@ DoPlayerMovement:: ; 80000 cp PLAYER_SLIP jr z, .Ice -.Normal +.Normal: call .CheckForced call .GetAction call .CheckTile @@ -60,7 +60,7 @@ DoPlayerMovement:: ; 80000 ret c jr .NotMoving -.Surf +.Surf: call .CheckForced call .GetAction call .CheckTile @@ -71,7 +71,7 @@ DoPlayerMovement:: ; 80000 ret c jr .NotMoving -.Ice +.Ice: call .CheckForced call .GetAction call .CheckTile @@ -88,12 +88,12 @@ DoPlayerMovement:: ; 80000 cp STANDING jr z, .HitWall call .BumpSound -.HitWall +.HitWall: call .StandInPlace xor a ret -.NotMoving +.NotMoving: ld a, [WalkingDirection] cp STANDING jr z, .Standing @@ -103,12 +103,12 @@ DoPlayerMovement:: ; 80000 and a jr nz, .CantMove call .BumpSound -.CantMove +.CantMove: call ._WalkInPlace xor a ret -.Standing +.Standing: call .StandInPlace xor a ret @@ -347,7 +347,7 @@ DoPlayerMovement:: ; 80000 scf ret -.ExitWater +.ExitWater: call .GetOutOfWater call PlayMapMusic ld a, STEP_WALK @@ -386,7 +386,7 @@ DoPlayerMovement:: ; 80000 scf ret -.DontJump +.DontJump: xor a ret @@ -442,11 +442,11 @@ DoPlayerMovement:: ; 80000 xor a ret -.EdgeWarps +.EdgeWarps: db $70, $78, $76, $7e ; 8025f -.DoStep +.DoStep: ld e, a ld d, 0 ld hl, .Steps @@ -473,7 +473,7 @@ DoPlayerMovement:: ; 80000 ld a, 4 ret -.Steps +.Steps: dw .SlowStep dw .NormalStep dw .FastStep @@ -483,42 +483,42 @@ DoPlayerMovement:: ; 80000 dw .BackJumpStep dw .InPlace -.SlowStep +.SlowStep: slow_step_down slow_step_up slow_step_left slow_step_right -.NormalStep +.NormalStep: step_down step_up step_left step_right -.FastStep +.FastStep: big_step_down big_step_up big_step_left big_step_right -.JumpStep +.JumpStep: jump_step_down jump_step_up jump_step_left jump_step_right -.SlideStep +.SlideStep: fast_slide_step_down fast_slide_step_up fast_slide_step_left fast_slide_step_right -.BackJumpStep +.BackJumpStep: jump_step_up jump_step_down jump_step_right jump_step_left -.TurningStep +.TurningStep: turn_step_down turn_step_up turn_step_left turn_step_right -.InPlace +.InPlace: db $80 + movement_turn_head_down db $80 + movement_turn_head_up db $80 + movement_turn_head_left @@ -719,7 +719,7 @@ DoPlayerMovement:: ; 80000 xor a ret -.NotWalkable +.NotWalkable: scf ret ; 803b4 @@ -741,7 +741,7 @@ DoPlayerMovement:: ; 80000 and a ret -.NotSurfable +.NotSurfable: scf ret ; 803ca @@ -779,16 +779,16 @@ DoPlayerMovement:: ; 80000 jr .Neither -.Water +.Water: xor a ret -.Land +.Land: ld a, 1 and a ret -.Neither +.Neither: scf ret ; 803ee diff --git a/engine/player_object.asm b/engine/player_object.asm index e84dff23e..2e94f0a6e 100755 --- a/engine/player_object.asm +++ b/engine/player_object.asm @@ -528,7 +528,7 @@ TrainerWalkToPlayer: ; 831e call .GetPathToPlayer call DecrementMovementBufferCount -.TerminateStep +.TerminateStep: ld a, movement_step_end call AppendToMovementBuffer ret @@ -809,7 +809,7 @@ QueueFollowerFirstStep: ; 848a ld [wFollowerMovementQueueLength], a ret -.QueueFirstStep +.QueueFirstStep: ld a, [wObjectFollow_Leader] call GetObjectStruct ld hl, OBJECT_NEXT_MAP_X diff --git a/engine/player_step.asm b/engine/player_step.asm index d0ae42451..15a01efea 100755 --- a/engine/player_step.asm +++ b/engine/player_step.asm @@ -59,7 +59,7 @@ HandlePlayerStep: ; d4e5 (3:54e5) ret .Jumptable: ; d4f2 (3:54f2) - + dw GetMovementPermissions dw BufferScreen dw .mobile diff --git a/engine/pokecenter_pc.asm b/engine/pokecenter_pc.asm index 4c4effb6b..f6b970ede 100755 --- a/engine/pokecenter_pc.asm +++ b/engine/pokecenter_pc.asm @@ -26,21 +26,21 @@ PokemonCenterPC: ; 1559a call CloseWindow ret -.TopMenu +.TopMenu: db $48 ; flags db 00, 00 ; start coords db 12, 15 ; end coords dw .MenuData2 db 1 ; default option -.MenuData2 +.MenuData2: db $a0 ; flags db 0 ; items dw .WhichPC dw PlaceNthMenuStrings dw .JumpTable -.JumpTable +.JumpTable: dw PlayersPC, .String_PlayersPC dw BillsPC, .String_BillsPC dw OaksPC, .String_OaksPC @@ -53,7 +53,7 @@ PokemonCenterPC: ; 1559a .String_HallOfFame: db "HALL OF FAME@" .String_TurnOff: db "TURN OFF@" -.WhichPC +.WhichPC: ; before pokedex db 3 ; items db 1, 0, 4 ; bill's, player's, turn off @@ -69,7 +69,7 @@ PokemonCenterPC: ; 1559a db 1, 0, 2, 3, 4 ; bill's, player's, oak's, hall of fame, turn off db -1 -.ChooseWhichPCListToUse +.ChooseWhichPCListToUse: call CheckReceivedDex jr nz, .got_dex ld a, $0 @@ -95,7 +95,7 @@ PC_CheckPartyForPokemon: ; 15650 scf ret -.MustHavePokemonToUse +.MustHavePokemonToUse: ; Bzzzzt! You must have a #MON to use this! text_jump UnknownText_0x1c1328 db "@" @@ -238,14 +238,14 @@ KrissPCMenuData: ; 0x15736 dw .KrissPCMenuData2 db 1 ; default selected option -.KrissPCMenuData2 +.KrissPCMenuData2: db %10100000 ; bit7 db 0 ; # items? dw .KrissPCMenuList1 dw PlaceNthMenuStrings dw .KrissPCMenuPointers -.KrissPCMenuPointers ; 0x15746 +.KrissPCMenuPointers: ; 0x15746 dw KrisWithdrawItemMenu, .WithdrawItem dw KrisDepositItemMenu, .DepositItem dw KrisTossItemMenu, .TossItem @@ -254,13 +254,13 @@ KrissPCMenuData: ; 0x15736 dw KrisLogOffMenu, .LogOff dw KrisLogOffMenu, .TurnOff -.WithdrawItem db "WITHDRAW ITEM@" -.DepositItem db "DEPOSIT ITEM@" -.TossItem db "TOSS ITEM@" -.MailBox db "MAIL BOX@" -.Decoration db "DECORATION@" -.TurnOff db "TURN OFF@" -.LogOff db "LOG OFF@" +.WithdrawItem: db "WITHDRAW ITEM@" +.DepositItem: db "DEPOSIT ITEM@" +.TossItem: db "TOSS ITEM@" +.MailBox: db "MAIL BOX@" +.Decoration: db "DECORATION@" +.TurnOff: db "TURN OFF@" +.LogOff: db "LOG OFF@" WITHDRAW_ITEM EQU 0 DEPOSIT_ITEM EQU 1 @@ -270,7 +270,7 @@ DECORATION EQU 4 TURN_OFF EQU 5 LOG_OFF EQU 6 -.KrissPCMenuList1 +.KrissPCMenuList1: db 5 db WITHDRAW_ITEM db DEPOSIT_ITEM @@ -279,7 +279,7 @@ LOG_OFF EQU 6 db TURN_OFF db -1 -.KrissPCMenuList2 +.KrissPCMenuList2: db 6 db WITHDRAW_ITEM db DEPOSIT_ITEM @@ -320,7 +320,7 @@ KrisWithdrawItemMenu: ; 0x157d1 xor a ret -.Submenu +.Submenu: ; check if the item has a quantity callba _CheckTossableItem ld a, [wItemAttributeParamBuffer] @@ -362,7 +362,7 @@ KrisWithdrawItemMenu: ; 0x157d1 call ExitMenu ret -.PackFull +.PackFull: ld hl, .NoRoomText call MenuTextBoxBackup ret @@ -370,15 +370,15 @@ KrisWithdrawItemMenu: ; 0x157d1 .done ret -.HowManyText ; 0x15850 +.HowManyText: ; 0x15850 text_jump _KrissPCHowManyWithdrawText db "@" -.WithdrewText ; 0x15855 +.WithdrewText: ; 0x15855 text_jump _KrissPCWithdrewItemsText db "@" -.NoRoomText ; 0x1585a +.NoRoomText: ; 0x1585a text_jump _KrissPCNoRoomWithdrawText db "@" @@ -435,7 +435,7 @@ KrisDepositItemMenu: ; 0x1588b xor a ret -.CheckItemsInBag +.CheckItemsInBag: callba HasNoItems ret nc ld hl, .NoItemsInBag @@ -443,12 +443,12 @@ KrisDepositItemMenu: ; 0x1588b scf ret -.NoItemsInBag +.NoItemsInBag: ; No items here! text_jump UnknownText_0x1c13df db "@" -.TryDepositItem +.TryDepositItem: ld a, [wSpriteUpdatesEnabled] push af ld a, $0 @@ -485,7 +485,7 @@ KrisDepositItemMenu: ; 0x1588b ld [Buffer1], a ret -.DepositItem_ +.DepositItem_: callba _CheckTossableItem ld a, [wItemAttributeParamBuffer] and a @@ -494,7 +494,7 @@ KrisDepositItemMenu: ; 0x1588b ld [wItemQuantityChangeBuffer], a jr .DepositItem -.AskQuantity +.AskQuantity: ld hl, .HowManyText call MenuTextBox callba SelectQuantityToToss @@ -504,7 +504,7 @@ KrisDepositItemMenu: ; 0x1588b pop af jr c, .DeclinedToDeposit -.DepositItem +.DepositItem: ld a, [wItemQuantityChangeBuffer] ld [Buffer1], a ld a, [CurItemQuantity] @@ -523,24 +523,24 @@ KrisDepositItemMenu: ; 0x1588b call PrintText ret -.NoRoomInPC +.NoRoomInPC: ld hl, .NoRoomText call PrintText ret -.DeclinedToDeposit +.DeclinedToDeposit: and a ret -.HowManyText ; 0x1596e +.HowManyText: ; 0x1596e text_jump _KrissPCHowManyDepositText db "@" -.DepositText ; 0x15973 +.DepositText: ; 0x15973 text_jump _KrissPCDepositItemsText db "@" -.NoRoomText ; 0x15978 +.NoRoomText: ; 0x15978 text_jump _KrissPCNoRoomDepositText db "@" @@ -619,14 +619,14 @@ PCItemsJoypad: ; 0x15985 scf ret -.PCItemsMenuData +.PCItemsMenuData: db %01000000 db 1, 4 ; start coords db 10, 18 ; end coords dw .MenuData2 db 1 ; default option -.MenuData2 +.MenuData2: db %10110000 db 4, 8 ; rows/cols? db 2 ; horizontal spacing? diff --git a/engine/pokedex.asm b/engine/pokedex.asm index 0ba14cd79..761b38874 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -2407,7 +2407,7 @@ Pokedex_LoadSelectedMonTiles: ; 4143b predef GetFrontpic ret -.QuestionMark +.QuestionMark: ld a, BANK(sScratch) call GetSRAMBank callba LoadQuestionMarkPic @@ -2481,12 +2481,12 @@ Pokedex_LoadGFX: ; 414b7 callba LoadSGBPokedexGFX jr .LoadPokedexSlowpokeLZ -.LoadPokedexLZ +.LoadPokedexLZ: ld hl, PokedexLZ ld de, VTiles2 tile $31 call Decompress -.LoadPokedexSlowpokeLZ +.LoadPokedexSlowpokeLZ: ld hl, PokedexSlowpokeLZ ld de, VTiles0 call Decompress @@ -2614,7 +2614,7 @@ Pokedex_SetBGMapMode_3ifDMG_4ifCGB: ; 41aeb (10:5aeb) and a jr z, .DMG call Pokedex_SetBGMapMode4 -.DMG +.DMG: call Pokedex_SetBGMapMode3 ret diff --git a/engine/pokegear.asm b/engine/pokegear.asm index c6829adbe..93d5b6de4 100755 --- a/engine/pokegear.asm +++ b/engine/pokegear.asm @@ -198,12 +198,12 @@ TownMap_InitCursorAndPlayerIconPositions: ; 90d70 (24:4d70) ld a, [BackupMapNumber] ld c, a call GetWorldMapLocation -.LoadLandmark +.LoadLandmark: ld [wPokegearMapPlayerIconLandmark], a ld [wPokegearMapCursorLandmark], a ret -.FastShip +.FastShip: ld [wPokegearMapPlayerIconLandmark], a ld a, NEW_BARK_TOWN ld [wPokegearMapCursorLandmark], a @@ -1240,7 +1240,7 @@ PokegearPhoneContactSubmenu: ; 91342 (24:5342) ld hl, PokegearText_WhomToCall call PrintText call WaitBGMap -.CancelDelete +.CancelDelete: scf ret @@ -1525,7 +1525,7 @@ RadioChannels: dbw 80, .EvolutionRadio db -1 -.PkmnTalkAndPokedexShow +.PkmnTalkAndPokedexShow: ; Pokédex Show in the morning ; Oak's Pokémon Talk in the afternoon and evening @@ -1536,28 +1536,28 @@ RadioChannels: jp z, LoadStation_PokedexShow jp LoadStation_OaksPokemonTalk -.PokemonMusic +.PokemonMusic: call .InJohto jr nc, .NoSignal jp LoadStation_PokemonMusic -.LuckyChannel +.LuckyChannel: call .InJohto jr nc, .NoSignal jp LoadStation_LuckyChannel -.BuenasPassword +.BuenasPassword: call .InJohto jr nc, .NoSignal jp LoadStation_BuenasPassword -.RuinsOfAlphRadio +.RuinsOfAlphRadio: ld a, [wPokegearMapPlayerIconLandmark] cp RUINS_OF_ALPH jr nz, .NoSignal jp LoadStation_UnownRadio -.PlacesAndPeople +.PlacesAndPeople: call .InJohto jr c, .NoSignal ld a, [wPokegearFlags] @@ -1565,7 +1565,7 @@ RadioChannels: jr z, .NoSignal jp LoadStation_PlacesAndPeople -.LetsAllSing +.LetsAllSing: call .InJohto jr c, .NoSignal ld a, [wPokegearFlags] @@ -1573,7 +1573,7 @@ RadioChannels: jr z, .NoSignal jp LoadStation_LetsAllSing -.PokeFluteRadio +.PokeFluteRadio: call .InJohto jr c, .NoSignal ld a, [wPokegearFlags] @@ -1581,7 +1581,7 @@ RadioChannels: jr z, .NoSignal jp LoadStation_PokeFluteRadio -.EvolutionRadio +.EvolutionRadio: ; This station airs in the Lake of Rage area when Rocket are still in Mahogany. ld a, [StatusFlags] bit 4, a @@ -1596,11 +1596,11 @@ RadioChannels: .ok jp LoadStation_EvolutionRadio -.NoSignal +.NoSignal: call NoRadioStation ret -.InJohto +.InJohto: ; if in Johto or on the S.S. Aqua, set carry ; otherwise clear carry @@ -2185,7 +2185,7 @@ FlyMapScroll: ; 91b73 jr nz, .ScrollPrev ret -.ScrollNext +.ScrollNext: ld hl, wd002 ld a, [hl] cp d @@ -2193,13 +2193,13 @@ FlyMapScroll: ; 91b73 ld a, e dec a ld [hl], a -.NotAtEndYet +.NotAtEndYet: inc [hl] call CheckIfVisitedFlypoint jr z, .ScrollNext jr .Finally -.ScrollPrev +.ScrollPrev: ld hl, wd002 ld a, [hl] cp e @@ -2207,11 +2207,11 @@ FlyMapScroll: ; 91b73 ld a, d inc a ld [hl], a -.NotAtStartYet +.NotAtStartYet: dec [hl] call CheckIfVisitedFlypoint jr z, .ScrollPrev -.Finally +.Finally: call TownMapBubble call WaitBGMap xor a @@ -2261,13 +2261,13 @@ TownMapBubble: ; 91bb5 call .Name ; Up/down arrows hlcoord 18, 1 - ld [hl], $34 + ld [hl], $34 ret -.Where +.Where: db "Where?@" -.Name +.Name: ; We need the map location of the default flypoint ld a, [wd002] ld l, a @@ -2398,11 +2398,11 @@ FlyMap: ; 91c90 ld a, [BackupMapNumber] ld c, a call GetWorldMapLocation -.CheckRegion +.CheckRegion: ; The first 46 locations are part of Johto. The rest are in Kanto cp KANTO_LANDMARK jr nc, .KantoFlyMap -.JohtoFlyMap +.JohtoFlyMap: ; Note that .NoKanto should be modified in tandem with this branch push af ; Start from New Bark Town @@ -2420,7 +2420,7 @@ FlyMap: ; 91c90 call TownMapPlayerIcon ret -.KantoFlyMap +.KantoFlyMap: ; The event that there are no flypoints enabled in a map is not ; accounted for. As a result, if you attempt to select a flypoint @@ -2457,7 +2457,7 @@ FlyMap: ; 91c90 call TownMapPlayerIcon ret -.NoKanto +.NoKanto: ; If Indigo Plateau hasn't been visited, we use Johto's map instead ; Start from New Bark Town @@ -2470,7 +2470,7 @@ FlyMap: ; 91c90 ld [EndFlypoint], a call FillJohtoMap pop af -.MapHud +.MapHud: call TownMapBubble call TownMapPals hlbgcoord 0, 0 ; BG Map 0 @@ -2685,7 +2685,7 @@ _Area: ; 91d11 ld b, d ld de, .PlayerOAM ld hl, Sprites -.ShowPlayerLoop +.ShowPlayerLoop: ld a, [de] cp $80 jr z, .clear_oam @@ -2770,7 +2770,7 @@ _Area: ; 91d11 callba GetPlayerIcon ret -.FastShip +.FastShip: ld de, FastShipGFX ld b, BANK(FastShipGFX) ret @@ -2878,7 +2878,7 @@ TownMapPals: ; 91f13 jr nz, .loop ret -.PalMap +.PalMap: townmappals: MACRO rept _NARG / 2 dn \2, \1 diff --git a/engine/printer.asm b/engine/printer.asm index ae1edd9d2..876e59efc 100755 --- a/engine/printer.asm +++ b/engine/printer.asm @@ -32,7 +32,7 @@ endr .Jumptable: ; 84031 (21:4031) - + dw Function84077 dw Function84143 dw Function84120 @@ -443,7 +443,7 @@ _PrinterReceive:: ; 842db .Jumptable: ; 842ea (21:42ea) - + dw Function8432f dw Function84330 dw Function84339 diff --git a/engine/radio.asm b/engine/radio.asm index e7498a1c8..678fc05d5 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -372,7 +372,7 @@ OaksPkmnTalk8: ld a, OAKS_POKEMON_TALK_9 jp NextRadioLine -.Descriptors +.Descriptors: dw .sweetadorably dw .wigglyslickly dw .aptlynamed @@ -492,7 +492,7 @@ OaksPkmnTalk9: .ok jp NextRadioLine -.Descriptors +.Descriptors: dw .cute dw .weird dw .pleasant @@ -896,7 +896,7 @@ BenFernMusic5: ld hl, BenFernText2A jr z, .SunTueThurSun ld hl, BenFernText2B -.SunTueThurSun +.SunTueThurSun: ld a, POKEMON_MUSIC_6 jp NextRadioLine @@ -906,7 +906,7 @@ BenFernMusic6: ld hl, BenFernText3A jr z, .SunTueThurSun ld hl, BenFernText3B -.SunTueThurSun +.SunTueThurSun: ld a, POKEMON_MUSIC_7 jp NextRadioLine @@ -921,7 +921,7 @@ StartPokemonMusicChannel: and 1 jr z, .SunTueThurSun ld de, MUSIC_POKEMON_LULLABY -.SunTueThurSun +.SunTueThurSun: callab RadioMusicRestartDE ret @@ -1235,7 +1235,7 @@ PeoplePlaces5: .ok jp NextRadioLine -.Descriptors +.Descriptors: dw PnP_cute dw PnP_lazy dw PnP_happy @@ -1352,7 +1352,7 @@ PeoplePlaces6: ; Places ld a, PLACES_AND_PEOPLE_7 jp NextRadioLine -.Maps +.Maps: map PALLET_TOWN map ROUTE_22 map PEWTER_CITY @@ -1392,7 +1392,7 @@ PeoplePlaces7: .ok jp PrintRadioLine -.Descriptors +.Descriptors: dw PnP_cute dw PnP_lazy dw PnP_happy @@ -1538,7 +1538,7 @@ BuenasPassword1: jp z, BuenasPassword20 jp BuenasPassword8 -.PlayPassword +.PlayPassword: call StartRadioStation ld a, [hBGMapMode] push af @@ -1594,7 +1594,7 @@ BuenasPassword4: ; Set the flag so that we don't generate a new password this week. ld hl, WeeklyFlags set 7, [hl] -.AlreadyGotIt +.AlreadyGotIt: ld c, a call GetBuenasPassword ld hl, BuenaRadioText4 @@ -1638,29 +1638,29 @@ GetBuenasPassword: ld c, [hl] ret -.StringFunctionJumpTable +.StringFunctionJumpTable: dw .Mon dw .Item dw .Move dw .RawString -.Mon +.Mon: call .GetTheIndex call GetPokemonName ret -.Item +.Item: call .GetTheIndex call GetItemName ret -.Move +.Move: call .GetTheIndex call GetMoveName ret -.GetTheIndex +.GetTheIndex: ld h, 0 ld l, c add hl, de @@ -1668,7 +1668,7 @@ GetBuenasPassword: ld [wNamedObjectIndexBuffer], a ret -.RawString +.RawString: ; Get the string from the table... ld a, c and a diff --git a/engine/scripting.asm b/engine/scripting.asm index 42d060e9b..c6a92c16e 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -582,7 +582,7 @@ GiveItemScript: ; 96f77 itemnotify end -.Full +.Full: buttonsound pocketisfull end @@ -681,19 +681,19 @@ GetPocketName: ; 96ffe call CopyName2 ret -.Pockets +.Pockets: dw .Item dw .Key dw .Ball dw .TM -.Item +.Item: db "ITEM POCKET@" -.Key +.Key: db "KEY POCKET@" -.Ball +.Ball: db "BALL POCKET@" -.TM +.TM: db "TM POCKET@" ; 97051 @@ -1425,12 +1425,12 @@ ShowEmoteScript: ; 973b6 applymovement2 .Hide end -.Show +.Show: show_emote step_sleep_1 step_end -.Hide +.Hide: hide_emote step_sleep_1 step_end diff --git a/engine/selectmenu.asm b/engine/selectmenu.asm index ce2ff8eb7..4e461a68e 100755 --- a/engine/selectmenu.asm +++ b/engine/selectmenu.asm @@ -4,7 +4,7 @@ SelectMenu:: ; 13327 jr c, .NotRegistered jp UseRegisteredItem -.NotRegistered +.NotRegistered: call OpenText ld b, BANK(ItemMayBeRegisteredText) ld hl, ItemMayBeRegisteredText @@ -32,13 +32,13 @@ CheckRegisteredItem: ; 13345 rst JumpTable ret -.Pockets +.Pockets: dw .CheckItem dw .CheckBall dw .CheckKeyItem dw .CheckTMHM -.CheckItem +.CheckItem: ld hl, NumItems call .CheckRegisteredNo jr c, .NoRegisteredItem @@ -53,7 +53,7 @@ endr and a ret -.CheckKeyItem +.CheckKeyItem: ld a, [RegisteredItem] ld hl, KeyItems ld de, 1 @@ -64,7 +64,7 @@ endr and a ret -.CheckBall +.CheckBall: ld hl, NumBalls call .CheckRegisteredNo jr nc, .NoRegisteredItem @@ -78,10 +78,10 @@ endr jr c, .NoRegisteredItem ret -.CheckTMHM +.CheckTMHM: jr .NoRegisteredItem -.NoRegisteredItem +.NoRegisteredItem: xor a ld [WhichRegisteredItem], a ld [RegisteredItem], a @@ -90,7 +90,7 @@ endr ; 133a6 -.CheckRegisteredNo ; 133a6 +.CheckRegisteredNo: ; 133a6 ld a, [WhichRegisteredItem] and REGISTERED_NUMBER dec a @@ -100,13 +100,13 @@ endr and a ret -.NotEnoughItems +.NotEnoughItems: scf ret ; 133b6 -.IsSameItem ; 133b6 +.IsSameItem: ; 133b6 ld a, [RegisteredItem] cp [hl] jr nz, .NotSameItem @@ -114,7 +114,7 @@ endr and a ret -.NotSameItem +.NotSameItem: scf ret ; 133c3 @@ -128,7 +128,7 @@ UseRegisteredItem: ; 133c3 rst JumpTable ret -.SwitchTo +.SwitchTo: dw .CantUse dw .NoFunction dw .NoFunction @@ -138,7 +138,7 @@ UseRegisteredItem: ; 133c3 dw .Overworld ; 133df -.NoFunction ; 133df +.NoFunction: ; 133df call OpenText call CantUseItem call CloseText @@ -146,7 +146,7 @@ UseRegisteredItem: ; 133c3 ret ; 133ea -.Current ; 133ea +.Current: ; 133ea call OpenText call DoItemEffect call CloseText @@ -154,7 +154,7 @@ UseRegisteredItem: ; 133c3 ret ; 133f5 -.Party ; 133f5 +.Party: ; 133f5 call RefreshScreen call FadeToMenu call DoItemEffect @@ -164,7 +164,7 @@ UseRegisteredItem: ; 133c3 ret ; 13406 -.Overworld ; 13406 +.Overworld: ; 13406 call RefreshScreen ld a, 1 ld [wUsingItemWithSelect], a @@ -180,7 +180,7 @@ UseRegisteredItem: ; 133c3 ret ; 13422 -.CantUse ; 13422 +.CantUse: ; 13422 call RefreshScreen ._cantuse diff --git a/engine/slot_machine.asm b/engine/slot_machine.asm index 2520a9a24..3077677ee 100755 --- a/engine/slot_machine.asm +++ b/engine/slot_machine.asm @@ -213,7 +213,7 @@ endr SlotsJumptable: ; 92844 (24:6844) jumptable .Jumptable, wJumptableIndex -.Jumptable +.Jumptable: dw Slots_Init ; 00 dw Slots_BetAndStart ; 01 dw Slots_WaitStart ; 02 @@ -358,7 +358,7 @@ Slots_FlashIfWin: ; 92955 (24:6955) call Slots_Next ret -.GotIt +.GotIt: call Slots_Next ld a, 16 ld [wcf64], a @@ -801,7 +801,7 @@ Function92bd4: ; 92bd4 (24:6bd4) ; 92be4 (24:6be4) .dw: ; 92be4 - + dw ReelAction_DoNothing ; 00 dw Slots_StopReelIgnoreJoypad ; 01 dw ReelAction_QuadrupleRate ; 02 @@ -893,7 +893,7 @@ Slots_StopReelIgnoreJoypad: ; 92c4c dec [hl] ret -.EndReel +.EndReel: ld hl, wReel1ReelAction - wReel1 add hl, bc ld a, $0 @@ -914,7 +914,7 @@ ReelAction_StopReel1: ; 92c5e dec [hl] call .CheckForBias ret nz -.NoBias +.NoBias: call Slots_StopReel ret @@ -955,7 +955,7 @@ ReelAction_StopReel2: ; 92c86 dec [hl] ret -.NoBias +.NoBias: call Slots_StopReel ret @@ -975,7 +975,7 @@ ReelAction_StopReel3: ; 92ca9 dec [hl] ret -.NoMatch +.NoMatch: ld a, [wSlotBias] cp SLOTS_NOMATCH jr z, .NoBias @@ -987,7 +987,7 @@ ReelAction_StopReel3: ; 92ca9 dec [hl] ret -.NoBias +.NoBias: call Slots_StopReel ret @@ -1177,7 +1177,7 @@ ReelAction_DropReel: ; 92dca call Slots_StopReel ret -.EggAgain +.EggAgain: ld hl, wReel1SpinRate - wReel1 add hl, bc ld [hl], $0 @@ -1234,7 +1234,7 @@ ReelAction_WaitDropReel: ; 92e31 dec [hl] ret -.DropReel +.DropReel: ld hl, wReel1ReelAction - wReel1 add hl, bc dec [hl] @@ -1323,7 +1323,7 @@ Slots_CheckMatchedFirstTwoReels: ; 92e94 ; 92ebd .Jumptable: ; 92ebd - + dw .zero dw .one dw .two @@ -1438,7 +1438,7 @@ Slots_CheckMatchedAllThreeReels: ; 92f1d ; 92f48 .Jumptable: ; 92f48 - + dw .zero dw .one dw .two @@ -1706,7 +1706,7 @@ Slots_AskBet: ; 9307c (24:707c) call PrintText jr .loop -.Start +.Start: ld hl, Coins + 1 ld a, [hl] sub c @@ -1815,7 +1815,7 @@ SlotGetPayout: ; 93124 (24:7124) callba MobileFn_105fe3 ret -.PayoutTable +.PayoutTable: dw 300 dw 50 dw 6 @@ -1839,7 +1839,7 @@ SlotPayoutText: ; 93158 (24:7158) callba MobileFn_105fd0 ret -.MatchedSomething +.MatchedSomething: srl a ld e, a ld d, 0 @@ -1961,7 +1961,7 @@ SlotMachine_AnimateGolem: ; 9321d (24:721d) jp [hl] .Jumptable: ; 9322d (24:722d) - + dw .init dw .fall dw .roll @@ -2062,7 +2062,7 @@ Slots_AnimateChansey: ; 932ac (24:72ac) jp [hl] .Jumptable: ; 932bc (24:72bc) - + dw .walk dw .one dw .two diff --git a/engine/specials.asm b/engine/specials.asm index 79c413fb5..c15422750 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -578,7 +578,7 @@ SpecialSnorlaxAwake: ; 0xc43d ld [ScriptVar], a ret -.ProximityCoords +.ProximityCoords: ; x, y db 33, 8 ; left db 34, 10 ; below diff --git a/engine/sprite_anims.asm b/engine/sprite_anims.asm index 50eb61df6..8d75d0430 100755 --- a/engine/sprite_anims.asm +++ b/engine/sprite_anims.asm @@ -13,7 +13,7 @@ DoAnimFrame: ; 8d24b ; 8d25b .Jumptable: ; 8d25b (23:525b) - + dw .Null ; null dw .one ; bouncing mon icon dw .two ; bouncing mon icon, selected diff --git a/engine/sprites.asm b/engine/sprites.asm index 666ac992d..1059803b3 100755 --- a/engine/sprites.asm +++ b/engine/sprites.asm @@ -173,7 +173,7 @@ endr ld [hli], a inc de ; Look up the third field from the table in the wSpriteAnimDict array (10x2). -; Take the value and load it in +; Take the value and load it in ld a, [de] call GetSpriteAnimVTile ld [hli], a diff --git a/engine/startmenu.asm b/engine/startmenu.asm index acad9bb88..b2b82bd6a 100755 --- a/engine/startmenu.asm +++ b/engine/startmenu.asm @@ -12,7 +12,7 @@ StartMenu:: ; 125cd ld hl, .MenuDataHeader jr z, .GotMenuData ld hl, .ContestMenuDataHeader -.GotMenuData +.GotMenuData: call LoadMenuDataHeader call .SetUpMenuItems @@ -28,14 +28,14 @@ StartMenu:: ; 125cd call UpdateTimePals jr .Select -.Reopen +.Reopen: call UpdateSprites call UpdateTimePals call .SetUpMenuItems ld a, [wd0d2] ld [wMenuCursorBuffer], a -.Select +.Select: call .GetInput jr c, .Exit call .DrawMenuAccount @@ -57,7 +57,7 @@ StartMenu:: ; 125cd ld l, a jp [hl] -.MenuReturns +.MenuReturns: dw .Reopen dw .Exit dw .ExitMenuCallFuncCloseText @@ -66,7 +66,7 @@ StartMenu:: ; 125cd dw .ReturnEnd dw .ReturnRedraw -.Exit +.Exit: ld a, [hOAMUpdate] push af ld a, 1 @@ -74,14 +74,14 @@ StartMenu:: ; 125cd call LoadFontsExtra pop af ld [hOAMUpdate], a -.ReturnEnd +.ReturnEnd: call ExitMenu -.ReturnEnd2 +.ReturnEnd2: call CloseText call UpdateTimePals ret -.GetInput +.GetInput: ; Return carry on exit, and no-carry on selection. xor a ld [hBGMapMode], a @@ -107,21 +107,21 @@ StartMenu:: ; 125cd ret ; 12691 -.ExitMenuRunScript ; 12691 +.ExitMenuRunScript: ; 12691 call ExitMenu ld a, HMENURETURN_SCRIPT ld [hMenuReturn], a ret ; 12699 -.ExitMenuRunScriptCloseText ; 12699 +.ExitMenuRunScriptCloseText: ; 12699 call ExitMenu ld a, HMENURETURN_SCRIPT ld [hMenuReturn], a jr .ReturnEnd2 ; 126a2 -.ExitMenuCallFuncCloseText ; 126a2 +.ExitMenuCallFuncCloseText: ; 126a2 call ExitMenu ld hl, wQueuedScriptAddr ld a, [hli] @@ -132,12 +132,12 @@ StartMenu:: ; 125cd jr .ReturnEnd2 ; 126b1 -.ReturnRedraw ; 126b1 +.ReturnRedraw: ; 126b1 call .Clear jp .Reopen ; 126b7 -.Clear ; 126b7 +.Clear: ; 126b7 call ClearBGPalettes call Call_ExitMenu call ReloadTilesetAndPalettes @@ -151,28 +151,28 @@ StartMenu:: ; 125cd ; 126d3 -.MenuDataHeader +.MenuDataHeader: db $40 ; tile backup db 0, 10 ; start coords db 17, 19 ; end coords dw .MenuData db 1 ; default selection -.ContestMenuDataHeader +.ContestMenuDataHeader: db $40 ; tile backup db 2, 10 ; start coords db 17, 19 ; end coords dw .MenuData db 1 ; default selection -.MenuData +.MenuData: db %10101000 ; x padding, wrap around, start can close dn 0, 0 ; rows, columns dw MenuItemsList dw .MenuString dw .Items -.Items +.Items: dw StartMenu_Pokedex, .PokedexString, .PokedexDesc dw StartMenu_Pokemon, .PartyString, .PartyDesc dw StartMenu_Pack, .PackString, .PackDesc @@ -183,45 +183,45 @@ StartMenu:: ; 125cd dw StartMenu_Pokegear, .PokegearString, .PokegearDesc dw StartMenu_Quit, .QuitString, .QuitDesc -.PokedexString db "#DEX@" -.PartyString db "#MON@" -.PackString db "PACK@" -.StatusString db "<PLAYER>@" -.SaveString db "SAVE@" -.OptionString db "OPTION@" -.ExitString db "EXIT@" -.PokegearString db $24, "GEAR@" -.QuitString db "QUIT@" - -.PokedexDesc db "#MON" +.PokedexString: db "#DEX@" +.PartyString: db "#MON@" +.PackString: db "PACK@" +.StatusString: db "<PLAYER>@" +.SaveString: db "SAVE@" +.OptionString: db "OPTION@" +.ExitString: db "EXIT@" +.PokegearString: db $24, "GEAR@" +.QuitString: db "QUIT@" + +.PokedexDesc: db "#MON" next "database@" -.PartyDesc db "Party ", $4a +.PartyDesc: db "Party ", $4a next "status@" -.PackDesc db "Contains" +.PackDesc: db "Contains" next "items@" -.PokegearDesc db "Trainer's" +.PokegearDesc: db "Trainer's" next "key device@" -.StatusDesc db "Your own" +.StatusDesc: db "Your own" next "status@" -.SaveDesc db "Save your" +.SaveDesc: db "Save your" next "progress@" -.OptionDesc db "Change" +.OptionDesc: db "Change" next "settings@" -.ExitDesc db "Close this" +.ExitDesc: db "Close this" next "menu@" -.QuitDesc db "Quit and" +.QuitDesc: db "Quit and" next "be judged.@" -.OpenMenu ; 127e5 +.OpenMenu: ; 127e5 ld a, [MenuSelection] call .GetMenuAccountTextPointer ld a, [hli] @@ -230,7 +230,7 @@ StartMenu:: ; 125cd jp [hl] ; 127ef -.MenuString ; 127ef +.MenuString: ; 127ef push de ld a, [MenuSelection] call .GetMenuAccountTextPointer @@ -244,7 +244,7 @@ StartMenu:: ; 125cd ret ; 12800 -.MenuDesc ; 12800 +.MenuDesc: ; 12800 push de ld a, [MenuSelection] cp $ff @@ -265,7 +265,7 @@ endr ; 12819 -.GetMenuAccountTextPointer ; 12819 +.GetMenuAccountTextPointer: ; 12819 ld e, a ld d, 0 ld hl, wMenuData2PointerTableAddr @@ -279,7 +279,7 @@ endr ; 12829 -.SetUpMenuItems ; 12829 +.SetUpMenuItems: ; 12829 xor a ld [wWhichIndexSet], a call .FillMenuList @@ -340,7 +340,7 @@ endr ; 1288d -.FillMenuList ; 1288d +.FillMenuList: ; 1288d xor a ld hl, MenuItemsList ld [hli], a @@ -352,18 +352,18 @@ endr ret ; 128a0 -.AppendMenuList ; 128a0 +.AppendMenuList: ; 128a0 ld [de], a inc de inc c ret ; 128a4 -.DrawMenuAccount_ ; 128a4 +.DrawMenuAccount_: ; 128a4 jp .DrawMenuAccount ; 128a7 -.PrintMenuAccount ; 128a7 +.PrintMenuAccount: ; 128a7 call .IsMenuAccountOn ret z call .DrawMenuAccount @@ -371,7 +371,7 @@ endr jp .MenuDesc ; 128b4 -.DrawMenuAccount ; 128b4 +.DrawMenuAccount: ; 128b4 call .IsMenuAccountOn ret z hlcoord 0, 13 @@ -383,13 +383,13 @@ endr jp TextBoxPalette ; 128cb -.IsMenuAccountOn ; 128cb +.IsMenuAccountOn: ; 128cb ld a, [Options2] and 1 ret ; 128d1 -.DrawBugContestStatusBox ; 128d1 +.DrawBugContestStatusBox: ; 128d1 ld hl, StatusFlags2 bit 2, [hl] ; bug catching contest ret z @@ -397,7 +397,7 @@ endr ret ; 128de -.DrawBugContestStatus ; 128de +.DrawBugContestStatus: ; 128de ld hl, StatusFlags2 bit 2, [hl] ; bug catching contest jr nz, .contest @@ -428,11 +428,11 @@ StartMenu_Quit: ; 128f0 ld a, 4 ret -.DontEndContest +.DontEndContest: ld a, 0 ret -.EndTheContestText +.EndTheContestText: text_jump UnknownText_0x1c1a6c db "@" ; 1290b @@ -630,27 +630,27 @@ TossItemFromPC: ; 129f4 scf ret -.TossHowMany +.TossHowMany: ; Toss out how many @ (S)? text_jump UnknownText_0x1c1a90 db "@" -.ConfirmToss +.ConfirmToss: ; Throw away @ @ (S)? text_jump UnknownText_0x1c1aad db "@" -.TossedThisMany +.TossedThisMany: ; Discarded @ (S). text_jump UnknownText_0x1c1aca db "@" -.CantToss +.CantToss: ld hl, .TooImportantToToss call MenuTextBoxBackup ret -.TooImportantToToss +.TooImportantToToss: ; That's too impor- tant to toss out! text_jump UnknownText_0x1c1adf db "@" @@ -707,7 +707,7 @@ PokemonActionSubmenu: ; 12a88 ld a, 0 ret -.Actions +.Actions: dbw MONMENU_CUT, MonMenu_Cut ; Cut dbw MONMENU_FLY, MonMenu_Fly ; Fly dbw MONMENU_SURF, MonMenu_Surf ; Surf @@ -776,7 +776,7 @@ SwitchPartyMons: ; 12aec ld a, 1 ret -.DontSwitch +.DontSwitch: xor a ld [PartyMenuActionText], a call CancelPokemonAction @@ -826,7 +826,7 @@ GiveTakePartyMonItem: ; 12b60 ; 12ba9 -.GiveItem +.GiveItem: callba DepositSellInitPackBuffers @@ -982,7 +982,7 @@ GiveTakeItemMenuData: ; 12c9b dw .Items db 1 ; default option -.Items +.Items: db %10000000 ; x padding db 2 ; # items db "GIVE@" @@ -1132,12 +1132,12 @@ MonMailAction: ; 12d45 call MenuTextBoxBackup jr .done -.MailboxFull +.MailboxFull: ld hl, .mailboxfulltext call MenuTextBoxBackup jr .done -.RemoveMailToBag +.RemoveMailToBag: ld hl, .mailwilllosemessagetext call StartMenuYesNo jr c, .done @@ -1153,7 +1153,7 @@ MonMailAction: ; 12d45 call MenuTextBoxBackup jr .done -.BagIsFull +.BagIsFull: ld hl, .bagfulltext call MenuTextBoxBackup jr .done @@ -1164,7 +1164,7 @@ MonMailAction: ; 12d45 ; 12dc9 -.MenuDataHeader +.MenuDataHeader: db $40 ; flags db 10, 12 ; start coords db 17, 19 ; end coords @@ -1172,7 +1172,7 @@ MonMailAction: ; 12d45 db 1 ; default option ; 0x12dd1 -.MenuData2 +.MenuData2: db $80 ; flags db 3 ; items db "READ@" @@ -1242,7 +1242,7 @@ MonMenu_Cut: ; 12e1b ld a, $2 ret -.Fail +.Fail: ld a, $3 ret ; 12e30 @@ -1260,15 +1260,15 @@ MonMenu_Fly: ; 12e30 ld a, $2 ret -.Fail +.Fail: ld a, $3 ret -.Error +.Error: ld a, $0 ret -.Unused +.Unused: ld a, $1 ret ; 12e55 @@ -1282,7 +1282,7 @@ MonMenu_Flash: ; 12e55 ld a, $2 ret -.Fail +.Fail: ld a, $3 ret ; 12e6a @@ -1296,7 +1296,7 @@ MonMenu_Strength: ; 12e6a ld a, $2 ret -.Fail +.Fail: ld a, $3 ret ; 12e7f @@ -1310,7 +1310,7 @@ MonMenu_Whirlpool: ; 12e7f ld a, $2 ret -.Fail +.Fail: ld a, $3 ret ; 12e94 @@ -1324,7 +1324,7 @@ MonMenu_Waterfall: ; 12e94 ld a, $2 ret -.Fail +.Fail: ld a, $3 ret ; 12ea9 @@ -1338,7 +1338,7 @@ MonMenu_Teleport: ; 12ea9 ld a, $2 ret -.Fail +.Fail: ld a, $3 ret ; 12ebd @@ -1352,7 +1352,7 @@ MonMenu_Surf: ; 12ebd ld a, $2 ret -.Fail +.Fail: ld a, $3 ret ; 12ed1 @@ -1366,7 +1366,7 @@ MonMenu_Dig: ; 12ed1 ld a, $2 ret -.Fail +.Fail: ld a, $3 ret ; 12ee6 @@ -1377,7 +1377,7 @@ MonMenu_Softboiled_MilkDrink: ; 12ee6 callba Softboiled_MilkDrinkFunction jr .finish -.NotEnoughHP +.NotEnoughHP: ld hl, .Text_NotEnoughHP call PrintText @@ -1388,13 +1388,13 @@ MonMenu_Softboiled_MilkDrink: ; 12ee6 ret ; 12f00 -.Text_NotEnoughHP +.Text_NotEnoughHP: ; Not enough HP! text_jump UnknownText_0x1c1ce3 db "@" ; 0x12f05 -.CheckMonHasEnoughHP +.CheckMonHasEnoughHP: ; Need to have at least (MaxHP / 5) HP left. ld a, MON_MAXHP call GetPartyParamLocation @@ -1425,7 +1425,7 @@ MonMenu_Headbutt: ; 12f26 ld a, $2 ret -.Fail +.Fail: ld a, $3 ret ; 12f3b @@ -1439,7 +1439,7 @@ MonMenu_RockSmash: ; 12f3b ld a, $2 ret -.Fail +.Fail: ld a, $3 ret ; 12f50 diff --git a/engine/stats_screen.asm b/engine/stats_screen.asm index 32b75069a..5c44d667c 100755 --- a/engine/stats_screen.asm +++ b/engine/stats_screen.asm @@ -100,7 +100,7 @@ StatsScreenBattle: ; 4dcf7 ; 4dd2a StatsScreenPointerTable: ; 4dd2a - + dw MonStatsInit ; regular pokémon dw EggStatsInit ; egg dw StatsScreenWaitCry @@ -535,7 +535,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6) ret .Jumptable: ; 4e00d (13:600d) - + dw .PinkPage dw .GreenPage dw .BluePage @@ -559,7 +559,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6) jr z, .NotImmuneToPkrs hlcoord 8, 8 ld [hl], "." -.NotImmuneToPkrs +.NotImmuneToPkrs: ld a, [MonType] cp BOXMON jr z, .StatusOK @@ -570,12 +570,12 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6) pop hl jr nz, .done_status jr .StatusOK -.HasPokerus +.HasPokerus: ld de, .PkrsStr hlcoord 1, 13 call PlaceString jr .done_status -.StatusOK +.StatusOK: ld de, .OK_str call PlaceString .done_status @@ -628,7 +628,7 @@ StatsScreen_LoadGFX: ; 4dfb6 (13:5fb6) jr z, .AtMaxLevel inc a ld [TempMonLevel], a -.AtMaxLevel +.AtMaxLevel: call PrintLevel pop af ld [TempMonLevel], a @@ -657,7 +657,7 @@ endr ld [Buffer1], a ; wd1ea (aliases: MagikarpLength) ret -.AlreadyAtMaxLevel +.AlreadyAtMaxLevel: ld hl, Buffer1 ; wd1ea (aliases: MagikarpLength) xor a rept 2 @@ -747,7 +747,7 @@ endr ld de, SCREEN_WIDTH ld b, 10 ld a, $31 -.BluePageVerticalDivider +.BluePageVerticalDivider: ld [hl], a add hl, de dec b diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 7baa90eea..278ada3ad 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -252,37 +252,37 @@ DayToTextScript: if_equal SATURDAY, .Saturday stringtotext .SundayText, 0 end -.Monday +.Monday: stringtotext .MondayText, 0 end -.Tuesday +.Tuesday: stringtotext .TuesdayText, 0 end -.Wednesday +.Wednesday: stringtotext .WednesdayText, 0 end -.Thursday +.Thursday: stringtotext .ThursdayText, 0 end -.Friday +.Friday: stringtotext .FridayText, 0 end -.Saturday +.Saturday: stringtotext .SaturdayText, 0 end -.SundayText +.SundayText: db "SUNDAY@" -.MondayText +.MondayText: db "MONDAY@" -.TuesdayText +.TuesdayText: db "TUESDAY@" -.WednesdayText +.WednesdayText: db "WEDNESDAY@" -.ThursdayText +.ThursdayText: db "THURSDAY@" -.FridayText +.FridayText: db "FRIDAY@" -.SaturdayText +.SaturdayText: db "SATURDAY@" GoldenrodRocketsScript: @@ -643,64 +643,64 @@ AskNumber1MScript: if_equal PHONE_BLACKBELT_KENJI, .Kenji if_equal PHONE_HIKER_PARRY, .Parry -.Jack +.Jack: farwritetext JackAskNumber1Text end -.Huey +.Huey: farwritetext HueyAskNumber1Text end -.Gaven +.Gaven: farwritetext GavenAskNumber1Text end -.Jose +.Jose: farwritetext JoseAskNumber1Text end -.Joey +.Joey: farwritetext JoeyAskNumber1Text end -.Wade +.Wade: farwritetext WadeAskNumber1Text end -.Ralph +.Ralph: farwritetext RalphAskNumber1Text end -.Anthony +.Anthony: farwritetext AnthonyAskNumber1Text end -.Todd +.Todd: farwritetext ToddAskNumber1Text end -.Irwin +.Irwin: farwritetext IrwinAskNumber1Text end -.Arnie +.Arnie: farwritetext ArnieAskNumber1Text end -.Alan +.Alan: farwritetext AlanAskNumber1Text end -.Chad +.Chad: farwritetext ChadAskNumber1Text end -.Derek +.Derek: farwritetext DerekAskNumber1Text end -.Tully +.Tully: farwritetext TullyAskNumber1Text end -.Brent +.Brent: farwritetext BrentAskNumber1Text end -.Vance +.Vance: farwritetext VanceAskNumber1Text end -.Wilton +.Wilton: farwritetext WiltonAskNumber1Text end -.Kenji +.Kenji: farwritetext KenjiAskNumber1Text end -.Parry +.Parry: farwritetext ParryAskNumber1Text end @@ -728,64 +728,64 @@ AskNumber2MScript: if_equal PHONE_BLACKBELT_KENJI, .Kenji if_equal PHONE_HIKER_PARRY, .Parry -.Jack +.Jack: farwritetext JackAskNumber2Text end -.Huey +.Huey: farwritetext HueyAskNumber2Text end -.Gaven +.Gaven: farwritetext GavenAskNumber2Text end -.Jose +.Jose: farwritetext JoseAskNumber2Text end -.Joey +.Joey: farwritetext JoeyAskNumber2Text end -.Wade +.Wade: farwritetext WadeAskNumber2Text end -.Ralph +.Ralph: farwritetext RalphAskNumber2Text end -.Anthony +.Anthony: farwritetext AnthonyAskNumber2Text end -.Todd +.Todd: farwritetext ToddAskNumber2Text end -.Irwin +.Irwin: farwritetext IrwinAskNumber2Text end -.Arnie +.Arnie: farwritetext ArnieAskNumber2Text end -.Alan +.Alan: farwritetext AlanAskNumber2Text end -.Chad +.Chad: farwritetext ChadAskNumber2Text end -.Derek +.Derek: farwritetext DerekAskNumber2Text end -.Tully +.Tully: farwritetext TullyAskNumber2Text end -.Brent +.Brent: farwritetext BrentAskNumber2Text end -.Vance +.Vance: farwritetext VanceAskNumber2Text end -.Wilton +.Wilton: farwritetext WiltonAskNumber2Text end -.Kenji +.Kenji: farwritetext KenjiAskNumber2Text end -.Parry +.Parry: farwritetext ParryAskNumber2Text end @@ -819,102 +819,102 @@ NumberAcceptedMScript: if_equal PHONE_BLACKBELT_KENJI, .Kenji if_equal PHONE_HIKER_PARRY, .Parry -.Jack +.Jack: farwritetext JackNumberAcceptedText waitbutton closetext end -.Huey +.Huey: farwritetext HueyNumberAcceptedText waitbutton closetext end -.Gaven +.Gaven: farwritetext GavenNumberAcceptedText waitbutton closetext end -.Jose +.Jose: farwritetext JoseNumberAcceptedText waitbutton closetext end -.Joey +.Joey: farwritetext JoeyNumberAcceptedText waitbutton closetext end -.Wade +.Wade: farwritetext WadeNumberAcceptedText waitbutton closetext end -.Ralph +.Ralph: farwritetext RalphNumberAcceptedText waitbutton closetext end -.Anthony +.Anthony: farwritetext AnthonyNumberAcceptedText waitbutton closetext end -.Todd +.Todd: farwritetext ToddNumberAcceptedText waitbutton closetext end -.Irwin +.Irwin: farwritetext IrwinNumberAcceptedText waitbutton closetext end -.Arnie +.Arnie: farwritetext ArnieNumberAcceptedText waitbutton closetext end -.Alan +.Alan: farwritetext AlanNumberAcceptedText waitbutton closetext end -.Chad +.Chad: farwritetext ChadNumberAcceptedText waitbutton closetext end -.Derek +.Derek: farwritetext DerekNumberAcceptedText waitbutton closetext end -.Tully +.Tully: farwritetext TullyNumberAcceptedText waitbutton closetext end -.Brent +.Brent: farwritetext BrentNumberAcceptedText waitbutton closetext end -.Vance +.Vance: farwritetext VanceNumberAcceptedText waitbutton closetext end -.Wilton +.Wilton: farwritetext WiltonNumberAcceptedText waitbutton closetext end -.Kenji +.Kenji: farwritetext KenjiNumberAcceptedText waitbutton closetext end -.Parry +.Parry: farwritetext ParryNumberAcceptedText waitbutton closetext @@ -943,102 +943,102 @@ NumberDeclinedMScript: if_equal PHONE_BLACKBELT_KENJI, .Kenji if_equal PHONE_HIKER_PARRY, .Parry -.Jack +.Jack: farwritetext JackNumberDeclinedText waitbutton closetext end -.Huey +.Huey: farwritetext HueyNumberDeclinedText waitbutton closetext end -.Gaven +.Gaven: farwritetext GavenNumberDeclinedText waitbutton closetext end -.Jose +.Jose: farwritetext JoseNumberDeclinedText waitbutton closetext end -.Joey +.Joey: farwritetext JoeyNumberDeclinedText waitbutton closetext end -.Wade +.Wade: farwritetext WadeNumberDeclinedText waitbutton closetext end -.Ralph +.Ralph: farwritetext RalphNumberDeclinedText waitbutton closetext end -.Anthony +.Anthony: farwritetext AnthonyNumberDeclinedText waitbutton closetext end -.Todd +.Todd: farwritetext ToddNumberDeclinedText waitbutton closetext end -.Irwin +.Irwin: farwritetext IrwinNumberDeclinedText waitbutton closetext end -.Arnie +.Arnie: farwritetext ArnieNumberDeclinedText waitbutton closetext end -.Alan +.Alan: farwritetext AlanNumberDeclinedText waitbutton closetext end -.Chad +.Chad: farwritetext ChadNumberDeclinedText waitbutton closetext end -.Derek +.Derek: farwritetext DerekNumberDeclinedText waitbutton closetext end -.Tully +.Tully: farwritetext TullyNumberDeclinedText waitbutton closetext end -.Brent +.Brent: farwritetext BrentNumberDeclinedText waitbutton closetext end -.Vance +.Vance: farwritetext VanceNumberDeclinedText waitbutton closetext end -.Wilton +.Wilton: farwritetext WiltonNumberDeclinedText waitbutton closetext end -.Kenji +.Kenji: farwritetext KenjiNumberDeclinedText waitbutton closetext end -.Parry +.Parry: farwritetext ParryNumberDeclinedText waitbutton closetext @@ -1067,102 +1067,102 @@ PhoneFullMScript: if_equal PHONE_BLACKBELT_KENJI, .Kenji if_equal PHONE_HIKER_PARRY, .Parry -.Jack +.Jack: farwritetext JackPhoneFullText waitbutton closetext end -.Huey +.Huey: farwritetext HueyPhoneFullText waitbutton closetext end -.Gaven +.Gaven: farwritetext GavenPhoneFullText waitbutton closetext end -.Jose +.Jose: farwritetext JosePhoneFullText waitbutton closetext end -.Joey +.Joey: farwritetext JoeyPhoneFullText waitbutton closetext end -.Wade +.Wade: farwritetext WadePhoneFullText waitbutton closetext end -.Ralph +.Ralph: farwritetext RalphPhoneFullText waitbutton closetext end -.Anthony +.Anthony: farwritetext AnthonyPhoneFullText waitbutton closetext end -.Todd +.Todd: farwritetext ToddPhoneFullText waitbutton closetext end -.Irwin +.Irwin: farwritetext IrwinPhoneFullText waitbutton closetext end -.Arnie +.Arnie: farwritetext ArniePhoneFullText waitbutton closetext end -.Alan +.Alan: farwritetext AlanPhoneFullText waitbutton closetext end -.Chad +.Chad: farwritetext ChadPhoneFullText waitbutton closetext end -.Derek +.Derek: farwritetext DerekPhoneFullText waitbutton closetext end -.Tully +.Tully: farwritetext TullyPhoneFullText waitbutton closetext end -.Brent +.Brent: farwritetext BrentPhoneFullText waitbutton closetext end -.Vance +.Vance: farwritetext VancePhoneFullText waitbutton closetext end -.Wilton +.Wilton: farwritetext WiltonPhoneFullText waitbutton closetext end -.Kenji +.Kenji: farwritetext KenjiPhoneFullText waitbutton closetext end -.Parry +.Parry: farwritetext ParryPhoneFullText waitbutton closetext @@ -1188,87 +1188,87 @@ RematchMScript: if_equal PHONE_FISHER_WILTON, .Wilton if_equal PHONE_HIKER_PARRY, .Parry -.Jack +.Jack: farwritetext JackRematchText waitbutton closetext end -.Huey +.Huey: farwritetext HueyRematchText waitbutton closetext end -.Gaven +.Gaven: farwritetext GavenRematchText waitbutton closetext end -.Jose +.Jose: farwritetext JoseRematchText waitbutton closetext end -.Joey +.Joey: farwritetext JoeyRematchText waitbutton closetext end -.Wade +.Wade: farwritetext WadeRematchText waitbutton closetext end -.Ralph +.Ralph: farwritetext RalphRematchText waitbutton closetext end -.Anthony +.Anthony: farwritetext AnthonyRematchText waitbutton closetext end -.Todd +.Todd: farwritetext ToddRematchText waitbutton closetext end -.Arnie +.Arnie: farwritetext ArnieRematchText waitbutton closetext end -.Alan +.Alan: farwritetext AlanRematchText waitbutton closetext end -.Chad +.Chad: farwritetext ChadRematchText waitbutton closetext end -.Tully +.Tully: farwritetext TullyRematchText waitbutton closetext end -.Brent +.Brent: farwritetext BrentRematchText waitbutton closetext end -.Vance +.Vance: farwritetext VanceRematchText waitbutton closetext end -.Wilton +.Wilton: farwritetext WiltonRematchText waitbutton closetext end -.Parry +.Parry: farwritetext ParryRematchText waitbutton closetext @@ -1284,31 +1284,31 @@ GiftMScript: if_equal PHONE_FISHER_WILTON, .Wilton if_equal PHONE_BLACKBELT_KENJI, .Kenji -.Jose +.Jose: farwritetext JoseGiftText buttonsound end -.Wade +.Wade: farwritetext WadeGiftText buttonsound end -.Alan +.Alan: farwritetext AlanGiftText buttonsound end -.Derek +.Derek: farwritetext DerekGiftText buttonsound end -.Tully +.Tully: farwritetext TullyGiftText buttonsound end -.Wilton +.Wilton: farwritetext WiltonGiftText buttonsound end -.Kenji +.Kenji: farwritetext KenjiGiftText buttonsound end @@ -1327,57 +1327,57 @@ PackFullMScript: if_equal PHONE_BLACKBELT_KENJI, .Kenji if_equal PHONE_HIKER_PARRY, .Parry -.Huey +.Huey: farwritetext HueyPackFullText waitbutton closetext end -.Jose +.Jose: farwritetext JosePackFullText waitbutton closetext end -.Joey +.Joey: farwritetext JoeyPackFullText waitbutton closetext end -.Wade +.Wade: farwritetext WadePackFullText waitbutton closetext end -.Alan +.Alan: farwritetext AlanPackFullText waitbutton closetext end -.Derek +.Derek: farwritetext DerekPackFullText waitbutton closetext end -.Tully +.Tully: farwritetext TullyPackFullText waitbutton closetext end -.Vance +.Vance: farwritetext VancePackFullText waitbutton closetext end -.Wilton +.Wilton: farwritetext WiltonPackFullText waitbutton closetext end -.Kenji +.Kenji: farwritetext KenjiPackFullText waitbutton closetext end -.Parry +.Parry: farwritetext ParryPackFullText waitbutton closetext @@ -1391,19 +1391,19 @@ RematchGiftMScript: if_equal PHONE_BIRDKEEPER_VANCE, .Vance if_equal PHONE_HIKER_PARRY, .Parry -.Huey +.Huey: farwritetext HueyRematchGiftText buttonsound end -.Joey +.Joey: farwritetext JoeyRematchGiftText buttonsound end -.Vance +.Vance: farwritetext VanceRematchGiftText buttonsound end -.Parry +.Parry: farwritetext ParryRematchGiftText buttonsound end @@ -1419,28 +1419,28 @@ AskNumber1FScript: if_equal PHONE_PICNICKER_TIFFANY, .Tiffany if_equal PHONE_PICNICKER_ERIN, .Erin -.Beverly +.Beverly: farwritetext BeverlyAskNumber1Text end -.Beth +.Beth: farwritetext BethAskNumber1Text end -.Reena +.Reena: farwritetext ReenaAskNumber1Text end -.Liz +.Liz: farwritetext LizAskNumber1Text end -.Gina +.Gina: farwritetext GinaAskNumber1Text end -.Dana +.Dana: farwritetext DanaAskNumber1Text end -.Tiffany +.Tiffany: farwritetext TiffanyAskNumber1Text end -.Erin +.Erin: farwritetext ErinAskNumber1Text end @@ -1455,28 +1455,28 @@ AskNumber2FScript: if_equal PHONE_PICNICKER_TIFFANY, .Tiffany if_equal PHONE_PICNICKER_ERIN, .Erin -.Beverly +.Beverly: farwritetext BeverlyAskNumber2Text end -.Beth +.Beth: farwritetext BethAskNumber2Text end -.Reena +.Reena: farwritetext ReenaAskNumber2Text end -.Liz +.Liz: farwritetext LizAskNumber2Text end -.Gina +.Gina: farwritetext GinaAskNumber2Text end -.Dana +.Dana: farwritetext DanaAskNumber2Text end -.Tiffany +.Tiffany: farwritetext TiffanyAskNumber2Text end -.Erin +.Erin: farwritetext ErinAskNumber2Text end @@ -1498,42 +1498,42 @@ NumberAcceptedFScript: ; 0xbcbd3 if_equal PHONE_PICNICKER_TIFFANY, .Tiffany if_equal PHONE_PICNICKER_ERIN, .Erin -.Beverly +.Beverly: farwritetext BeverlyNumberAcceptedText waitbutton closetext end -.Beth +.Beth: farwritetext BethNumberAcceptedText waitbutton closetext end -.Reena +.Reena: farwritetext ReenaNumberAcceptedText waitbutton closetext end -.Liz +.Liz: farwritetext LizNumberAcceptedText waitbutton closetext end -.Gina +.Gina: farwritetext GinaNumberAcceptedText waitbutton closetext end -.Dana +.Dana: farwritetext DanaNumberAcceptedText waitbutton closetext end -.Tiffany +.Tiffany: farwritetext TiffanyNumberAcceptedText waitbutton closetext end -.Erin +.Erin: farwritetext ErinNumberAcceptedText waitbutton closetext @@ -1550,42 +1550,42 @@ NumberDeclinedFScript: if_equal PHONE_PICNICKER_TIFFANY, .Tiffany if_equal PHONE_PICNICKER_ERIN, .Erin -.Beverly +.Beverly: farwritetext BeverlyNumberDeclinedText waitbutton closetext end -.Beth +.Beth: farwritetext BethNumberDeclinedText waitbutton closetext end -.Reena +.Reena: farwritetext ReenaNumberDeclinedText waitbutton closetext end -.Liz +.Liz: farwritetext LizNumberDeclinedText waitbutton closetext end -.Gina +.Gina: farwritetext GinaNumberDeclinedText waitbutton closetext end -.Dana +.Dana: farwritetext DanaNumberDeclinedText waitbutton closetext end -.Tiffany +.Tiffany: farwritetext TiffanyNumberDeclinedText waitbutton closetext end -.Erin +.Erin: farwritetext ErinNumberDeclinedText waitbutton closetext @@ -1602,42 +1602,42 @@ PhoneFullFScript: if_equal PHONE_PICNICKER_TIFFANY, .Tiffany if_equal PHONE_PICNICKER_ERIN, .Erin -.Beverly +.Beverly: farwritetext BeverlyPhoneFullText waitbutton closetext end -.Beth +.Beth: farwritetext BethPhoneFullText waitbutton closetext end -.Reena +.Reena: farwritetext ReenaPhoneFullText waitbutton closetext end -.Liz +.Liz: farwritetext LizPhoneFullText waitbutton closetext end -.Gina +.Gina: farwritetext GinaPhoneFullText waitbutton closetext end -.Dana +.Dana: farwritetext DanaPhoneFullText waitbutton closetext end -.Tiffany +.Tiffany: farwritetext TiffanyPhoneFullText waitbutton closetext end -.Erin +.Erin: farwritetext ErinPhoneFullText waitbutton closetext @@ -1653,37 +1653,37 @@ RematchFScript: if_equal PHONE_PICNICKER_TIFFANY, .Tiffany if_equal PHONE_PICNICKER_ERIN, .Erin -.Beth +.Beth: farwritetext BethRematchText waitbutton closetext end -.Reena +.Reena: farwritetext ReenaRematchText waitbutton closetext end -.Liz +.Liz: farwritetext LizRematchText waitbutton closetext end -.Gina +.Gina: farwritetext GinaRematchText waitbutton closetext end -.Dana +.Dana: farwritetext DanaRematchText waitbutton closetext end -.Tiffany +.Tiffany: farwritetext TiffanyRematchText waitbutton closetext end -.Erin +.Erin: farwritetext ErinRematchText waitbutton closetext @@ -1696,19 +1696,19 @@ GiftFScript: if_equal PHONE_LASS_DANA, .Dana if_equal PHONE_PICNICKER_TIFFANY, .Tiffany -.Beverly +.Beverly: farwritetext BeverlyGiftText buttonsound end -.Gina +.Gina: farwritetext GinaGiftText buttonsound end -.Dana +.Dana: farwritetext DanaGiftText buttonsound end -.Tiffany +.Tiffany: farwritetext TiffanyGiftText buttonsound end @@ -1721,27 +1721,27 @@ PackFullFScript: if_equal PHONE_PICNICKER_TIFFANY, .Tiffany if_equal PHONE_PICNICKER_ERIN, .Erin -.Beverly +.Beverly: farwritetext BeverlyPackFullText waitbutton closetext end -.Gina +.Gina: farwritetext GinaPackFullText waitbutton closetext end -.Dana +.Dana: farwritetext DanaPackFullText waitbutton closetext end -.Tiffany +.Tiffany: farwritetext TiffanyPackFullText waitbutton closetext end -.Erin +.Erin: farwritetext ErinPackFullText waitbutton closetext @@ -1751,7 +1751,7 @@ RematchGiftFScript: checkcode VAR_CALLERID if_equal PHONE_PICNICKER_ERIN, .Erin -.Erin +.Erin: opentext farwritetext ErinRematchGiftText buttonsound @@ -1867,14 +1867,14 @@ CoinVendor_IntroScript: ; 0xbcde0 ; 0xbce54 -.MenuDataHeader +.MenuDataHeader: db $40 ; flags db 04, 00 ; start coords db 11, 15 ; end coords dw .MenuData2 db 1 ; default option -.MenuData2 +.MenuData2: db $80 ; flags db 3 ; items db " 50 : ¥1000@" @@ -1894,13 +1894,13 @@ HappinessCheckScript: closetext end -.KindaHappy +.KindaHappy: farwritetext HappinessText2 waitbutton closetext end -.Unhappy +.Unhappy: farwritetext HappinessText1 waitbutton closetext diff --git a/engine/time.asm b/engine/time.asm index 29670afdc..255346c0a 100755 --- a/engine/time.asm +++ b/engine/time.asm @@ -30,7 +30,7 @@ NextCallReceiveDelay: ; 113e9 jp RestartReceiveCallDelay ; 113fd -.ReceiveCallDelays +.ReceiveCallDelays: db 20, 10, 5, 3 ; 11401 @@ -124,9 +124,9 @@ endr jr z, .RestartKenjiBreakCountdown dec [hl] jr nz, .DontRestartKenjiBreakCountdown -.RestartKenjiBreakCountdown +.RestartKenjiBreakCountdown: call Special_SampleKenjiBreakCountdown -.DontRestartKenjiBreakCountdown +.DontRestartKenjiBreakCountdown: jr RestartDailyResetTimer ; 11485 diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index 4ed000af2..1bfc2457b 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -215,7 +215,7 @@ ReplaceTimeOfDayPals: ; 8c0e5 ld [wTimeOfDayPalset], a ret -.DarkCave +.DarkCave: ld a, [StatusFlags] bit 2, a ; Flash jr nz, .UsedFlash @@ -223,7 +223,7 @@ ReplaceTimeOfDayPals: ; 8c0e5 ld [wTimeOfDayPalset], a ret -.UsedFlash +.UsedFlash: ld a, %10101010 ; 2, 2, 2, 2 ld [wTimeOfDayPalset], a ret @@ -254,31 +254,31 @@ endr jp [hl] ; 8c126 -.TimePalettes +.TimePalettes: dw .MorningPalette dw .DayPalette dw .NitePalette dw .DarknessPalette -.MorningPalette +.MorningPalette: ld a, [wTimeOfDayPalset] and %00000011 ; 0 ret -.DayPalette +.DayPalette: ld a, [wTimeOfDayPalset] and %00001100 ; 1 srl a srl a ret -.NitePalette +.NitePalette: ld a, [wTimeOfDayPalset] and %00110000 ; 2 swap a ret -.DarknessPalette +.DarknessPalette: ld a, [wTimeOfDayPalset] and %11000000 ; 3 rlca @@ -381,8 +381,8 @@ endr db %00000000, %00000000, %00000000 .day - db %11111111, %11111111, %11111111 - db %11111110, %11111110, %11111110 + db %11111111, %11111111, %11111111 + db %11111110, %11111110, %11111110 db %11111001, %11100100, %11100100 db %11100100, %11010000, %11010000 db %10010000, %10000000, %10000000 diff --git a/engine/timeset.asm b/engine/timeset.asm index 8f212bc4d..50bc0d3c0 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -63,7 +63,7 @@ InitClock: ; 90672 (24:4672) ld c, 10 call DelayFrames -.SetHourLoop +.SetHourLoop: call JoyTextDelay call SetHour jr nc, .SetHourLoop @@ -78,7 +78,7 @@ InitClock: ; 90672 (24:4672) call .ClearScreen jr .loop -.HourIsSet +.HourIsSet: ld hl, Text_HowManyMinutes call PrintText hlcoord 11, 7 @@ -93,7 +93,7 @@ InitClock: ; 90672 (24:4672) ld c, 10 call DelayFrames -.SetMinutesLoop +.SetMinutesLoop: call JoyTextDelay call SetMinutes jr nc, .SetMinutesLoop @@ -108,7 +108,7 @@ InitClock: ; 90672 (24:4672) call .ClearScreen jr .HourIsSet -.MinutesAreSet +.MinutesAreSet: call SetTimeOfDay ld hl, OakText_ResponseToSetTime call PrintText @@ -150,7 +150,7 @@ SetHour: ; 90795 (24:4795) and a jr nz, .DecreaseThroughMidnight ld a, 23 + 1 -.DecreaseThroughMidnight +.DecreaseThroughMidnight: dec a ld [hl], a jr .okay @@ -161,7 +161,7 @@ SetHour: ; 90795 (24:4795) cp 23 jr c, .AdvanceThroughMidnight ld a, -1 -.AdvanceThroughMidnight +.AdvanceThroughMidnight: inc a ld [hl], a @@ -176,7 +176,7 @@ SetHour: ; 90795 (24:4795) and a ret -.Confirm +.Confirm: scf ret @@ -368,13 +368,13 @@ OakText_ResponseToSetTime: ; 0x908b8 jr c, .MORN cp 18 jr c, .DAY -.NITE +.NITE: ld hl, .sodark ret -.MORN +.MORN: ld hl, .overslept ret -.DAY +.DAY: ld hl, .yikes ret ; 908ec (24:48ec) diff --git a/engine/title.asm b/engine/title.asm index ab82b77b2..30804fbe8 100644 --- a/engine/title.asm +++ b/engine/title.asm @@ -3,39 +3,39 @@ _TitleScreen: ; 10ed67 call ClearBGPalettes call ClearSprites call ClearTileMap - + ; Turn BG Map update off xor a ld [hBGMapMode], a - + ; Reset timing variables ld hl, wJumptableIndex ld [hli], a ; cf63 ; Scene? ld [hli], a ; cf64 ld [hli], a ; cf65 ; Timer lo ld [hl], a ; cf66 ; Timer hi - + ; Turn LCD off call DisableLCD - - + + ; VRAM bank 1 ld a, 1 ld [rVBK], a - - + + ; Decompress running Suicune gfx ld hl, TitleSuicuneGFX ld de, VTiles1 call Decompress - - + + ; Clear screen palettes hlbgcoord 0, 0 ld bc, 20 bgrows xor a call ByteFill - + ; Fill tile palettes: @@ -77,94 +77,94 @@ _TitleScreen: ; 10ed67 ld bc, 2 bgrows ld a, 6 call ByteFill - + ; 'CRYSTAL VERSION' hlbgcoord 5, 9 ld bc, NAME_LENGTH ; length of version text ld a, 1 call ByteFill - + ; Suicune gfx hlbgcoord 0, 12 ld bc, 6 bgrows ; the rest of the screen ld a, 8 call ByteFill - - + + ; Back to VRAM bank 0 ld a, $0 ld [rVBK], a - - + + ; Decompress logo ld hl, TitleLogoGFX ld de, VTiles1 call Decompress - + ; Decompress background crystal ld hl, TitleCrystalGFX ld de, VTiles0 call Decompress - - + + ; Clear screen tiles hlbgcoord 0, 0 ld bc, 64 bgrows ld a, " " call ByteFill - + ; Draw Pokemon logo hlcoord 0, 3 lb bc, 7, 20 ld d, $80 ld e, $14 call DrawTitleGraphic - + ; Draw copyright text hlbgcoord 3, 0, VBGMap1 lb bc, 1, 13 ld d, $c ld e, $10 call DrawTitleGraphic - + ; Initialize running Suicune? ld d, $0 call LoadSuicuneFrame - + ; Initialize background crystal call InitializeBackground - + ; Save WRAM bank ld a, [rSVBK] push af ; WRAM bank 5 ld a, 5 ld [rSVBK], a - + ; Update palette colors ld hl, TitleScreenPalettes ld de, UnknBGPals ld bc, 4 * 32 call CopyBytes - + ld hl, TitleScreenPalettes ld de, BGPals ld bc, 4 * 32 call CopyBytes - + ; Restore WRAM bank pop af ld [rSVBK], a - - + + ; LY/SCX trickery starts here - + ld a, [rSVBK] push af ld a, 5 ; BANK(LYOverrides) ld [rSVBK], a - + ; Make alternating lines come in from opposite sides ; ( This part is actually totally pointless, you can't @@ -180,30 +180,30 @@ _TitleScreen: ; 10ed67 inc hl dec b jr nz, .loop - + ; Make sure the rest of the buffer is empty ld hl, LYOverrides + 80 xor a ld bc, LYOverridesEnd - (LYOverrides + 80) call ByteFill - + ; Let LCD Stat know we're messing around with SCX ld a, rSCX - rJOYP ld [hFFC6], a - + pop af ld [rSVBK], a - - + + ; Reset audio call ChannelsOff call EnableLCD - + ; Set sprite size to 8x16 ld a, [rLCDC] set 2, a ld [rLCDC], a - + ld a, +112 ld [hSCX], a ld a, 8 @@ -212,21 +212,21 @@ _TitleScreen: ; 10ed67 ld [hWX], a ld a, -112 ld [hWY], a - + ld a, $1 ld [hCGBPalUpdate], a - + ; Update BG Map 0 (bank 0) ld [hBGMapMode], a - + xor a ld [UnknBGPals + 2], a - + ; Play starting sound effect call SFXChannelsOff ld de, SFX_TITLE_SCREEN_ENTRANCE call PlaySFX - + ret ; 10eea7 @@ -371,7 +371,7 @@ AnimateTitleCrystal: ; 10ef32 ld a, [hl] cp 6 + $10 ret z - + ; Move all 30 parts of the crystal down by 2 ld c, 30 .loop @@ -383,7 +383,7 @@ rept 3 endr dec c jr nz, .loop - + ret ; 10ef46 @@ -405,78 +405,78 @@ TitleScreenPalettes: RGB 19, 00, 00 RGB 15, 08, 31 RGB 15, 08, 31 - + RGB 00, 00, 00 RGB 31, 31, 31 RGB 15, 16, 31 RGB 31, 01, 13 - + RGB 00, 00, 00 RGB 07, 07, 07 RGB 31, 31, 31 RGB 02, 03, 30 - + RGB 00, 00, 00 RGB 13, 13, 13 RGB 31, 31, 18 RGB 02, 03, 30 - + RGB 00, 00, 00 RGB 19, 19, 19 RGB 29, 28, 12 RGB 02, 03, 30 - + RGB 00, 00, 00 RGB 25, 25, 25 RGB 28, 25, 06 RGB 02, 03, 30 - + RGB 00, 00, 00 RGB 31, 31, 31 RGB 26, 21, 00 RGB 02, 03, 30 - + RGB 00, 00, 00 RGB 11, 11, 19 RGB 31, 31, 31 RGB 00, 00, 00 - + ; OBJ RGB 00, 00, 00 RGB 10, 00, 15 RGB 17, 05, 22 RGB 19, 09, 31 - + RGB 31, 31, 31 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - + RGB 31, 31, 31 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - + RGB 31, 31, 31 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - + RGB 31, 31, 31 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - + RGB 31, 31, 31 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - + RGB 31, 31, 31 RGB 00, 00, 00 RGB 00, 00, 00 RGB 00, 00, 00 - + RGB 31, 31, 31 RGB 00, 00, 00 RGB 00, 00, 00 diff --git a/engine/tmhm2.asm b/engine/tmhm2.asm index 94de4f3e3..289857623 100755 --- a/engine/tmhm2.asm +++ b/engine/tmhm2.asm @@ -59,12 +59,12 @@ AskTeachTMHM: ; 2c7bf (b:47bf) cp HM01 jr c, .TM ld hl, Text_BootedHM ; Booted up an HM -.TM +.TM: call PrintText ld hl, Text_ItContained call PrintText call YesNoBox -.NotTMHM +.NotTMHM: pop bc ld a, b ld [Options], a @@ -374,7 +374,7 @@ TMHM_DisplayPocketItems: ; 2c9e2 (b:49e2) call PrintNum jr .okay -.HM +.HM: push af sub NUM_TMS ld [wd265], a @@ -421,7 +421,7 @@ TMHM_DisplayPocketItems: ; 2c9e2 (b:49e2) jr nz, .loop2 jr .done -.NotTMHM +.NotTMHM: call TMHMPocket_GetCurrentLineCoord rept 3 inc hl diff --git a/engine/trade/animation.asm b/engine/trade/animation.asm index be5318b2e..91e190075 100755 --- a/engine/trade/animation.asm +++ b/engine/trade/animation.asm @@ -155,7 +155,7 @@ RunTradeAnimSequence: ; 28fa1 ld a, $0 ld [rVBK], a -.NotCGB +.NotCGB: hlbgcoord 0, 0 ld bc, sScratch - VBGMap0 ld a, " " diff --git a/engine/trainer_card.asm b/engine/trainer_card.asm index 4898d657a..36bf55357 100755 --- a/engine/trainer_card.asm +++ b/engine/trainer_card.asm @@ -118,7 +118,7 @@ TrainerCard_Page1_Joypad: ; 251d7 (9:51d7) ld [wJumptableIndex], a ret -.KantoCheck +.KantoCheck: ; unreferenced ld a, [KantoBadges] and a @@ -164,7 +164,7 @@ TrainerCard_Page2_Joypad: ; 25221 (9:5221) ld [wJumptableIndex], a ret -.KantoCheck +.KantoCheck: ; unreferenced ld a, [KantoBadges] and a @@ -173,7 +173,7 @@ TrainerCard_Page2_Joypad: ; 25221 (9:5221) ld [wJumptableIndex], a ret -.Quit +.Quit: ld a, $6 ld [wJumptableIndex], a ret @@ -289,11 +289,11 @@ TrainerCard_Page1_PrintDexCaught_GameTime: ; 2530a (9:530a) call ClearBox ret -.Dex_PlayTime +.Dex_PlayTime: db "#DEX" next "PLAY TIME@@" -.Badges +.Badges: db " BADGES▶@" .StatusTilemap: ; 25366 diff --git a/engine/unown_puzzle.asm b/engine/unown_puzzle.asm index cf8b78618..ada5244a7 100755 --- a/engine/unown_puzzle.asm +++ b/engine/unown_puzzle.asm @@ -188,7 +188,7 @@ endr ; e12d9 .Jumptable: ; e12d9 - + dw .Function ; e12db @@ -321,7 +321,7 @@ UnownPuzzle_A: ; e1376 ld [wHoldingUnownPuzzlePiece], a ret -.TryPlacePiece +.TryPlacePiece: call UnownPuzzle_CheckCurrentTileOccupancy and a jr nz, UnownPuzzle_InvalidAction @@ -546,7 +546,7 @@ RedrawUnownPuzzlePieces: ; e14d9 ld hl, .OAM_HoldingPiece jr .load -.NoPiece +.NoPiece: ld hl, .OAM_NotHoldingPiece .load diff --git a/engine/wildmons.asm b/engine/wildmons.asm index f6643d6c3..140de9205 100755 --- a/engine/wildmons.asm +++ b/engine/wildmons.asm @@ -103,7 +103,7 @@ endr .SearchMapForMon: ; 2a088 inc hl -.ScanMapLoop +.ScanMapLoop: push af ld a, [wNamedObjectIndexBuffer] cp [hl] @@ -128,7 +128,7 @@ endr ld c, a hlcoord 0, 0 ld de, SCREEN_WIDTH * SCREEN_HEIGHT -.AppendNestLoop +.AppendNestLoop: ld a, [hli] cp c jr z, .found_nest @@ -459,7 +459,7 @@ _SwarmWildmonCheck scf ret -.CheckYanma +.CheckYanma: push hl ld hl, SwarmFlags bit 3, [hl] @@ -611,7 +611,7 @@ endr scf ret -.DontEncounterRoamMon +.DontEncounterRoamMon: pop hl and a ret @@ -631,7 +631,7 @@ UpdateRoamMons: ; 2a30d ld a, c ld [wRoamMon1MapNumber], a -.SkipRaikou +.SkipRaikou: ld a, [wRoamMon2MapGroup] cp GROUP_N_A jr z, .SkipEntei @@ -644,7 +644,7 @@ UpdateRoamMons: ; 2a30d ld a, c ld [wRoamMon2MapNumber], a -.SkipEntei +.SkipEntei: ld a, [wRoamMon3MapGroup] cp GROUP_N_A jr z, .SkipSuicune @@ -657,7 +657,7 @@ UpdateRoamMons: ; 2a30d ld a, c ld [wRoamMon3MapNumber], a -.SkipSuicune +.SkipSuicune: jp _BackUpMapIndices ; 2a355 @@ -729,7 +729,7 @@ JumpRoamMons: ; 2a394 ld [wRoamMon1MapGroup], a ld a, c ld [wRoamMon1MapNumber], a -.SkipRaikou +.SkipRaikou: ld a, [wRoamMon2MapGroup] cp GROUP_N_A @@ -739,7 +739,7 @@ JumpRoamMons: ; 2a394 ld [wRoamMon2MapGroup], a ld a, c ld [wRoamMon2MapNumber], a -.SkipEntei +.SkipEntei: ld a, [wRoamMon3MapGroup] cp GROUP_N_A @@ -749,7 +749,7 @@ JumpRoamMons: ; 2a394 ld [wRoamMon3MapGroup], a ld a, c ld [wRoamMon3MapNumber], a -.SkipSuicune +.SkipSuicune: jp _BackUpMapIndices @@ -852,7 +852,7 @@ RandomPhoneRareWildMon: ; 2a4ab call LookUpWildmonsForMapDE jr nc, .done -.GetGrassmon +.GetGrassmon: push hl ld bc, 5 + 4 * 2 ; Location of the level of the 5th wild Pokemon in that map add hl, bc @@ -908,7 +908,7 @@ endr ld [ScriptVar], a ret -.SawRareMonText +.SawRareMonText: ; I just saw some rare @ in @ . I'll call you if I see another rare #MON, OK? text_jump UnknownText_0x1bd34b db "@" |