diff options
Diffstat (limited to 'misc/mobile_45.asm')
-rw-r--r-- | misc/mobile_45.asm | 1604 |
1 files changed, 411 insertions, 1193 deletions
diff --git a/misc/mobile_45.asm b/misc/mobile_45.asm index 6e2c165f7..39d1f46ed 100644 --- a/misc/mobile_45.asm +++ b/misc/mobile_45.asm @@ -134,9 +134,9 @@ Function114243:: ; 114243 ld a, SRAM_ENABLE ld [MBC3SRamEnable], a ld a, [hFF8C] - push af ; if [wdc02] == 0, this is popped to pc. + push af ; if [$dc02] == 0, this is popped to pc. push de - ld a, [wdc02] + ld a, [$dc02] add a ld e, a ld d, 0 @@ -147,30 +147,32 @@ Function114243:: ; 114243 ld l, a pop de jp [hl] + ; 11425c Function11425c: ; 11425c - ld [wdc02], a + ld [$dc02], a pop af rept 2 ld [hFF8C], a endr ld [MBC3SRamBank], a ret + ; 114268 -Function114268: ; 114268 - ret +Function114268: mobile + ; 114269 Function114269: ; 114269 ld h, d ld l, e xor a - ld [wdc02], a - ld [wdc03], a + ld [$dc02], a + ld [$dc03], a ld a, [hli] - ld [wdc00], a + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -185,7 +187,7 @@ Function114269: ; 114269 and a jr z, .asm_1142a4 ld h, a - ld a, [wdc03] + ld a, [$dc03] and a jr nz, .asm_114292 ld a, h @@ -197,7 +199,7 @@ Function114269: ; 114269 cp $d jr z, .asm_1142bb xor a - ld [wdc02], a + ld [$dc02], a .asm_11429b inc e call z, Function114333 @@ -207,7 +209,7 @@ Function114269: ; 114269 jr nz, .asm_114282 .asm_1142a4 - ld a, [wdc03] + ld a, [$dc03] and a jr nz, .asm_114303 ld b, $80 @@ -217,7 +219,7 @@ Function114269: ; 114269 ld b, $81 .asm_1142b0 - ld a, [wdc00] + ld a, [$dc00] ld c, a ld a, $1 ld h, d @@ -235,7 +237,7 @@ Function114269: ; 114269 jr z, .asm_1142a4 ld a, [de] ld h, a - ld a, [wdc03] + ld a, [$dc03] and a jr nz, .asm_1142d4 ld a, h @@ -246,14 +248,14 @@ Function114269: ; 114269 ld a, h cp $a jr nz, .asm_1142ae - ld a, [wdc03] + ld a, [$dc03] and a jr nz, .asm_11430d - ld a, [wdc02] + ld a, [$dc02] and a jr nz, .asm_114309 ld a, $1 - ld [wdc02], a + ld [$dc02], a inc e call z, Function114333 dec bc @@ -279,14 +281,14 @@ Function114269: ; 114269 .asm_114309 xor a - ld [wdc02], a + ld [$dc02], a .asm_11430d - ld a, [wdc02] + ld a, [$dc02] and a jr nz, .asm_1142fe ld a, $1 - ld [wdc03], a + ld [$dc03], a inc e call z, Function114333 dec bc @@ -299,16 +301,18 @@ Function114269: ; 114269 cp $2e jp nz, .asm_114282 ld a, $1 - ld [wdc02], a + ld [$dc02], a jp .asm_11429b + ; 114333 Function114333: ; 114333 push bc - ld bc, wdc00 + ld bc, $dc00 call Function115d80 pop bc ret + ; 11433c Function11433c: ; 11433c @@ -343,7 +347,7 @@ Function11433c: ; 11433c .asm_114360 ld a, h - ld [wdc03], a + ld [$dc03], a pop hl push bc push de @@ -368,14 +372,14 @@ Function11433c: ; 11433c .asm_114381 pop de pop bc - ld a, [wdc03] - ld [wdc00], a + ld a, [$dc03] + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a call Function114c0b ld hl, String_114004 .asm_114394 - ld de, wdc24 + ld de, $dc24 .asm_114397 ld a, [hli] and a @@ -402,6 +406,7 @@ Function11433c: ; 11433c xor a ld b, $1 jp Function11425c + ; 1143b7 Function1143b7: ; 1143b7 @@ -453,6 +458,7 @@ Function1143b7: ; 1143b7 ld a, $1 pop hl jp Function11425c + ; 1143f3 Function1143f3: ; 1143f3 @@ -481,11 +487,12 @@ Function1143f3: ; 1143f3 ld a, $1 ld b, $84 ret + ; 114412 Function114412: ; 114412 ld a, c - ld [wdc00], a + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a ld hl, Unknown_11417f @@ -520,8 +527,8 @@ Function114412: ; 114412 jr z, .asm_1144b8 .asm_11444a - ld a, [wdc00] - ld [wdc02], a + ld a, [$dc00] + ld [$dc02], a ld a, [de] and a jr z, .asm_1144c2 @@ -587,7 +594,7 @@ Function114412: ; 114412 jr z, .asm_114486 ld d, h ld e, l - ld a, [wdc02] + ld a, [$dc02] ld h, a xor a ret @@ -611,14 +618,16 @@ Function114412: ; 114412 ld [hl], a ld a, $1 ret + ; 1144c8 Function1144c8: ; 1144c8 push bc - ld bc, wdc00 + ld bc, $dc00 call Function115d80 pop bc ret + ; 1144d1 Function1144d1: ; 1144d1 @@ -644,10 +653,10 @@ endr ld [hl], a xor a ld [BigDoll], a - ld [wdc17], a + ld [$dc17], a ld a, $2 - ld [wdc0e], a - ld hl, wdc03 + ld [$dc0e], a + ld hl, $dc03 ld c, [hl] inc hl ld e, [hl] @@ -659,7 +668,7 @@ endr and a jr z, .asm_114511 ld a, $1 - ld [wdc0d], a + ld [$dc0d], a call Function1146fa and a jr nz, .asm_11455b @@ -670,7 +679,7 @@ endr and a jr nz, .asm_11455b ld a, $2 - ld [wdc0d], a + ld [$dc0d], a .asm_11451c pop hl @@ -681,7 +690,7 @@ endr ld e, [hl] inc hl ld d, [hl] - ld a, [wdc0d] + ld a, [$dc0d] ld [de], a ld b, $0 ld a, [BigDoll] @@ -690,12 +699,12 @@ endr ld b, $1 .asm_114537 - ld hl, wdc06 + ld hl, $dc06 ld a, [hl] ld [wCurrentMapSignpostCount], a ld [hFF8C], a ld [MBC3SRamBank], a - ld hl, wdc09 + ld hl, $dc09 ld e, [hl] inc hl ld d, [hl] @@ -718,10 +727,11 @@ endr pop hl ld a, $1 jp Function11425c + ; 114561 Function114561: ; 114561 - ld hl, wdc03 + ld hl, $dc03 ld a, [de] ld [hli], a inc de @@ -740,6 +750,7 @@ Function114561: ; 114561 ld a, [de] ld [hl], a ret + ; 114576 Function114576: ; 114576 @@ -752,13 +763,13 @@ Function114576: ; 114576 and a jr nz, .asm_1145b4 ld a, h - ld [wdc00], a + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a push hl push de push bc - ld hl, wdc24 + ld hl, $dc24 call Function115d53 call Function1145c5 pop bc @@ -770,7 +781,7 @@ Function114576: ; 114576 and a jr nz, .asm_1145ba ld a, h - ld [wdc00], a + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a ld hl, String_114218 @@ -795,10 +806,11 @@ Function114576: ; 114576 ld a, $1 ld [Bed], a ret + ; 1145c5 Function1145c5: ; 1145c5 - ld hl, wdc24 + ld hl, $dc24 ld de, String_11421e ld c, $0 .asm_1145cd @@ -888,10 +900,11 @@ Function1145c5: ; 1145c5 ld [PartyMon5Defense], a xor a ret + ; 11463c Function11463c: ; 11463c - ld a, [wdc00] + ld a, [$dc00] push af push de ld hl, $ddc8 @@ -944,30 +957,32 @@ Function11463c: ; 11463c .asm_11468a pop de pop af - ld [wdc00], a + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a xor a ld [Carpet], a ld a, $1 ret + ; 11469b Function11469b: ; 11469b push bc - ld bc, wdc00 + ld bc, $dc00 call Function115d80 pop bc ret + ; 1146a4 Function1146a4: ; 1146a4 call Function114867 and a jr nz, .asm_1146e4 - ld hl, wdc03 + ld hl, $dc03 ld a, [hli] - ld [wdc00], a + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -979,9 +994,9 @@ Function1146a4: ; 1146a4 call Function1148c2 and a jr nz, .asm_1146e4 - ld hl, wdc03 + ld hl, $dc03 ld a, [hli] - ld [wdc00], a + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -1005,7 +1020,7 @@ endr jr .asm_1146f7 .asm_1146e8 - ld a, [wdc17] + ld a, [$dc17] and a jr z, .asm_1146f5 ld a, $1 @@ -1018,15 +1033,16 @@ endr .asm_1146f7 ld a, $1 ret + ; 1146fa Function1146fa: ; 1146fa call Function114867 and a jp nz, .asm_11478a - ld hl, wdc03 + ld hl, $dc03 ld a, [hli] - ld [wdc00], a + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -1039,8 +1055,8 @@ Function1146fa: ; 1146fa and a jp nz, .asm_11478a ld a, $1 - ld [wdc0e], a - ld a, [wdc00] + ld [$dc0e], a + ld a, [$dc00] ld [hFF8C], a ld [MBC3SRamBank], a ld a, $1 @@ -1052,7 +1068,7 @@ Function1146fa: ; 1146fa call Function114843 cp $1 jr nz, .asm_114749 - ld a, [wdc17] + ld a, [$dc17] and a jr z, .asm_114794 ld a, $1 @@ -1065,9 +1081,9 @@ Function1146fa: ; 1146fa ld a, [BigDoll] and a jr nz, .asm_114786 - ld hl, wdc03 + ld hl, $dc03 ld a, [hli] - ld [wdc00], a + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -1076,7 +1092,7 @@ Function1146fa: ; 1146fa call Function1147cd and a jr nz, .asm_1147b7 - ld a, [wdc0e] + ld a, [$dc0e] cp $3 jr nz, .asm_114773 rept 2 @@ -1087,9 +1103,9 @@ endr call Function1149cc and a jr nz, .asm_11478a - ld a, [wdc0d] + ld a, [$dc0d] inc a - ld [wdc0d], a + ld [$dc0d], a ld a, [BigDoll] and a jr z, .asm_114799 @@ -1103,7 +1119,7 @@ endr jr .asm_114796 .asm_11478e - ld a, [wdc17] + ld a, [$dc17] and a jr nz, .asm_114796 @@ -1120,9 +1136,9 @@ endr jr z, .asm_114737 jr .asm_1147cb - ld hl, wdc03 + ld hl, $dc03 ld a, [hli] - ld [wdc00], a + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a call Function114a7a @@ -1132,12 +1148,12 @@ endr ld [BigDoll], a .asm_1147b7 - ld a, [wdc17] + ld a, [$dc17] and a jr z, .asm_114794 ld a, $1 ld [BigDoll], a - ld a, [wdc0d] + ld a, [$dc0d] cp $1 jr nz, .asm_114773 ld b, $1 @@ -1145,6 +1161,7 @@ endr .asm_1147cb xor a ret + ; 1147cd Function1147cd: ; 1147cd @@ -1217,23 +1234,25 @@ Function1147cd: ; 1147cd and a jr nz, .asm_114837 ld a, $1 - ld [wdc17], a + ld [$dc17], a .asm_114837 ld a, $1 ret + ; 11483a Function11483a: ; 11483a push bc - ld bc, wdc00 + ld bc, $dc00 call Function115d80 pop bc ret + ; 114843 Function114843: ; 114843 - ld a, [wdc00] + ld a, [$dc00] push af push de ld [hFF8C], a @@ -1243,7 +1262,7 @@ Function114843: ; 114843 jr nz, .asm_11485f pop de pop af - ld [wdc00], a + ld [$dc00], a ld hl, String_114218 call Function114acf ret @@ -1251,13 +1270,14 @@ Function114843: ; 114843 .asm_11485f pop de pop af - ld [wdc00], a + ld [$dc00], a ld a, $1 ret + ; 114867 Function114867: ; 114867 - ld hl, wdc06 + ld hl, $dc06 ld a, [hli] ld [wCurrentMapSignpostCount], a ld [hFF8C], a @@ -1273,7 +1293,7 @@ Function114867: ; 114867 ld [de], a inc e call z, Function1148b9 - ld hl, wdc03 + ld hl, $dc03 ld a, [hli] ld [de], a inc e @@ -1286,7 +1306,7 @@ Function114867: ; 114867 ld [de], a inc e call z, Function1148b9 - ld hl, wdc06 + ld hl, $dc06 ld a, [wCurrentMapSignpostCount] ld [hli], a ld [hl], e @@ -1313,6 +1333,7 @@ Function114867: ; 114867 .asm_1148b6 ld a, $1 ret + ; 1148b9 Function1148b9: ; 1148b9 @@ -1321,10 +1342,11 @@ Function1148b9: ; 1148b9 call Function115d80 pop bc ret + ; 1148c2 Function1148c2: ; 1148c2 - ld hl, wdc06 + ld hl, $dc06 ld a, [hli] ld [wCurrentMapSignpostCount], a ld [hFF8C], a @@ -1340,7 +1362,7 @@ Function1148c2: ; 1148c2 ld [de], a inc e call z, Function114944 - ld a, [wdc0e] + ld a, [$dc0e] ld [de], a inc e call z, Function114944 @@ -1365,7 +1387,7 @@ Function1148c2: ; 1148c2 call z, Function114944 .asm_114904 - ld hl, wdc03 + ld hl, $dc03 ld a, [hli] ld [de], a inc e @@ -1378,7 +1400,7 @@ Function1148c2: ; 1148c2 ld [de], a inc e call z, Function114944 - ld hl, wdc06 + ld hl, $dc06 ld a, [wCurrentMapSignpostCount] ld [hli], a ld [hl], e @@ -1388,7 +1410,7 @@ Function1148c2: ; 1148c2 ld c, [hl] inc hl ld b, [hl] - ld a, [wdc0e] + ld a, [$dc0e] cp $3 jr z, .asm_114932 ld d, $6 @@ -1413,6 +1435,7 @@ Function1148c2: ; 1148c2 .asm_114941 ld a, $1 ret + ; 114944 Function114944: ; 114944 @@ -1421,10 +1444,11 @@ Function114944: ; 114944 call Function115d80 pop bc ret + ; 11494d Function11494d: ; 11494d - ld hl, wdc06 + ld hl, $dc06 ld a, [hli] ld [wCurrentMapSignpostCount], a ld [hFF8C], a @@ -1432,7 +1456,7 @@ Function11494d: ; 11494d ld e, [hl] inc hl ld d, [hl] - ld a, [wdc0e] + ld a, [$dc0e] ld [de], a inc e call z, Function1149c3 @@ -1457,7 +1481,7 @@ Function11494d: ; 11494d call z, Function1149c3 .asm_114983 - ld hl, wdc03 + ld hl, $dc03 ld a, [hli] ld [de], a inc e @@ -1470,7 +1494,7 @@ Function11494d: ; 11494d ld [de], a inc e call z, Function1149c3 - ld hl, wdc06 + ld hl, $dc06 ld a, [wCurrentMapSignpostCount] ld [hli], a ld [hl], e @@ -1480,7 +1504,7 @@ Function11494d: ; 11494d ld c, [hl] inc hl ld b, [hl] - ld a, [wdc0e] + ld a, [$dc0e] cp $3 jr z, .asm_1149b1 ld d, $4 @@ -1505,6 +1529,7 @@ Function11494d: ; 11494d .asm_1149c0 ld a, $1 ret + ; 1149c3 Function1149c3: ; 1149c3 @@ -1513,16 +1538,17 @@ Function1149c3: ; 1149c3 call Function115d80 pop bc ret + ; 1149cc Function1149cc: ; 1149cc - ld hl, wdc06 + ld hl, $dc06 ld a, [hl] ld [wCurrentMapSignpostCount], a ld [hFF8C], a ld [MBC3SRamBank], a push de - ld hl, wdc09 + ld hl, $dc09 ld e, [hl] inc hl ld d, [hl] @@ -1549,7 +1575,7 @@ Function1149cc: ; 1149cc ld [de], a inc e call z, Function114a0f - ld hl, wdc06 + ld hl, $dc06 ld a, [wCurrentMapSignpostCount] ld [hli], a ld [hl], e @@ -1563,6 +1589,7 @@ Function1149cc: ; 1149cc pop de ld a, $1 ret + ; 114a0f Function114a0f: ; 114a0f @@ -1571,6 +1598,7 @@ Function114a0f: ; 114a0f call Function115d80 pop bc ret + ; 114a18 Function114a18: ; 114a18 @@ -1612,8 +1640,8 @@ Function114a18: ; 114a18 dec bc .asm_114a52 - ld hl, wdc03 - ld a, [wdc00] + ld hl, $dc03 + ld a, [$dc00] ld [hli], a ld [hl], e inc hl @@ -1633,19 +1661,21 @@ Function114a18: ; 114a18 and a jr nz, .asm_114a6e ld a, $1 - ld [wdc17], a + ld [$dc17], a .asm_114a6e ld a, $1 ret + ; 114a71 Function114a71: ; 114a71 push bc - ld bc, wdc00 + ld bc, $dc00 call Function115d80 pop bc ret + ; 114a7a Function114a7a: ; 114a7a @@ -1680,8 +1710,8 @@ Function114a7a: ; 114a7a jr nz, .asm_114abb inc e call z, Function114ac6 - ld hl, wdc03 - ld a, [wdc00] + ld hl, $dc03 + ld a, [$dc00] ld [hli], a ld [hl], e inc hl @@ -1693,19 +1723,21 @@ Function114a7a: ; 114a7a and a jr nz, .asm_114ac3 ld a, $1 - ld [wdc17], a + ld [$dc17], a .asm_114ac3 ld a, $1 ret + ; 114ac6 Function114ac6: ; 114ac6 push bc - ld bc, wdc00 + ld bc, $dc00 call Function115d80 pop bc ret + ; 114acf Function114acf: ; 114acf @@ -1735,7 +1767,7 @@ Function114acf: ; 114acf jr nz, .asm_114ad1 .asm_114aec ld a, $2 - ld [wdc0e], a + ld [$dc0e], a pop bc pop hl ret @@ -1783,7 +1815,7 @@ Function114acf: ; 114acf .asm_114b26 ld hl, Plant - ld a, [wdc00] + ld a, [$dc00] ld [hli], a ld [hl], e inc hl @@ -1806,29 +1838,31 @@ Function114acf: ; 114acf pop bc pop hl ld a, $3 - ld [wdc0e], a + ld [$dc0e], a xor a ret + ; 114b4c Function114b4c: ; 114b4c push bc - ld bc, wdc00 + ld bc, $dc00 call Function115d80 pop bc ret + ; 114b55 Function114b55: ; 114b55 call Function114561 ld b, $0 - ld hl, wdc03 + ld hl, $dc03 ld c, [hl] inc hl ld e, [hl] inc hl ld d, [hl] - ld hl, wdc24 + ld hl, $dc24 .asm_114b65 push de push bc @@ -1871,7 +1905,7 @@ endr jr .asm_114b82 .asm_114b96 - ld hl, wdc06 + ld hl, $dc06 ld a, [hli] ld [wCurrentMapSignpostCount], a ld [hFF8C], a @@ -1881,7 +1915,7 @@ endr ld d, [hl] inc hl ld bc, $004e - ld hl, wdc24 + ld hl, $dc24 call Function115d6a jp Function11425c @@ -1892,6 +1926,7 @@ endr pop bc ld b, $82 jp Function11425c + ; 114bbc Function114bbc: ; 114bbc @@ -1912,11 +1947,11 @@ Function114bbc: ; 114bbc and a jr nz, .asm_114bff ld a, h - ld [wdc00], a + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a call Function114c0b - ld hl, wdc24 + ld hl, $dc24 call Function114c5e ld a, b or c @@ -1929,7 +1964,7 @@ Function114bbc: ; 114bbc ld a, [hli] ld e, a ld d, [hl] - ld hl, wdc24 + ld hl, $dc24 push bc call Function115d6a pop hl @@ -1946,14 +1981,15 @@ Function114bbc: ; 114bbc ld a, $1 pop hl jp Function11425c + ; 114c0b Function114c0b: ; 114c0b - ld hl, wdc24 + ld hl, $dc24 push bc call Function115d53 pop bc - ld hl, wdc24 + ld hl, $dc24 ld d, h ld e, l .asm_114c18 @@ -1969,7 +2005,7 @@ Function114c0b: ; 114c0b .asm_114c24 xor a ld [de], a - ld hl, wdc24 + ld hl, $dc24 ld bc, NULL .asm_114c2c ld a, [hli] @@ -2005,14 +2041,16 @@ Function114c0b: ; 114c0b or c jr z, .asm_114c24 jr .asm_114c18 + ; 114c55 Function114c55: ; 114c55 push bc - ld bc, wdc00 + ld bc, $dc00 call Function115d80 pop bc ret + ; 114c5e Function114c5e: ; 114c5e @@ -2057,9 +2095,9 @@ rept 2 dec bc endr ld a, l - ld [wdc03], a + ld [$dc03], a ld a, h - ld [wdc04], a + ld [$dc04], a pop hl push de call Function115c49 @@ -2078,9 +2116,9 @@ endr ld a, b or c jr nz, .asm_114ca6 - ld a, [wdc03] + ld a, [$dc03] ld l, a - ld a, [wdc04] + ld a, [$dc04] ld h, a jr .asm_114c62 @@ -2115,6 +2153,7 @@ endr .asm_114cd7 dec bc ret + ; 114cd9 Function114cd9: ; 114cd9 @@ -2132,15 +2171,15 @@ Function114cd9: ; 114cd9 call Function1143f3 and a jr nz, .asm_114d33 - ld [wdc03], a - ld [wdc04], a + ld [$dc03], a + ld [$dc04], a ld a, h - ld [wdc00], a + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a - ld hl, wdc24 + ld hl, $dc24 call Function114d39 - ld hl, wdc24 + ld hl, $dc24 call Function114d99 pop hl push hl @@ -2181,11 +2220,12 @@ endr pop hl ld a, $1 jp Function11425c + ; 114d39 Function114d39: ; 114d39 .asm_114d39 - ld a, [wdc04] + ld a, [$dc04] and a jr nz, .asm_114d4a ld a, [de] @@ -2204,27 +2244,27 @@ Function114d39: ; 114d39 jr .asm_114d84 .asm_114d55 - ld [wdc03], a + ld [$dc03], a ld a, $1 - ld [wdc04], a + ld [$dc04], a jr .asm_114d84 .asm_114d5f - ld a, [wdc03] + ld a, [$dc03] cp $28 jr nz, .asm_114d84 xor a - ld [wdc03], a - ld [wdc04], a + ld [$dc03], a + ld [$dc04], a jr .asm_114d84 .asm_114d6f - ld a, [wdc03] + ld a, [$dc03] cp $22 jr nz, .asm_114d84 xor a - ld [wdc03], a - ld [wdc04], a + ld [$dc03], a + ld [$dc04], a jr .asm_114d84 .asm_114d7f @@ -2240,7 +2280,7 @@ Function114d39: ; 114d39 inc e jr nz, .asm_114d39 push bc - ld bc, wdc00 + ld bc, $dc00 call Function115d80 pop bc jr .asm_114d39 @@ -2249,6 +2289,7 @@ Function114d39: ; 114d39 xor a ld [hli], a ret + ; 114d99 Function114d99: ; 114d99 @@ -2324,6 +2365,7 @@ rept 2 endr xor a ret + ; 114df1 Function114df1: ; 114df1 @@ -2374,6 +2416,7 @@ Function114df1: ; 114df1 .asm_114e2b xor a ret + ; 114e2d Function114e2d: ; 114e2d @@ -2410,6 +2453,7 @@ Function114e2d: ; 114e2d jr z, .asm_114e55 xor a ret + ; 114e62 Function114e62: ; 114e62 @@ -2435,7 +2479,7 @@ Function114e62: ; 114e62 call Function114ea0 and a jr nz, .asm_114e99 - ld hl, wdc09 + ld hl, $dc09 ld a, [hli] cpl ld e, a @@ -2454,10 +2498,11 @@ Function114e62: ; 114e62 ld a, $1 ld b, $83 jp Function11425c + ; 114ea0 Function114ea0: ; 114ea0 - ld hl, wdc06 + ld hl, $dc06 ld a, [hli] ld [wCurrentMapSignpostCount], a ld [hFF8C], a @@ -2483,7 +2528,7 @@ Function114ea0: ; 114ea0 dec bc inc e call z, Function114ee0 - ld hl, wdc06 + ld hl, $dc06 ld a, [wCurrentMapSignpostCount] ld [hli], a ld a, e @@ -2501,6 +2546,7 @@ Function114ea0: ; 114ea0 ld a, $1 ld b, $83 ret + ; 114ee0 Function114ee0: ; 114ee0 @@ -2509,10 +2555,11 @@ Function114ee0: ; 114ee0 call Function115d80 pop bc ret + ; 114ee9 Function114ee9: ; 114ee9 - ld hl, wdc03 + ld hl, $dc03 ld a, b ld [hli], a ld a, c @@ -2544,13 +2591,14 @@ endr ld [hli], a ld [hl], d ret + ; 114f0a Function114f0a: ; 114f0a call Function114f39 and a jr nz, .asm_114f26 - ld a, [wdc03] + ld a, [$dc03] cp $6 jr c, .asm_114f21 cp $c @@ -2571,7 +2619,7 @@ Function114f0a: ; 114f0a call Function114f59 and a jr nz, .asm_114f23 - ld hl, wdc0d + ld hl, $dc0d ld e, [hl] inc hl ld d, [hl] @@ -2580,10 +2628,11 @@ Function114f0a: ; 114f0a jr z, .asm_114f21 ld a, $ff ret + ; 114f39 Function114f39: ; 114f39 - ld hl, wdc0d + ld hl, $dc0d ld e, [hl] inc hl ld d, [hl] @@ -2602,7 +2651,7 @@ Function114f39: ; 114f39 ld a, [de] ld [hli], a inc de - ld hl, wdc0d + ld hl, $dc0d ld [hl], e inc hl ld [hl], d @@ -2611,13 +2660,14 @@ Function114f39: ; 114f39 .asm_114f58 ret + ; 114f59 Function114f59: ; 114f59 ld a, [wStartDay] and a jr nz, .asm_114f7c - ld a, [wdc03] + ld a, [$dc03] cp $11 jr z, .asm_114fa7 add a @@ -2635,7 +2685,7 @@ Function114f59: ; 114f59 ld [wStartDay], a .asm_114f7c - ld a, [wdc03] + ld a, [$dc03] cp $5 jr c, .asm_114fc9 jr z, .asm_114fec @@ -2665,15 +2715,15 @@ Function114f59: ; 114f59 ld c, [hl] inc hl ld a, [hli] - ld [wdc00], a + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] - ld hl, wdc24 + ld hl, $dc24 call Function115d53 - ld hl, wdc24 + ld hl, $dc24 call Function115020 and a jr nz, .asm_114fe7 @@ -2683,9 +2733,9 @@ Function114f59: ; 114f59 call Function115062 and a jr nz, .asm_114fe7 - ld a, [wdc04] + ld a, [$dc04] dec a - ld [wdc04], a + ld [$dc04], a and a jr z, .asm_114fdf call Function114f39 @@ -2693,8 +2743,8 @@ Function114f59: ; 114f59 jr nz, .asm_114fc9 .asm_114fdf - ld a, [wdc05] - ld [wdc04], a + ld a, [$dc05] + ld [$dc04], a jr .asm_11501e .asm_114fe7 @@ -2723,7 +2773,7 @@ Function114f59: ; 114f59 .asm_115007 call Function11528f - ld hl, wdc24 + ld hl, $dc24 call Function115217 and a jr nz, .asm_114fe7 @@ -2738,11 +2788,12 @@ Function114f59: ; 114f59 .asm_11501e xor a ret + ; 115020 Function115020: ; 115020 push hl - ld hl, wdc06 + ld hl, $dc06 ld a, [hli] ld [wCurrentMapSignpostCount], a ld [hFF8C], a @@ -2770,7 +2821,7 @@ Function115020: ; 115020 jr .asm_115036 .asm_115046 - ld hl, wdc06 + ld hl, $dc06 ld a, [wCurrentMapSignpostCount] ld [hli], a ld a, e @@ -2786,6 +2837,7 @@ Function115020: ; 115020 .asm_115056 ld a, $1 ret + ; 115059 Function115059: ; 115059 @@ -2794,6 +2846,7 @@ Function115059: ; 115059 call Function115d80 pop bc ret + ; 115062 Function115062: ; 115062 @@ -2803,14 +2856,14 @@ Function115062: ; 115062 jr z, .asm_1150ae ld c, a ld a, [hli] - ld [wdc00], a + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] ld b, $0 - ld hl, wdc24 + ld hl, $dc24 ld a, [wStartDay] cp $1 jr z, .asm_11509b @@ -2848,10 +2901,11 @@ Function115062: ; 115062 .asm_1150b2 ret + ; 1150b3 Function1150b3: ; 1150b3 - ld hl, wdc24 + ld hl, $dc24 ld de, PartyMon5Defense ld b, $0 .asm_1150bb @@ -2952,10 +3006,11 @@ endr xor a ld [de], a ret + ; 115136 Function115136: ; 115136 - ld hl, wdc06 + ld hl, $dc06 ld a, [hli] ld [wCurrentMapSignpostCount], a ld [hFF8C], a @@ -2983,7 +3038,7 @@ Function115136: ; 115136 jr .asm_11514d .asm_11515d - ld hl, wdc06 + ld hl, $dc06 ld a, [wCurrentMapSignpostCount] ld [hli], a ld a, e @@ -2999,6 +3054,7 @@ Function115136: ; 115136 .asm_11516d ld a, $1 ret + ; 115170 Function115170: ; 115170 @@ -3007,10 +3063,11 @@ Function115170: ; 115170 call Function115d80 pop bc ret + ; 115179 Function115179: ; 115179 - ld hl, wdc06 + ld hl, $dc06 ld a, [hli] ld [wCurrentMapSignpostCount], a ld [hFF8C], a @@ -3106,7 +3163,7 @@ Function115179: ; 115179 jr z, .asm_1151ef inc e call z, Function11520e - ld hl, wdc06 + ld hl, $dc06 ld a, [wCurrentMapSignpostCount] ld [hli], a ld a, e @@ -3118,6 +3175,7 @@ Function115179: ; 115179 ld [hl], b xor a ret + ; 11520e Function11520e: ; 11520e @@ -3126,11 +3184,12 @@ Function11520e: ; 11520e call Function115d80 pop bc ret + ; 115217 Function115217: ; 115217 push hl - ld hl, wdc06 + ld hl, $dc06 ld a, [hli] ld [wCurrentMapSignpostCount], a ld [hFF8C], a @@ -3158,7 +3217,7 @@ Function115217: ; 115217 jr .asm_11522d .asm_11523d - ld a, [wdc03] + ld a, [$dc03] cp $b jr z, .asm_115278 cp $c @@ -3170,7 +3229,7 @@ Function115217: ; 115217 jr .asm_115262 .asm_115252 - ld hl, wdc06 + ld hl, $dc06 ld a, [wCurrentMapSignpostCount] ld [hli], a ld a, e @@ -3212,6 +3271,7 @@ Function115217: ; 115217 inc e call z, Function115286 jr .asm_115252 + ; 115286 Function115286: ; 115286 @@ -3220,6 +3280,7 @@ Function115286: ; 115286 call Function115d80 pop bc ret + ; 11528f Function11528f: ; 11528f @@ -3227,14 +3288,14 @@ Function11528f: ; 11528f ld c, [hl] inc hl ld a, [hli] - ld [wdc00], a + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a ld a, [hli] ld e, a ld a, [hli] ld d, a - ld hl, wdc24 + ld hl, $dc24 .asm_1152a4 ld a, [de] ld [hli], a @@ -3244,14 +3305,16 @@ Function11528f: ; 11528f jr nz, .asm_1152a4 ld [hl], c ret + ; 1152af Function1152af: ; 1152af push bc - ld bc, wdc00 + ld bc, $dc00 call Function115d80 pop bc ret + ; 1152b8 Function1152b8: ; 1152b8 @@ -3268,12 +3331,12 @@ Function1152b8: ; 1152b8 and a jr nz, .asm_1152f9 .asm_1152ca - ld hl, wdc0d + ld hl, $dc0d ld e, [hl] inc hl ld d, [hl] .asm_1152d0 - ld a, [wdc03] + ld a, [$dc03] cp $3 jr nz, .asm_1152d8 push de @@ -3294,11 +3357,11 @@ Function1152b8: ; 1152b8 inc de and a jr nz, .asm_115301 - ld a, [wdc03] + ld a, [$dc03] cp $6 jr z, .asm_115335 inc a - ld [wdc03], a + ld [$dc03], a jr .asm_1152d0 .asm_1152f9 @@ -3308,29 +3371,29 @@ Function1152b8: ; 1152b8 jp Function11425c .asm_115301 - ld hl, wdc0d + ld hl, $dc0d ld [hl], e inc hl ld [hl], d .asm_115307 - ld [wdc05], a + ld [$dc05], a ld a, $1 - ld [wdc04], a + ld [$dc04], a call Function1153b5 call Function114f59 and a jr nz, .asm_1152f9 - ld a, [wdc05] + ld a, [$dc05] dec a jr nz, .asm_115307 - ld a, [wdc03] + ld a, [$dc03] inc a - ld [wdc03], a + ld [$dc03], a call Function114ea0 and a jr nz, .asm_1152f9 ld [wStartDay], a - ld a, [wdc03] + ld a, [$dc03] cp $6 jr nz, .asm_1152ca @@ -3344,9 +3407,9 @@ Function1152b8: ; 1152b8 call Function114ea0 and a jr nz, .asm_1152f9 - ld a, [wdc03] + ld a, [$dc03] inc a - ld [wdc03], a + ld [$dc03], a cp $9 jr nz, .asm_115335 pop bc @@ -3364,7 +3427,7 @@ Function1152b8: ; 1152b8 jr nz, .asm_1152f9 .asm_11536b - ld hl, wdc09 + ld hl, $dc09 ld a, [hli] cpl ld e, a @@ -3378,10 +3441,11 @@ Function1152b8: ; 1152b8 add hl, de xor a jp Function11425c + ; 11537d Function11537d: ; 11537d - ld hl, wdc06 + ld hl, $dc06 ld a, [de] ld [hli], a inc de @@ -3419,18 +3483,19 @@ Function11537d: ; 11537d ld a, [de] ld [hli], a inc de - ld hl, wdc0d + ld hl, $dc0d ld [hl], e inc hl ld [hl], d xor a - ld [wdc03], a + ld [$dc03], a ld [wStartDay], a ret + ; 1153b5 Function1153b5: ; 1153b5 - ld hl, wdc0d + ld hl, $dc0d ld e, [hl] inc hl ld d, [hl] @@ -3449,22 +3514,23 @@ endr ld a, [de] ld [Bed], a inc de - ld hl, wdc0d + ld hl, $dc0d ld [hl], e inc hl ld [hl], d ret + ; 1153d2 Function1153d2: ; 1153d2 - ld a, [wdc03] + ld a, [$dc03] ld d, a - ld a, [wdc04] + ld a, [$dc04] ld e, a push de xor a - ld [wdc03], a - ld [wdc04], a + ld [$dc03], a + ld [$dc04], a ld a, $24 ld [Console], a ld a, $dc @@ -3482,7 +3548,7 @@ Function1153d2: ; 1153d2 push bc .asm_1153f5 ld a, [hli] - ld [wdc00], a + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -3531,7 +3597,7 @@ Function1153d2: ; 1153d2 ld [LeftOrnament], a xor a ld [de], a - ld hl, wdc24 + ld hl, $dc24 .asm_11543d ld a, [hli] and a @@ -3547,14 +3613,14 @@ Function1153d2: ; 1153d2 .asm_11544b pop hl ld a, h - ld [wdc03], a + ld [$dc03], a ld a, l - ld [wdc04], a + ld [$dc04], a ld a, $1 ret .asm_115457 - ld hl, wdc24 + ld hl, $dc24 call Function114d99 ld hl, $ddc8 .asm_115460 @@ -3636,11 +3702,12 @@ Function1153d2: ; 1153d2 ld d, a pop hl ld a, h - ld [wdc03], a + ld [$dc03], a ld a, l - ld [wdc04], a + ld [$dc04], a xor a ret + ; 1154d4 Function1154d4: ; 1154d4 @@ -3669,7 +3736,7 @@ Function1154d4: ; 1154d4 .asm_115502 ld a, $a - ld [wdc03], a + ld [$dc03], a call Function114f59 and a jr z, .asm_11551a @@ -3677,7 +3744,7 @@ Function1154d4: ; 1154d4 .asm_11550f ld a, $c - ld [wdc03], a + ld [$dc03], a call Function114f59 and a jr nz, .asm_11552c @@ -3701,7 +3768,7 @@ Function1154d4: ; 1154d4 ld a, $1 ld [wDailyResetTimer], a ld a, $b - ld [wdc03], a + ld [$dc03], a call Function114f59 and a jr nz, .asm_11552c @@ -3713,7 +3780,7 @@ Function1154d4: ; 1154d4 and a jr nz, .asm_11552c ld a, $e - ld [wdc03], a + ld [$dc03], a call Function114f59 and a jr nz, .asm_11552c @@ -3730,7 +3797,7 @@ Function1154d4: ; 1154d4 and a jr z, .asm_11557d ld a, $f - ld [wdc03], a + ld [$dc03], a call Function114f59 and a jr nz, .asm_11552c @@ -3742,14 +3809,14 @@ Function1154d4: ; 1154d4 .asm_11557d ld a, $10 - ld [wdc03], a + ld [$dc03], a call Function114f59 and a jr nz, .asm_11552c call Function114ea0 and a jr nz, .asm_11552c - ld hl, wdc09 + ld hl, $dc09 ld a, [hli] cpl ld e, a @@ -3772,10 +3839,11 @@ Function1154d4: ; 1154d4 jr z, .asm_115560 call Function1155d1 jr .asm_115547 + ; 1155af Function1155af: ; 1155af - ld hl, wdc06 + ld hl, $dc06 ld a, [de] ld [hli], a inc de @@ -3803,12 +3871,13 @@ Function1155af: ; 1155af ld [hl], d call Function1155d1 ret + ; 1155d1 Function1155d1: ; 1155d1 - ld a, [wdc0d] + ld a, [$dc0d] ld l, a - ld a, [wdc0e] + ld a, [$dc0e] ld h, a ld a, [hli] ld [BigDoll], a @@ -3827,7 +3896,7 @@ Function1155d1: ; 1155d1 ld [Bed], a .asm_1155f0 - ld de, wdc17 + ld de, $dc17 ld a, [hli] ld [de], a inc de @@ -3843,20 +3912,21 @@ Function1155d1: ; 1155d1 ld a, [hli] ld [de], a ld a, l - ld [wdc0d], a + ld [$dc0d], a ld a, h - ld [wdc0e], a + ld [$dc0e], a ret + ; 11560a Function11560a: ; 11560a - ld a, [wdc06] + ld a, [$dc06] ld [wCurrentMapSignpostCount], a - ld a, [wdc17] - ld [wdc00], a + ld a, [$dc17] + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a - ld hl, wdc1a + ld hl, $dc1a ld c, [hl] inc hl ld b, [hl] @@ -3864,7 +3934,7 @@ Function11560a: ; 11560a cp b jp c, .asm_1156b1 jr nz, .asm_115631 - ld a, [wdc09] + ld a, [$dc09] cp c jp c, .asm_1156b1 @@ -3872,7 +3942,7 @@ Function11560a: ; 11560a ld a, b or c jr z, .asm_1156a9 - ld a, [wdc09] + ld a, [$dc09] ld l, a ld a, [wCurrMapCallbackCount] ld h, a @@ -3885,7 +3955,7 @@ Function11560a: ; 11560a inc de add hl, de ld a, l - ld [wdc09], a + ld [$dc09], a ld a, h ld [wCurrMapCallbackCount], a .asm_11564d @@ -3898,9 +3968,9 @@ Function11560a: ; 11560a jr c, .asm_1156b6 .asm_115659 - ld a, [wdc1a] + ld a, [$dc1a] ld e, a - ld a, [wdc1b] + ld a, [$dc1b] ld d, a ld a, c cpl @@ -3911,15 +3981,15 @@ Function11560a: ; 11560a inc hl add hl, de ld a, l - ld [wdc1a], a + ld [$dc1a], a ld a, h - ld [wdc1b], a + ld [$dc1b], a push bc ld hl, $dc18 ld e, [hl] inc hl ld d, [hl] - ld hl, wdc24 + ld hl, $dc24 call Function115d53 ld hl, $dc18 ld [hl], e @@ -3933,13 +4003,13 @@ Function11560a: ; 11560a ld e, [hl] inc hl ld d, [hl] - ld hl, wdc24 + ld hl, $dc24 call Function115d6a ld hl, wCurrMapTriggerCount ld [hl], e inc hl ld [hl], d - ld hl, wdc1a + ld hl, $dc1a ld c, [hl] inc hl ld b, [hl] @@ -3949,7 +4019,7 @@ Function11560a: ; 11560a .asm_1156a9 ld a, [wCurrentMapSignpostCount] - ld [wdc06], a + ld [$dc06], a xor a ret @@ -3966,7 +4036,7 @@ Function11560a: ; 11560a cpl ld l, a add hl, bc - ld de, wdc1a + ld de, $dc1a ld a, l ld [de], a inc de @@ -3974,6 +4044,7 @@ Function11560a: ; 11560a ld [de], a ld bc, $03db jr .asm_115659 + ; 1156cc Function1156cc: ; 1156cc @@ -4037,10 +4108,11 @@ Function1156cc: ; 1156cc ld a, $1 ld b, $83 jp Function11425c + ; 115732 Function115732: ; 115732 - ld hl, wdc02 + ld hl, $dc02 ld a, [de] ld [hli], a inc de @@ -4080,10 +4152,11 @@ Function115732: ; 115732 ld [hli], a ld [hl], b ret + ; 11575c Function11575c: ; 11575c - ld hl, wdc05 + ld hl, $dc05 ld a, [hli] ld h, [hl] ld l, a @@ -4167,14 +4240,15 @@ Function11575c: ; 11575c ld a, $2 ld [wStartDay], a ret + ; 1157d0 Function1157d0: ; 1157d0 - ld hl, wdc05 + ld hl, $dc05 ld a, [hli] ld h, [hl] ld l, a - ld a, [wdc0e] + ld a, [$dc0e] ld c, a ld a, [Bed] ld b, a @@ -4201,15 +4275,15 @@ Function1157d0: ; 1157d0 inc bc add hl, bc ld a, l - ld [wdc05], a + ld [$dc05], a ld a, h - ld [wdc06], a + ld [$dc06], a ld a, h or l jr nz, .asm_11580f pop bc ld a, c - ld [wdc0e], a + ld [$dc0e], a ld a, b ld [Bed], a ld a, $4 @@ -4219,41 +4293,42 @@ Function1157d0: ; 1157d0 .asm_11580f pop bc ld a, c - ld [wdc0e], a + ld [$dc0e], a ld a, b ld [Bed], a ld a, $3 ld [wStartDay], a ret + ; 11581e Function11581e: ; 11581e ld a, [wStartDay] and a ret z - ld a, [wdc0e] + ld a, [$dc0e] ld c, a ld a, [Bed] ld b, a - ld hl, wdc02 + ld hl, $dc02 ld a, [hli] - ld [wdc00], a + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] inc hl ld d, [hl] - ld hl, wdc24 + ld hl, $dc24 push bc call Function115d53 pop bc - ld hl, wdc02 - ld a, [wdc00] + ld hl, $dc02 + ld a, [$dc00] ld [hli], a ld [hl], e inc hl ld [hl], d - ld hl, wdc24 + ld hl, $dc24 ld de, PartyMon5Defense call Function1158c2 ld hl, PartyMon5Defense @@ -4332,24 +4407,25 @@ Function11581e: ; 11581e ld a, $ff ld [wStartDay], a ret + ; 1158c2 Function1158c2: ; 1158c2 ld a, e ld [SwarmFlags], a ld a, d - ld [wdc21], a + ld [$dc21], a xor a - ld [wdc22], a + ld [$dc22], a xor a ld [de], a inc de ld [de], a inc de ld a, c - ld [wdc19], a + ld [$dc19], a ld a, b - ld [wdc1a], a + ld [$dc1a], a ld c, e ld b, d ld e, l @@ -4362,16 +4438,16 @@ Function1158c2: ; 1158c2 .asm_1158e5 ld b, $3 push hl - ld hl, wdc1b + ld hl, $dc1b .asm_1158eb ld a, [de] inc de ld [hli], a dec b jr nz, .asm_1158eb - ld a, [wdc19] + ld a, [$dc19] ld c, a - ld a, [wdc1a] + ld a, [$dc1a] ld b, a xor a or b @@ -4398,9 +4474,9 @@ rept 3 dec bc endr ld a, c - ld [wdc19], a + ld [$dc19], a ld a, b - ld [wdc1a], a + ld [$dc1a], a push de push hl ld hl, SwarmFlags @@ -4470,20 +4546,20 @@ endr inc bc call Function1159dc ld [hli], a - ld a, [wdc22] + ld a, [$dc22] inc a cp $10 jr nz, .asm_1159b1 push af push bc - ld a, [wdc19] + ld a, [$dc19] ld b, a - ld a, [wdc1a] + ld a, [$dc1a] or b jr nz, .asm_115998 - ld a, [wdc05] + ld a, [$dc05] ld b, a - ld a, [wdc06] + ld a, [$dc06] or b jr nz, .asm_115998 pop bc @@ -4515,11 +4591,11 @@ endr xor a .asm_1159b1 - ld [wdc22], a - ld a, [wdc19] + ld [$dc22], a + ld a, [$dc19] cp $0 jp nz, .asm_1158e5 - ld a, [wdc1a] + ld a, [$dc1a] cp $0 jp nz, .asm_1158e5 @@ -4543,6 +4619,7 @@ endr ld a, $0 ld [hl], a ret + ; 1159dc Function1159dc: ; 1159dc @@ -4572,6 +4649,7 @@ Function1159dc: ; 1159dc .asm_1159f8 ld a, $2b ret + ; 1159fb Function1159fb: ; 1159fb @@ -4634,10 +4712,11 @@ Function1159fb: ; 1159fb .asm_115a5a ld a, $1 jp Function11425c + ; 115a5f Function115a5f: ; 115a5f - ld hl, wdc05 + ld hl, $dc05 ld a, [hli] ld h, [hl] ld l, a @@ -4694,14 +4773,15 @@ Function115a5f: ; 115a5f ld a, $2 ld [wStartDay], a ret + ; 115ab0 Function115ab0: ; 115ab0 - ld hl, wdc05 + ld hl, $dc05 ld a, [hli] ld h, [hl] ld l, a - ld a, [wdc0e] + ld a, [$dc0e] ld c, a ld a, [Bed] ld b, a @@ -4728,15 +4808,15 @@ Function115ab0: ; 115ab0 inc bc add hl, bc ld a, l - ld [wdc05], a + ld [$dc05], a ld a, h - ld [wdc06], a + ld [$dc06], a ld a, h or l jr nz, .asm_115af0 pop bc ld a, c - ld [wdc0e], a + ld [$dc0e], a ld a, b ld [Bed], a ld a, $4 @@ -4747,26 +4827,27 @@ Function115ab0: ; 115ab0 .asm_115af0 pop bc ld a, c - ld [wdc0e], a + ld [$dc0e], a ld a, b ld [Bed], a ld a, $3 ld [wStartDay], a xor a ret + ; 115b00 Function115b00: ; 115b00 ld a, [wStartDay] and a ret z - ld a, [wdc0e] + ld a, [$dc0e] ld c, a ld a, [Bed] ld b, a - ld hl, wdc02 + ld hl, $dc02 ld a, [hli] - ld [wdc00], a + ld [$dc00], a ld [hFF8C], a ld [MBC3SRamBank], a ld e, [hl] @@ -4811,16 +4892,16 @@ endr add hl, bc ld b, h ld c, l - ld hl, wdc02 - ld a, [wdc00] + ld hl, $dc02 + ld a, [$dc00] ld [hli], a ld [hl], e inc hl ld [hl], d ld hl, PartyMon5Defense - ld de, wdc24 + ld de, $dc24 call Function115c49 - ld hl, wdc24 + ld hl, $dc24 ld c, [hl] inc hl ld b, [hl] @@ -4861,7 +4942,7 @@ endr ld e, [hl] inc hl ld d, [hl] - ld hl, wdc26 + ld hl, $dc26 call Function115d6a ld hl, wCurrMapTriggerCount ld a, [wCurrentMapSignpostCount] @@ -4888,6 +4969,7 @@ endr .asm_115bc6 xor a ret + ; 115bc8 Function115bc8: ; 115bc8 @@ -4981,7 +5063,7 @@ endr .Function115c3d: push bc - ld bc, wdc00 + ld bc, $dc00 call Function115d80 pop bc ret @@ -4989,6 +5071,7 @@ endr .asm_115c46 ld a, $2 ret + ; 115c49 Function115c49: ; 115c49 @@ -5003,9 +5086,9 @@ Function115c49: ; 115c49 inc de ld a, c - ld [wdc19], a + ld [$dc19], a ld a, b - ld [wdc1a], a + ld [$dc1a], a ld c, e ld b, d ld e, l @@ -5014,17 +5097,17 @@ Function115c49: ; 115c49 ld h, b .asm_115c64 - ld a, [wdc1a] + ld a, [$dc1a] or a jr nz, .asm_115c71 - ld a, [wdc19] + ld a, [$dc19] cp $4 jr c, .asm_115c99 .asm_115c71 ld b, $4 push hl - ld hl, wdc1b + ld hl, $dc1b .asm_115c77 ld a, [de] inc de @@ -5032,9 +5115,9 @@ Function115c49: ; 115c49 ld [hli], a dec b jr nz, .asm_115c77 - ld a, [wdc19] + ld a, [$dc19] ld c, a - ld a, [wdc1a] + ld a, [$dc1a] ld b, a rept 4 dec bc @@ -5058,9 +5141,9 @@ endr .asm_115c9f ld a, c - ld [wdc19], a + ld [$dc19], a ld a, b - ld [wdc1a], a + ld [$dc1a], a push de push hl ld hl, WeeklyFlags @@ -5120,13 +5203,14 @@ endr inc bc ld a, [bc] ld [hli], a - ld a, [wdc19] + ld a, [$dc19] cp $0 jp nz, .asm_115c64 - ld a, [wdc1a] + ld a, [$dc1a] cp $0 jp nz, .asm_115c64 ret + ; 115cfd Function115cfd: ; 115cfd @@ -5197,6 +5281,7 @@ Function115cfd: ; 115cfd .asm_115d50 sub $47 ret + ; 115d53 Function115d53: ; 115d53 @@ -5212,14 +5297,16 @@ Function115d53: ; 115d53 xor a ld [hl], a ret + ; 115d61 Function115d61: ; 115d61 push bc - ld bc, wdc00 + ld bc, $dc00 call Function115d80 pop bc ret + ; 115d6a Function115d6a: ; 115d6a @@ -5234,6 +5321,7 @@ Function115d6a: ; 115d6a jr nz, .asm_115d6a xor a ret + ; 115d77 Function115d77: ; 115d77 @@ -5242,6 +5330,7 @@ Function115d77: ; 115d77 call Function115d80 pop bc ret + ; 115d80 Function115d80: ; 115d80 @@ -5264,915 +5353,11 @@ Function115d80: ; 115d80 ld d, $a0 ld e, $0 ret -; 115d99 - -Function115d99: ; 115d99 - ld de, GFX_11601a - ld hl, VTiles0 tile $60 - lb bc, BANK(GFX_11601a), $14 - call Get2bpp - xor a - ld [wc305], a - ld [wc306], a - ld [wc309], a - ld [wc30a], a - ld [wc30b], a - ld [wc30c], a - ld a, $10 - ld [wc307], a - ld a, $18 - ld [wc308], a - ret -; 115dc3 - -Function115dc3: ; 115dc3 - xor a - ld [wc305], a - ld a, $a0 - ld hl, Sprites + $7c - ld bc, $0020 - call ByteFill - ret -; 115dd3 - -Function115dd3: ; 115dd3 - ld a, [wc305] - and a - ret z - ld a, $a0 - ld hl, Sprites + $7c - ld bc, $0020 - call ByteFill - call Function115e22 - ld a, [wc309] - sla a - ld c, a - ld b, 0 - ld hl, Unknown_115e86 - add hl, bc - ld a, [hli] - ld e, a - ld a, [hl] - ld d, a - push de - pop hl - ld de, Sprites + $7c - ld a, [wc307] - ld c, a - ld a, [wc308] - ld b, a - ld a, [hli] -.asm_115e04 - push af - ld a, [hli] - add b - ld [de], a - inc de - ld a, [hli] - add c - ld [de], a - inc de - ld a, [hli] - ld [de], a - inc de - ld a, [hli] - ld [de], a - inc de - pop af - dec a - jr nz, .asm_115e04 - ret -; 115e18 - -Function115e18: ; 115e18 - ld a, c - ld [wc30a], a - xor a - ld [wc30b], a - jr Function115e2b -; 115e22 - -Function115e22: ; 115e22 - ld hl, wc30c - dec [hl] - ret nz - ld hl, wc30b - inc [hl] - -Function115e2b: ; 115e2b - ld a, [wc30a] - sla a - ld c, a - ld b, 0 - ld hl, Unknown_115e59 - add hl, bc - ld a, [hli] - ld e, a - ld a, [hli] - ld d, a - push de - pop hl - ld a, [wc30b] - sla a - ld c, a - ld b, $0 - add hl, bc - ld a, [hli] - cp $ff - jr nz, .asm_115e51 - xor a - ld [wc30b], a - jr Function115e2b - -.asm_115e51 - ld [wc309], a - ld a, [hl] - ld [wc30c], a - ret -; 115e59 - -Unknown_115e59: - dw Unknown_115e61 - dw Unknown_115e6c - dw Unknown_115e76 - dw Unknown_115e79 - -Unknown_115e61: ; 115e61 - db $4, $8 - db $5, $8 - db $6, $8 - db $7, $8 - db $8, $8 - db $ff - -Unknown_115e6c: ; 115e6c - db $1, $8 - db $2, $8 - db $3, $8 - db $9, $8 - db $a, $8 - -Unknown_115e76: ; 115e76 - db $0, $8 - db $ff - -Unknown_115e79: ; 115e79 - db $b, $8 - db $c, $8 - db $d, $8 - db $e, $8 - db $f, $8 - db $0, $8 - db $ff -; 115e86 - -Unknown_115e86: - dw Unknown_115ea6 - dw Unknown_115eb7 - dw Unknown_115ecc - dw Unknown_115ee1 - dw Unknown_115ef6 - dw Unknown_115f13 - dw Unknown_115f30 - dw Unknown_115f4d - dw Unknown_115f6a - dw Unknown_115f87 - dw Unknown_115f9c - dw Unknown_115fb1 - dw Unknown_115fc6 - dw Unknown_115fdb - dw Unknown_115ff0 - dw Unknown_116005 - -Unknown_115ea6: ; 115ea6 - db $4 - db $8, $0, $60, $1 - db $8, $8, $61, $1 - db $10, $0, $62, $1 - db $10, $8, $63, $1 - -Unknown_115eb7: ; 115eb7 - db $5 - db $0, $8, $64, $0 - db $8, $0, $60, $1 - db $8, $8, $61, $1 - db $10, $0, $62, $1 - db $10, $8, $63, $1 - -Unknown_115ecc: ; 115ecc - db $5 - db $0, $8, $65, $0 - db $8, $0, $60, $1 - db $8, $8, $61, $1 - db $10, $0, $62, $1 - db $10, $8, $63, $1 - -Unknown_115ee1: ; 115ee1 - db $5 - db $0, $8, $66, $0 - db $8, $0, $60, $1 - db $8, $8, $61, $1 - db $10, $0, $62, $1 - db $10, $8, $63, $1 - -Unknown_115ef6: ; 115ef6 - db $7 - db $0, $0, $67, $1 - db $8, $0, $68, $1 - db $10, $0, $6d, $0 - db $10, $8, $69, $0 - db $10, $10, $6a, $0 - db $18, $8, $6b, $0 - db $18, $10, $6c, $0 - -Unknown_115f13: ; 115f13 - db $7 - db $0, $0, $67, $1 - db $8, $0, $68, $1 - db $10, $0, $6e, $0 - db $10, $8, $69, $0 - db $10, $10, $6a, $0 - db $18, $8, $6b, $0 - db $18, $10, $6c, $0 - -Unknown_115f30: ; 115f30 - db $7 - db $0, $0, $67, $1 - db $8, $0, $68, $1 - db $10, $0, $6f, $0 - db $10, $8, $69, $0 - db $10, $10, $6a, $0 - db $18, $8, $6b, $0 - db $18, $10, $6c, $0 - -Unknown_115f4d: ; 115f4d - db $7 - db $0, $0, $67, $1 - db $8, $0, $68, $1 - db $10, $0, $70, $0 - db $10, $8, $69, $0 - db $10, $10, $6a, $0 - db $18, $8, $6b, $0 - db $18, $10, $6c, $0 - -Unknown_115f6a: ; 115f6a - db $7 - db $0, $0, $67, $1 - db $8, $0, $68, $1 - db $10, $0, $71, $0 - db $10, $8, $69, $0 - db $10, $10, $6a, $0 - db $18, $8, $6b, $0 - db $18, $10, $6c, $0 - -Unknown_115f87: ; 115f87 - db $5 - db $0, $8, $72, $0 - db $8, $0, $60, $1 - db $8, $8, $61, $1 - db $10, $0, $62, $1 - db $10, $8, $63, $1 - -Unknown_115f9c: ; 115f9c - db $5 - db $0, $8, $73, $0 - db $8, $0, $60, $1 - db $8, $8, $61, $1 - db $10, $0, $62, $1 - db $10, $8, $63, $1 - -Unknown_115fb1: ; 115fb1 - db $5 - db $1, $8, $64, $60 - db $8, $0, $60, $1 - db $8, $8, $61, $1 - db $10, $0, $62, $1 - db $10, $8, $63, $1 - -Unknown_115fc6: ; 115fc6 - db $5 - db $1, $8, $65, $60 - db $8, $0, $60, $1 - db $8, $8, $61, $1 - db $10, $0, $62, $1 - db $10, $8, $63, $1 - -Unknown_115fdb: ; 115fdb - db $5 - db $1, $8, $66, $60 - db $8, $0, $60, $1 - db $8, $8, $61, $1 - db $10, $0, $62, $1 - db $10, $8, $63, $1 - -Unknown_115ff0: ; 115ff0 - db $5 - db $1, $8, $72, $60 - db $8, $0, $60, $1 - db $8, $8, $61, $1 - db $10, $0, $62, $1 - db $10, $8, $63, $1 - -Unknown_116005: ; 116005 - db $5 - db $1, $8, $73, $60 - db $8, $0, $60, $1 - db $8, $8, $61, $1 - db $10, $0, $62, $1 - db $10, $8, $63, $1 -; 11601a - -GFX_11601a:: ; 11601a -INCBIN "gfx/unknown/11601a.2bpp" - -Function11615a: ; 11615a - xor a - ld [wc30d], a - ld [$c319], a - ld [wc310], a - ld [wc311], a - ld [wc312], a - ld [wc313], a - ld [wc314], a - ld [wc314 + 1], a - ld [wc314 + 4], a - ld [wc3f6], a - ld [wc3f8], a - ld [wc3f2], a - ld [wc3f4], a - ld a, $24 - ld [wc3f5], a - ld a, $7 - ld [wc3f7], a - ld a, $b0 - ld [wc30e], a - ld [wc3f1], a - ld a, $48 - ld [wc30f], a - ld [wc3f3], a - ret -; 11619d - -Function11619d: ; 11619d - ld a, [wc30d] - and a - ret z - ld a, [$c319] - cp $2 - jr c, .asm_1161b4 - ld a, $a0 - ld hl, Sprites - ld bc, $0064 - call ByteFill - -.asm_1161b4 - call Function1161b8 - ret -; 1161b8 - -Function1161b8: ; 1161b8 - ld a, [$c319] - ld e, a - ld d, 0 - ld hl, .Jumptable -rept 2 - add hl, de -endr - ld a, [hli] - ld h, [hl] - ld l, a - jp [hl] -; 1161c7 - -.Jumptable: ; 1161c7 - dw Function1161d5 - dw Function116294 - dw Function1162cb - dw Function1162f2 - dw Function1163c0 - dw Function11636e - dw Function116441 -; 1161d5 - -Function1161d5: ; 1161d5 - ld a, [rSVBK] - push af - - ld a, $6 - ld [rSVBK], a - - ld hl, Unknown_117356 - ld de, wDecompressScratch - ld bc, $0300 - call CopyBytes - - di - -.wait_for_vblank -; Wait until a vblank would occur had interrupts not just been disabled. - ld a, [rLY] - cp $91 - jr nz, .wait_for_vblank - - ld a, $d0 - ld [rHDMA1], a - ld a, $0 - ld [rHDMA2], a - ld a, $1c - ld [rHDMA3], a - xor a - ld [rHDMA4], a - ld a, $8 - ld [rHDMA5], a - - ld a, $d0 - ld [rHDMA1], a - ld a, $80 - ld [rHDMA2], a - ld a, $1c - ld [rHDMA3], a - ld a, $80 - ld [rHDMA4], a - ld a, $8 - ld [rHDMA5], a - - ld a, $d1 - ld [rHDMA1], a - ld a, $0 - ld [rHDMA2], a - ld a, $1d - ld [rHDMA3], a - xor a - ld [rHDMA4], a - ld a, $8 - ld [rHDMA5], a - - ld a, $1 - ld [rVBK], a - - ld a, $d1 - ld [rHDMA1], a - ld a, $80 - ld [rHDMA2], a - ld a, $1c - ld [rHDMA3], a - xor a - ld [rHDMA4], a - ld a, $8 - ld [rHDMA5], a - - ld a, $d2 - ld [rHDMA1], a - ld a, $0 - ld [rHDMA2], a - ld a, $1c - ld [rHDMA3], a - ld a, $80 - ld [rHDMA4], a - ld a, $8 - ld [rHDMA5], a - - ld a, $d2 - ld [rHDMA1], a - ld a, $80 - ld [rHDMA2], a - ld a, $1d - ld [rHDMA3], a - xor a - ld [rHDMA4], a - ld a, $8 - ld [rHDMA5], a - - xor a - ld [rVBK], a - - ei - - pop af - ld [rSVBK], a - callba ReloadMapPart - ld a, $8 - ld [MusicFade], a - ld de, MUSIC_MOBILE_ADAPTER - ld a, e - ld [MusicFadeIDLo], a - ld a, d - ld [MusicFadeIDHi], a - ld a, [$c319] - inc a - ld [$c319], a - ret -; 11628c - -MenuDataHeader_11628c: ; 11628c - db $40 ; flags - db 6, 0 ; start coords - db 17, 19 ; end coords - dw NULL - db 0 ; default option -; 116294 - -Function116294: ; 116294 - callba Function170d02 - ld a, [$c319] - inc a - ld [$c319], a - ld a, [rSVBK] - push af - ld a, $5 - ld [rSVBK], a - ld hl, UnknBGPals + 8 * 6 - ld de, $c320 - ld bc, 2 palettes - call CopyBytes - ld hl, Palette_11734e - ld de, UnknBGPals + 8 * 7 - ld bc, 1 palettes - call CopyBytes - call SetPalettes - pop af - ld [rSVBK], a - ld a, $30 - ld [hWY], a - ret -; 1162cb - -Function1162cb: ; 1162cb - callba Function170cc6 - ld a, [$c319] - inc a - ld [$c319], a - ld a, [rSVBK] - push af - ld a, $5 - ld [rSVBK], a - ld hl, Palette_11730e - ld de, UnknOBPals + 2 palettes - ld bc, 6 palettes - call CopyBytes - call SetPalettes - pop af - ld [rSVBK], a - ret -; 1162f2 - -Function1162f2: ; 1162f2 - call Function11659d - call Function116758 - call Function1167a6 - ld a, [wc310] - cp EGG - ret z - sla a - ld c, a - ld b, 0 - ld hl, Unknown_1168c5 - add hl, bc - ld a, [hli] - ld e, a - ld a, [hl] - ld d, a - push de - pop hl - ld a, [wc30e] - ld c, a - ld a, [wc30f] - ld b, a - ld a, [wc314 + 4] - ld e, a - ld a, [hli] - sub e - ld de, Sprites + $24 -.asm_116321 - push af - ld a, [hli] - add b - ld [de], a - inc de - ld a, [hli] - add c - ld [de], a - inc de - ld a, [hli] - ld [de], a - inc de - ld a, [hli] - ld [de], a - inc de - pop af - dec a - jr nz, .asm_116321 - call Function116468 - ld a, [wc3f5] - sla a - ld c, a - ld b, 0 - ld hl, Unknown_1168c5 - add hl, bc - ld a, [hli] - ld e, a - ld a, [hl] - ld d, a - push de - pop hl - ld a, [wc3f1] - ld c, a - ld a, [wc3f3] - ld b, a - ld a, [wc3f8] - ld e, a - ld a, [hli] - sub e - ld de, Sprites -.asm_11635a - push af - ld a, [hli] - add b - ld [de], a - inc de - ld a, [hli] - add c - ld [de], a - inc de - ld a, [hli] - ld [de], a - inc de - ld a, [hli] - ld [de], a - inc de - pop af - dec a - jr nz, .asm_11635a - ret -; 11636e - -Function11636e: ; 11636e - ld a, [rSVBK] - push af - ld a, $5 - ld [rSVBK], a - ld hl, BGPals - ld de, UnknBGPals - ld bc, $0040 - call CopyBytes - pop af - ld [rSVBK], a - call SetPalettes - ld a, [rSVBK] - push af - ld a, $1 - ld [rSVBK], a - ld a, $a0 - ld hl, Sprites - ld bc, 16 * 4 - call ByteFill - ld a, $90 - ld [hWY], a - call UpdateSprites - pop af - ld [rSVBK], a - callba ReloadMapPart - ld a, $8 - ld [MusicFade], a - ld a, [wMapMusic] - ld [MusicFadeIDLo], a - xor a - ld [MusicFadeIDHi], a - xor a - ld [$c319], a - ld [wc30d], a - ret -; 1163c0 - -Function1163c0: ; 1163c0 - ld a, [rSVBK] - push af - ld a, $1 - ld [rSVBK], a - ld a, $a0 - ld hl, Sprites - ld bc, 16 * 4 - call ByteFill - call DelayFrame - callba Function14146 - ld b, SCGB_MAPPALS - call GetSGBLayout - ld a, [rSVBK] - push af - ld a, $5 - ld [rSVBK], a - ld hl, $c320 - ld de, wd030 - ld bc, $0010 - call CopyBytes - pop af - ld [rSVBK], a - call SetPalettes - call DelayFrame - ld a, $90 - ld [hWY], a - call UpdateSprites - callba Function14157 - pop af - ld [rSVBK], a - callba ReloadMapPart - ld a, [wLinkMode] - cp $4 - jr z, .asm_11642a - ld a, $8 - ld [MusicFade], a - ld a, [wMapMusic] - ld [MusicFadeIDLo], a - xor a - ld [MusicFadeIDHi], a - jr .asm_116439 - -.asm_11642a - ld a, $8 - ld [MusicFade], a - ld a, $0 - ld [MusicFadeIDLo], a - ld a, $0 - ld [MusicFadeIDHi], a - -.asm_116439 - xor a - ld [$c319], a - ld [wc30d], a - ret -; 116441 - -Function116441: ; 116441 - callba Function17d405 - ld a, $90 - ld [hWY], a - callba ReloadMapPart - ld a, $8 - ld [MusicFade], a - ld a, [wMapMusic] - ld [MusicFadeIDLo], a - xor a - ld [MusicFadeIDHi], a - xor a - ld [$c319], a - ld [wc30d], a - ret -; 116468 - -Function116468: ; 116468 - call Function116567 - ld a, [wc314] - cp $d - jr nz, .asm_1164a8 - ld hl, wc30e - ld a, [hl] - cp $50 - jr nc, .asm_116484 - ld a, $50 - sub [hl] - add $50 - ld [wc3f1], a - jr .asm_11648d - -.asm_116484 - sub $50 - ld c, a - ld a, $50 - sub c - ld [wc3f1], a - -.asm_11648d - ld hl, wc30f - ld a, [hl] - cp $60 - jr nc, .asm_11649e - ld a, $60 - sub [hl] - add $60 - ld [wc3f3], a - ret - -.asm_11649e - sub $60 - ld c, a - ld a, $60 - sub c - ld [wc3f3], a - ret - -.asm_1164a8 - ld hl, wc30e - ld a, $b0 - cp [hl] - jr nc, .asm_1164b8 - ld a, [wc3f1] - and a - jr z, .asm_11650b - jr .asm_1164f2 - -.asm_1164b8 - ld a, [wc3f1] - sub [hl] - jr nc, .asm_1164c1 - xor $ff - inc a - -.asm_1164c1 - ld b, a - ld c, $0 - ld a, $5 -.asm_1164c6 - srl b - rr c - dec a - jr nz, .asm_1164c6 - ld a, c - ld [wc3fa], a - ld a, b - ld [wc3f9], a - ld a, [wc3f1] - sub [hl] - jr c, .asm_1164f2 - ld c, $0 - ld a, [wc3fa] - xor $ff - add $1 - rl c - ld [wc3fa], a - ld a, [wc3f9] - xor $ff - add c - ld [wc3f9], a - -.asm_1164f2 - ld a, [wc3f2] - ld l, a - ld a, [wc3f1] - ld h, a - ld a, [wc3fa] - ld e, a - ld a, [wc3f9] - ld d, a - add hl, de - ld a, l - ld [wc3f2], a - ld a, h - ld [wc3f1], a +; 115d99 -.asm_11650b - ld hl, wc30f - ld a, $b0 - cp [hl] - jr c, .asm_11654d - ld a, [wc3f3] - sub [hl] - jr nc, .asm_11651c - xor $ff - inc a +INCLUDE "misc/mobile_45_sprite_engine.asm" -.asm_11651c - ld b, a - ld c, $0 - ld a, $5 -.asm_116521 - srl b - rr c - dec a - jr nz, .asm_116521 - ld a, c - ld [wc3fc], a - ld a, b - ld [wc3fb], a - ld a, [wc3f3] - sub [hl] - jr c, .asm_11654d - ld c, $0 - ld a, [wc3fc] - xor $ff - add $1 - rl c - ld [wc3fc], a - ld a, [wc3fb] - xor $ff - add c - ld [wc3fb], a - -.asm_11654d - ld a, [wc3f4] - ld l, a - ld a, [wc3f3] - ld h, a - ld a, [wc3fc] - ld e, a - ld a, [wc3fb] - ld d, a - add hl, de - ld a, l - ld [wc3f4], a - ld a, h - ld [wc3f3], a - ret ; 116567 Function116567: ; 116567 @@ -6211,6 +5396,7 @@ Function116567: ; 116567 ld a, [hl] ld [wc3f7], a ret + ; 11659d Function11659d: ; 11659d @@ -6227,6 +5413,7 @@ endr ld h, [hl] ld l, a jp [hl] + ; 1165af Jumptable_1165af: ; 1165af @@ -6271,6 +5458,7 @@ Function1165e3: call Function116780 ret c jp Function116797 + ; 1165f5 Function1165f5: ; 1165f5 @@ -6292,6 +5480,7 @@ Function116600: ld a, $2 ld [wc314], a ret + ; 116615 Function116615: ; 116615 @@ -6314,6 +5503,7 @@ Function116623: call Function116780 ret c jp Function116797 + ; 116635 Function116635: ; 116635 @@ -6335,6 +5525,7 @@ Function116640: ld a, $7 ld [wc314], a ret + ; 116655 Function116655: ; 116655 @@ -6381,6 +5572,7 @@ Function11668d: ld a, $c ld [wc314], a ret + ; 11669f Function11669f: ; 11669f @@ -6429,6 +5621,7 @@ Function1166d6: xor a ld [wc314], a ret + ; 1166f4 Function1166f4: ; 1166f4 @@ -6456,6 +5649,7 @@ Function1166f4: ; 1166f4 call Function11679c call Function116797 ret + ; 11671f Function11671f: ; 11671f @@ -6479,6 +5673,7 @@ Function11671f: ; 11671f call Function11679c call Function116797 ret + ; 116747 Function116747: ; 116747 @@ -6491,6 +5686,7 @@ Function116747: ; 116747 add [hl] ld [hl], a ret + ; 116758 Function116758: ; 116758 @@ -6521,6 +5717,7 @@ Function116758: ; 116758 .asm_11677a ld [wc314 + 4], a ret + ; 11677e Function11677e: ; 11677e @@ -6538,6 +5735,7 @@ Function116780: .asm_11678c and a ret + ; 11678e Function11678e: ; 11678e @@ -6546,12 +5744,14 @@ Function11678e: ; 11678e ld [wc314 + 1], a inc [hl] ret + ; 116797 Function116797: ; 116797 ld hl, wc314 inc [hl] ret + ; 11679c Function11679c: @@ -6608,6 +5808,7 @@ asm_1167af ld a, [hl] ld [wc313], a ret + ; 1167eb Unknown_1167eb: @@ -7654,6 +6855,7 @@ SECTION "Mobile Stadium", ROMX, BANK[$45] Special_GiveOddEgg: ; 117656 callba GiveOddEgg ret + ; 11765d Function11765d: ; 11765d (45:765d) @@ -7679,7 +6881,7 @@ Function11766b: ; 11766b (45:766b) ld de, wcd49 ld bc, $8 call CopyBytes - ld de, wc708 + ld de, $c708 ld bc, $11 call CopyBytes call CloseSRAM @@ -7694,7 +6896,7 @@ Function117699: ; 117699 (45:7699) ld de, $b1f3 ld bc, $8 call CopyBytes - ld hl, wc708 + ld hl, $c708 ld bc, $11 call CopyBytes call CloseSRAM @@ -7706,7 +6908,7 @@ Function117699: ; 117699 (45:7699) ld [wcd4d], a ld [wcd4e], a ld [wcd4f], a - ld hl, wc708 + ld hl, $c708 ld bc, $11 call ByteFill call ClearBGPalettes @@ -7784,6 +6986,7 @@ Function117764: ; 117764 (45:7764) jr nz, .asm_11776f ld a, $1 jr .asm_117770 + .asm_11776f xor a .asm_117770 @@ -7855,7 +7058,7 @@ Function117764_b_button: ; 1177d6 (45:77d6) ld [wcd4a], a ld e, a ld d, $0 - ld hl, wc708 + ld hl, $c708 add hl, de xor a ld [hl], a @@ -7880,6 +7083,7 @@ Function117764_d_up: ; 1177f1 (45:77f1) Function117764_d_vertical_load: ; 117806 (45:7806) ld [wcd4c], a ret + Function117764_d_down: ; 11780a (45:780a) ld a, [wcd4d] cp $4 @@ -7895,9 +7099,11 @@ Function117764_d_down: ; 11780a (45:780a) jr nc, .asm_117829 xor a jr Function117764_d_vertical_load + .asm_117825 ld a, $2 jr Function117764_d_vertical_load + .asm_117829 ld a, $1 jr Function117764_d_vertical_load @@ -7949,6 +7155,7 @@ Function117764_a_button: ; 11784c (45:784c) jr nz, .ascii_symbols ld hl, Unknown_117a0f jr .got_ascii + .ascii_symbols ld hl, Unknown_117a47 .got_ascii @@ -7963,7 +7170,7 @@ Function117764_a_button: ; 11784c (45:784c) ld b, $0 add hl, bc ld a, [hl] - ld hl, wc708 + ld hl, $c708 add hl, de ld [hl], a pop de @@ -8062,7 +7269,7 @@ Function117942: ; 117942 (45:7942) call GetSRAMBank ld a, [wcd4f] ld [sMobileLoginPassword], a - ld hl, wc708 + ld hl, $c708 ld de, sMobileLoginPassword + 1 ld bc, LOGIN_PASSWORD_LENGTH call CopyBytes @@ -8103,6 +7310,7 @@ Function1179a7: ; 1179a7 (45:79a7) ld a, $1 ld [wcd49], a ret + ; 1179b5 (45:79b5) MenuDataHeader_1179b5: ; 1179b5 @@ -8146,6 +7354,7 @@ MobilePassword_IncrementJumptable: ; 117a0a (45:7a0a) ld hl, wcd49 inc [hl] ret + ; 117a0f (45:7a0f) Unknown_117a0f: @@ -8168,12 +7377,14 @@ MobileStudium: ; 0x117a7f pop af ld [hInMenu], a ret + ; 0x117a8d Function117a8d: ; 0x117a8d call Function117a94 call Function117acd ret + ; 0x117a94 Function117a94: ; 0x117a94 @@ -8187,6 +7398,7 @@ Function117a94: ; 0x117a94 callba Function172e78 callba Function104000 ret + ; 0x117ab4 Function117ab4: ; 0x117ab4 @@ -8196,6 +7408,7 @@ Function117ab4: ; 0x117ab4 callba Function172eb9 callba ReloadMapPart ret + ; 0x117acd Function117acd: ; 0x117acd @@ -8206,6 +7419,7 @@ Function117acd: ; 0x117acd call Function117ae9 callba Function104000 jr Function117acd + .asm_117ae2 call ClearBGPalettes call ClearSprites @@ -8340,10 +7554,12 @@ Function117bb6: ld a, $80 ld [wJumptableIndex], a ret + .asm_117be1 ld a, $80 ld [wJumptableIndex], a ret + .asm_117be7 ld a, [rSVBK] push af @@ -8370,12 +7586,14 @@ Function117bb6: dec c jr nz, .asm_117c0b jr .asm_117c20 + .asm_117c16 pop af ld [rSVBK], a ld a, $d3 ld [wc300], a jr .asm_117bd0 + .asm_117c20 pop af ld [rSVBK], a |