diff options
Diffstat (limited to 'engine/events')
| -rwxr-xr-x | engine/events/battle_tower/battle_tower.asm | 14 | ||||
| -rwxr-xr-x | engine/events/card_key.asm | 2 | ||||
| -rwxr-xr-x | engine/events/halloffame.asm | 6 |
3 files changed, 11 insertions, 11 deletions
diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm index fd559af27..9dace59b4 100755 --- a/engine/events/battle_tower/battle_tower.asm +++ b/engine/events/battle_tower/battle_tower.asm @@ -1334,7 +1334,7 @@ BattleTowerAction_EggTicket: ; 17093c (5c:493c) BattleTowerAction $0e dec a jr nz, .loop2 .skip - ld de, String_1709a4 + ld de, String_MysteryJP ld a, NAME_LENGTH_JAPANESE .compare_loop push af @@ -1375,8 +1375,8 @@ endr ret ; 1709a4 (5c:49a4) -String_1709a4: ; 1709a4 - db "なぞナゾ@@" +String_MysteryJP: ; 1709a4 + db "なぞナゾ@@" ; MYSTERY Function1709aa: ; 1709aa (5c:49aa) BattleTowerAction $0f ld a, [rSVBK] @@ -1400,7 +1400,7 @@ Function1709bb: ; 1709bb (5c:49bb) BattleTowerAction $10 jr nc, .invalid ld e, a ld d, 0 - ld hl, Jumptable_1709e7 + ld hl, .jumptable add hl, de add hl, de ld a, [hli] @@ -1417,7 +1417,7 @@ Function1709bb: ; 1709bb (5c:49bb) BattleTowerAction $10 ret ; 1709e7 (5c:49e7) -Jumptable_1709e7: ; 1709e7 +.jumptable: ; 1709e7 dw .NoAction dw .NoAction dw .DoAction1 @@ -1519,11 +1519,11 @@ Jumptable_1709e7: ; 1709e7 ; 170a9c Function170a9c: ; 170a9c (5c:4a9c) BattleTowerAction $11 - ld c, $0 + ld c, FALSE jr asm_170aa2 Function170aa0: ; 170aa0 (5c:4aa0) BattleTowerAction $12 - ld c, $1 + ld c, TRUE asm_170aa2: ; 170aa2 (5c:4aa2) ld a, $5 call GetSRAMBank diff --git a/engine/events/card_key.asm b/engine/events/card_key.asm index 0f0b0ff33..f4f36e402 100755 --- a/engine/events/card_key.asm +++ b/engine/events/card_key.asm @@ -35,5 +35,5 @@ _CardKey: ; 50779 .CardKeyScript: ; 0x507af closetext - farjump MapRadioTower3FSignpost2Script + farjump CardKeySlotScript ; 0x507b4 diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm index 8b6f2a62e..cf3831066 100755 --- a/engine/events/halloffame.asm +++ b/engine/events/halloffame.asm @@ -18,7 +18,7 @@ HallOfFame:: ; 0x8640e ld hl, wHallOfFameCount ld a, [hl] - cp 200 + cp HOF_MASTER_COUNT jr nc, .ok inc [hl] .ok @@ -355,7 +355,7 @@ _HallOfFamePC: ; 86650 .DisplayMonAndStrings: ; Print the number of times the player has entered the Hall of Fame. -; If that number is above 200, print "HOF Master!" instead. +; If that number is at least HOF_MASTER_COUNT, print "HOF Master!" instead. ld a, [wHallOfFameMonCounter] cp PARTY_LENGTH jr nc, .fail @@ -376,7 +376,7 @@ _HallOfFamePC: ; 86650 pop hl call DisplayHOFMon ld a, [wHallOfFameTempWinCount] - cp 200 + 1 + cp HOF_MASTER_COUNT + 1 ; should be HOF_MASTER_COUNT jr c, .print_num_hof ld de, .HOFMaster hlcoord 1, 2 |