More enumeration of constants, more annotations of scripts.

This commit is contained in:
PikalaxALT
2015-07-15 15:48:44 -04:00
parent 67e56102ef
commit 39524cdb76
96 changed files with 2634 additions and 2501 deletions

View File

@@ -2,7 +2,7 @@ UnknownScript_0xa0b14:
checkflag ENGINE_ROCKETS_IN_RADIO_TOWER
iftrue UnknownScript_0xa0b73
checkcode VAR_HOUR
if_greater_than $11, UnknownScript_0xa0b4b
if_greater_than 17, UnknownScript_0xa0b4b
scall UnknownScript_0xa0b32
jump UnknownScript_0xa0c0e
@@ -37,7 +37,7 @@ UnknownScript_0xa0b4b:
UnknownScript_0xa0b4f:
checkcode VAR_HOUR
if_greater_than $11, UnknownScript_0xa0b6e
if_greater_than 17, UnknownScript_0xa0b6e
checkmorn
iftrue UnknownScript_0xa0b64
checkday
@@ -68,27 +68,27 @@ UnknownScript_0xa0b73:
UnknownScript_0xa0b77:
checkevent EVENT_BEAT_ELITE_FOUR
iftrue UnknownScript_0xa0b82
random $b
random 11
jump UnknownScript_0xa0b84
UnknownScript_0xa0b82:
random $e
random 14
UnknownScript_0xa0b84:
if_equal $0, UnknownScript_0xa0bbc
if_equal $1, UnknownScript_0xa0bc2
if_equal $2, UnknownScript_0xa0bc8
if_equal $3, UnknownScript_0xa0bce
if_equal $4, UnknownScript_0xa0bd4
if_equal $5, UnknownScript_0xa0bda
if_equal $6, UnknownScript_0xa0be0
if_equal $7, UnknownScript_0xa0be6
if_equal $8, UnknownScript_0xa0bec
if_equal $9, UnknownScript_0xa0bf2
if_equal $a, UnknownScript_0xa0bf8
if_equal $b, UnknownScript_0xa0bfe
if_equal $c, UnknownScript_0xa0c04
if_equal $d, UnknownScript_0xa0c0a
if_equal 0, UnknownScript_0xa0bbc
if_equal 1, UnknownScript_0xa0bc2
if_equal 2, UnknownScript_0xa0bc8
if_equal 3, UnknownScript_0xa0bce
if_equal 4, UnknownScript_0xa0bd4
if_equal 5, UnknownScript_0xa0bda
if_equal 6, UnknownScript_0xa0be0
if_equal 7, UnknownScript_0xa0be6
if_equal 8, UnknownScript_0xa0bec
if_equal 9, UnknownScript_0xa0bf2
if_equal 10, UnknownScript_0xa0bf8
if_equal 11, UnknownScript_0xa0bfe
if_equal 12, UnknownScript_0xa0c04
if_equal 13, UnknownScript_0xa0c0a
UnknownScript_0xa0bbc:
writetext UnknownText_0xa0efb
@@ -149,10 +149,10 @@ UnknownScript_0xa0c0d:
end
UnknownScript_0xa0c0e:
random $3
if_equal $0, UnknownScript_0xa0c1c
if_equal $1, UnknownScript_0xa0c20
if_equal $2, UnknownScript_0xa0c24
random 3
if_equal 0, UnknownScript_0xa0c1c
if_equal 1, UnknownScript_0xa0c20
if_equal 2, UnknownScript_0xa0c24
UnknownScript_0xa0c1c:
writetext UnknownText_0xa1c88

View File

@@ -806,8 +806,7 @@ Function9764: ; 9764
Function976b: ; 976b
ld l, a
ld h, 0
add hl, hl
add hl, hl
add_n_times hl, hl, 2
ld bc, TrainerPalettes
add hl, bc
ret
@@ -1975,9 +1974,7 @@ Functionb1de: ; b1de
push hl
ld l, a
ld h, 0
add hl, hl
add hl, hl
add hl, hl
add_n_times hl, hl, 3
ld de, TilesetBGPalette
add hl, de
ld e, l
@@ -2017,9 +2014,7 @@ Functionb1de: ; b1de
ld a, [MapGroup]
ld l, a
ld h, 0
add hl, hl
add hl, hl
add hl, hl
add_n_times hl, hl, 3
ld de, RoofPals
add hl, de
ld a, [TimeOfDayPal]

