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 a8040590..24febe66 100644 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -1212,7 +1212,7 @@ StatStrings: GetStatExpRelativePointer: ld a, [wCurItem] - ld hl, Table_ef3f + ld hl, StatExpItemPointerOffsets .next cp [hl] inc hl @@ -1226,7 +1226,7 @@ GetStatExpRelativePointer: ld b, 0 ret -Table_ef3f: +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 f758a6a3..b952818b 100644 --- a/engine/overworld/scripting.asm +++ b/engine/overworld/scripting.asm @@ -875,7 +875,7 @@ Script_variablesprite: Script_appear: call GetScriptByte - call _CopyObjectStruct + call UnmaskCopyMapObjectStruct ldh a, [hMapObjectIndexBuffer] ld b, 0 ; clear call ApplyEventActionAppearDisappear diff --git a/home/audio.asm b/home/audio.asm index 9b750d49..410dad55 100644 --- a/home/audio.asm +++ b/home/audio.asm @@ -440,9 +440,8 @@ GetMapMusic_MaybeSpecial:: call GetMapMusic ret -Function3f7d:: ; 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 0fa63ec0..8a138be8 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1217,7 +1217,7 @@ UpdateBGMapColumn:: ldh [hBGMapTileCount], a ret -Function2939:: ; 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 0b57e211..d811d421 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 020b68e1..3370ff0d 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -676,7 +676,7 @@ PlaceNthMenuStrings:: call PlaceString ret -Function1e08:: ; unreferenced +GetNthMenuStrings:: ; unreferenced call GetMenuDataPointerTableEntry inc hl inc hl @@ -27,8 +27,8 @@ hBlackOutBGMapThird:: db hROMBank:: db hVBlank:: db hMapEntryMethod:: db -hMenuReturn:: db +hMenuReturn:: db hUnusedFFA3:: db hJoypadReleased:: db diff --git a/maps/Route27.asm b/maps/Route27.asm index 9a7f6010..ee0a4f69 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_0x128865 + applymovement ROUTE27_FISHER, Route27FisherStepLeftTwiceMovement sjump FirstStepIntoKantoScene_Continue FirstStepIntoKantoRightScene: turnobject ROUTE27_FISHER, LEFT showemote EMOTE_SHOCK, ROUTE27_FISHER, 15 - applymovement ROUTE27_FISHER, MovementData_0x128868 + applymovement ROUTE27_FISHER, Route27FisherStepLeftOnceMovement FirstStepIntoKantoScene_Continue: turnobject PLAYER, RIGHT opentext @@ -265,12 +265,12 @@ Route27TMSolarbeam: Route27RareCandy: itemball RARE_CANDY -MovementData_0x128865: +Route27FisherStepLeftTwiceMovement: step LEFT step LEFT step_end -MovementData_0x128868: +Route27FisherStepLeftOnceMovement: step LEFT step_end diff --git a/maps/RuinsOfAlphOutside.asm b/maps/RuinsOfAlphOutside.asm index 58975839..af06bbae 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_0x110092 + applymovement RUINSOFALPHOUTSIDE_SCIENTIST, RuinsOfAlphOutsideScientistWalkToLabMovement disappear RUINSOFALPHOUTSIDE_SCIENTIST stopfollow - applymovement PLAYER, MovementData_0x11009d + applymovement PLAYER, RuinsOfAlphOutsidePlayerEnterLabMovement setmapscene RUINS_OF_ALPH_RESEARCH_CENTER, SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX warpcheck end @@ -99,7 +99,7 @@ RuinsOfAlphSign: RuinsOfAlphResearchCenterSign: jumptext RuinsOfAlphResearchCenterSignText -MovementData_0x110092: +RuinsOfAlphOutsideScientistWalkToLabMovement: step RIGHT step RIGHT step RIGHT @@ -112,7 +112,7 @@ MovementData_0x110092: step UP step_end -MovementData_0x11009d: +RuinsOfAlphOutsidePlayerEnterLabMovement: step UP step_end @@ -68,7 +68,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:: |