diff options
Diffstat (limited to 'misc')
| -rwxr-xr-x | misc/battle_tower_5c.asm | 2 | ||||
| -rwxr-xr-x | misc/fixed_words.asm | 4 | ||||
| -rw-r--r-- | misc/gbc_only.asm | 4 | ||||
| -rwxr-xr-x | misc/gfx_41.asm | 20 | ||||
| -rwxr-xr-x | misc/mobile_12_2.asm | 2 | ||||
| -rw-r--r-- | misc/mobile_42.asm | 18 | ||||
| -rwxr-xr-x | misc/mobile_46.asm | 16 | ||||
| -rw-r--r-- | misc/mobile_5f.asm | 16 | ||||
| -rwxr-xr-x | misc/mobile_menu.asm | 2 |
9 files changed, 42 insertions, 42 deletions
diff --git a/misc/battle_tower_5c.asm b/misc/battle_tower_5c.asm index 127590b3a..149e8743a 100755 --- a/misc/battle_tower_5c.asm +++ b/misc/battle_tower_5c.asm @@ -125,7 +125,7 @@ Function170139: ; 170139 ld a, PartyMonNicknames / $100 ld [wcd4c], a ld a, 3 -.CopyLoop +.CopyLoop: push af ld a, [wcd49] ld l, a diff --git a/misc/fixed_words.asm b/misc/fixed_words.asm index c7f1390e5..56cd52078 100755 --- a/misc/fixed_words.asm +++ b/misc/fixed_words.asm @@ -2509,7 +2509,7 @@ Function11d0b6: ; 11d0b6 (47:50b6) ld l, a jp [hl] -.Jumptable +.Jumptable: dw .zero dw .one dw .two @@ -3142,7 +3142,7 @@ Function11d3ba: ; 11d3ba jr z, .ExitMasterLoop jp .MasterLoop -.ExitMasterLoop +.ExitMasterLoop: pop af ld [rSVBK], a ret diff --git a/misc/gbc_only.asm b/misc/gbc_only.asm index 2349bb687..cae976a1c 100644 --- a/misc/gbc_only.asm +++ b/misc/gbc_only.asm @@ -96,7 +96,7 @@ DrawGBCOnlyBorder: ; 4eaea ret ; 4eb15 -.FillRow ; 4eb15 +.FillRow: ; 4eb15 ld c, SCREEN_WIDTH - 2 .next_column ld [hli], a @@ -105,7 +105,7 @@ DrawGBCOnlyBorder: ; 4eaea ret ; 4eb1c -.FillColumn ; 4eb1c +.FillColumn: ; 4eb1c ld de, SCREEN_WIDTH ld c, SCREEN_HEIGHT - 2 .next_row diff --git a/misc/gfx_41.asm b/misc/gfx_41.asm index 7efdf41b8..44d2813c8 100755 --- a/misc/gfx_41.asm +++ b/misc/gfx_41.asm @@ -2,7 +2,7 @@ Function104000:: ; 104000 ld hl, .Function jp CallInSafeGFXMode -.Function +.Function: decoord 0, 0, AttrMap ld hl, wBackupAttrMap call CutAndPasteAttrMap @@ -24,7 +24,7 @@ Function10402d:: ; 10402d ld hl, .Function jp CallInSafeGFXMode -.Function +.Function: decoord 0, 0 ld hl, wDecompressScratch call CutAndPasteTilemap @@ -39,7 +39,7 @@ Function104047: ; 104047 ld hl, .Function jp CallInSafeGFXMode -.Function +.Function: decoord 0, 0, AttrMap ld hl, wBackupAttrMap call CutAndPasteAttrMap @@ -54,7 +54,7 @@ ReloadMapPart:: ; 104061 ld hl, .Function jp CallInSafeGFXMode -.Function +.Function: decoord 0, 0, AttrMap ld hl, wBackupAttrMap call CutAndPasteAttrMap @@ -83,7 +83,7 @@ Function104099: ; 104099 ld hl, .Function jp CallInSafeGFXMode -.Function +.Function: decoord 0, 0, AttrMap ld hl, wBackupAttrMap call CutAndPasteAttrMap @@ -112,7 +112,7 @@ Function1040d4: ; 1040d4 ld hl, .Function jp CallInSafeGFXMode -.Function +.Function: ld a, $1 ld [rVBK], a ld a, $3 @@ -136,7 +136,7 @@ Function1040fb: ; 1040fb ld hl, .Function jp CallInSafeGFXMode -.Function +.Function: ld a, $1 ld [rVBK], a ld a, $3 @@ -151,7 +151,7 @@ Function104110:: ; 104110 ld hl, .Function jp CallInSafeGFXMode -.Function +.Function: decoord 0, 0, AttrMap ld hl, wBackupAttrMap call CutAndPasteAttrMap @@ -181,7 +181,7 @@ Function104148: ; 104148 (41:4148) ld hl, .Function jp CallInSafeGFXMode -.Function +.Function: decoord 0, 0, AttrMap ld hl, wBackupAttrMap call CutAndPasteAttrMap @@ -454,7 +454,7 @@ endr ld l, e ld de, wDecompressScratch call FarCopyBytes - + pop hl pop bc diff --git a/misc/mobile_12_2.asm b/misc/mobile_12_2.asm index 928eeec98..05e92cd55 100755 --- a/misc/mobile_12_2.asm +++ b/misc/mobile_12_2.asm @@ -481,7 +481,7 @@ Function4ab06: ; 4ab06 jr nz, .NotFainted scf -.NotFainted +.NotFainted: ret ; 4ab1a diff --git a/misc/mobile_42.asm b/misc/mobile_42.asm index 950a3f0c2..a24efd10c 100644 --- a/misc/mobile_42.asm +++ b/misc/mobile_42.asm @@ -9,7 +9,7 @@ MobileTradeAnimation_SendGivemonToGTS: ; 108000 mobiletradeanim_showgtsgivemon mobiletradeanim_12 mobiletradeanim_10 - mobiletradeanim_sendmon + mobiletradeanim_sendmon mobiletradeanim_06 mobiletradeanim_0f mobiletradeanim_end @@ -29,7 +29,7 @@ asm_108018: .TradeAnimScript: mobiletradeanim_11 mobiletradeanim_07 - mobiletradeanim_receivemon + mobiletradeanim_receivemon mobiletradeanim_showgtsgetmon mobiletradeanim_end @@ -50,9 +50,9 @@ asm_10802c: mobiletradeanim_showgivemon mobiletradeanim_12 mobiletradeanim_02 - mobiletradeanim_sendmon + mobiletradeanim_sendmon mobiletradeanim_05 - mobiletradeanim_receivemon + mobiletradeanim_receivemon mobiletradeanim_showgetmon mobiletradeanim_end @@ -66,7 +66,7 @@ Function10803d: ; 10803d .TradeAnimScript: mobiletradeanim_11 mobiletradeanim_07 - mobiletradeanim_receivemon + mobiletradeanim_receivemon mobiletradeanim_showoddegg mobiletradeanim_end @@ -351,7 +351,7 @@ MobileTradeAnim_JumptableLoop: ; 10824b and a ret -.StopAnim +.StopAnim: xor a ld [hSCX], a ld [hSCY], a @@ -382,7 +382,7 @@ endr ; 10828a .Jumptable: ; 10828a - + dw GetMobileTradeAnimByte ; 00 dw MobileTradeAnim_ShowPlayerMonToBeSent ; 01 dw MobileTradeAnim_02 ; 02 @@ -1534,7 +1534,7 @@ Function108b78: ; 108b78 ld de, (31 << 10) + (31 << 5) + 31 ; $7fff jr .load_pal -.Orange +.Orange: ld de, ( 1 << 10) + (15 << 5) + 31 ; $05ff .load_pal ld a, e @@ -1680,7 +1680,7 @@ Function108c40: ; 108c40 call DelayFrames ret -.Getmon +.Getmon: ld hl, .TakeGoodCareOf call PrintText ld c, 80 diff --git a/misc/mobile_46.asm b/misc/mobile_46.asm index c30713f43..a7feeea28 100755 --- a/misc/mobile_46.asm +++ b/misc/mobile_46.asm @@ -1858,7 +1858,7 @@ Function118f14: ld hl, Text_SaveFileWillBeSent call Function11a9c0 -.DontSendSaveFile +.DontSendSaveFile: ld a, [wcd57] ld l, a ld a, [wcd58] @@ -4252,10 +4252,10 @@ Function119ed8: ; 119ed8 (46:5ed8) ld [hBGMapMode], a ret -.RunJumptable +.RunJumptable: jumptable .Jumptable, wcd3c -.Jumptable +.Jumptable: dw Function119f3f dw Function119f45 dw Function119f56 @@ -7086,7 +7086,7 @@ Mobile46_RunJumptable: ; 11b45c .IterateJumptable: ; 11b46a jumptable .Jumptable, wJumptableIndex -.Jumptable +.Jumptable: dw Function11b483 dw Function11b570 dw Function11b5c0 @@ -7232,7 +7232,7 @@ Function11b483: ; 11b483 call CloseSRAM jp Function11ad8a -.InitRAM +.InitRAM: ld bc, $c626 ld a, [PlayerID] ld [wcd2a], a @@ -7285,7 +7285,7 @@ Function11b570: ; 11b570 ld [wJumptableIndex], a ret -.SaveData +.SaveData: ld a, $3 ld [rSVBK], a @@ -7390,9 +7390,9 @@ Function11b5e8: ; 11b5e8 jr nz, .loop ret -.RunJumptable +.RunJumptable: jumptable .Jumptable, wJumptableIndex -.Jumptable +.Jumptable: dw Function11b66d dw Function11b6b3 ; 11b66d diff --git a/misc/mobile_5f.asm b/misc/mobile_5f.asm index e031d962c..461f03569 100644 --- a/misc/mobile_5f.asm +++ b/misc/mobile_5f.asm @@ -213,15 +213,15 @@ CheckStringForErrors: ; 17d073 cp $49 jr c, .NextChar -.Fail +.Fail: scf ret -.NextChar +.NextChar: dec c jr nz, .loop -.Done +.Done: and a ret ; 17d0b3 @@ -448,12 +448,12 @@ Special_Menu_ChallengeExplanationCancel: ; 17d224 ld hl, MenuDataHeader_17d26a ; Japanese Menu, where you can choose 'News' as an option jr .Load_Interpret -.English +.English: ld a, $4 ld [ScriptVar], a ld hl, MenuDataHeader_ChallengeExplanationCancel ; English Menu -.Load_Interpret +.Load_Interpret: call LoadMenuDataHeader call Function17d246 call CloseWindow @@ -473,14 +473,14 @@ Function17d246: ; 17d246 dec a jr .LoadToScriptVar -.UsewMenuCursorY +.UsewMenuCursorY: ld a, [wMenuCursorY] -.LoadToScriptVar +.LoadToScriptVar: ld [ScriptVar], a ret -.Exit +.Exit: ld a, $4 ld [ScriptVar], a ret diff --git a/misc/mobile_menu.asm b/misc/mobile_menu.asm index 8975a5151..d9fd3dd34 100755 --- a/misc/mobile_menu.asm +++ b/misc/mobile_menu.asm @@ -424,7 +424,7 @@ Function4a28a: ; 4a28a (12:628a) scf ret -.DeleteLoginPassword +.DeleteLoginPassword: call PlaceHollowCursor ld hl, UnknownText_0x4a358 call PrintText |