pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-12-11 05:02:16 -08:00
Code Issues Packages Projects Releases Wiki Activity

Prefix wram labels with w, part 2.

Browse Source
This commit is contained in:
luckytyphlosion
2018-01-23 17:39:09 -05:00
parent 79bd48f85c
commit a1951cefc0
323 changed files with 8581 additions and 8581 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
mobile/fixed_words.asm
View File

@@ -269,7 +269,7 @@ CopyMobileEZChatToC608: ; 11c156
ld a, e
ld [wd265], a
call GetPokemonName
ld hl, StringBuffer1
ld hl, wStringBuffer1
ld bc, MON_NAME_LENGTH - 1
jr .copy_string
; 11c1ab
@@ -337,7 +337,7 @@ Function11c1b9: ; 11c1b9
ld a, $5
ld [rSVBK], a
ld hl, $c6d0
ld de, LYOverrides
ld de, wLYOverrides
ld bc, $100
call CopyBytes
pop af
@@ -711,11 +711,11 @@ Function11c4a5: ; 11c4a5 (47:44a5)
Function11c4be: ; 11c4be (47:44be)
ld a, $1
hlcoord 0, 6, AttrMap
hlcoord 0, 6, wAttrMap
ld bc, $a0
call ByteFill
ld a, $7
hlcoord 0, 14, AttrMap
hlcoord 0, 14, wAttrMap
ld bc, $28
call ByteFill
farcall ReloadMapPart
@@ -914,7 +914,7 @@ EZChat_PlaceCategoryNames: ; 11c5f0 (47:45f0)
Function11c618: ; 11c618 (47:4618)
ld a, $2
hlcoord 0, 6, AttrMap
hlcoord 0, 6, wAttrMap
ld bc, $c8
call ByteFill
farcall ReloadMapPart
@@ -1526,7 +1526,7 @@ Function11c992: ; 11c992 (47:4992)
Function11c9ab: ; 11c9ab (47:49ab)
ld a, $7
hlcoord 0, 6, AttrMap
hlcoord 0, 6, wAttrMap
ld bc, $c8
call ByteFill
farcall ReloadMapPart
@@ -1583,7 +1583,7 @@ Function11c9c3: ; 11c9c3 (47:49c3)
ret
Function11ca01: ; 11ca01 (47:4a01)
hlcoord 14, 7, AttrMap
hlcoord 14, 7, wAttrMap
ld de, $14
ld a, $5
ld c, a
@@ -1602,7 +1602,7 @@ Function11ca01: ; 11ca01 (47:4a01)
jr nz, .asm_11ca0a
Function11ca19: ; 11ca19 (47:4a19)
hlcoord 0, 12, AttrMap
hlcoord 0, 12, wAttrMap
ld de, $14
ld a, $6
ld c, a
@@ -2035,11 +2035,11 @@ Function11cd54: ; 11cd54 (47:4d54)
Function11cdaa: ; 11cdaa (47:4daa)
ld a, $2
hlcoord 0, 6, AttrMap
hlcoord 0, 6, wAttrMap
ld bc, 6 * SCREEN_WIDTH
call ByteFill
ld a, $7
hlcoord 0, 12, AttrMap
hlcoord 0, 12, wAttrMap
ld bc, 4 * SCREEN_WIDTH
call ByteFill
farcall ReloadMapPart

10
mobile/mobile_12.asm
View File

@@ -38,11 +38,11 @@ InitMobileProfile: ; 4802f (12:402f)
jr .asm_480d7
.asm_4808a
ld a, $5
ld [MusicFade], a
ld [wMusicFade], a
ld a, LOW(MUSIC_MOBILE_ADAPTER_MENU)
ld [MusicFadeID], a
ld [wMusicFadeID], a
ld a, HIGH(MUSIC_MOBILE_ADAPTER_MENU)
ld [MusicFadeID + 1], a
ld [wMusicFadeID + 1], a
ld c, 20
call DelayFrames
ld b, $1
@@ -459,7 +459,7 @@ Function483bb: ; 483bb (12:43bb)
Function483e8: ; 483e8
push de
ld hl, Prefectures
ld a, [MenuSelection]
ld a, [wMenuSelection]
cp $ff
jr nz, .asm_483f8
ld hl, Wakayama ; last string
@@ -1681,7 +1681,7 @@ Function48cdc: ; 48cdc (12:4cdc)
call Function48cfd
pop hl
pop bc
ld de, AttrMap - TileMap
ld de, wAttrMap - wTileMap
add hl, de
inc b
inc b

70
mobile/mobile_12_2.asm
View File

