pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-04-09 05:44:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

All functions in main.asm have non-generic names

Browse Source
This commit is contained in:
pikalaxalt 2016-05-08 14:11:24 -04:00
parent bb58230ca7
commit e95d42e0af
34 changed files with 537 additions and 551 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
battle/core.asm
View File

@ -183,7 +183,7 @@ BattleTurn: ; 3c12f
call IsMobileBattle call IsMobileBattle
jr nz, .not_disconnected jr nz, .not_disconnected
callba Function100da5 callba Function100da5
callba Function100641 callba StartMobileInactivityTimer
callba Function100dd8 callba Function100dd8
jp c, .quit jp c, .quit
.not_disconnected .not_disconnected
@ -2503,8 +2503,8 @@ WinTrainerBattle: ; 3cfa4
call BattleWinSlideInEnemyTrainerFrontpic call BattleWinSlideInEnemyTrainerFrontpic
ld c, 40 ld c, 40
call DelayFrames call DelayFrames
ld c, $4 ld c, $4 ; win
callba Function4ea0a callba Mobile_PrintOpponentBattleMessage
ret ret
.battle_tower .battle_tower
@ -3176,8 +3176,8 @@ LostBattle: ; 3d38e
ld c, 40 ld c, 40
call DelayFrames call DelayFrames
ld c, $3 ld c, $3 ; lost
callba Function4ea0a callba Mobile_PrintOpponentBattleMessage
scf scf
ret ret
; 3d432 ; 3d432
@ -9621,8 +9621,8 @@ BattleStartMessage: ; 3fc8b
call IsMobileBattle2 call IsMobileBattle2
ret nz ret nz
ld c, $2 ld c, $2 ; start
callba Function4ea0a callba Mobile_PrintOpponentBattleMessage
ret ret
; 3fd26 ; 3fd26

66
constants/map_constants.asm
View File

@ -518,39 +518,39 @@ const_value SET 1
; object struct ; object struct
const_def const_def
const OBJECT_SPRITE const OBJECT_SPRITE ; 00
const OBJECT_MAP_OBJECT_INDEX const OBJECT_MAP_OBJECT_INDEX ; 01
const OBJECT_SPRITE_TILE const OBJECT_SPRITE_TILE ; 02
const OBJECT_MOVEMENTTYPE const OBJECT_MOVEMENTTYPE ; 03
const OBJECT_FLAGS1 const OBJECT_FLAGS1 ; 04
const OBJECT_FLAGS2 const OBJECT_FLAGS2 ; 05
const OBJECT_PALETTE const OBJECT_PALETTE ; 06
const OBJECT_DIRECTION_WALKING const OBJECT_DIRECTION_WALKING ; 07
const OBJECT_FACING const OBJECT_FACING ; 08
const OBJECT_STEP_TYPE const OBJECT_STEP_TYPE ; 09
const OBJECT_STEP_DURATION const OBJECT_STEP_DURATION ; 0a
const OBJECT_ACTION const OBJECT_ACTION ; 0b
const OBJECT_STEP_FRAME const OBJECT_STEP_FRAME ; 0c
const OBJECT_FACING_STEP const OBJECT_FACING_STEP ; 0d
const OBJECT_NEXT_TILE const OBJECT_NEXT_TILE ; 0e
const OBJECT_STANDING_TILE const OBJECT_STANDING_TILE ; 0f
const OBJECT_NEXT_MAP_X const OBJECT_NEXT_MAP_X ; 10
const OBJECT_NEXT_MAP_Y const OBJECT_NEXT_MAP_Y ; 11
const OBJECT_MAP_X const OBJECT_MAP_X ; 12
const OBJECT_MAP_Y const OBJECT_MAP_Y ; 13
const OBJECT_INIT_X const OBJECT_INIT_X ; 14
const OBJECT_INIT_Y const OBJECT_INIT_Y ; 15
const OBJECT_RADIUS const OBJECT_RADIUS ; 16
const OBJECT_SPRITE_X const OBJECT_SPRITE_X ; 17
const OBJECT_SPRITE_Y const OBJECT_SPRITE_Y ; 18
const OBJECT_SPRITE_X_OFFSET const OBJECT_SPRITE_X_OFFSET ; 19
const OBJECT_SPRITE_Y_OFFSET const OBJECT_SPRITE_Y_OFFSET ; 1a
const OBJECT_MOVEMENT_BYTE_INDEX const OBJECT_MOVEMENT_BYTE_INDEX ; 1b
const OBJECT_28 const OBJECT_28 ; 1c
const OBJECT_29 const OBJECT_29 ; 1d
const OBJECT_30 const OBJECT_30 ; 1e
const OBJECT_31 const OBJECT_31 ; 1f
const OBJECT_RANGE const OBJECT_RANGE ; 20
; 33-39 are not used ; 33-39 are not used
; map object struct ; map object struct

