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

Various annotations

Browse Source 
Annotated the SGB functions in predef/sgb.asm, and some of the map scripts.  Renamed several functions in home.  Renamed six WRAM addresses corresponding to party icon animations, and renamed several others relative to these.
This commit is contained in:
PikalaxALT 2015-07-22 15:57:02 -04:00
parent d5ddd9e54e
commit c8960dd2c8
43 changed files with 3252 additions and 3160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
battle/core.asm
View File

@ -8824,9 +8824,9 @@ Function3f836: ; 3f836
call GetSRAMBank
call Function3f85f
call CloseSRAM
ld hl, AttrMap
hlcoord 0, 0, AttrMap
xor a
ld bc, $0168
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
call Function3200
ld b, $8

26
battle/effect_commands.asm
View File

@ -6448,7 +6448,7 @@ BattleCommand8c: ; 363b8
jp BattleTextBox
.stat
TX_FAR UnknownText_0x1c0cc6
text_jump UnknownText_0x1c0cc6
start_asm
ld hl, .up
@ -6459,11 +6459,11 @@ BattleCommand8c: ; 363b8
ret
.wayup
TX_FAR UnknownText_0x1c0cd0
text_jump UnknownText_0x1c0cd0
db "@"
.up
TX_FAR UnknownText_0x1c0ce0
text_jump UnknownText_0x1c0ce0
db "@"
; 363e9
@ -6482,7 +6482,7 @@ BattleCommand8d: ; 363e9
jp BattleTextBox
.stat
TX_FAR UnknownText_0x1c0ceb
text_jump UnknownText_0x1c0ceb
start_asm
ld hl, .fell
@ -6493,10 +6493,10 @@ BattleCommand8d: ; 363e9
ret
.sharplyfell
TX_FAR UnknownText_0x1c0cf5
text_jump UnknownText_0x1c0cf5
db "@"
.fell
TX_FAR UnknownText_0x1c0d06
text_jump UnknownText_0x1c0d06
db "@"
; 3641a
@ -7804,7 +7804,7 @@ BattleCommand39: ; 36b4d
jp EndMoveEffect
.UsedText
TX_FAR UnknownText_0x1c0d0e ; "[USER]"
text_jump UnknownText_0x1c0d0e ; "[USER]"
start_asm
ld a, BATTLE_VARS_MOVE_ANIM
@ -7837,32 +7837,32 @@ BattleCommand39: ; 36b4d
.RazorWind
; 'made a whirlwind!'
TX_FAR UnknownText_0x1c0d12
text_jump UnknownText_0x1c0d12
db "@"
.Solarbeam
; 'took in sunlight!'
TX_FAR UnknownText_0x1c0d26
text_jump UnknownText_0x1c0d26
db "@"
.SkullBash
; 'lowered its head!'
TX_FAR UnknownText_0x1c0d3a
text_jump UnknownText_0x1c0d3a
db "@"
.SkyAttack
; 'is glowing!'
TX_FAR UnknownText_0x1c0d4e
text_jump UnknownText_0x1c0d4e
db "@"
.Fly
; 'flew up high!'
TX_FAR UnknownText_0x1c0d5c
text_jump UnknownText_0x1c0d5c
db "@"
.Dig
; 'dug a hole!'
TX_FAR UnknownText_0x1c0d6c
text_jump UnknownText_0x1c0d6c
db "@"
; 36c2c

1
constants.asm
View File

@ -25,3 +25,4 @@ INCLUDE "constants/pokemon_data_constants.asm"
INCLUDE "constants/misc_constants.asm"
INCLUDE "constants/std_constants.asm"
INCLUDE "constants/deco_constants.asm"
INCLUDE "constants/radio_constants.asm"

8
engine/color.asm
View File

@ -297,7 +297,7 @@ Function8bec: ; 8bec
ld a, [EnemyLightScreenCount]
ld c, a
ld a, [EnemyReflectCount]
ld hl, AttrMap
hlcoord 0, 0, AttrMap
ld de, $0014
.asm_8c04
and a
@ -661,8 +661,8 @@ endr
Function9699: ; 9699
ld hl, AttrMap
ld bc, $0168
hlcoord 0, 0, AttrMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
xor a
call ByteFill
ret
@ -694,7 +694,7 @@ Function96b3: ; 96b3
ret
.asm_96d0
ld hl, AttrMap
hlcoord 0, 0, AttrMap
ld de, VBGMap0
ld b, $12
ld a, $1

6
engine/credits.asm
View File

@ -527,7 +527,7 @@ Function109a95: ; 109a95 (42:5a95)
ld a, $c
ld [hBGMapAddress], a ; $ff00+$d6
ld a, $28
ld hl, TileMap
hlcoord 0, 0
ld bc, $168
call ByteFill
ld a, $7f
@ -540,7 +540,7 @@ Function109a95: ; 109a95 (42:5a95)
hlcoord 0, 17
ld a, $20
call Function109b1d
ld hl, AttrMap
hlcoord 0, 0, AttrMap
ld bc, $50
xor a
call ByteFill
@ -560,7 +560,7 @@ Function109a95: ; 109a95 (42:5a95)
xor a
ld [hBGMapMode], a ; $ff00+$d4
ld [hBGMapAddress], a ; $ff00+$d6
ld hl, TileMap
hlcoord 0, 0
call Function109aff
call Function3200
ret

12
engine/diploma.asm
View File

@ -14,8 +14,8 @@ Function1dd709: ; 1dd709
ld de, VTiles2
call Decompress
ld hl, Tilemap_1ddc4b
ld de, TileMap
ld bc, $0168
decoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call CopyBytes
ld de, String_1dd760
hlcoord 2, 5
@ -54,13 +54,13 @@ String_1dd768:
; 1dd7ae
Function1dd7ae: ; 1dd7ae
ld hl, TileMap
ld bc, $0168
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, $7f
call ByteFill
ld hl, Tilemap_1dddb3
ld de, TileMap
ld bc, $0168
decoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call CopyBytes
ld de, String_1dd7fa
hlcoord 8, 0

6
engine/engine_flags.asm
View File

@ -29,9 +29,9 @@
dwb StatusFlags, %01000000 ; credits skip
dwb StatusFlags, %10000000 ; bug contest on ; $10
dwb StatusFlags2, %00000100 ; bug contest timer
dwb StatusFlags2, %00000010 ; rockets in radio tower
dwb StatusFlags2, %00000001 ; bike shop call enabled (1024 bike steps reqd)
dwb StatusFlags2, %00010000
dwb StatusFlags2, %00000010
dwb StatusFlags2, %00000001 ; rockets in radio tower
dwb StatusFlags2, %00010000 ; bike shop call enabled (1024 bike steps reqd)
dwb StatusFlags2, %00100000 ; give pokerus; berry -> berry juice when trading?
dwb StatusFlags2, %01000000
dwb StatusFlags2, %10000000 ; rockets in mahogany

6
engine/pack.asm
View File

@ -1404,7 +1404,7 @@ Function10955: ; 10955
hlcoord 5, 1
lb bc, 11, 15
call ClearBox
ld hl, TileMap
hlcoord 0, 0
ld a, $28
ld c, $14
.asm_1098a
@ -1489,8 +1489,8 @@ Function10a1d: ; 10a1d
; 10a2a
Function10a2a: ; 10a2a
ld hl, TileMap
ld bc, $0168
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, $7f
call ByteFill
ret

16
engine/pokedex.asm
View File

@ -212,7 +212,7 @@ Function4013c: ; 4013c (10:413c)
ld [hBGMapMode], a ; $ff00+$d4
call ClearSprites
xor a
ld hl, AttrMap
hlcoord 0, 0, AttrMap
ld bc, $168
call ByteFill
callba Function1de171
@ -725,7 +725,7 @@ Function4050a: ; 4050a (10:450a)
xor a
ld [hBGMapMode], a ; $ff00+$d4
xor a
ld hl, AttrMap
hlcoord 0, 0, AttrMap
ld bc, $168
call ByteFill
call Function41ae1
@ -1071,10 +1071,10 @@ Function4074c: ; 4074c (10:474c)
ld de, Unknown_407f2
call Function40acd
ld a, $32
ld hl, TileMap
hlcoord 0, 0
ld bc, $168
call ByteFill
ld hl, TileMap
hlcoord 0, 0
lb bc, 7, 7
call Function40ad5
hlcoord 0, 9
@ -1135,7 +1135,7 @@ Unknown_407f2: ; 407f2
Function407fd: ; 407fd
call Function40aa6
ld hl, TileMap
hlcoord 0, 0
ld bc, $0f12
call Function40ad5
hlcoord 19, 0
@ -1259,7 +1259,7 @@ String_4094c: ; 4094c
Function40962: ; 40962 (10:4962)
call Function40aa6
ld hl, TileMap
hlcoord 0, 0
lb bc, 7, 7
call Function40ad5
hlcoord 0, 11
@ -1387,9 +1387,9 @@ Unknown_40a3e: ; 40a3e
; 40aa6
Function40aa6: ; 40aa6
ld hl, TileMap
hlcoord 0, 0
ld a, $32
ld bc, $0168
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
ret
; 40ab2

2
engine/predef.asm
View File

@ -79,7 +79,7 @@ PredefPointers:: ; 856b
add_predef Functioncbcdd
add_predef Predef2F
add_predef Function9853 ; $30
add_predef Function864c
add_predef Predef_LoadSGBLayout
add_predef Function91d11
add_predef CheckContestMon
add_predef Function8c20f

664
engine/radio.asm
View File

File diff suppressed because it is too large Load Diff

12
engine/scripting.asm
View File

@ -475,7 +475,7 @@ Script_loadmenudata: ; 0x96efa
ld de, LoadMenuDataHeader
ld a, [ScriptBank]
call Call_a_de
call DrawOnMap
call UpdateSprites
ret
; 0x96f0f
@ -483,7 +483,7 @@ Script_writebackup: ; 0x96f0f
; script command 0x50
call WriteBackup
call DrawOnMap
call UpdateSprites
ret
; 0x96f16
@ -1212,7 +1212,7 @@ ApplyPersonFacing: ; 0x9728b
jr nz, .asm_972b5 ; 0x972b0 $3
call Function972bc
.asm_972b5
call DrawOnMap
call UpdateSprites
ret
.not_visible
pop de
@ -1222,8 +1222,8 @@ ApplyPersonFacing: ; 0x9728b
Function972bc: ; 0x972bc
call Function217a
ld hl, TileMap
ld bc, $0168
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
.asm_972c5
res 7, [hl]
inc hl
@ -2970,7 +2970,7 @@ Script_reloadmappart:: ; 0x97ae3
call Function2173
call Function2914
callba Function104061
call DrawOnMap
call UpdateSprites
ret
; 0x97af6

4
engine/specials.asm
View File

@ -75,7 +75,7 @@ SpecialsPointers:: ; c029
add_special WhiteBGMap
add_special UpdateTimePals
add_special ClearTileMap
add_special DrawOnMap
add_special UpdateSprites
add_special Special_ReplaceKrisSprite
add_special Special_GameCornerPrizeMonCheckDex
add_special SpecialSeenMon
@ -110,7 +110,7 @@ SpecialsPointers:: ; c029
add_special SpecialNameRater
add_special Functionc2da
add_special GetFirstPokemonHappiness
add_special Function71ac
add_special CheckFirstMonIsEgg
add_special Function2a4ab
add_special Function2a51f
add_special RandomPhoneMon

16
home.asm
View File