@@ -2,14 +2,14 @@ MobileCheckOwnMonAnywhere: ; 4a843
; Like CheckOwnMonAnywhere, but only check for species.
; OT/ID don't matter.
ld a, [PartyCount]
ld a, [wPartyCount]
and a
ret z
ld d, a
ld e, 0
ld hl, PartyMon1Species
ld bc, PartyMonOT
ld hl, wPartyMon1Species
ld bc, wPartyMonOT
.asm_4a851
call .CheckMatch
ret c
@@ -111,7 +111,7 @@ MobileCheckOwnMonAnywhere: ; 4a843
push de
ld d, b
ld e, c
ld a, [ScriptVar]
ld a, [wScriptVar]
ld b, [hl]
cp b
jr nz, .no_match
@@ -160,25 +160,25 @@ MobileCheckOwnMonAnywhere: ; 4a843
; 4a927
UnusedSpecial_FindItemInPCOrBag: ; 4a927
ld a, [ScriptVar]
ld [CurItem], a
ld hl, PCItems
ld a, [wScriptVar]
ld [wCurItem], a
ld hl, wPCItems
call CheckItem
jr c, .found
ld a, [ScriptVar]
ld [CurItem], a
ld hl, NumItems
ld a, [wScriptVar]
ld [wCurItem], a
ld hl, wNumItems
call CheckItem
jr c, .found
xor a
ld [ScriptVar], a
ld [wScriptVar], a
ret
.found
ld a, 1
ld [ScriptVar], a
ld [wScriptVar], a
ret
; 4a94e
@@ -272,15 +272,15 @@ Function4a9c3: ; 4a9c3
Function4a9d7: ; 4a9d7
ld a, [wd002]
ld hl, PartyMonNicknames
ld hl, wPartyMonNicknames
call GetNick
ld h, d
ld l, e
ld de, EndFlypoint
ld de, wEndFlypoint
ld bc, 6
call CopyBytes
ld a, [wd003]
ld hl, PartyMonNicknames
ld hl, wPartyMonNicknames
call GetNick
ld h, d
ld l, e
@@ -288,7 +288,7 @@ Function4a9d7: ; 4a9d7
ld bc, 6
call CopyBytes
ld a, [wd004]
ld hl, PartyMonNicknames
ld hl, wPartyMonNicknames
call GetNick
ld h, d
ld l, e
@@ -317,10 +317,10 @@ Function4aa25: ; 4aa25
Function4aa34: ; 4aa34
ld a, PARTYMENUACTION_MOBILE
ld [PartyMenuActionText], a
ld [wPartyMenuActionText], a
farcall WritePartyMenuTilemap
xor a
ld [PartyMenuActionText], a
ld [wPartyMenuActionText], a
farcall PrintPartyMenuText
call Function4aab6
call WaitBGMap
@@ -431,7 +431,7 @@ Function4aab6: ; 4aab6
; 4aad3
Function4aad3: ; 4aad3
ld hl, PartyCount
ld hl, wPartyCount
ld a, [hli]
and a
ret z ; Nothing in your party
@@ -458,7 +458,7 @@ Function4aad3: ; 4aad3
; 4aafb
Function4aafb: ; 4aafb
ld a, [CurPartySpecies]
ld a, [wCurPartySpecies]
cp EGG
jr z, .egg
and a
@@ -470,9 +470,9 @@ Function4aafb: ; 4aafb
; 4ab06
Function4ab06: ; 4ab06
ld a, [CurPartyMon]
ld a, [wCurPartyMon]
ld bc, PARTYMON_STRUCT_LENGTH
ld hl, PartyMon1HP
ld hl, wPartyMon1HP
call AddNTimes
ld a, [hli]
ld b, a
@@ -503,7 +503,7 @@ Function4ab1a: ; 4ab1a
pop af
bit 1, a
jr nz, .asm_4ab6d
ld a, [PartyCount]
ld a, [wPartyCount]
inc a
ld b, a
ld a, [wMenuCursorY]
@@ -512,13 +512,13 @@ Function4ab1a: ; 4ab1a
jr z, .asm_4ab7e
ld a, [wMenuCursorY]
dec a
ld [CurPartyMon], a
ld [wCurPartyMon], a
ld c, a
ld b, $0
ld hl, PartySpecies
ld hl, wPartySpecies
add hl, bc
ld a, [hl]
ld [CurPartySpecies], a
ld [wCurPartySpecies], a
ld de, SFX_READ_TEXT_2
call PlaySFX
call WaitSFX
@@ -591,7 +591,7 @@ Function4aba8: ; 4aba8
Function4abc3: ; 4abc3
bit 3, a
jr z, .asm_4abd5
ld a, [PartyCount]
ld a, [wPartyCount]
inc a
ld [wMenuCursorY], a
ld a, $1
@@ -605,7 +605,7 @@ Function4abc3: ; 4abc3
ld [wMenuCursorY], a
and a
jr nz, .asm_4ac29
ld a, [PartyCount]
ld a, [wPartyCount]
inc a
ld [wMenuCursorY], a
jr .asm_4ac29
@@ -615,7 +615,7 @@ Function4abc3: ; 4abc3
jr z, .asm_4ac08
ld a, [wMenuCursorY]
ld [wMenuCursorY], a
ld a, [PartyCount]
ld a, [wPartyCount]
inc a
inc a
ld b, a
@@ -635,7 +635,7 @@ Function4abc3: ; 4abc3
.asm_4ac10
ld a, [wMenuCursorY]
ld b, a
ld a, [PartyCount]
ld a, [wPartyCount]
inc a
cp b
jr nz, .asm_4ac29
@@ -653,7 +653,7 @@ Function4abc3: ; 4abc3
lb bc, 13, 1
call ClearBox
call Function4aab6
ld a, [PartyCount]
ld a, [wPartyCount]
hlcoord 6, 1
.asm_4ac3b
ld bc, $28
@@ -663,7 +663,7 @@ Function4abc3: ; 4abc3
ld [hl], $7f
ld a, [wMenuCursorY]
ld b, a
ld a, [PartyCount]
ld a, [wPartyCount]
inc a
cp b
jr z, .asm_4ac54
@@ -800,7 +800,7 @@ Function4ad17: ; 4ad17
ret
.asm_4ad39
ld a, [CurPartyMon]
ld a, [wCurPartyMon]
ld [hl], a
call Function4a9c3
ret c
@@ -876,7 +876,7 @@ String_4ada7: ; 4ada7
Function4adb2: ; 4adb2
ld hl, wd002
ld a, [CurPartyMon]
ld a, [wCurPartyMon]
cp [hl]
ret z
inc hl
@@ -923,7 +923,7 @@ Function4adf7: ; 4adf7
ld a, [wd019]
bit 0, a
ret z
ld a, [PartyCount]
ld a, [wPartyCount]
inc a
ld [wMenuCursorY], a
ld a, $1

142
mobile/mobile_22.asm
View File

File diff suppressed because it is too large Load Diff

14
mobile/mobile_22_2.asm
View File