File diff suppressed because it is too large Load Diff

View File

@@ -125,8 +125,8 @@ Function97cc0:: ; 97cc0
jr .asm_97cf4
.asm_97ced
ld a, BANK(UnknownScript_0x135eb)
ld hl, UnknownScript_0x135eb
ld a, BANK(BugCatchingContestBattleScript)
ld hl, BugCatchingContestBattleScript
jr .asm_97cf4
.asm_97cf4

File diff suppressed because it is too large Load Diff

View File

@@ -306,7 +306,7 @@ MapSetupCommands: ; 15440
dbw BANK(Function24cd), Function24cd
dbw BANK(Function28e3), Function28e3
dbw BANK(Function289d), Function289d
dbw BANK(Function2879), Function2879
dbw BANK(BufferScreen), BufferScreen
dbw BANK(Function1047cf), Function1047cf
dbw BANK(LoadTilesetHeader), LoadTilesetHeader
dbw BANK(Function104750), Function104750

View File

@@ -62,7 +62,7 @@ Function10056: ; 10056 (4:4056)
Function10067: ; 10067 (4:4067)
ld hl, MenuDataHeader_0x10a4f
call Function1d3c
call CopyMenuDataHeader
ld a, [wd0d9]
ld [wcf88], a
ld a, [wd0df]
@@ -90,7 +90,7 @@ Function10094: ; 10094 (4:4094)
Function100a6: ; 100a6 (4:40a6)
ld hl, MenuDataHeader_0x10a7f
call Function1d3c
call CopyMenuDataHeader
ld a, [wd0da]
ld [wcf88], a
ld a, [wd0e0]
@@ -137,7 +137,7 @@ Function100e8: ; 100e8 (4:40e8)
.asm_10110
push de
call LoadMenuDataHeader
call Function1d81
call InterpretMenu2
call Function1c07
pop hl
ret c
@@ -220,7 +220,7 @@ Function10186: ; 10186 (4:4186)
Function10198: ; 10198 (4:4198)
ld hl, MenuDataHeader_0x10aaf
call Function1d3c
call CopyMenuDataHeader
ld a, [wd0db]
ld [wcf88], a
ld a, [wd0e1]
@@ -289,7 +289,7 @@ Function101c5: ; 101c5 (4:41c5)
.asm_10235
push de
call LoadMenuDataHeader
call Function1d81
call InterpretMenu2
call Function1c07
pop hl
ret c
@@ -709,7 +709,7 @@ Function104e9: ; 104e9 (4:44e9)
Function104fa: ; 104fa (4:44fa)
ld hl, MenuDataHeader_0x10a4f
call Function1d3c
call CopyMenuDataHeader
ld a, [wd0d9]
ld [wcf88], a
ld a, [wd0df]
@@ -737,7 +737,7 @@ Function10527: ; 10527 (4:4527)
Function10539: ; 10539 (4:4539)
ld hl, MenuDataHeader_0x10a7f
call Function1d3c
call CopyMenuDataHeader
ld a, [wd0da]
ld [wcf88], a
ld a, [wd0e0]
@@ -788,7 +788,7 @@ Function10594: ; 10594 (4:4594)
Function105a6: ; 105a6 (4:45a6)
ld hl, MenuDataHeader_0x10aaf
call Function1d3c
call CopyMenuDataHeader
ld a, [wd0db]
ld [wcf88], a
ld a, [wd0e1]
@@ -821,7 +821,7 @@ Function105dc: ; 105dc (4:45dc)
.asm_105ed
push de
call LoadMenuDataHeader
call Function1d81
call InterpretMenu2
call Function1c07
pop hl
ret c
@@ -992,7 +992,7 @@ Function106d9: ; 106d9 (4:46d9)
xor a
call Function10762
ld hl, MenuDataHeader_0x10a67
call Function1d3c
call CopyMenuDataHeader
ld a, [wd0d9]
ld [wcf88], a
ld a, [wd0df]
@@ -1008,7 +1008,7 @@ Function106ff: ; 106ff (4:46ff)
ld a, $2
call Function10762
ld hl, MenuDataHeader_0x10a97
call Function1d3c
call CopyMenuDataHeader
ld a, [wd0da]
ld [wcf88], a
ld a, [wd0e0]
@@ -1033,7 +1033,7 @@ Function1073b: ; 1073b (4:473b)
ld a, $1
call Function10762
ld hl, MenuDataHeader_0x10ac7
call Function1d3c
call CopyMenuDataHeader
ld a, [wd0db]
ld [wcf88], a
ld a, [wd0e1]
@@ -1223,7 +1223,7 @@ Function1085a: ; 1085a (4:485a)
push hl
call Function10762
pop hl
call Function1d3c
call CopyMenuDataHeader
call Function350c
ret