@ -217,7 +217,7 @@ Function309d:: ; 309d
push af
ld a, 2
ld [rSVBK], a
ld hl, TileMap
hlcoord 0, 0
ld de, w2_d000
ld bc, TileMapEnd - TileMap
call CopyBytes
@ -241,7 +241,7 @@ Function30bf:: ; 30bf
ld a, 2
ld [rSVBK], a
ld hl, w2_d000
ld de, TileMap
decoord 0, 0
ld bc, TileMapEnd - TileMap
call CopyBytes
pop af
@ -271,7 +271,7 @@ IsInArray:: ; 30e1
ld c, a
.loop
ld a, [hl]
cp $ff
cp -1
jr z, .NotInArray
cp c
jr z, .InArray
@ -626,11 +626,11 @@ Function3246:: ; 3246
di
ld a, $1
ld [rVBK], a
ld hl, AttrMap
hlcoord 0, 0, AttrMap
call Function327b
ld a, $0
ld [rVBK], a
ld hl, TileMap
hlcoord 0, 0
call Function327b
.wait2
ld a, [rLY]
@ -761,7 +761,7 @@ GetSGBLayout:: ; 3340
ret z
.sgb
predef_jump Function864c ; LoadSGBLayout
predef_jump Predef_LoadSGBLayout ; LoadSGBLayout
; 334e
@ -2153,11 +2153,11 @@ endr
; 3f20
Function3f20:: ; 3f20
ld hl, AttrMap
hlcoord 0, 0, AttrMap
ld b, $6
ld c, $14
call Function3f35
ld hl, TileMap
hlcoord 0, 0
ld b, $4
ld c, $12
call Function3f47

2
home/battle.asm
View File

@ -312,7 +312,7 @@ BattleTextBox:: ; 3ac3
push hl
call SpeechTextBox
call MobileTextBorder
call DrawOnMap
call UpdateSprites
call Function321c
pop hl
call PrintTextBoxText

24
home/map.asm
View File

@ -97,7 +97,7 @@ GetMapTrigger:: ; 2147
Function2173:: ; 2173
call Function217a
call Functiondb1
call FarCallFunction4c000
ret
; 217a
@ -110,7 +110,7 @@ Function217a:: ; 217a
call Function2198
ld a, $60
ld hl, TileMap
hlcoord 0, 0
ld bc, TileMapEnd - TileMap
call ByteFill
@ -1143,7 +1143,7 @@ ObjectEvent:: ; 0x26ef
; 0x26f2
ObjectEventText::
TX_FAR _ObjectEventText
text_jump _ObjectEventText
db "@"
; 0x26f7
@ -1200,11 +1200,11 @@ Function271e:: ; 271e
Function272a:: ; 272a
ld hl, TileMap
hlcoord 0, 0
ld de, BGMapBuffer
call Function27b7
ld c, $28
call Functiondbd
call FarCallFunction4c03f
ld a, [wd152]
ld e, a
ld a, [wd153]
@ -1220,7 +1220,7 @@ Function2748:: ; 2748
ld de, BGMapBuffer
call Function27b7
ld c, $28
call Functiondbd
call FarCallFunction4c03f
ld a, [wd152]
ld l, a
ld a, [wd153]
@ -1239,11 +1239,11 @@ Function2748:: ; 2748
; 2771
Function2771:: ; 2771
ld hl, TileMap
hlcoord 0, 0
ld de, BGMapBuffer
call Function27c0
ld c, $24
call Functiondbd
call FarCallFunction4c03f
ld a, [wd152]
ld e, a
ld a, [wd153]
@ -1259,7 +1259,7 @@ Function278f:: ; 278f
ld de, BGMapBuffer
call Function27c0
ld c, $24
call Functiondbd
call FarCallFunction4c03f
ld a, [wd152]
ld e, a
and $e0
@ -1966,7 +1966,7 @@ FadeToMenu:: ; 2b29
Function2b3c:: ; 2b3c
call WhiteBGMap
call Function2bae
call DrawOnMap
call UpdateSprites
call Function1d7d
call Functiond90
jr Function2b5c
@ -1976,7 +1976,7 @@ Function2b4d:: ; 2b4d
call WhiteBGMap
call Function1d7d
call Function2bae
call DrawOnMap
call UpdateSprites
call Functiond90
; 2b5c
@ -2003,7 +2003,7 @@ Function2b74:: ; 0x2b74
call TextBox
ld hl, VramState
set 0, [hl]
call DrawOnMap
call UpdateSprites
call Function3200
ld b, $9
call GetSGBLayout

2
home/map_objects.asm
View File

@ -623,7 +623,7 @@ ResetVramState_Bit0:: ; 1acc
; 1ad2
DrawOnMap:: ; 1ad2
UpdateSprites:: ; 1ad2
ld a, [VramState]
bit 0, a
ret z

2
home/menu.asm
View File

@ -75,7 +75,7 @@ InterpretMenu2:: ; 0x1d81
xor a
ld [hBGMapMode], a
call Function1cbb
call DrawOnMap
call UpdateSprites
call Function1c89
call Function321c
call Function1c66

2
home/movement.asm
View File

@ -209,7 +209,7 @@ WriteBackup:: ; 0x1c17
push af
call ExitMenu
call Function321c
call DrawOnMap
call UpdateSprites
pop af
ret

4
home/palettes.asm
View File

@ -323,7 +323,7 @@ Special_ReloadSpritesNoPalettes:: ; d91
; db1
Functiondb1:: ; db1
FarCallFunction4c000:: ; db1
ld a, [hROMBank]
push af
ld a, BANK(Function4c000)
@ -334,7 +334,7 @@ Functiondb1:: ; db1
ret
; dbd
Functiondbd:: ; dbd
FarCallFunction4c03f:: ; dbd
ld a, [hROMBank]
push af
ld a, BANK(Function4c03f)

18
home/text.asm
View File

@ -37,7 +37,7 @@ Functionfb8::
ClearTileMap:: ; fc8
; Fill TileMap with blank tiles.
ld hl, TileMap
hlcoord 0, 0
ld a, " "
ld bc, TileMapEnd - TileMap
call ByteFill
@ -52,7 +52,7 @@ ClearTileMap:: ; fc8
ClearScreen:: ; fdb
ld a, TEXTBOX_PAL
ld hl, AttrMap
hlcoord 0, 0, AttrMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
jr ClearTileMap
@ -163,7 +163,7 @@ TestText:: ; 1048
done
; 1052
Function1052:: ; 1052
RadioTerminator:: ; 1052
ld hl, .stop
ret
.stop db "@"
@ -181,14 +181,14 @@ Function105a:: ; 105a
PrintTextBoxText:: ; 1065
bccoord TEXTBOX_INNERX, TEXTBOX_INNERY
call Function13e5
call PlaceWholeStringInBoxAtOnce
ret
; 106c
SetUpTextBox:: ; 106c
push hl
call SpeechTextBox
call DrawOnMap
call UpdateSprites
call Function321c
pop hl
ret
@ -478,7 +478,7 @@ Char16:: ; 12b9
jr .asm_12c4
.asm_12d1
ld hl, TileMap
hlcoord 0, 0
ld de, SCREEN_WIDTH
ld a, c
.asm_12d8
@ -697,7 +697,7 @@ Function13e0:: ; 13e0
; 13e5
Function13e5:: ; 13e5
PlaceWholeStringInBoxAtOnce:: ; 13e5
ld a, [TextBoxFrame + 1]
push af
set 1, a
@ -780,7 +780,7 @@ Text_00:: ; 143e
; 1449
Text_01:: ; 1449
; TX_RAM
; text_from_ram
; write text from a ram address
; little endian
; [$01][addr]
@ -798,7 +798,7 @@ Text_01:: ; 1449
; 1455
Text_16:: ; 1455
; TX_FAR
; text_jump
; write text from a different bank
; little endian
; [$16][addr][bank]

4
home/tilemap.asm
View File

@ -186,7 +186,7 @@ endr
xor a
ld b, a
add hl, bc
ld bc, TileMap
bccoord 0, 0
add hl, bc
ret
; 1d19
@ -216,7 +216,7 @@ endr
xor a
ld b, a
add hl, bc
ld bc, AttrMap
bccoord 0, 0, AttrMap
add hl, bc
ret
; 1d35

4
home/video.asm
View File

@ -169,7 +169,7 @@ UpdateBGMap:: ; 164c
ld a, 1
ld [rVBK], a
ld hl, AttrMap
hlcoord 0, 0, AttrMap
call .update
ld a, 0
@ -178,7 +178,7 @@ UpdateBGMap:: ; 164c
.Tiles
ld hl, TileMap
hlcoord 0, 0
.update

2
home/window.asm
View File

@ -83,7 +83,7 @@ Function2e31:: ; 2e31
ld [hBGMapMode], a
ld a, $1
ld [hOAMUpdate], a
call DrawOnMap
call UpdateSprites
xor a
ld [hOAMUpdate], a
call DelayFrame

2
items/item_effects.asm
View File

@ -1912,7 +1912,7 @@ Functionf24a: ; f24a (3:724a)
Functionf279: ; f279 (3:7279)
xor a
ld [hBGMapMode], a
ld hl, TileMap
hlcoord 0, 0
ld bc, TileMapEnd - TileMap
ld a, " "
call ByteFill

11
macros/movement.asm
View File

@ -359,12 +359,12 @@ __enum__ = $51
enum movement_fish_got_bite
fish_got_bite: macro
db movement_fish_got_bite
db movement_fish_got_bite ; $51
endm
enum movement_fish_got_bite_2
fish_got_bite_2: macro
db movement_fish_got_bite_2
db movement_fish_got_bite_2 ; $52
endm
enum movement_hide_emote
@ -382,3 +382,10 @@ step_shake: macro
db movement_step_shake ; $55
db \1 ; displacement
endm
__enum__ = $57
enum movement_rock_smash
rock_smash: macro
db movement_rock_smash ; $57
db \1
endm

17
macros/text.asm
View File

@ -12,19 +12,19 @@ page EQUS "db $50," ; Start a new Pokedex page.
dex EQUS "db $e8, $50" ; End a Pokedex entry.
TX_RAM: MACRO
db 1
dw \1
ENDM
TX_RAM EQU 1
TX_FAR EQU $16
TX_FAR: MACRO
db $16
text_jump: MACRO
db TX_FAR
dw \1
db BANK(\1)
ENDM
text_from_ram EQUS "TX_RAM"
text_from_ram: MACRO
db TX_RAM
dw \1
ENDM
text_dunno1: macro
db 5
@ -81,4 +81,3 @@ current_day: macro
db $15
endm
text_jump EQUS "TX_FAR"

761
main.asm
View File

File diff suppressed because it is too large Load Diff

28
maps/AzaleaGym.asm
View File