@@ -645,11 +645,11 @@ Palette_8b6d5: ; 8b6d5
; 8b6ed
Function8b6ed: ; 8b6ed
hlcoord 0, 0, AttrMap
hlcoord 0, 0, wAttrMap
ld bc, $012c
xor a
call ByteFill
hlcoord 0, 14, AttrMap
hlcoord 0, 14, wAttrMap
ld bc, $0050
ld a, $7
call ByteFill
@@ -709,7 +709,7 @@ Function8b73e: ; 8b73e
; 8b744
Function8b744: ; 8b744
ld de, AttrMap - TileMap
ld de, wAttrMap - wTileMap
add hl, de
inc b
inc b
@@ -781,10 +781,10 @@ Function8b788: ; 8b788
; 8b79e
Function8b79e: ; 8b79e
hlcoord 0, 1, AttrMap
hlcoord 0, 1, wAttrMap
ld a, $1
ld [hli], a
hlcoord 9, 1, AttrMap
hlcoord 9, 1, wAttrMap
ld e, $b
.asm_8b7a9
ld a, $2
@@ -853,7 +853,7 @@ Function8b7bd: ; 8b7bd
jr .asm_8b7ea
.asm_8b81c
ld a, [MenuSelection]
ld a, [wMenuSelection]
cp $ff
jr nz, .asm_8b824
@@ -931,7 +931,7 @@ MenuData2_0x8b870: ; 0x8b870
Function8b880: ; 8b880
ld h, d
ld l, e
ld de, MenuSelection
ld de, wMenuSelection
lb bc, PRINTNUM_LEADINGZEROS | 1, 2
call PrintNum
ret

440
mobile/mobile_40.asm
View File

File diff suppressed because it is too large Load Diff

12
mobile/mobile_41.asm
View File

@@ -7,7 +7,7 @@ StubbedTrainerRankings_HallOfFame2:: ; 0x105ef6
ld a, BANK(sTrainerRankingGameTimeHOF)
call GetSRAMBank
ld hl, GameTimeHours
ld hl, wGameTimeHours
ld de, sTrainerRankingGameTimeHOF
ld bc, 4
call CopyBytes
@@ -38,7 +38,7 @@ StubbedTrainerRankings_MagikarpLength: ; 105f33
ret
ld a, BANK(sTrainerRankingLongestMagikarp)
call GetSRAMBank
ld de, Buffer1
ld de, wBuffer1
ld hl, sTrainerRankingLongestMagikarp
; Is this Magikarp the longest measured?
@@ -270,7 +270,7 @@ StubbedTrainerRankings_TMsHMsTaught: ; 106049
StubbedTrainerRankings_Battles: ; 106050
ret
ld a, [BattleType]
ld a, [wBattleType]
cp BATTLETYPE_TUTORIAL ; Exclude the Dude’s tutorial battle
ret z
ld hl, sTrainerRankingBattles
@@ -278,7 +278,7 @@ StubbedTrainerRankings_Battles: ; 106050
StubbedTrainerRankings_WildBattles: ; 10605d
ret
ld a, [BattleType]
ld a, [wBattleType]
cp BATTLETYPE_TUTORIAL ; Exclude the Dude’s tutorial battle
ret z
ld hl, sTrainerRankingWildBattles
@@ -814,7 +814,7 @@ endr
Special_Mobile_DummyReturnFalse: ; 10630f
xor a
ld [ScriptVar], a
ld [wScriptVar], a
ret
; 106314
@@ -1071,7 +1071,7 @@ Function106464:: ; 106464
; 10649b
Function10649b: ; 10649b
ld a, [TextBoxFrame]
ld a, [wTextBoxFrame]
maskbits NUM_FRAMES
ld bc, 6 * LEN_1BPP_TILE
ld hl, Frames

66
mobile/mobile_42.asm
View File

