summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/battle_anims/bg_effects.asm25
-rwxr-xr-xengine/dumps/bank03.asm4
-rw-r--r--engine/intro.asm2
-rw-r--r--engine/math/math.asm3
-rw-r--r--engine/menu/debug_menu.asm4
-rw-r--r--engine/menu/main_menu.asm2
-rw-r--r--engine/menu/set_time.asm2
-rw-r--r--engine/menu/start_menu.asm5
-rw-r--r--engine/menu/text_entry.asm10
-rw-r--r--engine/title.asm56
-rw-r--r--engine/unknown11d32.asm2
11 files changed, 38 insertions, 77 deletions
diff --git a/engine/battle_anims/bg_effects.asm b/engine/battle_anims/bg_effects.asm
index 0ffe425..1119e1a 100644
--- a/engine/battle_anims/bg_effects.asm
+++ b/engine/battle_anims/bg_effects.asm
@@ -174,7 +174,6 @@ BattleBGEffect_FlashInverted:
.inverted
db %11100100
db %00011011
-; c80f3
BattleBGEffect_FlashWhite:
ld de, .white
@@ -184,7 +183,6 @@ BattleBGEffect_FlashWhite:
.white
db %11100100
db %00000000
-; c80fb
BattleBGEffect_FlashContinue:
; current timer, flash duration, number of flashes
@@ -240,7 +238,6 @@ BattleBGEffect_WhiteHues:
db %11100000
db %11010000
db -1
-; c8141
BattleBGEffect_BlackHues:
ld de, .Pals
@@ -258,7 +255,6 @@ BattleBGEffect_BlackHues:
db %11110100
db %11111000
db -1
-; c8155
BattleBGEffect_AlternateHues:
ld de, .Pals
@@ -282,7 +278,6 @@ BattleBGEffect_AlternateHues:
db %01000000
db %10010000
db -2
-; c8171
BattleBGEffect_06:
call BattleBGEffects_CheckSGB
@@ -306,7 +301,6 @@ BattleBGEffect_06:
db %11110000
db %11000000
db -2
-; c818b
BattleBGEffect_07:
call BattleBGEffects_CheckSGB
@@ -330,7 +324,6 @@ BattleBGEffect_07:
db %11110000
db %11001100
db -2
-; c81a5
BattleBGEffect_08:
ld de, .Pals
@@ -343,7 +336,6 @@ BattleBGEffect_08:
db %01100011
db %10000111
db -2
-; c81b3
BattleBGEffect_HideMon:
call BattleBGEffects_AnonJumptable
@@ -409,7 +401,6 @@ BattleBGEffect_ShowMon:
.EnemyData:
db 3, $00, 3
db -1
-; c8214
BattleBGEffect_FeetFollow:
call BattleBGEffects_AnonJumptable
@@ -664,7 +655,6 @@ BattleBGEffect_EnterMon:
db 4, $00, 4
db 3, $00, 3
db -1
-; c83a8
BattleBGEffect_ReturnMon:
call BGEffect_CheckBattleTurn
@@ -700,7 +690,6 @@ BattleBGEffect_ReturnMon:
db -2, $33, 5
db -3, $00, 0
db -1
-; c83ed
BattleBGEffect_RunPicResizeScript:
call BattleBGEffects_AnonJumptable
@@ -903,7 +892,6 @@ ENDM
db $00, $15, $2a
db $03, $18, $2d
db $06, $1b, $30
-; c8545
BattleBGEffect_Surf:
call BattleBGEffects_AnonJumptable
@@ -1764,7 +1752,6 @@ BattleBGEffect_2a:
.data
db $00, $40, $90, $e4
db -1
-; c8acc
BattleBGEffect_2b:
call BattleBGEffects_AnonJumptable
@@ -1892,7 +1879,6 @@ BattleBGEffect_1c:
db $90, $f8
db $40, $fc
db $90, $f8
-; c8be8
BattleBGEffect_RapidFlash:
ld de, .FlashPals
@@ -1901,7 +1887,6 @@ BattleBGEffect_RapidFlash:
.FlashPals:
db $e4, $6c, $fe
-; c8bf2
BattleBGEffect_16:
ld de, .Pals
@@ -1910,7 +1895,6 @@ BattleBGEffect_16:
.Pals:
db $e4, $90, $40, $ff
-; c8bfd
BattleBGEffect_17:
ld de, .Pals
@@ -1919,7 +1903,6 @@ BattleBGEffect_17:
.Pals:
db $e4, $f8, $fc, $ff
-; c8c08
BattleBGEffect_18:
ld de, .Pals
@@ -1928,7 +1911,6 @@ BattleBGEffect_18:
.Pals:
db $e4, $90, $40, $90, $fe
-; c8c14
BattleBGEffect_19:
ld de, .Pals
@@ -1937,7 +1919,6 @@ BattleBGEffect_19:
.Pals:
db $e4, $f8, $fc, $f8, $fe
-; c8c20
BattleBGEffect_1a:
ld de, .Pals
@@ -1946,7 +1927,6 @@ BattleBGEffect_1a:
.Pals:
db $e4, $f8, $fc, $f8, $e4, $90, $40, $90, $fe
-; c8c30
BattleBGEffect_1b:
ld de, .Pals
@@ -1955,7 +1935,6 @@ BattleBGEffect_1b:
.Pals:
db $e4, $fc, $e4, $00, $fe
-; c8c3c
BattleBGEffect_1d:
ld de, .Pals
@@ -1964,7 +1943,6 @@ BattleBGEffect_1d:
.Pals:
db $e4, $90, $40, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $40, $90, $e4, $ff
-; c8c55
BattleBGEffect_1e:
ld de, .Pals
@@ -1973,7 +1951,6 @@ BattleBGEffect_1e:
.Pals:
db $00, $40, $90, $e4, $ff
-; c8c61
BattleBGEffect_2e:
call Functionc8d0b
@@ -2372,5 +2349,3 @@ BattleBGEffects_Cosine:
callab BattleAnim_Cosine_e
ld a, e
ret
-
-; c906f (32:506f)
diff --git a/engine/dumps/bank03.asm b/engine/dumps/bank03.asm
index bef8017..8ea4aa5 100755
--- a/engine/dumps/bank03.asm
+++ b/engine/dumps/bank03.asm
@@ -17,8 +17,6 @@ Functionc77d:
ld e, a
ret
-; 03:4791
-
SECTION "engine/dumps/bank03.asm@SpawnPoints", ROMX
; Map, Warp ID
SpawnPoints:
@@ -115,8 +113,6 @@ SpawnPoints:
db $ff, $ff
db $ff, $ff
-; 03:488d
-
SECTION "engine/dumps/bank03.asm@Functionc9c1", ROMX
diff --git a/engine/intro.asm b/engine/intro.asm
index c7e5494..740f148 100644
--- a/engine/intro.asm
+++ b/engine/intro.asm
@@ -796,5 +796,3 @@ GameStartSprites:
db $50, $50, $01
db $58, $48, $02
db $58, $50, $03
-
-; 5D8C
diff --git a/engine/math/math.asm b/engine/math/math.asm
index 750ada8..ae02e77 100644
--- a/engine/math/math.asm
+++ b/engine/math/math.asm
@@ -86,8 +86,6 @@ _Multiply::
ldh [hProduct + 0], a
ret
-; 6870
-
_Divide::
xor a
@@ -197,4 +195,3 @@ _Divide::
ldh [hDividend + 0], a
ret
-; 68f3
diff --git a/engine/menu/debug_menu.asm b/engine/menu/debug_menu.asm
index b9b3081..e33d61c 100644
--- a/engine/menu/debug_menu.asm
+++ b/engine/menu/debug_menu.asm
@@ -2,7 +2,7 @@ INCLUDE "constants.asm"
SECTION "engine/menu/debug_menu.asm", ROMX
-DebugMenu:: ; $4031
+DebugMenu::
call ClearTileMap
call ClearWindowData
call LoadFont
@@ -105,5 +105,3 @@ DebugMenuOptionName::
ld a, $e4
ldh [rBGP], a
jp DebugMenu
-
-; 40FD
diff --git a/engine/menu/main_menu.asm b/engine/menu/main_menu.asm
index c5c19d0..fca2b96 100644
--- a/engine/menu/main_menu.asm
+++ b/engine/menu/main_menu.asm
@@ -292,5 +292,3 @@ StartNewGame::
jp z, DemoStart
call DebugSetUpPlayer
jp IntroCleanup
-
-; 558D
diff --git a/engine/menu/set_time.asm b/engine/menu/set_time.asm
index 15e40dc..ab00280 100644
--- a/engine/menu/set_time.asm
+++ b/engine/menu/set_time.asm
@@ -79,5 +79,3 @@ Textdbb6c:
deciram wStartMinute, 1, 2
text "　ふん？"
done
-
-; 36:7b98
diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm
index 5b91246..299606f 100644
--- a/engine/menu/start_menu.asm
+++ b/engine/menu/start_menu.asm
@@ -345,7 +345,6 @@ DrawBackpack:
call DrawTextBox
ret
-; 04:600C
ld hl, wVramState
set 0, [hl]
call ExitMenu
@@ -993,7 +992,7 @@ PartyHeldItem:
call .PartyTryRecieveItem
call CloseWindow
jr .jump
-.close; 04:65B3
+.close
call CloseWindow
.jump
jp HandleSelectedPokemon
@@ -1175,7 +1174,7 @@ ItemPrompt6753:
dw wcd11
text "は　@"
-.UnusedText5; 04:675A
+.UnusedText5:
db 1
dw wStringBuffer1
text "を"
diff --git a/engine/menu/text_entry.asm b/engine/menu/text_entry.asm
index 4f4b9ee..14dbc85 100644
--- a/engine/menu/text_entry.asm
+++ b/engine/menu/text_entry.asm
@@ -206,8 +206,8 @@ GetNamingScreenSetup:
ret
NamingScreen_InitText:
-; fills the tilemap with ■, then clears a 12x17 box at 1,1
-; next it places the tiles at 04:58B3 onto the screen at 2,9 (tiles form an 11x8 box)
+; fills the tilemap with "■", then clears a 12x17 box at 1,1
+; next it places the tiles at TextEntryChars in a 11x8 box at 2,9
call WaitForAutoBgMapTransfer
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
@@ -437,7 +437,7 @@ NamingScreenJoypadLoop:
LetterOffsetsTable1:
db $00, $08, $10, $18, $20, $30, $38, $40, $48, $50, $60, $68, $70, $78, $80
-LetterOffsetsTable2:; 04:56ED
+LetterOffsetsTable2:
db $00, $08, $10, $18, $20, $28, $30, $38
NamingScreenTryAddCharacter:
@@ -701,7 +701,7 @@ ComposeMailMessage:
ldh [hMapAnims], a
ret
-.firstruncheck; 04:5A1B
+.firstruncheck
ld hl, wFlyDestination
ld a, [hl]
and 1
@@ -863,7 +863,7 @@ DoMailEntry:
inc [hl]
ret
-.processjoypad; 04:5B51
+.processjoypad
ld hl, hJoypadSum
ld a, [hl]
and A_BUTTON
diff --git a/engine/title.asm b/engine/title.asm
index 11f80a0..df47646 100644
--- a/engine/title.asm
+++ b/engine/title.asm
@@ -3,22 +3,22 @@ INCLUDE "constants.asm"
SECTION "engine/title.asm@Title screen", ROMX
IntroSequence::
- callab GameFreakIntro ; Bank $39
+ callab GameFreakIntro
jr c, TitleSequenceStart
ld a, [wTitleSequenceOpeningType]
and a
jr z, .opening_sequence
.pikachu_minigame
- callab PikachuMiniGame ; Bank $38
+ callab PikachuMiniGame
jr TitleSequenceStart
.opening_sequence
- callab OpeningCutscene ; Bank $39
+ callab OpeningCutscene
TitleSequenceStart::
call TitleSequenceInit
- callab SetTitleBGDecorationBorder ; Bank $02
+ callab SetTitleBGDecorationBorder
.loop
call TitleScreenMain
@@ -57,14 +57,14 @@ TitleSequenceInit::
ldh [hSCY], a
ldh [hSCX], a
- ld de, MUSIC_NONE ; Stop the music.
+ ld de, MUSIC_NONE
call PlayMusic
call ClearTileMap
call DisableLCD
call ClearSprites
- callba InitEffectObject ; Bank $23
+ callba InitEffectObject
ld hl, vChars0
ld bc, vBGMap0 - vChars0
@@ -127,10 +127,10 @@ TitleSequenceInit::
xor a
ldh [hBGMapMode], a
ld hl, wJumptableIndex
- ld [hli], a ; (Possibly wJumptableIndex from Crystal)
- ld [hli], a ; (Possibly wIntroSceneFrameCounter from Crystal)
- ld [hli], a ; (Possibly wTitleScreenTimer from Crystal)
- ld [hl], a ; (Possibly wTitleScreenTimer + 1 from Crystal)
+ ld [hli], a ; (Possibly wJumptableIndex from Crystal)
+ ld [hli], a ; (Possibly wIntroSceneFrameCounter from Crystal)
+ ld [hli], a ; (Possibly wTitleScreenTimer from Crystal)
+ ld [hl], a ; (Possibly wTitleScreenTimer + 1 from Crystal)
call .load_position_table
@@ -143,7 +143,7 @@ TitleSequenceInit::
.load_position_table:
ld hl, FirePositionTable
- ld c, 6 ; Load 6 flying objects on the screen.
+ ld c, 6 ; Load 6 flying objects on the screen.
.set_fire_note_loop
push bc
@@ -152,7 +152,7 @@ TitleSequenceInit::
ld d, [hl]
inc hl
push hl
- ld a, $2E ; Title fire/note object effect type?
+ ld a, $2E ; Title fire/note object effect type?
call InitSpriteAnimStruct
pop hl
pop bc
@@ -168,15 +168,15 @@ FirePositionTable::
dw $7CB0
dw $8800
-TitleFireGFX:: INCBIN "gfx/title/fire.2bpp" ; 5EB8-5F37
-TitleNotesGFX:: INCBIN "gfx/title/notes.2bpp" ; 5F38=5FB7
+TitleFireGFX:: INCBIN "gfx/title/fire.2bpp"
+TitleNotesGFX:: INCBIN "gfx/title/notes.2bpp"
TitleScreenMain::
ld a, [wJumptableIndex]
bit 7, a
jr nz, .exit
call TitleScreenSequence
- callba EffectObjectJumpNoDelay ; Bank $23
+ callba EffectObjectJumpNoDelay
call DelayFrame
and a
ret
@@ -267,8 +267,8 @@ TitleSeq_LoadPokemonLogo::
TitleSeq_Start::
call TitleSeq_IncreaseJumpTableIndex
push de
- ld de, $002D
- call PlaySFX ; Play "Swish" sound
+ ld de, $2D ; "swish" sound
+ call PlaySFX
pop de
ld a, $80
ld [wJumptableIndex + 2], a
@@ -304,7 +304,7 @@ TitleSeq_MoveTitleEnd::
ldh [hLCDCPointer], a
call TitleSeq_IncreaseJumpTableIndex
ld de, MUSIC_TITLE
- call PlayMusic ; Play "Title Theme"
+ call PlayMusic
ret
TitleSeq_InitFlashTitle::
@@ -384,7 +384,7 @@ TitleSeq_PressButtonInit::
ld hl, wJumptableIndex
inc [hl]
ld hl, wJumptableIndex + 2
- ld de, DecodeNybble0Table - 3 ; DecodeNybble0Table - 3 = $0C00
+ ld de, DecodeNybble0Table - 3
ld [hl], e
inc hl
ld [hl], d
@@ -404,23 +404,25 @@ TitleSeq_TitleScreenInputAndTimeout::
ld [hl], e
call GetJoypad
ld hl, hJoyState
+; UP + B + SELECT opens the SRAM clear screen
ld a, [hl]
- and D_UP | B_BUTTON | SELECT ; UP + B + SELECT brings you to the SRAM clear screen.
+ and D_UP | B_BUTTON | SELECT
cp D_UP | B_BUTTON | SELECT
jr z, .psbtn_sramclear
+; SELECT opens the debug menu
ld a, [hl]
- and SELECT ; SELECT will bring you to the debug menu.
+ and SELECT
jr nz, .psbtn_gotodebug
ld a, [hl]
and $09
ret z
.psbtn_play
- ld a, $00 ; MainMenu
+ ld a, $00 ; MainMenu
jr .psbtn_nextseq
.psbtn_gotodebug
- ld a, $01 ; DebugMenu
+ ld a, $01 ; DebugMenu
jr .psbtn_nextseq
.psbtn_sramclear
@@ -538,7 +540,7 @@ SRAMClearMenu::
cp $01
jp z, Init
- callab InitAllSRAMBanks ; Bank $05
+ callab InitAllSRAMBanks
jp Init
SRAMClear_Message::
@@ -570,9 +572,9 @@ IntroCopyRightInfo::
jp PlaceString
IntroCopyRightInfo_Text::
- db $60, $61, $62, $63, $6D, $6E, $6F, $70, $71, $72, $4E ; "(C)1997 Nintendo\n"
- db $60, $61, $62, $63, $73, $74, $75, $76, $77, $78, $6B, $6C, $4E ; "(C)1997 Creatures Inc.\n"
- db $60, $61, $62, $63, $64, $65, $66, $67, $68, $69, $6A, $6B, $6C, $50 ; "(C)1997 GAME FREAK Inc.{EOL}"
+ db $60, $61, $62, $63, $6D, $6E, $6F, $70, $71, $72, $4E ; "ⓒ1997 Nintendo\n"
+ db $60, $61, $62, $63, $73, $74, $75, $76, $77, $78, $6B, $6C, $4E ; "ⓒ1997 Creatures Inc.\n"
+ db $60, $61, $62, $63, $64, $65, $66, $67, $68, $69, $6A, $6B, $6C, $50 ; "ⓒ1997 GAME FREAK Inc.\0"
Set_HoOh::
coord hl, 7, 9
diff --git a/engine/unknown11d32.asm b/engine/unknown11d32.asm
index 0a806e4..01eed07 100644
--- a/engine/unknown11d32.asm
+++ b/engine/unknown11d32.asm
@@ -18,7 +18,7 @@ Unknown11d32:
jr nz, .rightJump
ret
-.rightJump; 04:5D4A
+.rightJump
ld hl, $000C
add hl, bc
ld a, [hl]
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-25 12:49:19 +0000