@ -27,7 +27,7 @@ BugsyScript_0x18ec1e:
scall AzaleaGymTriggerRockets
.FightDone
checkevent EVENT_GOT_TM49_FURY_CUTTER
iftrue UnknownScript_0x18ec6d
iftrue .GotFuryCutter
setevent EVENT_BEAT_TWINS_AMY_AND_MAY
setevent EVENT_BEAT_BUG_CATCHER_BENNY
setevent EVENT_BEAT_BUG_CATCHER_AL
@ -35,17 +35,17 @@ BugsyScript_0x18ec1e:
writetext UnknownText_0x18ee2b
keeptextopen
verbosegiveitem TM_FURY_CUTTER, 1
iffalse UnknownScript_0x18ec71
iffalse .NoRoomForFuryCutter
setevent EVENT_GOT_TM49_FURY_CUTTER
writetext UnknownText_0x18eefa
closetext
loadmovesprites
end
UnknownScript_0x18ec6d:
.GotFuryCutter:
writetext UnknownText_0x18ef98
closetext
UnknownScript_0x18ec71:
.NoRoomForFuryCutter:
loadmovesprites
end
@ -61,9 +61,9 @@ AzaleaGymTriggerRockets:
jumpstd radiotowerrockets
TrainerTwinsAmyandmay1:
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, $0000, TwinsAmyandmay1Script
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY1, TwinsAmyandmay1SeenText, TwinsAmyandmay1BeatenText, $0000, .AfterScript
TwinsAmyandmay1Script:
.AfterScript:
talkaftercancel
loadfont
writetext UnknownText_0x18f1fc
@ -72,9 +72,9 @@ TwinsAmyandmay1Script:
end
TrainerTwinsAmyandmay2:
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, $0000, TwinsAmyandmay2Script
trainer EVENT_BEAT_TWINS_AMY_AND_MAY, TWINS, AMYANDMAY2, TwinsAmyandmay2SeenText, TwinsAmyandmay2BeatenText, $0000, .AfterScript
TwinsAmyandmay2Script:
.AfterScript:
talkaftercancel
loadfont
writetext UnknownText_0x18f269
@ -83,9 +83,9 @@ TwinsAmyandmay2Script:
end
TrainerBug_catcherBug_catcher_benny:
trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherBug_catcher_bennySeenText, Bug_catcherBug_catcher_bennyBeatenText, $0000, Bug_catcherBug_catcher_bennyScript
trainer EVENT_BEAT_BUG_CATCHER_BENNY, BUG_CATCHER, BUG_CATCHER_BENNY, Bug_catcherBug_catcher_bennySeenText, Bug_catcherBug_catcher_bennyBeatenText, $0000, .AfterScript
Bug_catcherBug_catcher_bennyScript:
.AfterScript:
talkaftercancel
loadfont
writetext UnknownText_0x18f053
@ -94,9 +94,9 @@ Bug_catcherBug_catcher_bennyScript:
end
TrainerBug_catcherAl:
trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, $0000, Bug_catcherAlScript
trainer EVENT_BEAT_BUG_CATCHER_AL, BUG_CATCHER, AL, Bug_catcherAlSeenText, Bug_catcherAlBeatenText, $0000, .AfterScript
Bug_catcherAlScript:
.AfterScript:
talkaftercancel
loadfont
writetext UnknownText_0x18f0d3
@ -105,9 +105,9 @@ Bug_catcherAlScript:
end
TrainerBug_catcherJosh:
trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, $0000, Bug_catcherJoshScript
trainer EVENT_BEAT_BUG_CATCHER_JOSH, BUG_CATCHER, JOSH, Bug_catcherJoshSeenText, Bug_catcherJoshBeatenText, $0000, .AfterScript
Bug_catcherJoshScript:
.AfterScript:
talkaftercancel
loadfont
writetext UnknownText_0x18f17e

34
maps/GoldenrodFlowerShop.asm
View File

@ -5,17 +5,17 @@ GoldenrodFlowerShop_MapScriptHeader:
.MapCallbacks:
db 0
TeacherScript_0x5535d:
FlowerShopTeacherScript:
checkevent EVENT_FOUGHT_SUDOWOODO
iftrue UnknownScript_0x5538f
iftrue .Lalala
checkevent EVENT_GOT_SQUIRTBOTTLE
iftrue UnknownScript_0x55399
iftrue .GotSquirtbottle
checkevent EVENT_MET_FLORIA
iffalse UnknownScript_0x5539f
iffalse .HaventMetFloria
checkevent EVENT_TALKED_TO_FLORIA_AT_FLOWER_SHOP
iffalse UnknownScript_0x5538f
iffalse .Lalala
checkflag ENGINE_PLAINBADGE
iffalse UnknownScript_0x5539c
iffalse .NoPlainBadge
faceplayer
loadfont
writetext UnknownText_0x554c2
@ -27,7 +27,7 @@ TeacherScript_0x5535d:
clearevent EVENT_FLORIA_AT_FLOWER_SHOP
end
UnknownScript_0x5538f:
.Lalala:
spriteface $2, LEFT
loadfont
writetext UnknownText_0x5552e
@ -35,22 +35,22 @@ UnknownScript_0x5538f:
loadmovesprites
end
UnknownScript_0x55399:
.GotSquirtbottle:
jumptextfaceplayer UnknownText_0x5550d
UnknownScript_0x5539c:
.NoPlainBadge:
jumptextfaceplayer UnknownText_0x55463
UnknownScript_0x5539f:
.HaventMetFloria:
jumptextfaceplayer UnknownText_0x553d4
LassScript_0x553a2:
FlowerShopFloriaScript:
faceplayer
loadfont
checkevent EVENT_FOUGHT_SUDOWOODO
iftrue UnknownScript_0x553c5
iftrue .FoughtSudowoodo
checkevent EVENT_GOT_SQUIRTBOTTLE
iftrue UnknownScript_0x553bf
iftrue .GotSquirtbottle
writetext UnknownText_0x55561
closetext
loadmovesprites
@ -59,13 +59,13 @@ LassScript_0x553a2:
clearevent EVENT_FLORIA_AT_SUDOWOODO
end
UnknownScript_0x553bf:
.GotSquirtbottle:
writetext UnknownText_0x555e6
closetext
loadmovesprites
end
UnknownScript_0x553c5:
.FoughtSudowoodo:
writetext UnknownText_0x55604
closetext
loadmovesprites
@ -172,5 +172,5 @@ GoldenrodFlowerShop_MapEventHeader:
.PersonEvents:
db 2
person_event SPRITE_TEACHER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, TeacherScript_0x5535d, -1
person_event SPRITE_LASS, 10, 9, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, LassScript_0x553a2, EVENT_FLORIA_AT_FLOWER_SHOP
person_event SPRITE_TEACHER, 8, 6, OW_LEFT | $1, $0, -1, -1, $0, 0, FlowerShopTeacherScript, -1
person_event SPRITE_LASS, 10, 9, OW_DOWN | $2, $11, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, FlowerShopFloriaScript, EVENT_FLORIA_AT_FLOWER_SHOP

2
maps/Route35NationalParkgate.asm
View File

@ -135,7 +135,7 @@ Route35NationalParkgate_LeaveTheRestBehind:
if_equal 0, Route35NationalParkgate_NoRoomInBox
Route35NationalParkgate_LessThanFullParty: ; 6a27d
special Function71ac
special CheckFirstMonIsEgg
if_equal $1, Route35NationalParkgate_FirstMonIsEgg
writetext UnknownText_0x6a4c6
yesorno

176
maps/Route36NationalParkgate.asm
View File