@@ -91,11 +91,11 @@ RunMobileTradeAnim_Frontpics: ; 10805b
push af
xor a
ld [hMapAnims], a
ld hl, VramState
ld hl, wVramState
ld a, [hl]
push af
res 0, [hl]
ld hl, Options
ld hl, wOptions
ld a, [hl]
push af
set NO_TEXT_SCROLL, [hl]
@@ -104,9 +104,9 @@ RunMobileTradeAnim_Frontpics: ; 10805b
call MobileTradeAnim_JumptableLoop
jr nc, .loop
pop af
ld [Options], a
ld [wOptions], a
pop af
ld [VramState], a
ld [wVramState], a
pop af
ld [hMapAnims], a
ret
@@ -121,11 +121,11 @@ RunMobileTradeAnim_NoFrontpics: ; 108089
push af
xor a
ld [hMapAnims], a
ld hl, VramState
ld hl, wVramState
ld a, [hl]
push af
res 0, [hl]
ld hl, Options
ld hl, wOptions
ld a, [hl]
push af
set NO_TEXT_SCROLL, [hl]
@@ -134,9 +134,9 @@ RunMobileTradeAnim_NoFrontpics: ; 108089
call MobileTradeAnim_JumptableLoop
jr nc, .loop
pop af
ld [Options], a
ld [wOptions], a
pop af
ld [VramState], a
ld [wVramState], a
pop af
ld [hMapAnims], a
ret
@@ -292,8 +292,8 @@ MobileTradeAnim_GetFrontpic: ; 1081e9
push af
predef GetUnownLetter
pop af
ld [CurPartySpecies], a
ld [CurSpecies], a
ld [wCurPartySpecies], a
ld [wCurSpecies], a
call GetBaseData
pop de
predef GetMonFrontpic
@@ -305,8 +305,8 @@ Function108201: ; 108201
push af
predef GetUnownLetter
pop af
ld [CurPartySpecies], a
ld [CurSpecies], a
ld [wCurPartySpecies], a
ld [wCurSpecies], a
call GetBaseData
pop de
predef GetAnimatedFrontpic
@@ -314,7 +314,7 @@ Function108201: ; 108201
; 108219
Function108219: ; 108219
ld [CurPartySpecies], a
ld [wCurPartySpecies], a
hlcoord 7, 2
ld d, $0
ld e, ANIM_MON_TRADE
@@ -323,7 +323,7 @@ Function108219: ; 108219
; 108229
Function108229: ; 108229
ld [CurPartySpecies], a
ld [wCurPartySpecies], a
hlcoord 7, 2
ld d, $0
ld e, ANIM_MON_TRADE
@@ -335,7 +335,7 @@ MobileTradeAnim_InitSpeciesName: ; 108239
push de
ld [wd265], a
call GetPokemonName
ld hl, StringBuffer1
ld hl, wStringBuffer1
pop de
ld bc, MON_NAME_LENGTH
call CopyBytes
@@ -485,12 +485,12 @@ MobileTradeAnim_ShowPlayerMonToBeSent: ; 10830e
ld [hWY], a
call MobileTradeAnim_DisplayMonToBeSent
ld a, [wPlayerTrademonSpecies]
ld [CurPartySpecies], a
ld [wCurPartySpecies], a
call Function10895e
ld a, [wPlayerTrademonDVs]
ld [TempMonDVs], a
ld [wTempMonDVs], a
ld a, [wPlayerTrademonDVs + 1]
ld [TempMonDVs + 1], a
ld [wTempMonDVs + 1], a
ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
ld a, %11100100 ; 3,2,1,0
@@ -546,7 +546,7 @@ MobileTradeAnim_ShowOTMonFromTrade: ; 10839b
call DisableLCD
call MobileTradeAnim_ClearBGMap
ld a, [wOTTrademonSpecies]
ld [CurPartySpecies], a
ld [wCurPartySpecies], a
ld hl, wOTTrademonDVs
ld de, vTiles2
call Function108201
@@ -579,11 +579,11 @@ MobileTradeAnim_ShowOTMonFromTrade: ; 10839b
ld a, $50
ld [hWY], a
ld a, [wOTTrademonSpecies]
ld [CurPartySpecies], a
ld [wCurPartySpecies], a
ld a, [wOTTrademonDVs]
ld [TempMonDVs], a
ld [wTempMonDVs], a
ld a, [wOTTrademonDVs + 1]
ld [TempMonDVs + 1], a
ld [wTempMonDVs + 1], a
ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
ld a, %11100100 ; 3,2,1,0
@@ -610,7 +610,7 @@ MobileTradeAnim_ShowPlayerMonForGTS: ; 10842c
ld [hWY], a
call MobileTradeAnim_DisplayMonToBeSent
ld a, [wPlayerTrademonSpecies]
ld [CurPartySpecies], a
ld [wCurPartySpecies], a
ld hl, wPlayerTrademonDVs
call Function10898a
call DelayFrame
@@ -623,9 +623,9 @@ MobileTradeAnim_ShowPlayerMonForGTS: ; 10842c
lb bc, BANK(TradePoofGFX), 12
call Request2bpp
ld a, [wPlayerTrademonDVs]
ld [TempMonDVs], a
ld [wTempMonDVs], a
ld a, [wPlayerTrademonDVs + 1]
ld [TempMonDVs + 1], a
ld [wTempMonDVs + 1], a
ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
ld a, %11100100 ; 3,2,1,0
@@ -681,7 +681,7 @@ MobileTradeAnim_ShowOTMonFromGTS: ; 1084d7
call DisableLCD
call MobileTradeAnim_ClearBGMap
ld a, [wOTTrademonSpecies]
ld [CurPartySpecies], a
ld [wCurPartySpecies], a
ld hl, wOTTrademonDVs
ld de, vTiles2
call Function108201
@@ -723,11 +723,11 @@ MobileTradeAnim_ShowOTMonFromGTS: ; 1084d7
ld a, $50
ld [hWY], a
ld a, [wOTTrademonSpecies]
ld [CurPartySpecies], a
ld [wCurPartySpecies], a
ld a, [wOTTrademonDVs]
ld [TempMonDVs], a
ld [wTempMonDVs], a
ld a, [wOTTrademonDVs + 1]
ld [TempMonDVs + 1], a
ld [wTempMonDVs + 1], a
ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
ld a, %11100100 ; 3,2,1,0
@@ -750,7 +750,7 @@ MobileTradeAnim_GetOddEgg: ; 108589
call DisableLCD
call MobileTradeAnim_ClearBGMap
ld a, [wOTTrademonSpecies]
ld [CurPartySpecies], a
ld [wCurPartySpecies], a
ld hl, wOTTrademonDVs
ld de, vTiles2
call Function108201
@@ -792,11 +792,11 @@ MobileTradeAnim_GetOddEgg: ; 108589
ld a, $50
ld [hWY], a
ld a, [wOTTrademonSpecies]
ld [CurPartySpecies], a
ld [wCurPartySpecies], a
ld a, [wOTTrademonDVs]
ld [TempMonDVs], a
ld [wTempMonDVs], a
ld a, [wOTTrademonDVs + 1]
ld [TempMonDVs + 1], a
ld [wTempMonDVs + 1], a
ld b, SCGB_PLAYER_OR_MON_FRONTPIC_PALS
call GetSGBLayout
ld a, %11100100 ; 3,2,1,0

112
mobile/mobile_45.asm
View File