30
engine/billspc.asm
View File

@ -1159,10 +1159,10 @@ BillsPC_LoadMonStats: ; e2b6d (38:6b6d)
add [hl] add [hl]
ld e, a ld e, a
ld d, $0 ld d, $0
ld hl, wBillsPCPokemonList + 1 ld hl, wBillsPCPokemonList + 1 ; box number
rept 3 add hl, de
add hl, de
add hl, de add hl, de
endr
ld a, [hl] ld a, [hl]
and a and a
jr z, .party jr z, .party
@ -1274,9 +1274,9 @@ BillsPC_RefreshTextboxes: ; e2c2c (38:6c2c)
ld e, a ld e, a
ld d, 0 ld d, 0
ld hl, wBillsPCPokemonList ld hl, wBillsPCPokemonList
rept 3
add hl, de add hl, de
endr add hl, de
add hl, de
ld e, l ld e, l
ld d, h ld d, h
hlcoord 9, 4 hlcoord 9, 4
@ -1290,9 +1290,9 @@ endr
ld de, 2 * SCREEN_WIDTH ld de, 2 * SCREEN_WIDTH
add hl, de add hl, de
pop de pop de
rept 3
inc de inc de
endr inc de
inc de
pop af pop af
dec a dec a
jr nz, .loop jr nz, .loop
@ -1493,9 +1493,9 @@ BillsPC_GetSelectedPokemonSpecies: ; e2def (38:6def)
ld e, a ld e, a
ld d, $0 ld d, $0
ld hl, wBillsPCPokemonList ld hl, wBillsPCPokemonList
rept 3
add hl, de add hl, de
endr add hl, de
add hl, de
ld a, [hl] ld a, [hl]
ret ret
@ -2055,10 +2055,10 @@ MovePKMNWitoutMail_InsertMon: ; e31e7
.PartyToBox: ; e3267 .PartyToBox: ; e3267
call .CopyFromParty call .CopyFromParty
ld a, $1 ld a, $1
ld [wc2cd], a ld [wGameLogicPaused], a
callba SaveGameData callba SaveGameData
xor a xor a
ld [wc2cd], a ld [wGameLogicPaused], a
call .CopyToBox call .CopyToBox
ret ret
; e327d ; e327d
@ -2211,9 +2211,9 @@ GetBoxPointer: ; e3396 (38:7396)
ld c, b ld c, b
ld b, 0 ld b, 0
ld hl, .boxes ld hl, .boxes
rept 3
add hl, bc add hl, bc
endr add hl, bc
add hl, bc
ld a, [hli] ld a, [hli]
ld b, a ld b, a
ld a, [hli] ld a, [hli]
@ -2429,9 +2429,9 @@ GetBoxCount: ; e366c (38:766c)
ld c, a ld c, a
ld b, 0 ld b, 0
ld hl, .boxbanks ld hl, .boxbanks
rept 3
add hl, bc add hl, bc
endr add hl, bc
add hl, bc
ld a, [hli] ld a, [hli]
ld b, a ld b, a
call GetSRAMBank call GetSRAMBank

14
engine/link.asm
View File