@ -3,59 +3,59 @@ Route36NationalParkgate_MapScriptHeader:
db 3
; triggers
dw UnknownScript_0x6ab11, $0000
dw UnknownScript_0x6ab12, $0000
dw UnknownScript_0x6ab13, $0000
dw .Trigger1, $0000
dw .Trigger2, $0000
dw .Trigger3, $0000
.MapCallbacks:
db 2
; callbacks
dbw 5, UnknownScript_0x6ab17
dbw 5, .CheckIfContestRunning
dbw 2, UnknownScript_0x6ab23
dbw 2, .CheckIfContestAvailable
UnknownScript_0x6ab11:
.Trigger1:
end
UnknownScript_0x6ab12:
.Trigger2:
end
UnknownScript_0x6ab13:
priorityjump UnknownScript_0x6ab47
.Trigger3:
priorityjump .LeftTheContestEarly
end
UnknownScript_0x6ab17:
.CheckIfContestRunning:
checkflag ENGINE_BUG_CONTEST_TIMER
iftrue UnknownScript_0x6ab20
iftrue .BugContestIsRunning
dotrigger $0
return
UnknownScript_0x6ab20:
.BugContestIsRunning:
dotrigger $2
return
UnknownScript_0x6ab23:
.CheckIfContestAvailable:
checkevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
iftrue UnknownScript_0x6ab46
iftrue .Return
checkcode VAR_WEEKDAY
if_equal TUESDAY, UnknownScript_0x6ab42
if_equal THURSDAY, UnknownScript_0x6ab42
if_equal SATURDAY, UnknownScript_0x6ab42
if_equal TUESDAY, .SetContestOfficer
if_equal THURSDAY, .SetContestOfficer
if_equal SATURDAY, .SetContestOfficer
checkflag ENGINE_BUG_CONTEST_TIMER
iftrue UnknownScript_0x6ab42
iftrue .SetContestOfficer
disappear $2
appear $d
return
UnknownScript_0x6ab42:
.SetContestOfficer:
appear $2
disappear $d
UnknownScript_0x6ab46:
.Return:
return
UnknownScript_0x6ab47:
.LeftTheContestEarly:
spriteface $0, UP
loadfont
checkcode VAR_CONTESTMINUTES
@ -63,13 +63,13 @@ UnknownScript_0x6ab47:
RAM2MEM $0
writetext UnknownText_0x6b284
yesorno
iffalse UnknownScript_0x6ab76
iffalse .GoBackToContest
writetext UnknownText_0x6b2c5
closetext
loadmovesprites
special Special_FadeBlackQuickly
special Special_ReloadSpritesNoPalettes
scall UnknownScript_0x6ab8c
scall .CopyContestants
disappear $2
appear $d
applymovement $0, MovementData_0x6add1
@ -77,7 +77,7 @@ UnknownScript_0x6ab47:
special Special_FadeInQuickly
jumpstd bugcontestresults
UnknownScript_0x6ab76:
.GoBackToContest:
writetext UnknownText_0x6b300
closetext
loadmovesprites
@ -88,69 +88,69 @@ UnknownScript_0x6ab76:
warpfacing $2, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $21, $12
end
UnknownScript_0x6ab8c:
.CopyContestants:
checkevent EVENT_BUG_CATCHING_CONTESTANT_1A
iftrue UnknownScript_0x6ab94
iftrue .Not1
appear $3
UnknownScript_0x6ab94:
.Not1:
checkevent EVENT_BUG_CATCHING_CONTESTANT_2A
iftrue UnknownScript_0x6ab9c
iftrue .Not2
appear $4
UnknownScript_0x6ab9c:
.Not2:
checkevent EVENT_BUG_CATCHING_CONTESTANT_3A
iftrue UnknownScript_0x6aba4
iftrue .Not3
appear $5
UnknownScript_0x6aba4:
.Not3:
checkevent EVENT_BUG_CATCHING_CONTESTANT_4A
iftrue UnknownScript_0x6abac
iftrue .Not4
appear $6
UnknownScript_0x6abac:
.Not4:
checkevent EVENT_BUG_CATCHING_CONTESTANT_5A
iftrue UnknownScript_0x6abb4
iftrue .Not5
appear $7
UnknownScript_0x6abb4:
.Not5:
checkevent EVENT_BUG_CATCHING_CONTESTANT_6A
iftrue UnknownScript_0x6abbc
iftrue .Not6
appear $8
UnknownScript_0x6abbc:
.Not6:
checkevent EVENT_BUG_CATCHING_CONTESTANT_7A
iftrue UnknownScript_0x6abc4
iftrue .Not7
appear $9
UnknownScript_0x6abc4:
.Not7:
checkevent EVENT_BUG_CATCHING_CONTESTANT_8A
iftrue UnknownScript_0x6abcc
iftrue .Not8
appear $a
UnknownScript_0x6abcc:
.Not8:
checkevent EVENT_BUG_CATCHING_CONTESTANT_9A
iftrue UnknownScript_0x6abd4
iftrue .Not9
appear $b
UnknownScript_0x6abd4:
.Not9:
checkevent EVENT_BUG_CATCHING_CONTESTANT_10A
iftrue UnknownScript_0x6abdc
iftrue .Not10
appear $c
UnknownScript_0x6abdc:
special DrawOnMap
.Not10:
special UpdateSprites
end
OfficerScript_0x6abe0:
Route36OfficerScriptContest:
checkcode VAR_WEEKDAY
if_equal SUNDAY, UnknownScript_0x6acf1
if_equal MONDAY, UnknownScript_0x6acf1
if_equal WEDNESDAY, UnknownScript_0x6acf1
if_equal FRIDAY, UnknownScript_0x6acf1
if_equal SUNDAY, _ContestNotOn
if_equal MONDAY, _ContestNotOn
if_equal WEDNESDAY, _ContestNotOn
if_equal FRIDAY, _ContestNotOn
faceplayer
loadfont
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue UnknownScript_0x6ac91
scall UnknownScript_0x6ad02
iftrue Route36Officer_ContestHasConcluded
scall Route36Parkgate_DayToText
writetext UnknownText_0x6add5
yesorno
iffalse UnknownScript_0x6ac73
iffalse .DecidedNotToJoinContest
checkcode VAR_PARTYCOUNT
if_greater_than $1, UnknownScript_0x6ac41
if_greater_than $1, .LeaveMonsWithOfficer
special CheckFirstMonFainted
clearevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
UnknownScript_0x6ac10:
.ResumeStartingContest:
setflag ENGINE_BUG_CONTEST_TIMER
special PlayMapMusic
writetext UnknownText_0x6ae87
@ -172,19 +172,19 @@ UnknownScript_0x6ac10:
warpfacing $2, GROUP_NATIONAL_PARK_BUG_CONTEST, MAP_NATIONAL_PARK_BUG_CONTEST, $21, $12
end
UnknownScript_0x6ac41:
.LeaveMonsWithOfficer:
checkcode VAR_PARTYCOUNT
if_less_than $6, UnknownScript_0x6ac4d
if_less_than $6, .ContinueLeavingMons
checkcode VAR_BOXSPACE
if_equal $0, UnknownScript_0x6ac85
UnknownScript_0x6ac4d:
special Function71ac
if_equal $1, UnknownScript_0x6ac8b
if_equal $0, .BoxFull
.ContinueLeavingMons:
special CheckFirstMonIsEgg
if_equal $1, .FirstMonIsEgg
writetext UnknownText_0x6afb0
yesorno
iffalse UnknownScript_0x6ac79
iffalse .RefusedToLeaveMons
special CheckFirstMonFainted
iftrue UnknownScript_0x6ac7f
iftrue .FirstMonIsFainted
setevent EVENT_LEFT_MONS_WITH_CONTEST_OFFICER
writetext UnknownText_0x6b021
keeptextopen
@ -192,108 +192,108 @@ UnknownScript_0x6ac4d:
playsound SFX_GOT_SAFARI_BALLS
waitbutton
keeptextopen
jump UnknownScript_0x6ac10
jump .ResumeStartingContest
UnknownScript_0x6ac73:
.DecidedNotToJoinContest:
writetext UnknownText_0x6b0c6
closetext
loadmovesprites
end
UnknownScript_0x6ac79:
.RefusedToLeaveMons:
writetext UnknownText_0x6b081
closetext
loadmovesprites
end
UnknownScript_0x6ac7f:
.FirstMonIsFainted:
writetext UnknownText_0x6b0f2
closetext
loadmovesprites
end
UnknownScript_0x6ac85:
.BoxFull:
writetext UnknownText_0x6b166
closetext
loadmovesprites
end
UnknownScript_0x6ac8b:
.FirstMonIsEgg:
writetext UnknownText_0x6b209
closetext
loadmovesprites
end
UnknownScript_0x6ac91:
Route36Officer_ContestHasConcluded:
checkevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
iftrue UnknownScript_0x6acaf
iftrue .Sunstone
checkevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
iftrue UnknownScript_0x6acbe
iftrue .Everstone
checkevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
iftrue UnknownScript_0x6accd
iftrue .GoldBerry
checkevent EVENT_CONTEST_OFFICER_HAS_BERRY
iftrue UnknownScript_0x6acdc
iftrue .Berry
writetext UnknownText_0x6b32b
closetext
loadmovesprites
end
UnknownScript_0x6acaf:
.Sunstone:
writetext UnknownText_0x6b97f
keeptextopen
verbosegiveitem SUN_STONE, 1
iffalse UnknownScript_0x6aceb
iffalse .BagFull
clearevent EVENT_CONTEST_OFFICER_HAS_SUN_STONE
loadmovesprites
end
UnknownScript_0x6acbe:
.Everstone:
writetext UnknownText_0x6b97f
keeptextopen
verbosegiveitem EVERSTONE, 1
iffalse UnknownScript_0x6aceb
iffalse .BagFull
clearevent EVENT_CONTEST_OFFICER_HAS_EVERSTONE
loadmovesprites
end
UnknownScript_0x6accd:
.GoldBerry:
writetext UnknownText_0x6b97f
keeptextopen
verbosegiveitem GOLD_BERRY, 1
iffalse UnknownScript_0x6aceb
iffalse .BagFull
clearevent EVENT_CONTEST_OFFICER_HAS_GOLD_BERRY
loadmovesprites
end
UnknownScript_0x6acdc:
.Berry:
writetext UnknownText_0x6b97f
keeptextopen
verbosegiveitem BERRY, 1
iffalse UnknownScript_0x6aceb
iffalse .BagFull
clearevent EVENT_CONTEST_OFFICER_HAS_BERRY
loadmovesprites
end
UnknownScript_0x6aceb:
.BagFull:
writetext UnknownText_0x6b910
closetext
loadmovesprites
end
UnknownScript_0x6acf1:
_ContestNotOn:
jumptextfaceplayer UnknownText_0x6b370
OfficerScript_0x6acf4:
faceplayer
loadfont
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue UnknownScript_0x6ac91
iftrue Route36Officer_ContestHasConcluded
writetext UnknownText_0x6b370
closetext
loadmovesprites
end
UnknownScript_0x6ad02:
Route36Parkgate_DayToText:
jumpstd daytotext
end
@ -862,7 +862,7 @@ Route36NationalParkgate_MapEventHeader:
.PersonEvents:
db 12
person_event SPRITE_OFFICER, 7, 4, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, OfficerScript_0x6abe0, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
person_event SPRITE_OFFICER, 7, 4, OW_UP | $2, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, Route36OfficerScriptContest, EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_CONTEST_DAY
person_event SPRITE_YOUNGSTER, 9, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_RED << 4) | $80, 0, YoungsterScript_0x6ad06, EVENT_BUG_CATCHING_CONTESTANT_1B
person_event SPRITE_YOUNGSTER, 9, 8, OW_UP | $3, $0, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, YoungsterScript_0x6ad1a, EVENT_BUG_CATCHING_CONTESTANT_2B
person_event SPRITE_ROCKER, 10, 6, OW_UP | $3, $0, -1, -1, (PAL_OW_BLUE << 4) | $80, 0, RockerScript_0x6ad2e, EVENT_BUG_CATCHING_CONTESTANT_3B

4
misc/crystal_misc.asm
View File

@ -645,7 +645,7 @@ Function17aaa9: ; 17aaa9 (5e:6aa9)
call Function17aae3
ld c, a
ld b, $0
ld hl, AttrMap ; AttrMap + 0 + 0 * SCREEN_WIDTH
hlcoord 0, 0, AttrMap
add hl, bc
push hl
ld a, $4
@ -766,7 +766,7 @@ Function17abcf: ; 17abcf (5e:6bcf)
Function17ac0c: ; 17ac0c (5e:6c0c)
call Function17ac1d
call Function17ac2a
ld hl, TileMap
hlcoord 0, 0
ld b, $2
ld c, $12
call Function17ac46

50
misc/mobile_40.asm
View File

@ -173,7 +173,7 @@ Function1000fa: ; 1000fa
xor a
ld [InLinkBattle], a
ld a, $4
ld [wc319], a
ld [wPartyMon1MenuIconAnim + 5], a
callba Function11619d
ld hl, wcd29
set 6, [hl]
@ -327,7 +327,7 @@ Function100232: ; 100232
push de
callba Function106464
call Function3f20
call DrawOnMap
call UpdateSprites
hlcoord 1, 2
pop de
call PlaceString
@ -797,7 +797,7 @@ Function1004f4: ; 1004f4
Function100504: ; 100504
push de
call Function3f20
call DrawOnMap
call UpdateSprites
pop de
hlcoord 4, 2
call PlaceString
@ -830,7 +830,7 @@ Jumptable_10052a: ; 10052a
Function100534: ; 100534
call Function100513
call DrawOnMap
call UpdateSprites
call Function321c
ld a, [wcd28]
inc a
@ -1514,10 +1514,10 @@ Function100902: ; 100902
Function100970: ; 100970
ld hl, TileMap
hlcoord 0, 0
ld de, wdc00
call Function1009a5
ld hl, AttrMap
hlcoord 0, 0, AttrMap
ld de, $dd68
call Function1009a5
call Function1009d2
@ -1527,18 +1527,18 @@ Function100970: ; 100970
Function100989: ; 100989
ld hl, wdc00
ld de, TileMap
decoord 0, 0
call Function1009a5
call Function1009ae
callba Function104061
ld hl, $dd68
ld de, AttrMap
decoord 0, 0, AttrMap
call Function1009a5
ret
; 1009a5
Function1009a5: ; 1009a5
ld bc, $0168
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, $3
call FarCopyWRAM
ret
@ -1550,7 +1550,7 @@ Function1009ae: ; 1009ae
ld a, $3
ld [rSVBK], a
ld hl, $d800
ld de, AttrMap
decoord 0, 0, AttrMap
ld c, $14
ld b, $12
.asm_1009bf
@ -1829,7 +1829,7 @@ Function100b7a: ; 100b7a
rst FarCall
callba Function24085
callba MobileTextBorder
call DrawOnMap
call UpdateSprites
call Function321c
callba Function2411a
ld hl, wcfa5
@ -2084,7 +2084,7 @@ Function100d67: ; 100d67
xor a
ld [hBGMapMode], a
call Function1cbb
call DrawOnMap
call UpdateSprites
call Function1c89
call WaitBGMap
call Function1c66
@ -2812,7 +2812,7 @@ Jumptable_101247: ; 101247
; 101251
Function101251: ; 101251
call DrawOnMap
call UpdateSprites
call ResetWindow
ld hl, UnknownText_0x1021f4
call Function1021e0
@ -2829,7 +2829,7 @@ Function101265: ; 101265
; 10126c
Function10126c: ; 10126c
call DrawOnMap
call UpdateSprites
callba Script_reloadmappart
ld hl, UnknownText_0x1021f4
call Function1021e0
@ -3018,7 +3018,7 @@ Function1013aa: ; 1013aa
call Function1d7d
call Function2bae
callba Function106464
call DrawOnMap
call UpdateSprites
call Function2b5c
ret
; 1013c0
@ -4174,7 +4174,7 @@ Function101b70: ; 101b70
call Function101ee4
ld hl, wcd29
set 5, [hl]
call DrawOnMap
call UpdateSprites
ld a, [wcd25]
inc a
ld [wcd25], a
@ -4356,7 +4356,7 @@ Function101cc2: ; 101cc2 ; unreferenced
Function101cc8: ; 101cc8
ld a, $1
ld [wc314], a
ld [wPartyMon1MenuIconAnim], a
ld a, $1
ld [wc30d], a
ld hl, wcd29
@ -4369,7 +4369,7 @@ Function101cc8: ; 101cc8
Function101cdf: ; 101cdf
ld a, $6
ld [wc314], a
ld [wPartyMon1MenuIconAnim], a
ld a, $1
ld [wc30d], a
ld hl, wcd29
@ -4382,7 +4382,7 @@ Function101cdf: ; 101cdf
Function101cf6: ; 101cf6
ld a, $b
ld [wc315], a
ld [wPartyMon1MenuIconAnim + 1], a
ld a, [wcd25]
inc a
ld [wcd25], a
@ -4391,7 +4391,7 @@ Function101cf6: ; 101cf6
Function101d03: ; 101d03
ld a, $e
ld [wc315], a
ld [wPartyMon1MenuIconAnim + 1], a
ld a, [wcd25]
inc a
ld [wcd25], a
@ -6747,11 +6747,11 @@ Function102d48: ; 102d48
Function102d9a: ; 102d9a
ld a, $7f
ld hl, SpritesEnd
ld bc, $0168
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
ld a, $7
ld hl, AttrMap
ld bc, $0168
hlcoord 0, 0, AttrMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
callba Function104000
ret
@ -7321,7 +7321,7 @@ Function103309: ; 103309
ld a, [hl]
ld [wd1ee], a
call Function1034be
call DrawOnMap
call UpdateSprites
callba Function104000
ld a, $1
ld [wd1f0], a
@ -7566,7 +7566,7 @@ Function1034f1: ; 1034f1
ld [wd1f2], a
Function1034f7: ; 10134f7
ld hl, TileMap
hlcoord 0, 0
add hl, bc
ld a, [wd1ef]
ld bc, SCREEN_WIDTH

