diff options
author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-05 16:15:47 -0400 |
---|---|---|
committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-05 16:15:47 -0400 |
commit | 8871f4b611ec2c8a7f65592bf0b990182db7ec99 (patch) | |
tree | 51ef6b03e87c12d4045ca2135a315e0194a75507 | |
parent | 054e6088f9ed3995671fa294771cb11640551814 (diff) |
Identify more unnamed labels
-rw-r--r-- | engine/battle/ai/items.asm | 9 | ||||
-rw-r--r-- | engine/battle/battle_transition.asm | 4 | ||||
-rw-r--r-- | engine/battle/core.asm | 2 | ||||
-rw-r--r-- | engine/battle_anims/anim_commands.asm | 10 | ||||
-rw-r--r-- | engine/events/npc_trade.asm | 4 | ||||
-rw-r--r-- | engine/games/slot_machine.asm | 13 | ||||
-rw-r--r-- | engine/gfx/color.asm | 9 | ||||
-rw-r--r-- | engine/items/tmhm.asm | 4 | ||||
-rw-r--r-- | engine/movie/splash.asm | 2 | ||||
-rw-r--r-- | engine/overworld/map_objects.asm | 10 | ||||
-rw-r--r-- | engine/phone/phone.asm | 2 | ||||
-rw-r--r-- | engine/pokegear/pokegear.asm | 2 | ||||
-rw-r--r-- | engine/pokemon/stats_screen.asm | 3 | ||||
-rw-r--r-- | engine/rtc/print_hours_mins.asm | 1 |
14 files changed, 44 insertions, 31 deletions
diff --git a/engine/battle/ai/items.asm b/engine/battle/ai/items.asm index 7b4f2f47..e11643cd 100644 --- a/engine/battle/ai/items.asm +++ b/engine/battle/ai/items.asm @@ -746,7 +746,14 @@ EnemyUsedDireHit: ld a, DIRE_HIT jp PrintText_UsedItemOn_AND_AIUpdateHUD -Function38510: ; unreferenced +AICheckEnemyFractionMaxHP: ; unreferenced +; Input: a = divisor +; Work: bc = [wEnemyMonMaxHP] / a +; Work: de = [wEnemyMonHP] +; Output: +; - c, nz if [wEnemyMonHP] > [wEnemyMonMaxHP] / a +; - nc, z if [wEnemyMonHP] = [wEnemyMonMaxHP] / a +; - nc, nz if [wEnemyMonHP] < [wEnemyMonMaxHP] / a ldh [hDivisor], a ld hl, wEnemyMonMaxHP ld a, [hli] diff --git a/engine/battle/battle_transition.asm b/engine/battle/battle_transition.asm index cc324922..8217edcb 100644 --- a/engine/battle/battle_transition.asm +++ b/engine/battle/battle_transition.asm @@ -737,9 +737,9 @@ ENDM jr nz, .row ret -Function8ca53: ; unreferenced +UnusedWaitBGMapOnce: ; unreferenced ld a, 1 - ldh [hBGMapMode], a + ldh [hBGMapMode], a ; redundant call WaitBGMap xor a ldh [hBGMapMode], a diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 9fcf1f38..a7524172 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -7875,7 +7875,7 @@ InitEnemyWildmon: predef PlaceGraphic ret -Function3f41a: ; unreferenced +FillEnemyMovesFromMoveIndicesBuffer: ; unreferenced ld hl, wEnemyMonMoves ld de, wListMoves_MoveIndicesBuffer ld b, NUM_MOVES diff --git a/engine/battle_anims/anim_commands.asm b/engine/battle_anims/anim_commands.asm index 61fa7fb9..a309ae2f 100644 --- a/engine/battle_anims/anim_commands.asm +++ b/engine/battle_anims/anim_commands.asm @@ -189,16 +189,18 @@ ClearActorHud: call ClearBox ret -Functioncc1ff: ; unreferenced +PlaceWindowOverBattleTextbox: ; unreferenced xor a ldh [hBGMapMode], a - ld a, LOW(vBGMap0 tile $28) + ; bgcoord hBGMapAddress, 0, 20 + ld a, LOW(vBGMap0 + 20 * BG_MAP_WIDTH) ldh [hBGMapAddress], a - ld a, HIGH(vBGMap0 tile $28) + ld a, HIGH(vBGMap0 + 20 * BG_MAP_WIDTH) ldh [hBGMapAddress + 1], a call WaitBGMap2 - ld a, $60 + ld a, (SCREEN_HEIGHT - TEXTBOX_HEIGHT) * TILE_WIDTH ldh [hWY], a + ; bgcoord hBGMapAddress, 0, 0 xor a ; LOW(vBGMap0) ldh [hBGMapAddress], a ld a, HIGH(vBGMap0) diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm index f410c28d..d4e450c2 100644 --- a/engine/events/npc_trade.asm +++ b/engine/events/npc_trade.asm @@ -283,14 +283,14 @@ CopyTradeName: call CopyBytes ret -Functionfcbc7: ; unreferenced +Trade_CopyFourCharString: ; unreferenced ld bc, 4 call CopyBytes ld a, "@" ld [de], a ret -Functionfcbd1: ; unreferenced +Trade_CopyThreeCharString: ; unreferenced ld bc, 3 call CopyBytes ld a, "@" diff --git a/engine/games/slot_machine.asm b/engine/games/slot_machine.asm index a0d99629..68a56bbc 100644 --- a/engine/games/slot_machine.asm +++ b/engine/games/slot_machine.asm @@ -229,8 +229,7 @@ SlotsLoop: call PrintNum ret -Function92d7a: ; unreferenced -; debug function? +DebugPrintSlotBias: ; unreferenced ld a, [wSlotBias] add 0 daa @@ -247,8 +246,8 @@ Function92d7a: ; unreferenced ld [hl], a ret -Function92d95: ; unreferenced -; animate OAM tiles? +AnimateSlotReelIcons: ; unreferenced +; This animation was present in pokegold-spaceworld. ld hl, wce66 ld a, [hl] inc [hl] @@ -258,7 +257,7 @@ Function92d95: ; unreferenced ld c, NUM_SPRITE_OAM_STRUCTS - 16 .loop ld a, [hl] - xor %00100000 + xor $20 ; alternate between $00-$1f and $20-$3f ld [hli], a ; tile id rept SPRITEOAMSTRUCT_LENGTH - 1 inc hl @@ -844,7 +843,9 @@ Slots_UpdateReelPositionAndOAM: jr nz, .loop ret -Function93127: ; unreferenced +GetUnknownSlotReelData: ; unreferenced +; Used to get OAM attribute values for slot reels? +; (final Slots_UpdateReelPositionAndOAM above reuses tile IDs as OAM palettes) push hl srl a srl a diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 454a2f08..c6ce55aa 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -646,12 +646,13 @@ GetMonPalettePointer: call _GetMonPalettePointer ret -Function9be8: ; unreferenced +CGBCopyBattleObjectPals: ; unreferenced +; dummied out ret call CheckCGB ret z ld hl, BattleObjectPals - ld a, $90 + ld a, (1 << rOBPI_AUTO_INCREMENT) | $10 ldh [rOBPI], a ld c, 6 palettes .loop @@ -671,7 +672,7 @@ INCLUDE "gfx/battle_anims/battle_anims.pal" Function9c39: ; unreferenced call CheckCGB ret z - ld a, $90 + ld a, (1 << rOBPI_AUTO_INCREMENT) | $10 ldh [rOBPI], a ld a, PREDEFPAL_TRADE_TUBE call GetPredefPal @@ -869,7 +870,7 @@ _InitSGBBorderPals: dw DataSndPacket7 dw DataSndPacket8 -Function9d70: ; unreferenced +UpdateSGBBorder: ; unreferenced di xor a ldh [rJOYP], a diff --git a/engine/items/tmhm.asm b/engine/items/tmhm.asm index 4fe6876d..bc6f94c6 100644 --- a/engine/items/tmhm.asm +++ b/engine/items/tmhm.asm @@ -483,7 +483,7 @@ TMHM_PlaySFX_ReadText2: pop de ret -Function2c8e4: ; unreferenced +VerboseReceiveTMHM: ; unreferenced call ConvertCurItemIntoCurTMHM call .CheckHaveRoomForTMHM ld hl, .NoRoomTMHMText @@ -509,7 +509,7 @@ Function2c8e4: ; unreferenced add hl, bc ld a, [hl] inc a - cp NUM_TMS * 2 + cp MAX_ITEM_STACK + 1 ret nc ld [hl], a ret diff --git a/engine/movie/splash.asm b/engine/movie/splash.asm index 903ec4ea..1e74d9b8 100644 --- a/engine/movie/splash.asm +++ b/engine/movie/splash.asm @@ -136,7 +136,7 @@ GameFreakPresents_NextScene: inc [hl] ret -Functione4a8d: ; unreferenced +GameFreakPresents_Wait64Frames: ; unreferenced ld c, 64 call DelayFrames call GameFreakPresents_NextScene diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index d163c1d1..81ad8d62 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -26,7 +26,7 @@ DeleteMapObject:: pop bc ret -Function437c: +HandleObjectStep: call .CheckObjectStillVisible ret c call .HandleStepType @@ -609,7 +609,7 @@ MapObjectMovementPattern: ret .ObeyDPad: - ld hl, Function4fa8 + ld hl, ApplyPlayerMovementByte jp HandleMovementData .Movement08: @@ -630,7 +630,7 @@ MapObjectMovementPattern: jp _GetMovementObject .Movement0d: - ld hl, Function4fa8 + ld hl, ApplyPlayerMovementByte jp HandleMovementData .Movement0e: @@ -1791,7 +1791,7 @@ UpdateJumpPosition: db -4, -6, -8, -10, -11, -12, -12, -12 db -11, -10, -9, -8, -6, -4, 0, 0 -Function4fa8: ; unscripted? +ApplyPlayerMovementByte: ; copy [wPlayerNextMovement] to [wPlayerMovement] ld a, [wPlayerNextMovement] ld hl, wPlayerMovement @@ -2380,7 +2380,7 @@ HandleNPCStep:: ldh [hMapObjectIndexBuffer], a call DoesObjectHaveASprite jr z, .next - call Function437c + call HandleObjectStep .next ld hl, OBJECT_LENGTH add hl, bc diff --git a/engine/phone/phone.asm b/engine/phone/phone.asm index e94ed412..00cbec75 100644 --- a/engine/phone/phone.asm +++ b/engine/phone/phone.asm @@ -529,7 +529,7 @@ Phone_CallEnd: call HangUp_Wait20Frames ret -Function9030a: +HangUp_ShutDown: ; unreferenced ld de, SFX_SHUT_DOWN_PC call PlaySFX ret diff --git a/engine/pokegear/pokegear.asm b/engine/pokegear/pokegear.asm index e7ffe340..998cb589 100644 --- a/engine/pokegear/pokegear.asm +++ b/engine/pokegear/pokegear.asm @@ -2724,7 +2724,7 @@ INCBIN "gfx/pokegear/dexmap_nest_icon.2bpp" FlyMapLabelBorderGFX: INCBIN "gfx/pokegear/flymap_label_border.1bpp" -Function92264: +Function92264: ; unreferenced xor a ld [wTownMapPlayerIconLandmark], a call ClearBGPalettes diff --git a/engine/pokemon/stats_screen.asm b/engine/pokemon/stats_screen.asm index d1bc4172..b53a2622 100644 --- a/engine/pokemon/stats_screen.asm +++ b/engine/pokemon/stats_screen.asm @@ -512,7 +512,8 @@ LoadPinkPage: .PkrsStr: db "#RUS@" -Function50f4d: ; unreferenced +StatsScreen_PlaceVerticalDivider: ; unreferenced +; The Japanese stats screen has a vertical divider. hlcoord 7, 0 ld bc, SCREEN_WIDTH ld d, SCREEN_HEIGHT diff --git a/engine/rtc/print_hours_mins.asm b/engine/rtc/print_hours_mins.asm index 4efd461a..149e8cb1 100644 --- a/engine/rtc/print_hours_mins.asm +++ b/engine/rtc/print_hours_mins.asm @@ -1,4 +1,5 @@ Function1c0a0d: ; unreferenced +; Debug function? ld a, b ld b, c ld c, a |