@ -495,7 +495,7 @@ LinkTimeout: ; 283b2
pop de pop de
pop hl pop hl
bccoord 1, 14 bccoord 1, 14
call PlaceWholeStringInBoxAtOnce call PlaceHLTextAtBC
call RotateThreePalettesRight call RotateThreePalettesRight
call ClearScreen call ClearScreen
ld b, SCGB_08 ld b, SCGB_08
@ -1255,7 +1255,7 @@ LinkTradeOTPartymonMenuLoop: ; 28835
jr z, .not_a_button jr z, .not_a_button
ld a, $1 ld a, $1
ld [wd263], a ld [wd263], a
callab Function50db9 callab LoadAddrsForLinkMonStatsScreen
ld hl, OTPartyMon1Species ld hl, OTPartyMon1Species
callba LinkMonStatsScreen callba LinkMonStatsScreen
jp LinkTradePartiesMenuMasterLoop jp LinkTradePartiesMenuMasterLoop
@ -1448,7 +1448,7 @@ Function28926: ; 28926
ld [wMenuCursorY], a ld [wMenuCursorY], a
ld a, $4 ld a, $4
ld [wd263], a ld [wd263], a
callab Function50db9 callab LoadAddrsForLinkMonStatsScreen
callba LinkMonStatsScreen callba LinkMonStatsScreen
call Call_LoadTempTileMapToTileMap call Call_LoadTempTileMapToTileMap
hlcoord 6, 1 hlcoord 6, 1
@ -1490,7 +1490,7 @@ Function28926: ; 28926
callba Link_WaitBGMap callba Link_WaitBGMap
ld hl, .Text_CantTradeLastMon ld hl, .Text_CantTradeLastMon
bccoord 1, 14 bccoord 1, 14
call PlaceWholeStringInBoxAtOnce call PlaceHLTextAtBC
jr .cancel_trade jr .cancel_trade
.abnormal .abnormal
@ -1512,7 +1512,7 @@ Function28926: ; 28926
callba Link_WaitBGMap callba Link_WaitBGMap
ld hl, .Text_Abnormal ld hl, .Text_Abnormal
bccoord 1, 14 bccoord 1, 14
call PlaceWholeStringInBoxAtOnce call PlaceHLTextAtBC
.cancel_trade .cancel_trade
hlcoord 0, 12 hlcoord 0, 12
@ -1688,7 +1688,7 @@ LinkTrade: ; 28b87
call GetPokemonName call GetPokemonName
ld hl, UnknownText_0x28eb8 ld hl, UnknownText_0x28eb8
bccoord 1, 14 bccoord 1, 14
call PlaceWholeStringInBoxAtOnce call PlaceHLTextAtBC
call LoadStandardMenuDataHeader call LoadStandardMenuDataHeader
hlcoord 10, 7 hlcoord 10, 7
ld b, 3 ld b, 3
@ -2030,7 +2030,7 @@ LoadTradeScreenBorder: ; 28ef8
; 28eff ; 28eff
Function28eff: ; 28eff Function28eff: ; 28eff
callba Function16d6a7 callba Function16d6a7 ; just a nested farcall; so wasteful
call SetPalettes call SetPalettes
ret ret
; 28f09 ; 28f09

4
engine/map_objects.asm
View File

@ -137,7 +137,7 @@ Function437b: ; 437b
cp STEP_TYPE_SLEEP cp STEP_TYPE_SLEEP
ret z ret z
.ok3 .ok3
ld hl, Pointers4b45 ld hl, StepTypesJumptable
rst JumpTable rst JumpTable
ret ret
@ -1084,7 +1084,7 @@ SetRandomStepDuration: ; 4b2d
ret ret
; 4b45 ; 4b45
Pointers4b45: ; 4b45 StepTypesJumptable: ; 4b45
; These pointers use OBJECT_STEP_TYPE. See constants/sprite_constants.asm ; These pointers use OBJECT_STEP_TYPE. See constants/sprite_constants.asm
dw ObjectMovementReset ; 00 dw ObjectMovementReset ; 00
dw MapObjectMovementPattern ; unused dw MapObjectMovementPattern ; unused

2
engine/menu.asm
View File

@ -319,7 +319,7 @@ Function241d5: ; 241d5
ret c ret c
ld c, 1 ld c, 1
ld b, 3 ld b, 3
call Function10062d ; BUG: This function is in another bank. call AdvanceMobileInactivityTimerAndCheckExpired ; BUG: This function is in another bank.
; Pointer in current bank (9) is bogus. ; Pointer in current bank (9) is bogus.
ret c ret c
callba Function100337 callba Function100337

2
engine/pokedex.asm
View File

@ -823,7 +823,7 @@ Pokedex_UpdateUnownMode: ; 405df (10:45df)
call DelayFrame call DelayFrame
call Pokedex_CheckSGB call Pokedex_CheckSGB
jr nz, .decompress jr nz, .decompress
callba Function1ddf26 callba LoadSGBPokedexGFX2
jr .done jr .done
.decompress .decompress

4
engine/pokegear.asm
View File