8
misc/mobile_42.asm
View File

@ -497,7 +497,7 @@ Function10830e: ; 10830e
call Function3b2a
ld de, SFX_BALL_POOF
call PlaySFX
ld hl, TileMap
hlcoord 0, 0
ld bc, $00f0
ld a, $7f
call ByteFill
@ -632,7 +632,7 @@ Function10842c: ; 10842c
call Function3b2a
ld de, SFX_BALL_POOF
call PlaySFX
ld hl, TileMap
hlcoord 0, 0
ld bc, $00f0
ld a, $7f
call ByteFill
@ -1386,8 +1386,8 @@ Function108abe: ; 108abe
; 108ac8
Function108ac8: ; 108ac8
ld hl, TileMap
ld bc, $0168
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, $7f
call ByteFill
ret

252
misc/mobile_45.asm
View File

@ -5588,14 +5588,14 @@ INCBIN "gfx/unknown/11601a.2bpp"
Function11615a: ; 11615a
xor a
ld [wc30d], a
ld [wc319], a
ld [wPartyMon1MenuIconAnim + 5], a
ld [wc310], a
ld [wc311], a
ld [wc312], a
ld [wc313], a
ld [wc314], a
ld [wc315], a
ld [wc318], a
ld [wPartyMon1MenuIconAnim], a
ld [wPartyMon1MenuIconAnim + 1], a
ld [wPartyMon1MenuIconAnim + 4], a
ld [wc3f6], a
ld [wc3f8], a
ld [wc3f2], a
@ -5617,7 +5617,7 @@ Function11619d: ; 11619d
ld a, [wc30d]
and a
ret z
ld a, [wc319]
ld a, [wPartyMon1MenuIconAnim + 5]
cp $2
jr c, .asm_1161b4
ld a, $a0
@ -5631,7 +5631,7 @@ Function11619d: ; 11619d
; 1161b8
Function1161b8: ; 1161b8
ld a, [wc319]
ld a, [wPartyMon1MenuIconAnim + 5]
ld e, a
ld d, 0
ld hl, Jumptable_1161c7
@ -5758,9 +5758,9 @@ Function1161d5: ; 1161d5
ld [wc2a9], a
ld a, d
ld [wc2aa], a
ld a, [wc319]
ld a, [wPartyMon1MenuIconAnim + 5]
inc a
ld [wc319], a
ld [wPartyMon1MenuIconAnim + 5], a
ret
; 11628c
@ -5774,15 +5774,15 @@ MenuDataHeader_11628c: ; 11628c
Function116294: ; 116294
callba Function170d02
ld a, [wc319]
ld a, [wPartyMon1MenuIconAnim + 5]
inc a
ld [wc319], a
ld [wPartyMon1MenuIconAnim + 5], a
ld a, [rSVBK]
push af
ld a, $5
ld [rSVBK], a
ld hl, wd030
ld de, wc320
ld de, wPartyMon1MenuIconAnim + 12
ld bc, $0010
call CopyBytes
ld hl, Palette_11734e
@ -5799,9 +5799,9 @@ Function116294: ; 116294
Function1162cb: ; 1162cb
callba Function170cc6
ld a, [wc319]
ld a, [wPartyMon1MenuIconAnim + 5]
inc a
ld [wc319], a
ld [wPartyMon1MenuIconAnim + 5], a
ld a, [rSVBK]
push af
ld a, $5
@ -5838,7 +5838,7 @@ Function1162f2: ; 1162f2
ld c, a
ld a, [wc30f]
ld b, a
ld a, [wc318]
ld a, [wPartyMon1MenuIconAnim + 4]
ld e, a
ld a, [hli]
sub e
@ -5928,7 +5928,7 @@ Function11636e: ; 11636e
call ByteFill
ld a, $90
ld [hWY], a
call DrawOnMap
call UpdateSprites
pop af
ld [rSVBK], a
callba Function104061
@ -5939,7 +5939,7 @@ Function11636e: ; 11636e
xor a
ld [wc2aa], a
xor a
ld [wc319], a
ld [wPartyMon1MenuIconAnim + 5], a
ld [wc30d], a
ret
; 1163c0
@ -5961,7 +5961,7 @@ Function1163c0: ; 1163c0
push af
ld a, $5
ld [rSVBK], a
ld hl, wc320
ld hl, wPartyMon1MenuIconAnim + 12
ld de, wd030
ld bc, $0010
call CopyBytes
@ -5971,7 +5971,7 @@ Function1163c0: ; 1163c0
call DelayFrame
ld a, $90
ld [hWY], a
call DrawOnMap
call UpdateSprites
callba Function14157
pop af
ld [rSVBK], a
@ -5997,7 +5997,7 @@ Function1163c0: ; 1163c0
.asm_116439
xor a
ld [wc319], a
ld [wPartyMon1MenuIconAnim + 5], a
ld [wc30d], a
ret
; 116441
@ -6014,14 +6014,14 @@ Function116441: ; 116441
xor a
ld [wc2aa], a
xor a
ld [wc319], a
ld [wPartyMon1MenuIconAnim + 5], a
ld [wc30d], a
ret
; 116468
Function116468: ; 116468
call Function116567
ld a, [wc314]
ld a, [wPartyMon1MenuIconAnim]
cp $d
jr nz, .asm_1164a8
ld hl, wc30e
@ -6213,7 +6213,7 @@ Function116567: ; 116567
; 11659d
Function11659d: ; 11659d
ld a, [wc314]
ld a, [wPartyMon1MenuIconAnim]
cp $12
ret nc
ld e, a
@ -6289,7 +6289,7 @@ Function116600:
call Function116780
ret c
ld a, $2
ld [wc314], a
ld [wPartyMon1MenuIconAnim], a
ret
; 116615
@ -6332,24 +6332,24 @@ Function116640:
call Function116780
ret c
ld a, $7
ld [wc314], a
ld [wPartyMon1MenuIconAnim], a
ret
; 116655
Function116655: ; 116655
xor a
ld [wc317], a
ld [wPartyMon1MenuIconAnim + 3], a
call Function11678e
Function11665c:
ld hl, wc317
ld hl, wPartyMon1MenuIconAnim + 3
ld a, $1
xor [hl]
ld [hl], a
add $4
ld c, a
call Function11679c
ld a, [wc317]
ld a, [wPartyMon1MenuIconAnim + 3]
and a
jr nz, .asm_116673
ld a, $48
@ -6378,7 +6378,7 @@ Function11668d:
call Function116780
ret c
ld a, $c
ld [wc314], a
ld [wPartyMon1MenuIconAnim], a
ret
; 11669f
@ -6393,9 +6393,9 @@ Function1166a2:
ld [wc30f], a
ld [wc3f3], a
ld a, $ff
ld [wc316], a
ld [wPartyMon1MenuIconAnim + 2], a
xor a
ld [wc317], a
ld [wPartyMon1MenuIconAnim + 3], a
ld a, $0
ld c, a
call Function11679c
@ -6417,25 +6417,25 @@ Function1166d6:
cp $48
jr nz, .asm_1166e4
xor a
ld [wc316], a
ld [wPartyMon1MenuIconAnim + 2], a
.asm_1166e4
ld a, [wc311]
cp $ff
ret nz
ld a, $4
ld [wc319], a
ld [wPartyMon1MenuIconAnim + 5], a
xor a
ld [wc314], a
ld [wPartyMon1MenuIconAnim], a
ret
; 1166f4
Function1166f4: ; 1166f4
ld [wc30e], a
ld a, b
ld [wc316], a
ld [wPartyMon1MenuIconAnim + 2], a
xor a
ld [wc317], a
ld [wPartyMon1MenuIconAnim + 3], a
ld hl, wc30f
.asm_116702
call Random
@ -6460,9 +6460,9 @@ Function1166f4: ; 1166f4
Function11671f: ; 11671f
ld [wc30f], a
ld a, b
ld [wc317], a
ld [wPartyMon1MenuIconAnim + 3], a
xor a
ld [wc316], a
ld [wPartyMon1MenuIconAnim + 2], a
ld hl, wc30e
.asm_11672d
call Random
@ -6482,11 +6482,11 @@ Function11671f: ; 11671f
Function116747: ; 116747
ld hl, wc30e
ld a, [wc316]
ld a, [wPartyMon1MenuIconAnim + 2]
add [hl]
ld [hl], a
ld hl, wc30f
ld a, [wc317]
ld a, [wPartyMon1MenuIconAnim + 3]
add [hl]
ld [hl], a
ret
@ -6518,7 +6518,7 @@ Function116758: ; 116758
ld a, $4
.asm_11677a
ld [wc318], a
ld [wPartyMon1MenuIconAnim + 4], a
ret
; 11677e
@ -6526,11 +6526,11 @@ Function11677e: ; 11677e
ld a, $0
Function116780:
ld hl, wc315
ld hl, wPartyMon1MenuIconAnim + 1
cp [hl]
jr z, .asm_11678c
ld a, [hl]
ld [wc314], a
ld [wPartyMon1MenuIconAnim], a
scf
ret
@ -6540,15 +6540,15 @@ Function116780:
; 11678e
Function11678e: ; 11678e
ld hl, wc314
ld hl, wPartyMon1MenuIconAnim
ld a, [hl]
ld [wc315], a
ld [wPartyMon1MenuIconAnim + 1], a
inc [hl]
ret
; 116797
Function116797: ; 116797
ld hl, wc314
ld hl, wPartyMon1MenuIconAnim
inc [hl]
ret
; 11679c
@ -8456,11 +8456,11 @@ YesNo117ccc: ; 0x117ccc
db "@"
MobileStadiumEntryText: ; 0x117cd3
TX_FAR _MobileStadiumEntryText
text_jump _MobileStadiumEntryText
db "@"
MobileStadiumSuccessText: ; 0x117cd8
TX_FAR _MobileStadiumSuccessText
text_jump _MobileStadiumSuccessText
db "@"
Function117cdd: ; 0x117cdd
@ -8938,7 +8938,7 @@ Function1183cb: ; 1183cb
ld [wcd66], a
ld [wcd67], a
ld [wcd68], a
ld [wc31a], a
ld [wPartyMon1MenuIconAnim + 6], a
ld [wcd89], a
ld [wcd8a], a
ld [wcd8b], a
@ -9527,7 +9527,7 @@ Function11878d: ; 11878d (46:478d)
ld a, $a
call Function3e32
ld a, [wc3f0]
ld [wc319], a
ld [wPartyMon1MenuIconAnim + 5], a
ld a, [wcd34]
ld [wcf66], a
ret
@ -9571,13 +9571,13 @@ Function118805: ; 118805 (46:4805)
ld a, $a
call Function3e32
ld a, [wc3f0]
ld [wc319], a
ld [wPartyMon1MenuIconAnim + 5], a
ld a, [wcd34]
ld [wcf66], a
ret
Function118821: ; 118821 (46:4821)
ld a, [wc319]
ld a, [wPartyMon1MenuIconAnim + 5]
cp $3
jr c, .asm_11884a
cp $4
@ -9590,7 +9590,7 @@ Function118821: ; 118821 (46:4821)
ld a, $a
ld [wc300], a
ld a, [wc3f0]
ld [wc319], a
ld [wPartyMon1MenuIconAnim + 5], a
ld a, [wcd34]
ld [wcf66], a
scf
@ -9669,7 +9669,7 @@ Function118896: ; 118896
; 1188b0
Function1188b0: ; 1188b0 (46:48b0)
ld de, wc346
ld de, wPartyMon4MenuIconAnim + 2
ld a, $c
jp Function119e2b
@ -9701,7 +9701,7 @@ Function1188c8: ; 1188c8 (46:48c8)
jp Function119e2b
Function1188e7: ; 1188e7 (46:48e7)
ld de, wc346
ld de, wPartyMon4MenuIconAnim + 2
ld a, $5
call GetSRAMBank
ld a, [$aa4a]
@ -9721,7 +9721,7 @@ Function1188e7: ; 1188e7 (46:48e7)
Function118903: ; 118903 (46:4903)
ld a, [wc3f0]
ld [wc319], a
ld [wPartyMon1MenuIconAnim + 5], a
ld c, $1
callba Function115e18
ld a, $8
@ -9750,7 +9750,7 @@ Function118922: ; 118922
call Function119e2e
Function118936:
ld a, [wc31a]
ld a, [wPartyMon1MenuIconAnim + 6]
and a
ret nz
ld hl, MenuDataHeader_119cf7
@ -10032,7 +10032,7 @@ Function118b10:
jp Function119e2b
Function118b24: ; 118b24 (46:4b24)
ld hl, wc346
ld hl, wPartyMon4MenuIconAnim + 2
ld a, $8
ld [hli], a
ld a, $c7
@ -10045,7 +10045,7 @@ Function118b24: ; 118b24 (46:4b24)
call Function119ec2
ld a, $80
ld [wcd89], a
ld hl, wc346
ld hl, wPartyMon4MenuIconAnim + 2
ret
; 118b42 (46:4b42)
@ -10380,22 +10380,22 @@ Function118ec6: ; 118ec6
call Function118440
call SpeechTextBox
ld hl, $d80e
ld de, wc320
ld de, wPartyMon1MenuIconAnim + 12
ld bc, $0026
call CopyBytes
xor a
ld [wc31f], a
ld [wPartyMon1MenuIconAnim + 11], a
ld a, $20
ld [wc31b], a
ld [wPartyMon1MenuIconAnim + 7], a
ld a, $c3
ld [wc31c], a
ld [wPartyMon1MenuIconAnim + 8], a
hlcoord 1, 14
ld a, l
ld [wc31d], a
ld [wPartyMon1MenuIconAnim + 9], a
ld a, h
ld [wc31e], a
ld [wPartyMon1MenuIconAnim + 10], a
ld a, $2
ld [wc31a], a
ld [wPartyMon1MenuIconAnim + 6], a
ld a, $1d
ld [wcd3c], a
ld a, $24
@ -10468,7 +10468,7 @@ Function118f68:
ld a, [wcc60]
and a
jr z, .asm_118fba
ld hl, wc346
ld hl, wPartyMon4MenuIconAnim + 2
ld a, $c608 % $100
ld [hli], a
ld a, $c608 / $100
@ -10489,7 +10489,7 @@ Function118f68:
call Function119ec2
ld a, $40
ld [wcd89], a
ld hl, wc346
ld hl, wPartyMon4MenuIconAnim + 2
ld de, $de00
ld bc, $0200
ld a, $2c
@ -10549,7 +10549,7 @@ Function119009:
ld de, wcc60
call Function1191ad
ret c
ld hl, wc346
ld hl, wPartyMon4MenuIconAnim + 2
ld a, $8
ld [hli], a
ld a, $c6
@ -10570,7 +10570,7 @@ Function119009:
call Function119ec2
ld a, $40
ld [wcd89], a
ld hl, wc346
ld hl, wPartyMon4MenuIconAnim + 2
ld de, Unkn1Pals
ld bc, $1000
ld a, $2c
@ -11097,7 +11097,7 @@ Function1193a0:
ld a, $8
ld [wcd3c], a
call Function119ed8
ld hl, wc346
ld hl, wPartyMon4MenuIconAnim + 2
ld a, wd000 % $100
ld [hli], a
ld a, wd000 / $100
@ -11118,7 +11118,7 @@ Function1193a0:
call Function119ec2
ld a, $40
ld [wcd89], a
ld hl, wc346
ld hl, wPartyMon4MenuIconAnim + 2
ld de, $de00
ld bc, $0200
ld a, $2c
@ -11920,7 +11920,7 @@ Function1198ee: ; 1198ee
call Function119e2e
Function1198f7:
ld a, [wc31a]
ld a, [wPartyMon1MenuIconAnim + 6]
and a
ret nz
ld hl, $c608 + 2
@ -12466,7 +12466,7 @@ Function119ca2:
call Function119e2e
Function119cab:
ld a, [wc31a]
ld a, [wPartyMon1MenuIconAnim + 6]
and a
ret nz
ld a, $80
@ -12503,7 +12503,7 @@ Function119cc3: ; 119cc3
call Function119e2e
Function119cdf:
ld a, [wc31a]
ld a, [wPartyMon1MenuIconAnim + 6]
and a
ret nz
ld a, $f
@ -12949,7 +12949,7 @@ Function119f98: ; 119f98
ld a, $1
ld [wc30d], a
ld a, $1
ld [wc314], a
ld [wPartyMon1MenuIconAnim], a
callba Function104061
and a
ret
@ -13131,7 +13131,7 @@ Function11a16d: ; 11a16d
call Function11a63c
call Function11a1e6
hlcoord 4, 2
ld de, wc346
ld de, wPartyMon4MenuIconAnim + 2
call PlaceString
call Function11a5f5
xor a
@ -13185,7 +13185,7 @@ Function11a1d6: ; 11a1d6
Function11a1e6: ; 11a1e6
ld hl, String_11a706
ld de, wc346
ld de, wPartyMon4MenuIconAnim + 2
call Function11a1ff
ld hl, wcd85
call Function11a1ff
@ -13734,15 +13734,15 @@ Function11a5b9: ; 11a5b9
ld a, $5
ld [wcf84], a
call Function1c00
ld hl, AttrMap
hlcoord 0, 0, AttrMap
ld b, $6
ld c, $14
ld hl, TileMap
hlcoord 0, 0
ld b, $4
ld c, $12
call Function3eea
callba Function104061
call DrawOnMap
call UpdateSprites
ld c, $0
callba Function115e18
ld a, $1
@ -14011,7 +14011,7 @@ endr
; 11a8fa
Function11a8fa: ; 11a8fa
ld a, [wc31a]
ld a, [wPartyMon1MenuIconAnim + 6]
ld e, a
ld d, 0
ld hl, Jumptable_11a909
@ -14035,14 +14035,14 @@ Function11a90f: ; 11a90f
ld [rSVBK], a
call SpeechTextBox
ld a, $50
ld hl, wc320
ld hl, wPartyMon1MenuIconAnim + 12
ld bc, $008c
call ByteFill
ld a, [wc31b]
ld a, [wPartyMon1MenuIconAnim + 7]
ld l, a
ld a, [wc31c]
ld a, [wPartyMon1MenuIconAnim + 8]
ld h, a
ld de, wc320
ld de, wPartyMon1MenuIconAnim + 12
.asm_11a92c
ld a, [hli]
cp $57
@ -14073,17 +14073,17 @@ Function11a90f: ; 11a90f
.asm_11a94f
xor a
ld [wc31f], a
ld [wPartyMon1MenuIconAnim + 11], a
ld a, $20
ld [wc31b], a
ld [wPartyMon1MenuIconAnim + 7], a
ld a, $c3
ld [wc31c], a
ld [wPartyMon1MenuIconAnim + 8], a
hlcoord 1, 14
ld a, l
ld [wc31d], a
ld [wPartyMon1MenuIconAnim + 9], a
ld a, h
ld [wc31e], a
ld hl, wc31a
ld [wPartyMon1MenuIconAnim + 10], a
ld hl, wPartyMon1MenuIconAnim + 6
inc [hl]
ld a, $3
ld [rSVBK], a
@ -14093,7 +14093,7 @@ Function11a970:
; 11a971
Function11a971: ; 11a971
ld hl, wc31f
ld hl, wPartyMon1MenuIconAnim + 11
ld a, [hJoyDown]
and a
jr nz, .asm_11a97f
@ -14108,34 +14108,34 @@ Function11a971: ; 11a971
and $7
ld [hl], a
ld hl, wcd8d
ld a, [wc31b]
ld a, [wPartyMon1MenuIconAnim + 7]
ld e, a
ld a, [wc31c]
ld a, [wPartyMon1MenuIconAnim + 8]
ld d, a
ld a, [de]
inc de
ld [hli], a
ld a, e
ld [wc31b], a
ld [wPartyMon1MenuIconAnim + 7], a
ld a, d
ld [wc31c], a
ld [wPartyMon1MenuIconAnim + 8], a
ld a, $50
ld [hl], a
ld a, [wc31d]
ld a, [wPartyMon1MenuIconAnim + 9]
ld l, a
ld a, [wc31e]
ld a, [wPartyMon1MenuIconAnim + 10]
ld h, a
ld de, wcd8d
call PlaceString
ld a, c
ld [wc31d], a
ld [wPartyMon1MenuIconAnim + 9], a
ld a, b
ld [wc31e], a
ld [wPartyMon1MenuIconAnim + 10], a
ld a, [wcd8d]
cp $50
jr nz, .asm_11a9bf
xor a
ld [wc31a], a
ld [wPartyMon1MenuIconAnim + 6], a
.asm_11a9bf
ret
@ -14143,11 +14143,11 @@ Function11a971: ; 11a971
Function11a9c0: ; 11a9c0
ld a, l
ld [wc31b], a
ld [wPartyMon1MenuIconAnim + 7], a
ld a, h
ld [wc31c], a
ld [wPartyMon1MenuIconAnim + 8], a
ld a, $1
ld [wc31a], a
ld [wPartyMon1MenuIconAnim + 6], a
ret
; 11a9ce
@ -14159,7 +14159,7 @@ Function11a9ce: ; 11a9ce
callba Function106464
call Functiond90
callba Function2b5c
call DrawOnMap
call UpdateSprites
ret
; 11a9f0
@ -15200,9 +15200,9 @@ Function11b175: ; 11b175
; 11b1f7
Function11b1f7: ; 11b1f7
ld hl, TileMap
hlcoord 0, 0
ld a, $32
ld bc, $0168
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
ret
; 11b203
@ -16576,7 +16576,7 @@ endr
bccoord 1, 14
pop af
ld [rSVBK], a
call Function13e5
call PlaceWholeStringInBoxAtOnce
ret
; 11c05d
@ -16759,7 +16759,7 @@ Function11c0c6: ; 11c0c6
ld [hl], $57
pop bc
ld hl, $c608 + 16
call Function13e5
call PlaceWholeStringInBoxAtOnce
pop hl
ld a, l
ld [wcf63], a
@ -18804,7 +18804,7 @@ Unknown_11cfca:
; 11cfce
Function11cfce: ; 11cfce (47:4fce)
ld hl, TileMap
hlcoord 0, 0
ld bc, $14
ld a, [de]
inc de
@ -18895,7 +18895,7 @@ endr
ret
Function11d035: ; 11d035 (47:5035)
ld hl, TileMap
hlcoord 0, 0
ld bc, $14
ld a, [de]
inc de
@ -21492,7 +21492,7 @@ Function16c130: ; 16c130
; 16c145
Function16c145: ; 16c145
ld hl, TileMap
hlcoord 0, 0
ld bc, 20
xor a
call ByteFill
@ -21504,7 +21504,7 @@ Function16c145: ; 16c145
; 16c15c
Function16c15c: ; 16c15c
ld hl, AttrMap
hlcoord 0, 0, AttrMap
ld bc, $0014
xor a
call ByteFill
@ -22099,12 +22099,12 @@ Function16cc73:
ld a, $0
ld [rVBK], a
push hl
ld de, TileMap
decoord 0, 0
call Function16cc90
pop hl
ld a, $1
ld [rVBK], a
ld de, AttrMap
decoord 0, 0, AttrMap
call Function16cc90
pop af
ld [rVBK], a
@ -22169,8 +22169,8 @@ Function16d421: ; 16d421
Function16d42e: ; 16d42e
ld hl, Tilemap_16d465
ld de, TileMap
ld bc, $0168
decoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call CopyBytes
ret
; 16d43b
@ -22310,7 +22310,7 @@ Function16d6a7: ; 16d6a7
Function16d6ae: ; 16d6ae
call Function16d42e
ld hl, Tilemap_16d5cd
ld de, TileMap
decoord 0, 0
ld bc, $0028
call CopyBytes
ld hl, Tilemap_16d5f5
@ -24856,11 +24856,11 @@ Function171c87: ; 171c87 (5c:5c87)
call Decompress
call EnableLCD
ld hl, Tilemap_172491
ld de, TileMap
decoord 0, 0
ld bc, $168
call CopyBytes
ld hl, Attrmap_1727ed
ld de, AttrMap
decoord 0, 0, AttrMap
ld bc, $168
call CopyBytes
hlcoord 3, 2
@ -24928,11 +24928,11 @@ Function171d2b: ; 171d2b (5c:5d2b)
call Decompress
call EnableLCD
ld hl, Tilemap_172685
ld de, TileMap
decoord 0, 0
ld bc, $168
call CopyBytes
ld hl, Attrmap_172955
ld de, AttrMap
decoord 0, 0, AttrMap
ld bc, $168
call CopyBytes
hlcoord 2, 2
@ -25010,11 +25010,11 @@ String_172e5d: ; 172e5d
Function172e78: ; 172e78 (5c:6e78)
ld a, $7f
ld hl, TileMap
hlcoord 0, 0
ld bc, $168
call ByteFill
ld a, $7
ld hl, AttrMap
hlcoord 0, 0, AttrMap
ld bc, $168
call ByteFill
call DisableLCD
@ -25024,11 +25024,11 @@ Function172e78: ; 172e78 (5c:6e78)
call CopyBytes
call EnableLCD
ld hl, Tilemap_1733af
ld de, TileMap
decoord 0, 0
ld bc, $168
call CopyBytes
ld hl, Attrmap_173517
ld de, AttrMap
decoord 0, 0, AttrMap
ld bc, $168
call CopyBytes
ret

