You've already forked pokecrystal-board
mirror of
https://gitlab.com/xCrystal/pokecrystal-board.git
synced 2025-09-08 08:13:02 -07:00
Merge branch 'master' of https://github.com/xCrystal/pokecrystal (resolve PR #459)
# Conflicts: # data/items/descriptions.asm # data/sprite_anims/framesets.asm # engine/crystal_colors.asm # engine/events/kurt.asm # engine/events/special.asm # engine/events/std_scripts.asm # engine/events_3.asm # engine/item_effects.asm # engine/namingscreen.asm # engine/scripting.asm # engine/stats_screen.asm # engine/trade_animation.asm # home/audio.asm # main.asm # maps/BattleTower1F.asm # maps/BattleTowerBattleRoom.asm # maps/BurnedTowerB1F.asm # maps/ElmsLab.asm # maps/GoldenrodDeptStore5F.asm # maps/GoldenrodUnderground.asm # maps/HallOfFame.asm # maps/MahoganyTown.asm # maps/ManiasHouse.asm # maps/MobileBattleRoom.asm # maps/MobileTradeRoomMobile.asm # maps/RadioTower2F.asm # maps/Route35NationalParkGate.asm # maps/Route36NationalParkGate.asm # maps/Route39Farmhouse.asm # tilesets/palette_maps.asm
This commit is contained in:
@@ -33,8 +33,7 @@ Function11c075: ; 11c075
|
||||
ret
|
||||
; 11c082
|
||||
|
||||
Function11c082: ; 11c082
|
||||
; XXX
|
||||
Unreferenced_Function11c082: ; 11c082
|
||||
push de
|
||||
ld a, c
|
||||
call Function11c254
|
||||
@@ -275,7 +274,7 @@ CopyMobileEZChatToC608: ; 11c156
|
||||
jr .copy_string
|
||||
; 11c1ab
|
||||
|
||||
Function11c1ab: ; 11c1ab
|
||||
Special_Function11c1ab: ; 11c1ab
|
||||
ld a, [hInMenu]
|
||||
push af
|
||||
ld a, $1
|
||||
|
@@ -1615,9 +1615,8 @@ Function48c63: ; 48c63
|
||||
ret
|
||||
; 48c8e
|
||||
|
||||
Function48c8e: ; 48c8e
|
||||
; unreferenced
|
||||
ld hl, $d02a
|
||||
Unreferenced_Function48c8e: ; 48c8e
|
||||
ld hl, wd019 + $11
|
||||
ld d, h
|
||||
ld e, l
|
||||
farcall Function48c63
|
||||
|
@@ -159,7 +159,7 @@ MobileCheckOwnMonAnywhere: ; 4a843
|
||||
ret
|
||||
; 4a927
|
||||
|
||||
FindItemInPCOrBag: ; 4a927
|
||||
UnusedSpecial_FindItemInPCOrBag: ; 4a927
|
||||
ld a, [ScriptVar]
|
||||
ld [CurItem], a
|
||||
ld hl, PCItems
|
||||
|
@@ -1227,7 +1227,7 @@ Function897af: ; 897af
|
||||
xor a
|
||||
ld [CurPartySpecies], a
|
||||
ld de, vTiles2 tile $37
|
||||
farcall GetTrainerPic
|
||||
farcall Predef_GetTrainerPic
|
||||
pop bc
|
||||
ret
|
||||
; 897d5
|
||||
@@ -1259,7 +1259,7 @@ Function897d5: ; 897d5
|
||||
ld [hGraphicStartTile], a
|
||||
hlcoord 12, 3
|
||||
lb bc, 7, 7
|
||||
predef PlaceGraphic
|
||||
predef Predef_PlaceGraphic
|
||||
call Function8963d
|
||||
pop bc
|
||||
ret
|
||||
|
@@ -1,6 +1,6 @@
|
||||
Function8b342:: ; 8b342
|
||||
; Loads the secondary map header pointer, then runs through a
|
||||
; dw with three dummy functions. Spends a lot of energy
|
||||
; dw with three dummy functions. Spends a lot of energy
|
||||
; doing pretty much nothing.
|
||||
call GetSecondaryMapHeaderPointer
|
||||
ld d, h
|
||||
@@ -26,15 +26,15 @@ Function8b342:: ; 8b342
|
||||
; 8b35a
|
||||
|
||||
.zero ; 8b35a
|
||||
mobile
|
||||
ret
|
||||
; 8b35b
|
||||
|
||||
.one ; 8b35b
|
||||
mobile
|
||||
ret
|
||||
; 8b35c
|
||||
|
||||
.two ; 8b35c
|
||||
mobile
|
||||
ret
|
||||
; 8b35d
|
||||
|
||||
Function8b35d: ; 8b35d
|
||||
|
@@ -40,7 +40,7 @@ Function100022: ; 100022
|
||||
ld a, b
|
||||
ld [wcd24], a
|
||||
farcall Function10127e
|
||||
farcall MobileFunc_106462
|
||||
farcall Stubbed_Function106462
|
||||
farcall Function106464 ; load broken gfx
|
||||
farcall Function11615a ; init RAM
|
||||
ld hl, VramState
|
||||
@@ -318,7 +318,7 @@ Function10016f: ; 10016f
|
||||
Function10020b: ; 10020b
|
||||
xor a
|
||||
ld [wc303], a
|
||||
farcall FadeOutPalettes
|
||||
farcall Special_FadeOutPalettes
|
||||
farcall Function106464
|
||||
call HideSprites
|
||||
call DelayFrame
|
||||
@@ -1985,7 +1985,7 @@ Function100c74: ; 100c74
|
||||
ld a, SCREEN_WIDTH * 2
|
||||
ld [Buffer1], a
|
||||
hlcoord 2, 10
|
||||
predef ListMoves
|
||||
predef Predef_ListMoves
|
||||
ret
|
||||
; 100c98
|
||||
|
||||
@@ -2803,7 +2803,7 @@ LoadSelectedPartiesForColosseum: ; 1010f2
|
||||
ret
|
||||
; 1011f1
|
||||
|
||||
Function1011f1: ; 1011f1
|
||||
Special_Function1011f1: ; 1011f1
|
||||
ld a, $04
|
||||
call GetSRAMBank
|
||||
ld a, [$a60c]
|
||||
@@ -2827,20 +2827,20 @@ Function1011f1: ; 1011f1
|
||||
ret
|
||||
; 101220
|
||||
|
||||
Function101220: ; 101220
|
||||
Special_Function101220: ; 101220
|
||||
xor a
|
||||
ld [wLinkMode], a
|
||||
ret
|
||||
; 101225
|
||||
|
||||
Function101225: ; 101225
|
||||
Special_Function101225: ; 101225
|
||||
ld d, 1
|
||||
ld e, BANK(Jumptable_101297)
|
||||
ld bc, Jumptable_101297
|
||||
call Function100000
|
||||
jr Function10123d
|
||||
|
||||
Function101231: ; 101231
|
||||
Special_Function101231: ; 101231
|
||||
ld d, 2
|
||||
ld e, BANK(Jumptable_101297)
|
||||
ld bc, Jumptable_101297
|
||||
@@ -2871,7 +2871,7 @@ Function101251: ; 101251
|
||||
call Function1021e0
|
||||
call Function1020ea
|
||||
ret c
|
||||
call Function102142
|
||||
call Special_Function102142
|
||||
ret
|
||||
; 101265
|
||||
|
||||
@@ -3076,7 +3076,7 @@ Function1013aa: ; 1013aa
|
||||
|
||||
Function1013c0: ; 1013c0
|
||||
farcall BlankScreen
|
||||
farcall MobileFunc_106462
|
||||
farcall Stubbed_Function106462
|
||||
farcall Function106464
|
||||
call FinishExitMenu
|
||||
ret
|
||||
@@ -3092,7 +3092,7 @@ Function1013dd: ; 1013dd
|
||||
ret
|
||||
; 1013e1
|
||||
|
||||
Function1013e1: ; 1013e1 ; unreferenced
|
||||
Unreferenced_Function1013e1: ; 1013e1
|
||||
push de
|
||||
inc de
|
||||
ld b, a
|
||||
@@ -3129,7 +3129,7 @@ Function1013f5: ; 1013f5
|
||||
ret
|
||||
; 101400
|
||||
|
||||
Function101400: ; 101400 ; unreferenced
|
||||
Unreferenced_Function101400: ; 101400
|
||||
ld a, [de]
|
||||
inc de
|
||||
cp [hl]
|
||||
@@ -3317,7 +3317,7 @@ Function101507: ; 101507
|
||||
ret
|
||||
; 10151d
|
||||
|
||||
Function10151d: ; 10151d ; unreferenced
|
||||
Unreferenced_Function10151d: ; 10151d
|
||||
ld a, $34
|
||||
call Function3e32
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
@@ -3512,7 +3512,7 @@ Function101663: ; 101663
|
||||
ret
|
||||
; 101674
|
||||
|
||||
Function101674: ; 101674 ; unreferenced
|
||||
Unreferenced_Function101674: ; 101674
|
||||
ld a, $05
|
||||
ld hl, w5_dc00
|
||||
call Function101635
|
||||
@@ -4401,7 +4401,7 @@ Function101cbc: ; 101cbc
|
||||
ret
|
||||
; 101cc2
|
||||
|
||||
Function101cc2: ; 101cc2 ; unreferenced
|
||||
Unreferenced_Function101cc2: ; 101cc2
|
||||
ld a, $02
|
||||
ld [wcd2b], a
|
||||
ret
|
||||
@@ -4682,7 +4682,7 @@ Function101e64: ; 101e64
|
||||
ret
|
||||
; 101e82
|
||||
|
||||
Function101e82: ; 101e82 ; unreferenced
|
||||
Unreferenced_Function101e82: ; 101e82
|
||||
call Function101ecc
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
inc a
|
||||
@@ -4690,7 +4690,7 @@ Function101e82: ; 101e82 ; unreferenced
|
||||
ret
|
||||
; 101e8d
|
||||
|
||||
Function101e8d: ; 101e8d ; unreferenced
|
||||
Unreferenced_Function101e8d: ; 101e8d
|
||||
call Function101ed3
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
inc a
|
||||
@@ -5024,7 +5024,7 @@ Function102112: ; 102112
|
||||
ret
|
||||
; 102142
|
||||
|
||||
Function102142: ; 102142
|
||||
Special_Function102142: ; 102142
|
||||
call Function10218d
|
||||
call Function102180
|
||||
ld hl, UnknownText_0x1021d1
|
||||
@@ -5453,7 +5453,7 @@ Function102423: ; 102423
|
||||
call Function102921
|
||||
ret nc
|
||||
farcall SaveAfterLinkTrade
|
||||
farcall TrainerRankings_Trades
|
||||
farcall StubbedTrainerRankings_Trades
|
||||
farcall BackupMobileEventIndex
|
||||
ld hl, wcd4b
|
||||
set 1, [hl]
|
||||
@@ -6504,7 +6504,7 @@ Function102b4e: ; 102b4e
|
||||
ret
|
||||
; 102b68
|
||||
|
||||
Function102b68: ; 102b68 ; unreferenced
|
||||
Unreferenced_Function102b68: ; 102b68
|
||||
xor a
|
||||
ld hl, wWindowStackPointer
|
||||
ld bc, $10
|
||||
@@ -6794,7 +6794,7 @@ Function102d48: ; 102d48
|
||||
ld bc, PARTYMON_STRUCT_LENGTH
|
||||
ld hl, PartyMon1DVs
|
||||
call AddNTimes
|
||||
predef GetUnownLetter
|
||||
predef Predef_GetUnownLetter
|
||||
farcall UpdateUnownDex
|
||||
ld a, [wFirstUnownSeen]
|
||||
and a
|
||||
@@ -7722,9 +7722,9 @@ Unknown_1035d7: ; 1035d7
|
||||
dw Unknown_103608
|
||||
dw Unknown_103608
|
||||
dw Unknown_1035fe
|
||||
dw AskMobileOrCable
|
||||
dw AskMobileOrCable
|
||||
dw AskMobileOrCable
|
||||
dw Special_AskMobileOrCable
|
||||
dw Special_AskMobileOrCable
|
||||
dw Special_AskMobileOrCable
|
||||
|
||||
Unknown_1035e7: ; 1035e7
|
||||
dwcoord 0, 6
|
||||
@@ -7755,7 +7755,7 @@ Unknown_103608: ; 103608
|
||||
db 2, 2, 3
|
||||
; 103612
|
||||
|
||||
AskMobileOrCable: ; 103612
|
||||
Special_AskMobileOrCable: ; 103612
|
||||
ld hl, MenuDataHeader_103640
|
||||
call LoadMenuDataHeader
|
||||
ld a, [wMobileOrCable_LastSelection]
|
||||
@@ -7811,7 +7811,7 @@ Function103654: ; 103654
|
||||
ret
|
||||
; 10366e
|
||||
|
||||
Mobile_SelectThreeMons: ; 10366e
|
||||
Special_Mobile_SelectThreeMons: ; 10366e
|
||||
farcall Mobile_AlwaysReturnNotCarry
|
||||
bit 7, c
|
||||
jr z, .asm_10369b
|
||||
@@ -7979,7 +7979,7 @@ UnknownText_0x10377b: ; 0x10377b
|
||||
db "@"
|
||||
; 0x103780
|
||||
|
||||
Function103780: ; 103780
|
||||
Special_Function103780: ; 103780
|
||||
ld a, [wd265]
|
||||
push af
|
||||
call Function10378c
|
||||
@@ -8021,7 +8021,7 @@ Function10378c: ; 10378c
|
||||
ret
|
||||
; 1037c2
|
||||
|
||||
Function1037c2: ; 1037c2
|
||||
Special_Function1037c2: ; 1037c2
|
||||
call Function103823
|
||||
jr c, .nope
|
||||
ld a, [wdc5f]
|
||||
@@ -8047,7 +8047,7 @@ UnknownText_0x1037e6: ; 0x1037e6
|
||||
db "@"
|
||||
; 0x1037eb
|
||||
|
||||
Function1037eb: ; 1037eb
|
||||
Special_Function1037eb: ; 1037eb
|
||||
call Function103823
|
||||
jr nc, .asm_103807
|
||||
ld hl, UnknownText_0x103819
|
||||
@@ -8102,7 +8102,7 @@ Function103823: ; 103823
|
||||
ret
|
||||
; 10383c
|
||||
|
||||
Function10383c: ; 10383c
|
||||
Special_Function10383c: ; 10383c
|
||||
ld a, $01
|
||||
ld [wdc60], a
|
||||
xor a
|
||||
@@ -8135,7 +8135,7 @@ UnknownText_0x103876: ; 0x103876
|
||||
db "@"
|
||||
; 0x10387b
|
||||
|
||||
Function10387b: ; 10387b
|
||||
Special_Function10387b: ; 10387b
|
||||
farcall Mobile_AlwaysReturnNotCarry
|
||||
bit 7, c
|
||||
ret nz
|
||||
|
@@ -2,7 +2,8 @@
|
||||
; which were used for Trainer Rankings in Pokémon News.
|
||||
|
||||
; Copies certain values at the time the player enters the Hall of Fame.
|
||||
TrainerRankings_HallOfFame2:: mobile ; 0x105ef6
|
||||
StubbedTrainerRankings_HallOfFame2:: ; 0x105ef6
|
||||
ret
|
||||
ld a, BANK(sTrainerRankingGameTimeHOF)
|
||||
call GetSRAMBank
|
||||
|
||||
@@ -33,7 +34,8 @@ TrainerRankings_HallOfFame2:: mobile ; 0x105ef6
|
||||
ret
|
||||
; 105f33
|
||||
|
||||
TrainerRankings_MagikarpLength: mobile ; 105f33
|
||||
StubbedTrainerRankings_MagikarpLength: ; 105f33
|
||||
ret
|
||||
ld a, BANK(sTrainerRankingLongestMagikarp)
|
||||
call GetSRAMBank
|
||||
ld de, Buffer1
|
||||
@@ -101,7 +103,8 @@ TrainerRankings_MagikarpLength: mobile ; 105f33
|
||||
ret
|
||||
; 105f79
|
||||
|
||||
TrainerRankings_BugContestScore: mobile ; 105f79
|
||||
StubbedTrainerRankings_BugContestScore: ; 105f79
|
||||
ret
|
||||
ld a, BANK(sTrainerRankingBugContestScore)
|
||||
call GetSRAMBank
|
||||
ld a, [hProduct]
|
||||
@@ -130,7 +133,8 @@ TrainerRankings_BugContestScore: mobile ; 105f79
|
||||
ret
|
||||
; 105f9f
|
||||
|
||||
TrainerRankings_AddToSlotsWinStreak: mobile ; 105f9f
|
||||
StubbedTrainerRankings_AddToSlotsWinStreak: ; 105f9f
|
||||
ret
|
||||
ld a, BANK(sTrainerRankingCurrentSlotsStreak)
|
||||
call GetSRAMBank
|
||||
|
||||
@@ -170,7 +174,8 @@ TrainerRankings_AddToSlotsWinStreak: mobile ; 105f9f
|
||||
ret
|
||||
; 105fd0
|
||||
|
||||
TrainerRankings_EndSlotsWinStreak: mobile ; 105fd0
|
||||
StubbedTrainerRankings_EndSlotsWinStreak: ; 105fd0
|
||||
ret
|
||||
ld a, BANK(sTrainerRankingCurrentSlotsStreak)
|
||||
call GetSRAMBank
|
||||
ld hl, sTrainerRankingCurrentSlotsStreak
|
||||
@@ -182,7 +187,8 @@ TrainerRankings_EndSlotsWinStreak: mobile ; 105fd0
|
||||
ret
|
||||
; 105fe3
|
||||
|
||||
TrainerRankings_AddToSlotsPayouts: mobile ; 105fe3
|
||||
StubbedTrainerRankings_AddToSlotsPayouts: ; 105fe3
|
||||
ret
|
||||
ld a, BANK(sTrainerRankingTotalSlotsPayouts)
|
||||
call GetSRAMBank
|
||||
ld hl, sTrainerRankingTotalSlotsPayouts + 3
|
||||
@@ -210,7 +216,8 @@ TrainerRankings_AddToSlotsPayouts: mobile ; 105fe3
|
||||
ret
|
||||
; 106008
|
||||
|
||||
TrainerRankings_AddToBattlePayouts: mobile ; 106008
|
||||
StubbedTrainerRankings_AddToBattlePayouts: ; 106008
|
||||
ret
|
||||
ld a, BANK(sTrainerRankingTotalBattlePayouts)
|
||||
call GetSRAMBank
|
||||
ld hl, sTrainerRankingTotalBattlePayouts + 3
|
||||
@@ -240,12 +247,13 @@ TrainerRankings_AddToBattlePayouts: mobile ; 106008
|
||||
ret
|
||||
; 10602e
|
||||
|
||||
TrainerRankings_StepCount: mobile ; 10602e (41:602e)
|
||||
StubbedTrainerRankings_StepCount: ; 10602e (41:602e)
|
||||
ret
|
||||
ld hl, sTrainerRankingStepCount
|
||||
jp TrainerRankings_Increment4Byte
|
||||
jp StubbedTrainerRankings_Increment4Byte
|
||||
|
||||
; Unreferenced in English version.
|
||||
TrainerRankings_BattleTowerWins: mobile ; 106035
|
||||
Unreferenced_StubbedTrainerRankings_BattleTowerWins: ; 106035
|
||||
ret
|
||||
ld a, $5
|
||||
call GetSRAMBank
|
||||
ld a, [$aa8d]
|
||||
@@ -253,167 +261,196 @@ TrainerRankings_BattleTowerWins: mobile ; 106035
|
||||
call CloseSRAM
|
||||
ret nz
|
||||
ld hl, sTrainerRankingBattleTowerWins
|
||||
jp TrainerRankings_Increment2Byte
|
||||
jp StubbedTrainerRankings_Increment2Byte
|
||||
|
||||
TrainerRankings_TMsHMsTaught: mobile ; 106049
|
||||
StubbedTrainerRankings_TMsHMsTaught: ; 106049
|
||||
ret
|
||||
ld hl, sTrainerRankingTMsHMsTaught
|
||||
jp TrainerRankings_Increment3Byte
|
||||
jp StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_Battles: mobile ; 106050
|
||||
StubbedTrainerRankings_Battles: ; 106050
|
||||
ret
|
||||
ld a, [BattleType]
|
||||
cp BATTLETYPE_TUTORIAL ; Exclude the Dude’s tutorial battle
|
||||
ret z
|
||||
ld hl, sTrainerRankingBattles
|
||||
jp TrainerRankings_Increment3Byte
|
||||
jp StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_WildBattles: mobile ; 10605d
|
||||
StubbedTrainerRankings_WildBattles: ; 10605d
|
||||
ret
|
||||
ld a, [BattleType]
|
||||
cp BATTLETYPE_TUTORIAL ; Exclude the Dude’s tutorial battle
|
||||
ret z
|
||||
ld hl, sTrainerRankingWildBattles
|
||||
jp TrainerRankings_Increment3Byte
|
||||
jp StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_TrainerBattles: mobile ; 10606a
|
||||
StubbedTrainerRankings_TrainerBattles: ; 10606a
|
||||
ret
|
||||
ld hl, sTrainerRankingTrainerBattles
|
||||
jp TrainerRankings_Increment3Byte
|
||||
jp StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_Unused1: mobile ; 106071
|
||||
StubbedTrainerRankings_Unused1: ; 106071
|
||||
ret
|
||||
ld hl, sTrainerRankingUnused1
|
||||
jp TrainerRankings_Increment3Byte
|
||||
jp StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_HallOfFame:: mobile ; 0x106078
|
||||
StubbedTrainerRankings_HallOfFame:: ; 0x106078
|
||||
ret
|
||||
ld hl, sTrainerRankingHOFEntries
|
||||
jp TrainerRankings_Increment3Byte
|
||||
jp StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_WildMonsCaught: mobile ; 10607f (41:607f)
|
||||
StubbedTrainerRankings_WildMonsCaught: ; 10607f (41:607f)
|
||||
ret
|
||||
ld hl, sTrainerRankingWildMonsCaught
|
||||
jp TrainerRankings_Increment3Byte
|
||||
jp StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_HookedEncounters: mobile ; 106086
|
||||
StubbedTrainerRankings_HookedEncounters: ; 106086
|
||||
ret
|
||||
ld hl, sTrainerRankingHookedEncounters
|
||||
jp TrainerRankings_Increment3Byte
|
||||
jp StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_EggsHatched: mobile ; 10608d (41:608d)
|
||||
StubbedTrainerRankings_EggsHatched: ; 10608d (41:608d)
|
||||
ret
|
||||
ld hl, sTrainerRankingEggsHatched
|
||||
jp TrainerRankings_Increment3Byte
|
||||
jp StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_MonsEvolved: mobile ; 106094
|
||||
StubbedTrainerRankings_MonsEvolved: ; 106094
|
||||
ret
|
||||
ld hl, sTrainerRankingMonsEvolved
|
||||
jp TrainerRankings_Increment3Byte
|
||||
jp StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_FruitPicked: mobile ; 10609b
|
||||
StubbedTrainerRankings_FruitPicked: ; 10609b
|
||||
ret
|
||||
ld hl, sTrainerRankingFruitPicked
|
||||
jp TrainerRankings_Increment3Byte
|
||||
jp StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_Healings: mobile ; 1060a2
|
||||
Special_StubbedTrainerRankings_Healings: ; 1060a2
|
||||
ret
|
||||
ld hl, sTrainerRankingHealings
|
||||
jp TrainerRankings_Increment3Byte
|
||||
jp StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_MysteryGift: mobile ; 1060a9 (41:60a9)
|
||||
StubbedTrainerRankings_MysteryGift: ; 1060a9 (41:60a9)
|
||||
ret
|
||||
ld hl, sTrainerRankingMysteryGift
|
||||
jr TrainerRankings_Increment3Byte
|
||||
jr StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_Trades: mobile ; 1060af
|
||||
StubbedTrainerRankings_Trades: ; 1060af
|
||||
ret
|
||||
ld hl, sTrainerRankingTrades
|
||||
jr TrainerRankings_Increment3Byte
|
||||
jr StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_Fly: mobile ; 1060b5
|
||||
StubbedTrainerRankings_Fly: ; 1060b5
|
||||
ret
|
||||
ld hl, sTrainerRankingFly
|
||||
jr TrainerRankings_Increment3Byte
|
||||
jr StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_Surf: mobile ; 1060bb
|
||||
StubbedTrainerRankings_Surf: ; 1060bb
|
||||
ret
|
||||
ld hl, sTrainerRankingSurf
|
||||
jr TrainerRankings_Increment3Byte
|
||||
jr StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_Waterfall: mobile ; 1060c1
|
||||
StubbedTrainerRankings_Waterfall: ; 1060c1
|
||||
ret
|
||||
ld hl, sTrainerRankingWaterfall
|
||||
jr TrainerRankings_Increment3Byte
|
||||
jr StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_WhiteOuts: mobile ; 1060c7
|
||||
StubbedTrainerRankings_WhiteOuts: ; 1060c7
|
||||
ret
|
||||
ld hl, sTrainerRankingWhiteOuts
|
||||
jr TrainerRankings_Increment3Byte
|
||||
jr StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_LuckyNumberShow: mobile ; 1060cd
|
||||
StubbedTrainerRankings_LuckyNumberShow: ; 1060cd
|
||||
ret
|
||||
ld hl, sTrainerRankingLuckyNumberShow
|
||||
jr TrainerRankings_Increment2Byte
|
||||
jr StubbedTrainerRankings_Increment2Byte
|
||||
|
||||
TrainerRankings_PhoneCalls: mobile ; 1060d3
|
||||
StubbedTrainerRankings_PhoneCalls: ; 1060d3
|
||||
ret
|
||||
ld hl, sTrainerRankingPhoneCalls
|
||||
jr TrainerRankings_Increment3Byte
|
||||
jr StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_Unused2: mobile ; 1060df
|
||||
StubbedTrainerRankings_Unused2: ; 1060df
|
||||
ret
|
||||
ld hl, sTrainerRankingUnused2
|
||||
jr TrainerRankings_Increment3Byte
|
||||
jr StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_LinkBattles: mobile ; 1060df
|
||||
StubbedTrainerRankings_LinkBattles: ; 1060df
|
||||
ret
|
||||
ld hl, sTrainerRankingLinkBattles
|
||||
jr TrainerRankings_Increment3Byte
|
||||
jr StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_Splash: mobile ; 1060e5
|
||||
StubbedTrainerRankings_Splash: ; 1060e5
|
||||
ret
|
||||
; Only counts if it’s the player’s turn
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
ret nz
|
||||
ld hl, sTrainerRankingSplash
|
||||
jr TrainerRankings_Increment3Byte
|
||||
jr StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_TreeEncounters: mobile ; 1060ef
|
||||
StubbedTrainerRankings_TreeEncounters: ; 1060ef
|
||||
ret
|
||||
ld hl, sTrainerRankingTreeEncounters
|
||||
jr TrainerRankings_Increment3Byte
|
||||
jr StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_Unused3: mobile ; 1060f5
|
||||
StubbedTrainerRankings_Unused3: ; 1060f5
|
||||
ret
|
||||
ld hl, sTrainerRankingUnused3
|
||||
jr TrainerRankings_Increment3Byte
|
||||
jr StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_ColosseumWins: mobile ; win
|
||||
StubbedTrainerRankings_ColosseumWins: ; win
|
||||
ret
|
||||
ld hl, sTrainerRankingColosseumWins
|
||||
jr TrainerRankings_Increment3Byte
|
||||
jr StubbedTrainerRankings_Increment3Byte
|
||||
|
||||
TrainerRankings_ColosseumLosses: mobile ; lose
|
||||
StubbedTrainerRankings_ColosseumLosses: ; lose
|
||||
ret
|
||||
ld hl, sTrainerRankingColosseumLosses
|
||||
jr TrainerRankings_Increment3Byte
|
||||
jr StubbedTrainerRankings_Increment3Byte
|
||||
; 106107
|
||||
|
||||
TrainerRankings_ColosseumDraws: mobile ; draw
|
||||
StubbedTrainerRankings_ColosseumDraws: ; draw
|
||||
ret
|
||||
ld hl, sTrainerRankingColosseumDraws
|
||||
jr TrainerRankings_Increment3Byte
|
||||
jr StubbedTrainerRankings_Increment3Byte
|
||||
; 10610d
|
||||
|
||||
; Counts uses of both Selfdestruct and Explosion.
|
||||
TrainerRankings_Selfdestruct: mobile ; 10610d
|
||||
StubbedTrainerRankings_Selfdestruct: ; 10610d
|
||||
ret
|
||||
; Only counts if it’s the player’s turn
|
||||
ld a, [hBattleTurn]
|
||||
and a
|
||||
ret nz
|
||||
ld hl, sTrainerRankingSelfdestruct
|
||||
jr TrainerRankings_Increment3Byte
|
||||
jr StubbedTrainerRankings_Increment3Byte
|
||||
; 106117
|
||||
|
||||
TrainerRankings_Increment4Byte: ; 106117
|
||||
StubbedTrainerRankings_Increment4Byte: ; 106117
|
||||
push bc
|
||||
ld bc, 3
|
||||
jr TrainerRankings_Increment
|
||||
jr StubbedTrainerRankings_Increment
|
||||
; 10611d
|
||||
|
||||
TrainerRankings_Increment3Byte: ; 10611d
|
||||
StubbedTrainerRankings_Increment3Byte: ; 10611d
|
||||
push bc
|
||||
ld bc, 2
|
||||
jr TrainerRankings_Increment
|
||||
jr StubbedTrainerRankings_Increment
|
||||
; 106123
|
||||
|
||||
TrainerRankings_Increment2Byte: ; 106123
|
||||
StubbedTrainerRankings_Increment2Byte: ; 106123
|
||||
push bc
|
||||
ld bc, 1
|
||||
jr TrainerRankings_Increment
|
||||
jr StubbedTrainerRankings_Increment
|
||||
; 106129
|
||||
|
||||
; unused
|
||||
TrainerRankings_Increment1Byte: ; 106129
|
||||
StubbedTrainerRankings_Increment1Byte: ; 106129
|
||||
push bc
|
||||
ld bc, 0
|
||||
|
||||
; Increments a big-endian value of bc + 1 bytes at hl
|
||||
TrainerRankings_Increment: ; 10612d
|
||||
StubbedTrainerRankings_Increment: ; 10612d
|
||||
ld a, BANK(sTrainerRankings)
|
||||
call GetSRAMBank
|
||||
push hl
|
||||
@@ -450,7 +487,8 @@ TrainerRankings_Increment: ; 10612d
|
||||
; 106155
|
||||
|
||||
; Used when SRAM bank 5 isn’t already loaded — what’s the point of this?
|
||||
UpdateTrainerRankingsChecksum2: mobile ; 106155
|
||||
UpdateTrainerRankingsChecksum2: ; 106155
|
||||
ret
|
||||
ld a, BANK(sTrainerRankings)
|
||||
call GetSRAMBank
|
||||
call UpdateTrainerRankingsChecksum
|
||||
@@ -520,8 +558,7 @@ RestoreMobileEventIndex: ; 10619d (41:619d)
|
||||
ret
|
||||
; 1061b3 (41:61b3)
|
||||
|
||||
; Unreferenced in English version.
|
||||
VerifyTrainerRankingsChecksum: ; 1061b3
|
||||
Unreferenced_VerifyTrainerRankingsChecksum: ; 1061b3
|
||||
call CalculateTrainerRankingsChecksum
|
||||
ld hl, sTrainerRankingsChecksum
|
||||
ld a, d
|
||||
@@ -773,15 +810,16 @@ endr
|
||||
ret
|
||||
; 10630f
|
||||
|
||||
; functions related to the cable club and various NPC scripts referencing mobile communications
|
||||
; functions related to the cable club and various NPC scripts referencing communications
|
||||
|
||||
Mobile_DummyReturnFalse: ; 10630f
|
||||
Special_Mobile_DummyReturnFalse: ; 10630f
|
||||
xor a
|
||||
ld [ScriptVar], a
|
||||
ret
|
||||
; 106314
|
||||
|
||||
MobileFn_106314: mobile ; 106314
|
||||
Stubbed_Function106314: ; 106314
|
||||
ret
|
||||
ld a, $4
|
||||
call GetSRAMBank
|
||||
ld a, c
|
||||
@@ -800,7 +838,7 @@ Mobile_AlwaysReturnNotCarry: ; 10632f
|
||||
or a
|
||||
ret
|
||||
|
||||
Function106331: ; 106331 - called by Mobile_DummyReturnFalse in Crystal-J
|
||||
Function106331: ; 106331 - called by Special_Mobile_DummyReturnFalse in Crystal-J
|
||||
; check ~[4:b000] == [7:a800]
|
||||
ld a, $4
|
||||
call GetSRAMBank
|
||||
@@ -960,7 +998,7 @@ Function106403: ; 106403
|
||||
or c
|
||||
inc a
|
||||
ld c, a
|
||||
call MobileFn_106314
|
||||
call Stubbed_Function106314
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
inc a
|
||||
ld [wMobileCommsJumptableIndex], a
|
||||
@@ -978,7 +1016,7 @@ Function106403: ; 106403
|
||||
|
||||
.asm_106435
|
||||
ld c, $0
|
||||
call MobileFn_106314
|
||||
call Stubbed_Function106314
|
||||
ld a, [wMobileCommsJumptableIndex]
|
||||
inc a
|
||||
ld [wMobileCommsJumptableIndex], a
|
||||
@@ -1005,7 +1043,8 @@ Function106453: ; 106453
|
||||
ret
|
||||
; 106462
|
||||
|
||||
MobileFunc_106462: mobile
|
||||
Stubbed_Function106462:
|
||||
ret
|
||||
ret
|
||||
; 106464
|
||||
|
||||
|
@@ -290,26 +290,26 @@ MobileTradeAnim_ClearBGMap: ; 1081ca
|
||||
MobileTradeAnim_GetFrontpic: ; 1081e9
|
||||
push de
|
||||
push af
|
||||
predef GetUnownLetter
|
||||
predef Predef_GetUnownLetter
|
||||
pop af
|
||||
ld [CurPartySpecies], a
|
||||
ld [CurSpecies], a
|
||||
call GetBaseData
|
||||
pop de
|
||||
predef GetMonFrontpic
|
||||
predef Predef_GetMonFrontpic
|
||||
ret
|
||||
; 108201
|
||||
|
||||
Function108201: ; 108201
|
||||
push de
|
||||
push af
|
||||
predef GetUnownLetter
|
||||
predef Predef_GetUnownLetter
|
||||
pop af
|
||||
ld [CurPartySpecies], a
|
||||
ld [CurSpecies], a
|
||||
call GetBaseData
|
||||
pop de
|
||||
predef GetAnimatedFrontpicPredef
|
||||
predef Predef_GetAnimatedFrontpic
|
||||
ret
|
||||
; 108219
|
||||
|
||||
@@ -318,7 +318,7 @@ Function108219: ; 108219
|
||||
hlcoord 7, 2
|
||||
ld d, $0
|
||||
ld e, ANIM_MON_TRADE
|
||||
predef AnimateFrontpic
|
||||
predef Predef_AnimateFrontpic
|
||||
ret
|
||||
; 108229
|
||||
|
||||
@@ -327,7 +327,7 @@ Function108229: ; 108229
|
||||
hlcoord 7, 2
|
||||
ld d, $0
|
||||
ld e, ANIM_MON_TRADE
|
||||
predef LoadMonAnimation
|
||||
predef Predef_LoadMonAnimation
|
||||
ret
|
||||
; 108239
|
||||
|
||||
@@ -361,7 +361,7 @@ MobileTradeAnim_JumptableLoop: ; 10824b
|
||||
ld [hWY], a
|
||||
call LoadStandardFont
|
||||
call LoadFontsBattleExtra
|
||||
farcall MobileFunc_106462
|
||||
farcall Stubbed_Function106462
|
||||
farcall Function106464
|
||||
scf
|
||||
ret
|
||||
@@ -1238,7 +1238,7 @@ asm_108966
|
||||
xor a
|
||||
ld [hGraphicStartTile], a
|
||||
lb bc, 7, 7
|
||||
predef PlaceGraphic
|
||||
predef Predef_PlaceGraphic
|
||||
call WaitBGMap
|
||||
ret
|
||||
; 10898a
|
||||
@@ -1252,7 +1252,7 @@ Function10898a: ; 10898a
|
||||
xor a
|
||||
ld [hGraphicStartTile], a
|
||||
lb bc, 7, 7
|
||||
predef PlaceGraphic
|
||||
predef Predef_PlaceGraphic
|
||||
call WaitBGMap
|
||||
ret
|
||||
; 1089a8
|
||||
@@ -1825,7 +1825,7 @@ LZ_1090a7:
|
||||
INCBIN "gfx/unknown/1090a7.tilemap.lz"
|
||||
|
||||
Palette_1090f7:
|
||||
; unreferenced
|
||||
; unused
|
||||
RGB 31, 31, 31
|
||||
RGB 0, 0, 0
|
||||
|
||||
|
@@ -61,7 +61,7 @@ String_114163: ; 114163
|
||||
; 114165
|
||||
|
||||
Jumptable_114165: ; 114165
|
||||
dw Function114268
|
||||
dw Stubbed_Function114268
|
||||
dw Function114269
|
||||
dw Function11433c
|
||||
dw Function1143b7
|
||||
@@ -159,7 +159,8 @@ Function11425c: ; 11425c
|
||||
|
||||
; 114268
|
||||
|
||||
Function114268: mobile
|
||||
Stubbed_Function114268:
|
||||
ret
|
||||
|
||||
; 114269
|
||||
|
||||
@@ -7348,7 +7349,7 @@ INCBIN "data/mobile/ascii-sym.txt"
|
||||
|
||||
; everything from here to the end of the bank is related to the
|
||||
; Mobile Stadium option from the continue/newgame menu.
|
||||
; XXX better function names
|
||||
; Needs better function names
|
||||
MobileStudium: ; 0x117a7f
|
||||
ld a, [hInMenu]
|
||||
push af
|
||||
|
@@ -487,7 +487,7 @@ BattleTowerRoomMenu_InitRAM: ; 1183cb
|
||||
ld [hMobileReceive], a
|
||||
ld [hMobile], a
|
||||
ei
|
||||
farcall MobileFunc_106462
|
||||
farcall Stubbed_Function106462
|
||||
farcall Function106464
|
||||
farcall Function115d99
|
||||
farcall Function11615a
|
||||
@@ -1559,8 +1559,7 @@ IndexDownloadURL: ; 0x118ce5
|
||||
db "http://gameboy.datacenter.ne.jp/cgb/download?name=/01/CGB-BXTJ/tamago/index.txt", 0
|
||||
|
||||
|
||||
Function118d35: ; 118d35
|
||||
; unreferenced
|
||||
Unreferenced_Function118d35: ; 118d35
|
||||
ld hl, $d200
|
||||
ld a, [wcd38]
|
||||
and a
|
||||
@@ -1673,7 +1672,7 @@ Function118ded: ; 118ded
|
||||
push af
|
||||
ld a, $1
|
||||
ld [rSVBK], a
|
||||
farcall Function11b93b
|
||||
farcall Special_Function11b93b
|
||||
pop af
|
||||
ld [rSVBK], a
|
||||
|
||||
@@ -4460,7 +4459,7 @@ Function11a00e: ; 11a00e
|
||||
call PushWindow
|
||||
farcall Function11765d
|
||||
farcall Function117ab4
|
||||
farcall MobileFunc_106462
|
||||
farcall Stubbed_Function106462
|
||||
farcall Function106464
|
||||
call ExitMenu
|
||||
farcall ReloadMapPart
|
||||
@@ -4483,7 +4482,7 @@ Function11a0ca: ; 11a0ca
|
||||
call PushWindow
|
||||
farcall Function11765d
|
||||
farcall Function17d3f6
|
||||
farcall MobileFunc_106462
|
||||
farcall Stubbed_Function106462
|
||||
farcall Function106464
|
||||
call ExitMenu
|
||||
farcall ReloadMapPart
|
||||
@@ -5573,7 +5572,7 @@ Function11a9ce: ; 11a9ce
|
||||
call ClearBGPalettes
|
||||
call ReloadTilesetAndPalettes
|
||||
call Call_ExitMenu
|
||||
farcall MobileFunc_106462
|
||||
farcall Stubbed_Function106462
|
||||
farcall Function106464
|
||||
call ret_d90
|
||||
farcall FinishExitMenu
|
||||
@@ -5725,7 +5724,7 @@ Text_ThisBattleRoomPleaseWait: ; 0x11ac1f
|
||||
done
|
||||
; 0x11ac3e
|
||||
|
||||
Function11ac3e: ; 11ac3e
|
||||
Special_Function11ac3e: ; 11ac3e
|
||||
call SpeechTextBox
|
||||
call FadeToMenu
|
||||
callfar ClearSpriteAnims2
|
||||
@@ -6689,7 +6688,7 @@ Function11b242: ; 11b242
|
||||
call PlaceString
|
||||
xor a
|
||||
ld [MonType], a
|
||||
farcall GetGender
|
||||
farcall Predef_GetGender
|
||||
hlcoord 1, 4
|
||||
ld a, [CurPartySpecies]
|
||||
ld bc, wcd2f
|
||||
@@ -6949,8 +6948,7 @@ Function11b397: ; 11b397
|
||||
jr .loop
|
||||
; 11b3b6
|
||||
|
||||
Function11b3b6: ; 11b3b6
|
||||
; unreferenced
|
||||
Unreferenced_Function11b3b6: ; 11b3b6
|
||||
.loop
|
||||
ld a, [hl]
|
||||
cp -1
|
||||
@@ -7054,7 +7052,7 @@ Function11b3d9: ; 11b3d9
|
||||
ret
|
||||
; 11b444
|
||||
|
||||
Function11b444: ; 11b444
|
||||
Special_Function11b444: ; 11b444
|
||||
; special
|
||||
call Mobile46_InitJumptable
|
||||
call Mobile46_RunJumptable
|
||||
@@ -7148,7 +7146,7 @@ Function11b483: ; 11b483
|
||||
pop de
|
||||
push de
|
||||
ld b, OTPARTYMON
|
||||
predef CalcPkmnStats
|
||||
predef Predef_CalcPkmnStats
|
||||
pop de
|
||||
ld h, d
|
||||
ld l, e
|
||||
@@ -7343,7 +7341,7 @@ Function11b5e7: ; 11b5e7
|
||||
ret
|
||||
; 11b5e8
|
||||
|
||||
Function11b5e8: ; 11b5e8
|
||||
Special_Function11b5e8: ; 11b5e8
|
||||
ld a, $0
|
||||
call GetSRAMBank
|
||||
ld hl, wRTC
|
||||
@@ -7567,7 +7565,7 @@ Function11b6b4: ; 11b6b4
|
||||
ld hl, $c60d + MON_STAT_EXP - 1
|
||||
ld de, $c60d + MON_MAXHP
|
||||
ld b, $1
|
||||
predef CalcPkmnStats
|
||||
predef Predef_CalcPkmnStats
|
||||
ld de, $c60d + MON_MAXHP
|
||||
ld hl, $c60d + MON_HP
|
||||
ld a, [de]
|
||||
@@ -7579,7 +7577,7 @@ Function11b6b4: ; 11b6b4
|
||||
ret
|
||||
; 11b7e5
|
||||
|
||||
Function11b7e5: ; 11b7e5
|
||||
Special_Function11b7e5: ; 11b7e5
|
||||
ld a, [$c60d] ; species
|
||||
ld [wOTTrademonSpecies], a
|
||||
ld [CurPartySpecies], a
|
||||
@@ -7638,7 +7636,7 @@ Function11b7e5: ; 11b7e5
|
||||
ret
|
||||
; 11b879
|
||||
|
||||
Function11b879: ; 11b879
|
||||
Special_Function11b879: ; 11b879
|
||||
farcall BattleTower_CheckSaveFileExistsAndIsYours
|
||||
ld a, [ScriptVar]
|
||||
and a
|
||||
@@ -7731,7 +7729,7 @@ Function11b879: ; 11b879
|
||||
ret
|
||||
; 11b920
|
||||
|
||||
Function11b920: ; 11b920
|
||||
Special_Function11b920: ; 11b920
|
||||
call Mobile46_InitJumptable
|
||||
ld a, $5
|
||||
call GetSRAMBank
|
||||
@@ -7744,7 +7742,7 @@ Function11b920: ; 11b920
|
||||
ret
|
||||
; 11b93b
|
||||
|
||||
Function11b93b: ; 11b93b
|
||||
Special_Function11b93b: ; 11b93b
|
||||
ld a, $5
|
||||
call GetSRAMBank
|
||||
xor a
|
||||
@@ -7888,7 +7886,7 @@ AddMobileMonToParty: ; 11b98f
|
||||
ret
|
||||
; 11ba38
|
||||
|
||||
Function11ba38: ; 11ba38
|
||||
Special_Function11ba38: ; 11ba38
|
||||
farcall CheckCurPartyMonFainted
|
||||
ret c
|
||||
xor a
|
||||
|
@@ -1,5 +1,4 @@
|
||||
Function16c000: ; 16c000
|
||||
; unreferenced
|
||||
Unreferenced_Function16c000: ; 16c000
|
||||
; Only for CGB
|
||||
ld a, [hCGB]
|
||||
and a
|
||||
|
@@ -654,7 +654,7 @@ Function171c41: ; 171c41 (5c:5c41)
|
||||
dec [hl]
|
||||
ret nz
|
||||
call ClearBGPalettes
|
||||
farcall MobileFunc_106462
|
||||
farcall Stubbed_Function106462
|
||||
farcall Function106464
|
||||
ld a, $2
|
||||
ld [wc303], a
|
||||
|
@@ -412,7 +412,7 @@ Function17d1f1: ; 17d1f1
|
||||
dec a
|
||||
ld bc, PARTYMON_STRUCT_LENGTH
|
||||
call AddNTimes
|
||||
predef GetUnownLetter
|
||||
predef Predef_GetUnownLetter
|
||||
callfar UpdateUnownDex
|
||||
ld a, [wFirstUnownSeen]
|
||||
and a
|
||||
@@ -511,7 +511,7 @@ MenuData2_ChallengeExplanationCancel: ; 17d297
|
||||
db "Cancel@"
|
||||
; 17d2b6
|
||||
|
||||
Function17d2b6: ; 17d2b6
|
||||
Special_Function17d2b6: ; 17d2b6
|
||||
call Function17d2c0
|
||||
farcall Function1181da
|
||||
ret
|
||||
@@ -526,7 +526,7 @@ Function17d2c0: ; 17d2c0
|
||||
ret
|
||||
; 17d2ce
|
||||
|
||||
Function17d2ce: ; 17d2ce
|
||||
Special_Function17d2ce: ; 17d2ce
|
||||
ld a, $5
|
||||
call GetSRAMBank
|
||||
ld a, [$aa72]
|
||||
@@ -1498,7 +1498,7 @@ Function17d93a: ; 17d93a
|
||||
add hl, de
|
||||
ld e, l
|
||||
ld d, h
|
||||
farcall HOF_AnimateFrontpic
|
||||
farcall HOF_Predef_AnimateFrontpic
|
||||
pop af
|
||||
ld [rSVBK], a
|
||||
call Function17e349
|
||||
@@ -1530,12 +1530,12 @@ Function17d98b: ; 17d98b
|
||||
ld d, a
|
||||
push de
|
||||
ld de, vTiles2
|
||||
farcall GetTrainerPic
|
||||
farcall Predef_GetTrainerPic
|
||||
pop hl
|
||||
decoord 0, 0
|
||||
add hl, de
|
||||
ld bc, $707
|
||||
predef PlaceGraphic
|
||||
predef Predef_PlaceGraphic
|
||||
pop af
|
||||
ld [rSVBK], a
|
||||
call Function17e349
|
||||
@@ -2337,7 +2337,7 @@ Function17ded9: ; 17ded9
|
||||
ld [MonType], a
|
||||
push hl
|
||||
push bc
|
||||
predef TryAddMonToParty
|
||||
predef Predef_TryAddMonToParty
|
||||
farcall SetCaughtData
|
||||
pop bc
|
||||
pop hl
|
||||
@@ -2442,7 +2442,7 @@ Function17ded9: ; 17ded9
|
||||
ld e, l
|
||||
push hl
|
||||
ld b, $0
|
||||
farcall CalcPkmnStats
|
||||
farcall Predef_CalcPkmnStats
|
||||
ld a, [PartyCount]
|
||||
dec a
|
||||
ld hl, PartyMon1HP
|
||||
@@ -2508,7 +2508,7 @@ Function17ded9: ; 17ded9
|
||||
ld d, h
|
||||
ld e, l
|
||||
pop hl
|
||||
predef FillPP
|
||||
predef Predef_FillPP
|
||||
pop hl
|
||||
pop bc
|
||||
jp asm_17e0ee
|
||||
@@ -2531,7 +2531,7 @@ Function17e026: ; 17e026
|
||||
push bc
|
||||
push hl
|
||||
farcall LoadEnemyMon
|
||||
farcall SentPkmnIntoBox
|
||||
farcall Predef_SendPkmnIntoBox
|
||||
farcall SetBoxMonCaughtData
|
||||
pop hl
|
||||
pop bc
|
||||
@@ -2622,7 +2622,7 @@ Function17e026: ; 17e026
|
||||
push hl
|
||||
ld hl, sBoxMon1Moves
|
||||
ld de, sBoxMon1PP
|
||||
predef FillPP
|
||||
predef Predef_FillPP
|
||||
call CloseSRAM
|
||||
pop hl
|
||||
pop bc
|
||||
@@ -4617,7 +4617,7 @@ Function17f524: ; 17f524
|
||||
jr .asm_17f536
|
||||
; 17f53d
|
||||
|
||||
BattleTowerMobileError: ; 17f53d
|
||||
Special_BattleTowerMobileError: ; 17f53d
|
||||
call FadeToMenu
|
||||
xor a
|
||||
ld [wc303], a
|
||||
@@ -5244,7 +5244,7 @@ String_17fe63: ; 17fe63
|
||||
next "せつめいしょを ごらんください"
|
||||
db "@"
|
||||
|
||||
String_17fe9a: ; 17fe9a ; unreferenced
|
||||
String_17fe9a: ; 17fe9a ; unused
|
||||
db "ポケモンニュースが"
|
||||
next "あたらしくなっているので"
|
||||
next "レポートを おくれません"
|
||||
|
@@ -845,7 +845,7 @@ Function4a6ab: ; 4a6ab (12:66ab)
|
||||
call ClearBGPalettes
|
||||
ld b, SCGB_DIPLOMA
|
||||
call GetSGBLayout
|
||||
farcall Function11c1ab
|
||||
farcall Special_Function11c1ab
|
||||
pop bc
|
||||
call LoadFontsExtra
|
||||
jp Function4a4c4
|
||||
|
@@ -1,9 +1,8 @@
|
||||
; http://forums.glitchcity.info/index.php?topic=7509.msg206449#msg206449
|
||||
|
||||
db $cc, $6b, $1e ; XXX
|
||||
db $cc, $6b, $1e ; unused
|
||||
|
||||
Function1f4003: ; 1f4003
|
||||
; XXX
|
||||
Unreferenced_Function1f4003: ; 1f4003
|
||||
ld a, $6
|
||||
call GetSRAMBank
|
||||
ld hl, .news_data
|
||||
@@ -16,8 +15,7 @@ Function1f4003: ; 1f4003
|
||||
.news_data
|
||||
INCBIN "mobile/news/news_1.bin"
|
||||
|
||||
Function1f4dbe: ; 1f4dbe
|
||||
; XXX
|
||||
Unreferenced_Function1f4dbe: ; 1f4dbe
|
||||
ld a, $6
|
||||
call GetSRAMBank
|
||||
ld hl, .news_data
|
||||
|
Reference in New Issue
Block a user