@ -516,7 +516,7 @@ Pokegear_UpdateClock: ; 90f86 (24:4f86)
callba PrintHoursMins callba PrintHoursMins
ld hl, .DayText ld hl, .DayText
bccoord 6, 6 bccoord 6, 6
call PlaceWholeStringInBoxAtOnce call PlaceHLTextAtBC
ret ret
; 90fa8 (24:4fa8) ; 90fa8 (24:4fa8)
@ -711,7 +711,7 @@ PokegearMap_UpdateLandmarkName: ; 910b4
push de push de
callba GetLandmarkName callba GetLandmarkName
pop de pop de
callba Function1de2c5 callba TownMap_ConvertLineBreakCharacters
hlcoord 8, 0 hlcoord 8, 0
ld [hl], $34 ld [hl], $34
ret ret

2
engine/radio.asm
View File

@ -139,7 +139,7 @@ PrintRadioLine:
cp 2 cp 2
jr nz, .print jr nz, .print
bccoord 1, 16 bccoord 1, 16
call PlaceWholeStringInBoxAtOnce call PlaceHLTextAtBC
jr .skip jr .skip
.print .print
call PrintTextBoxText call PrintTextBoxText

36
engine/save.asm
View File

@ -9,9 +9,9 @@ SaveMenu: ; 14a1a
jr nz, .refused jr nz, .refused
call AskOverwriteSaveFile call AskOverwriteSaveFile
jr c, .refused jr c, .refused
call SetWRAMStateForSave call PauseGameLogic
call _SavingDontTurnOffThePower call _SavingDontTurnOffThePower
call ClearWRAMStateAfterSave call ResumeGameLogic
call ExitMenu call ExitMenu
and a and a
ret ret
@ -24,7 +24,7 @@ SaveMenu: ; 14a1a
ret ret
Function14a58: ; 14a58 Function14a58: ; 14a58
call SetWRAMStateForSave call PauseGameLogic
callba StageRTCTimeForSave callba StageRTCTimeForSave
callba BackupMysteryGift callba BackupMysteryGift
call SavePokemonData call SavePokemonData
@ -33,7 +33,7 @@ Function14a58: ; 14a58
call SaveBackupChecksum call SaveBackupChecksum
callba BackupPartyMonMail callba BackupPartyMonMail
callba SaveRTC callba SaveRTC
call ClearWRAMStateAfterSave call ResumeGameLogic
ret ret
; 14a83 ; 14a83
@ -47,7 +47,7 @@ ChangeBoxSaveGame: ; 14a83 (5:4a83)
jr c, .refused jr c, .refused
call AskOverwriteSaveFile call AskOverwriteSaveFile
jr c, .refused jr c, .refused
call SetWRAMStateForSave call PauseGameLogic
call SavingDontTurnOffThePower call SavingDontTurnOffThePower
call SaveBox call SaveBox
pop de pop de
@ -55,7 +55,7 @@ ChangeBoxSaveGame: ; 14a83 (5:4a83)
ld [wCurBox], a ld [wCurBox], a
call LoadBox call LoadBox
call SavedTheGame call SavedTheGame
call ClearWRAMStateAfterSave call ResumeGameLogic
and a and a
ret ret
.refused .refused
@ -65,9 +65,9 @@ ChangeBoxSaveGame: ; 14a83 (5:4a83)
Link_SaveGame: ; 14ab2 Link_SaveGame: ; 14ab2
call AskOverwriteSaveFile call AskOverwriteSaveFile
jr c, .refused jr c, .refused
call SetWRAMStateForSave call PauseGameLogic
call _SavingDontTurnOffThePower call _SavingDontTurnOffThePower
call ClearWRAMStateAfterSave call ResumeGameLogic
and a and a
.refused .refused
@ -75,19 +75,19 @@ Link_SaveGame: ; 14ab2
; 14ac2 ; 14ac2
MovePkmnWOMail_SaveGame: ; 14ac2 MovePkmnWOMail_SaveGame: ; 14ac2
call SetWRAMStateForSave call PauseGameLogic
push de push de
call SaveBox call SaveBox
pop de pop de
ld a, e ld a, e
ld [wCurBox], a ld [wCurBox], a
call LoadBox call LoadBox
call ClearWRAMStateAfterSave call ResumeGameLogic
ret ret
; 14ad5 ; 14ad5
Function14ad5: ; 14ad5 Function14ad5: ; 14ad5
call SetWRAMStateForSave call PauseGameLogic
push de push de
call SaveBox call SaveBox
pop de pop de
@ -111,7 +111,7 @@ Function14ad5: ; 14ad5
callba BackupMobileEventIndex callba BackupMobileEventIndex
callba SaveRTC callba SaveRTC
call LoadBox call LoadBox
call ClearWRAMStateAfterSave call ResumeGameLogic
ld de, SFX_SAVE ld de, SFX_SAVE
call PlaySFX call PlaySFX
ld c, 24 ld c, 24
@ -127,9 +127,9 @@ StartMovePkmnWOMail_SaveGame: ; 14b34
jr c, .refused jr c, .refused
call AskOverwriteSaveFile call AskOverwriteSaveFile
jr c, .refused jr c, .refused
call SetWRAMStateForSave call PauseGameLogic
call _SavingDontTurnOffThePower call _SavingDontTurnOffThePower
call ClearWRAMStateAfterSave call ResumeGameLogic
and a and a
ret ret
@ -138,15 +138,15 @@ StartMovePkmnWOMail_SaveGame: ; 14b34
ret ret
; 14b54 ; 14b54
SetWRAMStateForSave: ; 14b54 PauseGameLogic: ; 14b54
ld a, $1 ld a, $1
ld [wc2cd], a ld [wGameLogicPaused], a
ret ret
; 14b5a ; 14b5a
ClearWRAMStateAfterSave: ; 14b5a ResumeGameLogic: ; 14b5a
xor a xor a
ld [wc2cd], a ld [wGameLogicPaused], a
ret ret
; 14b5f ; 14b5f