@@ -895,7 +895,7 @@ Function1145c5: ; 1145c5
.asm_114636
ld a, b
ld [PartyMon5Defense], a
ld [wPartyMon5Defense], a
xor a
ret
@@ -906,7 +906,7 @@ Function11463c: ; 11463c
push af
push de
ld hl, $ddc8
ld a, [PartyMon5Defense]
ld a, [wPartyMon5Defense]
ld b, a
.asm_114648
ld a, [de]
@@ -2050,7 +2050,7 @@ Function114c55: ; 114c55
; 114c5e
Function114c5e: ; 114c5e
ld de, PartyMon5Defense
ld de, wPartyMon5Defense
push hl
.asm_114c62
ld a, [hli]
@@ -2133,7 +2133,7 @@ Function114c5e: ; 114c5e
.asm_114cc6
ld [de], a
pop hl
ld de, PartyMon5Defense
ld de, wPartyMon5Defense
ld bc, NULL
.asm_114cce
inc bc
@@ -2194,7 +2194,7 @@ endr
ld e, a
ld a, [hli]
ld d, a
ld hl, PartyMon5Defense
ld hl, wPartyMon5Defense
call Function115d6a
xor a
jp Function11425c
@@ -2287,7 +2287,7 @@ Function114d39: ; 114d39
; 114d99
Function114d99: ; 114d99
ld de, PartyMon5Defense
ld de, wPartyMon5Defense
xor a
ld [de], a
.asm_114d9e
@@ -2321,17 +2321,17 @@ Function114d99: ; 114d99
.asm_114dc4
pop hl
ld a, [PartyMon5Defense]
ld a, [wPartyMon5Defense]
and a
jr z, .asm_114dd2
ld a, $2c
inc de
ld [de], a
ld a, [PartyMon5Defense]
ld a, [wPartyMon5Defense]
.asm_114dd2
inc a
ld [PartyMon5Defense], a
ld [wPartyMon5Defense], a
.asm_114dd6
inc de
ld a, [hli]
@@ -2453,14 +2453,14 @@ Function114e62: ; 114e62
ld a, c
and a
jr nz, .asm_114e6f
ld a, [wStartDay]
ld a, [wTimerEventStartDay]
and a
jp z, Function11425c
jr .asm_114e76
.asm_114e6f
xor a
ld [wStartDay], a
ld [wTimerEventStartDay], a
call Function114ee9
.asm_114e76
@@ -2532,7 +2532,7 @@ Function114ea0: ; 114ea0
ld [hli], a
ld [hl], b
xor a
ld [wStartDay], a
ld [wTimerEventStartDay], a
ret
.asm_114edb
@@ -2656,7 +2656,7 @@ Function114f39: ; 114f39
; 114f59
Function114f59: ; 114f59
ld a, [wStartDay]
ld a, [wTimerEventStartDay]
and a
jr nz, .asm_114f7c
ld a, [$dc03]
@@ -2674,7 +2674,7 @@ Function114f59: ; 114f59
and a
jr nz, .asm_114fe7
ld a, $1
ld [wStartDay], a
ld [wTimerEventStartDay], a
.asm_114f7c
ld a, [$dc03]
@@ -2856,7 +2856,7 @@ Function115062: ; 115062
ld d, [hl]
ld b, $0
ld hl, $dc24
ld a, [wStartDay]
ld a, [wTimerEventStartDay]
cp $1
jr z, .asm_11509b
cp $2
@@ -2881,14 +2881,14 @@ Function115062: ; 115062
call Function115d53
call Function1150b3
call Function115136
ld a, [wStartDay]
ld a, [wTimerEventStartDay]
inc a
cp $4
jr nz, .asm_1150ae
ld a, $2
.asm_1150ae
ld [wStartDay], a
ld [wTimerEventStartDay], a
xor a
.asm_1150b2
@@ -2898,7 +2898,7 @@ Function115062: ; 115062
Function1150b3: ; 1150b3
ld hl, $dc24
ld de, PartyMon5Defense
ld de, wPartyMon5Defense
ld b, $0
.asm_1150bb
ld c, $0
@@ -3014,7 +3014,7 @@ Function115136: ; 115136
ld c, a
ld a, [hli]
ld b, a
ld hl, PartyMon5Defense
ld hl, wPartyMon5Defense
.asm_11514d
ld a, [hli]
and a
@@ -3383,7 +3383,7 @@ Function1152b8: ; 1152b8
call Function114ea0
and a
jr nz, .asm_1152f9
ld [wStartDay], a
ld [wTimerEventStartDay], a
ld a, [$dc03]
cp $6
jr nz, .asm_1152ca
@@ -3391,7 +3391,7 @@ Function1152b8: ; 1152b8
.asm_115335
call Function1153b5
xor a
ld [wStartDay], a
ld [wTimerEventStartDay], a
call Function114f59
and a
jr nz, .asm_1152f9
@@ -3409,7 +3409,7 @@ Function1152b8: ; 1152b8
jr z, .asm_11536b
call Function1153b5
xor a
ld [wStartDay], a
ld [wTimerEventStartDay], a
call Function114f59
and a
jr nz, .asm_1152f9
@@ -3480,7 +3480,7 @@ Function11537d: ; 11537d
ld [hl], d
xor a
ld [$dc03], a
ld [wStartDay], a
ld [wTimerEventStartDay], a
ret
; 1153b5
@@ -3702,7 +3702,7 @@ Function1153d2: ; 1153d2
Function1154d4: ; 1154d4
xor a
ld [wStartDay], a
ld [wTimerEventStartDay], a
call Function1155af
call Function11560a
and a
@@ -4038,7 +4038,7 @@ Function11560a: ; 11560a
; 1156cc
Function1156cc: ; 1156cc
ld a, [wStartDay]
ld a, [wTimerEventStartDay]
and a
jp z, Function11425c
cp $2
@@ -4067,7 +4067,7 @@ Function1156cc: ; 1156cc
call Function11581e
and a
jr nz, .asm_11572b
ld a, [wStartDay]
ld a, [wTimerEventStartDay]
cp $5
jr z, .asm_115716
ld a, [wDecoPoster]
@@ -4091,7 +4091,7 @@ Function1156cc: ; 1156cc
ld l, a
add hl, de
xor a
ld [wStartDay], a
ld [wTimerEventStartDay], a
jp Function11425c
.asm_11572b
@@ -4228,7 +4228,7 @@ Function11575c: ; 11575c
pop hl
add hl, bc
ld a, $2
ld [wStartDay], a
ld [wTimerEventStartDay], a
ret
; 1157d0
@@ -4277,7 +4277,7 @@ Function1157d0: ; 1157d0
ld a, b
ld [wDecoBed], a
ld a, $4
ld [wStartDay], a
ld [wTimerEventStartDay], a
ret
.asm_11580f
@@ -4287,13 +4287,13 @@ Function1157d0: ; 1157d0
ld a, b
ld [wDecoBed], a
ld a, $3
ld [wStartDay], a
ld [wTimerEventStartDay], a
ret
; 11581e
Function11581e: ; 11581e
ld a, [wStartDay]
ld a, [wTimerEventStartDay]
and a
ret z
ld a, [$dc0e]
@@ -4319,9 +4319,9 @@ Function11581e: ; 11581e
inc hl
ld [hl], d
ld hl, $dc24
ld de, PartyMon5Defense
ld de, wPartyMon5Defense
call Function1158c2
ld hl, PartyMon5Defense
ld hl, wPartyMon5Defense
ld c, [hl]
inc hl
ld b, [hl]
@@ -4362,7 +4362,7 @@ Function11581e: ; 11581e
ld e, [hl]
inc hl
ld d, [hl]
ld hl, PartyMon5Speed
ld hl, wPartyMon5Speed
call Function115d6a
ld hl, wCurrMapSceneScriptCount
ld a, [wCurrMapBGEventCount]
@@ -4370,7 +4370,7 @@ Function11581e: ; 11581e
ld a, e
ld [hli], a
ld [hl], d
ld a, [wStartDay]
ld a, [wTimerEventStartDay]
cp $3
jr z, .asm_1158b4
cp $4
@@ -4379,12 +4379,12 @@ Function11581e: ; 11581e
.asm_1158ad
ld a, $5
ld [wStartDay], a
ld [wTimerEventStartDay], a
jr .asm_1158b9
.asm_1158b4
ld a, $2
ld [wStartDay], a
ld [wTimerEventStartDay], a
.asm_1158b9
xor a
@@ -4395,7 +4395,7 @@ Function11581e: ; 11581e
.asm_1158bc
ld a, $ff
ld [wStartDay], a
ld [wTimerEventStartDay], a
ret
; 1158c2
@@ -4641,7 +4641,7 @@ Function1159dc: ; 1159dc
; 1159fb
Function1159fb: ; 1159fb
ld a, [wStartDay]
ld a, [wTimerEventStartDay]
and a
jp z, Function11425c
cp $2
@@ -4670,7 +4670,7 @@ Function1159fb: ; 1159fb
call Function115b00
and a
jr nz, .asm_115a5a
ld a, [wStartDay]
ld a, [wTimerEventStartDay]
cp $5
jr z, .asm_115a45
ld a, [wDecoPoster]
@@ -4694,7 +4694,7 @@ Function1159fb: ; 1159fb
ld l, a
add hl, de
xor a
ld [wStartDay], a
ld [wTimerEventStartDay], a
jp Function11425c
.asm_115a5a
@@ -4759,7 +4759,7 @@ Function115a5f: ; 115a5f
rl b
add hl, bc
ld a, $2
ld [wStartDay], a
ld [wTimerEventStartDay], a
ret
; 115ab0
@@ -4808,7 +4808,7 @@ Function115ab0: ; 115ab0
ld a, b
ld [wDecoBed], a
ld a, $4
ld [wStartDay], a
ld [wTimerEventStartDay], a
xor a
ret
@@ -4819,14 +4819,14 @@ Function115ab0: ; 115ab0
ld a, b
ld [wDecoBed], a
ld a, $3
ld [wStartDay], a
ld [wTimerEventStartDay], a
xor a
ret
; 115b00
Function115b00: ; 115b00
ld a, [wStartDay]
ld a, [wTimerEventStartDay]
and a
ret z
ld a, [$dc0e]
@@ -4841,7 +4841,7 @@ Function115b00: ; 115b00
ld e, [hl]
inc hl
ld d, [hl]
ld hl, PartyMon5Defense
ld hl, wPartyMon5Defense
push bc
call Function115bc8
pop hl
@@ -4849,7 +4849,7 @@ Function115b00: ; 115b00
jr z, .asm_115b43
cp $2
jr z, .asm_115b3b
ld a, [wStartDay]
ld a, [wTimerEventStartDay]
cp $4
jr z, .asm_115b43
inc hl
@@ -4866,7 +4866,7 @@ Function115b00: ; 115b00
.asm_115b3d
ld a, $ff
ld [wStartDay], a
ld [wTimerEventStartDay], a
ret
.asm_115b43
@@ -4885,7 +4885,7 @@ Function115b00: ; 115b00
ld [hl], e
inc hl
ld [hl], d
ld hl, PartyMon5Defense
ld hl, wPartyMon5Defense
ld de, $dc24
call Function115c49
ld hl, $dc24
@@ -4937,7 +4937,7 @@ Function115b00: ; 115b00
ld a, e
ld [hli], a
ld [hl], d
ld a, [wStartDay]
ld a, [wTimerEventStartDay]
cp $3
jr z, .asm_115bc1
cp $4
@@ -4946,12 +4946,12 @@ Function115b00: ; 115b00
.asm_115bba
ld a, $5
ld [wStartDay], a
ld [wTimerEventStartDay], a
jr .asm_115bc6
.asm_115bc1
ld a, $2
ld [wStartDay], a
ld [wTimerEventStartDay], a
.asm_115bc6
xor a
@@ -5018,7 +5018,7 @@ Function115bc8: ; 115bc8
jr nz, .asm_115bcc
.asm_115c1b
ld a, [wStartDay]
ld a, [wTimerEventStartDay]
cp $4
jr z, .asm_115c33
ld a, [de]
@@ -5122,7 +5122,7 @@ endr
.asm_115c99
ld a, $ff
ld [wStartDay], a
ld [wTimerEventStartDay], a
ret
.asm_115c9f
@@ -5226,7 +5226,7 @@ Function115cfd: ; 115cfd
pop hl
pop hl
ld a, $ff
ld [wStartDay], a
ld [wTimerEventStartDay], a
ret
.asm_115d2f
@@ -7030,7 +7030,7 @@ Function1177b7: ; 1177b7 (45:77b7)
Function1177cb: ; 1177cb (45:77cb)
ld a, $80
ld [wcd49], a
ld [ScriptVar], a
ld [wScriptVar], a
jp MobilePassword_IncrementJumptable
Function117764_b_button: ; 1177d6 (45:77d6)

