diff options
author | dannye <33dannye@gmail.com> | 2021-01-03 23:36:02 -0600 |
---|---|---|
committer | dannye <33dannye@gmail.com> | 2021-01-04 00:01:15 -0600 |
commit | 96168b95d2c70375a77243da759c2a4b54e80707 (patch) | |
tree | 125961b5ac28f7a4a9ebcd78bd5634a6f4bc7c58 | |
parent | 5f64d73c3fcd49f93bcbc3f8a5fc0dd0043faf4d (diff) |
Add labels for some addresses
-rw-r--r-- | src/audio/music1_headers.asm | 156 | ||||
-rw-r--r-- | src/audio/music2_headers.asm | 204 | ||||
-rw-r--r-- | src/data/booster_packs.asm | 24 | ||||
-rw-r--r-- | src/data/cards.asm | 4 | ||||
-rw-r--r-- | src/data/decks.asm | 2 | ||||
-rw-r--r-- | src/data/map_objects.asm | 52 | ||||
-rw-r--r-- | src/data/map_scripts.asm | 348 | ||||
-rw-r--r-- | src/data/move_animations.asm | 2 | ||||
-rw-r--r-- | src/data/npc_map_data.asm | 158 | ||||
-rw-r--r-- | src/data/warps.asm | 2 | ||||
-rw-r--r-- | src/engine/bank01.asm | 56 | ||||
-rw-r--r-- | src/engine/bank02.asm | 241 | ||||
-rwxr-xr-x | src/engine/bank03.asm | 108 | ||||
-rw-r--r-- | src/engine/bank04.asm | 127 | ||||
-rw-r--r-- | src/engine/bank06.asm | 36 | ||||
-rw-r--r-- | src/engine/bank07.asm | 138 | ||||
-rw-r--r-- | src/engine/bank20.asm | 36 | ||||
-rw-r--r-- | src/engine/effect_functions.asm | 8 | ||||
-rw-r--r-- | src/engine/home.asm | 38 | ||||
-rw-r--r-- | src/sram.asm | 26 | ||||
-rw-r--r-- | src/text/text1.asm | 4 | ||||
-rw-r--r-- | src/text/text3.asm | 2 | ||||
-rw-r--r-- | src/text/text_offsets.asm | 6 | ||||
-rw-r--r-- | src/wram.asm | 34 |
24 files changed, 1032 insertions, 780 deletions
diff --git a/src/audio/music1_headers.asm b/src/audio/music1_headers.asm index 05f33bb..26cdff4 100644 --- a/src/audio/music1_headers.asm +++ b/src/audio/music1_headers.asm @@ -41,19 +41,19 @@ SongHeaderPointers1: ; f4f05 (3d:4f05) dw Music_DuelTheme2 dw Music_DuelTheme3 dw Music_PauseMenu - dw $0000 + dw NULL dw Music_DeckMachine dw Music_CardPop dw Music_Overworld - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL + dw NULL + dw NULL + dw NULL + dw NULL + dw NULL dw Music_Unused13 dw Music_Unused14 dw Music_MatchStart1 @@ -107,10 +107,10 @@ Music_PauseMenu: ; f4f68 (3d:4f68) ;Music_PCMainMenu db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL Music_DeckMachine: ; f4f7a (3d:4f7a) db %1111 @@ -135,147 +135,147 @@ Music_Overworld: ; f4f8c (3d:4f8c) ;Music_PokemonDome db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_ChallengeHall db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_Club1 db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_Club2 db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_Club3 db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_Ronald db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_Imakuni db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_HallOfHonor db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_Credits db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL Music_Unused13: ; f4fe6 (3d:4fe6) db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL Music_Unused14: ; f4fef (3d:4fef) db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL Music_MatchStart1: ; f4ff8 (3d:4ff8) db %0001 dw Music_MatchStart1_Ch1 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL Music_MatchStart2: ; f5001 (3d:5001) db %0011 dw Music_MatchStart2_Ch1 dw Music_MatchStart2_Ch2 - dw $0000 - dw $0000 + dw NULL + dw NULL Music_MatchStart3: ; f500a (3d:500a) db %0011 dw Music_MatchStart3_Ch1 dw Music_MatchStart3_Ch2 - dw $0000 - dw $0000 + dw NULL + dw NULL Music_MatchVictory: ; f5013 (3d:5013) db %0111 dw Music_MatchVictory_Ch1 dw Music_MatchVictory_Ch2 dw Music_MatchVictory_Ch3 - dw $0000 + dw NULL Music_MatchLoss: ; f501c (3d:501c) db %0111 dw Music_MatchLoss_Ch1 dw Music_MatchLoss_Ch2 dw Music_MatchLoss_Ch3 - dw $0000 + dw NULL Music_MatchDraw: ; f5025 (3d:5025) db %0111 dw Music_MatchDraw_Ch1 dw Music_MatchDraw_Ch2 dw Music_MatchDraw_Ch3 - dw $0000 + dw NULL Music_Unused1b: ; f502e (3d:502e) db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL Music_BoosterPack: ; f5037 (3d:5037) db %0111 dw Music_BoosterPack_Ch1 dw Music_BoosterPack_Ch2 dw Music_BoosterPack_Ch3 - dw $0000 + dw NULL Music_Medal: ; f5040 (3d:5040) db %0111 dw Music_Medal_Ch1 dw Music_Medal_Ch2 dw Music_Medal_Ch3 - dw $0000 + dw NULL Music_Unused1e: ; f5049 (3d:5049) db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL diff --git a/src/audio/music2_headers.asm b/src/audio/music2_headers.asm index 206d8fd..3a088f7 100644 --- a/src/audio/music2_headers.asm +++ b/src/audio/music2_headers.asm @@ -36,15 +36,15 @@ SongBanks2: ; f8ee6 (3e:4ee6) SongHeaderPointers2: ; f8f05 (3e:4f05) dw Music_Stop - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL + dw NULL dw Music_PCMainMenu - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL dw Music_PokemonDome dw Music_ChallengeHall dw Music_Club1 @@ -54,56 +54,56 @@ SongHeaderPointers2: ; f8f05 (3e:4f05) dw Music_Imakuni dw Music_HallOfHonor dw Music_Credits - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL + dw NULL + dw NULL + dw NULL + dw NULL + dw NULL + dw NULL + dw NULL + dw NULL ;Music_Stop db %0000 ;Music_TitleScreen db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_DuelTheme1 db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_DuelTheme2 db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_DuelTheme3 db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_PauseMenu db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL Music_PCMainMenu: ; f8f71 (3e:4f71) db %1111 @@ -114,24 +114,24 @@ Music_PCMainMenu: ; f8f71 (3e:4f71) ;Music_DeckMachine db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_CardPop db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_Overworld db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL Music_PokemonDome: ; f8f95 (3e:4f95) db %1111 @@ -159,7 +159,7 @@ Music_Club2: ; f8fb0 (3e:4fb0) dw Music_Club2_Ch1 dw Music_Club2_Ch2 dw Music_Club2_Ch3 - dw $0000 + dw NULL Music_Club3: ; f8fb9 (3e:4fb9) db %1111 @@ -187,7 +187,7 @@ Music_HallOfHonor: ; f8fd4 (3e:4fd4) dw Music_HallOfHonor_Ch1 dw Music_HallOfHonor_Ch2 dw Music_HallOfHonor_Ch3 - dw $0000 + dw NULL Music_Credits: ; f8fdd (3e:4fdd) db %1111 @@ -198,84 +198,84 @@ Music_Credits: ; f8fdd (3e:4fdd) ;Music_Unused13 db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_Unused14 db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_MatchStart1 db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_MatchStart2 db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_MatchStart3 db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_MatchVictory db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_MatchLoss db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_MatchDraw db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_Unused1b db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_BoosterPack db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_Medal db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL ;Music_Unused1e db %0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL diff --git a/src/data/booster_packs.asm b/src/data/booster_packs.asm index 44a401f..51bb8c2 100644 --- a/src/data/booster_packs.asm +++ b/src/data/booster_packs.asm @@ -14,7 +14,7 @@ ENDM ; For the energy or energy generation function, there are three options: ; - Pointer to a function that generates energies (some generate one, some generate a full pack) ; - A single energy of a specific type -; - $0000 if no card in the pack is an energy +; - NULL if no card in the pack is an energy ; As for Card Type Chances, note that whenever one card of the 10 is drawn, the chances of ; the type of that card are reduced by the original average of all 8 types (capping the result at 1). @@ -232,7 +232,7 @@ BoosterPack_EvolutionTrainer:: ; 1e580 (7:6580) BoosterPack_MysteryNeutral:: ; 1e58c (7:658c) booster_set MYSTERY ; booster pack set - dw $0000 ; energy or energy generation function + dw NULL ; energy or energy generation function ; Card Type Chances db 17 ; Grass Type Chance @@ -247,7 +247,7 @@ BoosterPack_MysteryNeutral:: ; 1e58c (7:658c) BoosterPack_MysteryGrassColorless:: ; 1e598 (7:6598) booster_set MYSTERY ; booster pack set - dw $0000 ; energy or energy generation function + dw NULL ; energy or energy generation function ; Card Type Chances db 48 ; Grass Type Chance @@ -262,7 +262,7 @@ BoosterPack_MysteryGrassColorless:: ; 1e598 (7:6598) BoosterPack_MysteryWaterColorless:: ; 1e5a4 (7:65a4) booster_set MYSTERY ; booster pack set - dw $0000 ; energy or energy generation function + dw NULL ; energy or energy generation function ; Card Type Chances db 12 ; Grass Type Chance @@ -277,7 +277,7 @@ BoosterPack_MysteryWaterColorless:: ; 1e5a4 (7:65a4) BoosterPack_MysteryLightningColorless:: ; 1e5b0 (7:65b0) booster_set MYSTERY ; booster pack set - dw $0000 ; energy or energy generation function + dw NULL ; energy or energy generation function ; Card Type Chances db 12 ; Grass Type Chance @@ -292,7 +292,7 @@ BoosterPack_MysteryLightningColorless:: ; 1e5b0 (7:65b0) BoosterPack_MysteryFightingColorless:: ; 1e5bc (7:65bc) booster_set MYSTERY ; booster pack set - dw $0000 ; energy or energy generation function + dw NULL ; energy or energy generation function ; Card Type Chances db 12 ; Grass Type Chance @@ -307,7 +307,7 @@ BoosterPack_MysteryFightingColorless:: ; 1e5bc (7:65bc) BoosterPack_MysteryTrainerColorless:: ; 1e5c8 (7:65c8) booster_set MYSTERY ; booster pack set - dw $0000 ; energy or energy generation function + dw NULL ; energy or energy generation function ; Card Type Chances db 12 ; Grass Type Chance @@ -322,7 +322,7 @@ BoosterPack_MysteryTrainerColorless:: ; 1e5c8 (7:65c8) BoosterPack_LaboratoryMostlyNeutral:: ; 1e5d4 (7:65d4) booster_set LABORATORY ; booster pack set - dw $0000 ; energy or energy generation function + dw NULL ; energy or energy generation function ; Card Type Chances db 20 ; Grass Type Chance @@ -337,7 +337,7 @@ BoosterPack_LaboratoryMostlyNeutral:: ; 1e5d4 (7:65d4) BoosterPack_LaboratoryGrass:: ; 1e5e0 (7:65e0) booster_set LABORATORY ; booster pack set - dw $0000 ; energy or energy generation function + dw NULL ; energy or energy generation function ; Card Type Chances db 48 ; Grass Type Chance @@ -352,7 +352,7 @@ BoosterPack_LaboratoryGrass:: ; 1e5e0 (7:65e0) BoosterPack_LaboratoryWater:: ; 1e5ec (7:65ec) booster_set LABORATORY ; booster pack set - dw $0000 ; energy or energy generation function + dw NULL ; energy or energy generation function ; Card Type Chances db 16 ; Grass Type Chance @@ -367,7 +367,7 @@ BoosterPack_LaboratoryWater:: ; 1e5ec (7:65ec) BoosterPack_LaboratoryPsychic:: ; 1e5f8 (7:65f8) booster_set LABORATORY ; booster pack set - dw $0000 ; energy or energy generation function + dw NULL ; energy or energy generation function ; Card Type Chances db 16 ; Grass Type Chance @@ -382,7 +382,7 @@ BoosterPack_LaboratoryPsychic:: ; 1e5f8 (7:65f8) BoosterPack_LaboratoryTrainer:: ; 1e604 (7:6604) booster_set LABORATORY ; booster pack set - dw $0000 ; energy or energy generation function + dw NULL ; energy or energy generation function ; Card Type Chances db 16 ; Grass Type Chance diff --git a/src/data/cards.asm b/src/data/cards.asm index dca875a..de92db2 100644 --- a/src/data/cards.asm +++ b/src/data/cards.asm @@ -2,7 +2,7 @@ ; convenience once the meaning of all fields is figured out. CardPointers: ; 30c5c (c:4c5c) - dw $0000 + dw NULL dw GrassEnergyCard dw FireEnergyCard dw WaterEnergyCard @@ -231,7 +231,7 @@ CardPointers: ; 30c5c (c:4c5c) dw PokemonFluteCard dw GamblerCard dw RecycleCard - dw $0000 + dw NULL BulbasaurCard: ; 30e28 (c:4e28) db TYPE_PKMN_GRASS ; type diff --git a/src/data/decks.asm b/src/data/decks.asm index 424874b..8b800f4 100644 --- a/src/data/decks.asm +++ b/src/data/decks.asm @@ -54,7 +54,7 @@ DeckPointers: ; 30000 (c:4000) dw FlamethrowerDeck dw ReshuffleDeck dw ImakuniDeck - dw $0000 + dw NULL UnnamedDeck: ; 30070 (c:4070) db 20, PSYCHIC_ENERGY diff --git a/src/data/map_objects.asm b/src/data/map_objects.asm index eaa456f..046c20f 100644 --- a/src/data/map_objects.asm +++ b/src/data/map_objects.asm @@ -60,92 +60,92 @@ DeckMachineRoomObjects: ; 13b4d (3:7b4d) tx PokemonTradingCards101Text db NORTH, 6, 2 - dw $593f + dw Script_d93f tx PlaceholderMessageText tx PokemonTradingCards101Text db NORTH, 8, 2 - dw $593f + dw Script_d93f tx PlaceholderMessageText tx PokemonTradingCards101Text db NORTH, 10, 2 - dw $5995 + dw Script_d995 tx PlaceholderMessageText tx PokemonTradingCards101Text db NORTH, 12, 2 - dw $5995 + dw Script_d995 tx PlaceholderMessageText tx PokemonTradingCards101Text db NORTH, 14, 2 - dw $59c2 + dw Script_d9c2 tx PlaceholderMessageText tx PokemonTradingCards101Text db NORTH, 16, 2 - dw $59c2 + dw Script_d9c2 tx PlaceholderMessageText tx PokemonTradingCards101Text db NORTH, 18, 2 - dw $59ef + dw Script_d9ef tx PlaceholderMessageText tx PokemonTradingCards101Text db NORTH, 20, 2 - dw $59ef + dw Script_d9ef tx PlaceholderMessageText tx PokemonTradingCards101Text db NORTH, 14, 10 - dw $5a1c + dw Script_da1c tx PlaceholderMessageText tx PokemonTradingCards101Text db NORTH, 16, 10 - dw $5a1c + dw Script_da1c tx PlaceholderMessageText tx PokemonTradingCards101Text db NORTH, 18, 10 - dw $5a49 + dw Script_da49 tx PlaceholderMessageText tx PokemonTradingCards101Text db NORTH, 20, 10 - dw $5a49 + dw Script_da49 tx PlaceholderMessageText tx PokemonTradingCards101Text db NORTH, 14, 18 - dw $5a76 + dw Script_da76 tx PlaceholderMessageText tx PokemonTradingCards101Text db NORTH, 16, 18 - dw $5a76 + dw Script_da76 tx PlaceholderMessageText tx PokemonTradingCards101Text db NORTH, 18, 18 - dw $5aa3 + dw Script_daa3 tx PlaceholderMessageText tx PokemonTradingCards101Text db NORTH, 20, 18 - dw $5aa3 + dw Script_daa3 tx PlaceholderMessageText tx PokemonTradingCards101Text db NORTH, 2, 18 - dw $5ad0 + dw Script_dad0 tx PlaceholderMessageText tx PokemonTradingCards101Text db NORTH, 4, 18 - dw $5ad0 + dw Script_dad0 tx PlaceholderMessageText tx PokemonTradingCards101Text @@ -564,12 +564,12 @@ PokemonDomeEntranceObjects: ; 13e5e (3:7e5e) tx Text0507 db NORTH, 22, 0 - dw $76af + dw Script_f6af tx Text0558 tx Text0509 db NORTH, 24, 0 - dw $76af + dw Script_f6af tx Text0558 tx Text0509 @@ -585,22 +585,22 @@ HallOfHonorObjects: ; 13ec2 (3:7ec2) ; Legendary Cards db NORTH, 10, 10 dw Script_fbf1 - dw $0000 - dw $0000 + dw NULL + dw NULL ; Legendary Cards db NORTH, 12, 10 dw Script_fbf1 - dw $0000 - dw $0000 + dw NULL + dw NULL db NORTH, 10, 2 - dw $7be1 + dw Script_fbe1 tx PlaceholderMessageText tx PokemonTradingCards101Text db NORTH, 12, 2 - dw $7be1 + dw Script_fbe1 tx PlaceholderMessageText tx PokemonTradingCards101Text diff --git a/src/data/map_scripts.asm b/src/data/map_scripts.asm index 3084f8b..ff4e608 100644 --- a/src/data/map_scripts.asm +++ b/src/data/map_scripts.asm @@ -1,7 +1,7 @@ ; each map has a maximum of 8 scripts ; scripts are referenced with ids [0,2,4,6,8,a,c,e] ; each script id is used for a specific event -; if a script pointer is $0000, that map has no script for that event +; if a script pointer is NULL, that map has no script for that event ; 0: NPC data ; 2: Called after every NPC is loaded (unused) ; 4: Interactable Objects @@ -13,330 +13,330 @@ MapScripts: ; 1162a (4:562a) ; OVERWORLD_MAP - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL dw LoadOverworld - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL ; MASON_LABORATORY dw MasonLabNPCS - dw $0000 + dw NULL dw MasonLabObjects dw MasonLabPressedA dw MasonLabLoadMap dw MasonLaboratoryAfterDuel - dw $0000 + dw NULL dw MasonLabCloseTextBox ; DECK_MACHINE_ROOM dw DeckMachineRoomNPCS - dw $0000 + dw NULL dw DeckMachineRoomObjects - dw $0000 - dw $0000 + dw NULL + dw NULL dw $589f - dw $0000 + dw NULL dw $58ad ; ISHIHARAS_HOUSE dw IshiharasHouseNPCS - dw $0000 + dw NULL dw IshiharasHouseObjects - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL + dw NULL ; FIGHTING_CLUB_ENTRANCE dw FightingClubEntranceNPCS - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL dw LoadClubEntrance dw ClubEntranceAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; FIGHTING_CLUB_LOBBY dw FightingClubLobbyNPCS - dw $0000 + dw NULL dw FightingClubLobbyObjects - dw $0000 - dw $0000 + dw NULL + dw NULL dw FightingClubLobbyAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; FIGHTING_CLUB dw FightingClubNPCS - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL dw FightingClubAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; ROCK_CLUB_ENTRANCE dw RockClubEntranceNPCS - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL dw LoadClubEntrance dw ClubEntranceAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; ROCK_CLUB_LOBBY dw RockClubLobbyNPCS - dw $0000 + dw NULL dw RockClubLobbyObjects - dw $0000 - dw $0000 + dw NULL + dw NULL dw RockClubLobbyAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; ROCK_CLUB dw RockClubNPCS - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL dw $5fd6 - dw $0000 - dw $0000 + dw NULL + dw NULL ; WATER_CLUB_ENTRANCE dw WaterClubEntranceNPCS - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL dw LoadClubEntrance dw ClubEntranceAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; WATER_CLUB_LOBBY dw WaterClubLobbyNPCS - dw $0000 + dw NULL dw WaterClubLobbyObjects - dw $0000 - dw $0000 + dw NULL + dw NULL dw WaterClubLobbyAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; WATER_CLUB dw WaterClubNPCS - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL dw WaterClubAfterDuel dw WaterClubMovePlayer - dw $0000 + dw NULL ; LIGHTNING_CLUB_ENTRANCE dw LightningClubEntranceNPCS - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL dw LoadClubEntrance dw ClubEntranceAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; LIGHTNING_CLUB_LOBBY dw LightningClubLobbyNPCS - dw $0000 + dw NULL dw LightningClubLobbyObjects - dw $0000 - dw $0000 + dw NULL + dw NULL dw LightningClubLobbyAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; LIGHTNING_CLUB dw LightningClubNPCS - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL dw $63e8 - dw $0000 - dw $0000 + dw NULL + dw NULL ; GRASS_CLUB_ENTRANCE dw GrassClubEntranceNPCS - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL dw LoadClubEntrance dw GrassClubEntranceAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; GRASS_CLUB_LOBBY dw GrassClubLobbyNPCS - dw $0000 + dw NULL dw GrassClubLobbyObjects - dw $0000 - dw $0000 + dw NULL + dw NULL dw GrassClubLobbyAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; GRASS_CLUB dw GrassClubNPCS - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL dw $66e7 - dw $0000 - dw $0000 + dw NULL + dw NULL ; PSYCHIC_CLUB_ENTRANCE dw PsychicClubEntranceNPCS - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL dw LoadClubEntrance dw ClubEntranceAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; PSYCHIC_CLUB_LOBBY dw PsychicClubLobbyNPCS - dw $0000 + dw NULL dw PsychicClubLobbyObjects - dw $0000 + dw NULL dw $6971 dw PsychicClubLobbyAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; PSYCHIC_CLUB dw PsychicClubNPCS - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL dw $6a46 - dw $0000 - dw $0000 + dw NULL + dw NULL ; SCIENCE_CLUB_ENTRANCE dw ScienceClubEntranceNPCS - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL dw LoadClubEntrance dw ClubEntranceAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; SCIENCE_CLUB_LOBBY dw ScienceClubLobbyNPCS - dw $0000 + dw NULL dw ScienceClubLobbyObjects - dw $0000 - dw $0000 + dw NULL + dw NULL dw ScienceClubLobbyAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; SCIENCE_CLUB dw ScienceClubNPCS - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL dw $6bf1 - dw $0000 - dw $0000 + dw NULL + dw NULL ; FIRE_CLUB_ENTRANCE dw FireClubEntranceNPCS - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL dw LoadClubEntrance dw ClubEntranceAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; FIRE_CLUB_LOBBY dw FireClubLobbyNPCS - dw $0000 + dw NULL dw FireClubLobbyObjects dw FireClubPressedA - dw $0000 + dw NULL dw FireClubLobbyAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; FIRE_CLUB dw FireClubNPCS - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL dw FireClubAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; CHALLENGE_HALL_ENTRANCE dw ChallengeHallEntranceNPCS - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL + dw NULL + dw NULL + dw NULL + dw NULL ; CHALLENGE_HALL_LOBBY dw ChallengeHallLobbyNPCS - dw $0000 + dw NULL dw ChallengeHallLobbyObjects - dw $0000 + dw NULL dw ChallengeHallLobbyLoadMap - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL ; CHALLENGE_HALL dw ChallengeHallNPCS - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL dw ChallengeHallLoadMap dw ChallengeHallAfterDuel - dw $0000 - dw $0000 + dw NULL + dw NULL ; POKEMON_DOME_ENTRANCE dw PokemonDomeEntranceNPCS - dw $0000 + dw NULL dw PokemonDomeEntranceObjects - dw $0000 + dw NULL dw $7607 - dw $0000 - dw $0000 + dw NULL + dw NULL dw $762a ; POKEMON_DOME dw PokemonDomeNPCS - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL dw $7706 dw $76e0 dw $76c6 @@ -344,10 +344,10 @@ MapScripts: ; 1162a (4:562a) ; HALL_OF_HONOR dw HallOfHonorNPCS - dw $0000 + dw NULL dw HallOfHonorObjects - dw $0000 + dw NULL dw HallOfHonorLoadMap - dw $0000 - dw $0000 - dw $0000 + dw NULL + dw NULL + dw NULL diff --git a/src/data/move_animations.asm b/src/data/move_animations.asm index 222a6d7..48cf7c6 100644 --- a/src/data/move_animations.asm +++ b/src/data/move_animations.asm @@ -21,7 +21,7 @@ anim_end2: MACRO ENDM PointerTable_MoveAnimation: - dw $0000 + dw NULL dw MoveAnimation_52c6 dw MoveAnimation_52cf dw MoveAnimation_52c6 diff --git a/src/data/npc_map_data.asm b/src/data/npc_map_data.asm index 7c01e72..bf26269 100644 --- a/src/data/npc_map_data.asm +++ b/src/data/npc_map_data.asm @@ -8,26 +8,26 @@ MasonLabNPCS: ; 772f (4:1372f) db NPC_SAM, $04, $0e, EAST dw $5604 db NPC_TECH1, $16, $08, WEST - dw $0000 + dw NULL db NPC_TECH2, $16, $14, SOUTH - dw $0000 + dw NULL db NPC_TECH3, $16, $16, WEST - dw $0000 + dw NULL db NPC_TECH4, $0a, $16, EAST - dw $0000 + dw NULL db NPC_TECH5, $06, $04, SOUTH dw $55eb db $00 DeckMachineRoomNPCS: ; 775a (4:1375a) db NPC_TECH6, $06, $08, SOUTH - dw $0000 + dw NULL db NPC_TECH7, $06, $16, WEST - dw $0000 + dw NULL db NPC_TECH8, $0a, $12, WEST - dw $0000 + dw NULL db NPC_AARON, $0c, $0c, WEST - dw $0000 + dw NULL db $00 IshiharasHouseNPCS: ; 7773 (4:13773) @@ -41,7 +41,7 @@ IshiharasHouseNPCS: ; 7773 (4:13773) FightingClubEntranceNPCS: ; 7786 (4:13786) db NPC_CLERK1, $06, $02, SOUTH - dw $0000 + dw NULL db NPC_RONALD1, $08, $fe, SOUTH dw $685b db NPC_RONALD2, $fe, $08, NORTH @@ -52,17 +52,17 @@ FightingClubEntranceNPCS: ; 7786 (4:13786) FightingClubLobbyNPCS: ; 779f (4:1379f) db NPC_MAN1, $0c, $0e, WEST - dw $0000 + dw NULL db NPC_IMAKUNI, $12, $02, NORTH dw $5ceb db NPC_SPECS1, $12, $10, EAST - dw $0000 + dw NULL db NPC_BUTCH, $14, $10, WEST - dw $0000 + dw NULL db NPC_GRANNY1, $04, $10, WEST dw $5d98 db NPC_CLERK10, $06, $04, SOUTH - dw $0000 + dw NULL db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH dw Preload_GiftCenterClerk db $00 @@ -75,12 +75,12 @@ FightingClubNPCS: ; 77ca (4:137ca) db NPC_JESSICA, $12, $06, EAST dw $5ea5 db NPC_MITCH, $0a, $04, SOUTH - dw $0000 + dw NULL db $00 RockClubEntranceNPCS: ; 77e3 (4:137e3) db NPC_CLERK2, $06, $02, SOUTH - dw $0000 + dw NULL db NPC_RONALD1, $08, $fe, SOUTH dw $685b db NPC_RONALD2, $fe, $08, NORTH @@ -93,31 +93,31 @@ RockClubLobbyNPCS: ; 77fc (4:137fc) db NPC_CHRIS, $12, $08, WEST dw $5ee9 db NPC_MATTHEW, $06, $0e, EAST - dw $0000 + dw NULL db NPC_WOMAN1, $14, $12, NORTH - dw $0000 + dw NULL db NPC_CHAP1, $0e, $10, EAST - dw $0000 + dw NULL db NPC_LASS3, $10, $04, SOUTH dw $5fcb db NPC_CLERK10, $06, $04, SOUTH - dw $0000 + dw NULL db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH dw Preload_GiftCenterClerk db $00 RockClubNPCS: ; 7827 (4:13827) db NPC_RYAN, $14, $0e, EAST - dw $0000 + dw NULL db NPC_ANDREW, $06, $14, NORTH - dw $0000 + dw NULL db NPC_GENE, $0c, $06, NORTH - dw $0000 + dw NULL db $00 WaterClubEntranceNPCS: ; 783a (4:1383a) db NPC_CLERK3, $06, $02, SOUTH - dw $0000 + dw NULL db NPC_RONALD1, $08, $fe, SOUTH dw $685b db NPC_RONALD2, $fe, $08, NORTH @@ -128,35 +128,35 @@ WaterClubEntranceNPCS: ; 783a (4:1383a) WaterClubLobbyNPCS: ; 7853 (4:13853) db NPC_GAL1, $06, $0e, SOUTH - dw $0000 + dw NULL db NPC_LASS1, $10, $0a, SOUTH - dw $0000 + dw NULL db NPC_IMAKUNI, $12, $02, NORTH dw Preload_ImakuniInWaterClubLobby db NPC_MAN2, $04, $12, EAST dw Preload_Man2InWaterClubLobby db NPC_PAPPY2, $16, $10, NORTH - dw $0000 + dw NULL db NPC_CLERK10, $06, $04, SOUTH - dw $0000 + dw NULL db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH dw Preload_GiftCenterClerk db $00 WaterClubNPCS: ; 787e (4:1387e) db NPC_SARA, $06, $12, EAST - dw $0000 + dw NULL db NPC_AMANDA, $16, $14, WEST - dw $0000 + dw NULL db NPC_JOSHUA, $16, $08, SOUTH - dw $0000 + dw NULL db NPC_AMY, $16, $04, SOUTH dw Preload_Amy db $00 LightningClubEntranceNPCS: ; 7897 (4:13897) db NPC_CLERK4, $06, $02, SOUTH - dw $0000 + dw NULL db NPC_RONALD1, $08, $fe, SOUTH dw $685b db NPC_RONALD2, $fe, $08, NORTH @@ -167,33 +167,33 @@ LightningClubEntranceNPCS: ; 7897 (4:13897) LightningClubLobbyNPCS: ; 78b0 (4:138b0) db NPC_CHAP2, $12, $10, WEST - dw $0000 + dw NULL db NPC_IMAKUNI, $12, $02, NORTH dw $637b db NPC_LASS4, $08, $0c, SOUTH - dw $0000 + dw NULL db NPC_HOOD1, $14, $08, SOUTH - dw $0000 + dw NULL db NPC_CLERK10, $06, $04, SOUTH - dw $0000 + dw NULL db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH dw Preload_GiftCenterClerk db $00 LightningClubNPCS: ; 78d5 (4:138d5) db NPC_JENNIFER, $0e, $12, SOUTH - dw $0000 + dw NULL db NPC_NICHOLAS, $06, $0a, SOUTH - dw $0000 + dw NULL db NPC_BRANDON, $16, $0c, NORTH - dw $0000 + dw NULL db NPC_ISAAC, $0c, $04, NORTH dw $6494 db $00 GrassClubEntranceNPCS: ; 78ee (4:138ee) db NPC_CLERK5, $06, $02, SOUTH - dw $0000 + dw NULL db NPC_MICHAEL, $0e, $08, SOUTH dw $656a db NPC_RONALD1, $08, $fe, SOUTH @@ -206,31 +206,31 @@ GrassClubEntranceNPCS: ; 78ee (4:138ee) GrassClubLobbyNPCS: ; 790d (4:1390d) db NPC_BRITTANY, $0c, $0e, WEST - dw $0000 + dw NULL db NPC_LASS2, $12, $08, SOUTH - dw $0000 + dw NULL db NPC_GRANNY2, $04, $10, EAST - dw $0000 + dw NULL db NPC_GAL2, $14, $10, NORTH dw $66dc db NPC_CLERK10, $06, $04, SOUTH - dw $0000 + dw NULL db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH dw Preload_GiftCenterClerk db $00 GrassClubNPCS: ; 7932 (4:13932) db NPC_KRISTIN, $04, $0a, EAST - dw $0000 + dw NULL db NPC_HEATHER, $0e, $10, SOUTH - dw $0000 + dw NULL db NPC_NIKKI, $0c, $04, SOUTH dw $6796 db $00 PsychicClubEntranceNPCS: ; 7945 (4:13945) db NPC_CLERK6, $06, $02, SOUTH - dw $0000 + dw NULL db NPC_RONALD1, $08, $fe, SOUTH dw $685b db NPC_RONALD2, $fe, $08, NORTH @@ -238,31 +238,31 @@ PsychicClubEntranceNPCS: ; 7945 (4:13945) db NPC_RONALD3, $fe, $08, NORTH dw $6915 db NPC_LAD3, $0e, $04, SOUTH - dw $0000 + dw NULL db $00 PsychicClubLobbyNPCS: ; 7964 (4:13964) db NPC_ROBERT, $14, $08, NORTH - dw $0000 + dw NULL db NPC_PAPPY1, $04, $10, EAST - dw $0000 + dw NULL db NPC_RONALD1, $0c, $0a, EAST dw $69f7 db NPC_GAL3, $10, $0e, WEST - dw $0000 + dw NULL db NPC_CHAP4, $18, $10, SOUTH - dw $0000 + dw NULL db NPC_CLERK10, $06, $04, SOUTH - dw $0000 + dw NULL db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH dw Preload_GiftCenterClerk db $00 PsychicClubNPCS: ; 798f (4:1398f) db NPC_DANIEL, $08, $08, NORTH - dw $0000 + dw NULL db NPC_STEPHANIE, $16, $0c, EAST - dw $0000 + dw NULL db NPC_MURRAY2, $02, $02, WEST dw $6ad0 db NPC_MURRAY1, $0c, $06, SOUTH @@ -271,7 +271,7 @@ PsychicClubNPCS: ; 798f (4:1398f) ScienceClubEntranceNPCS: ; 79a8 (4:139a8) db NPC_CLERK7, $06, $02, SOUTH - dw $0000 + dw NULL db NPC_RONALD1, $08, $fe, SOUTH dw $685b db NPC_RONALD2, $fe, $08, NORTH @@ -282,17 +282,17 @@ ScienceClubEntranceNPCS: ; 79a8 (4:139a8) ScienceClubLobbyNPCS: ; 79c1 (4:139c1) db NPC_LAD1, $12, $12, NORTH - dw $0000 + dw NULL db NPC_IMAKUNI, $12, $02, NORTH dw $6b65 db NPC_MAN3, $04, $0e, WEST - dw $0000 + dw NULL db NPC_SPECS2, $0c, $0e, WEST - dw $0000 + dw NULL db NPC_SPECS3, $16, $08, SOUTH - dw $0000 + dw NULL db NPC_CLERK10, $06, $04, SOUTH - dw $0000 + dw NULL db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH dw Preload_GiftCenterClerk db $00 @@ -301,16 +301,16 @@ ScienceClubNPCS: ; 79ec (4:139ec) db NPC_JOSEPH, $08, $0a, SOUTH dw $6cc4 db NPC_DAVID, $14, $04, NORTH - dw $0000 + dw NULL db NPC_ERIK, $06, $12, SOUTH - dw $0000 + dw NULL db NPC_RICK, $04, $04, NORTH - dw $0000 + dw NULL db $00 FireClubEntranceNPCS: ; 7a05 (4:13a05) db NPC_CLERK8, $06, $02, SOUTH - dw $0000 + dw NULL db NPC_RONALD1, $08, $fe, SOUTH dw $685b db NPC_RONALD2, $fe, $08, NORTH @@ -325,24 +325,24 @@ FireClubLobbyNPCS: ; 7a1e (4:13a1e) db NPC_LAD2, $12, $06, EAST dw $6e25 db NPC_CHAP3, $06, $0a, NORTH - dw $0000 + dw NULL db NPC_MANIA, $14, $12, NORTH - dw $0000 + dw NULL db NPC_CLERK10, $06, $04, SOUTH - dw $0000 + dw NULL db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH dw Preload_GiftCenterClerk db $00 FireClubNPCS: ; 7a43 (4:13a43) db NPC_JOHN, $0c, $12, SOUTH - dw $0000 + dw NULL db NPC_ADAM, $08, $0e, SOUTH - dw $0000 + dw NULL db NPC_JONATHAN, $12, $0a, SOUTH - dw $0000 + dw NULL db NPC_KEN, $0e, $04, SOUTH - dw $0000 + dw NULL db $00 ChallengeHallEntranceNPCS: ; 7a5c (4:13a5c) @@ -366,7 +366,7 @@ ChallengeHallLobbyNPCS: ; 7a63 (4:13a63) db NPC_RONALD1, $08, $0c, SOUTH dw Preload_ChallengeHallLobbyRonald1 db NPC_CLERK10, $06, $04, SOUTH - dw $0000 + dw NULL db NPC_GIFT_CENTER_CLERK, $0a, $04, SOUTH dw Preload_GiftCenterClerk db $00 @@ -386,7 +386,7 @@ ChallengeHallNPCS: ; 7a9a (4:13a9a) PokemonDomeEntranceNPCS: ; 7ab9 (4:13ab9) db NPC_RONALD1, $0e, $12, SOUTH - dw $0000 + dw NULL db $00 PokemonDomeNPCS: ; 7ac0 (4:13ac0) @@ -404,15 +404,15 @@ PokemonDomeNPCS: ; 7ac0 (4:13ac0) HallOfHonorNPCS: ; 7adf (4:13adf) db NPC_LEGENDARY_CARD_TOP_LEFT, $0a, $08, SOUTH - dw $0000 + dw NULL db NPC_LEGENDARY_CARD_TOP_RIGHT, $0c, $08, SOUTH - dw $0000 + dw NULL db NPC_LEGENDARY_CARD_LEFT_SPARK, $08, $0a, SOUTH - dw $0000 + dw NULL db NPC_LEGENDARY_CARD_BOTTOM_LEFT, $0a, $0a, SOUTH - dw $0000 + dw NULL db NPC_LEGENDARY_CARD_BOTTOM_RIGHT, $0c, $0a, SOUTH - dw $0000 + dw NULL db NPC_LEGENDARY_CARD_RIGHT_SPARK, $0e, $0a, SOUTH - dw $0000 + dw NULL db $00 diff --git a/src/data/warps.asm b/src/data/warps.asm index cb34721..cba8053 100644 --- a/src/data/warps.asm +++ b/src/data/warps.asm @@ -1,5 +1,5 @@ WarpDataPointers: ; 1c099 (7:4099) - dw $0000 + dw NULL dw MasonLaboratoryWarpData dw DeckMachineRoomWarpData dw IshiharasHouseWarpData diff --git a/src/engine/bank01.asm b/src/engine/bank01.asm index 572109f..af902ac 100644 --- a/src/engine/bank01.asm +++ b/src/engine/bank01.asm @@ -509,7 +509,7 @@ OpenActivePokemonScreen: ; 4376 (1:4376) ; triggered by selecting the "Pkmn Power" item in the duel menu DuelMenu_PkmnPower: ; 438e (1:438e) - call $6431 + call Func_6431 jp c, DuelMainInterface call UseAttackOrPokemonPower jp DuelMainInterface @@ -1026,7 +1026,7 @@ EnergyDiscardCardListParameters: ; 46f3 (1:46f3) db 4 ; number of items selectable without scrolling db SYM_CURSOR_R ; cursor tile number db SYM_SPACE ; tile behind cursor - dw $0000 ; function pointer if non-0 + dw NULL ; function pointer if non-0 ; triggered by selecting the "Attack" item in the duel menu DuelMenu_Attack: ; 46fc (1:46fc) @@ -1167,28 +1167,28 @@ AttackMenuParameters: ; 47e4 (1:47e4) db 2 ; number of items db SYM_CURSOR_R ; cursor tile number db SYM_SPACE ; tile behind cursor - dw $0000 ; function pointer if non-0 + dw NULL ; function pointer if non-0 ; display the card page with id at wMovePageNumber of wLoadedCard1 -DisplayMovePage: ; $47ec (1:47ec) +DisplayMovePage: ; 47ec (1:47ec) ld a, [wMovePageNumber] ld hl, MovePageDisplayPointerTable jp JumpToFunctionInTable -MovePageDisplayPointerTable: ; $47f5 (1:47f5) +MovePageDisplayPointerTable: ; 47f5 (1:47f5) dw DisplayMovePage_Move1Page1 ; MOVEPAGE_MOVE1_1 dw DisplayMovePage_Move1Page2 ; MOVEPAGE_MOVE1_2 dw DisplayMovePage_Move2Page1 ; MOVEPAGE_MOVE2_1 dw DisplayMovePage_Move2Page2 ; MOVEPAGE_MOVE2_2 ; display MOVEPAGE_MOVE1_1 -DisplayMovePage_Move1Page1: ; $47fd (1:47fd) +DisplayMovePage_Move1Page1: ; 47fd (1:47fd) call DisplayCardPage_PokemonMove1Page1 jr SwitchMovePage ; display MOVEPAGE_MOVE1_2 if it exists. otherwise return in order ; to switch back to MOVEPAGE_MOVE1_1 and display it instead. -DisplayMovePage_Move1Page2: ; $4802 (1:4802) +DisplayMovePage_Move1Page2: ; 4802 (1:4802) ld hl, wLoadedCard1Move1Description + 2 ld a, [hli] or [hl] @@ -1197,13 +1197,13 @@ DisplayMovePage_Move1Page2: ; $4802 (1:4802) jr SwitchMovePage ; display MOVEPAGE_MOVE2_1 -DisplayMovePage_Move2Page1: ; $480d (1:480d) +DisplayMovePage_Move2Page1: ; 480d (1:480d) call DisplayCardPage_PokemonMove2Page1 jr SwitchMovePage ; display MOVEPAGE_MOVE2_2 if it exists. otherwise return in order ; to switch back to MOVEPAGE_MOVE2_1 and display it instead. -DisplayMovePage_Move2Page2: ; $4812 (1:4812) +DisplayMovePage_Move2Page2: ; 4812 (1:4812) ld hl, wLoadedCard1Move2Description + 2 ld a, [hli] or [hl] @@ -1213,7 +1213,7 @@ DisplayMovePage_Move2Page2: ; $4812 (1:4812) ; switch to MOVEPAGE_MOVE*_2 if in MOVEPAGE_MOVE*_1 and vice versa. ; sets the next move page to switch to if Right or Left are pressed. -SwitchMovePage: ; $481b (1:481b) +SwitchMovePage: ; 481b (1:481b) ld hl, wMovePageNumber ld a, $01 xor [hl] @@ -2148,7 +2148,7 @@ NoBasicPokemonCardListParameters: ; 4e37 (1:4e37) db 7 ; number of items selectable without scrolling db SYM_CURSOR_R ; cursor tile number db SYM_SPACE ; tile behind cursor - dw $0000 ; function pointer if non-0 + dw NULL ; function pointer if non-0 ; used only during the practice duel with Sam. ; displays the list with the player's cards in hand, and the player's name above the list. @@ -2631,7 +2631,7 @@ DoPracticeDuelAction: ; 51e7 (1:51e7) jp JumpToFunctionInTable PracticeDuelActionTable: ; 51f8 (1:51f8) - dw $0000 + dw NULL dw PracticeDuel_DrawSevenCards dw PracticeDuel_PlayGoldeen dw PracticeDuel_PutStaryuInBench @@ -3451,7 +3451,7 @@ ItemSelectionMenuParameters: ; 5708 (1:5708) db 2 ; number of items db SYM_CURSOR_R ; cursor tile number db SYM_SPACE ; tile behind cursor - dw $0000 ; function pointer if non-0 + dw NULL ; function pointer if non-0 CardListParameters: ; 5710 (1:5710) db 1, 3 ; cursor x, cursor y @@ -5661,7 +5661,10 @@ PrintPlayAreaCardAttachedEnergies: ; 63e6 (1:63e6) ret ; 0x6423 - INCROM $6423, $6510 + INCROM $6423, $6431 + +Func_6431: ; 6431 (1:6431) + INCROM $6431, $6510 ; display the screen that prompts the player to use the selected card's ; Pokemon Power. Includes the card's information above, and the Pokemon Power's @@ -6803,7 +6806,7 @@ HandleBetweenTurnsEvents: ; 6baf (1:6baf) .asm_6c3a call DiscardAttachedDefenders call SwapTurn - call $6e4c + call Func_6e4c ret ; discard any PLUSPOWER attached to the turn holder's arena and/or bench Pokemon @@ -7128,6 +7131,9 @@ ApplyStatusConditionToArenaPokemon: ; 6e38 (1:6e38) Func_6e49: ; 6e49 (1:6e49) call HandleDestinyBondSubstatus + ; fallthrough + +Func_6e4c: ; 6e4c (1:6e4c) call ClearDamageReductionSubstatus2OfKnockedOutPokemon xor a ld [wcce8], a @@ -7778,12 +7784,12 @@ _TossCoin: ; 71ad (1:71ad) ld a, [wcd9e] or a jr z, .asm_7236 - call $7324 + call Func_7324 jr .asm_723c .asm_7236 call WaitForWideTextBoxInput - call $72ff + call Func_72ff .asm_723c call Func_3b21 @@ -7802,7 +7808,7 @@ _TossCoin: ; 71ad (1:71ad) or a jr z, .asm_725e ld a, e - call $7310 + call Func_7310 ld e, a jr .asm_726c @@ -7813,7 +7819,7 @@ _TossCoin: ; 71ad (1:71ad) pop de jr c, .asm_725e ld a, e - call $72ff + call Func_72ff .asm_726c ld b, $5c @@ -7879,7 +7885,7 @@ _TossCoin: ; 71ad (1:71ad) ld hl, wcd9c cp [hl] call z, WaitForWideTextBoxInput - call $7324 + call Func_7324 ld a, [wcd9c] ld hl, wCoinTossNumHeads or [hl] @@ -7889,7 +7895,7 @@ _TossCoin: ; 71ad (1:71ad) .asm_72dc call WaitForWideTextBoxInput - call $72ff + call Func_72ff .asm_72e2 call Func_3b31 @@ -7922,13 +7928,15 @@ Func_7310: ; 7310 (1:7310) ldh [hff96], a ld a, [wDuelType] cp DUELTYPE_LINK - jr z, .asm_7338 + jr z, Func_7324.asm_7338 .asm_7319 call DoFrame call CheckAnyAnimationPlaying jr c, .asm_7319 ldh a, [hff96] ret + +Func_7324: ; 7324 (1:7324) ldh [hff96], a ld a, [wDuelType] cp DUELTYPE_LINK @@ -8042,7 +8050,7 @@ Func_73d8: ; 73d8 (1:73d8) ld [hli], a ld [hl], a .asm_73ec - ld hl, $7408 + ld hl, Data_7408 call PlaceTextItems call DrawDuelistPortraitsAndNames ld a, [wOpponentDeckID] @@ -8052,8 +8060,8 @@ Func_73d8: ; 73d8 (1:73d8) lb bc, 15, 10 call WriteTwoByteNumberInTxSymbolFormat ret -; 0x7408 +Data_7408: ; 7408 (1:7408) INCROM $7408, $7415 Func_7415: ; 7415 (1:7415) diff --git a/src/engine/bank02.asm b/src/engine/bank02.asm index 1e6179b..c72af73 100644 --- a/src/engine/bank02.asm +++ b/src/engine/bank02.asm @@ -1379,8 +1379,8 @@ Func_8764: ; 8764 (2:4764) call LoadCursorTile ; reset ce5c and ce56 xor a - ld [$ce5c], a - ld [$ce56], a + ld [wce5c], a + ld [wce56], a ; draw play area screen for the turn player ldh a, [hWhoseTurn] @@ -1389,13 +1389,13 @@ Func_8764: ; 8764 (2:4764) call DrawYourOrOppPlayAreaScreen .swap - ld a, [$ce56] + ld a, [wce56] or a jr z, .draw_menu ; if ce56 != 0, swap turn call SwapTurn xor a - ld [$ce56], a + ld [wce56], a .draw_menu xor a @@ -1430,7 +1430,7 @@ Func_8764: ; 8764 (2:4764) ld l, a call DrawYourOrOppPlayAreaScreen xor a - ld [$ce56], a + ld [wce56], a .text call DrawWideTextBox @@ -1482,7 +1482,7 @@ PlayAreaMenuParameters: ; 8811 (2:4811) db 2 ; number of items db SYM_CURSOR_R ; cursor tile number db SYM_SPACE ; tile behind cursor - dw $0000 ; function pointer if non-0 + dw NULL ; function pointer if non-0 Func_8819: ; 8819 (2:4819) ld a, [wPrizeCardCursorPosition] @@ -1506,7 +1506,7 @@ Func_8819: ; 8819 (2:4819) ld a, c add $40 - ld [$ce5c], a + ld [wce5c], a ld a, c add DUELVARS_PRIZE_CARDS call GetTurnDuelistVariable @@ -1524,7 +1524,7 @@ Func_8849: ; 8849 (2:4849) call CreateDeckCardList ret c ld a, %01111111 - ld [$ce5c], a + ld [wce5c], a ld a, [wDuelTempList] ; fallthrough @@ -1535,11 +1535,11 @@ Func_8849: ; 8849 (2:4849) ; with upper bit set if turn was swapped Func_8855: ; 8855 (2:4855) ld b, a - ld a, [$ce5c] + ld a, [wce5c] or a jr nz, .display ld a, b - ld [$ce5c], a + ld [wce5c], a .display ld a, b call LoadCardDataToBuffer1_FromDeckIndex @@ -1550,15 +1550,15 @@ Func_8855: ; 8855 (2:4855) pop af ; if ce56 != 0, swap turn - ld a, [$ce56] + ld a, [wce56] or a jr z, .dont_swap call SwapTurn - ld a, [$ce5c] + ld a, [wce5c] or %10000000 ret .dont_swap - ld a, [$ce5c] + ld a, [wce5c] ret Func_8883: ; 8883 (2:4883) @@ -1597,7 +1597,7 @@ Func_8883: ; 8883 (2:4883) call SwapTurn ld a, $01 - ld [$ce56], a + ld [wce56], a jp Func_8764.loop_2 Func_8764_TransitionTable: ; 88c2 (2:48c2) @@ -1866,13 +1866,13 @@ Func_8cd4: ; 8cd4 (2:4cd4) Func_8cf9: ; 8cf9 (2:4cf9) call EnableSRAM xor a - ld hl, $b703 + ld hl, sb703 ld [hli], a inc a ld [hli], a ld [hli], a ld [hl], a - ld [$b701], a + ld [sb701], a call DisableSRAM Func_8d0b: ; 8d0b (2:4d0b) ld hl, Unknown_8d15 @@ -2106,7 +2106,7 @@ Func_8f05: ; 8f05 (2:4f05) ret Func_8f38: ; 8f38 (2:4f38) - ld hl, $b701 + ld hl, sb701 call EnableSRAM ld a, [hli] ld h, [hl] @@ -2127,7 +2127,7 @@ Func_8f38: ; 8f38 (2:4f38) inc hl ld [hl], $20 inc hl - ld de, $c592 + ld de, wc592 ld a, [de] inc de ld [hli], a @@ -2138,7 +2138,7 @@ Func_8f38: ; 8f38 (2:4f38) ld [hli], a xor a ld [hl], a - ld hl, $b701 + ld hl, sb701 call EnableSRAM ld e, [hl] inc hl @@ -2447,17 +2447,17 @@ Func_9152: ; 9152 (2:5152) Func_9168: ; 9168 (2:5168) ld [hffb5], a call Func_8d56 - ld de, $0000 - ld bc, $1404 + lb de, 0, 0 + lb bc, 20, 4 call DrawRegularTextBox - ld de, $0003 - ld bc, $1404 + lb de, 0, 3 + lb bc, 20, 4 call DrawRegularTextBox - ld de, $0006 - ld bc, $1404 + lb de, 0, 6 + lb bc, 20, 4 call DrawRegularTextBox - ld de, $0009 - ld bc, $1404 + lb de, 0, 9 + lb bc, 20, 4 call DrawRegularTextBox ld hl, Unknown_9242 call PlaceTextItems @@ -2709,13 +2709,19 @@ CalculateOnesAndTensDigits: ; 98a6 (2:58a6) pop af ret - INCROM $98c7, $9e41 + INCROM $98c7, $9a6d + +Func_9a6d: ; 9a6d (2:5a6d) + INCROM $9a6d, $9e41 Func_9e41: ; 9e41 (2:5e41) INCROM $9e41, $a288 Func_a288: ; a288 (2:6288) - INCROM $a288, $b177 + INCROM $a288, $adfe + +Func_adfe: ; adfe (2:6dfe) + INCROM $adfe, $b177 Func_b177: ; b177 (2:7177) INCROM $b177, $b19d @@ -2728,20 +2734,20 @@ Func_b19d: ; b19d (2:719d) ld [hl], e inc hl ld [hl], d - call $7379 + call Func_b379 ld a, $3c ld [wd0a5], a xor a .asm_b1b3 - ld hl, $76fb - call $5a6d - call $7704 - call $7545 + ld hl, Unknown_b6fb + call Func_9a6d + call Func_b704 + call Func_b545 ldtx hl, PleaseSelectDeckText call DrawWideTextBox_PrintText ld de, $0224 ; PleaseSelectDeckText? - call $7285 - call $729f + call Func_b285 + call Func_b29f jr c, .asm_b1b3 cp $ff ret z @@ -2751,15 +2757,16 @@ Func_b19d: ; b19d (2:719d) ld [wd088], a call ResetCheckMenuCursorPositionAndBlink call DrawWideTextBox - ld hl, $7274 + ld hl, Unknown_b274 call PlaceTextItems +.asm_b1e7 call DoFrame call HandleCheckMenuInput - jp nc, $71e7 + jp nc, .asm_b1e7 cp $ff jr nz, .asm_b1fa ld a, [wd086] - jp $71b3 + jp .asm_b1b3 .asm_b1fa ld a, [wCheckMenuCursorYPosition] @@ -2768,66 +2775,108 @@ Func_b19d: ; b19d (2:719d) add [hl] or a jr nz, .asm_b22c - call $735b + call Func_b35b jr nc, .asm_b216 - call $7592 + call Func_b592 ld a, [wd086] - jp c, $71b3 + jp c, .asm_b1b3 jr .asm_b25e .asm_b216 - ld hl, $0272 + ldtx hl, OKIfFileDeletedText call YesOrNoMenuWithText ld a, [wd086] jr c, .asm_b1b3 - call $7592 + call Func_b592 ld a, [wd086] - jp c, $71b3 + jp c, .asm_b1b3 jr .asm_b25e .asm_b22c cp $1 jr nz, .asm_b24c - call $735b + call Func_b35b jr c, .asm_b240 - call $76ca + call Func_b6ca ld a, [wd086] - jp c, $71b3 + jp c, .asm_b1b3 jr .asm_b25e .asm_b240 ld hl, WaitForVBlank call DrawWideTextBox_WaitForInput ld a, [wd086] - jp $71b3 + jp .asm_b1b3 .asm_b24c cp $2 jr nz, .asm_b273 - call $735b + call Func_b35b jr c, .asm_b240 - call $77c6 + call Func_b7c6 ld a, [wd086] - jp nc, $71b3 + jp nc, .asm_b1b3 .asm_b25e ld a, [wd087] ld [wcea1], a - call $7379 - call $7704 - call $7545 + call Func_b379 + call Func_b704 + call Func_b545 ld a, [wd086] - jp $71b3 + jp .asm_b1b3 .asm_b273 ret -; 0xb274 - INCROM $b274, $ba04 +Unknown_b274: ; b274 (2:7274) + INCROM $b274, $b285 + +Func_b285: ; b285 (2:7285) + INCROM $b285, $b29f + +Func_b29f: ; b29f (2:729f) + INCROM $b29f, $b35b + +Func_b35b: ; b35b (2:735b) + INCROM $b35b, $b379 + +Func_b379: ; b379 (2:7379) + INCROM $b379, $b3fe + +Unknown_b3fe: ; b3fe (2:73fe) + INCROM $b3fe, $b545 + +Func_b545: ; b545 (2:7545) + INCROM $b545, $b592 + +Func_b592: ; b592 (2:7592) + INCROM $b592, $b625 + +Func_b625: ; b625 (2:7625) + INCROM $b625, $b644 + +Func_b644: ; b644 (2:7644) + INCROM $b644, $b653 + +Func_b653: ; b653 (2:7653) + INCROM $b653, $b6ca + +Func_b6ca: ; b6ca (2:76ca) + INCROM $b6ca, $b6fb + +Unknown_b6fb: ; b6fb (2:76fb) + INCROM $b6fb, $b704 + +Func_b704: ; b704 (2:7704) + INCROM $b704, $b7c6 + +Func_b7c6: ; b7c6 (2:77c6) + INCROM $b7c6, $ba04 Func_ba04: ; ba04 (2:7a04) ld a, [wd0a9] - ld hl, $7b83 + ld hl, Data_bb83 sla a ld c, a ld b, $0 @@ -2840,17 +2889,20 @@ Func_ba04: ; ba04 (2:7a04) ld [de], a xor a ld [wcea1], a - call $7b97 + call Func_bb97 ld a, $5 ld [wd0a5], a xor a - ld hl, $7b6e + ; fallthrough + +Func_ba25: ; ba25 (2:7a25) + ld hl, Func_bb6e call InitializeMenuParameters ldtx hl, PleaseSelectDeckText call DrawWideTextBox_PrintText ld a, $5 ld [wNamingScreenKeyboardHeight], a - ld hl, $73fe + ld hl, Unknown_b3fe ld d, h ld a, l ld hl, wcece @@ -2882,7 +2934,7 @@ Func_ba04: ; ba04 (2:7a04) ld b, $0 ld hl, wd00d add hl, bc - call $7653 + call Func_b653 ld a, [hli] ld h, [hl] ld l, a @@ -2893,19 +2945,19 @@ Func_ba04: ; ba04 (2:7a04) ld e, l ld a, [hl] pop hl - call $7644 + call Func_b644 or a jr z, .asm_ba40 ld a, $1 call PlaySFXConfirmOrCancel - call $7653 + call Func_b653 call Func_8e1f - call $7644 + call Func_b644 ld a, [wd087] ld [wcea1], a - call $7b97 + call Func_bb97 ld a, [wd086] - jp $7a25 + jp Func_ba25 .asm_baa3 call DrawCursor2 @@ -2915,21 +2967,22 @@ Func_ba04: ; ba04 (2:7a04) ld [wd086], a ldh a, [hCurMenuItem] cp $ff - jp z, $7b0d + jp z, .asm_bb0d ld [wd088], a call ResetCheckMenuCursorPositionAndBlink xor a ld [wce5e], a call DrawWideTextBox - ld hl, $7b76 + ld hl, Data_bb76 call PlaceTextItems +.asm_bacc call DoFrame - call $46ac - jp nc, $7acc + call HandleCheckMenuInput_YourOrOppPlayArea + jp nc, .asm_bacc cp $ff jr nz, .asm_badf ld a, [wd086] - jp $7a25 + jp Func_ba25 .asm_badf ld a, [wCheckMenuCursorYPosition] @@ -2938,20 +2991,21 @@ Func_ba04: ; ba04 (2:7a04) add [hl] or a jr nz, .asm_bb09 - call $7653 - call $77c6 - call $7644 + call Func_b653 + call Func_b7c6 + call Func_b644 ld a, [wd086] - jp nc, $7a25 + jp nc, Func_ba25 ld a, [wd087] ld [wcea1], a - call $7b97 + call Func_bb97 ld a, [wd086] - jp $7a25 + jp Func_ba25 .asm_bb09 cp $1 jr nz, .asm_bb12 +.asm_bb0d xor a ld [wd0a4], a ret @@ -2979,7 +3033,7 @@ Func_ba04: ; ba04 (2:7a04) ld a, [hl] ld [bc], a pop hl - call $7653 + call Func_b653 ld a, [hli] ld h, [hl] ld l, a @@ -2990,20 +3044,29 @@ Func_ba04: ; ba04 (2:7a04) ld e, l ld a, [hl] pop hl - call $7644 + call Func_b644 or a - jp z, $7a40 + jp z, .asm_ba40 ld a, $1 call PlaySFXConfirmOrCancel - call $7653 + call Func_b653 xor a - call $6dfe - call $7644 + call Func_adfe + call Func_b644 ld a, [wd087] ld [wcea1], a - call $7b97 + call Func_bb97 ld a, [wd086] - jp $7a25 -; 0xbb6e + jp Func_ba25 + +Func_bb6e: ; bb6e (2:7b6e) + INCROM $bb6e, $bb76 + +Data_bb76: ; bb76 (2:7b76) + INCROM $bb76, $bb83 + +Data_bb83: ; bb83 (2:7b83) + INCROM $bb83, $bb97 - INCROM $bb6e, $c000 +Func_bb97: ; bb97 (2:7b97) + INCROM $bb97, $c000 diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index b162dc6..f779482 100755 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -468,7 +468,16 @@ Func_c36a: ; c36a (3:436a) ret ; 0xc37a - INCROM $c37a, $c41c + INCROM $c37a, $c38f + +Func_c38f: ; c38f (3:438f) + INCROM $c38f, $c3ca + +Func_c3ca: ; c3ca (3:43ca) + INCROM $c3ca, $c3ee + +Func_c3ee: ; c3ee (3:43ee) + INCROM $c3ee, $c41c Func_c41c: ; c41c (3:441c) ld a, [wd332] @@ -1068,7 +1077,7 @@ PC_c7ea: ; c7ea (3:47ea) call DoFrameIfLCDEnabled ldtx hl, TurnedPCOnText call PrintScrollableText_NoTextBoxLabel - call $484e + call Func_c84e .asm_c801 ld a, $1 call Func_c29b @@ -1085,9 +1094,9 @@ PC_c7ea: ; c7ea (3:47ea) jr z, .asm_c82f call Func_c2a3 ld a, [wd0b9] - ld hl, $4846 + ld hl, Unknown_c846 call JumpToFunctionInTable - ld hl, $484e + ld hl, Func_c84e call Func_c32b jr .asm_c801 .asm_c82f @@ -1100,9 +1109,12 @@ PC_c7ea: ; c7ea (3:47ea) ld [wd112], a call Func_39fc ret -; 0xc846 - INCROM $c846, $c891 +Unknown_c846: ; c846 (3:4846) + INCROM $c846, $c84e + +Func_c84e: ; c84e (3:484e) + INCROM $c84e, $c891 Func_c891: ; c891 (3:4891) push hl @@ -1158,7 +1170,7 @@ Func_c8ba: ; c8ba (3:48ba) call Func_c241 call Func_c915 call DoFrameIfLCDEnabled - call $2c62 + call PrintScrollableText_WithTextBoxLabel ret Func_c8ed: ; c8ed (3:48ed) @@ -1198,7 +1210,7 @@ Func_c915: ; c915 (3:4915) ld de, $000c ld bc, $1406 call AdjustCoordinatesForBGScroll - call $43ca + call Func_c3ca pop de pop bc ret @@ -2546,11 +2558,11 @@ Func_d103: ; d103 (3:5103) ld [wTempNPC], a call FindLoadedNPC jr c, .asm_d119 - call $54d1 + call ScriptCommand_JumpIfFlagNonzero2.passTryJump jr .asm_d11c .asm_d119 - call $54e6 + call ScriptCommand_JumpIfFlagZero2.fail .asm_d11c pop af @@ -2643,7 +2655,7 @@ Func_d1b3: ; d1b3 (3:51b3) ; fallthrough .asm_d1c3 - ld hl, $51dc + ld hl, Unknown_d1dc asm_d1c6: ld e, a add a @@ -2659,6 +2671,7 @@ asm_d1c6: ld [wTxRam2 + 1], a jp IncreaseScriptPointerBy1 +Unknown_d1dc: ; d1dc (3:51dc) INCROM $d1dc, $d209 Func_d209: ; d209 (3:5209) @@ -2748,7 +2761,7 @@ ScriptCommand_ChooseStarterDeckMultichoice: ; d271 (3:5271) tx Text03fd ; text for textbox under menu dw MultichoiceTextbox_ConfigTable_ChooseDeckStarterDeck ; location of table configuration in bank 4 db $00 ; the value to return when b is pressed - dw $d693 ; ram location to return result into + dw wd693 ; ram location to return result into dw .text_entries ; location of table containing text entries .text_entries @@ -3493,7 +3506,32 @@ Script_d932: ; d932 (3:5932) quit_script_fully ; 0xd93f - INCROM $d93f, $dadd +Script_d93f: ; d93f (3:593f) + INCROM $d93f, $d995 + +Script_d995: ; d995 (3:5995) + INCROM $d995, $d9c2 + +Script_d9c2: ; d9c2 (3:59c2) + INCROM $d9c2, $d9ef + +Script_d9ef: ; d9ef (3:59ef) + INCROM $d9ef, $da1c + +Script_da1c: ; da1c (3:5a1c) + INCROM $da1c, $da49 + +Script_da49: ; da49 (3:5a49) + INCROM $da49, $da76 + +Script_da76: ; da76 (3:5a76) + INCROM $da76, $daa3 + +Script_daa3: ; daa3 (3:5aa3) + INCROM $daa3, $dad0 + +Script_dad0: ; dad0 (3:5ad0) + INCROM $dad0, $dadd Preload_NikkiInIshiharasHouse: ; dadd (3:5add) get_flag_value EVENT_FLAG_35 @@ -4637,7 +4675,7 @@ TryFirstRonaldEncounter: ; e813 (3:6813) TryFirstRonaldFight: ; e822 (3:6822) ld a, NPC_RONALD2 - ld [$d3ab], a + ld [wTempNPC], a call FindLoadedNPC ret c get_flag_value EVENT_FLAG_4C @@ -4648,7 +4686,7 @@ TryFirstRonaldFight: ; e822 (3:6822) TrySecondRonaldFight: ; e837 (3:6837) ld a, NPC_RONALD3 - ld [$d3ab], a + ld [wTempNPC], a call FindLoadedNPC ret c get_flag_value EVENT_FLAG_4D @@ -4708,9 +4746,10 @@ Script_FirstRonaldFight: ; e8c0 (3:68c0) do_frames $3c move_active_npc NPCMovement_e90d print_text_string Text064a - jump_if_player_coords_match $08, $02, $68d6 + jump_if_player_coords_match $08, $02, .ows_e8d6 set_player_direction WEST move_player WEST, 1 +.ows_e8d6 set_player_direction SOUTH move_player SOUTH, 1 move_player SOUTH, 1 @@ -5208,7 +5247,7 @@ ChallengeHallLobbyLoadMap: ; f088 (3:7088) ld a, $02 ld [wTempNPC], a call FindLoadedNPC - ld bc, $7166 + ld bc, Script_f166 jp SetNextNPCAndScript Script_Pappy3: ; f09c (3:709c) @@ -5316,7 +5355,10 @@ Unknown_f146: ; f146 (3:7146) INCROM $f146, $f156 Unknown_f156: ; f156 (3:7156) - INCROM $f156, $f239 + INCROM $f156, $f166 + +Script_f166: ; f166 (3:7166) + INCROM $f166, $f239 ChallengeHallAfterDuel: ; f239 (3:7239) ld c, $00 @@ -5808,11 +5850,11 @@ Func_f580: ; f580 (3:7580) ld a, d call Random ld c, a - call $75cc + call Func_f5cc jr c, .asm_f598 - call $75d4 + call Func_f5d4 ld b, $0 - ld hl, $75b3 + ld hl, Unknown_f5b3 add hl, bc ld a, [hl] @@ -5820,16 +5862,22 @@ Func_f580: ; f580 (3:7580) ld [wTempNPC], a ld [wd696], a ret -; 0xf5b3 - INCROM $f5b3, $f5db +Unknown_f5b3: ; f5b3 (3:75b3) + INCROM $f5b3, $f5cc + +Func_f5cc: ; f5cc (3:75cc) + INCROM $f5cc, $f5d4 + +Func_f5d4: ; f5d4 (3:75d4) + INCROM $f5d4, $f5db Func_f5db: ; f5db (3:75db) xor a - ld [$d698], a - ld [$d699], a - ld [$d69a], a - ld [$d69b], a + ld [wd698], a + ld [wd699], a + ld [wd69a], a + ld [wd69b], a ret ; 0xf5e9 @@ -5848,7 +5896,10 @@ Script_f631: ; f631 (3:7631) ret .ows_f63c - INCROM $f63c, $f71f + INCROM $f63c, $f6af + +Script_f6af: ; f6af (3:76af) + INCROM $f6af, $f71f Script_Courtney: ; f71f (3:771f) INCROM $f71f, $f72a @@ -5868,6 +5919,7 @@ HallOfHonorLoadMap: ; fbdb (3:7bdb) ret ; 0xfbe1 +Script_fbe1: ; fbe1 (3:7be1) INCROM $fbe1, $fbf1 Script_fbf1: ; fbf1 (3:7bf1) diff --git a/src/engine/bank04.asm b/src/engine/bank04.asm index dc148ad..68570c4 100644 --- a/src/engine/bank04.asm +++ b/src/engine/bank04.asm @@ -28,13 +28,13 @@ Func_10031: ; 10031 (4:4031) push af ld a, $1 call BankswitchSRAM - call $4cbb + call Func_10cbb call DisableSRAM - call $4b28 + call Func_10b28 call FlushAllPalettes call EnableLCD call DoFrameIfLCDEnabled - call $4cea + call Func_10cea call FlushAllPalettes pop af call BankswitchSRAM @@ -45,7 +45,13 @@ Func_10059: ; 10059 (4:4059) INCROM $10059, $100a2 Func_100a2: ; 100a2 (4:40a2) - INCROM $100a2, $1029e + INCROM $100a2, $1010c + +Func_1010c: ; 1010c (4:410c) + INCROM $1010c, $10197 + +Func_10197: ; 10197 (4:4197) + INCROM $10197, $1029e Medal_1029e: ; 1029e (4:429e) sub $8 @@ -59,10 +65,10 @@ Medal_1029e: ; 1029e (4:429e) call PlaySong farcall Func_70000 call DisableLCD - call $4000 + call Func_10000 ld a, $fa ld [wd114], a - call $410c + call Func_1010c pop bc ld a, c add a @@ -74,7 +80,7 @@ Medal_1029e: ; 1029e (4:429e) ld [wTxRam2], a ld a, [hl] ld [wTxRam2 + 1], a - call $4031 + call Func_10031 ld a, MUSIC_MEDAL call PlaySong ld a, $ff @@ -86,7 +92,7 @@ Medal_1029e: ; 1029e (4:429e) ld [wd116], a and $f jr nz, .asm_102e2 - call $4197 + call Func_10197 ld a, [wd116] cp $e0 jr nz, .asm_102e2 @@ -107,25 +113,25 @@ BoosterPack_1031b: ; 1031b (4:431b) push af push bc call DisableLCD - call $4000 + call Func_10000 xor a ld [wTextBoxFrameType], a pop bc push bc ld b, $0 - ld hl, $43a5 + ld hl, Unknown_103a5 add hl, bc ld a, [hl] ld c, a add a add a ld c, a - ld hl, $43c2 + ld hl, Unknown_103c2 add hl, bc ld a, [hli] push hl ld bc, $0600 - call $70ca + call Func_130ca pop hl ld a, [hli] ld [wTxRam3], a @@ -135,7 +141,7 @@ BoosterPack_1031b: ; 1031b (4:431b) ld [wTxRam2], a ld a, [hl] ld [wTxRam2 + 1], a - call $4031 + call Func_10031 call PauseSong ld a, MUSIC_BOOSTER_PACK call PlaySong @@ -166,9 +172,12 @@ BoosterPack_1031b: ; 1031b (4:431b) pop af ld [wd291], a ret -; 0x103a5 - INCROM $103a5, $103d2 +Unknown_103a5: ; 103a5 (4:43a5) + INCROM $103a5, $103c2 + +Unknown_103c2: ; 103c2 (4:43c2) + INCROM $103c2, $103d2 Func_103d2: ; 103d2 (4:43d2) INCROM $103d2, $103d3 @@ -177,7 +186,7 @@ Duel_Init: ; 103d3 (4:43d3) ld a, [wd291] push af call DisableLCD - call $4000 + call Func_10000 ld a, $4 ld [wTextBoxFrameType], a lb de, 0, 12 @@ -188,7 +197,7 @@ Duel_Init: ; 103d3 (4:43d3) add a ld c, a ld b, $0 - ld hl, $445b + ld hl, Unknown_1045b add hl, bc ld a, [hli] ld [wTxRam2], a @@ -199,8 +208,8 @@ Duel_Init: ; 103d3 (4:43d3) ld [wTxRam2_b], a ld a, [wOpponentName + 1] ld [wTxRam2_b + 1], a - ld hl, $4451 - call $51b3 ; LoadDuelistName + ld hl, Unknown_10451 + call Func_111b3 ; LoadDuelistName pop hl ld a, [hli] ld [wTxRam2], a @@ -209,8 +218,8 @@ Duel_Init: ; 103d3 (4:43d3) ld [wTxRam2 + 1], a or c jr z, .asm_10425 - ld hl, $4456 - call $51b3 ; LoadDeckName + ld hl, Unknown_10456 + call Func_111b3 ; LoadDeckName .asm_10425 ld bc, $0703 @@ -218,7 +227,7 @@ Duel_Init: ; 103d3 (4:43d3) call Func_3e2a ; LoadDuelistPortrait ld a, [wMatchStartTheme] call PlaySong - call $4031 + call Func_10031 call DoFrameIfLCDEnabled lb bc, $2f, $1d ; cursor tile, tile behind cursor lb de, 18, 17 ; x, y @@ -229,9 +238,15 @@ Duel_Init: ; 103d3 (4:43d3) pop af ld [wd291], a ret -; 0x10451 - INCROM $10451, $10548 +Unknown_10451: ; 10451 (4:4451) + INCROM $10451, $10456 + +Unknown_10456: ; 10456 (4:4456) + INCROM $10456, $1045b + +Unknown_1045b: ; 1045b (4:445b) + INCROM $1045b, $10548 Func_10548: ; 10548 (4:4548) INCROM $10548, $10756 @@ -284,7 +299,10 @@ Func_10ab4: ; 10ab4 (4:4ab4) INCROM $10ab4, $10af9 Func_10af9: ; 10af9 (4:4af9) - INCROM $10af9, $10c96 + INCROM $10af9, $10b28 + +Func_10b28: ; 10b28 (4:4b28) + INCROM $10b28, $10c96 Func_10c96: ; 10c96 (4:4c96) ldh a, [hBankSRAM] @@ -292,13 +310,13 @@ Func_10c96: ; 10c96 (4:4c96) push bc ld a, $1 call BankswitchSRAM - call $4cbb + call Func_10cbb call Func_10ab4 pop bc ld a, c or a jr nz, .asm_10cb0 - call $4cea + call Func_10cea call Func_10af9 .asm_10cb0 @@ -307,15 +325,18 @@ Func_10c96: ; 10c96 (4:4c96) call BankswitchSRAM call DisableSRAM ret -; 0x10cbb - INCROM $10cbb, $10dba +Func_10cbb: ; 10cbb (4:4cbb) + INCROM $10cbb, $10cea + +Func_10cea: ; 10cea (4:4cea) + INCROM $10cea, $10dba Func_10dba: ; 10dba (4:4dba) ld a, $1 farcall Func_c29b ld a, [wd0ba] - ld hl, $4e17 + ld hl, Unknown_10e17 farcall Func_111e9 .asm_10dca call DoFrameIfLCDEnabled @@ -331,15 +352,18 @@ Func_10dba: ; 10dba (4:4dba) .asm_10ddd ld [wd10e], a push af - ld hl, $4df0 + ld hl, Unknown_10df0 call JumpToFunctionInTable farcall CloseTextBox call DoFrameIfLCDEnabled pop af ret -; 0x10df0 - INCROM $10df0, $10e28 +Unknown_10df0: ; 10df0 (4:4df0) + INCROM $10df0, $10e17 + +Unknown_10e17: ; 10e17 (4:4e17) + INCROM $10e17, $10e28 Func_10e28: ; 10e28 (4:4e28) INCROM $10e28, $10e55 @@ -788,12 +812,15 @@ Func_11184: ; 11184 (4:5184) ld hl, wd341 dec [hl] ret -; 0x111b3 +Func_111b3: ; 111b3 (4:51b3) INCROM $111b3, $111e9 Func_111e9: ; 111e9 (4:51e9) - INCROM $111e9, $1124d + INCROM $111e9, $11238 + +Func_11238: ; 11238 (4:5238) + INCROM $11238, $1124d Func_1124d: ; 1124d (4:524d) INCROM $1124d, $11320 @@ -830,7 +857,7 @@ Func_1157c: ; 1157c (4:557c) ld [wd32e], a .asm_1159f - call $5238 + call Func_11238 ret Func_115a3: ; 115a3 (4:55a3) @@ -1202,7 +1229,7 @@ MainMenu_ContinueFromDiary: ; 12741 (4:6741) farcall Func_70000 call EnableSRAM xor a - ld [$ba44], a + ld [sba44], a call DisableSRAM ld a, GAME_EVENT_OVERWORLD ld [wGameEvent], a @@ -1234,7 +1261,10 @@ MainMenu_ContinueDuel: ; 1277e (4:677e) ret ; 0x1279a - INCROM $1279a, $12871 + INCROM $1279a, $12863 + +Func_12863: ; 12863 (4:6863) + INCROM $12863, $12871 Func_12871: ; 12871 (4:6871) INCROM $12871, $1288c @@ -1357,9 +1387,12 @@ FillNewSpriteAnimBufferEntry: ; 129d9 (4:69d9) pop bc pop hl ret -; 0x129fa - INCROM $129fa, $12a21 +Func_129fa: ; 129fa (4:69fa) + INCROM $129fa, $129fd + +Func_129fd: ; 129fd (4:69fd) + INCROM $129fd, $12a21 HandleAllSpriteAnimations: ; 12a21 (4:6a21) push af @@ -1719,7 +1752,13 @@ Func_12c5e: ; 12c5e (4:6c5e) INCROM $12c5e, $12c7f Func_12c7f: ; 12c7f (4:6c7f) - INCROM $12c7f, $131b3 + INCROM $12c7f, $12fc6 + +Func_12fc6: ; 12fc6 (4:6fc6) + INCROM $12fc6, $130ca + +Func_130ca: ; 130ca (4:70ca) + INCROM $130ca, $131b3 Func_131b3: ; 131b3 (4:71b3) INCROM $131b3, $131d3 @@ -1742,12 +1781,12 @@ Func_1344d: ; 1344d (4:744d) Func_13485: ; 13485 (4:7485) call EnableSRAM - ld a, [$ba68] + ld a, [sba68] or a ret z - ld a, [$ba56] + ld a, [sba56] ld [wTxRam3], a - ld a, [$ba57] + ld a, [sba57] ld [wTxRam3 + 1], a call DisableSRAM call PauseSong diff --git a/src/engine/bank06.asm b/src/engine/bank06.asm index 8101215..b69d109 100644 --- a/src/engine/bank06.asm +++ b/src/engine/bank06.asm @@ -1076,7 +1076,7 @@ Func_18f9c: ; 18f9c (6:4f9c) ld a, $00 ld [wd4ae], a ld a, $01 - ld [$d4b3], a + ld [wd4b3], a xor a ld [wd4b0], a ld a, [de] @@ -1144,10 +1144,10 @@ Func_19014: ; 19014 (6:5014) ld a, $97 call Func_3b6a ld a, [wce81] - ld [$d4b3], a + ld [wd4b3], a push de ld hl, wce7f - ld de, $d4b1 + ld de, wd4b1 ld a, [hli] ld [de], a inc de @@ -1189,7 +1189,7 @@ Func_19014: ; 19014 (6:5014) Func_19079: ; 19079 (6:5079) ld a, [de] inc de - ld [$d4b3], a + ld [wd4b3], a ld a, [wce82] ld [wd4b0], a call Func_1909d @@ -1207,7 +1207,7 @@ PointerTable_006_508f: ; 1908f (6:508f) dw Func_19013 Func_1909d: ; 1909d (6:509d) - ld a, [$d4b3] + ld a, [wd4b3] cp $04 jr z, .asm_50ad cp $01 @@ -1261,7 +1261,7 @@ Func_1909d: ; 1909d (6:509d) ; this part is not perfectly analyzed. ; needs some fix. - ld a, [$d4b3] + ld a, [wd4b3] cp $04 jr z, Func_190fb.asm_510f Func_190fb: ; 190fb (6:50fb) @@ -1336,25 +1336,25 @@ Func_19168: ; 19168 (6:5168) jr z, .asm_5188 call LoadTxRam3 ld a, [wce81] - ld hl, $003a + ldtx hl, AttackDamageText and $06 ret z - ld hl, $0038 + ldtx hl, WeaknessMoreDamage2Text cp $06 ret z and $02 - ld hl, $0037 + ldtx hl, WeaknessMoreDamageText ret nz - ld hl, $0036 + ldtx hl, ResistanceLessDamageText ret .asm_5188 call CheckNoDamageOrEffect ret c - ld hl, $003b + ldtx hl, NoDamageText ld a, [wce81] and $04 ret z - ld hl, $0039 + ldtx hl, ResistanceNoDamageText ret ; needs analyze. @@ -1679,12 +1679,12 @@ Func_1a6cd: ; 1a6cd (6:66cd) ld hl, $00a3 bank1call DrawWholeScreenTextBox ld a, $0a - ld [$0000], a + ld [MBC3SRamEnable], a xor a ldh [hBankSRAM], a - ld [$4000], a - ld [$a000], a - ld [$0000], a + ld [MBC3SRamBank], a + ld [MBC3RTC], a + ld [MBC3SRamEnable], a jp Reset ret @@ -1707,7 +1707,7 @@ Func_1a73a: ; 1a73a (6:673a) or b jr nz, .asm_6749 ld a, $0a - ld [$0000], a + ld [MBC3SRamEnable], a ld a, e ld [s0a00b], a pop bc @@ -3292,7 +3292,7 @@ Func_1bae4: ; 1bae4 (6:7ae4) push af ld hl, wd088 ld b, [hl] - farcall $2, $7625 + farcall Func_b625 jr c, .asm_7af5 pop af ld [wd0a6], a diff --git a/src/engine/bank07.asm b/src/engine/bank07.asm index 375a161..800d83b 100644 --- a/src/engine/bank07.asm +++ b/src/engine/bank07.asm @@ -112,7 +112,7 @@ Func_1c461: ; 1c461 (7:4461) ld a, b ld [hli], a ld [hl], c - call $46e3 + call Func_1c6e3 pop bc pop hl ret @@ -214,7 +214,7 @@ Func_1c50a: ; 1c50a (7:450a) ld a, [hl] or a jr z, .asm_1c52c - call $44fa + call Func_1c4fa jr nc, .asm_1c521 xor a ld [wd3b8], a @@ -223,7 +223,7 @@ Func_1c50a: ; 1c50a (7:450a) xor a ld [hli], a ld a, [hl] - farcall $4, $69fd + farcall Func_129fd ld hl, wd349 dec [hl] @@ -337,7 +337,7 @@ Func_1c5e9: ; 1c5e9 (7:45e9) ld l, LOADED_NPC_FIELD_07 call GetItemInLoadedNPCIndex ld a, [hl] - ld bc, $fffd + ld bc, -3 add hl, bc ld [hl], a call Func_1c58e @@ -346,6 +346,7 @@ Func_1c5e9: ; 1c5e9 (7:45e9) ret ; 0x1c5ff +Func_1c5ff: ; 1c5ff (7:45ff) INCROM $1c5ff, $1c610 Func_1c610: ; 1c610 (7:4610) @@ -382,7 +383,7 @@ Func_1c719: ; 1c719 (7:4719) ld b, a ld c, [hl] ld a, $40 - call $3937 + call UpdatePermissionOfMapPosition pop bc pop hl ret @@ -473,12 +474,12 @@ Func_1c78d: ; 1c78d (7:478d) inc hl ld [hl], b dec hl - call $39ea + call Func_39ea cp $f0 jr nc, .asm_1c7bb push af and $7f - call $45ff + call Func_1c5ff pop af bit 7, a jr z, .asm_1c7dc @@ -489,7 +490,7 @@ Func_1c78d: ; 1c78d (7:478d) cp $ff jr z, .asm_1c7d2 inc bc - call $39ea + call Func_39ea push hl ld l, a ld h, $0 @@ -551,8 +552,8 @@ Func_1c83d: ; 1c83d (7:483d) pop bc pop hl ret -; 0x1c858 +Func_1c858: ; 1c858 (7:4858) INCROM $1c858, $1c8bc Func_1c8bc: ; 1c8bc (7:48bc) @@ -598,7 +599,7 @@ Func_1c8ef: ; 1c8ef (7:48ef) ld a, [wTempAnimation] ld [wd4bf], a cp $61 - jp nc, $4b5e ; asm_007_4b5e + jp nc, Func_1cb5e push hl push bc push de @@ -672,7 +673,7 @@ Func_1c94a: ; 1c94a (7:494a) ld [wd4ca], a ld [wd4cb], a ld a, [hli] - farcall $20, $4418 + farcall Func_80418 ld a, [hli] push af @@ -824,7 +825,7 @@ Data_1ca04: macro_1ca04 $2838, $00 macro_1ca04 $2818, $00 -Func_1ca31: ; 1ca31 (7:4a6b) +Func_1ca31: ; 1ca31 (7:4a31) push hl push bc ld a, [wd4ac] @@ -835,10 +836,10 @@ Func_1ca31: ; 1ca31 (7:4a6b) add %00001000 and %01111111 cp b - jp z, .asm_007_4a6b + jp z, .asm_1ca6b ld [hl], a ld b, 0 - ld hl, $d42c + ld hl, wd42c add hl, bc ld a, [wTempAnimation] ld [hli], a @@ -848,15 +849,15 @@ Func_1ca31: ; 1ca31 (7:4a6b) ld [hli], a ld a, [wd4b0] ld [hli], a - ld a, [$d4b1] + ld a, [wd4b1] ld [hli], a - ld a, [$d4b2] + ld a, [wd4b2] ld [hli], a - ld a, [$d4b3] + ld a, [wd4b3] ld [hli], a ld a, [wd4be] ld [hl], a -.asm_007_4a6b +.asm_1ca6b pop bc pop hl ret @@ -878,6 +879,7 @@ Func_1cab3: ; 1cab3 (7:4ab3) pop bc ret +Func_1cac5: ; 1cac5 (7:4ac5) INCROM $1cac5, $1cb18 Func_1cb18: ; 1cb18 (7:4b18) @@ -894,7 +896,7 @@ Func_1cb18: ; 1cb18 (7:4b18) ld [wd4c0], a ld a, [wd42a] cp $ff - call nz, $4cd4 + call nz, Func_1ccd4 ld hl, wAnimationQueue ld c, $07 .asm_1cb3b @@ -903,7 +905,7 @@ Func_1cb18: ; 1cb18 (7:4b18) cp $ff jr z, .asm_1cb4b ld [wWhichSprite], a - farcall $4, $69fa + farcall Func_129fa ld a, $ff ld [hl], a .asm_1cb4b @@ -924,6 +926,7 @@ Func_1cb18: ; 1cb18 (7:4b18) jr .asm_1cb57 ; 0x1cb5e +Func_1cb5e: ; 1cb5e (7:4b5e) INCROM $1cb5e, $1ccbc Func_1ccbc: ; 1ccbc (7:4cbc) @@ -941,6 +944,7 @@ Func_1ccbc: ; 1ccbc (7:4cbc) ret ; 0x1ccd4 +Func_1ccd4: ; 1ccd4 (7:4cd4) INCROM $1ccd4, $1d078 Func_1d078: ; 1d078 (7:5078) @@ -951,8 +955,8 @@ Func_1d078: ; 1d078 (7:5078) ld a, MUSIC_STOP call PlaySong call Func_3ca0 - call $5335 - call $53ce + call Func_1d335 + call Func_1d3ce xor a ld [wd635], a ld a, $3c @@ -960,7 +964,7 @@ Func_1d078: ; 1d078 (7:5078) .asm_1d095 call DoFrameIfLCDEnabled call UpdateRNGSources - call $5614 + call Func_1d614 ld hl, wd635 inc [hl] call AssertSongFinished @@ -984,46 +988,46 @@ Func_1d078: ; 1d078 (7:5078) farcall Func_10ab4 .asm_1d0c7 - call $50fa - call $511c + call Func_1d0fa + call Func_1d11c ld a, [wd628] cp $2 jr nz, .asm_1d0db - call $5289 + call Func_1d289 jr c, Func_1d078 jr .asm_1d0e7 .asm_1d0db ld a, [wd628] cp $1 jr nz, .asm_1d0e7 - call $52b8 + call Func_1d2b8 jr c, Func_1d078 .asm_1d0e7 ld a, [wd628] cp $0 jr nz, .asm_1d0f3 - call $52dd + call Func_1d2dd jr c, Func_1d078 .asm_1d0f3 call ResetDoFrameFunction call Func_3ca0 ret -; 0x1d0fa +Func_1d0fa: ; 1d0fa (7:50fa) INCROM $1d0fa, $1d11c Func_1d11c: ; 1d11c (7:511c) ld a, MUSIC_PC_MAIN_MENU call PlaySong call DisableLCD - farcall $4, $4000 + farcall Func_10000 lb de, $30, $8f call SetupText call Func_3ca0 xor a ld [wLineSeparation], a - call $51e1 - call $517f + call Func_1d1e1 + call Func_1d17f ld a, $ff ld [wd626], a ld a, [wd627] @@ -1036,13 +1040,13 @@ Func_1d11c: ; 1d11c (7:511c) .asm_1d14f ld hl, wd636 farcall Func_111e9 - farcall $4, $4031 + farcall Func_10031 .asm_1d15a call DoFrameIfLCDEnabled call UpdateRNGSources call HandleMenuInput push af - call $51e9 + call Func_1d1e9 pop af jr nc, .asm_1d15a ldh a, [hCurMenuItem] @@ -1058,12 +1062,30 @@ Func_1d11c: ; 1d11c (7:511c) ld a, e ld [wd628], a ret -; 0x1d17f - INCROM $1d17f, $1d306 +Func_1d17f: ; 1d17f (7:517f) + INCROM $1d17f, $1d1e1 + +Func_1d1e1: ; 1d1e1 (7:51e1) + INCROM $1d1e1, $1d1e9 + +Func_1d1e9: ; 1d1e9 (7:51e9) + INCROM $1d1e9, $1d289 + +Func_1d289: ; 1d289 (7:5289) + INCROM $1d289, $1d2b8 + +Func_1d2b8: ; 1d2b8 (7:52b8) + INCROM $1d2b8, $1d2dd + +Func_1d2dd: ; 1d2dd (7:52dd) + INCROM $1d2dd, $1d306 Func_1d306: ; 1d306 (7:5306) - INCROM $1d306, $1d386 + INCROM $1d306, $1d335 + +Func_1d335: ; 1d335 (7:5335) + INCROM $1d335, $1d386 Titlescreen_1d386: ; 1d386 (7:5386) call AssertSongFinished @@ -1083,7 +1105,10 @@ Titlescreen_1d386: ; 1d386 (7:5386) ret Func_1d3a9: ; 1d3a9 (7:53a9) - INCROM $1d3a9, $1d42e + INCROM $1d3a9, $1d3ce + +Func_1d3ce: ; 1d3ce (7:53ce) + INCROM $1d3ce, $1d42e Func_1d42e: ; 1d42e (7:542e) INCROM $1d42e, $1d519 @@ -1099,35 +1124,38 @@ Titlescreen_1d519: ; 1d519 (7:5519) INCROM $1d523, $1d59c Func_1d59c: ; 1d59c (7:559c) - INCROM $1d59c, $1d6ad + INCROM $1d59c, $1d614 + +Func_1d614: ; 1d614 (7:5614) + INCROM $1d614, $1d6ad Credits_1d6ad: ; 1d6ad (7:56ad) ld a, MUSIC_STOP call PlaySong - call $5705 - call $4858 + call Func_1d705 + call Func_1c858 xor a ld [wd324], a ld a, MUSIC_CREDITS call PlaySong - farcall $4, $4031 - call $57fc + farcall Func_10031 + call Func_1d7fc .asm_1d6c8 call DoFrameIfLCDEnabled - call $5765 - call $580b + call Func_1d765 + call Func_1d80b ld a, [wd633] cp $ff jr nz, .asm_1d6c8 call WaitForSongToFinish ld a, $8 - farcall $4, $6863 + farcall Func_12863 ld a, MUSIC_STOP call PlaySong farcall Func_10ab4 call Func_3ca4 call Set_WD_off - call $5758 + call Func_1d758 call EnableLCD call DoFrameIfLCDEnabled call DisableLCD @@ -1135,6 +1163,18 @@ Credits_1d6ad: ; 1d6ad (7:56ad) set 1, [hl] call ResetDoFrameFunction ret -; 0x1d705 - INCROM $1d705, $1e1c4 +Func_1d705: ; 1d705 (7:5705) + INCROM $1d705, $1d758 + +Func_1d758: ; 1d758 (7:5758) + INCROM $1d758, $1d765 + +Func_1d765: ; 1d765 (7:5765) + INCROM $1d765, $1d7fc + +Func_1d7fc: ; 1d7fc (7:57fc) + INCROM $1d7fc, $1d80b + +Func_1d80b: ; 1d80b (7:580b) + INCROM $1d80b, $1e1c4 diff --git a/src/engine/bank20.asm b/src/engine/bank20.asm index 14292f9..ab74d7b 100644 --- a/src/engine/bank20.asm +++ b/src/engine/bank20.asm @@ -5,9 +5,9 @@ Func_80028: ; 80028 (20:4028) call Func_801f1 ld bc, $0000 call Func_80077 - farcall $3, $49c7 - call $41a1 - farcall $3, $43ee + farcall Func_c9c7 + call Func_801a1 + farcall Func_c3ee ret ; 0x8003d @@ -16,12 +16,12 @@ Func_80028: ; 80028 (20:4028) Func_80077: ; 80077 (20:4077) ld a, $1 ld [wd292], a - jr .asm_80082 + jr Func_80082 xor a ld [wd292], a -.asm_80082 +Func_80082: ; 80082 (20:4082) push hl push bc push de @@ -78,7 +78,7 @@ Func_800bd: ; 800bd (20:40bd) Func_800e0: ; 800e0 (20:40e0) push hl - ld hl, $d28e + ld hl, wd28e ld a, [wd12f] ld [hl], a ld a, [wd23c] @@ -99,7 +99,7 @@ Func_800e0: ; 800e0 (20:40e0) push bc push de ld b, $00 - ld a, [$d28e] + ld a, [wd28e] ld c, a ld de, wd23e call Func_3be4 @@ -138,17 +138,17 @@ Func_800e0: ; 800e0 (20:40e0) ret Func_80148: ; 80148 (20:4148) - ld a, [$d291] + ld a, [wd291] or a ret z - ld a, [$d23c] + ld a, [wd23c] or a jr z, .asm_80162 push hl push bc .asm_80155 push bc - ld a, [$d291] + ld a, [wd291] add [hl] ld [hli], a pop bc @@ -160,7 +160,7 @@ Func_80148: ; 80148 (20:4148) .asm_80162 push hl push bc - ld a, [$d291] + ld a, [wd291] .asm_80167 ld [hli], a dec b @@ -394,7 +394,7 @@ Func_803b9: ; 803b9 (20:43b9) call GetMapDataPointer call LoadGraphicsPointerFromHL ld a, [hl] - ld [$d239], a + ld [wd239], a ret ; 0x803c9 @@ -418,9 +418,9 @@ Func_80b89: ; 80b89 (20:4b89) push af ld c, a ld a, $01 - ld [$d292], a + ld [wd292], a ld b, $00 - ld hl, $d323 + ld hl, wd323 add hl, bc ld a, [hl] or a @@ -466,7 +466,7 @@ Func_80baa: ; 80baa (20:4baa) add a ld c, a ld b, $0 - ld hl, $4c21 + ld hl, Unknown_80c21 add hl, bc ld a, [hli] ld h, [hl] @@ -484,7 +484,7 @@ Func_80baa: ; 80baa (20:4baa) ld a, [hl] ld [wd131], a push bc - farcall $20, $4082 + farcall Func_80082 pop bc srl b ld a, c @@ -496,7 +496,7 @@ Func_80baa: ; 80baa (20:4baa) ld b, $0 ld hl, wBoosterViableCardList add hl, bc - farcall $3, $438f + farcall Func_c38f pop af ld [wd23b], a pop af @@ -513,8 +513,8 @@ Func_80baa: ; 80baa (20:4baa) pop bc pop hl ret -; 0x80c21 +Unknown_80c21: ; 80c21 (20:4c21) INCROM $80c21, $80e5a SpriteNullAnimationPointer: ; 80e5a (20:4e5a) diff --git a/src/engine/effect_functions.asm b/src/engine/effect_functions.asm index b381661..0fc94d4 100644 --- a/src/engine/effect_functions.asm +++ b/src/engine/effect_functions.asm @@ -877,7 +877,7 @@ HandleDefendingPokemonAttackSelection: ; 2c391 (b:4391) db 2 ; number of items db SYM_CURSOR_R ; cursor tile number db SYM_SPACE ; tile behind cursor - dw $0000 ; function pointer if non-0 + dw NULL ; function pointer if non-0 ; 0x2c3fc ; loads in hl the pointer to attack's name. @@ -1244,7 +1244,7 @@ HandleColorChangeScreen: ; 2c588 (b:4588) db MAX_PLAY_AREA_POKEMON ; number of items db SYM_CURSOR_R ; cursor tile number db SYM_SPACE ; tile behind cursor - dw $0000 ; function pointer if non-0 + dw NULL ; function pointer if non-0 ; 0x2c5be .DrawScreen: ; 2c5be (b:45be) @@ -1444,7 +1444,7 @@ PlayAreaSelectionMenuParameters: ; 2c6e0 (b:46e0) db MAX_PLAY_AREA_POKEMON ; number of items db SYM_CURSOR_R ; cursor tile number db SYM_SPACE ; tile behind cursor - dw $0000 ; function pointer if non-0 + dw NULL ; function pointer if non-0 ; 0x2c6e8 BenchSelectionMenuParameters: ; 2c6e8 (b:46e8) @@ -1453,7 +1453,7 @@ BenchSelectionMenuParameters: ; 2c6e8 (b:46e8) db MAX_PLAY_AREA_POKEMON ; number of items db SYM_CURSOR_R ; cursor tile number db SYM_SPACE ; tile behind cursor - dw $0000 ; function pointer if non-0 + dw NULL ; function pointer if non-0 ; 0x2c6f0 SpitPoison_AIEffect: ; 2c6f0 (b:46f0) diff --git a/src/engine/home.asm b/src/engine/home.asm index 9649f69..1ba64dd 100644 --- a/src/engine/home.asm +++ b/src/engine/home.asm @@ -7983,7 +7983,7 @@ NarrowTextBoxMenuParameters: ; 2a96 (0:2a96) db 1 ; number of items db SYM_CURSOR_D ; cursor tile number db SYM_BOX_BOTTOM ; tile behind cursor - dw $0000 ; function pointer if non-0 + dw NULL ; function pointer if non-0 ; draw a 20x6 text box aligned to the bottom of the screen DrawWideTextBox: ; 2a9e (0:2a9e) @@ -8020,7 +8020,7 @@ WideTextBoxMenuParameters: ; 2ac8 (0:2ac8) db 1 ; number of items db SYM_CURSOR_D ; cursor tile number db SYM_BOX_BOTTOM ; tile behind cursor - dw $0000 ; function pointer if non-0 + dw NULL ; function pointer if non-0 ; display a two-item horizontal menu with custom text provided in hl and handle input TwoItemHorizontalMenu: ; 2ad0 (0:2ad0) @@ -8793,7 +8793,7 @@ LoadTxRam3: ; 2ec4 (0:2ec4) ; load data of card with text id of name at de to wLoadedCard1 LoadCardDataToBuffer1_FromName: ; 2ecd (0:2ecd) - ld hl, CardPointers + 2 ; skip first $0000 pointer + ld hl, CardPointers + 2 ; skip first NULL pointer ld a, BANK(CardPointers) call BankpushROM2 .find_card_loop @@ -9051,7 +9051,7 @@ CheckMatchingCommand: ; 2ffe (0:2ffe) ld a, l or h jr nz, .not_null_pointer - ; return carry if pointer is $0000 + ; return carry if pointer is NULL scf ret @@ -10639,7 +10639,7 @@ GameEvent_Duel: ; 38c0 (0:38c0) ld [wd112], a call EnableSRAM xor a - ld [$ba44], a + ld [sba44], a call DisableSRAM call Func_3a3b bank1call StartDuel @@ -10652,7 +10652,7 @@ GameEvent_ChallengeMachine: ; 38db (0:38db) call Func_39fc call EnableSRAM xor a - ld [$ba44], a + ld [sba44], a call DisableSRAM .asm_38ed farcall Func_131d3 @@ -10667,7 +10667,7 @@ GameEvent_ContinueDuel: ; 38fb (0:38fb) ld [wd112], a bank1call TryContinueDuel call EnableSRAM - ld a, [$ba44] + ld a, [sba44] call DisableSRAM cp $ff jr z, GameEvent_ChallengeMachine.asm_38ed @@ -11059,9 +11059,9 @@ RunOverworldScript: ; 3aed (0:3aed) Func_3b11: ; 3b11 (0:3b11) ldh a, [hBankROM] push af - ld a, $04 + ld a, BANK(_GameLoop) call BankswitchROM - call $66d1 + call _GameLoop pop af call BankswitchROM ret @@ -11123,7 +11123,7 @@ Func_3b6a: ; 3b6a (0:3b6a) push hl push bc push de - ld a, $07 + ld a, BANK(Func_1ca31) ; BANK(Func_1c8ef) call BankswitchROM ld a, [wTempAnimation] cp $61 @@ -11135,10 +11135,10 @@ Func_3b6a: ; 3b6a (0:3b6a) call CheckAnyAnimationPlaying jr nc, .asm_3b95 .asm_3b90 - call $4a31 + call Func_1ca31 jr .asm_3b9a .asm_3b95 - call $48ef + call Func_1c8ef jr .asm_3b9a .asm_3b9a pop de @@ -11151,9 +11151,9 @@ Func_3b6a: ; 3b6a (0:3b6a) Func_3ba2: ; 3ba2 (0:3ba2) ldh a, [hBankROM] push af - ld a, $07 + ld a, BANK(Func_1cac5) call BankswitchROM - call $4ac5 + call Func_1cac5 call Func_3cb4 pop af call BankswitchROM @@ -11184,7 +11184,7 @@ SetDoFrameFunction: ; 3bd2 (0:3bd2) ResetDoFrameFunction: ; 3bdb (0:3bdb) push hl - ld hl, $0000 + ld hl, NULL call SetDoFrameFunction pop hl ret @@ -11617,9 +11617,9 @@ Func_3e17: ; 3e17 (0:3e17) ld [wd131], a ldh a, [hBankROM] push af - ld a, $4 + ld a, BANK(Func_12fc6) call BankswitchROM - call $6fc6 + call Func_12fc6 pop af call BankswitchROM ret @@ -11634,9 +11634,9 @@ Func_3e31: ; 3e31 (0:3e31) ldh a, [hBankROM] push af call Func_3cb4 - ld a, $20 + ld a, BANK(Func_804d8) call BankswitchROM - call $44d8 + call Func_804d8 pop af call BankswitchROM ret diff --git a/src/sram.asm b/src/sram.asm index f9c1a9e..6ad3cdd 100644 --- a/src/sram.asm +++ b/src/sram.asm @@ -66,6 +66,32 @@ s0a3f8:: ; a3f8 sCurrentlySelectedDeck:: ; b700 ds $1 +sb701:: ; b701 + ds $1 + + ds $1 + +sb703:: ; b703 + ds $1 + + ds $340 + +sba44:: ; ba44 + ds $1 + + ds $11 + +sba56:: ; ba56 + ds $1 + +sba57:: ; ba57 + ds $1 + + ds $10 + +sba68:: ; ba68 + ds $1 + SECTION "SRAM1", SRAM SECTION "SRAM2", SRAM diff --git a/src/text/text1.asm b/src/text/text1.asm index 93c389f..931a98d 100644 --- a/src/text/text1.asm +++ b/src/text/text1.asm @@ -222,12 +222,12 @@ ResistanceLessDamageText: ; 365e1 (d:65e1) line "<RAMNUM> damage due to Resistance!" done -Text0037: ; 36609 (d:6609) +WeaknessMoreDamageText: ; 36609 (d:6609) text "<RAMTEXT> received" line "<RAMNUM> damage due to Weakness!" done -Text0038: ; 3662f (d:662f) +WeaknessMoreDamage2Text: ; 3662f (d:662f) text "<RAMTEXT> received" line "<RAMNUM> damage due to Weakness!" done diff --git a/src/text/text3.asm b/src/text/text3.asm index 18b329e..dd18539 100644 --- a/src/text/text3.asm +++ b/src/text/text3.asm @@ -21,7 +21,7 @@ Text0271: ; 3c082 (f:4082) text "Dismantled the Deck." done -Text0272: ; 3c098 (f:4098) +OKIfFileDeletedText: ; 3c098 (f:4098) text "OK if this file is deleted?" done diff --git a/src/text/text_offsets.asm b/src/text/text_offsets.asm index 0d2ca4d..a061dc9 100644 --- a/src/text/text_offsets.asm +++ b/src/text/text_offsets.asm @@ -56,8 +56,8 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text0034 ; 0x0034 textpointer PokemonsAttackText ; 0x0035 textpointer ResistanceLessDamageText ; 0x0036 - textpointer Text0037 ; 0x0037 - textpointer Text0038 ; 0x0038 + textpointer WeaknessMoreDamageText ; 0x0037 + textpointer WeaknessMoreDamage2Text ; 0x0038 textpointer ResistanceNoDamageText ; 0x0039 textpointer AttackDamageText ; 0x003a textpointer NoDamageText ; 0x003b @@ -627,7 +627,7 @@ TextOffsets:: ; 34000 (d:4000) textpointer Text026f ; 0x026f textpointer Text0270 ; 0x0270 textpointer Text0271 ; 0x0271 - textpointer Text0272 ; 0x0272 + textpointer OKIfFileDeletedText ; 0x0272 textpointer Text0273 ; 0x0273 textpointer Text0274 ; 0x0274 textpointer Text0275 ; 0x0275 diff --git a/src/wram.asm b/src/wram.asm index 3189288..109f1d4 100644 --- a/src/wram.asm +++ b/src/wram.asm @@ -404,7 +404,10 @@ wDuelTempList:: ; c510 ; this is kept updated with some default text that is used ; when the text printing functions are called with text id $0000 wDefaultText:: ; c590 - ds $70 + ds $2 + +wc592:: ; c592 + ds $6e SECTION "WRAM0 Text Engine", WRAM0 @@ -1619,6 +1622,7 @@ wce53:: ; ce53 wDuelInitialPrizesUpperBitsSet:: ; ce55 ds $1 +wce56:: ; ce56 ds $1 ; it's used for restore the position of cursor @@ -1635,7 +1639,10 @@ wInPlayAreaTemporaryPosition:: ; ce58 wce59:: ; ce59 ds $1 - ds $3 + ds $2 + +wce5c:: ; ce5c + ds $1 ; stores whether there are Pokemon in play area ; player arena Pokemon sets bit 0 @@ -1927,7 +1934,7 @@ wd0a5:: ; d0a5 wd0a6:: ; d0a6 ds $1 -dw0a7:: ; d0a7 +wd0a7:: ; d0a7 ds $2 wd0a9:: ; d0a9 @@ -2112,6 +2119,7 @@ wd237:: ; d237 wd238:: ; d238 ds $1 +wd239:: ; d239 ds $1 wd23a:: ; d23a @@ -2129,7 +2137,10 @@ wd23d:: ; d23d wd23e:: ; d23e ds $1 - ds $50 + ds $4f + +wd28e:: ; d28e + ds $1 wd28f:: ; d28f ds $1 @@ -2354,6 +2365,7 @@ wd42a:: ; d42a wd42b:: ; d42b ds $1 +wd42c:: ; d42c ds $80 wd4ac:: ; d4ac @@ -2639,7 +2651,19 @@ wd696:: ; d696 wd697:: ; d697 ds $1 - ds $6e8 +wd698:: ; d698 + ds $1 + +wd699:: ; d699 + ds $1 + +wd69a:: ; d69a + ds $1 + +wd69b:: ; d69b + ds $1 + + ds $6e4 SECTION "WRAM1 Audio", WRAMX |