diff options
| -rw-r--r-- | engine/items/item_effects.asm | 4 | ||||
| -rw-r--r-- | engine/overworld/scripting.asm | 2 | ||||
| -rw-r--r-- | home/audio.asm | 5 | ||||
| -rw-r--r-- | home/map.asm | 2 | ||||
| -rw-r--r-- | home/map_objects.asm | 4 | ||||
| -rw-r--r-- | home/menu.asm | 2 | ||||
| -rw-r--r-- | hram.asm | 2 | ||||
| -rw-r--r-- | maps/Route27.asm | 8 | ||||
| -rw-r--r-- | maps/RuinsOfAlphOutside.asm | 8 | ||||
| -rw-r--r-- | sram.asm | 2 |
10 files changed, 19 insertions, 20 deletions
diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index ce873ff29..4de0fc3bc 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1241,7 +1241,7 @@ StatStrings: GetStatExpRelativePointer: ld a, [wCurItem] - ld hl, Table_eeeb + ld hl, StatExpItemPointerOffsets .next cp [hl] inc hl @@ -1255,7 +1255,7 @@ GetStatExpRelativePointer: ld b, 0 ret -Table_eeeb: +StatExpItemPointerOffsets: db HP_UP, MON_HP_EXP - MON_STAT_EXP db PROTEIN, MON_ATK_EXP - MON_STAT_EXP db IRON, MON_DEF_EXP - MON_STAT_EXP diff --git a/engine/overworld/scripting.asm b/engine/overworld/scripting.asm index 5f93ab396..5104ba92b 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -961,7 +961,7 @@ Script_variablesprite: Script_appear: call GetScriptByte call GetScriptObject - call _CopyObjectStruct + call UnmaskCopyMapObjectStruct ldh a, [hMapObjectIndexBuffer] ld b, 0 ; clear call ApplyEventActionAppearDisappear diff --git a/home/audio.asm b/home/audio.asm index d9e04dd92..c2d60adb0 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -467,9 +467,8 @@ GetMapMusic_MaybeSpecial:: call GetMapMusic ret -Function3d9f:: ; unreferenced -; Places a BCD number at the -; upper center of the screen. +PlaceBCDNumberSprite:: ; unreferenced +; Places a BCD number at the upper center of the screen. ld a, 4 * TILE_WIDTH ld [wVirtualOAMSprite38YCoord], a ld [wVirtualOAMSprite39YCoord], a diff --git a/home/map.asm b/home/map.asm index b2bf2bc9f..dfebff9b7 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1312,7 +1312,7 @@ UpdateBGMapColumn:: ldh [hBGMapTileCount], a ret -Function2816:: ; unreferenced +ClearBGMapBuffer:: ; unreferenced ld hl, wBGMapBuffer ld bc, wBGMapBufferEnd - wBGMapBuffer xor a diff --git a/home/map_objects.asm b/home/map_objects.asm index 94a33f032..d91b2ab84 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -300,13 +300,13 @@ CheckObjectTime:: scf ret -; unused +CopyMapObjectStruct:: ; unreferenced ldh [hMapObjectIndexBuffer], a call GetMapObject call CopyObjectStruct ret -_CopyObjectStruct:: +UnmaskCopyMapObjectStruct:: ldh [hMapObjectIndexBuffer], a call UnmaskObject ldh a, [hMapObjectIndexBuffer] diff --git a/home/menu.asm b/home/menu.asm index 2328ad5b1..3d026075c 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -720,7 +720,7 @@ PlaceNthMenuStrings:: call PlaceString ret -Function1f9e:: ; unreferenced +GetNthMenuStrings:: ; unreferenced call GetMenuDataPointerTableEntry inc hl inc hl @@ -31,8 +31,8 @@ hVBlankCounter:: db hROMBank:: db hVBlank:: db hMapEntryMethod:: db -hMenuReturn:: db +hMenuReturn:: db hUnusedFFA1:: db hJoypadReleased:: db diff --git a/maps/Route27.asm b/maps/Route27.asm index f6298137d..4bc974290 100644 --- a/maps/Route27.asm +++ b/maps/Route27.asm @@ -25,13 +25,13 @@ Route27_MapScripts: FirstStepIntoKantoLeftScene: turnobject ROUTE27_FISHER, LEFT showemote EMOTE_SHOCK, ROUTE27_FISHER, 15 - applymovement ROUTE27_FISHER, MovementData_0x1a0a66 + applymovement ROUTE27_FISHER, Route27FisherStepLeftTwiceMovement sjump FirstStepIntoKantoScene_Continue FirstStepIntoKantoRightScene: turnobject ROUTE27_FISHER, LEFT showemote EMOTE_SHOCK, ROUTE27_FISHER, 15 - applymovement ROUTE27_FISHER, MovementData_0x1a0a69 + applymovement ROUTE27_FISHER, Route27FisherStepLeftOnceMovement FirstStepIntoKantoScene_Continue: turnobject PLAYER, RIGHT opentext @@ -305,12 +305,12 @@ Route27TMSolarbeam: Route27RareCandy: itemball RARE_CANDY -MovementData_0x1a0a66: +Route27FisherStepLeftTwiceMovement: step LEFT step LEFT step_end -MovementData_0x1a0a69: +Route27FisherStepLeftOnceMovement: step LEFT step_end diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index d67d0424a..684d8d1e0 100644 --- a/maps/RuinsOfAlphOutside.asm +++ b/maps/RuinsOfAlphOutside.asm @@ -60,10 +60,10 @@ RuinsOfAlphOutsideScientistSceneContinue: closetext playmusic MUSIC_SHOW_ME_AROUND follow RUINSOFALPHOUTSIDE_SCIENTIST, PLAYER - applymovement RUINSOFALPHOUTSIDE_SCIENTIST, MovementData_0x580ba + applymovement RUINSOFALPHOUTSIDE_SCIENTIST, RuinsOfAlphOutsideScientistWalkToLabMovement disappear RUINSOFALPHOUTSIDE_SCIENTIST stopfollow - applymovement PLAYER, MovementData_0x580c5 + applymovement PLAYER, RuinsOfAlphOutsidePlayerEnterLabMovement setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX warpcheck end @@ -130,7 +130,7 @@ RuinsOfAlphSign: RuinsOfAlphResearchCenterSign: jumptext RuinsOfAlphResearchCenterSignText -MovementData_0x580ba: +RuinsOfAlphOutsideScientistWalkToLabMovement: step RIGHT step RIGHT step RIGHT @@ -143,7 +143,7 @@ MovementData_0x580ba: step UP step_end -MovementData_0x580c5: +RuinsOfAlphOutsidePlayerEnterLabMovement: step UP step_end @@ -59,7 +59,7 @@ sMysteryGiftTimerStartDay:: db ds 1 sMysteryGiftTrainerHouseFlag:: db sMysteryGiftPartnerName:: ds NAME_LENGTH -s0_ac09:: ds 1 + ds 1 sMysteryGiftTrainer:: ds (1 + 1 + NUM_MOVES) * PARTY_LENGTH + 2 sBackupMysteryGiftItemEnd:: |