40
mobile/mobile_45_sprite_engine.asm
View File

@@ -22,7 +22,7 @@ Function115dc3: ; 115dc3
xor a
ld [wc305], a
ld a, $a0
ld hl, Sprite32
ld hl, wSprite32
ld bc, 8 * SPRITEOAMSTRUCT_LENGTH
call ByteFill
ret
@@ -34,7 +34,7 @@ Function115dd3: ; 115dd3
and a
ret z
ld a, $a0
ld hl, Sprite32
ld hl, wSprite32
ld bc, 8 * SPRITEOAMSTRUCT_LENGTH
call ByteFill
call Function115e22
@@ -50,7 +50,7 @@ Function115dd3: ; 115dd3
ld d, a
push de
pop hl
ld de, Sprite32
ld de, wSprite32
ld a, [wc307]
ld c, a
ld a, [wc308]
@@ -493,12 +493,12 @@ Function1161d5: ; 1161d5
farcall ReloadMapPart
ld a, $8
ld [MusicFade], a
ld [wMusicFade], a
ld de, MUSIC_MOBILE_ADAPTER
ld a, e
ld [MusicFadeID], a
ld [wMusicFadeID], a
ld a, d
ld [MusicFadeID + 1], a
ld [wMusicFadeID + 1], a
ld a, [$c319]
inc a
ld [$c319], a
@@ -585,7 +585,7 @@ Function1162f2: ; 1162f2
ld e, a
ld a, [hli]
sub e
ld de, Sprite10
ld de, wSprite10
.asm_116321
push af
ld a, [hli]
@@ -626,7 +626,7 @@ Function1162f2: ; 1162f2
ld e, a
ld a, [hli]
sub e
ld de, Sprite01
ld de, wSprite01
.asm_11635a
push af
ld a, [hli]
@@ -677,11 +677,11 @@ Function11636e: ; 11636e
ld [rSVBK], a
farcall ReloadMapPart
ld a, $8
ld [MusicFade], a
ld [wMusicFade], a
ld a, [wMapMusic]
ld [MusicFadeID], a
ld [wMusicFadeID], a
xor a
ld [MusicFadeID + 1], a
ld [wMusicFadeID + 1], a
xor a
ld [$c319], a
ld [wc30d], a
@@ -725,20 +725,20 @@ Function1163c0: ; 1163c0
cp $4
jr z, .asm_11642a
ld a, $8
ld [MusicFade], a
ld [wMusicFade], a
ld a, [wMapMusic]
ld [MusicFadeID], a
ld [wMusicFadeID], a
xor a
ld [MusicFadeID + 1], a
ld [wMusicFadeID + 1], a
jr .asm_116439
.asm_11642a
ld a, $8
ld [MusicFade], a
ld [wMusicFade], a
ld a, $0
ld [MusicFadeID], a
ld [wMusicFadeID], a
ld a, $0
ld [MusicFadeID + 1], a
ld [wMusicFadeID + 1], a
.asm_116439
xor a
@@ -754,11 +754,11 @@ Function116441: ; 116441
ld [hWY], a
farcall ReloadMapPart
ld a, $8
ld [MusicFade], a
ld [wMusicFade], a
ld a, [wMapMusic]
ld [MusicFadeID], a
ld [wMusicFadeID], a
xor a
ld [MusicFadeID + 1], a
ld [wMusicFadeID + 1], a
xor a
ld [$c319], a
ld [wc30d], a

