diff --git a/docs/bugs_and_glitches.md b/docs/bugs_and_glitches.md index f4f6a6159..d7089088f 100644 --- a/docs/bugs_and_glitches.md +++ b/docs/bugs_and_glitches.md @@ -811,10 +811,10 @@ This can bring Pokémon straight from level 1 to 100 by gaining just a few exper ([Video](https://www.youtube.com/watch?v=o54VjpAEoO8)) -**Fix:** Edit `_ABoostedStringBuffer2ExpPointsText` and `_StringBuffer2ExpPointsText` in [data/text/common_2.asm](https://github.com/pret/pokecrystal/blob/master/data/text/common_2.asm): +**Fix:** Edit `_BoostedExpPointsText` and `_ExpPointsText` in [data/text/common_2.asm](https://github.com/pret/pokecrystal/blob/master/data/text/common_2.asm): ```diff - _ABoostedStringBuffer2ExpPointsText:: + _BoostedExpPointsText:: text_start line "a boosted" cont "@" @@ -823,7 +823,7 @@ This can bring Pokémon straight from level 1 to 100 by gaining just a few exper text " EXP. Points!" prompt - _StringBuffer2ExpPointsText:: + _ExpPointsText:: text_start line "@" - text_decimal wStringBuffer2, 2, 4 @@ -1264,7 +1264,7 @@ Finally, edit [engine/battle/read_trainer_party.asm](https://github.com/pret/pok ([Video](https://www.youtube.com/watch?v=ojq3xqfRF6I)) -**Fix:** Edit `Slots_PayoutAnim` in [engine/games/slot_machine.asm](https://github.com/pret/pokecrystal/blob/master/engine/games/slot_machine.asm): +**Fix:** Edit `SlotsAction_PayoutAnim` in [engine/games/slot_machine.asm](https://github.com/pret/pokecrystal/blob/master/engine/games/slot_machine.asm): ```diff .okay diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index a4350c2f7..06b6b9390 100644 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -449,7 +449,7 @@ DisplayHOFMon: ld bc, MON_NAME_LENGTH - 1 call CopyBytes ld a, "@" - ld [wStringBuffer2 + 10], a + ld [wStringBuffer2 + MON_NAME_LENGTH - 1], a hlcoord 0, 0 ld bc, SCREEN_WIDTH * SCREEN_HEIGHT ld a, " " diff --git a/engine/events/lucky_number.asm b/engine/events/lucky_number.asm index 36dbf3d0e..6b1d4d8a9 100644 --- a/engine/events/lucky_number.asm +++ b/engine/events/lucky_number.asm @@ -148,7 +148,7 @@ CheckForLuckyNumberWinners: .done pop hl push hl - ld de, -6 + ld de, MON_SPECIES - MON_ID add hl, de ld a, [hl] pop hl diff --git a/engine/pokemon/bills_pc_top.asm b/engine/pokemon/bills_pc_top.asm index b449c765a..3883d89c3 100644 --- a/engine/pokemon/bills_pc_top.asm +++ b/engine/pokemon/bills_pc_top.asm @@ -261,7 +261,7 @@ CopyBoxmonToTempMon: call CloseSRAM ret -Unreferenced_Functione5d9: +Unreferenced_LoadBoxMonListing: ld a, [wCurBox] cp b jr z, .same_box @@ -284,11 +284,11 @@ Unreferenced_Functione5d9: .okay call GetSRAMBank ld a, [hl] - ld bc, 1 + MONS_PER_BOX + 1 + ld bc, sBoxMons - sBox add hl, bc ld b, a ld c, $0 - ld de, wc608 + ld de, wBoxPartialData ld a, b and a jr z, .empty_box @@ -296,7 +296,7 @@ Unreferenced_Functione5d9: push hl push bc ld a, c - ld bc, 0 + ld bc, sBoxMon1Species - sBoxMons add hl, bc ld bc, BOXMON_STRUCT_LENGTH call AddNTimes @@ -311,7 +311,7 @@ Unreferenced_Functione5d9: push hl push bc ld a, c - ld bc, MONS_PER_BOX * (BOXMON_STRUCT_LENGTH + NAME_LENGTH) + ld bc, sBoxMonNicknames - sBoxMons add hl, bc call SkipNames call CopyBytes diff --git a/engine/pokemon/search.asm b/engine/pokemon/search.asm index c8d4439df..2ea1beacf 100644 --- a/engine/pokemon/search.asm +++ b/engine/pokemon/search.asm @@ -113,7 +113,7 @@ CheckOwnMonAnywhere: jr z, .loopbox ; Load the box. - ld hl, BoxAddressTable1 + ld hl, BoxAddressTable ld b, 0 add hl, bc add hl, bc @@ -244,7 +244,7 @@ endr scf ret -BoxAddressTable1: +BoxAddressTable: dba sBox1 dba sBox2 dba sBox3 diff --git a/engine/pokemon/search2.asm b/engine/pokemon/search2.asm index 7af93282e..c33d84edf 100644 --- a/engine/pokemon/search2.asm +++ b/engine/pokemon/search2.asm @@ -117,7 +117,7 @@ FindThatSpecies: ret RetroactivelyIgnoreEggs: - ld e, -2 + ld e, %11111110 ld hl, wPartySpecies .loop ld a, [hli] diff --git a/home/farcall.asm b/home/farcall.asm index 102460666..be050c642 100644 --- a/home/farcall.asm +++ b/home/farcall.asm @@ -23,7 +23,7 @@ FarCall_hl:: push af ldh a, [hBuffer] rst Bankswitch - call FarJump_hl + call FarCall_JumpToHL ReturnFarCall:: ; We want to retain the contents of f. @@ -45,5 +45,5 @@ ReturnFarCall:: ld c, a ret -FarJump_hl:: +FarCall_JumpToHL:: jp hl diff --git a/hram.asm b/hram.asm index 2bbbd4407..1cd64e90a 100644 --- a/hram.asm +++ b/hram.asm @@ -4,7 +4,7 @@ hTransferVirtualOAM:: ds 10 ; ff80 hROMBankBackup:: db ; ff8a hBuffer:: db ; ff8b -hFF8C:: db ; ff8c +hSRAMBank:: db ; ff8c hRTCDayHi:: db ; ff8d hRTCDayLo:: db ; ff8e diff --git a/mobile/mobile_12_2.asm b/mobile/mobile_12_2.asm index 3cc79a536..6b328b36a 100644 --- a/mobile/mobile_12_2.asm +++ b/mobile/mobile_12_2.asm @@ -17,7 +17,7 @@ MobileCheckOwnMonAnywhere: ld bc, PARTYMON_STRUCT_LENGTH add hl, bc pop bc - call .CopyName + call .AdvanceOTName dec d jr nz, .asm_4a851 ld a, BANK(sBoxCount) @@ -39,7 +39,7 @@ MobileCheckOwnMonAnywhere: ld bc, BOXMON_STRUCT_LENGTH add hl, bc pop bc - call .CopyName + call .AdvanceOTName dec d jr nz, .asm_4a873 @@ -90,7 +90,7 @@ MobileCheckOwnMonAnywhere: ld bc, BOXMON_STRUCT_LENGTH add hl, bc pop bc - call .CopyName + call .AdvanceOTName dec d jr nz, .asm_4a8ba pop bc @@ -146,7 +146,7 @@ MobileCheckOwnMonAnywhere: dba sBox13 dba sBox14 -.CopyName: +.AdvanceOTName: push hl ld hl, NAME_LENGTH add hl, bc diff --git a/mobile/mobile_45.asm b/mobile/mobile_45.asm index 7975fc2fa..58f552259 100644 --- a/mobile/mobile_45.asm +++ b/mobile/mobile_45.asm @@ -129,7 +129,7 @@ popc Function114243:: ld a, SRAM_ENABLE ld [MBC3SRamEnable], a - ldh a, [hFF8C] + ldh a, [hSRAMBank] push af ; if [$dc02] == 0, this is popped to pc. push de ld a, [$dc02] @@ -147,8 +147,8 @@ Function114243:: Function11425c: ld [$dc02], a pop af - ldh [hFF8C], a - ldh [hFF8C], a + ldh [hSRAMBank], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ret @@ -163,7 +163,7 @@ Function114269: ld [$dc03], a ld a, [hli] ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -360,7 +360,7 @@ Function11433c: pop bc ld a, [$dc03] ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a call Function114c0b ld hl, String_114004 @@ -418,7 +418,7 @@ Function1143b7: push af ld a, [hli] ld [wCurMapBGEventCount], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld a, [hli] ld h, [hl] @@ -473,7 +473,7 @@ Function1143f3: Function114412: ld a, c ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld hl, Unknown_11417f ld a, b @@ -660,7 +660,7 @@ Function1144d1: pop hl ld a, [hli] ld [wCurMapBGEventCount], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -677,7 +677,7 @@ Function1144d1: ld hl, $dc06 ld a, [hl] ld [wCurMapBGEventCount], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld hl, $dc09 ld e, [hl] @@ -735,7 +735,7 @@ Function114576: jr nz, .asm_1145b4 ld a, h ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a push hl push de @@ -753,7 +753,7 @@ Function114576: jr nz, .asm_1145ba ld a, h ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld hl, String_114218 call Function114acf @@ -925,7 +925,7 @@ Function11463c: pop de pop af ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a xor a ld [wDecoCarpet], a @@ -946,7 +946,7 @@ Function1146a4: ld hl, $dc03 ld a, [hli] ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -960,7 +960,7 @@ Function1146a4: ld hl, $dc03 ld a, [hli] ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -1003,7 +1003,7 @@ Function1146fa: ld hl, $dc03 ld a, [hli] ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -1017,7 +1017,7 @@ Function1146fa: ld a, $1 ld [$dc0e], a ld a, [$dc00] - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld a, $1 ld [wDecoRightOrnament], a @@ -1044,7 +1044,7 @@ Function1146fa: ld hl, $dc03 ld a, [hli] ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -1098,7 +1098,7 @@ Function1146fa: ld hl, $dc03 ld a, [hli] ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a call Function114a7a and a @@ -1208,7 +1208,7 @@ Function114843: ld a, [$dc00] push af push de - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a call Function114a18 and a @@ -1231,7 +1231,7 @@ Function114867: ld hl, $dc06 ld a, [hli] ld [wCurMapBGEventCount], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -1296,7 +1296,7 @@ Function1148c2: ld hl, $dc06 ld a, [hli] ld [wCurMapBGEventCount], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -1394,7 +1394,7 @@ Function11494d: ld hl, $dc06 ld a, [hli] ld [wCurMapBGEventCount], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -1484,7 +1484,7 @@ Function1149cc: ld hl, $dc06 ld a, [hl] ld [wCurMapBGEventCount], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a push de ld hl, $dc09 @@ -1831,7 +1831,7 @@ endr ld hl, $dc06 ld a, [hli] ld [wCurMapBGEventCount], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -1869,7 +1869,7 @@ Function114bbc: jr nz, .asm_114bff ld a, h ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a call Function114c0b ld hl, $dc24 @@ -1880,7 +1880,7 @@ Function114bbc: pop hl ld a, [hli] ld [wCurMapBGEventCount], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld a, [hli] ld e, a @@ -2086,7 +2086,7 @@ Function114cd9: ld [$dc04], a ld a, h ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld hl, $dc24 call Function114d39 @@ -2105,7 +2105,7 @@ endr pop hl ld a, [hli] ld [wCurMapBGEventCount], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld a, [hli] ld e, a @@ -2403,7 +2403,7 @@ Function114ea0: ld hl, $dc06 ld a, [hli] ld [wCurMapBGEventCount], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld a, [hli] ld e, a @@ -2603,7 +2603,7 @@ Function114f59: inc hl ld a, [hli] ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -2681,7 +2681,7 @@ Function115020: ld hl, $dc06 ld a, [hli] ld [wCurMapBGEventCount], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld a, [hli] ld e, a @@ -2738,7 +2738,7 @@ Function115062: ld c, a ld a, [hli] ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -2889,7 +2889,7 @@ Function115136: ld hl, $dc06 ld a, [hli] ld [wCurMapBGEventCount], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld a, [hli] ld e, a @@ -2942,7 +2942,7 @@ Function115179: ld hl, $dc06 ld a, [hli] ld [wCurMapBGEventCount], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld a, [hli] ld e, a @@ -3060,7 +3060,7 @@ Function115217: ld hl, $dc06 ld a, [hli] ld [wCurMapBGEventCount], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld a, [hli] ld e, a @@ -3153,7 +3153,7 @@ Function11528f: inc hl ld a, [hli] ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld a, [hli] ld e, a @@ -3402,7 +3402,7 @@ Function1153d2: .asm_1153f5 ld a, [hli] ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -3536,7 +3536,7 @@ Function1153d2: ld hl, wDecoRightOrnament ld a, [hli] ld [wCurMapBGEventCount], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -3769,7 +3769,7 @@ Function11560a: ld [wCurMapBGEventCount], a ld a, [$dc17] ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld hl, $dc1a ld c, [hl] @@ -3842,7 +3842,7 @@ Function11560a: ld [hl], d pop bc ld a, [wCurMapBGEventCount] - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld hl, wCurMapSceneScriptCount ld e, [hl] @@ -4148,7 +4148,7 @@ Function11581e: ld hl, $dc02 ld a, [hli] ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -4202,7 +4202,7 @@ Function11581e: ld hl, wCurMapSceneScriptCount ld a, [hli] ld [wCurMapBGEventCount], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -4669,7 +4669,7 @@ Function115b00: ld hl, $dc02 ld a, [hli] ld [$dc00], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -4757,7 +4757,7 @@ Function115b00: ld hl, wCurMapSceneScriptCount ld a, [hli] ld [wCurMapBGEventCount], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld e, [hl] inc hl @@ -5150,7 +5150,7 @@ Function115d80: ld a, [bc] inc a ld [bc], a - ldh [hFF8C], a + ldh [hSRAMBank], a ld [MBC3SRamBank], a ld a, e ld d, $a0 diff --git a/sram.asm b/sram.asm index e7af5dd0e..24cc3f088 100644 --- a/sram.asm +++ b/sram.asm @@ -218,7 +218,7 @@ sBTMonPrevPrevTrainer2:: db sBTMonPrevPrevTrainer3:: db -SECTION "Boxes 1-7", SRAM, BANK [2] +SECTION "Boxes 1-7", SRAM sBox1:: box sBox1 sBox2:: box sBox2