diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-06-24 16:09:41 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-06-24 16:13:22 +0200 |
| commit | 1d9a68dbdd0132035f1fc7b7ea8f7fdc24741507 (patch) | |
| tree | 3af0a92f5f7dc10f32eed04d9daae52749fc33c2 /data/events | |
| parent | 131875d3e37044ec995287af7c93decd86a0d659 (diff) | |
Remove all address comments
Diffstat (limited to 'data/events')
| -rw-r--r-- | data/events/bug_contest_flags.asm | 3 | ||||
| -rw-r--r-- | data/events/bug_contest_winners.asm | 4 | ||||
| -rw-r--r-- | data/events/field_move_blocks.asm | 4 | ||||
| -rw-r--r-- | data/events/happiness_probabilities.asm | 6 | ||||
| -rw-r--r-- | data/events/magikarp_lengths.asm | 3 | ||||
| -rw-r--r-- | data/events/npc_trades.asm | 3 | ||||
| -rw-r--r-- | data/events/odd_eggs.asm | 3 | ||||
| -rw-r--r-- | data/events/unown_walls.asm | 4 |
8 files changed, 11 insertions, 19 deletions
diff --git a/data/events/bug_contest_flags.asm b/data/events/bug_contest_flags.asm index 04d748270..734bf11f8 100644 --- a/data/events/bug_contest_flags.asm +++ b/data/events/bug_contest_flags.asm @@ -1,4 +1,4 @@ -BugCatchingContestantEventFlagTable: ; 139fe +BugCatchingContestantEventFlagTable: ; there are NUM_BUG_CONTESTANTS entries dw EVENT_BUG_CATCHING_CONTESTANT_1A dw EVENT_BUG_CATCHING_CONTESTANT_2A @@ -10,4 +10,3 @@ BugCatchingContestantEventFlagTable: ; 139fe dw EVENT_BUG_CATCHING_CONTESTANT_8A dw EVENT_BUG_CATCHING_CONTESTANT_9A dw EVENT_BUG_CATCHING_CONTESTANT_10A -; 13a12 diff --git a/data/events/bug_contest_winners.asm b/data/events/bug_contest_winners.asm index 7a465edf5..e29ce0436 100644 --- a/data/events/bug_contest_winners.asm +++ b/data/events/bug_contest_winners.asm @@ -1,4 +1,4 @@ -BugContestantPointers: ; 13783 +BugContestantPointers: ; there are NUM_BUG_CONTESTANTS + 1 entries dw BugContestant_BugCatcherDon ; this reverts back to the player dw BugContestant_BugCatcherDon @@ -11,7 +11,6 @@ BugContestantPointers: ; 13783 dw BugContestant_BugCatcherJosh dw BugContestant_YoungsterSamuel dw BugContestant_SchoolboyKipp -; 13799 ; contestant format: ; db class, id @@ -78,4 +77,3 @@ BugContestant_SchoolboyKipp: dbw VENONAT, 267 dbw PARAS, 254 dbw KAKUNA, 259 -; 13807 diff --git a/data/events/field_move_blocks.asm b/data/events/field_move_blocks.asm index d97fdc995..b7cae3dd7 100644 --- a/data/events/field_move_blocks.asm +++ b/data/events/field_move_blocks.asm @@ -1,4 +1,4 @@ -CutTreeBlockPointers: ; c862 +CutTreeBlockPointers: ; tileset, block list pointer dbw TILESET_JOHTO, .johto dbw TILESET_JOHTO_MODERN, .johto_modern @@ -43,7 +43,7 @@ CutTreeBlockPointers: ; c862 db -1 ; end -WhirlpoolBlockPointers: ; c8a4 +WhirlpoolBlockPointers: dbw TILESET_JOHTO, .johto db -1 ; end diff --git a/data/events/happiness_probabilities.asm b/data/events/happiness_probabilities.asm index 22a7395d9..0dc08ac7e 100644 --- a/data/events/happiness_probabilities.asm +++ b/data/events/happiness_probabilities.asm @@ -1,12 +1,12 @@ -HappinessData_YoungerHaircutBrother: ; 7459 +HappinessData_YoungerHaircutBrother: db $4c, 2, HAPPINESS_YOUNGCUT1 ; 30% chance db $80, 3, HAPPINESS_YOUNGCUT2 ; 20% chance db $ff, 4, HAPPINESS_YOUNGCUT3 ; 50% chance -HappinessData_OlderHaircutBrother: ; 7462 +HappinessData_OlderHaircutBrother: db $9a, 2, HAPPINESS_OLDERCUT1 ; 60% chance db $4c, 3, HAPPINESS_OLDERCUT2 ; 10% chance db $ff, 4, HAPPINESS_OLDERCUT3 ; 30% chance -HappinessData_DaisysGrooming: ; 746b +HappinessData_DaisysGrooming: db $ff, 2, HAPPINESS_GROOMING ; 99.6% chance diff --git a/data/events/magikarp_lengths.asm b/data/events/magikarp_lengths.asm index a631ef719..1a1040d6c 100644 --- a/data/events/magikarp_lengths.asm +++ b/data/events/magikarp_lengths.asm @@ -1,4 +1,4 @@ -MagikarpLengths: ; fbca8 +MagikarpLengths: ; [wMagikarpLength] = z * 100 + (bc - x) / y ; First argument is the bc threshold as well as x. ; Second argument is y. @@ -18,4 +18,3 @@ MagikarpLengths: ; fbca8 dwb 65210, 5 dwb 65410, 2 dwb 65510, 1 ; not used -; fbcd2 diff --git a/data/events/npc_trades.asm b/data/events/npc_trades.asm index b019baf7a..03d409571 100644 --- a/data/events/npc_trades.asm +++ b/data/events/npc_trades.asm @@ -6,7 +6,7 @@ npctrade: MACRO db \8, \9, 0 ENDM -NPCTrades: ; fce58 +NPCTrades: ; entries correspond to NPCTRADE_* constants npctrade TRADE_DIALOGSET_COLLECTOR, ABRA, MACHOP, "MUSCLE@@@@@", $37, $66, GOLD_BERRY, 37460, "MIKE@@@@@@@", TRADE_GENDER_EITHER npctrade TRADE_DIALOGSET_COLLECTOR, BELLSPROUT, ONIX, "ROCKY@@@@@@", $96, $66, BITTER_BERRY, 48926, "KYLE@@@@@@@", TRADE_GENDER_EITHER @@ -15,4 +15,3 @@ NPCTrades: ; fce58 npctrade TRADE_DIALOGSET_NEWBIE, HAUNTER, XATU, "PAUL@@@@@@@", $96, $86, MYSTERYBERRY, 15616, "CHRIS@@@@@@", TRADE_GENDER_EITHER npctrade TRADE_DIALOGSET_GIRL, CHANSEY, AERODACTYL, "AEROY@@@@@@", $96, $66, GOLD_BERRY, 26491, "KIM@@@@@@@@", TRADE_GENDER_EITHER npctrade TRADE_DIALOGSET_COLLECTOR, DUGTRIO, MAGNETON, "MAGGIE@@@@@", $96, $66, METAL_COAT, 50082, "FOREST@@@@@", TRADE_GENDER_EITHER -; fcf38 diff --git a/data/events/odd_eggs.asm b/data/events/odd_eggs.asm index aa7e8176b..f006833a7 100644 --- a/data/events/odd_eggs.asm +++ b/data/events/odd_eggs.asm @@ -26,10 +26,9 @@ prob_total = 0 ; Tyrogue prob 10 prob 1 -; 1fb56e -OddEggs: ; 1fb56e +OddEggs: OddEgg1: db PICHU diff --git a/data/events/unown_walls.asm b/data/events/unown_walls.asm index d7fa26cbc..d0909d139 100644 --- a/data/events/unown_walls.asm +++ b/data/events/unown_walls.asm @@ -17,7 +17,7 @@ endr db -1 ; end ENDM -UnownWalls: ; 8aebc +UnownWalls: ; UNOWNWORDS_ESCAPE ; db $08, $44, $04, $00, $2e, $08, -1 unownwall "E", "S", "C", "A", "P", "E" @@ -30,7 +30,6 @@ UnownWalls: ; 8aebc ; UNOWNWORDS_HO_OH ; db $0e, $2c, $64, $2c, $0e, -1 unownwall "H", "O", "-", "O", "H" -; 8aed5 MenuHeaders_UnownWalls: ; 0x8aed5 ; UNOWNWORDS_ESCAPE @@ -45,4 +44,3 @@ MenuHeaders_UnownWalls: ; 0x8aed5 ; UNOWNWORDS_HO_OH db MENU_BACKUP_TILES ; flags menu_coords 4, 4, 15, 9 -; 8aee9 |