162
mobile/mobile_46.asm
View File

File diff suppressed because it is too large Load Diff

26
mobile/mobile_5b.asm
View File

@@ -83,7 +83,7 @@ Unreferenced_Function16c000: ; 16c000
Function16c089: ; 16c089
ld a, $1
ld [Buffer2], a
ld [wBuffer2], a
ld [wd1f1], a
xor a
ld [hWY], a
@@ -103,7 +103,7 @@ Function16c09e: ; 16c09e
Function16c0a8: ; 16c0a8
xor a
ld [Buffer2], a
ld [wBuffer2], a
ld [wd1f1], a
call ClearSprites
ld a, $90
@@ -200,7 +200,7 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
ld bc, 20
xor a
call ByteFill
ld hl, .TileMap
ld hl, .wTileMap
decoord 0, 1
ld bc, $0154
call CopyBytes
@@ -208,12 +208,12 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
; 16c15c
.LoadAttrMap: ; 16c15c
hlcoord 0, 0, AttrMap
hlcoord 0, 0, wAttrMap
ld bc, SCREEN_WIDTH
xor a
call ByteFill
ld hl, .AttrMap
decoord 0, 1, AttrMap
ld hl, .wAttrMap
decoord 0, 1, wAttrMap
ld bc, 17 * SCREEN_WIDTH
call CopyBytes
ret
@@ -222,10 +222,10 @@ MobileSystemSplashScreen_InitGFX: ; 16c108
.Tiles:
INCBIN "gfx/mobile/mobile_splash.2bpp"
.TileMap:
.wTileMap:
INCBIN "gfx/mobile/mobile_splash.tilemap"
.AttrMap:
.wAttrMap:
INCBIN "gfx/mobile/mobile_splash.attrmap"
UnknownMobilePalettes_16c903: ; 16c903
@@ -543,8 +543,8 @@ Function16cb08: ; 16cb08
Function16cb0f: ; 16cb0f
xor a
ld [Buffer1], a
ld [Buffer2], a
ld [wBuffer1], a
ld [wBuffer2], a
xor a
ld [wd1ec], a
ld a, $70
@@ -559,7 +559,7 @@ Function16cb0f: ; 16cb0f
; 16cb2e
Function16cb2e: ; 16cb2e
ld a, [Buffer2]
ld a, [wBuffer2]
and a
ret z
call Function16cb40
@@ -754,7 +754,7 @@ Function16cc5a: ; 16cc5a
; 16cc62
Function16cc62: ; 16cc62
hlcoord 0, 15, AttrMap
hlcoord 0, 15, wAttrMap
ld bc, $0028
ld a, $1
call ByteFill
@@ -776,7 +776,7 @@ Function16cc73:
pop hl
ld a, $1
ld [rVBK], a
decoord 0, 0, AttrMap
decoord 0, 0, wAttrMap
call Function16cc90
pop af
ld [rVBK], a

16
mobile/mobile_5c.asm
View File

