diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/diploma.asm | 4 | ||||
| -rw-r--r-- | engine/engine_flags.asm | 2 | ||||
| -rw-r--r-- | engine/pokedex.asm | 2 | ||||
| -rw-r--r-- | engine/radio.asm | 32 | ||||
| -rw-r--r-- | engine/scripting.asm | 6 | ||||
| -rw-r--r-- | engine/specials.asm | 14 | ||||
| -rwxr-xr-x | engine/time.asm | 22 |
7 files changed, 41 insertions, 41 deletions
diff --git a/engine/diploma.asm b/engine/diploma.asm index 420bff7f1..f56e4ec00 100644 --- a/engine/diploma.asm +++ b/engine/diploma.asm @@ -70,12 +70,12 @@ Function1dd7ae: ; 1dd7ae call PlaceString hlcoord 12, 15 ld de, GameTimeHours - ld bc, $0204 + lb bc, 2, 4 call PrintNum ld [hl], $67 inc hl ld de, GameTimeMinutes - ld bc, $8102 + lb bc, PRINTNUM_LEADINGZEROS | 1, 2 call PrintNum ret ; 1dd7f0 diff --git a/engine/engine_flags.asm b/engine/engine_flags.asm index ff7948708..278c7c996 100644 --- a/engine/engine_flags.asm +++ b/engine/engine_flags.asm @@ -97,7 +97,7 @@ dwb VisitedSpawns + 3, %00000100 ; silver cave dwb VisitedSpawns + 3, %00010000 ; unused - dwb wdc9d, %00000001 ; lucky number show + dwb wLuckyNumberShowFlag, %00000001 ; lucky number show dwb StatusFlags2, %00001000 dwb DailyFlags, %00000001 ; kurt making balls ; $50 diff --git a/engine/pokedex.asm b/engine/pokedex.asm index 066653777..31a21cff0 100644 --- a/engine/pokedex.asm +++ b/engine/pokedex.asm @@ -1541,7 +1541,7 @@ Function40b6a: ; 40b6a (10:4b6a) ld de, -20 add hl, de ld de, wd265 - ld bc, $8103 + lb bc, PRINTNUM_LEADINGZEROS | 1, 3 call PrintNum pop hl ret diff --git a/engine/radio.asm b/engine/radio.asm index 8e96239de..4ebd0e1e8 100644 --- a/engine/radio.asm +++ b/engine/radio.asm @@ -147,12 +147,12 @@ PrintRadioLine: ; b86ea (2e:46ea) .skip ld a, RADIO_SCROLL ld [wd002], a - ld a, $64 + ld a, 100 ld [wd004], a ret ; b8718 (2e:4718) -Functionb8718: ; b8718 +ReplacePeriodsWithSpaces: ; b8718 push hl ld b, SCREEN_WIDTH * 2 .loop @@ -379,7 +379,7 @@ OaksPkmnTalk8: ; b8854 (2e:4854) and $f ld e, a ld d, 0 - ld hl, .descriptors + ld hl, .Descriptors rept 2 add hl, de endr @@ -390,7 +390,7 @@ endr jp NextRadioLine ; b8869 (2e:4869) -.descriptors: ; b8869 +.Descriptors: ; b8869 dw .sweetadorably dw .wigglyslickly dw .aptlynamed @@ -510,7 +510,7 @@ OaksPkmnTalk9: ; b88d9 (2e:48d9) and $f ld e, a ld d, 0 - ld hl, .descriptors + ld hl, .Descriptors rept 2 add hl, de endr @@ -529,7 +529,7 @@ endr jp NextRadioLine ; b88fe (2e:48fe) -.descriptors: ; b88fe +.Descriptors: ; b88fe dw .cute dw .weird dw .pleasant @@ -653,7 +653,7 @@ OaksPkmnTalk10: ; b896e (2e:496e) call PrintText ld a, OAKS_POKEMON_TALK_11 ld [wd002], a - ld a, $64 + ld a, 100 ld [wd004], a ret ; b898e (2e:498e) @@ -1058,10 +1058,10 @@ UnknownText_0xb8bd7: ; 0xb8bd7 LuckyNumberShow1: ; b8bdc (2e:4bdc) call StartRadioStation - callab Functionc434 - jr nc, .asm_b8bed - callab Functionc422 -.asm_b8bed + callab Special_CheckLuckyNumberShowFlag + jr nc, .dontreset + callab Special_ResetLuckyNumberShowFlag +.dontreset ld hl, UnknownText_0xb8c7e ld a, LUCKY_NUMBER_SHOW_2 jp NextRadioLine @@ -1098,8 +1098,8 @@ LuckyNumberShow7: ; b8c1d (2e:4c1d) LuckyNumberShow8: ; b8c25 (2e:4c25) ld hl, StringBuffer1 - ld de, wdc9f - ld bc, $8205 + ld de, wLuckyIDNumber + lb bc, PRINTNUM_LEADINGZEROS | 2, 5 call PrintNum ld a, "@" ld [StringBuffer1 + 5], a @@ -1275,7 +1275,7 @@ PeoplePlaces4: ; People push af ld hl, .E4Names ld a, [StatusFlags] - bit 6, a + bit 6, a ; ENGINE_CREDITS_SKIP jr z, .ok ld hl, .KantoLeaderNames ld a, [KantoBadges] @@ -1498,7 +1498,7 @@ PeoplePlaces7: ; b8e28 (2e:4e28) and $f ld e, a ld d, 0 - ld hl, .descriptors + ld hl, .Descriptors rept 2 add hl, de endr @@ -1519,7 +1519,7 @@ endr jp PrintRadioLine ; b8e52 (2e:4e52) -.descriptors: ; b8e52 +.Descriptors: ; b8e52 dw PnP_cute dw PnP_lazy dw PnP_happy diff --git a/engine/scripting.asm b/engine/scripting.asm index bc5a0e790..f8ac4cc0c 100644 --- a/engine/scripting.asm +++ b/engine/scripting.asm @@ -2232,7 +2232,7 @@ Script_readmoney: ; 0x97732 call ResetStringBuffer1 call GetMoneyAccount ld hl, StringBuffer1 - ld bc, $4306 + lb bc, PRINTNUM_RIGHTALIGN | 3, 6 call PrintNum ld de, StringBuffer1 jp ConvertMemToText @@ -2246,7 +2246,7 @@ Script_readcoins: ; 0x97747 call ResetStringBuffer1 ld hl, StringBuffer1 ld de, Coins - ld bc, $4206 + lb bc, PRINTNUM_RIGHTALIGN | 2, 6 call PrintNum ld de, StringBuffer1 jp ConvertMemToText @@ -2260,7 +2260,7 @@ Script_RAM2MEM: ; 0x9775c call ResetStringBuffer1 ld de, ScriptVar ld hl, StringBuffer1 - ld bc, $4103 + lb bc, PRINTNUM_RIGHTALIGN | 1, 3 call PrintNum ld de, StringBuffer1 jp ConvertMemToText diff --git a/engine/specials.asm b/engine/specials.asm index 58cf5d646..5db616f61 100644 --- a/engine/specials.asm +++ b/engine/specials.asm @@ -102,9 +102,9 @@ SpecialsPointers:: ; c029 add_special Function24b25 add_special Function24b4e add_special Function24ae8 - add_special Function4d87a - add_special Functionc434 - add_special Functionc422 + add_special Special_CheckForLuckyNumberWinners + add_special Special_CheckLuckyNumberShowFlag + add_special Special_ResetLuckyNumberShowFlag add_special Function4d9d3 add_special Function88018 add_special SpecialNameRater @@ -522,15 +522,15 @@ SpecialCheckPokerus: ; c419 jp ScriptReturnCarry ; c422 -Functionc422: ; c422 +Special_ResetLuckyNumberShowFlag: ; c422 callba Function1152b - ld hl, wdc9d + ld hl, wLuckyNumberShowFlag res 0, [hl] - callba Function5d33 + callba LoadOrRegenerateLuckyIDNumber ret ; c434 -Functionc434: ; c434 +Special_CheckLuckyNumberShowFlag: ; c434 callba Function11542 jp ScriptReturnCarry ; c43d diff --git a/engine/time.asm b/engine/time.asm index d47c4fbaa..8b3f5d758 100755 --- a/engine/time.asm +++ b/engine/time.asm @@ -5,7 +5,7 @@ Function113d6: ; 113d6 Function113da: ; 113da xor a - ld [wdc2d], a + ld [wLuckyNumberDayBuffer], a ld [wdc3a], a ld [wdc1c], a ret @@ -242,28 +242,28 @@ Function11522: ; 11522 ; 1152b Function1152b: ; 1152b - call Function11534 - ld hl, wdc2d + call .GetDaysUntilNextFriday + ld hl, wLuckyNumberDayBuffer jp Function11415 ; 11534 -Function11534: ; 11534 +.GetDaysUntilNextFriday: ; 11534 call GetWeekday ld c, a - ld a, $5 + ld a, FRIDAY sub c - jr z, .asm_1153f - jr nc, .asm_11541 + jr z, .friday_saturday + jr nc, .earlier ; should've done "ret nc" -.asm_1153f - add $7 +.friday_saturday + add 7 -.asm_11541 +.earlier ret ; 11542 Function11542: ; 11542 - ld hl, wdc2d + ld hl, wLuckyNumberDayBuffer jp Function11420 ; 11548 |