View File

@@ -654,7 +654,7 @@ UnknownScript_0xbd3d1:
UnknownScript_0xbd3f6:
farscall UnknownScript_0xbde3f
if_equal $0, UnknownScript_0xbd412
checkflag ENGINE_51
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue UnknownScript_0xbd412
checkcode VAR_WEEKDAY
if_equal $2, UnknownScript_0xbd416
@@ -680,7 +680,7 @@ UnknownScript_0xbd428:
farscall UnknownScript_0xbe1b6
farscall UnknownScript_0xbde3f
if_equal $0, UnknownScript_0xbd44c
checkflag ENGINE_51
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue UnknownScript_0xbd44c
checkcode VAR_WEEKDAY
if_equal $2, UnknownScript_0xbd480
@@ -1381,7 +1381,7 @@ UnknownScript_0xbda35:
iftrue UnknownScript_0xbda67
farscall UnknownScript_0xbde3f
if_equal $0, UnknownScript_0xbda5f
checkflag ENGINE_51
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue UnknownScript_0xbda5f
checkcode VAR_WEEKDAY
if_equal $2, UnknownScript_0xbda63
@@ -1403,7 +1403,7 @@ UnknownScript_0xbda6e:
farscall UnknownScript_0xbe1b6
farscall UnknownScript_0xbde3f
if_equal $0, UnknownScript_0xbda92
checkflag ENGINE_51
checkflag ENGINE_DAILY_BUG_CONTEST
iftrue UnknownScript_0xbda92
checkcode VAR_WEEKDAY
if_equal $2, UnknownScript_0xbda9e
@@ -3104,27 +3104,27 @@ String_be65b: db "Sister@"
String_be662: db "Brother@"
UnknownScript_0xbe66a:: ; 0xbe66a
TalkToTrainerScript:: ; 0xbe66a
faceplayer
trainerstatus $2
iftrue UnknownScript_0xbe698
iftrue AlreadyBeatenTrainerScript
loadtrainerdata
playrammusic
jump UnknownScript_0xbe68a
jump StartBattleWithMapTrainerScript
; 0xbe675
UnknownScript_0xbe675:: ; 0xbe675
SeenByTrainerScript:: ; 0xbe675
loadtrainerdata
playrammusic
showemote $0, $fe, 30
showemote EMOTE_SHOCK, $fe, 30
callasm Function831e
applymovement2 MovementBuffer
writepersonxy $fe
faceperson $0, $fe
jump UnknownScript_0xbe68a
jump StartBattleWithMapTrainerScript
; 0xbe68a
UnknownScript_0xbe68a: ; 0xbe68a
StartBattleWithMapTrainerScript: ; 0xbe68a
loadfont
trainertext $0
closetext
@@ -3135,6 +3135,6 @@ UnknownScript_0xbe68a: ; 0xbe68a
trainerstatus $1
loadvar wd04d, $ff
UnknownScript_0xbe698:
AlreadyBeatenTrainerScript:
scripttalkafter
; 0xbe699

File diff suppressed because it is too large Load Diff

View File