54
misc/mobile_5f.asm
View File

@ -14,8 +14,8 @@ Function17c000: ; 17c000
call Functione5f
ld hl, HaveWantMap
ld de, TileMap
ld bc, AttrMap
decoord 0, 0
bccoord 0, 0, AttrMap
ld a, SCREEN_HEIGHT
.y
@ -746,8 +746,8 @@ Function17d48d: ; 17d48d
ld bc, $0040
call CopyBytes
ld hl, TileAttrmap_17eb8e
ld de, TileMap
ld bc, AttrMap
decoord 0, 0
bccoord 0, 0, AttrMap
ld a, $12
.asm_17d4a4
push af
@ -862,7 +862,7 @@ Function17d48d: ; 17d48d
ld b, a
push hl
pop de
ld hl, TileMap
hlcoord 0, 0
add hl, bc
call PlaceString
push de
@ -1310,7 +1310,7 @@ Function17d818: ; 17d818
call Function17e447
ld e, l
ld d, h
ld hl, TileMap
hlcoord 0, 0
add hl, bc
call PlaceString
ret
@ -1335,7 +1335,7 @@ Function17d833: ; 17d833
call Function17e43d
ld c, l
ld b, h
ld hl, TileMap
hlcoord 0, 0
add hl, de
ld e, l
ld d, h
@ -1505,7 +1505,7 @@ Function17d93a: ; 17d93a
ld h, a
ld a, [wc70b]
ld c, a
ld de, TileMap
decoord 0, 0
add hl, de
ld e, l
ld d, h
@ -1543,7 +1543,7 @@ Function17d98b: ; 17d98b
ld de, VTiles2
callba GetTrainerPic
pop hl
ld de, TileMap
decoord 0, 0
add hl, de
ld bc, $0707
predef FillBox
@ -2051,12 +2051,12 @@ Function17dd13: ; 17dd13
call Function17e41e
call Function17e447
push hl
ld hl, TileMap
hlcoord 0, 0
add hl, bc
push hl
pop bc
pop hl
call Function13e5
call PlaceWholeStringInBoxAtOnce
ret
; 17dd30
@ -2073,7 +2073,7 @@ Function17dd30: ; 17dd30
push af
call Function17e41e
pop af
ld hl, TileMap
hlcoord 0, 0
add hl, de
call Function17e600
ret
@ -3230,7 +3230,7 @@ rept 2
add hl, bc
endr
push hl
ld hl, TileMap
hlcoord 0, 0
ld bc, $0014
ld a, [wcd23]
call AddNTimes
@ -3308,7 +3308,7 @@ Function17e4dd: ; 17e4dd
and $1
ret z
ld a, [wcd29]
ld hl, TileMap
hlcoord 0, 0
ld bc, $0014
call AddNTimes
ld a, [wcd28]
@ -3345,7 +3345,7 @@ Function17e51b: ; 17e51b
sub [hl]
inc a
ld [wcd4f], a
ld hl, TileMap
hlcoord 0, 0
ld bc, $0014
ld a, [wcd23]
dec a
@ -3395,7 +3395,7 @@ Function17e566: ; 17e566
Function17e571: ; 17e571
push af
ld hl, TileMap
hlcoord 0, 0
ld bc, $0014
ld a, [wcd23]
call AddNTimes
@ -3437,7 +3437,7 @@ Function17e5af: ; 17e5af
ld l, a
ld a, [wcd44]
ld h, a
ld bc, TileMap
bccoord 0, 0
add hl, bc
ld bc, $ffec
add hl, bc
@ -3471,7 +3471,7 @@ endr
ld l, a
ld a, [wcd44]
ld h, a
ld bc, TileMap
bccoord 0, 0
add hl, bc
call PlaceString
ret
@ -3496,7 +3496,7 @@ Function17e600: ; 17e600
Function17e613: ; 17e613
push hl
ld hl, TileMap
hlcoord 0, 0
ld bc, $0014
ld a, [de]
inc de
@ -3633,7 +3633,7 @@ endr
push af
push hl
push hl
ld bc, TileMap
bccoord 0, 0
add hl, bc
ld a, [hl]
cp $7f
@ -3648,7 +3648,7 @@ endr
.asm_17e6c7
pop hl
ld bc, AttrMap
bccoord 0, 0, AttrMap
add hl, bc
ld [hl], a
pop hl
@ -3672,7 +3672,7 @@ Function17e6de: ; 17e6de
ld l, a
ld a, [wc709]
ld h, a
ld de, AttrMap
decoord 0, 0, AttrMap
add hl, de
pop af
ld b, $7
@ -4456,7 +4456,7 @@ Function17f41d: ; 17f41d
jr .asm_17f42c
.asm_17f439
ld hl, TileMap
hlcoord 0, 0
ld de, SCREEN_WIDTH
ld a, c
.asm_17f440
@ -4769,12 +4769,12 @@ Function17f5e4: ; 17f5e4
ld a, d
ld [MusicFadeIDHi], a
ld a, " "
ld hl, TileMap
ld bc, $0168
hlcoord 0, 0
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
ld a, $6
ld hl, AttrMap
ld bc, $0168
hlcoord 0, 0, AttrMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
call ByteFill
hlcoord 2, 1
ld b, $1