@@ -131,7 +131,7 @@ Function170c06: ; 170c06
xor a
ld [wd265], a
.asm_170c30
ld hl, PartyMon1HP
ld hl, wPartyMon1HP
ld a, [wd265]
call GetPartyLocation
ld a, [hli]
@@ -181,7 +181,7 @@ Function170c06: ; 170c06
ld b, $0
ld c, $0
.asm_170c6f
ld hl, PartyMon1HP
ld hl, wPartyMon1HP
ld a, b
push bc
call GetPartyLocation
@@ -206,7 +206,7 @@ Function170c06: ; 170c06
; 170c8b
Function170c8b: ; 170c8b
ld hl, LastEnemyCounterMove
ld hl, wLastEnemyCounterMove
ld b, $5
.asm_170c90
ld a, [hl]
@@ -698,7 +698,7 @@ Function171c87: ; 171c87 (5c:5c87)
ld bc, $168
call CopyBytes
ld hl, Attrmap_1727ed
decoord 0, 0, AttrMap
decoord 0, 0, wAttrMap
ld bc, $168
call CopyBytes
hlcoord 3, 2
@@ -718,7 +718,7 @@ Function171ccd: ; 171ccd (5c:5ccd)
ld de, wBGPals1
ld bc, 8 palettes
call CopyBytes
ld hl, EngineBuffer5
ld hl, wEngineBuffer5
ld a, $ff
ld [hli], a
ld a, $7f
@@ -770,7 +770,7 @@ Function171d2b: ; 171d2b (5c:5d2b)
ld bc, $168
call CopyBytes
ld hl, Attrmap_172955
decoord 0, 0, AttrMap
decoord 0, 0, wAttrMap
ld bc, $168
call CopyBytes
hlcoord 2, 2
@@ -856,7 +856,7 @@ Function172e78: ; 172e78 (5c:6e78)
ld bc, $168
call ByteFill
ld a, $7
hlcoord 0, 0, AttrMap
hlcoord 0, 0, wAttrMap
ld bc, $168
call ByteFill
call DisableLCD
@@ -870,7 +870,7 @@ Function172e78: ; 172e78 (5c:6e78)
ld bc, $168
call CopyBytes
ld hl, Attrmap_173517
decoord 0, 0, AttrMap
decoord 0, 0, wAttrMap
ld bc, $168
call CopyBytes
ret

22
mobile/mobile_5e.asm
View File

@@ -7,7 +7,7 @@ Function17a68f:: ; 17a68f (5e:668f)
ld hl, $d088
bit 5, [hl]
jr z, .asm_17a6a6
ld de, StringBuffer1 ; $d073
ld de, wStringBuffer1 ; $d073
push de
call Function17a721
pop de
@@ -21,11 +21,11 @@ Function17a68f:: ; 17a68f (5e:668f)
Function17a6a8: ; 17a6a8 (5e:66a8)
push de
push bc
ld hl, StringBuffer2 ; $d086
ld hl, wStringBuffer2 ; $d086
ld bc, $a
xor a
call ByteFill
ld hl, Buffer1
ld hl, wBuffer1
ld bc, $10
ld a, $ff
call ByteFill
@@ -50,7 +50,7 @@ Function17a6a8: ; 17a6a8 (5e:66a8)
ret
Function17a6f5: ; 17a6f5 (5e:66f5)
ld hl, Buffer1
ld hl, wBuffer1
ld c, $0
ld b, $8
.asm_17a6fc
@@ -91,7 +91,7 @@ Function17a721: ; 17a721 (5e:6721)
ld a, $ff
call ByteFill
pop de
ld hl, Buffer1
ld hl, wBuffer1
ld b, $8
.asm_17a732
ld c, $0
@@ -443,7 +443,7 @@ Function17a943: ; 17a943 (5e:6943)
ld [$d08c], a
ld c, a
ld b, $0
ld hl, Buffer1
ld hl, wBuffer1
add hl, bc
ld [hl], $ff
ld a, $2
@@ -465,7 +465,7 @@ Function17a964: ; 17a964 (5e:6964)
ld b, $0
inc a
ld [$d08c], a
ld hl, Buffer1
ld hl, wBuffer1
add hl, bc
ld [hl], e
and a
@@ -480,7 +480,7 @@ Function17a97b: ; 17a97b (5e:697b)
lb bc, 2, 18
call ClearBox
hlcoord 3, 2
ld de, Buffer1
ld de, wBuffer1
ld a, [$d08c]
and a
ret z
@@ -663,7 +663,7 @@ Function17aaa9: ; 17aaa9 (5e:6aa9)
call Function17aae3
ld c, a
ld b, $0
hlcoord 0, 0, AttrMap
hlcoord 0, 0, wAttrMap
add hl, bc
push hl
ld a, $4
@@ -806,10 +806,10 @@ Function17ac1d: ; 17ac1d (5e:6c1d)
Function17ac2a: ; 17ac2a (5e:6c2a)
ld hl, Tilemap_17ae3d
decoord 0, 4, AttrMap
decoord 0, 4, wAttrMap
ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH
call CopyBytes
hlcoord 0, 4, AttrMap
hlcoord 0, 4, wAttrMap
ld bc, (SCREEN_HEIGHT - 4) * SCREEN_WIDTH
.loop
ld a, [hl]

168
mobile/mobile_5f.asm
View File

File diff suppressed because it is too large Load Diff

26
mobile/mobile_menu.asm
View File

@@ -190,8 +190,8 @@ Function4a0c2: ; 4a0c2 (12:60c2)
call MenuClickSound
ld a, BANK(sPlayerData)
call GetSRAMBank
ld hl, sPlayerData + PlayerName - wPlayerData
ld de, PlayerName
ld hl, sPlayerData + wPlayerName - wPlayerData
ld de, wPlayerName
ld bc, NAME_LENGTH_JAPANESE
call CopyBytes
call CloseSRAM
@@ -637,13 +637,13 @@ Function4a492: ; 4a492 (12:6492)
MainMenu_MobileStudium: ; 4a496
ld a, [StartDay]
ld a, [wStartDay]
ld b, a
ld a, [StartHour]
ld a, [wStartHour]
ld c, a
ld a, [StartMinute]
ld a, [wStartMinute]
ld d, a
ld a, [StartSecond]
ld a, [wStartSecond]
ld e, a
push bc
push de
@@ -652,13 +652,13 @@ MainMenu_MobileStudium: ; 4a496
pop de
pop bc
ld a, b
ld [StartDay], a
ld [wStartDay], a
ld a, c
ld [StartHour], a
ld [wStartHour], a
ld a, d
ld [StartMinute], a
ld [wStartMinute], a
ld a, e
ld [StartSecond], a
ld [wStartSecond], a
ret
; 4a4c4
@@ -852,11 +852,11 @@ Function4a6ab: ; 4a6ab (12:66ab)
Function4a6c5: ; 4a6c5 (12:66c5)
ld a, $5
ld [MusicFade], a
ld [wMusicFade], a
ld a, e
ld [MusicFadeID], a
ld [wMusicFadeID], a
ld a, d
ld [MusicFadeID + 1], a
ld [wMusicFadeID + 1], a
ld c, 22
call DelayFrames
ret