2
engine/startmenu.asm
View File

@ -1762,7 +1762,7 @@ SetUpMoveScreenBG: ; 13172
call ClearSprites call ClearSprites
xor a xor a
ld [hBGMapMode], a ld [hBGMapMode], a
callba Functionfb571 callba LoadStatsScreenPageTilesGFX
callba ClearSpriteAnims2 callba ClearSpriteAnims2
ld a, [CurPartyMon] ld a, [CurPartyMon]
ld e, a ld e, a

13
engine/stats_screen.asm
View File

@ -6,14 +6,14 @@ BattleStatsScreenInit: ; 4dc7b (13:5c7b)
ld a, [wBattleMode] ; wd22d (aliases: EnemyMonEnd) ld a, [wBattleMode] ; wd22d (aliases: EnemyMonEnd)
and a and a
jr z, StatsScreenInit jr z, StatsScreenInit
jr _BattleStatsScreenInit jr _MobileStatsScreenInit
StatsScreenInit: ; 4dc8a StatsScreenInit: ; 4dc8a
ld hl, StatsScreenMain ld hl, StatsScreenMain
jr StatsScreenInit_gotaddress jr StatsScreenInit_gotaddress
_BattleStatsScreenInit: ; 4dc8f _MobileStatsScreenInit: ; 4dc8f
ld hl, StatsScreenBattle ld hl, StatsScreenMobile
jr StatsScreenInit_gotaddress jr StatsScreenInit_gotaddress
StatsScreenInit_gotaddress: ; 4dc94 StatsScreenInit_gotaddress: ; 4dc94
@ -33,7 +33,7 @@ StatsScreenInit_gotaddress: ; 4dc94
call ClearBGPalettes call ClearBGPalettes
call ClearTileMap call ClearTileMap
call UpdateSprites call UpdateSprites
callba Functionfb53e callba StatsScreen_LoadFont
pop hl pop hl
call _hl_ call _hl_
call ClearBGPalettes call ClearBGPalettes
@ -73,7 +73,7 @@ StatsScreenMain: ; 0x4dcd2
ret ret
; 0x4dcf7 ; 0x4dcf7
StatsScreenBattle: ; 4dcf7 StatsScreenMobile: ; 4dcf7
xor a xor a
ld [wJumptableIndex], a ld [wJumptableIndex], a
; stupid interns ; stupid interns
@ -89,7 +89,7 @@ StatsScreenBattle: ; 4dcf7
ld hl, StatsScreenPointerTable ld hl, StatsScreenPointerTable
rst JumpTable rst JumpTable
call StatsScreen_WaitAnim call StatsScreen_WaitAnim
callba Function100dfd callba MobileComms_CheckInactivityTimer
jr c, .exit jr c, .exit
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
bit 7, a bit 7, a
@ -100,7 +100,6 @@ StatsScreenBattle: ; 4dcf7
; 4dd2a ; 4dd2a
StatsScreenPointerTable: ; 4dd2a StatsScreenPointerTable: ; 4dd2a
dw MonStatsInit ; regular pokémon dw MonStatsInit ; regular pokémon
dw EggStatsInit ; egg dw EggStatsInit ; egg
dw StatsScreenWaitCry dw StatsScreenWaitCry