20
predef/cgb.asm
View File

@ -13,7 +13,7 @@ Function8d59: ; 8d59
ld a, [SGBPredef]
.asm_8d61
cp $fc
cp -4
jp z, Function96f3
call Function9673
ld l, a
@ -121,8 +121,8 @@ endr
Function8e23: ; 8e23
call Function8e85
ld hl, AttrMap
ld bc, $0168
hlcoord 0, 0, AttrMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, $2
call ByteFill
hlcoord 0, 4, AttrMap
@ -133,7 +133,7 @@ Function8e23: ; 8e23
ld bc, $070a
ld a, $1
call Function9663
ld hl, AttrMap
hlcoord 0, 0, AttrMap
ld bc, $040a
ld a, $2
call Function9663
@ -233,7 +233,7 @@ endr
ld a, $5
call FarCopyWRAM
call Function9699
ld hl, AttrMap
hlcoord 0, 0, AttrMap
ld bc, $0814
ld a, $1
call Function9663
@ -717,8 +717,8 @@ Function9289: ; 9289
ld a, $24
call Function9625
call Function9630
ld hl, AttrMap
ld bc, $0168
hlcoord 0, 0, AttrMap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, [PlayerGender]
and a
ld a, $1
@ -864,7 +864,7 @@ Function93d3: ; 93d3
ld a, $5
call FarCopyWRAM
call Function9699
ld hl, AttrMap
hlcoord 0, 0, AttrMap
ld bc, $010a
ld a, $1
call Function9663
@ -948,7 +948,7 @@ Palettes_9469: ; 9469
Function9499: ; 9499
call Function91c8
ld de, $0014
ld hl, AttrMap
hlcoord 0, 0, AttrMap
ld a, [wcf82]
.asm_94a5
and a
@ -1093,7 +1093,7 @@ Function9591: ; 9591
ld bc, $0112
ld a, $1
call Function9663
ld hl, AttrMap
hlcoord 0, 0, AttrMap
ld bc, $1102
ld a, $1
call Function9663

148
predef/sgb.asm
View File