@@ -41,22 +41,22 @@ ENDM
spawn BLACKTHORN, BLACKTHORN_CITY, 21, 30
spawn MT_SILVER, SILVER_CAVE_OUTSIDE, 23, 20
spawn FAST_SHIP, FAST_SHIP_CABINS_SW_SSW_NW, 6, 2
const_value = -1
spawn N_A, N_A, -1, -1
db -1, -1, -1, -1
const NUM_SPAWNS
NUM_SPAWNS EQU const_value
LoadSpawnPoint: ; 1531f
; loads the spawn point in wd001
push hl
push de
ld a, [wd001]
cp -1
jr z, .asm_15341
cp SPAWN_N_A
jr z, .spawn_n_a
ld l, a
ld h, 0
add hl, hl
add hl, hl
add_n_times hl, hl, 2 ; multiply hl by 4
ld de, SpawnPoints
add hl, de
ld a, [hli]
@@ -67,7 +67,7 @@ LoadSpawnPoint: ; 1531f
ld [XCoord], a
ld a, [hli]
ld [YCoord], a
.asm_15341
.spawn_n_a
pop de
pop hl
ret
@@ -75,32 +75,33 @@ LoadSpawnPoint: ; 1531f
IsSpawnPoint: ; 15344
; Checks if the map loaded in de is a spawn point. Returns carry if it's a spawn point.
ld hl, SpawnPoints
ld c, 0
.asm_15349
.loop
ld a, [hl]
cp -1
jr z, .asm_1535f
cp SPAWN_N_A
jr z, .nope
cp d
jr nz, .asm_15356
jr nz, .next
inc hl
ld a, [hld]
cp e
jr z, .asm_15361
jr z, .yes
.asm_15356
.next
push bc
ld bc, 4
add hl, bc
pop bc
inc c
jr .asm_15349
jr .loop
.asm_1535f
.nope
and a
ret
.asm_15361
.yes
scf
ret
; 15363

View File

@@ -36,10 +36,10 @@ SpecialsPointers:: ; c029
add_special Functionc2f6
add_special Functionc309
add_special Function1050b9
add_special Functionc34a
add_special Function4d9e5
add_special BugContestJudging
add_special CheckPartyFullAfterContest
add_special Function13a12
add_special Function13a31
add_special ContestReturnMons
add_special Function135db
add_special Functionfbb32
add_special Functionfbcd2
@@ -71,7 +71,7 @@ SpecialsPointers:: ; c029
add_special WhiteBGMap
add_special UpdateTimePals
add_special ClearTileMap
add_special Function1ad2
add_special DrawOnMap
add_special Functione4a
add_special Functionc230
add_special SpecialSeenMon
@@ -105,7 +105,7 @@ SpecialsPointers:: ; c029
add_special Function88018
add_special SpecialNameRater
add_special Functionc2da
add_special Function718d
add_special GetFirstPokemonHappiness
add_special Function71ac
add_special Function2a4ab
add_special Function2a51f
@@ -173,7 +173,7 @@ SpecialsPointers:: ; c029
add_special Function10366e
add_special Function1037eb
add_special Function10383c
add_special Function1060a2
add_special Mobile_HealParty
add_special Function14168
add_special Function1037c2
add_special Function10630f
@@ -358,8 +358,8 @@ UnknownText_0xc345: ; 0xc345
db "@"
; 0xc34a
Functionc34a: ; c34a
callba Function1369d
BugContestJudging: ; c34a
callba _BugContestJudging
ld a, b
ld [ScriptVar], a
ret
@@ -463,7 +463,7 @@ UnknownText_0xc3d6: ; 0xc3d6
Functionc3db: ; c3db
call WhiteBGMap
call Function2879
call BufferScreen
ret
; c3e2
@@ -492,17 +492,18 @@ Functionc3fc: ; c3fc
; c403
Functionc403:: ; c403
LoadWildData:: ; c403
ld a, c
and a
jr nz, .asm_c410
jr nz, .swarm_route35
; swarm dark cave violet entrance
ld a, d
ld [wdfcc], a
ld a, e
ld [wdfcd], a
ret
.asm_c410
.swarm_route35
ld a, d
ld [wdc5a], a
ld a, e

File diff suppressed because it is too large Load Diff