6
engine/timeset.asm
View File

@ -577,7 +577,7 @@ Special_InitialSetDSTFlag: ; 90a54
lb bc, 3, 18 lb bc, 3, 18
call ClearBox call ClearBox
ld hl, .Text ld hl, .Text
call PlaceWholeStringInBoxAtOnce call PlaceHLTextAtBC
ret ret
; 90a6c ; 90a6c
@ -608,7 +608,7 @@ Special_InitialClearDSTFlag: ; 90a88
lb bc, 3, 18 lb bc, 3, 18
call ClearBox call ClearBox
ld hl, .Text ld hl, .Text
call PlaceWholeStringInBoxAtOnce call PlaceHLTextAtBC
ret ret
; 90aa0 ; 90aa0
@ -636,7 +636,7 @@ DebugDisplayTime: ; 90abc
lb bc, 3, SCREEN_WIDTH - 2 lb bc, 3, SCREEN_WIDTH - 2
call ClearBox call ClearBox
ld hl, .Text ld hl, .Text
call PlaceWholeStringInBoxAtOnce call PlaceHLTextAtBC
ret ret
; 90acc ; 90acc

10
event/halloffame.asm
View File

@ -3,7 +3,7 @@ HallOfFame:: ; 0x8640e
ld a, [StatusFlags] ld a, [StatusFlags]
push af push af
ld a, 1 ld a, 1
ld [wc2cd], a ld [wGameLogicPaused], a
call DisableSpriteUpdates call DisableSpriteUpdates
ld a, SPAWN_LANCE ld a, SPAWN_LANCE
ld [wSpawnAfterChampion], a ld [wSpawnAfterChampion], a
@ -25,7 +25,7 @@ HallOfFame:: ; 0x8640e
callba AddHallOfFameEntry callba AddHallOfFameEntry
xor a xor a
ld [wc2cd], a ld [wGameLogicPaused], a
call AnimateHallOfFame call AnimateHallOfFame
pop af pop af
ld b, a ld b, a
@ -44,7 +44,7 @@ RedCredits:: ; 86455
xor a xor a
ld [VramState], a ld [VramState], a
ld [hMapAnims], a ld [hMapAnims], a
callba Function4e8c2 callba InitDisplayForRedCredits
ld c, 8 ld c, 8
call DelayFrames call DelayFrames
call DisableSpriteUpdates call DisableSpriteUpdates
@ -67,7 +67,7 @@ HallOfFame_FadeOutMusic: ; 8648e
xor a xor a
ld [VramState], a ld [VramState], a
ld [hMapAnims], a ld [hMapAnims], a
callba Function4e881 callba InitDisplayForHallOfFame
ld c, 100 ld c, 100
jp DelayFrames jp DelayFrames
; 864b4 ; 864b4
@ -230,7 +230,7 @@ GetHallOfFameParty: ; 8653f
AnimateHOFMonEntrance: ; 865b5 AnimateHOFMonEntrance: ; 865b5
push hl push hl
call ClearBGPalettes call ClearBGPalettes
callba Function4e906 callba ResetDisplayBetweenHallOfFameMons
pop hl pop hl
ld a, [hli] ld a, [hli]
ld [TempMonSpecies], a ld [TempMonSpecies], a

12
event/mom.asm
View File

