diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/copy.asm | 2 | ||||
| -rw-r--r-- | home/copy2.asm | 11 | ||||
| -rw-r--r-- | home/flag.asm | 5 | ||||
| -rw-r--r-- | home/map.asm | 23 | ||||
| -rw-r--r-- | home/math.asm | 3 | ||||
| -rw-r--r-- | home/menu.asm | 4 | ||||
| -rw-r--r-- | home/menu_window.asm | 16 | ||||
| -rw-r--r-- | home/print_bcd.asm | 2 | ||||
| -rw-r--r-- | home/print_text.asm | 1 | ||||
| -rw-r--r-- | home/sprite_updates.asm | 3 | ||||
| -rw-r--r-- | home/text.asm | 3 | ||||
| -rw-r--r-- | home/tilemap.asm | 3 |
12 files changed, 25 insertions, 51 deletions
diff --git a/home/copy.asm b/home/copy.asm index dfe48a50c..65be3895a 100644 --- a/home/copy.asm +++ b/home/copy.asm @@ -155,7 +155,6 @@ FarCopyBytes:: pop af rst Bankswitch ret -; 0xe9b FarCopyBytesDouble:: @@ -194,7 +193,6 @@ FarCopyBytesDouble:: pop af rst Bankswitch ret -; 0xeba Request2bpp:: diff --git a/home/copy2.asm b/home/copy2.asm index 9f2673c38..fdf55b2e3 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -1,4 +1,4 @@ -CopyBytes:: ; 0x3026 +CopyBytes:: ; copy bc bytes from hl to de inc b ; we bail the moment b hits 0, so include the last run inc c ; same thing; include last byte @@ -14,7 +14,7 @@ CopyBytes:: ; 0x3026 jr nz, .CopyByte ret -SwapBytes:: ; 0x3034 +SwapBytes:: ; swap bc bytes between hl and de .Loop: ; stash [hl] away on the stack @@ -37,7 +37,7 @@ SwapBytes:: ; 0x3034 jr nz, .Loop ret -ByteFill:: ; 0x3041 +ByteFill:: ; fill bc bytes with the value of a, starting at hl inc b ; we bail the moment b hits 0, so include the last run inc c ; same thing; include last byte @@ -51,7 +51,7 @@ ByteFill:: ; 0x3041 jr nz, .PutByte ret -GetFarByte:: ; 0x304d +GetFarByte:: ; retrieve a single byte from a:hl, and return it in a. ; bankswitch to new bank ld [hBuffer], a @@ -72,7 +72,7 @@ GetFarByte:: ; 0x304d ld a, [hBuffer] ret -GetFarHalfword:: ; 0x305d +GetFarHalfword:: ; retrieve a halfword from a:hl, and return it in hl. ; bankswitch to new bank ld [hBuffer], a @@ -90,7 +90,6 @@ GetFarHalfword:: ; 0x305d pop af rst Bankswitch ret -; 0x306b FarCopyWRAM:: ld [hBuffer], a diff --git a/home/flag.asm b/home/flag.asm index 823582222..796c19880 100644 --- a/home/flag.asm +++ b/home/flag.asm @@ -25,12 +25,12 @@ ResetFlashIfOutOfCave:: ret -EventFlagAction:: ; 0x2e6f +EventFlagAction:: ld hl, wEventFlags call FlagAction ret -FlagAction:: ; 0x2e76 +FlagAction:: ; Perform action b on bit de in flag array hl. ; inputs: @@ -96,7 +96,6 @@ FlagAction:: ; 0x2e76 and [hl] ld [hl], a ret -; 0x2ead CheckReceivedDex:: diff --git a/home/map.asm b/home/map.asm index a546c00f9..416b2f51a 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1076,7 +1076,7 @@ GetMovementData:: rst Bankswitch ret -GetScriptByte:: ; 0x26d4 +GetScriptByte:: ; Return byte at wScriptBank:wScriptPos in a. push hl @@ -1105,16 +1105,13 @@ GetScriptByte:: ; 0x26d4 pop bc pop hl ret -; 0x26ef -ObjectEvent:: ; 0x26ef +ObjectEvent:: jumptextfaceplayer ObjectEventText -; 0x26f2 ObjectEventText:: text_jump _ObjectEventText db "@" -; 0x26f7 BGEvent:: jumptext BGEventText @@ -1929,7 +1926,7 @@ FinishExitMenu:: call EnableSpriteUpdates ret -ReturnToMapWithSpeechTextbox:: ; 0x2b74 +ReturnToMapWithSpeechTextbox:: push af ld a, $1 ld [wSpriteUpdatesEnabled], a @@ -1952,7 +1949,6 @@ ReturnToMapWithSpeechTextbox:: ; 0x2b74 ld [hMapAnims], a pop af ret -; 0x2bae ReloadTilesetAndPalettes:: call DisableLCD @@ -1983,7 +1979,7 @@ GetMapPointer:: ld b, a ld a, [wMapNumber] ld c, a -GetAnyMapPointer:: ; 0x2bed +GetAnyMapPointer:: ; Prior to calling this function, you must have switched banks so that ; MapGroupPointers is visible. @@ -2013,9 +2009,8 @@ GetAnyMapPointer:: ; 0x2bed ld a, 9 call AddNTimes ret -; 0x2c04 -GetMapField:: ; 0x2c04 +GetMapField:: ; Extract data from the current map's group entry. ; inputs: @@ -2029,7 +2024,7 @@ GetMapField:: ; 0x2c04 ld b, a ld a, [wMapNumber] ld c, a -GetAnyMapField:: ; 0x2c0c +GetAnyMapField:: ; bankswitch ld a, [hROMBank] push af @@ -2046,7 +2041,6 @@ GetAnyMapField:: ; 0x2c0c pop af rst Bankswitch ret -; 0x2c1c SwitchToMapAttributesBank:: ld a, [wMapGroup] @@ -2128,7 +2122,7 @@ GetAnyMapBlocksBank:: pop hl ret -GetMapAttributesPointer:: ; 0x2c7d +GetMapAttributesPointer:: ; returns the current map's data pointer in hl. push bc push de @@ -2172,7 +2166,7 @@ GetAnyMapTileset:: ld a, c ret -GetWorldMapLocation:: ; 0x2caf +GetWorldMapLocation:: ; given a map group/id in bc, return its location on the Pokégear map. push hl push de @@ -2186,7 +2180,6 @@ GetWorldMapLocation:: ; 0x2caf pop de pop hl ret -; 0x2cbd GetMapMusic:: push hl diff --git a/home/math.asm b/home/math.asm index 21582b8f6..4a1711343 100644 --- a/home/math.asm +++ b/home/math.asm @@ -1,4 +1,4 @@ -AddNTimes:: ; 0x30fe +AddNTimes:: ; Add bc * a to hl. and a ret z @@ -7,7 +7,6 @@ AddNTimes:: ; 0x30fe dec a jr nz, .loop ret -; 0x3105 SimpleMultiply:: ; Return a * c. diff --git a/home/menu.asm b/home/menu.asm index 976292291..dd8442cb7 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -13,7 +13,6 @@ CopyMenuHeader:: ld a, [hROMBank] ld [wMenuDataBank], a ret -; 0x1d4b StoreTo_wMenuCursorBuffer:: ld [wMenuCursorBuffer], a @@ -109,7 +108,6 @@ CopyNameFromMenu:: pop bc pop hl ret -; 0x1dcf YesNoBox:: @@ -246,7 +244,6 @@ MenuWriteText:: pop af ld [hOAMUpdate], a ret -; 0x1ea6 AutomaticGetMenuBottomCoord:: ld a, [wMenuBorderLeftCoord] @@ -505,7 +502,6 @@ PlayClickSFX:: call PlaySFX pop de ret -; 0x2012 MenuTextBoxWaitButton:: call MenuTextBox diff --git a/home/menu_window.asm b/home/menu_window.asm index 2800d19ca..c279b8c56 100644 --- a/home/menu_window.asm +++ b/home/menu_window.asm @@ -2,17 +2,17 @@ PushWindow:: callfar _PushWindow ret -ExitMenu:: ; 0x1c07 +ExitMenu:: push af callfar _ExitMenu pop af ret -InitVerticalMenuCursor:: ; 0x1c10 +InitVerticalMenuCursor:: callfar _InitVerticalMenuCursor ret -CloseWindow:: ; 0x1c17 +CloseWindow:: push af call ExitMenu call ApplyTilemap @@ -20,15 +20,14 @@ CloseWindow:: ; 0x1c17 pop af ret -RestoreTileBackup:: ; 0x1c23 +RestoreTileBackup:: call MenuBoxCoord2Tile call .copy call MenuBoxCoord2Attr call .copy ret -; 0x1c30 -.copy ; 0x1c30 +.copy call GetMenuBoxDims inc b inc c @@ -53,7 +52,7 @@ RestoreTileBackup:: ; 0x1c23 ret -PopWindow:: ; 0x1c47 +PopWindow:: ld b, $10 ld de, wMenuFlags .loop @@ -64,7 +63,7 @@ PopWindow:: ; 0x1c47 jr nz, .loop ; 0x1c50 $fa ret -GetMenuBoxDims:: ; 0x1c53 +GetMenuBoxDims:: ld a, [wMenuBorderTopCoord] ; top ld b, a ld a, [wMenuBorderBottomCoord] ; bottom @@ -76,7 +75,6 @@ GetMenuBoxDims:: ; 0x1c53 sub c ld c, a ret -; 0x1c66 CopyMenuData:: push hl diff --git a/home/print_bcd.asm b/home/print_bcd.asm index 89dbeffd5..4f93c866f 100644 --- a/home/print_bcd.asm +++ b/home/print_bcd.asm @@ -48,7 +48,6 @@ PrintBCDNumber:: inc hl .done ret -; 0x38f2 PrintBCDDigit:: and %00001111 @@ -78,4 +77,3 @@ PrintBCDDigit:: ld a, " " ld [hli], a ; if right-aligned, "print" a space by advancing the pointer ret -; 0x3917 diff --git a/home/print_text.asm b/home/print_text.asm index 6002affd6..8a8a7dd9f 100644 --- a/home/print_text.asm +++ b/home/print_text.asm @@ -97,7 +97,6 @@ CopyDataUntil:: cp c jr nz, CopyDataUntil ret -; 0x3198 PrintNum:: homecall _PrintNum diff --git a/home/sprite_updates.asm b/home/sprite_updates.asm index c0129d5ca..d263363a6 100644 --- a/home/sprite_updates.asm +++ b/home/sprite_updates.asm @@ -1,4 +1,4 @@ -DisableSpriteUpdates:: ; 0x2ed3 +DisableSpriteUpdates:: xor a ld [hMapAnims], a ld a, [wVramState] @@ -7,7 +7,6 @@ DisableSpriteUpdates:: ; 0x2ed3 ld a, $0 ld [wSpriteUpdatesEnabled], a ret -; 0x2ee4 EnableSpriteUpdates:: ld a, $1 diff --git a/home/text.asm b/home/text.asm index 7f07d0813..ceb249c4e 100644 --- a/home/text.asm +++ b/home/text.asm @@ -284,7 +284,6 @@ ENDM ld [hli], a call PrintLetterDelay jp NextChar -; 0x117b DayOfWeekChar:: @@ -399,7 +398,6 @@ PlaceCommandCharacter:: ld l, c pop de jp NextChar -; 0x1273 TMCharText:: db "TM@" TrainerCharText:: db "TRAINER@" @@ -480,7 +478,6 @@ LineChar:: hlcoord TEXTBOX_INNERX, TEXTBOX_INNERY + 2 push hl jp NextChar -; 0x12f2 Paragraph:: push de diff --git a/home/tilemap.asm b/home/tilemap.asm index 4ed05155a..711118ae0 100644 --- a/home/tilemap.asm +++ b/home/tilemap.asm @@ -9,7 +9,7 @@ WaitBGMap:: call DelayFrames ret -WaitBGMap2:: ; 0x3200 +WaitBGMap2:: ld a, [hCGB] and a jr z, .bg0 @@ -25,7 +25,6 @@ WaitBGMap2:: ; 0x3200 ld c, 4 call DelayFrames ret -; 0x3218 IsCGB:: ld a, [hCGB] |