@ -1,7 +1,7 @@
Function864c: ; 864c
Predef_LoadSGBLayout: ; 864c
; LoadSGBLayout
call CheckCGB
jp nz, Function8d59
jp nz, Predef_LoadSGBLayoutCGB
ld a, b
cp $ff
@ -14,57 +14,57 @@ Function864c: ; 864c
ld l, a
ld h, 0
add hl, hl
ld de, Table866f
ld de, .Jumptable
add hl, de
ld a, [hli]
ld h, [hl]
ld l, a
ld de, Function8a60
ld de, .Finish
push de
jp [hl]
; 866f
Table866f: ; 866f
dw Function86ad
dw Function86b4
dw Function875c
dw Function8763
dw Function87b2
dw Function8852
dw Function8859
dw Function8867
dw Function8860
dw Function88b1
dw Function87ab
dw Function88cd
dw Function8884
dw Function891a
dw Function873c
dw Function8897
dw Function882a
dw Function889e
dw Function8928
dw Function8890
dw Function884b
dw Function891a
dw Function8823
dw Function87e9
dw Function8921
dw Function89a6
dw Function89ad
dw Function89d9
dw Function89e0
dw Function8860
dw Function8969
.Jumptable: ; 866f
dw .SGB00
dw .SGB01
dw .SGB02
dw .SGB03
dw .SGB04
dw .SGB05
dw .SGB06
dw .SGB07
dw .SGB08_1d
dw .SGB09
dw .SGB0a
dw .SGB0b
dw .SGB0c
dw .SGB0d_15
dw .SGB0e
dw .SGB0f
dw .SGB10
dw .SGB11
dw .SGB12
dw .SGB13
dw .SGB14
dw .SGB0d_15
dw .SGB16
dw .SGB17
dw .SGB18
dw .SGB19
dw .SGB1a
dw .SGB1b
dw .SGB1c
dw .SGB08_1d
dw .SGB1e
; 86ad
Function86ad: ; 86ad
.SGB00: ; 86ad
ld hl, PalPacket_9c66
ld de, BlkPacket_9aa6
ret
; 86b4
Function86b4: ; 86b4
.SGB01: ; 86b4
ld hl, BlkPacket_9aa6
call Function9809
ld hl, PalPacket_9ce6
@ -132,7 +132,7 @@ endr
ret
; 873c
Function873c: ; 873c
.SGB0e: ; 873c
ld hl, PalPacket_9bd6
ld de, wcda9
ld bc, $0010
@ -150,13 +150,13 @@ endr
ret
; 875c
Function875c: ; 875c
.SGB02: ; 875c
ld hl, PalPacket_9c76
ld de, BlkPacket_9a86
ret
; 8763
Function8763: ; 8763
.SGB03: ; 8763
ld hl, PalPacket_9ce6
ld de, wcda9
ld bc, $0010
@ -193,13 +193,13 @@ endr
ret
; 87ab
Function87ab: ; 87ab
.SGB0a: ; 87ab
ld hl, PalPacket_9c56
ld de, wcda9 + 1
ret
; 87b2
Function87b2: ; 87b2
.SGB04: ; 87b2
ld hl, PalPacket_9ce6
ld de, wcda9
ld bc, $0010
@ -227,7 +227,7 @@ Function87b2: ; 87b2
ret
; 87e9
Function87e9: ; 87e9
.SGB17: ; 87e9
ld hl, PalPacket_9ce6
ld de, wcda9
ld bc, $0010
@ -256,13 +256,13 @@ Function87e9: ; 87e9
ret
; 8823
Function8823: ; 8823
call Function87b2
.SGB16: ; 8823
call .SGB04
ld de, BlkPacket_9af6
ret
; 882a
Function882a: ; 882a
.SGB10: ; 882a
ld hl, PalPacket_9ce6
ld de, wcda9
ld bc, $0010
@ -280,33 +280,33 @@ Function882a: ; 882a
ret
; 884b
Function884b: ; 884b
.SGB14: ; 884b
ld hl, PalPacket_9c36
ld de, BlkPacket_9a86
ret
; 8852
Function8852: ; 8852
.SGB05: ; 8852
ld hl, PalPacket_9c96
ld de, BlkPacket_9b06
ret
; 8859
Function8859: ; 8859
.SGB06: ; 8859
ld hl, PalPacket_9ca6
ld de, BlkPacket_9b76
ret
; 8860
Function8860: ; 8860
.SGB08_1d: ; 8860
ld hl, PalPacket_9cb6
ld de, BlkPacket_9a86
ret
; 8867
Function8867: ; 8867
.SGB07: ; 8867
ld b, 0
ld hl, Unknown_8878
ld hl, .BlkPacketTable_SGB07
rept 4
add hl, bc
endr
@ -320,13 +320,13 @@ endr
ret
; 8878
Unknown_8878: ; 8878
.BlkPacketTable_SGB07: ; 8878
dw BlkPacket_9a86, PalPacket_9be6
dw BlkPacket_9a96, PalPacket_9c06
dw BlkPacket_9a86, PalPacket_9c16
; 8884
Function8884: ; 8884
.SGB0c: ; 8884
ld hl, PalPacket_9b96
ld de, BlkPacket_9b56
ld a, $8
@ -334,19 +334,19 @@ Function8884: ; 8884
ret
; 8890
Function8890: ; 8890
.SGB13: ; 8890
ld hl, PalPacket_9ba6
ld de, BlkPacket_9b86
ret
; 8897
Function8897: ; 8897
.SGB0f: ; 8897
ld hl, PalPacket_9c46
ld de, BlkPacket_9a86
ret
; 889e
Function889e: ; 889e
.SGB11: ; 889e
ld hl, BlkPacket_9a86
ld de, PlayerLightScreenCount
ld bc, $0010
@ -356,12 +356,12 @@ Function889e: ; 889e
ret
; 88b1
Function88b1: ; 88b1
.SGB09: ; 88b1
ld hl, PalPacket_9bd6
ld de, wcda9
ld bc, $0010
call CopyBytes
call Function8a0c
call .GetPermission
ld hl, wcda9 + 1
ld [hld], a
ld de, BlkPacket_9a86
@ -370,7 +370,7 @@ Function88b1: ; 88b1
ret
; 88cd
Function88cd: ; 88cd
.SGB0b: ; 88cd
push bc
ld hl, PalPacket_9ce6
ld de, wcda9
@ -414,19 +414,19 @@ Function88cd: ; 88cd
ret
; 891a
Function891a: ; 891a
.SGB0d_15: ; 891a
ld hl, PalPacket_9cb6
ld de, BlkPacket_9a86
ret
; 8921
Function8921: ; 8921
.SGB18: ; 8921
ld hl, PalPacket_9bc6
ld de, BlkPacket_9a86
ret
; 8928
Function8928: ; 8928
.SGB12: ; 8928
ld hl, PalPacket_9bd6
ld de, wcda9
ld bc, $0010
@ -435,7 +435,7 @@ Function8928: ; 8928
ld de, wcda9 + $10
ld bc, $0010
call CopyBytes
call Function8a0c
call .GetPermission
ld hl, wcda9 + 1
ld [hl], a
ld hl, wcda9 + 3
@ -456,7 +456,7 @@ Function8928: ; 8928
ret
; 8969
Function8969: ; 8969
.SGB1e: ; 8969
ld hl, PalPacket_9ce6
ld de, wcda9
ld bc, $0010
@ -489,13 +489,13 @@ endr
ret
; 89a6
Function89a6: ; 89a6
.SGB19: ; 89a6
ld hl, PalPacket_9cd6
ld de, BlkPacket_9a86
ret
; 89ad
Function89ad: ; 89ad
.SGB1a: ; 89ad
ld hl, PalPacket_9ce6
ld de, wcda9
ld bc, $0010
@ -516,13 +516,13 @@ Function89ad: ; 89ad
ret
; 89d9
Function89d9: ; 89d9
.SGB1b: ; 89d9
ld hl, PalPacket_9cc6
ld de, BlkPacket_9a86
ret
; 89e0
Function89e0: ; 89e0
.SGB1c: ; 89e0
ld hl, PalPacket_9ce6
ld de, wcda9
ld bc, $0010
@ -543,7 +543,7 @@ Function89e0: ; 89e0
ret
; 8a0c
Function8a0c: ; 8a0c
.GetPermission: ; 8a0c
ld a, [TimeOfDayPal]
cp $2
jr c, .asm_8a16
@ -565,7 +565,7 @@ Function8a0c: ; 8a0c
ld a, [MapGroup]
ld e, a
ld d, 0
ld hl, Unknown_8a45
ld hl, .Unknown_8a45
add hl, de
ld a, [hl]
ret
@ -587,7 +587,7 @@ Function8a0c: ; 8a0c
ret
; 8a45
Unknown_8a45: ; 8a45
.Unknown_8a45: ; 8a45
db $00
db $12
db $14
@ -617,7 +617,7 @@ Unknown_8a45: ; 8a45
db $0d
; 8a60
Function8a60: ; 8a60
.Finish: ; 8a60
push de
call Function9809
pop hl

4
text/phone/bill.asm
View File

@ -44,7 +44,7 @@ BillPhoneNotFullText: ; 0x1b452a
para "<PLAY_G>, your BOX"
line "has room for @"
TX_RAM StringBuffer3
text_from_ram StringBuffer3
text ""
cont "more #MON."
@ -59,7 +59,7 @@ BillPhoneNearlyFullText: ; 0x1b4587
para "<PLAY_G>, your BOX"
line "has room for only"
cont "@"
TX_RAM StringBuffer3
text_from_ram StringBuffer3
text " more #MON."
para "Maybe you should"

16
text/phone/mom.asm
View File

@ -8,12 +8,12 @@ MomPhoneGreetingText: ; 0x1b4000
UnknownText_0x1b4021: ; 0x1b4021
text "Oh, so you're in"
line "@"
TX_RAM StringBuffer3
text_from_ram StringBuffer3
text "…"
para "Isn't that where"
line "@"
TX_RAM StringBuffer4
text_from_ram StringBuffer4
text ""
para "is? Did you go"
line "take a look?"
@ -22,7 +22,7 @@ UnknownText_0x1b4021: ; 0x1b4021
MomPhoneGenericAreaText: ; 0x1b406b
text "Really, you're in"
line "@"
TX_RAM StringBuffer3
text_from_ram StringBuffer3
text "?"
para "I've never gone"
@ -33,7 +33,7 @@ MomPhoneGenericAreaText: ; 0x1b406b
MomPhoneNewBarkText: ; 0x1b40b1
text "What? You're in"
line "@"
TX_RAM StringBuffer3
text_from_ram StringBuffer3
text "?"
para "Come see your MOM"
@ -43,7 +43,7 @@ MomPhoneNewBarkText: ; 0x1b40b1
MomPhoneCherrygroveText: ; 0x1b40e4
text "You're visiting"
line "@"
TX_RAM StringBuffer3
text_from_ram StringBuffer3
text "?"
para "How about coming"
@ -53,7 +53,7 @@ MomPhoneCherrygroveText: ; 0x1b40e4
UnknownText_0x1b411c: ; 0x1b411c
text "Wow, you're in"
line "@"
TX_RAM StringBuffer3
text_from_ram StringBuffer3
text "?"
para "Good luck on your"
@ -74,7 +74,7 @@ UnknownText_0x1b4150: ; 0x1b4150
UnknownText_0x1b41a7: ; 0x1b41a7
text "By the way, you've"
line "saved up ¥@"
TX_RAM StringBuffer3
text_from_ram StringBuffer3
text "."
para "Do you want to"
@ -97,7 +97,7 @@ UnknownText_0x1b420d: ; 0x1b420d
UnknownText_0x1b4249: ; 0x1b4249
text "By the way, you've"
line "saved up ¥@"
TX_RAM StringBuffer3
text_from_ram StringBuffer3
text "."
para "Want to start"

364
text/phone/trainers1.asm
View File

File diff suppressed because it is too large Load Diff

22
wram.asm
View File

@ -356,21 +356,13 @@ wc310:: ds 1
wc311:: ds 1
wc312:: ds 1
wc313:: ds 1
wc314:: ds 1
wc315:: ds 1
wc316:: ds 1
wc317:: ds 1
wc318:: ds 1
wc319:: ds 1
wc31a:: ds 1
wc31b:: ds 1
wc31c:: ds 1
wc31d:: ds 1
wc31e:: ds 1
wc31f:: ds 1
wc320:: ds 4
wc324:: ds 34
wc346:: ds 94
wPartyMon1MenuIconAnim:: ds 16 ; c314
wPartyMon2MenuIconAnim:: ds 16 ; c324
wPartyMon3MenuIconAnim:: ds 16 ; c334
wPartyMon4MenuIconAnim:: ds 16 ; c344
wPartyMon5MenuIconAnim:: ds 16 ; c354
wPartyMon6MenuIconAnim:: ds 16 ; c364
wc374:: ds 64
wc3a4:: ds 8
wc3ac:: ds 8
wc3b4:: ds 1