@ -321,13 +321,13 @@ DSTChecks: ; 16439
call .ClearBox call .ClearBox
bccoord 1, 14 bccoord 1, 14
ld hl, .Text_AdjustClock ld hl, .Text_AdjustClock
call PlaceWholeStringInBoxAtOnce call PlaceHLTextAtBC
call YesNoBox call YesNoBox
ret c ret c
call .ClearBox call .ClearBox
bccoord 1, 14 bccoord 1, 14
ld hl, .Text_LostInstructionBooklet ld hl, .Text_LostInstructionBooklet
call PlaceWholeStringInBoxAtOnce call PlaceHLTextAtBC
ret ret
.loop .loop
@ -337,7 +337,7 @@ DSTChecks: ; 16439
bit 7, a bit 7, a
jr z, .SetDST jr z, .SetDST
ld hl, .Text_IsDSTOver ld hl, .Text_IsDSTOver
call PlaceWholeStringInBoxAtOnce call PlaceHLTextAtBC
call YesNoBox call YesNoBox
ret c ret c
ld a, [wDST] ld a, [wDST]
@ -347,12 +347,12 @@ DSTChecks: ; 16439
call .ClearBox call .ClearBox
bccoord 1, 14 bccoord 1, 14
ld hl, .Text_SetClockBack ld hl, .Text_SetClockBack
call PlaceWholeStringInBoxAtOnce call PlaceHLTextAtBC
ret ret
.SetDST: .SetDST:
ld hl, .Text_SwitchToDST ld hl, .Text_SwitchToDST
call PlaceWholeStringInBoxAtOnce call PlaceHLTextAtBC
call YesNoBox call YesNoBox
ret c ret c
ld a, [wDST] ld a, [wDST]
@ -362,7 +362,7 @@ DSTChecks: ; 16439
call .ClearBox call .ClearBox
bccoord 1, 14 bccoord 1, 14
ld hl, .Text_SetClockForward ld hl, .Text_SetClockForward
call PlaceWholeStringInBoxAtOnce call PlaceHLTextAtBC
ret ret
; 164b9 ; 164b9

12
event/photo.asm
View File

@ -132,7 +132,7 @@ UnownPrinter: ; 16be4
.UpdateUnownFrontpic: ; 16cc8 .UpdateUnownFrontpic: ; 16cc8
ld a, [wJumptableIndex] ld a, [wJumptableIndex]
cp 26 cp 26
jr z, Function16d20 jr z, .vacant
inc a inc a
ld [UnownLetter], a ld [UnownLetter], a
ld a, UNOWN ld a, UNOWN
@ -141,18 +141,17 @@ UnownPrinter: ; 16be4
ld [wBoxAlignment], a ld [wBoxAlignment], a
ld de, VTiles2 ld de, VTiles2
predef GetFrontpic predef GetFrontpic
call Function16cff call .Load2bppToSRAM
hlcoord 1, 6 hlcoord 1, 6
xor a xor a
ld [hGraphicStartTile], a ld [hGraphicStartTile], a
lb bc, 7, 7 lb bc, 7, 7
predef PlaceGraphic predef PlaceGraphic
ld de, VTiles2 tile $31 ld de, VTiles2 tile $31
callba Functione0000 callba RotateUnownFrontpic
ret ret
; 16cff
Function16cff: ; 16cff .Load2bppToSRAM: ; 16cff
ld a, [rSVBK] ld a, [rSVBK]
push af push af
ld a, $6 ld a, $6
@ -171,9 +170,8 @@ Function16cff: ; 16cff
pop af pop af
ld [rSVBK], a ld [rSVBK], a
ret ret
; 16d20
Function16d20: ; 16d20 .vacant
hlcoord 1, 6 hlcoord 1, 6
lb bc, 7, 7 lb bc, 7, 7
call ClearBox call ClearBox

28
gfx/font.asm
View File

