diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/credits.asm | 4 | ||||
| -rw-r--r-- | engine/diploma.asm | 2 | ||||
| -rw-r--r-- | engine/events.asm | 6 | ||||
| -rw-r--r-- | engine/events_2.asm | 2 | ||||
| -rw-r--r-- | engine/pack.asm | 48 | ||||
| -rw-r--r-- | engine/predef.asm | 8 | ||||
| -rw-r--r-- | engine/save.asm | 2 |
7 files changed, 39 insertions, 33 deletions
diff --git a/engine/credits.asm b/engine/credits.asm index 449fc0ac0..524b97fb2 100644 --- a/engine/credits.asm +++ b/engine/credits.asm @@ -187,7 +187,7 @@ Function109847:: ; 109847 ld [hLCDStatCustom], a call GetCreditsPalette - call Function32f9 + call SetPalettes ld a, [hVBlank] push af ld a, $5 @@ -447,7 +447,7 @@ endr xor a ld [wcf64], a ; frame call GetCreditsPalette - call Function32f9 ; update hw pal registers + call SetPalettes ; update hw pal registers jr .loop .clear diff --git a/engine/diploma.asm b/engine/diploma.asm index f56e4ec00..eff2ff5f1 100644 --- a/engine/diploma.asm +++ b/engine/diploma.asm @@ -33,7 +33,7 @@ Function1dd709: ; 1dd709 call WaitBGMap ld b, $8 call GetSGBLayout - call Function32f9 + call SetPalettes call DelayFrame ret ; 1dd760 diff --git a/engine/events.asm b/engine/events.asm index b0f9fb769..e0770b7a0 100644 --- a/engine/events.asm +++ b/engine/events.asm @@ -1021,12 +1021,14 @@ Function96bd3: ; 96bd3 ; 96bd7 Function96bd7: ; 96bd7 - ld a, [wdca1] + ld a, [RepelStepsLeft] and a ret z + dec a - ld [wdca1], a + ld [RepelStepsLeft], a ret nz + ld a, BANK(RepelWoreOffScript) ld hl, RepelWoreOffScript call CallScript diff --git a/engine/events_2.asm b/engine/events_2.asm index 96ebfb515..494d796a3 100644 --- a/engine/events_2.asm +++ b/engine/events_2.asm @@ -278,7 +278,7 @@ Function97db5: ; 97db5 call GetMapHeaderPhoneServiceNybble and a jr nz, .NoCall - ld hl, wdca1 + 1 + ld hl, wdca2 ld a, [hli] ld d, a ld e, [hl] diff --git a/engine/pack.asm b/engine/pack.asm index 84413e1cb..657a5bea3 100644 --- a/engine/pack.asm +++ b/engine/pack.asm @@ -164,7 +164,7 @@ MenuData2_0x1012c: ; 0x1012c Jumptable_10137: ; 10137 dw Function10159 - dw Function10492 + dw Function10492_ret ; 1013b MenuDataHeader_0x1013b: ; 0x1013b @@ -186,7 +186,7 @@ MenuData2_0x10143: ; 0x10143 Jumptable_10153: ; 10153 dw Function10159 dw Function103fd - dw Function10492 + dw Function10492_ret ; 10159 Function10159: ; 10159 @@ -322,7 +322,7 @@ Jumptable_1026a: ; 1026a dw Function103fd dw Function10364 dw Function103c2 - dw Function10492 + dw Function10492_ret ; 10274 MenuDataHeader_0x10274: ; 0x10274 @@ -346,7 +346,7 @@ Jumptable_10291: ; 10291 dw Function10311 dw Function103fd dw Function10364 - dw Function10492 + dw Function10492_ret ; 10299 MenuDataHeader_0x10299: ; 0x10299 @@ -366,7 +366,7 @@ MenuData2_0x102a1: ; 0x102a1 Jumptable_102ac: ; 102ac dw Function10311 - dw Function10492 + dw Function10492_ret ; 102b0 MenuDataHeader_0x102b0: ; 0x102b0 @@ -388,7 +388,7 @@ MenuData2_0x102b8: ; 0x102b8 Jumptable_102c7: ; 102c7 dw Function10311 dw Function103c2 - dw Function10492 + dw Function10492_ret ; 102cd MenuDataHeader_0x102cd: ; 0x102cd @@ -412,7 +412,7 @@ Jumptable_102ea: ; 102ea dw Function103fd dw Function10364 dw Function103c2 - dw Function10492 + dw Function10492_ret ; 102f2 MenuDataHeader_0x102f2: ; 0x102f2 @@ -434,7 +434,7 @@ MenuData2_0x102fa: ; 0x102fa Jumptable_1030b: ; 1030b dw Function103fd dw Function10364 - dw Function10492 + dw Function10492_ret ; 10311 Function10311: ; 10311 @@ -476,7 +476,7 @@ Function10338: ; 10338 (4:4338) call Function10a40 ret .asm_1034e - ld hl, UnknownText_0x10af8 + ld hl, TextJump_YouDontHaveAPkmn call Function10889 ret @@ -594,16 +594,19 @@ Function103fd: ; 103fd callba WritePartyMenuTilemap callba PrintPartyMenuText call WaitBGMap - call Function32f9 + call SetPalettes call DelayFrame callba PartyMenuSelect jr c, .asm_10475 + ld a, [CurPartySpecies] cp EGG jr nz, .asm_10453 - ld hl, UnknownText_0x1048d + + ld hl, TextJump_AnEGGCantHoldAnItem call PrintText jr .asm_10427 + .asm_10453 ld a, [wcf63] push af @@ -630,18 +633,18 @@ Function103fd: ; 103fd ret Function10486: ; 10486 (4:4486) - ld hl, UnknownText_0x10af8 + ld hl, TextJump_YouDontHaveAPkmn call Function10889 ret ; 1048d (4:448d) -UnknownText_0x1048d: ; 0x1048d +TextJump_AnEGGCantHoldAnItem: ; 0x1048d ; An EGG can't hold an item. - text_jump UnknownText_0x1c0b7f + text_jump Text_AnEGGCantHoldAnItem db "@" ; 0x10492 -Function10492: ; 10492 +Function10492_ret: ; 10492 ret ; 10493 @@ -1112,7 +1115,7 @@ Function107bb: ; 107bb ld a, [InputType] or a jr z, .asm_107ca - callba Function1de28f + callba Start_DudeAutoInput_RightA .asm_107ca call Function107d7 @@ -1507,7 +1510,7 @@ Function10a40: ; 10a40 call WaitBGMap ld b, $14 call GetSGBLayout - call Function32f9 + call SetPalettes call DelayFrame ret ; 10a4f @@ -1650,9 +1653,9 @@ UnknownText_0x10af3: ; 0x10af3 db "@" ; 0x10af8 -UnknownText_0x10af8: ; 0x10af8 +TextJump_YouDontHaveAPkmn: ; 0x10af8 ; You don't have a #MON! - text_jump UnknownText_0x1c0c17 + text_jump Text_YouDontHaveAPkmn db "@" ; 0x10afd @@ -1680,9 +1683,10 @@ UnknownText_0x10b0c: ; 0x10b0c db "@" ; 0x10b11 -UnknownText_0x10b11: ; 0x10b11 - ; You can't use it in a battle. - text_jump UnknownText_0x1c0c85 +TextJump_YouCantUseItInABattle: ; 0x10b11 + ; Doesn't seem to be used anywhere + ; "You can't use it in a battle." + text_jump Text_YouCantUseItInABattle db "@" ; 0x10b16 diff --git a/engine/predef.asm b/engine/predef.asm index 47bc2528a..4284d5adf 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -38,11 +38,11 @@ PredefPointers:: ; 856b add_predef FillPP add_predef TryAddMonToParty add_predef Functionda96 - add_predef Functiondb3f ; $8 + add_predef SentGetPkmnIntoFromBox add_predef SentPkmnIntoBox add_predef GiveEgg add_predef Functionc6e0 - add_predef Functione167 + add_predef CalcPkmnStats add_predef Functione17b add_predef CanLearnTMHMMove add_predef GetTMHMMove @@ -50,7 +50,7 @@ PredefPointers:: ; 856b add_predef PrintMoveDesc add_predef UpdatePlayerHUD add_predef FillBox - add_predef Function3d873 + add_predef CheckPlayerPartyForFitPkmn add_predef UpdateEnemyHUD add_predef StartBattle add_predef FillInExpBar @@ -61,7 +61,7 @@ PredefPointers:: ; 856b add_predef Function421e6 add_predef Function28f63 add_predef Function28f24 - add_predef Function5084a + add_predef CopyPkmnToTempMon add_predef ListMoves ; $20 add_predef Function50d2e add_predef Function50cdb diff --git a/engine/save.asm b/engine/save.asm index 92b65398b..f47495b1d 100644 --- a/engine/save.asm +++ b/engine/save.asm @@ -1,5 +1,5 @@ Function14a1a: ; 14a1a - call Function1d6e + call LoadMenuDataHeader_0x1d75 callba Function5e9a call SpeechTextBox call UpdateSprites |