@ -21,14 +21,16 @@ INCBIN "gfx/frames/9.1bpp"
; TODO: Various misc graphics here. ; TODO: Various misc graphics here.
GFX_f89b0: ; f89b0 StatsScreenPageTilesGFX: ; f89b0
INCBIN "gfx/unknown/0f89b0.2bpp" INCBIN "gfx/unknown/0f89b0.2bpp"
; f8a90 ; f8a90
ShinyIcon: ; f8a90 ShinyIcon: ; f8a90
; also part of StatsScreenPageTilesGFX
INCBIN "gfx/stats/shiny.2bpp" INCBIN "gfx/stats/shiny.2bpp"
GFX_f8aa0: ; f8aa0 StatsScreenPageTilesGFX_Part2: ; f8aa0
; not referenced on its own, but part of StatsScreenPageTilesGFX
INCBIN "gfx/unknown/0f8aa0.2bpp" INCBIN "gfx/unknown/0f8aa0.2bpp"
; f8ac0 ; f8ac0
@ -48,7 +50,7 @@ TownMapGFX: ; f8ba0
INCBIN "gfx/misc/town_map.2bpp.lz" INCBIN "gfx/misc/town_map.2bpp.lz"
; f8ea4 ; f8ea4
GFX_f8ea4: ; unused GFX_f8ea4: ; unused kanji
INCBIN "gfx/unknown/0f8ea4.2bpp" INCBIN "gfx/unknown/0f8ea4.2bpp"
; f8f24 ; f8f24
@ -56,8 +58,8 @@ OverworldPhoneIconGFX: ; f8f24
INCBIN "gfx/mobile/overworld_phone_icon.2bpp" INCBIN "gfx/mobile/overworld_phone_icon.2bpp"
; f8f34 ; f8f34
GFX_f8f34: ; unused GFX_f8f34: ; unused bold letters + unown chars
INCBIN "gfx/unknown/0f8f34.2bpp" INCBIN "gfx/unknown/0f8f34.w64.1bpp"
; f9204 ; f9204
TextBoxSpaceGFX: ; f9204 TextBoxSpaceGFX: ; f9204
@ -72,7 +74,7 @@ MapEntryFrameGFX: ; f9344
INCBIN "gfx/frames/map_entry_sign.2bpp" INCBIN "gfx/frames/map_entry_sign.2bpp"
; f9424 ; f9424
GFX_f9424: ; f9424 FontsExtra2_UpArrowGFX: ; f9424
INCBIN "gfx/unknown/0f9424.2bpp" INCBIN "gfx/unknown/0f9424.2bpp"
; f9434 ; f9434
@ -81,6 +83,7 @@ INCBIN "gfx/misc/footprints.1bpp"
; fb434 ; fb434
; This and the following two functions are unreferenced. ; This and the following two functions are unreferenced.
; Debug, perhaps?
Unknown_fb434: Unknown_fb434:
db 0 db 0
@ -143,9 +146,9 @@ _LoadFontsExtra1:: ; fb48a
; fb4b0 ; fb4b0
_LoadFontsExtra2:: ; fb4b0 _LoadFontsExtra2:: ; fb4b0
ld de, GFX_f9424 ld de, FontsExtra2_UpArrowGFX
ld hl, VTiles2 tile $61 ld hl, VTiles2 tile $61
ld b, BANK(GFX_f9424) ld b, BANK(FontsExtra2_UpArrowGFX)
ld c, 1 ld c, 1
call Get2bpp_2 call Get2bpp_2
ret ret
@ -208,7 +211,7 @@ LoadHPBar: ; fb50d
ret ret
; fb53e ; fb53e
Functionfb53e: ; fb53e StatsScreen_LoadFont: ; fb53e
call _LoadFontsBattleExtra call _LoadFontsBattleExtra
ld de, EnemyHPBarBorderGFX ld de, EnemyHPBarBorderGFX
ld hl, VTiles2 tile $6c ld hl, VTiles2 tile $6c
@ -226,11 +229,10 @@ Functionfb53e: ; fb53e
ld hl, VTiles2 tile $55 ld hl, VTiles2 tile $55
lb bc, BANK(ExpBarGFX), 8 lb bc, BANK(ExpBarGFX), 8
call Get2bpp_2 call Get2bpp_2
LoadStatsScreenPageTilesGFX: ; fb571
Functionfb571: ; fb571 ld de, StatsScreenPageTilesGFX
ld de, GFX_f89b0
ld hl, VTiles2 tile $31 ld hl, VTiles2 tile $31
lb bc, BANK(GFX_f89b0), $11 lb bc, BANK(StatsScreenPageTilesGFX), $11
call Get2bpp_2 call Get2bpp_2
ret ret
; fb57e ; fb57e

0
gfx/unknown/0f8f34.2bpp → gfx/unknown/0f8f34.w64.1bpp
View File

2
home/game_time.asm
View File

@ -33,7 +33,7 @@ UpdateGameTimer:: ; 20ad
; Don't update if game logic is paused. ; Don't update if game logic is paused.
ld a, [wc2cd] ld a, [wGameLogicPaused]
and a and a
ret nz ret nz

2
home/joypad.asm
View File

@ -33,7 +33,7 @@ Joypad:: ; 935
ret nz ret nz
; If we're saving, input is disabled. ; If we're saving, input is disabled.
ld a, [wc2cd] ld a, [wGameLogicPaused]
and a and a
ret nz ret nz

Some files were not shown because too many files have changed in this diff Show More